re2 1.17.3 → 1.17.7

package/.github/actions/{linux-alpine-node-17 → linux-alpine-node-18}/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:17-alpine
+FROM node:18-alpine
 
 RUN apk add --no-cache python3 make gcc g++
 

package/.github/actions/linux-alpine-node-18/action.yml

@@ -0,0 +1,7 @@
+name: 'Create a binary artifact for Node 18 on Alpine Linux'
+description: 'Create a binary artifact for Node 18 on Alpine Linux using musl'
+runs:
+  using: 'docker'
+  image: 'Dockerfile'
+  args:
+    - ${{inputs.node-version}}

package/.github/actions/linux-node-12/action.yml

@@ -1,5 +1,5 @@
-name: 'Create a binary artifact for Node >10 on Linux'
-description: 'Create a binary artifact for Node >10 on Linux using CentOS6 and glibc 2.17'
+name: 'Create a binary artifact for Node > 10 on Linux'
+description: 'Create a binary artifact for Node > 10 on Linux using CentOS7 and glibc 2.17'
 inputs:
   node-version:
     description: 'Node.js version'

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

@@ -2,7 +2,7 @@
 
 NVM_DIR=$HOME/.nvm
 
-curl -sS -o- https://raw.githubusercontent.com/creationix/nvm/v0.35.3/install.sh | bash
+curl -sS -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
 
 nvm install --no-progress $1

package/.github/actions/linux-node-18/Dockerfile

@@ -0,0 +1,6 @@
+FROM node:18-buster
+
+RUN apt install python3 make gcc g++
+
+COPY entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]

package/.github/actions/linux-node-18/action.yml

@@ -0,0 +1,12 @@
+name: 'Create a binary artifact for Node == 18 on Linux'
+description: 'Create a binary artifact for Node == 18 on Linux using node:18-buster'
+inputs:
+  node-version:
+    description: 'Node.js version'
+    required: false
+    default: '18'
+runs:
+  using: 'docker'
+  image: 'Dockerfile'
+  args:
+    - ${{inputs.node-version}}

package/.github/actions/{linux-alpine-node-12 → linux-node-18}/entrypoint.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 npm config set unsafe-perm true
+export USERNAME=`whoami`
 export DEVELOPMENT_SKIP_GETTING_ASSET=true
 npm i
 npm run build --if-present

package/.github/workflows/build.yml

@@ -30,15 +30,18 @@ jobs:
 
     strategy:
       matrix:
-        os: [windows-latest, macOS-latest]
-        node-version: [12, 14, 16, 17]
+        os: [macOS-latest, windows-latest]
+        node-version: [14, 16, 18]
+        exclude:
+          - os: windows-latest
+            node-version: 14
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
     - name: Setup Node.js ${{matrix.node-version}}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: ${{matrix.node-version}}
     - name: Get NPM cache directory
@@ -46,7 +49,7 @@ jobs:
       run: |
         echo "::set-output name=dir::$(npm config get cache)"
     - name: Cache node modules
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{steps.npm-cache.outputs.dir}}
         key: ${{runner.os}}-node-${{hashFiles('**/package-lock.json')}}
@@ -65,7 +68,7 @@ jobs:
         GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
       run: npm run save-to-github
 
-  build-linux-node:
+  build-linux-centos7-node:
     name: Node.js ${{matrix.node-version}} on CentOS 7
     needs: create-release
     runs-on: ubuntu-latest
@@ -73,10 +76,10 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12, 14, 16, 17]
+        node-version: [14, 16]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
     - name: Get NPM cache directory
@@ -84,7 +87,7 @@ jobs:
       run: |
         echo "::set-output name=dir::$(npm config get cache)"
     - name: Cache node modules
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{steps.npm-cache.outputs.dir}}
         key: Linux-node-${{hashFiles('**/package-lock.json')}}
@@ -98,14 +101,14 @@ jobs:
       with:
         node-version: ${{matrix.node-version}}
 
