@effect-gql/core 1.0.0 → 1.1.1

package/index.d.cts

@@ -1,5 +1,5 @@
-import { F as FieldComplexityMap, G as GraphQLExtension, E as ExtensionsService } from './schema-builder-Cvdq7Kz_.cjs';
-export { y as CacheControlConfig, J as CacheControlConfigFromEnv, h as CacheControlScope, C as CacheHint, w as CacheHintMap, x as CachePolicy, z as CachePolicyAnalysisInfo, q as ComplexityAnalysisError, l as ComplexityAnalysisInfo, n as ComplexityCalculator, j as ComplexityConfig, u as ComplexityConfigFromEnv, m as ComplexityExceededInfo, p as ComplexityLimitExceededError, k as ComplexityResult, D as DirectiveApplication, d as DirectiveRegistration, b as EnumRegistration, K as ExecutionArgs, o as FieldComplexity, a as FieldRegistration, f as GraphQLEffectContext, i as GraphQLSchemaBuilder, c as InputTypeRegistration, I as InterfaceRegistration, M as MiddlewareContext, e as MiddlewareRegistration, O as ObjectFieldRegistration, S as SubscriptionFieldRegistration, T as TypeRegistration, g as TypeRegistries, U as UnionRegistration, t as combineCalculators, A as computeCachePolicy, B as computeCachePolicyFromQuery, r as defaultComplexityCalculator, s as depthOnlyCalculator, L as makeExtensionsService, R as runExecuteEndHooks, Q as runExecuteStartHooks, N as runParseHooks, P as runValidateHooks, H as toCacheControlHeader, v as validateComplexity } from './schema-builder-Cvdq7Kz_.cjs';
+import { F as FieldComplexityMap, G as GraphQLExtension, E as ExtensionsService } from './schema-builder-DKvkzU_M.cjs';
+export { y as CacheControlConfig, J as CacheControlConfigFromEnv, h as CacheControlScope, C as CacheHint, w as CacheHintMap, x as CachePolicy, z as CachePolicyAnalysisInfo, q as ComplexityAnalysisError, l as ComplexityAnalysisInfo, n as ComplexityCalculator, j as ComplexityConfig, u as ComplexityConfigFromEnv, m as ComplexityExceededInfo, p as ComplexityLimitExceededError, k as ComplexityResult, D as DirectiveApplication, d as DirectiveRegistration, b as EnumRegistration, K as ExecutionArgs, o as FieldComplexity, a as FieldRegistration, f as GraphQLEffectContext, i as GraphQLSchemaBuilder, c as InputTypeRegistration, I as InterfaceRegistration, M as MiddlewareContext, e as MiddlewareRegistration, O as ObjectFieldRegistration, S as SubscriptionFieldRegistration, T as TypeRegistration, g as TypeRegistries, U as UnionRegistration, t as combineCalculators, A as computeCachePolicy, B as computeCachePolicyFromQuery, r as defaultComplexityCalculator, s as depthOnlyCalculator, L as makeExtensionsService, R as runExecuteEndHooks, Q as runExecuteStartHooks, N as runParseHooks, P as runValidateHooks, H as toCacheControlHeader, v as validateComplexity } from './schema-builder-DKvkzU_M.cjs';
 import { GraphQLOutputType, GraphQLInputType, GraphQLFieldConfigArgumentMap, GraphQLObjectType } from 'graphql';
 export { DirectiveLocation, GraphQLBoolean, GraphQLEnumType, GraphQLFieldConfigMap, GraphQLFloat, GraphQLID, GraphQLInputObjectType, GraphQLInt, GraphQLInterfaceType, GraphQLList, GraphQLNonNull, GraphQLObjectType, GraphQLScalarType, GraphQLSchema, GraphQLString, GraphQLUnionType, Kind, ValueNode, graphql, lexicographicSortSchema, printSchema } from 'graphql';
 export { compose, directive, enumType, execute, extension, field, getSchemaName, inputType, interfaceType, middleware, mutation, objectType, query, subscription, unionType } from './builder/index.cjs';
