@aidc-toolkit/utility 0.9.5 → 0.9.6-beta

package/dist/index.js

@@ -660,28 +660,14 @@ var Transformer = class _Transformer {
       }));
     }
   }
-  /**
-   * Transform a value or values forward.
-   *
-   * @template T
-   * Type returned by transformation callback.
-   *
-   * @param valueOrValues
-   * Value(s).
-   *
-   * @param transformationCallback
-   * Called after value(s) is/are transformed to convert it/them to its/their final value(s).
-   *
-   * @returns
-   * Value(s) transformed into object(s).
-   */
-  forward(valueOrValues, transformationCallback) {
+  // eslint-disable-next-line jsdoc/require-jsdoc -- Implementation of overloaded signatures.
+  forward(valueOrValues, transformerCallback) {
     let result;
     if (typeof valueOrValues !== "object") {
       const valueN = BigInt(valueOrValues);
       this.validate(valueN);
       const transformedValue = this.doForward(valueN);
-      result = transformationCallback === void 0 ? transformedValue : transformationCallback(transformedValue, 0);
+      result = transformerCallback === void 0 ? transformedValue : transformerCallback(transformedValue, 0);
     } else if (valueOrValues instanceof Sequencer) {
       if (valueOrValues.minValue < 0n) {
         throw new RangeError(i18n_default.t("Transformer.minValueMustBeGreaterThanOrEqualToZero", {
@@ -696,16 +682,16 @@ var Transformer = class _Transformer {
           domain: this.domain
         }));
       }
-      result = transformationCallback === void 0 ? IteratorProxy.from(valueOrValues).map((value) => this.doForward(value)) : IteratorProxy.from(valueOrValues).map((value, index) => transformationCallback(this.doForward(value), index));
+      result = transformerCallback === void 0 ? IteratorProxy.from(valueOrValues).map((value) => this.doForward(value)) : IteratorProxy.from(valueOrValues).map((value, index) => transformerCallback(this.doForward(value), index));
     } else {
-      result = transformationCallback === void 0 ? IteratorProxy.from(valueOrValues).map((value) => {
+      result = transformerCallback === void 0 ? IteratorProxy.from(valueOrValues).map((value) => {
         const valueN = BigInt(value);
         this.validate(valueN);
         return this.doForward(valueN);
       }) : IteratorProxy.from(valueOrValues).map((value, index) => {
         const valueN = BigInt(value);
         this.validate(valueN);
-        return transformationCallback(this.doForward(valueN), index);
+        return transformerCallback(this.doForward(valueN), index);
       });
     }
     return result;
@@ -1387,17 +1373,21 @@ var CharacterSetCreator = class _CharacterSetCreator extends CharacterSetValidat
       exclusionDomains[1 /* FirstZero */] = exclusionFirstZeroDomains;
     }
     if (exclusionSupport.includes(2 /* AllNumeric */)) {
+      let validateNumberIndexes2 = function(numberIndexes2) {
+        let expectedNumberIndex = numberIndexes2[0];
+        for (const numberIndex of numberIndexes2) {
+          if (numberIndex === void 0 || numberIndex !== expectedNumberIndex) {
+            throw new RangeError(i18n_default.t("CharacterSetValidator.allNumericAllNumericCharacters", {
+              ns: utilityNS
+            }));
+          }
+          expectedNumberIndex = numberIndex + 1;
+        }
+      };
+      var validateNumberIndexes = validateNumberIndexes2;
       const exclusionAllNumericDomains = new Array(_CharacterSetCreator.MAXIMUM_STRING_LENGTH + 1);
       const numberIndexes = this.characterIndexes("0123456789");
-      let expectedNumberIndex = numberIndexes[0];
-      for (const numberIndex of numberIndexes) {
-        if (numberIndex === void 0 || numberIndex !== expectedNumberIndex) {
-          throw new RangeError(i18n_default.t("CharacterSetValidator.allNumericAllNumericCharacters", {
-            ns: utilityNS
-          }));
-        }
-        expectedNumberIndex = numberIndex + 1;
-      }
+      validateNumberIndexes2(numberIndexes);
       const zeroIndex = BigInt(numberIndexes[0]);
       const allZerosValues = new Array(_CharacterSetCreator.MAXIMUM_STRING_LENGTH + 1);
       let allZerosValue = 0n;
@@ -1484,8 +1474,30 @@ var CharacterSetCreator = class _CharacterSetCreator extends CharacterSetValidat
       }));
     }
   }