-  build-linux-alpine-node-12:
-    name: Node.js 12 on Alpine Linux
+  build-linux-node-18:
+    name: Node.js 18 on Debian Buster
     needs: create-release
     runs-on: ubuntu-latest
     continue-on-error: true
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
     - name: Get NPM cache directory
@@ -113,15 +116,15 @@ jobs:
       run: |
         echo "::set-output name=dir::$(npm config get cache)"
     - name: Cache node modules
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{steps.npm-cache.outputs.dir}}
-        key: Linux-Alpine-node-${{hashFiles('**/package-lock.json')}}
+        key: Linux-node-${{hashFiles('**/package-lock.json')}}
         restore-keys: |
-          Linux-Alpine-node-
-          Linux-Alpine-
+          Linux-node-
+          Linux-
     - name: Install, test, and create artifact
-      uses: ./.github/actions/linux-alpine-node-12/
+      uses: ./.github/actions/linux-node-18/
       env:
         GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
@@ -132,7 +135,7 @@ jobs:
     continue-on-error: true
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
     - name: Get NPM cache directory
@@ -140,7 +143,7 @@ jobs:
       run: |
         echo "::set-output name=dir::$(npm config get cache)"
     - name: Cache node modules
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{steps.npm-cache.outputs.dir}}
         key: Linux-Alpine-node-${{hashFiles('**/package-lock.json')}}
@@ -159,7 +162,7 @@ jobs:
     continue-on-error: true
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
     - name: Get NPM cache directory
@@ -167,7 +170,7 @@ jobs:
       run: |
         echo "::set-output name=dir::$(npm config get cache)"
     - name: Cache node modules
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{steps.npm-cache.outputs.dir}}
         key: Linux-Alpine-node-${{hashFiles('**/package-lock.json')}}
@@ -179,14 +182,14 @@ jobs:
       env:
         GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
-  build-linux-alpine-node-17:
-    name: Node.js 17 on Alpine Linux
+  build-linux-alpine-node-18:
+    name: Node.js 18 on Alpine Linux
     needs: create-release
     runs-on: ubuntu-latest
     continue-on-error: true
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
     - name: Get NPM cache directory
@@ -194,7 +197,7 @@ jobs:
       run: |
         echo "::set-output name=dir::$(npm config get cache)"
     - name: Cache node modules
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{steps.npm-cache.outputs.dir}}
         key: Linux-Alpine-node-${{hashFiles('**/package-lock.json')}}
@@ -202,6 +205,6 @@ jobs:
           Linux-Alpine-node-
           Linux-Alpine-
     - name: Install, test, and create artifact
-      uses: ./.github/actions/linux-alpine-node-17/
+      uses: ./.github/actions/linux-alpine-node-18/
       env:
         GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

package/.github/workflows/tests.yml

@@ -13,22 +13,25 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
-        node-version: [12, 14, 16, 17]
+        os: [ubuntu-latest, macOS-latest, windows-latest]
+        node-version: [14, 16, 18]
+        exclude:
+          - os: windows-latest
+            node-version: 14
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
     - name: Setup Node.js ${{matrix.node-version}}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: ${{matrix.node-version}}
     - name: Get NPM cache directory
       id: npm-cache
       run: echo "::set-output name=dir::$(npm config get cache)"
     - name: Cache node modules
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ${{steps.npm-cache.outputs.dir}}
         key: ${{runner.os}}-node-${{hashFiles('**/package-lock.json')}}

package/.prettierrc

@@ -1,5 +1,5 @@
 {
-  "printWidth": 160,
+  "printWidth": 120,
   "singleQuote": true,
   "bracketSpacing": false,
   "arrowParens": "avoid",

package/README.md

@@ -54,6 +54,7 @@ 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.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)
@@ -69,6 +70,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.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)
@@ -81,6 +83,9 @@ var re = new RE2("1");
 "213".search(re);       // 1
 "213".replace(re, "+"); // 2+3
 "213".split(re);        // [ '2', '3' ]
