Remove deprecated variables

SwiftGen · May 11, 2017 · fcdd1bc · fcdd1bc
2 parents a2fe0c0 + 6757b39
commit fcdd1bc
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 94 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,7 +10,9 @@ _None_
 
 ### Breaking Changes
 
-_None_
+* Removed deprecated variables. See [SwiftGenKit#5](https://github.com/SwiftGen/SwiftGenKit/issues/5) for more information.   
+  [David Jennes](https://github.com/djbe)
+  [#35](https://github.com/SwiftGen/templates/issues/35)
 
 ### New Features
 

diff --git a/Sources/Stencil/AssetsCatalogContext.swift b/Sources/Stencil/AssetsCatalogContext.swift
@@ -19,39 +19,18 @@ import Foundation
 */
 extension AssetsCatalogParser {
   public func stencilContext(enumName: String = "Asset") -> [String: Any] {
-    let images = catalogs.flatMap { justValues(entries: $1) }.sorted(by: <)
-    let structured = catalogs.keys.sorted(by: <).map { name -> [String: Any] in
+    let catalogs = self.catalogs.keys.sorted(by: <).map { name -> [String: Any] in
       return [
         "name": name,
-        "assets": structure(entries: catalogs[name] ?? [])
+        "assets": structure(entries: self.catalogs[name] ?? [])
       ]
     }
 
     return [
-      "catalogs": structured,
-
-      // NOTE: This is a deprecated variable
-      "enumName": enumName,
-      "images": images,
-      "param": ["enumName": enumName]
+      "catalogs": catalogs
     ]
   }
 
-  private func justValues(entries: [Entry]) -> [String] {
-    var result = [String]()
-
-    for entry in entries {
-      switch entry {
-      case let .group(name: _, items: items):
-        result += justValues(entries: items)
-      case let .image(name: _, value: value):
-        result += [value]
-      }
-    }
-
-    return result
-  }
-
   private func structure(entries: [Entry]) -> [[String: Any]] {
     return entries.map { entry in
       switch entry {

diff --git a/Sources/Stencil/ColorsContext.swift b/Sources/Stencil/ColorsContext.swift
@@ -27,20 +27,12 @@ extension ColorsFileParser {
         "red": comps[0],
         "green": comps[1],
         "blue": comps[2],
-        "alpha": comps[3],
-
-        // NOTE: This is a deprecated variable
-        "rgba": String(hexChars[0..<8]),
-        "rgb": String(hexChars[0..<6])
+        "alpha": comps[3]
       ]
     }).sorted { $0["name"] ?? "" < $1["name"] ?? "" }
 
     return [
-      "colors": colorMap,
-
-      // NOTE: This is a deprecated variable
-      "enumName": enumName,
-      "param": ["enumName": enumName]
+      "colors": colorMap
     ]
   }
 }
diff --git a/Sources/Stencil/FontsContext.swift b/Sources/Stencil/FontsContext.swift
@@ -24,12 +24,9 @@ extension FontsFileParser {
         return [
           "name": font.postScriptName,
           "path": font.filePath,
-          "style": font.style,
-
-          // NOTE: This is a deprecated variable
-          "fontName": font.postScriptName
+          "style": font.style
         ]
-      }.sorted { $0["fontName"] ?? "" < $1["fontName"] ?? "" }
+      }.sorted { $0["name"] ?? "" < $1["name"] ?? "" }
       // Family
       return [
         "name": name,
@@ -38,11 +35,7 @@ extension FontsFileParser {
     }.sorted { $0["name"] as? String ?? "" < $1["name"] as? String ?? "" }
 
     return [
-      "families": families,
-
-      // NOTE: This is a deprecated variable
-      "enumName": enumName,
-      "param": ["enumName": enumName]
+      "families": families
     ]
   }
 }
diff --git a/Sources/Stencil/StoryboardsContext.swift b/Sources/Stencil/StoryboardsContext.swift
@@ -59,16 +59,7 @@ extension StoryboardParser {
     }
     return [
       "modules": modules.sorted(),
-      "storyboards": storyboardsMap,
-
-      // NOTE: This is a deprecated variable
-      "extraImports": modules.sorted(),
-      "param": [
-        "sceneEnumName": sceneEnumName,
-        "segueEnumName": segueEnumName
-      ],
-      "sceneEnumName": sceneEnumName,
-      "segueEnumName": segueEnumName
+      "storyboards": storyboardsMap
     ]
   }
 
@@ -80,10 +71,7 @@ extension StoryboardParser {
       ]
     } else {
       return [
-        "baseType": uppercaseFirst(scene.tag),
-
-        // NOTE: This is a deprecated variable
-        "isBaseViewController": scene.tag == "viewController"
+        "baseType": uppercaseFirst(scene.tag)
       ]
     }
   }
@@ -98,10 +86,7 @@ extension StoryboardParser {
     } else if scene.tag == "viewController" {
       return [
         "identifier": scene.storyboardID,
-        "baseType": uppercaseFirst(scene.tag),
-
-        // NOTE: This is a deprecated variable
-        "isBaseViewController": scene.tag == "viewController"
+        "baseType": uppercaseFirst(scene.tag)
       ]
     } else {
       return [

diff --git a/Sources/Stencil/StringsContext.swift b/Sources/Stencil/StringsContext.swift
@@ -32,38 +32,21 @@ extension StringsFileParser {
   public func stencilContext(enumName: String = "L10n", tableName: String = "Localizable") -> [String: Any] {
 
     let entryToStringMapper = { (entry: Entry, keyPath: [String]) -> [String: Any] in
-      var keyStructure = entry.keyStructure
-      Array(0..<keyPath.count).forEach { _ in keyStructure.removeFirst() }
-      let levelName = keyStructure.joined(separator: ".")
+      let levelName = entry.keyStructure.last ?? ""
 
       var result: [String: Any] = [
         "name": levelName,
         "key": entry.key.newlineEscaped,
-        "translation": entry.translation.newlineEscaped,
-
-        // NOTE: keytail is deprecated
-        "keytail": levelName
+        "translation": entry.translation.newlineEscaped
       ]
 
       if entry.types.count > 0 {
         result["types"] = entry.types.map { $0.rawValue }
-
-        // NOTE: params is deprecated
-        result["params"] = [
-          "types": entry.types.map { $0.rawValue },
-          "count": entry.types.count,
-          "declarations": entry.types.indices.map { "let p\($0)" },
-          "names": entry.types.indices.map { "p\($0)" },
-          "typednames": entry.types.enumerated().map { "p\($0): \($1.rawValue)" }
-        ]
       }
 
       return result
     }
 
-    let strings = entries
-      .sorted { $0.key.caseInsensitiveCompare($1.key) == .orderedAscending }
-      .map { entryToStringMapper($0, []) }
     let structuredStrings = structure(
       entries: entries,
       usingMapper: entryToStringMapper
@@ -74,14 +57,7 @@ extension StringsFileParser {
     ]]
 
     return [
-      "tables": tables,
-
-      // NOTE: These are deprecated variables
-      "enumName": enumName,
-      "param": ["enumName": enumName],
-      "strings": strings,
-      "structuredStrings": structuredStrings,
-      "tableName": tableName
+      "tables": tables
     ]
   }
 
@@ -139,9 +115,6 @@ extension StringsFileParser {
 
     if !children.isEmpty {
       structuredStrings["children"] = children
-
-      // NOTE: These are deprecated variables
-      structuredStrings["subenums"] = children
     }
 
     return structuredStrings

diff --git a/Tests/Resources b/Tests/Resources