regex-partial-match 0.1.13 → 0.2.1

package/README.md

@@ -69,13 +69,15 @@ Such combinations have not been tested.
 ## Supported Features
 
 - 🔤 [Literal characters](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Regular_expressions/Literal_character)
-- 📋 [Character classes](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Regular_expressions/Character_class) (`[abc]`, `[^abc]`, `[a-z]`)
 - 🔣 [Character escapes](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Regular_expressions/Character_escape) (`\n`, `\t`, `\x61`, `\u0061`, `\u{1F600}`)
+- 🧩 [Character class escapes](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Regular_expressions/Character_class_escape): `/\w+/`, `/\d{3}/`
 - 🌐 [Unicode character class escape](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Regular_expressions/Unicode_character_class_escape) (`\p{Letter}`, `\P{Letter}`)
+- 📋 [Character classes](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Regular_expressions/Character_class) (`[abc]`, `[^abc]`, `[a-z]`)
+- 🧮 [Unicode sets (`v` flag)](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/unicodeSets) (`/[\p{Lowercase}&&\p{Script=Greek}]/v`)
 - 🔢 [Quantifiers](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Regular_expressions/Quantifier) (`*`, `+`, `?`, `{n}`, `{n,}`, `{n,m}`)
 - 🔀 [Disjunction](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Regular_expressions/Disjunction) (`a|b`)
 - 👥 [Groups](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Regular_expressions/Capturing_group) (capturing and non-capturing) (`(?:abc)`, `(abc)`, `(?<named>abc)`)
-- 👀 [Lookahead assertions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Regular_expressions/Lookahead_assertion) (`(?=...)`, `(?!...)`)
+- 👉 [Lookahead assertions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Regular_expressions/Lookahead_assertion) (`(?=...)`, `(?!...)`)
 - 👈 [Lookbehind assertions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Regular_expressions/Lookbehind_assertion) (`(?<=...)`, `(?<!...)`)
 - ⚓ [Input Boundaries](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Regular_expressions/Input_boundary_assertion) (`^`, `$`)
 - 🆒 [Word Boundaries](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Regular_expressions/Word_boundary_assertion) (`\b`, `\B`)
@@ -86,7 +88,7 @@ Such combinations have not been tested.
 The following regex features are **not currently supported**:
 
 - ⚠️ [Backreferences](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Regular_expressions/Backreference) (`\1`, `\k<name>`) - Can be included, but can't partially match. See [caveats](#caveats).
-- ❌ [Unicode sets (`v` flag)](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/unicodeSets) - ES2024+. See [issue](https://github.com/TomStrepsil/regex-partial-match/issues/1).
+- ⚠️ [Character class substrings](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Regular_expressions/Character_class#matching_strings) (`\q{abc}`) - When used independently, rather than to modify, can be included, but can't partially match. See [caveats](#caveats).
 - ❌ [Modifiers](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Regular_expressions/Modifier) (`(?ims:...)`, `(?-ims:...)`) - ES2025+. See [issue](https://github.com/TomStrepsil/regex-partial-match/issues/2).
 
 ## Browser Compatibility
@@ -99,6 +101,7 @@ The library is compiled to **ES5** for broad compatibility with older browsers a
 - [**Named capturing groups**](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Regular_expressions/Named_capturing_group) (`(?<name>...)`) - ES2018+
 - [**`s` (dotAll) flag**](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/dotAll) - ES2018+
 - [**`d` (hasIndices) flag**](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/hasIndices) - ES2022+
+- [**`v` (unicodeSets) flag**](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/unicodeSets) - ES2024+
 
 ## Caveats
 
@@ -178,6 +181,14 @@ The **global flag is preserved** but may not be necessary for partial matching u
 
 The global flag does not cause issues like the sticky flag, as partial patterns naturally match from the beginning of the input. However, if you're using `lastIndex` to track position, be aware that failed matches will reset it to 0.
 
+### "String properties"
+
+As with surrogate pair matching, grapheme clusters / string properties can only match atomically.
+
+Hence, `[\p{RGI_Emoji_Flag_Sequence}]` will match `🇺🇳` as a whole, but not as the individual code points of which it's comprised.
+
+In [`v` mode](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/unicodeSets) expressions, where `[\q{abc}]` syntax is used in isolation (rather than its canonical use-case as a subtraction/intersection of another character class), this will also only match entirely or not at all. i.e. `abc` can match, but not partially.
+
 ## Examples
 
 ### Form Validation

package/lib/index.js

@@ -1,7 +1,7 @@
-var characterClassGlobalRegex = /\[(?:\\.|.)*?\]/g;
 var occurrencesRegex = /\{\d+,?\d*\}/g;
 var createPartialMatchRegex = function (regex) {
     var source = regex.source;
+    var isUnicode = regex.unicode || regex.unicodeSets;
     var i = 0;
     function extractSubstring(length) {
         return source.substring(i, (i += length));
@@ -25,7 +25,7 @@ var createPartialMatchRegex = function (regex) {
                             appendOptional(source.indexOf(">", i) - i + 1);
                             break;
                         case "u":
-                            if (regex.unicode && source[i + 2] === "{") {
+                            if (isUnicode && source[i + 2] === "{") {
                                 appendOptional(source.indexOf("}", i) - i + 1);
                             }
                             else {
@@ -34,7 +34,7 @@ var createPartialMatchRegex = function (regex) {
                             break;
                         case "p":
                         case "P":
-                            if (regex.unicode) {
+                            if (isUnicode) {
                                 appendOptional(source.indexOf("}", i) - i + 1);
                             }
                             else {
@@ -50,10 +50,24 @@ var createPartialMatchRegex = function (regex) {
                     }
                     break;
                 case "[": {
-                    characterClassGlobalRegex.lastIndex = i;
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- must match, since otherwise an invalid regex
-                    var match = characterClassGlobalRegex.exec(source)[0];
-                    appendOptional(match.length);
+                    var depth = 1, escaped = false, j = i + 1;
+                    while (depth) {
+                        switch (source[j++]) {
+                            case "\\":
+                                escaped = !escaped;
+                                continue;
+                            case "[":
+                                if (!escaped)
+                                    depth++;
+                                break;
+                            case "]":
+                                if (!escaped)
+                                    depth--;
+                                break;
+                        }
+                        escaped = false;
+                    }
+                    appendOptional(j - i);
                     break;
                 }
                 case "|":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "regex-partial-match",
-  "version": "0.1.13",
+  "version": "0.2.1",
   "description": "A regular expression transform for partial matching",
   "devEngines": {
     "runtime": {
@@ -66,7 +66,7 @@
   },
   "lint-staged": {
     "*.{ts,js}": [
-      "npm run lint:fix"
+      "eslint --fix"
     ]
   },
   "publishConfig": {