wenay-common2 1.0.61 → 1.0.62

package/lib/Common/async/promiseProgress.d.ts

@@ -0,0 +1,12 @@
+export declare function promiseProgress<T extends any = unknown>(array: ((() => Promise<T>) | (() => any) | Promise<T>)[]): {
+    onOk: (cb: (...data: [data: T, i: number, countOk: number, countError: number, count: number]) => any) => import("../events/Listen3").ListenOff;
+    onError: (cb: (...data: [error: any, i: number, countOk: number, countError: number, count: number]) => any) => import("../events/Listen3").ListenOff;
+    all: () => Promise<any[]>;
+    allSettled: () => Promise<PromiseSettledResult<any>[]>;
+    items: () => Promise<any>[];
+    stats: () => {
+        ok: number;
+        error: number;
+        count: number;
+    };
+};

package/lib/Common/async/promiseProgress.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.promiseProgress = promiseProgress;
+const Listen_1 = require("../events/Listen");
+function promiseProgress(array) {
+    let ok = 0, errorCount = 0;
+    const count = array.length;
+    const okEvents = (0, Listen_1.listen)();
+    const errorEvents = (0, Listen_1.listen)();
+    const emitOk = (data, i) => {
+        ++ok;
+        okEvents[0](data, i, ok, errorCount, count);
+    };
+    const emitError = (error, i) => {
+        ++errorCount;
+        errorEvents[0](error, i, ok, errorCount, count);
+    };
+    const wrap = (promise, i) => promise.then(r => { emitOk(r, i); return r; }).catch((er) => { emitError(er, i); throw er; });
+    const arr = array.map((e, i) => e instanceof Promise ? wrap(e, i) : () => wrap((async () => e())(), i));
+    const started = [];
+    const startAll = () => arr.map((x, i) => started[i] ??= (typeof x === "function" ? x() : x));
+    const onOk = (cb) => okEvents[1].on(cb);
+    const onError = (cb) => errorEvents[1].on(cb);
+    const all = () => Promise.all(startAll());
+    const allSettled = () => Promise.allSettled(startAll());
+    const items = () => startAll();
+    const stats = () => ({ ok, error: errorCount, count });
+    return { onOk, onError, all, allSettled, items, stats };
+}

package/lib/Common/events/Listen3.d.ts

@@ -1,208 +1,127 @@
-export type Listener<T extends any[]> = (...r: T) => void;
+export type Listener<T extends any[]> = (...args: T) => void;
 export type NormalizeTuple<T> = T extends any[] ? T : [T];
-type key = string | symbol;
-type cbClose = () => void;
+export type ListenKey = string | symbol;
+export type ListenOff = () => void;
+type CloseCallback = () => void;
 declare const LISTEN_ON_BRAND: unique symbol;
 export type ListenOn<Z extends any[] = any[]> = ((cb: Listener<Z>, opts?: {
-    cbClose?: cbClose;
-    key?: key;
-}) => (() => void)) & {
+    cbClose?: CloseCallback;
+    key?: ListenKey;
+}) => ListenOff) & {
     readonly [LISTEN_ON_BRAND]: Z;
 };
 export type ListenOnCurrent<Z extends any[] = any[]> = ((cb: Listener<Z>, opts?: {
-    cbClose?: cbClose;
-    key?: key;
+    cbClose?: CloseCallback;
+    key?: ListenKey;
     current?: ListenCurrent<Z>;
-}) => (() => void)) & {
+}) => ListenOff) & {
     readonly [LISTEN_ON_BRAND]: Z;
 };
 export type ListenCurrentProvider<Z extends any[]> = () => Z | undefined;
 export type ListenCurrent<Z extends any[]> = boolean | ListenCurrentProvider<Z>;
+export type ListenCoreApi<T = any> = {
+    emit: Listener<NormalizeTuple<T>>;
+    has(key: ListenKey): boolean;
+    on: ListenOn<NormalizeTuple<T>>;
+    off(keyOrCallback: Listener<NormalizeTuple<T>> | null | ListenKey): void;
+    once(cb: Listener<NormalizeTuple<T>>, opts?: {
+        key?: ListenKey;
+    }): ListenOff;
+    close(): void;
+    count(): number;
+    keys(): ListenKey[];
+};
+export type ListenApi<T = any> = ListenCoreApi<T> & {
+    isRunning(): boolean;
+    run(): void;
+    onClose(cb: CloseCallback): ListenOff;
+};
 export type ListenCoreOptions<T = any> = {
     fast?: boolean;
-    onRemove?: (k: key) => void;
+    onRemove?: (key: ListenKey) => void;
     event?: (type: 'add' | 'remove', count: number, api: ListenCoreApi<T>) => void;
 };
