more tests

Author: 75lb

dist/index.cjs

@@ -34,40 +34,45 @@ function fromTo (arr, options = {}) {
     })
   });
 
-  const toFn = arrayBack(options.to).map(convertToFunction);
-  let toIndex = -1;
-  if (toFn.length) {
-    for (const fn of toFn) {
-      toIndex = arr.findIndex((item, index, arr) => {
-        if (index > fromIndex) {
-          const valueIndex = index - fromIndex;
-          return fn(item, index, arr, valueIndex)
-        } else {
-          return false
+  /* From item not found */
+  if (fromIndex === -1) {
+    return []
+  } else {
+    const toFn = arrayBack(options.to).map(convertToFunction);
+    let toIndex = -1;
+    if (toFn.length) {
+      for (const fn of toFn) {
+        toIndex = arr.findIndex((item, index, arr) => {
+          if (index > fromIndex) {
+            const valueIndex = index - fromIndex;
+            return fn(item, index, arr, valueIndex)
+          } else {
+            return false
+          }
+        });
+        /* Keep looping until a match is found. */
+        if (toIndex > -1) {
+          break
         }
-      });
-      /* Keep looping until a match is found. */
-      if (toIndex > -1) {
-        break
       }
     }
-  }
 
-  /* 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 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);
-    } else {
-      arr.splice(fromIndex, toIndex - fromIndex);
+    /* step 3: optionally remove from input array */
+    if (options.remove) {
+      if (toIndex === -1) {
+        arr.splice(fromIndex);
+      } else {
+        arr.splice(fromIndex, toIndex - fromIndex);
+      }
     }
-  }
 
-  return output
+    return output
+  }
 }
 
 function convertToFunction (fn) {

lib/from-to.js

@@ -32,40 +32,45 @@ function fromTo (arr, options = {}) {
     })
   })
 
-  const toFn = arrayBack(options.to).map(convertToFunction)
-  let toIndex = -1
-  if (toFn.length) {
-    for (const fn of toFn) {
-      toIndex = arr.findIndex((item, index, arr) => {
-        if (index > fromIndex) {
-          const valueIndex = index - fromIndex
-          return fn(item, index, arr, valueIndex)
-        } else {
-          return false
+  /* From item not found */
+  if (fromIndex === -1) {
+    return []
+  } else {
+    const toFn = arrayBack(options.to).map(convertToFunction)
+    let toIndex = -1
+    if (toFn.length) {
+      for (const fn of toFn) {
+        toIndex = arr.findIndex((item, index, arr) => {
+          if (index > fromIndex) {
+            const valueIndex = index - fromIndex
+            return fn(item, index, arr, valueIndex)
+          } else {
+            return false
+          }
+        })
+        /* Keep looping until a match is found. */
+        if (toIndex > -1) {
+          break
         }
-      })
-      /* Keep looping until a match is found. */
-      if (toIndex > -1) {
-        break
       }
     }
-  }
 
-  /* 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 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)
-    } else {
-      arr.splice(fromIndex, toIndex - fromIndex)
+    /* step 3: optionally remove from input array */
+    if (options.remove) {
+      if (toIndex === -1) {
+        arr.splice(fromIndex)
+      } else {
+        arr.splice(fromIndex, toIndex - fromIndex)
+      }
     }
-  }
 
-  return output
+    return output
+  }
 }
 
 function convertToFunction (fn) {

package-lock.json

@@ -66,6 +66,17 @@ test.set('--option value', async function () {
   a.deepEqual(arr, ['one', 'here', 'more'])
 })
 
+test.set('--option value, from not found with remove set', async function () {
+  const arr = ['one', 'here', '--option', 'there', 'more']
+  const result = fromTo(arr, {
+    from: '--not-found',
+    to: (val, i, a, valueIndex) => valueIndex > 1 || val.startsWith('--'),
+    remove: true
+  })
+  a.deepEqual(result, [])
+  a.deepEqual(arr, ['one', 'here', '--option', 'there', 'more'])
+})
+
 test.set('--option value, no remove', async function () {
   const arr = ['one', 'here', '--option', 'there', 'more']
   const result = fromTo(arr, {

test/from-to.js

@@ -137,6 +137,33 @@ test.set('Positional with one single', async function () {
   a.deepEqual(result, { symbol: 'AAPL', contract: true })
 })
 
+test.set('Positional, one single, one from-to', async function () {
+  const argv = ['AAPL', '--contract']
+  const cla = new CommandLineArgs(argv)
+  const result = cla.parse([
+    {
+      name: 'contract',
+      extractor: 'single',
+      single: '--contract',
+      output: extraction => true
+    },
+    {
+      name: 'symbol',
+      extractor: 'positional',
+      position: 1,
+      output: extraction => extraction[0]
+    },
+    {
+      name: 'exchange',
+      extractor: 'fromTo',
+      from: '--exchange',
+      to: 'singleOptionValue',
+      output: extraction => extraction[1]
+    },
+  ])
+  a.deepEqual(result, { symbol: 'AAPL', contract: true })
+})
+
 test.set('Missing positional with one single', async function () {
   const argv = ['--contract']
   const cla = new CommandLineArgs(argv)