Coerce findLastIndex and lastIndexOf fromIndex parameter to integer (#4440)

blikblum · jdalton · commit 3ebb38d389b9 · 2019-08-24T09:44:00.000-07:00
* Enable lastIndexOf, findLast and findLastIndex

* Coerce findLastIndex fromIndex parameter to integer

* Coerce lastIndexOf fromIndex parameter to integer
diff --git a/findLastIndex.js b/findLastIndex.js
@@ -1,4 +1,5 @@
 import baseFindIndex from './.internal/baseFindIndex.js'
+import toInteger from './toInteger.js'
 
 /**
  * This method is like `findIndex` except that it iterates over elements
@@ -29,9 +30,10 @@ function findLastIndex(array, predicate, fromIndex) {
   }
   let index = length - 1
   if (fromIndex !== undefined) {
+    index = toInteger(fromIndex)
     index = fromIndex < 0
-      ? Math.max(length + fromIndex, 0)
-      : Math.min(fromIndex, length - 1)
+      ? Math.max(length + index, 0)
+      : Math.min(index, length - 1)
   }
   return baseFindIndex(array, predicate, index, true)
 }
diff --git a/lastIndexOf.js b/lastIndexOf.js
@@ -1,6 +1,7 @@
 import baseFindIndex from './.internal/baseFindIndex.js'
 import baseIsNaN from './.internal/baseIsNaN.js'
 import strictLastIndexOf from './.internal/strictLastIndexOf.js'
+import toInteger from './toInteger.js'
 
 /**
  * This method is like `indexOf` except that it iterates over elements of
@@ -28,6 +29,7 @@ function lastIndexOf(array, value, fromIndex) {
   }
   let index = length
   if (fromIndex !== undefined) {
+    index = toInteger(fromIndex)
     index = index < 0 ? Math.max(length + index, 0) : Math.min(index, length - 1)
   }
   return value === value
diff --git a/test/findLast.test.js b/test/findLast.test.js
diff --git a/test/findLastIndex-and-lastIndexOf.test.js b/test/findLastIndex-and-lastIndexOf.test.js
@@ -1,11 +1,18 @@
 import assert from 'assert';
 import lodashStable from 'lodash';
-import { _, identity, stubZero, falsey } from './utils.js';
+import { identity, stubZero, falsey } from './utils.js';
+import findLastIndex from '../findLastIndex.js';
+import lastIndexOf from '../lastIndexOf.js';
+
+const methods = {
+  findLastIndex,
+  lastIndexOf
+};
 
 describe('findLastIndex and lastIndexOf', function() {
   lodashStable.each(['findLastIndex', 'lastIndexOf'], function(methodName) {
     var array = [1, 2, 3, 1, 2, 3],
-        func = _[methodName],
+        func = methods[methodName],
         resolve = methodName == 'findLastIndex' ? lodashStable.curry(lodashStable.eq) : identity;
 
     it('`_.' + methodName + '` should return the index of the last matched value', function() {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import baseFindIndex from './.internal/baseFindIndex.js'`
	`2`	`+import toInteger from './toInteger.js'`
`2`	`3`
`3`	`4`	`/**`
`4`	`5`	* This method is like `findIndex` except that it iterates over elements
`@@ -29,9 +30,10 @@ function findLastIndex(array, predicate, fromIndex) {`
`29`	`30`	`}`
`30`	`31`	`let index = length - 1`
`31`	`32`	`if (fromIndex !== undefined) {`
	`33`	`+ index = toInteger(fromIndex)`
`32`	`34`	`index = fromIndex < 0`
`33`		`- ? Math.max(length + fromIndex, 0)`
`34`		`- : Math.min(fromIndex, length - 1)`
	`35`	`+ ? Math.max(length + index, 0)`
	`36`	`+ : Math.min(index, length - 1)`
`35`	`37`	`}`
`36`	`38`	`return baseFindIndex(array, predicate, index, true)`
`37`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import baseFindIndex from './.internal/baseFindIndex.js'`
`2`	`2`	`import baseIsNaN from './.internal/baseIsNaN.js'`
`3`	`3`	`import strictLastIndexOf from './.internal/strictLastIndexOf.js'`
	`4`	`+import toInteger from './toInteger.js'`
`4`	`5`
`5`	`6`	`/**`
`6`	`7`	* This method is like `indexOf` except that it iterates over elements of
`@@ -28,6 +29,7 @@ function lastIndexOf(array, value, fromIndex) {`
`28`	`29`	`}`
`29`	`30`	`let index = length`
`30`	`31`	`if (fromIndex !== undefined) {`
	`32`	`+ index = toInteger(fromIndex)`
`31`	`33`	`index = index < 0 ? Math.max(length + index, 0) : Math.min(index, length - 1)`
`32`	`34`	`}`
`33`	`35`	`return value === value`