re2 1.19.0 → 1.19.2

package/README.md

@@ -54,11 +54,11 @@ Supported properties:
 * [`re2.global`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/global)
 * [`re2.ignoreCase`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/ignoreCase)
 * [`re2.multiline`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/multiline)
-* *Since 1.17.6*: [`re2.dotAll`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/dotAll)
+* [`re2.dotAll`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/dotAll) — *since 1.17.6.*
 * [`re2.unicode`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/unicode)
   * `RE2` engine always works in the Unicode mode. See details below.
-* [`re2.sticky`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/sticky)
-* *Since 1.19.0*: [`re2.hasIndices`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/hasIndices)
+* [`re2.sticky`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/sticky) — *since 1.7.0.*
+* [`re2.hasIndices`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/hasIndices) — *since 1.19.0.*
 * [`re2.source`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/source)
 * [`re2.flags`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/flags)
 
@@ -71,7 +71,7 @@ Supported methods:
 Starting with 1.6.0 following well-known symbol-based methods are supported (see [Symbols](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Symbol)):
 
 * [`re2[Symbol.match](str)`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Symbol/match)
-* *Since 1.17.5*: [`re2[Symbol.matchAll](str)`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Symbol/matchAll)
+* [`re2[Symbol.matchAll](str)`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Symbol/matchAll) — *since 1.17.5.*
 * [`re2[Symbol.search](str)`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Symbol/search)
 * [`re2[Symbol.replace](str, newSubStr|function)`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Symbol/replace)
 * [`re2[Symbol.split](str[, limit])`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Symbol/split)
@@ -353,6 +353,8 @@ console.log('re2_res : ' + re2_res); // prints: re2_res : abc,a,b,c
 
 ## Release history
 
+- 1.19.2 *Bugfix: infinite loop in matchAll() with empty matches. Thx, [ziyunfei](https://github.com/ziyunfei).*
+- 1.19.1 *Bugfix: indices for the `d` flag when `lastIndex` is non zero. Bugfix: the match result. Thx, [teebu](https://github.com/teebu).*
 - 1.19.0 *Added `hasIndices` AKA the `d` flag. Thx, [teebu](https://github.com/teebu).*
 - 1.18.3 *Fixed bug with non-matched groups. Thx, [Dan Setterquist](https://github.com/dset).*
 - 1.18.2 *Reference to the binary module by its full name.*

package/lib/exec.cc

@@ -90,8 +90,8 @@ NAN_METHOD(WrappedRE2::Exec)
 				if (re2->hasIndices) {
 					auto pair = Nan::New<v8::Array>();
 					auto offset = data - str.data;
-					Nan::Set(pair, 0, Nan::New<v8::Integer>(static_cast<int>(offset)));
-					Nan::Set(pair, 1, Nan::New<v8::Integer>(static_cast<int>(offset + item.size())));
+					Nan::Set(pair, 0, Nan::New<v8::Integer>(indexOffset + static_cast<int>(offset)));
+					Nan::Set(pair, 1, Nan::New<v8::Integer>(indexOffset + static_cast<int>(offset + item.size())));
 					Nan::Set(indices, i, pair);
 				}
 			}
@@ -118,8 +118,8 @@ NAN_METHOD(WrappedRE2::Exec)
 					auto pair = Nan::New<v8::Array>();
 					auto offset = getUtf16Length(str.data + lastIndex, data);
 					auto length = getUtf16Length(data, data + item.size());
-					Nan::Set(pair, 0, Nan::New<v8::Integer>(static_cast<int>(offset)));
-					Nan::Set(pair, 1, Nan::New<v8::Integer>(static_cast<int>(offset + length)));
+					Nan::Set(pair, 0, Nan::New<v8::Integer>(indexOffset + static_cast<int>(offset)));
+					Nan::Set(pair, 1, Nan::New<v8::Integer>(indexOffset + static_cast<int>(offset + length)));
 					Nan::Set(indices, i, pair);
 				}
 			}

package/lib/match.cc

@@ -206,11 +206,10 @@ NAN_METHOD(WrappedRE2::Match)
 				Nan::Set(indices, Nan::New("groups").ToLocalChecked(), Nan::Undefined());
 			}
 		}
