jackspeak 1.3.5 → 1.4.0

package/README.md

@@ -23,7 +23,16 @@ as argument names as well; just put them in different sections.
     - `usage` A function that dumps the help output to stdout.
     - `explicit` A `Set` containing the names of all arguments that were
       explicitly set.
+    - `original` The `argv` array before any expansions.
     - `parsed` The `argv` array once all aliases have been expanded.
+    - `reparse` A function that takes a string or array of strings, and
+      parses it according to the options initially provided.  Note that
+      this does _not_ update the results object, it's just for expanding
+      aliases and short options.
+    - `update` A function that takes either a single `--key=val`, an array
+      of `--key=val` values, or an object (as read from an rc file, for
+      example), and updates the result data accordingly.  This will _not_
+      update any options set explicitly in the original argv.
 
 - `usage` String or Array
 

package/index.js

@@ -162,6 +162,47 @@ const usage = j => {
 // }
 const jack = (...sections) => execute(parse_(buildParser(newObj(), sections)))
 
+const kvToArg = j => (k, v) =>
+  j.options[k] && isFlag(j.options[k]) ? (v ? `--${k}` : `--no-${k}`)
+  : `--${k}=${v}`
+
+const objToArgv = j => obj => Object.keys(obj).reduce((set, k) => {
+  const toArg = kvToArg(j)
+  const val = obj[k]
+  if (Array.isArray(val))
+    set.push(...val.map(v => toArg(k, v)))
+  else
+    set.push(toArg(k, val))
+  return set
+}, [])
+
+const update = j => args => {
+  const argv = []
+  const toArgv = objToArgv(j)
+  if (typeof args === 'string')
+    argv.push(args)
+  else if (Array.isArray(args))
+    argv.push(...args)
+  else if (args)
+    argv.push(...toArgv(args))
+  const result = reparse(j)(argv)
+  Object.keys(result)
+    .filter(k => k !== '_' && !j.explicit.has(k))
+    .forEach(k => j.result[k] = result[k])
+}
+
+const reparse = j => args => {
+  const argv = Array.isArray(args) ? args : [args]
+  return parse_({
+    ...j,
+    explicit: new Set(),
+    result: { _: [] },
+    help: [],
+    main: null,
+    argv,
+  }).result
+}
+
 const newObj = () => ({
   help: [],
   shortOpts: {},
@@ -402,7 +443,7 @@ const addHelpText = (j, name, val) => {
     val.alias ? `Alias for ${[].concat(val.alias).join(' ')}`
     : '[no description provided]'
   ))
-  const mult = isList(val) ? `${
+  const mult = isList(val) && !isEnv(val) ? `${
     desc.indexOf('\n') === -1 ? '\n' : '\n\n'
   }Can be set multiple times` : ''
   const text = `${desc}${mult}`
@@ -479,6 +520,7 @@ ${wrap(spec.valid.join(' '), [ 0, 2, 0, 8 ])}`)
 
 const parse_ = j => {
   const argv = getArgv(j)
+  const original = [...argv]
 
   for (let i = 0; i < argv.length; i++) {
     const arg = argv[i]
@@ -561,6 +603,8 @@ const parse_ = j => {
 
     if (isList(spec)) {
       if (isOpt(spec)) {
+        if (!Array.isArray(j.result[name]))
+          j.result[name] = []
         set(j, name, spec, j.result[name].concat(val))
       } else {
         const v = j.result[name] || 0
@@ -579,8 +623,11 @@ const parse_ = j => {
   Object.defineProperty(j.result._, 'usage', {
     value: () => console.log(usage(j))
   })
+  Object.defineProperty(j.result._, 'update', { value: update(j) })
+  Object.defineProperty(j.result._, 'reparse', { value: reparse(j) })
   Object.defineProperty(j.result._, 'explicit', { value: j.explicit })
   Object.defineProperty(j.result._, 'parsed', { value: argv })
+  Object.defineProperty(j.result._, 'original', { value: original })
 
   return j
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jackspeak",
-  "version": "1.3.5",
+  "version": "1.4.0",
   "description": "A very strict and proper argument parser.",
   "main": "index.js",
   "scripts": {
@@ -13,7 +13,7 @@
   },
   "license": "ISC",
   "devDependencies": {
-    "tap": "^12.5.1"
+    "tap": "^14.0.0"
   },
   "files": [
     "index.js"