@oliasoft-open-source/node-json-migrator 2.3.4 → 2.3.5-beta-1

package/dist/hash/hash.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.hash = void 0;
-var crypto = _interopRequireWildcard(require("crypto"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var _crypto = require("crypto");
 /**
  * Generate SHA256 hash from a string
  *
@@ -14,5 +12,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * @returns {String} SHA256 hash
  */
 
-const hash = string => crypto.createHash('sha256').update(string).digest('hex');
+const hash = string => (0, _crypto.createHash)('sha256').update(string).digest('hex');
 exports.hash = hash;

package/dist/migrate/migrate.js

@@ -51,9 +51,8 @@ const migrate = async ({
   } = await (0, _pending.getPendingMigrators)({
     config
   });
-  const nextPayload = (0, _pipe.pipe)(pendingMigrators, payload);
   return {
-    nextPayload,
+    nextPayload: pendingMigrators.length ? (0, _pipe.pipe)(pendingMigrators, payload) : payload,
     nextVersion
   };
 };

package/dist/pending/pending.js

@@ -67,7 +67,7 @@ const getPendingMigrators = async ({
   });
   return {
     pendingMigrators,
-    nextVersion
+    nextVersion: plannedMigrations.length < executedMigrations.length ? version : nextVersion
   };
 };
 exports.getPendingMigrators = getPendingMigrators;

package/dist/plan/plan.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.writePlan = exports.sortPlanEntries = exports.readPlan = exports.parsePlan = exports.getPlannedMigrations = exports.getNextSequenceString = exports.generatePlanEntries = void 0;
+exports.writePlan = exports.sortPlanEntries = exports.readPlan = exports.parsePlan = exports.getPlannedMigrations = exports.getNextSequenceString = exports.generatePlanEntries = exports.formatJSON = void 0;
 var _path = _interopRequireDefault(require("path"));
 var _fs = require("fs");
 var _moduleFromString = require("module-from-string");
@@ -13,7 +13,16 @@ var _validator = require("./validator");
 var _database = require("../database/database");
 var _cachedPlannedVersion = require("./cached-planned-version");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * Format JSON with 2-space indentation
+ *
+ * @param {String} json
+ * @returns {String} formatted json
+ */
+const formatJSON = json => JSON.stringify(JSON.parse(json), null, 2);
+
 //https://stackoverflow.com/a/31102605/942635
+exports.formatJSON = formatJSON;
 const sortEntry = entry => Object.keys(entry).sort().reduce((obj, key) => {
   obj[key] = entry[key];
   return obj;
@@ -60,9 +69,9 @@ const readPlan = async directory => {
     plan = await _fs.promises.readFile(`${directory}/plan.json`, {
       encoding: 'utf8'
     });
-    return plan;
+    return formatJSON(plan);
   } catch {
-    return '[]';
+    throw new Error('Invalid JSON for migrator plan.js (unable to parse file)');
   }
 };
 

package/dist/plan/planned-version.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getPlannedVersion = void 0;
-var _fs = require("fs");
 var _hash = require("../hash/hash");
 var _plan = require("./plan");
 var _cachedPlannedVersion = require("./cached-planned-version");
@@ -14,9 +13,7 @@ const getPlannedVersion = async ({
   const {
     directory
   } = config;
-  const currentPlan = await _fs.promises.readFile(`${directory}/plan.json`, {
-    encoding: 'utf8'
-  });
+  const currentPlan = await (0, _plan.readPlan)(directory);
   const plannedVersion = (0, _hash.hash)(currentPlan);
   const cachedPlannedVersion = (0, _cachedPlannedVersion.getCachedPlannedVersion)();
   return cachedPlannedVersion === plannedVersion ? cachedPlannedVersion : (await (0, _plan.getPlannedMigrations)({

package/package.json

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