@fluojs/graphql 1.1.0 → 2.0.0

package/dist/instance-of-patch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"instance-of-patch.d.ts","sourceRoot":"","sources":["../src/instance-of-patch.ts"],"names":[],"mappings":"AAAA,qFAAqF;AACrF,MAAM,MAAM,kBAAkB,GAAG,QAAQ,GAAG;IAC1C,QAAQ,CAAC,SAAS,EAAE;QAClB,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC;KACxC,CAAC;CACH,CAAC;AAEF,oEAAoE;AACpE,MAAM,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,kBAAkB,KAAK,OAAO,CAAC;AAE7F,iFAAiF;AACjF,MAAM,MAAM,uBAAuB,GAAG;IACpC,UAAU,EAAE,iBAAiB,CAAC;CAC/B,CAAC;AA0IF;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAC3C,gBAAgB,EAAE,uBAAuB,EACzC,cAAc,EAAE,OAAO,CAAC,MAAM,CAAC,GAC9B,MAAM,IAAI,CAmCZ"}

package/dist/instance-of-patch.js

@@ -0,0 +1,126 @@
+/** Represents a GraphQL constructor inspected by the private `instanceOf` helper. */
+
+/** Represents the private GraphQL `instanceOf` helper signature. */
+
+/** Represents the mutable private GraphQL module object that owns the helper. */
+
+const graphqlInstanceOfPatchStateRegistryKey = Symbol.for('@fluojs/graphql.instance-of-patch-state-registry/v1');
+function isGraphqlInstanceOfPatchStateRegistry(value) {
+  if (typeof value !== 'object' || value === null) {
+    return false;
+  }
+  return Reflect.get(value, 'states') instanceof WeakMap;
+}
+function getGraphqlInstanceOfPatchStates() {
+  const registeredValue = Reflect.get(globalThis, graphqlInstanceOfPatchStateRegistryKey);
+  if (isGraphqlInstanceOfPatchStateRegistry(registeredValue)) {
+    return registeredValue.states;
+  }
+  const registry = {
+    states: new WeakMap()
+  };
+  Object.defineProperty(globalThis, graphqlInstanceOfPatchStateRegistryKey, {
+    configurable: false,
+    enumerable: false,
+    value: registry,
+    writable: false
+  });
+  return registry.states;
+}
+function createGraphqlInstanceOfPatchState(originalInstanceOf) {
+  let patchState;
+  const allowedObjectSets = new Set();
+  const patchedInstanceOf = (value, constructor) => {
+    if (patchState.isEvaluatingDelegate) {
+      return isAllowedCrossRealmGraphqlObject(value, constructor, allowedObjectSets);
+    }
+    patchState.isEvaluatingDelegate = true;
+    try {
+      try {
+        if (patchState.originalInstanceOf(value, constructor)) {
+          return true;
+        }
+      } catch (error) {
+        if (isAllowedCrossRealmGraphqlObject(value, constructor, allowedObjectSets)) {
+          return true;
+        }
+        throw error;
+      }
+      return isAllowedCrossRealmGraphqlObject(value, constructor, allowedObjectSets);
+    } finally {
+      patchState.isEvaluatingDelegate = false;
+    }
+  };
+  patchState = {
+    allowedObjectSets,
+    isEvaluatingDelegate: false,
+    originalInstanceOf,
+    patchedInstanceOf
+  };
+  return patchState;
+}
+function getCrossRealmGraphqlTag(value, constructor) {
+  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;
+  }
+  const valueTag = Reflect.get(value, Symbol.toStringTag);
+  if (typeof valueTag === 'string') {
+    return valueTag === className ? className : undefined;
+  }
+  const valueConstructor = Reflect.get(value, 'constructor');
+  const valueClassName = typeof valueConstructor === 'object' && valueConstructor !== null || typeof valueConstructor === 'function' ? Reflect.get(valueConstructor, 'name') : undefined;
+  return typeof valueClassName === 'string' && valueClassName === className ? className : undefined;
+}
+function isAllowedCrossRealmGraphqlObject(value, constructor, allowedObjectSets) {
+  if (typeof value !== 'object' || value === null) {
+    return false;
+  }
+  for (const allowedObjects of allowedObjectSets) {
+    if (allowedObjects.has(value)) {
+      return getCrossRealmGraphqlTag(value, constructor) !== undefined;
+    }
+  }
+  return false;
+}
+
+/**
+ * Installs and releases a cross-realm GraphQL `instanceOf` patch for one module object.
+ *
+ * @param instanceOfModule The GraphQL module object that owns the `instanceOf` helper.
+ * @param allowedObjects The active application's cross-realm GraphQL object allowlist.
+ * @returns A one-time release callback for the application's allowlist.
+ */
+export function installGraphqlInstanceOfPatch(instanceOfModule, allowedObjects) {
+  const patchStates = getGraphqlInstanceOfPatchStates();
+  let patchState = patchStates.get(instanceOfModule);
+  if (patchState === undefined) {
+    patchState = createGraphqlInstanceOfPatchState(instanceOfModule.instanceOf);
+    patchStates.set(instanceOfModule, patchState);
+  } else if (instanceOfModule.instanceOf !== patchState.patchedInstanceOf) {
+    patchState.originalInstanceOf = instanceOfModule.instanceOf;
+  }
+  instanceOfModule.instanceOf = patchState.patchedInstanceOf;
+  patchState.allowedObjectSets.add(allowedObjects);
+  let released = false;
+  return () => {
+    if (released) {
+      return;
+    }
+    released = true;
+    patchState.allowedObjectSets.delete(allowedObjects);
+    if (patchState.allowedObjectSets.size > 0) {
+      return;
+    }
+    if (instanceOfModule.instanceOf === patchState.patchedInstanceOf) {
+      instanceOfModule.instanceOf = patchState.originalInstanceOf;
+    }
+    if (patchStates.get(instanceOfModule) === patchState) {
+      patchStates.delete(instanceOfModule);
+    }
+  };
+}

