@ptolemy2002/rgx 13.5.0 → 13.7.0

package/dist/utils/createRGXBounds.d.ts

@@ -3,5 +3,6 @@ export type CreateRGXBoundsOptions = {
     flags?: string;
     anchorStart?: boolean;
     anchorEnd?: boolean;
+    inner?: boolean;
 };
 export declare function createRGXBounds(positive: RGXToken, negative: RGXToken, options?: CreateRGXBoundsOptions | string | boolean): [RGXConvertibleToken, RGXConvertibleToken];

package/dist/utils/createRGXBounds.js

@@ -27,10 +27,14 @@ function createRGXBounds(positive, negative, options = {}) {
         options = { flags: options };
     else if (typeof options === "boolean")
         options = { anchorStart: options, anchorEnd: options };
-    const { flags = "", anchorStart = true, anchorEnd = true } = options;
+    const { flags = "", anchorStart = true, anchorEnd = true, inner = true } = options;
     const resolvedPositive = (0, resolve_1.resolveRGXToken)(convertNoGroupWrap(positive), { groupWrap: false, currentFlags: flags });
     const resolvedNegative = (0, resolve_1.resolveRGXToken)(convertNoGroupWrap(negative), { groupWrap: false, currentFlags: flags });
-    const startBound = convertToBound((0, createRegex_1.createRegex)(`(?<=${resolvedNegative}${anchorStart ? "|^" : ""})(?=${resolvedPositive})`, flags, true));
-    const endBound = convertToBound((0, createRegex_1.createRegex)(`(?<=${resolvedPositive})(?=${resolvedNegative}${anchorEnd ? "|$" : ""})`, flags, true));
+    const startLookbehind = `(?<=${resolvedNegative}${anchorStart ? "|^" : ""})`;
+    const startLookahead = inner ? `(?=${resolvedPositive})` : "";
+    const startBound = convertToBound((0, createRegex_1.createRegex)(`${startLookbehind}${startLookahead}`, flags, true));
+    const endLookbehind = inner ? `(?<=${resolvedPositive})` : "";
+    const endLookahead = `(?=${resolvedNegative}${anchorEnd ? "|$" : ""})`;
+    const endBound = convertToBound((0, createRegex_1.createRegex)(`${endLookbehind}${endLookahead}`, flags, true));
     return [startBound, endBound];
 }

package/dist/walker/base.d.ts

@@ -60,12 +60,19 @@ export declare class RGXWalker<R, S = unknown> {
     private validateCapture;
     private handleAfterCapture;
     step(): RGXCapture | null;
-    stepToToken(predicate: (token: RGXTokenOrPart<R>) => boolean): this;
+    private _stepToTokenIter;
+    stepToToken(predicate?: (token: RGXTokenOrPart<R>) => boolean): this;
+    stepToTokenAsync(predicate?: (token: RGXTokenOrPart<R, S, unknown>) => boolean, yieldFn?: () => Promise<void>): Promise<this>;
+    private _stepPastCurrentPartIfNeeded;
     stepToPart(predicate?: (part: RGXPart<R, S, unknown>) => boolean): this;
+    stepToPartAsync(predicate?: (part: RGXPart<R, S, unknown>) => boolean, yieldFn?: () => Promise<void>): Promise<this>;
     walk(): R;
+    walkAsync(yieldFn?: () => Promise<void>): Promise<R>;
     snapshot(name: string, ...keys: Array<RGXWalkerSnapshotKey | false>): this;
     restore(name: string): this;
+    private _walkerSnapshot;
     tryWalk({ revertReduced, revertShare, revertCaptures }?: RGXTryWalkOptions): boolean;
+    tryWalkAsync({ revertReduced, revertShare, revertCaptures }?: RGXTryWalkOptions, yieldFn?: () => Promise<void>): Promise<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

@@ -315,7 +315,7 @@ class RGXWalker {
         this.advanceToken();
         return captureResult;
     }
-    stepToToken(predicate) {
+    *_stepToTokenIter(predicate) {
         while (this.hasNextToken()) {
             this._stopped = false;
             if (predicate(this.currentToken()))
@@ -323,25 +323,51 @@ class RGXWalker {
             this.step();
             if (this._stopped)
                 break;
+            yield;
         }
+    }
+    stepToToken(predicate = () => true) {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        for (const _ of this._stepToTokenIter(predicate)) { /* sync — no yield needed */ }
         return this;
     }
-    stepToPart(predicate = () => true) {
-        // If currently at a Part, step past it first so repeated
-        // calls advance to the next Part rather than getting stuck.
+    async stepToTokenAsync(predicate = () => true, yieldFn = () => new Promise(resolve => setImmediate(resolve))) {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        for (const _ of this._stepToTokenIter(predicate))
+            await yieldFn();
+        return this;
+    }
+    // If currently at a Part, steps past it (so repeated stepToPart calls advance
+    // rather than getting stuck). Returns true when the walker stopped mid-step.
+    _stepPastCurrentPartIfNeeded() {
         if (this.hasNextToken() && this.currentToken() instanceof part_1.RGXPart) {
             this._stopped = false;
             this.step();
             if (this._stopped)
-                return this;
+                return true;
         }
+        return false;
+    }
+    stepToPart(predicate = () => true) {
+        if (this._stepPastCurrentPartIfNeeded())
+            return this;
         this.stepToToken(token => token instanceof part_1.RGXPart && predicate(token));
         return this;
     }
+    async stepToPartAsync(predicate = () => true, yieldFn = () => new Promise(resolve => setImmediate(resolve))) {
+        if (this._stepPastCurrentPartIfNeeded())
+            return this;
+        await this.stepToTokenAsync(token => token instanceof part_1.RGXPart && predicate(token), yieldFn);
+        return this;
+    }
     walk() {
         this.stepToToken(() => false);
         return this.reduced;
     }
+    async walkAsync(yieldFn) {
+        await this.stepToTokenAsync(() => false, yieldFn);
+        return this.reduced;
+    }
     snapshot(name, ...keys) {
         const filteredKeys = keys.filter((k) => k !== false);
         const snap = {};
@@ -374,8 +400,11 @@ class RGXWalker {
             this.namedCaptures = snap.namedCaptures;
         return this;
     }
+    _walkerSnapshot(name, { revertReduced, revertShare, revertCaptures }) {
+        return this.snapshot(name, "sourcePosition", "tokenPosition", revertReduced && "reduced", revertShare && "share", revertCaptures && "captures", revertCaptures && "namedCaptures");
+    }
     tryWalk({ revertReduced = false, revertShare = false, revertCaptures = false } = {}) {
-        this.snapshot("tryWalk", "sourcePosition", "tokenPosition", revertReduced && "reduced", revertShare && "share", revertCaptures && "captures", revertCaptures && "namedCaptures");
+        this._walkerSnapshot("tryWalk", { revertReduced, revertShare, revertCaptures });
         try {
             this.walk();
             return true;
@@ -387,6 +416,19 @@ class RGXWalker {
             throw e;
         }
     }
+    async tryWalkAsync({ revertReduced = false, revertShare = false, revertCaptures = false } = {}, yieldFn) {
+        this._walkerSnapshot("tryWalk", { revertReduced, revertShare, revertCaptures });
+        try {
+            await this.walkAsync(yieldFn);
+            return true;
+        }
+        catch (e) {
+            this.restore("tryWalk");
+            if (isMatchError(e))
+                return false;
+            throw e;
+        }
+    }
     // Clone method
     clone(depth = "max") {
         if (depth === 0)

package/package.json

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