@hotmeshio/hotmesh 0.13.0 → 0.14.0

package/build/services/store/providers/postgres/kvtypes/hash/jsonb.js

@@ -23,6 +23,7 @@ function createJsonbOperations(context) {
         let sql = '';
         if (options?.nx) {
             if (replayId) {
+                const { symbol: replaySym, dimension: replayDim } = (0, utils_1.splitField)(replayId);
                 sql = `
           WITH inserted_job AS (
             INSERT INTO ${tableName} (id, key, context)
@@ -34,16 +35,16 @@ function createJsonbOperations(context) {
             RETURNING id, context::text as new_value
           ),
           replay_insert AS (
-            INSERT INTO ${tableName}_attributes (job_id, field, value, type)
-            SELECT id, $3, new_value, $4
+            INSERT INTO ${tableName}_attributes (job_id, symbol, dimension, value, type)
+            SELECT id, $3, $4, new_value, $5
             FROM inserted_job
-            ON CONFLICT (job_id, field) DO UPDATE
+            ON CONFLICT (job_id, symbol, dimension) DO UPDATE
             SET value = EXCLUDED.value
             RETURNING 1
           )
           SELECT new_value FROM inserted_job
         `;
-                params.push(key, fields['@context'], replayId, (0, utils_1.deriveType)(replayId));
+                params.push(key, fields['@context'], replaySym, replayDim, (0, utils_1.deriveType)(replayId));
             }
             else {
                 sql = `
@@ -60,6 +61,7 @@ function createJsonbOperations(context) {
         }
         else {
             if (replayId) {
+                const { symbol: replaySym, dimension: replayDim } = (0, utils_1.splitField)(replayId);
                 sql = `
           WITH updated_job AS (
             UPDATE ${tableName}
@@ -68,16 +70,16 @@ function createJsonbOperations(context) {
             RETURNING id, context::text as new_value
           ),
           replay_insert AS (
-            INSERT INTO ${tableName}_attributes (job_id, field, value, type)
-            SELECT id, $3, new_value, $4
+            INSERT INTO ${tableName}_attributes (job_id, symbol, dimension, value, type)
+            SELECT id, $3, $4, new_value, $5
             FROM updated_job
-            ON CONFLICT (job_id, field) DO UPDATE
+            ON CONFLICT (job_id, symbol, dimension) DO UPDATE
             SET value = EXCLUDED.value
             RETURNING 1
           )
           SELECT new_value FROM updated_job
         `;
-                params.push(key, fields['@context'], replayId, (0, utils_1.deriveType)(replayId));
+                params.push(key, fields['@context'], replaySym, replayDim, (0, utils_1.deriveType)(replayId));
             }
             else {
                 sql = `
@@ -110,12 +112,13 @@ function createJsonbOperations(context) {
         }
         else {
             if (replayId) {
+                const { symbol: replaySym, dimension: replayDim } = (0, utils_1.splitField)(replayId);
                 sql = `
           WITH updated_job AS (
             UPDATE ${tableName}
             SET context = (
               WITH RECURSIVE deep_merge(original, new_data, result) AS (
-                SELECT 
+                SELECT
                   COALESCE(context, '{}'::jsonb) as original,
                   $2::jsonb as new_data,
                   COALESCE(context, '{}'::jsonb) as result
@@ -123,11 +126,11 @@ function createJsonbOperations(context) {
                 WHERE key = $1 AND is_live
               ),
               merged_data AS (
-                SELECT 
+                SELECT
                   (
                     SELECT jsonb_object_agg(
                       key,
-                      CASE 
+                      CASE
                         WHEN jsonb_typeof(original -> key) = 'object' AND jsonb_typeof(new_data -> key) = 'object'
                         THEN (
                           WITH nested_keys AS (
@@ -135,7 +138,7 @@ function createJsonbOperations(context) {
                           )
                           SELECT jsonb_object_agg(
                             nested_key,
-                            CASE 
+                            CASE
                               WHEN (new_data -> key) ? nested_key
                               THEN (new_data -> key) -> nested_key
                               ELSE (original -> key) -> nested_key
@@ -160,27 +163,27 @@ function createJsonbOperations(context) {
             RETURNING id, context::text as new_value
           ),
           replay_insert AS (
-            INSERT INTO ${tableName}_attributes (job_id, field, value, type)
-            SELECT id, $3, new_value, $4
+            INSERT INTO ${tableName}_attributes (job_id, symbol, dimension, value, type)
+            SELECT id, $3, $4, new_value, $5
             FROM updated_job
-            ON CONFLICT (job_id, field) DO UPDATE
+            ON CONFLICT (job_id, symbol, dimension) DO UPDATE
             SET value = EXCLUDED.value
             RETURNING 1
           )
           SELECT new_value FROM updated_job
         `;
-                params.push(key, fields['@context:merge'], replayId, (0, utils_1.deriveType)(replayId));
+                params.push(key, fields['@context:merge'], replaySym, replayDim, (0, utils_1.deriveType)(replayId));
             }
             else {
                 sql = `
           UPDATE ${tableName}
           SET context = (
             WITH merged_data AS (
-              SELECT 
+              SELECT
                 (
                   SELECT jsonb_object_agg(
                     key,
-                    CASE 
+                    CASE
                       WHEN jsonb_typeof(original -> key) = 'object' AND jsonb_typeof(new_data -> key) = 'object'
                       THEN (
                         WITH nested_keys AS (
@@ -188,7 +191,7 @@ function createJsonbOperations(context) {
                         )
                         SELECT jsonb_object_agg(
                           nested_key,
-                          CASE 
+                          CASE
                             WHEN (new_data -> key) ? nested_key
                             THEN (new_data -> key) -> nested_key
                             ELSE (original -> key) -> nested_key
@@ -206,7 +209,7 @@ function createJsonbOperations(context) {
                   ) all_keys
                 ) as merged_context
               FROM (
-                SELECT 
+                SELECT
                   COALESCE(context, '{}'::jsonb) as original,
                   $2::jsonb as new_data
                 FROM ${tableName}
@@ -233,6 +236,7 @@ function createJsonbOperations(context) {
         if (pathParts.length === 1) {
             // Simple key deletion
             if (replayId) {
+                const { symbol: replaySym, dimension: replayDim } = (0, utils_1.splitField)(replayId);
                 sql = `
           WITH updated_job AS (
             UPDATE ${tableName}
@@ -241,16 +245,16 @@ function createJsonbOperations(context) {
             RETURNING id, context::text as new_value
           ),
           replay_insert AS (
-            INSERT INTO ${tableName}_attributes (job_id, field, value, type)
-            SELECT id, $3, new_value, $4
+            INSERT INTO ${tableName}_attributes (job_id, symbol, dimension, value, type)
+            SELECT id, $3, $4, new_value, $5
             FROM updated_job
-            ON CONFLICT (job_id, field) DO UPDATE
+            ON CONFLICT (job_id, symbol, dimension) DO UPDATE
             SET value = EXCLUDED.value
             RETURNING 1
           )
           SELECT new_value FROM updated_job
         `;
-                params.push(key, path, replayId, (0, utils_1.deriveType)(replayId));
+                params.push(key, path, replaySym, replayDim, (0, utils_1.deriveType)(replayId));
             }
             else {
                 sql = `
@@ -265,6 +269,7 @@ function createJsonbOperations(context) {
         else {
             // Nested path deletion using jsonb_set with null to remove
             if (replayId) {
+                const { symbol: replaySym, dimension: replayDim } = (0, utils_1.splitField)(replayId);
                 sql = `
           WITH updated_job AS (
             UPDATE ${tableName}
@@ -273,16 +278,16 @@ function createJsonbOperations(context) {
             RETURNING id, context::text as new_value
           ),
           replay_insert AS (
-            INSERT INTO ${tableName}_attributes (job_id, field, value, type)
-            SELECT id, $3, new_value, $4
+            INSERT INTO ${tableName}_attributes (job_id, symbol, dimension, value, type)
+            SELECT id, $3, $4, new_value, $5
             FROM updated_job
-            ON CONFLICT (job_id, field) DO UPDATE
+            ON CONFLICT (job_id, symbol, dimension) DO UPDATE
             SET value = EXCLUDED.value
             RETURNING 1
           )
           SELECT new_value FROM updated_job
         `;
-                params.push(key, pathParts, replayId, (0, utils_1.deriveType)(replayId));
+                params.push(key, pathParts, replaySym, replayDim, (0, utils_1.deriveType)(replayId));
             }
             else {
                 sql = `
@@ -304,6 +309,7 @@ function createJsonbOperations(context) {
         const params = [];
         let sql = '';
         if (replayId) {
+            const { symbol: replaySym, dimension: replayDim } = (0, utils_1.splitField)(replayId);
             sql = `
         WITH updated_job AS (
           UPDATE ${tableName}
@@ -317,16 +323,16 @@ function createJsonbOperations(context) {
           RETURNING id, (context #> $2::text[])::text as new_value
         ),
         replay_insert AS (
-          INSERT INTO ${tableName}_attributes (job_id, field, value, type)
-          SELECT id, $4, new_value, $5
+          INSERT INTO ${tableName}_attributes (job_id, symbol, dimension, value, type)
+          SELECT id, $4, $5, new_value, $6
           FROM updated_job
-          ON CONFLICT (job_id, field) DO UPDATE
+          ON CONFLICT (job_id, symbol, dimension) DO UPDATE
           SET value = EXCLUDED.value
           RETURNING 1
         )
         SELECT new_value FROM updated_job
       `;
-            params.push(key, pathParts, JSON.stringify([value]), replayId, (0, utils_1.deriveType)(replayId));
+            params.push(key, pathParts, JSON.stringify([value]), replaySym, replayDim, (0, utils_1.deriveType)(replayId));
         }
         else {
             sql = `
@@ -352,6 +358,7 @@ function createJsonbOperations(context) {
         const params = [];
         let sql = '';
         if (replayId) {
+            const { symbol: replaySym, dimension: replayDim } = (0, utils_1.splitField)(replayId);
             sql = `
         WITH updated_job AS (
           UPDATE ${tableName}
@@ -365,16 +372,16 @@ function createJsonbOperations(context) {
           RETURNING id, (context #> $2::text[])::text as new_value
         ),
         replay_insert AS (
-          INSERT INTO ${tableName}_attributes (job_id, field, value, type)
-          SELECT id, $4, new_value, $5
+          INSERT INTO ${tableName}_attributes (job_id, symbol, dimension, value, type)
+          SELECT id, $4, $5, new_value, $6
           FROM updated_job
-          ON CONFLICT (job_id, field) DO UPDATE
+          ON CONFLICT (job_id, symbol, dimension) DO UPDATE
           SET value = EXCLUDED.value
           RETURNING 1
         )
         SELECT new_value FROM updated_job
       `;
-            params.push(key, pathParts, JSON.stringify([value]), replayId, (0, utils_1.deriveType)(replayId));
+            params.push(key, pathParts, JSON.stringify([value]), replaySym, replayDim, (0, utils_1.deriveType)(replayId));
         }
         else {
             sql = `
@@ -400,6 +407,7 @@ function createJsonbOperations(context) {
         const params = [];
         let sql = '';
         if (replayId) {
+            const { symbol: replaySym, dimension: replayDim } = (0, utils_1.splitField)(replayId);
             sql = `
         WITH updated_job AS (
           UPDATE ${tableName}
@@ -420,16 +428,16 @@ function createJsonbOperations(context) {
           RETURNING id, (context #> $2::text[])::text as new_value
         ),
         replay_insert AS (
-          INSERT INTO ${tableName}_attributes (job_id, field, value, type)
-          SELECT id, $4, new_value, $5
+          INSERT INTO ${tableName}_attributes (job_id, symbol, dimension, value, type)
+          SELECT id, $4, $5, new_value, $6
           FROM updated_job
-          ON CONFLICT (job_id, field) DO UPDATE
+          ON CONFLICT (job_id, symbol, dimension) DO UPDATE
           SET value = EXCLUDED.value
           RETURNING 1
         )
         SELECT new_value FROM updated_job
       `;
-            params.push(key, pathParts, index, replayId, (0, utils_1.deriveType)(replayId));
+            params.push(key, pathParts, index, replaySym, replayDim, (0, utils_1.deriveType)(replayId));
         }
         else {
             sql = `
@@ -462,6 +470,7 @@ function createJsonbOperations(context) {
         const params = [];
         let sql = '';
         if (replayId) {
+            const { symbol: replaySym, dimension: replayDim } = (0, utils_1.splitField)(replayId);
             sql = `
         WITH updated_job AS (
           UPDATE ${tableName}
@@ -475,16 +484,16 @@ function createJsonbOperations(context) {
           RETURNING id, (context #> $2::text[])::text as new_value
         ),
         replay_insert AS (
-          INSERT INTO ${tableName}_attributes (job_id, field, value, type)
-          SELECT id, $4, new_value, $5
+          INSERT INTO ${tableName}_attributes (job_id, symbol, dimension, value, type)
+          SELECT id, $4, $5, new_value, $6
           FROM updated_job
-          ON CONFLICT (job_id, field) DO UPDATE
+          ON CONFLICT (job_id, symbol, dimension) DO UPDATE
           SET value = EXCLUDED.value
           RETURNING 1
         )
         SELECT new_value FROM updated_job
       `;
-            params.push(key, pathParts, value, replayId, (0, utils_1.deriveType)(replayId));
+            params.push(key, pathParts, value, replaySym, replayDim, (0, utils_1.deriveType)(replayId));
         }
         else {
             sql = `
@@ -510,6 +519,7 @@ function createJsonbOperations(context) {
         const params = [];
         let sql = '';
         if (replayId) {
+            const { symbol: replaySym, dimension: replayDim } = (0, utils_1.splitField)(replayId);
             sql = `
         WITH updated_job AS (
           UPDATE ${tableName}
@@ -523,16 +533,16 @@ function createJsonbOperations(context) {
           RETURNING id, (context #> $2::text[])::text as new_value
         ),
         replay_insert AS (
-          INSERT INTO ${tableName}_attributes (job_id, field, value, type)
-          SELECT id, $3, new_value, $4
+          INSERT INTO ${tableName}_attributes (job_id, symbol, dimension, value, type)
+          SELECT id, $3, $4, new_value, $5
           FROM updated_job
-          ON CONFLICT (job_id, field) DO UPDATE
+          ON CONFLICT (job_id, symbol, dimension) DO UPDATE
           SET value = EXCLUDED.value
           RETURNING 1
         )
         SELECT new_value FROM updated_job
       `;
-            params.push(key, pathParts, replayId, (0, utils_1.deriveType)(replayId));
+            params.push(key, pathParts, replaySym, replayDim, (0, utils_1.deriveType)(replayId));
         }
         else {
             sql = `
@@ -558,11 +568,12 @@ function createJsonbOperations(context) {
         const params = [];
         let sql = '';
         if (replayId) {
+            const { symbol: replaySym, dimension: replayDim } = (0, utils_1.splitField)(replayId);
             sql = `
         WITH updated_job AS (
           UPDATE ${tableName}
-          SET context = CASE 
-            WHEN context #> $2::text[] IS NULL THEN 
+          SET context = CASE
+            WHEN context #> $2::text[] IS NULL THEN
               jsonb_set(COALESCE(context, '{}'::jsonb), $2::text[], $3::jsonb, true)
             ELSE context
           END
@@ -570,22 +581,22 @@ function createJsonbOperations(context) {
           RETURNING id, (context #> $2::text[])::text as new_value
         ),
         replay_insert AS (
-          INSERT INTO ${tableName}_attributes (job_id, field, value, type)
-          SELECT id, $4, new_value, $5
+          INSERT INTO ${tableName}_attributes (job_id, symbol, dimension, value, type)
+          SELECT id, $4, $5, new_value, $6
           FROM updated_job
-          ON CONFLICT (job_id, field) DO UPDATE
+          ON CONFLICT (job_id, symbol, dimension) DO UPDATE
           SET value = EXCLUDED.value
           RETURNING 1
         )
         SELECT new_value FROM updated_job
       `;
-            params.push(key, pathParts, JSON.stringify(value), replayId, (0, utils_1.deriveType)(replayId));
+            params.push(key, pathParts, JSON.stringify(value), replaySym, replayDim, (0, utils_1.deriveType)(replayId));
         }
         else {
             sql = `
         UPDATE ${tableName}
-        SET context = CASE 
-          WHEN context #> $2::text[] IS NULL THEN 
+        SET context = CASE
+          WHEN context #> $2::text[] IS NULL THEN
             jsonb_set(COALESCE(context, '{}'::jsonb), $2::text[], $3::jsonb, true)
           ELSE context
         END
@@ -601,27 +612,29 @@ function createJsonbOperations(context) {
         const getField = Object.keys(fields).find((k) => k.startsWith('@context:get:'));
         const pathKey = getField.replace('@context:get:', '');
         const pathParts = JSON.parse(fields[getField]);
+        const { symbol: getSym, dimension: getDim } = (0, utils_1.splitField)(getField);
         const params = [];
         // Extract the specific path and store it as a temporary field
         const sql = `
-      INSERT INTO ${tableName}_attributes (job_id, field, value, type)
-      SELECT 
+      INSERT INTO ${tableName}_attributes (job_id, symbol, dimension, value, type)
+      SELECT
         job.id,
         $2,
-        COALESCE((job.context #> $3::text[])::text, 'null'),
-        $4
+        $3,
+        COALESCE((job.context #> $4::text[])::text, 'null'),
+        $5
       FROM (
         SELECT id, context FROM ${tableName} WHERE key = $1 AND is_live
       ) AS job
-      ON CONFLICT (job_id, field) DO UPDATE
+      ON CONFLICT (job_id, symbol, dimension) DO UPDATE
       SET value = COALESCE((
-        SELECT context #> $3::text[]
-        FROM ${tableName} 
+        SELECT context #> $4::text[]
+        FROM ${tableName}
         WHERE key = $1 AND is_live
       )::text, 'null')
       RETURNING 1 as count
     `;
-        params.push(key, getField, pathParts, (0, utils_1.deriveType)(getField));
+        params.push(key, getSym, getDim, pathParts, (0, utils_1.deriveType)(getField));
         return { sql, params };
     }
     function handleContextGet(key, fields, options) {
@@ -633,6 +646,7 @@ function createJsonbOperations(context) {
         if (path === '') {
             // Get entire context
             if (replayId) {
+                const { symbol: replaySym, dimension: replayDim } = (0, utils_1.splitField)(replayId);
                 sql = `
           WITH job_data AS (
             SELECT id, context::text as context_value
@@ -640,17 +654,17 @@ function createJsonbOperations(context) {
             WHERE key = $1 AND is_live
           ),
           replay_insert AS (
-            INSERT INTO ${tableName}_attributes (job_id, field, value, type)
-            SELECT id, $2, context_value, $3
+            INSERT INTO ${tableName}_attributes (job_id, symbol, dimension, value, type)
+            SELECT id, $2, $3, context_value, $4
             FROM job_data
             WHERE id IS NOT NULL
-            ON CONFLICT (job_id, field) DO UPDATE
+            ON CONFLICT (job_id, symbol, dimension) DO UPDATE
             SET value = EXCLUDED.value
             RETURNING 1
           )
           SELECT context_value as new_value FROM job_data
         `;
-                params.push(key, replayId, (0, utils_1.deriveType)(replayId));
+                params.push(key, replaySym, replayDim, (0, utils_1.deriveType)(replayId));
             }
             else {
                 sql = `
@@ -665,6 +679,7 @@ function createJsonbOperations(context) {
             // Get specific path
             const pathParts = path.split('.');
             if (replayId) {
+                const { symbol: replaySym, dimension: replayDim } = (0, utils_1.splitField)(replayId);
                 sql = `
           WITH job_data AS (
             SELECT id, COALESCE((context #> $2::text[])::text, 'null') as path_value
@@ -672,17 +687,17 @@ function createJsonbOperations(context) {
             WHERE key = $1 AND is_live
           ),
           replay_insert AS (
-            INSERT INTO ${tableName}_attributes (job_id, field, value, type)
-            SELECT id, $3, path_value, $4
+            INSERT INTO ${tableName}_attributes (job_id, symbol, dimension, value, type)
+            SELECT id, $3, $4, path_value, $5
             FROM job_data
             WHERE id IS NOT NULL
-            ON CONFLICT (job_id, field) DO UPDATE
+            ON CONFLICT (job_id, symbol, dimension) DO UPDATE
             SET value = EXCLUDED.value
             RETURNING 1
           )
           SELECT path_value as new_value FROM job_data
         `;
-                params.push(key, pathParts, replayId, (0, utils_1.deriveType)(replayId));
+                params.push(key, pathParts, replaySym, replayDim, (0, utils_1.deriveType)(replayId));
             }
             else {
                 sql = `