package/dist/module.d.ts

@@ -1,14 +1,6 @@
-import type { Provider } from '@fluojs/di';
+import type { InjectionToken } from '@fluojs/core';
 import { type ModuleType } from '@fluojs/runtime';
-import type { GraphqlModuleOptions } from './types.js';
-/**
- * Creates GraphQL runtime providers for module-level options and lifecycle wiring.
- *
- * @param options GraphQL module options used by the lifecycle service and endpoint controller.
- * @returns Provider definitions that register only the internal options token and GraphQL lifecycle service; this helper
- * does not register `GraphqlEndpointController` or mount the `/graphql` endpoint by itself.
- */
-export declare function createGraphqlProviders(options: GraphqlModuleOptions): Provider[];
+import type { GraphqlAsyncModuleOptions, GraphqlModuleOptions } from './types.js';
 /**
  * Represents the graphql module.
  */
@@ -21,5 +13,17 @@ export declare class GraphqlModule {
      * module path (not `createGraphqlProviders(...)` alone) when the application should expose `/graphql`.
      */
     static forRoot(options?: GraphqlModuleOptions): ModuleType;
+    /**
+     * Registers GraphQL from options resolved by explicitly injected application dependencies.
+     *
+     * The factory runs once in each application context. Only `inject` and `useFactory` are
+     * supported; NestJS-style `imports`, `useClass`, `useExisting`, and implicit discovery are rejected.
+     *
+     * @param options Injected dependency tokens and the factory that resolves GraphQL options.
+     * @returns A module definition that resolves GraphQL configuration before endpoint lifecycle wiring begins.
+     *
+     * @throws {TypeError} When the options shape requests unsupported registration behavior.
+     */
+    static forRootAsync<const TTokens extends readonly InjectionToken[]>(options: GraphqlAsyncModuleOptions<TTokens>): ModuleType;
 }
 //# sourceMappingURL=module.d.ts.map

package/dist/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAIhE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAEvD;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,oBAAoB,GAAG,QAAQ,EAAE,CAQhF;AAED;;GAEG;AACH,qBAAa,aAAa;IACxB;;;;;;OAMG;IACH,MAAM,CAAC,OAAO,CAAC,OAAO,GAAE,oBAAyB,GAAG,UAAU;CAS/D"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAKhE,OAAO,KAAK,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAiDlF;;GAEG;AACH,qBAAa,aAAa;IACxB;;;;;;OAMG;IACH,MAAM,CAAC,OAAO,CAAC,OAAO,GAAE,oBAAyB,GAAG,UAAU;IAa9D;;;;;;;;;;OAUG;IACH,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,cAAc,EAAE,EACjE,OAAO,EAAE,yBAAyB,CAAC,OAAO,CAAC,GAC1C,UAAU;CA4Bd"}

package/dist/module.js

@@ -1,18 +1,37 @@
+import { isForwardRef, isOptionalToken } from '@fluojs/di';
 import { defineModule } from '@fluojs/runtime';
+import { RUNTIME_CONTAINER } from '@fluojs/runtime/internal';
 import { GRAPHQL_INTERNAL_MODULE_OPTIONS_TOKEN } from './internal-tokens.js';
 import { GraphqlEndpointController, GraphqlLifecycleService } from './service.js';
