@daiso-tech/core 0.14.0 → 0.16.0

package/dist/types/cache/implementations/adapters/memory-cache-adapter/memory-cache-adapter.d.ts

@@ -2,7 +2,7 @@
  * @module Cache
  */
 import { type ICacheAdapter } from "../../../../cache/contracts/cache-adapter.contract";
-import type { TimeSpan } from "../../../../utilities/_module";
+import { type OneOrMore, type TimeSpan } from "../../../../utilities/_module";
 /**
  * To utilize the <i>MemoryCacheAdapter</i>, you must create instance of it.
  * @group Adapters
@@ -18,18 +18,24 @@ import type { TimeSpan } from "../../../../utilities/_module";
  * import { MemoryCacheAdapter } from "@daiso-tech/core";
  *
  * const map = new Map<any, any>();
- * const cacheAdapter = new MemoryCacheAdapter(map);
+ * const cacheAdapter = new MemoryCacheAdapter("@cache", map);
  * ```
  */
 export declare class MemoryCacheAdapter<TType> implements ICacheAdapter<TType> {
     private readonly map;
-    constructor(map?: Map<string, TType>);
-    private readonly timeoutIdMap;
+    private readonly group;
+    private readonly timeoutMap;
+    constructor(rootGroup: OneOrMore<string>, map?: Map<string, TType>);
+    private getGroupName;
+    private withPrefix;
+    exists(key: string): Promise<boolean>;
     get(key: string): Promise<TType | null>;
     add(key: string, value: TType, ttl: TimeSpan | null): Promise<boolean>;
     update(key: string, value: TType): Promise<boolean>;
-    put(key: string, value: TType, _ttl: TimeSpan | null): Promise<boolean>;
+    put(key: string, value: TType, ttl: TimeSpan | null): Promise<boolean>;
     remove(key: string): Promise<boolean>;
     increment(key: string, value: number): Promise<boolean>;
-    clear(prefix: string): Promise<void>;
+    clear(): Promise<void>;
+    getGroup(): string;
+    withGroup(group: OneOrMore<string>): ICacheAdapter<TType>;
 }

package/dist/types/cache/implementations/adapters/mongodb-cache-adapter/mongodb-cache-adapter.d.ts

@@ -2,17 +2,17 @@
  * @module Cache
  */
 import { type ICacheAdapter } from "../../../../cache/contracts/cache-adapter.contract";
-import type { TimeSpan } from "../../../../utilities/_module";
-import type { IInitizable } from "../../../../_shared/types";
+import { type TimeSpan, type IInitizable, type OneOrMore } from "../../../../utilities/_module";
 import type { ObjectId } from "mongodb";
 import { type Collection } from "mongodb";
-import type { ISerializer } from "../../../../serializer/contracts/_module";
+import type { ISerde } from "../../../../serde/contracts/_module";
 /**
  * @group Adapters
  */
 export type MongodbCacheDocument = {
     _id: ObjectId;
     key: string;
+    group: string;
     value: number | string;
     expiresAt: Date | null;
 };
