node-power-user 0.0.32 → 0.0.34

package/dist/index.js

@@ -24,6 +24,14 @@ const os = require('os');
 // const npm = require('npm');
 
 function Main() {
+  const self = this;
+  
+  self.options = {};
+  self.npu_packageJSON = {};
+  self.proj_path = null;
+  self.proj_packageJSONPath = null;
+  self.proj_packageJSON = {};
+  self.proj_allDependencies = {};
 
 }
 
@@ -43,8 +51,9 @@ Main.prototype.process = async function (options) {
     self.proj_path = process.cwd();
     self.proj_packageJSONPath = path.resolve(self.proj_path, './package.json');
     self.proj_packageJSON = require(self.proj_packageJSONPath);
-    self.proj_packageJSON.allDependencies = _.merge({}, self.proj_packageJSON.peerDependencies, self.proj_packageJSON.devDependencies, self.proj_packageJSON.dependencies);
-    self.proj_packageJSON.allDependenciesKeys = Object.keys(self.proj_packageJSON.allDependencies);
+    self.proj_allDependencies.pairs = _.merge({}, self.proj_packageJSON.peerDependencies, self.proj_packageJSON.devDependencies, self.proj_packageJSON.dependencies);
+    self.proj_allDependencies.list = Object.keys(self.proj_allDependencies.pairs);
+
   } catch (e) {
     self.proj_packageJSON = {
       name: 'Unknown Name',
@@ -140,22 +149,26 @@ Main.prototype.process = async function (options) {
       },
     }  
     const progress = new ProgressBar.SingleBar({}, ProgressBar.Presets.shades_classic);
-    progress.start(self.proj_packageJSON.allDependenciesKeys.length, 0);
+    progress.start(self.proj_allDependencies.list.length, 0);
 
     const response = {};
 
     let bumpCommand = '';
 
-    for (var i = 0; i < self.proj_packageJSON.allDependenciesKeys.length; i++) {
+    for (var i = 0; i < self.proj_allDependencies.list.length; i++) {
       progress.update(i);
-      const dep = self.proj_packageJSON.allDependenciesKeys[i];
-      const packageVersion = _coerce(self.proj_packageJSON.allDependencies[dep]);
+      const dep = self.proj_allDependencies.list[i];
+      const depPair = self.proj_allDependencies.pairs[dep];
+      const packageVersion = _coerce(depPair);
       const installedVersion = _coerce(
-        _getVersion(
-          (await asyncCommand(`npm list ${dep} --depth=0 | grep ${dep}`))
-            .split(' ')[1]
+        _getListVersion(
+          (await asyncCommand(`npm list ${dep} --depth=0 | grep ${dep}`)).split(' ')
         )
       );
+
+      // console.log('---', dep, depPair, _.get(packageVersion, 'version'), _.get(installedVersion, 'version'));
+
+      // console.log('---dep', dep, packageVersion, installedVersion);
       const latestVersion = await getLatestVersion(dep);
       const isEqual = _isEqual(installedVersion, packageVersion);
       const isLatest = _isEqual(packageVersion, latestVersion);
@@ -397,7 +410,9 @@ function _isEqual(v1, v2) {
   }
 }
 
-function _getVersion(v) {
+function _getListVersion(v) {
+  v = v.filter(i => i !== '\n');
+  v = v[v.length - 1]
   v = v.split('@');
   return v[v.length - 1]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-power-user",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "description": "Easy tools for every Node.js developer!",
   "main": "dist/index.js",
   "bin": {
@@ -45,42 +45,11 @@
   },
   "files": [
     "bin/",
-    "src/"
+    "src/",
+    "dist/"
   ],
   "devDependencies": {
     "mocha": "^8.4.0",
     "prepare-package": "^0.0.16"
-  },
-  "allDependencies": {
-    "mocha": "^8.4.0",
-    "prepare-package": "^0.0.16",
-    "chalk": "^4.1.2",
-    "cli-progress": "^3.11.2",
-    "fs-jetpack": "^4.3.1",
-    "inquirer": "^8.2.4",
-    "json5": "^2.2.1",
-    "keychain": "^1.3.0",
-    "lodash": "^4.17.21",
-    "node-powertools": "^0.0.21",
-    "npm-api": "^1.0.1",
-    "semver": "^7.3.7",
-    "table": "^6.8.0",
-    "yargs": "^16.2.0"
-  },
-  "allDependenciesKeys": [
-    "mocha",
-    "prepare-package",
-    "chalk",
-    "cli-progress",
-    "fs-jetpack",
-    "inquirer",
-    "json5",
-    "keychain",
-    "lodash",
-    "node-powertools",
-    "npm-api",
-    "semver",
-    "table",
-    "yargs"
-  ]
-}
+  }
+}

package/src/index.js

@@ -24,6 +24,14 @@ const os = require('os');
 // const npm = require('npm');
 
 function Main() {
+  const self = this;
+  
+  self.options = {};
+  self.npu_packageJSON = {};
+  self.proj_path = null;
+  self.proj_packageJSONPath = null;
+  self.proj_packageJSON = {};
+  self.proj_allDependencies = {};
 
 }
 
@@ -43,8 +51,9 @@ Main.prototype.process = async function (options) {
     self.proj_path = process.cwd();
     self.proj_packageJSONPath = path.resolve(self.proj_path, './package.json');
     self.proj_packageJSON = require(self.proj_packageJSONPath);
-    self.proj_packageJSON.allDependencies = _.merge({}, self.proj_packageJSON.peerDependencies, self.proj_packageJSON.devDependencies, self.proj_packageJSON.dependencies);
-    self.proj_packageJSON.allDependenciesKeys = Object.keys(self.proj_packageJSON.allDependencies);
+    self.proj_allDependencies.pairs = _.merge({}, self.proj_packageJSON.peerDependencies, self.proj_packageJSON.devDependencies, self.proj_packageJSON.dependencies);
+    self.proj_allDependencies.list = Object.keys(self.proj_allDependencies.pairs);
+
   } catch (e) {
     self.proj_packageJSON = {
       name: 'Unknown Name',
@@ -140,22 +149,26 @@ Main.prototype.process = async function (options) {
       },
     }  
     const progress = new ProgressBar.SingleBar({}, ProgressBar.Presets.shades_classic);
-    progress.start(self.proj_packageJSON.allDependenciesKeys.length, 0);
+    progress.start(self.proj_allDependencies.list.length, 0);
 
     const response = {};
 
     let bumpCommand = '';
 
-    for (var i = 0; i < self.proj_packageJSON.allDependenciesKeys.length; i++) {
+    for (var i = 0; i < self.proj_allDependencies.list.length; i++) {
       progress.update(i);
-      const dep = self.proj_packageJSON.allDependenciesKeys[i];
-      const packageVersion = _coerce(self.proj_packageJSON.allDependencies[dep]);
+      const dep = self.proj_allDependencies.list[i];
+      const depPair = self.proj_allDependencies.pairs[dep];
+      const packageVersion = _coerce(depPair);
       const installedVersion = _coerce(
-        _getVersion(
-          (await asyncCommand(`npm list ${dep} --depth=0 | grep ${dep}`))
-            .split(' ')[1]
+        _getListVersion(
+          (await asyncCommand(`npm list ${dep} --depth=0 | grep ${dep}`)).split(' ')
         )
       );
+
+      // console.log('---', dep, depPair, _.get(packageVersion, 'version'), _.get(installedVersion, 'version'));
+
+      // console.log('---dep', dep, packageVersion, installedVersion);
       const latestVersion = await getLatestVersion(dep);
       const isEqual = _isEqual(installedVersion, packageVersion);
       const isLatest = _isEqual(packageVersion, latestVersion);
@@ -397,7 +410,9 @@ function _isEqual(v1, v2) {
   }
 }
 
-function _getVersion(v) {
+function _getListVersion(v) {
+  v = v.filter(i => i !== '\n');
+  v = v[v.length - 1]
   v = v.split('@');
   return v[v.length - 1]
 }