regex-partial-match 0.1.12 → 0.2.0

package/README.md

@@ -72,6 +72,7 @@ Such combinations have not been tested.
 - 📋 [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}`)
 - 🌐 [Unicode character class escape](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Regular_expressions/Unicode_character_class_escape) (`\p{Letter}`, `\P{Letter}`)
+- 🧮 [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)`)
@@ -86,7 +87,6 @@ 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).
 - ❌ [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

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.12",
+  "version": "0.2.0",
   "description": "A regular expression transform for partial matching",
   "devEngines": {
     "runtime": {
@@ -35,12 +35,14 @@
   "main": "lib/index.js",
   "exports": {
     ".": {
+      "types": "./lib/index.d.ts",
       "import": "./lib/index.js",
-      "types": "./lib/index.d.ts"
+      "default": "./lib/index.js"
     },
     "./extend": {
+      "types": "./lib/extend.d.ts",
       "import": "./lib/extend.js",
-      "types": "./lib/extend.d.ts"
+      "default": "./lib/extend.js"
     }
   },
   "files": [
@@ -64,7 +66,7 @@
   },
   "lint-staged": {
     "*.{ts,js}": [
-      "npm run lint:fix"
+      "eslint --fix"
     ]
   },
   "publishConfig": {