Merge remote-tracking branch 'prashantswami/master'

# Conflicts: # package-lock.json # package.json
seppevs · Jan 29, 2025 · b08b924 · b08b924
2 parents 64b5a1f + 8156b4b
commit b08b924
Show file tree

Hide file tree

Showing 9 changed files with 3,123 additions and 4,049 deletions.
diff --git a/bin/migrate-mongo.js b/bin/migrate-mongo.js
@@ -1,7 +1,8 @@
 #! /usr/bin/env node
 
 const program = require("commander");
-const _ = require("lodash");
+const _isEmpty = require("lodash.isempty");
+const _values = require("lodash.values");
 const Table = require("cli-table3");
 const migrateMongo = require("../lib/migrate-mongo");
 const pkgjson = require("../package.json");
@@ -21,7 +22,7 @@ function printStatusTable(statusItems) {
   return migrateMongo.config.read().then(config => {
     const useFileHash = config.useFileHash === true;
     const table = new Table({ head: useFileHash ? ["Filename", "Hash", "Applied At"] : ["Filename", "Applied At"]});
-    statusItems.forEach(item => table.push(_.values(item)));
+    statusItems.forEach(item => table.push(_values(item)));
     console.log(table.toString());
   })
 
@@ -123,6 +124,6 @@ program
 
 program.parse(process.argv);
 
-if (_.isEmpty(program.rawArgs)) {
+if (_isEmpty(program.rawArgs)) {
   program.outputHelp();
 }
diff --git a/lib/actions/down.js b/lib/actions/down.js
@@ -1,4 +1,4 @@
-const _ = require("lodash");
+const _last = require("lodash.last");
 const { promisify } = require("util");
 const fnArgs = require('fn-args');
 
@@ -11,7 +11,7 @@ module.exports = async (db, client) => {
   const downgraded = [];
   const statusItems = await status(db);
   const appliedItems = statusItems.filter(item => item.appliedAt !== "PENDING");
-  const lastAppliedItem = _.last(appliedItems);
+  const lastAppliedItem = _last(appliedItems);
 
   if (lastAppliedItem) {
     try {

diff --git a/lib/actions/status.js b/lib/actions/status.js
@@ -1,4 +1,4 @@
-const { find } = require("lodash");
+const _find = require("lodash.find");
 const migrationsDir = require("../env/migrationsDir");
 const config = require("../env/config");
 
@@ -20,7 +20,7 @@ module.exports = async db => {
       fileHash = await migrationsDir.loadFileHash(fileName);
       findTest = { fileName, fileHash };
     }
-    const itemInLog = find(changelog, findTest);
+    const itemInLog = _find(changelog, findTest);
     const appliedAt = itemInLog ? itemInLog.appliedAt.toJSON() : "PENDING";
     return useFileHash ? { fileName, fileHash, appliedAt } : { fileName, appliedAt };
   }));

diff --git a/lib/actions/up.js b/lib/actions/up.js
@@ -1,4 +1,4 @@
-const _ = require("lodash");
+const _filter = require("lodash.filter");
 const pEachSeries = require("p-each-series");
 const { promisify } = require("util");
 const fnArgs = require('fn-args');
@@ -10,7 +10,7 @@ const hasCallback = require('../utils/has-callback');
 
 module.exports = async (db, client) => {
   const statusItems = await status(db);
-  const pendingItems = _.filter(statusItems, { appliedAt: "PENDING" });
+  const pendingItems = _filter(statusItems, { appliedAt: "PENDING" });
   const migrated = [];
 
   const migrateItem = async item => {

diff --git a/lib/env/config.js b/lib/env/config.js
@@ -1,15 +1,15 @@
 const fs = require("fs-extra");
 const path = require("path");
 const url = require("url");
-const { get } = require("lodash");
+const _get  = require("lodash.get");
 const moduleLoader = require('../utils/module-loader');
 
 const DEFAULT_CONFIG_FILE_NAME = "migrate-mongo-config.js";
 
 let customConfigContent = null;
 
 function getConfigPath() {
-  const fileOptionValue = get(global.options, "file");
+  const fileOptionValue = _get(global.options, "file");
   if (!fileOptionValue) {
     return path.join(process.cwd(), DEFAULT_CONFIG_FILE_NAME);
   }

diff --git a/lib/env/database.js b/lib/env/database.js
@@ -1,13 +1,13 @@
 const { MongoClient } = require("mongodb");
-const _ = require("lodash");
+const _get = require("lodash.get");
 const config = require("./config");
 
 module.exports = {
   async connect() {
     const configContent = await config.read();
-    const url = _.get(configContent, "mongodb.url");
-    const databaseName = _.get(configContent, "mongodb.databaseName");
-    const options = _.get(configContent, "mongodb.options");
+    const url = _get(configContent, "mongodb.url");
+    const databaseName = _get(configContent, "mongodb.databaseName");
+    const options = _get(configContent, "mongodb.options");
 
     if (!url) {
       throw new Error("No `url` defined in config file!");

diff --git a/lib/utils/has-callback.js b/lib/utils/has-callback.js
@@ -1,10 +1,10 @@
 const fnArgs = require('fn-args');
-const { last } = require('lodash');
+const _last = require('lodash.last');
 
 module.exports = (func) => {
 
   const argNames = fnArgs(func);
-  const lastArgName = last(argNames);
+  const lastArgName = _last(argNames);
 
   return [
     'callback',