Merge remote-tracking branch 'upstream/master'

Author: sportlabsMike

.swift-version

@@ -1 +1 @@
-3.1
+4.0

.travis.yml

@@ -5,7 +5,7 @@ matrix:
   include:
     - os: osx
       env: JOB=SwiftPM_OSX
-      osx_image: xcode8.3
+      osx_image: xcode9
     - os: linux
       env: JOB=SwiftPM_linux
       dist: trusty

README.md

@@ -138,7 +138,7 @@ The following strategies are available:
 
 This project is released under the MIT license. See [LICENSE](LICENSE) for details.
 
-[swift-badge]: https://img.shields.io/badge/Swift-3.0-orange.svg?style=flat
+[swift-badge]: https://img.shields.io/badge/Swift-4-orange.svg?style=flat
 [swift-url]: https://swift.org
 [mit-badge]: https://img.shields.io/badge/License-MIT-blue.svg?style=flat
 [mit-url]: https://tldrlegal.com/license/mit-license

Sources/GraphQL/Instrumentation/Instrumentation.swift

@@ -1,3 +1,4 @@
+import Foundation
 import Dispatch
 
 /// Provides the capability to instrument the execution steps of a GraphQL query.
@@ -62,7 +63,11 @@ extension Instrumentation {
 }
 
 func threadId() -> Int {
-    return Int(pthread_mach_thread_np(pthread_self()))
+    #if os(Linux)
+        return Int(pthread_self())
+    #else
+        return Int(pthread_mach_thread_np(pthread_self()))
+    #endif
 }
 
 func processId() -> Int {

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 {