duron 0.3.0-beta.3 → 0.3.0-beta.4

package/dist/step-manager.d.ts

@@ -40,7 +40,7 @@ export declare class StepManager {
     #private;
     constructor(options: StepManagerOptions);
     setJobSpan(span: Span): void;
-    setRunFn(runFn: StepHandlerContext['run']): void;
+    setRunFnFactory(factory: (parentStepId: string | null, abortSignal: AbortSignal) => StepHandlerContext['run']): void;
     createActionContext<TInput extends z.ZodObject, TOutput extends z.ZodObject, TVariables = Record<string, unknown>>(job: {
         id: string;
         input: z.infer<TInput>;

package/dist/step-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"step-manager.d.ts","sourceRoot":"","sources":["../src/step-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAE5B,OAAO,EACL,KAAK,MAAM,EACX,KAAK,oBAAoB,EAGzB,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAEjB,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EAAE,OAAO,EAAgC,MAAM,uBAAuB,CAAA;AAClF,OAAO,EAAoE,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAWlH,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAIpF,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,EAAE,CAAC,GAAG,EAAE,kBAAkB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IAC7C,OAAO,EAAE,WAAW,CAAA;IACpB,WAAW,EAAE,WAAW,CAAA;IACxB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,QAAQ,EAAE,OAAO,CAAA;CAClB;AAMD,qBAAa,SAAS;;gBAYR,OAAO,EAAE,OAAO;IAoBtB,WAAW,CACf,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,YAAY,GAAE,MAAM,GAAG,IAAW,EAClC,QAAQ,GAAE,OAAe;;;;;;;;;;IAyBrB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;IAoB7F,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;CAG3E;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,gBAAgB,CAAA;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,gBAAgB,EAAE,MAAM,CAAA;CACzB;AAMD,qBAAa,WAAW;;gBAyBV,OAAO,EAAE,kBAAkB;IAmBvC,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAQ5B,QAAQ,CAAC,KAAK,EAAE,kBAAkB,CAAC,KAAK,CAAC,GAAG,IAAI;IAoBhD,mBAAmB,CAAC,MAAM,SAAS,CAAC,CAAC,SAAS,EAAE,OAAO,SAAS,CAAC,CAAC,SAAS,EAAE,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/G,GAAG,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,EAC9D,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,EAC3C,SAAS,EAAE,UAAU,EACrB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,cAAc,GAC7B,oBAAoB,CAAC,MAAM,EAAE,UAAU,CAAC;IAO3C,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc;IA6BlD,IAAI,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAQlC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAkT7B"}
+{"version":3,"file":"step-manager.d.ts","sourceRoot":"","sources":["../src/step-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAE5B,OAAO,EACL,KAAK,MAAM,EACX,KAAK,oBAAoB,EAGzB,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAEjB,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EAAE,OAAO,EAAgC,MAAM,uBAAuB,CAAA;AAClF,OAAO,EAAoE,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAWlH,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAIpF,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,EAAE,CAAC,GAAG,EAAE,kBAAkB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IAC7C,OAAO,EAAE,WAAW,CAAA;IACpB,WAAW,EAAE,WAAW,CAAA;IACxB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,QAAQ,EAAE,OAAO,CAAA;CAClB;AAMD,qBAAa,SAAS;;gBAYR,OAAO,EAAE,OAAO;IAoBtB,WAAW,CACf,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,YAAY,GAAE,MAAM,GAAG,IAAW,EAClC,QAAQ,GAAE,OAAe;;;;;;;;;;IAyBrB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;IAoB7F,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;CAG3E;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,EAAE,gBAAgB,CAAA;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,gBAAgB,EAAE,MAAM,CAAA;CACzB;AAMD,qBAAa,WAAW;;gBAyBV,OAAO,EAAE,kBAAkB;IAmBvC,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAU5B,eAAe,CAAC,OAAO,EAAE,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,EAAE,WAAW,EAAE,WAAW,KAAK,kBAAkB,CAAC,KAAK,CAAC,GAAG,IAAI;IAoBpH,mBAAmB,CAAC,MAAM,SAAS,CAAC,CAAC,SAAS,EAAE,OAAO,SAAS,CAAC,CAAC,SAAS,EAAE,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/G,GAAG,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,EAC9D,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,EAC3C,SAAS,EAAE,UAAU,EACrB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,cAAc,GAC7B,oBAAoB,CAAC,MAAM,EAAE,UAAU,CAAC;IAO3C,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc;IA6BlD,IAAI,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAQlC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAkT7B"}

package/dist/step-manager.js

@@ -50,7 +50,7 @@ export class StepManager {
     #historySteps = new Set();
     #stepSpans = new Map();
     #jobSpan = null;
-    #runFn = null;
+    #runFnFactory = null;
     constructor(options) {
         this.#jobId = options.jobId;
         this.#actionName = options.actionName;
@@ -68,8 +68,8 @@ export class StepManager {
     setJobSpan(span) {
         this.#jobSpan = span;
     }
-    setRunFn(runFn) {
-        this.#runFn = runFn;
+    setRunFnFactory(factory) {
+        this.#runFnFactory = factory;
     }
     createActionContext(job, action, variables, abortSignal, logger, observeContext) {
         return new ActionContext(this, job, action, variables, abortSignal, logger, observeContext);
@@ -181,7 +181,7 @@ export class StepManager {
                     });
                     return childPromise;
                 },
-                run: this.#runFn,
+                run: this.#runFnFactory(step.id, childSignal),
             };
             try {
                 const abortPromise = waitForAbort(stepSignal);
@@ -310,7 +310,9 @@ class ActionContext {
         this.#input = job.input ?? {};
         this.step = this.step.bind(this);
         this.run = this.run.bind(this);
-        this.#stepManager.setRunFn(this.run);
+        this.#stepManager.setRunFnFactory((parentStepId, abortSignal) => {
+            return (stepDef, input, options) => this.#runInternal(stepDef, input, options, parentStepId, abortSignal);
+        });
     }
     get input() {
         return this.#input;
@@ -345,6 +347,9 @@ class ActionContext {
         });
     }
     async run(stepDef, input, options = {}) {
+        return this.#runInternal(stepDef, input, options, null, this.#abortSignal);
+    }
+    async #runInternal(stepDef, input, options = {}, parentStepId, abortSignal) {
         const validatedInput = stepDef.input
             ? stepDef.input.parse(input, {
                 error: () => 'Error parsing step input',
@@ -367,7 +372,6 @@ class ActionContext {
                 var: this.#variables,
                 logger: this.#logger,
                 jobId: this.#jobId,
-                run: this.run.bind(this),
             };
             return stepDef.handler(extendedCtx);
         };
@@ -375,8 +379,8 @@ class ActionContext {
             name: stepName,
             cb: wrappedCb,
             options: parsedOptions,
-            abortSignal: this.#abortSignal,
-            parentStepId: null,
+            abortSignal,
+            parentStepId,
             parallel: parsedOptions.parallel,
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "duron",
-  "version": "0.3.0-beta.3",
+  "version": "0.3.0-beta.4",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

package/src/step-manager.ts

@@ -154,8 +154,8 @@ export class StepManager {
   #stepSpans = new Map<string, Span>()
   // Store the job span for creating step spans
   #jobSpan: Span | null = null
-  // Store the run function for executing step definitions from inline steps
-  #runFn: StepHandlerContext['run'] | null = null
+  // Factory function to create run functions with the correct parent step ID and abort signal
+  #runFnFactory: ((parentStepId: string | null, abortSignal: AbortSignal) => StepHandlerContext['run']) | null = null
 
   // ============================================================================
   // Constructor
@@ -190,11 +190,13 @@ export class StepManager {
   }
 
   /**
-   * Set the run function for executing step definitions from inline steps.
+   * Set the run function factory for executing step definitions from inline steps.
    * Called from ActionContext after it's initialized.
+   *
+   * @param factory - A function that creates run functions with the correct parent step ID and abort signal
    */
-  setRunFn(runFn: StepHandlerContext['run']): void {
-    this.#runFn = runFn
+  setRunFnFactory(factory: (parentStepId: string | null, abortSignal: AbortSignal) => StepHandlerContext['run']): void {
+    this.#runFnFactory = factory
   }
 
   // ============================================================================
@@ -436,7 +438,7 @@ export class StepManager {
 
           return childPromise
         },
-        run: this.#runFn!,
+        run: this.#runFnFactory!(step.id, childSignal),
       }
 
       try {
@@ -623,8 +625,10 @@ class ActionContext<TInput extends z.ZodObject, TOutput extends z.ZodObject, TVa
     this.#input = job.input ?? {}
     this.step = this.step.bind(this)
     this.run = this.run.bind(this)
-    // Set the run function on the step manager so inline steps can call step definitions
-    this.#stepManager.setRunFn(this.run)
+    // Set the run function factory so inline steps can call step definitions with correct parent
+    this.#stepManager.setRunFnFactory((parentStepId, abortSignal) => {
+      return (stepDef, input, options) => this.#runInternal(stepDef, input, options, parentStepId, abortSignal)
+    })
   }
 
   // ============================================================================
@@ -707,6 +711,7 @@ class ActionContext<TInput extends z.ZodObject, TOutput extends z.ZodObject, TVa
 
   /**
    * Execute a reusable step definition created with createStep().
+   * This is the public method called from action handlers.
    *
    * @param stepDef - The step definition to execute
    * @param input - The input data for the step (validated against the step's input schema)
@@ -717,6 +722,20 @@ class ActionContext<TInput extends z.ZodObject, TOutput extends z.ZodObject, TVa
     stepDef: StepDefinition<TStepInput, TResult, TVariables>,
     input: z.input<TStepInput>,
     options: Partial<z.input<typeof StepOptionsSchema>> = {},
+  ): Promise<TResult> {
+    return this.#runInternal(stepDef, input, options, null, this.#abortSignal)
+  }
+
+  /**
+   * Internal method to execute a step definition with explicit parent step ID and abort signal.
+   * Used by both the public run method and the run functions passed to step contexts.
+   */
+  async #runInternal<TStepInput extends z.ZodObject, TResult>(
+    stepDef: StepDefinition<TStepInput, TResult, TVariables>,
+    input: z.input<TStepInput>,
+    options: Partial<z.input<typeof StepOptionsSchema>> = {},
+    parentStepId: string | null,
+    abortSignal: AbortSignal,
   ): Promise<TResult> {
     // Validate input against the step's schema if provided
     // After parsing, validatedInput is z.output<TStepInput> (same as z.infer<TStepInput>)
@@ -749,7 +768,6 @@ class ActionContext<TInput extends z.ZodObject, TOutput extends z.ZodObject, TVa
         var: this.#variables,
         logger: this.#logger,
         jobId: this.#jobId,
-        run: this.run.bind(this), // Allow nested step definitions to call ctx.run()
       }
       return stepDef.handler(extendedCtx)
     }
@@ -758,8 +776,8 @@ class ActionContext<TInput extends z.ZodObject, TOutput extends z.ZodObject, TVa
       name: stepName,
       cb: wrappedCb,
       options: parsedOptions,
-      abortSignal: this.#abortSignal,
-      parentStepId: null, // Root steps have no parent
+      abortSignal,
+      parentStepId,
       parallel: parsedOptions.parallel,
     })
   }