-  // eslint-disable-next-line jsdoc/require-jsdoc -- Implementation of overloaded signatures.
-  create(length, valueOrValues, exclusion = 0 /* None */, tweak, creationCallback) {
+  /**
+   * Create string(s) by mapping value(s) to the equivalent characters in the character set across the length of the
+   * string.
+   *
+   * @param length
+   * Required string length.
+   *
+   * @param valueOrValues
+   * Numeric value(s) of the string(s).
+   *
+   * @param exclusion
+   * String(s) to be excluded from the range of outputs. See {@link Exclusion} for possible values and their meaning.
+   *
+   * @param tweak
+   * If provided, the numerical value of the string(s) is/are "tweaked" using an {@link EncryptionTransformer |
+   * encryption transformer}.
+   *
+   * @param creatorCallback
+   * If provided, called after each string is constructed to create the final value.
+   *
+   * @returns
+   * String(s) created from the value(s).
+   */
+  create(length, valueOrValues, exclusion = 0 /* None */, tweak, creatorCallback) {
     this.validateLength(length);
     this.validateExclusion(exclusion);
     const allZerosValue = exclusion === 2 /* AllNumeric */ ? this._allZerosValues[length] : 0n;
@@ -1504,7 +1516,7 @@ var CharacterSetCreator = class _CharacterSetCreator extends CharacterSetValidat
         }
         s = this.character(exclusion === 1 /* FirstZero */ ? Number(convertValue % this._characterSetSizeMinusOneN) + 1 : Number(convertValue % this._characterSetSizeN)) + s;
       }
-      return creationCallback !== void 0 ? creationCallback(s, index) : s;
+      return creatorCallback !== void 0 ? creatorCallback(s, index) : s;
     });
   }
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aidc-toolkit/utility",
-  "version": "0.9.5",
+  "version": "0.9.6-beta",
   "description": "Foundational utilities for AIDC Toolkit",
   "type": "module",
   "main": "dist/index.js",
@@ -19,22 +19,21 @@
     "url": "https://www.linkedin.com/in/kdean"
   },
   "scripts": {
-    "eslint": "eslint .",
+    "lint": "eslint .",
     "build": "tsup src/index.ts --clean --format cjs,esm --dts",
     "build-doc": "npm run build && tsc src/index.ts --outDir dist --target esnext --moduleResolution nodenext --module nodenext --emitDeclarationOnly --declaration --declarationMap",
     "test": "vitest run"
   },
   "devDependencies": {
-    "@aidc-toolkit/dev": "^0.9.5",
-    "eslint": "^9.15.0",
+    "@aidc-toolkit/dev": "^0.9.6-beta",
+    "eslint": "^9.16.0",
     "ts-node": "^10.9.2",
     "tsup": "^8.3.5",
-    "typescript": "^5.6.3",
-    "vitest": "^2.1.5"
+    "typescript": "^5.7.2",
+    "vitest": "^2.1.7"
   },
   "dependencies": {
-    "@aidc-toolkit/core": "^0.9.5",
-    "@rollup/rollup-linux-x64-gnu": "^4.27.3",
-    "i18next": "^23.16.8"
+    "@aidc-toolkit/core": "^0.9.6-beta",
+    "@rollup/rollup-linux-x64-gnu": "^4.28.0"
   }
 }

package/src/character_set.ts

@@ -2,6 +2,7 @@ import i18next, { utilityNS } from "./locale/i18n.js";
 import { RegExpValidator } from "./reg_exp.js";
 import type { StringValidation, StringValidator } from "./string.js";
 import { Transformer } from "./transformer.js";
