Adopt Reflection 0.15.0

Author: jseibert

Sources/GraphQL/Reflection/Advance.swift

@@ -6,25 +6,32 @@
 //
 //
 
-public protocol AnyExtensions {}
+protocol AnyExtensions {}
 
-public extension AnyExtensions {
+extension AnyExtensions {
 
     static func construct(constructor: (Property.Description) throws -> Any) throws -> Any {
-        return try GraphQL.construct(self, constructor: constructor)
+        return try GraphQL.constructGenericType(self, constructor: constructor)
     }
 
-    static func construct(dictionary: [String: Any]) throws -> Any {
-        return try GraphQL.construct(self, dictionary: dictionary)
+    static func isValueTypeOrSubtype(_ value: Any) -> Bool {
+        return value is Self
     }
 
-    func write(to pointer: UnsafeMutableRawPointer) {
-        pointer.assumingMemoryBound(to: type(of: self)).initialize(to: self)
+    static func value(from storage: UnsafeRawPointer) -> Any {
+        return storage.assumingMemoryBound(to: self).pointee
+    }
+    
+    static func write(_ value: Any, to storage: UnsafeMutableRawPointer) throws {
+        guard let this = value as? Self else {
+            throw ReflectionError.valueIsNotType(value: value, type: self)
+        }
+        storage.assumingMemoryBound(to: self).initialize(to: this)
     }
 
 }
 
-public func extensions(of type: Any.Type) -> AnyExtensions.Type {
+func extensions(of type: Any.Type) -> AnyExtensions.Type {
     struct Extensions : AnyExtensions {}
     var extensions: AnyExtensions.Type = Extensions.self
     withUnsafePointer(to: &extensions) { pointer in
@@ -33,7 +40,7 @@ public func extensions(of type: Any.Type) -> AnyExtensions.Type {
     return extensions
 }
 
-public func extensions(of value: Any) -> AnyExtensions {
+func extensions(of value: Any) -> AnyExtensions {
     struct Extensions : AnyExtensions {}
     var extensions: AnyExtensions = Extensions()
     withUnsafePointer(to: &extensions) { pointer in

Sources/GraphQL/Reflection/Any+Extensions.swift

@@ -1,5 +1,9 @@
 /// Create a struct with a constructor method. Return a value of `property.type` for each property.
 public func construct<T>(_ type: T.Type = T.self, constructor: (Property.Description) throws -> Any) throws -> T {
+    return try constructGenericType(constructor: constructor)
+}
+
+func constructGenericType<T>(_ type: T.Type = T.self, constructor: (Property.Description) throws -> Any) throws -> T {
     if Metadata(type: T.self)?.kind == .struct {
         return try constructValueType(constructor)
     } else {
@@ -22,22 +26,29 @@ private func constructValueType<T>(_ constructor: (Property.Description) throws
 }
 
 private func constructType(storage: UnsafeMutableRawPointer, values: inout [Any], properties: [Property.Description], constructor: (Property.Description) throws -> Any) throws {
+    var errors = [Error]()
     for property in properties {
-        let value = try constructor(property)
-        guard GraphQL.value(value, is: property.type) else { throw ReflectionError.valueIsNotType(value: value, type: property.type) }
-        values.append(value)
-        extensions(of: value).write(to: storage.advanced(by: property.offset))
+        do {
+            let value = try constructor(property)
+            values.append(value)
+            try property.write(value, to: storage)
+        } catch {
+            errors.append(error)
+        }
+    }
+    if errors.count > 0 {
+        throw ConstructionErrors(errors: errors)
     }
 }
 
 /// Create a struct from a dictionary.
 public func construct<T>(_ type: T.Type = T.self, dictionary: [String: Any]) throws -> T {
-    return try construct(constructor: constructorForDictionary(dictionary))
+    return try constructGenericType(constructor: constructorForDictionary(dictionary))
 }
 
 /// Create a struct from a dictionary.
 public func construct(_ type: Any.Type, dictionary: [String: Any]) throws -> Any {
-    return try extensions(of: type).construct(dictionary: dictionary)
+    return try construct(type, constructor: constructorForDictionary(dictionary))
 }
 
 private func constructorForDictionary(_ dictionary: [String: Any]) -> (Property.Description) throws -> Any {

Sources/GraphQL/Reflection/AnyExistentialContainer.swift

@@ -1,11 +1,9 @@
 /// Get value for key from instance
 public func get(_ key: String, from instance: Any) throws -> Any {
-    for property in try properties(instance) {
-        if property.key == key {
-            return property.value
-        }
+    guard let value = try properties(instance).first(where: { $0.key == key })?.value else {
+        throw ReflectionError.instanceHasNoKey(type: type(of: instance), key: key)
     }
-    throw ReflectionError.instanceHasNoKey(type: type(of: instance), key: key)
+    return value
 }
 
 /// Get value for key from instance as type `T`

Sources/GraphQL/Reflection/Array+Extensions.swift

@@ -1,18 +1,6 @@
 /// Tests if `value` is `type` or a subclass of `type`
 public func value(_ value: Any, is type: Any.Type) -> Bool {
-    if Swift.type(of: value) == type {
-        return true
-    }
-    guard var subclass = Metadata.Class(type: Swift.type(of: value)), let superclass = Metadata.Class(type: type) else {
-        return false
-    }
-    while let parentClass = subclass.superclass {
-        if parentClass == superclass {
-            return true
-        }
-        subclass = parentClass
-    }
-    return false
+    return extensions(of: type).isValueTypeOrSubtype(value)
 }
 
 /// Tests equality of any two existential types

Sources/GraphQL/Reflection/Buffer.swift

@@ -12,6 +12,14 @@ extension Metadata {
             guard let superclass = pointer.pointee.superclass else { return nil }
             return Metadata.Class(type: superclass)
         }
+        
+        func properties() throws -> [Property.Description] {
+            let properties = try fetchAndSaveProperties(nominalType: self, hashedType: HashedType(pointer))
+            guard let superclass = superclass, String(describing: unsafeBitCast(superclass.pointer, to: Any.Type.self)) != "SwiftObject" else {
+                return properties
+            }
+            return try superclass.properties() + properties
+        }
 
     }
 }