@wooksjs/event-wf 0.7.10 → 0.7.12

package/dist/index.cjs

@@ -1,42 +1,20 @@
-//#region rolldown:runtime
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key$2; i < n; i++) {
-		key$2 = keys[i];
-		if (!__hasOwnProp.call(to, key$2) && key$2 !== except) __defProp(to, key$2, {
-			get: ((k) => from[k]).bind(null, key$2),
-			enumerable: !(desc = __getOwnPropDesc(from, key$2)) || desc.enumerable
-		});
-	}
-	return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-
-//#endregion
-const __wooksjs_event_core = __toESM(require("@wooksjs/event-core"));
-const __wooksjs_event_http = __toESM(require("@wooksjs/event-http"));
-const __wooksjs_http_body = __toESM(require("@wooksjs/http-body"));
-const node_crypto = __toESM(require("node:crypto"));
-const __prostojs_wf = __toESM(require("@prostojs/wf"));
-const wooks = __toESM(require("wooks"));
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+let _wooksjs_event_core = require("@wooksjs/event-core");
+let _wooksjs_event_http = require("@wooksjs/event-http");
+let _wooksjs_http_body = require("@wooksjs/http-body");
+let node_crypto = require("node:crypto");
+let _prostojs_wf = require("@prostojs/wf");
+let wooks = require("wooks");
 
 //#region packages/event-wf/src/wf-kind.ts
