graphql-modules 2.1.1-alpha-20220927212124-3ed53042 → 3.0.0-alpha-20220928142355-e1096a88

package/application/application.d.ts

@@ -16,6 +16,7 @@ export interface InternalAppContext {
  *
  * ```typescript
  * import { createApplication } from 'graphql-modules';
+ * import { createHook, executionAsyncId } from 'async_hooks';
  * import { usersModule } from './users';
  * import { postsModule } from './posts';
  * import { commentsModule } from './comments';
@@ -25,7 +26,8 @@ export interface InternalAppContext {
  *     usersModule,
  *     postsModule,
  *     commentsModule
- *   ]
+ *   ],
+ *   executionContext: { createHook, executionAsyncId },
  * })
  * ```
  */

package/application/execution-context.d.ts

@@ -1,3 +1,10 @@
+export interface ExecutionContextConfig {
+    executionAsyncId: () => number;
+    createHook(config: {
+        init(asyncId: number, _: string, triggerAsyncId: number): void;
+        destroy(asyncId: number): void;
+    }): void;
+}
 export interface ExecutionContextPicker {
     getModuleContext(moduleId: string): GraphQLModules.ModuleContext;
     getApplicationContext(): GraphQLModules.AppContext;
@@ -7,6 +14,7 @@ export declare const executionContext: {
     getModuleContext: ExecutionContextPicker['getModuleContext'];
     getApplicationContext: ExecutionContextPicker['getApplicationContext'];
 };
-export declare function enableExecutionContext(): void;
+export declare function enableExecutionContext(config: ExecutionContextConfig): void;
+export declare function assertExecutionContext(): void | never;
 export declare function getExecutionContextStore(): Map<number, ExecutionContextPicker>;
 export declare function getExecutionContextDependencyStore(): Map<number, Set<number>>;

package/application/types.d.ts

@@ -2,6 +2,7 @@ import { execute, subscribe, DocumentNode, GraphQLSchema, ExecutionResult } from
 import type { Provider, Injector } from '../di';
 import type { Resolvers, Module, MockedModule } from '../module/types';
 import type { MiddlewareMap } from '../shared/middleware';
+import type { ExecutionContextConfig } from './execution-context';
 import type { ApolloRequestContext } from './apollo';
 import type { Single } from '../shared/types';
 import type { InternalAppContext } from './application';
@@ -126,5 +127,20 @@ export interface ApplicationConfig {
         typeDefs: DocumentNode[];
         resolvers: Record<string, any>[];
     }): GraphQLSchema;
+    /**
+     * Enables ExecutionContext
+     *
+     * @example
+     *
+     * ```typescript
+     * import { createHook, executionAsyncId } from 'async_hooks';
+     *
+     * const app = createApplication({
+     *  modules: [],
+     *  executionContext: { createHook, executionAsyncId }
+     * });
+     * ```
+     */
+    executionContext?: ExecutionContextConfig;
 }
 export {};

package/index.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const schema = require('@graphql-tools/schema');
-const async_hooks = require('async_hooks');
 const graphql = require('graphql');
 const wrap = require('@graphql-tools/wrap');
 const ramda = require('ramda');
@@ -175,62 +174,6 @@ function isFactoryProvider(provider) {
     return typeof provider.useFactory !== 'undefined';
 }
 
