@wooksjs/event-wf 0.4.20 → 0.4.22

package/dist/index.cjs

@@ -34,7 +34,7 @@ class WooksWorkflow extends wf.Workflow {
         this.wooks = wooks;
     }
     resolveStep(stepId) {
-        const stepIdNorm = '/' + stepId.replace(/\/\/+/g, '/');
+        const stepIdNorm = ('/' + stepId).replace(/\/\/+/g, '/');
         try {
             useWFContext();
             const found = this.wooks.lookup('WF_STEP', stepIdNorm);

package/dist/index.d.ts

@@ -86,10 +86,10 @@ declare function useWFContext<T extends TEmpty>(): {
     setStore: <K_2 extends "resume" | keyof _wooksjs_event_core.TGenericContextStore<TWFEventData> | keyof T>(key: K_2, v: (TWFContextStore & T & _wooksjs_event_core.TGenericContextStore<TWFEventData>)[K_2]) => void;
 };
 
-declare class WooksWorkflow<T> extends Workflow<T> {
+declare class WooksWorkflow<T, IR> extends Workflow<T, IR> {
     protected wooks: Wooks;
     constructor(wooks: Wooks);
-    protected resolveStep<I, D>(stepId: string): Step<T, I, D>;
+    protected resolveStep<I, IR>(stepId: string): Step<T, I, IR>;
 }
 
 declare const wfShortcuts: {
@@ -104,25 +104,25 @@ interface TWooksWfOptions {
     eventOptions?: TEventOptions;
     router?: TWooksOptions['router'];
 }
-declare class WooksWf<T> extends WooksAdapterBase {
+declare class WooksWf<T = any, IR = any> extends WooksAdapterBase {
     protected opts?: TWooksWfOptions | undefined;
     protected logger: TConsoleBase;
-    protected wf: WooksWorkflow<T>;
+    protected wf: WooksWorkflow<T, IR>;
     constructor(opts?: TWooksWfOptions | undefined, wooks?: Wooks | WooksAdapterBase);
-    attachSpy<I>(fn: TWorkflowSpy<T, I>): () => void;
-    detachSpy<I>(fn: TWorkflowSpy<T, I>): void;
-    step<I = any, D = any>(id: string, opts: {
-        input?: D;
-        handler: string | TStepHandler<T, I, D>;
+    attachSpy<I>(fn: TWorkflowSpy<T, I, IR>): () => void;
+    detachSpy<I>(fn: TWorkflowSpy<T, I, IR>): void;
+    step<I = any>(id: string, opts: {
+        input?: I;
+        handler: string | TStepHandler<T, I, IR>;
     }): _prostojs_router.TProstoRouterPathHandle<Record<string, string | string[]>>;
     flow(id: string, schema: TWorkflowSchema<T>, prefix?: string, init?: () => void | Promise<void>): _prostojs_router.TProstoRouterPathHandle<Record<string, string | string[]>>;
-    start<I>(schemaId: string, inputContext: T, input?: I, spy?: TWorkflowSpy<T, I>, cleanup?: () => void): Promise<TFlowOutput<T, I>>;
+    start<I>(schemaId: string, inputContext: T, input?: I, spy?: TWorkflowSpy<T, I, IR>, cleanup?: () => void): Promise<TFlowOutput<T, I, IR>>;
     resume<I>(state: {
         schemaId: string;
         indexes: number[];
         context: T;
-    }, input?: I, spy?: TWorkflowSpy<T, I>, cleanup?: () => void): Promise<TFlowOutput<T, I>>;
-    protected _start<I>(schemaId: string, inputContext: T, indexes?: number[], input?: I, spy?: TWorkflowSpy<T, I>, cleanup?: () => void): Promise<TFlowOutput<T, I>>;
+    }, input?: I, spy?: TWorkflowSpy<T, I, IR>, cleanup?: () => void): Promise<TFlowOutput<T, I, IR>>;
+    protected _start<I>(schemaId: string, inputContext: T, indexes?: number[], input?: I, spy?: TWorkflowSpy<T, I, IR>, cleanup?: () => void): Promise<TFlowOutput<T, I, IR>>;
     protected onError(e: Error): void;
     protected error(e: string | Error): void;
 }
@@ -132,7 +132,7 @@ declare class WooksWf<T> extends WooksAdapterBase {
  * @param wooks Wooks | WooksAdapterBase
  * @returns WooksWf
  */
-declare function createWfApp<T>(opts?: TWooksWfOptions, wooks?: Wooks | WooksAdapterBase): WooksWf<T>;
+declare function createWfApp<T>(opts?: TWooksWfOptions, wooks?: Wooks | WooksAdapterBase): WooksWf<T, any>;
 
 declare function useWfState(): {
     ctx: <T>() => T;

package/dist/index.mjs

@@ -32,7 +32,7 @@ class WooksWorkflow extends Workflow {
         this.wooks = wooks;
     }
     resolveStep(stepId) {
-        const stepIdNorm = '/' + stepId.replace(/\/\/+/g, '/');
+        const stepIdNorm = ('/' + stepId).replace(/\/\/+/g, '/');
         try {
             useWFContext();
             const found = this.wooks.lookup('WF_STEP', stepIdNorm);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wooksjs/event-wf",
-  "version": "0.4.20",
+  "version": "0.4.22",
   "description": "@wooksjs/event-wf",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -33,12 +33,12 @@
   "author": "Artem Maltsev",
   "license": "MIT",
   "peerDependencies": {
-    "wooks": "0.4.20",
-    "@wooksjs/event-core": "0.4.20"
+    "wooks": "0.4.22",
+    "@wooksjs/event-core": "0.4.22"
   },
   "dependencies": {
     "@prostojs/logger": "^0.4.0",
-    "@prostojs/wf": "^0.0.14"
+    "@prostojs/wf": "^0.0.15"
   },
   "bugs": {
     "url": "https://github.com/wooksjs/wooksjs/issues"