Reverts accidental push

Revert "test: Adds circular reference object test"
Revert "feature: Adds type objects to TypeProvider types"
Revert "feature: Replaces unknown type error with auto-reference"
Revert "feature: Deprecates `Types` in preference of `Type`"
Revert "chore: Updates packages"
Revert "refactor: Removes unnecessary TypeReference usage"

Author: NeedleInAJayStack

Package.resolved

@@ -6,35 +6,26 @@
         "repositoryURL": "https://github.com/GraphQLSwift/GraphQL.git",
         "state": {
           "branch": null,
-          "revision": "17b96ed859072fca79dd562da2a79e1bc752756f",
-          "version": "2.4.1"
-        }
-      },
-      {
-        "package": "swift-atomics",
-        "repositoryURL": "https://github.com/apple/swift-atomics.git",
-        "state": {
-          "branch": null,
-          "revision": "919eb1d83e02121cdb434c7bfc1f0c66ef17febe",
-          "version": "1.0.2"
+          "revision": "ebd2ea40676f8bcbdfd6088c408f3ed321c1a905",
+          "version": "2.4.0"
         }
       },
       {
         "package": "swift-collections",
         "repositoryURL": "https://github.com/apple/swift-collections",
         "state": {
           "branch": null,
-          "revision": "f504716c27d2e5d4144fa4794b12129301d17729",
-          "version": "1.0.3"
+          "revision": "48254824bb4248676bf7ce56014ff57b142b77eb",
+          "version": "1.0.2"
         }
       },
       {
         "package": "swift-nio",
         "repositoryURL": "https://github.com/apple/swift-nio.git",
         "state": {
           "branch": null,
-          "revision": "a16e2f54a25b2af217044e5168997009a505930f",
-          "version": "2.42.0"
+          "revision": "124119f0bb12384cef35aa041d7c3a686108722d",
+          "version": "2.40.0"
         }
       }
     ]

Sources/Graphiti/Definition/TypeProvider.swift

@@ -56,15 +56,11 @@ extension TypeProvider {
                 return try getGraphQLOptionalType(from: referenceType, isOptional: isOptional)
             }
         } else {
-            if let graphQLType = graphQLTypeMap[AnyType(type)] {
-                return try getGraphQLOptionalType(from: graphQLType, isOptional: isOptional)
-            } else {
-                // If we haven't seen this type yet, just store it as a type reference and resolve later.
-                let name = Reflection.name(for: type)
-                let referenceType = GraphQLTypeReference(name)
-
-                return try getGraphQLOptionalType(from: referenceType, isOptional: isOptional)
+            guard let graphQLType = graphQLTypeMap[AnyType(type)] else {
+                throw GraphQLError(message: "Type \"\(type)\" is not registered.")
             }
+
+            return try getGraphQLOptionalType(from: graphQLType, isOptional: isOptional)
         }
     }
 

Sources/Graphiti/Enum/Enum.swift

@@ -24,7 +24,6 @@ public final class Enum<
         )
 
         try typeProvider.map(EnumType.self, to: enumType)
-        typeProvider.types.append(enumType)
     }
 
     private init(

Sources/Graphiti/Input/Input.swift

@@ -18,7 +18,6 @@ public final class Input<
         )
 
         try typeProvider.map(InputObjectType.self, to: inputObjectType)
-        typeProvider.types.append(inputObjectType)
     }
 
     func fields(typeProvider: TypeProvider) throws -> InputObjectFieldMap {

Sources/Graphiti/Interface/Interface.swift

@@ -12,7 +12,6 @@ public final class Interface<Resolver, Context, InterfaceType>: Component<Resolv
         )
 
         try typeProvider.map(InterfaceType.self, to: interfaceType)
-        typeProvider.types.append(interfaceType)
     }
 
     func fields(typeProvider: TypeProvider, coders: Coders) throws -> GraphQLFieldMap {

Sources/Graphiti/Scalar/Scalar.swift

@@ -34,7 +34,6 @@ open class Scalar<Resolver, Context, ScalarType: Codable>: Component<Resolver, C
         )
 
         try typeProvider.map(ScalarType.self, to: scalarType)
