@d-zero/dealer 1.0.2 → 1.2.0

package/dist/deal.d.ts

@@ -1,8 +1,8 @@
 import type { DealerOptions } from './dealer.js';
 import type { LanesOptions } from './lanes.js';
-type Options = DealerOptions & LanesOptions & {
-    header?: (progress: number, done: number, total: number, limit: number) => string;
-    debug?: boolean;
+export type DealOptions = DealerOptions & LanesOptions & {
+    readonly header?: DealHeader;
+    readonly debug?: boolean;
 };
-export declare function deal<T extends WeakKey>(items: readonly T[], setup: (process: T, update: (log: string) => void, index: number) => Promise<() => void | Promise<void>>, options?: Options): Promise<void>;
-export {};
+export type DealHeader = (progress: number, done: number, total: number, limit: number) => string;
+export declare function deal<T extends WeakKey>(items: readonly T[], setup: (process: T, update: (log: string) => void, index: number) => Promise<() => void | Promise<void>> | (() => void | Promise<void>), options?: DealOptions): Promise<void>;

package/dist/display.d.ts

@@ -2,6 +2,7 @@ import type { Animations, FPS } from './types.js';
 interface Options {
     animations?: Animations;
     fps?: FPS;
+    verbose?: boolean;
 }
 export declare class Display {
     #private;

package/dist/display.js

@@ -19,7 +19,7 @@ export class Display {
     #stack = null;
     #startTime = Date.now();
     #timer = null;
-    #verbose = false;
+    #verbose;
     constructor(options) {
         this.#animations = {
             ...animationPresets,
@@ -27,6 +27,7 @@ export class Display {
         };
         const fps = options?.fps ?? 30;
         this.#frameInterval = 1000 / fps;
+        this.#verbose = options?.verbose ?? false;
         process.stdout.on('resize', () => this.#resize());
     }
     close() {
@@ -46,7 +47,9 @@ export class Display {
     }
     write(...logs) {
         if (this.#verbose) {
-            process.stdout.write(logs.map((log) => log.trim()).join('\n'));
+            for (const log of logs) {
+                process.stdout.write(this.#text(log, false) + '\n');
+            }
             return;
         }
         this.#stack = [...this.#debugMessages, ...logs];
@@ -85,6 +88,9 @@ export class Display {
         return text.replace(placeholder, `${displayTime}`);
     }
     #enterFrame() {
+        if (this.#verbose) {
+            return;
+        }
         this.#timer = setTimeout(() => this.#enterFrame(), this.#frameInterval);
         this.#write();
     }
@@ -94,17 +100,25 @@ export class Display {
         }
         this.#write();
     }
+    #text(text, trim = true) {
+        text = riffle(text, Date.now() - this.#startTime, this.#animations, this.#verbose);
+        text = this.#countDown(text);
+        text = text.replaceAll(/\r?\n/g, ' ');
+        if (trim) {
+            text = text.slice(0, process.stdout.columns);
+        }
+        return `${RESET}${text}${RESET}`;
+    }
     #write() {
         if (!this.#stack) {
             return;
         }
         this.#clear();
+        const outputBuffer = [];
         for (const stack of this.#stack) {
-            let text = riffle(stack, Date.now() - this.#startTime, this.#animations);
-            text = this.#countDown(text);
-            const displayText = text.slice(0, process.stdout.columns);
-            process.stdout.write(`${RESET}${displayText}${RESET}\n`);
+            outputBuffer.push(this.#text(stack));
         }
+        process.stdout.write(outputBuffer.join('\n') + '\n');
         this.#lastWroteLineNum = this.#stack.length;
     }
 }

package/dist/get-corsor-pos.d.ts

@@ -0,0 +1 @@
+export declare function getCursorPos(): Promise<[x: number, y: number]>;

package/dist/get-corsor-pos.js

@@ -0,0 +1,16 @@
+export function getCursorPos() {
+    return new Promise((resolve) => {
+        const termcodes = { cursorGetPosition: '\u001B[6n' };
+        process.stdin.setEncoding('utf8');
+        process.stdin.setRawMode(true);
+        const readFx = function () {
+            const buf = process.stdin.read();
+            const str = JSON.stringify(buf); // "\u001b[9;1R"
+            const xy = /\[.*/.exec(str)?.[0].replaceAll(/\[|R"/g, '').split(';');
+            process.stdin.setRawMode(false);
+            resolve([Number(xy?.[1] ?? 0), Number(xy?.[0] ?? 0)]);
+        };
+        process.stdin.once('readable', readFx);
+        process.stdout.write(termcodes.cursorGetPosition);
+    });
+}

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+export type { DealOptions, DealHeader } from './deal.js';
 export { deal } from './deal.js';
 export { Dealer } from './dealer.js';
 export { Lanes } from './lanes.js';

package/dist/lanes.d.ts

@@ -1,11 +1,12 @@
 import type { Animations, FPS } from './types.js';
-type Log = [id: number, message: string];
+type Log = readonly [id: number, message: string];
 type SortFunc = (a: Log, b: Log) => number;
 export type LanesOptions = {
-    animations?: Animations;
-    fps?: FPS;
-    indent?: string;
-    sort?: SortFunc;
+    readonly animations?: Animations;
+    readonly fps?: FPS;
+    readonly indent?: string;
+    readonly sort?: SortFunc;
+    readonly verbose?: boolean;
 };
 export declare class Lanes {
     #private;

package/dist/lanes.js

@@ -4,36 +4,52 @@ export class Lanes {
     #header;
     #indent = '';
     #logs = new Map();
+    #verbose;
     #sort = ([a], [b]) => a - b;
     constructor(options) {
         this.#display = new Display({
             animations: options?.animations,
             fps: options?.fps,
+            verbose: options?.verbose,
         });
         this.#indent = options?.indent ?? this.#indent;
         this.#sort = options?.sort ?? this.#sort;
+        this.#verbose = options?.verbose ?? false;
     }
     close() {
         this.#display.close();
     }
     delete(id) {
+        if (this.#verbose) {
+            return;
+        }
         this.#logs.delete(id);
         this.write();
     }
     header(text) {
         this.#header = text;
+        if (this.#verbose) {
+            return;
+        }
         this.write();
     }
     update(id, log) {
+        if (this.#verbose) {
+            this.#display.write(this.#header + ' ' + log);
+            return;
+        }
         this.#logs.set(id, log);
         this.write();
     }
     write() {
+        if (this.#verbose) {
+            return;
+        }
         const logs = [...this.#logs.entries()];
         logs.sort(this.#sort);
         const messages = logs.map(([, message]) => `${this.#indent}${message}`);
         if (this.#header) {
-            messages.unshift(this.#header);
+            messages.unshift(...this.#header.split('\n'));
         }
         this.#display.write(...messages);
     }

package/dist/riffle.d.ts

@@ -1,2 +1,2 @@
 import type { Animations } from './types.js';
-export declare function riffle(text: string, elapsed: number, animations: Animations): string;
+export declare function riffle(text: string, elapsed: number, animations: Animations, hidden?: boolean): string;

package/dist/riffle.js

@@ -1,5 +1,9 @@
-export function riffle(text, elapsed, animations) {
+export function riffle(text, elapsed, animations, hidden = false) {
     for (const key of Object.keys(animations)) {
+        if (hidden) {
+            text = text.replaceAll(`%${key}%`, '');
+            continue;
+        }
         const animation = animations[key];
         if (!animation) {
             continue;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@d-zero/dealer",
-	"version": "1.0.2",
+	"version": "1.2.0",
 	"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",
@@ -20,10 +20,11 @@
 	],
 	"scripts": {
 		"build": "tsc",
+		"watch": "tsc --watch",
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
 		"ansi-colors": "4.1.3"
 	},
-	"gitHead": "9b4c167933f33237bb688e4835f17b499dc4c48d"
+	"gitHead": "1eb1c03400580040119121e11ffb33acd876fe1b"
 }