@oliasoft-open-source/node-json-migrator 4.0.0-beta-1 → 4.1.0-beta-1

package/dist/index.cjs

@@ -9036,22 +9036,22 @@ const getRecordList = async (db, entity, entityTableName, entityColumnNames, lat
   const query = `
     SELECT
       $(entityIdColumn:name) AS id,
-      name,
+      $(entityNameColumn:name) AS name,
       $(entityCreatedColumn:name) AS created,
-      version
+      $(entityVersionColumn:name) AS version
     FROM $(entityTable:name)
     WHERE (
-      version IS NULL OR version = ''
+      $(entityVersionColumn:name) IS NULL OR $(entityVersionColumn:name) = ''
       OR (
-        version <> $(latestVersion)
+        $(entityVersionColumn:name) <> $(latestVersion)
         AND (
           SELECT
             CASE
               WHEN IS_JSON(plan) THEN JSON_ARRAY_LENGTH(plan::json)
-            ELSE 0
+              ELSE 0
             END AS length
           FROM $(entityVersionsTable:name)
-          WHERE $(entityVersionsTable:name).version = version
+          WHERE $(entityVersionsTable:name).version = $(entityVersionColumn:name)
           LIMIT 1
         )::integer <= $(latestVersionPlanLength)
       )
@@ -9061,7 +9061,9 @@ const getRecordList = async (db, entity, entityTableName, entityColumnNames, lat
     entityTable: entityTableName,
     entityVersionsTable: `${entity}_versions`,
     entityIdColumn: entityColumnNames.id,
+    entityNameColumn: entityColumnNames.name,
     entityCreatedColumn: entityColumnNames.created,
+    entityVersionColumn: entityColumnNames.version,
     latestVersion,
     latestVersionPlanLength
   };
@@ -9084,18 +9086,22 @@ const updateRecord = async (t, entityTableName, entityColumnNames, entityId, cur
   const useEtag = typeof etag === "number";
   const query = `
     UPDATE $(entityTable:name)
-    SET data = $(nextData),
-        version = $(nextVersion)
-        ${useEtag ? ", etag = etag + 1" : ""}
-    WHERE $(entityIdColumn:name) = $(entityId)
-      AND version = $(currentVersion)
-      ${useEtag ? "AND etag = $(etag)" : ""}
+    SET
+      $(payloadColumn:name) = $(nextData),
+      $(versionColumn:name) = $(nextVersion)
+      ${useEtag ? ", $(etagColumn:name) = $(etagColumn:name) + 1" : ""}
+    WHERE $(idColumn:name) = $(entityId)
+      AND $(versionColumn:name) = $(currentVersion)
+      ${useEtag ? "AND $(etagColumn:name) = $(etag)" : ""}
     RETURNING *
   `;
   const params = {
     entityTable: entityTableName,
+    idColumn: entityColumnNames.id,
+    payloadColumn: entityColumnNames.payload,
+    versionColumn: entityColumnNames.version,
+    etagColumn: entityColumnNames.etag,
     entityId,
-    entityIdColumn: entityColumnNames.id,
     currentVersion,
     nextData,
     nextVersion,
@@ -9681,14 +9687,18 @@ const migrateRecord = async ({
         config.entityColumnNames,
         record.id
       );
-      const { data, etag, version: currentVersion } = currentRecord;
+      const {
+        [config.entityColumnNames.payload]: payload,
+        [config.entityColumnNames.etag]: etag,
+        [config.entityColumnNames.version]: currentVersion
+      } = currentRecord;
       await beforeMigrateRecord({
         currentRecord,
         transaction,
         dry
       });
       const { nextPayload: nextData, nextVersion } = await migrate({
-        payload: data,
+        payload,
         config: {
           ...config,
           version: currentVersion,
@@ -9722,9 +9732,9 @@ const migrateRecord = async ({
     return null;
   } catch (error) {
     const migrationErrorPayload = {
-      id: record.id,
-      name: record.name,
-      created: record.created,
+      [config.entityColumnNames.id]: record.id,
+      [config.entityColumnNames.name]: record.name,
+      [config.entityColumnNames.created]: record.created,
       error,
       stackTrace: error.stack
     };

package/dist/index.d.cts

@@ -19,13 +19,22 @@ type TMigration = {
 };
 type TEntityColumnNames = {
     id: string;
-    created: string;
-};
-type TRecord<T extends TEntityColumnNames = TEntityColumnNames> = {
     name: string;
+    payload: string;
+    etag?: string;
     version: string;
-} & {
+    created: string;
+};
+type TRecord<T extends TEntityColumnNames = TEntityColumnNames, TData = unknown> = {
     [K in T['id']]: number | string;
+} & {
+    [K in T['name']]: string;
+} & {
+    [K in T['payload']]: TData;
+} & (T['etag'] extends string ? {
+    [K in T['etag']]?: string;
+} : Record<never, never>) & {
+    [K in T['version']]: string;
 } & {
     [K in T['created']]: string | Date;
 };

package/dist/index.d.mts

@@ -19,13 +19,22 @@ type TMigration = {
 };
 type TEntityColumnNames = {
     id: string;
-    created: string;
-};
-type TRecord<T extends TEntityColumnNames = TEntityColumnNames> = {
     name: string;
+    payload: string;
+    etag?: string;
     version: string;
-} & {
+    created: string;
+};
+type TRecord<T extends TEntityColumnNames = TEntityColumnNames, TData = unknown> = {
     [K in T['id']]: number | string;
+} & {
+    [K in T['name']]: string;
+} & {
+    [K in T['payload']]: TData;
+} & (T['etag'] extends string ? {
+    [K in T['etag']]?: string;
+} : Record<never, never>) & {
+    [K in T['version']]: string;
 } & {
     [K in T['created']]: string | Date;
 };

package/dist/index.mjs

@@ -9015,22 +9015,22 @@ const getRecordList = async (db, entity, entityTableName, entityColumnNames, lat
   const query = `
     SELECT
       $(entityIdColumn:name) AS id,
-      name,
+      $(entityNameColumn:name) AS name,
       $(entityCreatedColumn:name) AS created,
-      version
+      $(entityVersionColumn:name) AS version
     FROM $(entityTable:name)
     WHERE (
-      version IS NULL OR version = ''
+      $(entityVersionColumn:name) IS NULL OR $(entityVersionColumn:name) = ''
       OR (
-        version <> $(latestVersion)
+        $(entityVersionColumn:name) <> $(latestVersion)
         AND (
           SELECT
             CASE
               WHEN IS_JSON(plan) THEN JSON_ARRAY_LENGTH(plan::json)
-            ELSE 0
+              ELSE 0
             END AS length
           FROM $(entityVersionsTable:name)
-          WHERE $(entityVersionsTable:name).version = version
+          WHERE $(entityVersionsTable:name).version = $(entityVersionColumn:name)
           LIMIT 1
         )::integer <= $(latestVersionPlanLength)
       )
@@ -9040,7 +9040,9 @@ const getRecordList = async (db, entity, entityTableName, entityColumnNames, lat
     entityTable: entityTableName,
     entityVersionsTable: `${entity}_versions`,
     entityIdColumn: entityColumnNames.id,
+    entityNameColumn: entityColumnNames.name,
     entityCreatedColumn: entityColumnNames.created,
+    entityVersionColumn: entityColumnNames.version,
     latestVersion,
     latestVersionPlanLength
   };
@@ -9063,18 +9065,22 @@ const updateRecord = async (t, entityTableName, entityColumnNames, entityId, cur
   const useEtag = typeof etag === "number";
   const query = `
     UPDATE $(entityTable:name)
-    SET data = $(nextData),
-        version = $(nextVersion)
-        ${useEtag ? ", etag = etag + 1" : ""}
-    WHERE $(entityIdColumn:name) = $(entityId)
-      AND version = $(currentVersion)
-      ${useEtag ? "AND etag = $(etag)" : ""}
+    SET
+      $(payloadColumn:name) = $(nextData),
+      $(versionColumn:name) = $(nextVersion)
+      ${useEtag ? ", $(etagColumn:name) = $(etagColumn:name) + 1" : ""}
+    WHERE $(idColumn:name) = $(entityId)
+      AND $(versionColumn:name) = $(currentVersion)
+      ${useEtag ? "AND $(etagColumn:name) = $(etag)" : ""}
     RETURNING *
   `;
   const params = {
     entityTable: entityTableName,
+    idColumn: entityColumnNames.id,
+    payloadColumn: entityColumnNames.payload,
+    versionColumn: entityColumnNames.version,
+    etagColumn: entityColumnNames.etag,
     entityId,
-    entityIdColumn: entityColumnNames.id,
     currentVersion,
     nextData,
     nextVersion,
@@ -9660,14 +9666,18 @@ const migrateRecord = async ({
         config.entityColumnNames,
         record.id
       );
-      const { data, etag, version: currentVersion } = currentRecord;
+      const {
+        [config.entityColumnNames.payload]: payload,
+        [config.entityColumnNames.etag]: etag,
+        [config.entityColumnNames.version]: currentVersion
+      } = currentRecord;
       await beforeMigrateRecord({
         currentRecord,
         transaction,
         dry
       });
       const { nextPayload: nextData, nextVersion } = await migrate({
-        payload: data,
+        payload,
         config: {
           ...config,
           version: currentVersion,
@@ -9701,9 +9711,9 @@ const migrateRecord = async ({
     return null;
   } catch (error) {
     const migrationErrorPayload = {
-      id: record.id,
-      name: record.name,
-      created: record.created,
+      [config.entityColumnNames.id]: record.id,
+      [config.entityColumnNames.name]: record.name,
+      [config.entityColumnNames.created]: record.created,
       error,
       stackTrace: error.stack
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oliasoft-open-source/node-json-migrator",
-  "version": "4.0.0-beta-1",
+  "version": "4.1.0-beta-1",
   "description": "A library for JSON migrations",
   "homepage": "https://oliasoft-open-source.gitlab.io/node-postgresql-migrator",
   "bugs": {