re2 1.20.1 → 1.20.3

package/.github/actions/linux-alpine-node-16/entrypoint.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 npm config set unsafe-perm true
 export USERNAME=`whoami`
 export DEVELOPMENT_SKIP_GETTING_ASSET=true

package/.github/actions/linux-alpine-node-18/entrypoint.sh

@@ -1,6 +1,8 @@
 #!/bin/sh
 
-npm config set unsafe-perm true
+set -e
+
+#npm config set unsafe-perm true
 export USERNAME=`whoami`
 export DEVELOPMENT_SKIP_GETTING_ASSET=true
 npm i

package/.github/actions/linux-alpine-node-20/entrypoint.sh

@@ -1,6 +1,8 @@
 #!/bin/sh
 
-npm config set unsafe-perm true
+set -e
+
+#npm config set unsafe-perm true
 export USERNAME=`whoami`
 export DEVELOPMENT_SKIP_GETTING_ASSET=true
 npm i

package/.github/actions/linux-node-12/entrypoint.sh

@@ -1,5 +1,7 @@
 #!/bin/bash -l
 
+set -e
+
 NVM_DIR=$HOME/.nvm
 
 curl -sS -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash

package/.github/actions/linux-node-18/entrypoint.sh

@@ -1,6 +1,8 @@
 #!/bin/sh
 
-npm config set unsafe-perm true
+set -e
+
+#npm config set unsafe-perm true
 export USERNAME=`whoami`
 export DEVELOPMENT_SKIP_GETTING_ASSET=true
 npm i

package/.github/actions/linux-node-20/entrypoint.sh

@@ -1,6 +1,8 @@
 #!/bin/sh
 
-npm config set unsafe-perm true
+set -e
+
+#npm config set unsafe-perm true
 export USERNAME=`whoami`
 export DEVELOPMENT_SKIP_GETTING_ASSET=true
 npm i

package/README.md

@@ -353,6 +353,8 @@ console.log('re2_res : ' + re2_res); // prints: re2_res : abc,a,b,c
 
 ## Release history
 
+- 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).*
 - 1.19.2 *Bugfix: infinite loop in matchAll() with empty matches. Thx, [ziyunfei](https://github.com/ziyunfei).*

package/binding.gyp

@@ -47,6 +47,7 @@
         "vendor/abseil-cpp/absl/base/internal/throw_delegate.cc",
         "vendor/abseil-cpp/absl/base/internal/unscaledcycleclock.cc",
         "vendor/abseil-cpp/absl/container/internal/raw_hash_set.cc",
+        "vendor/abseil-cpp/absl/debugging/internal/address_is_readable.cc",
         "vendor/abseil-cpp/absl/debugging/stacktrace.cc",
         "vendor/abseil-cpp/absl/debugging/symbolize.cc",
         "vendor/abseil-cpp/absl/flags/commandlineflag.cc",

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.1",
+  "version": "1.20.3",
   "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",
@@ -16,7 +16,7 @@
     "node-gyp": "^9.4.0"
   },
   "devDependencies": {
-    "@types/node": "^20.4.5",
+    "@types/node": "^20.5.3",
     "heya-unit": "^0.3.0",
     "typescript": "^5.1.6"
   },

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'"));
   }
 ]);