@d-zero/dealer 1.1.0 → 1.3.0

package/dist/count-down-function-parser.d.ts

@@ -1,3 +1,7 @@
+/**
+ *
+ * @param text
+ */
 export declare function countDownFunctionParser(text: string): {
     id: string;
     time: number;

package/dist/count-down-function-parser.js

@@ -1,3 +1,7 @@
+/**
+ *
+ * @param text
+ */
 export function countDownFunctionParser(text) {
     const matched = /%countdown\((?<time>\d+)\s*,\s*(?<id>[^\s),]+)(?:\s*,\s*(?<unit>m?s))?\)%/i.exec(text);
     if (!matched) {

package/dist/deal.d.ts

@@ -1,8 +1,14 @@
 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>> | (() => void | Promise<void>), options?: Options): Promise<void>;
-export {};
+export type DealHeader = (progress: number, done: number, total: number, limit: number) => string;
+/**
+ *
+ * @param items
+ * @param setup
+ * @param options
+ */
+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/deal.js

@@ -1,6 +1,12 @@
 import { Dealer } from './dealer.js';
 import { Lanes } from './lanes.js';
 const DEBUG_ID = Number.MIN_SAFE_INTEGER;
+/**
+ *
+ * @param items
+ * @param setup
+ * @param options
+ */
 export async function deal(items, setup, options) {
     const dealer = new Dealer(items, options);
     const lanes = new Lanes(options);

package/dist/dealer.js

@@ -1,13 +1,13 @@
 export class Dealer {
+    #debug = () => { };
     #done = new WeakSet();
     #doneCount = 0;
+    #finish = () => { };
     #items;
     #limit;
+    #progress = () => { };
     #starts = new WeakMap();
     #workers = new Set();
-    #debug = () => { };
-    #finish = () => { };
-    #progress = () => { };
     constructor(items, options) {
         this.#items = items;
         this.#limit = options?.limit ?? 10;

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/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

@@ -5,35 +5,51 @@ export class Lanes {
     #indent = '';
     #logs = new Map();
     #sort = ([a], [b]) => a - b;
+    #verbose;
     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,9 @@
 import type { Animations } from './types.js';
-export declare function riffle(text: string, elapsed: number, animations: Animations): string;
+/**
+ *
+ * @param text
+ * @param elapsed
+ * @param animations
+ * @param hidden
+ */
+export declare function riffle(text: string, elapsed: number, animations: Animations, hidden?: boolean): string;

package/dist/riffle.js

@@ -1,5 +1,16 @@
-export function riffle(text, elapsed, animations) {
+/**
+ *
+ * @param text
+ * @param elapsed
+ * @param animations
+ * @param hidden
+ */
+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.1.0",
+	"version": "1.3.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": "e8f65086bf7c316dda6667f1173da8585a5ef19c"
+	"gitHead": "e4fd17857e31022d121527b00fd7f009dbdb2142"
 }

package/dist/animate.d.ts

@@ -1 +0,0 @@
-export declare function animate(chars: string[], time: number): string | undefined;

package/dist/animate.js

@@ -1,3 +0,0 @@
-export function animate(chars, time) {
-    return chars[time % chars.length];
-}

package/dist/logger.d.ts

@@ -1,14 +0,0 @@
-import type { Animations, FPS } from './types.js';
-interface Options {
-    animations?: Animations;
-    fps?: FPS;
-}
-export declare class Logger {
-    #private;
-    constructor(options?: Options);
-    clear(): void;
-    close(): void;
-    verboseMode(): void;
-    write(...logs: string[]): void;
-}
-export {};

package/dist/logger.js

@@ -1,111 +0,0 @@
-import readline from 'node:readline';
-import c from 'ansi-colors';
-import { countDownFunctionParser } from './count-down-function-parser.js';
-import { riffle } from './riffle.js';
-import { writeVerbosely } from './write-verbosely.js';
-const animationPresets = {
-    earth: ['🌏', '🌍', '🌎'],
-    dots: ['.  ', '.. ', '...'],
-    block: ['▘', '▀', '▜', '▉', '▟', '▃', '▖', ' '],
-    propeller: ['\\', '|', '/', '-'],
-};
-export class Logger {
-    #animations;
-    #coundDownMap = new Map();
-    #frameInterval;
-    #lastWroteLineNum = 0;
-    #stack = null;
-    #time = 0;
-    #timer = null;
-    #verbose = false;
-    constructor(options) {
-        this.#animations = {
-            ...animationPresets,
-            ...options?.animations,
-        };
-        const fps = options?.fps ?? 30;
-        this.#frameInterval = 1000 / fps;
-        process.stdout.on('resize', () => this.#resize());
-    }
-    clear() {
-        if (this.#verbose) {
-            return;
-        }
-        const cursorY = this.#lastWroteLineNum * -1;
-        readline.moveCursor(process.stdout, 0, cursorY);
-        readline.cursorTo(process.stdout, 0);
-    }
-    close() {
-        if (this.#verbose) {
-            return;
-        }
-        // Writing last stack
-        if (this.#timer) {
-            clearTimeout(this.#timer);
-            this.#timer = null;
-        }
-        this.#write();
-        this.#time = 0;
-        this.#lastWroteLineNum = 0;
-        this.#stack = null;
-    }
-    verboseMode() {
-        this.#verbose = true;
-    }
-    write(...logs) {
-        if (this.#verbose) {
-            writeVerbosely(...logs);
-            return;
-        }
-        this.#stack = logs;
-        if (this.#timer) {
-            return;
-        }
-        this.#run();
-    }
-    #countDown(text) {
-        const parsed = countDownFunctionParser(text);
-        if (!parsed) {
-            return text;
-        }
-        const { id, time, placeholder, unit } = parsed;
-        const currentTime = this.#coundDownMap.get(id);
-        let displayTimeMS;
-        if (currentTime == null) {
-            this.#coundDownMap.set(id, Date.now());
-            displayTimeMS = time;
-        }
-        else {
-            const elapsedTime = Date.now() - currentTime;
-            displayTimeMS = Math.max(time - elapsedTime, 0);
-        }
-        const displayTime = unit === 's' ? Math.round(displayTimeMS / 1000) : displayTimeMS;
-        return text.replace(placeholder, `${displayTime}`);
-    }
-    #resize() {
-        if (this.#verbose) {
-            return;
-        }
-        this.#write();
-    }
-    #run() {
-        this.#time += 1;
-        this.#timer = setTimeout(() => this.#run(), this.#frameInterval);
-        this.#write();
-    }
-    #write() {
-        if (!this.#stack) {
-            return;
-        }
-        this.clear();
-        const reset = c.reset('');
-        for (const line of this.#stack) {
-            readline.clearLine(process.stdout, 0);
-            let text = riffle(line, this.#time, this.#animations ?? {});
-            text = this.#countDown(text);
-            const displayText = text.slice(0, process.stdout.columns);
-            process.stdout.write(`${reset}${displayText}${reset}\n`);
-        }
-        this.#lastWroteLineNum = this.#stack.length;
-    }
-}

package/dist/write-verbosely.d.ts

@@ -1 +0,0 @@
-export declare function writeVerbosely(...lines: string[]): void;

package/dist/write-verbosely.js

@@ -1,3 +0,0 @@
-export function writeVerbosely(...lines) {
-    process.stdout.write(lines.map((line) => line.trim()).join('\n'));
-}