Fixed issue where the offset was not truly global and unique

Author: oztune

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "string-replace-to-array",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Works like String.prototype.replace but outputs an array. Useful for replacing parts of the string with objects of other types.",
   "main": "string-replace-to-array.js",
   "repository": {

package.json

@@ -1,15 +1,15 @@
 // Inspiration: https://github.com/facebook/react/issues/3386
 
-function replace (string, regexpOrSubstr, newValueOrFn) {
+function replace (string, regexpOrSubstr, newValueOrFn, globalOffset) {
 	if (typeof string !== 'string') throw new Error('First param must be a string')
 	if (typeof regexpOrSubstr !== 'string' && !(regexpOrSubstr instanceof RegExp)) throw new Error('Second param must be a string pattern or a regular expression')
 
 	var fn = (typeof regexpOrSubstr === 'string') ? replaceUsingString : replaceUsingRegexp
 
-	return fn(string, regexpOrSubstr, newValueOrFn)
+	return fn(string, regexpOrSubstr, newValueOrFn, globalOffset)
 }
 
-function replaceUsingString (string, patternString, newValueOrFn) {
+function replaceUsingString (string, patternString, newValueOrFn, globalOffset) {
 	var index = string.indexOf(patternString)
 
 	if (index >= 0) {
@@ -24,7 +24,7 @@ function replaceUsingString (string, patternString, newValueOrFn) {
 			(typeof newValueOrFn === 'function') ?
 				newValueOrFn(
 					string.substring(index, endIndex),
-					index,
+					index + globalOffset,
 					string
 				) :
 				newValueOrFn
@@ -40,7 +40,7 @@ function replaceUsingString (string, patternString, newValueOrFn) {
 	}
 }
 
-function replaceUsingRegexp (string, regexp, newValueOrFn) {
+function replaceUsingRegexp (string, regexp, newValueOrFn, globalOffset) {
 	var output = []
 
 	var replacerIsFn = (typeof newValueOrFn === 'function')
@@ -68,7 +68,7 @@ function replaceUsingRegexp (string, regexp, newValueOrFn) {
 		lastIndex = index + match.length
 
 		var out = replacerIsFn ?
-			newValueOrFn.apply(this, result.concat(index, result.input)) :
+			newValueOrFn.apply(this, result.concat(index + globalOffset, result.input)) :
 			newValueOrFn
 		output.push(out)
 
@@ -87,16 +87,21 @@ function replaceUsingRegexp (string, regexp, newValueOrFn) {
 
 module.exports = function stringReplaceToArray (stringOrArray, regexpOrSubstr, newSubStrOrFn) {
 	if (typeof stringOrArray === 'string') {
-		return replace(stringOrArray, regexpOrSubstr, newSubStrOrFn)
+		return replace(stringOrArray, regexpOrSubstr, newSubStrOrFn, 0)
 	} else if (!Array.isArray(stringOrArray) || !stringOrArray[0]) {
 		throw new TypeError('First argument must be an array or non-empty string')
 	} else {
 		var len = stringOrArray.length
 		var output = []
+		var globalOffset = 0
 		for (var i = 0; i < len; ++i) {
 			var arrayItem = stringOrArray[i]
-			if (typeof arrayItem !== 'string') output.push(arrayItem)
-			else output.push.apply(output, replace(arrayItem, regexpOrSubstr, newSubStrOrFn))
+			if (typeof arrayItem === 'string') {
+				output.push.apply(output, replace(arrayItem, regexpOrSubstr, newSubStrOrFn, globalOffset))
+				globalOffset += arrayItem.length
+			} else {
+				output.push(arrayItem)
+			}
 		}
 		return output
 	}

string-replace-to-array.js

@@ -83,5 +83,18 @@ describe('string-replace-to-array', function () {
 			replace([{}, 'some string', {}], 'some', 'a')
 				.should.eql([{}, 'a', ' string', {}])
 		})
+		// Source: https://github.com/appfigures/react-easy-emoji/issues/18
+		it ('should provide a global offset when doing a string replace', function () {
+			const result = replace(["🧡 abc", "🧡 xyz"], '🧡', (_match, offset, _string) => {
+				return offset
+			})
+			result.should.eql([0, ' abc', 6, ' xyz'])
+		})
+		it ('should provide a global offset when doing a regex replace', function () {
+			const result = replace(["🧡 abc", "🧡 xyz"], /🧡/g, (_match, offset, _string) => {
+				return offset
+			})
+			result.should.eql([0, ' abc', 6, ' xyz'])
+		})
 	})
 })