fix: add new keyword support and fix build (#132)

* fix: add all keywords

* fix: issue template

* fix: lint

* chore: update lint command

Author: insanoid

.github/ISSUE_TEMPLATE.yml .github/ISSUE_TEMPLATE.github/ISSUE_TEMPLATE.yml renamed to .github/ISSUE_TEMPLATE

@@ -50,14 +50,37 @@ struct NameGenerator {
     /// - Parameter currentName: The current name which has to be checked.
     /// - Returns: New name for the variable.
     static func replaceKeywords(_ currentName: String) -> String {
-        let keywordsWithReplacements = [
-            "description": "descriptionValue",
-            "class": "classProperty",
-            "struct": "structProperty",
-            "enum": "enumProperty",
-            "internal": "internalProperty",
-            "default": "defaultValue",
-        ]
+        
+        /// Swift keywords from https://docs.swift.org/swift-book/ReferenceManual/LexicalStructure.html#ID413 as of 2020-10-10
+        /// Does not include the "sometimes" keywords
+        /// Thanks to a PR from @TheMadBug.
+        let swiftKeywords: Set = [
+                "associatedtype", "class", "deinit",
+                "enum", "extension", "fileprivate",
+                "func", "import", "init",
+                "inout", "internal", "let",
+                "open", "operator", "private",
+                "protocol", "public", "rethrows",
+                "static", "struct", "subscript",
+                "typealias", "var",
+                "break", "case", "continue",
+                "default", "defer", "do",
+                "else", "fallthrough", "for",
+                "guard", "if", "in",
+                "repeat", "return", "switch",
+                "where", "while",
+                "as", "Any", "catch",
+                "false", "is", "nil",
+                "super", "self", "Self",
+                "throw", "throws", "true",
+                "try"
+            ]
+        
+        var keywordsWithReplacements: [String: String] = [:]
+        for keyword in swiftKeywords {
+            keywordsWithReplacements[keyword] = "\(keyword)Value"
+        }
+        
         if let value = keywordsWithReplacements[currentName] {
             return value
         }

.github/ISSUE_TEMPLATE/feature_request.md

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -442,6 +442,7 @@
 		};
 		935F7E4722F3852E0003F787 /* Swiftlint */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 12;
 			files = (
 			);
@@ -456,7 +457,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if which swiftlint >/dev/null; then\nswiftlint autocorrect --config .swiftlint.yml\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
+			shellScript = "if which swiftlint >/dev/null; then\nswiftlint lint --autocorrect --config .swiftlint.yml\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
 		};
 		937D9DF122E8962F00A83D84 /* Swiftformat */ = {
 			isa = PBXShellScriptBuildPhase;

Core/Generator/NameGenerator.swift

@@ -39,8 +39,8 @@ class ModelGeneratorTests: XCTestCase {
                      "double_value": Double(5.3),
                      "sub_value_four": "value",
                      "internal": "renamed_value",
-                     "sub_value_five": ["two_level_down": "value"],
-                 ],
+                     "sub_value_five": ["two_level_down": "value"]
+                 ]
              ],
              "value_eight": []])
     }