swift-4 support

Author: Igor-Palaguta

Sources/GraphQL/Reflection/Identity.swift

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

Sources/GraphQL/Reflection/MetadataType.swift

@@ -14,7 +14,7 @@ extension MetadataType {
 
     init?(type: Any.Type) {
         self.init(pointer: unsafeBitCast(type, to: UnsafePointer<Int>.self))
-        if let kind = type(of: self).kind, kind != self.kind {
+        if let kind = Swift.type(of: self).kind, kind != self.kind {
             return nil
         }
     }

Sources/GraphQL/Reflection/ReflectionError.swift

@@ -12,7 +12,7 @@ public enum ReflectionError : Error, CustomStringConvertible {
     var caseDescription: String {
         switch self {
         case .notStruct(type: let type): return "\(type) is not a struct"
-        case .valueIsNotType(value: let value, type: let type): return "Cannot set value of type \(type(of: value)) as \(type)"
+        case .valueIsNotType(value: let value, type: let type): return "Cannot set value of type \(Swift.type(of: value)) as \(type)"
         case .instanceHasNoKey(type: let type, key: let key): return "Instance of type \(type) has no key \(key)"
         case .requiredValueMissing(key: let key): return "No value found for required key \"\(key)\" in dictionary"
         case .unexpected: return "An unexpected error hass occured"

Sources/GraphQL/Reflection/RelativePointer.swift

@@ -1,3 +1,24 @@
+
+#if swift(>=4)
+func relativePointer<T, U, V>(base: UnsafePointer<T>, offset: U) -> UnsafePointer<V> where U : BinaryInteger {
+    let p = UnsafeRawPointer(base).assumingMemoryBound(to: Int8.self)
+    return UnsafeRawPointer(p.advanced(by: Int(integer: offset))).assumingMemoryBound(to: V.self)
+}
+
+extension Int {
+    fileprivate init<T : BinaryInteger>(integer: T) {
+        switch integer {
+        case let value as Int: self = value
+        case let value as Int32: self = Int(value)
+        case let value as Int16: self = Int(value)
+        case let value as Int8: self = Int(value)
+        default: self = 0
+        }
+    }
+}
+
+#else
+
 func relativePointer<T, U, V>(base: UnsafePointer<T>, offset: U) -> UnsafePointer<V> where U : Integer {
     let p = UnsafeRawPointer(base).assumingMemoryBound(to: Int8.self)
     return UnsafeRawPointer(p.advanced(by: Int(integer: offset))).assumingMemoryBound(to: V.self)
@@ -14,3 +35,5 @@ extension Int {
         }
     }
 }
+
+#endif

Tests/GraphQLTests/FieldExecutionStrategyTests/FieldExecutionStrategyTests.swift

@@ -14,7 +14,7 @@ class FieldExecutionStrategyTests: XCTestCase {
             fields: [
                 "sleep": GraphQLField(
                     type: GraphQLString,
-                    resolve: { _ in
+                    resolve: { _, _, _, _ in
                         let g = DispatchGroup()
                         g.enter()
                         DispatchQueue.global().asyncAfter(wallDeadline: .now() + 0.1) {

Tests/GraphQLTests/HelloWorldTests/HelloWorldTests.swift

@@ -8,7 +8,7 @@ class HelloWorldTests : XCTestCase {
             fields: [
                 "hello": GraphQLField(
                     type: GraphQLString,
-                    resolve: { _ in "world" }
+                    resolve: { _, _, _, _ in "world" }
                 )
             ]
         )

Tests/GraphQLTests/PersistedQueriesTests/PersistedQueriesTests.swift

@@ -9,7 +9,7 @@ class PersistedQueriesTests: XCTestCase {
             fields: [
                 "hello": GraphQLField(
                     type: GraphQLString,
-                    resolve: { _ in "world" }
+                    resolve: { _, _, _, _ in "world" }
                 )
             ]
         )

Tests/GraphQLTests/StarWarsTests/StarWarsQueryTests.swift

@@ -487,15 +487,15 @@ class StarWarsQueryTests : XCTestCase {
             fields: [
                 "nullableA": GraphQLField(
                     type: GraphQLTypeReference("A"),
-                    resolve: { _ in [:] }
+                    resolve: { _, _, _, _ in [:] }
                 ),
                 "nonNullA": GraphQLField(
                     type: GraphQLNonNull(GraphQLTypeReference("A")),
-                    resolve: { _ in [:] }
+                    resolve: { _, _, _, _ in [:] }
                 ),
                 "throws": GraphQLField(
                     type: GraphQLNonNull(GraphQLString),
-                    resolve: { _ in
+                    resolve: { _, _, _, _ in
                         struct 🏃 : Error, CustomStringConvertible {
                             let description: String
                         }
@@ -511,7 +511,7 @@ class StarWarsQueryTests : XCTestCase {
             fields: [
                 "nullableA": GraphQLField(
                     type: A,
-                    resolve: { _ in [:] }
+                    resolve: { _, _, _, _ in [:] }
                 )
             ]
         )

Tests/GraphQLTests/StarWarsTests/StarWarsSchema.swift

@@ -175,7 +175,7 @@ let HumanType = try! GraphQLObjectType(
         "secretBackstory": GraphQLField(
             type: GraphQLString,
             description: "Where are they from and how they came to be who they are.",
-            resolve: { _ in
+            resolve: { _, _, _, _ in
                 struct Secret : Error, CustomStringConvertible {
                     let description: String
                 }
@@ -230,7 +230,7 @@ let DroidType = try! GraphQLObjectType(
         "secretBackstory": GraphQLField(
             type: GraphQLString,
             description: "Construction date and the name of the designer.",
-            resolve: { _ in
+            resolve: { _, _, _, _ in
                 struct Secret : Error, CustomStringConvertible {
                     let description: String
                 }