node-power-user 0.0.22 → 0.0.25

package/dist/index.js

@@ -13,6 +13,12 @@ const { spawn, exec } = require('child_process');
 const argv = require('yargs').argv;
 const JSON5 = require('json5');
 const { isEqual } = require('lodash');
+const semverIsEqual = require('semver/functions/eq')
+const semverCoerce = require('semver/functions/coerce')
+const table = require('table').table;
+const Npm = require('npm-api');
+const os = require('os');
+
 // const npm = require('npm');
 
 function Main() {
@@ -99,45 +105,183 @@ const self = this;
   }
 
   if (self.options.out || self.options.outdated || self.options.match || self.options['-o'] || self.options['--outdated'] || self.options['--match']) {
-    self.log(chalk.blue.bold(`Match:`));
+    // self.log(chalk.blue.bold(`Outdated:`));
+    // self.log(chalk.green(`name: package = installed`));
+
+    const data = [
+      ['Package', 'package.json', 'Intalled', 'Latest'],
+    ];
+
+    const config = {
+      columnDefault: {
+        width: 10,
+      },
+      header: {
+        alignment: 'center',
+        content: 'Outdated and mismatched packages',
+      },
+    }       
 
     const response = {};
-    const isEqualFn = require('semver/functions/eq')
-    const coerceFn = require('semver/functions/coerce')
+
+    const depKeys = Object.keys(self.proj_packageJSON.dependencies || {});
+
+    let bumpCommand = '';
     
-    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]
+    for (var i = 0; i < depKeys.length; i++) {
+      const dep = depKeys[i];
+      const packageVersion = _coerce(self.proj_packageJSON.dependencies[dep]);
+      const installedVersion = _coerce(
+        _getVersion(
+          (await asyncCommand(`npm list ${dep} --depth=0 | grep ${dep}`))
+            .split(' ')[1]
+        )
       );
-      const isEqual = isEqualFn(installedVersion, packageVersion);
-      const verb = isEqual ? 'green' : 'yellow'
+      const latestVersion = await getLatestVersion(dep);
+      const isEqual = _isEqual(installedVersion, packageVersion);
+      const isLatest = _isEqual(packageVersion, latestVersion);
+      const verbLocal = isEqual ? 'green' : 'yellow';
+      const verbRemote = isLatest ? 'green' : 'red';
+
+      if (!isEqual) {
+        bumpCommand += `npm i ${dep}@${installedVersion} && `
+      }
+
+      // function _color(array) {
+      //   array.forEach((item, i) => {
+      //     array[i] = chalk[verb](item);
+      //   });
+      //   return array;
+      // }
+      // data.push(_color([ dep, packageVersion, installedVersion, latestVersion]))
+
+      // function _color(s) {
+      //   return chalk[verb](s);
+      // }
+
+      data.push([
+        dep, 
+        packageVersion, 
+        chalk[verbLocal](installedVersion), 
+        chalk[verbRemote](latestVersion), 
+      ])
 
       response[dep] = {
         isEqual: isEqual,
+        isLatest: isLatest,
         package: packageVersion,
         installed: installedVersion,
+        latest: latestVersion,
       }
 
-      self.log(chalk[verb](`${dep}: ${packageVersion} = ${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]}`));
-    // });
+    // }); 
+
+    console.log(table(data, config));
+
+    if (bumpCommand) {
+      bumpCommand = bumpCommand.replace(/&&\s$/ig, '')
+      inquirer.prompt([
+        {
+          type: 'confirm',
+          name: 'bump',
+          message: 'Would you like to bump the package.json versions?',
+          default: true,
+        }
+      ])
+      .then(async (answer) => {
+        if (answer.bump) {
+          asyncCommand(bumpCommand);
+        } else {
+        }
+      })           
+    } 
 
     return response;  
   }
 
