@modernpoacher/deps 2.1.18 → 2.1.20

package/bin/common/index.mjs

@@ -32,6 +32,10 @@ import {
   PLATFORM
 } from '#deps/src/common/env'
 
+import {
+  getOptions
+} from '#deps/src/common/options'
+
 import {
   DIRECTORY,
   REGISTRY,
@@ -40,8 +44,7 @@ import {
   getRegistryParameter,
   getForceParameter,
   getExportPath,
-  getNvm,
-  getOptions
+  getNvm
 } from '#deps/src/common'
 
 const log = debug('@modernpoacher/deps')

package/bin/deps/deps.mjs

@@ -2,6 +2,8 @@
 
 import debug from 'debug'
 
+import PATH from '#where-am-i'
+
 import {
   exec
 } from 'node:child_process'
@@ -16,15 +18,13 @@ import {
   handleComplete
 } from '#deps/bin/common'
 
-import {
-  getOptions
-} from '#deps/src/common'
-
 import {
   PLATFORM
 } from '#deps/src/common/env'
 
-import PATH from '#where-am-i'
+import {
+  getOptions
+} from '#deps/src/common/options'
 
 const {
   env: {

package/bin/deps/head.mjs

@@ -2,6 +2,8 @@
 
 import debug from 'debug'
 
+import PATH from '#where-am-i'
+
 import {
   exec
 } from 'node:child_process'
@@ -16,15 +18,13 @@ import {
   handleComplete
 } from '#deps/bin/common'
 
-import {
-  getOptions
-} from '#deps/src/common'
-
 import {
   PLATFORM
 } from '#deps/src/common/env'
 
-import PATH from '#where-am-i'
+import {
+  getOptions
+} from '#deps/src/common/options'
 
 const {
   env: {

package/bin/deps/install.mjs

@@ -74,25 +74,6 @@ async function app () {
    *  Any other command will continue
    */
 
-  const {
-    env: {
-      PWD,
-      DEPS_PATH = PWD
-    }
-  } = process
-
-  const PACKAGE = (
-    await hasPackage(DEPS_PATH)
-      ? await getPackage(DEPS_PATH)
-      : {}
-  )
-
-  const CONFIGURATION = (
-    await hasConfiguration(DEPS_PATH)
-      ? await getConfiguration(DEPS_PATH)
-      : {}
-  )
-
   const {
     prod: P,
     dev: D,
@@ -115,6 +96,25 @@ async function app () {
     ...(force ? { force } : {})
   })
 
+  const {
+    env: {
+      PWD,
+      DEPS_PATH = PWD
+    }
+  } = process
+
+  const PACKAGE = (
+    await hasPackage(DEPS_PATH)
+      ? await getPackage(DEPS_PATH)
+      : {}
+  )
+
+  const CONFIGURATION = (
+    await hasConfiguration(DEPS_PATH)
+      ? await getConfiguration(DEPS_PATH)
+      : {}
+  )
+
   if (P) {
     log('Prod')
 

package/bin/deps/push.mjs

@@ -2,6 +2,8 @@
 
 import debug from 'debug'
 
+import PATH from '#where-am-i'
+
 import {
   exec
 } from 'node:child_process'
@@ -16,15 +18,13 @@ import {
   handleComplete
 } from '#deps/bin/common'
 
-import {
-  getOptions
-} from '#deps/src/common'
-
 import {
   PLATFORM
 } from '#deps/src/common/env'
 
-import PATH from '#where-am-i'
+import {
+  getOptions
+} from '#deps/src/common/options'
 
 const {
   env: {

package/bin/deps/wipe.mjs

@@ -2,6 +2,8 @@
 
 import debug from 'debug'
 
+import PATH from '#where-am-i'
+
 import {
   exec
 } from 'node:child_process'
@@ -16,15 +18,13 @@ import {
   handleComplete
 } from '#deps/bin/common'
 
-import {
-  getOptions
-} from '#deps/src/common'
-
 import {
   PLATFORM
 } from '#deps/src/common/env'
 
-import PATH from '#where-am-i'
+import {
+  getOptions
+} from '#deps/src/common/options'
 
 const {
   env: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modernpoacher/deps",
-  "version": "2.1.18",
+  "version": "2.1.20",
   "description": "Update NPM package dependencies from the command line",
   "keywords": [
     "deps",
@@ -79,8 +79,7 @@
     "#deps/src": "./src/index.mjs",
     "#deps/src/*": "./src/*.mjs",
     "#deps/src/common": "./src/common/index.mjs",
-    "#deps/src/common/env": "./src/common/env/index.mjs",
-    "#deps/src/common/git": "./src/common/git/index.mjs",
+    "#deps/src/common/*": "./src/common/*/index.mjs",
     "#deps/src/install": "./src/install/index.mjs",
     "#where-am-i": "./where-am-i.mjs"
   }

package/src/common/env/index.mjs

@@ -23,7 +23,7 @@ const PLATFORM = platform()
 
 const log = debug('@modernpoacher/deps')
 
-log(`\`env\` (${NAME} - ${VERSION} - ${PLATFORM}) is awake at "${PATH}"`)
+log(`\`common/env\` (${NAME} - ${VERSION} - ${PLATFORM}) is awake`)
 
 export {
   NAME,

package/src/common/git/index.mjs

@@ -17,7 +17,7 @@ import {
 
 import {
   getOptions
-} from '#deps/src/common'
+} from '#deps/src/common/options'
 
 export const DIRECTORY = '.'
 
@@ -57,7 +57,7 @@ eval $(ssh-agent -k) 1> /dev/null
 
 const log = debug('@modernpoacher/deps')
 
-log(`\`git\` (${VERSION} - ${PLATFORM}) is awake`)
+log(`\`common/git\` (${VERSION} - ${PLATFORM}) is awake`)
 
 const trim = (v) => v.split(String.fromCharCode(10)).map((v) => v.trimEnd()).join(String.fromCharCode(10)).trim()
 
@@ -65,13 +65,13 @@ function filter (v) {
   return Boolean(stripAnsi(v).trim())
 }
 
-export function getIsDirectory (directory) {
+function getIsDirectory (directory) {
   return function isDirectory (s) {
     return directory === s
   }
 }
 
-export function isFatal (s) {
+function isFatal (s) {
   return s.toLowerCase().startsWith('fatal: not a git repository')
 }
 

package/src/common/index.mjs

@@ -54,21 +54,9 @@ export const AUTHOR = 'Modern Poacher Limited <modernpoacher@modernpoacher.com>'
 
 export const NVM = resolve(PATH, 'nvm.sh')
 
-export const OPTIONS = {
-  maxBuffer: 1024 * 2000,
-  stdio: 'inherit',
-  env: {
-    DEBUG_COLORS: 'yes',
-    FORCE_COLOR: PLATFORM === 'win32'
-      ? 3
-      : 2,
-    PATH: process.env.PATH
-  }
-}
-
 const log = debug('@modernpoacher/deps')
 
-log(`\`common\` (${VERSION} - ${PLATFORM}) is awake at "${PATH}"`)
+log(`\`common\` (${VERSION} - ${PLATFORM}) is awake`)
 
 export const tidy = (v) => v.replace(/\n{2,}}/gm, String.fromCharCode(10)).trim()
 
@@ -206,31 +194,6 @@ export const getCommands = PLATFORM === 'win32'
   ? (commands = 'npm i') => tidy(commands)
   : (commands = 'npm i') => tidy(getExportPath(getNvm(commands)))
 
-/**
- *  @function getOptions
- *
- *  Get the installation `exec` child process options
- *
- *  @param {string} cwd normalized directory
- *
- *  @return {{
-*    maxBuffer: number,
-*    stdio: string
-*    env: {
-*      DEBUG_COLORS: string,
-*      FORCE_COLOR: number,
-*      PROCESS: string
-*    }
-*    cwd: string
-*  }}
-*/
-export function getOptions (cwd) {
-  return {
-    ...OPTIONS,
-    cwd
-  }
-}
-
 /**
  *  @function getProdDependencies
  *

package/src/common/options/index.mjs

@@ -0,0 +1,53 @@
+import debug from 'debug'
+
+import {
+  VERSION,
+  PLATFORM
+} from '#deps/src/common/env'
+
+const {
+  env: {
+    PATH
+  }
+} = process
+
+export const OPTIONS = {
+  maxBuffer: 1024 * 2000,
+  stdio: 'inherit',
+  env: {
+    DEBUG_COLORS: 'yes',
+    FORCE_COLOR: PLATFORM === 'win32'
+      ? 3
+      : 2,
+    PATH
+  }
+}
+
+const log = debug('@modernpoacher/deps')
+
+log(`\`common/options\` (${VERSION} - ${PLATFORM}) is awake`)
+
+/**
+ *  @function getOptions
+ *
+ *  Get the installation `exec` child process options
+ *
+ *  @param {string} cwd normalized directory
+ *
+ *  @return {{
+*    maxBuffer: number,
+*    stdio: string
+*    env: {
+*      DEBUG_COLORS: string,
+*      FORCE_COLOR: number,
+*      PROCESS: string
+*    }
+*    cwd: string
+*  }}
+*/
+export function getOptions (cwd) {
+  return {
+    ...OPTIONS,
+    cwd
+  }
+}

package/src/index.mjs

@@ -25,6 +25,10 @@ import {
   PLATFORM
 } from '#deps/src/common/env'
 
+import {
+  getOptions
+} from '#deps/src/common/options'
+
 import {
   DIRECTORY,
   REGISTRY,
@@ -36,7 +40,6 @@ import {
   getSaveDevParameter,
   getSaveProdParameter,
   getCommands,
-  getOptions,
   normalizeCommands,
   transform,
   getDepsExact,

package/src/install/index.mjs

@@ -23,6 +23,10 @@ import {
   PLATFORM
 } from '#deps/src/common/env'
 
+import {
+  getOptions
+} from '#deps/src/common/options'
+
 import {
   DIRECTORY,
   REGISTRY,
@@ -31,7 +35,6 @@ import {
   getForceParameter,
   getSaveExactParameter,
   getCommands,
-  getOptions,
   normalizeCommands,
   transform,
   getDepsExact,