@@ -216,11 +216,17 @@ declare class LoaderRegistry<Defs extends Record<string, LoaderDef<any, any, any
     /**
      * Load a single value by key.
      * This is the most common operation in resolvers.
+     *
+     * @internal The internal cast is safe because LoaderInstances<Defs> guarantees
+     * that loaders[name] is a DataLoader with the correct key/value types.
      */
     load<Name extends keyof Defs & string>(name: Name, key: LoaderKey<Defs[Name]>): Effect.Effect<LoaderValue<Defs[Name]>, Error, LoaderInstances<Defs>>;
     /**
      * Load multiple values by keys.
      * All keys are batched into a single request.
+     *
+     * @internal The internal cast is safe because LoaderInstances<Defs> guarantees
+     * that loaders[name] is a DataLoader with the correct key/value types.
      */
     loadMany<Name extends keyof Defs & string>(name: Name, keys: readonly LoaderKey<Defs[Name]>[]): Effect.Effect<readonly LoaderValue<Defs[Name]>[], Error, LoaderInstances<Defs>>;
 }
@@ -520,4 +526,4 @@ interface AnalyzerOutput {
  */
 declare const createAnalyzerExtension: (config?: AnalyzerExtensionConfig) => GraphQLExtension<ExtensionsService>;
 
-export { type AdditionalField, type AnalyzerExtensionConfig, type AnalyzerOutput, AuthorizationError, ExtensionsService, FieldComplexityMap, GraphQLError, GraphQLExtension, GraphQLRequestContext, Loader, type LoaderDef, type LoaderInstances, LoaderRegistry, MissingResolverContextError, NotFoundError, ResolverContext, type ResolverContextSlot, ResolverContextStore, 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, make, makeRequestContextLayer, makeStoreLayer, scoped, set, setMany, storeLayer, toGraphQLArgs, toGraphQLInputType, toGraphQLObjectType, toGraphQLType };

package/index.d.ts

@@ -1,5 +1,5 @@
-import { F as FieldComplexityMap, G as GraphQLExtension, E as ExtensionsService } from './schema-builder-Cvdq7Kz_.js';
-export { y as CacheControlConfig, J as CacheControlConfigFromEnv, h as CacheControlScope, C as CacheHint, w as CacheHintMap, x as CachePolicy, z as CachePolicyAnalysisInfo, q as ComplexityAnalysisError, l as ComplexityAnalysisInfo, n as ComplexityCalculator, j as ComplexityConfig, u as ComplexityConfigFromEnv, m as ComplexityExceededInfo, p as ComplexityLimitExceededError, k as ComplexityResult, D as DirectiveApplication, d as DirectiveRegistration, b as EnumRegistration, K as ExecutionArgs, o as FieldComplexity, a as FieldRegistration, f as GraphQLEffectContext, i as GraphQLSchemaBuilder, c as InputTypeRegistration, I as InterfaceRegistration, M as MiddlewareContext, e as MiddlewareRegistration, O as ObjectFieldRegistration, S as SubscriptionFieldRegistration, T as TypeRegistration, g as TypeRegistries, U as UnionRegistration, t as combineCalculators, A as computeCachePolicy, B as computeCachePolicyFromQuery, r as defaultComplexityCalculator, s as depthOnlyCalculator, L as makeExtensionsService, R as runExecuteEndHooks, Q as runExecuteStartHooks, N as runParseHooks, P as runValidateHooks, H as toCacheControlHeader, v as validateComplexity } from './schema-builder-Cvdq7Kz_.js';
+import { F as FieldComplexityMap, G as GraphQLExtension, E as ExtensionsService } from './schema-builder-DKvkzU_M.js';
+export { y as CacheControlConfig, J as CacheControlConfigFromEnv, h as CacheControlScope, C as CacheHint, w as CacheHintMap, x as CachePolicy, z as CachePolicyAnalysisInfo, q as ComplexityAnalysisError, l as ComplexityAnalysisInfo, n as ComplexityCalculator, j as ComplexityConfig, u as ComplexityConfigFromEnv, m as ComplexityExceededInfo, p as ComplexityLimitExceededError, k as ComplexityResult, D as DirectiveApplication, d as DirectiveRegistration, b as EnumRegistration, K as ExecutionArgs, o as FieldComplexity, a as FieldRegistration, f as GraphQLEffectContext, i as GraphQLSchemaBuilder, c as InputTypeRegistration, I as InterfaceRegistration, M as MiddlewareContext, e as MiddlewareRegistration, O as ObjectFieldRegistration, S as SubscriptionFieldRegistration, T as TypeRegistration, g as TypeRegistries, U as UnionRegistration, t as combineCalculators, A as computeCachePolicy, B as computeCachePolicyFromQuery, r as defaultComplexityCalculator, s as depthOnlyCalculator, L as makeExtensionsService, R as runExecuteEndHooks, Q as runExecuteStartHooks, N as runParseHooks, P as runValidateHooks, H as toCacheControlHeader, v as validateComplexity } from './schema-builder-DKvkzU_M.js';
 import { GraphQLOutputType, GraphQLInputType, GraphQLFieldConfigArgumentMap, GraphQLObjectType } from 'graphql';
 export { DirectiveLocation, GraphQLBoolean, GraphQLEnumType, GraphQLFieldConfigMap, GraphQLFloat, GraphQLID, GraphQLInputObjectType, GraphQLInt, GraphQLInterfaceType, GraphQLList, GraphQLNonNull, GraphQLObjectType, GraphQLScalarType, GraphQLSchema, GraphQLString, GraphQLUnionType, Kind, ValueNode, graphql, lexicographicSortSchema, printSchema } from 'graphql';
 export { compose, directive, enumType, execute, extension, field, getSchemaName, inputType, interfaceType, middleware, mutation, objectType, query, subscription, unionType } from './builder/index.js';
@@ -216,11 +216,17 @@ declare class LoaderRegistry<Defs extends Record<string, LoaderDef<any, any, any
     /**
      * Load a single value by key.
      * This is the most common operation in resolvers.
+     *
+     * @internal The internal cast is safe because LoaderInstances<Defs> guarantees
+     * that loaders[name] is a DataLoader with the correct key/value types.
      */
     load<Name extends keyof Defs & string>(name: Name, key: LoaderKey<Defs[Name]>): Effect.Effect<LoaderValue<Defs[Name]>, Error, LoaderInstances<Defs>>;
     /**
      * Load multiple values by keys.
      * All keys are batched into a single request.
+     *
+     * @internal The internal cast is safe because LoaderInstances<Defs> guarantees
+     * that loaders[name] is a DataLoader with the correct key/value types.
      */
     loadMany<Name extends keyof Defs & string>(name: Name, keys: readonly LoaderKey<Defs[Name]>[]): Effect.Effect<readonly LoaderValue<Defs[Name]>[], Error, LoaderInstances<Defs>>;
 }
