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

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

@@ -3,11 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setCachedPlannedVersion = exports.getCachedPlannedVersion = void 0;
+exports.setCachedPlannedVersion = exports.setCachedMigratorFunctions = exports.getCachedPlannedVersion = exports.getCachedMigratorFunctions = void 0;
 let cachedPlannedVersion = null;
+let cachedMigratorFunctions = [];
 const getCachedPlannedVersion = () => cachedPlannedVersion;
 exports.getCachedPlannedVersion = getCachedPlannedVersion;
 const setCachedPlannedVersion = version => {
   cachedPlannedVersion = version;
 };
-exports.setCachedPlannedVersion = setCachedPlannedVersion;
+exports.setCachedPlannedVersion = setCachedPlannedVersion;
+const getCachedMigratorFunctions = () => cachedMigratorFunctions;
+exports.getCachedMigratorFunctions = getCachedMigratorFunctions;
+const setCachedMigratorFunctions = scripts => {
+  cachedMigratorFunctions = scripts;
+};
+exports.setCachedMigratorFunctions = setCachedMigratorFunctions;

package/dist/plan/plan.js

@@ -3,8 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.writePlan = exports.sortPlanEntries = exports.readPlan = exports.parsePlan = exports.getPlannedMigrations = exports.getNextSequenceString = exports.generatePlanEntries = exports.formatJSON = void 0;
+exports.writePlan = exports.sortPlanEntries = exports.readPlan = exports.parsePlan = 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");
 var _moduleFromString = require("module-from-string");
 var _hash = require("../hash/hash");
@@ -130,6 +131,26 @@ const generatePlanEntries = sortedMigrationEntries => sortedMigrationEntries.map
   sequence: m.sequence
 }));
 exports.generatePlanEntries = generatePlanEntries;
+const loadMigrationFunctions = async (sortedMigrationEntries, currentPlanVersion) => {
+  const cachedPlannedVersion = (0, _cachedPlannedVersion.getCachedPlannedVersion)();
+  const cachedMigratorFunctions = (0, _cachedPlannedVersion.getCachedMigratorFunctions)();
+  const cacheValid = cachedPlannedVersion === currentPlanVersion && 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;
+    return {
+      fileHash: m.fileHash,
+      migrator
+    };
+  }));
+  if (!cacheValid) {
+    (0, _cachedPlannedVersion.setCachedMigratorFunctions)(migrationFunctions);
+  }
+  return (0, _lodash.merge)(sortedMigrationEntries, migrationFunctions);
+};
+exports.loadMigrationFunctions = loadMigrationFunctions;
 const getPlannedMigrations = async ({
   config
 }) => {
@@ -173,7 +194,6 @@ const getPlannedMigrations = async ({
     const script = filePath ? await _fs.promises.readFile(filePath, {
       encoding: 'utf8'
     }) : null;
-    const migrator = script && importModule ? (await (0, _moduleFromString.importFromString)(script))?.default : null;
     const fileHash = script ? (0, _hash.hash)(script) : null;
 
     //skipped files
@@ -195,7 +215,6 @@ const getPlannedMigrations = async ({
       filePath,
       isValidFileName,
       script,
-      migrator,
       fileHash,
       skippedFileHashes
     };
@@ -234,9 +253,10 @@ const getPlannedMigrations = async ({
     }];
     await (0, _database.insertVersions)(database, pgpHelpers, entity, versionRecord);
   }
-  (0, _cachedPlannedVersion.setCachedPlannedVersion)(nextVersion);
+  const plannedMigrationsWithFunctions = importModule ? await loadMigrationFunctions(plannedMigrationsWithFileEntries, nextVersion, importModule) : plannedMigrationsWithFileEntries;
+  (0, _cachedPlannedVersion.setCachedPlannedVersion)(nextVersion); //Must set _after_ loading migration functions
   return {
-    plannedMigrations: plannedMigrationsWithHistory,
+    plannedMigrations: plannedMigrationsWithFunctions,
     nextVersion
   };
 };

package/package.json

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