Update to Stencil 0.14.0 (and Swift 5)

.circleci/config.yml

@@ -1,3 +1,6 @@
+orbs:
+  bundle-install: toshimaru/[email protected]
+
 defaults:
   - &macos-config
     parallelism: 1
@@ -20,23 +23,6 @@ defaults:
     run:
       name: Create directories for artifacts and reports
       command: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
-  - &restore-gems
-    restore_cache:
-      keys:
-        - &cache-key v1-gems-{{ checksum "Gemfile.lock" }}
-        - v1-gems-
-  - &install-gems
-    run:
-      name: Bundle install
-      command: bundle check || bundle install
-      environment:
-        BUNDLE_JOBS: 4
-        BUNDLE_RETRY: 3
-  - &store-gems
-    save_cache:
-      key: *cache-key
-      paths:
-        - vendor/bundle
   - &fetch-xcode-logs
     run:
       name: Getting Xcode activity logs
@@ -46,16 +32,15 @@ defaults:
       path: /tmp/circleci-artifacts
 
 
-version: 2
+version: 2.1
 jobs:
   lint:
     <<: *macos-config
     steps:
       - *prepare-storage
       - checkout
-      - *restore-gems
-      - *install-gems
-      - *store-gems
+      - bundle-install/bundle-install:
+          cache_key_prefix: v1-macos
       - run:
           name: Lint source code
           command: bundle exec rake lint:code
@@ -69,9 +54,8 @@ jobs:
     steps:
       - *prepare-storage
       - checkout
-      - *restore-gems
-      - *install-gems
-      - *store-gems
+      - bundle-install/bundle-install:
+          cache_key_prefix: v1-macos
       - run:
           name: Run all tests
           command: bundle exec rake xcode:test
@@ -85,9 +69,8 @@ jobs:
     steps:
       - *prepare-storage
       - checkout
-      - *restore-gems
-      - *install-gems
-      - *store-gems
+      - bundle-install/bundle-install:
+          cache_key_prefix: v1-linux
       - run:
           name: Run all tests
           command: bundle exec rake spm:test
@@ -98,9 +81,8 @@ jobs:
     steps:
       - *prepare-storage
       - checkout
-      - *restore-gems
-      - *install-gems
-      - *store-gems
+      - bundle-install/bundle-install:
+          cache_key_prefix: v1-macos
       - run:
           name: Run all tests
           command: bundle exec rake spm:test
@@ -111,9 +93,8 @@ jobs:
     steps:
       - *prepare-storage
       - checkout
-      - *restore-gems
-      - *install-gems
-      - *store-gems
+      - bundle-install/bundle-install:
+          cache_key_prefix: v1-macos
       - run:
           name: Download podspec repo
           command: curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf
@@ -124,7 +105,6 @@ jobs:
 
 
 workflows:
-  version: 2
   lint-buildandtest-checkdeploy:
     jobs:
       - lint

Package.resolved

@@ -6,26 +6,26 @@
         "repositoryURL": "https://github.com/kylef/PathKit.git",
         "state": {
           "branch": null,
-          "revision": "e2f5be30e4c8f531c9c1e8765aa7b71c0a45d7a0",
-          "version": "0.9.2"
+          "revision": "73f8e9dca9b7a3078cb79128217dc8f2e585a511",
+          "version": "1.0.0"
         }
       },
       {
         "package": "Spectre",
         "repositoryURL": "https://github.com/kylef/Spectre.git",
         "state": {
           "branch": null,
-          "revision": "f14ff47f45642aa5703900980b014c2e9394b6e5",
-          "version": "0.9.0"
+          "revision": "f717bbce0e19f0129fc001b2b6bed43b70fd8b87",
+          "version": "0.9.1"
         }
       },
       {
         "package": "Stencil",
         "repositoryURL": "https://github.com/stencilproject/Stencil.git",
         "state": {
           "branch": null,
-          "revision": "0e9a78d6584e3812cd9c09494d5c7b483e8f533c",
-          "version": "0.13.1"
+          "revision": "94197b3adbbf926348ad8765476a158aa4e54f8a",
+          "version": "0.14.0"
         }
       }
     ]

Package.swift

