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

package/dist/plan/cached-planned-version.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setCachedPlannedVersion = exports.setCachedMigratorFunctions = exports.getCachedPlannedVersion = exports.getCachedMigratorFunctions = void 0;
+exports.setCachedPlannedVersion = exports.setCachedMigratorFunctions = exports.getCachedPlannedVersion = exports.getCachedMigratorFunctions = exports.cacheHasAllMigrationFunctions = void 0;
 let cachedPlannedVersion = null;
 let cachedMigratorFunctions = [];
 const getCachedPlannedVersion = () => cachedPlannedVersion;
@@ -17,4 +17,9 @@ exports.getCachedMigratorFunctions = getCachedMigratorFunctions;
 const setCachedMigratorFunctions = scripts => {
   cachedMigratorFunctions = scripts;
 };
-exports.setCachedMigratorFunctions = setCachedMigratorFunctions;
+exports.setCachedMigratorFunctions = setCachedMigratorFunctions;
+const cacheHasAllMigrationFunctions = ({
+  sortedMigrationEntries,
+  cachedMigrationEntries
+}) => sortedMigrationEntries.every(migration => cachedMigrationEntries.some(cached => cached.fileHash === migration.fileHash && typeof cached.migrator === 'function'));
+exports.cacheHasAllMigrationFunctions = cacheHasAllMigrationFunctions;

package/dist/plan/plan.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.writePlan = exports.sortPlanEntries = exports.readPlan = exports.parsePlan = exports.loadMigrationFunctions = exports.getPlannedMigrations = exports.getNextSequenceString = exports.generatePlanEntries = exports.formatJSON = void 0;
+exports.writePlan = exports.sortPlanEntries = exports.readPlan = exports.parsePlan = exports.loadMigrationFunctionsFromStrings = exports.loadMigrationFunctions = exports.getPlannedMigrations = exports.getNextSequenceString = exports.generatePlanEntries = exports.formatJSON = void 0;
 var _path = _interopRequireDefault(require("path"));
 var _lodash = require("lodash");
 var _fs = require("fs");
@@ -131,26 +131,31 @@ const generatePlanEntries = sortedMigrationEntries => sortedMigrationEntries.map
   sequence: m.sequence
 }));
 exports.generatePlanEntries = generatePlanEntries;
+const loadMigrationFunctionsFromStrings = async (sortedMigrationEntries, importModule) => Promise.all(sortedMigrationEntries.map(async m => {
+  const {
+    script
+  } = m;
+  const migrator = script && importModule ? (await (0, _moduleFromString.importFromString)(script))?.default : null;
+  return {
+    fileHash: m.fileHash,
+    migrator
+  };
+}));
+exports.loadMigrationFunctionsFromStrings = loadMigrationFunctionsFromStrings;
 const loadMigrationFunctions = async (sortedMigrationEntries, nextVersion, importModule = true) => {
   const cachedPlannedVersion = (0, _cachedPlannedVersion.getCachedPlannedVersion)();
   const cachedMigratorFunctions = (0, _cachedPlannedVersion.getCachedMigratorFunctions)();
-  const cacheValid = cachedPlannedVersion === nextVersion && sortedMigrationEntries.length === cachedMigratorFunctions.length;
+  const cacheValid = cachedPlannedVersion === nextVersion && (0, _cachedPlannedVersion.cacheHasAllMigrationFunctions)({
+    sortedMigrationEntries,
+    cachedMigrationEntries: cachedMigratorFunctions
+  });
   /*
     OW-15584 the module-from-string package seems to have a memory leak bug
     where calling importFromString multiple times consumes memory that
     doesn't get released or garbage collected. We cache the imported strings
     as a workaround (until plan.json version changes)
    */
-  const migrationFunctions = cacheValid ? cachedMigratorFunctions : await Promise.all(sortedMigrationEntries.map(async m => {
-    const {
-      script
-    } = m;
-    const migrator = script && importModule ? (await (0, _moduleFromString.importFromString)(script))?.default : null;
-    return {
-      fileHash: m.fileHash,
-      migrator
-    };
-  }));
+  const migrationFunctions = cacheValid ? cachedMigratorFunctions : await loadMigrationFunctionsFromStrings(sortedMigrationEntries, importModule);
   if (!cacheValid) {
     (0, _cachedPlannedVersion.setCachedMigratorFunctions)(migrationFunctions);
     (0, _cachedPlannedVersion.setCachedPlannedVersion)(nextVersion);

package/package.json

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