graphql-modules 2.4.1-alpha-20250219023342-88dc61eee3a181fbaa65c36e13358cd4524c54fb → 2.4.1

package/application/context.d.ts

@@ -3,7 +3,10 @@ import { ResolvedProvider } from '../di/resolution';
 import type { InternalAppContext, ModulesMap } from './application';
 export type ExecutionContextBuilder<TContext extends {
     [key: string]: any;
-} = {}> = (context: TContext) => {
+} = {}> = (context: TContext) => ExecutionContextEnv & {
+    runWithContext<TReturn = any>(cb: (env: ExecutionContextEnv) => TReturn): TReturn;
+};
+export type ExecutionContextEnv = {
     context: InternalAppContext;
     ɵdestroy(): void;
     ɵinjector: Injector;

package/application/execution.d.ts

@@ -3,6 +3,6 @@ import { ExecutionContextBuilder } from './context';
 export declare function executionCreator({ contextBuilder, }: {
     contextBuilder: ExecutionContextBuilder;
 }): (options?: {
-    execute?: typeof execute;
-    controller?: import("./types").OperationController;
-}) => typeof execute;
+    execute?: typeof execute | undefined;
+    controller?: import("./types").OperationController | undefined;
+} | undefined) => typeof execute;

package/application/subscription.d.ts

@@ -3,6 +3,6 @@ import { ExecutionContextBuilder } from './context';
 export declare function subscriptionCreator({ contextBuilder, }: {
     contextBuilder: ExecutionContextBuilder;
 }): (options?: {
-    subscribe?: typeof subscribe;
-    controller?: import("./types").OperationController;
-}) => typeof subscribe;
+    subscribe?: typeof subscribe | undefined;
+    controller?: import("./types").OperationController | undefined;
+} | undefined) => typeof subscribe;

package/async-context.browser.mjs

@@ -0,0 +1,7 @@
+// noop
+// TODO: typecheck
+
+export default {
+  getAsyncContext: () => undefined,
+  runWithAsyncContext: (_asyncContext, callback, ...args) => callback(...args),
+};

package/async-context.node.cjs

@@ -0,0 +1,14 @@
+// use async hooks
+// TODO: typecheck
+
+const hooks = require('async_hooks');
+
+const alc = new hooks.AsyncLocalStorage();
+
+// we dont use named exports (exports.getAsyncContext) because node with typescript is weird
+
+module.exports = {
+  getAsyncContext: () => alc.getStore(),
+  runWithAsyncContext: (asyncContext, callback, ...args) =>
+    alc.run(asyncContext, callback, ...args),
+};

package/index.js

@@ -2,8 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
+
 const schema = require('@graphql-tools/schema');
 const graphql = require('graphql');
+const async_context = _interopDefault(require('#async-context'));
 const wrap = require('@graphql-tools/wrap');
 const ramda = require('ramda');
 
@@ -732,9 +735,9 @@ function tapAsyncIterator(iterable, doneCallback) {
                 throw error;
             }
         },
-        async return(value) {
+        async return() {
             try {
-                const result = await iterator.return(value);
+                const result = await iterator.return();
                 return mapResult(result);
             }
             catch (error) {
@@ -742,7 +745,7 @@ function tapAsyncIterator(iterable, doneCallback) {
                 throw error;
             }
         },
-        throw(error) {
+        async throw(error) {
             doneCallback();
             return iterator.throw(error);
         },
@@ -882,11 +885,14 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
             },
         });
         appInjector.setExecutionContextGetter(function executionContextGetter() {
-            return appContext;
+            var _a;
+            return (((_a = async_context.getAsyncContext()) === null || _a === void 0 ? void 0 : _a.getApplicationContext()) || appContext);
         });
         function createModuleExecutionContextGetter(moduleId) {
             return function moduleExecutionContextGetter() {
-                return getModuleContext(moduleId, context);
+                var _a;
+                return (((_a = async_context.getAsyncContext()) === null || _a === void 0 ? void 0 : _a.getModuleContext(moduleId)) ||
+                    getModuleContext(moduleId, context));
             };
         }
         modulesMap.forEach((mod, moduleId) => {
@@ -956,7 +962,7 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
                 return getModuleContext(moduleId, sharedContext).injector;
             },
         });
