@cadenza.io/core 3.13.1 → 3.13.3

package/dist/index.mjs

@@ -13,7 +13,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;
@@ -133,15 +133,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");
   }
@@ -407,7 +407,7 @@ var SignalBroker = class _SignalBroker {
           return;
         }
       }
-      this.emit("meta.signal_broker.added", { __signalName: _signal });
+      this.emit("meta.signal_broker.added", { signalName: _signal });
     }
   }
   /**
@@ -1825,7 +1825,7 @@ var GraphRoutine = class extends SignalEmitter {
         description: this.description,
         isMeta: this.isMeta
       },
-      __routineInstance: this
+      routineInstance: this
     });
     tasks.forEach((t) => {
       this.tasks.add(t);
@@ -2072,7 +2072,7 @@ var Task = class _Task extends SignalEmitter {
           // inputContextSchemaId: this.inputContextSchema,
           // outputContextSchemaId: this.outputContextSchema,
         },
-        __taskInstance: this,
+        taskInstance: this,
         __isSubMeta: this.isSubMeta
       });
     }
@@ -2383,6 +2383,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);
@@ -2413,6 +2414,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);
@@ -2871,11 +2873,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",
@@ -2914,7 +2916,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;
@@ -2928,13 +2930,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."
     );
@@ -2942,7 +2944,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
@@ -2960,11 +2962,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."
@@ -2975,7 +2977,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;
@@ -2986,7 +2988,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."
@@ -2995,7 +2997,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."
@@ -3202,10 +3204,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);