-export type ListenOptions<T> = {
+export type ListenOptions<T = any> = {
     event?: (type: 'add' | 'remove', count: number, api: ListenApi<T>) => void;
     fast?: boolean;
-    addListenClose?: ListenApi<any>;
+    closeOn?: ListenApi<any>;
 };
 export type ListenStoreOptions<T> = ListenOptions<T> & {
     current: ListenCurrentProvider<NormalizeTuple<T>>;
 };
-export declare function getListenByOn(fn: any): any;
-export declare function isListenOn(fn: any): boolean;
-export declare function registerListenOn(on: Function, api: any): void;
 export type ListenOnBrand<Z extends any[] = any[]> = {
     readonly [LISTEN_ON_BRAND]: Z;
 };
-export declare function funcListenCore<T>(options?: ListenCoreOptions<T>): {
-    func: Listener<NormalizeTuple<T>>;
-    has: (k: key) => boolean;
-    on: ListenOn<NormalizeTuple<T>>;
-    off: (k: Listener<NormalizeTuple<T>> | null | key) => void;
-    addListen: (cb: Listener<NormalizeTuple<T>>, opts?: {
-        key?: key;
-    }) => () => void;
-    removeListen: (k: Listener<NormalizeTuple<T>> | null | key) => void;
-    once: (cb: Listener<NormalizeTuple<T>>, opts?: {
-        key?: key;
-    }) => () => void;
-    close: () => void;
-    count: () => number;
-    readonly getAllKeys: key[];
-};
-export type ListenCoreApi<T = any> = ReturnType<typeof funcListenCore<T>>;
-export declare function funcListenCallbackBase<T>(b: (e: Listener<NormalizeTuple<T>>) => (void | (() => void)), options?: ListenOptions<T>): {
-    func: Listener<NormalizeTuple<T>>;
-    isRun: () => boolean;
-    run: () => void;
-    close: () => void;
-    eventClose: (cb: cbClose) => () => void;
-    onClose: (cb: cbClose) => () => void;
-    removeEventClose: (cb: cbClose) => void;
-    on: ListenOn<NormalizeTuple<T>>;
-    off: (k: key | Listener<NormalizeTuple<T>> | null) => void;
-    addListen: (cb: Listener<NormalizeTuple<T>>, opts?: {
-        cbClose?: cbClose;
-        key?: key;
-    }) => () => void;
-    removeListen: (k: Listener<NormalizeTuple<T>> | null | key) => void;
-    once: (cb: Listener<NormalizeTuple<T>>, opts?: {
-        key?: key;
-    }) => () => void;
-    count: () => number;
-    readonly getAllKeys: key[];
-};
-export type ListenApi<T = any> = ReturnType<typeof funcListenCallbackBase<T>>;
-export declare function funcListenCallbackFast<T>(a: (e: (Listener<NormalizeTuple<T>> | null)) => (void | (() => void))): {
-    func: Listener<NormalizeTuple<T>>;
-    isRun: () => boolean;
-    run: () => void;
-    close: () => void;
-    eventClose: (cb: cbClose) => () => void;
-    onClose: (cb: cbClose) => () => void;
-    removeEventClose: (cb: cbClose) => void;
-    on: ListenOn<NormalizeTuple<T>>;
-    off: (k: key | Listener<NormalizeTuple<T>> | null) => void;
-    addListen: (cb: Listener<NormalizeTuple<T>>, opts?: {
-        cbClose?: cbClose;
-        key?: key;
-    }) => () => void;
-    removeListen: (k: key | Listener<NormalizeTuple<T>> | null) => void;
-    once: (cb: Listener<NormalizeTuple<T>>, opts?: {
-        key?: key;
-    }) => () => void;
-    count: () => number;
-    readonly getAllKeys: key[];
-};
-export declare const funcListenCallback: typeof funcListenCallbackBase;
-export declare function UseListen<T>(data?: ListenOptions<T>): readonly [(...a: NormalizeTuple<T>) => void, {
-    func: Listener<NormalizeTuple<T>>;
-    isRun: () => boolean;
-    run: () => void;
-    close: () => void;
-    eventClose: (cb: cbClose) => () => void;
-    onClose: (cb: cbClose) => () => void;
-    removeEventClose: (cb: cbClose) => void;
-    on: ListenOn<NormalizeTuple<T>>;
-    off: (k: key | Listener<NormalizeTuple<T>> | null) => void;
-    addListen: (cb: Listener<NormalizeTuple<T>>, opts?: {
-        cbClose?: cbClose;
-        key?: key;
-    }) => () => void;
-    removeListen: (k: key | Listener<NormalizeTuple<T>> | null) => void;
-    once: (cb: Listener<NormalizeTuple<T>>, opts?: {
-        key?: key;
-    }) => () => void;
-    count: () => number;
-    readonly getAllKeys: key[];
-}];
+export declare function getListenByOn(fn: any): any;
+export declare function isListenOn(fn: any): boolean;
+export declare function registerListenOn(on: Function, api: any): void;
+export declare function createListenCore<T>(options?: ListenCoreOptions<T>): ListenCoreApi<T>;
+export declare function createListen<T>(producer: (emit: Listener<NormalizeTuple<T>>) => (void | ListenOff), options?: ListenOptions<T>): ListenApi<T>;
+export declare function createFastListen<T>(producer: (emit: Listener<NormalizeTuple<T>>) => (void | ListenOff)): ListenApi<T>;
+export declare function listen<T>(options?: ListenOptions<T>): readonly [Listener<NormalizeTuple<T>>, ListenApi<T>];
 export declare function withStoreListen<T>(base: ListenApi<T>, currentProvider: ListenCurrentProvider<NormalizeTuple<T>>): {
     on: ListenOnCurrent<NormalizeTuple<T>>;
-    addListen: (cb: Listener<NormalizeTuple<T>>, opts?: {
-        cbClose?: cbClose;
-        key?: key;
-        current?: ListenCurrent<NormalizeTuple<T>>;
-    }) => () => void;
-    removeListen: (k: Listener<NormalizeTuple<T>> | null | key) => void;
     once: (cb: Listener<NormalizeTuple<T>>, opts?: {
-        key?: key;
+        key?: ListenKey;
         current?: ListenCurrent<NormalizeTuple<T>>;
-    }) => () => void;
-    getAllKeys: key[];
-    func: Listener<NormalizeTuple<T>>;
-    isRun: () => boolean;
-    run: () => void;
-    close: () => void;
-    eventClose: (cb: cbClose) => () => void;
-    onClose: (cb: cbClose) => () => void;
-    removeEventClose: (cb: cbClose) => void;
-    off: (k: key | Listener<NormalizeTuple<T>> | null) => void;
-    count: () => number;
+    }) => ListenOff;
+    emit: Listener<NormalizeTuple<T>>;
+    has(key: ListenKey): boolean;
+    off(keyOrCallback: ListenKey | Listener<NormalizeTuple<T>> | null): void;
+    close(): void;
+    count(): number;
+    keys(): ListenKey[];
+    isRunning(): boolean;
+    run(): void;
+    onClose(cb: CloseCallback): ListenOff;
 };
 export type ListenStoreApi<T> = ReturnType<typeof withStoreListen<T>>;
