@effect-gql/core 1.4.9 → 1.4.11

package/builder/index.cjs

@@ -79,7 +79,7 @@ function handleTupleTypeAST(ast, convertFn) {
   }
   return void 0;
 }
-function buildFieldsFromPropertySignatures(propertySignatures, convertFn, isInput) {
+function buildFieldsFromPropertySignatures(propertySignatures, convertFn) {
   const fields = {};
   for (const field2 of propertySignatures) {
     const fieldName = String(field2.name);
@@ -188,7 +188,8 @@ var toGraphQLInputType = (schema) => {
   if (ast._tag === "TypeLiteral") {
     const fields = buildFieldsFromPropertySignatures(
       ast.propertySignatures,
-      toGraphQLInputType);
+      toGraphQLInputType
+    );
     const typeName = schema.annotations?.identifier || `Input_${Math.random().toString(36).slice(2, 11)}`;
     return new graphql.GraphQLInputObjectType({
       name: typeName,
@@ -348,7 +349,7 @@ function toGraphQLTypeWithRegistry(schema, ctx) {
     return handleTupleTypeAST2(ast, ctx);
   }
   if (ast._tag === "Declaration") {
-    if (isOptionDeclaration2(ast)) {
+    if (isOptionDeclaration(ast)) {
       const innerType = getOptionInnerType2(ast);
       if (innerType) {
         return toGraphQLTypeWithRegistry(S2__namespace.make(innerType), ctx);
@@ -379,19 +380,6 @@ 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;
@@ -492,7 +480,7 @@ function handleArrayTransformation(toAst, ctx) {
 function handleTransformationAST(ast, ctx) {
   const toAst = ast.to;
   const fromAst = ast.from;
-  if (isOptionDeclaration2(toAst)) {
+  if (isOptionDeclaration(toAst)) {
     const optionResult = handleOptionTransformation(ast, fromAst, toAst, ctx);
     if (optionResult) return optionResult;
   }
@@ -598,7 +586,8 @@ function schemaToFields(schema, ctx) {
       if (fieldName === "_tag") continue;
       const fieldSchema = S2__namespace.make(field2.type);
       let fieldType = toGraphQLTypeWithRegistry(fieldSchema, ctx);
-      if (!field2.isOptional) {
+      const isOptionField = isOptionTransformation(field2.type) || isOptionDeclaration(field2.type);
+      if (!field2.isOptional && !isOptionField) {
         fieldType = getNonNull(fieldType);
       }
       fields[fieldName] = { type: fieldType };
@@ -626,7 +615,8 @@ function schemaToInputFields(schema, enumRegistry, inputRegistry, inputs, enums,
         enums,
         cache
       );
-      if (!field2.isOptional) {
+      const isOptionField = isOptionTransformation(field2.type) || isOptionDeclaration(field2.type);
+      if (!field2.isOptional && !isOptionField) {
         fieldType = getNonNull(fieldType);
       }
       fields[fieldName] = { type: fieldType };
@@ -817,7 +807,7 @@ function handleOptionTransformationForInput(fromAst, toAst, inputs, inputRegistr
 function handleTransformationForInput(ast, inputs, inputRegistry, enumRegistry, enums, cache) {
   const toAst = ast.to;
   const fromAst = ast.from;
-  if (isOptionDeclaration2(toAst)) {
+  if (isOptionDeclaration(toAst)) {
     const optionResult = handleOptionTransformationForInput(
       fromAst,
       toAst,