node-power-user 0.0.18 → 0.0.21

package/README.md

@@ -47,6 +47,7 @@ Note: you may have to run cli commands with `npx npu <command>` if you install t
     * `npu bump 1`: Bump the last number (`patch` version).
     * `npu bump 2`: Bump the middle number (`minor` version).
     * `npu bump 3`: Bump the first number (`major` version).
+  * `npu match`: Compare the versions of installed modules to those in your package.json
 
 ## Final Words
 If you are still having difficulty, we would love for you to post a question to [the Node Power User issues page](https://github.com/itw-creative-works/node-power-user/issues). It is much easier to answer questions that include your code and relevant files! So if you can provide them, we'd be extremely grateful (and more likely to help you find the answer!)

package/dist/index.js

@@ -4,7 +4,6 @@
 
 // https://www.sitepoint.com/javascript-command-line-interface-cli-node-js/
 // https://github.com/sitepoint-editors/ginit
-
 const jetpack = require('fs-jetpack');
 const chalk = require('chalk');
 const _ = require('lodash');
@@ -13,13 +12,15 @@ const path = require('path');
 const { spawn, exec } = require('child_process');
 const argv = require('yargs').argv;
 const JSON5 = require('json5');
+const { isEqual } = require('lodash');
+// const npm = require('npm');
 
 function Main() {
 
 }
 
 Main.prototype.process = async function (args) {
-  const self = this;
+const self = this;
   args = args || process.argv
   self.options = {};
   self.argv = argv;
@@ -27,10 +28,7 @@ Main.prototype.process = async function (args) {
   try {
     self.npu_packageJSON = require('../package.json');
   } catch (e) {
-    self.npu_packageJSON = {
-      version: '0.0.0'
-    }
-    console.error(chalk.red(`This project does not contain a valid package.json file!: \n${e}`));
+    throw new Error(`NPU does not contain a valid package.json file!: \n${e}`);
   }
 
   try {
@@ -38,8 +36,14 @@ Main.prototype.process = async function (args) {
     self.proj_packageJSONPath = path.resolve(self.proj_path, './package.json');
     self.proj_packageJSON = require(self.proj_packageJSONPath);
   } catch (e) {
-    console.error(chalk.red(`Could not read package.json: ${e}`));
-    return
+    self.proj_packageJSON = {
+      name: 'Unknown Name',
+      version: '0.0.0',
+      dependencies: {},
+      devDependencies: {},
+      peerDependencies: {},
+    }
+    console.error(chalk.red(`This project does not contain a valid package.json file!: \n${e}`));
   }
 
   if (Array.isArray(args)) {
@@ -64,11 +68,12 @@ Main.prototype.process = async function (args) {
 
   if (self.options.pv || self.options['project-version'] || self.options.project) {
     self.log(chalk.blue(`The current project (${chalk.bold(self.proj_packageJSON.name)}) is v${chalk.bold(self.proj_packageJSON.version)}`));
-    return self.proj_packageJSON.versio
+    return self.proj_packageJSON.version;
   }
 
   if (self.options.lp || self.options.listpackages || self.options['-lp'] || self.options['--listpackages']) {
     self.log(chalk.blue.bold(`Dependencies:`));
+   
     Object.keys(self.proj_packageJSON.dependencies || {})
     .forEach((dep, i) => {
       self.log(chalk.blue(`${dep} @ ${self.proj_packageJSON.dependencies[dep]}`));
@@ -93,6 +98,42 @@ Main.prototype.process = async function (args) {
     };
   }
 
+  if (self.options.mm || self.options.matchmodules || self.options.match || self.options['-mm'] || self.options['--matchmodules'] || self.options['--match']) {
+    self.log(chalk.blue.bold(`Match:`));
+
+    const response = {};
+    const isEqualFn = require('semver/functions/eq')
+    const coerceFn = require('semver/functions/coerce')
+    
+    Object.keys(self.proj_packageJSON.dependencies || {})
+    .forEach(async (dep, i) => {
+      const packageVersion = coerceFn(self.proj_packageJSON.dependencies[dep]);
+      const installedVersion = coerceFn(
+        (await asyncCommand(`npm list ${dep} --depth=0 | grep ${dep}`))
+          .split(' ')[1]
+          .split('@')[1]
+      );
+      const isEqual = isEqualFn(installedVersion, packageVersion);
+      const verb = isEqual ? 'green' : 'yellow'
+
+      response[dep] = {
+        isEqual: isEqual,
+        package: packageVersion,
+        installed: installedVersion,
+      }
+
+      self.log(chalk[verb](`${dep}: ${packageVersion} = ${installedVersion}`));
+    });
+
+    // self.log(chalk.blue.bold(`\nDev Dependencies:`));
+    // Object.keys(self.proj_packageJSON.devDependencies || {})
+    // .forEach((dep, i) => {
+    //   self.log(chalk.blue(`${dep} @ ${self.proj_packageJSON.devDependencies[dep]}`));
+    // });
+
+    return response;  
+  }
+
   if (self.options.clean) {
     const NPM_INSTALL_FLAG = self.options['--no-optional'] || self.options['-no-optional'] || self.options['no-optional'] ? '--no-optional' : ''
     const NPM_CLEAN = `rm -fr node_modules && rm -fr package-lock.json && npm cache clean --force && npm install ${NPM_INSTALL_FLAG} && npm rb`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-power-user",
-  "version": "0.0.18",
+  "version": "0.0.21",
   "description": "Easy tools for every Node.js developer!",
   "main": "dist/index.js",
   "bin": {
@@ -29,10 +29,10 @@
   },
   "homepage": "https://itwcreativeworks.com",
   "dependencies": {
-    "chalk": "^4.1.0",
+    "chalk": "^4.1.2",
     "fs-jetpack": "^4.3.1",
-    "inquirer": "^8.0.0",
-    "json5": "^2.2.0",
+    "inquirer": "^8.2.4",
+    "json5": "^2.2.1",
     "keychain": "^1.3.0",
     "lodash": "^4.17.21",
     "semver": "^7.3.7",
@@ -44,6 +44,6 @@
   ],
   "devDependencies": {
     "mocha": "^8.4.0",
-    "prepare-package": "^0.0.12"
+    "prepare-package": "^0.0.13"
   }
-}
+}

package/src/index.js

@@ -4,7 +4,6 @@
 
 // https://www.sitepoint.com/javascript-command-line-interface-cli-node-js/
 // https://github.com/sitepoint-editors/ginit
-
 const jetpack = require('fs-jetpack');
 const chalk = require('chalk');
 const _ = require('lodash');
@@ -13,13 +12,15 @@ const path = require('path');
 const { spawn, exec } = require('child_process');
 const argv = require('yargs').argv;
 const JSON5 = require('json5');
+const { isEqual } = require('lodash');
+// const npm = require('npm');
 
 function Main() {
 
 }
 
 Main.prototype.process = async function (args) {
-  const self = this;
+const self = this;
   args = args || process.argv
   self.options = {};
   self.argv = argv;
@@ -27,10 +28,7 @@ Main.prototype.process = async function (args) {
   try {
     self.npu_packageJSON = require('../package.json');
   } catch (e) {
-    self.npu_packageJSON = {
-      version: '0.0.0'
-    }
-    console.error(chalk.red(`This project does not contain a valid package.json file!: \n${e}`));
+    throw new Error(`NPU does not contain a valid package.json file!: \n${e}`);
   }
 
   try {
@@ -38,8 +36,14 @@ Main.prototype.process = async function (args) {
     self.proj_packageJSONPath = path.resolve(self.proj_path, './package.json');
     self.proj_packageJSON = require(self.proj_packageJSONPath);
   } catch (e) {
-    console.error(chalk.red(`Could not read package.json: ${e}`));
-    return
+    self.proj_packageJSON = {
+      name: 'Unknown Name',
+      version: '0.0.0',
+      dependencies: {},
+      devDependencies: {},
+      peerDependencies: {},
+    }
+    console.error(chalk.red(`This project does not contain a valid package.json file!: \n${e}`));
   }
 
   if (Array.isArray(args)) {
@@ -64,11 +68,12 @@ Main.prototype.process = async function (args) {
 
   if (self.options.pv || self.options['project-version'] || self.options.project) {
     self.log(chalk.blue(`The current project (${chalk.bold(self.proj_packageJSON.name)}) is v${chalk.bold(self.proj_packageJSON.version)}`));
-    return self.proj_packageJSON.versio
+    return self.proj_packageJSON.version;
   }
 
   if (self.options.lp || self.options.listpackages || self.options['-lp'] || self.options['--listpackages']) {
     self.log(chalk.blue.bold(`Dependencies:`));
+   
     Object.keys(self.proj_packageJSON.dependencies || {})
     .forEach((dep, i) => {
       self.log(chalk.blue(`${dep} @ ${self.proj_packageJSON.dependencies[dep]}`));
@@ -93,6 +98,42 @@ Main.prototype.process = async function (args) {
     };
   }
 
+  if (self.options.mm || self.options.matchmodules || self.options.match || self.options['-mm'] || self.options['--matchmodules'] || self.options['--match']) {
+    self.log(chalk.blue.bold(`Match:`));
+
+    const response = {};
+    const isEqualFn = require('semver/functions/eq')
+    const coerceFn = require('semver/functions/coerce')
+    
+    Object.keys(self.proj_packageJSON.dependencies || {})
+    .forEach(async (dep, i) => {
+      const packageVersion = coerceFn(self.proj_packageJSON.dependencies[dep]);
+      const installedVersion = coerceFn(
+        (await asyncCommand(`npm list ${dep} --depth=0 | grep ${dep}`))
+          .split(' ')[1]
+          .split('@')[1]
+      );
+      const isEqual = isEqualFn(installedVersion, packageVersion);
+      const verb = isEqual ? 'green' : 'yellow'
+
+      response[dep] = {
+        isEqual: isEqual,
+        package: packageVersion,
+        installed: installedVersion,
+      }
+
+      self.log(chalk[verb](`${dep}: ${packageVersion} = ${installedVersion}`));
+    });
+
+    // self.log(chalk.blue.bold(`\nDev Dependencies:`));
+    // Object.keys(self.proj_packageJSON.devDependencies || {})
+    // .forEach((dep, i) => {
+    //   self.log(chalk.blue(`${dep} @ ${self.proj_packageJSON.devDependencies[dep]}`));
+    // });
+
+    return response;  
+  }
+
   if (self.options.clean) {
     const NPM_INSTALL_FLAG = self.options['--no-optional'] || self.options['-no-optional'] || self.options['no-optional'] ? '--no-optional' : ''
     const NPM_CLEAN = `rm -fr node_modules && rm -fr package-lock.json && npm cache clean --force && npm install ${NPM_INSTALL_FLAG} && npm rb`;