@effect-gql/core 1.4.9 → 1.4.11

package/index.d.cts

@@ -5,12 +5,23 @@ export { DirectiveLocation, GraphQLBoolean, GraphQLEnumType, GraphQLFieldConfigM
 export { compose, directive, enumType, execute, extension, field, getSchemaName, inputType, interfaceType, middleware, mutation, objectType, query, subscription, unionType } from './builder/index.cjs';
 import { Effect, Context, Layer, Ref, HashMap, Option } from 'effect';
 import * as S from 'effect/Schema';
+import * as AST from 'effect/SchemaAST';
 import * as effect_Cause from 'effect/Cause';
 import * as effect_Types from 'effect/Types';
 import DataLoader from 'dataloader';
 export { CloseEvent, CompleteMessage, ConnectionContext, EffectSSE, EffectWebSocket, ErrorHandler, GraphQLRouterConfig, GraphQLRouterConfigFromEnv, GraphQLRouterConfigInput, GraphQLSSEConfig, GraphQLSSEOptions, GraphQLWSConfig, GraphQLWSOptions, GraphiQLConfig, MakeGraphQLRouterOptions, SSEConnectionContext, SSEError, SSEEvent, SSEEventType, SSESubscriptionRequest, SSESubscriptionResult, SSE_HEADERS, SubscribeMessage, WS_CLOSED, WebSocketError, WsWebSocket, defaultConfig, defaultErrorHandler, formatCompleteEvent, formatErrorEvent, formatNextEvent, formatSSEMessage, graphiqlHtml, makeGraphQLRouter, makeGraphQLSSEHandler, makeGraphQLWSHandler, makeSSESubscriptionStream, normalizeConfig, toEffectWebSocketFromWs, toRouter } from './server/index.cjs';
 import '@effect/platform';
 
+/**
+ * Check if a Declaration AST node represents an Option type.
+ * Option declarations have a TypeConstructor annotation of 'effect/Option'.
+ */
+declare const isOptionDeclaration: (ast: AST.AST) => boolean;
+/**
+ * Check if a Transformation represents an Option schema (e.g., S.OptionFromNullOr).
+ * These have a Declaration with "Option" identifier on the "to" side.
+ */
+declare const isOptionTransformation: (ast: AST.AST) => boolean;
 /**
  * Convert an Effect Schema to a GraphQL output type
  */
@@ -526,4 +537,4 @@ interface AnalyzerOutput {
  */
 declare const createAnalyzerExtension: (config?: AnalyzerExtensionConfig) => GraphQLExtension<ExtensionsService>;
 
-export { type AdditionalField, type AnalyzerExtensionConfig, type AnalyzerOutput, AuthorizationError, ExtensionsService, FieldComplexityMap, GraphQLError, GraphQLExtension, GraphQLRequestContext, type GroupedLoaderDef, Loader, type LoaderDef, type LoaderInstances, LoaderRegistry, MissingResolverContextError, NotFoundError, ResolverContext, type ResolverContextSlot, ResolverContextStore, type SingleLoaderDef, ValidationError, createAnalyzerExtension, get, getOption, getOrElse, has, make, makeRequestContextLayer, makeStoreLayer, scoped, set, setMany, storeLayer, toGraphQLArgs, toGraphQLInputType, toGraphQLObjectType, toGraphQLType };
+export { type AdditionalField, type AnalyzerExtensionConfig, type AnalyzerOutput, AuthorizationError, ExtensionsService, FieldComplexityMap, GraphQLError, GraphQLExtension, GraphQLRequestContext, type GroupedLoaderDef, Loader, type LoaderDef, type LoaderInstances, LoaderRegistry, MissingResolverContextError, NotFoundError, ResolverContext, type ResolverContextSlot, ResolverContextStore, type SingleLoaderDef, ValidationError, createAnalyzerExtension, get, getOption, getOrElse, has, isOptionDeclaration, isOptionTransformation, make, makeRequestContextLayer, makeStoreLayer, scoped, set, setMany, storeLayer, toGraphQLArgs, toGraphQLInputType, toGraphQLObjectType, toGraphQLType };

package/index.d.ts

@@ -5,12 +5,23 @@ export { DirectiveLocation, GraphQLBoolean, GraphQLEnumType, GraphQLFieldConfigM
 export { compose, directive, enumType, execute, extension, field, getSchemaName, inputType, interfaceType, middleware, mutation, objectType, query, subscription, unionType } from './builder/index.js';
 import { Effect, Context, Layer, Ref, HashMap, Option } from 'effect';
 import * as S from 'effect/Schema';
+import * as AST from 'effect/SchemaAST';
 import * as effect_Cause from 'effect/Cause';
 import * as effect_Types from 'effect/Types';
 import DataLoader from 'dataloader';
 export { CloseEvent, CompleteMessage, ConnectionContext, EffectSSE, EffectWebSocket, ErrorHandler, GraphQLRouterConfig, GraphQLRouterConfigFromEnv, GraphQLRouterConfigInput, GraphQLSSEConfig, GraphQLSSEOptions, GraphQLWSConfig, GraphQLWSOptions, GraphiQLConfig, MakeGraphQLRouterOptions, SSEConnectionContext, SSEError, SSEEvent, SSEEventType, SSESubscriptionRequest, SSESubscriptionResult, SSE_HEADERS, SubscribeMessage, WS_CLOSED, WebSocketError, WsWebSocket, defaultConfig, defaultErrorHandler, formatCompleteEvent, formatErrorEvent, formatNextEvent, formatSSEMessage, graphiqlHtml, makeGraphQLRouter, makeGraphQLSSEHandler, makeGraphQLWSHandler, makeSSESubscriptionStream, normalizeConfig, toEffectWebSocketFromWs, toRouter } from './server/index.js';
 import '@effect/platform';
 
+/**
+ * Check if a Declaration AST node represents an Option type.
+ * Option declarations have a TypeConstructor annotation of 'effect/Option'.
+ */
+declare const isOptionDeclaration: (ast: AST.AST) => boolean;
+/**
+ * Check if a Transformation represents an Option schema (e.g., S.OptionFromNullOr).
+ * These have a Declaration with "Option" identifier on the "to" side.
+ */
+declare const isOptionTransformation: (ast: AST.AST) => boolean;
 /**
  * Convert an Effect Schema to a GraphQL output type
  */
@@ -526,4 +537,4 @@ interface AnalyzerOutput {
  */
 declare const createAnalyzerExtension: (config?: AnalyzerExtensionConfig) => GraphQLExtension<ExtensionsService>;
 
-export { type AdditionalField, type AnalyzerExtensionConfig, type AnalyzerOutput, AuthorizationError, ExtensionsService, FieldComplexityMap, GraphQLError, GraphQLExtension, GraphQLRequestContext, type GroupedLoaderDef, Loader, type LoaderDef, type LoaderInstances, LoaderRegistry, MissingResolverContextError, NotFoundError, ResolverContext, type ResolverContextSlot, ResolverContextStore, type SingleLoaderDef, ValidationError, createAnalyzerExtension, get, getOption, getOrElse, has, make, makeRequestContextLayer, makeStoreLayer, scoped, set, setMany, storeLayer, toGraphQLArgs, toGraphQLInputType, toGraphQLObjectType, toGraphQLType };
+export { type AdditionalField, type AnalyzerExtensionConfig, type AnalyzerOutput, AuthorizationError, ExtensionsService, FieldComplexityMap, GraphQLError, GraphQLExtension, GraphQLRequestContext, type GroupedLoaderDef, Loader, type LoaderDef, type LoaderInstances, LoaderRegistry, MissingResolverContextError, NotFoundError, ResolverContext, type ResolverContextSlot, ResolverContextStore, type SingleLoaderDef, ValidationError, createAnalyzerExtension, get, getOption, getOrElse, has, isOptionDeclaration, isOptionTransformation, make, makeRequestContextLayer, makeStoreLayer, scoped, set, setMany, storeLayer, toGraphQLArgs, toGraphQLInputType, toGraphQLObjectType, toGraphQLType };

package/index.js

@@ -59,7 +59,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);
@@ -168,7 +168,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 GraphQLInputObjectType({
       name: typeName,
@@ -363,7 +364,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.make(innerType), ctx);
@@ -394,19 +395,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;
@@ -507,7 +495,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;
   }
@@ -613,7 +601,8 @@ function schemaToFields(schema, ctx) {
       if (fieldName === "_tag") continue;
       const fieldSchema = S2.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 };
@@ -641,7 +630,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 };
@@ -832,7 +822,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,
@@ -3756,6 +3746,6 @@ function checkThresholds(result, thresholds) {
   return Effect.void;
 }
 
-export { AuthorizationError, CacheControlConfigFromEnv, ComplexityAnalysisError, ComplexityConfigFromEnv, ComplexityLimitExceededError, ExtensionsService, GraphQLError2 as GraphQLError, GraphQLRequestContext, GraphQLRouterConfigFromEnv, GraphQLSchemaBuilder, Loader, MissingResolverContextError, NotFoundError, ResolverContext, ResolverContextStore, SSEError, SSE_HEADERS, ValidationError, WS_CLOSED, WebSocketError, combineCalculators, compose, computeCachePolicy, computeCachePolicyFromQuery, createAnalyzerExtension, defaultComplexityCalculator, defaultConfig, defaultErrorHandler, depthOnlyCalculator, directive, enumType, execute, extension, field, formatCompleteEvent, formatErrorEvent, formatNextEvent, formatSSEMessage, get, getOption, getOrElse, getSchemaName, graphiqlHtml, has, inputType, interfaceType, make3 as make, makeExtensionsService, makeGraphQLRouter, makeGraphQLSSEHandler, makeGraphQLWSHandler, makeRequestContextLayer, makeSSESubscriptionStream, makeStoreLayer, middleware, mutation, normalizeConfig, objectType, query, runExecuteEndHooks, runExecuteStartHooks, runParseHooks, runValidateHooks, scoped, set, setMany, storeLayer, subscription, toCacheControlHeader, toEffectWebSocketFromWs, toGraphQLArgs, toGraphQLInputType, toGraphQLObjectType, toGraphQLType, toRouter, unionType, validateComplexity };
+export { AuthorizationError, CacheControlConfigFromEnv, ComplexityAnalysisError, ComplexityConfigFromEnv, ComplexityLimitExceededError, ExtensionsService, GraphQLError2 as GraphQLError, GraphQLRequestContext, GraphQLRouterConfigFromEnv, GraphQLSchemaBuilder, Loader, MissingResolverContextError, NotFoundError, ResolverContext, ResolverContextStore, SSEError, SSE_HEADERS, ValidationError, WS_CLOSED, WebSocketError, combineCalculators, compose, computeCachePolicy, computeCachePolicyFromQuery, createAnalyzerExtension, defaultComplexityCalculator, defaultConfig, defaultErrorHandler, depthOnlyCalculator, directive, enumType, execute, extension, field, formatCompleteEvent, formatErrorEvent, formatNextEvent, formatSSEMessage, get, getOption, getOrElse, getSchemaName, graphiqlHtml, has, inputType, interfaceType, isOptionDeclaration, isOptionTransformation, make3 as make, makeExtensionsService, makeGraphQLRouter, makeGraphQLSSEHandler, makeGraphQLWSHandler, makeRequestContextLayer, makeSSESubscriptionStream, makeStoreLayer, middleware, mutation, normalizeConfig, objectType, query, runExecuteEndHooks, runExecuteStartHooks, runParseHooks, runValidateHooks, scoped, set, setMany, storeLayer, subscription, toCacheControlHeader, toEffectWebSocketFromWs, toGraphQLArgs, toGraphQLInputType, toGraphQLObjectType, toGraphQLType, toRouter, unionType, validateComplexity };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map