re2 1.20.2 → 1.20.4

package/README.md

@@ -353,6 +353,8 @@ console.log('re2_res : ' + re2_res); // prints: re2_res : abc,a,b,c
 
 ## Release history
 
+- 1.20.4 *Updated deps. Fix: the 2nd argument of the constructor overrides flags. Thx, [gost-serb](https://github.com/gost-serb).*
+- 1.20.3 *Fix: subsequent numbers are incorporated into group if they would form a legal group reference. Thx, [Oleksii Vasyliev](https://github.com/le0pard).*
 - 1.20.2 *Fix: added a missing C++ file, which caused a bug on Alpine Linux. Thx, [rbitanga-manticore](https://github.com/rbitanga-manticore).*
 - 1.20.1 *Fix: files included in the npm package to build the C++ code.*
 - 1.20.0 *Updated RE2. New version uses `abseil-cpp` and required the adaptation work. Thx, [Stefano Rivera](https://github.com/stefanor).*

package/lib/new.cc

@@ -235,6 +235,7 @@ NAN_METHOD(WrappedRE2::New)
 	bool hasIndices = false;
 
 	auto context = Nan::GetCurrentContext();
+	bool needFlags = true;
 
 	if (info.Length() > 1)
 	{
@@ -279,6 +280,7 @@ NAN_METHOD(WrappedRE2::New)
 			}
 		}
 		size = 0;
+		needFlags = false;
 	}
 
 	bool needConversion = true;
@@ -303,14 +305,18 @@ NAN_METHOD(WrappedRE2::New)
 
 		source = escapeRegExp(data, size);
 
-		v8::RegExp::Flags flags = re->GetFlags();
-		global = bool(flags & v8::RegExp::kGlobal);
-		ignoreCase = bool(flags & v8::RegExp::kIgnoreCase);
-		multiline = bool(flags & v8::RegExp::kMultiline);
-		dotAll = bool(flags & v8::RegExp::kDotAll);
-		unicode = bool(flags & v8::RegExp::kUnicode);
-		sticky = bool(flags & v8::RegExp::kSticky);
-		hasIndices = bool(flags & v8::RegExp::kHasIndices);
+		if (needFlags)
+		{
+			v8::RegExp::Flags flags = re->GetFlags();
+			global = bool(flags & v8::RegExp::kGlobal);
+			ignoreCase = bool(flags & v8::RegExp::kIgnoreCase);
+			multiline = bool(flags & v8::RegExp::kMultiline);
+			dotAll = bool(flags & v8::RegExp::kDotAll);
+			unicode = bool(flags & v8::RegExp::kUnicode);
+			sticky = bool(flags & v8::RegExp::kSticky);
+			hasIndices = bool(flags & v8::RegExp::kHasIndices);
+			needFlags = false;
+		}
 	}
 	else if (info[0]->IsObject() && !info[0]->IsString())
 	{
@@ -331,13 +337,17 @@ NAN_METHOD(WrappedRE2::New)
 
 			source = re2->source;
 
-			global = re2->global;
-			ignoreCase = re2->ignoreCase;
-			multiline = re2->multiline;
-			dotAll = re2->dotAll;
-			unicode = true;
-			sticky = re2->sticky;
-			hasIndices = re2->hasIndices;
+			if (needFlags)
+			{
+				global = re2->global;
+				ignoreCase = re2->ignoreCase;
+				multiline = re2->multiline;
+				dotAll = re2->dotAll;
+				unicode = true;
+				sticky = re2->sticky;
+				hasIndices = re2->hasIndices;
+				needFlags = false;
+			}
 		}
 	}
 	else if (info[0]->IsString())

package/lib/replace.cc

@@ -142,6 +142,12 @@ inline std::string replace(const char *data, size_t size, const std::vector<re2:
 								result += (std::string)groups[index2];
 								continue;
 							}
+							else if (index && index < groups.size())
+							{
+								result += (std::string)groups[index];
+								result += ch;
+								continue;
+							}
 							result += '$';
 							result += '0' + index;
 							result += ch;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "re2",
-  "version": "1.20.2",
+  "version": "1.20.4",
   "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",
