@ptolemy2002/rgx 2.9.0 → 3.1.0

package/README.md

@@ -10,6 +10,7 @@ type RGXLiteralToken = RegExp;
 type RGXNativeToken = string | number | boolean | RGXNoOpToken;
 type RGXConvertibleToken = { toRgx: () => RGXToken };
 type RGXToken = RGXNativeToken | RGXLiteralToken | RGXConvertibleToken | RGXToken[];
+type RGXClassTokenConstructor = new (...args: unknown[]) => RGXClassToken;
 
 const validRegexSymbol = Symbol('rgx.ValidRegex');
 type ValidRegexBrandSymbol = typeof validRegexSymbol;
@@ -19,10 +20,13 @@ const validVanillaRegexFlagsSymbol = Symbol('rgx.ValidVanillaRegexFlags');
 type ValidVanillaRegexFlagsBrandSymbol = typeof validVanillaRegexFlagsSymbol;
 type ValidVanillaRegexFlags = Branded<string, [ValidVanillaRegexFlagsBrandSymbol]>;
 
-type RGXTokenType = 'no-op' | 'literal' | 'native' | 'convertible' | RGXTokenType[];
+type RGXTokenType = 'no-op' | 'literal' | 'native' | 'convertible' | 'class' | RGXTokenType[];
 type RGXTokenTypeFlat = Exclude<RGXTokenType, RGXTokenType[]> | "array";
-type RGXTokenTypeGuardInput = RGXTokenTypeFlat | null | RGXTokenTypeGuardInput[];
+type RGXTokenTypeGuardInput = RGXTokenTypeFlat | null | RGXClassTokenConstructor | RGXTokenTypeGuardInput[];
 type RGXTokenFromType<T extends RGXTokenTypeGuardInput> =
+    // Maps token type strings to their corresponding types, e.g.:
+    // 'no-op' -> RGXNoOpToken, 'literal' -> RGXLiteralToken, etc.
+    // Also maps RGXClassTokenConstructor to InstanceType<T>.
     // ... see source for full definition
 ;
 
@@ -309,10 +313,12 @@ Asserts that the given value is an array of RGX tokens. When `contentCheck` is `
 
 ### rgxTokenType
 ```typescript
-function rgxTokenType(value: unknown): RGXTokenType
+function rgxTokenType(value: unknown, recognizeClass?: boolean): RGXTokenType
 ```
 
-Determines the type of a given RGX token value (`no-op`, `literal`, `native`, `convertible`, or an array of the former) or throws an error if the value is not a valid RGX token.
+Determines the type of a given RGX token value (`no-op`, `literal`, `native`, `convertible`, `class`, or an array of the former) or throws an error if the value is not a valid RGX token.
+
+When `recognizeClass` is `true` (the default), `RGXClassToken` instances are identified as `'class'` rather than `'convertible'`. When `recognizeClass` is `false`, class tokens are identified as `'convertible'` instead. The `recognizeClass` preference is passed through to recursive calls for array elements.
 
 If you narrow the result of this function to something more specific, you can then convert these string or array literals into their corresponding token types using the `RGXTokenFromType` utility type or `rgxTokenFromType` function.
 
@@ -328,15 +334,18 @@ if (type === 'native') {
 
 #### Parameters
   - `value` (`unknown`): The value to check.
+  - `recognizeClass` (`boolean`, optional): Whether to recognize `RGXClassToken` instances as `'class'` instead of `'convertible'`. Defaults to `true`.
 
 #### Returns
 - `RGXTokenType`: The type of the RGX token.
 
 ### rgxTokenTypeFlat
 ```typescript
