@oliasoft-open-source/node-json-migrator 2.3.7-beta-1 → 2.3.7-beta-2

package/dist/plan/plan.js

@@ -131,15 +131,15 @@ const generatePlanEntries = sortedMigrationEntries => sortedMigrationEntries.map
   sequence: m.sequence
 }));
 exports.generatePlanEntries = generatePlanEntries;
-const loadMigrationFunctions = async (sortedMigrationEntries, currentPlanVersion) => {
+const loadMigrationFunctions = async (sortedMigrationEntries, nextVersion, importModule = true) => {
   const cachedPlannedVersion = (0, _cachedPlannedVersion.getCachedPlannedVersion)();
   const cachedMigratorFunctions = (0, _cachedPlannedVersion.getCachedMigratorFunctions)();
-  const cacheValid = cachedPlannedVersion === currentPlanVersion && sortedMigrationEntries.length === cachedMigratorFunctions.length;
+  const cacheValid = cachedPlannedVersion === nextVersion && sortedMigrationEntries.length === cachedMigratorFunctions.length;
   const migrationFunctions = cacheValid ? cachedMigratorFunctions : await Promise.all(sortedMigrationEntries.map(async m => {
     const {
       script
     } = m;
-    const migrator = script ? (await (0, _moduleFromString.importFromString)(script))?.default : null;
+    const migrator = script && importModule ? (await (0, _moduleFromString.importFromString)(script))?.default : null;
     return {
       fileHash: m.fileHash,
       migrator
@@ -147,6 +147,7 @@ const loadMigrationFunctions = async (sortedMigrationEntries, currentPlanVersion
   }));
   if (!cacheValid) {
     (0, _cachedPlannedVersion.setCachedMigratorFunctions)(migrationFunctions);
+    (0, _cachedPlannedVersion.setCachedPlannedVersion)(nextVersion);
   }
   return (0, _lodash.merge)(sortedMigrationEntries, migrationFunctions);
 };
@@ -253,8 +254,7 @@ const getPlannedMigrations = async ({
     }];
     await (0, _database.insertVersions)(database, pgpHelpers, entity, versionRecord);
   }
-  const plannedMigrationsWithFunctions = importModule ? await loadMigrationFunctions(plannedMigrationsWithFileEntries, nextVersion, importModule) : plannedMigrationsWithFileEntries;
-  (0, _cachedPlannedVersion.setCachedPlannedVersion)(nextVersion); //Must set _after_ loading migration functions
+  const plannedMigrationsWithFunctions = await loadMigrationFunctions(plannedMigrationsWithFileEntries, nextVersion, importModule);
   return {
     plannedMigrations: plannedMigrationsWithFunctions,
     nextVersion

package/package.json

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