-/**
- * Creates GraphQL runtime providers for module-level options and lifecycle wiring.
- *
- * @param options GraphQL module options used by the lifecycle service and endpoint controller.
- * @returns Provider definitions that register only the internal options token and GraphQL lifecycle service; this helper
- * does not register `GraphqlEndpointController` or mount the `/graphql` endpoint by itself.
- */
-export function createGraphqlProviders(options) {
-  return [{
-    provide: GRAPHQL_INTERNAL_MODULE_OPTIONS_TOKEN,
-    useValue: options
-  }, GraphqlLifecycleService];
+function createGraphqlProviders(optionsProvider) {
+  return [optionsProvider, GraphqlLifecycleService];
+}
+function assertGraphqlAsyncModuleOptions(options) {
+  if (options === null || typeof options !== 'object') {
+    throw new TypeError('GraphqlModule.forRootAsync requires an options object.');
+  }
+  const unsupportedKey = Object.keys(options).find(key => key !== 'inject' && key !== 'useFactory');
+  if (unsupportedKey !== undefined) {
+    throw new TypeError(`GraphqlModule.forRootAsync does not support "${unsupportedKey}"; use only inject and useFactory.`);
+  }
+  if (typeof options.useFactory !== 'function') {
+    throw new TypeError('GraphqlModule.forRootAsync requires a useFactory function.');
+  }
+  if (options.inject !== undefined && !Array.isArray(options.inject)) {
+    throw new TypeError('GraphqlModule.forRootAsync inject must be an array of application tokens.');
+  }
+}
+function isContainer(value) {
+  return value !== null && typeof value === 'object' && 'has' in value && 'resolve' in value;
+}
+async function resolveAsyncDependency(container, token) {
+  if (isForwardRef(token)) {
+    return await container.resolve(token.forwardRef());
+  }
+  if (isOptionalToken(token)) {
+    return container.has(token.token) ? await container.resolve(token.token) : undefined;
+  }
+  return await container.resolve(token);
 }
 
 /**
@@ -30,8 +49,44 @@ export class GraphqlModule {
     class GraphqlRootModule extends GraphqlModule {}
     return defineModule(GraphqlRootModule, {
       controllers: [GraphqlEndpointController],
-      middleware: [],
-      providers: createGraphqlProviders(options)
+      middleware: [GraphqlLifecycleService],
+      providers: createGraphqlProviders({
+        provide: GRAPHQL_INTERNAL_MODULE_OPTIONS_TOKEN,
+        useValue: options
+      })
+    });
+  }
+
+  /**
+   * Registers GraphQL from options resolved by explicitly injected application dependencies.
+   *
+   * The factory runs once in each application context. Only `inject` and `useFactory` are
+   * supported; NestJS-style `imports`, `useClass`, `useExisting`, and implicit discovery are rejected.
+   *
+   * @param options Injected dependency tokens and the factory that resolves GraphQL options.
+   * @returns A module definition that resolves GraphQL configuration before endpoint lifecycle wiring begins.
+   *
+   * @throws {TypeError} When the options shape requests unsupported registration behavior.
+   */
+  static forRootAsync(options) {
+    assertGraphqlAsyncModuleOptions(options);
+    class GraphqlAsyncRootModule extends GraphqlModule {}
+    return defineModule(GraphqlAsyncRootModule, {
+      controllers: [GraphqlEndpointController],
+      middleware: [GraphqlLifecycleService],
+      providers: createGraphqlProviders({
+        inject: [RUNTIME_CONTAINER],
+        provide: GRAPHQL_INTERNAL_MODULE_OPTIONS_TOKEN,
+        scope: 'singleton',
+        useFactory: async (...dependencies) => {
+          const [runtimeContainer] = dependencies;
+          if (!isContainer(runtimeContainer)) {
+            throw new TypeError('GraphqlModule.forRootAsync could not resolve the application container.');
+          }
+          const injectedDependencies = await Promise.all((options.inject ?? []).map(async token => await resolveAsyncDependency(runtimeContainer, token)));
+          return Reflect.apply(options.useFactory, options, injectedDependencies);
+        }
+      })
     });
   }
 }

package/dist/node/graphql-websocket-transport.d.ts

@@ -10,6 +10,9 @@ interface GraphqlSubscribePayload {
     query: string;
     variables?: Record<string, unknown> | null;
 }