@@ -520,4 +526,4 @@ interface AnalyzerOutput {
  */
 declare const createAnalyzerExtension: (config?: AnalyzerExtensionConfig) => GraphQLExtension<ExtensionsService>;
 
-export { type AdditionalField, type AnalyzerExtensionConfig, type AnalyzerOutput, AuthorizationError, ExtensionsService, FieldComplexityMap, GraphQLError, GraphQLExtension, GraphQLRequestContext, Loader, type LoaderDef, type LoaderInstances, LoaderRegistry, MissingResolverContextError, NotFoundError, ResolverContext, type ResolverContextSlot, ResolverContextStore, 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, make, makeRequestContextLayer, makeStoreLayer, scoped, set, setMany, storeLayer, toGraphQLArgs, toGraphQLInputType, toGraphQLObjectType, toGraphQLType };

package/index.js

@@ -1,11 +1,10 @@
 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, Runtime, Queue, Stream, Fiber, Deferred } from 'effect';
+import { Pipeable, Context, Data, Layer, Effect, Ref, HashMap, Config, Option, Schema, Runtime, Queue, Stream, Fiber, Deferred } from 'effect';
 import * as S2 from 'effect/Schema';
 import * as AST from 'effect/SchemaAST';
 import DataLoader from 'dataloader';
