@effect-gql/core 1.4.1 → 1.4.2

package/builder/index.js

@@ -360,7 +360,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 +408,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);
   }
@@ -542,6 +577,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 +629,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();