-function rgxTokenTypeFlat(value: unknown): RGXTokenTypeFlat
+function rgxTokenTypeFlat(value: unknown, recognizeClass?: boolean): RGXTokenTypeFlat
 ```
-Determines the flat type of a given RGX token value (`no-op`, `literal`, `native`, `convertible`, or `array`) or throws an error if the value is not a valid RGX token. The `array` type represents any array of RGX tokens, regardless of the types of the individual tokens within the array.
+Determines the flat type of a given RGX token value (`no-op`, `literal`, `native`, `convertible`, `class`, or `array`) or throws an error if the value is not a valid RGX token. The `array` type represents any array of RGX tokens, regardless of the types of the individual tokens within the array.
+
+When `recognizeClass` is `true` (the default), `RGXClassToken` instances are identified as `'class'` rather than `'convertible'`. This distinction is important because class tokens are also convertible tokens, but the `'class'` type is more specific. When `recognizeClass` is `false`, class tokens are identified as `'convertible'` instead.
 
 If you narrow the result of this function to something more specific, you can then convert these string literals into their corresponding token types using the `RGXTokenFromType` utility type or `rgxTokenFromType` function.
 
@@ -351,6 +360,7 @@ if (type === 'array') {
 
 #### Parameters
   - `value` (`unknown`): The value to check.
+  - `recognizeClass` (`boolean`, optional): Whether to recognize `RGXClassToken` instances as `'class'` instead of `'convertible'`. Defaults to `true`.
 
 #### Returns
 - `RGXTokenTypeFlat`: The flat type of the RGX token.
@@ -387,7 +397,7 @@ Converts an `RGXTokenType` to its flat equivalent `RGXTokenTypeFlat`. If the typ
 function rgxTokenTypeGuardInputToFlat(type: RGXTokenTypeGuardInput): RGXTokenTypeFlat | null
 ```
 
-Converts an `RGXTokenTypeGuardInput` to its flat equivalent. If the type is `null`, it returns `null`; if it is an array, it returns `'array'`; otherwise, it returns the type as-is.
+Converts an `RGXTokenTypeGuardInput` to its flat equivalent. If the type is `null`, it returns `null`; if it is an array, it returns `'array'`; if it is an `RGXClassTokenConstructor` (a constructor for an `RGXClassToken` subclass), it returns `'class'` (making it slightly lossy in that case); otherwise, it returns the type as-is.
 
 #### Parameters
   - `type` (`RGXTokenTypeGuardInput`): The type guard input to convert.
@@ -400,13 +410,15 @@ Converts an `RGXTokenTypeGuardInput` to its flat equivalent. If the type is `nul
 function isRGXToken<T extends RGXTokenTypeGuardInput = null>(value: unknown, type?: T, matchLength?: boolean): value is RGXTokenFromType<T>
 ```
 
-Checks if the given value is a valid RGX token, optionally narrowed to a specific token type. When `type` is `null` (the default), it checks against all token types. When `type` is a specific token type string, it checks only against that type.
+Checks if the given value is a valid RGX token, optionally narrowed to a specific token type. When `type` is `null` (the default), it checks against all token types. When `type` is a specific token type string, it checks only against that type. The `'class'` type matches `RGXClassToken` instances specifically, while `'convertible'` also matches class tokens since they implement the convertible interface.
+
+When `type` is an `RGXClassTokenConstructor` (a constructor for an `RGXClassToken` subclass), it performs an `instanceof` check against that specific constructor, allowing you to narrow to a specific class token subclass rather than all class tokens. In this case, `RGXTokenFromType` resolves to `InstanceType<T>`, giving you the specific subclass type.
 
 When `type` is an array, it checks that every element of the value array is a valid RGX token matching the corresponding type in the `type` array. If `matchLength` is `true` (the default), it also requires that the value array has the same length as the type array; if `false`, it allows the value array to be longer than the type array, as long as all elements up to the length of the type array match and all elements after that are still valid RGX tokens of any type.
 
 #### Parameters
   - `value` (`unknown`): The value to check.
-  - `type` (`T`, optional): The token type to check against. Defaults to `null`, which checks against all token types.
+  - `type` (`T`, optional): The token type to check against. Can be a token type string, `null` (checks against all token types), an `RGXClassTokenConstructor` (checks via `instanceof`), or an array of these. Defaults to `null`.
   - `matchLength` (`boolean`, optional): When `type` is an array, whether to require that the value array has the same length as the type array. Defaults to `true`.
 
 #### Returns
