Merge pull request #15 from SportlabsTechnology/master

paulofaria · web-flow · commit 85d7117d10dc · 2018-04-10T08:00:25.000-03:00
Swift4.1 updates and switch to Runtime library
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0
+4.1
diff --git a/.travis.yml b/.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
@@ -16,4 +16,6 @@ script:
   - swift build -c release
   - swift build
   - swift test
-  - eval "$(curl -sL https://raw.githubusercontent.com/lgaches/swifttravisci/master/codecov)"
+  - 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+       eval "$(curl -sL https://raw.githubusercontent.com/lgaches/swifttravisci/master/codecov)";
+     fi'
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -1,8 +1,20 @@
+// swift-tools-version:4.0
 import PackageDescription
 
 let package = Package(
     name: "Graphiti",
+    
+    products: [
+        .library(name: "Graphiti", targets: ["Graphiti"]),
+    ],
+
     dependencies: [
-        .Package(url: "https://github.com/GraphQLSwift/GraphQL.git", majorVersion: 0, minor: 3),
+        .package(url: "https://github.com/GraphQLSwift/GraphQL.git", from: "0.5.0"),
+    ],
+
+    targets: [
+        .target(name: "Graphiti", dependencies: ["GraphQL"]),
+        
+        .testTarget(name: "GraphitiTests", dependencies: ["Graphiti"]),
     ]
 )
diff --git a/Sources/Graphiti/Graphiti.swift b/Sources/Graphiti/Graphiti.swift
@@ -19,7 +19,7 @@ final class AnyType : Hashable {
 }
 
 func isProtocol(type: Any.Type) -> Bool {
-    let description = String(describing: type(of: type))
+    let description = String(describing: Swift.type(of: type))
     return description.hasSuffix("Protocol")
 }
 
