Merge pull request #3 from hactar/public-expression

Allow setting expression directly
stadiamaps · May 3, 2024 · d52adbc · d52adbc
2 parents 9f15cbb + 121c55b
commit d52adbc
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/Sources/MapLibreSwiftMacrosImpl/StyleExpressionMacro.swift b/Sources/MapLibreSwiftMacrosImpl/StyleExpressionMacro.swift
@@ -33,6 +33,12 @@ private func generateStyleProperty(for attributes: AttributeSyntax, valueType: T
         isRawRepresentable: isRawRepresentable
     )
 
+    let nsExpressionFuncDecl = try FunctionDeclSyntax("public func \(identifier)(expression: NSExpression) -> Self") {
+        "var copy = self"
+        "copy.\(identifier) = expression"
+        "return copy"
+    }
+
     let getPropFuncDecl =
         try FunctionDeclSyntax("public func \(identifier)(featurePropertyNamed keyPath: String) -> Self") {
             "var copy = self"
@@ -41,7 +47,8 @@ private func generateStyleProperty(for attributes: AttributeSyntax, valueType: T
         }
 
     guard let constFuncDeclSyntax = DeclSyntax(constantFuncDecl),
-          let getPropFuncDeclSyntax = DeclSyntax(getPropFuncDecl)
+          let getPropFuncDeclSyntax = DeclSyntax(getPropFuncDecl),
+          let nsExpressionFuncDeclSyntax = DeclSyntax(nsExpressionFuncDecl)
     else {
         fatalError("SwiftSyntax bug or implementation error: unable to construct DeclSyntax")
     }
@@ -65,7 +72,7 @@ private func generateStyleProperty(for attributes: AttributeSyntax, valueType: T
         extra.append(interpolationFuncDeclSyntax)
     }
 
-    return [varDeclSyntax, constFuncDeclSyntax, getPropFuncDeclSyntax] + extra
+    return [varDeclSyntax, constFuncDeclSyntax, nsExpressionFuncDeclSyntax, getPropFuncDeclSyntax] + extra
 }
 
 private func generateFunctionDeclSyntax(identifier: TokenSyntax, valueType: TypeSyntax,

diff --git a/Tests/MapLibreSwiftMacrosTests/MapLibreSwiftMacrosTests.swift b/Tests/MapLibreSwiftMacrosTests/MapLibreSwiftMacrosTests.swift
@@ -42,6 +42,12 @@ final class ExpressionTests: XCTestCase {
                         return copy
                     }
 
+                    public func backgroundColor(expression: NSExpression) -> Self {
+                        var copy = self
+                        copy.backgroundColor = expression
+                        return copy
+                    }
+
                     public func backgroundColor(featurePropertyNamed keyPath: String) -> Self {
                         var copy = self
                         copy.backgroundColor = NSExpression(forKeyPath: keyPath)
@@ -69,6 +75,12 @@ final class ExpressionTests: XCTestCase {
                         return copy
                     }
 
+                    public func backgroundColor(expression: NSExpression) -> Self {
+                        var copy = self
+                        copy.backgroundColor = expression
+                        return copy
+                    }
+
                     public func backgroundColor(featurePropertyNamed keyPath: String) -> Self {
                         var copy = self
                         copy.backgroundColor = NSExpression(forKeyPath: keyPath)
@@ -102,6 +114,12 @@ final class ExpressionTests: XCTestCase {
                         return copy
                     }
 
+                    public func backgroundColor(expression: NSExpression) -> Self {
+                        var copy = self
+                        copy.backgroundColor = expression
+                        return copy
+                    }
+
                     public func backgroundColor(featurePropertyNamed keyPath: String) -> Self {
                         var copy = self
                         copy.backgroundColor = NSExpression(forKeyPath: keyPath)
@@ -141,6 +159,12 @@ final class ExpressionTests: XCTestCase {
                         return copy
                     }
 
+                    public func backgroundColor(expression: NSExpression) -> Self {
+                        var copy = self
+                        copy.backgroundColor = expression
+                        return copy
+                    }
+
                     public func backgroundColor(featurePropertyNamed keyPath: String) -> Self {
                         var copy = self
                         copy.backgroundColor = NSExpression(forKeyPath: keyPath)