@d-zero/dealer 1.6.0 → 1.6.2

package/README.md

@@ -54,7 +54,7 @@ async function deal<T extends WeakKey>(
 		setLineHeader: (lineHeader: string) => void,
 		push: (...items: T[]) => Promise<void>,
 	) => Promise<() => void | Promise<void>> | (() => void | Promise<void>),
-	options?: DealOptions,
+	options?: DealOptions<T>,
 ): Promise<void>;
 ```
 
@@ -83,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;
@@ -135,7 +135,7 @@ type DealHeader = (
 #### コンストラクタ
 
 ```ts
-constructor(items: readonly T[], options?: DealerOptions)
+constructor(items: readonly T[], options?: DealerOptions<T>)
 ```
 
 - `items`: 処理対象のアイテム

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, push: (...items: T[]) => Promise<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/dealer.d.ts

@@ -1,11 +1,11 @@
 import type { ProcessInitializer } from './types.js';
-export interface DealerOptions {
+export interface DealerOptions<T = unknown> {
     limit?: number;
-    onPush?: (item: never) => boolean;
+    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;

package/dist/display.js

@@ -1,8 +1,9 @@
-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 RESET = '\u001B[0m';
+const CURSOR_UP = (n) => `\u001B[${n}A`;
+const CURSOR_TO_COL0 = '\u001B[G';
+const ERASE_DOWN = '\u001B[0J';
 const animationPresets = {
     earth: [2, '🌏', '🌍', '🌎'],
     dots: [5, '.  ', '.. ', '...'],
@@ -12,10 +13,13 @@ const animationPresets = {
 };
 export class Display {
     #animations;
+    #closed = false;
     #coundDownMap = new Map();
     #debugMessages = [];
     #frameInterval;
     #lastWroteLineNum = 0;
+    #resizeHandler = null;
+    #sigintHandler = null;
     #stack = null;
     #startTime = Date.now();
     #timer = null;
@@ -28,18 +32,34 @@ export class Display {
         const fps = options?.fps ?? 30;
         this.#frameInterval = 1000 / fps;
         this.#verbose = options?.verbose ?? false;
-        process.stdout.on('resize', () => this.#resize());
+        this.#resizeHandler = () => this.#resize();
+        process.stdout.on('resize', this.#resizeHandler);
+        if (!this.#verbose) {
+            this.#sigintHandler = () => {
+                this.close();
+                process.exit(130);
+            };
+            process.on('SIGINT', this.#sigintHandler);
+        }
     }
     close() {
-        if (this.#verbose) {
+        if (this.#verbose || this.#closed) {
             return;
         }
+        this.#closed = true;
         if (this.#timer) {
             clearTimeout(this.#timer);
             this.#timer = null;
         }
         this.#write();
-        process.stdin.setRawMode(false);
+        if (this.#resizeHandler) {
+            process.stdout.off('resize', this.#resizeHandler);
+            this.#resizeHandler = null;
+        }
+        if (this.#sigintHandler) {
+            process.off('SIGINT', this.#sigintHandler);
+            this.#sigintHandler = null;
+        }
         this.#lastWroteLineNum = 0;
         this.#stack = null;
     }
@@ -59,16 +79,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 +124,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/dist/lanes.js

@@ -1,4 +1,5 @@
 import { Display } from './display.js';
+const RESET = '\u001B[0m';
 export class Lanes {
     #display;
     #header;
@@ -45,7 +46,7 @@ export class Lanes {
     }
     update(id, log) {
         if (this.#verbose) {
-            this.#display.write(this.#header + ' ' + log);
+            this.#display.write(`${RESET}${this.#header}${RESET} ${log}`);
             return;
         }
         this.#logs.set(id, log);
@@ -59,7 +60,7 @@ export class Lanes {
         logs.sort(this.#sort);
         const messages = logs.map(([, message]) => `${this.#indent}${message}`);
         if (this.#header) {
-            messages.unshift(...this.#header.split('\n'));
+            messages.unshift(...this.#header.split('\n').map((line) => `${RESET}${line}${RESET}`));
         }
         this.#display.write(...messages);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@d-zero/dealer",
-	"version": "1.6.0",
+	"version": "1.6.2",
 	"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.20.0",
 		"ansi-colors": "4.1.3"
 	},
-	"gitHead": "a6d7b36c485bbc0782375c6e1ad0d0606f423e97"
+	"gitHead": "1830747a6fee6194c897d54966c25ada5237645e"
 }