@cadenza.io/service 1.27.4 → 1.27.6

package/dist/index.js

@@ -419,6 +419,7 @@ var ServiceRegistry = class _ServiceRegistry {
         const { serviceName } = ctx;
         let remoteSignals = this.remoteSignals.get(serviceName) ?? [];
         remoteSignals = remoteSignals.concat(this.remoteSignals.get("*") ?? []);
+        console.log("remote signals", remoteSignals);
         return {
           remoteSignals,
           ...ctx
@@ -3630,8 +3631,7 @@ var DatabaseController = class _DatabaseController {
     for (const [key, value] of Object.entries(data)) {
       if (typeof value === "object" && value !== null && "subOperation" in value) {
         const subOp = value;
-        const subResult = await this.executeSubOperation(subOp);
-        resolved[key] = subResult[subOp.return || "uuid"] ?? subResult;
+        resolved[key] = await this.executeSubOperation(subOp);
       } else if (typeof value === "string" && ["increment", "decrement", "set"].includes(value)) {
         resolved[key] = { __effect: value };
       } else if (typeof value === "object") {
@@ -3662,22 +3662,15 @@ var DatabaseController = class _DatabaseController {
           resolvedData
         ).map((_, i) => `$${i + 1}`).join(", ")}) ON CONFLICT DO NOTHING RETURNING ${op.return ?? "*"}`;
         result = await client.query(sql, Object.values(resolvedData));
-        console.log(
-          "sub operation",
-          sql,
-          Object.values(resolvedData),
-          result,
-          op.return
-        );
-        result = result.rows[0];
+        result = result.rows[0]?.[op.return ?? "uuid"];
         if (!result) {
-          result = resolvedData.uuid ? { uuid: resolvedData.uuid } : void 0;
+          result = op.return && op.return in resolvedData ? resolvedData[op.return] : resolvedData["uuid"];
         }
       } else if (op.subOperation === "query") {
         const params = [];
         const whereClause = this.buildWhereClause(op.filter || {}, params);
         const sql = `SELECT ${op.fields?.join(", ") || "*"} FROM ${op.table} ${whereClause} LIMIT 1`;
-        result = (await client.query(sql, params)).rows[0];
+        result = (await client.query(sql, params)).rows[0]?.[op.return ?? "uuid"];
       }
       await client.query("COMMIT");
       return result || {};
@@ -4039,10 +4032,11 @@ var GraphSyncController = class _GraphSyncController {
       function* (ctx) {
         const task = ctx.task;
         if (task.hidden || !task.register) return;
-        for (const signal of task.signalsToEmitAfter) {
-          if (task.registeredSignals.has(signal)) continue;
+        for (const signal of task.emitsSignals) {
           const _signal = signal.split(":")[0];
+          if (task.registeredSignals.has(_signal)) continue;
           const { isMeta, sourceServiceName, domain, action } = decomposeSignalName(_signal);
+          const isOnFail = task.signalsToEmitOnFail.has(signal);
           yield {
             data: {
               signalName: {
@@ -4060,34 +4054,8 @@ var GraphSyncController = class _GraphSyncController {
               },
               taskName: task.name,
               taskVersion: task.version,
-              serviceName: CadenzaService.serviceRegistry.serviceName
-            },
-            signalName: signal,
-            __name: task.name
-          };
-        }
-        for (const signal of task.signalsToEmitOnFail) {
-          if (task.registeredSignals.has(signal)) continue;
-          const { isMeta, sourceServiceName, domain, action } = decomposeSignalName(signal);
-          yield {
-            data: {
-              signalName: {
-                subOperation: "insert",
-                table: "signal_registry",
-                data: {
-                  name: signal,
-                  service_name: CadenzaService.serviceRegistry.serviceName,
-                  is_meta: isMeta,
-                  source_service_name: sourceServiceName,
-                  domain,
-                  action
-                },
-                return: "name"
-              },
-              taskName: task.name,
-              taskVersion: task.version,
               serviceName: CadenzaService.serviceRegistry.serviceName,
-              isOnFail: true
+              isOnFail
             },
             signalName: signal,
             __name: task.name