from array to array

Author: 75lb

dist/index.cjs

@@ -21,7 +21,18 @@ var arrayBack = require('array-back');
 
 /* TODO: rename to extractFromTo? Rename `options.remove` to `extract`. */
 function fromTo (arr, options = {}) {
-  const fromIndex = getFromIndex(arr, options.from);
+  /* step 1: compute from and to index */
+  const fromIndex = arr.findIndex(item => {
+    return arrayBack(options.from).some(fr => {
+      if (typeof fr === 'function') {
+        return fr(item)
+      } else if (fr instanceof RegExp) {
+        return fr.test(item)
+      } else {
+        return fr === item
+      }
+    })
+  });
 
   const toFn = arrayBack(options.to).map(convertToFunction);
   let toIndex = -1;
@@ -42,10 +53,12 @@ function fromTo (arr, options = {}) {
     }
   }
 
+  /* step 2: extract items between the from and to indices */
   const output = toIndex === -1
     ? arr.slice(fromIndex) /* Return all to the end */
     : arr.slice(fromIndex, toIndex);
 
+  /* step 3: optionally remove from input array */
   if (options.remove) {
     if (toIndex === -1) {
       arr.splice(fromIndex);

lib/from-to.js

@@ -19,7 +19,18 @@ import arrayBack from 'array-back'
 
 /* TODO: rename to extractFromTo? Rename `options.remove` to `extract`. */
 function fromTo (arr, options = {}) {
-  const fromIndex = getFromIndex(arr, options.from)
+  /* step 1: compute from and to index */
+  const fromIndex = arr.findIndex(item => {
+    return arrayBack(options.from).some(fr => {
+      if (typeof fr === 'function') {
+        return fr(item)
+      } else if (fr instanceof RegExp) {
+        return fr.test(item)
+      } else {
+        return fr === item
+      }
+    })
+  })
 
   const toFn = arrayBack(options.to).map(convertToFunction)
   let toIndex = -1
@@ -40,10 +51,12 @@ function fromTo (arr, options = {}) {
     }
   }
 
+  /* step 2: extract items between the from and to indices */
   const output = toIndex === -1
     ? arr.slice(fromIndex) /* Return all to the end */
     : arr.slice(fromIndex, toIndex)
 
+  /* step 3: optionally remove from input array */
   if (options.remove) {
     if (toIndex === -1) {
       arr.splice(fromIndex)

test/from-to.js

@@ -1,5 +1,5 @@
 import { strict as a } from 'assert'
-import { fromTo, single, positional } from '../lib/from-to.js'
+import { fromTo, single } from '../lib/from-to.js'
 
 const [test, only, skip] = [new Map(), new Map(), new Map()]
 
@@ -88,7 +88,7 @@ test.set('--option value value ...', async function () {
   a.deepEqual(arr, ['one', 'here'])
 })
 
-skip.set('from many, to many', async function () {
+test.set('from many, to many', async function () {
   const validCommands = [
     '/help',
     '/users',
@@ -100,14 +100,21 @@ skip.set('from many, to many', async function () {
     '/join'
   ]
 
-  const arr = ['/join', 'r', '/nick', 'lloyd']
+  const arr = ['/join', 'roomA', '/nick', 'lloyd']
   const result = fromTo(arr, {
     from: validCommands,
-    to: validCommands
+    to: validCommands,
+    remove: true
+  })
+  const result2 = fromTo(arr, {
+    from: validCommands,
+    to: validCommands,
+    remove: true
   })
   /* Priority should be given to "first in the array", not "first in the from list". Is order in the argv more meaningful than order in the from list? */
-  a.deepEqual(result, ['/join', 'r'])
-  // a.deepEqual(arr, ['one', 'here'])
+  a.deepEqual(result, ['/join', 'roomA'])
+  a.deepEqual(result2, ['/nick', 'lloyd'])
+  // this.data = { result, result2 }
 })
 
 export { test, only, skip }

test/test.js

@@ -1,17 +1,8 @@
 import { strict as a } from 'assert'
 import CommandLineArgs from 'command-line-args'
-import { fromTo, single, positional } from '../lib/from-to.js'
 
 const [test, only, skip] = [new Map(), new Map(), new Map()]
 
-function singleOptionValuePreset (arg, index, argv, valueIndex) {
-  return valueIndex > 1 || arg.startsWith('--')
-}
-
-function multipleOptionValuePreset (arg, index, argv, valueIndex) {
-  return arg.startsWith('--')
-}
-
 test.set('Input argv is not mutated', async function () {
   const argv = ['one', 'two', '--one', 'something', '--two']
   const optionDefinitions = [
@@ -180,7 +171,7 @@ test.set('Magic arg values: file1 file2 extra-large verbose output final', async
 })
 
 skip.set('Preprocessing', async function () {
-  const argv = ['b25lIHR3byAtLW9uZSBzb21ldGhpbmcgLS10d28K'] // or a JWT
+  // const argv = ['b25lIHR3byAtLW9uZSBzb21ldGhpbmcgLS10d28K'] // or a JWT
   // echo 'one two --one something --two' | base64
 })
 
@@ -245,13 +236,13 @@ test.set('self-defining options', async function () {
       from: /^--server\.string\./,
       to: 'singleOptionValue',
       output: e => e[1]
-    },
+    }
   ]
 
   const cla = new CommandLineArgs(argv)
   const result = cla.parse(optionDefinitions)
   a.deepEqual(result, {
-    one: [ 'one', 'uno', 'ein' ],
+    one: ['one', 'uno', 'ein'],
     two: undefined,
     broke: 1,
     three: true,