From 885dda22d21e704bffa2c489d620a971a6c1fc64 Mon Sep 17 00:00:00 2001
From: Segev Finer <segev@swimm.io>
Date: Wed, 19 Mar 2025 19:26:40 +0200
Subject: [PATCH 1/2] Add types for `String.{matchAll,replaceAll}` with a well
 known symbol

---
 src/lib/es2020.symbol.wellknown.d.ts |  9 +++++++++
 src/lib/es2021.d.ts                  |  1 +
 src/lib/es2021.string.d.ts           |  6 ++++--
 src/lib/es2021.symbol.wellknown.d.ts | 17 +++++++++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 src/lib/es2021.symbol.wellknown.d.ts

diff --git a/src/lib/es2020.symbol.wellknown.d.ts b/src/lib/es2020.symbol.wellknown.d.ts
index cdf0349f9b420..f7cf5674d3f50 100644
--- a/src/lib/es2020.symbol.wellknown.d.ts
+++ b/src/lib/es2020.symbol.wellknown.d.ts
@@ -21,3 +21,12 @@ interface RegExp {
      */
     [Symbol.matchAll](str: string): RegExpStringIterator<RegExpMatchArray>;
 }
+
+interface String {
+    /**
+     * Matches a string or an object that supports being matched against, and
+     * returns an iterable of matches containing the results of that search.
+     * @param regexp An object that supports being matched against.
+     */
+    matchAll(matcher: { [Symbol.matchAll](str: string): RegExpStringIterator<RegExpMatchArray> }): RegExpStringIterator<RegExpExecArray>;
+}
diff --git a/src/lib/es2021.d.ts b/src/lib/es2021.d.ts
index a70e09c1f5c0c..a14bde8663804 100644
--- a/src/lib/es2021.d.ts
+++ b/src/lib/es2021.d.ts
@@ -1,5 +1,6 @@
 /// <reference lib="es2020" />
 /// <reference lib="es2021.promise" />
 /// <reference lib="es2021.string" />
+/// <reference lib="es2021.symbol.wellknown" />
 /// <reference lib="es2021.weakref" />
 /// <reference lib="es2021.intl" />
diff --git a/src/lib/es2021.string.d.ts b/src/lib/es2021.string.d.ts
index 66971bf84d6cf..a1fcc47069f32 100644
--- a/src/lib/es2021.string.d.ts
+++ b/src/lib/es2021.string.d.ts
@@ -1,14 +1,16 @@
+/// <reference lib="es2021.symbol.wellknown" />
+
 interface String {
     /**
      * Replace all instances of a substring in a string, using a regular expression or search string.
-     * @param searchValue A string to search for.
+     * @param searchValue An object that supports searching for and replacing matches within a string.
      * @param replaceValue A string containing the text to replace for every successful match of searchValue in this string.
      */
     replaceAll(searchValue: string | RegExp, replaceValue: string): string;
 
     /**
      * Replace all instances of a substring in a string, using a regular expression or search string.
-     * @param searchValue A string to search for.
+     * @param searchValue An object that supports searching for and replacing matches within a string.
      * @param replacer A function that returns the replacement text.
      */
     replaceAll(searchValue: string | RegExp, replacer: (substring: string, ...args: any[]) => string): string;
diff --git a/src/lib/es2021.symbol.wellknown.d.ts b/src/lib/es2021.symbol.wellknown.d.ts
new file mode 100644
index 0000000000000..dfae2c51c64ae
--- /dev/null
+++ b/src/lib/es2021.symbol.wellknown.d.ts
@@ -0,0 +1,17 @@
+/// <reference lib="es2015.symbol.wellknown" />
+
+interface String {
+    /**
+     * Replace all instances of a substring in a string, using an object that supports replacement within a string.
+     * @param searchValue A string to search for.
+     * @param replaceValue A string containing the text to replace for every successful match of searchValue in this string.
+     */
+    replaceAll(searchValue: { [Symbol.replace](string: string, replaceValue: string): string; }, replaceValue: string): string;
+
+    /**
+     * Replace all instances of a substring in a string, using an object that supports replacement within a string.
+     * @param searchValue A string to search for.
+     * @param replacer A function that returns the replacement text.
+     */
+    replaceAll(searchValue: { [Symbol.replace](string: string, replacer: (substring: string, ...args: any[]) => string): string; }, replacer: (substring: string, ...args: any[]) => string): string;
+}

From 72fb2edef5c5df27cdf41f7d55420e0fad892df5 Mon Sep 17 00:00:00 2001
From: Segev Finer <segev@swimm.io>
Date: Wed, 19 Mar 2025 20:17:48 +0200
Subject: [PATCH 2/2] Fix formatting

---
 src/lib/es2020.symbol.wellknown.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/es2020.symbol.wellknown.d.ts b/src/lib/es2020.symbol.wellknown.d.ts
index f7cf5674d3f50..5c5142cca7fc9 100644
--- a/src/lib/es2020.symbol.wellknown.d.ts
+++ b/src/lib/es2020.symbol.wellknown.d.ts
@@ -28,5 +28,5 @@ interface String {
      * returns an iterable of matches containing the results of that search.
      * @param regexp An object that supports being matched against.
      */
-    matchAll(matcher: { [Symbol.matchAll](str: string): RegExpStringIterator<RegExpMatchArray> }): RegExpStringIterator<RegExpExecArray>;
+    matchAll(matcher: { [Symbol.matchAll](str: string): RegExpStringIterator<RegExpMatchArray>; }): RegExpStringIterator<RegExpExecArray>;
 }