Merge pull request #35 from jseibert/swift-4.1

Swift 4.1 Support

Author: paulofaria

.swift-version

@@ -1 +1 @@
-4.0
+4.1

.travis.yml

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

Package.resolved

@@ -1,5 +1,20 @@
+// swift-tools-version:4.0
 import PackageDescription
 
 let package = Package(
-    name: "GraphQL"
+    name: "GraphQL",
+
+    products: [
+        .library(name: "GraphQL", targets: ["GraphQL"]),
+    ],
+
+    dependencies: [
+        .package(url: "https://github.com/wickwirew/Runtime.git", from: "0.4.0"),
+    ],
+
+    targets: [
+        .target(name: "GraphQL", dependencies: ["Runtime"]),
+
+        .testTarget(name: "GraphQLTests", dependencies: ["GraphQL"]),
+    ]
 )

Package.swift

@@ -28,7 +28,7 @@ func highlightSourceAtLocation(source: Source, location: SourceLocation) -> Stri
     let prevLineNum = (line - 1).description
     let lineNum = line.description
     let nextLineNum = (line + 1).description
-    let padLength = nextLineNum.characters.count
+    let padLength = nextLineNum.count
 
     let lines = splitLines(string: source.body)
 
@@ -73,5 +73,5 @@ func splitLines(string: String) -> [String] {
 }
 
 func leftpad(_ length: Int, _ string: String) -> String {
-    return String(repeating: " ", count: max(length - string.characters.count + 1, 0)) + string
+    return String(repeating: " ", count: max(length - string.count + 1, 0)) + string
 }

Sources/GraphQL/Error/SyntaxError.swift

@@ -1,4 +1,5 @@
 import Dispatch
+import Runtime
 
 /**
  * Terminology
@@ -1128,7 +1129,12 @@ func defaultResolve(source: Any, args: Map, context: Any, info: GraphQLResolveIn
     }
 
     // TODO: check why Reflection fails
-    guard let value = try? get(info.fieldName, from: s) else {
+    guard let typeInfo = try? typeInfo(of: type(of: s)),
+        let property = try? typeInfo.property(named: info.fieldName) else {
+        return nil
+    }
+    
+    guard let value = try? property.get(from: s) else {
         return nil
     }
 

Sources/GraphQL/Execution/Execute.swift

@@ -39,7 +39,7 @@ extension Map {
         func escape(_ source: String) -> String {
             var string = "\""
 
-            for character in source.characters {
+            for character in source {
                 if let escapedSymbol = escapeMapping[character] {
                     string.append(escapedSymbol)
                 } else {

Sources/GraphQL/Map/MapCustomStringConvertible.swift

@@ -1,20 +1,30 @@
+import Runtime
+
+enum RuntimeReflectionError: Error {
+    case requiredValueMissing(key: String)
+}
+
 extension MapInitializable {
     public init(map: Map) throws {
         guard case .dictionary(let dictionary) = map else {
             throw MapError.cannotInitialize(type: Self.self, from: try type(of: map.get()))
         }
-        self = try construct { property in
+        
+        self = try createInstance()
+        let info = try typeInfo(of: Self.self)
+        
+        for property in info.properties {
             guard let initializable = property.type as? MapInitializable.Type else {
                 throw MapError.notMapInitializable(property.type)
             }
-            switch dictionary[property.key] ?? .null {
+            switch dictionary[property.name] ?? .null {
             case .null:
                 guard let expressibleByNilLiteral = property.type as? ExpressibleByNilLiteral.Type else {
-                    throw ReflectionError.requiredValueMissing(key: property.key)
+                    throw RuntimeReflectionError.requiredValueMissing(key: property.name)
                 }
-                return expressibleByNilLiteral.init(nilLiteral: ())
+                try property.set(value: expressibleByNilLiteral.init(nilLiteral: ()), on: &self)
             case let x:
-                return try initializable.init(map: x)
+                try property.set(value: initializable.init(map: x), on: &self)
             }
         }
     }

Sources/GraphQL/Map/MapInitializable.swift

@@ -1,3 +1,5 @@
+import Runtime
+
 public func map(from value: Any?) throws -> Map {
     guard let value = value else {
         return .null
@@ -10,13 +12,14 @@ public func map(from value: Any?) throws -> Map {
     if let mapFallibleRepresentable = value as? MapFallibleRepresentable {
         return try mapFallibleRepresentable.asMap()
     }
-
-    let props = try properties(value)
+    
+    let info = try typeInfo(of: type(of: value))
+    let props = info.properties
 
     var dictionary = [String: Map](minimumCapacity: props.count)
 
     for property in props {
-        dictionary[property.key] = try map(from: property.value)
+        dictionary[property.name] = try map(from: property.get(from: value))
     }
 
     return .dictionary(dictionary)
@@ -31,20 +34,22 @@ public func assertMappable(_ type: Any.Type) throws {
         return
     }
 
-    for property in try properties(type) {
+    let info = try typeInfo(of: type)
+    for property in info.properties {
         try assertMappable(property.type)
     }
 }
 
 extension MapFallibleRepresentable {
     public func asMap() throws -> Map {
-        let props = try properties(self)
+        let info = try typeInfo(of: type(of: self))
+        let props = info.properties
         var dictionary = [String: Map](minimumCapacity: props.count)
         for property in props {
-            guard let representable = property.value as? MapFallibleRepresentable else {
-                throw MapError.notMapRepresentable(type(of: property.value))
+            guard let representable = try property.get(from: self) as? MapFallibleRepresentable else {
+                throw MapError.notMapRepresentable(property.type)
             }
-            dictionary[property.key] = try representable.asMap()
+            dictionary[property.name] = try representable.asMap()
         }
         return .dictionary(dictionary)
     }