glasswork 1.4.1 → 1.6.0

package/dist/core/module-inspection.js

@@ -0,0 +1,114 @@
+import { createLogger } from '../utils/logger.js';
+import { getProviderName, resolveModule } from './module.js';
+import { collectModules, validateNoCycles } from './module-graph.js';
+import { ModuleRuntime } from './module-runtime.js';
+/**
+ * Describe the module graph of an application without creating any provider.
+ *
+ * Runs the same checks as bootstrap: duplicate module and provider names, undeferred import
+ * cycles, ambiguous imports, unknown exports and `inject` dependencies that a module cannot
+ * see. It does not run factories, route factories or lifecycle hooks, so it needs no
+ * database, network or credentials.
+ */
+export function inspectModuleGraph(root) {
+    const modules = collectModules(root);
+    validateNoCycles(modules);
+    const runtime = new ModuleRuntime(modules, createLogger('ModuleGraph', 'silent'));
+    return {
+        root: root.name,
+        modules: modules.map((module) => {
+            const exported = new Set(runtime.exportedNames(module));
+            return {
+                name: module.name,
+                ...(module.basePath ? { basePath: module.basePath } : {}),
+                imports: (module.imports ?? []).map((reference) => ({
+                    module: resolveModule(reference).name,
+                    deferred: 'forwardRef' in reference,
+                })),
+                exports: [...exported],
+                providers: (module.providers ?? []).map((provider) => describeProvider(provider, exported)),
+                jobs: (module.jobs ?? []).map((job) => job.name),
+                hasRoutes: Boolean(module.routes),
+            };
+        }),
+        cycles: findDeferredCycles(modules),
+    };
+}
+function describeProvider(provider, exported) {
+    const name = getProviderName(provider);
+    const base = { name, exported: exported.has(name), inject: [] };
+    if (typeof provider === 'function') {
+        return { ...base, kind: 'class', scope: 'SINGLETON', async: false };
+    }
+    if ('useValue' in provider) {
+        return { ...base, kind: 'value', scope: 'VALUE', async: false };
+    }
+    if ('useClass' in provider) {
+        return { ...base, kind: 'class', scope: provider.scope ?? 'SINGLETON', async: false };
+    }
+    const declared = provider.async;
+    return {
+        ...base,
+        kind: 'factory',
+        scope: provider.scope ?? 'SINGLETON',
+        async: declared ?? provider.useFactory.constructor.name === 'AsyncFunction',
+        inject: provider.inject ?? [],
+    };
+}
+/** Every deferred edge that leads back to its importer closes a deliberate cycle. */
+function findDeferredCycles(modules) {
+    const edges = new Map(modules.map((module) => [
+        module.name,
+        (module.imports ?? []).map((reference) => resolveModule(reference).name),
+    ]));
+    const cycles = [];
+    for (const module of modules) {
+        for (const reference of module.imports ?? []) {
+            if (!('forwardRef' in reference))
+                continue;
+            const path = shortestPath(edges, resolveModule(reference).name, module.name);
+            if (path)
+                cycles.push([module.name, ...path]);
+        }
+    }
+    return cycles;
+}
+function shortestPath(edges, from, to) {
+    const previous = new Map([[from, null]]);
+    const queue = [from];
+    while (queue.length > 0) {
+        const current = queue.shift();
+        if (current === to) {
+            const path = [];
+            for (let node = to; node; node = previous.get(node)) {
+                path.unshift(node);
+            }
+            return path;
+        }
+        for (const next of edges.get(current) ?? []) {
+            if (!previous.has(next)) {
+                previous.set(next, current);
+                queue.push(next);
+            }
+        }
+    }
+    return undefined;
+}
+/** Render a module graph as a Mermaid flowchart. Deferred imports use dotted arrows. */
+export function moduleGraphToMermaid(graph) {
+    const ids = new Map(graph.modules.map((module, index) => [module.name, `m_${index}`]));
+    const id = (name) => ids.get(name);
+    const label = (name) => name.replace(/[&<>"#\r\n]/g, (character) => `#${character.charCodeAt(0)};`);
+    const lines = ['flowchart LR'];
+    for (const module of graph.modules) {
+        const providers = module.providers.length;
+        lines.push(`  ${id(module.name)}["${label(module.name)}<br/>${providers} provider${providers === 1 ? '' : 's'}, ${module.exports.length} exported"]`);
+    }
+    for (const module of graph.modules) {
+        for (const imported of module.imports) {
+            lines.push(`  ${id(module.name)} ${imported.deferred ? '-.->' : '-->'} ${id(imported.module)}`);
+        }
+    }
+    return lines.join('\n');
+}
+//# sourceMappingURL=module-inspection.js.map

package/dist/core/module-inspection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"module-inspection.js","sourceRoot":"","sources":["../../src/core/module-inspection.ts"],"names":[],"mappings":"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"}

package/dist/core/module-runtime.d.ts

@@ -0,0 +1,22 @@
+import { type AwilixContainer } from 'awilix';
+import type { Logger } from '../utils/logger.js';
+import { type JobServicesScope } from './job-services.js';
+import type { ModuleConfig } from './types.js';
+/** Module names are translated only at the edge; Awilix owns caching and lifetimes. */
+export declare class ModuleRuntime {
+    #private;
+    readonly modules: ModuleConfig[];
+    readonly container: AwilixContainer<{}>;
+    readonly asyncFactories: string[];
+    constructor(modules: ModuleConfig[], logger: Logger);
+    /** Names a module exports, including re-exports of imported modules. */
+    exportedNames(module: ModuleConfig): string[];
+    /**
+     * Opens a scope in the module that declares a job, as the worker does for each attempt.
+     * Returns undefined for jobs that no module declares.
+     */
+    jobServices(jobName: string): JobServicesScope | undefined;
+    /** A container view exposes only local providers and direct imports' exports. */
+    forModule(module: ModuleConfig, container?: AwilixContainer<{}>): AwilixContainer;
+}
+//# sourceMappingURL=module-runtime.d.ts.map

package/dist/core/module-runtime.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"module-runtime.d.ts","sourceRoot":"","sources":["../../src/core/module-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EAMrB,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EAAgB,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAGxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,uFAAuF;AACvF,qBAAa,aAAa;;IAUtB,QAAQ,CAAC,OAAO,EAAE,YAAY,EAAE;IATlC,QAAQ,CAAC,SAAS,sBAAyE;IAC3F,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,CAAM;IAOvC,YACW,OAAO,EAAE,YAAY,EAAE,EAChC,MAAM,EAAE,MAAM,EAsBf;IAgGD,wEAAwE;IACxE,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,EAAE,CAE5C;IA8CD;;;OAGG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAQzD;IAED,iFAAiF;IACjF,SAAS,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,sBAAiB,GAAG,eAAe,CAM3E;CA6EF"}

package/dist/core/module-runtime.js

@@ -0,0 +1,252 @@
+import { asClass, asFunction, createContainer, InjectionMode, } from 'awilix';
+import { ProviderNotAvailableError } from './errors.js';
+import { JOB_SERVICES } from './job-services.js';
+import { getProviderName, resolveModule } from './module.js';
+import { registerModuleProviders } from './module-graph.js';
+/** Module names are translated only at the edge; Awilix owns caching and lifetimes. */
+export class ModuleRuntime {
+    modules;
+    container = createContainer({ injectionMode: InjectionMode.PROXY, strict: true });
+    asyncFactories = [];
+    #locals = new Map();
+    #exports = new Map();
+    #visible = new Map();
+    #views = new WeakMap();
+    #jobOwners = new Map();
+    constructor(modules, logger) {
+        this.modules = modules;
+        for (const module of modules) {
+            const names = new Map();
+            for (const provider of module.providers ?? []) {
+                const name = getProviderName(provider);
+                if (names.has(name))
+                    throw new Error(`Duplicate provider "${name}" in module "${module.name}"`);
+                names.set(name, `${module.name}/${name}`);
+            }
+            this.#locals.set(module, names);
+        }
+        for (const module of modules) {
+            for (const job of module.jobs ?? [])
+                this.#jobOwners.set(job.name, module);
+        }
+        this.#collectExports();
+        for (const module of modules)
+            this.#visible.set(module, this.#visibility(module));
+        // Register everything before resolving anything, including deferred module imports.
+        for (const module of modules) {
+            const names = registerModuleProviders(module, this.forModule(module), logger);
+            this.asyncFactories.push(...names.map((name) => this.#token(module, name)));
+        }
+    }
+    #exportCandidates(module, entry) {
+        if (typeof entry === 'object') {
+            const source = resolveModule(entry);
+            if (!(module.imports ?? []).map(resolveModule).includes(source)) {
+                throw new Error(`Module "${module.name}" re-exports a module it does not import: "${source.name}"`);
+            }
+            return this.#exports.get(source) ?? [];
+        }
+        const name = getProviderName(entry);
+        const token = this.#locals.get(module)?.get(name);
+        if (!token)
+            throw new Error(`Module "${module.name}" exports unknown provider "${name}". Re-export the imported module instead.`);
+        return [[name, token]];
+    }
+    #mergeExports(module) {
+        const exported = this.#exports.get(module);
+        let changed = false;
+        for (const entry of module.exports ?? []) {
+            for (const [name, token] of this.#exportCandidates(module, entry)) {
+                const previous = exported.get(name);
+                if (previous && previous !== token)
+                    throw new Error(`Ambiguous exported provider "${name}" in module "${module.name}"`);
+                if (!previous) {
+                    exported.set(name, token);
+                    changed = true;
+                }
+            }
+        }
+        return changed;
+    }
+    #collectExports() {
+        for (const module of this.modules)
+            this.#exports.set(module, new Map());
+        // Fixed point: module re-exports may themselves form a deferred cycle.
+        let changed = true;
+        while (changed) {
+            changed = false;
+            for (const module of this.modules) {
+                if (this.#mergeExports(module))
+                    changed = true;
+            }
+        }
+    }
+    #visibility(module) {
+        const locals = this.#locals.get(module);
+        const visible = new Map(locals);
+        for (const reference of module.imports ?? []) {
+            const imported = resolveModule(reference);
+            for (const [name, token] of this.#exports.get(imported) ?? []) {
+                if (locals.has(name))
+                    continue;
+                const previous = visible.get(name);
+                if (previous && previous !== token) {
+                    throw new Error(`Ambiguous imported provider "${name}" in module "${module.name}"`);
+                }
+                visible.set(name, token);
+            }
+        }
+        return visible;
+    }
+    /** Imports are fixed at bootstrap; names registered later belong to the registering module. */
+    #lookup(module, name, container) {
+        const own = `${module.name}/${name}`;
+        return (this.#visible.get(module)?.get(name) ?? (container.getRegistration(own) ? own : undefined));
+    }
+    #token(module, name, container = this.container) {
+        const token = typeof name === 'string' ? this.#lookup(module, name, container) : undefined;
+        if (!token) {
+            throw new ProviderNotAvailableError(module.name, String(name), this.#missingHint(name));
+        }
+        return token;
+    }
+    /** Explains where a provider that a module cannot see is declared and exported. */
+    #missingHint(name) {
+        const declaring = this.modules.filter((owner) => this.#locals.get(owner)?.has(String(name)));
+        if (declaring.length === 0)
+            return 'No module declares it.';
+        const exporting = this.modules.filter((owner) => this.#exports.get(owner)?.has(String(name)));
+        const list = (modules) => modules.map((owner) => `"${owner.name}"`).join(', ');
+        if (exporting.length > 0)
+            return `Import ${list(exporting)}, which exports it.`;
+        return `Declared in ${list(declaring)}, which does not export it.`;
+    }
+    /** Names a module exports, including re-exports of imported modules. */
+    exportedNames(module) {
+        return [...(this.#exports.get(module)?.keys() ?? [])];
+    }
+    #names(module, container) {
+        const prefix = `${module.name}/`;
+        const registered = Object.keys(container.registrations)
+            .filter((token) => token.startsWith(prefix))
+            .map((token) => token.slice(prefix.length));
+        return [...new Set([...(this.#visible.get(module)?.keys() ?? []), ...registered])];
+    }
+    #register(module, target, name, registration) {
+        if (!registration)
+            throw new Error(`Missing resolver for "${String(name)}"`);
+        if (typeof name !== 'string')
+            throw new Error('Module provider tokens must be strings');
+        const token = `${module.name}/${name}`;
+        if ((this.#lookup(module, name, target) ?? token) !== token) {
+            throw new Error(`Provider "${name}" is imported into module "${module.name}" and cannot be registered there. Use providerOverrides to replace it.`);
+        }
+        const originalResolve = registration.resolve;
+        const rethrow = (error) => {
+            if (error instanceof ProviderNotAvailableError)
+                error.requiredBy(token);
+            throw error;
+        };
+        const wrapped = {
+            ...registration,
+            dependencies: registration.dependencies?.map((dependency) => this.#token(module, dependency, target)),
+            resolve: (scope) => {
+                try {
+                    const value = originalResolve.call(registration, this.forModule(module, scope));
+                    return value instanceof Promise && registration.lifetime ? value.catch(rethrow) : value;
+                }
+                catch (error) {
+                    return rethrow(error);
+                }
+            },
+        };
+        target.register(token, wrapped);
+    }
+    /**
+     * Opens a scope in the module that declares a job, as the worker does for each attempt.
+     * Returns undefined for jobs that no module declares.
+     */
+    jobServices(jobName) {
+        const owner = this.#jobOwners.get(jobName);
+        if (!owner)
+            return undefined;
+        const scope = this.container.createScope();
+        return {
+            services: this.forModule(owner, scope).cradle,
+            dispose: () => scope.dispose(),
+        };
+    }
+    /** A container view exposes only local providers and direct imports' exports. */
+    forModule(module, container = this.container) {
+        const views = this.#views.get(container) ?? new Map();
+        this.#views.set(container, views);
+        const view = views.get(module) ?? this.#createView(module, container);
+        views.set(module, view);
+        return view;
+    }
+    #createView(module, container) {
+        if (!this.#visible.has(module))
+            throw new Error(`Unknown module "${module.name}"`);
+        const has = (name) => typeof name === 'string' && this.#lookup(module, name, container) !== undefined;
+        const resolve = (name, options) => {
+            if (!has(name) && (options?.allowUnregistered || name === 'then'))
+                return undefined;
+            return container.resolve(this.#token(module, name, container), options);
+        };
+        const jobServices = (jobName) => this.jobServices(jobName);
+        const cradle = new Proxy(Object.create(null), {
+            get: (_target, name) => (name === JOB_SERVICES ? jobServices : resolve(name)),
+            has: (_target, name) => has(name),
+            ownKeys: () => this.#names(module, container),
+            getOwnPropertyDescriptor: (_target, name) => has(name) ? { configurable: true, enumerable: true } : undefined,
+        });
+        const view = new Proxy(container, {
+            get: (target, property) => {
+                switch (property) {
+                    case 'cradle':
+                        return cradle;
+                    case 'resolve':
+                        return resolve;
+                    case 'registrations': {
+                        // Awilix rebuilds `registrations` on every access; read it once.
+                        const registrations = target.registrations;
+                        return Object.fromEntries(this.#names(module, target).map((name) => [
+                            name,
+                            registrations[this.#token(module, name, target)],
+                        ]));
+                    }
+                    case 'hasRegistration':
+                        return (name) => has(name) && target.hasRegistration(this.#token(module, name, target));
+                    case 'getRegistration':
+                        return (name) => has(name) ? target.getRegistration(this.#token(module, name, target)) : null;
+                    case 'build':
+                        return (target, options) => {
+                            if (typeof target === 'function') {
+                                const resolver = /^class\s/.test(Function.prototype.toString.call(target))
+                                    ? asClass(target, options)
+                                    : asFunction(target, options);
+                                return resolver.resolve(view);
+                            }
+                            return target.resolve(view);
+                        };
+                    case 'createScope':
+                        return () => this.forModule(module, target.createScope());
+                    case 'register':
+                        return (nameOrMap, resolver) => {
+                            const entries = typeof nameOrMap === 'object'
+                                ? Object.entries(nameOrMap)
+                                : [[nameOrMap, resolver]];
+                            for (const [name, registration] of entries) {
+                                this.#register(module, target, name, registration);
+                            }
+                            return view;
+                        };
+                    default:
+                        return Reflect.get(target, property);
+                }
+            },
+        });
+        return view;
+    }
+}
+//# sourceMappingURL=module-runtime.js.map

package/dist/core/module-runtime.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"module-runtime.js","sourceRoot":"","sources":["../../src/core/module-runtime.ts"],"names":[],"mappings":"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"}

package/dist/core/module.d.ts

@@ -1,4 +1,4 @@
-import type { ModuleConfig } from './types.js';
+import type { Constructor, ForwardReference, ModuleConfig, ProviderConfig } from './types.js';
 /**
  * Define a module with providers, imports, and routes.
  *
@@ -18,4 +18,8 @@ import type { ModuleConfig } from './types.js';
  * ```
  */
 export declare function defineModule(config: ModuleConfig): ModuleConfig;
+export declare function getProviderName(provider: ProviderConfig | Constructor | string): string;
+/** Defer a module import to allow explicitly declared circular module graphs. */
+export declare function forwardRef(factory: () => ModuleConfig): ForwardReference;
+export declare function resolveModule(reference: ModuleConfig | ForwardReference): ModuleConfig;
 //# sourceMappingURL=module.d.ts.map

package/dist/core/module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/core/module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,YAAY,EAAkB,MAAM,YAAY,CAAC;AAE5E;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CAG/D"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/core/module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE9F;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CAG/D;AAwDD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,cAAc,GAAG,WAAW,GAAG,MAAM,GAAG,MAAM,CAgBvF;AASD,iFAAiF;AACjF,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,YAAY,GAAG,gBAAgB,CAExE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,YAAY,GAAG,gBAAgB,GAAG,YAAY,CAItF"}

package/dist/core/module.js

@@ -44,11 +44,13 @@ function validateProviders(config) {
     }
 }
 function validateExports(config) {
-    if (!config.exports || !config.providers) {
+    if (!config.exports) {
         return;
     }
-    const providerNames = collectProviderNames(config.providers);
+    const providerNames = collectProviderNames(config.providers ?? []);
     for (const exp of config.exports) {
+        if (typeof exp === 'object')
+            continue;
         const exportName = getProviderName(exp);
         if (!providerNames.has(exportName)) {
             throw new Error(`Module "${config.name}" exports "${exportName}" but it's not in providers`);
@@ -62,7 +64,7 @@ function collectProviderNames(providers) {
     }
     return names;
 }
-function getProviderName(provider) {
+export function getProviderName(provider) {
     if (typeof provider === 'string') {
         return provider;
     }
@@ -82,4 +84,14 @@ function getProviderName(provider) {
 function camelCase(str) {
     return str.charAt(0).toLowerCase() + str.slice(1);
 }
+/** Defer a module import to allow explicitly declared circular module graphs. */
+export function forwardRef(factory) {
+    return { forwardRef: factory };
+}
+export function resolveModule(reference) {
+    const module = 'forwardRef' in reference ? reference.forwardRef() : reference;
+    if (!module?.name)
+        throw new Error('Module import is undefined or has no name');
+    return module;
+}
 //# sourceMappingURL=module.js.map

package/dist/core/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/core/module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/core/module.ts"],"names":[],"mappings":"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"}

package/dist/core/request-scope.d.ts

@@ -7,6 +7,6 @@ import type { MiddlewareHandler } from 'hono';
 export declare class HttpRequestScope {
     #private;
     middleware(container: AwilixContainer): MiddlewareHandler;
-    routeServices(container: AwilixContainer): Record<string, unknown>;
+    routeServices(container: AwilixContainer, moduleScope?: (scope: AwilixContainer) => AwilixContainer): Record<string, unknown>;
 }
 //# sourceMappingURL=request-scope.d.ts.map

package/dist/core/request-scope.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request-scope.d.ts","sourceRoot":"","sources":["../../src/core/request-scope.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAAY,MAAM,QAAQ,CAAC;AACxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAE9C;;;GAGG;AACH,qBAAa,gBAAgB;;IAI3B,UAAU,CAAC,SAAS,EAAE,eAAe,GAAG,iBAAiB,CAUxD;IAED,aAAa,CAAC,SAAS,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAuBjE;CAgDF"}
+{"version":3,"file":"request-scope.d.ts","sourceRoot":"","sources":["../../src/core/request-scope.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAAY,MAAM,QAAQ,CAAC;AACxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAE9C;;;GAGG;AACH,qBAAa,gBAAgB;;IAI3B,UAAU,CAAC,SAAS,EAAE,eAAe,GAAG,iBAAiB,CAUxD;IAED,aAAa,CACX,SAAS,EAAE,eAAe,EAC1B,WAAW,GAAE,CAAC,KAAK,EAAE,eAAe,KAAK,eAAkC,GAC1E,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA8BzB;CAqDF"}

package/dist/core/request-scope.js

@@ -6,7 +6,7 @@ import { Lifetime } from 'awilix';
  */
 export class HttpRequestScope {
     #storage = new AsyncLocalStorage();
-    #proxies = new Map();
+    #proxies = new WeakMap();
     middleware(container) {
         return async (_context, next) => {
             const scope = container.createScope();
@@ -18,15 +18,17 @@ export class HttpRequestScope {
             }
         };
     }
-    routeServices(container) {
+    routeServices(container, moduleScope = (scope) => scope) {
+        const proxies = this.#proxies.get(container) ?? new Map();
+        this.#proxies.set(container, proxies);
         return new Proxy(Object.create(null), {
             get: (_target, property) => {
                 if (typeof property !== 'string')
                     return undefined;
-                const registration = container.registrations[property];
+                const registration = container.getRegistration(property);
                 if (registration?.lifetime === Lifetime.SCOPED ||
                     registration?.lifetime === Lifetime.TRANSIENT) {
-                    return this.#requestScopedProxy(property, registration.lifetime === Lifetime.SCOPED);
+                    return this.#requestScopedProxy(property, registration.lifetime === Lifetime.SCOPED, proxies, moduleScope);
                 }
                 return container.resolve(property);
             },
@@ -39,8 +41,8 @@ export class HttpRequestScope {
             ownKeys: () => Object.keys(container.registrations),
         });
     }
-    #requestScopedProxy(name, shared) {
-        const existing = shared ? this.#proxies.get(name) : undefined;
+    #requestScopedProxy(name, shared, proxies, moduleScope) {
+        const existing = shared ? proxies.get(name) : undefined;
         if (existing)
             return existing;
         const instances = new WeakMap();
@@ -50,7 +52,7 @@ export class HttpRequestScope {
                 throw new Error(`Scoped provider "${name}" can only be used while handling an HTTP request`);
             }
             if (!instances.has(scope))
-                instances.set(scope, scope.resolve(name));
+                instances.set(scope, moduleScope(scope).resolve(name));
             return instances.get(scope);
         };
         const callable = (...args) => {
@@ -79,7 +81,7 @@ export class HttpRequestScope {
             },
         });
         if (shared)
-            this.#proxies.set(name, proxy);
+            proxies.set(name, proxy);
         return proxy;
     }
 }

package/dist/core/request-scope.js.map

@@ -1 +1 @@
-{"version":3,"file":"request-scope.js","sourceRoot":"","sources":["../../src/core/request-scope.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"request-scope.js","sourceRoot":"","sources":["../../src/core/request-scope.ts"],"names":[],"mappings":"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"}