graphql-modules 2.1.0-alpha-d1b812f5.0 → 2.1.0

package/application/execution-context.d.ts

@@ -3,8 +3,10 @@ export interface ExecutionContextPicker {
     getApplicationContext(): GraphQLModules.AppContext;
 }
 export declare const executionContext: {
-    create(picker: ExecutionContextPicker): void;
+    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>>;

package/index.js

@@ -176,11 +176,18 @@ function isFactoryProvider(provider) {
 }
 
 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
-        if (executionContextStore.has(triggerAsyncId)) {
-            executionContextStore.set(asyncId, executionContextStore.get(triggerAsyncId));
+        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) {
@@ -189,9 +196,25 @@ const executionContextHook = async_hooks.createHook({
         }
     },
 });
+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) {
-        executionContextStore.set(async_hooks.executionAsyncId(), picker);
+        const id = async_hooks.executionAsyncId();
+        executionContextStore.set(id, picker);
+        return function destroyContext() {
+            destroyContextAndItsChildren(id);
+        };
     },
     getModuleContext(moduleId) {
         const picker = executionContextStore.get(async_hooks.executionAsyncId());
@@ -933,7 +956,7 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
                 return getModuleContext(moduleId, context);
             },
         };
-        executionContext.create(executionContextPicker);
+        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
@@ -1007,6 +1030,7 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
                         injector._getObjByKeyId(keyId).onDestroy();
                     }
                 });
+                destroyExecutionContext();
                 contextCache = {};
             }),
             ɵinjector: operationAppInjector,

package/index.mjs

@@ -173,11 +173,18 @@ function isFactoryProvider(provider) {
 }
 
 const executionContextStore = new Map();
+const executionContextDependencyStore = new Map();
 const executionContextHook = createHook({
     init(asyncId, _, triggerAsyncId) {
+        var _a;
         // Store same context data for child async resources
-        if (executionContextStore.has(triggerAsyncId)) {
-            executionContextStore.set(asyncId, executionContextStore.get(triggerAsyncId));
+        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) {
@@ -186,9 +193,25 @@ const executionContextHook = createHook({
         }
     },
 });
+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) {
-        executionContextStore.set(executionAsyncId(), picker);
+        const id = executionAsyncId();
+        executionContextStore.set(id, picker);
+        return function destroyContext() {
+            destroyContextAndItsChildren(id);
+        };
     },
     getModuleContext(moduleId) {
         const picker = executionContextStore.get(executionAsyncId());
@@ -930,7 +953,7 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
                 return getModuleContext(moduleId, context);
             },
         };
-        executionContext.create(executionContextPicker);
+        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
@@ -1004,6 +1027,7 @@ 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.0-alpha-d1b812f5.0",
+  "version": "2.1.0",
   "description": "Create reusable, maintainable, testable and extendable GraphQL modules",
   "sideEffects": false,
   "peerDependencies": {