@ptolemy2002/rgx 13.3.2 → 13.3.4

package/dist/resolve.js

@@ -58,9 +58,39 @@ function localizableVanillaRegexFlagDiff(prev, next) {
         return `${added}`;
     return `${added}-${removed}`;
 }
+function hasParenErrors(pattern) {
+    let depth = 0;
+    let charClassDepth = 0;
+    for (let i = 0; i < pattern.length; i++) {
+        const ch = pattern[i];
+        if (ch === '\\') {
+            i++;
+            continue;
+        }
+        if (charClassDepth > 0) {
+            if (ch === '[')
+                charClassDepth++;
+            else if (ch === ']')
+                charClassDepth--;
+            continue;
+        }
+        if (ch === '[') {
+            charClassDepth++;
+        }
+        else if (ch === '(') {
+            depth++;
+        }
+        else if (ch === ')') {
+            depth--;
+            if (depth < 0)
+                return true;
+        }
+    }
+    return depth !== 0;
+}
 function resolveRGXToken(token, { groupWrap = true, topLevel = true, currentFlags = '' } = {}) {
     (0, ExtRegExp_1.assertValidRegexFlags)(currentFlags);
-    let acceptUnterminatedGroup = false;
+    let acceptParenErrors = false;
     const innerResolve = () => {
         if (tg.isRGXNoOpToken(token))
             return '';
@@ -86,7 +116,7 @@ function resolveRGXToken(token, { groupWrap = true, topLevel = true, currentFlag
             // will be caught by one of the checks that the entire resolved string
             // is a valid regex string.
             if (token.rgxInterpolate) {
-                acceptUnterminatedGroup = true;
+                acceptParenErrors = true;
                 return String(token.toRgx());
             }
             // The top-level group-wrapping preference propogates to a direct convertible token, but after that
@@ -113,21 +143,7 @@ function resolveRGXToken(token, { groupWrap = true, topLevel = true, currentFlag
         throw new e.RGXInvalidTokenError(`Invalid RGX token: ${token}`, null, token);
     };
     const result = innerResolve();
-    try {
+    if (!(acceptParenErrors && hasParenErrors(result)))
         tg.assertValidRegexString(result);
-    }
-    catch (err) {
-        if (err instanceof e.RGXInvalidRegexStringError) {
-            if (acceptUnterminatedGroup &&
-                (err.cause.message.endsWith('Unterminated group') ||
-                    err.cause.message.endsWith("Unmatched ')'"))) {
-                return result;
-            }
-        }
-        // This is ignored because I don't know what kind of
-        // unexpected errors might happen.
-        /* istanbul ignore next */
-        throw err;
-    }
     return result;
 }

package/dist/walker/base.d.ts

@@ -14,7 +14,7 @@ export type RGXTryWalkOptions = {
     revertShare?: boolean;
     revertCaptures?: boolean;
 };
-export type RGXTokenOrPart<R, S = unknown, T = unknown> = RGXToken | RGXPart<R, S, T>;
+export type RGXTokenOrPart<R, S = unknown, T = any> = RGXToken | RGXPart<R, S, T>;
 export type RGXWalkerStepDirective = "stop" | "skip" | "silent";
 export declare class RGXWalker<R, S = unknown> {
     readonly source: string;
@@ -45,7 +45,7 @@ export declare class RGXWalker<R, S = unknown> {
     atSourceEnd(): boolean;
     hasNextSource(predicate?: (rest: string) => boolean): boolean;
     lastCapture(): RGXCapture | null;
-    currentToken(): RGXTokenOrPart<R, S, unknown>;
+    currentToken(): RGXTokenOrPart<R, S, any>;
     remainingSource(): string | null;
     capture(token: RGXTokenOrPart<R, S>, includeMatch: true): RegExpExecArray;
     capture(token: RGXTokenOrPart<R, S>, includeMatch?: false): string;

package/package.json

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