@ptolemy2002/rgx 12.7.2 → 12.7.4

package/dist/errors/base.d.ts

@@ -1,4 +1,4 @@
-export type RGXErrorCode = 'UNKNOWN' | 'INVALID_RGX_TOKEN' | 'INVALID_REGEX_STRING' | 'INVALID_REGEX_FLAGS' | 'INVALID_VANILLA_REGEX_FLAGS' | 'NOT_IMPLEMENTED' | 'NOT_SUPPORTED' | 'INVALID_IDENTIFIER' | 'OUT_OF_BOUNDS' | 'INVALID_FLAG_TRANSFORMER_KEY' | 'FLAG_TRANSFORMER_CONFLICT' | 'CONSTANT_CONFLICT' | 'INVALID_CONSTANT_KEY' | 'INSERTION_REJECTED' | 'REGEX_NOT_MATCHED_AT_POSITION' | 'REGEX_NOT_MATCHED_AFTER_POSITION' | 'PART_VALIDATION_FAILED' | 'INVALID_LEXER_MODE' | 'LEXEME_NOT_MATCHED_AT_POSITION' | 'INVALID_RGX_LEXER' | 'INVALID_RGX_WALKER' | 'INVALID_RGX_PART' | 'NOT_DIRECT_REGEXP';
+export type RGXErrorCode = 'UNKNOWN' | 'INVALID_RGX_TOKEN' | 'INVALID_REGEX_STRING' | 'INVALID_REGEX_FLAGS' | 'INVALID_VANILLA_REGEX_FLAGS' | 'NOT_IMPLEMENTED' | 'NOT_SUPPORTED' | 'INVALID_IDENTIFIER' | 'OUT_OF_BOUNDS' | 'INVALID_FLAG_TRANSFORMER_KEY' | 'FLAG_TRANSFORMER_CONFLICT' | 'CONSTANT_CONFLICT' | 'INVALID_CONSTANT_KEY' | 'INSERTION_REJECTED' | 'REGEX_NOT_MATCHED_AT_POSITION' | 'REGEX_NOT_MATCHED_AFTER_POSITION' | 'PART_VALIDATION_FAILED' | 'INVALID_LEXER_MODE' | 'LEXEME_NOT_MATCHED_AT_POSITION' | 'INVALID_RGX_LEXER' | 'INVALID_RGX_WALKER' | 'INVALID_RGX_PART' | 'NOT_DIRECT_REGEXP' | 'CURRENT_TOKEN_NOT_FOUND';
 export declare class RGXError extends Error {
     _message: string;
     code: RGXErrorCode;

package/dist/errors/currentTokenNotFound.d.ts

@@ -0,0 +1,4 @@
+import { RGXError } from "./base";
+export declare class RGXCurrentTokenNotFoundError extends RGXError {
+    constructor(message: string);
+}

package/dist/errors/currentTokenNotFound.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RGXCurrentTokenNotFoundError = void 0;
+const base_1 = require("./base");
+class RGXCurrentTokenNotFoundError extends base_1.RGXError {
+    constructor(message) {
+        super(message, 'CURRENT_TOKEN_NOT_FOUND');
+        this.name = 'RGXCurrentTokenNotFoundError';
+    }
+}
+exports.RGXCurrentTokenNotFoundError = RGXCurrentTokenNotFoundError;

package/dist/errors/index.d.ts

@@ -21,3 +21,4 @@ export * from './invalidLexer';
 export * from './invalidWalker';
 export * from './invalidPart';
 export * from './notDirectRegexp';
+export * from './currentTokenNotFound';

package/dist/errors/index.js

@@ -37,3 +37,4 @@ __exportStar(require("./invalidLexer"), exports);
 __exportStar(require("./invalidWalker"), exports);
 __exportStar(require("./invalidPart"), exports);
 __exportStar(require("./notDirectRegexp"), exports);
+__exportStar(require("./currentTokenNotFound"), exports);

package/dist/walker/base.d.ts

@@ -35,7 +35,8 @@ export declare class RGXWalker<R, S = unknown> {
     constructor(source: string, tokens: RGXTokenOrPart<R, S>[], options?: RGXWalkerOptions<R, S>);
     stop(): this;
     atTokenEnd(): boolean;
-    hasNextToken(predicate?: (token: RGXToken | RGXPart<R, S, unknown>) => boolean): boolean;
+    atLastToken(): boolean;
+    hasNextToken(predicate?: (token: RGXTokenOrPart<R, S, unknown>) => boolean): boolean;
     atSourceEnd(): boolean;
     hasNextSource(predicate?: (rest: string) => boolean): boolean;
     lastCapture(): RGXCapture | null;

package/dist/walker/base.js

@@ -11,6 +11,7 @@ const utils_1 = require("../utils");
 const typeGuards_1 = require("../typeGuards");
 const class_1 = require("../class");
 const utils_2 = require("../utils");
+const currentTokenNotFound_1 = require("../errors/currentTokenNotFound");
 function createBranchGroups(tokens) {
     if ((tokens instanceof collection_1.RGXTokenCollection && tokens.mode === "union") ||
         class_1.RGXClassUnionToken.check(tokens))
@@ -71,6 +72,9 @@ class RGXWalker {
     atTokenEnd() {
         return this.tokenPosition >= this.tokens.length;
     }
+    atLastToken() {
+        return this.tokenPosition === this.tokens.length - 1;
+    }
     hasNextToken(predicate = () => true) {
         return !this.atTokenEnd() && predicate(this.currentToken());
     }
@@ -86,8 +90,11 @@ class RGXWalker {
         return this.captures[this.captures.length - 1];
     }
     currentToken() {
+        // Because an RGXToken might be null or undefined, this error is used
+        // to indicate there is no current token when one is expected.
+        // Previously, we just returned null.
         if (this.atTokenEnd())
-            return null;
+            throw new currentTokenNotFound_1.RGXCurrentTokenNotFoundError("Token position is at the end of the token collection, no current token exists");
         return this.tokens[this.tokenPosition];
     }
     remainingSource() {
@@ -113,9 +120,9 @@ class RGXWalker {
         return includeMatch ? match : match[0];
     }
     advanceToken() {
-        if (this.tokenPosition === this.tokens.length - 1)
+        if (this.atLastToken())
             this._didReachEnd = true;
-        if (!this.infinite || this.tokenPosition < this.tokens.length - 1) {
+        if (!this.infinite || !this.atLastToken()) {
             this.tokenPosition++;
             if (this.looping && this.atTokenEnd()) {
                 this.tokenPosition = 0;
@@ -123,7 +130,7 @@ class RGXWalker {
         }
     }
     determineBranch(capture) {
-        for (let i = 0; i < capture.length - 1; i++) {
+        for (let i = 0; i < capture.length; i++) {
             if (capture.groups?.[`rgx_branch_${i}`] !== undefined)
                 return i;
         }
@@ -240,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);
@@ -256,7 +266,7 @@ class RGXWalker {
             if (e instanceof errors_1.RGXRegexNotMatchedAfterPositionError) {
                 // If we're in infinite mode, we've reached the end before, and we're at the end now,
                 // this is recoverable. Just stop the walker instead of throwing an error.
-                if (this.infinite && this._didReachEnd && this.tokenPosition === this.tokens.length - 1) {
+                if (this.infinite && this._didReachEnd && this.atLastToken()) {
                     this._stopped = true;
                     return null;
                 }
@@ -277,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;
@@ -290,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;
@@ -318,7 +328,7 @@ class RGXWalker {
     stepToPart(predicate = () => true) {
         // If currently at a Part, step past it first so repeated
         // calls advance to the next Part rather than getting stuck.
-        if (this.currentToken() instanceof part_1.RGXPart) {
+        if (this.hasNextToken() && this.currentToken() instanceof part_1.RGXPart) {
             this._stopped = false;
             this.step();
             if (this._stopped)

package/package.json

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