re2 1.19.2 → 1.20.0

package/.github/actions/linux-alpine-node-16/Dockerfile

@@ -1,6 +1,6 @@
 FROM node:16-alpine
 
-RUN apk add --no-cache python3 make gcc g++
+RUN apk add --no-cache python3 make gcc g++ linux-headers
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]

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

@@ -1,6 +1,6 @@
 FROM node:18-alpine
 
-RUN apk add --no-cache python3 make gcc g++
+RUN apk add --no-cache python3 make gcc g++ linux-headers
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]

package/.github/actions/linux-alpine-node-20/Dockerfile

@@ -1,6 +1,6 @@
 FROM node:20-alpine
 
-RUN apk add --no-cache python3 make gcc g++
+RUN apk add --no-cache python3 make gcc g++ linux-headers
 
 COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]

package/.gitmodules

@@ -1,3 +1,6 @@
-[submodule "vendor"]
-	path = vendor
+[submodule "vendor/re2"]
+	path = vendor/re2
 	url = https://github.com/google/re2
+[submodule "vendor/abseil-cpp"]
+	path = vendor/abseil-cpp
+	url = https://github.com/abseil/abseil-cpp

package/README.md

@@ -353,6 +353,7 @@ console.log('re2_res : ' + re2_res); // prints: re2_res : abc,a,b,c
 
 ## Release history
 
+- 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).*
 - 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).*

package/binding.gyp

@@ -14,30 +14,86 @@
         "lib/to_string.cc",
         "lib/accessors.cc",
         "lib/util.cc",
