@modernpoacher/deps 2.1.8 → 2.1.10

package/bin/common/index.mjs

@@ -53,9 +53,9 @@ const CODE = 0
 
 const MESSAGE = 'Either no error message has been defined or no error has been supplied'
 
-const tidy = (v) => v.replace(/\n\n/gm, '\n').trim()
+export const tidy = (v) => v.replace(/\n{2,}}/gm, String.fromCharCode(10)).trim()
 
-const trim = (v) => v.split('\n').map((v) => v.trim()).join('\n').trim()
+export const trim = (v) => v.split(String.fromCharCode(10)).map((v) => v.trimEnd()).join(String.fromCharCode(10)).trim()
 
 const toRelativePath = (to) => relative(process.cwd(), to) // const toRelativePath = relative.bind(null, process.cwd())
 
@@ -95,10 +95,10 @@ export function use (key) {
   const log = debug(`@modernpoacher/deps:${key}`)
 
   return function use (v) {
-    if (v.includes('\n')) v.split('\n').map((s) => trim(s)).filter(Boolean).forEach((s) => log(s))
+    if (v.includes(String.fromCharCode(10))) v.split(String.fromCharCode(10)).map((s) => s.trimEnd()).filter(Boolean).forEach((s) => { log(s) })
     else {
       const s = v.trim()
-      if (s !== '') log(trim(s))
+      if (s !== '') log(v.trimEnd())
     }
   }
 }

package/bin/deps/execute.mjs

@@ -222,6 +222,10 @@ const filterDeps = (v) => !!v // de-falsy
 
 const reduceDeps = (a, v) => a.includes(v) ? a : a.concat(v) // de-dupe
 
+function * genDirsList (directories = []) {
+  while (directories.length) yield directories.shift()
+}
+
 function getPathList (directory) {
   log('getPathList')
 
@@ -272,7 +276,7 @@ async function mapRevParseShowTopLevel (directory) {
   }
 }
 
-async function iterate ([directory, ...directories] = [], registry, force, message, author) {
+async function iterate (directory, registry, force, message, author) {
   log('iterate')
 
   if (directory) {
@@ -292,10 +296,6 @@ async function iterate ([directory, ...directories] = [], registry, force, messa
       handleCommandError(e)
     }
   }
-
-  if (directories.length) {
-    await iterate(directories, registry, force, message, author)
-  }
 }
 
 async function iteratePath (directory, registry, force, message, author) {
@@ -309,11 +309,7 @@ async function iteratePath (directory, registry, force, message, author) {
     if (pathList.length) {
       const depsList = await getDepsList(pathList)
 
-      if (depsList.length) {
-        return (
-          await iterate(depsList, registry, force, message, author)
-        )
-      }
+      for (const d of genDirsList(depsList)) await iterate(d, registry, force, message, author)
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modernpoacher/deps",
-  "version": "2.1.8",
+  "version": "2.1.10",
   "description": "Update NPM package dependencies from the command line",
   "keywords": [
     "deps",

package/src/common/git/index.mjs

@@ -57,45 +57,45 @@ const log = debug('@modernpoacher/deps')
 
 log(`\`git\` (${VERSION} - ${PLATFORM}) is awake`)
 
-const trim = (v) => v.split('\n').map((v) => v.trimEnd()).join('\n').trim()
+const trim = (v) => v.split(String.fromCharCode(10)).map((v) => v.trimEnd()).join(String.fromCharCode(10)).trim()
 
-function use (key) {
+function isFatal (s) {
+  return s.toLowerCase().startsWith('fatal: not a git repository')
+}
+
+export function use (key) {
   const log = debug(`@modernpoacher/deps:${key}`)
 
   return function use (v) {
-    if (v.trim() === '') return
-
-    return (
-      log(trim(v))
-    )
+    if (v.includes(String.fromCharCode(10))) v.split(String.fromCharCode(10)).map((s) => s.trimEnd()).filter(Boolean).forEach((s) => { log(s) })
+    else {
+      const s = v.trim()
+      if (s !== '') log(v.trimEnd())
+    }
   }
 }
 
-function out (key, directory) {
+export function out (key, directory) {
   const log = debug(`@modernpoacher/deps:${key}`)
 
   return function out (v) {
-    const s = v.trim()
-
-    if (s === '' || directory === s) return
-
-    return (
-      log(trim(s))
-    )
+    if (v.includes(String.fromCharCode(10))) v.split(String.fromCharCode(10)).map((s) => s.trimEnd()).filter(Boolean).filter((s) => directory !== s).forEach((s) => { log(s) })
+    else {
+      const s = v.trim()
+      if (s !== '' && directory !== s) log(v.trimEnd())
+    }
   }
 }
 
-function err (key, directory) {
+export function err (key, directory) {
   const log = debug(`@modernpoacher/deps:${key}`)
 
   return function err (v) {
-    const s = v.trim()
-
-    if (s === '' || directory === s || s.toLowerCase().startsWith('fatal: not a git repository')) return
-
-    return (
-      log(trim(s))
-    )
+    if (v.includes(String.fromCharCode(10))) v.split(String.fromCharCode(10)).map((s) => s.trimEnd()).filter(Boolean).filter((s) => directory !== s).filter((s) => !isFatal(s)).forEach((s) => { log(s) })
+    else {
+      const s = v.trim()
+      if (s !== '' && directory !== s && !isFatal(s)) log(s)
+    }
   }
 }
 

package/src/common/index.mjs

@@ -70,7 +70,9 @@ const log = debug('@modernpoacher/deps')
 
 log(`\`common\` (${VERSION} - ${PLATFORM}) is awake at "${PATH}"`)
 
-const tidy = (v) => v.replace(/\n{2,}}/gm, String.fromCharCode(10)).trim()
+export const tidy = (v) => v.replace(/\n{2,}}/gm, String.fromCharCode(10)).trim()
+
+export const trim = (v) => v.split(String.fromCharCode(10)).map((v) => v.trimEnd()).join(String.fromCharCode(10)).trim()
 
 /**
  *  @function getSaveProdParameter

package/src/index.mjs

@@ -45,17 +45,15 @@ const log = debug('@modernpoacher/deps')
 
 log(`\`deps\` (${VERSION} - ${PLATFORM}) is awake`)
 
-function use (key) {
+export function use (key) {
   const log = debug(`@modernpoacher/deps:${key}`)
 
   return function use (v) {
-    const s = v.trim()
-
-    if (s === '') return
-
-    return (
-      log(s)
-    )
+    if (v.includes(String.fromCharCode(10))) v.split(String.fromCharCode(10)).map((s) => s.trimEnd()).filter(Boolean).forEach((s) => { log(s) })
+    else {
+      const s = v.trim()
+      if (s !== '') log(v.trimEnd())
+    }
   }
 }