Merge pull request #94 from insanoid/swift-5

Swift 5

Author: insanoid

.gitmodules

@@ -0,0 +1 @@
+5.0

.slather.yml

@@ -0,0 +1,38 @@
+# file options
+
+--exclude Tests/XCTestManifests.swift,Snapshots 
+
+# format options
+
+--allman false
+--binarygrouping 4,8
+--commas always
+--comments indent
+--decimalgrouping 3,6
+--elseposition same-line
+--empty void
+--exponentcase lowercase
+--exponentgrouping disabled
+--fractiongrouping disabled
+--header ignore
+--hexgrouping 4,8
+--hexliteralcase uppercase
+--ifdef indent
+--indent 4
+--indentcase false
+--importgrouping testable-bottom
+--linebreaks lf
+--octalgrouping 4,8
+--operatorfunc spaced
+--patternlet hoist
+--ranges spaced
+--self remove
+--semicolons inline
+--stripunusedargs always
+--trimwhitespace always
+--wraparguments preserve
+--wrapcollections preserve
+
+# rules
+
+--enable isEmpty

.swift-version

@@ -0,0 +1,7 @@
+disabled_rules: # rule identifiers to exclude from running
+  - line_length
+  - function_body_length
+  - unused_closure_parameter
+  - valid_docs
+  - large_tuple
+  - identifier_name

.swiftformat

@@ -2,73 +2,55 @@
 //  Constants.swift
 //  SwiftyJSONAccelerator
 //
-//  Created by Karthikeya Udupa on 01/06/16.
-//  Copyright © 2016 Karthikeya Udupa K M. All rights reserved.
+//  Created by Karthikeya Udupa on 24/07/2019.
+//  Copyright © 2019 Karthikeya Udupa. All rights reserved.
 //
 
 import Foundation
 
-/**
- Various supported variable types
-
- - String:       String.
- - Int:          Integer.
- - Float:        Float.
- - Double: 		 Double.
- - Bool:         Boolean.
- - Array:        Array.
- - Object:       Object.
- */
+/// Various supported variable types
 enum VariableType: String {
-  case string = "String"
-  case int = "Int"
-  case float = "Float"
-  case double = "Double"
-  case bool = "Bool"
-  case array = "[]"
-  case object = "{OBJ}"
-  case null = "Any"
+    case string = "String"
+    case int = "Int"
+    case float = "Float"
+    case double = "Double"
+    case bool = "Bool"
+    case array = "[]"
+    case object = "{OBJ}"
+    case null = "Any"
 }
 
-/**
- Various types of construct that can be generated.
-
- - classType:  Model with construct type class.
- - structType: Model with construct type struct.
- */
+/// Various types of construct that can be generated.
+///
+/// - classType:  Model with construct type class.
+/// - structType: Model with construct type struct.
 enum ConstructType: String {
-  case classType = "class"
-  case structType = "struct"
+    case classType = "class"
+    case structType = "struct"
 }
 