-export declare function funcListenCallbackStore<T>(b: (e: Listener<NormalizeTuple<T>>) => (void | (() => void)), options: ListenStoreOptions<T>): {
+export declare function createStoreListen<T>(producer: (emit: Listener<NormalizeTuple<T>>) => (void | ListenOff), options: ListenStoreOptions<T>): {
     on: ListenOnCurrent<NormalizeTuple<T>>;
-    addListen: (cb: Listener<NormalizeTuple<T>>, opts?: {
-        cbClose?: cbClose;
-        key?: key;
-        current?: ListenCurrent<NormalizeTuple<T>> | undefined;
-    }) => () => void;
-    removeListen: (k: key | Listener<NormalizeTuple<T>> | null) => void;
     once: (cb: Listener<NormalizeTuple<T>>, opts?: {
-        key?: key;
+        key?: ListenKey;
         current?: ListenCurrent<NormalizeTuple<T>> | undefined;
-    }) => () => void;
-    getAllKeys: key[];
-    func: Listener<NormalizeTuple<T>>;
-    isRun: () => boolean;
-    run: () => void;
-    close: () => void;
-    eventClose: (cb: cbClose) => () => void;
-    onClose: (cb: cbClose) => () => void;
-    removeEventClose: (cb: cbClose) => void;
-    off: (k: key | Listener<NormalizeTuple<T>> | null) => void;
-    count: () => number;
+    }) => ListenOff;
+    emit: Listener<NormalizeTuple<T>>;
+    has(key: ListenKey): boolean;
+    off(keyOrCallback: ListenKey | Listener<NormalizeTuple<T>> | null): void;
+    close(): void;
+    count(): number;
+    keys(): ListenKey[];
+    isRunning(): boolean;
+    run(): void;
+    onClose(cb: CloseCallback): ListenOff;
 };
