@ptolemy2002/rgx 12.7.3 → 12.8.0

package/dist/walker/base.d.ts

@@ -9,6 +9,11 @@ export type RGXWalkerOptions<R, S = unknown> = {
     looping?: boolean;
     contiguous?: boolean;
 };
+export type RGXTryWalkOptions = {
+    revertReduced?: boolean;
+    revertShare?: boolean;
+    revertCaptures?: boolean;
+};
 export type RGXTokenOrPart<R, S = unknown, T = unknown> = RGXToken | RGXPart<R, S, T>;
 export type RGXWalkerStepDirective = "stop" | "skip" | "silent";
 export declare class RGXWalker<R, S = unknown> {
@@ -56,7 +61,7 @@ export declare class RGXWalker<R, S = unknown> {
     stepToToken(predicate: (token: RGXTokenOrPart<R>) => boolean): this;
     stepToPart(predicate?: (part: RGXPart<R, S, unknown>) => boolean): this;
     walk(): R;
-    tryWalk(): boolean;
+    tryWalk({ revertReduced, revertShare, revertCaptures }?: RGXTryWalkOptions): boolean;
     clone(depth?: CloneDepth): RGXWalker<R, S>;
 }
 export declare function rgxWalker<R, S = unknown>(...args: ConstructorParameters<typeof RGXWalker<R, S>>): RGXWalker<R, S>;

package/dist/walker/base.js

@@ -104,7 +104,7 @@ class RGXWalker {
     }
     capture(token, includeMatch = false) {
         const regex = (0, utils_1.createRegex)((0, resolve_1.resolveRGXToken)(part_1.RGXPart.check(token) ? token.token : token));
-        const args = [regex, this.source, this.sourcePosition, 10, true];
+        const args = [regex, this.source, Math.min(this.sourcePosition, this.source.length - 1), 10, true];
         let match;
         let endPosition;
         if (this.contiguous) {
@@ -247,6 +247,9 @@ class RGXWalker {
             silent = dir === "silent";
         }
         const branchedToken = isPart ? createBranchGroups(token.token) : createBranchGroups(token);
+        // Still track the previous source position,
+        // because if we have to skip, we need to reset to it.
+        const prevSourcePosition = this.sourcePosition;
         let captureAttempt;
         try {
             captureAttempt = this.attemptCapture(branchedToken, isPart ? token : null);
@@ -284,7 +287,7 @@ class RGXWalker {
             groups: captureAttempt.groups ?? null
         };
         if (isPart) {
-            const dir = this.validateCapture(token, captureResult, start);
+            const dir = this.validateCapture(token, captureResult, prevSourcePosition);
             if (dir === "stop") {
                 this._stopped = true;
                 return null;
@@ -297,7 +300,7 @@ class RGXWalker {
         if (!silent)
             this.registerCapture(captureResult, token);
         if (isPart) {
-            const dir = this.handleAfterCapture(token, captureResult, silent, start);
+            const dir = this.handleAfterCapture(token, captureResult, silent, prevSourcePosition);
             if (dir === "stop") {
                 this.advanceToken();
                 this._stopped = true;
@@ -338,9 +341,13 @@ class RGXWalker {
         this.stepToToken(() => false);
         return this.reduced;
     }
-    tryWalk() {
+    tryWalk({ revertReduced = false, revertShare = false, revertCaptures = false } = {}) {
         const prevSourcePosition = this.sourcePosition;
         const prevTokenPosition = this.tokenPosition;
+        const prevReduced = revertReduced ? (0, immutability_utils_1.extClone)(this.reduced, "max") : this.reduced;
+        const prevShare = revertShare ? (0, immutability_utils_1.extClone)(this.share, "max") : this.share;
+        const prevCaptures = revertCaptures ? (0, immutability_utils_1.extClone)(this.captures, "max") : this.captures;
+        const prevNamedCaptures = revertCaptures ? (0, immutability_utils_1.extClone)(this.namedCaptures, "max") : this.namedCaptures;
         try {
             this.walk();
             return true;
@@ -348,6 +355,14 @@ class RGXWalker {
         catch (e) {
             this.sourcePosition = prevSourcePosition;
             this.tokenPosition = prevTokenPosition;
+            if (revertReduced)
+                this.reduced = prevReduced;
+            if (revertShare)
+                this.share = prevShare;
+            if (revertCaptures)
+                this.captures = prevCaptures;
+            if (revertCaptures)
+                this.namedCaptures = prevNamedCaptures;
             if (isMatchError(e)) {
                 return false;
             }

package/package.json

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