@ptolemy2002/rgx 7.6.0 → 7.7.1

package/README.md

@@ -1376,6 +1376,12 @@ A pre-built `RegExpFlagTransformer` that makes a regex pattern accent-insensitiv
 
 Note that this transformer intentionally excludes replacing characters preceded by an odd number of backslashes, to allow for escaping. For example, in the pattern `\\a`, the `a` is preceded by two backslashes (an even number), so it will be replaced with `(a|á|à|ä|â|ã)`. In the pattern `\a`, the `a` is preceded by one backslash (an odd number), so it will not be replaced.
 
+Also, characters part of a localized flag diff inline modifier (e.g., `(?i:a)`) are not replaced, as that would introduce invalid syntax. This refers to the `i` here, not the `a`, since only `i` is a localizable flag.
+
+Finally, characters part of a character class are avoided for transformation, since that would introduce syntax errors again. For example, in the pattern `[a]`, the `a` is part of a character class and will not be replaced.
+
+These conditions (especially the last two) may cause some patterns that should be transformed to be skipped, but that is better than having the transformer produce invalid regex patterns.
+
 #### Parameters
   - `exp` (`RegExp`): The regular expression to transform.
 

package/dist/flag-transformer/accentInsensitive.js

@@ -10,13 +10,23 @@ const accentPatterns = [
     "(o|ó|ò|ö|ô|õ)", "(O|Ó|Ò|Ö|Ô|Õ)",
     "(u|ú|ù|ü|û)", "(U|Ú|Ù|Ü|Û)"
 ];
+const nonEscapeBound = (0, resolve_1.resolveRGXToken)((0, constants_1.rgxConstant)("non-escape-bound"));
+const nonLocalizedFlagBound = (0, resolve_1.resolveRGXToken)({
+    rgxGroupWrap: false,
+    rgxIsRepeatable: false,
+    toRgx() { return /(?<!\(\?\-?[ims]*)/; }
+});
+const nonCharacterClassBound = (0, resolve_1.resolveRGXToken)({
+    rgxGroupWrap: false,
+    rgxIsRepeatable: false,
+    toRgx() { return /(?<!\[[^\]]*)/; }
+});
 const accentInsensitiveFlagTransformer = function (exp) {
     let source = exp.source;
     const flags = exp.flags;
-    const nonEscapeBound = (0, resolve_1.resolveRGXToken)((0, constants_1.rgxConstant)("non-escape-bound"));
     accentPatterns.forEach((pattern) => {
         // Replace any of the characters in the pattern with the pattern itself
-        source = source.replaceAll(new RegExp(nonEscapeBound + pattern, "g"), pattern);
+        source = source.replaceAll(new RegExp(nonEscapeBound + nonLocalizedFlagBound + nonCharacterClassBound + pattern, "g"), pattern);
     });
     return new RegExp(source, flags);
 };

package/dist/walker/base.js

@@ -138,7 +138,11 @@ class RGXWalker {
                 }
             }
         }
-        const captureResult = { raw, value, start, end, branch, ownerId: isPart && token.hasId() ? token.id : null };
+        const captureResult = {
+            raw, value, start, end, branch,
+            ownerId: isPart && token.hasId() ? token.id : null,
+            groups: isPart ? capture.groups ?? null : null
+        };
         // Validate the part. If validation fails, it will throw an error, so nothing below will run.
         if (isPart) {
             token.validate(captureResult, this);

package/dist/walker/part.d.ts

@@ -9,6 +9,7 @@ export type RGXCapture<T = unknown> = {
     end: number;
     ownerId: string | null;
     branch: number;
+    groups: Record<string, string> | null;
 };
 export type RGXPartOptions<R, T = string> = {
     id: string;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ptolemy2002/rgx",
-    "version": "7.6.0",
+    "version": "7.7.1",
     "private": false,
     "main": "dist/index.js",
     "types": "dist/index.d.ts",