@effect-gql/core 1.4.3 → 1.4.5

package/index.js

@@ -1,7 +1,7 @@
 import { GraphQLDirective, GraphQLEnumType, GraphQLInputObjectType, GraphQLInterfaceType, GraphQLObjectType, GraphQLUnionType, GraphQLSchema, GraphQLNonNull, GraphQLString, GraphQLFloat, GraphQLBoolean, GraphQLInt, GraphQLList, parse, GraphQLError, validate, execute as execute$1, Kind, specifiedRules, NoSchemaIntrospectionCustomRule, subscribe, GraphQLScalarType } from 'graphql';
 export { DirectiveLocation, GraphQLBoolean, GraphQLEnumType, GraphQLFloat, GraphQLID, GraphQLInputObjectType, GraphQLInt, GraphQLInterfaceType, GraphQLList, GraphQLNonNull, GraphQLObjectType, GraphQLScalarType, GraphQLSchema, GraphQLString, GraphQLUnionType, Kind, graphql, lexicographicSortSchema, printSchema } from 'graphql';
 import { Pipeable, Context, Data, Layer, Effect, Ref, HashMap, Config, Option, Schema, Runtime, Queue, Stream, Fiber, Deferred } from 'effect';
-import * as S from 'effect/Schema';
+import * as S2 from 'effect/Schema';
 import * as AST from 'effect/SchemaAST';
 import DataLoader from 'dataloader';
 import { HttpIncomingMessage, HttpServerResponse, HttpServerRequest, HttpRouter } from '@effect/platform';
