Merge branch 'release/1.0.1'

Author: bbriatte

Sources/PolymorphCore/Models.swift

@@ -77,7 +77,7 @@ public class Models: Documentable, Codable {
 
     @discardableResult
     public func removeClass(uuid: UUID) -> Bool {
-        guard self.classes[uuid] == nil else {
+        guard self.classes[uuid] != nil else {
             return false
         }
         self.classes[uuid] = nil
@@ -109,7 +109,7 @@ public class Models: Documentable, Codable {
 
     @discardableResult
     public func removeEnum(uuid: UUID) -> Bool {
-        guard self.enums[uuid] == nil else {
+        guard self.enums[uuid] != nil else {
             return false
         }
         self.enums[uuid] = nil

Sources/PolymorphCore/NativeFactory.swift

@@ -25,7 +25,7 @@ internal class NativeFactory {
         var idx = 1
         var natives = [UUID: Native]()
         NativeFactory.dataTypes.forEach {
-            guard let uuid = UUID(uuidString: "NATIVEID-0000-0000-0000-\(String(format: "%012d", idx))") else {
+            guard let uuid = UUID(uuidString: "00000001-0000-0000-0000-\(String(format: "%012d", idx))") else {
                 return
             }
             let native = Native(type: $0)

Sources/PolymorphCore/Project.swift

@@ -81,29 +81,29 @@ public class Project: Packageable, Documentable {
 
     // MARK Natives
 
-    public func findNative(type: Native.DataType) -> Native? {
-        return self.natives.first { $0.value.name == type.rawValue }?.value
+    public func findNative(type: Native.DataType) -> UUID? {
+        return self.natives.first { $0.value.name == type.rawValue }?.key
     }
 
-    public func findNative(name: String) -> Native? {
+    public func findNative(name: String) -> UUID? {
         guard let dataType = Native.DataType.from(string: name) else {
             return nil
         }
         return self.findNative(type: dataType)
     }
 
-    public func searchNatives(matching: String) -> [Native] {
-        return self.natives.values.filter { $0.name.range(of: matching, options: .caseInsensitive) != nil }
+    public func searchNatives(matching: String) -> [UUID: Native] {
+        return self.natives.filter {  $0.value.name.range(of: matching, options: .caseInsensitive) != nil }
     }
 
     // MARK Transformers
 
-    public func findTransformer(name: String) -> Transformer? {
-        return self.transformers.first { $0.value.name == name }?.value
+    public func findTransformer(name: String) -> UUID? {
+        return self.transformers.first { $0.value.name == name }?.key
     }
 
-    public func searchTransformers(matching: String) -> [Transformer] {
-        return self.transformers.values.filter { $0.name.range(of: matching, options: .caseInsensitive) != nil }
+    public func searchTransformers(matching: String) -> [UUID: Transformer] {
+        return self.transformers.filter { $0.value.name.range(of: matching, options: .caseInsensitive) != nil }
     }
 
 }

Sources/PolymorphCore/Property.swift

@@ -14,15 +14,15 @@ public class Property: Member, Documentable, Codable {
         public struct TransformerConfiguration: Codable {
 
             enum CodingKeys: String, CodingKey {
-                case transformer
+                case id
                 case options
             }
 
-            public var transformer: UUID
+            public var id: UUID
             public var options: [Transformer.Option]
 
-            public init(transformer: UUID, options: [Transformer.Option] = []) {
-                self.transformer = transformer
+            public init(id: UUID, options: [Transformer.Option] = []) {
+                self.id = id
                 self.options = options
             }
         }
@@ -62,6 +62,7 @@ public class Property: Member, Documentable, Codable {
         case isNonnull
         case isConst
         case isTransient
+        case defaultValue
     }
 
     // MARK: Properties
@@ -84,6 +85,8 @@ public class Property: Member, Documentable, Codable {
 
     public var isTransient: Bool = false
 
+    public var defaultValue: String?
+
     public internal(set) weak var project: Project? = nil
 
     // MARK: Initializers

Sources/PolymorphCore/Transformer.swift

@@ -24,7 +24,7 @@ public class Transformer: Member {
         public init(name: String, required: Bool = false, value: String? = nil) {
             self.name = name
             self.required = required
-            self.value = nil
+            self.value = value
         }
 
         public func update(_ value: String?) -> Option {

Sources/PolymorphCore/TransformerFactory.swift

@@ -14,13 +14,12 @@ internal class TransformerFactory {
             Transformer(name: "timestamp"),
             Transformer(name: "date", options: [
                 .init(name: "format", required: true, value: "yyyy-MM-dd'T'HH:mm:ssZZZ")
-            ]),
-            Transformer(name: "base64")
+            ])
         ]
         var idx = 1
         var result = [UUID: Transformer]()
         transformers.forEach {
-            guard let uuid = UUID(uuidString: "TRANSID0-0000-0000-0000-\(String(format: "%012d", idx))") else {
+            guard let uuid = UUID(uuidString: "00000002-0000-0000-0000-\(String(format: "%012d", idx))") else {
                 return
             }
             $0.project = project