+  if (self.options.global || self.options['-g'] || self.options['--global']) {
+    const parentPath = `/Users/${os.userInfo().username}/.nvm/versions/node`;
+    const versions = jetpack.list(parentPath);
+    const currentNode = process.versions.node;
+
+    const response = {};
+
+    // console.log(chalk.bold.blue('NVM Global Modules'));
+
+    for (var i = 0; i < versions.length; i++) {
+      try {
+        const parsed = semverCoerce(versions[i]);
+        const lib = path.resolve(parentPath, `v${parsed.version}`, 'lib', 'node_modules');
+
+        const modules = jetpack.list(lib);
+
+        const data = [
+          ['Package', 'package.json', 'latest'],
+        ];
+
+        const config = {
+          columnDefault: {
+            width: 10,
+          },
+          header: {
+            alignment: 'center',
+            content: `Global packages for v${parsed.version}`,
+          },
+        }    
+
+        response[parsed.version] = {};
+
+        for (var j = 0; j < modules.length; j++) {
+          const mod = modules[j];
+          const packagePath = path.resolve(lib, mod, 'package.json');
+          try {
+            const package = require(packagePath);  
+
+            const packageVersion = package.version;
+            const latestVersion = await getLatestVersion(mod);
+            // const isEqual = _isEqual(installedVersion, packageVersion);
+            const isLatest = _isEqual(packageVersion, latestVersion);
+            // const verbLocal = isEqual ? 'green' : 'yellow';
+            const verbRemote = isLatest ? 'green' : 'red';            
+
+            data.push([
+              mod, 
+              packageVersion,
+              chalk[verbRemote](latestVersion),
+            ]);
+
+            response[parsed.version][mod] = {
+              packageVersion: packageVersion,
+              latestVersion: latestVersion,
+            }       
+          } catch (e) {
+            
+          }
+        }
+
+        console.log(table(data, config));
+
+      } catch (e) {
+        
+      }
+    }
+
+    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`;
+    
     self.log(chalk.blue(`Running: ${NPM_CLEAN}...`));
+    
     return await asyncCommand(NPM_CLEAN)
     .then(r => {
       self.log(chalk.green(`Finished cleaning`));
@@ -210,3 +354,38 @@ async function asyncCommand(command) {
     });
   });
 }
+
+function _coerce(v) {
+  try {
+    return semverCoerce(v)
+  } catch (e) {
+    return '0.0.0'
+  }
+}
+
+function _isEqual(v1, v2) {
+  try {
+    return semverIsEqual(v1, v2)
+  } catch (e) {
+    return false;
+  }
+}
+
+function _getVersion(v) {
+  v = v.split('@');
+  return v[v.length - 1]
+}
+
+function getLatestVersion(package) {
+  return new Promise(function(resolve, reject) {
+    const npm = new Npm();
+    
+    npm.repo(package)
+    .package()
+      .then(function(pkg) {
+        resolve(pkg.version);
+      }, function(err) {
+        resolve('?');
+      });      
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-power-user",
-  "version": "0.0.22",
+  "version": "0.0.25",
   "description": "Easy tools for every Node.js developer!",
   "main": "dist/index.js",
   "bin": {
@@ -11,7 +11,7 @@
   "scripts": {
     "test": "npm run prepare && ./node_modules/mocha/bin/mocha test/ --recursive --timeout=10000",
     "start": "npm run prepare && node -e 'new (require(`./dist/index.js`))().process()'",
-    "prepare": "node -e 'require(`prepare-package`)'"
+    "prepare": "node -e 'require(`prepare-package`)()'"
   },
   "repository": {
     "type": "git",
@@ -35,7 +35,9 @@
     "json5": "^2.2.1",
     "keychain": "^1.3.0",
     "lodash": "^4.17.21",
+    "npm-api": "^1.0.1",
     "semver": "^7.3.7",
+    "table": "^6.8.0",
     "yargs": "^16.2.0"
   },
   "files": [
@@ -44,6 +46,6 @@
   ],
   "devDependencies": {
     "mocha": "^8.4.0",
-    "prepare-package": "^0.0.13"
+    "prepare-package": "^0.0.16"
   }
-}
+}

package/src/index.js

@@ -13,6 +13,12 @@ const { spawn, exec } = require('child_process');
 const argv = require('yargs').argv;
 const JSON5 = require('json5');
 const { isEqual } = require('lodash');
+const semverIsEqual = require('semver/functions/eq')
+const semverCoerce = require('semver/functions/coerce')
+const table = require('table').table;
+const Npm = require('npm-api');
+const os = require('os');
+
 // const npm = require('npm');
 
 function Main() {
@@ -99,45 +105,183 @@ const self = this;
   }
 
   if (self.options.out || self.options.outdated || self.options.match || self.options['-o'] || self.options['--outdated'] || self.options['--match']) {
-    self.log(chalk.blue.bold(`Match:`));
+    // self.log(chalk.blue.bold(`Outdated:`));
+    // self.log(chalk.green(`name: package = installed`));
+
+    const data = [
+      ['Package', 'package.json', 'Intalled', 'Latest'],
+    ];
+
+    const config = {
+      columnDefault: {
+        width: 10,
+      },
+      header: {
+        alignment: 'center',
+        content: 'Outdated and mismatched packages',
+      },
+    }       
 
     const response = {};
-    const isEqualFn = require('semver/functions/eq')
-    const coerceFn = require('semver/functions/coerce')
+
+    const depKeys = Object.keys(self.proj_packageJSON.dependencies || {});
+
+    let bumpCommand = '';
     
-    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]
+    for (var i = 0; i < depKeys.length; i++) {
+      const dep = depKeys[i];
+      const packageVersion = _coerce(self.proj_packageJSON.dependencies[dep]);
+      const installedVersion = _coerce(
+        _getVersion(
+          (await asyncCommand(`npm list ${dep} --depth=0 | grep ${dep}`))
+            .split(' ')[1]
+        )
       );
-      const isEqual = isEqualFn(installedVersion, packageVersion);
-      const verb = isEqual ? 'green' : 'yellow'
+      const latestVersion = await getLatestVersion(dep);
+      const isEqual = _isEqual(installedVersion, packageVersion);
+      const isLatest = _isEqual(packageVersion, latestVersion);
+      const verbLocal = isEqual ? 'green' : 'yellow';
+      const verbRemote = isLatest ? 'green' : 'red';
+
+      if (!isEqual) {
+        bumpCommand += `npm i ${dep}@${installedVersion} && `
+      }
+
+      // function _color(array) {
+      //   array.forEach((item, i) => {
+      //     array[i] = chalk[verb](item);
+      //   });
+      //   return array;
+      // }
+      // data.push(_color([ dep, packageVersion, installedVersion, latestVersion]))
+
+      // function _color(s) {
+      //   return chalk[verb](s);
+      // }
+
+      data.push([
+        dep, 
+        packageVersion, 
+        chalk[verbLocal](installedVersion), 
+        chalk[verbRemote](latestVersion), 
+      ])
 
       response[dep] = {
         isEqual: isEqual,
+        isLatest: isLatest,
         package: packageVersion,
         installed: installedVersion,
+        latest: latestVersion,
       }
 
-      self.log(chalk[verb](`${dep}: ${packageVersion} = ${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]}`));
-    // });
+    // }); 
+
+    console.log(table(data, config));
+
+    if (bumpCommand) {
+      bumpCommand = bumpCommand.replace(/&&\s$/ig, '')
+      inquirer.prompt([
+        {
+          type: 'confirm',
+          name: 'bump',
+          message: 'Would you like to bump the package.json versions?',
+          default: true,
+        }
+      ])
+      .then(async (answer) => {
+        if (answer.bump) {
+          asyncCommand(bumpCommand);
+        } else {
+        }
+      })           
+    } 
 
     return response;  
   }
 
+  if (self.options.global || self.options['-g'] || self.options['--global']) {
+    const parentPath = `/Users/${os.userInfo().username}/.nvm/versions/node`;
+    const versions = jetpack.list(parentPath);
+    const currentNode = process.versions.node;
+
+    const response = {};
+
+    // console.log(chalk.bold.blue('NVM Global Modules'));
+
+    for (var i = 0; i < versions.length; i++) {
+      try {
+        const parsed = semverCoerce(versions[i]);
+        const lib = path.resolve(parentPath, `v${parsed.version}`, 'lib', 'node_modules');
+
+        const modules = jetpack.list(lib);
+
+        const data = [
+          ['Package', 'package.json', 'latest'],
+        ];
+
+        const config = {
+          columnDefault: {
+            width: 10,
+          },
+          header: {
+            alignment: 'center',
+            content: `Global packages for v${parsed.version}`,
+          },
+        }    
+
+        response[parsed.version] = {};
+
+        for (var j = 0; j < modules.length; j++) {
+          const mod = modules[j];
+          const packagePath = path.resolve(lib, mod, 'package.json');
+          try {
+            const package = require(packagePath);  
+
+            const packageVersion = package.version;
+            const latestVersion = await getLatestVersion(mod);
+            // const isEqual = _isEqual(installedVersion, packageVersion);
+            const isLatest = _isEqual(packageVersion, latestVersion);
+            // const verbLocal = isEqual ? 'green' : 'yellow';
+            const verbRemote = isLatest ? 'green' : 'red';            
+
+            data.push([
+              mod, 
+              packageVersion,
+              chalk[verbRemote](latestVersion),
+            ]);
+
+            response[parsed.version][mod] = {
+              packageVersion: packageVersion,
+              latestVersion: latestVersion,
+            }       
+          } catch (e) {
+            
+          }
+        }
+
+        console.log(table(data, config));
+
+      } catch (e) {
+        
+      }
+    }
+
+    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`;
+    
     self.log(chalk.blue(`Running: ${NPM_CLEAN}...`));
+    
     return await asyncCommand(NPM_CLEAN)
     .then(r => {
       self.log(chalk.green(`Finished cleaning`));
@@ -210,3 +354,38 @@ async function asyncCommand(command) {
     });
   });
 }
+
+function _coerce(v) {
+  try {
+    return semverCoerce(v)
+  } catch (e) {
+    return '0.0.0'
+  }
+}
+
+function _isEqual(v1, v2) {
+  try {
+    return semverIsEqual(v1, v2)
+  } catch (e) {
+    return false;
+  }
+}
+
+function _getVersion(v) {
+  v = v.split('@');
+  return v[v.length - 1]
+}
+
+function getLatestVersion(package) {
+  return new Promise(function(resolve, reject) {
+    const npm = new Npm();
+    
+    npm.repo(package)
+    .package()
+      .then(function(pkg) {
+        resolve(pkg.version);
+      }, function(err) {
+        resolve('?');
+      });      
+  });
+}