-/**
- List of supported mapping libraries.
-
- - SwiftyJSON:   SwiftyJSON - https://github.com/SwiftyJSON/SwiftyJSON
- - ObjectMapper: ObjectMapper - https://github.com/Hearst-DD/ObjectMapper
- - Marshal: Marshal - https://github.com/utahiosmac/Marshal
- */
-enum JSONMappingLibrary: String {
-  case libSwiftyJSON = "SwiftyJSON"
-  case libObjectMapper = "ObjectMapper"
-  case libMarshal = "Marshal"
+/// JSON mapping options available in the UI
+///
+/// - Swift: Pure Swift 5 Codeable
+/// - SwiftCodeExtended: Codeextended along with Swift 5 - https://github.com/JohnSundell/Codextended
+enum JSONMappingMethod: String {
+    case Swift = "SwiftCodingVanilla"
+    case SwiftCodeExtended
 }
 
-/**
- Types of property.
-
- - Value:       Value type like String, Integer, Float etc.
- - ValueArray:  Array of Value
- - Object:      Object type
- - ObjectArray: Array of object
- - emptyArray:  An empty array
- - Null:        Null value
- */
+/// Types of property.
+///
+/// - Value: Value type like String, Integer, Float etc.
+/// - ValueArray: Array of Value
+/// - Object: Object type
+/// - ObjectArray: Array of object
+/// - emptyArray: An empty array
+/// - Null: Null value
 enum PropertyType: String {
-  case valueType
-  case valueTypeArray
-  case objectType
-  case objectTypeArray
-  case emptyArray
-  case nullType
+    case valueType
+    case valueTypeArray
+    case objectType
+    case objectTypeArray
+    case emptyArray
+    case nullType
 }

.swiftlint

@@ -9,23 +9,18 @@
 import Foundation
 
 struct FileGenerator {
-
-    /**
-   Fetch the template for creating model.swift files.
-
-   - parameter filename: Name of the file to be loaded
-
-   - returns: String containing the template.
-   */
+    /// Fetch the template for creating model.swift files.
+    ///
+    /// - Parameter filename: Name of the file to be loaded
+    /// - Returns: String containing the template.
     static func loadFileWith(_ filename: String) -> String {
-
         let bundle = Bundle.main
         let path = bundle.path(forResource: filename, ofType: "txt")
 
         do {
-            let content = try String.init(contentsOfFile: path!)
+            let content = try String(contentsOfFile: path!)
             return content
-        } catch { }
+        } catch {}
 
         return ""
     }

.swiftlint.yml

@@ -0,0 +1,59 @@
+//
+//  FileGenerator.swift
+//  SwiftyJSONAccelerator
+//
+//  Created by Karthik on 27/12/2016.
+//  Copyright © 2016 Karthikeya Udupa K M. All rights reserved.
+//
+
+import Foundation
+
+extension FileGenerator {
+    static func generateFileContentWith(_ modelFile: ModelFile, configuration: ModelGenerationConfiguration) -> String {
+        var content = loadFileWith("BaseTemplate")
+        let singleTab = "  ", doubleTab = "    "
+        content = content.replacingOccurrences(of: "{OBJECT_NAME}", with: modelFile.fileName)
+        content = content.replacingOccurrences(of: "{DATE}", with: todayDateString())
+        content = content.replacingOccurrences(of: "{OBJECT_KIND}", with: modelFile.type.rawValue)
+
+        if let authorName = configuration.authorName {
+            content = content.replacingOccurrences(of: "__NAME__", with: authorName)
+        }
+        if let companyName = configuration.companyName {
+            content = content.replacingOccurrences(of: "__MyCompanyName__", with: companyName)
+        }
+
+        let stringConstants = modelFile.component.stringConstants.map { doubleTab + $0 }.joined(separator: "\n")
+        let declarations = modelFile.component.declarations.map { singleTab + $0 }.joined(separator: "\n")
+        let initialisers = modelFile.component.initialisers.map { doubleTab + $0 }.joined(separator: "\n")
+
+        content = content.replacingOccurrences(of: "{STRING_CONSTANT}", with: stringConstants)
+        content = content.replacingOccurrences(of: "{DECLARATION}", with: declarations)
+        content = content.replacingOccurrences(of: "{INITIALIZER}", with: initialisers)
+
+        return content
+    }
+
+    /**
+     Write the given content to a file at the mentioned path.
+
+     - parameter name:      The name of the file.
+     - parameter content:   Content that has to be written on the file.
+     - parameter path:      Path where the file has to be created.
+
+     - returns: Boolean indicating if the process was successful.
+     */
+    internal static func writeToFileWith(_ name: String, content: String, path: String) throws {
+        let filename = path.appendingFormat("%@", name + ".swift")
+        try FileManager.default.createDirectory(at: URL(fileURLWithPath: path),
+                                                withIntermediateDirectories: true,
+                                                attributes: nil)
+        try content.write(toFile: filename, atomically: true, encoding: String.Encoding.utf8)
+    }
+
+    fileprivate static func todayDateString() -> String {
+        let formatter = DateFormatter()
+        formatter.dateStyle = .short
+        return formatter.string(from: Date())
+    }
+}