Properly generate optional string-Date fields

Should fix issue #37
Lighter-swift · Oct 26, 2024 · 83050ef · 83050ef
1 parent e354ce0
commit 83050ef
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Plugins/Libraries/LighterGeneration/RecordGeneration/GenerateRecordStatementBind.swift b/Plugins/Libraries/LighterGeneration/RecordGeneration/GenerateRecordStatementBind.swift
@@ -1,6 +1,6 @@
 //
 //  Created by Helge Heß.
-//  Copyright © 2022 ZeeZide GmbH.
+//  Copyright © 2022-2024 ZeeZide GmbH.
 //
 
 import LighterCodeGenAST
@@ -590,10 +590,10 @@ extension EnlighterASTGenerator {
             !optional // but still yields an optional if dateformatter is nil
             ? .call(name: "\(database.name).dateFormatter?.string",
                     parameters: [ ( "from", ivar(propertyName) ) ])
-            : .flatMap(expression: ivar(propertyName), map: .call(
-                    name: "\(database.name).dateFormatter?.string",
-                    parameters: [ ( "from", .raw("$0") ) ]
-              ))
+            : .flatMap(expression: ivar(propertyName), map: .closure([
+                .call(name: "\(database.name).dateFormatter?.string",
+                      parameters: [ ( "from", .closureArg0 ) ])
+              ]))
           ) ],
           trailing: ( [ "s" ], [
             .ifSwitch( (