-        "vendor/re2/bitmap256.cc",
-        "vendor/re2/bitstate.cc",
-        "vendor/re2/compile.cc",
-        "vendor/re2/dfa.cc",
-        "vendor/re2/filtered_re2.cc",
-        "vendor/re2/mimics_pcre.cc",
-        "vendor/re2/nfa.cc",
-        "vendor/re2/onepass.cc",
-        "vendor/re2/parse.cc",
-        "vendor/re2/perl_groups.cc",
-        "vendor/re2/prefilter.cc",
-        "vendor/re2/prefilter_tree.cc",
-        "vendor/re2/prog.cc",
-        "vendor/re2/re2.cc",
-        "vendor/re2/regexp.cc",
-        "vendor/re2/set.cc",
-        "vendor/re2/simplify.cc",
-        "vendor/re2/stringpiece.cc",
-        "vendor/re2/tostring.cc",
-        "vendor/re2/unicode_casefold.cc",
-        "vendor/re2/unicode_groups.cc",
-        "vendor/util/pcre.cc",
-        "vendor/util/rune.cc",
-        "vendor/util/strutil.cc"
+        "vendor/re2/re2/bitmap256.cc",
+        "vendor/re2/re2/bitstate.cc",
+        "vendor/re2/re2/compile.cc",
+        "vendor/re2/re2/dfa.cc",
+        "vendor/re2/re2/filtered_re2.cc",
+        "vendor/re2/re2/mimics_pcre.cc",
+        "vendor/re2/re2/nfa.cc",
+        "vendor/re2/re2/onepass.cc",
+        "vendor/re2/re2/parse.cc",
+        "vendor/re2/re2/perl_groups.cc",
+        "vendor/re2/re2/prefilter.cc",
+        "vendor/re2/re2/prefilter_tree.cc",
+        "vendor/re2/re2/prog.cc",
+        "vendor/re2/re2/re2.cc",
+        "vendor/re2/re2/regexp.cc",
+        "vendor/re2/re2/set.cc",
+        "vendor/re2/re2/simplify.cc",
+        "vendor/re2/re2/tostring.cc",
+        "vendor/re2/re2/unicode_casefold.cc",
+        "vendor/re2/re2/unicode_groups.cc",
+        "vendor/re2/util/pcre.cc",
+        "vendor/re2/util/rune.cc",
+        "vendor/re2/util/strutil.cc",
+        "vendor/abseil-cpp/absl/base/internal/cycleclock.cc",
+        "vendor/abseil-cpp/absl/base/internal/low_level_alloc.cc",
+        "vendor/abseil-cpp/absl/base/internal/raw_logging.cc",
+        "vendor/abseil-cpp/absl/base/internal/spinlock.cc",
+        "vendor/abseil-cpp/absl/base/internal/spinlock_wait.cc",
+        "vendor/abseil-cpp/absl/base/internal/sysinfo.cc",
+        "vendor/abseil-cpp/absl/base/internal/thread_identity.cc",
+        "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/stacktrace.cc",
+        "vendor/abseil-cpp/absl/debugging/symbolize.cc",
+        "vendor/abseil-cpp/absl/flags/commandlineflag.cc",
+        "vendor/abseil-cpp/absl/flags/flag.cc",
+        "vendor/abseil-cpp/absl/flags/internal/commandlineflag.cc",
+        "vendor/abseil-cpp/absl/flags/internal/flag.cc",
+        "vendor/abseil-cpp/absl/flags/internal/private_handle_accessor.cc",
+        "vendor/abseil-cpp/absl/flags/internal/program_name.cc",
+        "vendor/abseil-cpp/absl/flags/marshalling.cc",
+        "vendor/abseil-cpp/absl/flags/reflection.cc",
+        "vendor/abseil-cpp/absl/flags/usage_config.cc",
+        "vendor/abseil-cpp/absl/hash/internal/city.cc",
+        "vendor/abseil-cpp/absl/hash/internal/hash.cc",
+        "vendor/abseil-cpp/absl/hash/internal/low_level_hash.cc",
+        "vendor/abseil-cpp/absl/numeric/int128.cc",
+        "vendor/abseil-cpp/absl/strings/ascii.cc",
+        "vendor/abseil-cpp/absl/strings/charconv.cc",
+        "vendor/abseil-cpp/absl/strings/internal/charconv_bigint.cc",
+        "vendor/abseil-cpp/absl/strings/internal/charconv_parse.cc",
+        "vendor/abseil-cpp/absl/strings/internal/memutil.cc",
+        "vendor/abseil-cpp/absl/strings/internal/str_format/arg.cc",
+        "vendor/abseil-cpp/absl/strings/internal/str_format/bind.cc",
+        "vendor/abseil-cpp/absl/strings/internal/str_format/extension.cc",
+        "vendor/abseil-cpp/absl/strings/internal/str_format/float_conversion.cc",
+        "vendor/abseil-cpp/absl/strings/internal/str_format/output.cc",
+        "vendor/abseil-cpp/absl/strings/internal/str_format/parser.cc",
+        "vendor/abseil-cpp/absl/strings/match.cc",
+        "vendor/abseil-cpp/absl/strings/numbers.cc",
+        "vendor/abseil-cpp/absl/strings/str_cat.cc",
+        "vendor/abseil-cpp/absl/strings/str_split.cc",
+        "vendor/abseil-cpp/absl/strings/string_view.cc",
+        "vendor/abseil-cpp/absl/synchronization/internal/create_thread_identity.cc",
+        "vendor/abseil-cpp/absl/synchronization/internal/graphcycles.cc",
+        "vendor/abseil-cpp/absl/synchronization/internal/per_thread_sem.cc",
+        "vendor/abseil-cpp/absl/synchronization/internal/waiter.cc",
+        "vendor/abseil-cpp/absl/synchronization/mutex.cc",
+        "vendor/abseil-cpp/absl/time/clock.cc",
+        "vendor/abseil-cpp/absl/time/duration.cc",
+        "vendor/abseil-cpp/absl/time/internal/cctz/src/time_zone_fixed.cc",
+        "vendor/abseil-cpp/absl/time/internal/cctz/src/time_zone_if.cc",
+        "vendor/abseil-cpp/absl/time/internal/cctz/src/time_zone_impl.cc",
+        "vendor/abseil-cpp/absl/time/internal/cctz/src/time_zone_info.cc",
+        "vendor/abseil-cpp/absl/time/internal/cctz/src/time_zone_libc.cc",
+        "vendor/abseil-cpp/absl/time/internal/cctz/src/time_zone_lookup.cc",
+        "vendor/abseil-cpp/absl/time/internal/cctz/src/time_zone_posix.cc",
+        "vendor/abseil-cpp/absl/time/internal/cctz/src/zone_info_source.cc",
+        "vendor/abseil-cpp/absl/time/time.cc",
       ],
       "cflags": [
         "-std=c++2a",
@@ -56,7 +112,8 @@
       ],
       "include_dirs": [
         "<!(node -e \"require('nan')\")",
-        "vendor"
+        "vendor/re2",
+        "vendor/abseil-cpp",
       ],
       "xcode_settings": {
         "MACOSX_DEPLOYMENT_TARGET": "10.7",

package/lib/replace.cc

@@ -107,7 +107,7 @@ inline std::string replace(const char *data, size_t size, const std::vector<re2:
 					i += 2;
 					continue;
 				case '&':
-					result += groups[0].as_string();
+					result += (std::string)groups[0];
 					i += 2;
 					continue;
 				case '`':
@@ -139,7 +139,7 @@ inline std::string replace(const char *data, size_t size, const std::vector<re2:
 							index2 = index * 10 + (ch - '0');
 							if (index2 && index2 < groups.size())
 							{
-								result += groups[index2].as_string();
+								result += (std::string)groups[index2];
 								continue;
 							}
 							result += '$';
@@ -152,7 +152,7 @@ inline std::string replace(const char *data, size_t size, const std::vector<re2:
 					i += 2;
 					if (index && index < groups.size())
 					{
-						result += groups[index].as_string();
+						result += (std::string)groups[index];
 						continue;
 					}
 					result += '$';
@@ -170,7 +170,7 @@ inline std::string replace(const char *data, size_t size, const std::vector<re2:
 							if (group != namedGroups.end())
 							{
 								index = group->second;
-								result += groups[index].as_string();
+								result += (std::string)groups[index];
 							}
 							i = nameEnd + 1 - data;
 						}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "re2",
-  "version": "1.19.2",
+  "version": "1.20.0",
   "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",

package/tsconfig.json

@@ -16,5 +16,6 @@
     "noUnusedParameters": true,
 
   },
-  "include": ["**/*.ts"]
+  "include": ["**/*.ts"],
+  "exclude": ["vendor/re2/app/**"]
 }

package/vendor/re2/.bazelrc

@@ -0,0 +1,16 @@
+# Copyright 2022 The RE2 Authors.  All Rights Reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+# Abseil requires C++14 at minimum.
+# Previously, the flag was set via `BAZEL_CXXOPTS`. On macOS, we also had to set
+# `BAZEL_USE_CPP_ONLY_TOOLCHAIN` since Bazel wouldn't respect the former without
+# the latter. However, the latter stopped Bazel from using Xcode and `-framework
+# Foundation`, which CCTZ (vendored into Abseil) requires.
+build --enable_platform_specific_config
+build:linux --cxxopt=-std=c++14
+build:macos --cxxopt=-std=c++14
+build:windows --cxxopt=/std:c++14
+
+# Print test logs for failed tests.
+test --test_output=errors

package/vendor/re2/.github/bazel.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+set -eux
+
+bazel clean
+bazel build --compilation_mode=dbg -- //:all
+bazel test  --compilation_mode=dbg -- //:all \
+  -//:dfa_test \
+  -//:exhaustive1_test \
+  -//:exhaustive2_test \
+  -//:exhaustive3_test \
+  -//:exhaustive_test \
+  -//:random_test
+
+bazel clean
+bazel build --compilation_mode=opt -- //:all
+bazel test  --compilation_mode=opt -- //:all \
+  -//:dfa_test \
+  -//:exhaustive1_test \
+  -//:exhaustive2_test \
+  -//:exhaustive3_test \
+  -//:exhaustive_test \
+  -//:random_test
+
+exit 0

package/vendor/re2/.github/cmake.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -eux
+
+cmake . -D CMAKE_BUILD_TYPE=Debug -D RE2_BUILD_TESTING=ON "$@"
+cmake --build . --config Debug --clean-first
+ctest -C Debug --output-on-failure -E 'dfa|exhaustive|random'
+
+cmake . -D CMAKE_BUILD_TYPE=Release -D RE2_BUILD_TESTING=ON "$@"
+cmake --build . --config Release --clean-first
+ctest -C Release --output-on-failure -E 'dfa|exhaustive|random'
+
+exit 0

package/vendor/re2/.github/workflows/ci-bazel.yml

@@ -0,0 +1,17 @@
+name: CI (Bazel)
+on:
+  push:
+    branches: [main]
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, ubuntu-latest, windows-latest]
+    env:
+      BAZELISK_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@v3
+      - run: .github/bazel.sh
+        shell: bash

package/vendor/re2/.github/workflows/ci-cmake.yml

@@ -0,0 +1,108 @@
+name: CI (CMake)
+on:
+  push:
+    branches: [main]
+jobs:
+  # GitHub Actions doesn't provide GCC 13, so we use a Docker container instead.
+  # (Also, the Benchmark package on Ubuntu 22.04 LTS is problematic whereas this
+  # Docker container is based on Debian bookworm and so it has a newer version.)
+  build-linux:
+    runs-on: ubuntu-latest
+    container: gcc:13
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install CMake
+        run: |
+          apt update -y
+          apt install -y cmake
+        shell: bash
+      - name: Install Abseil, GoogleTest and Benchmark
+        run: |
+          apt update -y
+          apt install -y libabsl-dev libgtest-dev libbenchmark-dev
+        shell: bash
+      - run: .github/cmake.sh
+        shell: bash
+  build-linux-shared:
+    runs-on: ubuntu-latest
+    container: gcc:13
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install CMake
+        run: |
+          apt update -y
+          apt install -y cmake
+        shell: bash
+      - name: Install Abseil, GoogleTest and Benchmark
+        run: |
+          apt update -y
+          apt install -y libabsl-dev libgtest-dev libbenchmark-dev
+        shell: bash
+      - run: .github/cmake.sh -D BUILD_SHARED_LIBS=ON
+        shell: bash
+  build-macos:
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Abseil, GoogleTest and Benchmark
+        run: |
+          brew update
+          brew install abseil googletest google-benchmark
+        shell: bash
+      - run: .github/cmake.sh
+        shell: bash
+  build-macos-shared:
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Abseil, GoogleTest and Benchmark
+        run: |
+          brew update
+          brew install abseil googletest google-benchmark
+        shell: bash
+      - run: .github/cmake.sh -D BUILD_SHARED_LIBS=ON
+        shell: bash
+  build-windows:
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Abseil, GoogleTest and Benchmark
+        run: |
+          # TODO: Remove this in September 2023, which is when the default triplet for
+          # vcpkg libraries will change from x86-windows to the detected host triplet.
+          export VCPKG_DEFAULT_TRIPLET=x64-windows
+          vcpkg update
+          vcpkg install abseil gtest benchmark
+        shell: bash
+      - run: |
+          .github/cmake.sh \
+            -D CMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
+        shell: bash
+  build-windows-shared:
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Abseil, GoogleTest and Benchmark
+        run: |
+          # TODO: Remove this in September 2023, which is when the default triplet for
+          # vcpkg libraries will change from x86-windows to the detected host triplet.
+          export VCPKG_DEFAULT_TRIPLET=x64-windows
+          vcpkg update
+          vcpkg install abseil gtest benchmark
+        shell: bash
+      - run: |
+          .github/cmake.sh -D BUILD_SHARED_LIBS=ON \
+            -D CMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
+        shell: bash

package/vendor/re2/.github/workflows/ci.yml

@@ -0,0 +1,89 @@
+name: CI
+on:
+  push:
+    branches: [main]
+jobs:
+  build-appleclang:
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ver: [17, 20]
+    env:
+      CC: clang
+      CXX: clang++
+      # Unlike GCC and upstream Clang, AppleClang still defaults to `-std=c++98`
+      # for some reason. Also, the macOS image on GitHub Actions provides wildly
+      # numbered Xcode versions. Thus, rather than varying the compiler version,
+      # we set the `-std` flag explicitly in order to vary the language version.
+      # (The other two flags are the default provided for CXXFLAGS in Makefile.)
+      CXXFLAGS: -O3 -g -std=c++${{ matrix.ver }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Abseil, GoogleTest and Benchmark
+        run: |
+          brew update
+          brew install abseil googletest google-benchmark
+        shell: bash
+      - run: make && make test
+        shell: bash
+  build-clang:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ver: [14, 15, 16]
+    env:
+      CC: clang-${{ matrix.ver }}
+      CXX: clang++-${{ matrix.ver }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Clang ${{ matrix.ver }}
+        run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod +x ./llvm.sh
+          sudo ./llvm.sh ${{ matrix.ver }}
+        shell: bash
+      - name: Install Abseil, GoogleTest and Benchmark
+        run: |
+          sudo apt update -y
+          sudo apt install -y libabsl-dev libgtest-dev libbenchmark-dev
+        shell: bash
+      - run: make && make test
+        shell: bash
+  build-gcc:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ver: [11, 12]
+    env:
+      CC: gcc-${{ matrix.ver }}
+      CXX: g++-${{ matrix.ver }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Abseil, GoogleTest and Benchmark
+        run: |
+          sudo apt update -y
+          sudo apt install -y libabsl-dev libgtest-dev libbenchmark-dev
+        shell: bash
+      - run: make && make test
+        shell: bash
+  # GitHub Actions doesn't provide GCC 13, so we use a Docker container instead.
+  build-gcc-13:
+    runs-on: ubuntu-latest
+    container: gcc:13
+    strategy:
+      fail-fast: false
+    env:
+      CC: gcc
+      CXX: g++
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Abseil, GoogleTest and Benchmark
+        run: |
+          apt update -y
+          apt install -y libabsl-dev libgtest-dev libbenchmark-dev
+        shell: bash
+      - run: make && make test
+        shell: bash

package/vendor/re2/.github/workflows/pr.yml

@@ -0,0 +1,26 @@
+name: PR
+on:
+  pull_request_target:
+    branches: [main]
+    types: [opened]
+jobs:
+  close:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/github-script@v6
+        with:
+          script: |
+            const fs = require('fs');
+            console.log(await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              body: fs.readFileSync('CONTRIBUTING.md', { encoding: 'utf8', }),
+            }));
+            console.log(await github.rest.pulls.update({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.issue.number,
+              state: 'closed',
+            }));