-const wfKind = (0, __wooksjs_event_core.defineEventKind)("WF", {
-	schemaId: (0, __wooksjs_event_core.slot)(),
-	stepId: (0, __wooksjs_event_core.slot)(),
-	inputContext: (0, __wooksjs_event_core.slot)(),
-	indexes: (0, __wooksjs_event_core.slot)(),
-	input: (0, __wooksjs_event_core.slot)()
+const wfKind = (0, _wooksjs_event_core.defineEventKind)("WF", {
+	schemaId: (0, _wooksjs_event_core.slot)(),
+	stepId: (0, _wooksjs_event_core.slot)(),
+	inputContext: (0, _wooksjs_event_core.slot)(),
+	indexes: (0, _wooksjs_event_core.slot)(),
+	input: (0, _wooksjs_event_core.slot)()
 });
-const resumeKey = (0, __wooksjs_event_core.key)("wf.resume");
+const resumeKey = (0, _wooksjs_event_core.key)("wf.resume");
 
 //#endregion
 //#region packages/event-wf/src/composables/wf-state.ts
@@ -49,7 +27,7 @@ const resumeKey = (0, __wooksjs_event_core.key)("wf.resume");
 * const stepInput = input<MyInput>()
 * ```
 */
-const useWfState = (0, __wooksjs_event_core.defineWook)((c) => ({
+const useWfState = (0, _wooksjs_event_core.defineWook)((c) => ({
 	ctx: () => c.get(wfKind.keys.inputContext),
 	input: () => c.get(wfKind.keys.input),
 	schemaId: c.get(wfKind.keys.schemaId),
@@ -62,15 +40,15 @@ const useWfState = (0, __wooksjs_event_core.defineWook)((c) => ({
 //#region packages/event-wf/src/event-wf.ts
 /** Creates a WF event context for a fresh workflow execution and runs `fn` inside it. */
 function createWfContext(options, seeds, fn) {
-	return (0, __wooksjs_event_core.createEventContext)(options, wfKind, seeds, () => {
-		(0, __wooksjs_event_core.current)().set(resumeKey, false);
+	return (0, _wooksjs_event_core.createEventContext)(options, wfKind, seeds, () => {
+		(0, _wooksjs_event_core.current)().set(resumeKey, false);
 		return fn();
 	});
 }
 /** Creates a WF event context for resuming a paused workflow and runs `fn` inside it. */
 function resumeWfContext(options, seeds, fn) {
-	return (0, __wooksjs_event_core.createEventContext)(options, wfKind, seeds, () => {
-		(0, __wooksjs_event_core.current)().set(resumeKey, true);
+	return (0, _wooksjs_event_core.createEventContext)(options, wfKind, seeds, () => {
+		(0, _wooksjs_event_core.current)().set(resumeKey, true);
 		return fn();
 	});
 }
@@ -78,11 +56,11 @@ function resumeWfContext(options, seeds, fn) {
 //#endregion
 //#region packages/event-wf/src/outlets/outlet-context.ts
 /** Registered outlet handlers, keyed by name */
-const outletsRegistryKey = (0, __wooksjs_event_core.key)("wf.outlets.registry");
+const outletsRegistryKey = (0, _wooksjs_event_core.key)("wf.outlets.registry");
 /** Active state strategy for current request */
-const stateStrategyKey = (0, __wooksjs_event_core.key)("wf.outlets.stateStrategy");
+const stateStrategyKey = (0, _wooksjs_event_core.key)("wf.outlets.stateStrategy");
 /** Finished response set by workflow steps */
-const wfFinishedKey = (0, __wooksjs_event_core.key)("wf.outlets.finished");
+const wfFinishedKey = (0, _wooksjs_event_core.key)("wf.outlets.finished");
 
 //#endregion
 //#region packages/event-wf/src/outlets/use-wf-outlet.ts
@@ -93,7 +71,7 @@ const wfFinishedKey = (0, __wooksjs_event_core.key)("wf.outlets.finished");
 * `outletEmail(to, template)`. This composable is for advanced cases
 * where steps need to inspect or modify outlet state directly.
 */
-const useWfOutlet = (0, __wooksjs_event_core.defineWook)((ctx) => ({
+const useWfOutlet = (0, _wooksjs_event_core.defineWook)((ctx) => ({
 	getStateStrategy: () => ctx.get(stateStrategyKey),
 	getOutlets: () => ctx.get(outletsRegistryKey),
 	getOutlet: (name) => ctx.get(outletsRegistryKey)?.get(name) ?? null
@@ -113,7 +91,7 @@ const useWfOutlet = (0, __wooksjs_event_core.defineWook)((ctx) => ({
 * useWfFinished().set({ type: 'data', value: { success: true } })
 * ```
 */
-const useWfFinished = (0, __wooksjs_event_core.defineWook)((ctx) => ({
+const useWfFinished = (0, _wooksjs_event_core.defineWook)((ctx) => ({
 	set: (response) => ctx.set(wfFinishedKey, response),
 	get: () => ctx.has(wfFinishedKey) ? ctx.get(wfFinishedKey) : void 0
 }));
@@ -147,14 +125,14 @@ async function handleWfOutletRequest(config, deps) {
 	];
 	const tokenWrite = tok.write ?? "body";
 	const wfidName = config.wfidName ?? "wfid";
-	const ctx = (0, __wooksjs_event_core.current)();
+	const ctx = (0, _wooksjs_event_core.current)();
 	const registry = new Map(config.outlets.map((o) => [o.name, o]));
 	ctx.set(outletsRegistryKey, registry);
 	ctx.set(wfFinishedKey, void 0);
-	const { parseBody } = (0, __wooksjs_http_body.useBody)();
-	const { params } = (0, __wooksjs_event_http.useUrlParams)();
-	const { getCookie } = (0, __wooksjs_event_http.useCookies)();
-	const response = (0, __wooksjs_event_http.useResponse)();
+	const { parseBody } = (0, _wooksjs_http_body.useBody)();
+	const { params } = (0, _wooksjs_event_http.useUrlParams)();
+	const { getCookie } = (0, _wooksjs_event_http.useCookies)();
+	const response = (0, _wooksjs_event_http.useResponse)();
 	const body = await parseBody().catch(() => void 0);
 	const queryParams = params();
 	let token;
@@ -172,10 +150,10 @@ async function handleWfOutletRequest(config, deps) {
 		const strategy = resolveStrategy(wfid ?? "");
 		ctx.set(stateStrategyKey, strategy);
 		const state = await strategy.consume(token);
-		if (!state) return {
-			error: "Invalid or expired workflow state",
-			status: 400
-		};
+		if (!state) {
+			response.setStatus(410);
+			return { error: "Invalid or expired workflow state" };
+		}
 		if (state.schemaId !== (wfid ?? "")) {
 			const realStrategy = resolveStrategy(state.schemaId);
 			ctx.set(stateStrategyKey, realStrategy);
@@ -185,14 +163,14 @@ async function handleWfOutletRequest(config, deps) {
 			eventContext: ctx
 		});
 	} else if (wfid) {
-		if (config.allow?.length && !config.allow.includes(wfid)) return {
-			error: `Workflow '${wfid}' is not allowed`,
-			status: 403
-		};
-		if (config.block?.includes(wfid)) return {
-			error: `Workflow '${wfid}' is blocked`,
-			status: 403
-		};
+		if (config.allow?.length && !config.allow.includes(wfid)) {
+			response.setStatus(403);
+			return { error: `Workflow '${wfid}' is not allowed` };
+		}
+		if (config.block?.includes(wfid)) {
+			response.setStatus(403);
+			return { error: `Workflow '${wfid}' is blocked` };
+		}
 		const strategy = resolveStrategy(wfid);
 		ctx.set(stateStrategyKey, strategy);
 		const initialContext = config.initialContext ? config.initialContext(body, wfid) : {};
@@ -200,10 +178,10 @@ async function handleWfOutletRequest(config, deps) {
 			input,
 			eventContext: ctx
 		});
-	} else return {
-		error: "Missing wfs (state token) or wfid (workflow ID)",
-		status: 400
-	};
+	} else {
+		response.setStatus(400);
+		return { error: "Missing wfs (state token) or wfid (workflow ID)" };
+	}
 	if (output.finished) {
 		if (config.onFinished) return config.onFinished({
 			context: output.state.context,
@@ -212,19 +190,23 @@ async function handleWfOutletRequest(config, deps) {
 		const finished = ctx.get(wfFinishedKey);
 		if (finished?.cookies) for (const [name, cookie] of Object.entries(finished.cookies)) response.setCookie(name, cookie.value, cookie.options);
 		if (finished?.type === "redirect") {
+			response.setStatus(finished.status ?? 302);
 			response.setHeader("location", finished.value);
-			return { status: finished.status ?? 302 };
+			return "";
+		}
+		if (finished) {
+			if (finished.status) response.setStatus(finished.status);
+			return finished.value;
 		}
-		if (finished) return finished.value;
 		return { finished: true };
 	}
 	if (output.inputRequired) {
 		const outletReq = output.inputRequired;
 		const outletHandler = registry.get(outletReq.outlet);
-		if (!outletHandler) return {
-			error: `Unknown outlet: '${outletReq.outlet}'`,
-			status: 500
-		};
+		if (!outletHandler) {
+			response.setStatus(500);
+			return { error: `Unknown outlet: '${outletReq.outlet}'` };
+		}
 		const strategy = ctx.get(stateStrategyKey);
 		const stateWithMeta = {
 			...output.state,
@@ -270,11 +252,10 @@ function createHttpOutlet(opts) {
 		name: "http",
 		tokenDelivery: "caller",
 		async deliver(request, _token) {
-			const body = opts?.transform ? opts.transform(request.payload, request.context) : typeof request.payload === "object" && request.payload !== null ? {
+			return { response: opts?.transform ? opts.transform(request.payload, request.context) : typeof request.payload === "object" && request.payload !== null ? {
 				...request.payload,
 				...request.context
-			} : request.payload;
-			return { response: body };
+			} : request.payload };
 		}
 	};
 }
@@ -544,23 +525,22 @@ var WfStateStoreMemory = class {
 //#endregion
 //#region packages/event-wf/src/workflow.ts
 /** Workflow engine that resolves steps via Wooks router lookup. */
-var WooksWorkflow = class extends __prostojs_wf.Workflow {
-	constructor(wooks$1) {
+var WooksWorkflow = class extends _prostojs_wf.Workflow {
+	constructor(wooks) {
 		super([]);
-		this.wooks = wooks$1;
+		this.wooks = wooks;
 	}
 	resolveStep(stepId) {
 		const stepIdNorm = `/${stepId}`.replace(/\/{2,}/gu, "/");
 		try {
-			const ctx = (0, __wooksjs_event_core.current)();
+			const ctx = (0, _wooksjs_event_core.current)();
 			const found = this.wooks.lookup("WF_STEP", stepIdNorm);
 			if (found.handlers?.length) {
 				ctx.set(wfKind.keys.stepId, stepIdNorm);
 				return found.handlers[0]();
 			}
 		} catch {
-			const router = this.wooks.getRouter();
-			const found = router.lookup("WF_STEP", stepIdNorm);
+			const found = this.wooks.getRouter().lookup("WF_STEP", stepIdNorm);
 			if (found?.route?.handlers.length) return found.route.handlers[0]();
 		}
 		throw new Error(`Step "${stepIdNorm}" not found.`);
@@ -576,9 +556,6 @@ const wfShortcuts = {
 };
 /** Wooks adapter for defining and executing workflow schemas with step-based routing. */
 var WooksWf = class extends wooks.WooksAdapterBase {
-	logger;
-	wf;
-	eventContextOptions;
 	constructor(opts, wooks$1) {
 		super(wooks$1, opts?.logger, opts?.router);
 		this.opts = opts;
@@ -596,7 +573,7 @@ var WooksWf = class extends wooks.WooksAdapterBase {
 	}
 	/** Registers a workflow step with the given id and handler. */
 	step(id, opts) {
-		const step = (0, __prostojs_wf.createStep)(id, opts);
+		const step = (0, _prostojs_wf.createStep)(id, opts);
 		return this.on("WF_STEP", id, () => step);
 	}
 	/** Registers a workflow flow schema with the given id. */
@@ -642,19 +619,16 @@ var WooksWf = class extends wooks.WooksAdapterBase {
 	async _start(schemaId, inputContext, indexes, opts, parentCtx) {
 		const { input, spy, cleanup } = opts ?? {};
 		const resume = !!indexes?.length;
-		const factory = resume ? resumeWfContext : createWfContext;
-		const ctxOptions = parentCtx ? {
+		return (resume ? resumeWfContext : createWfContext)(parentCtx ? {
 			...this.eventContextOptions,
 			parent: parentCtx
-		} : this.eventContextOptions;
-		const seeds = {
+		} : this.eventContextOptions, {
 			inputContext,
 			schemaId,
 			stepId: null,
 			indexes,
 			input
-		};
-		return factory(ctxOptions, seeds, async () => {
+		}, async () => {
 			const { handlers: foundHandlers } = this.wooks.lookup("WF_FLOW", `/${schemaId}`.replace(/^\/+/u, "/"));
 			const handlers = foundHandlers || this.opts?.onNotFound && [this.opts.onNotFound] || null;
 			if (handlers && handlers.length > 0) {
@@ -664,8 +638,7 @@ var WooksWf = class extends wooks.WooksAdapterBase {
 					if (spy) spy(...args);
 					if (firstStep && args[0] === "step") {
 						firstStep = false;
-						const ctx = (0, __wooksjs_event_core.current)();
-						ctx.set(wfKind.keys.input, void 0);
+						(0, _wooksjs_event_core.current)().set(wfKind.keys.input, void 0);
 					}
 				};
 				try {
@@ -728,8 +701,8 @@ var WooksWf = class extends wooks.WooksAdapterBase {
 * await app.start('my-flow', { data: 'hello' })
 * ```
 */
-function createWfApp(opts, wooks$1) {
-	return new WooksWf(opts, wooks$1);
+function createWfApp(opts, wooks$2) {
+	return new WooksWf(opts, wooks$2);
 }
 
 //#endregion
@@ -738,7 +711,7 @@ exports.HandleStateStrategy = HandleStateStrategy;
 Object.defineProperty(exports, 'StepRetriableError', {
   enumerable: true,
   get: function () {
-    return __prostojs_wf.StepRetriableError;
+    return _prostojs_wf.StepRetriableError;
   }
 });
 exports.WfStateStoreMemory = WfStateStoreMemory;
@@ -757,13 +730,13 @@ exports.resumeWfContext = resumeWfContext;
 Object.defineProperty(exports, 'useLogger', {
   enumerable: true,
   get: function () {
-    return __wooksjs_event_core.useLogger;
+    return _wooksjs_event_core.useLogger;
   }
 });
 Object.defineProperty(exports, 'useRouteParams', {
   enumerable: true,
   get: function () {
-    return __wooksjs_event_core.useRouteParams;
+    return _wooksjs_event_core.useRouteParams;
   }
 });
 exports.useWfFinished = useWfFinished;

package/dist/index.mjs

@@ -149,10 +149,10 @@ async function handleWfOutletRequest(config, deps) {
 		const strategy = resolveStrategy(wfid ?? "");
 		ctx.set(stateStrategyKey, strategy);
 		const state = await strategy.consume(token);
-		if (!state) return {
-			error: "Invalid or expired workflow state",
-			status: 400
-		};
+		if (!state) {
+			response.setStatus(410);
+			return { error: "Invalid or expired workflow state" };
+		}
 		if (state.schemaId !== (wfid ?? "")) {
 			const realStrategy = resolveStrategy(state.schemaId);
 			ctx.set(stateStrategyKey, realStrategy);
@@ -162,14 +162,14 @@ async function handleWfOutletRequest(config, deps) {
 			eventContext: ctx
 		});
 	} else if (wfid) {
-		if (config.allow?.length && !config.allow.includes(wfid)) return {
-			error: `Workflow '${wfid}' is not allowed`,
-			status: 403
-		};
-		if (config.block?.includes(wfid)) return {
-			error: `Workflow '${wfid}' is blocked`,
-			status: 403
-		};
+		if (config.allow?.length && !config.allow.includes(wfid)) {
+			response.setStatus(403);
+			return { error: `Workflow '${wfid}' is not allowed` };
+		}
+		if (config.block?.includes(wfid)) {
+			response.setStatus(403);
+			return { error: `Workflow '${wfid}' is blocked` };
+		}
 		const strategy = resolveStrategy(wfid);
 		ctx.set(stateStrategyKey, strategy);
 		const initialContext = config.initialContext ? config.initialContext(body, wfid) : {};
@@ -177,10 +177,10 @@ async function handleWfOutletRequest(config, deps) {
 			input,
 			eventContext: ctx
 		});
-	} else return {
-		error: "Missing wfs (state token) or wfid (workflow ID)",
-		status: 400
-	};
+	} else {
+		response.setStatus(400);
+		return { error: "Missing wfs (state token) or wfid (workflow ID)" };
+	}
 	if (output.finished) {
 		if (config.onFinished) return config.onFinished({
 			context: output.state.context,
@@ -189,19 +189,23 @@ async function handleWfOutletRequest(config, deps) {
 		const finished = ctx.get(wfFinishedKey);
 		if (finished?.cookies) for (const [name, cookie] of Object.entries(finished.cookies)) response.setCookie(name, cookie.value, cookie.options);
 		if (finished?.type === "redirect") {
+			response.setStatus(finished.status ?? 302);
 			response.setHeader("location", finished.value);
-			return { status: finished.status ?? 302 };
+			return "";
+		}
+		if (finished) {
+			if (finished.status) response.setStatus(finished.status);
+			return finished.value;
 		}
-		if (finished) return finished.value;
 		return { finished: true };
 	}
 	if (output.inputRequired) {
 		const outletReq = output.inputRequired;
 		const outletHandler = registry.get(outletReq.outlet);
-		if (!outletHandler) return {
-			error: `Unknown outlet: '${outletReq.outlet}'`,
-			status: 500
-		};
+		if (!outletHandler) {
+			response.setStatus(500);
+			return { error: `Unknown outlet: '${outletReq.outlet}'` };
+		}
 		const strategy = ctx.get(stateStrategyKey);
 		const stateWithMeta = {
 			...output.state,
@@ -247,11 +251,10 @@ function createHttpOutlet(opts) {
 		name: "http",
 		tokenDelivery: "caller",
 		async deliver(request, _token) {
-			const body = opts?.transform ? opts.transform(request.payload, request.context) : typeof request.payload === "object" && request.payload !== null ? {
+			return { response: opts?.transform ? opts.transform(request.payload, request.context) : typeof request.payload === "object" && request.payload !== null ? {
 				...request.payload,
 				...request.context
-			} : request.payload;
-			return { response: body };
+			} : request.payload };
 		}
 	};
 }
@@ -536,8 +539,7 @@ var WooksWorkflow = class extends Workflow {
 				return found.handlers[0]();
 			}
 		} catch {
-			const router = this.wooks.getRouter();
-			const found = router.lookup("WF_STEP", stepIdNorm);
+			const found = this.wooks.getRouter().lookup("WF_STEP", stepIdNorm);
 			if (found?.route?.handlers.length) return found.route.handlers[0]();
 		}
 		throw new Error(`Step "${stepIdNorm}" not found.`);
@@ -553,9 +555,6 @@ const wfShortcuts = {
 };
 /** Wooks adapter for defining and executing workflow schemas with step-based routing. */
 var WooksWf = class extends WooksAdapterBase {
-	logger;
-	wf;
-	eventContextOptions;
 	constructor(opts, wooks) {
 		super(wooks, opts?.logger, opts?.router);
 		this.opts = opts;
@@ -619,19 +618,16 @@ var WooksWf = class extends WooksAdapterBase {
 	async _start(schemaId, inputContext, indexes, opts, parentCtx) {
 		const { input, spy, cleanup } = opts ?? {};
 		const resume = !!indexes?.length;
-		const factory = resume ? resumeWfContext : createWfContext;
-		const ctxOptions = parentCtx ? {
+		return (resume ? resumeWfContext : createWfContext)(parentCtx ? {
 			...this.eventContextOptions,
 			parent: parentCtx
-		} : this.eventContextOptions;
-		const seeds = {
+		} : this.eventContextOptions, {
 			inputContext,
 			schemaId,
 			stepId: null,
 			indexes,
 			input
-		};
-		return factory(ctxOptions, seeds, async () => {
+		}, async () => {
 			const { handlers: foundHandlers } = this.wooks.lookup("WF_FLOW", `/${schemaId}`.replace(/^\/+/u, "/"));
 			const handlers = foundHandlers || this.opts?.onNotFound && [this.opts.onNotFound] || null;
 			if (handlers && handlers.length > 0) {
@@ -641,8 +637,7 @@ var WooksWf = class extends WooksAdapterBase {
 					if (spy) spy(...args);
 					if (firstStep && args[0] === "step") {
 						firstStep = false;
-						const ctx = current();
-						ctx.set(wfKind.keys.input, void 0);
+						current().set(wfKind.keys.input, void 0);
 					}
 				};
 				try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wooksjs/event-wf",
-  "version": "0.7.10",
+  "version": "0.7.12",
   "description": "@wooksjs/event-wf",
   "keywords": [
     "app",
@@ -42,17 +42,17 @@
   "devDependencies": {
     "typescript": "^5.9.3",
     "vitest": "^3.2.4",
-    "@wooksjs/event-http": "^0.7.10",
-    "@wooksjs/event-core": "^0.7.10",
-    "wooks": "^0.7.10",
-    "@wooksjs/http-body": "^0.7.10"
+    "@wooksjs/event-core": "^0.7.12",
+    "@wooksjs/event-http": "^0.7.12",
+    "@wooksjs/http-body": "^0.7.12",
+    "wooks": "^0.7.12"
   },
   "peerDependencies": {
     "@prostojs/logger": "^0.4.3",
-    "@wooksjs/event-core": "^0.7.10",
-    "@wooksjs/event-http": "^0.7.10",
-    "@wooksjs/http-body": "^0.7.10",
-    "wooks": "^0.7.10"
+    "@wooksjs/event-core": "^0.7.12",
+    "@wooksjs/http-body": "^0.7.12",
+    "wooks": "^0.7.12",
+    "@wooksjs/event-http": "^0.7.12"
   },
   "peerDependenciesMeta": {
     "@wooksjs/event-http": {