-const executionContextStore = new Map();
-const executionContextDependencyStore = new Map();
-const executionContextHook = async_hooks.createHook({
-    init(asyncId, _, triggerAsyncId) {
-        var _a;
-        // Store same context data for child async resources
-        const ctx = executionContextStore.get(triggerAsyncId);
-        if (ctx) {
-            const dependencies = (_a = executionContextDependencyStore.get(triggerAsyncId)) !== null && _a !== void 0 ? _a : executionContextDependencyStore
-                .set(triggerAsyncId, new Set())
-                .get(triggerAsyncId);
-            dependencies.add(asyncId);
-            executionContextStore.set(asyncId, ctx);
-        }
-    },
-    destroy(asyncId) {
-        if (executionContextStore.has(asyncId)) {
-            executionContextStore.delete(asyncId);
-        }
-    },
-});
-function destroyContextAndItsChildren(id) {
-    if (executionContextStore.has(id)) {
-        executionContextStore.delete(id);
-    }
-    const deps = executionContextDependencyStore.get(id);
-    if (deps) {
-        for (const dep of deps) {
-            destroyContextAndItsChildren(dep);
-        }
-        executionContextDependencyStore.delete(id);
-    }
-}
-const executionContext = {
-    create(picker) {
-        const id = async_hooks.executionAsyncId();
-        executionContextStore.set(id, picker);
-        return function destroyContext() {
-            destroyContextAndItsChildren(id);
-        };
-    },
-    getModuleContext(moduleId) {
-        const picker = executionContextStore.get(async_hooks.executionAsyncId());
-        return picker.getModuleContext(moduleId);
-    },
-    getApplicationContext() {
-        const picker = executionContextStore.get(async_hooks.executionAsyncId());
-        return picker.getApplicationContext();
-    },
-};
-function enableExecutionContext() {
-    {
-        executionContextHook.enable();
-    }
-}
-
 function ensureReflect() {
     if (!(Reflect && Reflect.getOwnMetadata)) {
         throw 'reflect-metadata shim is required when using class decorators';
@@ -240,7 +183,6 @@ function Injectable(options) {
     return (target) => {
         var _a;
         ensureReflect();
-        enableExecutionContext();
         const params = (Reflect.getMetadata('design:paramtypes', target) || []).map((param) => (isType(param) ? param : null));
         const existingMeta = readInjectableMetadata(target);
         const meta = {
@@ -912,6 +854,77 @@ function duplicatedGlobalTokenError(provider, modules) {
  */
 const CONTEXT = new InjectionToken('context');
 
+const executionContextStore = new Map();
+const executionContextDependencyStore = new Map();
+let executionAsyncId = () => 0;
+function destroyContextAndItsChildren(id) {
+    if (executionContextStore.has(id)) {
+        executionContextStore.delete(id);
+    }
+    const deps = executionContextDependencyStore.get(id);
+    if (deps) {
+        for (const dep of deps) {
+            destroyContextAndItsChildren(dep);
+        }
+        executionContextDependencyStore.delete(id);
+    }
+}
+let executionContextEnabled = false;
+const executionContext = {
+    create(picker) {
+        if (!executionContextEnabled) {
+            return function destroyContextNoop() {
+                // noop
+            };
+        }
+        const id = executionAsyncId();
+        executionContextStore.set(id, picker);
+        return function destroyContext() {
+            destroyContextAndItsChildren(id);
+        };
+    },
+    getModuleContext(moduleId) {
+        assertExecutionContext();
+        const picker = executionContextStore.get(executionAsyncId());
+        return picker.getModuleContext(moduleId);
+    },
+    getApplicationContext() {
+        assertExecutionContext();
+        const picker = executionContextStore.get(executionAsyncId());
+        return picker.getApplicationContext();
+    },
+};
+function enableExecutionContext(config) {
+    if (!executionContextEnabled) {
+        config.createHook({
+            init(asyncId, _, triggerAsyncId) {
+                var _a;
+                // Store same context data for child async resources
+                const ctx = executionContextStore.get(triggerAsyncId);
+                if (ctx) {
+                    const dependencies = (_a = executionContextDependencyStore.get(triggerAsyncId)) !== null && _a !== void 0 ? _a : executionContextDependencyStore
+                        .set(triggerAsyncId, new Set())
+                        .get(triggerAsyncId);
+                    dependencies.add(asyncId);
+                    executionContextStore.set(asyncId, ctx);
+                }
+            },
+            destroy(asyncId) {
+                if (executionContextStore.has(asyncId)) {
+                    executionContextStore.delete(asyncId);
+                }
+            },
+        });
+        executionAsyncId = config.executionAsyncId;
+        executionContextEnabled = true;
+    }
+}
+function assertExecutionContext() {
+    if (!executionContextEnabled) {
+        throw new Error('Execution Context is not enabled. Please set `executionContext` option in `createApplication`');
+    }
+}
+
 function createContextBuilder({ appInjector, modulesMap, appLevelOperationProviders, singletonGlobalProvidersMap, operationGlobalProvidersMap, }) {
     // This is very critical. It creates an execution context.
     // It has to run on every operation.
@@ -1218,6 +1231,7 @@ function operationControllerCreator(options) {
  *
  * ```typescript
  * import { createApplication } from 'graphql-modules';
+ * import { createHook, executionAsyncId } from 'async_hooks';
  * import { usersModule } from './users';
  * import { postsModule } from './posts';
  * import { commentsModule } from './comments';
@@ -1227,13 +1241,17 @@ function operationControllerCreator(options) {
  *     usersModule,
  *     postsModule,
  *     commentsModule
- *   ]
+ *   ],
+ *   executionContext: { createHook, executionAsyncId },
  * })
  * ```
  */
 function createApplication(applicationConfig) {
     function applicationFactory(cfg) {
         const config = cfg || applicationConfig;
+        if (config.executionContext) {
+            enableExecutionContext(config.executionContext);
+        }
         const providers = config.providers && typeof config.providers === 'function'
             ? config.providers()
             : config.providers;

package/index.mjs

@@ -1,5 +1,4 @@
 import { makeExecutableSchema } from '@graphql-tools/schema';
-import { createHook, executionAsyncId } from 'async_hooks';
 import { GraphQLSchema, execute as execute$1, subscribe, visit, Kind, GraphQLScalarType, concatAST, defaultFieldResolver, parse } from 'graphql';
 import { wrapSchema } from '@graphql-tools/wrap';
 import { mergeDeepWith } from 'ramda';
@@ -172,62 +171,6 @@ function isFactoryProvider(provider) {
     return typeof provider.useFactory !== 'undefined';
 }
 
-const executionContextStore = new Map();
-const executionContextDependencyStore = new Map();
-const executionContextHook = createHook({
-    init(asyncId, _, triggerAsyncId) {
-        var _a;
-        // Store same context data for child async resources
-        const ctx = executionContextStore.get(triggerAsyncId);
-        if (ctx) {
-            const dependencies = (_a = executionContextDependencyStore.get(triggerAsyncId)) !== null && _a !== void 0 ? _a : executionContextDependencyStore
-                .set(triggerAsyncId, new Set())
-                .get(triggerAsyncId);
-            dependencies.add(asyncId);
-            executionContextStore.set(asyncId, ctx);
-        }
-    },
-    destroy(asyncId) {
-        if (executionContextStore.has(asyncId)) {
-            executionContextStore.delete(asyncId);
-        }
-    },
-});
-function destroyContextAndItsChildren(id) {
-    if (executionContextStore.has(id)) {
-        executionContextStore.delete(id);
-    }
-    const deps = executionContextDependencyStore.get(id);
-    if (deps) {
-        for (const dep of deps) {
-            destroyContextAndItsChildren(dep);
-        }
-        executionContextDependencyStore.delete(id);
-    }
-}
-const executionContext = {
-    create(picker) {
-        const id = executionAsyncId();
-        executionContextStore.set(id, picker);
-        return function destroyContext() {
-            destroyContextAndItsChildren(id);
-        };
-    },
-    getModuleContext(moduleId) {
-        const picker = executionContextStore.get(executionAsyncId());
-        return picker.getModuleContext(moduleId);
-    },
-    getApplicationContext() {
-        const picker = executionContextStore.get(executionAsyncId());
-        return picker.getApplicationContext();
-    },
-};
-function enableExecutionContext() {
-    {
-        executionContextHook.enable();
-    }
-}
-
 function ensureReflect() {
     if (!(Reflect && Reflect.getOwnMetadata)) {
         throw 'reflect-metadata shim is required when using class decorators';
@@ -237,7 +180,6 @@ function Injectable(options) {
     return (target) => {
         var _a;
         ensureReflect();
-        enableExecutionContext();
         const params = (Reflect.getMetadata('design:paramtypes', target) || []).map((param) => (isType(param) ? param : null));
         const existingMeta = readInjectableMetadata(target);
         const meta = {
@@ -909,6 +851,77 @@ function duplicatedGlobalTokenError(provider, modules) {
  */
 const CONTEXT = new InjectionToken('context');
 
+const executionContextStore = new Map();
+const executionContextDependencyStore = new Map();
+let executionAsyncId = () => 0;
+function destroyContextAndItsChildren(id) {
+    if (executionContextStore.has(id)) {
+        executionContextStore.delete(id);
+    }
+    const deps = executionContextDependencyStore.get(id);
+    if (deps) {
+        for (const dep of deps) {
+            destroyContextAndItsChildren(dep);
+        }
+        executionContextDependencyStore.delete(id);
+    }
+}
+let executionContextEnabled = false;
+const executionContext = {
+    create(picker) {
+        if (!executionContextEnabled) {
+            return function destroyContextNoop() {
+                // noop
+            };
+        }
+        const id = executionAsyncId();
+        executionContextStore.set(id, picker);
+        return function destroyContext() {
+            destroyContextAndItsChildren(id);
+        };
+    },
+    getModuleContext(moduleId) {
+        assertExecutionContext();
+        const picker = executionContextStore.get(executionAsyncId());
+        return picker.getModuleContext(moduleId);
+    },
+    getApplicationContext() {
+        assertExecutionContext();
+        const picker = executionContextStore.get(executionAsyncId());
+        return picker.getApplicationContext();
+    },
+};
+function enableExecutionContext(config) {
+    if (!executionContextEnabled) {
+        config.createHook({
+            init(asyncId, _, triggerAsyncId) {
+                var _a;
+                // Store same context data for child async resources
+                const ctx = executionContextStore.get(triggerAsyncId);
+                if (ctx) {
+                    const dependencies = (_a = executionContextDependencyStore.get(triggerAsyncId)) !== null && _a !== void 0 ? _a : executionContextDependencyStore
+                        .set(triggerAsyncId, new Set())
+                        .get(triggerAsyncId);
+                    dependencies.add(asyncId);
+                    executionContextStore.set(asyncId, ctx);
+                }
+            },
+            destroy(asyncId) {
+                if (executionContextStore.has(asyncId)) {
+                    executionContextStore.delete(asyncId);
+                }
+            },
+        });
+        executionAsyncId = config.executionAsyncId;
+        executionContextEnabled = true;
+    }
+}
+function assertExecutionContext() {
+    if (!executionContextEnabled) {
+        throw new Error('Execution Context is not enabled. Please set `executionContext` option in `createApplication`');
+    }
+}
+
 function createContextBuilder({ appInjector, modulesMap, appLevelOperationProviders, singletonGlobalProvidersMap, operationGlobalProvidersMap, }) {
     // This is very critical. It creates an execution context.
     // It has to run on every operation.
@@ -1215,6 +1228,7 @@ function operationControllerCreator(options) {
  *
  * ```typescript
  * import { createApplication } from 'graphql-modules';
+ * import { createHook, executionAsyncId } from 'async_hooks';
  * import { usersModule } from './users';
  * import { postsModule } from './posts';
  * import { commentsModule } from './comments';
@@ -1224,13 +1238,17 @@ function operationControllerCreator(options) {
  *     usersModule,
  *     postsModule,
  *     commentsModule
- *   ]
+ *   ],
+ *   executionContext: { createHook, executionAsyncId },
  * })
  * ```
  */
 function createApplication(applicationConfig) {
     function applicationFactory(cfg) {
         const config = cfg || applicationConfig;
+        if (config.executionContext) {
+            enableExecutionContext(config.executionContext);
+        }
         const providers = config.providers && typeof config.providers === 'function'
             ? config.providers()
             : config.providers;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-modules",
-  "version": "2.1.1-alpha-20220927212124-3ed53042",
+  "version": "3.0.0-alpha-20220928142355-e1096a88",
   "description": "Create reusable, maintainable, testable and extendable GraphQL modules",
   "sideEffects": false,
   "peerDependencies": {