+import type { TransformerCallback, TransformerInput, TransformerOutput } from "./types.js";
 
 /**
  * Exclusion options for validating and creating strings based on character sets.
@@ -291,20 +292,6 @@ export class CharacterSetValidator implements StringValidator<CharacterSetValida
     }
 }
 
-/**
- * Creation callback, used to convert created string to its final value.
- *
- * @param s
- * Created string.
- *
- * @param index
- * Index in sequence creation (0 for single creation).
- *
- * @returns
- * Final value.
- */
-export type CreationCallback = (s: string, index: number) => string;
-
 /**
  * Character set creator. Maps numeric values to strings using the character set as digits.
  */
@@ -418,23 +405,33 @@ export class CharacterSetCreator extends CharacterSetValidator {
         if (exclusionSupport.includes(Exclusion.AllNumeric)) {
             const exclusionAllNumericDomains = new Array<bigint>(CharacterSetCreator.MAXIMUM_STRING_LENGTH + 1);
 
-            const numberIndexes = this.characterIndexes("0123456789");
-
-            let expectedNumberIndex = numberIndexes[0];
+            /**
+             * Validate that number indexes are defined and sequential.
+             *
+             * @param numberIndexes
+             * Number indexes.
+             */
+            function validateNumberIndexes(numberIndexes: ReadonlyArray<number | undefined>): asserts numberIndexes is number[] {
+                let expectedNumberIndex = numberIndexes[0];
+
+                // Make sure that all numeric characters are present and in sequence.
+                for (const numberIndex of numberIndexes) {
+                    if (numberIndex === undefined || numberIndex !== expectedNumberIndex) {
+                        throw new RangeError(i18next.t("CharacterSetValidator.allNumericAllNumericCharacters", {
+                            ns: utilityNS
+                        }));
+                    }
 
-            // Make sure that all numeric characters are present and in sequence.
-            for (const numberIndex of numberIndexes) {
-                if (numberIndex === undefined || numberIndex !== expectedNumberIndex) {
-                    throw new RangeError(i18next.t("CharacterSetValidator.allNumericAllNumericCharacters", {
-                        ns: utilityNS
-                    }));
+                    expectedNumberIndex = numberIndex + 1;
                 }
-
-                expectedNumberIndex = numberIndex + 1;
             }
 
+            const numberIndexes = this.characterIndexes("0123456789");
+
+            validateNumberIndexes(numberIndexes);
+
             // Zero index is the all-zero value for a single-character string.
-            const zeroIndex = BigInt((numberIndexes as number[])[0]);
+            const zeroIndex = BigInt(numberIndexes[0]);
 
             const allZerosValues = new Array<bigint>(CharacterSetCreator.MAXIMUM_STRING_LENGTH + 1);
             let allZerosValue = 0n;
@@ -548,79 +545,33 @@ export class CharacterSetCreator extends CharacterSetValidator {
     }
 
     /**
-     * Create a string by mapping a value to the equivalent characters in the character set across the length of the
+     * Create string(s) by mapping value(s) to the equivalent characters in the character set across the length of the
      * string.
      *
      * @param length
      * Required string length.
      *
-     * @param value
-     * Numeric value of the string.
-     *
-     * @param exclusion
-     * Strings to be excluded from the range of outputs. See {@link Exclusion} for possible values and their meaning.
-     *
-     * @param tweak
-     * If provided, the numerical value of the string is "tweaked" using an {@link EncryptionTransformer | encryption
-     * transformer}.
-     *
-     * @param creationCallback
-     * If provided, called after the string is constructed to create the final value.
-     *
-     * @returns
-     * String created from the value.
-     */
-    create(length: number, value: number | bigint, exclusion?: Exclusion, tweak?: number | bigint, creationCallback?: CreationCallback): string;
-
-    /**
-     * Create multiple strings by mapping each value to the equivalent characters in the character set across the length
-     * of the string. Equivalent to calling this method for each individual value.
-     *
-     * @param length
-     * Required string length.
-     *
-     * @param values
-     * Numeric values of the strings.
-     *
-     * @param exclusion
-     * Strings to be excluded from the range of outputs. See {@link Exclusion} for possible values and their meaning.
-     *
-     * @param tweak
-     * If provided, the numerical value of the strings are "tweaked" using an {@link EncryptionTransformer | encryption
-     * transformer}.
-     *
-     * @param creationCallback
-     * If provided, called after each string is constructed to create the final value.
-     *
-     * @returns
-     * Iterable iterator over strings created from the values.
-     */
-    create(length: number, values: Iterable<number | bigint>, exclusion?: Exclusion, tweak?: number | bigint, creationCallback?: CreationCallback): IterableIterator<string>;
-
-    /**
-     * Create a string or multiple strings. This signature exists to allow similar overloaded methods in other classes
-     * to call this method correctly.
-     *
-     * @param length
-     *
      * @param valueOrValues
+     * Numeric value(s) of the string(s).
      *
      * @param exclusion
+     * String(s) to be excluded from the range of outputs. See {@link Exclusion} for possible values and their meaning.
      *
      * @param tweak
+     * If provided, the numerical value of the string(s) is/are "tweaked" using an {@link EncryptionTransformer |
+     * encryption transformer}.
      *
-     * @param creationCallback
+     * @param creatorCallback
+     * If provided, called after each string is constructed to create the final value.
      *
      * @returns
+     * String(s) created from the value(s).
      */
-    create(length: number, valueOrValues: number | bigint | Iterable<number | bigint>, exclusion?: Exclusion, tweak?: number | bigint, creationCallback?: CreationCallback): string | IterableIterator<string>;
-
-    // eslint-disable-next-line jsdoc/require-jsdoc -- Implementation of overloaded signatures.
-    create(length: number, valueOrValues: number | bigint | Iterable<number | bigint>, exclusion: Exclusion = Exclusion.None, tweak?: number | bigint, creationCallback?: CreationCallback): string | IterableIterator<string> {
+    create<T extends TransformerInput<number | bigint>>(length: number, valueOrValues: T, exclusion: Exclusion = Exclusion.None, tweak?: number | bigint, creatorCallback?: TransformerCallback<string, string>): TransformerOutput<T, string> {
         this.validateLength(length);
         this.validateExclusion(exclusion);
 
-        // Zero value obviates need for non-null assertion.
+        // Zero value in ternary else obviates need for non-null assertion.
         const allZerosValue = exclusion === Exclusion.AllNumeric ? this._allZerosValues[length] : 0n;
 
         const transformer = Transformer.get(this._exclusionDomains[exclusion][length], tweak);
@@ -651,7 +602,7 @@ export class CharacterSetCreator extends CharacterSetValidator {
                 s = this.character(exclusion === Exclusion.FirstZero ? Number(convertValue % this._characterSetSizeMinusOneN) + 1 : Number(convertValue % this._characterSetSizeN)) + s;
             }
 
-            return creationCallback !== undefined ? creationCallback(s, index) : s;
+            return creatorCallback !== undefined ? creatorCallback(s, index) : s;
         });
     }
 

package/src/index.ts

@@ -1,3 +1,4 @@
+export type * from "./types.js";
 export * from "./iterator_proxy.js";
 export * from "./sequencer.js";
 export * from "./transformer.js";

package/src/iterator_proxy.ts

@@ -150,10 +150,10 @@ abstract class IteratorProxyBase<TInitial, TFinal> implements IteratorObject<TFi
         for (const value of this) {
             // Need to check arguments length as U could include undefined.
             if (index === 0 && arguments.length === 1) {
-                // Initial value is not supplied only when U is identical to TFinal.
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Initial value is not supplied only when U is identical to TFinal.
                 result = value as unknown as U;
             } else {
-                // Iteration has occurred at least once so result is of the expected type.
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Iteration has occurred at least once so result is of the expected type.
                 result = callback(result as U, value, index);
             }
 
@@ -164,7 +164,7 @@ abstract class IteratorProxyBase<TInitial, TFinal> implements IteratorObject<TFi
             throw new Error("reduce() of empty iterator with no initial value");
         }
 
-        // Iteration has occurred at least once so result is of the expected type.
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Iteration has occurred at least once so result is of the expected type.
         return result as U;
     }
 
@@ -508,8 +508,8 @@ function iteratorProxy(): Pick<typeof Iterator, "from"> {
 /**
  * Iterator proxy. In environments where
  * {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Iterator#iterator_helpers |
- * iterator helpers} are supported, this references the {@link Iterator} variable directly. Otherwise, it references an
- * implementation of "from" that uses an internally-defined iterator proxy object.
+ * iterator helpers} are supported, this references the {@linkcode Iterator} variable directly. Otherwise, it references
+ * an implementation of "from" that uses an internally-defined iterator proxy object.
  *
  * Client applications should **not** rely on long-term availability of this variable as it will be removed once there
  * is widespread support for iterator helpers.

package/src/transformer.ts

@@ -1,23 +1,7 @@
 import { IteratorProxy } from "./iterator_proxy.js";
 import i18next, { utilityNS } from "./locale/i18n.js";
 import { Sequencer } from "./sequencer.js";
-
-/**
- * Transformation callback, used to convert transformed value to its final value.
- *
- * @template T
- * Type returned by callback.
- *
- * @param transformedValue
- * Transformed value.
- *
- * @param index
- * Index in sequence transformation (0 for single transformation).
- *
- * @returns
- * Final value.
- */
-export type TransformationCallback<T> = (transformedValue: bigint, index: number) => T;
+import type { TransformerCallback, TransformerInput, TransformerOutput } from "./types.js";
 
 /**
  * Transformer that transforms values in a numeric domain to values in a range equal to the domain or to another range
@@ -143,104 +127,45 @@ export abstract class Transformer {
     protected abstract doForward(value: bigint): bigint;
 
     /**
-     * Transform a value forward.
-     *
-     * @param value
-     * Value.
-     *
-     * @returns
-     * Transformed value.
-     */
-    forward(value: number | bigint): bigint;
-
-    /**
-     * Transform a value forward.
-     *
-     * @template T
-     * Type returned by transformation callback.
-     *
-     * @param value
-     * Value.
-     *
-     * @param transformationCallback
-     * Called after the value is transformed to convert it to its final value.
-     *
-     * @returns
-     * Value transformed into object.
-     */
-    forward<T>(value: number | bigint, transformationCallback: TransformationCallback<T>): T;
-
-    /**
-     * Transform values forward.
-     *
-     * @param values
-     * Values. If this is an instance of {@link Sequencer}, the minimum and maximum values are validated prior to
-     * transformation. Otherwise, the individual values are validated at the time of transformation.
-     *
-     * @returns
-     * Transformed values.
-     */
-    forward(values: Iterable<number | bigint>): IterableIterator<bigint>;
-
-    /**
-     * Transform values forward.
+     * Transform value(s) forward.
      *
      * @template T
-     * Type returned by transformation callback.
-     *
-     * @param values
-     * Values. If this is an instance of {@link Sequencer}, the minimum and maximum values are validated prior to
-     * transformation. Otherwise, the individual values are validated at the time of transformation.
-     *
-     * @param transformationCallback
-     * Called after each value is transformed to convert it to its final value.
-     *
-     * @returns
-     * Values transformed into objects.
-     */
-    forward<T>(values: Iterable<number | bigint>, transformationCallback: TransformationCallback<T>): IterableIterator<T>;
-
-    /**
-     * Transform a value or values forward. This signature exists to allow similar overloaded methods in other classes
-     * to call this method correctly.
+     * Value(s) input type.
      *
      * @param valueOrValues
+     * Value(s). If this is an instance of {@link Sequencer}, the minimum and maximum values are validated prior to
+     * transformation. Otherwise, the individual value(s) is/are validated at the time of transformation.
      *
      * @returns
+     * Transformed value(s).
      */
-    forward(valueOrValues: number | bigint | Iterable<number | bigint>): bigint | IterableIterator<bigint>;
+    forward<T extends TransformerInput<number | bigint>>(valueOrValues: T): TransformerOutput<T, bigint>;
 
     /**
-     * Transform a value or values forward. This signature exists to allow similar overloaded methods in other classes
-     * to call this method correctly.
+     * Transform value(s) forward, optionally applying a transformation.
      *
      * @template T
+     * Value(s) input type.
      *
-     * @param valueOrValues
-     *
-     * @param transformationCallback
-     *
-     * @returns
-     */
-    forward<T>(valueOrValues: number | bigint | Iterable<number | bigint>, transformationCallback: TransformationCallback<T>): T | IterableIterator<T>;
-
-    /**
-     * Transform a value or values forward.
-     *
-     * @template T
-     * Type returned by transformation callback.
+     * @template U
+     * Transformation callback output type.
      *
      * @param valueOrValues
-     * Value(s).
+     * Value(s). If this is an instance of {@link Sequencer}, the minimum and maximum values are validated prior to
+     * transformation. Otherwise, the individual value(s) is/are validated at the time of transformation.
      *
-     * @param transformationCallback
-     * Called after value(s) is/are transformed to convert it/them to its/their final value(s).
+     * @param transformerCallback
+     * Called after each value is transformed to convert it to its final value.
      *
      * @returns
-     * Value(s) transformed into object(s).
+     * Transformed value(s).
      */
-    forward<T>(valueOrValues: number | bigint | Iterable<number | bigint>, transformationCallback?: TransformationCallback<T>): bigint | T | IterableIterator<bigint> | IterableIterator<T> {
-        let result: bigint | T | IterableIterator<bigint> | IterableIterator<T>;
+    forward<T extends TransformerInput<number | bigint>, U>(valueOrValues: T, transformerCallback: TransformerCallback<bigint, U>): TransformerOutput<T, U>;
+
+    // eslint-disable-next-line jsdoc/require-jsdoc -- Implementation of overloaded signatures.
+    forward<T extends TransformerInput<number | bigint>, U>(valueOrValues: T, transformerCallback?: TransformerCallback<bigint, U>): TransformerOutput<T, U> {
+        // TODO Refactor type when https://github.com/microsoft/TypeScript/pull/56941 released.
+        let result: bigint | U | IterableIterator<bigint> | IterableIterator<U>;
 
         if (typeof valueOrValues !== "object") {
             const valueN = BigInt(valueOrValues);
@@ -249,7 +174,7 @@ export abstract class Transformer {
 
             const transformedValue = this.doForward(valueN);
 
-            result = transformationCallback === undefined ? transformedValue : transformationCallback(transformedValue, 0);
+            result = transformerCallback === undefined ? transformedValue : transformerCallback(transformedValue, 0);
         } else if (valueOrValues instanceof Sequencer) {
             if (valueOrValues.minValue < 0n) {
                 throw new RangeError(i18next.t("Transformer.minValueMustBeGreaterThanOrEqualToZero", {
@@ -266,11 +191,11 @@ export abstract class Transformer {
                 }));
             }
 
-            result = transformationCallback === undefined ?
+            result = transformerCallback === undefined ?
                 IteratorProxy.from(valueOrValues).map(value => this.doForward(value)) :
-                IteratorProxy.from(valueOrValues).map((value, index) => transformationCallback(this.doForward(value), index));
+                IteratorProxy.from(valueOrValues).map((value, index) => transformerCallback(this.doForward(value), index));
         } else {
-            result = transformationCallback === undefined ?
+            result = transformerCallback === undefined ?
                 IteratorProxy.from(valueOrValues).map((value) => {
                     const valueN = BigInt(value);
 
@@ -283,11 +208,12 @@ export abstract class Transformer {
 
                     this.validate(valueN);
 
-                    return transformationCallback(this.doForward(valueN), index);
+                    return transformerCallback(this.doForward(valueN), index);
                 });
         }
 
-        return result;
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- Type determination is handled above.
+        return result as TransformerOutput<T, U>;
     }
 
     /**

package/src/types.ts

@@ -0,0 +1,46 @@
+/**
+ * Transformer input, one of:
+ *
+ * - T (primitive type)
+ * - Iterable<T>
+ *
+ * @template T
+ * Primitive type.
+ */
+export type TransformerInput<T extends string | number | bigint | boolean> =
+    T | Iterable<T>;
+
+/**
+ * Transformer callback, used to convert transformed value to its final value.
+ *
+ * @template TInput
+ * Type of input to callback.
+ *
+ * @template TOutput
+ * Type of output to callback.
+ *
+ * @param input
+ * Input value.
+ *
+ * @param index
+ * Index in sequence (0 for single transformation).
+ *
+ * @returns
+ * Output value.
+ */
+export type TransformerCallback<TInput, TOutput> = (input: TInput, index: number) => TOutput;
+
+/**
+ * Transformer output, based on transformer input:
+ *
+ * - If type T is primitive type, result is type U.
+ * - If type T is Iterable type, result is type IterableIterator<U>.
+ *
+ * @template T
+ * Transformer input type.
+ *
+ * @template U
+ * Output base type.
+ */
+export type TransformerOutput<T extends TransformerInput<string | number | bigint | boolean>, U> =
+    T extends (T extends TransformerInput<infer V> ? V : never) ? U : IterableIterator<U>;

package/test/character_set.test.ts

@@ -6,7 +6,6 @@ import {
     CharacterSetCreator,
     Exclusion,
     HEXADECIMAL_CREATOR,
-    IteratorProxy,
     NUMERIC_CREATOR,
     Sequencer
 } from "../src/index.js";
@@ -65,7 +64,7 @@ function testCharacterSetCreator(name: string, characterSetCreator: CharacterSet
                     break;
             }
 
-            const sequence = IteratorProxy.from(characterSetCreator.create(length, new Sequencer(0n, domain), exclusion));
+            const sequence = Iterator.from(characterSetCreator.create(length, new Sequencer(0n, domain), exclusion));
 
             let previousS = "";
 
@@ -86,7 +85,7 @@ function testCharacterSetCreator(name: string, characterSetCreator: CharacterSet
 
             expect(() => characterSetCreator.create(length, domain, exclusion)).toThrow(`Value ${domain} must be less than ${domain}`);
 
-            const sparseSequence = IteratorProxy.from(characterSetCreator.create(length, new Sequencer(domain - 1, -domain), exclusion, 123456n));
+            const sparseSequence = Iterator.from(characterSetCreator.create(length, new Sequencer(domain - 1, -domain), exclusion, 123456n));
 
             let sequential = true;
             previousS = "~";

package/test/sequencer.test.ts

@@ -1,6 +1,6 @@
 import { I18NEnvironment, i18nInit } from "@aidc-toolkit/core";
 import { describe, expect, test } from "vitest";
-import { IteratorProxy, Sequencer } from "../src/index.js";
+import { Sequencer } from "../src/index.js";
 
 await i18nInit(I18NEnvironment.CLI);
 
@@ -29,7 +29,7 @@ describe("Sequence", () => {
         expectedValue = 10n;
         count = 0;
 
-        for (const value of IteratorProxy.from(sequencer1)) {
+        for (const value of Iterator.from(sequencer1)) {
             expect(value).toBe(expectedValue);
 
             expectedValue++;
@@ -41,7 +41,7 @@ describe("Sequence", () => {
         expectedValue = 29n;
         count = 0;
 
-        for (const value of IteratorProxy.from(sequencer2)) {
+        for (const value of Iterator.from(sequencer2)) {
             expect(value).toBe(expectedValue);
 
             expectedValue--;
@@ -60,7 +60,7 @@ describe("Sequence", () => {
 
         sequencer1.reset();
 
-        for (const value of IteratorProxy.from(sequencer1)) {
+        for (const value of Iterator.from(sequencer1)) {
             expect(value).toBe(expectedValue);
 
             expectedValue++;