@ptolemy2002/rgx 12.2.0 → 12.4.0

package/README.md

@@ -38,12 +38,7 @@ Because there is so much to document, it has been broken up into multiple files.
       - [lookbehind](./docs/class/token/lookaround/lookbehind.md) - The `RGXLookbehindToken` class, which represents a lookbehind assertion in a regular expression.
 
 ## Peer Dependencies
-- `@ptolemy2002/immutability-utils` ^2.0.0
-- `@ptolemy2002/js-utils` ^3.2.2
-- `@ptolemy2002/ts-brand-utils` ^1.0.0
-- `@ptolemy2002/ts-utils` ^3.4.0
-- `is-callable` ^1.2.7
-- `lodash.clonedeep` ^4.5.0
+N/A
 
 ## Commands
 The following commands exist in the project:

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/dist/flag-transformer/end.d.ts

@@ -0,0 +1,2 @@
+import { RegExpFlagTransformer } from "../ExtRegExp";
+export declare const endFlagTransformer: RegExpFlagTransformer;

package/dist/flag-transformer/end.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.endFlagTransformer = void 0;
+const endFlagTransformer = function (exp) {
+    // Putting it in a group so that a union of patterns will be wrapped correctly,
+    // e.g. "a|b" will become "(?:a|b)$" instead of "a|b$"
+    return ["(?:" + exp.source + ")$", exp.flags];
+};
+exports.endFlagTransformer = endFlagTransformer;

package/dist/flag-transformer/index.d.ts

@@ -1,2 +1,5 @@
 export * from "./accentInsensitive";
 export * from "./register";
+export * from "./whole";
+export * from "./start";
+export * from "./end";

package/dist/flag-transformer/index.js

@@ -16,3 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./accentInsensitive"), exports);
 __exportStar(require("./register"), exports);
+__exportStar(require("./whole"), exports);
+__exportStar(require("./start"), exports);
+__exportStar(require("./end"), exports);

package/dist/flag-transformer/register.js

@@ -4,9 +4,18 @@ exports.registerCustomFlagTransformers = registerCustomFlagTransformers;
 exports.unregisterCustomFlagTransformers = unregisterCustomFlagTransformers;
 const ExtRegExp_1 = require("../ExtRegExp");
 const accentInsensitive_1 = require("./accentInsensitive");
+const whole_1 = require("./whole");
+const start_1 = require("./start");
+const end_1 = require("./end");
 function registerCustomFlagTransformers() {
     (0, ExtRegExp_1.registerFlagTransformer)("a", accentInsensitive_1.accentInsensitiveFlagTransformer);
+    (0, ExtRegExp_1.registerFlagTransformer)("w", whole_1.wholeFlagTransformer);
+    (0, ExtRegExp_1.registerFlagTransformer)("b", start_1.beginningFlagTransformer);
+    (0, ExtRegExp_1.registerFlagTransformer)("e", end_1.endFlagTransformer);
 }
 function unregisterCustomFlagTransformers() {
     (0, ExtRegExp_1.unregisterFlagTransformer)("a");
+    (0, ExtRegExp_1.unregisterFlagTransformer)("w");
+    (0, ExtRegExp_1.unregisterFlagTransformer)("b");
+    (0, ExtRegExp_1.unregisterFlagTransformer)("e");
 }

package/dist/flag-transformer/start.d.ts

@@ -0,0 +1,2 @@
+import { RegExpFlagTransformer } from "../ExtRegExp";
+export declare const beginningFlagTransformer: RegExpFlagTransformer;

package/dist/flag-transformer/start.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.beginningFlagTransformer = void 0;
+const beginningFlagTransformer = function (exp) {
+    // Putting it in a group so that a union of patterns will be wrapped correctly,
+    // e.g. "a|b" will become "^(?:a|b)" instead of "^a|b"
+    return ["^(?:" + exp.source + ")", exp.flags];
+};
+exports.beginningFlagTransformer = beginningFlagTransformer;

package/dist/flag-transformer/whole.d.ts

@@ -0,0 +1,2 @@
+import { RegExpFlagTransformer } from "../ExtRegExp";
+export declare const wholeFlagTransformer: RegExpFlagTransformer;

package/dist/flag-transformer/whole.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.wholeFlagTransformer = void 0;
+const wholeFlagTransformer = function (exp) {
+    // Putting it in a group so that a union of patterns will be wrapped correctly,
+    // e.g. "a|b" will become "^(?:a|b)$" instead of "^a|b$"
+    return ["^(?:" + exp.source + ")$", exp.flags];
+};
+exports.wholeFlagTransformer = wholeFlagTransformer;

package/dist/walker/base.d.ts

@@ -43,6 +43,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;
     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

@@ -25,6 +25,9 @@ function createBranchGroups(tokens) {
         return tokens;
     }
 }
+function isMatchError(e) {
+    return e instanceof errors_1.RGXRegexNotMatchedAtPositionError || e instanceof errors_1.RGXPartValidationFailedError;
+}
 class RGXWalker {
     get sourcePosition() {
         return this._sourcePosition;
@@ -235,6 +238,22 @@ class RGXWalker {
         this.stepToToken(() => false);
         return this.reduced;
     }
+    tryWalk() {
+        const prevSourcePosition = this.sourcePosition;
+        const prevTokenPosition = this.tokenPosition;
+        try {
+            this.walk();
+            return true;
+        }
+        catch (e) {
+            this.sourcePosition = prevSourcePosition;
+            this.tokenPosition = prevTokenPosition;
+            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": "12.2.0",
+    "version": "12.4.0",
     "private": false,
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -28,22 +28,16 @@
         "release-major": "bash ./scripts/release.sh major"
     },
     "devDependencies": {
-        "@ptolemy2002/immutability-utils": "^2.0.0",
-        "@ptolemy2002/js-utils": "^3.2.2",
-        "@ptolemy2002/ts-brand-utils": "^1.0.0",
-        "@ptolemy2002/ts-utils": "^3.5.1",
         "@types/is-callable": "^1.1.2",
         "@types/jest": "^29.5.0",
         "@types/lodash.clonedeep": "^4.5.9",
-        "is-callable": "^1.2.7",
         "jest": "^29.5.0",
-        "lodash.clonedeep": "^4.5.0",
         "ts-jest": "^29.1.0",
         "ts-patch": "^3.3.0",
         "tsconfig-paths": "^4.2.0",
         "typescript-transform-paths": "^3.5.3"
     },
-    "peerDependencies": {
+    "dependencies": {
         "@ptolemy2002/immutability-utils": "^2.0.0",
         "@ptolemy2002/js-utils": "^3.2.2",
         "@ptolemy2002/ts-brand-utils": "^1.0.0",