@@ -12,13 +12,13 @@
   },
   "dependencies": {
     "install-artifact-from-github": "^1.3.3",
-    "nan": "^2.17.0",
+    "nan": "^2.18.0",
     "node-gyp": "^9.4.0"
   },
   "devDependencies": {
-    "@types/node": "^20.5.3",
+    "@types/node": "^20.8.7",
     "heya-unit": "^0.3.0",
-    "typescript": "^5.1.6"
+    "typescript": "^5.2.2"
   },
   "scripts": {
     "test": "node tests/tests.js",

package/tests/test_general.js

@@ -278,6 +278,45 @@ unit.add(module, [
 
 		re = new RE2("a", "smigyu");
 		eval(t.TEST("re.flags === 'gimsuy'"));
+	},
+	function test_flags_2nd(t) {
+		"use strict";
+
+		var re = new RE2(/a/, "u");
+		eval(t.TEST("re.flags === 'u'"));
+
+		re = new RE2(/a/gm, "iu");
+		eval(t.TEST("re.flags === 'iu'"));
+
+		re = new RE2(/a/ig, "mu");
+		eval(t.TEST("re.flags === 'mu'"));
+
+		re = new RE2(/a/g, "gu");
+		eval(t.TEST("re.flags === 'gu'"));
+
+		re = new RE2(/a/m, "yu");
+		eval(t.TEST("re.flags === 'uy'"));
+
+		re = new RE2(/a/, "yiu");
+		eval(t.TEST("re.flags === 'iuy'"));
+
+		re = new RE2(/a/gim, "yigu");
+		eval(t.TEST("re.flags === 'giuy'"));
+
+		re = new RE2(/a/gm, "miu");
+		eval(t.TEST("re.flags === 'imu'"));
+
+		re = new RE2(/a/i, "ygu");
+		eval(t.TEST("re.flags === 'guy'"));
+
+		re = new RE2(/a/g, "myu");
+		eval(t.TEST("re.flags === 'muy'"));
+
+		re = new RE2(/a/, "migyu");
+		eval(t.TEST("re.flags === 'gimuy'"));
+
+		re = new RE2(/a/s, "smigyu");
+		eval(t.TEST("re.flags === 'gimsuy'"));
 	}
 ]);
 

package/tests/test_replace.js

@@ -334,5 +334,47 @@ unit.add(module, [
     var re = new RE2(/b(?<a>1)? & (?<b>2)?y/);
     var result = re.replace('ab & yz', replacer);
     eval(t.TEST("result === 'az'"));
+  },
+  function test_replaceGroupSimple(t) {
+    'use strict';
+
+    var re = new RE2(/(2)/);
+
+    var result = re.replace('123', '$0');
+    eval(t.TEST("result === '1$03'"));
+    result = re.replace('123', '$1');
+    eval(t.TEST("result === '123'"));
+    result = re.replace('123', '$2');
+    eval(t.TEST("result === '1$23'"));
+
+    result = re.replace('123', '$00');
+    eval(t.TEST("result === '1$003'"));
+    result = re.replace('123', '$01');
+    eval(t.TEST("result === '123'"));
+    result = re.replace('123', '$02');
+    eval(t.TEST("result === '1$023'"));
+  },
+  function test_replaceGroupCases(t) {
+    'use strict';
+
+    var re = new RE2(/(test)/g);
+    var result = re.replace('123', '$1$20');
+    eval(t.TEST("result === '123'"));
+
+    re = new RE2(/(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)/g);
+    result = re.replace('abcdefghijklmnopqrstuvwxyz123', '$10$20');
+    eval(t.TEST("result === 'jb0wo0123'"));
+
+    re = new RE2(/(.)(.)(.)(.)(.)/g);
+    result = re.replace('abcdefghijklmnopqrstuvwxyz123', '$10$20');
+    eval(t.TEST("result === 'a0b0f0g0k0l0p0q0u0v0z123'"));
+
+    re = new RE2(/(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)/g);
+    result = re.replace('abcdefghijklmnopqrstuvwxyz123', '$10$20');
+    eval(t.TEST("result === 'jtvwxyz123'"));
+
+    re = new RE2(/abcd/g);
+    result = re.replace('abcd123', '$1$2');
+    eval(t.TEST("result === '$1$2123'"));
   }
 ]);