@modernpoacher/deps 1.6.19 → 1.6.20

package/bin/app.js

@@ -66,8 +66,6 @@ async function app () {
     .option('-B, --save-bundle [bundleDependencies]', 'Install `bundleDependencies`', false)
     .option('--registry [registry]', 'Installation registry')
     .option('--force [force]', 'Force installation`', false)
-    .option('-m, --message [message]', 'Git commit message')
-    .option('-a, --author [author]', 'Git commit author')
     .parse(argv)
 
   /*
@@ -98,9 +96,7 @@ async function app () {
     saveOptional: O,
     saveBundle: B,
     force,
-    registry,
-    message,
-    author
+    registry
   } = commander.opts()
 
   log({
@@ -116,7 +112,7 @@ async function app () {
     log('Prod')
 
     try {
-      await executeProd(DEPS_PATH, getProdDependencies(PACKAGE), getProdDependencies(CONFIGURATION), registry, force, message, author)
+      await executeProd(DEPS_PATH, getProdDependencies(PACKAGE), getProdDependencies(CONFIGURATION), registry, force)
     } catch (e) {
       handleError(e)
     }
@@ -124,7 +120,7 @@ async function app () {
     log('Dev')
 
     try {
-      await executeDev(DEPS_PATH, getDevDependencies(PACKAGE), getDevDependencies(CONFIGURATION), registry, force, message, author)
+      await executeDev(DEPS_PATH, getDevDependencies(PACKAGE), getDevDependencies(CONFIGURATION), registry, force)
     } catch (e) {
       handleError(e)
     }
@@ -133,7 +129,7 @@ async function app () {
       log('Prod')
 
       try {
-        await executeProd(DEPS_PATH, getProdDependencies(PACKAGE), getProdDependencies(CONFIGURATION), registry, force, message, author)
+        await executeProd(DEPS_PATH, getProdDependencies(PACKAGE), getProdDependencies(CONFIGURATION), registry, force)
       } catch (e) {
         handleError(e)
       }
@@ -142,7 +138,7 @@ async function app () {
         log('Dev')
 
         try {
-          await executeDev(DEPS_PATH, getDevDependencies(PACKAGE), getDevDependencies(CONFIGURATION), registry, force, message, author)
+          await executeDev(DEPS_PATH, getDevDependencies(PACKAGE), getDevDependencies(CONFIGURATION), registry, force)
         } catch (e) {
           handleError(e)
         }
@@ -151,7 +147,7 @@ async function app () {
           log('Optional')
 
           try {
-            await executeOptional(DEPS_PATH, getOptionalDependencies(PACKAGE), getOptionalDependencies(CONFIGURATION), registry, force, message, author)
+            await executeOptional(DEPS_PATH, getOptionalDependencies(PACKAGE), getOptionalDependencies(CONFIGURATION), registry, force)
           } catch (e) {
             handleError(e)
           }
@@ -160,7 +156,7 @@ async function app () {
             log('Bundle')
 
             try {
-              await executeBundle(DEPS_PATH, getBundleDependencies(PACKAGE), getBundleDependencies(CONFIGURATION), registry, force, message, author)
+              await executeBundle(DEPS_PATH, getBundleDependencies(PACKAGE), getBundleDependencies(CONFIGURATION), registry, force)
             } catch (e) {
               handleError(e)
             }

package/bin/execute/app.js

@@ -34,14 +34,17 @@ const {
 } = require('@modernpoacher/deps/common/git')
 
 const {
-  REGISTRY
+  REGISTRY,
+  getAuthor
 } = require('@modernpoacher/deps/common')
 
 const {
   handleError,
   rmrf,
   npmi,
-  deps
+  deps,
+  hasConfiguration,
+  getConfiguration
 } = require('~/bin/common')
 
 const {
@@ -60,7 +63,7 @@ const DIRECTORY = process.cwd()
 
 function handleCommandError (e) {
   const {
-    code = 'NONE'
+    code = 0
   } = e
 
   if (code !== 128) {
@@ -68,13 +71,25 @@ function handleCommandError (e) {
       message
     } = e
 
-    log({
-      code,
-      message
-    })
+    const log = debug('@modernpoacher/deps:error')
+
+    if (code > 1) log(code)
+    log(message)
   }
 }
 
+async function getAuthorFromConfiguration (path) {
+  log('getAuthorFromConfiguration')
+
+  const CONFIGURATION = await hasConfiguration(path)
+    ? await getConfiguration(path)
+    : {}
+
+  return (
+    getAuthor(CONFIGURATION)
+  )
+}
+
 const filterDeps = (v) => !!v // de-falsy
 
 const reduceDeps = (a, v) => a.includes(v) ? a : a.concat(v) // de-dupe
@@ -118,12 +133,24 @@ async function mapRevParse (directory) {
   }
 }
 
-async function iterate ([directory, ...directories] = [], registry = REGISTRY, force = false, message = MESSAGE, author = AUTHOR) {
+async function iterate ([directory, ...directories] = [], registry, force, message, author) {
   log('iterate')
 
-  if (directory) await execute(directory, registry, force, message, author)
+  if (directory) {
+    const path = resolve(directory)
+
+    try {
+      if (path === await gitRevParse(path)) {
+        await execute(path, registry, force, message, author || await getAuthorFromConfiguration(path))
+      }
+    } catch (e) {
+      handleCommandError(e)
+    }
+  }
 
-  if (directories.length) await iterate(directories, registry, force, message, author)
+  if (directories.length) {
+    await iterate(directories, registry, force, message, author)
+  }
 }
 
 async function execute (directory = DIRECTORY, registry = REGISTRY, force = false, message = MESSAGE, author = AUTHOR) {
@@ -146,7 +173,7 @@ async function execute (directory = DIRECTORY, registry = REGISTRY, force = fals
   }
 }
 
-async function executeFrom (directory = DIRECTORY, registry = REGISTRY, force = false, message = MESSAGE, author = AUTHOR) {
+async function executeFrom (directory, registry, force, message, author) {
   log('executeFrom')
 
   const path = resolve(directory)
@@ -154,7 +181,7 @@ async function executeFrom (directory = DIRECTORY, registry = REGISTRY, force =
   try {
     if (path === await gitRevParse(path)) {
       return (
-        await execute(path, registry, force, message, author)
+        await execute(path, registry, force, message, author || await getAuthorFromConfiguration(path))
       )
     }
   } catch (e) {
@@ -162,7 +189,7 @@ async function executeFrom (directory = DIRECTORY, registry = REGISTRY, force =
   }
 }
 
-async function executeOnly (directory = DIRECTORY, registry = REGISTRY, force = false, message = MESSAGE, author = AUTHOR) {
+async function executeOnly (directory, registry, force, message, author) {
   log('executeOnly')
 
   const path = resolve(directory)
@@ -170,7 +197,7 @@ async function executeOnly (directory = DIRECTORY, registry = REGISTRY, force =
   try {
     if (path === await gitRevParse(path)) {
       return (
-        await execute(path, registry, force, message, author)
+        await execute(path, registry, force, message, author || await getAuthorFromConfiguration(path))
       )
     }
   } catch (e) {
@@ -178,7 +205,7 @@ async function executeOnly (directory = DIRECTORY, registry = REGISTRY, force =
   }
 }
 
-async function executePath (directory = DIRECTORY, registry = REGISTRY, force = false, message = MESSAGE, author = AUTHOR) {
+async function executePath (directory, registry, force, message, author) {
   log('executePath')
 
   const path = resolve(directory)
@@ -186,7 +213,7 @@ async function executePath (directory = DIRECTORY, registry = REGISTRY, force =
   try {
     if (path === await gitRevParse(path)) {
       return (
-        await execute(path, registry, force, message, author)
+        await execute(path, registry, force, message, author || await getAuthorFromConfiguration(path))
       )
     }
   } catch (e) {

package/bin/install/app.js

@@ -66,8 +66,6 @@ async function app () {
     .option('-s, --save [save]', 'Install `peerDependencies`', false)
     .option('--registry [registry]', 'Installation registry')
     .option('--force [force]', 'Force installation`', false)
-    .option('-m, --message [message]', 'Git commit message')
-    .option('-a, --author [author]', 'Git commit author')
     .parse(argv)
 
   /*
@@ -100,9 +98,7 @@ async function app () {
     peer: p,
     save,
     registry,
-    force,
-    message,
-    author
+    force
   } = commander.opts()
 
   log({
@@ -120,7 +116,7 @@ async function app () {
     log('Prod')
 
     try {
-      await execute(DEPS_PATH, getProdDependencies(PACKAGE), getProdDependencies(CONFIGURATION), save, registry, force, message, author)
+      await execute(DEPS_PATH, getProdDependencies(PACKAGE), getProdDependencies(CONFIGURATION), save, registry, force)
     } catch (e) {
       handleError(e)
     }
@@ -129,7 +125,7 @@ async function app () {
       log('Dev')
 
       try {
-        await execute(DEPS_PATH, getDevDependencies(PACKAGE), getDevDependencies(CONFIGURATION), save, registry, force, message, author)
+        await execute(DEPS_PATH, getDevDependencies(PACKAGE), getDevDependencies(CONFIGURATION), save, registry, force)
       } catch (e) {
         handleError(e)
       }
@@ -138,7 +134,7 @@ async function app () {
         log('Optional')
 
         try {
-          await execute(DEPS_PATH, getOptionalDependencies(PACKAGE), getOptionalDependencies(CONFIGURATION), save, registry, force, message, author)
+          await execute(DEPS_PATH, getOptionalDependencies(PACKAGE), getOptionalDependencies(CONFIGURATION), save, registry, force)
         } catch (e) {
           handleError(e)
         }
@@ -147,7 +143,7 @@ async function app () {
           log('Bundle')
 
           try {
-            await execute(DEPS_PATH, getBundleDependencies(PACKAGE), getBundleDependencies(CONFIGURATION), save, registry, force, message, author)
+            await execute(DEPS_PATH, getBundleDependencies(PACKAGE), getBundleDependencies(CONFIGURATION), save, registry, force)
           } catch (e) {
             handleError(e)
           }
@@ -156,7 +152,7 @@ async function app () {
             log('Peer')
 
             try {
-              await execute(DEPS_PATH, getPeerDependencies(PACKAGE), getPeerDependencies(CONFIGURATION), save, registry, force, message, author)
+              await execute(DEPS_PATH, getPeerDependencies(PACKAGE), getPeerDependencies(CONFIGURATION), save, registry, force)
             } catch (e) {
               handleError(e)
             }

package/lib/common/index.js

@@ -1,5 +1,5 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.getCommands=exports.getBundleDependencies=exports.REGISTRY=exports.NVM=exports.DIRECTORY=exports.AUTHOR=void 0;exports.getDeps=getDeps;exports.getDepsExact=getDepsExact;exports.isPreRelease=exports.isExact=exports.getSaveProdParameter=exports.getSaveOptionalParameter=exports.getSaveExactParameter=exports.getSaveDevParameter=exports.getSaveBundleParameter=exports.getRegistryParameter=exports.getProdDependencies=exports.getPeerDependencies=exports.getOptionalDependencies=exports.getNoSaveParameter=exports.getForceParameter=exports.getDevDependencies=void 0;exports.normalizeCommands=normalizeCommands;exports.transform=transform;exports.transformDependency=void 0;var _debug=_interopRequireDefault(require("debug"));var _path=require("path");var _env=require("./env");function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}const{path:MODULE_PATH}=module;const DIRECTORY='.';exports.DIRECTORY=DIRECTORY;const REGISTRY='https://registry.npmjs.org';exports.REGISTRY=REGISTRY;const AUTHOR='Modern Poacher Limited <modernpoacher@modernpoacher.com>';exports.AUTHOR=AUTHOR;const NVM=(0,_path.resolve)(MODULE_PATH,'../../nvm.sh');exports.NVM=NVM;const log=(0,_debug.default)('@modernpoacher/deps');log(`\`common\` (${_env.PLATFORM}) is awake`);const tidy=v=>v.replace(/\n\n/gm,String.fromCharCode(10)).trim();const getSaveProdParameter=commands=>commands.concat(' --save-prod');exports.getSaveProdParameter=getSaveProdParameter;const getSaveDevParameter=commands=>commands.concat(' --save-dev');exports.getSaveDevParameter=getSaveDevParameter;const getSaveBundleParameter=commands=>commands.concat(' --save-bundle');exports.getSaveBundleParameter=getSaveBundleParameter;const getSaveOptionalParameter=commands=>commands.concat(' --save-optional');exports.getSaveOptionalParameter=getSaveOptionalParameter;const getRegistryParameter=(r,commands)=>r?commands.concat(` --registry ${r}`):commands;exports.getRegistryParameter=getRegistryParameter;const getForceParameter=(f,commands)=>f?commands.concat(' --force'):commands;exports.getForceParameter=getForceParameter;const getNoSaveParameter=(s,commands)=>s?commands:commands.concat(' --no-save');exports.getNoSaveParameter=getNoSaveParameter;const getSaveExactParameter=commands=>commands.concat(' --save-exact');exports.getSaveExactParameter=getSaveExactParameter;const getCommands=_env.PLATFORM==='win32'?(directory=DIRECTORY,commands='npm i')=>tidy(commands):(directory=DIRECTORY,commands='npm i')=>tidy(`
+"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.getCommands=exports.getBundleDependencies=exports.getAuthor=exports.REGISTRY=exports.NVM=exports.DIRECTORY=exports.AUTHOR=void 0;exports.getDeps=getDeps;exports.getDepsExact=getDepsExact;exports.isPreRelease=exports.isExact=exports.getSaveProdParameter=exports.getSaveOptionalParameter=exports.getSaveExactParameter=exports.getSaveDevParameter=exports.getSaveBundleParameter=exports.getRegistryParameter=exports.getProdDependencies=exports.getPeerDependencies=exports.getOptionalDependencies=exports.getNoSaveParameter=exports.getForceParameter=exports.getDevDependencies=void 0;exports.normalizeCommands=normalizeCommands;exports.transform=transform;exports.transformDependency=void 0;var _debug=_interopRequireDefault(require("debug"));var _path=require("path");var _env=require("./env");function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}const{path:MODULE_PATH}=module;const DIRECTORY='.';exports.DIRECTORY=DIRECTORY;const REGISTRY='https://registry.npmjs.org';exports.REGISTRY=REGISTRY;const AUTHOR='Modern Poacher Limited <modernpoacher@modernpoacher.com>';exports.AUTHOR=AUTHOR;const NVM=(0,_path.resolve)(MODULE_PATH,'../../nvm.sh');exports.NVM=NVM;const log=(0,_debug.default)('@modernpoacher/deps');log(`\`common\` (${_env.PLATFORM}) is awake`);const tidy=v=>v.replace(/\n\n/gm,String.fromCharCode(10)).trim();const getSaveProdParameter=commands=>commands.concat(' --save-prod');exports.getSaveProdParameter=getSaveProdParameter;const getSaveDevParameter=commands=>commands.concat(' --save-dev');exports.getSaveDevParameter=getSaveDevParameter;const getSaveBundleParameter=commands=>commands.concat(' --save-bundle');exports.getSaveBundleParameter=getSaveBundleParameter;const getSaveOptionalParameter=commands=>commands.concat(' --save-optional');exports.getSaveOptionalParameter=getSaveOptionalParameter;const getRegistryParameter=(r,commands)=>r?commands.concat(` --registry ${r}`):commands;exports.getRegistryParameter=getRegistryParameter;const getForceParameter=(f,commands)=>f?commands.concat(' --force'):commands;exports.getForceParameter=getForceParameter;const getNoSaveParameter=(s,commands)=>s?commands:commands.concat(' --no-save');exports.getNoSaveParameter=getNoSaveParameter;const getSaveExactParameter=commands=>commands.concat(' --save-exact');exports.getSaveExactParameter=getSaveExactParameter;const getCommands=_env.PLATFORM==='win32'?(directory=DIRECTORY,commands='npm i')=>tidy(commands):(directory=DIRECTORY,commands='npm i')=>tidy(`
 export PATH=/usr/local/bin:$PATH &> /dev/null
 . "${NVM}" 2> /dev/null
 ${commands}
-`);exports.getCommands=getCommands;const getProdDependencies=({dependencies={}}={})=>dependencies;exports.getProdDependencies=getProdDependencies;const getDevDependencies=({devDependencies={}}={})=>devDependencies;exports.getDevDependencies=getDevDependencies;const getOptionalDependencies=({optionalDependencies={}}={})=>optionalDependencies;exports.getOptionalDependencies=getOptionalDependencies;const getBundleDependencies=({bundleDependencies=[]}={})=>bundleDependencies;exports.getBundleDependencies=getBundleDependencies;const getPeerDependencies=({peerDependencies}={})=>peerDependencies;exports.getPeerDependencies=getPeerDependencies;const isPreRelease=v=>/-/.test(v);exports.isPreRelease=isPreRelease;const isExact=v=>/^\d/.test(v);exports.isExact=isExact;function getDepsExact(values,configuration){log('getDepsExact');return Object.entries(values).reduce((accumulator,[name,version])=>isExact(version)?accumulator.concat({name,version:Reflect.has(configuration,name)?Reflect.get(configuration,name):version}):accumulator,[]);}function getDeps(values){log('getDeps');return Object.entries(values).reduce((accumulator,[name,version])=>isExact(version)?accumulator:isPreRelease(version)?accumulator.concat({name,version}):accumulator.concat({name,version:'latest'}),[]);}function normalizeCommands(value){while(/\s\s|\n/.test(value)){value=value.replace(/\s\s/gm,String.fromCharCode(32)).replace(/\n/gm,String.fromCharCode(32));}return value.trim();}const transformDependency=({name='@modernpoacher/deps',version='latest'}={})=>`${name}@${version}`;exports.transformDependency=transformDependency;function transform(value){log('transform');return Array.isArray(value)?value.map(transformDependency).join(String.fromCharCode(32)).trim():transformDependency(value);}
+`);exports.getCommands=getCommands;const getProdDependencies=({dependencies={}}={})=>dependencies;exports.getProdDependencies=getProdDependencies;const getDevDependencies=({devDependencies={}}={})=>devDependencies;exports.getDevDependencies=getDevDependencies;const getOptionalDependencies=({optionalDependencies={}}={})=>optionalDependencies;exports.getOptionalDependencies=getOptionalDependencies;const getBundleDependencies=({bundleDependencies=[]}={})=>bundleDependencies;exports.getBundleDependencies=getBundleDependencies;const getPeerDependencies=({peerDependencies}={})=>peerDependencies;exports.getPeerDependencies=getPeerDependencies;const getAuthor=({author}={})=>author;exports.getAuthor=getAuthor;const isPreRelease=v=>/-/.test(v);exports.isPreRelease=isPreRelease;const isExact=v=>/^\d/.test(v);exports.isExact=isExact;function getDepsExact(values,configuration){log('getDepsExact');return Object.entries(values).reduce((accumulator,[name,version])=>isExact(version)?accumulator.concat({name,version:Reflect.has(configuration,name)?Reflect.get(configuration,name):version}):accumulator,[]);}function getDeps(values){log('getDeps');return Object.entries(values).reduce((accumulator,[name,version])=>isExact(version)?accumulator:isPreRelease(version)?accumulator.concat({name,version}):accumulator.concat({name,version:'latest'}),[]);}function normalizeCommands(value){while(/\s\s|\n/.test(value)){value=value.replace(/\s\s/gm,String.fromCharCode(32)).replace(/\n/gm,String.fromCharCode(32));}return value.trim();}const transformDependency=({name='@modernpoacher/deps',version='latest'}={})=>`${name}@${version}`;exports.transformDependency=transformDependency;function transform(value){log('transform');return Array.isArray(value)?value.map(transformDependency).join(String.fromCharCode(32)).trim():transformDependency(value);}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modernpoacher/deps",
-  "version": "1.6.19",
+  "version": "1.6.20",
   "description": "Update NPM package dependencies from the command line",
   "keywords": [
     "deps",
@@ -58,15 +58,15 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.17.10",
-    "@babel/core": "^7.17.10",
+    "@babel/core": "^7.18.0",
     "@babel/eslint-parser": "^7.17.0",
-    "@babel/preset-env": "^7.17.10",
+    "@babel/preset-env": "^7.18.0",
     "@babel/register": "^7.17.7",
     "babel-plugin-module-resolver": "^4.1.0",
     "chai": "^4.3.6",
     "core-js": "^3.22.5",
     "cross-env": "^7.0.3",
-    "eslint": "^8.15.0",
+    "eslint": "^8.16.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-import-resolver-babel-module": "^5.3.1",
     "eslint-plugin-import": "^2.26.0",

package/src/common/index.js

@@ -119,7 +119,7 @@ export const getNoSaveParameter = (s, commands) => s ? commands : commands.conca
 export const getSaveExactParameter = (commands) => commands.concat(' --save-exact')
 
 /**
- *  @function getProdDependencies
+ *  @function getCommands
  *
  *  Get the installation shell script
  *
@@ -140,7 +140,7 @@ ${commands}
 /**
  *  @function getProdDependencies
  *
- *  Get the production dependencies by destructuring the package
+ *  Get the production dependencies by destructuring the package or configuration
  *
  *  @param {Object} package
  *
@@ -151,7 +151,7 @@ export const getProdDependencies = ({ dependencies = {} } = {}) => dependencies
 /**
  *  @function getDevDependencies
  *
- *  Get the development dependencies by destructuring the package
+ *  Get the development dependencies by destructuring the package or configuration
  *
  *  @param {Object} package
  *
@@ -162,7 +162,7 @@ export const getDevDependencies = ({ devDependencies = {} } = {}) => devDependen
 /**
  *  @function getOptionalDependencies
  *
- *  Get the optional dependencies by destructuring the package
+ *  Get the optional dependencies by destructuring the package or configuration
  *
  *  @param {Object} package
  *
@@ -173,7 +173,7 @@ export const getOptionalDependencies = ({ optionalDependencies = {} } = {}) => o
 /**
  *  @function getBundleDependencies
  *
- *  Get the bundle dependencies by destructuring the package
+ *  Get the bundle dependencies by destructuring the package or configuration
  *
  *  @param {Object} package
  *
@@ -184,7 +184,7 @@ export const getBundleDependencies = ({ bundleDependencies = [] } = {}) => bundl
 /**
  *  @function getPeerDependencies
  *
- *  Get the peer dependencies by destructuring the package
+ *  Get the peer dependencies by destructuring the package or configuration
  *
  *  @param {Object} package
  *
@@ -192,6 +192,17 @@ export const getBundleDependencies = ({ bundleDependencies = [] } = {}) => bundl
  */
 export const getPeerDependencies = ({ peerDependencies } = {}) => peerDependencies
 
+/**
+ *  @function getAuthor
+ *
+ *  Get the author by destructuring the package or configuration
+ *
+ *  @param {Object} package
+ *
+ *  @return {Object}
+ */
+export const getAuthor = ({ author } = {}) => author
+
 /**
  *  @function isPreRelease
  *