@@ -20,36 +20,49 @@ export type MongodbCacheDocument = {
  * @group Adapters
  */
 export type MongodbCacheAdapterSettings = {
-    serializer: ISerializer<string>;
+    serde: ISerde<string>;
+    rootGroup: OneOrMore<string>;
 };
 /**
- * To utilize the <i>MongodbCacheAdapter</i>, you must install the <i>"mongodb"</i> package and supply a <i>{@link ISerializer | string serializer}</i>, such as <i>{@link SuperJsonSerializer}</i>.
+ * To utilize the <i>MongodbCacheAdapter</i>, you must install the <i>"mongodb"</i> package and supply a <i>{@link ISerde | string serde}</i>, such as <i>{@link SuperJsonSerde}</i>.
  * @group Adapters
  * @example
  * ```ts
- * import { MongodbCacheAdapter, SuperJsonSerializer } from "@daiso-tech/core";
+ * import { MongodbCacheAdapter, SuperJsonSerde } from "@daiso-tech/core";
  * import { MongoClient } from "mongodb";
  *
  * const client = new MongoClient("YOUR_MONGODB_CONNECTION_STRING");
  * const database = client.db("database");
  * const cacheCollection = database.collection("cache");
- * const serializer = new SuperJsonSerializer();
+ * const serde = new SuperJsonSerde();
  * const cacheAdapter = new MongodbCacheAdapter(cacheCollection, {
- *   serializer,
+ *   serde,
+ *   rootGroup: "@global"
  * });
+ *
+ * (async () => {
+ *   // You only need to call it once before using the adapter.
+ *   await cacheAdapter.init();
+ *   await cacheAdapter.add("a", 1);
+ * })();
  * ```
  */
 export declare class MongodbCacheAdapter<TType> implements ICacheAdapter<TType>, IInitizable {
     private readonly collection;
     private static isMongodbIncrementError;
-    private serializer;
-    constructor(collection: Collection<MongodbCacheDocument>, { serializer }: MongodbCacheAdapterSettings);
+    private readonly mongodbSerde;
+    private readonly group;
+    private readonly serde;
+    constructor(collection: Collection<MongodbCacheDocument>, { serde, rootGroup }: MongodbCacheAdapterSettings);
+    getGroup(): string;
+    withGroup(group: OneOrMore<string>): ICacheAdapter<TType>;
     init(): Promise<void>;
+    exists(key: string): Promise<boolean>;
     get(key: string): Promise<TType | null>;
     add(key: string, value: TType, ttl: TimeSpan | null): Promise<boolean>;
     update(key: string, value: TType): Promise<boolean>;
     put(key: string, value: TType, ttl: TimeSpan | null): Promise<boolean>;
     remove(key: string): Promise<boolean>;
     increment(key: string, value: number): Promise<boolean>;
-    clear(prefix: string): Promise<void>;
+    clear(): Promise<void>;
 }

package/dist/types/cache/implementations/adapters/no-op-cache-adapter/no-op-cache-adapter.d.ts

@@ -2,17 +2,20 @@
  * @module Cache
  */
 import { type ICacheAdapter } from "../../../../cache/contracts/cache-adapter.contract";
-import type { TimeSpan } from "../../../../utilities/_module";
+import type { OneOrMore, TimeSpan } from "../../../../utilities/_module";
 /**
  * This <i>NoOpCacheAdapter</i> will do nothing and is used for easily mocking {@link ICacheAdapter} for testing.
  * @group Adapters
  */
 export declare class NoOpCacheAdapter<TType> implements ICacheAdapter<TType> {
+    getGroup(): string;
+    withGroup(_group: OneOrMore<string>): ICacheAdapter<TType>;
+    exists(_key: string): Promise<boolean>;
     get(_key: string): Promise<TType | null>;
     add(_key: string, _value: TType, _ttl: TimeSpan | null): Promise<boolean>;
     update(_key: string, _value: TType): Promise<boolean>;
     put(_key: string, _value: TType, _ttl: TimeSpan | null): Promise<boolean>;
     remove(_key: string): Promise<boolean>;
     increment(_key: string, _value: number): Promise<boolean>;
-    clear(_prefix: string): Promise<void>;
+    clear(): Promise<void>;
 }

package/dist/types/cache/implementations/adapters/redis-cache-adapter/redis-cache-adapter.d.ts

@@ -2,42 +2,47 @@
  * @module Cache
  */
 import { type ICacheAdapter } from "../../../../cache/contracts/cache-adapter.contract";
-import type { TimeSpan } from "../../../../utilities/_module";
+import type { OneOrMore } from "../../../../utilities/_module";
+import { type TimeSpan } from "../../../../utilities/_module";
 import { type Redis, type Result } from "ioredis";
-import type { ISerializer } from "../../../../serializer/contracts/_module";
+import type { ISerde } from "../../../../serde/contracts/_module";
 declare module "ioredis" {
     interface RedisCommander<Context> {
-        daiso_storage_increment(key: string, number: string): Result<number, Context>;
-        daiso_storage_put(key: string, value: string): Result<string, Context>;
-        daiso_storage_getOrAdd(key: string, valueToAdd: string): Result<string, Context>;
+        daiso_cache_increment(key: string, number: string): Result<number, Context>;
     }
 }
 /**
  * @group Adapters
  */
 export type RedisCacheAdapterSettings = {
-    serializer: ISerializer<string>;
+    serde: ISerde<string>;
+    rootGroup: OneOrMore<string>;
 };
 /**
- * To utilize the <i>RedisCacheAdapter</i>, you must install the <i>"ioredis"</i> package and supply a <i>{@link ISerializer | string serializer}</i>, such as <i>{@link SuperJsonSerializer}</i>.
+ * To utilize the <i>RedisCacheAdapter</i>, you must install the <i>"ioredis"</i> package and supply a <i>{@link ISerde | string serde}</i>, such as <i>{@link SuperJsonSerde}</i>.
  * @group Adapters
  * @example
  * ```ts
- * import { RedisCacheAdapter, SuperJsonSerializer } from "@daiso-tech/core";
+ * import { RedisCacheAdapter, SuperJsonSerde } from "@daiso-tech/core";
  * import Redis from "ioredis";
  *
  * const client = new Redis("YOUR_REDIS_CONNECTION_STRING");
- * const serializer = new SuperJsonSerializer();
+ * const serde = new SuperJsonSerde();
  * const cacheAdapter = new RedisCacheAdapter(client, {
- *   serializer,
+ *   serde,
+ *   rootGroup: "@global"
  * });
  * ```
  */
 export declare class RedisCacheAdapter<TType> implements ICacheAdapter<TType> {
     private readonly client;
     private static isRedisTypeError;
-    private serializer;
-    constructor(client: Redis, { serializer }: RedisCacheAdapterSettings);
+    private readonly serde;
+    private readonly group;
+    constructor(client: Redis, { serde, rootGroup }: RedisCacheAdapterSettings);
+    private getGroupName;
+    private withPrefix;
+    exists(key: string): Promise<boolean>;
     get(key: string): Promise<TType | null>;
     add(key: string, value: TType, ttl: TimeSpan | null): Promise<boolean>;
     update(key: string, value: TType): Promise<boolean>;
@@ -45,5 +50,7 @@ export declare class RedisCacheAdapter<TType> implements ICacheAdapter<TType> {
     remove(key: string): Promise<boolean>;
     private initIncrementCommand;
     increment(key: string, value: number): Promise<boolean>;
-    clear(prefix: string): Promise<void>;
+    clear(): Promise<void>;
+    getGroup(): string;
+    withGroup(group: OneOrMore<string>): ICacheAdapter<TType>;
 }

package/dist/types/cache/implementations/adapters/sqlite-cache-adapter/sqlite-cache-adapter.d.ts

@@ -1,47 +1,60 @@
 /**
  * @module Cache
  */
-import type { IDeinitizable, IInitizable } from "../../../../_shared/types";
 import { type ICacheAdapter } from "../../../../cache/contracts/cache-adapter.contract";
-import type { ISerializer } from "../../../../serializer/contracts/_module";
-import type { TimeSpan } from "../../../../utilities/_module";
+import type { ISerde } from "../../../../serde/contracts/_module";
+import type { TimeSpan, IInitizable, IDeinitizable, OneOrMore } from "../../../../utilities/_module";
 import { type Database } from "better-sqlite3";
 /**
  * @group Adapters
  */
 export type SqliteStorageAdapterSettings = {
     tableName?: string;
-    serializer: ISerializer<string>;
+    serde: ISerde<string>;
     enableTransactions?: boolean;
     expiredKeysRemovalInterval?: TimeSpan;
     shouldRemoveExpiredKeys?: boolean;
+    rootGroup: OneOrMore<string>;
 };
 /**
- * To utilize the <i>SqliteCacheAdapter</i>, you must install the <i>"better-sqlite3"</i> package and supply a <i>{@link ISerializer | string serializer}</i>, such as <i>{@link SuperJsonSerializer}</i>.
+ * To utilize the <i>SqliteCacheAdapter</i>, you must install the <i>"better-sqlite3"</i> package and supply a <i>{@link ISerde | string serde}</i>, such as <i>{@link SuperJsonSerde}</i>.
  * @group Adapters
  * @example
  * ```ts
- * import { SqliteCacheAdapter, SuperJsonSerializer } from "@daiso-tech/core";
+ * import { SqliteCacheAdapter, SuperJsonSerde } from "@daiso-tech/core";
  * import Sqlite from "better-sqlite3";
  *
  * const client = new Sqlite("local.db");
- * const serializer = new SuperJsonSerializer();
+ * const serde = new SuperJsonSerde();
  * const cacheAdapter = new SqliteCacheAdapter(client, {
- *   serializer,
+ *   serde,
+ *   rootGroup: "@global"
  * });
+ *
+ * (async () => {
+ *   // You only need to call it once before using the adapter.
+ *   await cacheAdapter.init();
+ *   await cacheAdapter.add("a", 1);
+ *
+ *   // Will remove the cache
+ *   await cacheAdapter.deInit();
+ * })();
  * ```
  */
 export declare class SqliteCacheAdapter<TType> implements ICacheAdapter<TType>, IInitizable, IDeinitizable {
     private readonly cacheAdapter;
     constructor(database: Database, settings: SqliteStorageAdapterSettings);
+    getGroup(): string;
+    withGroup(group: OneOrMore<string>): ICacheAdapter<TType>;
     removeExpiredKeys(): Promise<void>;
     deInit(): Promise<void>;
     init(): Promise<void>;
+    exists(key: string): Promise<boolean>;
     get(key: string): Promise<TType | null>;
     add(key: string, value: TType, ttl: TimeSpan | null): Promise<boolean>;
     update(key: string, value: TType): Promise<boolean>;
     put(key: string, value: TType, ttl: TimeSpan | null): Promise<boolean>;
     remove(key: string): Promise<boolean>;
     increment(key: string, value: number): Promise<boolean>;
-    clear(prefix: string): Promise<void>;
+    clear(): Promise<void>;
 }

package/dist/types/cache/implementations/derivables/_module.d.ts

@@ -1,3 +1,2 @@
-export * from "../../../cache/implementations/derivables/base-cache";
 export * from "../../../cache/implementations/derivables/cache";
 export * from "../../../cache/implementations/derivables/cache-factory";

package/dist/types/cache/implementations/derivables/cache-factory.d.ts

@@ -1,8 +1,8 @@
 /**
  * @module Cache
  */
-import type { INamespacedEventBus } from "../../../event-bus/contracts/_module";
-import type { ICacheFactory, INamespacedCache, ICacheAdapter } from "../../../cache/contracts/_module";
+import type { IGroupableEventBus } from "../../../event-bus/contracts/_module";
+import type { ICacheFactory, IGroupableCache, ICacheAdapter } from "../../../cache/contracts/_module";
 import type { TimeSpan } from "../../../utilities/_module";
 /**
  * @group Derivables
@@ -19,13 +19,9 @@ export type CacheFactorySettings<TDrivers extends string = string> = {
      */
     defaultTtl?: TimeSpan;
     /**
-     * In order to listen to events of <i>{@link Cache}</i> class you must pass in <i>{@link INamespacedEventBus}</i>.
+     * In order to listen to events of <i>{@link Cache}</i> class you must pass in <i>{@link IGroupableEventBus}</i>.
      */
-    eventBus?: INamespacedEventBus<any>;
-    /**
-     * You can prefix all keys with a given <i>rootNamespace</i>.
-     */
-    rootNamespace?: string;
+    eventBus?: IGroupableEventBus<any>;
 };
 /**
  * @group Derivables
@@ -40,17 +36,15 @@ export type CacheFactorySettings<TDrivers extends string = string> = {
  *     redis: new RedisCacheAdapter(new Redis()),
  *   },
  *   defaultDriver: "memory",
- *   rootNamespace: "@events"
  * });
  * ```
  */
 export declare class CacheFactory<TDrivers extends string = string, TType = unknown> implements ICacheFactory<TDrivers, TType> {
-    private readonly rootNamespace?;
     private readonly drivers;
     private readonly defaultDriver?;
     private readonly eventBus?;
     private defaultTtl;
     constructor(settings: CacheFactorySettings<TDrivers>);
-    use(driverName?: TDrivers | undefined): INamespacedCache<TType>;
+    use(driverName?: TDrivers | undefined): IGroupableCache<TType>;
     withType<TOutput extends TType = TType>(): ICacheFactory<TDrivers, TOutput>;
 }

package/dist/types/cache/implementations/derivables/cache.d.ts

@@ -1,53 +1,27 @@
 /**
  * @module Cache
  */
+import type { CacheEvents, WithTtlValue } from "../../../cache/contracts/_module";
 import { type ICache, type ICacheAdapter } from "../../../cache/contracts/_module";
-import { type INamespacedCache, type AllCacheEvents } from "../../../cache/contracts/_module";
-import type { OneOrMore } from "../../../_shared/types";
+import { type IGroupableCache } from "../../../cache/contracts/_module";
+import type { AsyncLazyable, GetOrAddValue, OneOrMore } from "../../../utilities/_module";
 import type { TimeSpan } from "../../../utilities/_module";
-import { LazyPromise } from "../../../utilities/_module";
-import type { INamespacedEventBus } from "../../../event-bus/contracts/_module";
-import { BaseCache } from "../../../cache/implementations/derivables/base-cache";
+import type { LazyPromiseSettings } from "../../../async/_module";
+import { LazyPromise } from "../../../async/_module";
+import type { IGroupableEventBus, Listener, SelectEvent, Unsubscribe } from "../../../event-bus/contracts/_module";
 /**
  * @group Derivables
  */
 export type CacheSettings<TType> = {
     /**
-     * You can prefix all keys with a given <i>rootNamespace</i>.
-     * This useful if you want to add multitenancy but still use the same database.
-     * @default {""}
-     * @example
-     * ```ts
-     * import { Cache, MemoryCacheAdapter } from "@daiso-tech/core";
-     *
-     * const memoryCacheAdapter = new MemoryCacheAdapter();
-     * const cacheA = new Cache(memoryCacheAdapter, {
-     *   rootNamespace: "@a"
-     * });
-     * const cacheB = new Cache(memoryCacheAdapter, {
-     *   rootNamespace: "@b"
-     * });
-     *
-     * (async () => {
-     *   await cacheA.add("a", 1);
-     *
-     *   // Will be "a"
-     *   console.log(await cacheA.get("a"));
-     *
-     *   // Will be "null"
-     *   console.log(await cacheB.get("a"));
-     * })();
-     * ```
+     * In order to listen to events of <i>{@link Cache}</i> class you must pass in <i>{@link IGroupableEventBus}</i>.
      */
-    rootNamespace?: OneOrMore<string>;
-    /**
-     * In order to listen to events of <i>{@link Cache}</i> class you must pass in <i>{@link INamespacedEventBus}</i>.
-     */
-    eventBus?: INamespacedEventBus<AllCacheEvents<TType>>;
+    eventBus?: IGroupableEventBus<CacheEvents<TType>>;
     /**
      * You can decide the default ttl value. If null is passed then no ttl will be used by default.
      */
     defaultTtl?: TimeSpan | null;
+    lazyPromiseSettings?: LazyPromiseSettings;
 };
 /**
  * <i>Cache</i> class can be derived from any <i>{@link ICacheAdapter}</i>.
@@ -59,14 +33,14 @@ export type CacheSettings<TType> = {
  * const cache = new Cache(new MemoryCacheAdapter());
  * ```
  */
-export declare class Cache<TType = unknown> extends BaseCache<TType> implements INamespacedCache<TType> {
-    private readonly namespace;
-    private readonly namespacedEventBus;
+export declare class Cache<TType = unknown> implements IGroupableCache<TType> {
+    private readonly groupdEventBus;
     private readonly eventBus;
     private readonly cacheAdapter;
-    private readonly eventAttributes;
     private readonly defaultTtl;
+    private readonly lazyPromiseSettings?;
     constructor(cacheAdapter: ICacheAdapter<any>, settings?: CacheSettings<TType>);
+    private createLayPromise;
     private createKeyFoundEvent;
     private createKeyNotFoundEvent;
     private createKeyAddedEvent;
@@ -75,9 +49,8 @@ export declare class Cache<TType = unknown> extends BaseCache<TType> implements
     private createKeysClearedEvent;
     private createKeyIncrementedEvent;
     private createKeyDecrementedEvent;
-    private keyWithNamespace;
-    withNamespace(namespace: OneOrMore<string>): ICache<TType>;
-    getNamespace(): string;
+    withGroup(group: OneOrMore<string>): ICache<TType>;
+    getGroup(): string;
     get(key: string): LazyPromise<TType | null>;
     add(key: string, value: TType, ttl?: TimeSpan | null): LazyPromise<boolean>;
     update(key: string, value: TType): LazyPromise<boolean>;
@@ -85,4 +58,26 @@ export declare class Cache<TType = unknown> extends BaseCache<TType> implements
     remove(key: string): LazyPromise<boolean>;
     increment(key: string, value?: Extract<TType, number>): LazyPromise<boolean>;
     clear(): LazyPromise<void>;
+    addListener<TEventName extends keyof CacheEvents>(eventName: TEventName, listener: Listener<SelectEvent<CacheEvents, TEventName>>): LazyPromise<void>;
+    addListenerMany<TEventName extends keyof CacheEvents>(eventNames: TEventName[], listener: Listener<SelectEvent<CacheEvents, TEventName>>): LazyPromise<void>;
+    removeListener<TEventName extends keyof CacheEvents>(eventName: TEventName, listener: Listener<SelectEvent<CacheEvents, TEventName>>): LazyPromise<void>;
+    removeListenerMany<TEventName extends keyof CacheEvents>(eventNames: TEventName[], listener: Listener<SelectEvent<CacheEvents, TEventName>>): LazyPromise<void>;
+    listenOnce<TEventName extends keyof CacheEvents>(eventName: TEventName, listener: Listener<SelectEvent<CacheEvents, TEventName>>): LazyPromise<void>;
+    subscribe<TEventName extends keyof CacheEvents>(eventName: TEventName, listener: Listener<SelectEvent<CacheEvents, TEventName>>): LazyPromise<Unsubscribe>;
+    subscribeMany<TEventName extends keyof CacheEvents>(eventNames: TEventName[], listener: Listener<SelectEvent<CacheEvents, TEventName>>): LazyPromise<Unsubscribe>;
+    exists(key: string): LazyPromise<boolean>;
+    existsMany<TKeys extends string>(keys: TKeys[]): LazyPromise<Record<TKeys, boolean>>;
+    missing(key: string): LazyPromise<boolean>;
+    missingMany<TKeys extends string>(keys: TKeys[]): LazyPromise<Record<TKeys, boolean>>;
+    getMany<TKeys extends string>(keys: TKeys[]): LazyPromise<Record<TKeys, TType | null>>;
+    getOr(key: string, defaultValue: AsyncLazyable<TType>): LazyPromise<TType>;
+    getOrMany<TKeys extends string>(keysWithDefaults: Record<TKeys, AsyncLazyable<TType>>): LazyPromise<Record<TKeys, TType>>;
+    getOrFail(key: string): LazyPromise<TType>;
+    addMany<TKeys extends string>(values: Record<TKeys, WithTtlValue<TType>>): LazyPromise<Record<TKeys, boolean>>;
+    updateMany<TKeys extends string>(values: Record<TKeys, TType>): LazyPromise<Record<TKeys, boolean>>;
+    putMany<TKeys extends string>(values: Record<TKeys, WithTtlValue<TType>>): LazyPromise<Record<TKeys, boolean>>;
+    removeMany<TKeys extends string>(keys: TKeys[]): LazyPromise<Record<TKeys, boolean>>;
+    getAndRemove(key: string): LazyPromise<TType | null>;
+    getOrAdd(key: string, valueToAdd: AsyncLazyable<GetOrAddValue<TType>>, ttl?: TimeSpan): LazyPromise<TType>;
+    decrement(key: string, value?: Extract<TType, number>): LazyPromise<boolean>;
 }

package/dist/types/collection/contracts/async-collection.contract.d.ts

@@ -2,8 +2,9 @@
  * @module Collection
  */
 import type { AsyncReduce, CrossJoinResult, AsyncPredicate, AsyncForEach, AsyncMap, AsyncModifier, AsyncTap, AsyncTransform, Comparator, EnsureRecord, EnsureMap } from "../../collection/contracts/_module";
-import type { AsyncLazyable, AsyncIterableValue } from "../../_shared/types";
-import type { LazyPromise, TimeSpan } from "../../utilities/_module";
+import type { AsyncLazyable, AsyncIterableValue } from "../../utilities/_module";
+import type { TimeSpan } from "../../utilities/_module";
+import type { LazyPromise } from "../../async/_module";
 export type AsyncCollapse<TValue> = TValue extends Array<infer TItem> | Iterable<infer TItem> | IAsyncCollection<infer TItem> ? TItem : TValue;
 /**
  * The <i>IAsyncCollection</i> contract offers a fluent and efficient approach to working with {@link AsyncIterable} objects.
@@ -1485,7 +1486,9 @@ export type IAsyncCollection<TInput> = AsyncIterable<TInput> & {
      */
     delay(time: TimeSpan): IAsyncCollection<TInput>;
     /**
-     * The <i>abort</i> method will abort iteration of the collection by passing <i>{@link AbortSignal}</i>.
+     * @experimental
+     * The <I>takeUntilAbort</i> method returns a new collection that will iterate values until aborted by passing in <i>{@link abortSignal | AbortSignal}</i>.
+     * After when aborted, the collection will stop iterating:
      * @example
      * ```ts
      * import { AsyncIterableCollection } from "@daiso-tech/core";;
@@ -1499,8 +1502,9 @@ export type IAsyncCollection<TInput> = AsyncIterable<TInput> & {
      */
     takeUntilAbort(abortSignal: AbortSignal, shouldThrow?: boolean): IAsyncCollection<TInput>;
     /**
-     * The <I>timeout</i> method returns a new collection that will iterate values until the specified time.
-     * After that time, the collection will then stop iterating:
+     * @experimental
+     * The <I>takeUntilTimeout</i> method returns a new collection that will iterate values until the specified time.
+     * After that time, the collection will stop iterating:
      * @example
      * ```ts
      * import { AsyncIterableCollection } from "@daiso-tech/core";;
@@ -1519,7 +1523,7 @@ export type IAsyncCollection<TInput> = AsyncIterable<TInput> & {
      *  .forEach(nbr => console.log(nbr))
      * ```
      */
-    takeUntilTimeout(timeInMs: TimeSpan, shouldThrow?: boolean): IAsyncCollection<TInput>;
+    takeUntilTimeout(time: TimeSpan, shouldThrow?: boolean): IAsyncCollection<TInput>;
     /**
      * The <i>toArray</i> method converts the collection to a new <i>{@link Array}</i>.
      */

package/dist/types/collection/contracts/collection.contract.d.ts

@@ -2,7 +2,7 @@
  * @module Collection
  */
 import type { Comparator, Predicate, ForEach, Map, Modifier, Tap, Transform, Reduce, CrossJoinResult, EnsureMap, EnsureRecord } from "../../collection/contracts/_module";
-import type { Lazyable } from "../../_shared/types";
+import type { Lazyable } from "../../utilities/_module";
 export type Collapse<TValue> = TValue extends Array<infer TItem> | Iterable<infer TItem> | ICollection<infer TItem> ? TItem : TValue;
 /**
  * The <i>ICollection</i> contract offers a fluent and efficient approach to working with {@link Iterable} objects.

package/dist/types/collection/implementations/async-iterable-collection/_shared/_module.d.ts

@@ -4,7 +4,6 @@ export * from "../../../../collection/implementations/async-iterable-collection/
 export * from "../../../../collection/implementations/async-iterable-collection/_shared/async-count-by-iterable";
 export * from "../../../../collection/implementations/async-iterable-collection/_shared/async-cross-join-iterable";
 export * from "../../../../collection/implementations/async-iterable-collection/_shared/async-entries-iterable";
-export * from "../../../../collection/implementations/async-iterable-collection/_shared/async-error-handler-iterable";
 export * from "../../../../collection/implementations/async-iterable-collection/_shared/async-filter-iterable";
 export * from "../../../../collection/implementations/async-iterable-collection/_shared/async-flat-map-iterable";
 export * from "../../../../collection/implementations/async-iterable-collection/_shared/async-group-by-iterable";
@@ -31,3 +30,7 @@ export * from "../../../../collection/implementations/async-iterable-collection/
 export * from "../../../../collection/implementations/async-iterable-collection/_shared/async-update-iterable";
 export * from "../../../../collection/implementations/async-iterable-collection/_shared/async-when-iterable";
 export * from "../../../../collection/implementations/async-iterable-collection/_shared/async-zip-iterable";
+export * from "../../../../collection/implementations/async-iterable-collection/_shared/async-take-until-abort-iterable";
+export * from "../../../../collection/implementations/async-iterable-collection/_shared/async-take-until-timeout-iterable";
+export * from "../../../../collection/implementations/async-iterable-collection/_shared/async-delay-iterable";
+export * from "../../../../collection/implementations/async-iterable-collection/_shared/async-retry-iterable";

package/dist/types/collection/implementations/async-iterable-collection/_shared/async-chunk-iterable.d.ts

@@ -2,7 +2,7 @@
  * @module Collection
  */
 import { type IAsyncCollection } from "../../../../collection/contracts/_module";
-import { type AsyncIterableValue } from "../../../../_shared/types";
+import { type AsyncIterableValue } from "../../../../utilities/_module";
 /**
  * @internal
  */

package/dist/types/collection/implementations/async-iterable-collection/_shared/async-chunk-while-iterable.d.ts

@@ -2,7 +2,7 @@
  * @module Collection
  */
 import { type AsyncPredicate, type IAsyncCollection } from "../../../../collection/contracts/_module";
-import { type AsyncIterableValue } from "../../../../_shared/types";
+import { type AsyncIterableValue } from "../../../../utilities/_module";
 /**
  * @internal
  */

package/dist/types/collection/implementations/async-iterable-collection/_shared/async-cross-join-iterable.d.ts

@@ -3,7 +3,7 @@
  */
 import type { CrossJoinResult } from "../../../../collection/contracts/_module";
 import { type IAsyncCollection } from "../../../../collection/contracts/_module";
-import { type AsyncIterableValue } from "../../../../_shared/types";
+import { type AsyncIterableValue } from "../../../../utilities/_module";
 /**
  * @internal
  */

package/dist/types/collection/implementations/async-iterable-collection/_shared/async-delay-iterable.d.ts

@@ -0,0 +1,13 @@
+/**
+ * @module Collection
+ */
+import type { TimeSpan } from "../../../../utilities/_module";
+/**
+ * @internal
+ */
+export declare class AsyncDelayIterable<TValue> implements AsyncIterable<TValue> {
+    private readonly iterable;
+    private readonly time;
+    constructor(iterable: AsyncIterable<TValue>, time: TimeSpan);
+    [Symbol.asyncIterator](): AsyncIterator<TValue>;
+}

package/dist/types/collection/implementations/async-iterable-collection/_shared/async-entries-iterable.d.ts

@@ -1,7 +1,7 @@
 /**
  * @module Collection
  */
-import { type AsyncIterableValue } from "../../../../_shared/types";
+import { type AsyncIterableValue } from "../../../../utilities/_module";
 /**
  * @internal
  */

package/dist/types/collection/implementations/async-iterable-collection/_shared/async-group-by-iterable.d.ts

@@ -2,7 +2,7 @@
  * @module Collection
  */
 import { type AsyncMap, type IAsyncCollection } from "../../../../collection/contracts/_module";
-import { type AsyncIterableValue } from "../../../../_shared/types";
+import { type AsyncIterableValue } from "../../../../utilities/_module";
 /**
  * @internal
  */

package/dist/types/collection/implementations/async-iterable-collection/_shared/async-insert-after-iterable.d.ts

@@ -2,7 +2,7 @@
  * @module Collection
  */
 import { type AsyncPredicate, type IAsyncCollection } from "../../../../collection/contracts/_module";
-import { type AsyncIterableValue } from "../../../../_shared/types";
+import { type AsyncIterableValue } from "../../../../utilities/_module";
 /**
  * @internal
  */

package/dist/types/collection/implementations/async-iterable-collection/_shared/async-insert-before-iterable.d.ts

@@ -2,7 +2,7 @@
  * @module Collection
  */
 import { type AsyncPredicate, type IAsyncCollection } from "../../../../collection/contracts/_module";
-import { type AsyncIterableValue } from "../../../../_shared/types";
+import { type AsyncIterableValue } from "../../../../utilities/_module";
 /**
  * @internal
  */

package/dist/types/collection/implementations/async-iterable-collection/_shared/async-merge-iterable.d.ts

@@ -1,13 +1,12 @@
 /**
  * @module Collection
  */
-import { type AsyncIterableValue } from "../../../../_shared/types";
+import { type AsyncIterableValue } from "../../../../utilities/_module";
 /**
  * @internal
  */
-export declare class AsyncMergeIterable<TInput, TExtended> implements AsyncIterable<TInput | TExtended> {
-    private iterableA;
-    private iterableB;
-    constructor(iterableA: AsyncIterableValue<TInput>, iterableB: AsyncIterableValue<TExtended>);
-    [Symbol.asyncIterator](): AsyncIterator<TInput | TExtended>;
+export declare class AsyncMergeIterable<TInput> implements AsyncIterable<TInput> {
+    private readonly iterables;
+    constructor(iterables: AsyncIterableValue<AsyncIterableValue<TInput>>);
+    [Symbol.asyncIterator](): AsyncIterator<TInput>;
 }