+/**
+ * Describes a GraphQL-over-WebSocket subscription forwarded to application hooks.
+ */
 export interface GraphqlNodeWebSocketSubscribeRequest {
     connectionParams?: Record<string, unknown>;
     operationId: string;
@@ -17,7 +20,15 @@ export interface GraphqlNodeWebSocketSubscribeRequest {
     request: FrameworkRequest;
     socket: object;
 }
+/**
+ * Represents a registered Node GraphQL WebSocket transport.
+ */
 export interface GraphqlNodeWebSocketTransport {
+    /**
+     * Releases websocket listeners, clients, and GraphQL protocol resources.
+     *
+     * @returns A promise that resolves when cleanup completes or rejects with all current cleanup failures.
+     */
     dispose(): Promise<void>;
 }
 interface GraphqlNodeWebSocketTransportOptions {
@@ -31,6 +42,12 @@ interface GraphqlNodeWebSocketTransportOptions {
     onSubscribe: (request: GraphqlNodeWebSocketSubscribeRequest) => Promise<ExecutionArgs | readonly GraphQLErrorType[]>;
     subscribe: typeof subscribeGraphql;
 }
+/**
+ * Registers GraphQL-over-WebSocket upgrade handling for a Node HTTP/S adapter.
+ *
+ * @param options Transport dependencies and WebSocket lifecycle hooks.
+ * @returns A transport that unregisters upgrade handling and disposes WebSocket clients.
+ */
 export declare function createNodeGraphqlWebSocketTransport(options: GraphqlNodeWebSocketTransportOptions): Promise<GraphqlNodeWebSocketTransport>;
 export {};
 //# sourceMappingURL=graphql-websocket-transport.d.ts.map

package/dist/node/graphql-websocket-transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-websocket-transport.d.ts","sourceRoot":"","sources":["../../src/node/graphql-websocket-transport.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAC7E,OAAO,KAAK,EACV,aAAa,EACb,OAAO,IAAI,cAAc,EACzB,YAAY,IAAI,gBAAgB,EAChC,SAAS,IAAI,gBAAgB,EAC9B,MAAM,SAAS,CAAC;AAgBjB,UAAU,0BAA0B;IAClC,cAAc,EAAE,MAAM,CAAC;IACvB,0BAA0B,EAAE,MAAM,CAAC;IACnC,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,UAAU,uBAAuB;IAC/B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CAC5C;AAED,MAAM,WAAW,oCAAoC;IACnD,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,uBAAuB,CAAC;IACjC,OAAO,EAAE,gBAAgB,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,6BAA6B;IAC5C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,UAAU,oCAAoC;IAC5C,OAAO,EAAE,sBAAsB,CAAC;IAChC,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,OAAO,EAAE,OAAO,cAAc,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,0BAA0B,CAAC;IACpC,UAAU,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC7E,YAAY,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1D,WAAW,EAAE,CAAC,OAAO,EAAE,oCAAoC,KAAK,OAAO,CAAC,aAAa,GAAG,SAAS,gBAAgB,EAAE,CAAC,CAAC;IACrH,SAAS,EAAE,OAAO,gBAAgB,CAAC;CACpC;AA2HD,wBAAsB,mCAAmC,CACvD,OAAO,EAAE,oCAAoC,GAC5C,OAAO,CAAC,6BAA6B,CAAC,CAsFxC"}
+{"version":3,"file":"graphql-websocket-transport.d.ts","sourceRoot":"","sources":["../../src/node/graphql-websocket-transport.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAC7E,OAAO,KAAK,EACV,aAAa,EACb,OAAO,IAAI,cAAc,EACzB,YAAY,IAAI,gBAAgB,EAChC,SAAS,IAAI,gBAAgB,EAC9B,MAAM,SAAS,CAAC;AAgBjB,UAAU,0BAA0B;IAClC,cAAc,EAAE,MAAM,CAAC;IACvB,0BAA0B,EAAE,MAAM,CAAC;IACnC,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,UAAU,uBAAuB;IAC/B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CAC5C;AAED;;GAEG;AACH,MAAM,WAAW,oCAAoC;IACnD,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,uBAAuB,CAAC;IACjC,OAAO,EAAE,gBAAgB,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C;;;;OAIG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,UAAU,oCAAoC;IAC5C,OAAO,EAAE,sBAAsB,CAAC;IAChC,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,OAAO,EAAE,OAAO,cAAc,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,0BAA0B,CAAC;IACpC,UAAU,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC7E,YAAY,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1D,WAAW,EAAE,CAAC,OAAO,EAAE,oCAAoC,KAAK,OAAO,CAAC,aAAa,GAAG,SAAS,gBAAgB,EAAE,CAAC,CAAC;IACrH,SAAS,EAAE,OAAO,gBAAgB,CAAC;CACpC;AA2ID;;;;;GAKG;AACH,wBAAsB,mCAAmC,CACvD,OAAO,EAAE,oCAAoC,GAC5C,OAAO,CAAC,6BAA6B,CAAC,CAkIxC"}

package/dist/node/graphql-websocket-transport.js

@@ -2,6 +2,15 @@ import { handleProtocols } from 'graphql-ws';
 import { useServer } from 'graphql-ws/lib/use/ws';
 import { WebSocketServer } from 'ws';
 import { isGraphqlPath } from '../transport/transport.js';
+
+/**
+ * Describes a GraphQL-over-WebSocket subscription forwarded to application hooks.
+ */
+
+/**
+ * Represents a registered Node GraphQL WebSocket transport.
+ */
+
 function hasNodeUpgradeServer(value) {
   if (typeof value !== 'object' || value === null) {
     return false;
@@ -40,6 +49,18 @@ function closeWebSocketServer(server) {
     });
   });
 }
+function collectCleanupError(errors, error) {
+  if (error instanceof AggregateError) {
+    for (const nested of error.errors) {
+      collectCleanupError(errors, nested);
+    }
+    return;
+  }
+  if (errors.includes(error)) {
+    return;
+  }
+  errors.push(error);
+}
 function resolveUpgradeServer(adapter) {
   if (typeof 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.');
@@ -83,17 +104,37 @@ function createSubscribeRequest(context, message) {
     socket: context.extra.socket
   };
 }
+
+/**
+ * Registers GraphQL-over-WebSocket upgrade handling for a Node HTTP/S adapter.
+ *
+ * @param options Transport dependencies and WebSocket lifecycle hooks.
+ * @returns A transport that unregisters upgrade handling and disposes WebSocket clients.
+ */
 export async function createNodeGraphqlWebSocketTransport(options) {
   const upgradeServer = resolveUpgradeServer(options.adapter);
   const disconnectErrors = [];
+  const disconnectedSockets = new Set();
   const pendingDisconnects = new Set();
+  let websocketDisposableDisposed = false;
+  let websocketServerClosed = false;
+  let inFlightDispose;
   const websocketServer = new WebSocketServer({
     handleProtocols: protocols => handleProtocols(protocols),
     maxPayload: options.limits?.maxPayloadBytes ?? 0,
     noServer: true
   });
   const upgradeListener = createUpgradeListener(websocketServer, options.limits);
+  const drainDisconnectErrors = cleanupErrors => {
+    for (const error of disconnectErrors.splice(0, disconnectErrors.length)) {
+      collectCleanupError(cleanupErrors, error);
+    }
+  };
   const trackDisconnect = socketKey => {
+    if (disconnectedSockets.has(socketKey)) {
+      return;
+    }
+    disconnectedSockets.add(socketKey);
     const pendingDisconnect = Promise.resolve(options.onDisconnect(socketKey)).catch(error => {
       disconnectErrors.push(error);
     }).finally(() => {
@@ -110,47 +151,69 @@ export async function createNodeGraphqlWebSocketTransport(options) {
     onComplete: async (context, message) => {
       await options.onComplete(context.extra.socket, message.id);
     },
-    onDisconnect: async context => {
-      await options.onDisconnect(context.extra.socket);
+    onDisconnect: context => {
+      trackDisconnect(context.extra.socket);
     },
     onSubscribe: async (context, message) => options.onSubscribe(createSubscribeRequest(context, message)),
     subscribe: options.subscribe
   }, websocketServer, options.keepAliveMs);
   websocketServer.on('connection', trackConnection);
   upgradeServer.on('upgrade', upgradeListener);
-  return {
-    async dispose() {
-      let disposeError;
-      websocketServer.off('connection', trackConnection);
-      upgradeServer.off('upgrade', upgradeListener);
-      for (const client of websocketServer.clients) {
-        client.terminate();
-      }
-      const disconnectResults = await Promise.allSettled(pendingDisconnects);
-      for (const error of disconnectErrors) {
-        disposeError ??= error;
-      }
+  const runDispose = async () => {
+    const cleanupErrors = [];
+    drainDisconnectErrors(cleanupErrors);
+    websocketServer.off('connection', trackConnection);
+    upgradeServer.off('upgrade', upgradeListener);
+    for (const client of websocketServer.clients) {
+      client.terminate();
+    }
+    while (pendingDisconnects.size > 0) {
+      const disconnectResults = await Promise.allSettled([...pendingDisconnects]);
       for (const result of disconnectResults) {
         if (result.status === 'rejected') {
-          disposeError ??= result.reason;
+          collectCleanupError(cleanupErrors, result.reason);
         }
       }
+    }
+    drainDisconnectErrors(cleanupErrors);
+    if (!websocketDisposableDisposed) {
       try {
         await websocketDisposable.dispose();
+        websocketDisposableDisposed = true;
       } catch (error) {
-        disposeError = error;
+        collectCleanupError(cleanupErrors, error);
       }
+    }
+    if (!websocketServerClosed) {
       try {
         await closeWebSocketServer(websocketServer);
+        websocketServerClosed = true;
       } catch (error) {
-        disposeError ??= error;
-      }
-      if (disposeError instanceof Error) {
-        throw disposeError;
+        collectCleanupError(cleanupErrors, error);
       }
-      if (disposeError !== undefined) {
-        throw new Error(String(disposeError));
+    }
+    while (pendingDisconnects.size > 0) {
+      const lateDisconnectResults = await Promise.allSettled([...pendingDisconnects]);
+      for (const result of lateDisconnectResults) {
+        if (result.status === 'rejected') {
+          collectCleanupError(cleanupErrors, result.reason);
+        }
       }
     }
+    drainDisconnectErrors(cleanupErrors);
+    if (cleanupErrors.length === 1) {
+      throw cleanupErrors[0];
+    }
+    if (cleanupErrors.length > 1) {
+      throw new AggregateError(cleanupErrors, 'Failed to dispose GraphQL websocket transport resources.');
+    }
+  };
+  return {
+    async dispose() {
+      inFlightDispose ??= runDispose().finally(() => {
+        inFlightDispose = undefined;
+      });
+      await inFlightDispose;
+    }
   };
 }

package/dist/pipeline/input-pipeline.js

@@ -1,4 +1,4 @@
-import { getDtoValidationSchema } from '@fluojs/core/internal';
+import { getDtoValidationSchema } from '@fluojs/core/request-pipeline';
 import { DefaultValidator } from '@fluojs/validation';
 import { isGraphqlListTypeRef } from '../types.js';
 const defaultValidator = new DefaultValidator();

package/dist/schema/object-field-resolvers.d.ts

@@ -1,7 +1,8 @@
-import type { GraphQLFieldConfigMap, GraphQLOutputType } from 'graphql';
+import type { GraphQLFieldConfigArgumentMap, GraphQLFieldConfigMap, GraphQLOutputType } from 'graphql';
 import type { GraphQLContext as FluoGraphQLContext, GraphqlRootOutputType, ResolverDescriptor, ResolverHandlerDescriptor } from '../types.js';
 type ResolveOutputType = (outputType: GraphqlRootOutputType) => GraphQLOutputType;
-type InvokeObjectFieldResolver = (descriptor: ResolverDescriptor, handler: ResolverHandlerDescriptor, source: unknown, contextValue: FluoGraphQLContext) => Promise<unknown>;
+type ResolveInputArgs = (handler: ResolverHandlerDescriptor) => GraphQLFieldConfigArgumentMap;
+type InvokeObjectFieldResolver = (descriptor: ResolverDescriptor, handler: ResolverHandlerDescriptor, args: Record<string, unknown>, source: unknown, contextValue: FluoGraphQLContext) => Promise<unknown>;
 /**
  * Indexes object field resolver descriptors and attaches them to matching code-first object types.
  */
@@ -9,8 +10,8 @@ export declare class ObjectFieldResolverRegistry {
     private readonly attachedTypeNames;
     private readonly entriesByTypeName;
     constructor(descriptors: readonly ResolverDescriptor[]);
-    attach(typeName: string, fields: GraphQLFieldConfigMap<unknown, FluoGraphQLContext>, resolveOutputType: ResolveOutputType, invokeResolver: InvokeObjectFieldResolver): GraphQLFieldConfigMap<unknown, FluoGraphQLContext>;
-    createMethodArguments(handler: ResolverHandlerDescriptor, parent: unknown, contextValue: FluoGraphQLContext): unknown[];
+    attach(typeName: string, fields: GraphQLFieldConfigMap<unknown, FluoGraphQLContext>, resolveOutputType: ResolveOutputType, resolveInputArgs: ResolveInputArgs, invokeResolver: InvokeObjectFieldResolver): GraphQLFieldConfigMap<unknown, FluoGraphQLContext>;
+    createMethodArguments(handler: ResolverHandlerDescriptor, input: unknown, parent: unknown, contextValue: FluoGraphQLContext): unknown[];
     assertAllTargetsAttached(): void;
 }
 export {};

package/dist/schema/object-field-resolvers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"object-field-resolvers.d.ts","sourceRoot":"","sources":["../../src/schema/object-field-resolvers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAExE,OAAO,KAAK,EACV,cAAc,IAAI,kBAAkB,EACpC,qBAAqB,EACrB,kBAAkB,EAClB,yBAAyB,EAC1B,MAAM,aAAa,CAAC;AAOrB,KAAK,iBAAiB,GAAG,CAAC,UAAU,EAAE,qBAAqB,KAAK,iBAAiB,CAAC;AAElF,KAAK,yBAAyB,GAAG,CAC/B,UAAU,EAAE,kBAAkB,EAC9B,OAAO,EAAE,yBAAyB,EAClC,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,kBAAkB,KAC7B,OAAO,CAAC,OAAO,CAAC,CAAC;AAMtB;;GAEG;AACH,qBAAa,2BAA2B;IACtC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IACvD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA4D;gBAElF,WAAW,EAAE,SAAS,kBAAkB,EAAE;IAqBtD,MAAM,CACJ,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,qBAAqB,CAAC,OAAO,EAAE,kBAAkB,CAAC,EAC1D,iBAAiB,EAAE,iBAAiB,EACpC,cAAc,EAAE,yBAAyB,GACxC,qBAAqB,CAAC,OAAO,EAAE,kBAAkB,CAAC;IA+BrD,qBAAqB,CACnB,OAAO,EAAE,yBAAyB,EAClC,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,kBAAkB,GAC/B,OAAO,EAAE;IAoBZ,wBAAwB,IAAI,IAAI;CASjC"}
+{"version":3,"file":"object-field-resolvers.d.ts","sourceRoot":"","sources":["../../src/schema/object-field-resolvers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,6BAA6B,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAEvG,OAAO,KAAK,EACV,cAAc,IAAI,kBAAkB,EACpC,qBAAqB,EACrB,kBAAkB,EAClB,yBAAyB,EAC1B,MAAM,aAAa,CAAC;AAOrB,KAAK,iBAAiB,GAAG,CAAC,UAAU,EAAE,qBAAqB,KAAK,iBAAiB,CAAC;AAClF,KAAK,gBAAgB,GAAG,CAAC,OAAO,EAAE,yBAAyB,KAAK,6BAA6B,CAAC;AAE9F,KAAK,yBAAyB,GAAG,CAC/B,UAAU,EAAE,kBAAkB,EAC9B,OAAO,EAAE,yBAAyB,EAClC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,kBAAkB,KAC7B,OAAO,CAAC,OAAO,CAAC,CAAC;AAMtB;;GAEG;AACH,qBAAa,2BAA2B;IACtC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IACvD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA4D;gBAElF,WAAW,EAAE,SAAS,kBAAkB,EAAE;IAqBtD,MAAM,CACJ,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,qBAAqB,CAAC,OAAO,EAAE,kBAAkB,CAAC,EAC1D,iBAAiB,EAAE,iBAAiB,EACpC,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,yBAAyB,GACxC,qBAAqB,CAAC,OAAO,EAAE,kBAAkB,CAAC;IAmCrD,qBAAqB,CACnB,OAAO,EAAE,yBAAyB,EAClC,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,kBAAkB,GAC/B,OAAO,EAAE;IAuBZ,wBAAwB,IAAI,IAAI;CASjC"}

package/dist/schema/object-field-resolvers.js

@@ -1,3 +1,4 @@
+import { GraphQLNonNull } from 'graphql';
 function assertNever(value) {
   throw new Error(`Unsupported GraphQL field resolver parameter binding: ${String(value)}`);
 }
@@ -26,7 +27,7 @@ export class ObjectFieldResolverRegistry {
       }
     }
   }
-  attach(typeName, fields, resolveOutputType, invokeResolver) {
+  attach(typeName, fields, resolveOutputType, resolveInputArgs, invokeResolver) {
     const resolverFields = this.entriesByTypeName.get(typeName);
     if (!resolverFields) {
       return fields;
@@ -41,21 +42,28 @@ export class ObjectFieldResolverRegistry {
       if (!outputType) {
         throw new Error(`GraphQL object field resolver "${typeName}.${fieldName}" must target an existing field or declare a type.`);
       }
+      const hasExplicitNonNullableNewField = existingField === undefined && entry.handler.outputType !== undefined && entry.handler.nullable === false;
       attachedFields[fieldName] = {
         ...existingField,
-        resolve: async (source, _args, contextValue) => invokeResolver(entry.descriptor, entry.handler, source, contextValue),
-        type: outputType
+        ...(entry.handler.inputClass ? {
+          args: resolveInputArgs(entry.handler)
+        } : {}),
+        resolve: async (source, args, contextValue) => invokeResolver(entry.descriptor, entry.handler, args, source, contextValue),
+        type: hasExplicitNonNullableNewField ? new GraphQLNonNull(outputType) : outputType
       };
     }
     return attachedFields;
   }
-  createMethodArguments(handler, parent, contextValue) {
+  createMethodArguments(handler, input, parent, contextValue) {
     const lastBinding = handler.parameterBindings.at(-1);
     const methodArguments = Array.from({
       length: (lastBinding?.index ?? -1) + 1
     });
     for (const binding of handler.parameterBindings) {
       switch (binding.kind) {
+        case 'input':
+          methodArguments[binding.index] = input;
+          break;
         case 'parent':
           methodArguments[binding.index] = parent;
           break;

package/dist/schema/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/schema/schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,KAAK,EAEV,YAAY,IAAI,gBAAgB,EAMhC,WAAW,IAAI,eAAe,EAC9B,cAAc,IAAI,kBAAkB,EACpC,iBAAiB,IAAI,qBAAqB,EAE1C,iBAAiB,EACjB,aAAa,IAAI,iBAAiB,EAClC,gBAAgB,IAAI,oBAAoB,EACzC,MAAM,SAAS,CAAC;AAGjB,OAAO,EAOL,KAAK,kBAAkB,EAGxB,MAAM,aAAa,CAAC;AAGrB,KAAK,eAAe,GAAG;IACrB,YAAY,EAAE,OAAO,gBAAgB,CAAC;IACtC,cAAc,EAAE,iBAAiB,CAAC;IAClC,YAAY,EAAE,iBAAiB,CAAC;IAChC,SAAS,EAAE,iBAAiB,CAAC;IAC7B,UAAU,EAAE,iBAAiB,CAAC;IAC9B,WAAW,EAAE,OAAO,eAAe,CAAC;IACpC,cAAc,EAAE,OAAO,kBAAkB,CAAC;IAC1C,iBAAiB,EAAE,OAAO,qBAAqB,CAAC;IAChD,aAAa,EAAE,OAAO,iBAAiB,CAAC;IACxC,aAAa,EAAE,iBAAiB,CAAC;IACjC,gBAAgB,EAAE,OAAO,oBAAoB,CAAC;IAC9C,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,iBAAiB,CAAC;IACnD,kBAAkB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,KAAK,gBAAgB,CAAC;CAC9G,CAAC;AAkfF;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,eAAe,EACrB,aAAa,EAAE,iBAAiB,GAAG,MAAM,GAAG,SAAS,EACrD,qBAAqB,EAAE,MAAM,iBAAiB,EAC9C,mCAAmC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAC5D,iBAAiB,CAWnB;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,eAAe,EACrB,gBAAgB,EAAE,SAAS,EAC3B,mBAAmB,EAAE,kBAAkB,EAAE,EACzC,mCAAmC,GAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAe,GACvE,iBAAiB,CA4EnB"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/schema/schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,KAAK,EAEV,YAAY,IAAI,gBAAgB,EAMhC,WAAW,IAAI,eAAe,EAC9B,cAAc,IAAI,kBAAkB,EACpC,iBAAiB,IAAI,qBAAqB,EAE1C,iBAAiB,EACjB,aAAa,IAAI,iBAAiB,EAClC,gBAAgB,IAAI,oBAAoB,EACzC,MAAM,SAAS,CAAC;AAGjB,OAAO,EAOL,KAAK,kBAAkB,EAGxB,MAAM,aAAa,CAAC;AAGrB,KAAK,eAAe,GAAG;IACrB,YAAY,EAAE,OAAO,gBAAgB,CAAC;IACtC,cAAc,EAAE,iBAAiB,CAAC;IAClC,YAAY,EAAE,iBAAiB,CAAC;IAChC,SAAS,EAAE,iBAAiB,CAAC;IAC7B,UAAU,EAAE,iBAAiB,CAAC;IAC9B,WAAW,EAAE,OAAO,eAAe,CAAC;IACpC,cAAc,EAAE,OAAO,kBAAkB,CAAC;IAC1C,iBAAiB,EAAE,OAAO,qBAAqB,CAAC;IAChD,aAAa,EAAE,OAAO,iBAAiB,CAAC;IACxC,aAAa,EAAE,iBAAiB,CAAC;IACjC,gBAAgB,EAAE,OAAO,oBAAoB,CAAC;IAC9C,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,iBAAiB,CAAC;IACnD,kBAAkB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,KAAK,gBAAgB,CAAC;CAC9G,CAAC;AA4fF;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,eAAe,EACrB,aAAa,EAAE,iBAAiB,GAAG,MAAM,GAAG,SAAS,EACrD,qBAAqB,EAAE,MAAM,iBAAiB,EAC9C,mCAAmC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAC5D,iBAAiB,CAWnB;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,eAAe,EACrB,gBAAgB,EAAE,SAAS,EAC3B,mBAAmB,EAAE,kBAAkB,EAAE,EACzC,mCAAmC,GAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAe,GACvE,iBAAiB,CA6EnB"}

package/dist/schema/schema.js

@@ -234,7 +234,7 @@ function createResolverInvoker(deps, runtimeContainer, markAllowedCrossRealmGrap
     if (descriptor.scope === 'singleton') {
       const instance = await runtimeContainer.resolve(descriptor.token);
       const resolverMethod = resolveResolverMethod(instance, descriptor, handler);
-      const methodArguments = handler.type === 'field' ? objectFieldResolvers.createMethodArguments(handler, source, contextValue) : [await createResolverInput(deps, handler, args, markAllowedCrossRealmGraphqlObjects), contextValue];
+      const methodArguments = handler.type === 'field' ? objectFieldResolvers.createMethodArguments(handler, await createResolverInput(deps, handler, args, markAllowedCrossRealmGraphqlObjects), source, contextValue) : [await createResolverInput(deps, handler, args, markAllowedCrossRealmGraphqlObjects), contextValue];
       return resolverMethod.call(instance, ...methodArguments);
     }
     const operationContainer = contextValue[GRAPHQL_OPERATION_CONTAINER] ?? runtimeContainer.createRequestScope();
@@ -242,7 +242,7 @@ function createResolverInvoker(deps, runtimeContainer, markAllowedCrossRealmGrap
     try {
       const instance = await operationContainer.resolve(descriptor.token);
       const resolverMethod = resolveResolverMethod(instance, descriptor, handler);
-      const methodArguments = handler.type === 'field' ? objectFieldResolvers.createMethodArguments(handler, source, contextValue) : [await createResolverInput(deps, handler, args, markAllowedCrossRealmGraphqlObjects), contextValue];
+      const methodArguments = handler.type === 'field' ? objectFieldResolvers.createMethodArguments(handler, await createResolverInput(deps, handler, args, markAllowedCrossRealmGraphqlObjects), source, contextValue) : [await createResolverInput(deps, handler, args, markAllowedCrossRealmGraphqlObjects), contextValue];
       return await resolverMethod.call(instance, ...methodArguments);
     } finally {
       if (disposeOperationContainer) {
@@ -315,7 +315,7 @@ export function createCodeFirstSchema(deps, runtimeContainer, resolverDescriptor
   const invokeResolver = createResolverInvoker(deps, runtimeContainer, markAllowedCrossRealmGraphqlObjects, objectFieldResolvers);
   const outputTypeCache = new Map();
   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));
+    return objectFieldResolvers.attach(typeName, fields, outputType => resolveRootOutputType(deps, outputTypeCache, markAllowedCrossRealmGraphqlObjects, outputType, attachObjectFieldResolvers), handler => createFieldArgs(deps, handler), (descriptor, handler, args, source, contextValue) => invokeResolver(descriptor, handler, args, contextValue, source));
   }
   const queryFields = pickFieldsByType(deps, resolverDescriptors, 'query', markAllowedCrossRealmGraphqlObjects, outputTypeCache, attachObjectFieldResolvers, invokeResolver);
   const mutationFields = pickFieldsByType(deps, resolverDescriptors, 'mutation', markAllowedCrossRealmGraphqlObjects, outputTypeCache, attachObjectFieldResolvers, invokeResolver);