moost 0.6.40 → 0.6.42

package/dist/index.cjs

@@ -48,7 +48,7 @@ let stamped = false;
 	if (stamped) return;
 	stamped = true;
 	stampModuleIdentity({
-		version: "0.6.40",
+		version: "0.6.42",
 		path: typeof __filename === "string" ? __filename : require("url").pathToFileURL(__filename).href
 	});
 }
@@ -139,19 +139,15 @@ let sourceRefs = [];
 /**
 * Scans the registered apps' controllers for a class-scoped `@Provide`
 * carrying `token` and returns the provider controller class names. Both
-* string and symbol keys are checked — symbol class-tokens match by identity
-* because infact keys them via `Symbol.for` (same class source, same symbol).
+* string and symbol keys are checked — a class token matches because
+* `@Inject(Class)` and `@Provide(Class)` both key it via infact's `getClassKey`.
 */ function findTokenProviders(token) {
 	const providers = [];
 	for (const source of scanLiveSources()) for (const entry of source.getControllersOverview()) if (Reflect.ownKeys(entry.meta?.provide ?? {}).includes(token) && !providers.includes(entry.type.name)) providers.push(entry.type.name);
 	return providers;
 }
-const CLASS_SOURCE_RE = /^class\s+([\w$]+)/;
-/** Renders a provide token readably: strings as-is, class-source symbols by class name. */ function stringifyToken(token) {
-	if (typeof token === "string") return token;
-	const description = token.description ?? token.toString();
-	const match = CLASS_SOURCE_RE.exec(description);
-	return match ? match[1] : description;
+/** Renders a provide token readably: strings as-is, symbols (class keys carry the class name) by description. */ function stringifyToken(token) {
+	return typeof token === "string" ? token : token.description || token.toString();
 }
 /**
 * D4: when an unresolved `@Inject(token)` IS provided somewhere — via a
@@ -450,7 +446,13 @@ function nextScopeId() {
 	}
 	return `__moost_${_scopeChar}_${++_scopeNum}`;
 }
-/** Composable returning the moost scope ID for the current event. Generates on first call, caches for subsequent calls. */ const useScopeId = (0, _wooksjs_event_core.defineWook)(() => nextScopeId());
+const scopeIdSlot = (0, _wooksjs_event_core.cached)(() => nextScopeId());
+/**
+* Composable returning the moost DI scope ID of the current event. Generated on first call
+* and cached on the event context itself — never inherited from a parent context, so a child
+* event (a workflow run started with `eventContext`, a WebSocket message) owns its scope
+* instead of sharing, and later releasing, its parent's.
+*/ const useScopeId = (ctx) => (ctx ?? (0, _wooksjs_event_core.current)()).getOwn(scopeIdSlot);
 /** Registers a DI scope for the given ID and returns an unscope function. */ function registerEventScope(scopeId) {
 	const infact = getMoostInfact();
 	infact.registerScope(scopeId);
@@ -458,12 +460,42 @@ function nextScopeId() {
 		infact.unregisterScope(scopeId);
 	};
 }
+const noop = () => {};
+/**
+* Registers an event's DI scope, held by its handler lifecycle and, with `adapterHolds`, by
+* the adapter too. Each release is idempotent; the scope is dropped once every holder let go,
+* so an adapter signal that fires early (a client disconnect mid-handler) cannot pull the
+* scope from under a running handler. Built outside the handler closure so a long-lived
+* adapter listener (the response 'close' of a streamed body) retains only the scope.
+*/ function holdEventScope(scopeId, adapterHolds) {
+	const drop = registerEventScope(scopeId);
+	let holders = adapterHolds ? 2 : 1;
+	const hold = () => {
+		let held = true;
+		return () => {
+			if (held) {
+				held = false;
+				if (--holders === 0) drop();
+			}
+		};
+	};
+	const releaseLifecycle = hold();
+	return {
+		releaseLifecycle,
+		failLifecycle: (error) => {
+			releaseLifecycle();
+			throw error;
+		},
+		unscope: adapterHolds ? hold() : noop
+	};
+}
 /**
 * Creates the complete event handler lifecycle processor used by adapters.
 * Handles scope registration, controller resolution, interceptors, argument resolution,
 * handler invocation, and cleanup — optimised for sync-first execution.
 */ function defineMoostEventHandler(options) {
 	const ci = (0, _wooksjs_event_core.getContextInjector)();
+	const manualUnscope = !!options.manualUnscope;
 	const handlerSpanName = `Handler:${options.targetPath}`;
 	const handlerAttrs = {
 		"moost.handler": options.controllerMethod || "",
@@ -473,7 +505,7 @@ function nextScopeId() {
 		const ctx = (0, _wooksjs_event_core.current)();
 		const scopeId = useScopeId(ctx);
 		const logger = (0, _wooksjs_event_core.useLogger)(options.loggerTitle, ctx);
-		const unscope = registerEventScope(scopeId);
+		const { unscope, releaseLifecycle, failLifecycle } = holdEventScope(scopeId, manualUnscope);
 		let response;
 		let hookOptions;
 		function getHookOptions() {
@@ -489,14 +521,17 @@ function nextScopeId() {
 		let interceptorHandler;
 		let raise = false;
 		try {
+			const result = start();
+			return isThenable(result) ? result.then(void 0, failLifecycle) : result;
+		} catch (error) {
+			return failLifecycle(error);
+		}
+		function start() {
 			if (options.hooks?.init) {
 				const hookResult = options.hooks.init(getHookOptions());
 				if (isThenable(hookResult)) return hookResult.then(afterInit);
 			}
 			return afterInit();
-		} catch (error) {
-			if (!options.manualUnscope) unscope();
-			throw error;
 		}
 		function afterInit() {
 			const instanceResult = options.getControllerInstance();
@@ -580,7 +615,6 @@ function nextScopeId() {
 					return finalize();
 				}, (error) => {
 					if (options.logErrors) logger.error(String(error));
-					if (!options.manualUnscope) unscope();
 					throw error;
 				});
 				response = afterResult;
@@ -589,7 +623,7 @@ function nextScopeId() {
 			return finalize();
 		}
 		function finalize() {
-			if (!options.manualUnscope) unscope();
+			releaseLifecycle();
 			if (options.hooks?.end) {
 				const endResult = options.hooks.end(getHookOptions());
 				if (isThenable(endResult)) return endResult.then(() => {
@@ -1307,7 +1341,7 @@ var TInterceptorPriority = /* @__PURE__ */ function(TInterceptorPriority) {
 * (For optional values use with @Optional())
 * @param type - string or class constructor
 */ function Inject(type) {
-	const key = typeof type === "string" ? type : Symbol.for(String(type));
+	const key = typeof type === "string" ? type : (0, _prostojs_infact.getClassKey)(type);
 	return getMoostMate().decorate("inject", key);
 }
 /**
@@ -2671,6 +2705,12 @@ Object.defineProperty(exports, 'eventTypeKey', {
     return _wooksjs_event_core.eventTypeKey;
   }
 });
+Object.defineProperty(exports, 'getClassKey', {
+  enumerable: true,
+  get: function () {
+    return _prostojs_infact.getClassKey;
+  }
+});
 Object.defineProperty(exports, 'getConstructor', {
   enumerable: true,
   get: function () {

package/dist/index.d.ts

@@ -1,8 +1,7 @@
-import * as _wooksjs_event_core from '@wooksjs/event-core';
 import { EventContext, Logger, Key } from '@wooksjs/event-core';
 export { Cached, ContextInjector, EventContext, EventContextOptions, Key, Logger, cached, createEventContext, current, eventTypeKey, getContextInjector, key, replaceContextInjector, resetContextInjector, run, useLogger } from '@wooksjs/event-core';
 import { TProvideRegistry, TReplaceRegistry, Infact, TProvideFn } from '@prostojs/infact';
-export { TProvideRegistry, createProvideRegistry, createReplaceRegistry } from '@prostojs/infact';
+export { TProvideRegistry, createProvideRegistry, createReplaceRegistry, getClassKey } from '@prostojs/infact';
 import * as _prostojs_mate from '@prostojs/mate';
 import { TMateParamMeta, Mate } from '@prostojs/mate';
 export { Mate, TMateParamMeta, getConstructor, isConstructor } from '@prostojs/mate';
@@ -1288,8 +1287,13 @@ interface TMoostEventHandlerOptions<T> {
     controllerPrefix?: string;
     handlerType: string;
 }
-/** Composable returning the moost scope ID for the current event. Generates on first call, caches for subsequent calls. */
-declare const useScopeId: _wooksjs_event_core.WookComposable<string>;
+/**
+ * Composable returning the moost DI scope ID of the current event. Generated on first call
+ * and cached on the event context itself — never inherited from a parent context, so a child
+ * event (a workflow run started with `eventContext`, a WebSocket message) owns its scope
+ * instead of sharing, and later releasing, its parent's.
+ */
+declare const useScopeId: (ctx?: EventContext) => string;
 /** Registers a DI scope for the given ID and returns an unscope function. */
 declare function registerEventScope(scopeId: string): () => void;
 /**

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { ContextInjector, cached, createEventContext, createEventContext as createEventContext$1, current, current as current$1, defineWook, eventTypeKey, getContextInjector, getContextInjector as getContextInjector$1, key, key as key$1, replaceContextInjector, resetContextInjector, run, useLogger, useLogger as useLogger$1, useRouteParams } from "@wooksjs/event-core";
-import { Infact, createProvideRegistry, createProvideRegistry as createProvideRegistry$1, createReplaceRegistry, createReplaceRegistry as createReplaceRegistry$1 } from "@prostojs/infact";
+import { ContextInjector, cached, cached as cached$1, createEventContext, createEventContext as createEventContext$1, current, current as current$1, eventTypeKey, getContextInjector, getContextInjector as getContextInjector$1, key, key as key$1, replaceContextInjector, resetContextInjector, run, useLogger, useLogger as useLogger$1, useRouteParams } from "@wooksjs/event-core";
+import { Infact, createProvideRegistry, createProvideRegistry as createProvideRegistry$1, createReplaceRegistry, createReplaceRegistry as createReplaceRegistry$1, getClassKey, getClassKey as getClassKey$1 } from "@prostojs/infact";
 import { Mate, getConstructor, getConstructor as getConstructor$1, isConstructor, isConstructor as isConstructor$1 } from "@prostojs/mate";
 import { ProstoLogger, ProstoLogger as ProstoLogger$1, coloredConsole, createConsoleTransort } from "@prostojs/logger";
 import { Hookable } from "hookable";
@@ -47,7 +47,7 @@ let stamped = false;
 	if (stamped) return;
 	stamped = true;
 	stampModuleIdentity({
-		version: "0.6.40",
+		version: "0.6.42",
 		path: typeof __filename === "string" ? __filename : import.meta.url
 	});
 }
@@ -138,19 +138,15 @@ let sourceRefs = [];
 /**
 * Scans the registered apps' controllers for a class-scoped `@Provide`
 * carrying `token` and returns the provider controller class names. Both
-* string and symbol keys are checked — symbol class-tokens match by identity
-* because infact keys them via `Symbol.for` (same class source, same symbol).
+* string and symbol keys are checked — a class token matches because
+* `@Inject(Class)` and `@Provide(Class)` both key it via infact's `getClassKey`.
 */ function findTokenProviders(token) {
 	const providers = [];
 	for (const source of scanLiveSources()) for (const entry of source.getControllersOverview()) if (Reflect.ownKeys(entry.meta?.provide ?? {}).includes(token) && !providers.includes(entry.type.name)) providers.push(entry.type.name);
 	return providers;
 }
-const CLASS_SOURCE_RE = /^class\s+([\w$]+)/;
-/** Renders a provide token readably: strings as-is, class-source symbols by class name. */ function stringifyToken(token) {
-	if (typeof token === "string") return token;
-	const description = token.description ?? token.toString();
-	const match = CLASS_SOURCE_RE.exec(description);
-	return match ? match[1] : description;
+/** Renders a provide token readably: strings as-is, symbols (class keys carry the class name) by description. */ function stringifyToken(token) {
+	return typeof token === "string" ? token : token.description || token.toString();
 }
 /**
 * D4: when an unresolved `@Inject(token)` IS provided somewhere — via a
@@ -449,7 +445,13 @@ function nextScopeId() {
 	}
 	return `__moost_${_scopeChar}_${++_scopeNum}`;
 }
-/** Composable returning the moost scope ID for the current event. Generates on first call, caches for subsequent calls. */ const useScopeId = defineWook(() => nextScopeId());
+const scopeIdSlot = cached$1(() => nextScopeId());
+/**
+* Composable returning the moost DI scope ID of the current event. Generated on first call
+* and cached on the event context itself — never inherited from a parent context, so a child
+* event (a workflow run started with `eventContext`, a WebSocket message) owns its scope
+* instead of sharing, and later releasing, its parent's.
+*/ const useScopeId = (ctx) => (ctx ?? current$1()).getOwn(scopeIdSlot);
 /** Registers a DI scope for the given ID and returns an unscope function. */ function registerEventScope(scopeId) {
 	const infact = getMoostInfact();
 	infact.registerScope(scopeId);
@@ -457,12 +459,42 @@ function nextScopeId() {
 		infact.unregisterScope(scopeId);
 	};
 }
+const noop = () => {};
+/**
+* Registers an event's DI scope, held by its handler lifecycle and, with `adapterHolds`, by
+* the adapter too. Each release is idempotent; the scope is dropped once every holder let go,
+* so an adapter signal that fires early (a client disconnect mid-handler) cannot pull the
+* scope from under a running handler. Built outside the handler closure so a long-lived
+* adapter listener (the response 'close' of a streamed body) retains only the scope.
+*/ function holdEventScope(scopeId, adapterHolds) {
+	const drop = registerEventScope(scopeId);
+	let holders = adapterHolds ? 2 : 1;
+	const hold = () => {
+		let held = true;
+		return () => {
+			if (held) {
+				held = false;
+				if (--holders === 0) drop();
+			}
+		};
+	};
+	const releaseLifecycle = hold();
+	return {
+		releaseLifecycle,
+		failLifecycle: (error) => {
+			releaseLifecycle();
+			throw error;
+		},
+		unscope: adapterHolds ? hold() : noop
+	};
+}
 /**
 * Creates the complete event handler lifecycle processor used by adapters.
 * Handles scope registration, controller resolution, interceptors, argument resolution,
 * handler invocation, and cleanup — optimised for sync-first execution.
 */ function defineMoostEventHandler(options) {
 	const ci = getContextInjector$1();
+	const manualUnscope = !!options.manualUnscope;
 	const handlerSpanName = `Handler:${options.targetPath}`;
 	const handlerAttrs = {
 		"moost.handler": options.controllerMethod || "",
@@ -472,7 +504,7 @@ function nextScopeId() {
 		const ctx = current$1();
 		const scopeId = useScopeId(ctx);
 		const logger = useLogger$1(options.loggerTitle, ctx);
-		const unscope = registerEventScope(scopeId);
+		const { unscope, releaseLifecycle, failLifecycle } = holdEventScope(scopeId, manualUnscope);
 		let response;
 		let hookOptions;
 		function getHookOptions() {
@@ -488,14 +520,17 @@ function nextScopeId() {
 		let interceptorHandler;
 		let raise = false;
 		try {
+			const result = start();
+			return isThenable(result) ? result.then(void 0, failLifecycle) : result;
+		} catch (error) {
+			return failLifecycle(error);
+		}
+		function start() {
 			if (options.hooks?.init) {
 				const hookResult = options.hooks.init(getHookOptions());
 				if (isThenable(hookResult)) return hookResult.then(afterInit);
 			}
 			return afterInit();
-		} catch (error) {
-			if (!options.manualUnscope) unscope();
-			throw error;
 		}
 		function afterInit() {
 			const instanceResult = options.getControllerInstance();
@@ -579,7 +614,6 @@ function nextScopeId() {
 					return finalize();
 				}, (error) => {
 					if (options.logErrors) logger.error(String(error));
-					if (!options.manualUnscope) unscope();
 					throw error;
 				});
 				response = afterResult;
@@ -588,7 +622,7 @@ function nextScopeId() {
 			return finalize();
 		}
 		function finalize() {
-			if (!options.manualUnscope) unscope();
+			releaseLifecycle();
 			if (options.hooks?.end) {
 				const endResult = options.hooks.end(getHookOptions());
 				if (isThenable(endResult)) return endResult.then(() => {
@@ -1306,7 +1340,7 @@ var TInterceptorPriority = /* @__PURE__ */ function(TInterceptorPriority) {
 * (For optional values use with @Optional())
 * @param type - string or class constructor
 */ function Inject(type) {
-	const key = typeof type === "string" ? type : Symbol.for(String(type));
+	const key = typeof type === "string" ? type : getClassKey$1(type);
 	return getMoostMate().decorate("inject", key);
 }
 /**
@@ -2565,4 +2599,4 @@ function _define_property(obj, key, value) {
 }
 
 //#endregion
-export { After, ApplyDecorators, Before, Circular, Const, ConstFactory, ContextInjector, Controller, Description, HandlerPaths, Id, ImportController, Inherit, Inject, InjectEventLogger, InjectFromScope, InjectMoost, InjectMoostLogger, InjectScopeVars, Injectable, Intercept, Interceptor, InterceptorHandler, Label, LoggerTopic, MOOST_MODULE_IDENTITY_KEY, Moost, MoostDispose, MoostInit, OnError, Optional, Overtake, Param, Params, Pipe, ProstoLogger, Provide, Replace, Required, Resolve, Response, TInterceptorPriority, TPipePriority, Value, cached, clearGlobalWooks, createEventContext, createLogger, createProvideRegistry, createReplaceRegistry, current, defineAfterInterceptor, defineBeforeInterceptor, defineErrorInterceptor, defineInfactScope, defineInterceptor, defineMoostEventHandler, definePipeFn, disposeInstances, eventTypeKey, getConstructor, getContextInjector, getGlobalWooks, getHandlerPaths, getInfactScopeVars, getInfactSingletonInstances, getInstanceOwnMethods, getInstanceOwnProps, getMoostInfact, getMoostMate, getNewMoostInfact, globalKey, isConstructor, isThenable, key, loggerConsoleTransport, mergeSorted, registerEventScope, replaceContextInjector, resetContextInjector, resolvePipe, run, setControllerContext, setInfactLoggingOptions, setInterceptResult, setOvertake, stampModuleIdentity, stampOnce, useControllerContext, useHandlerPaths, useInterceptResult, useLogger, useOvertake, useScopeId };
+export { After, ApplyDecorators, Before, Circular, Const, ConstFactory, ContextInjector, Controller, Description, HandlerPaths, Id, ImportController, Inherit, Inject, InjectEventLogger, InjectFromScope, InjectMoost, InjectMoostLogger, InjectScopeVars, Injectable, Intercept, Interceptor, InterceptorHandler, Label, LoggerTopic, MOOST_MODULE_IDENTITY_KEY, Moost, MoostDispose, MoostInit, OnError, Optional, Overtake, Param, Params, Pipe, ProstoLogger, Provide, Replace, Required, Resolve, Response, TInterceptorPriority, TPipePriority, Value, cached, clearGlobalWooks, createEventContext, createLogger, createProvideRegistry, createReplaceRegistry, current, defineAfterInterceptor, defineBeforeInterceptor, defineErrorInterceptor, defineInfactScope, defineInterceptor, defineMoostEventHandler, definePipeFn, disposeInstances, eventTypeKey, getClassKey, getConstructor, getContextInjector, getGlobalWooks, getHandlerPaths, getInfactScopeVars, getInfactSingletonInstances, getInstanceOwnMethods, getInstanceOwnProps, getMoostInfact, getMoostMate, getNewMoostInfact, globalKey, isConstructor, isThenable, key, loggerConsoleTransport, mergeSorted, registerEventScope, replaceContextInjector, resetContextInjector, resolvePipe, run, setControllerContext, setInfactLoggingOptions, setInterceptResult, setOvertake, stampModuleIdentity, stampOnce, useControllerContext, useHandlerPaths, useInterceptResult, useLogger, useOvertake, useScopeId };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moost",
-  "version": "0.6.40",
+  "version": "0.6.42",
   "description": "moost",
   "keywords": [
     "composables",
@@ -38,18 +38,18 @@
     }
   },
   "dependencies": {
-    "@prostojs/infact": "^0.5.1",
+    "@prostojs/infact": "^0.6.0",
     "@prostojs/logger": "^0.4.3",
     "@prostojs/mate": "^0.5.0",
-    "@wooksjs/event-core": "^0.7.24",
+    "@wooksjs/event-core": "^0.7.25",
     "hookable": "^5.5.3",
-    "wooks": "^0.7.24"
+    "wooks": "^0.7.25"
   },
   "devDependencies": {
-    "@wooksjs/event-http": "^0.7.24",
-    "@wooksjs/http-body": "^0.7.24",
+    "@wooksjs/event-http": "^0.7.25",
+    "@wooksjs/http-body": "^0.7.25",
     "vitest": "3.2.7",
-    "@moostjs/event-http": "^0.6.40"
+    "@moostjs/event-http": "^0.6.42"
   },
   "scripts": {
     "pub": "pnpm publish --access public",