@atscript/moost-wf 0.1.70 → 0.1.72

package/dist/index.d.mts

@@ -35,38 +35,6 @@ declare function extractPassContext(type: TAtscriptAnnotatedType, wfContext: Rec
  */
 declare function getFormActions(type: TAtscriptAnnotatedType): TFormActions;
 //#endregion
-//#region src/wf-io/use-wf-action-slot.d.ts
-/**
- * Low-level accessor for the workflow action slot in the current wf event context.
- *
- * Used by:
- * - Transport adapters (HTTP / CLI / WS controllers) to **write** the action
- *   from the incoming request (`useWfActionSlot().setAction(body.action)`).
- * - Composable helpers that need to **read + clear** the slot atomically
- *   (e.g. one-shot action consumption patterns).
- *
- * In step handlers, prefer `useAtscriptWf(Type).resolveAction()` — it reads
- * the same slot but validates the value against the schema's
- * `@ui.form.action` / `@wf.action.withData` declarations and throws
- * `StepRetriableError` on unknown actions.
- *
- * **In a transport adapter** (to set the action from the request body):
- * ```ts
- * const { setAction } = useWfActionSlot()
- * setAction(body.action)
- * ```
- *
- * **In step handlers** (raw read — prefer `@WfAction()` / `useAtscriptWf().resolveAction()`):
- * ```ts
- * const { getAction } = useWfActionSlot()
- * const action = getAction()
- * ```
- */
-declare function useWfActionSlot(): {
-  getAction: () => string | undefined;
-  setAction: (action: string | undefined) => void;
-};
-//#endregion
 //#region src/wf-io/use-atscript-wf.d.ts
 /**
  * Schema-driven workflow I/O primitives for atscript types. Returned helpers
@@ -127,26 +95,29 @@ declare function WfInput(opts?: {
 //#endregion
 //#region src/wf-io/wf-action.decorator.d.ts
 /**
- * Parameter decorator that resolves to the current workflow action name.
+ * Parameter decorator — sugar for `useAtscriptWf(Type).resolveAction()`.
+ *
+ * Resolves to the current workflow action name from the input envelope, or
+ * `undefined` when no action was submitted.
  *
- * If the parameter is annotated with an atscript type, the action is
- * validated against the type's `@ui.form.action` / `@wf.action.withData`
- * declarations — unknown actions throw `StepRetriableError`. When no
- * annotated type is available the action is returned raw (or `undefined`).
+ * The form type is **required**: the decorator validates the action against
+ * the form's declared `@ui.form.action` / `@wf.action.withData` whitelist and
+ * throws `StepRetriableError` for any unknown action — the step body never
+ * sees actions that aren't part of the form's contract.
  *
  * @example
  * ```ts
  * @Step('mfa-verify')
  * async mfaVerify(
  *   @WfInput() input: PincodeForm,
- *   @WfAction() action: string | undefined,
+ *   @WfAction(PincodeForm) action: string | undefined,
  * ) {
  *   if (action === 'resend') return this.sendOtp()
  *   await this.verifyCode(input.code)
  * }
  * ```
  */
-declare function WfAction(): ParameterDecorator;
+declare function WfAction<T extends TAtscriptTypeDef>(type: TAtscriptAnnotatedType<T>): ParameterDecorator;
 //#endregion
 //#region src/outlet.d.ts
 /**
@@ -253,4 +224,4 @@ declare function finishWf<T = unknown>(opts?: FinishWfOpts<T>): void;
  */
 declare function abortWf(reason: string, opts?: FinishWfOpts): void;
 //#endregion
-export { type FinishWfOpts, WfAction, type WfActionRequest, type WfButton, type WfFinished, WfInput, type WfMessage, type WfNext, abortWf, createAsHttpOutlet, extractPassContext, finishWf, getFormActions, handleAsOutletRequest, isWfFinished, serializeFormSchema, useAtscriptWf, useWfActionSlot };
+export { type FinishWfOpts, WfAction, type WfActionRequest, type WfButton, type WfFinished, WfInput, type WfMessage, type WfNext, abortWf, createAsHttpOutlet, extractPassContext, finishWf, getFormActions, handleAsOutletRequest, isWfFinished, serializeFormSchema, useAtscriptWf };

package/dist/index.mjs

@@ -1,5 +1,4 @@
 import { isAnnotatedType, serializeAnnotatedType } from "@atscript/typescript/utils";
-import { current, key } from "@wooksjs/event-core";
 import { createHttpOutlet, handleWfOutletRequest, useWfState } from "@moostjs/event-wf";
 import { StepRetriableError, useWfFinished } from "@wooksjs/event-wf";
 import { Optional, Resolve } from "moost";
@@ -84,51 +83,6 @@ function serializeFormSchema(type) {
 	return schema;
 }
 //#endregion
-//#region src/wf-io/wf-keys.ts
-/**
-* Internal event context key for the workflow action name.
-*
-* Not exported from the package barrel — HTTP triggers should call
-* `useWfActionSlot().setAction(body.action)` before `wf.resume()`, and step
-* handlers should read via `@WfAction()` or `useAtscriptWf()`.
-*/
-const actionKey = key("wf.action");
-//#endregion
-//#region src/wf-io/use-wf-action-slot.ts
-/**
-* Low-level accessor for the workflow action slot in the current wf event context.
-*
-* Used by:
-* - Transport adapters (HTTP / CLI / WS controllers) to **write** the action
-*   from the incoming request (`useWfActionSlot().setAction(body.action)`).
-* - Composable helpers that need to **read + clear** the slot atomically
-*   (e.g. one-shot action consumption patterns).
-*
-* In step handlers, prefer `useAtscriptWf(Type).resolveAction()` — it reads
-* the same slot but validates the value against the schema's
-* `@ui.form.action` / `@wf.action.withData` declarations and throws
-* `StepRetriableError` on unknown actions.
-*
-* **In a transport adapter** (to set the action from the request body):
-* ```ts
-* const { setAction } = useWfActionSlot()
-* setAction(body.action)
-* ```
-*
-* **In step handlers** (raw read — prefer `@WfAction()` / `useAtscriptWf().resolveAction()`):
-* ```ts
-* const { getAction } = useWfActionSlot()
-* const action = getAction()
-* ```
-*/
-function useWfActionSlot() {
-	const ctx = current();
-	return {
-		getAction: () => ctx.has(actionKey) ? ctx.get(actionKey) : void 0,
-		setAction: (action) => ctx.set(actionKey, action)
-	};
-}
-//#endregion
 //#region src/wf-io/validator-cache.ts
 const cache = /* @__PURE__ */ new WeakMap();
 /**
@@ -163,7 +117,6 @@ function isValidatorError(err) {
 }
 function useAtscriptWf(type) {
 	const wfState = useWfState();
-	const wfAction = useWfActionSlot();
 	function requireInput({ errors, formMessage } = {}) {
 		const passContext = extractPassContext(type, wfState.ctx() ?? {});
 		const mergedErrors = errors ? { ...errors } : formMessage ? {} : void 0;
@@ -188,7 +141,7 @@ function useAtscriptWf(type) {
 		}
 	}
 	function resolveInput(opts) {
-		const input = wfState.input();
+		const input = wfState.input()?.formData;
 		if (input === void 0) throw requireInput();
 		validateOrThrow(input, opts?.partial === "deep" ? {
 			partial: "deep",
@@ -197,7 +150,7 @@ function useAtscriptWf(type) {
 		return input;
 	}
 	function resolveAction() {
-		const action = wfAction.getAction();
+		const action = wfState.input()?.action;
 		if (action === void 0) return void 0;
 		const { actions, actionsWithData } = getFormActions(type);
 		if (!actions.includes(action) && !actionsWithData.includes(action)) throw requireInput({ formMessage: `Action "${action}" is not supported` });
@@ -241,7 +194,7 @@ function WfInput(opts) {
 			const pass = opts?.pass === true;
 			const action = wf.resolveAction();
 			if (action) {
-				const wfInput = useWfState().input();
+				const wfInput = useWfState().input()?.formData;
 				const { actions, actionsWithData } = getFormActions(type);
 				const isNoData = actions.includes(action);
 				const isWithData = actionsWithData.includes(action);
@@ -263,33 +216,32 @@ function WfInput(opts) {
 //#endregion
 //#region src/wf-io/wf-action.decorator.ts
 /**
-* Parameter decorator that resolves to the current workflow action name.
+* Parameter decorator — sugar for `useAtscriptWf(Type).resolveAction()`.
+*
+* Resolves to the current workflow action name from the input envelope, or
+* `undefined` when no action was submitted.
 *
-* If the parameter is annotated with an atscript type, the action is
-* validated against the type's `@ui.form.action` / `@wf.action.withData`
-* declarations — unknown actions throw `StepRetriableError`. When no
-* annotated type is available the action is returned raw (or `undefined`).
+* The form type is **required**: the decorator validates the action against
+* the form's declared `@ui.form.action` / `@wf.action.withData` whitelist and
+* throws `StepRetriableError` for any unknown action — the step body never
+* sees actions that aren't part of the form's contract.
 *
 * @example
 * ```ts
 * @Step('mfa-verify')
 * async mfaVerify(
 *   @WfInput() input: PincodeForm,
-*   @WfAction() action: string | undefined,
+*   @WfAction(PincodeForm) action: string | undefined,
 * ) {
 *   if (action === 'resend') return this.sendOtp()
 *   await this.verifyCode(input.code)
 * }
 * ```
 */
-function WfAction() {
+function WfAction(type) {
 	return (target, key, index) => {
 		if (typeof index !== "number") return;
-		Resolve((metas) => {
-			const type = metas?.targetMeta?.type;
-			if (type && isAnnotatedType(type)) return useAtscriptWf(type).resolveAction();
-			return useWfActionSlot().getAction();
-		}, "WfAction")(target, key, index);
+		Resolve(() => useAtscriptWf(type).resolveAction(), "WfAction")(target, key, index);
 	};
 }
 //#endregion
@@ -420,4 +372,4 @@ function abortWf(reason, opts) {
 	});
 }
 //#endregion
