@effect-gql/core 1.4.0 → 1.4.2

package/builder/index.js

@@ -76,6 +76,7 @@ var toGraphQLType = (schema) => {
     const fields = {};
     for (const field2 of ast.propertySignatures) {
       const fieldName = String(field2.name);
+      if (fieldName === "_tag") continue;
       const fieldSchema = S.make(field2.type);
       let fieldType = toGraphQLType(fieldSchema);
       if (!field2.isOptional) {
@@ -151,6 +152,7 @@ var toGraphQLInputType = (schema) => {
     const fields = {};
     for (const field2 of ast.propertySignatures) {
       const fieldName = String(field2.name);
+      if (fieldName === "_tag") continue;
       const fieldSchema = S.make(field2.type);
       let fieldType = toGraphQLInputType(fieldSchema);
       if (!field2.isOptional) {
@@ -201,6 +203,7 @@ var toGraphQLArgs = (schema) => {
     const args = {};
     for (const field2 of ast.propertySignatures) {
       const fieldName = String(field2.name);
+      if (fieldName === "_tag") continue;
       const fieldSchema = S.make(field2.type);
       let fieldType = toGraphQLInputType(fieldSchema);
       if (!field2.isOptional) {
@@ -357,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);
@@ -385,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);
   }
@@ -448,14 +486,21 @@ function schemaToFields(schema, ctx) {
   }
   if (ast._tag === "Declaration") {
     const typeParams = ast.typeParameters;
-    if (typeParams && typeParams.length > 0 && typeParams[0]._tag === "TypeLiteral") {
-      ast = typeParams[0];
+    if (typeParams && typeParams.length > 0) {
+      let innerAst = typeParams[0];
+      while (innerAst._tag === "Transformation") {
+        innerAst = innerAst.to;
+      }
+      if (innerAst._tag === "TypeLiteral") {
+        ast = innerAst;
+      }
     }
   }
   if (ast._tag === "TypeLiteral") {
     const fields = {};
     for (const field2 of ast.propertySignatures) {
       const fieldName = String(field2.name);
+      if (fieldName === "_tag") continue;
       const fieldSchema = S.make(field2.type);
       let fieldType = toGraphQLTypeWithRegistry(fieldSchema, ctx);
       if (!field2.isOptional) {
@@ -468,11 +513,15 @@ function schemaToFields(schema, ctx) {
   return {};
 }
 function schemaToInputFields(schema, enumRegistry, inputRegistry, inputs, enums, cache) {
-  const ast = schema.ast;
+  let ast = schema.ast;
+  while (ast._tag === "Transformation") {
+    ast = ast.to;
+  }
   if (ast._tag === "TypeLiteral") {
     const fields = {};
     for (const field2 of ast.propertySignatures) {
       const fieldName = String(field2.name);
+      if (fieldName === "_tag") continue;
       const fieldSchema = S.make(field2.type);
       let fieldType = toGraphQLInputTypeWithRegistry(
         fieldSchema,
@@ -512,17 +561,6 @@ function buildInputTypeLookupCache(inputs, enums) {
 }
 function toGraphQLInputTypeWithRegistry(schema, enumRegistry, inputRegistry, inputs, enums, cache) {
   const ast = schema.ast;
-  if (ast._tag === "Transformation") {
-    const toAst = ast.to;
-    return toGraphQLInputTypeWithRegistry(
-      S.make(toAst),
-      enumRegistry,
-      inputRegistry,
-      inputs,
-      enums,
-      cache
-    );
-  }
   if (cache?.schemaToInputName || cache?.astToInputName) {
     const inputName = cache.schemaToInputName?.get(schema) ?? cache.astToInputName?.get(ast);
     if (inputName) {
@@ -537,6 +575,37 @@ 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,
+      inputRegistry,
+      inputs,
+      enums,
+      cache
+    );
+  }
   if (ast._tag === "Union") {
     const unionAst = ast;
     const nonUndefinedTypes = unionAst.types.filter((t) => t._tag !== "UndefinedKeyword");
@@ -560,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();
@@ -608,6 +692,7 @@ function toGraphQLArgsWithRegistry(schema, enumRegistry, inputRegistry, inputs,
     const args = {};
     for (const field2 of ast.propertySignatures) {
       const fieldName = String(field2.name);
+      if (fieldName === "_tag") continue;
       const fieldSchema = S.make(field2.type);
       let fieldType = toGraphQLInputTypeWithRegistry(
         fieldSchema,