@d-zero/dealer 1.5.4 → 1.6.1

package/README.md

@@ -15,13 +15,9 @@ npm install @d-zero/dealer
 ```ts
 import { deal } from '@d-zero/dealer';
 
-await deal(items, {
-	limit: 30,
-	header: (progress, done, total, limit) =>
-		progress === 1
-			? 'HeaderMessage: Done!'
-			: `HeaderMessage: %earth% %dots% %block% %propeller%`,
-	setup: (item, update, index) => {
+await deal(
+	items,
+	(item, update, index, setLineHeader, push) => {
 		item.setup();
 		item.addListeners((state) => {
 			update(`item(${index}): ${state}`);
@@ -32,7 +28,14 @@ await deal(items, {
 			item.cleanup();
 		};
 	},
-});
+	{
+		limit: 30,
+		header: (progress, done, total, limit) =>
+			progress === 1
+				? 'HeaderMessage: Done!'
+				: `HeaderMessage: %earth% %dots% %block% %propeller%`,
+	},
+);
 ```
 
 ### deal関数
@@ -49,8 +52,9 @@ async function deal<T extends WeakKey>(
 		update: (log: string) => void,
 		index: number,
 		setLineHeader: (lineHeader: string) => void,
+		push: (...items: T[]) => Promise<void>,
 	) => Promise<() => void | Promise<void>> | (() => void | Promise<void>),
-	options?: DealOptions,
+	options?: DealOptions<T>,
 ): Promise<void>;
 ```
 
@@ -62,6 +66,7 @@ async function deal<T extends WeakKey>(
   - `update`: ログを更新する関数
   - `index`: アイテムのインデックス
   - `setLineHeader`: ログの各行にプレフィックスを設定する関数
+  - `push`: 実行中にアイテムをキューに追加する関数
   - 戻り値: アイテムを開始する関数
 - `options`: 設定オプション
 
@@ -78,7 +83,7 @@ async function deal<T extends WeakKey>(
 ### DealOptions型
 
 ```ts
