@fgv/ts-utils 4.3.0 → 4.4.0

package/CHANGELOG.json

@@ -1,6 +1,12 @@
 {
   "name": "@fgv/ts-utils",
   "entries": [
+    {
+      "version": "4.4.0",
+      "tag": "@fgv/ts-utils_v4.4.0",
+      "date": "Sat, 01 Feb 2025 17:13:10 GMT",
+      "comments": {}
+    },
     {
       "version": "4.3.0",
       "tag": "@fgv/ts-utils_v4.3.0",

package/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log - @fgv/ts-utils
 
-This log was last generated on Thu, 30 Jan 2025 00:35:17 GMT and should not be manually modified.
+This log was last generated on Sat, 01 Feb 2025 17:13:10 GMT and should not be manually modified.
+
+## 4.4.0
+Sat, 01 Feb 2025 17:13:10 GMT
+
+_Version update only_
 
 ## 4.3.0
 Thu, 30 Jan 2025 00:35:17 GMT

package/dist/ts-utils.d.ts

@@ -280,16 +280,22 @@ declare class Collectible<TKEY extends string = string, TINDEX extends number =
      */
     get index(): TINDEX | undefined;
     protected _index: TINDEX | undefined;
+    protected readonly _indexConverter?: Validator<TINDEX, unknown> | Converter<TINDEX, unknown>;
     /**
      * Constructs a new {@link Collections.Collectible | Collectible} instance.
-     * @param key - The key of the item to be collected.
-     * @param index - Optional index of the item to be collected.
+     * @param params - Required parameters for constructing the collectible.
      */
-    constructor(key: TKEY, index?: TINDEX);
+    constructor(params: ICollectibleConstructorParams<TKEY, TINDEX>);
+    /**
+     * Creates a new {@link Collections.Collectible | Collectible} instance from the supplied parameters.
+     * @param params - Required parameters for constructing the collectible.
+     * @returns `Success` with the new collectible if successful, or `Failure` with an error message if not.
+     */
+    static createCollectible<TKEY extends string = string, TINDEX extends number = number>(params: ICollectibleConstructorParams<TKEY, TINDEX>): Result<Collectible<TKEY, TINDEX>>;
     /**
      * {@link Collections.ICollectible.setIndex}
      */
-    setIndex(index: TINDEX): Result<TINDEX>;
+    setIndex(index: number): Result<TINDEX>;
 }
 
 /**
@@ -311,16 +317,23 @@ declare namespace Collections {
         ICollectible,
         CollectibleFactory,
         CollectibleFactoryCallback,
+        ICollectibleConstructorParamsWithIndex,
+        ICollectibleConstructorParamsWithConverter,
+        ICollectibleConstructorParams,
         Collectible,
+        CollectorResultDetail,
+        IReadOnlyCollector,
         ICollector,
         ISimpleCollector,
         IConvertingCollector,
         ICollectorConstructorParams,
         Collector,
+        IReadOnlyCollectorConverter,
         ICollectorConverterCreateParams,
         CollectorConverter,
         ISimpleCollectorCreateParams,
         SimpleCollector,
+        IReadOnlyConvertingCollector,
         IConvertingCollectorConstructorParams,
         ConvertingCollector,
         KeyValueEntry,
@@ -385,17 +398,33 @@ export declare class Collector<TKEY extends string = string, TINDEX extends numb
      */
     get(key: TKEY): DetailedResult<TITEM, ResultMapResultDetail>;
     /**
-     * {@inheritdoc ICollector.getAt}
+     * {@inheritdoc Collections.IReadOnlyCollector.getAt}
+     */
+    getAt(index: number): Result<TITEM>;
+    /**
+     * {@inheritdoc ICollector.(add:1)}
+     */
+    add(key: TKEY, item: TSRC): DetailedResult<TITEM, CollectorResultDetail>;
+    /**
+     * {@inheritdoc ICollector.(add:2)}
      */
-    getAt(index: TINDEX): Result<TITEM>;
+    add(key: TKEY, cb: CollectibleFactoryCallback<TKEY, TINDEX, TITEM>): DetailedResult<TITEM, CollectorResultDetail>;
+    /**
+     * {@inheritdoc ICollector.addItem}
+     */
+    addItem(item: TITEM): DetailedResult<TITEM, CollectorResultDetail>;
     /**
      * {@inheritdoc ICollector.(getOrAdd:1)}
      */
-    getOrAdd(key: TKEY, item: TSRC): DetailedResult<TITEM, ResultMapResultDetail>;
+    getOrAdd(key: TKEY, item: TSRC): DetailedResult<TITEM, CollectorResultDetail>;
     /**
      * {@inheritdoc ICollector.(getOrAdd:2)}
      */
-    getOrAdd(key: TKEY, cb: CollectibleFactoryCallback<TKEY, TINDEX, TITEM>): DetailedResult<TITEM, ResultMapResultDetail>;
+    getOrAdd(key: TKEY, cb: CollectibleFactoryCallback<TKEY, TINDEX, TITEM>): DetailedResult<TITEM, CollectorResultDetail>;
+    /**
+     * {@inheritdoc ICollector.getOrAddItem}
+     */
+    getOrAddItem(item: TITEM): DetailedResult<TITEM, CollectorResultDetail>;
     /**
      * {@inheritdoc IReadOnlyResultMap.has}
      */
@@ -403,12 +432,22 @@ export declare class Collector<TKEY extends string = string, TINDEX extends numb
     /**
      * {@inheritdoc ICollector.toReadOnly}
      */
-    toReadOnly(): IReadOnlyResultMap<TKEY, TITEM>;
+    toReadOnly(): IReadOnlyCollector<TKEY, TINDEX, TITEM>;
     /**
      * Gets an iterator over the map entries.
      * @returns An iterator over the map entries.
      */
     [Symbol.iterator](): IterableIterator<KeyValueEntry<TKEY, TITEM>>;
+    /**
+     * A simple factory method for derived classes which directly store the supplied
+     * object.
+     * @param key - The key of the item to create.
+     * @param index - The index of the item to create.
+     * @param item - The source item to create.
+     * @returns `Success` with the created item and a detail of 'success', or
+     * `Failure` with an error message and appropriate detail.
+     */
+    protected static _simpleFactory<TKEY extends string = string, TINDEX extends number = number, TITEM extends ICollectible<TKEY, TINDEX> = ICollectible<TKEY, TINDEX>>(key: TKEY, index: number, item: TITEM): Result<TITEM>;
     protected _isFactoryCB(item: TSRC | CollectibleFactoryCallback<TKEY, TINDEX, TITEM>): item is CollectibleFactoryCallback<TKEY, TINDEX, TITEM>;
 }
 
@@ -426,6 +465,14 @@ declare class CollectorConverter<TKEY extends string = string, TINDEX extends nu
      * @param params - Required parameters for constructing the collector converter.
      */
     constructor(params: ICollectorConverterCreateParams<TKEY, TINDEX, TITEM, TSRC>);
+    /**
+     * {@inheritdoc Collections.Collector.(add:1)}
+     */
+    add(key: string, value: unknown): DetailedResult<TITEM, CollectorResultDetail>;
+    /**
+     * {@inheritdoc Collections.Collector.(add:2)}
+     */
+    add(key: string, factory: ResultMapValueFactory<TKEY, TITEM>): DetailedResult<TITEM, CollectorResultDetail>;
     /**
      * {@inheritdoc Collections.Collector.get}
      */
@@ -433,11 +480,11 @@ declare class CollectorConverter<TKEY extends string = string, TINDEX extends nu
     /**
      * {@inheritdoc Collections.Collector.(getOrAdd:1)}
      */
-    getOrAdd(key: string, value: unknown): DetailedResult<TITEM, ResultMapResultDetail>;
+    getOrAdd(key: string, value: unknown): DetailedResult<TITEM, CollectorResultDetail>;
     /**
      * {@inheritdoc Collections.Collector.(getOrAdd:2)}
      */
-    getOrAdd(key: string, factory: ResultMapValueFactory<TKEY, TITEM>): DetailedResult<TITEM, ResultMapResultDetail>;
+    getOrAdd(key: string, factory: ResultMapValueFactory<TKEY, TITEM>): DetailedResult<TITEM, CollectorResultDetail>;
     /**
      * {@inheritdoc Collections.Collector.has}
      */
@@ -445,7 +492,7 @@ declare class CollectorConverter<TKEY extends string = string, TINDEX extends nu
     /**
      * {@inheritdoc Collections.Collector.toReadOnly}
      */
-    toReadOnly(): IReadOnlyResultMapConverter<TKEY, TITEM>;
+    toReadOnly(): IReadOnlyCollectorConverter<TKEY, TINDEX, TITEM>;
     /**
      * Determines if a value is a {@link Collections.CollectibleFactoryCallback | CollectibleFactoryCallback}.
      * @param value - The value to check.
@@ -456,6 +503,12 @@ declare class CollectorConverter<TKEY extends string = string, TINDEX extends nu
     protected _isCollectibleFactoryCallback(value: unknown | CollectibleFactoryCallback<TKEY, TINDEX, TITEM>): value is CollectibleFactoryCallback<TKEY, TINDEX, TITEM>;
 }
 
+/**
+ * Additional success or failure details for mutating {@link ICollector | Collector} calls.
+ * @public
+ */
+declare type CollectorResultDetail = ResultMapResultDetail | 'invalid-index';
+
 /**
  * A {@link Validation.Constraint | Constraint<T>} function returns
  * `true` if the supplied value meets the constraint. Can return
@@ -743,7 +796,7 @@ declare interface ConverterTraits {
  * property that enables validated use of the underlying map with weakly-typed keys and values.
  * @public
  */
-declare class ConvertingCollector<TKEY extends string = string, TINDEX extends number = number, TITEM extends ICollectible<TKEY, TINDEX> = ICollectible<TKEY, TINDEX>, TSRC = TITEM> extends Collector<TKEY, TINDEX, TITEM, TSRC> {
+export declare class ConvertingCollector<TKEY extends string = string, TINDEX extends number = number, TITEM extends ICollectible<TKEY, TINDEX> = ICollectible<TKEY, TINDEX>, TSRC = TITEM> extends Collector<TKEY, TINDEX, TITEM, TSRC> {
     /**
      * A {@link Collections.CollectorConverter | CollectorConverter} which validates keys and values
      * before inserting them into this collector.
@@ -763,20 +816,12 @@ declare class ConvertingCollector<TKEY extends string = string, TINDEX extends n
      * @returns {@link Success} with the new collector if successful, {@link Failure} otherwise.
          */
      static createConvertingCollector<TKEY extends string = string, TINDEX extends number = number, TITEM extends ICollectible<TKEY, TINDEX> = ICollectible<TKEY, TINDEX>, TSRC = TITEM>(params: IConvertingCollectorConstructorParams<TKEY, TINDEX, TITEM, TSRC>): Result<ConvertingCollector<TKEY, TINDEX, TITEM, TSRC>>;
-     /**
-      * {@inheritdoc Collections.Collector.(getOrAdd:1)}
-      */
-     getOrAdd(key: TKEY, item: TSRC): DetailedResult<TITEM, ResultMapResultDetail>;
-     /**
-      * {@inheritdoc Collections.Collector.(getOrAdd:2)}
-      */
-     getOrAdd(key: TKEY, cb: CollectibleFactoryCallback<TKEY, TINDEX, TITEM>): DetailedResult<TITEM, ResultMapResultDetail>;
      /**
       * Gets a read-only version of this collector as a
       * {@link Collections.IReadOnlyConvertingResultMap | read-only map}.
       * @returns
       */
-     toReadOnly(): IReadOnlyConvertingResultMap<TKEY, TITEM>;
+     toReadOnly(): IReadOnlyConvertingCollector<TKEY, TINDEX, TITEM>;
     }
 
     /**
@@ -802,26 +847,6 @@ declare class ConvertingCollector<TKEY extends string = string, TINDEX extends n
          * @public
          */
         static createConvertingResultMap<TK extends string = string, TV = unknown>(params: IConvertingResultMapConstructorParams<TK, TV>): Result<ConvertingResultMap<TK, TV>>;
-        /**
-         * {@inheritdoc Collections.ResultMap.add}
-         */
-        add(key: TK, value: TV): DetailedResult<TV, ResultMapResultDetail>;
-        /**
-         * {@inheritdoc Collections.ResultMap.(getOrAdd:1)}
-         */
-        getOrAdd(key: TK, value: TV): DetailedResult<TV, ResultMapResultDetail>;
-        /**
-         * {@inheritdoc Collections.ResultMap.(getOrAdd:2)}
-         */
-        getOrAdd(key: TK, factory: ResultMapValueFactory<TK, TV>): DetailedResult<TV, ResultMapResultDetail>;
-        /**
-         * {@inheritdoc Collections.ResultMap.set}
-         */
-        set(key: TK, value: TV): DetailedResult<TV, ResultMapResultDetail>;
-        /**
-         * {@inheritdoc Collections.ResultMap.update}
-         */
-        update(key: TK, value: TV): DetailedResult<TV, ResultMapResultDetail>;
         /**
          * Gets a read-only version of this map.
          */
@@ -1514,10 +1539,37 @@ declare class ConvertingCollector<TKEY extends string = string, TINDEX extends n
      * An item that can be collected by some {@link Collector | Collector}.
      * @public
      */
-    declare interface ICollectible<TKEY extends string = string, TINDEX extends number = number> {
+    export declare interface ICollectible<TKEY extends string = string, TINDEX extends number = number> {
         readonly key: TKEY;
         readonly index: TINDEX | undefined;
-        setIndex(index: TINDEX): Result<TINDEX>;
+        setIndex(index: number): Result<TINDEX>;
+    }
+
+    /**
+     * Parameters for constructing a new {@link Collections.ICollectible | ICollectible} instance.
+     * @public
+     */
+    declare type ICollectibleConstructorParams<TKEY extends string = string, TINDEX extends number = number> = ICollectibleConstructorParamsWithIndex<TKEY, TINDEX> | ICollectibleConstructorParamsWithConverter<TKEY, TINDEX>;
+
+    /**
+     * Parameters for constructing a new {@link Collections.ICollectible | ICollectible} instance with an
+     * index converter.
+     * @public
+     */
+    declare interface ICollectibleConstructorParamsWithConverter<TKEY extends string = string, TINDEX extends number = number> {
+        key: TKEY;
+        index?: number;
+        indexConverter: Validator<TINDEX, unknown> | Converter<TINDEX, unknown> | ConverterFunc<TINDEX, undefined>;
+    }
+
+    /**
+     * Parameters for constructing a new {@link Collections.ICollectible | ICollectible} instance with
+     * a defined, strongly-typed index.
+     * @public
+     */
+    declare interface ICollectibleConstructorParamsWithIndex<TKEY extends string = string, TINDEX extends number = number> {
+        key: TKEY;
+        index: TINDEX;
     }
 
     /**
@@ -1525,13 +1577,26 @@ declare class ConvertingCollector<TKEY extends string = string, TINDEX extends n
      * time of addition.  Items are immutable once added.
      * @public
      */
-    export declare interface ICollector<TKEY extends string = string, TINDEX extends number = number, TITEM extends ICollectible<TKEY, TINDEX> = ICollectible<TKEY, TINDEX>, TSRC = TITEM> extends IReadOnlyResultMap<TKEY, TITEM> {
+    export declare interface ICollector<TKEY extends string = string, TINDEX extends number = number, TITEM extends ICollectible<TKEY, TINDEX> = ICollectible<TKEY, TINDEX>, TSRC = TITEM> extends IReadOnlyCollector<TKEY, TINDEX, TITEM> {
         /**
-         * Gets the item at a specified index.
-         * @param index - The index of the item to retrieve.
-         * @returns Returs {@link Success | Success} with the item if it exists, or {@link Failure | Failure} with an error if the index is out of range.
+         * Adds an item to the collector using the default {@link Collections.CollectibleFactory | factory}
+         * at a specified key, failing if an item with that key already exists.
+         * @param key - The key of the item to add.
+         * @param item - The source representation of the item to be added.
+         * @returns Returns {@link Success | Success} with the item if it is added, or {@link Failure | Failure} with
+         * an error if the item cannot be created and indexed.
+         * @public
          */
-        getAt(index: TINDEX): Result<TITEM>;
+        add(key: TKEY, item: TSRC): DetailedResult<TITEM, CollectorResultDetail>;
+        add(key: TKEY, callback: CollectibleFactoryCallback<TKEY, TINDEX>): DetailedResult<TITEM, CollectorResultDetail>;
+        /**
+         * Adds an item to the collector using the default {@link Collections.CollectibleFactory | factory}
+         * at a specified key, failing if an item with that key already exists.
+         * @param item - The item to add.
+         * @returns Returns {@link Success | Success} with the item if it is added, or {@link Failure | Failure} with an
+         * error if the item cannot be created and indexed.
+         */
+        addItem(item: TITEM): DetailedResult<TITEM, CollectorResultDetail>;
         /**
          * Gets an item by key if it exists, or creates a new item and adds it using the default {@link Collections.CollectibleFactory | factory} if not.
          * @param key - The key of the item to retrieve.
@@ -1539,18 +1604,26 @@ declare class ConvertingCollector<TKEY extends string = string, TINDEX extends n
          * @returns Returns {@link Success | Success} with the item if it exists or could be created, or {@link Failure | Failure} with an error if the
          * item cannot be created and indexed.
          */
-        getOrAdd(key: TKEY, item: TSRC): DetailedResult<TITEM, ResultMapResultDetail>;
+        getOrAdd(key: TKEY, item: TSRC): DetailedResult<TITEM, CollectorResultDetail>;
         /**
          * Gets an item by key if it exists, or creates a new item and adds it using the specified {@link Collections.CollectibleFactoryCallback | factory callback} if not.
          * @param key - The key of the item to retrieve.
          * @param callback - The factory callback to create the item if it does not exist.
          * @returns Returns {@link Success | Success} with the item if it exists, or {@link Failure | Failure} with an error if the item is not found.
          */
-        getOrAdd(key: TKEY, callback: CollectibleFactoryCallback<TKEY, TINDEX>): DetailedResult<TITEM, ResultMapResultDetail>;
+        getOrAdd(key: TKEY, callback: CollectibleFactoryCallback<TKEY, TINDEX>): DetailedResult<TITEM, CollectorResultDetail>;
+        /**
+         * Gets an existing item with a key matching that of a supplied item, or adds the supplied
+         * item to the collector if no item with that key exists.
+         * @param item - The item to retrieve or add.
+         * @returns Returns {@link Success | Success} with the item stored in the collector
+         * or {@link Failure | Failure} with an error if the item cannot be created and indexed.
+         */
+        getOrAddItem(item: TITEM): DetailedResult<TITEM, CollectorResultDetail>;
         /**
          * Gets a {@link IReadOnlyResultMap | read-only map} which can access the items in the collector.
          */
-        toReadOnly(): IReadOnlyResultMap<TKEY, TITEM>;
+        toReadOnly(): IReadOnlyCollector<TKEY, TINDEX, TITEM>;
     }
 
     /**
@@ -1626,13 +1699,6 @@ declare class ConvertingCollector<TKEY extends string = string, TINDEX extends n
          * or {@link Conversion.ConverterFunc | converter function}.
          */
         value: Validator<TV, unknown> | Converter<TV, unknown> | ConverterFunc<TV, unknown>;
-        /**
-         * Optional entry {@link Validator | validator}, {@link Converter | converter},
-         * or {@link Conversion.ConverterFunc | converter function}.
-         * If no entry validator is provided, an entry is considered valid if both key and
-         * value are valid.
-         */
-        entry?: Validator<KeyValueEntry<TK, TV>, unknown> | Converter<KeyValueEntry<TK, TV>, unknown> | ConverterFunc<KeyValueEntry<TK, TV>, unknown>;
     }
 
     /**
@@ -1701,6 +1767,55 @@ declare class ConvertingCollector<TKEY extends string = string, TINDEX extends n
      */
     declare type InnerInferredType<TCONV> = TCONV extends Converter<infer TTO> ? TTO extends Array<infer TTOELEM> ? InnerInferredType<TTOELEM>[] : TTO : TCONV extends Array<infer TELEM> ? InnerInferredType<TELEM>[] : TCONV;
 
+    /**
+     * A read-only interface exposing non-mutating methods of a {@link Collections.ICollector | Collector}.
+     * @public
+     */
+    declare interface IReadOnlyCollector<TKEY extends string = string, TINDEX extends number = number, TITEM extends ICollectible<TKEY, TINDEX> = ICollectible<TKEY, TINDEX>> extends IReadOnlyResultMap<TKEY, TITEM> {
+        /**
+         * Gets the item at a specified index.
+         * @param index - The index of the item to retrieve.
+         * @returns Returns {@link Success | Success} with the item if it exists, or {@link Failure | Failure} with an error if the index is out of range.
+         */
+        getAt(index: number): Result<TITEM>;
+    }
+
+    /**
+     * A read-only interface exposing non-mutating methods of a
+     * {@link Collections.CollectorConverter | CollectorConverter}.
+     * @public
+     */
+    declare interface IReadOnlyCollectorConverter<TKEY extends string = string, TINDEX extends number = number, TITEM extends ICollectible<TKEY> = ICollectible<TKEY, TINDEX>> extends IReadOnlyResultMapConverter<TKEY, TITEM> {
+        /**
+         * {@inheritdoc Collections.CollectorConverter.map}
+         */
+        readonly map: IReadOnlyResultMap<TKEY, TITEM>;
+        /**
+         * {@inheritdoc Collections.Collector.get}
+         */
+        get(key: string): DetailedResult<TITEM, ResultMapResultDetail>;
+        /**
+         * {@inheritdoc Collections.Collector.has}
+         */
+        has(key: string): boolean;
+    }
+
+    /**
+     * A read-only interface exposing non-mutating methods of a
+     * {@link Collections.ConvertingCollector | ConvertingCollector}.
+     * @public
+     */
+    declare interface IReadOnlyConvertingCollector<TKEY extends string = string, TINDEX extends number = number, TITEM extends ICollectible<TKEY, TINDEX> = ICollectible<TKEY, TINDEX>> extends IReadOnlyConvertingResultMap<TKEY, TITEM> {
+        /**
+         * {@inheritdoc Collections.ConvertingCollector.converting}
+         */
+        readonly converting: IReadOnlyCollectorConverter<TKEY, TINDEX, TITEM>;
+        /**
+         * {@inheritdoc Collections.Collector.getAt}
+         */
+        readonly getAt: (index: number) => Result<TITEM>;
+    }
+
     /**
      * A read-only interface exposing non-mutating methods of a {@link Collections.ConvertingResultMap | ConvertingResultMap}.
      * @public
@@ -2050,23 +2165,14 @@ declare class ConvertingCollector<TKEY extends string = string, TINDEX extends n
          * Required value {@link Validator | validator} or {@link Converter | converter}.
          */
         readonly value: Validator<TV, unknown> | Converter<TV, unknown>;
-        /**
-         * Optional entry {@link Validator | validator} or {@link Converter | converter}.
-         * If no entry validator is provided, an entry is considered valid if both key and
-         * value are valid.
-         */
-        readonly entry?: Validator<KeyValueEntry<TK, TV>, unknown> | Converter<KeyValueEntry<TK, TV>, unknown>;
         /**
          * Constructs a new key-value validator.
          * @param key - Required key {@link Validator | validator}, {@link Converter | converter},
          * or {@link Conversion.ConverterFunc | converter function}.
          * @param value - Required value {@link Validator | validator}, {@link Converter | converter},
          * or {@link Conversion.ConverterFunc | converter function}.
-         * @param entry - Optional entry {@link Validator | validator}, {@link Converter | converter},
-         * or {@link Conversion.ConverterFunc | converter function}..  If no entry validator is provided,
-         * an entry is considered valid if both key and value are valid.
          */
-        constructor({ key, value, entry }: IKeyValueConverterConstructorParams<TK, TV>);
+        constructor({ key, value }: IKeyValueConverterConstructorParams<TK, TV>);
         /**
          * Converts a supplied unknown to a valid key value of type `<TK>`.
          * @param key - The unknown to be converted.
@@ -3283,7 +3389,6 @@ declare class ConvertingCollector<TKEY extends string = string, TINDEX extends n
                          * @public
                          */
                      static createSimpleCollector<TITEM extends ICollectible<string, number>>(params?: ISimpleCollectorCreateParams<TITEM>): Result<SimpleCollector<TITEM>>;
-                     private static _factory;
                     }
 
                     /**

package/lib/index.d.ts

@@ -2,9 +2,9 @@ import * as Collections from './packlets/collections';
 import * as Conversion from './packlets/conversion';
 import * as Hash from './packlets/hash';
 import * as Validation from './packlets/validation';
-import { ICollector, Collector, IReadOnlyResultMap, ResultMap, SimpleCollector, ConvertingResultMap } from './packlets/collections';
+import { ICollectible, ICollector, Collector, ConvertingCollector, IReadOnlyResultMap, ResultMap, SimpleCollector, ConvertingResultMap } from './packlets/collections';
 import { Converter, Converters, ObjectConverter, StringConverter } from './packlets/conversion';
 import { Validator, Validators } from './packlets/validation';
 export * from './packlets/base';
-export { Collections, Collector, Conversion, Converter, Converters, Hash, ICollector, IReadOnlyResultMap, ObjectConverter, ResultMap, SimpleCollector, StringConverter, ConvertingResultMap, Validation, Validator, Validators };
+export { Collections, Collector, Conversion, Converter, Converters, ConvertingCollector, Hash, ICollectible, ICollector, IReadOnlyResultMap, ObjectConverter, ResultMap, SimpleCollector, StringConverter, ConvertingResultMap, Validation, Validator, Validators };
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,WAAW,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EACL,UAAU,EACV,SAAS,EACT,kBAAkB,EAClB,SAAS,EACT,eAAe,EACf,mBAAmB,EACpB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAChG,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAE9D,cAAc,iBAAiB,CAAC;AAChC,OAAO,EACL,WAAW,EACX,SAAS,EACT,UAAU,EACV,SAAS,EACT,UAAU,EACV,IAAI,EACJ,UAAU,EACV,kBAAkB,EAClB,eAAe,EACf,SAAS,EACT,eAAe,EACf,eAAe,EACf,mBAAmB,EACnB,UAAU,EACV,SAAS,EACT,UAAU,EACX,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,WAAW,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EACL,YAAY,EACZ,UAAU,EACV,SAAS,EACT,mBAAmB,EACnB,kBAAkB,EAClB,SAAS,EACT,eAAe,EACf,mBAAmB,EACpB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAChG,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAE9D,cAAc,iBAAiB,CAAC;AAChC,OAAO,EACL,WAAW,EACX,SAAS,EACT,UAAU,EACV,SAAS,EACT,UAAU,EACV,mBAAmB,EACnB,IAAI,EACJ,YAAY,EACZ,UAAU,EACV,kBAAkB,EAClB,eAAe,EACf,SAAS,EACT,eAAe,EACf,eAAe,EACf,mBAAmB,EACnB,UAAU,EACV,SAAS,EACT,UAAU,EACX,CAAC"}

package/lib/index.js

@@ -57,7 +57,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Validators = exports.Validation = exports.ConvertingResultMap = exports.StringConverter = exports.SimpleCollector = exports.ResultMap = exports.ObjectConverter = exports.Hash = exports.Converters = exports.Conversion = exports.Collector = exports.Collections = void 0;
+exports.Validators = exports.Validation = exports.ConvertingResultMap = exports.StringConverter = exports.SimpleCollector = exports.ResultMap = exports.ObjectConverter = exports.Hash = exports.ConvertingCollector = exports.Converters = exports.Conversion = exports.Collector = exports.Collections = void 0;
 const Collections = __importStar(require("./packlets/collections"));
 exports.Collections = Collections;
 const Conversion = __importStar(require("./packlets/conversion"));
@@ -68,6 +68,7 @@ const Validation = __importStar(require("./packlets/validation"));
 exports.Validation = Validation;
 const collections_1 = require("./packlets/collections");
 Object.defineProperty(exports, "Collector", { enumerable: true, get: function () { return collections_1.Collector; } });
+Object.defineProperty(exports, "ConvertingCollector", { enumerable: true, get: function () { return collections_1.ConvertingCollector; } });
 Object.defineProperty(exports, "ResultMap", { enumerable: true, get: function () { return collections_1.ResultMap; } });
 Object.defineProperty(exports, "SimpleCollector", { enumerable: true, get: function () { return collections_1.SimpleCollector; } });
 Object.defineProperty(exports, "ConvertingResultMap", { enumerable: true, get: function () { return collections_1.ConvertingResultMap; } });

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,oEAAsD;AAkBpD,kCAAW;AAjBb,kEAAoD;AAmBlD,gCAAU;AAlBZ,sDAAwC;AAqBtC,oBAAI;AApBN,kEAAoD;AA4BlD,gCAAU;AA1BZ,wDAOgC;AAO9B,0FAZA,uBAAS,OAYA;AAQT,0FAlBA,uBAAS,OAkBA;AACT,gGAlBA,6BAAe,OAkBA;AAEf,oGAnBA,iCAAmB,OAmBA;AAjBrB,sDAAgG;AAS9F,2FATkB,uBAAU,OASlB;AAIV,gGAb8B,4BAAe,OAa9B;AAGf,gGAhB+C,4BAAe,OAgB/C;AAfjB,sDAA8D;AAmB5D,2FAnBkB,uBAAU,OAmBlB;AAjBZ,kDAAgC","sourcesContent":["/*\n * Copyright (c) 2020 Erik Fortune\n *\n * Permission is hereby granted, free of charge, to any person obtaining a copy\n * of this software and associated documentation files (the \"Software\"), to deal\n * in the Software without restriction, including without limitation the rights\n * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n * copies of the Software, and to permit persons to whom the Software is\n * furnished to do so, subject to the following conditions:\n *\n * The above copyright notice and this permission notice shall be included in all\n * copies or substantial portions of the Software.\n *\n * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n * SOFTWARE.\n */\n\nimport * as Collections from './packlets/collections';\nimport * as Conversion from './packlets/conversion';\nimport * as Hash from './packlets/hash';\nimport * as Validation from './packlets/validation';\n\nimport {\n  ICollector,\n  Collector,\n  IReadOnlyResultMap,\n  ResultMap,\n  SimpleCollector,\n  ConvertingResultMap\n} from './packlets/collections';\nimport { Converter, Converters, ObjectConverter, StringConverter } from './packlets/conversion';\nimport { Validator, Validators } from './packlets/validation';\n\nexport * from './packlets/base';\nexport {\n  Collections,\n  Collector,\n  Conversion,\n  Converter,\n  Converters,\n  Hash,\n  ICollector,\n  IReadOnlyResultMap,\n  ObjectConverter,\n  ResultMap,\n  SimpleCollector,\n  StringConverter,\n  ConvertingResultMap,\n  Validation,\n  Validator,\n  Validators\n};\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,oEAAsD;AAoBpD,kCAAW;AAnBb,kEAAoD;AAqBlD,gCAAU;AApBZ,sDAAwC;AAwBtC,oBAAI;AAvBN,kEAAoD;AAgClD,gCAAU;AA9BZ,wDASgC;AAO9B,0FAbA,uBAAS,OAaA;AAIT,oGAhBA,iCAAmB,OAgBA;AAMnB,0FApBA,uBAAS,OAoBA;AACT,gGApBA,6BAAe,OAoBA;AAEf,oGArBA,iCAAmB,OAqBA;AAnBrB,sDAAgG;AAS9F,2FATkB,uBAAU,OASlB;AAMV,gGAf8B,4BAAe,OAe9B;AAGf,gGAlB+C,4BAAe,OAkB/C;AAjBjB,sDAA8D;AAqB5D,2FArBkB,uBAAU,OAqBlB;AAnBZ,kDAAgC","sourcesContent":["/*\n * Copyright (c) 2020 Erik Fortune\n *\n * Permission is hereby granted, free of charge, to any person obtaining a copy\n * of this software and associated documentation files (the \"Software\"), to deal\n * in the Software without restriction, including without limitation the rights\n * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n * copies of the Software, and to permit persons to whom the Software is\n * furnished to do so, subject to the following conditions:\n *\n * The above copyright notice and this permission notice shall be included in all\n * copies or substantial portions of the Software.\n *\n * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n * SOFTWARE.\n */\n\nimport * as Collections from './packlets/collections';\nimport * as Conversion from './packlets/conversion';\nimport * as Hash from './packlets/hash';\nimport * as Validation from './packlets/validation';\n\nimport {\n  ICollectible,\n  ICollector,\n  Collector,\n  ConvertingCollector,\n  IReadOnlyResultMap,\n  ResultMap,\n  SimpleCollector,\n  ConvertingResultMap\n} from './packlets/collections';\nimport { Converter, Converters, ObjectConverter, StringConverter } from './packlets/conversion';\nimport { Validator, Validators } from './packlets/validation';\n\nexport * from './packlets/base';\nexport {\n  Collections,\n  Collector,\n  Conversion,\n  Converter,\n  Converters,\n  ConvertingCollector,\n  Hash,\n  ICollectible,\n  ICollector,\n  IReadOnlyResultMap,\n  ObjectConverter,\n  ResultMap,\n  SimpleCollector,\n  StringConverter,\n  ConvertingResultMap,\n  Validation,\n  Validator,\n  Validators\n};\n"]}

package/lib/packlets/collections/collectible.d.ts

@@ -1,4 +1,6 @@
 import { Result } from '../base';
+import { Converter, ConverterFunc } from '../conversion';
+import { Validator } from '../validation';
 /**
  * An item that can be collected by some {@link Collector | Collector}.
  * @public
@@ -6,7 +8,7 @@ import { Result } from '../base';
 export interface ICollectible<TKEY extends string = string, TINDEX extends number = number> {
     readonly key: TKEY;
     readonly index: TINDEX | undefined;
-    setIndex(index: TINDEX): Result<TINDEX>;
+    setIndex(index: number): Result<TINDEX>;
 }
 /**
  * Factory function for creating a new {@link Collections.ICollectible | ICollectible} instance given a key, an index and a source representation
@@ -19,6 +21,30 @@ export type CollectibleFactory<TKEY extends string = string, TINDEX extends numb
  * @public
  */
 export type CollectibleFactoryCallback<TKEY extends string = string, TINDEX extends number = number, TITEM extends ICollectible<TKEY, TINDEX> = ICollectible<TKEY, TINDEX>> = (key: TKEY, index: number) => Result<TITEM>;
+/**
+ * Parameters for constructing a new {@link Collections.ICollectible | ICollectible} instance with
+ * a defined, strongly-typed index.
+ * @public
+ */
+export interface ICollectibleConstructorParamsWithIndex<TKEY extends string = string, TINDEX extends number = number> {
+    key: TKEY;
+    index: TINDEX;
+}
+/**
+ * Parameters for constructing a new {@link Collections.ICollectible | ICollectible} instance with an
+ * index converter.
+ * @public
+ */
+export interface ICollectibleConstructorParamsWithConverter<TKEY extends string = string, TINDEX extends number = number> {
+    key: TKEY;
+    index?: number;
+    indexConverter: Validator<TINDEX, unknown> | Converter<TINDEX, unknown> | ConverterFunc<TINDEX, undefined>;
+}
+/**
+ * Parameters for constructing a new {@link Collections.ICollectible | ICollectible} instance.
+ * @public
+ */
+export type ICollectibleConstructorParams<TKEY extends string = string, TINDEX extends number = number> = ICollectibleConstructorParamsWithIndex<TKEY, TINDEX> | ICollectibleConstructorParamsWithConverter<TKEY, TINDEX>;
 /**
  * Simple implementation of {@link Collections.ICollectible | ICollectible} which does not allow the index to be
  * changed once set.
@@ -34,15 +60,21 @@ export declare class Collectible<TKEY extends string = string, TINDEX extends nu
      */
     get index(): TINDEX | undefined;
     protected _index: TINDEX | undefined;
+    protected readonly _indexConverter?: Validator<TINDEX, unknown> | Converter<TINDEX, unknown>;
     /**
      * Constructs a new {@link Collections.Collectible | Collectible} instance.
-     * @param key - The key of the item to be collected.
-     * @param index - Optional index of the item to be collected.
+     * @param params - Required parameters for constructing the collectible.
+     */
+    constructor(params: ICollectibleConstructorParams<TKEY, TINDEX>);
+    /**
+     * Creates a new {@link Collections.Collectible | Collectible} instance from the supplied parameters.
+     * @param params - Required parameters for constructing the collectible.
+     * @returns `Success` with the new collectible if successful, or `Failure` with an error message if not.
      */
-    constructor(key: TKEY, index?: TINDEX);
+    static createCollectible<TKEY extends string = string, TINDEX extends number = number>(params: ICollectibleConstructorParams<TKEY, TINDEX>): Result<Collectible<TKEY, TINDEX>>;
     /**
      * {@link Collections.ICollectible.setIndex}
      */
-    setIndex(index: TINDEX): Result<TINDEX>;
+    setIndex(index: number): Result<TINDEX>;
 }
 //# sourceMappingURL=collectible.d.ts.map

package/lib/packlets/collections/collectible.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collectible.d.ts","sourceRoot":"","sources":["../../../src/packlets/collections/collectible.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,MAAM,EAAiB,MAAM,SAAS,CAAC;AAEhD;;;GAGG;AACH,MAAM,WAAW,YAAY,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM,EAAE,MAAM,SAAS,MAAM,GAAG,MAAM;IACxF,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC;IACnB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;CACzC;AAED;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,CAC5B,IAAI,SAAS,MAAM,GAAG,MAAM,EAC5B,MAAM,SAAS,MAAM,GAAG,MAAM,EAC9B,KAAK,SAAS,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,EACrE,IAAI,GAAG,KAAK,IACV,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC;AAE5D;;;GAGG;AACH,MAAM,MAAM,0BAA0B,CACpC,IAAI,SAAS,MAAM,GAAG,MAAM,EAC5B,MAAM,SAAS,MAAM,GAAG,MAAM,EAC9B,KAAK,SAAS,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,IACnE,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC;AAEhD;;;;GAIG;AACH,qBAAa,WAAW,CAAC,IAAI,SAAS,MAAM,GAAG,MAAM,EAAE,MAAM,SAAS,MAAM,GAAG,MAAM,CACnF,YAAW,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC;IAErC;;OAEG;IACH,SAAgB,GAAG,EAAE,IAAI,CAAC;IAE1B;;OAEG;IACH,IAAW,KAAK,IAAI,MAAM,GAAG,SAAS,CAErC;IAED,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAErC;;;;OAIG;gBACgB,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,MAAM;IAK5C;;OAEG;IACI,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;CAO/C"}
+{"version":3,"file":"collectible.d.ts","sourceRoot":"","sources":["../../../src/packlets/collections/collectible.ts"],"names":[],"mappings":"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"}