@oliasoft-open-source/node-json-migrator 4.2.0 → 4.2.1-beta-1

package/dist/index.cjs

@@ -7374,30 +7374,32 @@ const getVersions = async (db, entity) => {
   };
   return db.any(query, params);
 };
-const getRecordList = async (db, entity, entityTableName, entityColumnNames, latestVersion, latestVersionPlanLength) => {
+const filterRecordsWithNoPendingMigrations = ({
+  records,
+  latestPlan
+}) => {
+  return records.filter((record) => {
+    const currentHashes = new Set(
+      (record?.currentPlan ?? []).map((p) => p.fileHash)
+    );
+    return latestPlan.some((p) => !currentHashes.has(p.fileHash));
+  });
+};
+const getRecordList = async (db, entity, entityTableName, entityColumnNames, latestVersion, latestPlan) => {
   const query = `
     SELECT
-      $(entityIdColumn:name) AS id,
-      $(entityNameColumn:name) AS name,
-      $(entityCreatedColumn:name) AS created,
-      $(entityVersionColumn:name) AS version
-    FROM $(entityTable:name)
-    WHERE (
-      $(entityVersionColumn:name) IS NULL OR $(entityVersionColumn:name) = ''
-      OR (
-        $(entityVersionColumn:name) <> $(latestVersion)
-        AND (
-          SELECT
-            CASE
-              WHEN IS_JSON(plan) THEN JSON_ARRAY_LENGTH(plan::json)
-              ELSE 0
-            END AS length
-          FROM $(entityVersionsTable:name)
-          WHERE $(entityVersionsTable:name).version = $(entityVersionColumn:name)
-          LIMIT 1
-        )::integer <= $(latestVersionPlanLength)
-      )
-    )
+      e.$(entityIdColumn:name) AS id,
+      e.$(entityNameColumn:name) AS name,
+      e.$(entityCreatedColumn:name) AS created,
+      e.$(entityVersionColumn:name) AS version,
+      v_current.plan::json AS currentplan
+    FROM $(entityTable:name) e
+    LEFT JOIN $(entityVersionsTable:name) v_current
+      ON v_current.version = e.$(entityVersionColumn:name)
+    WHERE
+      e.$(entityVersionColumn:name) IS NULL
+      OR e.$(entityVersionColumn:name) = ''
+      OR e.$(entityVersionColumn:name) <> $(latestVersion)
   `;
   const params = {
     entityTable: entityTableName,
@@ -7406,10 +7408,13 @@ const getRecordList = async (db, entity, entityTableName, entityColumnNames, lat
     entityNameColumn: entityColumnNames.name,
     entityCreatedColumn: entityColumnNames.created,
     entityVersionColumn: entityColumnNames.version,
-    latestVersion,
-    latestVersionPlanLength
+    latestVersion
   };
-  return db.any(query, params);
+  const records = (await db.any(query, params)).map((r) => ({
+    ...r,
+    currentPlan: r.currentplan
+  }));
+  return filterRecordsWithNoPendingMigrations({ records, latestPlan });
 };
 const getRecord = async (t, entityTableName, entityColumnNames, entityId) => {
   const query = `
@@ -7671,6 +7676,7 @@ const getPlannedMigrations = async ({ config }) => {
     importModule
   );
   return {
+    validatedPlan: validatedPlannedMigrations,
     plannedMigrations: plannedMigrationsWithFunctions,
     nextVersion
   };
@@ -8147,18 +8153,16 @@ const migrateAll = async ({
   afterMigrateRecord,
   onMigrationErrors
 }) => {
-  const plan = await getPlannedMigrations({
+  const { validatedPlan: latestPlan, nextVersion: latestVersion } = await getPlannedMigrations({
     config
   });
-  const latestVersion = plan.nextVersion;
-  const latestVersionPlanLength = plan.plannedMigrations.length;
   const recordList = await getRecordList(
     config?.database,
     config?.entity,
     config?.entityTableName,
     config?.entityColumnNames,
     latestVersion,
-    latestVersionPlanLength
+    latestPlan
   );
   await migrateRecords({
     config,

package/dist/index.d.cts

@@ -5,6 +5,12 @@ import { IDatabase, IHelpers, ITask } from 'pg-promise';
  */
 declare const createMigration: (directory: string, description: string, entity: string) => Promise<void>;
 
+type TPlanEntry = {
+    fileName: string;
+    fileHash: string;
+    sequence: string;
+};
+type TPlan = TPlanEntry[];
 type TPayload = Record<string, unknown>;
 type TMetaData = Record<string, unknown>;
 type TMigration = {
@@ -19,6 +25,14 @@ type TMigration = {
     script?: string;
     migrator?: (payload: TPayload, metaData?: TMetaData) => TPayload;
 };
+type TRecordDetails = {
+    id: number | string;
+    name: string;
+    created: string | Date;
+    version: string;
+    currentPlan?: TPlan;
+};
+type TRecordDetailsList = TRecordDetails[];
 type TEntityColumnNames = {
     id: string;
     name: string;
@@ -83,6 +97,11 @@ type TOnMigrationErrors = (params: TOnMigrationErrorsPayload) => Promise<void>;
 declare const getPlannedMigrations: ({ config }: {
     config: TConfig;
 }) => Promise<{
+    validatedPlan: {
+        fileHash: string;
+        fileName: string;
+        sequence: string;
+    }[];
     plannedMigrations: TMigration[] & any[];
     nextVersion: string;
 }>;
@@ -139,4 +158,4 @@ declare const printVersionHistory: ({ config }: {
     config: TConfig;
 }) => Promise<void>;
 
-export { type TAfterMigrateRecord, type TAfterMigrateRecordPayload, type TBeforeMigrateRecord, type TBeforeMigrateRecordPayload, type TConfig, type TEntityColumnNames, type TMetaData, type TMigration, type TMigrationErrorPayload, type TOnMigrationErrors, type TOnMigrationErrorsPayload, type TPayload, type TRecord, createMigration, getPlannedMigrations, getPlannedVersion, getVersions, migrate, migrateAll, pipe, printVersionHistory };
+export { type TAfterMigrateRecord, type TAfterMigrateRecordPayload, type TBeforeMigrateRecord, type TBeforeMigrateRecordPayload, type TConfig, type TEntityColumnNames, type TMetaData, type TMigration, type TMigrationErrorPayload, type TOnMigrationErrors, type TOnMigrationErrorsPayload, type TPayload, type TPlan, type TPlanEntry, type TRecord, type TRecordDetails, type TRecordDetailsList, createMigration, getPlannedMigrations, getPlannedVersion, getVersions, migrate, migrateAll, pipe, printVersionHistory };

package/dist/index.d.mts

@@ -5,6 +5,12 @@ import { IDatabase, IHelpers, ITask } from 'pg-promise';
  */
 declare const createMigration: (directory: string, description: string, entity: string) => Promise<void>;
 
+type TPlanEntry = {
+    fileName: string;
+    fileHash: string;
+    sequence: string;
+};
+type TPlan = TPlanEntry[];
 type TPayload = Record<string, unknown>;
 type TMetaData = Record<string, unknown>;
 type TMigration = {
@@ -19,6 +25,14 @@ type TMigration = {
     script?: string;
     migrator?: (payload: TPayload, metaData?: TMetaData) => TPayload;
 };
+type TRecordDetails = {
+    id: number | string;
+    name: string;
+    created: string | Date;
+    version: string;
+    currentPlan?: TPlan;
+};
+type TRecordDetailsList = TRecordDetails[];
 type TEntityColumnNames = {
     id: string;
     name: string;
@@ -83,6 +97,11 @@ type TOnMigrationErrors = (params: TOnMigrationErrorsPayload) => Promise<void>;
 declare const getPlannedMigrations: ({ config }: {
     config: TConfig;
 }) => Promise<{
+    validatedPlan: {
+        fileHash: string;
+        fileName: string;
+        sequence: string;
+    }[];
     plannedMigrations: TMigration[] & any[];
     nextVersion: string;
 }>;
@@ -139,4 +158,4 @@ declare const printVersionHistory: ({ config }: {
     config: TConfig;
 }) => Promise<void>;
 
-export { type TAfterMigrateRecord, type TAfterMigrateRecordPayload, type TBeforeMigrateRecord, type TBeforeMigrateRecordPayload, type TConfig, type TEntityColumnNames, type TMetaData, type TMigration, type TMigrationErrorPayload, type TOnMigrationErrors, type TOnMigrationErrorsPayload, type TPayload, type TRecord, createMigration, getPlannedMigrations, getPlannedVersion, getVersions, migrate, migrateAll, pipe, printVersionHistory };
+export { type TAfterMigrateRecord, type TAfterMigrateRecordPayload, type TBeforeMigrateRecord, type TBeforeMigrateRecordPayload, type TConfig, type TEntityColumnNames, type TMetaData, type TMigration, type TMigrationErrorPayload, type TOnMigrationErrors, type TOnMigrationErrorsPayload, type TPayload, type TPlan, type TPlanEntry, type TRecord, type TRecordDetails, type TRecordDetailsList, createMigration, getPlannedMigrations, getPlannedVersion, getVersions, migrate, migrateAll, pipe, printVersionHistory };

package/dist/index.mjs

@@ -7353,30 +7353,32 @@ const getVersions = async (db, entity) => {
   };
   return db.any(query, params);
 };
-const getRecordList = async (db, entity, entityTableName, entityColumnNames, latestVersion, latestVersionPlanLength) => {
+const filterRecordsWithNoPendingMigrations = ({
+  records,
+  latestPlan
+}) => {
+  return records.filter((record) => {
+    const currentHashes = new Set(
+      (record?.currentPlan ?? []).map((p) => p.fileHash)
+    );
+    return latestPlan.some((p) => !currentHashes.has(p.fileHash));
+  });
+};
+const getRecordList = async (db, entity, entityTableName, entityColumnNames, latestVersion, latestPlan) => {
   const query = `
     SELECT
-      $(entityIdColumn:name) AS id,
-      $(entityNameColumn:name) AS name,
-      $(entityCreatedColumn:name) AS created,
-      $(entityVersionColumn:name) AS version
-    FROM $(entityTable:name)
-    WHERE (
-      $(entityVersionColumn:name) IS NULL OR $(entityVersionColumn:name) = ''
-      OR (
-        $(entityVersionColumn:name) <> $(latestVersion)
-        AND (
-          SELECT
-            CASE
-              WHEN IS_JSON(plan) THEN JSON_ARRAY_LENGTH(plan::json)
-              ELSE 0
-            END AS length
-          FROM $(entityVersionsTable:name)
-          WHERE $(entityVersionsTable:name).version = $(entityVersionColumn:name)
-          LIMIT 1
-        )::integer <= $(latestVersionPlanLength)
-      )
-    )
+      e.$(entityIdColumn:name) AS id,
+      e.$(entityNameColumn:name) AS name,
+      e.$(entityCreatedColumn:name) AS created,
+      e.$(entityVersionColumn:name) AS version,
+      v_current.plan::json AS currentplan
+    FROM $(entityTable:name) e
+    LEFT JOIN $(entityVersionsTable:name) v_current
+      ON v_current.version = e.$(entityVersionColumn:name)
+    WHERE
+      e.$(entityVersionColumn:name) IS NULL
+      OR e.$(entityVersionColumn:name) = ''
+      OR e.$(entityVersionColumn:name) <> $(latestVersion)
   `;
   const params = {
     entityTable: entityTableName,
@@ -7385,10 +7387,13 @@ const getRecordList = async (db, entity, entityTableName, entityColumnNames, lat
     entityNameColumn: entityColumnNames.name,
     entityCreatedColumn: entityColumnNames.created,
     entityVersionColumn: entityColumnNames.version,
-    latestVersion,
-    latestVersionPlanLength
+    latestVersion
   };
-  return db.any(query, params);
+  const records = (await db.any(query, params)).map((r) => ({
+    ...r,
+    currentPlan: r.currentplan
+  }));
+  return filterRecordsWithNoPendingMigrations({ records, latestPlan });
 };
 const getRecord = async (t, entityTableName, entityColumnNames, entityId) => {
   const query = `
@@ -7650,6 +7655,7 @@ const getPlannedMigrations = async ({ config }) => {
     importModule
   );
   return {
+    validatedPlan: validatedPlannedMigrations,
     plannedMigrations: plannedMigrationsWithFunctions,
     nextVersion
   };
@@ -8126,18 +8132,16 @@ const migrateAll = async ({
   afterMigrateRecord,
   onMigrationErrors
 }) => {
-  const plan = await getPlannedMigrations({
+  const { validatedPlan: latestPlan, nextVersion: latestVersion } = await getPlannedMigrations({
     config
   });
-  const latestVersion = plan.nextVersion;
-  const latestVersionPlanLength = plan.plannedMigrations.length;
   const recordList = await getRecordList(
     config?.database,
     config?.entity,
     config?.entityTableName,
     config?.entityColumnNames,
     latestVersion,
-    latestVersionPlanLength
+    latestPlan
   );
   await migrateRecords({
     config,

package/package.json

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