-        return {
+        const env = {
             ɵdestroy: once(() => {
                 providersToDestroy.forEach(([injector, keyId]) => {
                     // If provider was instantiated
@@ -970,6 +976,19 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
             ɵinjector: operationAppInjector,
             context: sharedContext,
         };
+        return {
+            ...env,
+            runWithContext(cb) {
+                return async_context.runWithAsyncContext({
+                    getApplicationContext() {
+                        return appContext;
+                    },
+                    getModuleContext(moduleId) {
+                        return getModuleContext(moduleId, context);
+                    },
+                }, cb, env);
+            },
+        };
     };
     return contextBuilder;
 }
@@ -979,31 +998,34 @@ function executionCreator({ contextBuilder, }) {
         // Custom or original execute function
         const executeFn = (options === null || options === void 0 ? void 0 : options.execute) || graphql.execute;
         return (argsOrSchema, document, rootValue, contextValue, variableValues, operationName, fieldResolver, typeResolver) => {
-            var _a;
-            // Create an execution context
-            const { context, ɵdestroy: destroy } = (_a = options === null || options === void 0 ? void 0 : options.controller) !== null && _a !== void 0 ? _a : contextBuilder(isNotSchema(argsOrSchema)
+            function perform({ context, ɵdestroy: destroy, }) {
+                const executionArgs = isNotSchema(argsOrSchema)
+                    ? {
+                        ...argsOrSchema,
+                        contextValue: context,
+                    }
+                    : {
+                        schema: argsOrSchema,
+                        document: document,
+                        rootValue,
+                        contextValue: context,
+                        variableValues,
+                        operationName,
+                        fieldResolver,
+                        typeResolver,
+                    };
+                // It's important to wrap the executeFn within a promise
+                // so we can easily control the end of execution (with finally)
+                return Promise.resolve()
+                    .then(() => executeFn(executionArgs))
+                    .finally(destroy);
+            }
+            if (options === null || options === void 0 ? void 0 : options.controller) {
+                return perform(options.controller);
+            }
+            return contextBuilder(isNotSchema(argsOrSchema)
                 ? argsOrSchema.contextValue
-                : contextValue);
-            const executionArgs = isNotSchema(argsOrSchema)
-                ? {
-                    ...argsOrSchema,
-                    contextValue: context,
-                }
-                : {
-                    schema: argsOrSchema,
-                    document: document,
-                    rootValue,
-                    contextValue: context,
-                    variableValues,
-                    operationName,
-                    fieldResolver,
-                    typeResolver,
-                };
-            // It's important to wrap the executeFn within a promise
-            // so we can easily control the end of execution (with finally)
-            return Promise.resolve()
-                .then(() => executeFn(executionArgs))
-                .finally(destroy);
+                : contextValue).runWithContext(perform);
         };
     };
     return createExecution;
@@ -1014,43 +1036,46 @@ function subscriptionCreator({ contextBuilder, }) {
         // Custom or original subscribe function
         const subscribeFn = (options === null || options === void 0 ? void 0 : options.subscribe) || graphql.subscribe;
         return (argsOrSchema, document, rootValue, contextValue, variableValues, operationName, fieldResolver, subscribeFieldResolver) => {
-            var _a;
-            // Create an subscription context
-            const { context, ɵdestroy: destroy } = (_a = options === null || options === void 0 ? void 0 : options.controller) !== null && _a !== void 0 ? _a : contextBuilder(isNotSchema(argsOrSchema)
+            function perform({ context, ɵdestroy: destroy, }) {
+                const subscriptionArgs = isNotSchema(argsOrSchema)
+                    ? {
+                        ...argsOrSchema,
+                        contextValue: context,
+                    }
+                    : {
+                        schema: argsOrSchema,
+                        document: document,
+                        rootValue,
+                        contextValue: context,
+                        variableValues,
+                        operationName,
+                        fieldResolver,
+                        subscribeFieldResolver,
+                    };
+                let isIterable = false;
+                // It's important to wrap the subscribeFn within a promise
+                // so we can easily control the end of subscription (with finally)
+                return Promise.resolve()
+                    .then(() => subscribeFn(subscriptionArgs))
+                    .then((sub) => {
+                    if (isAsyncIterable(sub)) {
+                        isIterable = true;
+                        return tapAsyncIterator(sub, destroy);
+                    }
+                    return sub;
+                })
+                    .finally(() => {
+                    if (!isIterable) {
+                        destroy();
+                    }
+                });
+            }
+            if (options === null || options === void 0 ? void 0 : options.controller) {
+                return perform(options.controller);
+            }
+            return contextBuilder(isNotSchema(argsOrSchema)
                 ? argsOrSchema.contextValue
-                : contextValue);
-            const subscriptionArgs = isNotSchema(argsOrSchema)
-                ? {
-                    ...argsOrSchema,
-                    contextValue: context,
-                }
-                : {
-                    schema: argsOrSchema,
-                    document: document,
-                    rootValue,
-                    contextValue: context,
-                    variableValues,
-                    operationName,
-                    fieldResolver,
-                    subscribeFieldResolver,
-                };
-            let isIterable = false;
-            // It's important to wrap the subscribeFn within a promise
-            // so we can easily control the end of subscription (with finally)
-            return Promise.resolve()
-                .then(() => subscribeFn(subscriptionArgs))
-                .then((sub) => {
-                if (isAsyncIterable(sub)) {
-                    isIterable = true;
-                    return tapAsyncIterator(sub, destroy);
-                }
-                return sub;
-            })
-                .finally(() => {
-                if (!isIterable) {
-                    destroy();
-                }
-            });
+                : contextValue).runWithContext(perform);
         };
     };
     return createSubscription;
@@ -1075,10 +1100,9 @@ function apolloSchemaCreator({ createSubscription, contextBuilder, schema, }) {
     const createApolloSchema = () => {
         const sessions = {};
         const subscription = createSubscription();
-        function getSession(ctx) {
+        function getSession(ctx, { context, ɵdestroy: destroy }) {
             if (!ctx[CONTEXT_ID]) {
                 ctx[CONTEXT_ID] = uniqueId((id) => !sessions[id]);
-                const { context, ɵdestroy: destroy } = contextBuilder(ctx);
                 sessions[ctx[CONTEXT_ID]] = {
                     count: 0,
                     session: {
@@ -1110,20 +1134,22 @@ function apolloSchemaCreator({ createSubscription, contextBuilder, schema, }) {
                         operationName: input.operationName,
                     });
                 }
-                // Create an execution context
-                const { context, destroy } = getSession(input.context);
-                // It's important to wrap the executeFn within a promise
-                // so we can easily control the end of execution (with finally)
-                return Promise.resolve()
-                    .then(() => graphql.execute({
-                    schema,
-                    document: input.document,
-                    contextValue: context,
-                    variableValues: input.variables,
-                    rootValue: input.rootValue,
-                    operationName: input.operationName,
-                }))
-                    .finally(destroy);
+                // Create an execution context and run within it
+                return contextBuilder(input.context).runWithContext((env) => {
+                    const { context, destroy } = getSession(input.context, env);
+                    // It's important to wrap the executeFn within a promise
+                    // so we can easily control the end of execution (with finally)
+                    return Promise.resolve()
+                        .then(() => graphql.execute({
+                        schema,
+                        document: input.document,
+                        contextValue: context,
+                        variableValues: input.variables,
+                        rootValue: input.rootValue,
+                        operationName: input.operationName,
+                    }))
+                        .finally(destroy);
+                });
             },
         });
     };

package/index.mjs

@@ -1,5 +1,6 @@
 import { makeExecutableSchema } from '@graphql-tools/schema';
 import { GraphQLSchema, execute as execute$1, subscribe, visit, Kind, GraphQLScalarType, concatAST, defaultFieldResolver, parse } from 'graphql';
+import async_context from '#async-context';
 import { wrapSchema } from '@graphql-tools/wrap';
 import { mergeDeepWith } from 'ramda';
 
@@ -729,9 +730,9 @@ function tapAsyncIterator(iterable, doneCallback) {
                 throw error;
             }
         },
-        async return(value) {
+        async return() {
             try {
-                const result = await iterator.return(value);
+                const result = await iterator.return();
                 return mapResult(result);
             }
             catch (error) {
@@ -739,7 +740,7 @@ function tapAsyncIterator(iterable, doneCallback) {
                 throw error;
             }
         },
-        throw(error) {
+        async throw(error) {
             doneCallback();
             return iterator.throw(error);
         },
@@ -879,11 +880,14 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
             },
         });
         appInjector.setExecutionContextGetter(function executionContextGetter() {
-            return appContext;
+            var _a;
+            return (((_a = async_context.getAsyncContext()) === null || _a === void 0 ? void 0 : _a.getApplicationContext()) || appContext);
         });
         function createModuleExecutionContextGetter(moduleId) {
             return function moduleExecutionContextGetter() {
-                return getModuleContext(moduleId, context);
+                var _a;
+                return (((_a = async_context.getAsyncContext()) === null || _a === void 0 ? void 0 : _a.getModuleContext(moduleId)) ||
+                    getModuleContext(moduleId, context));
             };
         }
         modulesMap.forEach((mod, moduleId) => {
@@ -953,7 +957,7 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
                 return getModuleContext(moduleId, sharedContext).injector;
             },
         });
-        return {
+        const env = {
             ɵdestroy: once(() => {
                 providersToDestroy.forEach(([injector, keyId]) => {
                     // If provider was instantiated
@@ -967,6 +971,19 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
             ɵinjector: operationAppInjector,
             context: sharedContext,
         };
+        return {
+            ...env,
+            runWithContext(cb) {
+                return async_context.runWithAsyncContext({
+                    getApplicationContext() {
+                        return appContext;
+                    },
+                    getModuleContext(moduleId) {
+                        return getModuleContext(moduleId, context);
+                    },
+                }, cb, env);
+            },
+        };
     };
     return contextBuilder;
 }
@@ -976,31 +993,34 @@ function executionCreator({ contextBuilder, }) {
         // Custom or original execute function
         const executeFn = (options === null || options === void 0 ? void 0 : options.execute) || execute$1;
         return (argsOrSchema, document, rootValue, contextValue, variableValues, operationName, fieldResolver, typeResolver) => {
-            var _a;
-            // Create an execution context
-            const { context, ɵdestroy: destroy } = (_a = options === null || options === void 0 ? void 0 : options.controller) !== null && _a !== void 0 ? _a : contextBuilder(isNotSchema(argsOrSchema)
+            function perform({ context, ɵdestroy: destroy, }) {
+                const executionArgs = isNotSchema(argsOrSchema)
+                    ? {
+                        ...argsOrSchema,
+                        contextValue: context,
+                    }
+                    : {
+                        schema: argsOrSchema,
+                        document: document,
+                        rootValue,
+                        contextValue: context,
+                        variableValues,
+                        operationName,
+                        fieldResolver,
+                        typeResolver,
+                    };
+                // It's important to wrap the executeFn within a promise
+                // so we can easily control the end of execution (with finally)
+                return Promise.resolve()
+                    .then(() => executeFn(executionArgs))
+                    .finally(destroy);
+            }
+            if (options === null || options === void 0 ? void 0 : options.controller) {
+                return perform(options.controller);
+            }
+            return contextBuilder(isNotSchema(argsOrSchema)
                 ? argsOrSchema.contextValue
-                : contextValue);
-            const executionArgs = isNotSchema(argsOrSchema)
-                ? {
-                    ...argsOrSchema,
-                    contextValue: context,
-                }
-                : {
-                    schema: argsOrSchema,
-                    document: document,
-                    rootValue,
-                    contextValue: context,
-                    variableValues,
-                    operationName,
-                    fieldResolver,
-                    typeResolver,
-                };
-            // It's important to wrap the executeFn within a promise
-            // so we can easily control the end of execution (with finally)
-            return Promise.resolve()
-                .then(() => executeFn(executionArgs))
-                .finally(destroy);
+                : contextValue).runWithContext(perform);
         };
     };
     return createExecution;
@@ -1011,43 +1031,46 @@ function subscriptionCreator({ contextBuilder, }) {
         // Custom or original subscribe function
         const subscribeFn = (options === null || options === void 0 ? void 0 : options.subscribe) || subscribe;
         return (argsOrSchema, document, rootValue, contextValue, variableValues, operationName, fieldResolver, subscribeFieldResolver) => {
-            var _a;
-            // Create an subscription context
-            const { context, ɵdestroy: destroy } = (_a = options === null || options === void 0 ? void 0 : options.controller) !== null && _a !== void 0 ? _a : contextBuilder(isNotSchema(argsOrSchema)
+            function perform({ context, ɵdestroy: destroy, }) {
+                const subscriptionArgs = isNotSchema(argsOrSchema)
+                    ? {
+                        ...argsOrSchema,
+                        contextValue: context,
+                    }
+                    : {
+                        schema: argsOrSchema,
+                        document: document,
+                        rootValue,
+                        contextValue: context,
+                        variableValues,
+                        operationName,
+                        fieldResolver,
+                        subscribeFieldResolver,
+                    };
+                let isIterable = false;
+                // It's important to wrap the subscribeFn within a promise
+                // so we can easily control the end of subscription (with finally)
+                return Promise.resolve()
+                    .then(() => subscribeFn(subscriptionArgs))
+                    .then((sub) => {
+                    if (isAsyncIterable(sub)) {
+                        isIterable = true;
+                        return tapAsyncIterator(sub, destroy);
+                    }
+                    return sub;
+                })
+                    .finally(() => {
+                    if (!isIterable) {
+                        destroy();
+                    }
+                });
+            }
+            if (options === null || options === void 0 ? void 0 : options.controller) {
+                return perform(options.controller);
+            }
+            return contextBuilder(isNotSchema(argsOrSchema)
                 ? argsOrSchema.contextValue
-                : contextValue);
-            const subscriptionArgs = isNotSchema(argsOrSchema)
-                ? {
-                    ...argsOrSchema,
-                    contextValue: context,
-                }
-                : {
-                    schema: argsOrSchema,
-                    document: document,
-                    rootValue,
-                    contextValue: context,
-                    variableValues,
-                    operationName,
-                    fieldResolver,
-                    subscribeFieldResolver,
-                };
-            let isIterable = false;
-            // It's important to wrap the subscribeFn within a promise
-            // so we can easily control the end of subscription (with finally)
-            return Promise.resolve()
-                .then(() => subscribeFn(subscriptionArgs))
-                .then((sub) => {
-                if (isAsyncIterable(sub)) {
-                    isIterable = true;
-                    return tapAsyncIterator(sub, destroy);
-                }
-                return sub;
-            })
-                .finally(() => {
-                if (!isIterable) {
-                    destroy();
-                }
-            });
+                : contextValue).runWithContext(perform);
         };
     };
     return createSubscription;
@@ -1072,10 +1095,9 @@ function apolloSchemaCreator({ createSubscription, contextBuilder, schema, }) {
     const createApolloSchema = () => {
         const sessions = {};
         const subscription = createSubscription();
-        function getSession(ctx) {
+        function getSession(ctx, { context, ɵdestroy: destroy }) {
             if (!ctx[CONTEXT_ID]) {
                 ctx[CONTEXT_ID] = uniqueId((id) => !sessions[id]);
-                const { context, ɵdestroy: destroy } = contextBuilder(ctx);
                 sessions[ctx[CONTEXT_ID]] = {
                     count: 0,
                     session: {
@@ -1107,20 +1129,22 @@ function apolloSchemaCreator({ createSubscription, contextBuilder, schema, }) {
                         operationName: input.operationName,
                     });
                 }
-                // Create an execution context
-                const { context, destroy } = getSession(input.context);
-                // It's important to wrap the executeFn within a promise
-                // so we can easily control the end of execution (with finally)
-                return Promise.resolve()
-                    .then(() => execute$1({
-                    schema,
-                    document: input.document,
-                    contextValue: context,
-                    variableValues: input.variables,
-                    rootValue: input.rootValue,
-                    operationName: input.operationName,
-                }))
-                    .finally(destroy);
+                // Create an execution context and run within it
+                return contextBuilder(input.context).runWithContext((env) => {
+                    const { context, destroy } = getSession(input.context, env);
+                    // It's important to wrap the executeFn within a promise
+                    // so we can easily control the end of execution (with finally)
+                    return Promise.resolve()
+                        .then(() => execute$1({
+                        schema,
+                        document: input.document,
+                        contextValue: context,
+                        variableValues: input.variables,
+                        rootValue: input.rootValue,
+                        operationName: input.operationName,
+                    }))
+                        .finally(destroy);
+                });
             },
         });
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-modules",
-  "version": "2.4.1-alpha-20250219023342-88dc61eee3a181fbaa65c36e13358cd4524c54fb",
+  "version": "2.4.1",
   "description": "Create reusable, maintainable, testable and extendable GraphQL modules",
   "sideEffects": false,
   "peerDependencies": {
@@ -10,7 +10,7 @@
     "@graphql-tools/schema": "^10.0.0",
     "@graphql-tools/wrap": "^10.0.0",
     "@graphql-typed-document-node/core": "^3.1.0",
-    "ramda": "^0.30.0"
+    "ramda": "^0.29.0"
   },
   "keywords": [
     "graphql",
@@ -37,5 +37,11 @@
       "import": "./*.mjs"
     },
     "./package.json": "./package.json"
+  },
+  "imports": {
+    "#async-context": {
+      "node": "./async-context.node.cjs",
+      "default": "./async-context.browser.mjs"
+    }
   }
 }

package/shared/middleware.d.ts

@@ -16,6 +16,6 @@ export type MiddlewareMap = {
         [field: string]: Middleware[];
     };
 };
-export declare function createMiddleware(path: string[], middlewareMap?: MiddlewareMap): (context: MiddlewareContext, next: Next) => Promise<any>;
+export declare function createMiddleware(path: string[], middlewareMap?: MiddlewareMap): (context: MiddlewareContext, next: Next<any>) => Promise<any>;
 export declare function mergeMiddlewareMaps(app: MiddlewareMap, mod: MiddlewareMap): MiddlewareMap;
 export declare function validateMiddlewareMap(middlewareMap: MiddlewareMap, metadata: ModuleMetadata): void;

package/shared/utils.d.ts

@@ -4,7 +4,7 @@ export declare function isNil<T>(val: T | null | undefined): val is null | undef
 export declare function isObject(val: any): boolean;
 export declare function isPrimitive(val: any): val is number | string | boolean | symbol | bigint;
 export declare function isAsyncIterable(obj: any): obj is AsyncIterableIterator<any>;
-export declare function tapAsyncIterator<T, TAsyncIterableIterator extends AsyncIterableIterator<T>>(iterable: TAsyncIterableIterator, doneCallback: () => void): TAsyncIterableIterator;
+export declare function tapAsyncIterator<T>(iterable: AsyncIterable<T>, doneCallback: () => void): AsyncGenerator<T>;
 export declare function once(cb: () => void): () => void;
 export declare function share<T, A>(factory: (arg?: A) => T): (arg?: A) => T;
 export declare function uniqueId(isNotUsed: (id: string) => boolean): string;