-type DealOptions = DealerOptions &
+type DealOptions<T = unknown> = DealerOptions<T> &
 	LanesOptions & {
 		readonly header?: DealHeader;
 		readonly debug?: boolean;
@@ -89,6 +94,7 @@ type DealOptions = DealerOptions &
 #### プロパティ
 
 - `limit?: number`: 同時実行数の制限(デフォルト: 10)
+- `onPush?: (item: T) => boolean`: `push()`時のフィルタ関数。`false`を返すとそのアイテムは拒否される(例: 重複排除)
 - `header?: DealHeader`: 進捗ヘッダーを生成する関数
 - `debug?: boolean`: デバッグログを表示するかどうか
 - `interval?: number | DelayOptions`: 各処理の間隔(ミリ秒またはDelayOptions)
@@ -129,11 +135,12 @@ type DealHeader = (
 #### コンストラクタ
 
 ```ts
-constructor(items: readonly T[], options?: DealerOptions)
+constructor(items: readonly T[], options?: DealerOptions<T>)
 ```
 
 - `items`: 処理対象のアイテム
 - `options.limit`: 同時実行数の制限(デフォルト: 10)
+- `options.onPush`: `push()`時のフィルタ関数
 
 #### メソッド
 
@@ -175,6 +182,16 @@ dealer.progress((progress, done, total, limit) => {
 });
 ```
 
+##### async push(...items: T[])
+
+実行中にアイテムをキューに追加します。追加されたアイテムには`setup()`で設定した初期化関数が自動適用されます。完了後の呼び出しは無視されます。
+
+```ts
+await dealer.push(newItem1, newItem2);
+```
+
+- `items`: 追加するアイテム。`onPush`が設定されている場合、`false`を返したアイテムはスキップされます。
+
 ##### async setup(initializer: ProcessInitializer<T>)
 
 各アイテムの初期化関数を設定します。

package/dist/deal.d.ts

@@ -1,7 +1,7 @@
 import type { DealerOptions } from './dealer.js';
 import type { LanesOptions } from './lanes.js';
 import type { DelayOptions } from '@d-zero/shared/delay';
-export type DealOptions = DealerOptions & LanesOptions & {
+export type DealOptions<T = unknown> = DealerOptions<T> & LanesOptions & {
     readonly header?: DealHeader;
     readonly debug?: boolean;
     readonly interval?: number | DelayOptions;
@@ -41,4 +41,4 @@ export type DealHeader = (progress: number, done: number, total: number, limit:
  * @param options - Configuration options including interval delay
  * @returns Promise that resolves when all items are processed
  */
-export declare function deal<T extends WeakKey>(items: readonly T[], setup: (process: T, update: (log: string) => void, index: number, setLineHeader: (lineHeader: string) => void) => Promise<() => void | Promise<void>> | (() => void | Promise<void>), options?: DealOptions): Promise<void>;
+export declare function deal<T extends WeakKey>(items: readonly T[], setup: (process: T, update: (log: string) => void, index: number, setLineHeader: (lineHeader: string) => void, push: (...items: T[]) => Promise<void>) => Promise<() => void | Promise<void>> | (() => void | Promise<void>), options?: DealOptions<T>): Promise<void>;

package/dist/deal.js

@@ -50,7 +50,8 @@ export async function deal(items, setup, options) {
             lineHeader = header;
         };
         const update = (log) => lanes.update(index, lineHeader + log);
-        const start = await setup(process, update, index, setLineHeader);
+        const push = (...newItems) => dealer.push(...newItems);
+        const start = await setup(process, update, index, setLineHeader, push);
         return async () => {
             await delay(options?.interval ?? 0, (determinedInterval) => {
                 update(`Waiting interval: %countdown(${determinedInterval},${index}_interval)%ms`);

package/dist/dealer.d.ts

@@ -1,13 +1,15 @@
 import type { ProcessInitializer } from './types.js';
-export interface DealerOptions {
+export interface DealerOptions<T = unknown> {
     limit?: number;
+    onPush?: (item: T) => boolean;
 }
 export declare class Dealer<T extends WeakKey> {
     #private;
-    constructor(items: readonly T[], options?: DealerOptions);
+    constructor(items: readonly T[], options?: DealerOptions<T>);
     debug(listener: (log: string) => void): void;
     finish(listener: () => void): void;
     play(): void;
     progress(listener: (progress: number, done: number, total: number, limit: number) => void): void;
+    push(...items: T[]): Promise<void>;
     setup(initializer: ProcessInitializer<T>): Promise<void>;
 }

package/dist/dealer.js

@@ -3,14 +3,20 @@ export class Dealer {
     #done = new WeakSet();
     #doneCount = 0;
     #finish = () => { };
+    #finished = false;
+    #initializer = null;
     #items;
     #limit;
+    #nextIndex = 0;
+    #onPush;
+    #pendingInitCount = 0;
     #progress = () => { };
     #starts = new WeakMap();
     #workers = new Set();
     constructor(items, options) {
-        this.#items = items;
+        this.#items = [...items];
         this.#limit = options?.limit ?? 10;
+        this.#onPush = options?.onPush;
     }
     debug(listener) {
         this.#debug = listener;
@@ -24,18 +30,35 @@ export class Dealer {
     progress(listener) {
         this.#progress = listener;
     }
+    async push(...items) {
+        if (this.#finished) {
+            return;
+        }
+        for (const item of items) {
+            if (this.#onPush && !this.#onPush(item)) {
+                continue;
+            }
+            this.#pendingInitCount++;
+            await this.#initializeAndDispatch(item);
+        }
+    }
     async setup(initializer) {
-        for (const [index, item] of this.#items.entries()) {
-            const start = await initializer(item, index);
+        this.#initializer = initializer;
+        for (const item of this.#items) {
+            const start = await initializer(item, this.#nextIndex++);
             this.#starts.set(item, async () => await start());
         }
-        this.#progress(this.#doneCount / this.#items.length, this.#doneCount, this.#items.length, this.#limit);
+        const total = this.#items.length;
+        this.#progress(total === 0 ? 0 : this.#doneCount / total, this.#doneCount, total, this.#limit);
     }
     #deal() {
-        this.#debug(`Done: ${this.#doneCount}/${this.#items.length} (Limit: ${this.#limit})`);
-        this.#progress(this.#doneCount / this.#items.length, this.#doneCount, this.#items.length, this.#limit);
-        if (this.#doneCount === this.#items.length) {
+        const total = this.#items.length;
+        this.#debug(`Done: ${this.#doneCount}/${total} (Limit: ${this.#limit})`);
+        this.#progress(total === 0 ? 0 : this.#doneCount / total, this.#doneCount, total, this.#limit);
+        if (total > 0 && this.#doneCount === total && this.#pendingInitCount === 0) {
+            this.#finished = true;
             this.#finish();
+            return;
         }
         while (this.#workers.size < this.#limit) {
             const worker = this.#draw();
@@ -67,4 +90,14 @@ export class Dealer {
         }
         return null;
     }
+    async #initializeAndDispatch(item) {
+        if (!this.#initializer) {
+            throw new Error('setup() must be called before push()');
+        }
+        const start = await this.#initializer(item, this.#nextIndex++);
+        this.#starts.set(item, async () => await start());
+        this.#items.push(item);
+        this.#pendingInitCount--;
+        this.#deal();
+    }
 }

package/dist/display.js

@@ -1,8 +1,10 @@
-import readline from 'node:readline';
 import c from 'ansi-colors';
 import { countDownFunctionParser } from './count-down-function-parser.js';
 import { riffle } from './riffle.js';
 const RESET = c.reset('');
+const CURSOR_UP = (n) => `\u001B[${n}A`;
+const CURSOR_TO_COL0 = '\u001B[G';
+const ERASE_DOWN = '\u001B[0J';
 const animationPresets = {
     earth: [2, '🌏', '🌍', '🌎'],
     dots: [5, '.  ', '.. ', '...'],
@@ -39,7 +41,9 @@ export class Display {
             this.#timer = null;
         }
         this.#write();
-        process.stdin.setRawMode(false);
+        if (process.stdin.isTTY) {
+            process.stdin.setRawMode(false);
+        }
         this.#lastWroteLineNum = 0;
         this.#stack = null;
     }
@@ -59,16 +63,6 @@ export class Display {
         }
         this.#enterFrame();
     }
-    #clear() {
-        if (this.#verbose) {
-            return;
-        }
-        for (let i = 0; i < this.#lastWroteLineNum; i++) {
-            readline.moveCursor(process.stdout, 0, -1);
-            readline.cursorTo(process.stdout, 0);
-            readline.clearLine(process.stdout, 0);
-        }
-    }
     #countDown(text) {
         const parsed = countDownFunctionParser(text);
         if (!parsed) {
@@ -114,12 +108,17 @@ export class Display {
         if (!this.#stack) {
             return;
         }
-        this.#clear();
         const outputBuffer = [];
         for (const stack of this.#stack) {
             outputBuffer.push(this.#text(stack));
         }
-        process.stdout.write(outputBuffer.join('\n') + '\n');
+        const content = outputBuffer.join('\n') + '\n';
+        let output = '';
+        if (this.#lastWroteLineNum > 0) {
+            output += CURSOR_UP(this.#lastWroteLineNum) + CURSOR_TO_COL0 + ERASE_DOWN;
+        }
+        output += content;
+        process.stdout.write(output);
         this.#lastWroteLineNum = this.#stack.length;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@d-zero/dealer",
-	"version": "1.5.4",
+	"version": "1.6.1",
 	"description": "A tool that provides an API and CLI for parallel processing of collections and sequential logging to standard output",
 	"author": "D-ZERO",
 	"license": "MIT",
@@ -23,8 +23,8 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@d-zero/shared": "0.18.0",
+		"@d-zero/shared": "0.19.0",
 		"ansi-colors": "4.1.3"
 	},
-	"gitHead": "008ea25926579b061e36c1f5f4f4fc7e15cb782e"
+	"gitHead": "7f90e8c637c40b9abee652eac927a3ca257ef29f"
 }