@fluojs/graphql 1.0.4 → 1.1.0

package/dist/schema/schema.js

@@ -1,6 +1,7 @@
 import { DtoValidationError } from '@fluojs/validation';
 import { createGraphqlInput, resolveArgType, resolveOutputType } from '../pipeline/input-pipeline.js';
 import { GRAPHQL_OPERATION_CONTAINER, isGraphqlListTypeRef } from '../types.js';
+import { ObjectFieldResolverRegistry } from './object-field-resolvers.js';
 function isAsyncIterable(value) {
   return typeof value === 'object' && value !== null && Symbol.asyncIterator in value;
 }
@@ -14,7 +15,6 @@ function scalarByName(deps, scalar) {
       return deps.GraphQLBoolean;
     case 'id':
       return deps.GraphQLID;
-    case 'string':
     default:
       return deps.GraphQLString;
   }
@@ -35,43 +35,60 @@ function builtinScalarByGraphqlName(deps, scalarName) {
       return undefined;
   }
 }
-function normalizeFieldOutputType(deps, type) {
+function normalizeFieldOutputType(deps, outputTypeCache, type, transformObjectFields) {
+  if (isListOutputType(type)) {
+    return new deps.GraphQLList(normalizeFieldOutputType(deps, outputTypeCache, type.ofType, transformObjectFields));
+  }
+  if (isNonNullOutputType(type)) {
+    return new deps.GraphQLNonNull(normalizeFieldOutputType(deps, outputTypeCache, type.ofType, transformObjectFields));
+  }
   const maybeScalarName = type.name;
   if (typeof maybeScalarName === 'string') {
-    return builtinScalarByGraphqlName(deps, maybeScalarName) ?? type;
+    const builtinScalar = builtinScalarByGraphqlName(deps, maybeScalarName);
+    if (builtinScalar) {
+      return builtinScalar;
+    }
+  }
+  if (isUnionOutputType(type)) {
+    return normalizeUnionOutputType(deps, outputTypeCache, type, transformObjectFields);
+  }
+  if (isObjectOutputType(type)) {
+    return normalizeObjectOutputType(deps, outputTypeCache, type, transformObjectFields);
   }
   return type;
 }
-function normalizeObjectOutputType(deps, outputTypeCache, outputType) {
+function normalizeObjectOutputType(deps, outputTypeCache, outputType, transformObjectFields) {
   const outputTypeName = outputType.name;
   const cached = outputTypeCache.get(outputTypeName);
   if (cached) {
     return cached;
   }
   const config = outputType.toConfig();
-  const clonedFields = Object.fromEntries(Object.entries(config.fields).map(([fieldName, fieldConfig]) => {
-    const field = fieldConfig;
-    return [fieldName, {
-      ...field,
-      type: normalizeFieldOutputType(deps, field.type)
-    }];
-  }));
   const normalized = new deps.GraphQLObjectType({
     ...config,
-    fields: clonedFields
+    fields: () => {
+      const clonedFields = Object.fromEntries(Object.entries(config.fields).map(([fieldName, fieldConfig]) => {
+        const field = fieldConfig;
+        return [fieldName, {
+          ...field,
+          type: normalizeFieldOutputType(deps, outputTypeCache, field.type, transformObjectFields)
+        }];
+      }));
+      return transformObjectFields(outputTypeName, clonedFields);
+    }
   });
   outputTypeCache.set(outputTypeName, normalized);
+  normalized.getFields();
   return normalized;
 }
-function normalizeUnionOutputType(deps, outputTypeCache, outputType) {
+function normalizeUnionOutputType(deps, outputTypeCache, outputType, transformObjectFields) {
   const outputTypeName = outputType.name;
   const cached = outputTypeCache.get(outputTypeName);
   if (cached) {
     return cached;
   }
   const config = outputType.toConfig();
-  const normalizedTypes = config.types.map(itemType => normalizeObjectOutputType(deps, outputTypeCache, itemType));
-  const normalizedTypeByName = new Set(normalizedTypes.map(itemType => itemType.name).filter(name => typeof name === 'string'));
+  const normalizedTypeByName = new Set(config.types.map(itemType => itemType.name));
   const normalized = new deps.GraphQLUnionType({
     ...config,
     resolveType: async (...args) => {
@@ -88,36 +105,46 @@ function normalizeUnionOutputType(deps, outputTypeCache, outputType) {
       }
       return undefined;
     },
-    types: normalizedTypes
+    types: () => config.types.map(itemType => normalizeObjectOutputType(deps, outputTypeCache, itemType, transformObjectFields))
   });
   outputTypeCache.set(outputTypeName, normalized);
+  normalized.getTypes();
   return normalized;
 }
 function isUnionOutputType(value) {
   return typeof value === 'object' && typeof value.getTypes === 'function';
 }
+function isObjectOutputType(value) {
+  return value[Symbol.toStringTag] === 'GraphQLObjectType';
+}
+function isListOutputType(value) {
+  return value[Symbol.toStringTag] === 'GraphQLList';
+}
+function isNonNullOutputType(value) {
+  return value[Symbol.toStringTag] === 'GraphQLNonNull';
+}
 function resolveArgGraphqlType(deps, argType) {
   if (isGraphqlListTypeRef(argType)) {
     return new deps.GraphQLList(scalarByName(deps, argType.ofType));
   }
   return scalarByName(deps, argType);
 }
-function resolveNamedRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputRef) {
+function resolveNamedRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputRef, transformObjectFields) {
   if (typeof outputRef === 'string') {
     return scalarByName(deps, outputRef);
   }
   markAllowedCrossRealmGraphqlObjects(outputRef);
   if (isUnionOutputType(outputRef)) {
-    return normalizeUnionOutputType(deps, outputTypeCache, outputRef);
+    return normalizeUnionOutputType(deps, outputTypeCache, outputRef, transformObjectFields);
   }
-  return normalizeObjectOutputType(deps, outputTypeCache, outputRef);
+  return normalizeObjectOutputType(deps, outputTypeCache, outputRef, transformObjectFields);
 }
-function resolveRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputRef) {
+function resolveRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputRef, transformObjectFields) {
   if (isGraphqlListTypeRef(outputRef)) {
-    const listItemType = resolveNamedRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputRef.ofType);
+    const listItemType = resolveNamedRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputRef.ofType, transformObjectFields);
     return new deps.GraphQLList(listItemType);
   }