@@ -4,10 +4,10 @@ import PackageDescription
 let package = Package(
   name: "StencilSwiftKit",
   products: [
-      .library(name: "StencilSwiftKit", targets: ["StencilSwiftKit"])
+    .library(name: "StencilSwiftKit", targets: ["StencilSwiftKit"])
   ],
   dependencies: [
-      .package(url: "https://github.com/stencilproject/Stencil.git", .upToNextMinor(from: "0.13.0"))
+    .package(url: "https://github.com/stencilproject/Stencil.git", .upToNextMajor(from: "0.14.0"))
   ],
   targets: [
     .target(

Package@swift-4.2.swift

@@ -4,10 +4,10 @@ import PackageDescription
 let package = Package(
   name: "StencilSwiftKit",
   products: [
-      .library(name: "StencilSwiftKit", targets: ["StencilSwiftKit"])
+    .library(name: "StencilSwiftKit", targets: ["StencilSwiftKit"])
   ],
   dependencies: [
-      .package(url: "https://github.com/stencilproject/Stencil.git", .upToNextMinor(from: "0.13.0"))
+    .package(url: "https://github.com/stencilproject/Stencil.git", .upToNextMajor(from: "0.14.0"))
   ],
   targets: [
     .target(

Sources/StencilSwiftKit/CallMacroNodes.swift

@@ -41,7 +41,7 @@ class MacroNode: NodeType {
   let token: Token?
 
   class func parse(_ parser: TokenParser, token: Token) throws -> NodeType {
-    let components = token.components()
+    let components = token.components
     guard components.count >= 2 else {
       throw TemplateSyntaxError("'macro' tag takes at least one argument, the name of the variable to set.")
     }
@@ -76,7 +76,7 @@ class CallNode: NodeType {
   let token: Token?
 
   class func parse(_ parser: TokenParser, token: Token) throws -> NodeType {
-    let components = token.components()
+    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.")
     }

Sources/StencilSwiftKit/Filters+Strings.swift

@@ -88,6 +88,7 @@ extension Filters.Strings {
   /// e.g. "PeoplePicker" gives "peoplePicker" but "URLChooser" gives "urlChooser"
   static func lowerFirstWord(_ value: Any?) throws -> Any? {
     let string = try Filters.parseString(from: value)
+    guard !string.isEmpty else { return "" }
     let characterSet = CharacterSet.uppercaseLetters
     let scalars = string.unicodeScalars
     let start = scalars.startIndex

Sources/StencilSwiftKit/MapNode.swift

@@ -14,7 +14,7 @@ class MapNode: NodeType {
   let token: Token?
 
   class func parse(parser: TokenParser, token: Token) throws -> NodeType {
-    let components = token.components()
+    let components = token.components
 
     func hasToken(_ token: String, at index: Int) -> Bool {
       return components.indices ~= index + 1 && components[index] == token

Sources/StencilSwiftKit/SetNode.swift

@@ -17,7 +17,7 @@ class SetNode: NodeType {
   let token: Token?
 
   class func parse(_ parser: TokenParser, token: Token) throws -> NodeType {
-    let components = token.components()
+    let components = token.components
     guard components.count <= 3 else {
       throw TemplateSyntaxError(
         """

Tests/StencilSwiftKitTests/MacroNodeTests.swift

@@ -90,7 +90,7 @@ class MacroNodeTests: XCTestCase {
 
   func testContextModification() throws {
     let node = MacroNode(variableName: "myFunc", parameters: [], nodes: [TextNode(text: "hello")])
-    let context = Context(dictionary: [:])
+    let context = Context(dictionary: ["": ""])
     _ = try node.render(context)
 
     guard let block = context["myFunc"] as? CallableBlock else {
@@ -104,7 +104,7 @@ class MacroNodeTests: XCTestCase {
 
   func testContextModificationWithParameters() throws {
     let node = MacroNode(variableName: "myFunc", parameters: ["a", "b", "c"], nodes: [TextNode(text: "hello")])
-    let context = Context(dictionary: [:])
+    let context = Context(dictionary: ["":""])
     _ = try node.render(context)
 
     guard let block = context["myFunc"] as? CallableBlock else {
@@ -130,8 +130,8 @@ class MacroNodeTests: XCTestCase {
   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 environment = stencilSwiftEnvironment()
+    let arguments = try [FilterExpression(token: "greet|uppercase", environment: environment)]
     let context = Context(dictionary: ["greet": "hello"])
 
     let result = try block.context(context, arguments: arguments, variable: Variable("myFunc"))

Tests/StencilSwiftKitTests/SetNodeTests.swift

@@ -114,7 +114,7 @@ class SetNodeTests: XCTestCase {
 
   func testContextModification() throws {
     // start empty
-    let context = Context(dictionary: [:])
+    let context = Context(dictionary: ["": ""])
     XCTAssertNil(context["a"])
     XCTAssertNil(context["b"])
     XCTAssertNil(context["c"])
@@ -272,8 +272,8 @@ class SetNodeTests: XCTestCase {
   func testSetWithFilterExpressionParameter() throws {
     let context = Context(dictionary: ["greet": "hello"])
 
-    let parser = TokenParser(tokens: [], environment: stencilSwiftEnvironment())
-    let argument = try FilterExpression(token: "greet|uppercase", parser: parser)
+    let environment = stencilSwiftEnvironment()
+    let argument = try FilterExpression(token: "greet|uppercase", environment: environment)
     let node = SetNode(variableName: "a", content: .reference(resolvable: argument))
 
     _ = try node.render(context)