graphql-modules 3.0.0-alpha-20231018163544-36199b68 → 3.0.0-alpha-20231106133212-0b04b56e

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 ramda = require('ramda');
 
@@ -174,85 +173,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();
-    }
-}
-
-const executionContextStore$1 = async_hooks.AsyncLocalStorage
-    ? new async_hooks.AsyncLocalStorage()
-    : undefined;
-const executionContext$1 = {
-    create(picker) {
-        executionContextStore$1.enterWith(picker);
-        return function destroyContext() { };
-    },
-    getModuleContext(moduleId) {
-        return executionContextStore$1.getStore().getModuleContext(moduleId);
-    },
-    getApplicationContext() {
-        return executionContextStore$1.getStore().getApplicationContext();
-    },
-};
-
-const executionContext$2 = async_hooks.AsyncLocalStorage
-    ? executionContext$1
-    : executionContext;
-const enableExecutionContext$1 = async_hooks.AsyncLocalStorage
-    ? () => undefined
-    : enableExecutionContext;
-
 function ensureReflect() {
     if (!(Reflect && Reflect.getOwnMetadata)) {
         throw 'reflect-metadata shim is required when using class decorators';
@@ -262,7 +182,6 @@ function Injectable(options) {
     return (target) => {
         var _a;
         ensureReflect();
-        enableExecutionContext$1();
         const params = (Reflect.getMetadata('design:paramtypes', target) || []).map((param) => (isType(param) ? param : null));
         const existingMeta = readInjectableMetadata(target);
         const meta = {
@@ -956,24 +875,17 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
                 return modulesMap.get(moduleId).injector;
             },
         });
-        appInjector.setExecutionContextGetter(executionContext$2.getApplicationContext);
+        appInjector.setExecutionContextGetter(function executionContextGetter() {
+            return appContext;
+        });
         function createModuleExecutionContextGetter(moduleId) {
             return function moduleExecutionContextGetter() {
-                return executionContext$2.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$2.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
@@ -1047,7 +959,6 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
                         injector._getObjByKeyId(keyId).onDestroy();
                     }
                 });
-                destroyExecutionContext();
                 contextCache = {};
             }),
             ɵinjector: operationAppInjector,
