graphql-modules 2.1.3-alpha-20230725013707-39be59f9 → 2.2.1-alpha-20231102120726-44db491f

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 = {
@@ -939,24 +881,17 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
                 return modulesMap.get(moduleId).injector;
             },
         });
-        appInjector.setExecutionContextGetter(executionContext.getApplicationContext);
+        appInjector.setExecutionContextGetter(function executionContextGetter() {
+            return appContext;
+        });
         function createModuleExecutionContextGetter(moduleId) {
             return function moduleExecutionContextGetter() {
-                return executionContext.getModuleContext(moduleId);
+                return getModuleContext(moduleId, context);
             };
         }
         modulesMap.forEach((mod, moduleId) => {
             mod.injector.setExecutionContextGetter(createModuleExecutionContextGetter(moduleId));
         });
-        const executionContextPicker = {
-            getApplicationContext() {
-                return appContext;
-            },
-            getModuleContext(moduleId) {
-                return getModuleContext(moduleId, context);
-            },
-        };
-        const destroyExecutionContext = executionContext.create(executionContextPicker);
         // As the name of the Injector says, it's an Operation scoped Injector
         // Application level
         // Operation scoped - means it's created and destroyed on every GraphQL Operation
@@ -1030,7 +965,6 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
                         injector._getObjByKeyId(keyId).onDestroy();
                     }
                 });
-                destroyExecutionContext();
                 contextCache = {};
             }),
             ɵinjector: operationAppInjector,

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 = {
@@ -936,24 +878,17 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
                 return modulesMap.get(moduleId).injector;
             },
         });
-        appInjector.setExecutionContextGetter(executionContext.getApplicationContext);
+        appInjector.setExecutionContextGetter(function executionContextGetter() {
+            return appContext;
+        });
         function createModuleExecutionContextGetter(moduleId) {
             return function moduleExecutionContextGetter() {
-                return executionContext.getModuleContext(moduleId);
+                return getModuleContext(moduleId, context);
             };
         }
         modulesMap.forEach((mod, moduleId) => {
             mod.injector.setExecutionContextGetter(createModuleExecutionContextGetter(moduleId));
         });
-        const executionContextPicker = {
-            getApplicationContext() {
-                return appContext;
-            },
-            getModuleContext(moduleId) {
-                return getModuleContext(moduleId, context);
-            },
-        };
-        const destroyExecutionContext = executionContext.create(executionContextPicker);
         // As the name of the Injector says, it's an Operation scoped Injector
         // Application level
         // Operation scoped - means it's created and destroyed on every GraphQL Operation
@@ -1027,7 +962,6 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
                         injector._getObjByKeyId(keyId).onDestroy();
                     }
                 });
-                destroyExecutionContext();
                 contextCache = {};
             }),
             ɵinjector: operationAppInjector,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-modules",
-  "version": "2.1.3-alpha-20230725013707-39be59f9",
+  "version": "2.2.1-alpha-20231102120726-44db491f",
   "description": "Create reusable, maintainable, testable and extendable GraphQL modules",
   "sideEffects": false,
   "peerDependencies": {

package/application/execution-context.d.ts

@@ -1,12 +0,0 @@
-export interface ExecutionContextPicker {
-    getModuleContext(moduleId: string): GraphQLModules.ModuleContext;
-    getApplicationContext(): GraphQLModules.AppContext;
-}
-export declare const executionContext: {
-    create(picker: ExecutionContextPicker): () => void;
-    getModuleContext: ExecutionContextPicker['getModuleContext'];
-    getApplicationContext: ExecutionContextPicker['getApplicationContext'];
-};
-export declare function enableExecutionContext(): void;
-export declare function getExecutionContextStore(): Map<number, ExecutionContextPicker>;
-export declare function getExecutionContextDependencyStore(): Map<number, Set<number>>;