-        typeProvider.types.append(scalarType)
     }
 
     open func serialize(scalar: ScalarType, encoder: MapEncoder) throws -> Map {

Sources/Graphiti/Type/Type.swift

@@ -20,7 +20,6 @@ public final class Type<Resolver, Context, ObjectType: Encodable>: Component<Res
         )
 
         try typeProvider.map(ObjectType.self, to: objectType)
-        typeProvider.types.append(objectType)
     }
 
     func fields(typeProvider: TypeProvider, coders: Coders) throws -> GraphQLFieldMap {

Sources/Graphiti/Types/Types.swift

@@ -1,6 +1,5 @@
 import GraphQL
 
-@available(*, deprecated, message: "No longer use this. Instead define types using `Type`.")
 public final class Types<Resolver, Context>: Component<Resolver, Context> {
     let types: [Any.Type]
 
@@ -14,8 +13,10 @@ public final class Types<Resolver, Context>: Component<Resolver, Context> {
         self.types = types
         super.init(name: "")
     }
+}
 
-    public convenience init(_ types: Any.Type...) {
+public extension Types {
+    convenience init(_ types: Any.Type...) {
         self.init(types: types)
     }
 }

Tests/GraphitiTests/HelloWorldTests/HelloWorldAsyncTests.swift

@@ -61,13 +61,13 @@ import XCTest
             Type(User.self) {
                 Field("id", at: \.id)
                 Field("name", at: \.name)
-                Field("friends", at: \.friends)
+                Field("friends", at: \.friends, as: [TypeReference<User>]?.self)
             }
 
             Input(UserInput.self) {
                 InputField("id", at: \.id)
                 InputField("name", at: \.name)
-                InputField("friends", at: \.friends)
+                InputField("friends", at: \.friends, as: [TypeReference<UserInput>]?.self)
             }
 
             Type(UserEvent.self) {

Tests/GraphitiTests/HelloWorldTests/HelloWorldTests.swift

@@ -121,13 +121,13 @@ struct HelloAPI: API {
         Type(User.self) {
             Field("id", at: \.id)
             Field("name", at: \.name)
-            Field("friends", at: \.friends)
+            Field("friends", at: \.friends, as: [TypeReference<User>]?.self)
         }
 
         Input(UserInput.self) {
             InputField("id", at: \.id)
             InputField("name", as: String?.self)
-            InputField("friends", at: \.friends)
+            InputField("friends", at: \.friends, as: [TypeReference<UserInput>]?.self)
         }
 
         Type(UserEvent.self) {

Tests/GraphitiTests/SchemaTests.swift

@@ -40,7 +40,7 @@ public struct StarWarsAPI: API {
             Field("diameter", at: \.diameter)
             Field("rotationPeriod", at: \.rotationPeriod)
             Field("orbitalPeriod", at: \.orbitalPeriod)
-            Field("residents", at: \.residents)
+            Field("residents", at: \.residents, as: [TypeReference<Human>].self)
         }
         .description(
             "A large mass, planet or planetoid in the Star Wars Universe, at the time of 0 ABY."
@@ -100,5 +100,7 @@ public struct StarWarsAPI: API {
                     .defaultValue("R2-D2")
             }
         }
+
+        Types(Human.self, Droid.self)
     }
 }

Tests/GraphitiTests/StarWarsAPI/StarWarsAPI.swift

@@ -655,8 +655,8 @@ class StarWarsQueryTests: XCTestCase {
 
             let schema = try! Schema<TestResolver, NoContext> {
                 Type(A.self) {
-                    Field("nullableA", at: A.nullableA)
-                    Field("nonNullA", at: A.nonNullA)
+                    Field("nullableA", at: A.nullableA, as: (TypeReference<A>?).self)
+                    Field("nonNullA", at: A.nonNullA, as: TypeReference<A>.self)
                     Field("throws", at: A.throws)
                 }