@effect-gql/core 1.4.1 → 1.4.3

package/builder/index.js

@@ -240,6 +240,14 @@ function buildReverseLookups(ctx) {
     for (const [typeName, typeReg] of ctx.types) {
       ctx.schemaToTypeName.set(typeReg.schema, typeName);
       ctx.astToTypeName.set(typeReg.schema.ast, typeName);
+      let ast = typeReg.schema.ast;
+      while (ast._tag === "Transformation") {
+        ast = ast.to;
+        ctx.astToTypeName.set(ast, typeName);
+      }
+      if (ast._tag === "Declaration" && ast.typeParameters?.[0]) {
+        ctx.astToTypeName.set(ast.typeParameters[0], typeName);
+      }
     }
   }
   if (!ctx.schemaToInterfaceName) {
@@ -248,6 +256,14 @@ function buildReverseLookups(ctx) {
     for (const [interfaceName, interfaceReg] of ctx.interfaces) {
       ctx.schemaToInterfaceName.set(interfaceReg.schema, interfaceName);
       ctx.astToInterfaceName.set(interfaceReg.schema.ast, interfaceName);
+      let ast = interfaceReg.schema.ast;
+      while (ast._tag === "Transformation") {
+        ast = ast.to;
+        ctx.astToInterfaceName.set(ast, interfaceName);
+      }
+      if (ast._tag === "Declaration" && ast.typeParameters?.[0]) {
+        ctx.astToInterfaceName.set(ast.typeParameters[0], interfaceName);
+      }
     }
   }
   if (!ctx.schemaToInputName) {
@@ -256,6 +272,14 @@ function buildReverseLookups(ctx) {
     for (const [inputName, inputReg] of ctx.inputs) {
       ctx.schemaToInputName.set(inputReg.schema, inputName);
       ctx.astToInputName.set(inputReg.schema.ast, inputName);
+      let ast = inputReg.schema.ast;
+      while (ast._tag === "Transformation") {
+        ast = ast.to;
+        ctx.astToInputName.set(ast, inputName);
+      }
+      if (ast._tag === "Declaration" && ast.typeParameters?.[0]) {
+        ctx.astToInputName.set(ast.typeParameters[0], inputName);
+      }
     }
   }
   if (!ctx.enumSortedValues) {
@@ -360,7 +384,27 @@ function getOptionInnerType2(ast) {
 }
 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;
+        }
+        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;
+          }
+        }
+      }
+    }
     const innerType = getOptionInnerType2(toAst);
     if (innerType) {
       return toGraphQLTypeWithRegistry(S.make(innerType), ctx);
@@ -388,6 +432,21 @@ 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;
+    }
+    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;
+      }
+    }
+  }
   if (ast.types.length > 0) {
     return toGraphQLTypeWithRegistry(S.make(ast.types[0]), ctx);
   }
@@ -515,6 +574,14 @@ function buildInputTypeLookupCache(inputs, enums) {
   for (const [inputName, inputReg] of inputs) {
     cache.schemaToInputName.set(inputReg.schema, inputName);
     cache.astToInputName.set(inputReg.schema.ast, inputName);
+    let ast = inputReg.schema.ast;
+    while (ast._tag === "Transformation") {
+      ast = ast.to;
+      cache.astToInputName.set(ast, inputName);
+    }
+    if (ast._tag === "Declaration" && ast.typeParameters?.[0]) {
+      cache.astToInputName.set(ast.typeParameters[0], inputName);
+    }
   }
   for (const [enumName, enumReg] of enums) {
     cache.enumSortedValues.set(enumName, [...enumReg.values].sort());
@@ -542,6 +609,26 @@ function toGraphQLInputTypeWithRegistry(schema, enumRegistry, inputRegistry, inp
   }
   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 result = inputRegistry.get(inputName);
+          if (result) return result;
+        }
+        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;
+          }
+        }
+      }
+    }
     return toGraphQLInputTypeWithRegistry(
       S.make(toAst),
       enumRegistry,
@@ -574,6 +661,21 @@ function toGraphQLInputTypeWithRegistry(schema, enumRegistry, inputRegistry, inp
         cache
       );
     }
+    for (const memberAst of unionAst.types) {
+      const inputName = cache?.astToInputName?.get(memberAst);
+      if (inputName) {
+        const result = inputRegistry.get(inputName);
+        if (result) return result;
+      }
+      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 allLiterals = unionAst.types.every((t) => t._tag === "Literal");
     if (allLiterals) {
       const literalValues = unionAst.types.map((t) => String(t.literal)).sort();