@@ -417,11 +429,11 @@ When `type` is an array, it checks that every element of the value array is a va
 function assertRGXToken<T extends RGXTokenTypeGuardInput = null>(value: unknown, type?: T, matchLength?: boolean): asserts value is RGXTokenFromType<T>
 ```
 
-Asserts that the given value is a valid RGX token, optionally narrowed to a specific token type. Uses the same logic as `isRGXToken`. If the assertion fails, an `RGXInvalidTokenError` will be thrown.
+Asserts that the given value is a valid RGX token, optionally narrowed to a specific token type (including `'class'` for `RGXClassToken` instances, or a specific `RGXClassTokenConstructor` for `instanceof` checks). Uses the same logic as `isRGXToken`. If the assertion fails, an `RGXInvalidTokenError` will be thrown.
 
 #### Parameters
   - `value` (`unknown`): The value to assert.
-  - `type` (`T`, optional): The token type to assert against. Defaults to `null`, which checks against all token types.
+  - `type` (`T`, optional): The token type to assert against. Can be a token type string, `null` (checks against all token types), an `RGXClassTokenConstructor` (checks via `instanceof`), or an array of these. Defaults to `null`.
   - `matchLength` (`boolean`, optional): When `type` is an array, whether to require that the value array has the same length as the type array. Defaults to `true`.
 
 #### Returns

package/dist/errors/invalidToken.js

@@ -10,6 +10,7 @@ const tokenExpectationMap = {
     'native': ['string', 'number', 'boolean', 'null', 'undefined'],
     'convertible': ['object with a toRgx method that returns a valid native/literal token or an array of valid native/literal tokens'],
     'array': ['array of native/literal/convertible tokens'],
+    'class': ['instance of RGXClassToken']
 };
 class RGXInvalidTokenError extends errors_1.RGXError {
     setExpected(expected) {

package/dist/internal/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./createConstructFunction";
 export * from "./createClassGuardFunction";
 export * from "./taggedTemplateToArray";
+export * from "./isConstructor";

package/dist/internal/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./createConstructFunction"), exports);
 __exportStar(require("./createClassGuardFunction"), exports);
 __exportStar(require("./taggedTemplateToArray"), exports);
+__exportStar(require("./isConstructor"), exports);

package/dist/internal/isConstructor.d.ts

@@ -0,0 +1 @@
+export declare function isConstructor(value: unknown): value is new (...args: unknown[]) => unknown;

package/dist/internal/isConstructor.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isConstructor = isConstructor;
+// This should work for our purposes
+const handler = { construct() { return handler; } };
+function isConstructor(value) {
+    try {
+        //@ts-expect-error If the value isn't constructable, the error will be caught.
+        return !!(new (new Proxy(value, handler))());
+    }
+    catch {
+        return false;
+    }
+}

package/dist/typeGuards.d.ts

@@ -9,8 +9,8 @@ export declare function isRGXConvertibleToken(value: unknown, returnCheck?: bool
 export declare function assertRGXConvertibleToken(value: unknown, returnCheck?: boolean): asserts value is t.RGXConvertibleToken;
 export declare function isRGXArrayToken(value: unknown, contentCheck?: boolean): value is t.RGXToken[];
 export declare function assertRGXArrayToken(value: unknown, contentCheck?: boolean): asserts value is t.RGXToken[];
-export declare function rgxTokenTypeFlat(value: unknown): t.RGXTokenTypeFlat;
-export declare function rgxTokenType(value: unknown): t.RGXTokenType;
+export declare function rgxTokenTypeFlat(value: unknown, recognizeClass?: boolean): t.RGXTokenTypeFlat;
+export declare function rgxTokenType(value: unknown, recognizeClass?: boolean): t.RGXTokenType;
 export declare function rgxTokenFromType<T extends t.RGXTokenTypeGuardInput>(type: T, value: t.RGXToken): t.RGXTokenFromType<T>;
 export declare function rgxTokenTypeToFlat(type: t.RGXTokenType): t.RGXTokenTypeFlat;
 export declare function rgxTokenTypeGuardInputToFlat(type: t.RGXTokenTypeGuardInput): t.RGXTokenTypeFlat | null;

package/dist/typeGuards.js

@@ -58,7 +58,9 @@ exports.assertValidRegexString = assertValidRegexString;
 exports.isValidVanillaRegexFlags = isValidVanillaRegexFlags;
 exports.assertValidVanillaRegexFlags = assertValidVanillaRegexFlags;
 const e = __importStar(require("./errors"));
+const class_1 = require("./class");
 const is_callable_1 = __importDefault(require("is-callable"));
+const internal_1 = require("./internal");
 function isRGXNoOpToken(value) {
     return value === null || value === undefined;
 }
@@ -112,25 +114,28 @@ function assertRGXArrayToken(value, contentCheck = true) {
         throw new e.RGXInvalidTokenError("Invalid array token", { type: "tokenType", values: ['array'] }, value);
     }
 }
-function rgxTokenTypeFlat(value) {
+function rgxTokenTypeFlat(value, recognizeClass = true) {
     if (isRGXNoOpToken(value))
         return 'no-op';
     if (isRGXLiteralToken(value))
         return 'literal';
     if (isRGXNativeToken(value))
         return 'native';
+    // We have to check class before convertible because class tokens are also convertible.
+    if (recognizeClass && (0, class_1.isRgxClassToken)(value))
+        return 'class';
     if (isRGXConvertibleToken(value))
         return 'convertible';
     if (isRGXArrayToken(value))
         return 'array';
     throw new e.RGXInvalidTokenError("Invalid RGX token", null, value);
 }
-function rgxTokenType(value) {
-    const flatType = rgxTokenTypeFlat(value);
+function rgxTokenType(value, recognizeClass = true) {
+    const flatType = rgxTokenTypeFlat(value, recognizeClass);
     if (flatType !== 'array')
         return flatType;
     else
-        return value.map(rgxTokenType);
+        return value.map(item => rgxTokenType(item, recognizeClass));
 }
 function rgxTokenFromType(type, value) {
     // Ignoring this line because the function is entirely a TypeScript utility that doesn't need to be tested at runtime.
@@ -145,9 +150,13 @@ function rgxTokenTypeGuardInputToFlat(type) {
         return null;
     if (Array.isArray(type))
         return 'array';
+    if ((0, internal_1.isConstructor)(type))
+        return 'class';
     return type;
 }
 function isRGXToken(value, type = null, matchLength = true) {
+    if ((0, internal_1.isConstructor)(type))
+        return value instanceof type;
     function typeMatches(s) {
         return type === null || type === s;
     }
@@ -157,6 +166,9 @@ function isRGXToken(value, type = null, matchLength = true) {
         return true;
     if (typeMatches('native') && isRGXNativeToken(value))
         return true;
+    // We have to check class before convertible because class tokens are also convertible.
+    if (typeMatches('class') && (0, class_1.isRgxClassToken)(value))
+        return true;
     if (typeMatches('convertible') && isRGXConvertibleToken(value))
         return true;
     if (typeMatches('array') && isRGXArrayToken(value))

package/dist/types.d.ts

@@ -1,4 +1,5 @@
 import { Branded } from "@ptolemy2002/ts-brand-utils";
+import type { RGXClassToken } from "./class";
 export type RGXNoOpToken = null | undefined;
 export type RGXLiteralToken = RegExp;
 export type RGXNativeToken = string | number | boolean | RGXNoOpToken;
@@ -6,12 +7,13 @@ export type RGXConvertibleToken = {
     toRgx: () => RGXToken;
 };
 export type RGXToken = RGXNativeToken | RGXLiteralToken | RGXConvertibleToken | RGXToken[];
-export type RGXTokenType = 'no-op' | 'literal' | 'native' | 'convertible' | RGXTokenType[];
+export type RGXClassTokenConstructor = new (...args: unknown[]) => RGXClassToken;
+export type RGXTokenType = 'no-op' | 'literal' | 'native' | 'convertible' | 'class' | RGXTokenType[];
 export type RGXTokenTypeFlat = Exclude<RGXTokenType, RGXTokenType[]> | "array";
-export type RGXTokenTypeGuardInput = RGXTokenTypeFlat | null | 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 'array' ? RGXToken[] : T extends RGXTokenTypeGuardInput[] ? {
+export type RGXTokenTypeGuardInput = RGXTokenTypeFlat | null | RGXClassTokenConstructor | 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 RGXTokenTypeGuardInput[] ? {
     [K in keyof T]: T[K] extends RGXTokenTypeGuardInput ? RGXTokenFromType<T[K]> : never;
-} : never;
+} : T extends RGXClassTokenConstructor ? InstanceType<T> : never;
 export declare const validRegexSymbol: unique symbol;
 export type ValidRegexBrandSymbol = typeof validRegexSymbol;
 export type ValidRegexString = Branded<string, [ValidRegexBrandSymbol]>;

package/package.json

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