@effect-gql/core 1.4.11 → 1.4.13

package/builder/index.cjs

@@ -186,10 +186,7 @@ var toGraphQLInputType = (schema) => {
   const tupleResult = handleTupleTypeAST(ast, toGraphQLInputType);
   if (tupleResult) return tupleResult;
   if (ast._tag === "TypeLiteral") {
-    const fields = buildFieldsFromPropertySignatures(
-      ast.propertySignatures,
-      toGraphQLInputType
-    );
+    const fields = buildFieldsFromPropertySignatures(ast.propertySignatures, toGraphQLInputType);
     const typeName = schema.annotations?.identifier || `Input_${Math.random().toString(36).slice(2, 11)}`;
     return new graphql.GraphQLInputObjectType({
       name: typeName,
@@ -421,9 +418,7 @@ function findRegisteredTypeForTransformation(memberAst, ctx) {
 }
 function findRegisteredTypeForOptionSome(memberAst, ctx) {
   if (memberAst._tag !== "TypeLiteral") return void 0;
-  const valueField = memberAst.propertySignatures?.find(
-    (p) => String(p.name) === "value"
-  );
+  const valueField = memberAst.propertySignatures?.find((p) => String(p.name) === "value");
   if (!valueField) return void 0;
   const valueType = valueField.type;
   const valueTypeName = ctx.astToTypeName?.get(valueType);
@@ -799,7 +794,14 @@ function handleOptionTransformationForInput(fromAst, toAst, inputs, inputRegistr
   for (const memberAst of fromAst.types) {
     if (memberAst._tag === "Literal") continue;
     if (memberAst._tag === "UndefinedKeyword") continue;
-    const registeredInput = findRegisteredInputForAST(memberAst, inputs, inputRegistry, enumRegistry, enums, cache) || findRegisteredInputForTransformation(memberAst, inputs, inputRegistry, enumRegistry, enums, cache) || findRegisteredInputForOptionSome(memberAst, inputs, inputRegistry, enumRegistry, enums, cache);
+    const registeredInput = findRegisteredInputForAST(memberAst, inputs, inputRegistry, enumRegistry, enums, cache) || findRegisteredInputForTransformation(
+      memberAst,
+      inputs,
+      inputRegistry,
+      enumRegistry,
+      enums,
+      cache
+    ) || findRegisteredInputForOptionSome(memberAst, inputs, inputRegistry, enumRegistry, enums, cache);
     if (registeredInput) return registeredInput;
   }
   return void 0;
@@ -830,7 +832,14 @@ function handleTransformationForInput(ast, inputs, inputRegistry, enumRegistry,
 }
 function findRegisteredInputInUnionMembers(types, inputs, inputRegistry, enumRegistry, enums, cache) {
   for (const memberAst of types) {
-    const registeredInput = findRegisteredInputForAST(memberAst, inputs, inputRegistry, enumRegistry, enums, cache) || findRegisteredInputForTransformation(memberAst, inputs, inputRegistry, enumRegistry, enums, cache) || findRegisteredInputForOptionSome(memberAst, inputs, inputRegistry, enumRegistry, enums, cache);
+    const registeredInput = findRegisteredInputForAST(memberAst, inputs, inputRegistry, enumRegistry, enums, cache) || findRegisteredInputForTransformation(
+      memberAst,
+      inputs,
+      inputRegistry,
+      enumRegistry,
+      enums,
+      cache
+    ) || findRegisteredInputForOptionSome(memberAst, inputs, inputRegistry, enumRegistry, enums, cache);
     if (registeredInput) return registeredInput;
   }
   return void 0;
@@ -935,7 +944,8 @@ function toGraphQLArgsWithRegistry(schema, enumRegistry, inputRegistry, inputs,
         enums,
         cache
       );
-      if (!field2.isOptional) {
+      const isOptionField = isOptionTransformation(field2.type) || isOptionDeclaration(field2.type);
+      if (!field2.isOptional && !isOptionField) {
         fieldType = getNonNull(fieldType);
       }
       args[fieldName] = { type: fieldType };
@@ -1487,8 +1497,16 @@ var GraphQLSchemaBuilder = class _GraphQLSchemaBuilder {
     const enumRegistry = this.buildEnumRegistry();
     const inputRegistry = this.buildInputRegistry(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 directiveRegistry = this.buildDirectiveRegistry(
+      enumRegistry,
+      inputRegistry,
+      inputTypeLookupCache
+    );
+    const interfaceRegistry = this.buildInterfaceRegistry(
+      enumRegistry,
+      inputRegistry,
+      inputTypeLookupCache
+    );
     const { typeRegistry, unionRegistry } = this.buildTypeAndUnionRegistries(
       enumRegistry,
       interfaceRegistry,