-  return resolveNamedRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputRef);
+  return resolveNamedRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputRef, transformObjectFields);
 }
 function createFieldArgs(deps, handler) {
   return Object.fromEntries(handler.argFields.map(argField => [argField.argName, {
@@ -147,7 +174,7 @@ function createOperationField(descriptor, handler, args, outputType, invokeResol
     type: outputType
   };
 }
-function pickFieldsByType(deps, descriptors, handlerType, markAllowedCrossRealmGraphqlObjects, outputTypeCache, invokeResolver) {
+function pickFieldsByType(deps, descriptors, handlerType, markAllowedCrossRealmGraphqlObjects, outputTypeCache, transformObjectFields, invokeResolver) {
   const fields = {};
   for (const descriptor of descriptors) {
     for (const handler of descriptor.handlers) {
@@ -156,7 +183,7 @@ function pickFieldsByType(deps, descriptors, handlerType, markAllowedCrossRealmG
       }
       const args = createFieldArgs(deps, handler);
       const outputRef = resolveOutputType(handler);
-      const outputType = resolveRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputRef);
+      const outputType = resolveRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputRef, transformObjectFields);
       if (Object.hasOwn(fields, handler.fieldName)) {
         throw new Error(`GraphQL schema conflict: field "${handler.fieldName}" on ${handlerType} type is registered more than once. ` + `Found duplicate in resolver "${descriptor.targetName}". Each field name must be unique across all resolvers.`);
       }
@@ -175,20 +202,22 @@ function isGraphQLSchemaLike(value) {
   }
   return typeof value.getQueryType === 'function' && typeof value.getTypeMap === 'function';
 }
-function toGraphqlValidationError(deps, error) {
-  return new deps.GraphQLError('Validation failed.', {
+function toGraphqlValidationError(deps, error, markAllowedCrossRealmGraphqlObjects) {
+  const graphqlError = deps.createGraphQLError('Validation failed.', {
     extensions: {
       code: 'BAD_USER_INPUT',
       issues: error.issues
     }
   });
+  markAllowedCrossRealmGraphqlObjects(graphqlError);
+  return graphqlError;
 }
-async function createResolverInput(deps, handler, args) {
+async function createResolverInput(deps, handler, args, markAllowedCrossRealmGraphqlObjects) {
   try {
     return await createGraphqlInput(handler.inputClass, args, handler.argFields);
   } catch (error) {
     if (error instanceof DtoValidationError) {
-      throw toGraphqlValidationError(deps, error);
+      throw toGraphqlValidationError(deps, error, markAllowedCrossRealmGraphqlObjects);
     }
     throw error;
   }
@@ -200,21 +229,21 @@ function resolveResolverMethod(instance, descriptor, handler) {
   }
   return value;
 }
-function createResolverInvoker(deps, runtimeContainer) {
-  return async (descriptor, handler, args, contextValue) => {
+function createResolverInvoker(deps, runtimeContainer, markAllowedCrossRealmGraphqlObjects, objectFieldResolvers) {
+  return async (descriptor, handler, args, contextValue, source) => {
     if (descriptor.scope === 'singleton') {
       const instance = await runtimeContainer.resolve(descriptor.token);
       const resolverMethod = resolveResolverMethod(instance, descriptor, handler);
-      const input = await createResolverInput(deps, handler, args);
-      return resolverMethod.call(instance, input, contextValue);
+      const methodArguments = handler.type === 'field' ? objectFieldResolvers.createMethodArguments(handler, source, contextValue) : [await createResolverInput(deps, handler, args, markAllowedCrossRealmGraphqlObjects), contextValue];
+      return resolverMethod.call(instance, ...methodArguments);
     }
     const operationContainer = contextValue[GRAPHQL_OPERATION_CONTAINER] ?? runtimeContainer.createRequestScope();
     const disposeOperationContainer = contextValue[GRAPHQL_OPERATION_CONTAINER] === undefined;
     try {
       const instance = await operationContainer.resolve(descriptor.token);
       const resolverMethod = resolveResolverMethod(instance, descriptor, handler);
-      const input = await createResolverInput(deps, handler, args);
-      return await resolverMethod.call(instance, input, contextValue);
+      const methodArguments = handler.type === 'field' ? objectFieldResolvers.createMethodArguments(handler, source, contextValue) : [await createResolverInput(deps, handler, args, markAllowedCrossRealmGraphqlObjects), contextValue];
+      return await resolverMethod.call(instance, ...methodArguments);
     } finally {
       if (disposeOperationContainer) {
         await operationContainer.dispose();
@@ -282,17 +311,24 @@ export function createCodeFirstSchema(deps, runtimeContainer, resolverDescriptor
   if (resolverDescriptors.length === 0) {
     throw new Error('GraphQL module requires either schema or at least one resolver decorated with @Resolver().');
   }
-  const invokeResolver = createResolverInvoker(deps, runtimeContainer);
+  const objectFieldResolvers = new ObjectFieldResolverRegistry(resolverDescriptors);
+  const invokeResolver = createResolverInvoker(deps, runtimeContainer, markAllowedCrossRealmGraphqlObjects, objectFieldResolvers);
   const outputTypeCache = new Map();
-  const queryFields = pickFieldsByType(deps, resolverDescriptors, 'query', markAllowedCrossRealmGraphqlObjects, outputTypeCache, invokeResolver);
-  const mutationFields = pickFieldsByType(deps, resolverDescriptors, 'mutation', markAllowedCrossRealmGraphqlObjects, outputTypeCache, invokeResolver);
-  const subscriptionFields = pickFieldsByType(deps, resolverDescriptors, 'subscription', markAllowedCrossRealmGraphqlObjects, outputTypeCache, invokeResolver);
+  function attachObjectFieldResolvers(typeName, fields) {
+    return objectFieldResolvers.attach(typeName, fields, outputType => resolveRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputType, attachObjectFieldResolvers), (descriptor, handler, source, contextValue) => invokeResolver(descriptor, handler, {}, contextValue, source));
+  }
+  const queryFields = pickFieldsByType(deps, resolverDescriptors, 'query', markAllowedCrossRealmGraphqlObjects, outputTypeCache, attachObjectFieldResolvers, invokeResolver);
+  const mutationFields = pickFieldsByType(deps, resolverDescriptors, 'mutation', markAllowedCrossRealmGraphqlObjects, outputTypeCache, attachObjectFieldResolvers, invokeResolver);
+  const subscriptionFields = pickFieldsByType(deps, resolverDescriptors, 'subscription', markAllowedCrossRealmGraphqlObjects, outputTypeCache, attachObjectFieldResolvers, invokeResolver);
+  objectFieldResolvers.assertAllTargetsAttached();
   const queryType = createQueryRootType(deps, queryFields);
   const mutationType = createOptionalRootType(deps, 'Mutation', mutationFields);
   const subscriptionType = createOptionalRootType(deps, 'Subscription', subscriptionFields);
-  return new deps.GraphQLSchema({
+  const schema = new deps.GraphQLSchema({
     mutation: mutationType,
     query: queryType,
     subscription: subscriptionType
   });
+  markAllowedCrossRealmGraphqlObjects(schema);
+  return schema;
 }

package/dist/service.d.ts

@@ -1,5 +1,5 @@
-import { type HttpApplicationAdapter } from '@fluojs/http';
 import type { Container } from '@fluojs/di';
+import { type HttpApplicationAdapter } from '@fluojs/http';
 import type { ApplicationLogger, CompiledModule, OnApplicationBootstrap, OnApplicationShutdown } from '@fluojs/runtime';
 import type { GraphqlModuleOptions } from './types.js';
 /**
@@ -23,10 +23,7 @@ export declare class GraphqlLifecycleService implements OnApplicationBootstrap,
     private readonly operationContainers;
     private readonly requestContexts;
     private readonly websocketOperationContainers;
-    private websocketDisposable;
-    private websocketServer;
-    private websocketUpgradeListener;
-    private websocketUpgradeServer;
+    private websocketTransport;
     private executeGraphqlOperation;
     private releaseGraphqlInstanceOfPatch;
     private subscribeGraphqlOperation;
@@ -48,10 +45,8 @@ export declare class GraphqlLifecycleService implements OnApplicationBootstrap,
     private registerWebSocketTransport;
     private unregisterWebSocketTransport;
     private isWebSocketTransportEnabled;
-    private resolveUpgradeServer;
     private handleWebSocketSubscribe;
     private createWebSocketOperationLimitError;
-    private rejectWebSocketUpgrade;
     private getOrCreateWebSocketOperationContainer;
     private disposeWebSocketOperationContainer;
     private disposeAllWebSocketOperationContainers;

package/dist/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgD,KAAK,sBAAsB,EAAsD,MAAM,cAAc,CAAC;AAE7J,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AA0BxH,OAAO,KAAK,EAEV,oBAAoB,EAGrB,MAAM,YAAY,CAAC;AAsIpB;;GAEG;AACH,qBACa,yBAAyB;IAEpC,SAAS,IAAI,SAAS;IAKtB,UAAU,IAAI,SAAS;CAGxB;AA+ID;;GAEG;AACH,qBACa,uBAAwB,YAAW,sBAAsB,EAAE,qBAAqB;IA6DzF,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAhE1B,OAAO,CAAC,uBAAuB,CAAsC;IACrE,OAAO,CAAC,oBAAoB,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAqC;IACzE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiD;IACjF,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAA6C;IAC1F,OAAO,CAAC,mBAAmB,CAAkD;IAC7E,OAAO,CAAC,eAAe,CAA8B;IACrD,OAAO,CAAC,wBAAwB,CAAkC;IAClE,OAAO,CAAC,sBAAsB,CAAgC;IAC9D,OAAO,CAAC,uBAAuB,CAAyD;IACxF,OAAO,CAAC,6BAA6B,CAA2B;IAChE,OAAO,CAAC,yBAAyB,CAAyD;IAC1F,OAAO,CAAC,IAAI,CAAuB;IAEnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CA2CzB;gBAGiB,gBAAgB,EAAE,SAAS,EAC3B,eAAe,EAAE,SAAS,cAAc,EAAE,EAC1C,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,oBAAoB;IAG1C,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAgDvC,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;YAI9B,wBAAwB;IAYtC,OAAO,CAAC,sBAAsB;IAI9B,OAAO,CAAC,2BAA2B;IAInC,OAAO,CAAC,sBAAsB;IAe9B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,2BAA2B;IAInC,OAAO,CAAC,kBAAkB;IAiB1B,OAAO,CAAC,oBAAoB;IAmB5B,OAAO,CAAC,mBAAmB;YAyBb,0BAA0B;YA4E1B,4BAA4B;IAuC1C,OAAO,CAAC,2BAA2B;IAInC,OAAO,CAAC,oBAAoB;YAkBd,wBAAwB;IAwDtC,OAAO,CAAC,kCAAkC;IAwB1C,OAAO,CAAC,sBAAsB;IAoB9B,OAAO,CAAC,sCAAsC;YAchC,kCAAkC;YAqBlC,sCAAsC;IAkBpD,OAAO,CAAC,6BAA6B;YAYvB,yBAAyB;CAexC"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAA0C,KAAK,sBAAsB,EAA4D,MAAM,cAAc,CAAC;AAC7J,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AA0BxH,OAAO,KAAK,EAEV,oBAAoB,EAGrB,MAAM,YAAY,CAAC;AA2EpB;;GAEG;AACH,qBACa,yBAAyB;IAEpC,SAAS,IAAI,SAAS;IAKtB,UAAU,IAAI,SAAS;CAGxB;AA4JD;;GAEG;AACH,qBACa,uBAAwB,YAAW,sBAAsB,EAAE,qBAAqB;IA0DzF,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IA7D1B,OAAO,CAAC,uBAAuB,CAAsC;IACrE,OAAO,CAAC,oBAAoB,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAqC;IACzE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiD;IACjF,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAA6C;IAC1F,OAAO,CAAC,kBAAkB,CAA4C;IACtE,OAAO,CAAC,uBAAuB,CAAoC;IACnE,OAAO,CAAC,6BAA6B,CAA2B;IAChE,OAAO,CAAC,yBAAyB,CAAsC;IACvE,OAAO,CAAC,IAAI,CAAuB;IAEnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CA2CzB;gBAGiB,gBAAgB,EAAE,SAAS,EAC3B,eAAe,EAAE,SAAS,cAAc,EAAE,EAC1C,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,oBAAoB;IAG1C,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAgDvC,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;YAI9B,wBAAwB;IAYtC,OAAO,CAAC,sBAAsB;IAI9B,OAAO,CAAC,2BAA2B;IAInC,OAAO,CAAC,sBAAsB;IAe9B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,2BAA2B;IAInC,OAAO,CAAC,kBAAkB;IAiB1B,OAAO,CAAC,oBAAoB;IAmB5B,OAAO,CAAC,mBAAmB;YAyBb,0BAA0B;YAgC1B,4BAA4B;IAgB1C,OAAO,CAAC,2BAA2B;YAIrB,wBAAwB;IAmDtC,OAAO,CAAC,kCAAkC;IAwB1C,OAAO,CAAC,sCAAsC;YAchC,kCAAkC;YAqBlC,sCAAsC;IAkBpD,OAAO,CAAC,6BAA6B;YAYvB,yBAAyB;CAexC"}

package/dist/service.js

@@ -4,8 +4,8 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _setFunctionName(e, t, n) { "symbol" == typeof t && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? typeof e : "null")); return e; }
-import { Controller, Get, Post } from '@fluojs/http';
 import { Inject } from '@fluojs/core';
+import { Controller, Get, Post } from '@fluojs/http';
 import { APPLICATION_LOGGER, COMPILED_MODULES, HTTP_APPLICATION_ADAPTER, RUNTIME_CONTAINER } from '@fluojs/runtime/internal';
 import { discoverResolverDescriptors } from './discovery.js';
 import { createGraphqlValidationPlugin, resolveGraphqlRequestLimits } from './guardrails.js';
@@ -19,13 +19,6 @@ const DEFAULT_GRAPHQL_WEBSOCKET_LIMITS = {
   maxOperationsPerConnection: 25,
   maxPayloadBytes: 64 * 1024
 };
-function hasNodeUpgradeServer(value) {
-  if (typeof value !== 'object' || value === null) {
-    return false;
-  }
-  const server = value;
-  return typeof server.on === 'function' && typeof server.off === 'function';
-}
 function buildFrameworkRequestFromFetchRequest(request) {
   const requestUrl = new URL(request.url);
   return {
@@ -40,37 +33,6 @@ function buildFrameworkRequestFromFetchRequest(request) {
     url: requestUrl.pathname + requestUrl.search
   };
 }
-function buildFrameworkRequestFromIncomingMessage(request) {
-  const requestUrl = new URL(request.url ?? '/graphql', 'http://localhost');
-  return {
-    cookies: {},
-    headers: request.headers,
-    method: request.method ?? 'GET',
-    params: {},
-    path: requestUrl.pathname,
-    query: Object.fromEntries(requestUrl.searchParams.entries()),
-    raw: request,
-    url: requestUrl.pathname + requestUrl.search
-  };
-}
-function isConnectionParamsRecord(value) {
-  return typeof value === 'object' && value !== null && !Array.isArray(value);
-}
-function closeWebSocketServer(server) {
-  return new Promise((resolve, reject) => {
-    server.close(error => {
-      if (error?.message === 'The server is not running') {
-        resolve();
-        return;
-      }
-      if (error) {
-        reject(error);
-        return;
-      }
-      resolve();
-    });
-  });
-}
 let graphqlInstanceOfPatchRefCount = 0;
 let restoreGraphqlInstanceOfPatch;
 const allowedCrossRealmGraphqlObjects = new WeakSet();
@@ -101,16 +63,17 @@ class GraphqlEndpointController {
 }
 export { _GraphqlEndpointContr as GraphqlEndpointController };
 function getCrossRealmGraphqlTag(value, constructor) {
-  const className = constructor.prototype?.[Symbol.toStringTag];
+  const prototypeTag = constructor.prototype?.[Symbol.toStringTag];
+  const className = typeof prototypeTag === 'string' ? prototypeTag : constructor.name;
   if (typeof className !== 'string' || !className.startsWith('GraphQL')) {
     return undefined;
   }
   if (typeof value !== 'object' || value === null) {
     return undefined;
   }
-  if (Symbol.toStringTag in value) {
-    const valueClassName = value[Symbol.toStringTag];
-    return valueClassName === className ? className : undefined;
+  const valueTag = value[Symbol.toStringTag];
+  if (typeof valueTag === 'string') {
+    return valueTag === className ? className : undefined;
   }
   const valueClassName = value.constructor?.name;
   return valueClassName === className ? className : undefined;
@@ -124,7 +87,8 @@ function markAllowedCrossRealmGraphqlObjects(value, visited = new WeakSet()) {
   }
   visited.add(value);
   const tag = value[Symbol.toStringTag];
-  if (typeof tag === 'string' && tag.startsWith('GraphQL')) {
+  const constructorName = value.constructor?.name;
+  if (typeof tag === 'string' && tag.startsWith('GraphQL') || typeof constructorName === 'string' && constructorName.startsWith('GraphQL')) {
     allowedCrossRealmGraphqlObjects.add(value);
   }
   if (Array.isArray(value)) {
@@ -184,13 +148,10 @@ function releaseGraphqlInstanceOfPatch() {
   restoreGraphqlInstanceOfPatch = undefined;
 }
 async function loadGraphqlDeps() {
-  const {
-    createRequire
-  } = await import('node:module');
-  const runtimeRequire = createRequire(import.meta.url);
-  const graphqlMod = runtimeRequire('graphql');
-  const yogaMod = runtimeRequire('graphql-yoga');
-  const instanceOfModule = runtimeRequire('graphql/jsutils/instanceOf.js');
+  const graphqlSpecifier = 'graphql';
+  const yogaSpecifier = 'graphql-yoga';
+  const instanceOfSpecifier = 'graphql/jsutils/instanceOf.js';
+  const [graphqlMod, yogaMod, instanceOfModule] = await Promise.all([import(/* @vite-ignore */graphqlSpecifier), import(/* @vite-ignore */yogaSpecifier), import(/* @vite-ignore */instanceOfSpecifier)]);
   return {
     GraphQLError: graphqlMod.GraphQLError,
     GraphQLBoolean: graphqlMod.GraphQLBoolean,
@@ -198,11 +159,13 @@ async function loadGraphqlDeps() {
     GraphQLID: graphqlMod.GraphQLID,
     GraphQLInt: graphqlMod.GraphQLInt,
     GraphQLList: graphqlMod.GraphQLList,
+    GraphQLNonNull: graphqlMod.GraphQLNonNull,
     GraphQLObjectType: graphqlMod.GraphQLObjectType,
     GraphQLSchema: graphqlMod.GraphQLSchema,
     GraphQLString: graphqlMod.GraphQLString,
     GraphQLUnionType: graphqlMod.GraphQLUnionType,
     buildSchema: graphqlMod.buildSchema,
+    createGraphQLError: yogaMod.createGraphQLError,
     createYoga: yogaMod.createYoga,
     execute: graphqlMod.execute,
     instanceOfModule,
@@ -223,10 +186,7 @@ class GraphqlLifecycleService {
   operationContainers = new WeakMap();
   requestContexts = new WeakMap();
   websocketOperationContainers = new Map();
-  websocketDisposable;
-  websocketServer;
-  websocketUpgradeListener;
-  websocketUpgradeServer;
+  websocketTransport;
   executeGraphqlOperation;
   releaseGraphqlInstanceOfPatch;
   subscribeGraphqlOperation;
@@ -406,91 +366,43 @@ class GraphqlLifecycleService {
     };
   }
   async registerWebSocketTransport() {
-    if (!this.isWebSocketTransportEnabled() || this.yoga === undefined || this.websocketUpgradeListener !== undefined) {
+    if (!this.isWebSocketTransportEnabled() || this.yoga === undefined || this.websocketTransport !== undefined) {
       return;
     }
-    const [{
-      handleProtocols
-    }, {
-      useServer
-    }, {
-      WebSocketServer
-    }] = await Promise.all([import('graphql-ws'), import('graphql-ws/lib/use/ws'), import('ws')]);
-    const upgradeServer = this.resolveUpgradeServer();
-    const websocketLimits = this.resolveWebSocketLimits();
-    const websocketServer = new WebSocketServer({
-      handleProtocols: protocols => handleProtocols(protocols),
-      maxPayload: websocketLimits?.maxPayloadBytes ?? 0,
-      noServer: true
-    });
-    const upgradeListener = (request, socket, head) => {
-      const targetPath = new URL(request.url ?? '/', 'http://localhost').pathname;
-      if (!isGraphqlPath(targetPath)) {
-        return;
-      }
-      if (websocketLimits && websocketServer.clients.size >= websocketLimits.maxConnections) {
-        this.rejectWebSocketUpgrade(socket, 503, 'GraphQL websocket connection count exceeds the configured limit.');
-        return;
-      }
-      websocketServer.handleUpgrade(request, socket, head, websocket => {
-        websocketServer.emit('connection', websocket, request);
-      });
-    };
-    const websocketDisposable = useServer({
-      connectionInitWaitTimeout: this.options.subscriptions?.websocket?.connectionInitWaitTimeoutMs,
+    const {
+      createNodeGraphqlWebSocketTransport
+    } = await import('./node/graphql-websocket-transport.js');
+    this.websocketTransport = await createNodeGraphqlWebSocketTransport({
+      adapter: this.adapter,
+      connectionInitWaitTimeoutMs: this.options.subscriptions?.websocket?.connectionInitWaitTimeoutMs,
       execute: args => {
         if (!this.executeGraphqlOperation) {
           throw new Error('GraphQL execute function not initialized.');
         }
         return this.executeGraphqlOperation(args);
       },
-      onComplete: async (context, message) => {
-        await this.disposeWebSocketOperationContainer(context.extra.socket, message.id);
-      },
-      onDisconnect: async context => {
-        await this.disposeAllWebSocketOperationContainers(context.extra.socket);
-      },
-      onSubscribe: async (context, message) => this.handleWebSocketSubscribe(context, message.id, message.payload),
+      keepAliveMs: this.options.subscriptions?.websocket?.keepAliveMs,
+      limits: this.resolveWebSocketLimits(),
+      onComplete: (socketKey, operationId) => this.disposeWebSocketOperationContainer(socketKey, operationId),
+      onDisconnect: socketKey => this.disposeAllWebSocketOperationContainers(socketKey),
+      onSubscribe: request => this.handleWebSocketSubscribe(request),
       subscribe: args => {
         if (!this.subscribeGraphqlOperation) {
           throw new Error('GraphQL subscribe function not initialized.');
         }
         return this.subscribeGraphqlOperation(args);
       }
-    }, websocketServer, this.options.subscriptions?.websocket?.keepAliveMs);
-    upgradeServer.on('upgrade', upgradeListener);
-    this.websocketDisposable = websocketDisposable;
-    this.websocketServer = websocketServer;
-    this.websocketUpgradeListener = upgradeListener;
-    this.websocketUpgradeServer = upgradeServer;
+    });
   }
   async unregisterWebSocketTransport() {
-    if (this.websocketUpgradeListener && this.websocketUpgradeServer) {
-      this.websocketUpgradeServer.off('upgrade', this.websocketUpgradeListener);
-    }
-    this.websocketUpgradeListener = undefined;
-    this.websocketUpgradeServer = undefined;
-    if (this.websocketServer) {
-      for (const client of this.websocketServer.clients) {
-        client.terminate();
-      }
-    }
-    if (this.websocketDisposable) {
+    if (this.websocketTransport) {
       try {
-        await this.websocketDisposable.dispose();
+        await this.websocketTransport.dispose();
       } catch (error) {
         this.logger.error('Failed to dispose GraphQL websocket transport.', error, 'GraphqlLifecycleService');
       }
     }
-    this.websocketDisposable = undefined;
-    if (this.websocketServer) {
-      try {
-        await closeWebSocketServer(this.websocketServer);
-      } catch (error) {
-        this.logger.error('Failed to close GraphQL websocket server.', error, 'GraphqlLifecycleService');
-      }
-    }
-    this.websocketServer = undefined;
+    this.websocketTransport = undefined;
     for (const socketKey of this.websocketOperationContainers.keys()) {
       await this.disposeAllWebSocketOperationContainers(socketKey);
     }
@@ -498,32 +410,21 @@ class GraphqlLifecycleService {
   isWebSocketTransportEnabled() {
     return this.options.subscriptions?.websocket?.enabled === true;
   }
-  resolveUpgradeServer() {
-    if (typeof this.adapter.getServer !== 'function') {
-      throw new Error('GraphQL websocket subscriptions require an HTTP adapter with getServer(). Use the Node HTTP adapter or provide a compatible adapter implementation.');
-    }
-    const server = this.adapter.getServer();
-    if (!hasNodeUpgradeServer(server)) {
-      throw new Error('GraphQL websocket subscriptions require adapter.getServer() to return a Node HTTP/S server that supports upgrade listeners.');
-    }
-    return server;
-  }
-  async handleWebSocketSubscribe(context, operationId, payload) {
+  async handleWebSocketSubscribe(request) {
     const yoga = this.yoga;
     if (!yoga) {
       throw new Error('GraphQL server not initialized.');
     }
-    const websocketLimitError = this.createWebSocketOperationLimitError(context.extra.socket, operationId);
+    const websocketLimitError = this.createWebSocketOperationLimitError(request.socket, request.operationId);
     if (websocketLimitError) {
       return [websocketLimitError];
     }
-    const frameworkRequest = buildFrameworkRequestFromIncomingMessage(context.extra.request);
-    const fetchRequest = toFetchRequest(frameworkRequest);
-    const operationContainer = this.getOrCreateWebSocketOperationContainer(context.extra.socket, operationId);
+    const fetchRequest = toFetchRequest(request.request);
+    const operationContainer = this.getOrCreateWebSocketOperationContainer(request.socket, request.operationId);
     const graphqlContext = this.buildGraphqlContext(fetchRequest, {
-      connectionParams: isConnectionParamsRecord(context.connectionParams) ? context.connectionParams : undefined,
-      request: frameworkRequest,
-      socket: context.extra.socket
+      connectionParams: request.connectionParams,
+      request: request.request,
+      socket: request.socket
     }, operationContainer);
     try {
       const {
@@ -535,21 +436,21 @@ class GraphqlLifecycleService {
         request: fetchRequest,
         [GRAPHQL_CONTEXT_OVERRIDE]: graphqlContext
       });
-      const document = parse(payload.query);
+      const document = parse(request.payload.query);
       const validationErrors = validate(schema, document);
       if (validationErrors.length > 0) {
-        await this.disposeWebSocketOperationContainer(context.extra.socket, operationId);
+        await this.disposeWebSocketOperationContainer(request.socket, request.operationId);
         return validationErrors;
       }
       return {
         contextValue: await contextFactory(),
         document,
-        operationName: payload.operationName ?? undefined,
+        operationName: request.payload.operationName ?? undefined,
         schema,
-        variableValues: payload.variables
+        variableValues: request.payload.variables
       };
     } catch (error) {
-      await this.disposeWebSocketOperationContainer(context.extra.socket, operationId);
+      await this.disposeWebSocketOperationContainer(request.socket, request.operationId);
       throw error;
     }
   }
@@ -568,15 +469,6 @@ class GraphqlLifecycleService {
     }
     return new GraphQLError(`GraphQL websocket active operation count exceeds the configured limit of ${String(limits.maxOperationsPerConnection)}.`);
   }
-  rejectWebSocketUpgrade(socket, statusCode, message) {
-    if (!socket.writable) {
-      socket.destroy();
-      return;
-    }
-    const body = `${message}\n`;
-    socket.write([`HTTP/1.1 ${String(statusCode)} ${statusCode === 503 ? 'Service Unavailable' : 'Bad Request'}`, 'Connection: close', 'Content-Type: text/plain; charset=utf-8', `Content-Length: ${String(new TextEncoder().encode(body).byteLength)}`, '', body].join('\r\n'));
-    socket.destroy();
-  }
   getOrCreateWebSocketOperationContainer(socketKey, operationId) {
     const existingSocketContainers = this.websocketOperationContainers.get(socketKey);
     if (existingSocketContainers?.has(operationId)) {

package/dist/types.d.ts

@@ -99,9 +99,20 @@ export interface ResolverMetadata {
     typeName: string;
 }
 /**
- * Supported GraphQL operation handler categories.
+ * Supported GraphQL root-operation and object-field handler categories.
  */
-export type ResolverHandlerType = 'query' | 'mutation' | 'subscription';
+export type ResolverHandlerType = 'query' | 'mutation' | 'subscription' | 'field';
+/**
+ * Explicit source kinds that can be bound to object field-resolver parameters.
+ */
+export type FieldResolverParameterKind = 'parent' | 'context';
+/**
+ * Describes one positional parameter binding for an object field resolver.
+ */
+export interface FieldResolverParameterBindingMetadata {
+    index: number;
+    kind: FieldResolverParameterKind;
+}
 /**
  * Scalar names supported by the code-first schema helpers.
  */
@@ -157,6 +168,7 @@ export interface ResolverHandlerMetadata {
     inputClass?: Function;
     argTypes?: Record<string, GraphqlArgType>;
     outputType?: GraphqlRootOutputType;
+    nullable?: boolean;
 }
 /**
  * Describes how one method parameter maps to a named GraphQL argument.
@@ -177,6 +189,8 @@ export interface ResolverHandlerDescriptor {
     argFields: ArgFieldMetadata[];
     argTypes?: Record<string, GraphqlArgType>;
     outputType?: GraphqlRootOutputType;
+    nullable?: boolean;
+    parameterBindings: FieldResolverParameterBindingMetadata[];
 }
 /**
  * Fully discovered resolver descriptor used by the GraphQL runtime.