@nu-art/commando 0.300.8 → 0.400.1

package/shell/interactive/CommandoInteractive.d.ts

@@ -1,6 +1,7 @@
 import { Constructor, LogLevel } from '@nu-art/ts-common';
-import { LogTypes } from '../types';
-import { BaseCommando } from '../core/BaseCommando';
+import { ShellLogProcessor, ShellPidListener } from './InteractiveShell.js';
+import { LogTypes } from '../types.js';
+import { BaseCommando } from '../core/BaseCommando.js';
 export declare class CommandoInteractive extends BaseCommando {
     private shell;
     /**
@@ -8,7 +9,7 @@ export declare class CommandoInteractive extends BaseCommando {
      * @param {Constructor<any>[]} plugins - The plugins to merge with CommandoInteractive.
      * @returns {CommandoInteractive} - The new instance of CommandoInteractive merged with the plugins.
      */
-    static create<T extends Constructor<any>[]>(...plugins: T): import("../core/class-merger").MergeTypes<[typeof BaseCommando, typeof CommandoInteractive, ...T]> & BaseCommando & CommandoInteractive;
+    static create<T extends Constructor<any>[]>(...plugins: T): import("../core/class-merger.js").MergeTypes<[typeof BaseCommando, typeof CommandoInteractive, ...T]> & BaseCommando & CommandoInteractive;
     /**
      * Constructs a CommandoInteractive instance.
      */
@@ -35,26 +36,19 @@ export declare class CommandoInteractive extends BaseCommando {
      * @param {NodeJS.Signals | number} [signal] - The signal to send to the process.
      * @returns {boolean} - Whether the kill signal was successfully sent.
      */
-    kill(signal?: NodeJS.Signals | number): boolean | undefined;
+    kill(signal?: NodeJS.Signals): Promise<void>;
     /**
      * Gracefully kills a process by its PID.
      * @param {number} [pid] - The PID of the process to kill.
+     * @param signal
      */
-    gracefullyKill(pid?: number): Promise<void>;
+    killSubprocess(pid: number, signal?: NodeJS.Signals): Promise<void>;
     /**
      * Waits for a log entry that matches a specified pattern, then executes a callback.
      * @param {string | RegExp} filter - The pattern to match in log entries.
      * @param {(match: RegExpMatchArray) => any} callback - The callback to execute when a match is found.
      */
     onLog(filter: string | RegExp, callback: (match: RegExpMatchArray) => any): this;
-    /**
-     * Executes commands asynchronously and listens for the PID.
-     *
-     * @param {Function} pidListener - A listener function to handle the PID.
-     * @param {Function} [callback] - A callback function to handle the command output.
-     * @returns {Promise<T>} - The result of the callback function.
-     */
-    executeAsync<T>(pidListener: (pid: number) => void, callback?: (stdout: string, stderr: string, exitCode: number) => T): Promise<T>;
     /**
      * Executes commands and processes logs to extract exit code.
      * @param {Function} [callback] - A callback function to handle the command output.
@@ -64,20 +58,23 @@ export declare class CommandoInteractive extends BaseCommando {
     /**
      * Adds a log processor to the shell.
      * @param {Function} processor - The log processor function to add.
+     * @param index
      * @returns {this} - The CommandoInteractive instance for method chaining.
      */
-    addLogProcessor(processor: (log: string, std: LogTypes) => boolean): this;
+    addLogProcessor(processor: ShellLogProcessor, index?: number): this;
     setLogLevelFilter(processor: (log: string, std: LogTypes) => LogLevel | undefined): this;
     /**
      * Removes a log processor from the shell.
      * @param {Function} processor - The log processor function to remove.
      * @returns {this} - The CommandoInteractive instance for method chaining.
      */
-    removeLogProcessor(processor: (log: string, std: LogTypes) => boolean): this;
+    removeLogProcessor(processor: ShellLogProcessor): this;
     /**
      * Appends a command to the command list.
      * @param {string} command - The command to append.
      * @returns {this} - The CommandoInteractive instance for method chaining.
      */
     append(command: string): this;
+    appendAsync(command: string, pidListener?: ShellPidListener): this;
+    getCommand(): string;
 }

package/shell/interactive/CommandoInteractive.js

@@ -1,20 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommandoInteractive = void 0;
-const ts_common_1 = require("@nu-art/ts-common");
-const InteractiveShell_1 = require("./InteractiveShell");
-const BaseCommando_1 = require("../core/BaseCommando");
-class CommandoInteractive extends BaseCommando_1.BaseCommando {
+import { generateHex } from '@nu-art/ts-common';
+import { InteractiveShell } from './InteractiveShell.js';
+import { BaseCommando } from '../core/BaseCommando.js';
+export class CommandoInteractive extends BaseCommando {
+    shell;
     /**
      * Creates a new instance of CommandoInteractive merged with the provided plugins.
      * @param {Constructor<any>[]} plugins - The plugins to merge with CommandoInteractive.
      * @returns {CommandoInteractive} - The new instance of CommandoInteractive merged with the plugins.
      */
     static create(...plugins) {
-        const _commando = BaseCommando_1.BaseCommando._create(CommandoInteractive, ...plugins);
+        const _commando = BaseCommando._create(CommandoInteractive, ...plugins);
         const commando = _commando;
-        commando.shell = new InteractiveShell_1.InteractiveShell();
-        commando.shell.setMinLevel(ts_common_1.LogLevel.Verbose);
+        commando.shell = new InteractiveShell();
         return commando;
     }
     /**
@@ -22,7 +19,7 @@ class CommandoInteractive extends BaseCommando_1.BaseCommando {
      */
     constructor() {
         super();
-        this.shell = new InteractiveShell_1.InteractiveShell();
+        this.shell = new InteractiveShell();
     }
     /**
      * Toggles or sets the debug mode.
@@ -60,9 +57,10 @@ class CommandoInteractive extends BaseCommando_1.BaseCommando {
     /**
      * Gracefully kills a process by its PID.
      * @param {number} [pid] - The PID of the process to kill.
+     * @param signal
      */
-    async gracefullyKill(pid) {
-        return this.shell.gracefullyKill(pid);
+    async killSubprocess(pid, signal) {
+        return this.shell.killSubprocess(pid, signal);
     }
     /**
      * Waits for a log entry that matches a specified pattern, then executes a callback.
@@ -81,77 +79,74 @@ class CommandoInteractive extends BaseCommando_1.BaseCommando {
         this.addLogProcessor(logFilter);
         return this;
     }
-    /**
-     * Executes commands asynchronously and listens for the PID.
-     *
-     * @param {Function} pidListener - A listener function to handle the PID.
-     * @param {Function} [callback] - A callback function to handle the command output.
-     * @returns {Promise<T>} - The result of the callback function.
-     */
-    async executeAsync(pidListener, callback) {
-        const pidUniqueKey = (0, ts_common_1.generateHex)(16);
-        const regexp = new RegExp(`${pidUniqueKey}=(\\d+)`);
-        const functionContent = this.builder.reset().trim() + ' &';
-        const pidLogProcessor = (log) => {
-            const match = log.match(regexp);
-            if (!match)
-                return true;
-            const pid = +match[1];
-            pidListener(pid);
-            return false;
-        };
-        return await this
-            .append(functionContent)
-            .append('pid=$!')
-            .append(`echo "${pidUniqueKey}=\${pid}"`)
-            .append(`wait \$pid`)
-            .addLogProcessor(pidLogProcessor)
-            .execute(callback);
-    }
     /**
      * Executes commands and processes logs to extract exit code.
      * @param {Function} [callback] - A callback function to handle the command output.
      * @returns {Promise<T>} - The result of the callback function.
      */
     async execute(callback) {
-        return await new Promise((resolve, reject) => {
-            const uniqueKey = (0, ts_common_1.generateHex)(16);
-            const regexp = new RegExp(`${uniqueKey}=(\\d+)`);
-            let _stderr = '';
-            let _stdout = '';
-            const logProcessor = (log, type) => {
-                if (type === 'err')
-                    _stderr += `${log}\n`;
-                else
-                    _stdout += `${log}\n`;
-                if (!log.includes(uniqueKey))
+        let logProcessor;
+        let stdLogProcessor;
+        let onCloseListener;
+        try {
+            return await new Promise((resolve, reject) => {
+                const uniqueKey = generateHex(16);
+                const regexp = new RegExp(`${uniqueKey}=(\\d+)`);
+                let _stderr = '';
+                let _stdout = '';
+                stdLogProcessor = (log, type) => {
+                    if (type === 'err')
+                        _stderr += `${log}\n`;
+                    else
+                        _stdout += `${log}\n`;
                     return true;
-                const match = log.match(regexp);
-                if (!match)
-                    return true;
-                const exitCode = match === null || match === void 0 ? void 0 : match[1];
-                this.removeLogProcessor(logProcessor);
-                try {
-                    resolve(callback === null || callback === void 0 ? void 0 : callback(_stdout, _stderr, +exitCode));
-                }
-                catch (err) {
-                    reject(err);
-                }
-                return false;
-            };
-            this.builder.append(`echo ${uniqueKey}=$?`);
-            const command = this.builder.reset();
-            this.shell.addLogProcessor(logProcessor);
-            this.shell.execute(command);
-        });
+                };
+                let uidCounter = 0;
+                let exitCode = -1;
+                logProcessor = (log, type) => {
+                    if (!log.includes(uniqueKey))
+                        return true;
+                    const match = log.match(regexp);
+                    if (!match)
+                        return false;
+                    uidCounter++;
+                    if (type === 'out')
+                        exitCode = +(match[1]);
+                    if (uidCounter !== 2)
+                        return false;
+                    try {
+                        resolve(callback?.(_stdout, _stderr, +exitCode));
+                    }
+                    catch (err) {
+                        reject(err);
+                    }
+                    return false;
+                };
+                onCloseListener = (exitCode) => {
+                    resolve(callback?.(_stdout, _stderr, exitCode));
+                };
+                this.builder.append(`echo ${uniqueKey}=$? && echo ${uniqueKey}=$? 1>&2`);
+                const command = this.builder.reset();
+                this.shell.addLogProcessor(logProcessor, 0);
+                this.shell.addLogProcessor(stdLogProcessor);
+                this.shell.addOnCloseListener(onCloseListener);
+                this.shell.execute(command);
+            });
+        }
+        finally {
+            this.shell.removeLogProcessor(logProcessor);
+            this.shell.removeLogProcessor(stdLogProcessor);
+            this.shell.removeOnCloseListener(onCloseListener);
+        }
     }
     /**
      * Adds a log processor to the shell.
      * @param {Function} processor - The log processor function to add.
+     * @param index
      * @returns {this} - The CommandoInteractive instance for method chaining.
      */
-    addLogProcessor(processor) {
-        this.shell.addLogProcessor(processor);
+    addLogProcessor(processor, index) {
+        this.shell.addLogProcessor(processor, index);
         return this;
     }
     setLogLevelFilter(processor) {
@@ -176,5 +171,26 @@ class CommandoInteractive extends BaseCommando_1.BaseCommando {
         this.builder.append(command);
         return this;
     }
+    appendAsync(command, pidListener) {
+        const pidUniqueKey = generateHex(16);
+        const regexp = new RegExp(`${pidUniqueKey}=(\\d+)`);
+        const pidLogProcessor = async (log) => {
+            const match = log.match(regexp);
+            if (!match)
+                return true;
+            const pid = +match[1];
+            await pidListener?.(pid);
+            return false;
+        };
+        this.append(`${command} &`)
+            .append('pid=$!')
+            .append(`echo "${pidUniqueKey}=\${pid}"`)
+            .append(`wait \$pid`)
+            .addLogProcessor(pidLogProcessor, 0);
+        return this;
+    }
+    getCommand() {
+        return this.builder.getCommand();
+    }
 }
-exports.CommandoInteractive = CommandoInteractive;
+//# sourceMappingURL=CommandoInteractive.js.map

package/shell/interactive/CommandoInteractive.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CommandoInteractive.js","sourceRoot":"/Users/tacb0ss/dev/nu-art/beamz/_thunderstorm/commando/src/main/","sources":["shell/interactive/CommandoInteractive.ts"],"names":[],"mappings":"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"}

package/shell/interactive/InteractiveShell.d.ts

@@ -1,9 +1,12 @@
 import { Logger, LogLevel } from '@nu-art/ts-common';
-import { LogTypes } from '../types';
-type LogProcessor = (log: string, std: LogTypes) => boolean;
+import { LogTypes } from '../types.js';
+export type ShellLogProcessor = (log: string, std: LogTypes) => (Promise<boolean> | boolean);
+export type ShellPidListener = (pid: number) => (Promise<any> | any);
+type OnCloseListener = (exitCode: number) => void;
 export declare class InteractiveShell extends Logger {
     private _debug;
     private logProcessors;
+    private onCloseListeners;
     private shell;
     private alive;
     private logLevelFilter;
@@ -26,31 +29,26 @@ export declare class InteractiveShell extends Logger {
      * Awaits for the end of the interactive shell session.
      */
     endInteractive: () => Promise<void>;
-    /**
-     * Sends a signal to terminate the shell process.
-     * @param {NodeJS.Signals | number} [signal] - The signal to send to the shell process.
-     * @returns {boolean | undefined} - The result of the kill operation.
-     */
-    kill: (signal?: NodeJS.Signals | number) => boolean | undefined;
-    /**
-     * Attempts to gracefully terminate the shell process.
-     * @param {number} [pid] - Process ID of the shell to terminate.
-     * @returns {Promise<void>} - Resolves when the shell process is gracefully killed.
-     */
-    gracefullyKill: (pid?: number) => Promise<void>;
+    isAlive: (pid: number) => boolean;
+    waitForExit: (pid: number, timeout?: number, sampleInterval?: number) => Promise<void>;
+    kill: (signal?: NodeJS.Signals, timeout?: number) => Promise<void>;
+    killSubprocess: (pid: number, signal?: NodeJS.Signals, timeout?: number) => Promise<void>;
     /**
      * Adds a log processor to handle log messages.
      * @param {(log: string, std: LogTypes) => boolean} processor - The log processor function.
+     * @param index -
      * @returns {this} - The InteractiveShell instance for method chaining.
      */
-    addLogProcessor(processor: LogProcessor): this;
+    addLogProcessor(processor: ShellLogProcessor, index?: number): this;
     setLogLevelFilter(logLevelFilter: (log: string, std: LogTypes) => LogLevel | undefined): this;
+    addOnCloseListener(listener: OnCloseListener): this;
+    removeOnCloseListener(listener: OnCloseListener): this;
     /**
      * Removes a log processor from handling log messages.
      * @param {(log: string, std: LogTypes) => boolean} processor - The log processor function to remove.
      * @returns {this} - The InteractiveShell instance for method chaining.
      */
-    removeLogProcessor(processor: LogProcessor): this;
+    removeLogProcessor(processor: ShellLogProcessor): this;
     /**
      * Sets a unique identifier for the shell session.
      * @param {string} uid - The unique identifier.

package/shell/interactive/InteractiveShell.js

@@ -1,95 +1,44 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.InteractiveShell = void 0;
-const ts_common_1 = require("@nu-art/ts-common");
-const node_child_process_1 = require("node:child_process");
-const defaultLogLevelFilter = (log, std) => std === 'err' ? ts_common_1.LogLevel.Error : ts_common_1.LogLevel.Info;
-class InteractiveShell extends ts_common_1.Logger {
+import { addItemToArrayAtIndex, currentTimeMillis, generateHex, Logger, LogLevel, removeItemFromArray } from '@nu-art/ts-common';
+import { spawn } from 'node:child_process';
+const defaultLogLevelFilter = (log, std) => std === 'err' ? LogLevel.Error : LogLevel.Info;
+export class InteractiveShell extends Logger {
+    _debug = false;
+    logProcessors = [];
+    onCloseListeners = [];
+    shell;
+    alive;
+    logLevelFilter = defaultLogLevelFilter;
     /**
      * Constructs an InteractiveShell instance, initializes a detached shell session, and sets up log processors.
      */
     constructor() {
-        var _a, _b;
         super();
-        this._debug = false;
-        this.logProcessors = [];
-        this.logLevelFilter = defaultLogLevelFilter;
-        /**
-         * Executes a command in the interactive shell.
-         * @param {string} command - The command to execute.
-         */
-        this.execute = (command) => {
-            var _a;
-            if (this._debug)
-                this.logDebug(`executing: `, `"""\n${command}\n"""`);
-            (_a = this.shell.stdin) === null || _a === void 0 ? void 0 : _a.write(command + '\n', 'utf-8', (err) => {
-                if (err)
-                    this.logError(`error`, err);
-            });
-        };
-        /**
-         * Awaits for the end of the interactive shell session.
-         */
-        this.endInteractive = () => {
-            return new Promise(resolve => {
-                var _a;
-                (_a = this.shell.stdin) === null || _a === void 0 ? void 0 : _a.end(resolve);
-            });
-        };
-        /**
-         * Sends a signal to terminate the shell process.
-         * @param {NodeJS.Signals | number} [signal] - The signal to send to the shell process.
-         * @returns {boolean | undefined} - The result of the kill operation.
-         */
-        this.kill = (signal) => {
-            if (!this.alive)
-                return;
-            this.logWarning(`Killing......`);
-            // return this.gracefullyKill(this.shell.pid);
-            return this.shell.emit('exit', 2);
-        };
-        /**
-         * Attempts to gracefully terminate the shell process.
-         * @param {number} [pid] - Process ID of the shell to terminate.
-         * @returns {Promise<void>} - Resolves when the shell process is gracefully killed.
-         */
-        this.gracefullyKill = async (pid) => {
-            if (!this.alive)
-                return;
-            return new Promise((resolve, reject) => {
-                this.logWarning('Killing process');
-                this.shell.on('exit', async (code, signal) => {
-                    this.logWarning(`Process Killed ${signal}`);
-                    resolve();
-                });
-                if (pid) {
-                    this.logWarning(`KILLING PID: ${pid}`);
-                    process.kill(pid, 'SIGINT');
-                }
-                else {
-                    this.logWarning(`KILLING SHELL WITH SIGINT`);
-                    this.shell.kill('SIGINT');
-                }
-            });
-        };
-        this.shell = (0, node_child_process_1.spawn)('/bin/bash', {
+        this.setTag(`${this.constructor['name']}(${generateHex(4)})`);
+        this.shell = spawn('/bin/bash', {
             detached: true, // This is important to make the process a session leader
-            shell: true
+            shell: true,
+            env: {
+                ...process.env,
+                NODE_OPTIONS: '' // Remove any --inspect flags
+            }
         });
         this.alive = true;
-        const printer = (std) => (data) => {
-            var _a;
+        const printer = (std) => async (data) => {
             const messages = data.toString().trim().split('\n');
             if (!messages.length)
                 return;
             for (const message of messages) {
                 try {
-                    const toPrint = this.logProcessors.length === 0 || this.logProcessors.reduce((toPrint, processor) => {
-                        const filter = processor(message, std);
-                        return toPrint && filter;
-                    }, true);
-                    if (toPrint) {
-                        const logLevel = (_a = this.logLevelFilter(message, std)) !== null && _a !== void 0 ? _a : defaultLogLevelFilter(message, std);
+                    let consumed = false;
+                    for (const processor of this.logProcessors) {
+                        const result = await processor(message, std);
+                        if (!result) {
+                            consumed = true;
+                            break;
+                        }
+                    }
+                    if (!consumed) {
+                        const logLevel = this.logLevelFilter(message, std) ?? defaultLogLevelFilter(message, std);
                         this.log(logLevel, false, [message]);
                     }
                 }
@@ -98,12 +47,18 @@ class InteractiveShell extends ts_common_1.Logger {
                 }
             }
         };
-        (_a = this.shell.stdout) === null || _a === void 0 ? void 0 : _a.on('data', printer('out'));
-        (_b = this.shell.stderr) === null || _b === void 0 ? void 0 : _b.on('data', printer('err'));
+        const stdoutPrinter = printer('out');
+        const stderrPrinter = printer('err');
+        this.shell.stdout?.on('data', stdoutPrinter);
+        this.shell.stderr?.on('data', stderrPrinter);
         // Handle shell exit
-        this.shell.on('close', (code) => {
+        this.shell.on('close', async (code) => {
             this.alive = false;
-            this.logInfo(`child process exited with code ${code}`);
+            code = code === null ? -1 : code;
+            this.onCloseListeners.forEach(listener => listener(code === null ? -1 : code));
+            const printer = code === 0 ? stdoutPrinter : stderrPrinter;
+            const string = `Process exited with code: ${code}`;
+            printer(Buffer.from(string));
         });
     }
     /**
@@ -112,29 +67,121 @@ class InteractiveShell extends ts_common_1.Logger {
      * @returns {boolean} - The current state of debug mode.
      */
     debug(debug) {
-        this._debug = debug !== null && debug !== void 0 ? debug : !this._debug;
+        this._debug = debug ?? !this._debug;
         return this;
     }
+    /**
+     * Executes a command in the interactive shell.
+     * @param {string} command - The command to execute.
+     */
+    execute = (command) => {
+        this.logVerbose(`executing: `, `"""\n${command}\n"""`);
+        this.shell.stdin?.write(command + '\n', 'utf-8', (err) => {
+            if (err)
+                this.logError(`error`, err);
+        });
+    };
+    /**
+     * Awaits for the end of the interactive shell session.
+     */
+    endInteractive = () => {
+        return new Promise(resolve => {
+            this.shell.stdin?.end(resolve);
+        });
+    };
+    // Check if a given PID is alive
+    isAlive = (pid) => {
+        try {
+            process.kill(pid, 0); // Non-intrusive check
+            return true;
+        }
+        catch {
+            return false;
+        }
+    };
+    // Poll until a PID is no longer alive or timeout is hit
+    waitForExit = (pid, timeout = 10000, sampleInterval = 100) => {
+        const startTime = currentTimeMillis();
+        return new Promise((resolve, reject) => {
+            const check = () => {
+                if (!this.isAlive(pid))
+                    return resolve();
+                if (currentTimeMillis() - startTime > timeout) {
+                    this.logWarning(`PID ${pid} did not exit in time. Sending 'SIGTERM'.`);
+                    try {
+                        process.kill(pid, 'SIGTERM');
+                    }
+                    catch (e) {
+                        this.logError(`Failed to send 'SIGTERM' to PID ${pid}`, e);
+                    }
+                    return reject(new Error(`PID ${pid} did not exit after ${timeout}ms`));
+                }
+                setTimeout(check, sampleInterval);
+            };
+            check();
+        });
+    };
+    // Kill the main shell process (interactive shell)
+    kill = async (signal = 'SIGINT', timeout = 10000) => {
+        if (!this.alive)
+            return;
+        this.logWarning(`Sending ${signal} to shell PID: ${this.shell.pid}`);
+        try {
+            this.shell.kill(signal);
+        }
+        catch (e) {
+            this.logError(`Failed to send ${signal} to shell`, e);
+            throw e;
+        }
+        await this.waitForExit(this.shell.pid, timeout);
+        this.logWarning(`Shell process PID ${this.shell.pid} terminated`);
+    };
+    // Kill a background subprocess PID without affecting the shell
+    killSubprocess = async (pid, signal = 'SIGINT', timeout = 10000) => {
+        if (!this.isAlive(pid)) {
+            this.logDebug(`Subprocess PID ${pid} already exited`);
+            return;
+        }
+        this.logWarning(`Sending ${signal} to subprocess PID: ${pid}`);
+        try {
+            process.kill(pid, signal);
+        }
+        catch (e) {
+            this.logError(`Failed to send ${signal} to subprocess`, e);
+            throw e;
+        }
+        await this.waitForExit(pid, timeout);
+        this.logWarning(`Subprocess PID ${pid} terminated`);
+    };
     /**
      * Adds a log processor to handle log messages.
      * @param {(log: string, std: LogTypes) => boolean} processor - The log processor function.
+     * @param index -
      * @returns {this} - The InteractiveShell instance for method chaining.
      */
-    addLogProcessor(processor) {
-        this.logProcessors.push(processor);
+    addLogProcessor(processor, index = this.logProcessors.length) {
+        addItemToArrayAtIndex(this.logProcessors, processor, index);
         return this;
     }
     setLogLevelFilter(logLevelFilter) {
         this.logLevelFilter = logLevelFilter;
         return this;
     }
+    addOnCloseListener(listener) {
+        this.onCloseListeners.push(listener);
+        return this;
+    }
+    removeOnCloseListener(listener) {
+        removeItemFromArray(this.onCloseListeners, listener);
+        return this;
+    }
     /**
      * Removes a log processor from handling log messages.
      * @param {(log: string, std: LogTypes) => boolean} processor - The log processor function to remove.
      * @returns {this} - The InteractiveShell instance for method chaining.
      */
     removeLogProcessor(processor) {
-        (0, ts_common_1.removeItemFromArray)(this.logProcessors, processor);
+        removeItemFromArray(this.logProcessors, processor);
         return this;
     }
     /**
@@ -147,4 +194,4 @@ class InteractiveShell extends ts_common_1.Logger {
         return this;
     }
 }
-exports.InteractiveShell = InteractiveShell;
+//# sourceMappingURL=InteractiveShell.js.map

package/shell/interactive/InteractiveShell.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"InteractiveShell.js","sourceRoot":"/Users/tacb0ss/dev/nu-art/beamz/_thunderstorm/commando/src/main/","sources":["shell/interactive/InteractiveShell.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,qBAAqB,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,mBAAmB,EAAC,MAAM,mBAAmB,CAAC;AAC/H,OAAO,EAA+C,KAAK,EAAC,MAAM,oBAAoB,CAAC;AAQvF,MAAM,qBAAqB,GAAG,CAAC,GAAW,EAAE,GAAa,EAAE,EAAE,CAAC,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;AAI7G,MAAM,OAAO,gBACZ,SAAQ,MAAM;IAEN,MAAM,GAAY,KAAK,CAAC;IACxB,aAAa,GAA0B,EAAE,CAAC;IAC1C,gBAAgB,GAAwB,EAAE,CAAC;IAC3C,KAAK,CAAgD;IACrD,KAAK,CAAU;IACf,cAAc,GAAyD,qBAAqB,CAAC;IAErG;;OAEG;IACH;QACC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAC9D,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE;YAC/B,QAAQ,EAAE,IAAI,EAAG,yDAAyD;YAC1E,KAAK,EAAE,IAAI;YACX,GAAG,EAAE;gBACJ,GAAG,OAAO,CAAC,GAAG;gBACd,YAAY,EAAE,EAAE,CAAG,6BAA6B;aAChD;SACD,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAElB,MAAM,OAAO,GAAG,CAAC,GAAa,EAAE,EAAE,CAAC,KAAK,EAAE,IAAY,EAAE,EAAE;YACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACpD,IAAI,CAAC,QAAQ,CAAC,MAAM;gBACnB,OAAO;YAER,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAChC,IAAI,CAAC;oBACJ,IAAI,QAAQ,GAAG,KAAK,CAAC;oBAErB,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;wBAC5C,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;wBAC7C,IAAI,CAAC,MAAM,EAAE,CAAC;4BACb,QAAQ,GAAG,IAAI,CAAC;4BAChB,MAAM;wBACP,CAAC;oBACF,CAAC;oBAED,IAAI,CAAC,QAAQ,EAAE,CAAC;wBACf,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,qBAAqB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;wBAC1F,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;oBACtC,CAAC;gBACF,CAAC;gBAAC,OAAO,CAAM,EAAE,CAAC;oBACjB,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;YACF,CAAC;QACF,CAAC,CAAC;QAEF,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QACrC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAC7C,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAE7C,oBAAoB;QACpB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACrC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,GAAG,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACjC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YAE/E,MAAM,OAAO,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC;YAC3D,MAAM,MAAM,GAAG,6BAA6B,IAAI,EAAE,CAAC;YACnD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,KAAe;QACpB,IAAI,CAAC,MAAM,GAAG,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;QACpC,OAAO,IAAI,CAAC;IACb,CAAC;IAED;;;OAGG;IACH,OAAO,GAAG,CAAC,OAAe,EAAE,EAAE;QAC7B,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,QAAQ,OAAO,OAAO,CAAC,CAAC;QAEvD,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,GAAkB,EAAE,EAAE;YACvE,IAAI,GAAG;gBACN,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF;;OAEG;IACH,cAAc,GAAG,GAAG,EAAE;QACrB,OAAO,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;YAClC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC;IAEH,gCAAgC;IAC/B,OAAO,GAAG,CAAC,GAAW,EAAW,EAAE;QAClC,IAAI,CAAC;YACJ,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,sBAAsB;YAC5C,OAAO,IAAI,CAAC;QACb,CAAC;QAAC,MAAM,CAAC;YACR,OAAO,KAAK,CAAC;QACd,CAAC;IACF,CAAC,CAAC;IAEH,wDAAwD;IACvD,WAAW,GAAG,CAAC,GAAW,EAAE,OAAO,GAAG,KAAK,EAAE,cAAc,GAAG,GAAG,EAAiB,EAAE;QACnF,MAAM,SAAS,GAAG,iBAAiB,EAAE,CAAC;QAEtC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACtC,MAAM,KAAK,GAAG,GAAG,EAAE;gBAClB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;oBACrB,OAAO,OAAO,EAAE,CAAC;gBAElB,IAAI,iBAAiB,EAAE,GAAG,SAAS,GAAG,OAAO,EAAE,CAAC;oBAC/C,IAAI,CAAC,UAAU,CAAC,OAAO,GAAG,2CAA2C,CAAC,CAAC;oBACvE,IAAI,CAAC;wBACJ,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;oBAC9B,CAAC;oBAAC,OAAO,CAAM,EAAE,CAAC;wBACjB,IAAI,CAAC,QAAQ,CAAC,mCAAmC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;oBAC5D,CAAC;oBAED,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,GAAG,uBAAuB,OAAO,IAAI,CAAC,CAAC,CAAC;gBACxE,CAAC;gBAED,UAAU,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;YACnC,CAAC,CAAC;YACF,KAAK,EAAE,CAAC;QACT,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC;IAEH,kDAAkD;IACjD,IAAI,GAAG,KAAK,EAAE,SAAyB,QAAQ,EAAE,OAAO,GAAG,KAAK,EAAiB,EAAE;QAClF,IAAI,CAAC,IAAI,CAAC,KAAK;YACd,OAAO;QAER,IAAI,CAAC,UAAU,CAAC,WAAW,MAAM,kBAAkB,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;QAErE,IAAI,CAAC;YACJ,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACzB,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YACjB,IAAI,CAAC,QAAQ,CAAC,kBAAkB,MAAM,WAAW,EAAE,CAAC,CAAC,CAAC;YACtD,MAAM,CAAC,CAAC;QACT,CAAC;QAED,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,GAAI,EAAE,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,UAAU,CAAC,qBAAqB,IAAI,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC,CAAC;IACnE,CAAC,CAAC;IAEH,+DAA+D;IAC9D,cAAc,GAAG,KAAK,EAAE,GAAW,EAAE,SAAyB,QAAQ,EAAE,OAAO,GAAG,KAAK,EAAiB,EAAE;QACzG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,QAAQ,CAAC,kBAAkB,GAAG,iBAAiB,CAAC,CAAC;YACtD,OAAO;QACR,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,WAAW,MAAM,uBAAuB,GAAG,EAAE,CAAC,CAAC;QAE/D,IAAI,CAAC;YACJ,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YACjB,IAAI,CAAC,QAAQ,CAAC,kBAAkB,MAAM,gBAAgB,EAAE,CAAC,CAAC,CAAC;YAC3D,MAAM,CAAC,CAAC;QACT,CAAC;QAED,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACrC,IAAI,CAAC,UAAU,CAAC,kBAAkB,GAAG,aAAa,CAAC,CAAC;IACrD,CAAC,CAAC;IAEF;;;;;OAKG;IACH,eAAe,CAAC,SAA4B,EAAE,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM;QAC9E,qBAAqB,CAAC,IAAI,CAAC,aAAa,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;QAC5D,OAAO,IAAI,CAAC;IACb,CAAC;IAED,iBAAiB,CAAC,cAAoE;QACrF,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,OAAO,IAAI,CAAC;IACb,CAAC;IAED,kBAAkB,CAAC,QAAyB;QAC3C,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC;IACb,CAAC;IAED,qBAAqB,CAAC,QAAyB;QAC9C,mBAAmB,CAAC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QACrD,OAAO,IAAI,CAAC;IACb,CAAC;IAGD;;;;OAIG;IACH,kBAAkB,CAAC,SAA4B;QAC9C,mBAAmB,CAAC,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC;IACb,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,GAAW;QACjB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjB,OAAO,IAAI,CAAC;IACb,CAAC;CACD"}

package/shell/plugins/basic.d.ts

@@ -1,5 +1,5 @@
-import { BaseCommando } from '../core/BaseCommando';
-import { CliBlock } from '../types';
+import { BaseCommando } from '../core/BaseCommando.js';
+import { CliBlock } from '../types.js';
 type Cli_EchoOptions = {
     escape?: boolean;
     toFile?: {