@ptolemy2002/rgx 7.7.0 → 7.7.2

package/dist/errors/partValidationFailed.d.ts

@@ -1,7 +1,8 @@
 import { RGXError } from "./base";
 export declare class RGXPartValidationFailedError extends RGXError {
+    id: string;
     gotRaw: string;
     gotTransformed: unknown;
-    constructor(message: string, gotRaw: string, gotTransformed: unknown);
+    constructor(id: string | null, message: string, gotRaw: string, gotTransformed: unknown);
     calcMessage(message: string): string;
 }

package/dist/errors/partValidationFailed.js

@@ -3,14 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RGXPartValidationFailedError = void 0;
 const base_1 = require("./base");
 class RGXPartValidationFailedError extends base_1.RGXError {
-    constructor(message, gotRaw, gotTransformed) {
+    constructor(id, message, gotRaw, gotTransformed) {
         super(message, 'PART_VALIDATION_FAILED');
         this.name = 'RGXPartValidationFailedError';
+        this.id = id ?? 'unknown';
         this.gotRaw = gotRaw;
         this.gotTransformed = gotTransformed;
     }
     calcMessage(message) {
-        return `${message}; Got: ${this.gotRaw} (transformed: ${JSON.stringify(this.gotTransformed)})`;
+        return `${message}; ID: ${this.id}; Got: ${this.gotRaw} (transformed: ${JSON.stringify(this.gotTransformed)})`;
     }
 }
 exports.RGXPartValidationFailedError = RGXPartValidationFailedError;

package/dist/flag-transformer/accentInsensitive.js

@@ -10,13 +10,23 @@ const accentPatterns = [
     "(o|ó|ò|ö|ô|õ)", "(O|Ó|Ò|Ö|Ô|Õ)",
     "(u|ú|ù|ü|û)", "(U|Ú|Ù|Ü|Û)"
 ];
+const nonEscapeBound = (0, resolve_1.resolveRGXToken)((0, constants_1.rgxConstant)("non-escape-bound"));
+const nonLocalizedFlagBound = (0, resolve_1.resolveRGXToken)({
+    rgxGroupWrap: false,
+    rgxIsRepeatable: false,
+    toRgx() { return /(?<!\(\?\-?[ims]*)/; }
+});
+const nonCharacterClassBound = (0, resolve_1.resolveRGXToken)({
+    rgxGroupWrap: false,
+    rgxIsRepeatable: false,
+    toRgx() { return /(?<!\[[^\]]*)/; }
+});
 const accentInsensitiveFlagTransformer = function (exp) {
     let source = exp.source;
     const flags = exp.flags;
-    const nonEscapeBound = (0, resolve_1.resolveRGXToken)((0, constants_1.rgxConstant)("non-escape-bound"));
     accentPatterns.forEach((pattern) => {
         // Replace any of the characters in the pattern with the pattern itself
-        source = source.replaceAll(new RegExp(nonEscapeBound + pattern, "g"), pattern);
+        source = source.replaceAll(new RegExp(nonEscapeBound + nonLocalizedFlagBound + nonCharacterClassBound + pattern, "g"), pattern);
     });
     return new RegExp(source, flags);
 };

package/dist/index.js

@@ -54,6 +54,7 @@ function rgx(flags = '', multiline = true) {
     };
 }
 function rgxwa(source, tokens, options = {}) {
+    (0, internal_1.assureAcceptance)(tokens, '');
     return new walker_1.RGXWalker(source, tokens, options);
 }
 function rgxw(source, { multiline = true, ...options } = {}) {

package/dist/types.d.ts

@@ -3,6 +3,7 @@ import type { RGXClassToken } from "./class";
 import type { ExtRegExp } from "./ExtRegExp";
 import type { RGXTokenCollection } from "./collection";
 import type { RGXWalkerOptions } from "./walker";
+import type { RGXPart, RGXWalker } from "./walker";
 export type RGXNoOpToken = null | undefined;
 export type RGXLiteralToken = RegExp;
 export type RGXNativeToken = string | number | boolean | RGXNoOpToken;
@@ -27,7 +28,7 @@ export type RGXRepeatableConvertibleToken = RGXConvertibleToken & {
 };
 export type RGXTokenType = 'no-op' | 'literal' | 'native' | 'convertible' | 'class' | RGXTokenType[];
 export type RGXTokenTypeFlat = Exclude<RGXTokenType, RGXTokenType[]> | "array";
-export type RGXTokenTypeGuardInput = "repeatable" | RGXTokenTypeFlat | null | RGXClassTokenConstructor | typeof RegExp | typeof ExtRegExp | typeof RGXTokenCollection | RGXTokenTypeGuardInput[];
+export type RGXTokenTypeGuardInput = "repeatable" | RGXTokenTypeFlat | null | RGXClassTokenConstructor | typeof RegExp | typeof ExtRegExp | typeof RGXTokenCollection | typeof RGXWalker | typeof RGXPart | RGXTokenTypeGuardInput[];
 export type RGXTokenFromType<T extends RGXTokenTypeGuardInput> = T extends null ? RGXToken : T extends 'no-op' ? RGXNoOpToken : T extends 'literal' ? RGXLiteralToken : T extends 'native' ? RGXNativeToken : T extends 'convertible' ? RGXConvertibleToken : T extends 'class' ? RGXClassToken : T extends 'array' ? RGXToken[] : T extends 'repeatable' ? Exclude<RGXToken, RGXConvertibleToken> | RGXRepeatableConvertibleToken : T extends new (...args: unknown[]) => infer R ? R : T extends RGXTokenTypeGuardInput[] ? {
     [K in keyof T]: T[K] extends RGXTokenTypeGuardInput ? RGXTokenFromType<T[K]> : never;
 } : never;
@@ -49,6 +50,6 @@ export type ValidRegexFlags = Branded<string, [ValidRegexFlagsBrandSymbol]> | Va
 export declare const validIdentifierSymbol: unique symbol;
 export type ValidIdentifierBrandSymbol = typeof validIdentifierSymbol;
 export type ValidIdentifier = Branded<string, [ValidIdentifierBrandSymbol]>;
-export type RGXWOptions<R = unknown> = Omit<RGXWalkerOptions<R>, "startingSourcePosition"> & {
+export type RGXWOptions<R = unknown> = RGXWalkerOptions<R> & {
     multiline?: boolean;
 };

package/dist/utils/regexWithFlags.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.regexWithFlags = regexWithFlags;
-const typeGuards_1 = require("../typeGuards");
-const normalizeRegexFlags_1 = require("./normalizeRegexFlags");
 const ExtRegExp_1 = require("../ExtRegExp");
+const normalizeRegexFlags_1 = require("./normalizeRegexFlags");
+const ExtRegExp_2 = require("../ExtRegExp");
 function regexWithFlags(exp, flags, replace = false) {
-    (0, typeGuards_1.assertValidVanillaRegexFlags)(flags);
+    (0, ExtRegExp_1.assertValidRegexFlags)(flags);
     if (replace)
-        return new ExtRegExp_1.ExtRegExp(exp.source, flags);
+        return new ExtRegExp_2.ExtRegExp(exp.source, flags);
     const existingFlags = exp.flags;
     const newFlags = existingFlags + flags;
-    return new ExtRegExp_1.ExtRegExp(exp.source, (0, normalizeRegexFlags_1.normalizeVanillaRegexFlags)(newFlags));
+    return new ExtRegExp_2.ExtRegExp(exp.source, (0, normalizeRegexFlags_1.normalizeRegexFlags)(newFlags));
 }

package/dist/walker/part.js

@@ -25,7 +25,7 @@ class RGXPart {
         if (result === true)
             return;
         const message = typeof result === "string" ? result : "Part Validation Failed";
-        throw new errors_1.RGXPartValidationFailedError(message, capture.raw, capture.value);
+        throw new errors_1.RGXPartValidationFailedError(this.id, message, capture.raw, capture.value);
     }
     // Properties used for conversion to an RGXToken
     get rgxIsGroup() {

package/package.json

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