@cadenza.io/service 2.17.9 → 2.17.11

package/dist/index.d.mts

@@ -23120,6 +23120,7 @@ declare class DatabaseController {
     private deleteFunction;
     private resolveSafetyPolicy;
     private buildOnConflictClause;
+    private getFieldDefinitionForKey;
     /**
      * Validates database schema structure and content.
      */

package/dist/index.d.ts

@@ -23120,6 +23120,7 @@ declare class DatabaseController {
     private deleteFunction;
     private resolveSafetyPolicy;
     private buildOnConflictClause;
+    private getFieldDefinitionForKey;
     /**
      * Validates database schema structure and content.
      */

package/dist/index.js

@@ -5830,6 +5830,13 @@ var GraphMetadataController = class _GraphMetadataController {
       };
     }).doOn("meta.task.layer_index_changed", "meta.task.destroyed").emits("global.meta.graph_metadata.task_updated");
     CadenzaService.createMetaTask("Handle task relationship creation", (ctx) => {
+      const taskName = ctx.data?.taskName ?? ctx.data?.task_name;
+      const predecessorTaskName = ctx.data?.predecessorTaskName ?? ctx.data?.predecessor_task_name;
+      const task = taskName ? CadenzaService.get(taskName) : void 0;
+      const predecessorTask = predecessorTaskName ? CadenzaService.get(predecessorTaskName) : void 0;
+      if (!task?.registered || !predecessorTask?.registered) {
+        return false;
+      }
       return {
         data: {
           ...ctx.data,
@@ -6106,6 +6113,13 @@ function defaultOperationIntentDescription(operation, tableName) {
 function isExplicitSqlLiteral(value) {
   return /^'.*'::[a-z_][a-z0-9_]*(\[\])?$/i.test(value.trim());
 }
+function extractExplicitJsonLiteral(value) {
+  const match = /^'(.*)'::jsonb$/i.exec(value.trim());
+  if (!match) {
+    return null;
+  }
+  return match[1].replace(/''/g, "'");
+}
 function isExplicitSqlExpression(value) {
   const trimmed = value.trim();
   if (!trimmed) {
@@ -6164,6 +6178,31 @@ function serializeInitialDataValueForSql(value, field) {
   }
   return `'${stringValue.replace(/'/g, "''")}'`;
 }
+function serializeFieldValueForQuery(value, field) {
+  if (value === void 0 || value === null || field?.type !== "jsonb") {
+    return value;
+  }
+  if (typeof value === "string") {
+    const explicitJsonLiteral = extractExplicitJsonLiteral(value);
+    if (explicitJsonLiteral !== null) {
+      return explicitJsonLiteral;
+    }
+    try {
+      JSON.parse(value);
+      return value;
+    } catch {
+      return JSON.stringify(value);
+    }
+  }
+  return JSON.stringify(value);
+}
+function isSubOperationPayload(value) {
+  if (!value || typeof value !== "object") {
+    return false;
+  }
+  const candidate = value;
+  return typeof candidate.subOperation === "string" && typeof candidate.table === "string" && candidate.table.trim().length > 0;
+}
 function readCustomIntentConfig(customIntent) {
   if (typeof customIntent === "string") {
     return {
@@ -6845,18 +6884,28 @@ var DatabaseController = class _DatabaseController {
             throw new Error("No rows available for insert after resolving data");
           }
           const keys = Object.keys(rows[0]);
+          const tableFields = registration.schema.tables[tableName]?.fields ?? {};
           const sqlPrefix = `INSERT INTO ${tableName} (${keys.map((key) => (0, import_lodash_es.snakeCase)(key)).join(", ")}) VALUES `;
           const params = [];
           const placeholders = rows.map((row) => {
             const tuple = keys.map((key) => {
-              params.push(row[key]);
+              params.push(
+                serializeFieldValueForQuery(
+                  row[key],
+                  this.getFieldDefinitionForKey(tableFields, key)
+                )
+              );
               return `$${params.length}`;
             }).join(", ");
             return `(${tuple})`;
           }).join(", ");
           let onConflictSql = "";
           if (onConflict) {
-            onConflictSql = this.buildOnConflictClause(onConflict, params);
+            onConflictSql = this.buildOnConflictClause(
+              onConflict,
+              params,
+              tableFields
+            );
           }
           const sql = `${sqlPrefix}${placeholders}${onConflictSql} RETURNING ${fields.length ? fields.map(import_lodash_es.snakeCase).join(", ") : "*"}`;
           const result = await this.withTimeout(
@@ -6904,27 +6953,26 @@ var DatabaseController = class _DatabaseController {
             data,
             tableName
           );
-          const params = Object.values(resolvedData);
-          let offset = 0;
-          const setClause = Object.keys(resolvedData).map((key, index) => {
+          const tableFields = registration.schema.tables[tableName]?.fields ?? {};
+          const params = [];
+          const setClause = Object.keys(resolvedData).map((key) => {
             const value = resolvedData[key];
-            const offsetIndex = index - offset;
             if (value?.__effect === "increment") {
-              params.splice(offsetIndex, 1);
-              offset += 1;
               return `${(0, import_lodash_es.snakeCase)(key)} = ${(0, import_lodash_es.snakeCase)(key)} + 1`;
             }
             if (value?.__effect === "decrement") {
-              params.splice(offsetIndex, 1);
-              offset += 1;
               return `${(0, import_lodash_es.snakeCase)(key)} = ${(0, import_lodash_es.snakeCase)(key)} - 1`;
             }
             if (value?.__effect === "set") {
-              params.splice(offsetIndex, 1);
-              offset += 1;
               return `${(0, import_lodash_es.snakeCase)(key)} = ${value.__value}`;
             }
-            return `${(0, import_lodash_es.snakeCase)(key)} = $${offsetIndex + 1}`;
+            params.push(
+              serializeFieldValueForQuery(
+                value,
+                this.getFieldDefinitionForKey(tableFields, key)
+              )
+            );
+            return `${(0, import_lodash_es.snakeCase)(key)} = $${params.length}`;
           }).join(", ");
           const whereClause = this.buildWhereClause(filter, params);
           const sql = `UPDATE ${tableName} SET ${setClause} ${whereClause} RETURNING *`;
@@ -7013,7 +7061,7 @@ var DatabaseController = class _DatabaseController {
       retryDelayFactor: Number.isFinite(durableState.safetyPolicy?.retryDelayFactor) ? Math.max(1, Number(durableState.safetyPolicy?.retryDelayFactor)) : 1
     };
   }
-  buildOnConflictClause(onConflict, params) {
+  buildOnConflictClause(onConflict, params, tableFields) {
     const { target, action } = onConflict;
     let sql = ` ON CONFLICT (${target.map(import_lodash_es.snakeCase).join(", ")})`;
     if (action.do === "update") {
@@ -7024,7 +7072,12 @@ var DatabaseController = class _DatabaseController {
         if (typeof value === "string" && value === "excluded") {
           return `${(0, import_lodash_es.snakeCase)(field)} = excluded.${(0, import_lodash_es.snakeCase)(field)}`;
         }
-        params.push(value);
+        params.push(
+          serializeFieldValueForQuery(
+            value,
+            this.getFieldDefinitionForKey(tableFields, field)
+          )
+        );
         return `${(0, import_lodash_es.snakeCase)(field)} = $${params.length}`;
       });
       sql += ` DO UPDATE SET ${assignments.join(", ")}`;
@@ -7036,6 +7089,9 @@ var DatabaseController = class _DatabaseController {
     sql += " DO NOTHING";
     return sql;
   }
+  getFieldDefinitionForKey(fields, key) {
+    return fields[key] ?? fields[(0, import_lodash_es.snakeCase)(key)];
+  }
   /**
    * Validates database schema structure and content.
    */
@@ -7628,9 +7684,8 @@ var DatabaseController = class _DatabaseController {
     }
     const resolved = { ...data };
     for (const [key, value] of Object.entries(data)) {
-      if (typeof value === "object" && value !== null && "subOperation" in value) {
-        const subOperation = value;
-        resolved[key] = await this.executeSubOperation(registration, subOperation);
+      if (isSubOperationPayload(value)) {
+        resolved[key] = await this.executeSubOperation(registration, value);
       } else if (typeof value === "string" && ["increment", "decrement", "set"].includes(value)) {
         resolved[key] = { __effect: value };
       } else if (typeof value === "object" && value !== null) {
@@ -7657,7 +7712,13 @@ var DatabaseController = class _DatabaseController {
         );
         const row = ensurePlainObject(resolvedData, "sub-operation insert data");
         const keys = Object.keys(row);
-        const params = Object.values(row);
+        const tableFields = registration.schema.tables[operation.table]?.fields ?? {};
+        const params = keys.map(
+          (key) => serializeFieldValueForQuery(
+            row[key],
+            this.getFieldDefinitionForKey(tableFields, key)
+          )
+        );
         const sql2 = `INSERT INTO ${operation.table} (${keys.map((key) => (0, import_lodash_es.snakeCase)(key)).join(", ")}) VALUES (${params.map((_, index) => `$${index + 1}`).join(", ")}) ON CONFLICT DO NOTHING RETURNING ${operation.return ?? "*"}`;
         const result2 = await this.withTimeout(
           () => client.query(sql2, params),