fix issues with generated files

Author: insanoid

Core/Generator/FileGeneratorExtension.swift

@@ -31,6 +31,11 @@ extension FileGenerator {
         content = content.replacingOccurrences(of: "{DECLARATION}", with: declarations)
         content = content.replacingOccurrences(of: "{INITIALIZER}", with: initialisers)
 
+        if modelFile.type == .classType {
+            content = content.replacingOccurrences(of: "{REQUIRED}", with: "required ")
+        } else {
+            content = content.replacingOccurrences(of: "{REQUIRED}", with: "")
+        }
         return content
     }
 

Core/Generator/Model-File-Components/SwiftJSONModelFile.swift

@@ -100,7 +100,8 @@ struct SwiftJSONModelFile: ModelFile {
         if isArray {
             variableType = "[\(type)]"
         }
+        let component = constantName.components(separatedBy: ".")
         let decodeMethod = isOptional ? "decodeIfPresent" : "decode"
-        return "\(name) = try container.\(decodeMethod)(\(variableType).self, forKey: .\(constantName))"
+        return "\(name) = try container.\(decodeMethod)(\(variableType).self, forKey: .\(component.last!))"
     }
 }

Core/Template/BaseTemplate.txt

@@ -9,13 +9,13 @@ import Foundation
 
 {OBJECT_KIND} {OBJECT_NAME}: Codable {
 
-  enum CodingKeys: CodingKey {
+  enum CodingKeys: String, CodingKey {
 {STRING_CONSTANT}
   }
 
 {DECLARATION}
 
-  init(from decoder: Decoder) throws {
+  {REQUIRED}init(from decoder: Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
 {INITIALIZER}
   }

SwiftyJSONAccelerator/Support/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.0</string>
 	<key>CFBundleVersion</key>
-	<string>12</string>
+	<string>13</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.developer-tools</string>
 	<key>LSMinimumSystemVersion</key>