@ptolemy2002/rgx 11.0.0 → 11.1.1

package/dist/internal/taggedTemplateToArray.js

@@ -2,15 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rgxTaggedTemplateToArray = rgxTaggedTemplateToArray;
 function rgxTaggedTemplateToArray(strings, tokens, multiline, verbatim) {
-    function isNullOrUndefined(value) {
-        return value === null || value === undefined;
-    }
     const array = [];
     for (let i = 0; i < Math.max(strings.length, tokens.length); i++) {
+        const isTokensEnd = i >= tokens.length;
         const string = strings[i];
         const token = tokens[i];
         // Strings always come before tokens
-        if (!isNullOrUndefined(string)) {
+        if (string !== undefined) {
             if (!multiline) {
                 if (verbatim)
                     array.push(string);
@@ -33,10 +31,10 @@ function rgxTaggedTemplateToArray(strings, tokens, multiline, verbatim) {
                         resolves to "foo | bar |baz" instead of "foo | bar|baz"
                     */
                     .map((line, i) => (i !== 0 || startsNewLine) ? line.trimStart() : line)
-                    // Remove comments both for the start of the line.
+                    // Remove comments from the start of the line.
                     .filter(line => !line.startsWith("//"))
                     .filter(line => line.length > 0)
-                    // Remove comments at the end of the line.
+                    // Remove comments from the end of the line.
                     .map(line => {
                     const commentIndex = line.indexOf("//");
                     if (commentIndex !== -1) {
@@ -51,7 +49,7 @@ function rgxTaggedTemplateToArray(strings, tokens, multiline, verbatim) {
                     array.push({ rgxInterpolate: true, toRgx: () => lines });
             }
         }
-        if (!isNullOrUndefined(token))
+        if (!isTokensEnd)
             array.push(token);
     }
     return array;

package/dist/walker/base.js

@@ -134,7 +134,16 @@ class RGXWalker {
         }
         catch (e) {
             if (isPart && e instanceof errors_1.RGXRegexNotMatchedAtPositionError) {
-                token.afterFailure?.(e, { part: token, walker: this });
+                const control = token.afterFailure?.(e, { part: token, walker: this });
+                if (control === "stop") {
+                    this._stopped = true;
+                    return null;
+                }
+                if (control === "skip") {
+                    this.tokenPosition++;
+                    return null;
+                }
+                // Handling silent is pointless here since it won't add a capture in either case, so we don't check for it.
             }
             throw e;
         }
@@ -144,7 +153,7 @@ class RGXWalker {
         let branch = 0;
         // Determine branch index for captureResult by finding the first index
         // with non-undefined match group.
-        for (let i = 0; i < capture.length; i++) {
+        for (let i = 0; i < capture.length - 1; i++) {
             const branchKey = `rgx_branch_${i}`;
             if (capture.groups && capture.groups[branchKey] !== undefined) {
                 branch = i;
@@ -162,8 +171,18 @@ class RGXWalker {
                 token.validate(captureResult, { part: token, walker: this });
             }
             catch (e) {
+                this.sourcePosition = start; // Reset source position on validation failure
                 if (e instanceof errors_1.RGXPartValidationFailedError) {
-                    token.afterValidationFailure?.(e, { part: token, walker: this });
+                    const control = token.afterValidationFailure?.(e, { part: token, walker: this });
+                    if (control === "stop") {
+                        this._stopped = true;
+                        return null;
+                    }
+                    if (control === "skip") {
+                        this.tokenPosition++;
+                        return null;
+                    }
+                    // Handling silent is pointless here since it won't add a capture in either case, so we don't check for it.
                 }
                 throw e;
             }

package/dist/walker/part.d.ts

@@ -23,8 +23,8 @@ export type RGXPartOptions<R, S = unknown, T = string> = {
     validate: (captured: RGXCapture<T>, context: RGXPartContext<R, S, T>) => boolean | string;
     beforeCapture: ((context: RGXPartContext<R, S, T>) => RGXPartControl) | null;
     afterCapture: ((capture: RGXCapture<T>, context: RGXPartContext<R, S, T>) => void) | null;
-    afterFailure: ((e: RGXRegexNotMatchedAtPositionError, context: RGXPartContext<R, S, T>) => void) | null;
-    afterValidationFailure: ((e: RGXPartValidationFailedError, context: RGXPartContext<R, S, T>) => void) | null;
+    afterFailure: ((e: RGXRegexNotMatchedAtPositionError, context: RGXPartContext<R, S, T>) => RGXPartControl) | null;
+    afterValidationFailure: ((e: RGXPartValidationFailedError, context: RGXPartContext<R, S, T>) => RGXPartControl) | null;
 };
 export declare class RGXPart<R, S = unknown, T = string> {
     id: string | null;

package/package.json

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