Move date formatter expression from AST lib to gen

Let's keep the AST lib generic, useful in other projects.
Lighter-swift · Nov 11, 2024 · ebeafe2 · ebeafe2
1 parent 105982c
commit ebeafe2
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 24 deletions.
diff --git a/Plugins/Libraries/LighterCodeGenAST/Nodes/Expression.swift b/Plugins/Libraries/LighterCodeGenAST/Nodes/Expression.swift
@@ -301,30 +301,6 @@ public extension Expression {
 }
 
 
-// MARK: - Date Formatting Convenience
-
-public extension Expression {
-    static func formattedCurrentDate(format: String) -> Self {
-        .inlineClosureCall([
-            .let("fmt", is: .call(name: "DateFormatter")),
-            .set(instance: "fmt", "locale",
-                 .call(name: "Locale", parameters: [
-                    ("identifier", .string("en_US_POSIX"))
-                 ])),
-            .set(instance: "fmt", "timeZone",
-                 .call(name: "TimeZone", parameters: [
-                    ("secondsFromGMT", .integer(0))
-                 ])),
-            .set(instance: "fmt", "dateFormat", .string(format)),
-            .return(.call(instance: "fmt",
-                          name: "string",
-                          parameters: [
-                            ("from", .call(name: "Date"))
-                          ]))
-        ])
-    }
-}
-
 #if swift(>=5.5)
 extension Expression                   : Sendable {}
 extension FunctionCall                 : Sendable {}

diff --git a/Plugins/Libraries/LighterGeneration/RecordGeneration/GenerateDefaultValues.swift b/Plugins/Libraries/LighterGeneration/RecordGeneration/GenerateDefaultValues.swift
@@ -204,3 +204,28 @@ extension EnlighterASTGenerator {
     }
   }
 }
+
+// MARK: - Date Formatting Convenience
+
+fileprivate extension Expression {
+
+  static func formattedCurrentDate(format: String) -> Self {
+    .inlineClosureCall([
+      .let("fmt", is: .call(name: "DateFormatter")),
+      .set(instance: "fmt", "locale",
+           .call(name: "Locale", parameters: [
+            ("identifier", .string("en_US_POSIX"))
+           ])),
+      .set(instance: "fmt", "timeZone",
+           .call(name: "TimeZone", parameters: [
+            ("secondsFromGMT", .integer(0))
+           ])),
+      .set(instance: "fmt", "dateFormat", .string(format)),
+      .return(.call(instance: "fmt",
+                    name: "string",
+                    parameters: [
+                      ("from", .call(name: "Date"))
+                    ]))
+    ])
+  }
+}