@@ -58,7 +58,7 @@ var toGraphQLType = (schema) => {
     if (isIntegerType(ast)) {
       return GraphQLInt;
     }
-    return toGraphQLType(S.make(ast.from));
+    return toGraphQLType(S2.make(ast.from));
   }
   if (ast._tag === "Literal") {
     if (typeof ast.literal === "string") return GraphQLString;
@@ -70,7 +70,7 @@ var toGraphQLType = (schema) => {
   if (ast._tag === "TupleType") {
     const elements = ast.elements;
     if (elements.length > 0) {
-      const elementSchema = S.make(elements[0].type);
+      const elementSchema = S2.make(elements[0].type);
       return new GraphQLList(toGraphQLType(elementSchema));
     }
   }
@@ -79,7 +79,7 @@ var toGraphQLType = (schema) => {
     for (const field2 of ast.propertySignatures) {
       const fieldName = String(field2.name);
       if (fieldName === "_tag") continue;
-      const fieldSchema = S.make(field2.type);
+      const fieldSchema = S2.make(field2.type);
       let fieldType = toGraphQLType(fieldSchema);
       if (!field2.isOptional) {
         fieldType = new GraphQLNonNull(fieldType);
@@ -96,32 +96,32 @@ var toGraphQLType = (schema) => {
     if (isOptionTransformation(ast)) {
       const innerType = getOptionInnerType(ast.to);
       if (innerType) {
-        return toGraphQLType(S.make(innerType));
+        return toGraphQLType(S2.make(innerType));
       }
     }
-    return toGraphQLType(S.make(ast.to));
+    return toGraphQLType(S2.make(ast.to));
   }
   if (ast._tag === "Declaration") {
     if (isOptionDeclaration(ast)) {
       const innerType = getOptionInnerType(ast);
       if (innerType) {
-        return toGraphQLType(S.make(innerType));
+        return toGraphQLType(S2.make(innerType));
       }
     }
     const typeParams = ast.typeParameters;
     if (typeParams && typeParams.length > 0) {
-      return toGraphQLType(S.make(typeParams[0]));
+      return toGraphQLType(S2.make(typeParams[0]));
     }
   }
   if (ast._tag === "Union") {
     const types = ast.types;
     if (types.length > 0) {
-      return toGraphQLType(S.make(types[0]));
+      return toGraphQLType(S2.make(types[0]));
     }
   }
   if (ast._tag === "Suspend") {
     const innerAst = ast.f();
-    return toGraphQLType(S.make(innerAst));
+    return toGraphQLType(S2.make(innerAst));
   }
   return GraphQLString;
 };
@@ -134,7 +134,7 @@ var toGraphQLInputType = (schema) => {
     if (isIntegerType(ast)) {
       return GraphQLInt;
     }
-    return toGraphQLInputType(S.make(ast.from));
+    return toGraphQLInputType(S2.make(ast.from));
   }
   if (ast._tag === "Literal") {
     if (typeof ast.literal === "string") return GraphQLString;
@@ -146,7 +146,7 @@ var toGraphQLInputType = (schema) => {
   if (ast._tag === "TupleType") {
     const elements = ast.elements;
     if (elements.length > 0) {
-      const elementSchema = S.make(elements[0].type);
+      const elementSchema = S2.make(elements[0].type);
       return new GraphQLList(toGraphQLInputType(elementSchema));
     }
   }
@@ -155,7 +155,7 @@ var toGraphQLInputType = (schema) => {
     for (const field2 of ast.propertySignatures) {
       const fieldName = String(field2.name);
       if (fieldName === "_tag") continue;
-      const fieldSchema = S.make(field2.type);
+      const fieldSchema = S2.make(field2.type);
       let fieldType = toGraphQLInputType(fieldSchema);
       if (!field2.isOptional) {
         fieldType = new GraphQLNonNull(fieldType);
@@ -169,33 +169,33 @@ var toGraphQLInputType = (schema) => {
     });
   }
   if (ast._tag === "Transformation") {
-    return toGraphQLInputType(S.make(ast.from));
+    return toGraphQLInputType(S2.make(ast.from));
   }
   if (ast._tag === "Declaration") {
     if (isOptionDeclaration(ast)) {
       const innerType = getOptionInnerType(ast);
       if (innerType) {
-        return toGraphQLInputType(S.make(innerType));
+        return toGraphQLInputType(S2.make(innerType));
       }
     }
     const typeParams = ast.typeParameters;
     if (typeParams && typeParams.length > 0) {
-      return toGraphQLInputType(S.make(typeParams[0]));
+      return toGraphQLInputType(S2.make(typeParams[0]));
     }
   }
   if (ast._tag === "Union") {
     const types = ast.types;
     const nonNullTypes = types.filter((t) => t._tag !== "Literal" || t.literal !== null).filter((t) => t._tag !== "UndefinedKeyword");
     if (nonNullTypes.length > 0) {
-      return toGraphQLInputType(S.make(nonNullTypes[0]));
+      return toGraphQLInputType(S2.make(nonNullTypes[0]));
     }
     if (types.length > 0) {
-      return toGraphQLInputType(S.make(types[0]));
+      return toGraphQLInputType(S2.make(types[0]));
     }
   }
   if (ast._tag === "Suspend") {
     const innerAst = ast.f();
-    return toGraphQLInputType(S.make(innerAst));
+    return toGraphQLInputType(S2.make(innerAst));
   }
   return GraphQLString;
 };
@@ -218,7 +218,7 @@ var toGraphQLObjectType = (name, schema, additionalFields) => {
     for (const field2 of ast.propertySignatures) {
       const fieldName = String(field2.name);
       if (fieldName === "_tag") continue;
-      const fieldSchema = S.make(field2.type);
+      const fieldSchema = S2.make(field2.type);
       let fieldType = toGraphQLType(fieldSchema);
       if (!field2.isOptional) {
         fieldType = new GraphQLNonNull(fieldType);
@@ -250,7 +250,7 @@ var toGraphQLArgs = (schema) => {
     for (const field2 of ast.propertySignatures) {
       const fieldName = String(field2.name);
       if (fieldName === "_tag") continue;
-      const fieldSchema = S.make(field2.type);
+      const fieldSchema = S2.make(field2.type);
       let fieldType = toGraphQLInputType(fieldSchema);
       if (!field2.isOptional) {
         fieldType = new GraphQLNonNull(fieldType);
@@ -378,17 +378,17 @@ function toGraphQLTypeWithRegistry(schema, ctx) {
     if (isOptionDeclaration2(ast)) {
       const innerType = getOptionInnerType2(ast);
       if (innerType) {
-        return toGraphQLTypeWithRegistry(S.make(innerType), ctx);
+        return toGraphQLTypeWithRegistry(S2.make(innerType), ctx);
       }
     }
     const typeParams = ast.typeParameters;
     if (typeParams && typeParams.length > 0) {
-      return toGraphQLTypeWithRegistry(S.make(typeParams[0]), ctx);
+      return toGraphQLTypeWithRegistry(S2.make(typeParams[0]), ctx);
     }
   }
   if (ast._tag === "Suspend") {
     const innerAst = ast.f();
-    return toGraphQLTypeWithRegistry(S.make(innerAst), ctx);
+    return toGraphQLTypeWithRegistry(S2.make(innerAst), ctx);
   }
   return toGraphQLType(schema);
 }
@@ -441,6 +441,12 @@ function handleTransformationAST(ast, ctx) {
           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);
@@ -448,26 +454,61 @@ function handleTransformationAST(ast, ctx) {
             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.make(valueType), ctx);
+            if (innerResult) return innerResult;
+          }
         }
       }
     }
     const innerType = getOptionInnerType2(toAst);
     if (innerType) {
-      return toGraphQLTypeWithRegistry(S.make(innerType), ctx);
+      return toGraphQLTypeWithRegistry(S2.make(innerType), ctx);
     }
   }
   if (toAst._tag === "TupleType") {
     if (toAst.rest && toAst.rest.length > 0) {
-      const elementSchema = S.make(toAst.rest[0].type);
+      const elementSchema = S2.make(toAst.rest[0].type);
       const elementType = toGraphQLTypeWithRegistry(elementSchema, ctx);
       return new GraphQLList(elementType);
     } else if (toAst.elements.length > 0) {
-      const elementSchema = S.make(toAst.elements[0].type);
+      const elementSchema = S2.make(toAst.elements[0].type);
       const elementType = toGraphQLTypeWithRegistry(elementSchema, ctx);
       return new GraphQLList(elementType);
     }
   }
-  return toGraphQLTypeWithRegistry(S.make(ast.to), ctx);
+  return toGraphQLTypeWithRegistry(S2.make(ast.to), ctx);
 }
 function handleUnionAST(ast, ctx) {
   const allLiterals = ast.types.every((t) => t._tag === "Literal");
@@ -484,6 +525,12 @@ function handleUnionAST(ast, ctx) {
       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);
@@ -491,12 +538,49 @@ function handleUnionAST(ast, ctx) {
         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.make(valueType), ctx);
+        if (innerResult) {
+          return innerResult;
+        }
+      }
     }
   }
   if (ast.types.length > 0) {
-    return toGraphQLTypeWithRegistry(S.make(ast.types[0]), ctx);
+    return toGraphQLTypeWithRegistry(S2.make(ast.types[0]), ctx);
   }
-  return toGraphQLType(S.make(ast));
+  return toGraphQLType(S2.make(ast));
 }
 function findEnumForLiteralUnion(types, ctx) {
   const literalValues = types.map((t) => String(t.literal)).sort();
@@ -539,15 +623,15 @@ function findEnumForLiteral(ast, ctx) {
 }
 function handleTupleTypeAST(ast, ctx) {
   if (ast.rest && ast.rest.length > 0) {
-    const elementSchema = S.make(ast.rest[0].type);
+    const elementSchema = S2.make(ast.rest[0].type);
     const elementType = toGraphQLTypeWithRegistry(elementSchema, ctx);
     return new GraphQLList(elementType);
   } else if (ast.elements && ast.elements.length > 0) {
-    const elementSchema = S.make(ast.elements[0].type);
+    const elementSchema = S2.make(ast.elements[0].type);
     const elementType = toGraphQLTypeWithRegistry(elementSchema, ctx);
     return new GraphQLList(elementType);
   }
-  return toGraphQLType(S.make(ast));
+  return toGraphQLType(S2.make(ast));
 }
 function schemaToFields(schema, ctx) {
   let ast = schema.ast;
@@ -571,7 +655,7 @@ function schemaToFields(schema, ctx) {
     for (const field2 of ast.propertySignatures) {
       const fieldName = String(field2.name);
       if (fieldName === "_tag") continue;
-      const fieldSchema = S.make(field2.type);
+      const fieldSchema = S2.make(field2.type);
       let fieldType = toGraphQLTypeWithRegistry(fieldSchema, ctx);
       if (!field2.isOptional) {
         fieldType = getNonNull(fieldType);
@@ -592,7 +676,7 @@ function schemaToInputFields(schema, enumRegistry, inputRegistry, inputs, enums,
     for (const field2 of ast.propertySignatures) {
       const fieldName = String(field2.name);
       if (fieldName === "_tag") continue;
-      const fieldSchema = S.make(field2.type);
+      const fieldSchema = S2.make(field2.type);
       let fieldType = toGraphQLInputTypeWithRegistry(
         fieldSchema,
         enumRegistry,
@@ -665,6 +749,12 @@ function toGraphQLInputTypeWithRegistry(schema, enumRegistry, inputRegistry, inp
           const result = inputRegistry.get(inputName);
           if (result) return result;
         }
+        for (const [regInputName, inputReg] of inputs) {
+          if (inputReg.schema.ast === memberAst) {
+            const result = inputRegistry.get(regInputName);
+            if (result) return result;
+          }
+        }
         if (memberAst._tag === "Transformation") {
           const innerToAst = memberAst.to;
           const transformedInputName = cache?.astToInputName?.get(innerToAst);
@@ -672,11 +762,59 @@ function toGraphQLInputTypeWithRegistry(schema, enumRegistry, inputRegistry, inp
             const result = inputRegistry.get(transformedInputName);
             if (result) return result;
           }
+          for (const [regInputName, inputReg] of inputs) {
+            if (inputReg.schema.ast === innerToAst) {
+              const result = inputRegistry.get(regInputName);
+              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 valueInputName = cache?.astToInputName?.get(valueType);
+            if (valueInputName) {
+              const result = inputRegistry.get(valueInputName);
+              if (result) return result;
+            }
+            for (const [regInputName, inputReg] of inputs) {
+              if (inputReg.schema.ast === valueType) {
+                const result = inputRegistry.get(regInputName);
+                if (result) return result;
+              }
+              let regAst = inputReg.schema.ast;
+              while (regAst._tag === "Transformation") {
+                regAst = regAst.to;
+                if (regAst === valueType) {
+                  const result = inputRegistry.get(regInputName);
+                  if (result) return result;
+                }
+              }
+              if (regAst._tag === "Declaration" && regAst.typeParameters?.[0] === valueType) {
+                const result = inputRegistry.get(regInputName);
+                if (result) return result;
+              }
+            }
+            const innerResult = toGraphQLInputTypeWithRegistry(
+              S2.make(valueType),
+              enumRegistry,
+              inputRegistry,
+              inputs,
+              enums,
+              cache
+            );
+            if (innerResult) {
+              return innerResult;
+            }
+          }
         }
       }
     }
     return toGraphQLInputTypeWithRegistry(
-      S.make(toAst),
+      S2.make(toAst),
       enumRegistry,
       inputRegistry,
       inputs,
@@ -689,7 +827,7 @@ function toGraphQLInputTypeWithRegistry(schema, enumRegistry, inputRegistry, inp
     const nonUndefinedTypes = unionAst.types.filter((t) => t._tag !== "UndefinedKeyword");
     if (nonUndefinedTypes.length === 1 && nonUndefinedTypes[0]._tag === "Union") {
       return toGraphQLInputTypeWithRegistry(
-        S.make(nonUndefinedTypes[0]),
+        S2.make(nonUndefinedTypes[0]),
         enumRegistry,
         inputRegistry,
         inputs,
@@ -699,7 +837,7 @@ function toGraphQLInputTypeWithRegistry(schema, enumRegistry, inputRegistry, inp
     }
     if (nonUndefinedTypes.length === 1 && nonUndefinedTypes[0]._tag === "TypeLiteral") {
       return toGraphQLInputTypeWithRegistry(
-        S.make(nonUndefinedTypes[0]),
+        S2.make(nonUndefinedTypes[0]),
         enumRegistry,
         inputRegistry,
         inputs,
@@ -713,6 +851,12 @@ function toGraphQLInputTypeWithRegistry(schema, enumRegistry, inputRegistry, inp
         const result = inputRegistry.get(inputName);
         if (result) return result;
       }
+      for (const [regInputName, inputReg] of inputs) {
+        if (inputReg.schema.ast === memberAst) {
+          const result = inputRegistry.get(regInputName);
+          if (result) return result;
+        }
+      }
       if (memberAst._tag === "Transformation") {
         const toAst = memberAst.to;
         const transformedInputName = cache?.astToInputName?.get(toAst);
@@ -720,6 +864,54 @@ function toGraphQLInputTypeWithRegistry(schema, enumRegistry, inputRegistry, inp
           const result = inputRegistry.get(transformedInputName);
           if (result) return result;
         }
+        for (const [regInputName, inputReg] of inputs) {
+          if (inputReg.schema.ast === toAst) {
+            const result = inputRegistry.get(regInputName);
+            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 valueInputName = cache?.astToInputName?.get(valueType);
+          if (valueInputName) {
+            const result = inputRegistry.get(valueInputName);
+            if (result) return result;
+          }
+          for (const [regInputName, inputReg] of inputs) {
+            if (inputReg.schema.ast === valueType) {
+              const result = inputRegistry.get(regInputName);
+              if (result) return result;
+            }
+            let regAst = inputReg.schema.ast;
+            while (regAst._tag === "Transformation") {
+              regAst = regAst.to;
+              if (regAst === valueType) {
+                const result = inputRegistry.get(regInputName);
+                if (result) return result;
+              }
+            }
+            if (regAst._tag === "Declaration" && regAst.typeParameters?.[0] === valueType) {
+              const result = inputRegistry.get(regInputName);
+              if (result) return result;
+            }
+          }
+          const innerResult = toGraphQLInputTypeWithRegistry(
+            S2.make(valueType),
+            enumRegistry,
+            inputRegistry,
+            inputs,
+            enums,
+            cache
+          );
+          if (innerResult) {
+            return innerResult;
+          }
+        }
       }
     }
     const allLiterals = unionAst.types.every((t) => t._tag === "Literal");
@@ -754,7 +946,7 @@ function toGraphQLInputTypeWithRegistry(schema, enumRegistry, inputRegistry, inp
   if (ast._tag === "Suspend") {
     const innerAst = ast.f();
     return toGraphQLInputTypeWithRegistry(
-      S.make(innerAst),
+      S2.make(innerAst),
       enumRegistry,
       inputRegistry,
       inputs,
@@ -771,7 +963,7 @@ function toGraphQLArgsWithRegistry(schema, enumRegistry, inputRegistry, inputs,
     for (const field2 of ast.propertySignatures) {
       const fieldName = String(field2.name);
       if (fieldName === "_tag") continue;
-      const fieldSchema = S.make(field2.type);
+      const fieldSchema = S2.make(field2.type);
       let fieldType = toGraphQLInputTypeWithRegistry(
         fieldSchema,
         enumRegistry,
@@ -808,7 +1000,7 @@ function isOptionSchema(schema) {
 }
 function encodeResolverOutput(schema, value) {
   if (isOptionSchema(schema)) {
-    return Effect.orDie(S.encode(schema)(value));
+    return Effect.orDie(S2.encode(schema)(value));
   }
   return Effect.succeed(value);
 }