@effect-gql/core 1.4.5 → 1.4.7

package/builder/index.cjs

@@ -722,26 +722,56 @@ function toGraphQLInputTypeWithRegistry(schema, enumRegistry, inputRegistry, inp
         if (memberAst._tag === "UndefinedKeyword") continue;
         const inputName = cache?.astToInputName?.get(memberAst);
         if (inputName) {
-          const result = inputRegistry.get(inputName);
-          if (result) return result;
+          const inputReg = inputs.get(inputName);
+          if (inputReg) {
+            return toGraphQLInputTypeWithRegistry(
+              inputReg.schema,
+              enumRegistry,
+              inputRegistry,
+              inputs,
+              enums,
+              cache
+            );
+          }
         }
-        for (const [regInputName, inputReg] of inputs) {
+        for (const [, inputReg] of inputs) {
           if (inputReg.schema.ast === memberAst) {
-            const result = inputRegistry.get(regInputName);
-            if (result) return result;
+            return toGraphQLInputTypeWithRegistry(
+              inputReg.schema,
+              enumRegistry,
+              inputRegistry,
+              inputs,
+              enums,
+              cache
+            );
           }
         }
         if (memberAst._tag === "Transformation") {
           const innerToAst = memberAst.to;
           const transformedInputName = cache?.astToInputName?.get(innerToAst);
           if (transformedInputName) {
-            const result = inputRegistry.get(transformedInputName);
-            if (result) return result;
+            const inputReg = inputs.get(transformedInputName);
+            if (inputReg) {
+              return toGraphQLInputTypeWithRegistry(
+                inputReg.schema,
+                enumRegistry,
+                inputRegistry,
+                inputs,
+                enums,
+                cache
+              );
+            }
           }
-          for (const [regInputName, inputReg] of inputs) {
+          for (const [, inputReg] of inputs) {
             if (inputReg.schema.ast === innerToAst) {
-              const result = inputRegistry.get(regInputName);
-              if (result) return result;
+              return toGraphQLInputTypeWithRegistry(
+                inputReg.schema,
+                enumRegistry,
+                inputRegistry,
+                inputs,
+                enums,
+                cache
+              );
             }
           }
         }
@@ -753,25 +783,52 @@ function toGraphQLInputTypeWithRegistry(schema, enumRegistry, inputRegistry, inp
             const valueType = valueField.type;
             const valueInputName = cache?.astToInputName?.get(valueType);
             if (valueInputName) {
-              const result = inputRegistry.get(valueInputName);
-              if (result) return result;
+              const inputReg = inputs.get(valueInputName);
+              if (inputReg) {
+                return toGraphQLInputTypeWithRegistry(
+                  inputReg.schema,
+                  enumRegistry,
+                  inputRegistry,
+                  inputs,
+                  enums,
+                  cache
+                );
+              }
             }
-            for (const [regInputName, inputReg] of inputs) {
+            for (const [, inputReg] of inputs) {
               if (inputReg.schema.ast === valueType) {
-                const result = inputRegistry.get(regInputName);
-                if (result) return result;
+                return toGraphQLInputTypeWithRegistry(
+                  inputReg.schema,
+                  enumRegistry,
+                  inputRegistry,
+                  inputs,
+                  enums,
+                  cache
+                );
               }
               let regAst = inputReg.schema.ast;
               while (regAst._tag === "Transformation") {
                 regAst = regAst.to;
                 if (regAst === valueType) {
-                  const result = inputRegistry.get(regInputName);
-                  if (result) return result;
+                  return toGraphQLInputTypeWithRegistry(
+                    inputReg.schema,
+                    enumRegistry,
+                    inputRegistry,
+                    inputs,
+                    enums,
+                    cache
+                  );
                 }
               }
               if (regAst._tag === "Declaration" && regAst.typeParameters?.[0] === valueType) {
-                const result = inputRegistry.get(regInputName);
-                if (result) return result;
+                return toGraphQLInputTypeWithRegistry(
+                  inputReg.schema,
+                  enumRegistry,
+                  inputRegistry,
+                  inputs,
+                  enums,
+                  cache
+                );
               }
             }
             const innerResult = toGraphQLInputTypeWithRegistry(
@@ -824,26 +881,56 @@ function toGraphQLInputTypeWithRegistry(schema, enumRegistry, inputRegistry, inp
     for (const memberAst of unionAst.types) {
       const inputName = cache?.astToInputName?.get(memberAst);
       if (inputName) {
-        const result = inputRegistry.get(inputName);
-        if (result) return result;
+        const inputReg = inputs.get(inputName);
+        if (inputReg) {
+          return toGraphQLInputTypeWithRegistry(
+            inputReg.schema,
+            enumRegistry,
+            inputRegistry,
+            inputs,
+            enums,
+            cache
+          );
+        }
       }
-      for (const [regInputName, inputReg] of inputs) {
+      for (const [, inputReg] of inputs) {
         if (inputReg.schema.ast === memberAst) {
-          const result = inputRegistry.get(regInputName);
-          if (result) return result;
+          return toGraphQLInputTypeWithRegistry(
+            inputReg.schema,
+            enumRegistry,
+            inputRegistry,
+            inputs,
+            enums,
+            cache
+          );
         }
       }
       if (memberAst._tag === "Transformation") {
         const toAst = memberAst.to;
         const transformedInputName = cache?.astToInputName?.get(toAst);
         if (transformedInputName) {
-          const result = inputRegistry.get(transformedInputName);
-          if (result) return result;
+          const inputReg = inputs.get(transformedInputName);
+          if (inputReg) {
+            return toGraphQLInputTypeWithRegistry(
+              inputReg.schema,
+              enumRegistry,
+              inputRegistry,
+              inputs,
+              enums,
+              cache
+            );
+          }
         }
-        for (const [regInputName, inputReg] of inputs) {
+        for (const [, inputReg] of inputs) {
           if (inputReg.schema.ast === toAst) {
-            const result = inputRegistry.get(regInputName);
-            if (result) return result;
+            return toGraphQLInputTypeWithRegistry(
+              inputReg.schema,
+              enumRegistry,
+              inputRegistry,
+              inputs,
+              enums,
+              cache
+            );
           }
         }
       }
@@ -855,25 +942,52 @@ function toGraphQLInputTypeWithRegistry(schema, enumRegistry, inputRegistry, inp
           const valueType = valueField.type;
           const valueInputName = cache?.astToInputName?.get(valueType);
           if (valueInputName) {
-            const result = inputRegistry.get(valueInputName);
-            if (result) return result;
+            const inputReg = inputs.get(valueInputName);
+            if (inputReg) {
+              return toGraphQLInputTypeWithRegistry(
+                inputReg.schema,
+                enumRegistry,
+                inputRegistry,
+                inputs,
+                enums,
+                cache
+              );
+            }
           }
-          for (const [regInputName, inputReg] of inputs) {
+          for (const [, inputReg] of inputs) {
             if (inputReg.schema.ast === valueType) {
-              const result = inputRegistry.get(regInputName);
-              if (result) return result;
+              return toGraphQLInputTypeWithRegistry(
+                inputReg.schema,
+                enumRegistry,
+                inputRegistry,
+                inputs,
+                enums,
+                cache
+              );
             }
             let regAst = inputReg.schema.ast;
             while (regAst._tag === "Transformation") {
               regAst = regAst.to;
               if (regAst === valueType) {
-                const result = inputRegistry.get(regInputName);
-                if (result) return result;
+                return toGraphQLInputTypeWithRegistry(
+                  inputReg.schema,
+                  enumRegistry,
+                  inputRegistry,
+                  inputs,
+                  enums,
+                  cache
+                );
               }
             }
             if (regAst._tag === "Declaration" && regAst.typeParameters?.[0] === valueType) {
-              const result = inputRegistry.get(regInputName);
-              if (result) return result;
+              return toGraphQLInputTypeWithRegistry(
+                inputReg.schema,
+                enumRegistry,
+                inputRegistry,
+                inputs,
+                enums,
+                cache
+              );
             }
           }
           const innerResult = toGraphQLInputTypeWithRegistry(
@@ -1488,15 +1602,25 @@ var GraphQLSchemaBuilder = class _GraphQLSchemaBuilder {
   }
   /**
    * Build the GraphQL schema (no services required)
+   *
+   * Uses a two-phase approach:
+   * 1. Phase 1: Build enum and input registries first (these may be referenced by other types)
+   * 2. Phase 2: Build interface, object, and union types (which may reference inputs in args)
+   *
+   * This ensures that when object type fields with args are processed,
+   * all registered input types are already available in the inputRegistry.
    */
   buildSchema() {
-    const directiveRegistry = this.buildDirectiveRegistry();
     const enumRegistry = this.buildEnumRegistry();
     const inputRegistry = this.buildInputRegistry(enumRegistry);
-    const interfaceRegistry = this.buildInterfaceRegistry(enumRegistry);
+    const inputTypeLookupCache = buildInputTypeLookupCache(this.state.inputs, this.state.enums);
+    const directiveRegistry = this.buildDirectiveRegistry(enumRegistry, inputRegistry, inputTypeLookupCache);
+    const interfaceRegistry = this.buildInterfaceRegistry(enumRegistry, inputRegistry, inputTypeLookupCache);
     const { typeRegistry, unionRegistry } = this.buildTypeAndUnionRegistries(
       enumRegistry,
-      interfaceRegistry
+      interfaceRegistry,
+      inputRegistry,
+      inputTypeLookupCache
     );
     const fieldCtx = this.createFieldBuilderContext(
       typeRegistry,
@@ -1520,9 +1644,8 @@ var GraphQLSchemaBuilder = class _GraphQLSchemaBuilder {
       subscriptionFields
     });
   }
-  buildDirectiveRegistry() {
+  buildDirectiveRegistry(enumRegistry, inputRegistry, cache) {
     const registry = /* @__PURE__ */ new Map();
-    const cache = buildInputTypeLookupCache(this.state.inputs, this.state.enums);
     for (const [name, reg] of this.state.directives) {
       const graphqlDirective = new graphql.GraphQLDirective({
         name,
@@ -1530,8 +1653,8 @@ var GraphQLSchemaBuilder = class _GraphQLSchemaBuilder {
         locations: [...reg.locations],
         args: reg.args ? toGraphQLArgsWithRegistry(
           reg.args,
-          /* @__PURE__ */ new Map(),
-          /* @__PURE__ */ new Map(),
+          enumRegistry,
+          inputRegistry,
           this.state.inputs,
           this.state.enums,
           cache
@@ -1581,7 +1704,7 @@ var GraphQLSchemaBuilder = class _GraphQLSchemaBuilder {
     }
     return registry;
   }
-  buildInterfaceRegistry(enumRegistry) {
+  buildInterfaceRegistry(enumRegistry, inputRegistry, _cache) {
     const registry = /* @__PURE__ */ new Map();
     const typeRegistry = /* @__PURE__ */ new Map();
     const unionRegistry = /* @__PURE__ */ new Map();
@@ -1607,7 +1730,7 @@ var GraphQLSchemaBuilder = class _GraphQLSchemaBuilder {
     }
     return registry;
   }
-  buildTypeAndUnionRegistries(enumRegistry, interfaceRegistry) {
+  buildTypeAndUnionRegistries(enumRegistry, interfaceRegistry, inputRegistry, inputTypeLookupCache) {
     const typeRegistry = /* @__PURE__ */ new Map();
     const unionRegistry = /* @__PURE__ */ new Map();
     const sharedCtx = {
@@ -1616,18 +1739,19 @@ var GraphQLSchemaBuilder = class _GraphQLSchemaBuilder {
       enums: this.state.enums,
       unions: this.state.unions,
       inputs: this.state.inputs,
-      typeRegistry,
-      interfaceRegistry,
-      enumRegistry,
-      unionRegistry};
-    buildReverseLookups(sharedCtx);
-    const sharedFieldCtx = this.createFieldBuilderContext(
       typeRegistry,
       interfaceRegistry,
       enumRegistry,
       unionRegistry,
-      /* @__PURE__ */ new Map()
-    );
+      inputRegistry
+    };
+    buildReverseLookups(sharedCtx);
+    const sharedFieldCtx = {
+      ...sharedCtx,
+      directiveRegistrations: this.state.directives,
+      middlewares: this.state.middlewares,
+      inputTypeLookupCache
+    };
     for (const [typeName, typeReg] of this.state.types) {
       const implementedInterfaces = typeReg.implements?.map((name) => interfaceRegistry.get(name)).filter(Boolean) ?? [];
       const graphqlType = new graphql.GraphQLObjectType({