@@ -29,11 +29,11 @@ func fixName(_ name: String) -> String {
     var workingString = name
     
     if name.hasPrefix("(") {
-        workingString = String(name.characters.dropFirst())
+        workingString = String(name.dropFirst())
     }
     
     var newName: [Character] = []
-    for character in workingString.characters {
+    for character in workingString {
         if character != " " {
             newName.append(character)
         } else {
diff --git a/Sources/Graphiti/Schema/Schema.swift b/Sources/Graphiti/Schema/Schema.swift
@@ -1,4 +1,5 @@
 import GraphQL
+import Runtime
 
 public final class SchemaBuilder<Root, Context> {
     var graphQLTypeMap: [AnyType: GraphQLType] = [
@@ -261,7 +262,7 @@ public final class SchemaBuilder<Root, Context> {
     }
 }
 
-extension SchemaBuilder {
+public extension SchemaBuilder {
     func map(_ type: Any.Type, to graphQLType: GraphQLType) {
         guard !(type is Void.Type) else {
             return
@@ -339,7 +340,7 @@ extension SchemaBuilder {
         return outputType
     }
 
-    func getInputType(from type: Any.Type, field: String) throws -> GraphQLInputType {
+    public func getInputType(from type: Any.Type, field: String) throws -> GraphQLInputType {
         guard let graphQLType = getGraphQLType(from: type) else {
             throw GraphQLError(
                 message:
@@ -462,15 +463,16 @@ extension SchemaBuilder {
             return [:]
         }
 
-        for property in try properties(type) {
+        let info = try typeInfo(of: type)
+        for property in info.properties {
             if case let propertyType as MapInitializable.Type = property.type {
                 let argument =  GraphQLArgument(
                     type: try getInputType(from: propertyType, field: field),
-                    description: argumentsType.descriptions[property.key],
-                    defaultValue: try argumentsType.defaultValues[property.key]?.asMap()
+                    description: argumentsType.descriptions[property.name],
+                    defaultValue: try argumentsType.defaultValues[property.name]?.asMap()
                 )
 
-                arguments[property.key] = argument
+                arguments[property.name] = argument
             }
         }
         
diff --git a/Sources/Graphiti/Types/Field.swift b/Sources/Graphiti/Types/Field.swift
@@ -1,4 +1,5 @@
 import GraphQL
+import Runtime
 
 public protocol InputType  : MapInitializable {}
 public protocol OutputType : MapFallibleRepresentable {}
@@ -45,10 +46,12 @@ public class FieldBuilder<Root, Context, Type> {
     /// - Parameter excluding: properties excluded from the export
     /// - Throws: Reflection Errors
     public func exportFields(excluding: String...) throws {
-        for property in try properties(Type.self) {
-            if !excluding.contains(property.key) {
-                let field = GraphQLField(type: try schema.getOutputType(from: property.type, field: property.key))
-                fields[property.key] = field
+        let info = try typeInfo(of: Type.self)
+        
+        for property in info.properties {
+            if !excluding.contains(property.name) {
+                let field = GraphQLField(type: try schema.getOutputType(from: property.type, field: property.name))
+                fields[property.name] = field
             }
         }
     }
@@ -65,11 +68,11 @@ public class FieldBuilder<Root, Context, Type> {
         if let resolve = resolve {
             r = { source, _, context, info in
                 guard let s = source as? Type else {
-                    throw GraphQLError(message: "Expected source type \(Type.self) but got \(type(of: source))")
+                    throw GraphQLError(message: "Expected source type \(Type.self) but got \(Swift.type(of: source))")
                 }
 
                 guard let c = context as? Context else {
-                    throw GraphQLError(message: "Expected context type \(Context.self) but got \(type(of: context))")
+                    throw GraphQLError(message: "Expected context type \(Context.self) but got \(Swift.type(of: context))")
                 }
 
                 guard let output = try resolve(s, NoArguments(), c, info) else {
@@ -103,11 +106,11 @@ public class FieldBuilder<Root, Context, Type> {
         if let resolve = resolve {
             r = { source, _, context, info in
                 guard let s = source as? Type else {
-                    throw GraphQLError(message: "Expected source type \(Type.self) but got \(type(of: source))")
+                    throw GraphQLError(message: "Expected source type \(Type.self) but got \(Swift.type(of: source))")
                 }
 
                 guard let c = context as? Context else {
-                    throw GraphQLError(message: "Expected context type \(Context.self) but got \(type(of: context))")
+                    throw GraphQLError(message: "Expected context type \(Context.self) but got \(Swift.type(of: context))")
                 }
 
                 return try resolve(s, NoArguments(), c, info)
@@ -137,11 +140,11 @@ public class FieldBuilder<Root, Context, Type> {
         if let resolve = resolve {
             r = { source, _, context, info in
                 guard let s = source as? Type else {
-                    throw GraphQLError(message: "Expected source type \(Type.self) but got \(type(of: source))")
+                    throw GraphQLError(message: "Expected source type \(Type.self) but got \(Swift.type(of: source))")
                 }
 
                 guard let c = context as? Context else {
-                    throw GraphQLError(message: "Expected context type \(Context.self) but got \(type(of: context))")
+                    throw GraphQLError(message: "Expected context type \(Context.self) but got \(Swift.type(of: context))")
                 }
 
                 return try resolve(s, NoArguments(), c, info)
@@ -186,11 +189,11 @@ public class FieldBuilder<Root, Context, Type> {
         if let resolve = resolve {
             r = { source, _, context, info in
                 guard let s = source as? Type else {
-                    throw GraphQLError(message: "Expected source type \(Type.self) but got \(type(of: source))")
+                    throw GraphQLError(message: "Expected source type \(Type.self) but got \(Swift.type(of: source))")
                 }
 
                 guard let c = context as? Context else {
-                    throw GraphQLError(message: "Expected context type \(Context.self) but got \(type(of: context))")
+                    throw GraphQLError(message: "Expected context type \(Context.self) but got \(Swift.type(of: context))")
                 }
 
                 return try resolve(s, NoArguments(), c, info)
@@ -225,13 +228,13 @@ public class FieldBuilder<Root, Context, Type> {
             resolve: resolve.map { resolve in
                 return { source, args, context, info in
                     guard let s = source as? Type else {
-                        throw GraphQLError(message: "Expected source type \(Type.self) but got \(type(of: source))")
+                        throw GraphQLError(message: "Expected source type \(Type.self) but got \(Swift.type(of: source))")
                     }
 
                     let a = try A(map: args)
 
                     guard let c = context as? Context else {
-                        throw GraphQLError(message: "Expected context type \(Context.self) but got \(type(of: context))")
+                        throw GraphQLError(message: "Expected context type \(Context.self) but got \(Swift.type(of: context))")
                     }
 
                     guard let output = try resolve(s, a, c, info) else {
@@ -263,13 +266,13 @@ public class FieldBuilder<Root, Context, Type> {
             resolve: resolve.map { resolve in
                 return { source, args, context, info in
                     guard let s = source as? Type else {
-                        throw GraphQLError(message: "Expected type \(Type.self) but got \(type(of: source))")
+                        throw GraphQLError(message: "Expected type \(Type.self) but got \(Swift.type(of: source))")
                     }
 
                     let a = try A(map: args)
 
                     guard let c = context as? Context else {
-                        throw GraphQLError(message: "Expected context type \(Context.self) but got \(type(of: context))")
+                        throw GraphQLError(message: "Expected context type \(Context.self) but got \(Swift.type(of: context))")
                     }
 
                     return try resolve(s, a, c, info)
diff --git a/Sources/Graphiti/Types/InputObjectType.swift b/Sources/Graphiti/Types/InputObjectType.swift
@@ -1,4 +1,5 @@
 import GraphQL
+import Runtime
 
 public final class InputObjectTypeBuilder<Root, Context, Type> {
     var schema: SchemaBuilder<Root, Context>
@@ -14,11 +15,20 @@ public final class InputObjectTypeBuilder<Root, Context, Type> {
     /// Export all properties using reflection
     ///
     /// - Throws: Reflection Errors
-    public func exportFields() throws {
-        for property in try properties(Type.self) {
-            let field = InputObjectField(type: try schema.getInputType(from: property.type, field: property.key))
-            fields[property.key] = field
+    public func exportFields(excluding: String...) throws {
+        
+        let info = try typeInfo(of: Type.self)
+        
+        for property in info.properties {
+            if !excluding.contains(property.name) {
+                let field = InputObjectField(type: try schema.getInputType(from: property.type, field: property.name))
+                fields[property.name] = field
+            }
         }
     }
+    
+    public func addFieldMap(key: String, fieldMap: InputObjectField) {
+        fields[key] = fieldMap
+    }
 }
 
diff --git a/Sources/Graphiti/Types/InterfaceType.swift b/Sources/Graphiti/Types/InterfaceType.swift
@@ -13,11 +13,11 @@ public final class InterfaceTypeBuilder<Root, Context, Type> : FieldBuilder<Root
     public func resolveType(_ resolve: @escaping ResolveType<Type, Context>) {
         self.resolveType = { value, context, info in
             guard let v = value as? Type else {
-                throw GraphQLError(message: "Expected value type \(Type.self) but got \(type(of: value))")
+                throw GraphQLError(message: "Expected value type \(Type.self) but got \(Swift.type(of: value))")
             }
 
             guard let c = context as? Context else {
-                throw GraphQLError(message: "Expected context type \(Context.self) but got \(type(of: context))")
+                throw GraphQLError(message: "Expected context type \(Context.self) but got \(Swift.type(of: context))")
             }
 
             let type = try resolve(v, c, info)
diff --git a/Tests/GraphitiTests/HelloWorldTests/HelloWorldTests.swift b/Tests/GraphitiTests/HelloWorldTests/HelloWorldTests.swift
@@ -15,7 +15,7 @@ extension Float : InputType, OutputType {
 class HelloWorldTests : XCTestCase {
     let schema = try! Schema<NoRoot, NoContext> { schema in
         try schema.query { query in
-            try query.field(name: "hello", type: String.self) { _ in
+            try query.field(name: "hello", type: String.self) { (_, _, _, _) -> String in
                 "world"
             }
         }
diff --git a/Tests/GraphitiTests/StarWarsTests/StarWarsQueryTests.swift b/Tests/GraphitiTests/StarWarsTests/StarWarsQueryTests.swift
@@ -443,9 +443,15 @@ class StarWarsQueryTests : XCTestCase {
             struct A : OutputType {}
 
             try schema.object(type: A.self) { a in
-                try a.field(name: "nullableA", type: (TypeReference<A>?).self) { _ in A() }
-                try a.field(name: "nonNullA", type: TypeReference<A>.self) { _ in A() }
-                try a.field(name: "throws", type: String.self) { _ in
+                try a.field(name: "nullableA", type: (TypeReference<A>?).self) { (_, _, _, _) -> A?
+                    in A()
+                }
+                
+                try a.field(name: "nonNullA", type: TypeReference<A>.self) { (_, _, _, _) -> A
+                    in A()
+                }
+                
+                try a.field(name: "throws", type: String.self) { (_, _, _, _) -> String in
                     struct 🏃 : Error, CustomStringConvertible {
                         let description: String
                     }
@@ -455,7 +461,9 @@ class StarWarsQueryTests : XCTestCase {
             }
 
             try schema.query { query in
-                try query.field(name: "nullableA", type: (A?).self) { _ in A() }
+                try query.field(name: "nullableA", type: (A?).self) { (_, _, _, _) -> A? in
+                    A()
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ final class AnyType : Hashable {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`func isProtocol(type: Any.Type) -> Bool {`
`22`		`- let description = String(describing: type(of: type))`
	`22`	`+ let description = String(describing: Swift.type(of: type))`
`23`	`23`	`return description.hasSuffix("Protocol")`
`24`	`24`	`}`
`25`	`25`
`@@ -29,11 +29,11 @@ func fixName(_ name: String) -> String {`
`29`	`29`	`var workingString = name`
`30`	`30`
`31`	`31`	`if name.hasPrefix("(") {`
`32`		`- workingString = String(name.characters.dropFirst())`
	`32`	`+ workingString = String(name.dropFirst())`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`var newName: [Character] = []`
`36`		`- for character in workingString.characters {`
	`36`	`+ for character in workingString {`
`37`	`37`	`if character != " " {`
`38`	`38`	`newName.append(character)`
`39`	`39`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import GraphQL`
	`2`	`+import Runtime`
`2`	`3`
`3`	`4`	`public final class SchemaBuilder<Root, Context> {`
`4`	`5`	`var graphQLTypeMap: [AnyType: GraphQLType] = [`
`@@ -261,7 +262,7 @@ public final class SchemaBuilder<Root, Context> {`
`261`	`262`	`}`
`262`	`263`	`}`
`263`	`264`
`264`		`-extension SchemaBuilder {`
	`265`	`+public extension SchemaBuilder {`
`265`	`266`	`func map(_ type: Any.Type, to graphQLType: GraphQLType) {`
`266`	`267`	`guard !(type is Void.Type) else {`
`267`	`268`	`return`
`@@ -339,7 +340,7 @@ extension SchemaBuilder {`
`339`	`340`	`return outputType`
`340`	`341`	`}`
`341`	`342`
`342`		`- func getInputType(from type: Any.Type, field: String) throws -> GraphQLInputType {`
	`343`	`+ public func getInputType(from type: Any.Type, field: String) throws -> GraphQLInputType {`
`343`	`344`	`guard let graphQLType = getGraphQLType(from: type) else {`
`344`	`345`	`throw GraphQLError(`
`345`	`346`	`message:`
`@@ -462,15 +463,16 @@ extension SchemaBuilder {`
`462`	`463`	`return [:]`
`463`	`464`	`}`
`464`	`465`
`465`		`- for property in try properties(type) {`
	`466`	`+ let info = try typeInfo(of: type)`
	`467`	`+ for property in info.properties {`
`466`	`468`	`if case let propertyType as MapInitializable.Type = property.type {`
`467`	`469`	`let argument = GraphQLArgument(`
`468`	`470`	`type: try getInputType(from: propertyType, field: field),`
`469`		`- description: argumentsType.descriptions[property.key],`
`470`		`- defaultValue: try argumentsType.defaultValues[property.key]?.asMap()`
	`471`	`+ description: argumentsType.descriptions[property.name],`
	`472`	`+ defaultValue: try argumentsType.defaultValues[property.name]?.asMap()`
`471`	`473`	`)`
`472`	`474`
`473`		`- arguments[property.key] = argument`
	`475`	`+ arguments[property.name] = argument`
`474`	`476`	`}`
`475`	`477`	`}`
`476`	`478`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@ public final class InterfaceTypeBuilder<Root, Context, Type> : FieldBuilder<Root`
`13`	`13`	`public func resolveType(_ resolve: @escaping ResolveType<Type, Context>) {`
`14`	`14`	`self.resolveType = { value, context, info in`
`15`	`15`	`guard let v = value as? Type else {`
`16`		`- throw GraphQLError(message: "Expected value type \(Type.self) but got \(type(of: value))")`
	`16`	`+ throw GraphQLError(message: "Expected value type \(Type.self) but got \(Swift.type(of: value))")`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`guard let c = context as? Context else {`
`20`		`- throw GraphQLError(message: "Expected context type \(Context.self) but got \(type(of: context))")`
	`20`	`+ throw GraphQLError(message: "Expected context type \(Context.self) but got \(Swift.type(of: context))")`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`let type = try resolve(v, c, info)`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ extension Float : InputType, OutputType {`
`15`	`15`	`class HelloWorldTests : XCTestCase {`
`16`	`16`	`let schema = try! Schema<NoRoot, NoContext> { schema in`
`17`	`17`	`try schema.query { query in`
`18`		`- try query.field(name: "hello", type: String.self) { _ in`
	`18`	`+ try query.field(name: "hello", type: String.self) { (_, _, _, _) -> String in`
`19`	`19`	`"world"`
`20`	`20`	`}`
`21`	`21`	`}`