@effect-gql/core 1.3.4 → 1.4.1

package/builder/index.cjs

@@ -2,7 +2,7 @@
 
 var graphql = require('graphql');
 var effect = require('effect');
-var S2 = require('effect/Schema');
+var S = require('effect/Schema');
 var AST = require('effect/SchemaAST');
 
 function _interopNamespace(e) {
@@ -23,7 +23,7 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var S2__namespace = /*#__PURE__*/_interopNamespace(S2);
+var S__namespace = /*#__PURE__*/_interopNamespace(S);
 var AST__namespace = /*#__PURE__*/_interopNamespace(AST);
 
 // src/builder/index.ts
@@ -41,6 +41,34 @@ var isIntegerType = (ast) => {
   }
   return false;
 };
+var isOptionDeclaration = (ast) => {
+  if (ast._tag === "Declaration") {
+    const annotations = ast.annotations;
+    if (annotations) {
+      const TypeConstructorSymbol = /* @__PURE__ */ Symbol.for("effect/annotation/TypeConstructor");
+      const typeConstructor = annotations[TypeConstructorSymbol];
+      if (typeConstructor && typeConstructor._tag === "effect/Option") {
+        return true;
+      }
+    }
+  }
+  return false;
+};
+var isOptionTransformation = (ast) => {
+  if (ast._tag === "Transformation") {
+    return isOptionDeclaration(ast.to);
+  }
+  return false;
+};
+var getOptionInnerType = (ast) => {
+  if (ast._tag === "Declaration") {
+    const typeParams = ast.typeParameters;
+    if (typeParams && typeParams.length > 0) {
+      return typeParams[0];
+    }
+  }
+  return void 0;
+};
 var toGraphQLType = (schema) => {
   const ast = schema.ast;
   if (ast._tag === "StringKeyword") return graphql.GraphQLString;
@@ -50,7 +78,7 @@ var toGraphQLType = (schema) => {
     if (isIntegerType(ast)) {
       return graphql.GraphQLInt;
     }
-    return toGraphQLType(S2__namespace.make(ast.from));
+    return toGraphQLType(S__namespace.make(ast.from));
   }
   if (ast._tag === "Literal") {
     if (typeof ast.literal === "string") return graphql.GraphQLString;
@@ -62,7 +90,7 @@ var toGraphQLType = (schema) => {
   if (ast._tag === "TupleType") {
     const elements = ast.elements;
     if (elements.length > 0) {
-      const elementSchema = S2__namespace.make(elements[0].type);
+      const elementSchema = S__namespace.make(elements[0].type);
       return new graphql.GraphQLList(toGraphQLType(elementSchema));
     }
   }
@@ -70,7 +98,8 @@ var toGraphQLType = (schema) => {
     const fields = {};
     for (const field2 of ast.propertySignatures) {
       const fieldName = String(field2.name);
-      const fieldSchema = S2__namespace.make(field2.type);
+      if (fieldName === "_tag") continue;
+      const fieldSchema = S__namespace.make(field2.type);
       let fieldType = toGraphQLType(fieldSchema);
       if (!field2.isOptional) {
         fieldType = new graphql.GraphQLNonNull(fieldType);
@@ -84,17 +113,35 @@ var toGraphQLType = (schema) => {
     });
   }
   if (ast._tag === "Transformation") {
-    return toGraphQLType(S2__namespace.make(ast.to));
+    if (isOptionTransformation(ast)) {
+      const innerType = getOptionInnerType(ast.to);
+      if (innerType) {
+        return toGraphQLType(S__namespace.make(innerType));
+      }
+    }
+    return toGraphQLType(S__namespace.make(ast.to));
+  }
+  if (ast._tag === "Declaration") {
+    if (isOptionDeclaration(ast)) {
+      const innerType = getOptionInnerType(ast);
+      if (innerType) {
+        return toGraphQLType(S__namespace.make(innerType));
+      }
+    }
+    const typeParams = ast.typeParameters;
+    if (typeParams && typeParams.length > 0) {
+      return toGraphQLType(S__namespace.make(typeParams[0]));
+    }
   }
   if (ast._tag === "Union") {
     const types = ast.types;
     if (types.length > 0) {
-      return toGraphQLType(S2__namespace.make(types[0]));
+      return toGraphQLType(S__namespace.make(types[0]));
     }
   }
   if (ast._tag === "Suspend") {
     const innerAst = ast.f();
-    return toGraphQLType(S2__namespace.make(innerAst));
+    return toGraphQLType(S__namespace.make(innerAst));
   }
   return graphql.GraphQLString;
 };
@@ -107,7 +154,7 @@ var toGraphQLInputType = (schema) => {
     if (isIntegerType(ast)) {
       return graphql.GraphQLInt;
     }
-    return toGraphQLInputType(S2__namespace.make(ast.from));
+    return toGraphQLInputType(S__namespace.make(ast.from));
   }
   if (ast._tag === "Literal") {
     if (typeof ast.literal === "string") return graphql.GraphQLString;
@@ -119,7 +166,7 @@ var toGraphQLInputType = (schema) => {
   if (ast._tag === "TupleType") {
     const elements = ast.elements;
     if (elements.length > 0) {
-      const elementSchema = S2__namespace.make(elements[0].type);
+      const elementSchema = S__namespace.make(elements[0].type);
       return new graphql.GraphQLList(toGraphQLInputType(elementSchema));
     }
   }
@@ -127,7 +174,8 @@ var toGraphQLInputType = (schema) => {
     const fields = {};
     for (const field2 of ast.propertySignatures) {
       const fieldName = String(field2.name);
-      const fieldSchema = S2__namespace.make(field2.type);
+      if (fieldName === "_tag") continue;
+      const fieldSchema = S__namespace.make(field2.type);
       let fieldType = toGraphQLInputType(fieldSchema);
       if (!field2.isOptional) {
         fieldType = new graphql.GraphQLNonNull(fieldType);
@@ -141,17 +189,33 @@ var toGraphQLInputType = (schema) => {
     });
   }
   if (ast._tag === "Transformation") {
-    return toGraphQLInputType(S2__namespace.make(ast.from));
+    return toGraphQLInputType(S__namespace.make(ast.from));
+  }
+  if (ast._tag === "Declaration") {
+    if (isOptionDeclaration(ast)) {
+      const innerType = getOptionInnerType(ast);
+      if (innerType) {
+        return toGraphQLInputType(S__namespace.make(innerType));
+      }
+    }
+    const typeParams = ast.typeParameters;
+    if (typeParams && typeParams.length > 0) {
+      return toGraphQLInputType(S__namespace.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__namespace.make(nonNullTypes[0]));
+    }
     if (types.length > 0) {
-      return toGraphQLInputType(S2__namespace.make(types[0]));
+      return toGraphQLInputType(S__namespace.make(types[0]));
     }
   }
   if (ast._tag === "Suspend") {
     const innerAst = ast.f();
-    return toGraphQLInputType(S2__namespace.make(innerAst));
+    return toGraphQLInputType(S__namespace.make(innerAst));
   }
   return graphql.GraphQLString;
 };
@@ -161,7 +225,8 @@ var toGraphQLArgs = (schema) => {
     const args = {};
     for (const field2 of ast.propertySignatures) {
       const fieldName = String(field2.name);
-      const fieldSchema = S2__namespace.make(field2.type);
+      if (fieldName === "_tag") continue;
+      const fieldSchema = S__namespace.make(field2.type);
       let fieldType = toGraphQLInputType(fieldSchema);
       if (!field2.isOptional) {
         fieldType = new graphql.GraphQLNonNull(fieldType);
@@ -261,9 +326,21 @@ function toGraphQLTypeWithRegistry(schema, ctx) {
   if (ast._tag === "TupleType") {
     return handleTupleTypeAST(ast, ctx);
   }
+  if (ast._tag === "Declaration") {
+    if (isOptionDeclaration2(ast)) {
+      const innerType = getOptionInnerType2(ast);
+      if (innerType) {
+        return toGraphQLTypeWithRegistry(S__namespace.make(innerType), ctx);
+      }
+    }
+    const typeParams = ast.typeParameters;
+    if (typeParams && typeParams.length > 0) {
+      return toGraphQLTypeWithRegistry(S__namespace.make(typeParams[0]), ctx);
+    }
+  }
   if (ast._tag === "Suspend") {
     const innerAst = ast.f();
-    return toGraphQLTypeWithRegistry(S2__namespace.make(innerAst), ctx);
+    return toGraphQLTypeWithRegistry(S__namespace.make(innerAst), ctx);
   }
   return toGraphQLType(schema);
 }
@@ -281,20 +358,48 @@ function findRegisteredInterface(schema, ast, ctx) {
   }
   return void 0;
 }
+function isOptionDeclaration2(ast) {
+  if (ast._tag === "Declaration") {
+    const annotations = ast.annotations;
+    if (annotations) {
+      const TypeConstructorSymbol = /* @__PURE__ */ Symbol.for("effect/annotation/TypeConstructor");
+      const typeConstructor = annotations[TypeConstructorSymbol];
+      if (typeConstructor && typeConstructor._tag === "effect/Option") {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+function getOptionInnerType2(ast) {
+  if (ast._tag === "Declaration") {
+    const typeParams = ast.typeParameters;
+    if (typeParams && typeParams.length > 0) {
+      return typeParams[0];
+    }
+  }
+  return void 0;
+}
 function handleTransformationAST(ast, ctx) {
   const toAst = ast.to;
+  if (isOptionDeclaration2(toAst)) {
+    const innerType = getOptionInnerType2(toAst);
+    if (innerType) {
+      return toGraphQLTypeWithRegistry(S__namespace.make(innerType), ctx);
+    }
+  }
   if (toAst._tag === "TupleType") {
     if (toAst.rest && toAst.rest.length > 0) {
-      const elementSchema = S2__namespace.make(toAst.rest[0].type);
+      const elementSchema = S__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 elementSchema = S__namespace.make(toAst.elements[0].type);
       const elementType = toGraphQLTypeWithRegistry(elementSchema, ctx);
       return new graphql.GraphQLList(elementType);
     }
   }
-  return toGraphQLTypeWithRegistry(S2__namespace.make(ast.to), ctx);
+  return toGraphQLTypeWithRegistry(S__namespace.make(ast.to), ctx);
 }
 function handleUnionAST(ast, ctx) {
   const allLiterals = ast.types.every((t) => t._tag === "Literal");
@@ -306,9 +411,9 @@ function handleUnionAST(ast, ctx) {
     if (unionType2) return unionType2;
   }
   if (ast.types.length > 0) {
-    return toGraphQLTypeWithRegistry(S2__namespace.make(ast.types[0]), ctx);
+    return toGraphQLTypeWithRegistry(S__namespace.make(ast.types[0]), ctx);
   }
-  return toGraphQLType(S2__namespace.make(ast));
+  return toGraphQLType(S__namespace.make(ast));
 }
 function findEnumForLiteralUnion(types, ctx) {
   const literalValues = types.map((t) => String(t.literal)).sort();
@@ -351,15 +456,15 @@ function findEnumForLiteral(ast, ctx) {
 }
 function handleTupleTypeAST(ast, ctx) {
   if (ast.rest && ast.rest.length > 0) {
-    const elementSchema = S2__namespace.make(ast.rest[0].type);
+    const elementSchema = S__namespace.make(ast.rest[0].type);
     const elementType = toGraphQLTypeWithRegistry(elementSchema, ctx);
     return new graphql.GraphQLList(elementType);
   } else if (ast.elements && ast.elements.length > 0) {
-    const elementSchema = S2__namespace.make(ast.elements[0].type);
+    const elementSchema = S__namespace.make(ast.elements[0].type);
     const elementType = toGraphQLTypeWithRegistry(elementSchema, ctx);
     return new graphql.GraphQLList(elementType);
   }
-  return toGraphQLType(S2__namespace.make(ast));
+  return toGraphQLType(S__namespace.make(ast));
 }
 function schemaToFields(schema, ctx) {
   let ast = schema.ast;
@@ -368,15 +473,22 @@ 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);
-      const fieldSchema = S2__namespace.make(field2.type);
+      if (fieldName === "_tag") continue;
+      const fieldSchema = S__namespace.make(field2.type);
       let fieldType = toGraphQLTypeWithRegistry(fieldSchema, ctx);
       if (!field2.isOptional) {
         fieldType = getNonNull(fieldType);
@@ -388,12 +500,16 @@ 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);
-      const fieldSchema = S2__namespace.make(field2.type);
+      if (fieldName === "_tag") continue;
+      const fieldSchema = S__namespace.make(field2.type);
       let fieldType = toGraphQLInputTypeWithRegistry(
         fieldSchema,
         enumRegistry,
@@ -432,17 +548,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(
-      S2__namespace.make(toAst),
-      enumRegistry,
-      inputRegistry,
-      inputs,
-      enums,
-      cache
-    );
-  }
   if (cache?.schemaToInputName || cache?.astToInputName) {
     const inputName = cache.schemaToInputName?.get(schema) ?? cache.astToInputName?.get(ast);
     if (inputName) {
@@ -457,12 +562,23 @@ function toGraphQLInputTypeWithRegistry(schema, enumRegistry, inputRegistry, inp
       }
     }
   }
+  if (ast._tag === "Transformation") {
+    const toAst = ast.to;
+    return toGraphQLInputTypeWithRegistry(
+      S__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") {
       return toGraphQLInputTypeWithRegistry(
-        S2__namespace.make(nonUndefinedTypes[0]),
+        S__namespace.make(nonUndefinedTypes[0]),
         enumRegistry,
         inputRegistry,
         inputs,
@@ -472,7 +588,7 @@ function toGraphQLInputTypeWithRegistry(schema, enumRegistry, inputRegistry, inp
     }
     if (nonUndefinedTypes.length === 1 && nonUndefinedTypes[0]._tag === "TypeLiteral") {
       return toGraphQLInputTypeWithRegistry(
-        S2__namespace.make(nonUndefinedTypes[0]),
+        S__namespace.make(nonUndefinedTypes[0]),
         enumRegistry,
         inputRegistry,
         inputs,
@@ -512,7 +628,7 @@ function toGraphQLInputTypeWithRegistry(schema, enumRegistry, inputRegistry, inp
   if (ast._tag === "Suspend") {
     const innerAst = ast.f();
     return toGraphQLInputTypeWithRegistry(
-      S2__namespace.make(innerAst),
+      S__namespace.make(innerAst),
       enumRegistry,
       inputRegistry,
       inputs,
@@ -528,7 +644,8 @@ function toGraphQLArgsWithRegistry(schema, enumRegistry, inputRegistry, inputs,
     const args = {};
     for (const field2 of ast.propertySignatures) {
       const fieldName = String(field2.name);
-      const fieldSchema = S2__namespace.make(field2.type);
+      if (fieldName === "_tag") continue;
+      const fieldSchema = S__namespace.make(field2.type);
       let fieldType = toGraphQLInputTypeWithRegistry(
         fieldSchema,
         enumRegistry,
@@ -546,6 +663,29 @@ function toGraphQLArgsWithRegistry(schema, enumRegistry, inputRegistry, inputs,
   }
   return toGraphQLArgs(schema);
 }
+function isOptionSchema(schema) {
+  const ast = schema.ast;
+  if (ast._tag === "Transformation") {
+    const toAst = ast.to;
+    if (toAst._tag === "Declaration") {
+      const annotations = toAst.annotations;
+      if (annotations) {
+        const TypeConstructorSymbol = /* @__PURE__ */ Symbol.for("effect/annotation/TypeConstructor");
+        const typeConstructor = annotations[TypeConstructorSymbol];
+        if (typeConstructor && typeConstructor._tag === "effect/Option") {
+          return true;
+        }
+      }
+    }
+  }
+  return false;
+}
+function encodeResolverOutput(schema, value) {
+  if (isOptionSchema(schema)) {
+    return effect.Effect.orDie(S__namespace.encode(schema)(value));
+  }
+  return effect.Effect.succeed(value);
+}
 function applyDirectives(effect, directives, directiveRegistrations) {
   if (!directives) return effect;
   let wrapped = effect;
@@ -580,7 +720,8 @@ function buildField(config, ctx) {
       );
       const middlewareContext = { parent: _parent, args, info };
       effect$1 = applyMiddleware(effect$1, middlewareContext, ctx.middlewares);
-      return await effect.Runtime.runPromise(context.runtime)(effect$1);
+      const result = await effect.Runtime.runPromise(context.runtime)(effect$1);
+      return await effect.Runtime.runPromise(context.runtime)(encodeResolverOutput(config.type, result));
     }
   };
   if (config.args) {
@@ -609,7 +750,8 @@ function buildObjectField(config, ctx) {
       );
       const middlewareContext = { parent, args, info };
       effect$1 = applyMiddleware(effect$1, middlewareContext, ctx.middlewares);
-      return await effect.Runtime.runPromise(context.runtime)(effect$1);
+      const result = await effect.Runtime.runPromise(context.runtime)(effect$1);
+      return await effect.Runtime.runPromise(context.runtime)(encodeResolverOutput(config.type, result));
     }
   };
   if (config.args) {
@@ -644,13 +786,18 @@ function buildSubscriptionField(config, ctx) {
       return streamToAsyncIterator(stream, context.runtime);
     },
     // The resolve function transforms each yielded value
-    // If no custom resolve is provided, return the payload directly
+    // If no custom resolve is provided, encode and return the payload directly
     resolve: config.resolve ? async (value, args, context, info) => {
       let effect$1 = config.resolve(value, args);
       const middlewareContext = { parent: value, args, info };
       effect$1 = applyMiddleware(effect$1, middlewareContext, ctx.middlewares);
-      return await effect.Runtime.runPromise(context.runtime)(effect$1);
-    } : (value) => value
+      const result = await effect.Runtime.runPromise(context.runtime)(effect$1);
+      return await effect.Runtime.runPromise(context.runtime)(
+        encodeResolverOutput(config.type, result)
+      );
+    } : async (value, _args, context) => {
+      return await effect.Runtime.runPromise(context.runtime)(encodeResolverOutput(config.type, value));
+    }
   };
   if (config.args) {
     fieldConfig.args = toGraphQLArgsWithRegistry(