-	}
-
-	if (re2->hasIndices)
-	{
-		Nan::Set(result, Nan::New("indices").ToLocalChecked(), indices);
+		if (re2->hasIndices)
+		{
+			Nan::Set(result, Nan::New("indices").ToLocalChecked(), indices);
+		}
 	}
 
 	info.GetReturnValue().Set(result);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "re2",
-  "version": "1.19.0",
+  "version": "1.19.2",
   "description": "Bindings for RE2: fast, safe alternative to backtracking regular expression engines.",
   "homepage": "https://github.com/uhop/node-re2",
   "bugs": "https://github.com/uhop/node-re2/issues",
@@ -13,12 +13,12 @@
   "dependencies": {
     "install-artifact-from-github": "^1.3.3",
     "nan": "^2.17.0",
-    "node-gyp": "^9.3.1"
+    "node-gyp": "^9.4.0"
   },
   "devDependencies": {
-    "@types/node": "^20.2.3",
+    "@types/node": "^20.4.5",
     "heya-unit": "^0.3.0",
-    "typescript": "^5.0.4"
+    "typescript": "^5.1.6"
   },
   "scripts": {
     "test": "node tests/tests.js",

package/re2.js

@@ -29,6 +29,7 @@ if (typeof Symbol != 'undefined') {
       for (;;) {
         const result = re.exec(str);
         if (!result) break;
+        if (result[0] === '') ++re.lastIndex;
         yield result;
       }
     });

package/tests/test_exec.js

@@ -414,5 +414,27 @@ xy2 (at start of line)
     } catch (e) {
       // squelch
     }
+  },
+
+  function test_hasIndexLastIndex(t) {
+    'use strict';
+
+    const re2 = new RE2('a', 'dg');
+
+    eval(t.TEST('re2.lastIndex === 0'));
+
+    let result = re2.exec('abca');
+    eval(t.TEST('re2.lastIndex === 1'));
+    eval(t.TEST('result.index === 0'));
+    eval(t.TEST('t.unify(result.indices, [[0, 1]])'));
+
+    result = re2.exec('abca');
+    eval(t.TEST('re2.lastIndex === 4'));
+    eval(t.TEST('result.index === 3'));
+    eval(t.TEST('t.unify(result.indices, [[3, 4]])'));
+
+    result = re2.exec('abca');
+    eval(t.TEST('re2.lastIndex === 0'));
+    eval(t.TEST('result === null'));
   }
 ]);

package/tests/test_match.js

@@ -151,11 +151,22 @@ unit.add(module, [
   function test_matchHasIndices(t) {
     'use strict';
 
-    var re = new RE2('(aa)(?<b>b)?(?<c>ccc)', 'd'),
+    const re = new RE2('(aa)(?<b>b)?(?<c>ccc)', 'd'),
       str1 = '1aabccc2',
       str2 = '1aaccc2';
 
     eval(t.TEST("t.unify(str1.match(re), re.exec(str1))"));
     eval(t.TEST("t.unify(str2.match(re), re.exec(str2))"));
+  },
+
+  function test_matchHasIndicesGlobal(t) {
+    'use strict';
+
+    const re = new RE2('(?<zzz>a)', 'dg'),
+      result = 'abca'.match(re);
+
+    eval(t.TEST("t.unify(result, ['a', 'a'])"));
+    eval(t.TEST("!('indices' in result)"));
+    eval(t.TEST("!('groups' in result)"));
   }
 ]);

package/tests/test_matchAll.js

@@ -77,5 +77,19 @@ unit.add(module, [
       eval(t.TEST('match[0] === expected[i]'));
       ++i;
     }
+  },
+
+  function test_matchAll_empty_match(t) {
+    'use strict';
+
+    const str = 'foo';
+    // Matches empty strings, but should not cause an infinite loop
+    const re = new RE2('(?:)', 'g');
+    const result = Array.from(str.matchAll(re));
+
+    eval(t.TEST('result.length === str.length + 1'));
+    for (let i = 0; i < result.length; ++i) {
+      eval(t.TEST('result[i][0] === ""'));
+    }
   }
 ]);