@effect-gql/core 1.4.7 → 1.4.9

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;
       }
     }
@@ -41,6 +49,51 @@ var isIntegerType = (ast) => {
   }
   return false;
 };
+function handlePrimitiveAST(ast) {
+  if (ast._tag === "StringKeyword") return graphql.GraphQLString;
+  if (ast._tag === "NumberKeyword") return graphql.GraphQLFloat;
+  if (ast._tag === "BooleanKeyword") return graphql.GraphQLBoolean;
+  return void 0;
+}
+function handleRefinementAST(ast, convertFn) {
+  if (isIntegerType(ast)) {
+    return graphql.GraphQLInt;
+  }
+  return convertFn(S2__namespace.make(ast.from));
+}
+function handleLiteralAST(ast) {
+  if (ast._tag !== "Literal") return void 0;
+  if (typeof ast.literal === "string") return graphql.GraphQLString;
+  if (typeof ast.literal === "number") {
+    return Number.isInteger(ast.literal) ? graphql.GraphQLInt : graphql.GraphQLFloat;
+  }
+  if (typeof ast.literal === "boolean") return graphql.GraphQLBoolean;
+  return void 0;
+}
+function handleTupleTypeAST(ast, convertFn) {
+  if (ast._tag !== "TupleType") return void 0;
+  const elements = ast.elements;
+  if (elements.length > 0) {
+    const elementSchema = S2__namespace.make(elements[0].type);
+    return new graphql.GraphQLList(convertFn(elementSchema));
+  }
+  return void 0;
+}
+function buildFieldsFromPropertySignatures(propertySignatures, convertFn, isInput) {
+  const fields = {};
+  for (const field2 of propertySignatures) {
+    const fieldName = String(field2.name);
+    if (fieldName === "_tag") continue;
+    const fieldSchema = S2__namespace.make(field2.type);
+    let fieldType = convertFn(fieldSchema);
+    const isOptionField = isOptionTransformation(field2.type) || isOptionDeclaration(field2.type);
+    if (!field2.isOptional && !isOptionField) {
+      fieldType = new graphql.GraphQLNonNull(fieldType);
+    }
+    fields[fieldName] = { type: fieldType };
+  }
+  return fields;
+}
 var isOptionDeclaration = (ast) => {
   if (ast._tag === "Declaration") {
     const annotations = ast.annotations;
@@ -71,41 +124,17 @@ var getOptionInnerType = (ast) => {
 };
 var toGraphQLType = (schema) => {
   const ast = schema.ast;
-  if (ast._tag === "StringKeyword") return graphql.GraphQLString;
-  if (ast._tag === "NumberKeyword") return graphql.GraphQLFloat;
-  if (ast._tag === "BooleanKeyword") return graphql.GraphQLBoolean;
+  const primitiveResult = handlePrimitiveAST(ast);
+  if (primitiveResult) return primitiveResult;
   if (ast._tag === "Refinement") {
-    if (isIntegerType(ast)) {
-      return graphql.GraphQLInt;
-    }
-    return toGraphQLType(S2__namespace.make(ast.from));
-  }
-  if (ast._tag === "Literal") {
-    if (typeof ast.literal === "string") return graphql.GraphQLString;
-    if (typeof ast.literal === "number") {
-      return Number.isInteger(ast.literal) ? graphql.GraphQLInt : graphql.GraphQLFloat;
-    }
-    if (typeof ast.literal === "boolean") return graphql.GraphQLBoolean;
-  }
-  if (ast._tag === "TupleType") {
-    const elements = ast.elements;
-    if (elements.length > 0) {
-      const elementSchema = S2__namespace.make(elements[0].type);
-      return new graphql.GraphQLList(toGraphQLType(elementSchema));
-    }
+    return handleRefinementAST(ast, toGraphQLType);
   }
+  const literalResult = handleLiteralAST(ast);
+  if (literalResult) return literalResult;
+  const tupleResult = handleTupleTypeAST(ast, toGraphQLType);
+  if (tupleResult) return tupleResult;
   if (ast._tag === "TypeLiteral") {
-    const fields = {};
-    for (const field2 of ast.propertySignatures) {
-      const fieldName = String(field2.name);
-      if (fieldName === "_tag") continue;
-      const fieldSchema = S2__namespace.make(field2.type);
-      let fieldType = toGraphQLType(fieldSchema);
-      if (!field2.isOptional) {
-        fieldType = new graphql.GraphQLNonNull(fieldType);
-      }
-      fields[fieldName] = { type: fieldType };
-    }
+    const fields = buildFieldsFromPropertySignatures(ast.propertySignatures, toGraphQLType);
     const typeName = schema.annotations?.identifier || `Object_${Math.random().toString(36).slice(2, 11)}`;
     return new graphql.GraphQLObjectType({
       name: typeName,
@@ -147,41 +176,19 @@ var toGraphQLType = (schema) => {
 };
 var toGraphQLInputType = (schema) => {
   const ast = schema.ast;
-  if (ast._tag === "StringKeyword") return graphql.GraphQLString;
-  if (ast._tag === "NumberKeyword") return graphql.GraphQLFloat;
-  if (ast._tag === "BooleanKeyword") return graphql.GraphQLBoolean;
+  const primitiveResult = handlePrimitiveAST(ast);
+  if (primitiveResult) return primitiveResult;
   if (ast._tag === "Refinement") {
-    if (isIntegerType(ast)) {
-      return graphql.GraphQLInt;
-    }
-    return toGraphQLInputType(S2__namespace.make(ast.from));
-  }
-  if (ast._tag === "Literal") {
-    if (typeof ast.literal === "string") return graphql.GraphQLString;
-    if (typeof ast.literal === "number") {
-      return Number.isInteger(ast.literal) ? graphql.GraphQLInt : graphql.GraphQLFloat;
-    }
-    if (typeof ast.literal === "boolean") return graphql.GraphQLBoolean;
-  }
-  if (ast._tag === "TupleType") {
-    const elements = ast.elements;
-    if (elements.length > 0) {
-      const elementSchema = S2__namespace.make(elements[0].type);
-      return new graphql.GraphQLList(toGraphQLInputType(elementSchema));
-    }
+    return handleRefinementAST(ast, toGraphQLInputType);
   }
+  const literalResult = handleLiteralAST(ast);
+  if (literalResult) return literalResult;
+  const tupleResult = handleTupleTypeAST(ast, toGraphQLInputType);
+  if (tupleResult) return tupleResult;
   if (ast._tag === "TypeLiteral") {
-    const fields = {};
-    for (const field2 of ast.propertySignatures) {
-      const fieldName = String(field2.name);
-      if (fieldName === "_tag") continue;
-      const fieldSchema = S2__namespace.make(field2.type);
-      let fieldType = toGraphQLInputType(fieldSchema);
-      if (!field2.isOptional) {
-        fieldType = new graphql.GraphQLNonNull(fieldType);
-      }
-      fields[fieldName] = { type: fieldType };
-    }
+    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,
@@ -222,17 +229,7 @@ var toGraphQLInputType = (schema) => {
 var toGraphQLArgs = (schema) => {
   const ast = schema.ast;
   if (ast._tag === "TypeLiteral") {
-    const args = {};
-    for (const field2 of ast.propertySignatures) {
-      const fieldName = String(field2.name);
-      if (fieldName === "_tag") continue;
-      const fieldSchema = S2__namespace.make(field2.type);
-      let fieldType = toGraphQLInputType(fieldSchema);
-      if (!field2.isOptional) {
-        fieldType = new graphql.GraphQLNonNull(fieldType);
-      }
-      args[fieldName] = { type: fieldType };
-    }
+    const args = buildFieldsFromPropertySignatures(ast.propertySignatures, toGraphQLInputType);
     return args;
   }
   throw new Error(`Schema must be an object type to convert to GraphQL arguments`);
@@ -348,7 +345,7 @@ function toGraphQLTypeWithRegistry(schema, ctx) {
     if (enumType2) return enumType2;
   }
   if (ast._tag === "TupleType") {
-    return handleTupleTypeAST(ast, ctx);
+    return handleTupleTypeAST2(ast, ctx);
   }
   if (ast._tag === "Declaration") {
     if (isOptionDeclaration2(ast)) {
@@ -404,88 +401,112 @@ function getOptionInnerType2(ast) {
   }
   return void 0;
 }
-function handleTransformationAST(ast, ctx) {
-  const toAst = ast.to;
-  const fromAst = ast.from;
-  if (isOptionDeclaration2(toAst)) {
-    if (fromAst && fromAst._tag === "Union") {
-      for (const memberAst of fromAst.types) {
-        if (memberAst._tag === "Literal") continue;
-        if (memberAst._tag === "UndefinedKeyword") continue;
-        const typeName = ctx.astToTypeName?.get(memberAst);
-        if (typeName) {
-          const result = ctx.typeRegistry.get(typeName);
-          if (result) return result;
-        }
-        for (const [regTypeName, typeReg] of ctx.types) {
-          if (typeReg.schema.ast === memberAst) {
-            const result = ctx.typeRegistry.get(regTypeName);
-            if (result) return result;
-          }
-        }
-        if (memberAst._tag === "Transformation") {
-          const innerToAst = memberAst.to;
-          const transformedTypeName = ctx.astToTypeName?.get(innerToAst);
-          if (transformedTypeName) {
-            const result = ctx.typeRegistry.get(transformedTypeName);
-            if (result) return result;
-          }
-          for (const [regTypeName, typeReg] of ctx.types) {
-            if (typeReg.schema.ast === innerToAst) {
-              const result = ctx.typeRegistry.get(regTypeName);
-              if (result) return result;
-            }
-          }
-        }
-        if (memberAst._tag === "TypeLiteral") {
-          const valueField = memberAst.propertySignatures?.find(
-            (p) => String(p.name) === "value"
-          );
-          if (valueField) {
-            const valueType = valueField.type;
-            const valueTypeName = ctx.astToTypeName?.get(valueType);
-            if (valueTypeName) {
-              const result = ctx.typeRegistry.get(valueTypeName);
-              if (result) return result;
-            }
-            for (const [regTypeName, typeReg] of ctx.types) {
-              if (typeReg.schema.ast === valueType) {
-                const result = ctx.typeRegistry.get(regTypeName);
-                if (result) return result;
-              }
-              let regAst = typeReg.schema.ast;
-              while (regAst._tag === "Transformation") {
-                regAst = regAst.to;
-                if (regAst === valueType) {
-                  const result = ctx.typeRegistry.get(regTypeName);
-                  if (result) return result;
-                }
-              }
-            }
-            const innerResult = toGraphQLTypeWithRegistry(S2__namespace.make(valueType), ctx);
-            if (innerResult) return innerResult;
-          }
-        }
-      }
+function findRegisteredTypeForAST(memberAst, ctx) {
+  const typeName = ctx.astToTypeName?.get(memberAst);
+  if (typeName) {
+    const result = ctx.typeRegistry.get(typeName);
+    if (result) return result;
+  }
+  for (const [regTypeName, typeReg] of ctx.types) {
+    if (typeReg.schema.ast === memberAst) {
+      const result = ctx.typeRegistry.get(regTypeName);
+      if (result) return result;
+    }
+  }
+  return void 0;
+}
+function findRegisteredTypeForTransformation(memberAst, ctx) {
+  if (memberAst._tag !== "Transformation") return void 0;
+  const innerToAst = memberAst.to;
+  const transformedTypeName = ctx.astToTypeName?.get(innerToAst);
+  if (transformedTypeName) {
+    const result = ctx.typeRegistry.get(transformedTypeName);
+    if (result) return result;
+  }
+  for (const [regTypeName, typeReg] of ctx.types) {
+    if (typeReg.schema.ast === innerToAst) {
+      const result = ctx.typeRegistry.get(regTypeName);
+      if (result) return result;
+    }
+  }
+  return void 0;
+}
+function findRegisteredTypeForOptionSome(memberAst, ctx) {
+  if (memberAst._tag !== "TypeLiteral") return void 0;
+  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);
+  if (valueTypeName) {
+    const result = ctx.typeRegistry.get(valueTypeName);
+    if (result) return result;
+  }
+  for (const [regTypeName, typeReg] of ctx.types) {
+    if (typeReg.schema.ast === valueType) {
+      const result = ctx.typeRegistry.get(regTypeName);
+      if (result) return result;
     }
-    const innerType = getOptionInnerType2(toAst);
-    if (innerType) {
-      return toGraphQLTypeWithRegistry(S2__namespace.make(innerType), ctx);
+    let regAst = typeReg.schema.ast;
+    while (regAst._tag === "Transformation") {
+      regAst = regAst.to;
+      if (regAst === valueType) {
+        const result = ctx.typeRegistry.get(regTypeName);
+        if (result) return result;
+      }
     }
   }
-  if (toAst._tag === "TupleType") {
-    if (toAst.rest && toAst.rest.length > 0) {
-      const elementSchema = S2__namespace.make(toAst.rest[0].type);
-      const elementType = toGraphQLTypeWithRegistry(elementSchema, ctx);
-      return new graphql.GraphQLList(elementType);
-    } else if (toAst.elements.length > 0) {
-      const elementSchema = S2__namespace.make(toAst.elements[0].type);
-      const elementType = toGraphQLTypeWithRegistry(elementSchema, ctx);
-      return new graphql.GraphQLList(elementType);
+  const innerResult = toGraphQLTypeWithRegistry(S2__namespace.make(valueType), ctx);
+  return innerResult;
+}
+function handleOptionTransformation(ast, fromAst, toAst, ctx) {
+  if (fromAst && fromAst._tag === "Union") {
+    for (const memberAst of fromAst.types) {
+      if (memberAst._tag === "Literal") continue;
+      if (memberAst._tag === "UndefinedKeyword") continue;
+      const registeredType = findRegisteredTypeForAST(memberAst, ctx) || findRegisteredTypeForTransformation(memberAst, ctx) || findRegisteredTypeForOptionSome(memberAst, ctx);
+      if (registeredType) return registeredType;
     }
   }
+  const innerType = getOptionInnerType2(toAst);
+  if (innerType) {
+    return toGraphQLTypeWithRegistry(S2__namespace.make(innerType), ctx);
+  }
+  return void 0;
+}
+function handleArrayTransformation(toAst, ctx) {
+  if (toAst._tag !== "TupleType") return void 0;
+  let elementType;
+  if (toAst.rest && toAst.rest.length > 0) {
+    const elementSchema = S2__namespace.make(toAst.rest[0].type);
+    elementType = toGraphQLTypeWithRegistry(elementSchema, ctx);
+  } else if (toAst.elements.length > 0) {
+    const elementSchema = S2__namespace.make(toAst.elements[0].type);
+    elementType = toGraphQLTypeWithRegistry(elementSchema, ctx);
+  } else {
+    return void 0;
+  }
+  return new graphql.GraphQLList(elementType);
+}
+function handleTransformationAST(ast, ctx) {
+  const toAst = ast.to;
+  const fromAst = ast.from;
+  if (isOptionDeclaration2(toAst)) {
+    const optionResult = handleOptionTransformation(ast, fromAst, toAst, ctx);
+    if (optionResult) return optionResult;
+  }
+  const arrayResult = handleArrayTransformation(toAst, ctx);
+  if (arrayResult) return arrayResult;
   return toGraphQLTypeWithRegistry(S2__namespace.make(ast.to), ctx);
 }
+function findRegisteredTypeInUnionMembers(types, ctx) {
+  for (const memberAst of types) {
+    const registeredType = findRegisteredTypeForAST(memberAst, ctx) || findRegisteredTypeForTransformation(memberAst, ctx) || findRegisteredTypeForOptionSome(memberAst, ctx);
+    if (registeredType) return registeredType;
+  }
+  return void 0;
+}
 function handleUnionAST(ast, ctx) {
   const allLiterals = ast.types.every((t) => t._tag === "Literal");
   if (allLiterals) {
@@ -495,64 +516,8 @@ function handleUnionAST(ast, ctx) {
     const unionType2 = findRegisteredUnion(ast.types, ctx);
     if (unionType2) return unionType2;
   }
-  for (const memberAst of ast.types) {
-    const typeName = ctx.astToTypeName?.get(memberAst);
-    if (typeName) {
-      const result = ctx.typeRegistry.get(typeName);
-      if (result) return result;
-    }
-    for (const [regTypeName, typeReg] of ctx.types) {
-      if (typeReg.schema.ast === memberAst) {
-        const result = ctx.typeRegistry.get(regTypeName);
-        if (result) return result;
-      }
-    }
-    if (memberAst._tag === "Transformation") {
-      const toAst = memberAst.to;
-      const transformedTypeName = ctx.astToTypeName?.get(toAst);
-      if (transformedTypeName) {
-        const result = ctx.typeRegistry.get(transformedTypeName);
-        if (result) return result;
-      }
-      for (const [regTypeName, typeReg] of ctx.types) {
-        if (typeReg.schema.ast === toAst) {
-          const result = ctx.typeRegistry.get(regTypeName);
-          if (result) return result;
-        }
-      }
-    }
-    if (memberAst._tag === "TypeLiteral") {
-      const valueField = memberAst.propertySignatures?.find(
-        (p) => String(p.name) === "value"
-      );
-      if (valueField) {
-        const valueType = valueField.type;
-        const valueTypeName = ctx.astToTypeName?.get(valueType);
-        if (valueTypeName) {
-          const result = ctx.typeRegistry.get(valueTypeName);
-          if (result) return result;
-        }
-        for (const [regTypeName, typeReg] of ctx.types) {
-          if (typeReg.schema.ast === valueType) {
-            const result = ctx.typeRegistry.get(regTypeName);
-            if (result) return result;
-          }
-          let regAst = typeReg.schema.ast;
-          while (regAst._tag === "Transformation") {
-            regAst = regAst.to;
-            if (regAst === valueType) {
-              const result = ctx.typeRegistry.get(regTypeName);
-              if (result) return result;
-            }
-          }
-        }
-        const innerResult = toGraphQLTypeWithRegistry(S2__namespace.make(valueType), ctx);
-        if (innerResult) {
-          return innerResult;
-        }
-      }
-    }
-  }
+  const registeredType = findRegisteredTypeInUnionMembers(ast.types, ctx);
+  if (registeredType) return registeredType;
   if (ast.types.length > 0) {
     return toGraphQLTypeWithRegistry(S2__namespace.make(ast.types[0]), ctx);
   }
@@ -597,7 +562,7 @@ function findEnumForLiteral(ast, ctx) {
   }
   return void 0;
 }
-function handleTupleTypeAST(ast, ctx) {
+function handleTupleTypeAST2(ast, ctx) {
   if (ast.rest && ast.rest.length > 0) {
     const elementSchema = S2__namespace.make(ast.rest[0].type);
     const elementType = toGraphQLTypeWithRegistry(elementSchema, ctx);
@@ -697,170 +662,40 @@ function buildInputTypeLookupCache(inputs, enums) {
   }
   return cache;
 }
-function toGraphQLInputTypeWithRegistry(schema, enumRegistry, inputRegistry, inputs, enums, cache) {
-  const ast = schema.ast;
+function findRegisteredInputType(schema, ast, inputs, inputRegistry, cache) {
   if (cache?.schemaToInputName || cache?.astToInputName) {
     const inputName = cache.schemaToInputName?.get(schema) ?? cache.astToInputName?.get(ast);
     if (inputName) {
-      const result = inputRegistry.get(inputName);
-      if (result) return result;
+      return inputRegistry.get(inputName);
     }
   } else {
     for (const [inputName, inputReg] of inputs) {
       if (inputReg.schema.ast === ast || inputReg.schema === schema) {
-        const result = inputRegistry.get(inputName);
-        if (result) return result;
+        return inputRegistry.get(inputName);
       }
     }
   }
-  if (ast._tag === "Transformation") {
-    const toAst = ast.to;
-    const fromAst = ast.from;
-    if (isOptionDeclaration2(toAst) && fromAst && fromAst._tag === "Union") {
-      for (const memberAst of fromAst.types) {
-        if (memberAst._tag === "Literal") continue;
-        if (memberAst._tag === "UndefinedKeyword") continue;
-        const inputName = cache?.astToInputName?.get(memberAst);
-        if (inputName) {
-          const inputReg = inputs.get(inputName);
-          if (inputReg) {
-            return toGraphQLInputTypeWithRegistry(
-              inputReg.schema,
-              enumRegistry,
-              inputRegistry,
-              inputs,
-              enums,
-              cache
-            );
-          }
-        }
-        for (const [, inputReg] of inputs) {
-          if (inputReg.schema.ast === memberAst) {
-            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 inputReg = inputs.get(transformedInputName);
-            if (inputReg) {
-              return toGraphQLInputTypeWithRegistry(
-                inputReg.schema,
-                enumRegistry,
-                inputRegistry,
-                inputs,
-                enums,
-                cache
-              );
-            }
-          }
-          for (const [, inputReg] of inputs) {
-            if (inputReg.schema.ast === innerToAst) {
-              return toGraphQLInputTypeWithRegistry(
-                inputReg.schema,
-                enumRegistry,
-                inputRegistry,
-                inputs,
-                enums,
-                cache
-              );
-            }
-          }
-        }
-        if (memberAst._tag === "TypeLiteral") {
-          const valueField = memberAst.propertySignatures?.find(
-            (p) => String(p.name) === "value"
-          );
-          if (valueField) {
-            const valueType = valueField.type;
-            const valueInputName = cache?.astToInputName?.get(valueType);
-            if (valueInputName) {
-              const inputReg = inputs.get(valueInputName);
-              if (inputReg) {
-                return toGraphQLInputTypeWithRegistry(
-                  inputReg.schema,
-                  enumRegistry,
-                  inputRegistry,
-                  inputs,
-                  enums,
-                  cache
-                );
-              }
-            }
-            for (const [, inputReg] of inputs) {
-              if (inputReg.schema.ast === valueType) {
-                return toGraphQLInputTypeWithRegistry(
-                  inputReg.schema,
-                  enumRegistry,
-                  inputRegistry,
-                  inputs,
-                  enums,
-                  cache
-                );
-              }
-              let regAst = inputReg.schema.ast;
-              while (regAst._tag === "Transformation") {
-                regAst = regAst.to;
-                if (regAst === valueType) {
-                  return toGraphQLInputTypeWithRegistry(
-                    inputReg.schema,
-                    enumRegistry,
-                    inputRegistry,
-                    inputs,
-                    enums,
-                    cache
-                  );
-                }
-              }
-              if (regAst._tag === "Declaration" && regAst.typeParameters?.[0] === valueType) {
-                return toGraphQLInputTypeWithRegistry(
-                  inputReg.schema,
-                  enumRegistry,
-                  inputRegistry,
-                  inputs,
-                  enums,
-                  cache
-                );
-              }
-            }
-            const innerResult = toGraphQLInputTypeWithRegistry(
-              S2__namespace.make(valueType),
-              enumRegistry,
-              inputRegistry,
-              inputs,
-              enums,
-              cache
-            );
-            if (innerResult) {
-              return innerResult;
-            }
-          }
-        }
-      }
+  return void 0;
+}
+function findRegisteredInputForAST(memberAst, inputs, inputRegistry, enumRegistry, enums, cache) {
+  const inputName = cache?.astToInputName?.get(memberAst);
+  if (inputName) {
+    const inputReg = inputs.get(inputName);
+    if (inputReg) {
+      return toGraphQLInputTypeWithRegistry(
+        inputReg.schema,
+        enumRegistry,
+        inputRegistry,
+        inputs,
+        enums,
+        cache
+      );
     }
-    return toGraphQLInputTypeWithRegistry(
-      S2__namespace.make(toAst),
-      enumRegistry,
-      inputRegistry,
-      inputs,
-      enums,
-      cache
-    );
   }
-  if (ast._tag === "Union") {
-    const unionAst = ast;
-    const nonUndefinedTypes = unionAst.types.filter((t) => t._tag !== "UndefinedKeyword");
-    if (nonUndefinedTypes.length === 1 && nonUndefinedTypes[0]._tag === "Union") {
+  for (const [, inputReg] of inputs) {
+    if (inputReg.schema.ast === memberAst) {
       return toGraphQLInputTypeWithRegistry(
-        S2__namespace.make(nonUndefinedTypes[0]),
+        inputReg.schema,
         enumRegistry,
         inputRegistry,
         inputs,
@@ -868,9 +703,18 @@ function toGraphQLInputTypeWithRegistry(schema, enumRegistry, inputRegistry, inp
         cache
       );
     }
-    if (nonUndefinedTypes.length === 1 && nonUndefinedTypes[0]._tag === "TypeLiteral") {
+  }
+  return void 0;
+}
+function findRegisteredInputForTransformation(memberAst, inputs, inputRegistry, enumRegistry, enums, cache) {
+  if (memberAst._tag !== "Transformation") return void 0;
+  const innerToAst = memberAst.to;
+  const transformedInputName = cache?.astToInputName?.get(innerToAst);
+  if (transformedInputName) {
+    const inputReg = inputs.get(transformedInputName);
+    if (inputReg) {
       return toGraphQLInputTypeWithRegistry(
-        S2__namespace.make(nonUndefinedTypes[0]),
+        inputReg.schema,
         enumRegistry,
         inputRegistry,
         inputs,
@@ -878,171 +722,210 @@ function toGraphQLInputTypeWithRegistry(schema, enumRegistry, inputRegistry, inp
         cache
       );
     }
-    for (const memberAst of unionAst.types) {
-      const inputName = cache?.astToInputName?.get(memberAst);
-      if (inputName) {
-        const inputReg = inputs.get(inputName);
-        if (inputReg) {
-          return toGraphQLInputTypeWithRegistry(
-            inputReg.schema,
-            enumRegistry,
-            inputRegistry,
-            inputs,
-            enums,
-            cache
-          );
-        }
-      }
-      for (const [, inputReg] of inputs) {
-        if (inputReg.schema.ast === memberAst) {
-          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 inputReg = inputs.get(transformedInputName);
-          if (inputReg) {
-            return toGraphQLInputTypeWithRegistry(
-              inputReg.schema,
-              enumRegistry,
-              inputRegistry,
-              inputs,
-              enums,
-              cache
-            );
-          }
-        }
-        for (const [, inputReg] of inputs) {
-          if (inputReg.schema.ast === toAst) {
-            return toGraphQLInputTypeWithRegistry(
-              inputReg.schema,
-              enumRegistry,
-              inputRegistry,
-              inputs,
-              enums,
-              cache
-            );
-          }
-        }
-      }
-      if (memberAst._tag === "TypeLiteral") {
-        const valueField = memberAst.propertySignatures?.find(
-          (p) => String(p.name) === "value"
+  }
+  for (const [, inputReg] of inputs) {
+    if (inputReg.schema.ast === innerToAst) {
+      return toGraphQLInputTypeWithRegistry(
+        inputReg.schema,
+        enumRegistry,
+        inputRegistry,
+        inputs,
+        enums,
+        cache
+      );
+    }
+  }
+  return void 0;
+}
+function findRegisteredInputForOptionSome(memberAst, inputs, inputRegistry, enumRegistry, enums, cache) {
+  if (memberAst._tag !== "TypeLiteral") return void 0;
+  const valueField = memberAst.propertySignatures?.find(
+    (p) => String(p.name) === "value"
+  );
+  if (!valueField) return void 0;
+  const valueType = valueField.type;
+  const valueInputName = cache?.astToInputName?.get(valueType);
+  if (valueInputName) {
+    const inputReg = inputs.get(valueInputName);
+    if (inputReg) {
+      return toGraphQLInputTypeWithRegistry(
+        inputReg.schema,
+        enumRegistry,
+        inputRegistry,
+        inputs,
+        enums,
+        cache
+      );
+    }
+  }
+  for (const [, inputReg] of inputs) {
+    if (inputReg.schema.ast === valueType) {
+      return toGraphQLInputTypeWithRegistry(
+        inputReg.schema,
+        enumRegistry,
+        inputRegistry,
+        inputs,
+        enums,
+        cache
+      );
+    }
+    let regAst = inputReg.schema.ast;
+    while (regAst._tag === "Transformation") {
+      regAst = regAst.to;
+      if (regAst === valueType) {
+        return toGraphQLInputTypeWithRegistry(
+          inputReg.schema,
+          enumRegistry,
+          inputRegistry,
+          inputs,
+          enums,
+          cache
         );
-        if (valueField) {
-          const valueType = valueField.type;
-          const valueInputName = cache?.astToInputName?.get(valueType);
-          if (valueInputName) {
-            const inputReg = inputs.get(valueInputName);
-            if (inputReg) {
-              return toGraphQLInputTypeWithRegistry(
-                inputReg.schema,
-                enumRegistry,
-                inputRegistry,
-                inputs,
-                enums,
-                cache
-              );
-            }
-          }
-          for (const [, inputReg] of inputs) {
-            if (inputReg.schema.ast === valueType) {
-              return toGraphQLInputTypeWithRegistry(
-                inputReg.schema,
-                enumRegistry,
-                inputRegistry,
-                inputs,
-                enums,
-                cache
-              );
-            }
-            let regAst = inputReg.schema.ast;
-            while (regAst._tag === "Transformation") {
-              regAst = regAst.to;
-              if (regAst === valueType) {
-                return toGraphQLInputTypeWithRegistry(
-                  inputReg.schema,
-                  enumRegistry,
-                  inputRegistry,
-                  inputs,
-                  enums,
-                  cache
-                );
-              }
-            }
-            if (regAst._tag === "Declaration" && regAst.typeParameters?.[0] === valueType) {
-              return toGraphQLInputTypeWithRegistry(
-                inputReg.schema,
-                enumRegistry,
-                inputRegistry,
-                inputs,
-                enums,
-                cache
-              );
-            }
-          }
-          const innerResult = toGraphQLInputTypeWithRegistry(
-            S2__namespace.make(valueType),
-            enumRegistry,
-            inputRegistry,
-            inputs,
-            enums,
-            cache
-          );
-          if (innerResult) {
-            return innerResult;
-          }
-        }
       }
     }
-    const allLiterals = unionAst.types.every((t) => t._tag === "Literal");
-    if (allLiterals) {
-      const literalValues = unionAst.types.map((t) => String(t.literal)).sort();
-      for (const [enumName] of enums) {
-        const enumValues = cache?.enumSortedValues?.get(enumName) ?? [...enums.get(enumName).values].sort();
-        if (literalValues.length === enumValues.length && literalValues.every((v, i) => v === enumValues[i])) {
-          const result = enumRegistry.get(enumName);
-          if (result) return result;
-        }
-      }
+    if (regAst._tag === "Declaration" && regAst.typeParameters?.[0] === valueType) {
+      return toGraphQLInputTypeWithRegistry(
+        inputReg.schema,
+        enumRegistry,
+        inputRegistry,
+        inputs,
+        enums,
+        cache
+      );
     }
   }
-  if (ast._tag === "Literal") {
-    const literalValue = String(ast.literal);
-    if (cache?.literalToEnumName) {
-      const enumName = cache.literalToEnumName.get(literalValue);
-      if (enumName) {
+  const innerResult = toGraphQLInputTypeWithRegistry(
+    S2__namespace.make(valueType),
+    enumRegistry,
+    inputRegistry,
+    inputs,
+    enums,
+    cache
+  );
+  return innerResult || void 0;
+}
+function handleOptionTransformationForInput(fromAst, toAst, inputs, inputRegistry, enumRegistry, enums, cache) {
+  if (!fromAst || fromAst._tag !== "Union") return void 0;
+  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);
+    if (registeredInput) return registeredInput;
+  }
+  return void 0;
+}
+function handleTransformationForInput(ast, inputs, inputRegistry, enumRegistry, enums, cache) {
+  const toAst = ast.to;
+  const fromAst = ast.from;
+  if (isOptionDeclaration2(toAst)) {
+    const optionResult = handleOptionTransformationForInput(
+      fromAst,
+      toAst,
+      inputs,
+      inputRegistry,
+      enumRegistry,
+      enums,
+      cache
+    );
+    if (optionResult) return optionResult;
+  }
+  return toGraphQLInputTypeWithRegistry(
+    S2__namespace.make(toAst),
+    enumRegistry,
+    inputRegistry,
+    inputs,
+    enums,
+    cache
+  );
+}
+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);
+    if (registeredInput) return registeredInput;
+  }
+  return void 0;
+}
+function handleUnionForInput(ast, inputs, inputRegistry, enumRegistry, enums, cache) {
+  const unionAst = ast;
+  const nonUndefinedTypes = unionAst.types.filter((t) => t._tag !== "UndefinedKeyword");
+  if (nonUndefinedTypes.length === 1) {
+    if (nonUndefinedTypes[0]._tag === "Union" || nonUndefinedTypes[0]._tag === "TypeLiteral") {
+      return toGraphQLInputTypeWithRegistry(
+        S2__namespace.make(nonUndefinedTypes[0]),
+        enumRegistry,
+        inputRegistry,
+        inputs,
+        enums,
+        cache
+      );
+    }
+  }
+  const registeredInput = findRegisteredInputInUnionMembers(
+    unionAst.types,
+    inputs,
+    inputRegistry,
+    enumRegistry,
+    enums,
+    cache
+  );
+  if (registeredInput) return registeredInput;
+  const allLiterals = unionAst.types.every((t) => t._tag === "Literal");
+  if (allLiterals) {
+    const literalValues = unionAst.types.map((t) => String(t.literal)).sort();
+    for (const [enumName] of enums) {
+      const enumValues = cache?.enumSortedValues?.get(enumName) ?? [...enums.get(enumName).values].sort();
+      if (literalValues.length === enumValues.length && literalValues.every((v, i) => v === enumValues[i])) {
         const result = enumRegistry.get(enumName);
         if (result) return result;
       }
-    } else {
-      for (const [enumName, enumReg] of enums) {
-        if (enumReg.values.includes(literalValue)) {
-          const result = enumRegistry.get(enumName);
-          if (result) return result;
-        }
+    }
+  }
+  return void 0;
+}
+function handleLiteralForInput(ast, enumRegistry, enums, cache) {
+  const literalValue = String(ast.literal);
+  if (cache?.literalToEnumName) {
+    const enumName = cache.literalToEnumName.get(literalValue);
+    if (enumName) {
+      return enumRegistry.get(enumName);
+    }
+  } else {
+    for (const [enumName, enumReg] of enums) {
+      if (enumReg.values.includes(literalValue)) {
+        return enumRegistry.get(enumName);
       }
     }
   }
+  return void 0;
+}
+function handleSuspendForInput(ast, inputs, inputRegistry, enumRegistry, enums, cache) {
+  const innerAst = ast.f();
+  return toGraphQLInputTypeWithRegistry(
+    S2__namespace.make(innerAst),
+    enumRegistry,
+    inputRegistry,
+    inputs,
+    enums,
+    cache
+  );
+}
+function toGraphQLInputTypeWithRegistry(schema, enumRegistry, inputRegistry, inputs, enums, cache) {
+  const ast = schema.ast;
+  const registeredInput = findRegisteredInputType(schema, ast, inputs, inputRegistry, cache);
+  if (registeredInput) return registeredInput;
+  if (ast._tag === "Transformation") {
+    return handleTransformationForInput(ast, inputs, inputRegistry, enumRegistry, enums, cache);
+  }
+  if (ast._tag === "Union") {
+    const unionResult = handleUnionForInput(ast, inputs, inputRegistry, enumRegistry, enums, cache);
+    if (unionResult) return unionResult;
+  }
+  if (ast._tag === "Literal") {
+    const literalResult = handleLiteralForInput(ast, enumRegistry, enums, cache);
+    if (literalResult) return literalResult;
+  }
   if (ast._tag === "Suspend") {
-    const innerAst = ast.f();
-    return toGraphQLInputTypeWithRegistry(
-      S2__namespace.make(innerAst),
-      enumRegistry,
-      inputRegistry,
-      inputs,
-      enums,
-      cache
-    );
+    return handleSuspendForInput(ast, inputs, inputRegistry, enumRegistry, enums, cache);
   }
   return toGraphQLInputType(schema);
 }