graphql-modules 3.1.0 → 3.1.1

package/README.md

@@ -1,7 +1,4 @@
-[![GraphQLConf 2024 Banner: September 10-12, San Francisco. Hosted by the GraphQL Foundation](https://github.com/user-attachments/assets/bdb8cd5d-5186-4ece-b06b-b00a499b7868)](https://graphql.org/conf/2024/?utm_source=github&utm_medium=graphql_modules&utm_campaign=readme)
-
-<!-- Uncomment when we remove GraphQL Conf banner -->
-<!-- [![modules](https://user-images.githubusercontent.com/25294569/64067074-ed185b80-cc2a-11e9-8f4d-5f1e19feaa0a.gif)](https://graphql-modules.com/) -->
+[![modules](https://user-images.githubusercontent.com/25294569/64067074-ed185b80-cc2a-11e9-8f4d-5f1e19feaa0a.gif)](https://graphql-modules.com/)
 
 [![npm version](https://badge.fury.io/js/graphql-modules.svg)](https://www.npmjs.com/package/graphql-modules)
 ![CI](https://github.com/graphql-hive/graphql-modules/workflows/CI/badge.svg)

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/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

@@ -4,9 +4,14 @@ 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];
@@ -883,11 +888,14 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
             },
         });
         appInjector.setExecutionContextGetter(function executionContextGetter() {
-            return appContext;
+            var _a;
+            return (((_a = async_context__default["default"].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__default["default"].getAsyncContext()) === null || _a === void 0 ? void 0 : _a.getModuleContext(moduleId)) ||
+                    getModuleContext(moduleId, context));
             };
         }
         modulesMap.forEach((mod, moduleId) => {
@@ -957,7 +965,7 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
                 return getModuleContext(moduleId, sharedContext).injector;
             },
         });
-        return {
+        const env = {
             ɵdestroy: once(() => {
                 providersToDestroy.forEach(([injector, keyId]) => {
                     // If provider was instantiated
@@ -971,6 +979,19 @@ 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;
 }
@@ -980,31 +1001,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;
@@ -1015,43 +1039,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;
@@ -1076,10 +1103,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: {
@@ -1111,20 +1137,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, concatAST, defaultFieldResolver, GraphQLScalarType, parse } from 'graphql';
+import async_context from '#async-context';
 import { wrapSchema } from '@graphql-tools/wrap';
 import { mergeDeepWith } from 'ramda';
 
@@ -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": "3.1.0",
+  "version": "3.1.1",
   "description": "Create reusable, maintainable, testable and extendable GraphQL modules",
   "sideEffects": false,
   "peerDependencies": {
@@ -37,5 +37,11 @@
       "import": "./*.mjs"
     },
     "./package.json": "./package.json"
+  },
+  "imports": {
+    "#async-context": {
+      "node": "./async-context.node.cjs",
+      "default": "./async-context.browser.mjs"
+    }
   }
 }