-export declare function UseListenStore<T>(data: ListenStoreOptions<T>): readonly [(...a: NormalizeTuple<T>) => void, {
+export declare function listenStore<T>(options: ListenStoreOptions<T>): readonly [Listener<NormalizeTuple<T>>, {
     on: ListenOnCurrent<NormalizeTuple<T>>;
-    addListen: (cb: Listener<NormalizeTuple<T>>, opts?: {
-        cbClose?: cbClose;
-        key?: key;
-        current?: ListenCurrent<NormalizeTuple<T>> | undefined;
-    }) => () => void;
-    removeListen: (k: key | Listener<NormalizeTuple<T>> | null) => void;
     once: (cb: Listener<NormalizeTuple<T>>, opts?: {
-        key?: key;
+        key?: ListenKey;
         current?: ListenCurrent<NormalizeTuple<T>> | undefined;
-    }) => () => void;
-    getAllKeys: key[];
-    func: Listener<NormalizeTuple<T>>;
-    isRun: () => boolean;
-    run: () => void;
-    close: () => void;
-    eventClose: (cb: cbClose) => () => void;
-    onClose: (cb: cbClose) => () => void;
-    removeEventClose: (cb: cbClose) => void;
-    off: (k: key | Listener<NormalizeTuple<T>> | null) => void;
-    count: () => number;
+    }) => ListenOff;
+    emit: Listener<NormalizeTuple<T>>;
+    has(key: ListenKey): boolean;
+    off(keyOrCallback: ListenKey | Listener<NormalizeTuple<T>> | null): void;
+    close(): void;
+    count(): number;
+    keys(): ListenKey[];
+    isRunning(): boolean;
+    run(): void;
+    onClose(cb: CloseCallback): ListenOff;
 }];
-export declare function toListen2<T>(full: ListenApi<T>): {
+export declare function toSlimListen<T>(full: ListenApi<T>): {
     on: (cb: Listener<NormalizeTuple<T>>, opts?: {
-        key?: key;
-    }) => () => void;
-    off: (k: Listener<NormalizeTuple<T>> | null | key) => void;
+        key?: ListenKey;
+    }) => ListenOff;
+    off: (keyOrCallback: Listener<NormalizeTuple<T>> | null | ListenKey) => void;
     close: () => void;
     count: () => number;
 };
-export type Listen2<T> = ReturnType<typeof toListen2<T>>;
-export declare function UseListen2<T>(data?: ListenOptions<T>): readonly [(...a: NormalizeTuple<T>) => void, {
+export type SlimListen<T> = ReturnType<typeof toSlimListen<T>>;
+export declare function slimListen<T>(options?: ListenOptions<T>): readonly [Listener<NormalizeTuple<T>>, {
     on: (cb: Listener<NormalizeTuple<T>>, opts?: {
-        key?: key;
-    } | undefined) => () => void;
-    off: (k: key | Listener<NormalizeTuple<T>> | null) => void;
+        key?: ListenKey;
+    } | undefined) => ListenOff;
+    off: (keyOrCallback: ListenKey | Listener<NormalizeTuple<T>> | null) => void;
     close: () => void;
     count: () => number;
 }];