-import { HttpServerResponse, HttpServerRequest, HttpRouter } from '@effect/platform';
-import { makeServer } from 'graphql-ws';
+import { HttpIncomingMessage, HttpServerResponse, HttpServerRequest, HttpRouter } from '@effect/platform';
 
 // src/builder/index.ts
 var isIntegerType = (ast) => {
@@ -812,7 +811,14 @@ var GraphQLSchemaBuilder = class _GraphQLSchemaBuilder {
    * Register an object type from a schema
    */
   objectType(config) {
-    const { schema, implements: implementsInterfaces, directives, cacheControl, fields } = config;
+    const {
+      schema,
+      description,
+      implements: implementsInterfaces,
+      directives,
+      cacheControl,
+      fields
+    } = config;
     const name = config.name ?? getSchemaName(schema);
     if (!name) {
       throw new Error(
@@ -820,7 +826,14 @@ var GraphQLSchemaBuilder = class _GraphQLSchemaBuilder {
       );
     }
     const newTypes = new Map(this.state.types);
-    newTypes.set(name, { name, schema, implements: implementsInterfaces, directives, cacheControl });
+    newTypes.set(name, {
+      name,
+      schema,
+      description,
+      implements: implementsInterfaces,
+      directives,
+      cacheControl
+    });
     let newObjectFields = this.state.objectFields;
     if (fields) {
       newObjectFields = new Map(this.state.objectFields);
@@ -1189,6 +1202,7 @@ var GraphQLSchemaBuilder = class _GraphQLSchemaBuilder {
       const implementedInterfaces = typeReg.implements?.map((name) => interfaceRegistry.get(name)).filter(Boolean) ?? [];
       const graphqlType = new GraphQLObjectType({
         name: typeName,
+        description: typeReg.description,
         fields: () => {
           const baseFields = schemaToFields(typeReg.schema, sharedCtx);
           const additionalFields = this.state.objectFields.get(typeName);
@@ -1464,7 +1478,8 @@ var LoaderRegistry = class {
       this.Service,
       Effect.gen(function* () {
         const instances = {};
-        for (const [name, def] of Object.entries(self.definitions)) {
+        for (const name of Object.keys(self.definitions)) {
+          const def = self.definitions[name];
           instances[name] = yield* createDataLoader(def);
         }
         return instances;
@@ -1484,6 +1499,9 @@ var LoaderRegistry = class {
   /**
    * Load a single value by key.
    * This is the most common operation in resolvers.
+   *
+   * @internal The internal cast is safe because LoaderInstances<Defs> guarantees
+   * that loaders[name] is a DataLoader with the correct key/value types.
    */
   load(name, key) {
     const self = this;
@@ -1496,6 +1514,9 @@ var LoaderRegistry = class {
   /**
    * Load multiple values by keys.
    * All keys are batched into a single request.
+   *
+   * @internal The internal cast is safe because LoaderInstances<Defs> guarantees
+   * that loaders[name] is a DataLoader with the correct key/value types.
    */
   loadMany(name, keys) {
     const self = this;
@@ -1512,35 +1533,39 @@ var LoaderRegistry = class {
     });
   }
 };
+function createSingleDataLoader(def, context) {
+  return new DataLoader(async (keys) => {
+    const items = await Effect.runPromise(def.batch(keys).pipe(Effect.provide(context)));
+    return keys.map((key) => {
+      const item = items.find((i) => def.key(i) === key);
+      if (!item) return new Error(`Not found: ${key}`);
+      return item;
+    });
+  });
+}
+function createGroupedDataLoader(def, context) {
+  return new DataLoader(async (keys) => {
+    const items = await Effect.runPromise(def.batch(keys).pipe(Effect.provide(context)));
+    const map = /* @__PURE__ */ new Map();
+    for (const item of items) {
+      const key = def.groupBy(item);
+      let arr = map.get(key);
+      if (!arr) {
+        arr = [];
+        map.set(key, arr);
+      }
+      arr.push(item);
+    }
+    return keys.map((key) => map.get(key) ?? []);
+  });
+}
 function createDataLoader(def) {
   return Effect.gen(function* () {
     const context = yield* Effect.context();
     if (def._tag === "single") {
-      const loader = new DataLoader(async (keys) => {
-        const items = await Effect.runPromise(def.batch(keys).pipe(Effect.provide(context)));
-        return keys.map((key) => {
-          const item = items.find((i) => def.key(i) === key);
-          if (!item) return new Error(`Not found: ${key}`);
-          return item;
-        });
-      });
-      return loader;
+      return createSingleDataLoader(def, context);
     } else {
-      const loader = new DataLoader(async (keys) => {
-        const items = await Effect.runPromise(def.batch(keys).pipe(Effect.provide(context)));
-        const map = /* @__PURE__ */ new Map();
-        for (const item of items) {
-          const key = def.groupBy(item);
-          let arr = map.get(key);
-          if (!arr) {
-            arr = [];
-            map.set(key, arr);
-          }
-          arr.push(item);
-        }
-        return keys.map((key) => map.get(key) ?? []);
-      });
-      return loader;
+      return createGroupedDataLoader(def, context);
     }
   });
 }
@@ -1764,7 +1789,7 @@ var GraphQLRouterConfigFromEnv = Config.all({
 );
 
 // src/server/graphiql.ts
-var graphiqlHtml = (endpoint) => `<!DOCTYPE html>
+var graphiqlHtml = (endpoint, subscriptionEndpoint) => `<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
@@ -1792,6 +1817,7 @@ var graphiqlHtml = (endpoint) => `<!DOCTYPE html>
     <script>
       const fetcher = GraphiQL.createFetcher({
         url: ${JSON.stringify(endpoint)},
+        subscriptionUrl: ${JSON.stringify(subscriptionEndpoint ?? endpoint)},
       });
       ReactDOM.createRoot(document.getElementById('graphiql')).render(
         React.createElement(GraphiQL, { fetcher })
@@ -2467,19 +2493,32 @@ var defaultErrorHandler = (cause) => (process.env.NODE_ENV !== "production" ? Ef
     ).pipe(Effect.orDie)
   )
 );
-var parseGraphQLQuery = (query2, extensionsService) => Effect.gen(function* () {
+var GraphQLRequestBodySchema = Schema.Struct({
+  query: Schema.String,
+  variables: Schema.optionalWith(Schema.Record({ key: Schema.String, value: Schema.Unknown }), {
+    as: "Option"
+  }),
+  operationName: Schema.optionalWith(Schema.String, { as: "Option" })
+});
+var decodeRequestBody = HttpIncomingMessage.schemaBodyJson(GraphQLRequestBodySchema);
+var parseGraphQLQuery = (query2, extensionsService) => {
   try {
     const document = parse(query2);
-    return { ok: true, document };
+    return Effect.succeed({ ok: true, document });
   } catch (parseError) {
-    const extensionData = yield* extensionsService.get();
-    const response = yield* HttpServerResponse.json({
-      errors: [{ message: String(parseError) }],
-      extensions: Object.keys(extensionData).length > 0 ? extensionData : void 0
-    }).pipe(Effect.orDie);
-    return { ok: false, response };
+    return extensionsService.get().pipe(
+      Effect.flatMap(
+        (extensionData) => HttpServerResponse.json({
+          errors: [{ message: String(parseError) }],
+          extensions: Object.keys(extensionData).length > 0 ? extensionData : void 0
+        }).pipe(
+          Effect.orDie,
+          Effect.map((response) => ({ ok: false, response }))
+        )
+      )
+    );
   }
-});
+};
 var runComplexityValidation = (body, schema, fieldComplexities, complexityConfig) => {
   if (!complexityConfig) {
     return Effect.void;
@@ -2499,8 +2538,9 @@ var runComplexityValidation = (body, schema, fieldComplexities, complexityConfig
     )
   );
 };
-var executeGraphQLQuery = (schema, document, variables, operationName, runtime) => Effect.gen(function* () {
-  const executeResult = yield* Effect.try({
+var isPromiseLike = (value) => value !== null && typeof value === "object" && "then" in value && typeof value.then === "function";
+var executeGraphQLQuery = (schema, document, variables, operationName, runtime) => {
+  const tryExecute = Effect.try({
     try: () => execute$1({
       schema,
       document,
@@ -2510,33 +2550,34 @@ var executeGraphQLQuery = (schema, document, variables, operationName, runtime)
     }),
     catch: (error) => new Error(String(error))
   });
-  if (executeResult && typeof executeResult === "object" && "then" in executeResult) {
-    return yield* Effect.promise(
-      () => executeResult
-    );
-  }
-  return executeResult;
-});
-var computeCacheControlHeader = (document, operationName, schema, cacheHints, cacheControlConfig) => Effect.gen(function* () {
+  return tryExecute.pipe(
+    Effect.flatMap((executeResult) => {
+      if (isPromiseLike(executeResult)) {
+        return Effect.promise(() => executeResult);
+      }
+      return Effect.succeed(executeResult);
+    })
+  );
+};
+var computeCacheControlHeader = (document, operationName, schema, cacheHints, cacheControlConfig) => {
   if (cacheControlConfig?.enabled === false || cacheControlConfig?.calculateHttpHeaders === false) {
-    return void 0;
+    return Effect.succeed(void 0);
   }
   const operations = document.definitions.filter(
     (d) => d.kind === Kind.OPERATION_DEFINITION
   );
   const operation = operationName ? operations.find((o) => o.name?.value === operationName) : operations[0];
   if (!operation || operation.operation === "mutation") {
-    return void 0;
+    return Effect.succeed(void 0);
   }
-  const cachePolicy = yield* computeCachePolicy({
+  return computeCachePolicy({
     document,
     operation,
     schema,
     cacheHints,
     config: cacheControlConfig ?? {}
-  });
-  return toCacheControlHeader(cachePolicy);
-});
+  }).pipe(Effect.map(toCacheControlHeader));
+};
 var buildGraphQLResponse = (result, extensionData, cacheControlHeader) => {
   const finalResult = Object.keys(extensionData).length > 0 ? {
     ...result,
@@ -2574,7 +2615,12 @@ var makeGraphQLRouter = (schema, layer, options = {}) => {
     const extensionsService = yield* makeExtensionsService();
     const runtime = yield* Effect.runtime();
     const request = yield* HttpServerRequest.HttpServerRequest;
-    const body = yield* request.json;
+    const parsedBody = yield* decodeRequestBody(request);
+    const body = {
+      query: parsedBody.query,
+      variables: parsedBody.variables._tag === "Some" ? parsedBody.variables.value : void 0,
+      operationName: parsedBody.operationName._tag === "Some" ? parsedBody.operationName.value : void 0
+    };
     const parseResult = yield* parseGraphQLQuery(body.query, extensionsService);
     if (!parseResult.ok) {
       return parseResult.response;
@@ -2583,7 +2629,7 @@ var makeGraphQLRouter = (schema, layer, options = {}) => {
     yield* runParseHooks(extensions, body.query, document).pipe(
       Effect.provideService(ExtensionsService, extensionsService)
     );
-    const validationRules = resolvedConfig.introspection ? void 0 : [...specifiedRules, NoSchemaIntrospectionCustomRule];
+    const validationRules = resolvedConfig.introspection ? void 0 : specifiedRules.concat(NoSchemaIntrospectionCustomRule);
     const validationErrors = validate(schema, document, validationRules);
     yield* runValidateHooks(extensions, document, validationErrors).pipe(
       Effect.provideService(ExtensionsService, extensionsService)
@@ -2644,9 +2690,12 @@ var makeGraphQLRouter = (schema, layer, options = {}) => {
     HttpRouter.post(resolvedConfig.path, graphqlHandler)
   );
   if (resolvedConfig.graphiql) {
-    const { path, endpoint } = resolvedConfig.graphiql;
+    const { path, endpoint, subscriptionEndpoint } = resolvedConfig.graphiql;
     router = router.pipe(
-      HttpRouter.get(path, HttpServerResponse.html(graphiqlHtml(endpoint)))
+      HttpRouter.get(
+        path,
+        HttpServerResponse.html(graphiqlHtml(endpoint, subscriptionEndpoint))
+      )
     );
   }
   return router;
@@ -2821,27 +2870,45 @@ var runConnectionLifecycle = (socket, wsServer, extra) => Effect.gen(function* (
   Effect.catchAllCause(() => Effect.void),
   Effect.scoped
 );
+var importGraphqlWs = Effect.tryPromise({
+  try: () => import('graphql-ws'),
+  catch: () => new Error(
+    "graphql-ws is required for WebSocket subscriptions. Install it with: npm install graphql-ws"
+  )
+});
 var makeGraphQLWSHandler = (schema, layer, options) => {
   const complexityConfig = options?.complexity;
   const fieldComplexities = options?.fieldComplexities ?? /* @__PURE__ */ new Map();
-  const serverOptions = {
-    schema,
-    context: async (ctx) => {
-      const extra = ctx.extra;
-      return {
-        runtime: extra.runtime,
-        ...extra.connectionParams
-      };
-    },
-    subscribe: async (args) => subscribe(args),
-    onConnect: makeOnConnectHandler(options),
-    onDisconnect: makeOnDisconnectHandler(options),
-    onSubscribe: makeOnSubscribeHandler(options, schema, complexityConfig, fieldComplexities),
-    onComplete: makeOnCompleteHandler(options),
-    onError: makeOnErrorHandler(options)
+  let wsServerPromise = null;
+  const getOrCreateServer = async () => {
+    if (!wsServerPromise) {
+      wsServerPromise = Effect.runPromise(importGraphqlWs).then(({ makeServer }) => {
+        const serverOptions = {
+          schema,
+          context: async (ctx) => {
+            const extra = ctx.extra;
+            return {
+              runtime: extra.runtime,
+              ...extra.connectionParams
+            };
+          },
+          subscribe: async (args) => subscribe(args),
+          onConnect: makeOnConnectHandler(options),
+          onDisconnect: makeOnDisconnectHandler(options),
+          onSubscribe: makeOnSubscribeHandler(options, schema, complexityConfig, fieldComplexities),
+          onComplete: makeOnCompleteHandler(options),
+          onError: makeOnErrorHandler(options)
+        };
+        return makeServer(serverOptions);
+      });
+    }
+    return wsServerPromise;
   };
-  const wsServer = makeServer(serverOptions);
   return (socket) => Effect.gen(function* () {
+    const wsServer = yield* Effect.tryPromise({
+      try: () => getOrCreateServer(),
+      catch: (error) => error
+    });
     const runtime = yield* Effect.provide(Effect.runtime(), layer);
     const extra = {
       socket,