+
+Array.from("2131".matchAll(re)); // returns a generator!
+// [['1', index: 1, input: '2131'], ['1', index: 3, input: '2131']]
 ```
 
 Starting with 1.8.0 [named groups](https://tc39.github.io/proposal-regexp-named-groups/) are supported.
@@ -347,6 +352,10 @@ console.log('re2_res : ' + re2_res); // prints: re2_res : abc,a,b,c
 
 ## Release history
 
+- 1.17.7 *Added support for a cross-platform fetching of a pre-compiled version by updating [install-artifact-from-github](https://github.com/uhop/install-artifact-from-github).*
+- 1.17.6 *Implemented `dotAll`. Thx [Michael Kriese](https://github.com/viceice).*
+- 1.17.5 *Updated deps, updated test/build targets, implemented `matchAll()` (thx, [ThePendulum](https://github.com/ThePendulum) and [David Sichau](https://github.com/DavidSichau)).*
+- 1.17.4 *Updated deps.*
 - 1.17.3 *Fixed bug with zero-length replacements.*
 - 1.17.2 *Added support for the enhanced local mirroring by updating [install-artifact-from-github](https://github.com/uhop/install-artifact-from-github).*
 - 1.17.1 *Fix for `lastIndex` for U+10000 - U+10FFFF UTF characters. Thx, [omg](https://github.com/omg).*

package/lib/accessors.cc

@@ -51,6 +51,10 @@ NAN_GETTER(WrappedRE2::GetFlags)
 	{
 		flags += "m";
 	}
+	if (re2->dotAll)
+	{
+		flags += "s";
+	}
 	flags += "u";
 	if (re2->sticky)
 	{
@@ -96,6 +100,18 @@ NAN_GETTER(WrappedRE2::GetMultiline)
 	info.GetReturnValue().Set(re2->multiline);
 }
 
+NAN_GETTER(WrappedRE2::GetDotAll)
+{
+	if (!WrappedRE2::HasInstance(info.This()))
+	{
+		info.GetReturnValue().SetUndefined();
+		return;
+	}
+
+	auto re2 = Nan::ObjectWrap::Unwrap<WrappedRE2>(info.This());
+	info.GetReturnValue().Set(re2->dotAll);
+}
+
 NAN_GETTER(WrappedRE2::GetUnicode)
 {
 	if (!WrappedRE2::HasInstance(info.This()))

package/lib/addon.cc

@@ -68,6 +68,7 @@ v8::Local<v8::Function> WrappedRE2::Init()
 	Nan::SetAccessor(instanceTemplate, Nan::New("global").ToLocalChecked(), GetGlobal);
 	Nan::SetAccessor(instanceTemplate, Nan::New("ignoreCase").ToLocalChecked(), GetIgnoreCase);
 	Nan::SetAccessor(instanceTemplate, Nan::New("multiline").ToLocalChecked(), GetMultiline);
+	Nan::SetAccessor(instanceTemplate, Nan::New("dotAll").ToLocalChecked(), GetDotAll);
 	Nan::SetAccessor(instanceTemplate, Nan::New("unicode").ToLocalChecked(), GetUnicode);
 	Nan::SetAccessor(instanceTemplate, Nan::New("sticky").ToLocalChecked(), GetSticky);
 	Nan::SetAccessor(instanceTemplate, Nan::New("lastIndex").ToLocalChecked(), GetLastIndex, SetLastIndex);

package/lib/new.cc

@@ -229,6 +229,7 @@ NAN_METHOD(WrappedRE2::New)
 	bool global = false;
 	bool ignoreCase = false;
 	bool multiline = false;
+	bool dotAll = false;
 	bool unicode = false;
 	bool sticky = false;
 
@@ -262,6 +263,9 @@ NAN_METHOD(WrappedRE2::New)
 			case 'm':
 				multiline = true;
 				break;
+			case 's':
+				dotAll = true;
+				break;
 			case 'u':
 				unicode = true;
 				break;
@@ -299,6 +303,7 @@ NAN_METHOD(WrappedRE2::New)
 		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);
 	}
@@ -324,6 +329,7 @@ NAN_METHOD(WrappedRE2::New)
 			global = re2->global;
 			ignoreCase = re2->ignoreCase;
 			multiline = re2->multiline;
+			dotAll = re2->dotAll;
 			unicode = true;
 			sticky = re2->sticky;
 		}
@@ -376,9 +382,10 @@ NAN_METHOD(WrappedRE2::New)
 	re2::RE2::Options options;
 	options.set_case_sensitive(!ignoreCase);
 	options.set_one_line(!multiline); // to track this state, otherwise it is ignored
-	options.set_log_errors(false);	  // inappropriate when embedding
+	options.set_dot_nl(dotAll);
+	options.set_log_errors(false); // inappropriate when embedding
 
-	std::unique_ptr<WrappedRE2> re2(new WrappedRE2(re2::StringPiece(data, size), options, source, global, ignoreCase, multiline, sticky));
+	std::unique_ptr<WrappedRE2> re2(new WrappedRE2(re2::StringPiece(data, size), options, source, global, ignoreCase, multiline, dotAll, sticky));
 	if (!re2->regexp.ok())
 	{
 		return Nan::ThrowSyntaxError(re2->regexp.error().c_str());

package/lib/to_string.cc

@@ -32,6 +32,10 @@ NAN_METHOD(WrappedRE2::ToString)
 	{
 		buffer += "m";
 	}
+	if (re2->dotAll)
+	{
+		buffer += "s";
+	}
 	buffer += "u";
 	if (re2->sticky)
 	{

package/lib/wrapped_re2.h

@@ -10,9 +10,9 @@
 class WrappedRE2 : public Nan::ObjectWrap
 {
 private:
-	WrappedRE2(const re2::StringPiece &pattern, const re2::RE2::Options &options, const std::string &s,
-			   const bool &g, const bool &i, const bool &m, const bool &y) : regexp(pattern, options),
-																			 source(s), global(g), ignoreCase(i), multiline(m), sticky(y), lastIndex(0) {}
+	WrappedRE2(const re2::StringPiece &pattern, const re2::RE2::Options &options, const std::string &src,
+			   const bool &g, const bool &i, const bool &m, const bool &s, const bool &y) : regexp(pattern, options),
+																							source(src), global(g), ignoreCase(i), multiline(m), dotAll(s), sticky(y), lastIndex(0) {}
 
 	static NAN_METHOD(New);
 	static NAN_METHOD(ToString);
@@ -22,6 +22,7 @@ private:
 	static NAN_GETTER(GetGlobal);
 	static NAN_GETTER(GetIgnoreCase);
 	static NAN_GETTER(GetMultiline);
+	static NAN_GETTER(GetDotAll);
 	static NAN_GETTER(GetUnicode);
 	static NAN_GETTER(GetSticky);
 	static NAN_GETTER(GetLastIndex);
@@ -67,6 +68,7 @@ public:
 	bool global;
 	bool ignoreCase;
 	bool multiline;
+	bool dotAll;
 	bool sticky;
 	size_t lastIndex;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "re2",
-  "version": "1.17.3",
+  "version": "1.17.7",
   "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",
@@ -10,9 +10,9 @@
     "test": "tests"
   },
   "dependencies": {
-    "install-artifact-from-github": "^1.3.0",
-    "nan": "^2.15.0",
-    "node-gyp": "^8.4.1"
+    "install-artifact-from-github": "^1.3.1",
+    "nan": "^2.16.0",
+    "node-gyp": "^9.0.0"
   },
   "devDependencies": {
     "heya-unit": "^0.3.0"

package/re2.js

@@ -19,6 +19,19 @@ if (typeof Symbol != 'undefined') {
     (RE2.prototype[Symbol.split] = function (str, limit) {
       return this.split(str, limit);
     });
+    Symbol.matchAll &&
+    (RE2.prototype[Symbol.matchAll] = function* (str) {
+      if (!this.global) {
+        throw TypeError('String.prototype.matchAll called with a non-global RE2 argument');
+      }
+      const re = new RE2(this);
+      re.lastIndex = this.lastIndex;
+      for (;;) {
+        const result = re.exec(str);
+        if (!result) break;
+        yield result;
+      }
+    });
 }
 
 module.exports = RE2;