@ptolemy2002/rgx 12.1.0 → 12.3.0

package/dist/class/base.d.ts

@@ -12,6 +12,7 @@ export declare abstract class RGXClassToken implements RGXConvertibleToken {
     rgxAcceptInsertion(tokens: RGXToken[], flags: ValidRegexFlags): string | boolean;
     static check: (value: unknown) => value is RGXClassToken;
     static assert: (value: unknown) => asserts value is RGXClassToken;
+    get rgxInterpolate(): boolean;
     get rgxIsGroup(): boolean;
     get rgxIsRepeatable(): boolean;
     get rgxGroupWrap(): boolean;

package/dist/class/base.js

@@ -7,6 +7,9 @@ class RGXClassToken {
     rgxAcceptInsertion(tokens, flags) {
         return true;
     }
+    get rgxInterpolate() {
+        return false;
+    }
     get rgxIsGroup() {
         return false;
     }
@@ -26,7 +29,7 @@ class RGXClassToken {
         throw new errors_1.RGXNotImplementedError('RGXClassToken.repeat(min, max, lazy)', 'call rgxClassInit() first.');
     }
     optional(lazy = false) {
-        return this.repeat(0, 1, lazy);
+        throw new errors_1.RGXNotImplementedError('RGXClassToken.optional(lazy)', 'call rgxClassInit() first.');
     }
     asLookahead(positive = true) {
         throw new errors_1.RGXNotImplementedError('RGXClassToken.asLookahead(positive)', 'call rgxClassInit() first.');

package/dist/class/init.js

@@ -33,6 +33,20 @@ function rgxClassInit() {
             throw new errors_1.RGXNotSupportedError("RGXLookaroundToken.repeat()", "Lookaround tokens cannot be repeated or made optional.");
         return new repeat_1.RGXRepeatToken(this, min, max, lazy);
     };
+    base_1.RGXClassToken.prototype.optional = function (lazy = false) {
+        if (repeat_1.RGXRepeatToken.check(this)) {
+            // Retun the self if already optional.
+            if (this.min === 0)
+                return this;
+            // Simply set min to 0 if it's currently 1,
+            // but not if it's any other number, since
+            // "either 0 or > 0" is not the same as "either 0 or >= n" for n > 1,
+            // but they are equivalent for n = 1, assuming n is an integer.
+            else if (this.min === 1)
+                return new repeat_1.RGXRepeatToken(this.token, 0, this.max, lazy);
+        }
+        return this.repeat(0, 1, lazy);
+    };
     base_1.RGXClassToken.prototype.asLookahead = function (positive = true) {
         if (lookahead_1.RGXLookaheadToken.check(this))
             return this;

package/dist/constants.d.ts

@@ -120,6 +120,11 @@ export declare const RGX_PREDEFINED_CONSTANTS: {
         readonly rgxGroupWrap: false;
         readonly toRgx: () => RegExp;
     };
+    readonly "escape-bound": {
+        readonly rgxGroupWrap: false;
+        readonly rgxIsRepeatable: false;
+        readonly toRgx: () => RegExp;
+    };
     readonly "non-escape-bound": {
         readonly rgxGroupWrap: false;
         readonly rgxIsRepeatable: false;

package/dist/constants.js

@@ -144,12 +144,21 @@ exports.RGX_PREDEFINED_CONSTANTS = {
         toRgx() { return /[\b]/; }
     },
     // Complex Constructs
+    "escape-bound": {
+        rgxGroupWrap: false,
+        rgxIsRepeatable: false,
+        toRgx() {
+            // Put this before any pattern to ensure that the pattern is escaped, i.e., preceded by an odd number of backslashes.
+            return /(?<=(?<!\\)\\(?:\\\\)*)/;
+        }
+    },
     "non-escape-bound": {
         rgxGroupWrap: false,
         rgxIsRepeatable: false,
         toRgx() {
             // Put this before any pattern to ensure that the pattern is not escaped, i.e., not preceded by an odd number of backslashes.
-            return /(?<=(?<!\\)(?:\\\\)*)(?=[^\\]|$)/;
+            // Essentially equivalent to escape-bound, but without the extra backslash between the negative lookbehind and the non-capturing group.
+            return /(?<=(?<!\\)(?:\\\\)*)/;
         }
     },
 };

package/package.json

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