-export { WfAction, WfInput, abortWf, createAsHttpOutlet, extractPassContext, finishWf, getFormActions, handleAsOutletRequest, isWfFinished, serializeFormSchema, useAtscriptWf, useWfActionSlot };
+export { WfAction, WfInput, abortWf, createAsHttpOutlet, extractPassContext, finishWf, getFormActions, handleAsOutletRequest, isWfFinished, serializeFormSchema, useAtscriptWf };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/moost-wf",
-  "version": "0.1.70",
+  "version": "0.1.72",
   "description": "Workflow form integration for moost — decorators, interceptors, and serialization driven by atscript type metadata",
   "keywords": [
     "atscript",
@@ -51,26 +51,26 @@
     "access": "public"
   },
   "devDependencies": {
-    "@atscript/core": "^0.1.58",
-    "@atscript/db": "^0.1.82",
-    "@atscript/db-sqlite": "^0.1.82",
-    "@atscript/typescript": "^0.1.58",
-    "@moostjs/event-wf": "^0.6.14",
+    "@atscript/core": "^0.1.59",
+    "@atscript/db": "^0.1.83",
+    "@atscript/db-sqlite": "^0.1.83",
+    "@atscript/typescript": "^0.1.59",
+    "@moostjs/event-wf": "^0.6.15",
     "@prostojs/wf": "^0.1.1",
     "@wooksjs/event-core": "^0.7.13",
     "@wooksjs/event-wf": "^0.7.13",
-    "moost": "^0.6.14",
-    "unplugin-atscript": "^0.1.58",
+    "moost": "^0.6.15",
+    "unplugin-atscript": "^0.1.59",
     "vitest": "npm:@voidzero-dev/vite-plus-test@0.1.14",
-    "@atscript/ui": "^0.1.70"
+    "@atscript/ui": "^0.1.72"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.1.58",
-    "@atscript/typescript": "^0.1.58",
-    "@moostjs/event-wf": "^0.6.14",
+    "@atscript/core": "^0.1.59",
+    "@atscript/typescript": "^0.1.59",
+    "@moostjs/event-wf": "^0.6.15",
     "@wooksjs/event-core": "^0.7.13",
     "@wooksjs/event-wf": "^0.7.13",
-    "moost": "^0.6.14"
+    "moost": "^0.6.15"
   },
   "scripts": {
     "build": "vp pack",