@cadenza.io/core 3.13.1 → 3.13.3

package/README.md

@@ -123,7 +123,7 @@ Cadenza.createTask('My task', (ctx) => {
 }).emits('meta.some.event');
 
 Cadenza.createMetaTask('My meta task', (ctx) => {
-  console.log(ctx.__task.name);
+  console.log(ctx.task.name);
   return true;
 })
   .doOn('meta.some.event')

package/dist/index.d.mts

@@ -937,7 +937,7 @@ declare class Task extends SignalEmitter implements Graph {
      * @return {this} The current task instance for method chaining.
      * @throws {Error} Throws an error if adding a predecessor creates a cycle in the task structure.
      */
-    doAfter(...tasks: Task[]): this;
+    doAfter(...tasks: (Task | undefined)[]): this;
     /**
      * Adds a sequence of tasks as successors to the current task, ensuring no cyclic dependencies are introduced.
      * Metrics are emitted when a relationship is successfully added.
@@ -946,7 +946,7 @@ declare class Task extends SignalEmitter implements Graph {
      * @return {this} Returns the current task instance for method chaining.
      * @throws {Error} Throws an error if adding a task causes a cyclic dependency.
      */
-    then(...tasks: Task[]): this;
+    then(...tasks: (Task | undefined)[]): this;
     /**
      * Decouples the current task from the provided task by removing mutual references.
      *

package/dist/index.d.ts

@@ -937,7 +937,7 @@ declare class Task extends SignalEmitter implements Graph {
      * @return {this} The current task instance for method chaining.
      * @throws {Error} Throws an error if adding a predecessor creates a cycle in the task structure.
      */
-    doAfter(...tasks: Task[]): this;
+    doAfter(...tasks: (Task | undefined)[]): this;
     /**
      * Adds a sequence of tasks as successors to the current task, ensuring no cyclic dependencies are introduced.
      * Metrics are emitted when a relationship is successfully added.
@@ -946,7 +946,7 @@ declare class Task extends SignalEmitter implements Graph {
      * @return {this} Returns the current task instance for method chaining.
      * @throws {Error} Throws an error if adding a task causes a cyclic dependency.
      */
-    then(...tasks: Task[]): this;
+    then(...tasks: (Task | undefined)[]): this;
     /**
      * Decouples the current task from the provided task by removing mutual references.
      *

package/dist/index.js

@@ -50,7 +50,7 @@ function deepCloneFilter(input, filterOut = () => false) {
     const currentTarget = key !== void 0 ? target[key] : target;
     if (
       // TODO Should probably not be done like this...
-      key === "__taskInstance" || key === "__routineInstance" || key === "__task" || key === "__routine" || key === "__tasks" || key === "__routines" || key === "__httpServer" || key === "__httpsServer" || key === "__socketServer"
+      key === "taskInstance" || key === "routineInstance" || key === "task" || key === "routine" || key === "tasks" || key === "routines" || key === "httpServer" || key === "httpsServer"
     ) {
       target[key] = source;
       continue;
@@ -170,15 +170,15 @@ var SignalBroker = class _SignalBroker {
         }
       }));
       return {
-        __signals: processedSignals,
+        signals: processedSignals,
         ...ctx
       };
     });
     this.registerSignalTask = Cadenza.createMetaTask(
       "Register signal",
       (ctx) => {
-        const { __signalName } = ctx;
-        this.signalObservers.get(__signalName).registered = true;
+        const { signalName } = ctx;
+        this.signalObservers.get(signalName).registered = true;
       }
     ).doOn("meta.signal.registered");
   }
@@ -444,7 +444,7 @@ var SignalBroker = class _SignalBroker {
           return;
         }
       }
-      this.emit("meta.signal_broker.added", { __signalName: _signal });
+      this.emit("meta.signal_broker.added", { signalName: _signal });
     }
   }
   /**
@@ -1862,7 +1862,7 @@ var GraphRoutine = class extends SignalEmitter {
         description: this.description,
         isMeta: this.isMeta
       },
-      __routineInstance: this
+      routineInstance: this
     });
     tasks.forEach((t) => {
       this.tasks.add(t);
@@ -2109,7 +2109,7 @@ var Task = class _Task extends SignalEmitter {
           // inputContextSchemaId: this.inputContextSchema,
           // outputContextSchemaId: this.outputContextSchema,
         },
-        __taskInstance: this,
+        taskInstance: this,
         __isSubMeta: this.isSubMeta
       });
     }
@@ -2420,6 +2420,7 @@ var Task = class _Task extends SignalEmitter {
    */
   doAfter(...tasks) {
     for (const pred of tasks) {
+      if (!pred) continue;
       if (this.predecessorTasks.has(pred)) continue;
       pred.nextTasks.add(this);
       this.predecessorTasks.add(pred);
@@ -2450,6 +2451,7 @@ var Task = class _Task extends SignalEmitter {
    */
   then(...tasks) {
     for (const next of tasks) {
+      if (!next) continue;
       if (this.nextTasks.has(next)) continue;
       this.nextTasks.add(next);
       next.predecessorTasks.add(this);
@@ -2908,11 +2910,11 @@ var GraphRegistry = class _GraphRegistry {
     this.registerTask = new Task(
       "Register task",
       (context) => {
-        const { __taskInstance } = context;
-        if (__taskInstance && !this.tasks.has(__taskInstance.name)) {
-          this.tasks.set(__taskInstance.name, __taskInstance);
+        const { taskInstance } = context;
+        if (taskInstance && !this.tasks.has(taskInstance.name)) {
+          this.tasks.set(taskInstance.name, taskInstance);
         }
-        delete context.__taskInstance;
+        delete context.taskInstance;
         return true;
       },
       "Registers tasks. Seed for meta.taskCreated",
@@ -2951,7 +2953,7 @@ var GraphRegistry = class _GraphRegistry {
         const { __name } = context;
         for (const task of this.tasks.values()) {
           if (task.name === __name) {
-            return { ...context, __task: task };
+            return { ...context, task };
           }
         }
         return false;
@@ -2965,13 +2967,13 @@ var GraphRegistry = class _GraphRegistry {
         const layerTasks = Array.from(this.tasks.values()).filter(
           (task) => task.layerIndex === __layerIndex
         );
-        return { ...context, __tasks: layerTasks };
+        return { ...context, tasks: layerTasks };
       },
       "Gets tasks by layer index."
     );
     this.getAllTasks = Cadenza.createMetaTask(
       "Get all tasks",
-      (context) => ({ ...context, __tasks: Array.from(this.tasks.values()) }),
+      (context) => ({ ...context, tasks: Array.from(this.tasks.values()) }),
       // Use arrow to capture this
       "Gets all tasks."
     );
@@ -2979,7 +2981,7 @@ var GraphRegistry = class _GraphRegistry {
       "Do for each task",
       function* (context) {
         for (const task of this.tasks.values()) {
-          yield { ...context, __task: task };
+          yield { ...context, task };
         }
       }.bind(this),
       // Bind to capture this in generator
@@ -2997,11 +2999,11 @@ var GraphRegistry = class _GraphRegistry {
     this.registerRoutine = Cadenza.createMetaTask(
       "Register routine",
       (context) => {
-        const { __routineInstance } = context;
-        if (__routineInstance && !this.routines.has(__routineInstance.name)) {
-          this.routines.set(__routineInstance.name, __routineInstance);
+        const { routineInstance } = context;
+        if (routineInstance && !this.routines.has(routineInstance.name)) {
+          this.routines.set(routineInstance.name, routineInstance);
         }
-        delete context.__routineInstance;
+        delete context.routineInstance;
         return true;
       },
       "Registers routine."
@@ -3012,7 +3014,7 @@ var GraphRegistry = class _GraphRegistry {
         const { __name } = context;
         for (const routine of this.routines.values()) {
           if (routine.name === __name) {
-            return { ...context, __routine: routine };
+            return { ...context, routine };
           }
         }
         return false;
@@ -3023,7 +3025,7 @@ var GraphRegistry = class _GraphRegistry {
       "Get all routines",
       (context) => ({
         ...context,
-        __routines: Array.from(this.routines.values())
+        routines: Array.from(this.routines.values())
       }),
       // Use arrow to capture this
       "Gets all routines."
@@ -3032,7 +3034,7 @@ var GraphRegistry = class _GraphRegistry {
       "Do for each routine",
       function* (context) {
         for (const routine of this.routines.values()) {
-          yield { ...context, __routine: routine };
+          yield { ...context, routine };
         }
       }.bind(this),
       "Yields each routine."
@@ -3239,10 +3241,10 @@ var GraphRunner = class extends SignalEmitter {
   }
   // TODO This should not live here. This is deputy related.
   startRun(context, emit) {
-    if (context.__task || context.__routine) {
-      const routine = context.__task ?? context.__routine;
-      delete context.__task;
-      delete context.__routine;
+    if (context.task || context.routine) {
+      const routine = context.task ?? context.routine;
+      delete context.task;
+      delete context.routine;
       context.__routineExecId = context.__metadata?.__deputyExecId ?? null;
       context.__isDeputy = true;
       this.run(routine, context);