Fixed, issue when saving both dependencies. Updated successful save message

Author: lkounadis

.gitignore

@@ -1,2 +1,3 @@
 .history
-.DS_Store
+.DS_Store
+.idea

args.js

@@ -1,5 +1,5 @@
 const args = process.argv;
-const parseArgs = require('minimist')
+const parseArgs = require('minimist');
 const parsedArgs = parseArgs(args);
 
 const devDeps = parsedArgs.dev;
@@ -19,4 +19,4 @@ module.exports = {
     patchVersions,
     minorVersions,
     fixVersions,
-}
+};

constants.js

@@ -0,0 +1,7 @@
+const PROD_DEPENDENCIES = 'dependencies';
+const DEV_DEPENDENCIES = 'devDependencies';
+
+module.exports = {
+    PROD_DEPENDENCIES,
+    DEV_DEPENDENCIES
+};

index.js

@@ -1,42 +1,44 @@
 const EditJsonFile = require('edit-json-file');
-const packageJson = EditJsonFile(`./package.json`)
-const {createProdDep, createDevDep, patchVersions, minorVersions, fixVersions} = require('./args') 
+const packageJson = EditJsonFile(`./package.json`, {});
+const {createProdDep, createDevDep, patchVersions, minorVersions, fixVersions} = require('./args')
 const chalk = require('chalk');
+const {pipe, saveTag} = require('./utils');
+const { PROD_DEPENDENCIES, DEV_DEPENDENCIES } = require('./constants');
 
-const pipe = (...args) => () => args.reduce((acc, fn) => fn(acc),{})
 
-const PROD_DEPENDENCIES = 'dependencies';
-const DEV_DEPENDENCIES = 'devDependencies';
-
-
-const readPackage = (dep) => () => packageJson.get(dep)
+const readPackage = (dep) => () => packageJson.get(dep);
 
 const getCurrentVersion = (package) => new EditJsonFile(`./node_modules/${package}/package.json`).get('version');
 
 const getNewPackageVersions = (dep) => Object.keys(dep).map(dep => {
     return { [dep]: getCurrentVersion(dep) }
 });
 
-const semver = patchVersions||minorVersions||fixVersions
+const semver = patchVersions||minorVersions||fixVersions;
 
 const setNewPackageJson = (type) => (dep) => {
     dep && dep.forEach((package) => {
         packageJson.set(`${type}.${Object.keys(package)[0]}`,`${semver}${Object.values(package)[0]}`)
     });
-    dep && packageJson.save(function(){
-        console.info(chalk.green(`Successfully updated ${type} in package.json`))
-    })
-    
-}
+};
+
+const savePackageJson = ()=>{
+    packageJson.save(function(){
+        console.info(chalk.green(saveTag `Successfully updated ${createProdDep} ${createDevDep} in package.json`))
+    });
+};
 
-const setNewPackageJsonProd = setNewPackageJson(PROD_DEPENDENCIES)
-const setNewPackageJsonDev = setNewPackageJson(DEV_DEPENDENCIES)
+const setNewPackageJsonProd = setNewPackageJson(PROD_DEPENDENCIES);
+const setNewPackageJsonDev = setNewPackageJson(DEV_DEPENDENCIES);
 
-const readDependenciesProd = readPackage(PROD_DEPENDENCIES)
-const readDependenciesDev = readPackage(DEV_DEPENDENCIES)
+const readDependenciesProd = readPackage(PROD_DEPENDENCIES);
+const readDependenciesDev = readPackage(DEV_DEPENDENCIES);
 
-const createPackageProd = pipe(readDependenciesProd, getNewPackageVersions, setNewPackageJsonProd)
-const createPackageDev = pipe(readDependenciesDev, getNewPackageVersions, setNewPackageJsonDev)
+const createPackageProd = pipe(readDependenciesProd, getNewPackageVersions, setNewPackageJsonProd);
+const createPackageDev = pipe(readDependenciesDev, getNewPackageVersions, setNewPackageJsonDev);
 
 createProdDep && createPackageProd();
 createDevDep && createPackageDev();
+
+savePackageJson();
+

package-lock.json

@@ -7,11 +7,11 @@
   "version": "1.0.5",
   "main": "index.js",
   "dependencies": {
-    "edit-json-file": "1.2.1"
+    "edit-json-file": "1.2.1",
+    "minimist": "1.2.0"
   },
   "devDependencies": {
-    "chalk": "2.4.2",
-    "minimist": "1.2.0"
+    "chalk": "2.4.2"
   },
   "scripts": {
     "fixed-minor-patch-package-json": "./index.js"

package.json

@@ -0,0 +1,15 @@
+const { PROD_DEPENDENCIES, DEV_DEPENDENCIES } = require('./constants');
+
+function saveTag([ strA, strB, strC ], prod, dev) {
+    const EMPTY_PLACEHOLDER = '';
+    const prodString = prod && PROD_DEPENDENCIES;
+    const devString = dev && DEV_DEPENDENCIES;
+    return `${strA}${prodString || EMPTY_PLACEHOLDER}${strB}${devString || EMPTY_PLACEHOLDER}${strC}`
+}
+
+const pipe = (...args) => () => args.reduce((acc, fn) => fn(acc),{});
+
+module.exports = {
+    pipe,
+    saveTag
+};