graphql-modules 3.1.0-alpha-20260116120626-0749090abe9d2dc233c8dc7d3ca6c7e01e0d7e60 → 3.1.0

package/application/context.d.ts

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

package/index.js

@@ -4,14 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const schema = require('@graphql-tools/schema');
 const graphql = require('graphql');
-const async_context = require('#async-context');
 const wrap = require('@graphql-tools/wrap');
 const ramda = require('ramda');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-const async_context__default = /*#__PURE__*/_interopDefaultLegacy(async_context);
-
 const ERROR_ORIGINAL_ERROR = 'diOriginalError';
 function getOriginalError(error) {
     return error[ERROR_ORIGINAL_ERROR];
@@ -888,14 +883,11 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
             },
         });
         appInjector.setExecutionContextGetter(function executionContextGetter() {
-            var _a;
-            return (((_a = async_context__default["default"].getAsyncContext()) === null || _a === void 0 ? void 0 : _a.getApplicationContext()) || appContext);
+            return appContext;
         });
         function createModuleExecutionContextGetter(moduleId) {
             return function moduleExecutionContextGetter() {
-                var _a;
-                return (((_a = async_context__default["default"].getAsyncContext()) === null || _a === void 0 ? void 0 : _a.getModuleContext(moduleId)) ||
-                    getModuleContext(moduleId, context));
+                return getModuleContext(moduleId, context);
             };
         }
         modulesMap.forEach((mod, moduleId) => {
@@ -965,7 +957,7 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
                 return getModuleContext(moduleId, sharedContext).injector;
             },
         });
-        const env = {
+        return {
             ɵdestroy: once(() => {
                 providersToDestroy.forEach(([injector, keyId]) => {
                     // If provider was instantiated
@@ -979,19 +971,6 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
             ɵinjector: operationAppInjector,
             context: sharedContext,
         };
-        return {
-            ...env,
-            runWithContext(cb) {
-                return async_context__default["default"].runWithAsyncContext({
-                    getApplicationContext() {
-                        return appContext;
-                    },
-                    getModuleContext(moduleId) {
-                        return getModuleContext(moduleId, context);
-                    },
-                }, cb, env);
-            },
-        };
     };
     return contextBuilder;
 }
@@ -1001,34 +980,31 @@ 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) => {
-            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)
+            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)
                 ? argsOrSchema.contextValue
-                : contextValue).runWithContext(perform);
+                : 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);
         };
     };
     return createExecution;
@@ -1039,46 +1015,43 @@ 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) => {
-            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)
+            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)
                 ? argsOrSchema.contextValue
-                : contextValue).runWithContext(perform);
+                : 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();
+                }
+            });
         };
     };
     return createSubscription;
@@ -1103,9 +1076,10 @@ function apolloSchemaCreator({ createSubscription, contextBuilder, schema, }) {
     const createApolloSchema = () => {
         const sessions = {};
         const subscription = createSubscription();
-        function getSession(ctx, { context, ɵdestroy: destroy }) {
+        function getSession(ctx) {
             if (!ctx[CONTEXT_ID]) {
                 ctx[CONTEXT_ID] = uniqueId((id) => !sessions[id]);
+                const { context, ɵdestroy: destroy } = contextBuilder(ctx);
                 sessions[ctx[CONTEXT_ID]] = {
                     count: 0,
                     session: {
@@ -1137,22 +1111,20 @@ function apolloSchemaCreator({ createSubscription, contextBuilder, schema, }) {
                         operationName: input.operationName,
                     });
                 }
-                // 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);
-                });
+                // 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);
             },
         });
     };

package/index.mjs

@@ -1,6 +1,5 @@
 import { makeExecutableSchema } from '@graphql-tools/schema';
 import { GraphQLSchema, execute as execute$1, subscribe, visit, Kind, concatAST, defaultFieldResolver, GraphQLScalarType, parse } from 'graphql';
-import async_context from '#async-context';
 import { wrapSchema } from '@graphql-tools/wrap';
 import { mergeDeepWith } from 'ramda';
 
@@ -880,14 +879,11 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
             },
         });
         appInjector.setExecutionContextGetter(function executionContextGetter() {
-            var _a;
-            return (((_a = async_context.getAsyncContext()) === null || _a === void 0 ? void 0 : _a.getApplicationContext()) || appContext);
+            return appContext;
         });
         function createModuleExecutionContextGetter(moduleId) {
             return function moduleExecutionContextGetter() {
-                var _a;
-                return (((_a = async_context.getAsyncContext()) === null || _a === void 0 ? void 0 : _a.getModuleContext(moduleId)) ||
-                    getModuleContext(moduleId, context));
+                return getModuleContext(moduleId, context);
             };
         }
         modulesMap.forEach((mod, moduleId) => {
@@ -957,7 +953,7 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
                 return getModuleContext(moduleId, sharedContext).injector;
             },
         });
-        const env = {
+        return {
             ɵdestroy: once(() => {
                 providersToDestroy.forEach(([injector, keyId]) => {
                     // If provider was instantiated
@@ -971,19 +967,6 @@ 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;
 }
@@ -993,34 +976,31 @@ 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) => {
-            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)
+            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)
                 ? argsOrSchema.contextValue
-                : contextValue).runWithContext(perform);
+                : 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);
         };
     };
     return createExecution;
@@ -1031,46 +1011,43 @@ 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) => {
-            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)
+            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)
                 ? argsOrSchema.contextValue
-                : contextValue).runWithContext(perform);
+                : 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();
+                }
+            });
         };
     };
     return createSubscription;
@@ -1095,9 +1072,10 @@ function apolloSchemaCreator({ createSubscription, contextBuilder, schema, }) {
     const createApolloSchema = () => {
         const sessions = {};
         const subscription = createSubscription();
-        function getSession(ctx, { context, ɵdestroy: destroy }) {
+        function getSession(ctx) {
             if (!ctx[CONTEXT_ID]) {
                 ctx[CONTEXT_ID] = uniqueId((id) => !sessions[id]);
+                const { context, ɵdestroy: destroy } = contextBuilder(ctx);
                 sessions[ctx[CONTEXT_ID]] = {
                     count: 0,
                     session: {
@@ -1129,22 +1107,20 @@ function apolloSchemaCreator({ createSubscription, contextBuilder, schema, }) {
                         operationName: input.operationName,
                     });
                 }
-                // 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);
-                });
+                // 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);
             },
         });
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-modules",
-  "version": "3.1.0-alpha-20260116120626-0749090abe9d2dc233c8dc7d3ca6c7e01e0d7e60",
+  "version": "3.1.0",
   "description": "Create reusable, maintainable, testable and extendable GraphQL modules",
   "sideEffects": false,
   "peerDependencies": {
@@ -37,11 +37,5 @@
       "import": "./*.mjs"
     },
     "./package.json": "./package.json"
-  },
-  "imports": {
-    "#async-context": {
-      "node": "./async-context.node.cjs",
-      "default": "./async-context.browser.mjs"
-    }
   }
 }

package/async-context.browser.mjs

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

package/async-context.node.cjs

@@ -1,14 +0,0 @@
-// 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),
-};