@@ -1597,7 +1508,11 @@ function wrapResolver({ resolver, config, path, middlewareMap, isTypeResolver, i
         const wrappedResolver = (root, context, info) => {
             const ctx = {
                 root,
-                context: context.ɵgetModuleContext(config.id, context),
+                context: isReferenceResolver
+                    ? context.ɵgetModuleContext(config.id, context)
+                    : // We mark the context object as possibly undefined,
+                        // because graphql-jit for some reason doesn't pass it for isTypeOf or resolveType methods
+                        context === null || context === void 0 ? void 0 : context.ɵgetModuleContext(config.id, context),
                 info,
             };
             return resolver(ctx.root, ctx.context, ctx.info);

package/index.mjs

@@ -1,5 +1,4 @@
 import { makeExecutableSchema } from '@graphql-tools/schema';
-import { createHook, executionAsyncId, AsyncLocalStorage } from 'async_hooks';
 import { GraphQLSchema, execute as execute$1, subscribe, print, concatAST, visit, Kind, GraphQLScalarType, defaultFieldResolver, parse } from 'graphql';
 import { mergeDeepWith } from 'ramda';
 
@@ -171,85 +170,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();
-    }
-}
-
-const executionContextStore$1 = AsyncLocalStorage
-    ? new AsyncLocalStorage()
-    : undefined;
-const executionContext$1 = {
-    create(picker) {
-        executionContextStore$1.enterWith(picker);
-        return function destroyContext() { };
-    },
-    getModuleContext(moduleId) {
-        return executionContextStore$1.getStore().getModuleContext(moduleId);
-    },
-    getApplicationContext() {
-        return executionContextStore$1.getStore().getApplicationContext();
-    },
-};
-
-const executionContext$2 = AsyncLocalStorage
-    ? executionContext$1
-    : executionContext;
-const enableExecutionContext$1 = AsyncLocalStorage
-    ? () => undefined
-    : enableExecutionContext;
-
 function ensureReflect() {
     if (!(Reflect && Reflect.getOwnMetadata)) {
         throw 'reflect-metadata shim is required when using class decorators';
@@ -259,7 +179,6 @@ function Injectable(options) {
     return (target) => {
         var _a;
         ensureReflect();
-        enableExecutionContext$1();
         const params = (Reflect.getMetadata('design:paramtypes', target) || []).map((param) => (isType(param) ? param : null));
         const existingMeta = readInjectableMetadata(target);
         const meta = {
@@ -953,24 +872,17 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
                 return modulesMap.get(moduleId).injector;
             },
         });
-        appInjector.setExecutionContextGetter(executionContext$2.getApplicationContext);
+        appInjector.setExecutionContextGetter(function executionContextGetter() {
+            return appContext;
+        });
         function createModuleExecutionContextGetter(moduleId) {
             return function moduleExecutionContextGetter() {
-                return executionContext$2.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$2.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
@@ -1044,7 +956,6 @@ function createContextBuilder({ appInjector, modulesMap, appLevelOperationProvid
                         injector._getObjByKeyId(keyId).onDestroy();
                     }
                 });
-                destroyExecutionContext();
                 contextCache = {};
             }),
             ɵinjector: operationAppInjector,
@@ -1594,7 +1505,11 @@ function wrapResolver({ resolver, config, path, middlewareMap, isTypeResolver, i
         const wrappedResolver = (root, context, info) => {
             const ctx = {
                 root,
-                context: context.ɵgetModuleContext(config.id, context),
+                context: isReferenceResolver
+                    ? context.ɵgetModuleContext(config.id, context)
+                    : // We mark the context object as possibly undefined,
+                        // because graphql-jit for some reason doesn't pass it for isTypeOf or resolveType methods
+                        context === null || context === void 0 ? void 0 : context.ɵgetModuleContext(config.id, context),
                 info,
             };
             return resolver(ctx.root, ctx.context, ctx.info);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-modules",
-  "version": "3.0.0-alpha-20231018163544-36199b68",
+  "version": "3.0.0-alpha-20231106133212-0b04b56e",
   "description": "Create reusable, maintainable, testable and extendable GraphQL modules",
   "sideEffects": false,
   "peerDependencies": {

package/application/execution-context-async-local-storage.d.ts

@@ -1,10 +0,0 @@
-/// <reference types="node" />
-import { AsyncLocalStorage } from 'async_hooks';
-import { type ExecutionContextPicker } from './execution-context.interface';
-export declare const executionContext: {
-    create(picker: ExecutionContextPicker): () => void;
-    getModuleContext: ExecutionContextPicker['getModuleContext'];
-    getApplicationContext: ExecutionContextPicker['getApplicationContext'];
-};
-export declare function enableExecutionContext(): void;
-export declare function getExecutionContextStore(): AsyncLocalStorage<ExecutionContextPicker> | undefined;

package/application/execution-context-hooks.d.ts

@@ -1,9 +0,0 @@
-import { type ExecutionContextPicker } from './execution-context.interface';
-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>>;

package/application/execution-context.d.ts

@@ -1,8 +0,0 @@
-import * as Hooks from './execution-context-hooks';
-export type { ExecutionContextPicker } from './execution-context.interface';
-export declare const executionContext: {
-    create(picker: import("./execution-context.interface").ExecutionContextPicker): () => void;
-    getModuleContext: (moduleId: string) => GraphQLModules.ModuleContext;
-    getApplicationContext: () => GraphQLModules.AppContext;
-};
-export declare const enableExecutionContext: typeof Hooks.enableExecutionContext;

package/application/execution-context.interface.d.ts

@@ -1,4 +0,0 @@
-export interface ExecutionContextPicker {
-    getModuleContext(moduleId: string): GraphQLModules.ModuleContext;
-    getApplicationContext(): GraphQLModules.AppContext;
-}