Merge pull request #85 from ilyapuchka/call-with-filter

Compile filters in call node

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ---
 
+## Master
+
+### Bug fixes
+
+* Fixed using filter expression in call node.  
+  [Ilya Puchka](https://github.com/ilyapuchka) 
+  [#85](https://github.com/SwiftGen/StencilSwiftKit/pull/85)
+
 ## 2.5.0
 
 ### New Features

Documentation/tag-call.md

@@ -49,7 +49,7 @@ See the documentation for the [macro tag](tag-macro.md) for more information.
 {% endmacro %}
 
 {# calling test2 #}
-{% call test2 "hey" 123 "world" %}
+{% call test2 "hey" 123 "world"|capitalise %}
 ```
 
 Will output:
@@ -58,7 +58,7 @@ Will output:
   Received parameters in test2:
   - a = "hey"
   - b = "123"
-  - c = "world"
+  - c = "World"
 
   // calling test1
   Hello world! (inside test)

Sources/CallMacroNodes.swift

@@ -10,7 +10,7 @@ struct CallableBlock: NodeType {
   let parameters: [String]
   let nodes: [NodeType]
 
-  func context(_ context: Context, arguments: [Variable]) throws -> [String: Any] {
+  func context(_ context: Context, arguments: [Resolvable]) throws -> [String: Any] {
     var result = [String: Any]()
 
     for (parameter, argument) in zip(parameters, arguments) {
@@ -61,20 +61,20 @@ class MacroNode: NodeType {
 
 class CallNode: NodeType {
   let variableName: String
-  let arguments: [Variable]
+  let arguments: [Resolvable]
 
   class func parse(_ parser: TokenParser, token: Token) throws -> NodeType {
     let components = token.components()
     guard components.count >= 2 else {
       throw TemplateSyntaxError("'call' tag takes at least one argument, the name of the block to call.")
     }
     let variable = components[1]
-    let arguments = Array(components.dropFirst(2)).map { Variable($0) }
+    let arguments = try Array(components.dropFirst(2)).map(parser.compileFilter)
 
     return CallNode(variableName: variable, arguments: arguments)
   }
 
-  init(variableName: String, arguments: [Variable]) {
+  init(variableName: String, arguments: [Resolvable]) {
     self.variableName = variableName
     self.arguments = arguments
   }

Tests/StencilSwiftKitTests/CallNodeTests.swift

@@ -22,7 +22,7 @@ class CallNodeTests: XCTestCase {
     }
 
     XCTAssertEqual(node.variableName, "myFunc")
-    XCTAssertEqual(node.arguments, [])
+    XCTAssertEqual(node.arguments.count, 0)
   }
 
   func testParserWithArguments() {
@@ -38,7 +38,8 @@ class CallNodeTests: XCTestCase {
     }
 
     XCTAssertEqual(node.variableName, "myFunc")
-    XCTAssertEqual(node.arguments, [Variable("a"), Variable("b"), Variable("c")])
+    let variables = node.arguments.flatMap { $0 as? FilterExpression }.flatMap { $0.variable }
+    XCTAssertEqual(variables, [Variable("a"), Variable("b"), Variable("c")])
   }
 
   func testParserFail() {

Tests/StencilSwiftKitTests/MacroNodeTests.swift

@@ -133,4 +133,15 @@ class MacroNodeTests: XCTestCase {
     XCTAssertEqual(result["p2"] as? Int, 2)
     XCTAssertEqual(result["p3"] as? String, "hello")
   }
+
+  func testCallableBlockWithFilterExpressionParameter() throws {
+    let block = CallableBlock(parameters: ["greeting"], nodes: [])
+
+    let parser = TokenParser(tokens: [], environment: stencilSwiftEnvironment())
+    let arguments = try [FilterExpression(token: "greet|uppercase", parser: parser)]
+    let context = Context(dictionary: ["greet": "hello"])
+
+    let result = try block.context(context, arguments: arguments)
+    XCTAssertEqual(result["greeting"] as? String, "HELLO")
+  }
 }