@effect-gql/core 1.4.6 → 1.4.8

package/builder/index.cjs

@@ -33,7 +33,15 @@ var isIntegerType = (ast) => {
     const annotations = refinement.annotations;
     if (annotations) {
       const identifier = AST__namespace.getIdentifierAnnotation(refinement);
-      if (identifier._tag === "Some" && identifier.value === "Int") {
+      if (identifier._tag === "Some") {
+        const id = identifier.value;
+        if (id === "Int" || id.includes("Int")) {
+          return true;
+        }
+      }
+      const JSONSchemaSymbol = /* @__PURE__ */ Symbol.for("effect/annotation/JSONSchema");
+      const jsonSchema = annotations[JSONSchemaSymbol];
+      if (jsonSchema && jsonSchema.type === "integer") {
         return true;
       }
     }
@@ -101,7 +109,8 @@ var toGraphQLType = (schema) => {
       if (fieldName === "_tag") continue;
       const fieldSchema = S2__namespace.make(field2.type);
       let fieldType = toGraphQLType(fieldSchema);
-      if (!field2.isOptional) {
+      const isOptionField = isOptionTransformation(field2.type) || isOptionDeclaration(field2.type);
+      if (!field2.isOptional && !isOptionField) {
         fieldType = new graphql.GraphQLNonNull(fieldType);
       }
       fields[fieldName] = { type: fieldType };
@@ -177,7 +186,8 @@ var toGraphQLInputType = (schema) => {
       if (fieldName === "_tag") continue;
       const fieldSchema = S2__namespace.make(field2.type);
       let fieldType = toGraphQLInputType(fieldSchema);
-      if (!field2.isOptional) {
+      const isOptionField = isOptionTransformation(field2.type) || isOptionDeclaration(field2.type);
+      if (!field2.isOptional && !isOptionField) {
         fieldType = new graphql.GraphQLNonNull(fieldType);
       }
       fields[fieldName] = { type: fieldType };
@@ -228,7 +238,8 @@ var toGraphQLArgs = (schema) => {
       if (fieldName === "_tag") continue;
       const fieldSchema = S2__namespace.make(field2.type);
       let fieldType = toGraphQLInputType(fieldSchema);
-      if (!field2.isOptional) {
+      const isOptionField = isOptionTransformation(field2.type) || isOptionDeclaration(field2.type);
+      if (!field2.isOptional && !isOptionField) {
         fieldType = new graphql.GraphQLNonNull(fieldType);
       }
       args[fieldName] = { type: fieldType };
@@ -1602,15 +1613,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,
@@ -1634,9 +1655,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,
@@ -1644,8 +1664,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
@@ -1695,7 +1715,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();
@@ -1721,7 +1741,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 = {
@@ -1730,18 +1750,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({