@nu-art/commando 0.204.17 → 0.204.19

package/{screen/Screen.d.ts → console/ConsoleScreen.d.ts}

@@ -1,14 +1,14 @@
 import { ResolvableContent } from '@nu-art/ts-common';
 import { BoxOptions, ScreenOptions, WidgetTypes } from './types';
-import * as blessed from 'neo-blessed';
-export declare abstract class Screen<State extends object> {
+export declare abstract class ConsoleScreen<State extends object> {
     protected state: State;
     private screen;
-    protected readonly widgets: blessed.Widgets.Node[];
+    protected readonly widgets: any[];
     constructor(props?: ScreenOptions);
-    setState(state: ResolvableContent<Partial<State>>): void;
+    setState(state: ResolvableContent<Partial<State>>): this;
     createWidget(type: WidgetTypes, props: Omit<BoxOptions, 'parent'>): any;
     getFocusedWidget(): any;
+    private _render;
     protected abstract render(): void;
     enable(): void;
     disable(): void;

package/{screen/Screen.js → console/ConsoleScreen.js}

@@ -23,11 +23,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Screen = void 0;
-const ts_common_1 = require("@nu-art/ts-common");
+exports.ConsoleScreen = void 0;
 // @ts-ignore
 const blessed = __importStar(require("neo-blessed"));
-class Screen {
+const ts_common_1 = require("@nu-art/ts-common");
+class ConsoleScreen {
     constructor(props) {
         var _a;
         this.widgets = [];
@@ -37,8 +37,9 @@ class Screen {
         });
     }
     setState(state) {
-        this.state = Object.freeze((0, ts_common_1.mergeObject)(this.state, state));
-        this.render();
+        this.state = (0, ts_common_1.mergeObject)(this.state, state);
+        this._render();
+        return this;
     }
     createWidget(type, props) {
         const widget = blessed[type](Object.assign(Object.assign({}, props), { parent: this.screen }));
@@ -48,30 +49,31 @@ class Screen {
     getFocusedWidget() {
         return this.screen.focused;
     }
+    _render() {
+        this.screen.render();
+        this.render();
+    }
     enable() {
         this.widgets.forEach(widget => {
             widget.focusable = true;
             widget.interactive = true;
         });
-        this.screen.render();
+        this._render();
     }
     disable() {
         this.widgets.forEach(widget => {
             widget.focusable = false;
             widget.interactive = false;
         });
-        this.screen.render();
+        this._render();
     }
     /**
      * Clears all widgets from the screen and optionally clears the screen.
      */
     clearScreen(clearContent = true) {
         this.widgets.forEach(widget => widget.detach());
-        this.widgets.forEach(widget => (0, ts_common_1.removeFromArray)(this.widgets, widget));
-        if (clearContent) {
-            this.screen.clear();
-        }
-        this.screen.render();
+        // @ts-ignore
+        this.widgets = [];
     }
 }
-exports.Screen = Screen;
+exports.ConsoleScreen = ConsoleScreen;

package/{screen → console}/types.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-import * as blessed from 'neo-blessed';
 /**
  * Styles configuration for the box component.
  */
@@ -50,7 +49,7 @@ export type BoxStyle = {
  */
 export type BoxOptions = {
     /** Parent screen object. */
-    parent?: blessed.Widgets.Screen;
+    parent?: any;
     /** Top position (can be in pixels or percentage). */
     top?: number | string;
     /** Left position (can be in pixels or percentage). */
@@ -139,7 +138,7 @@ export type ScreenOptions = {
     output?: NodeJS.WritableStream;
     /** Time in milliseconds to wait after a resize event before redrawing the screen. */
     resizeTimeout?: number;
-    keyBinding: {
+    keyBinding?: {
         keys: string[];
         callback: VoidFunction;
     }[];

package/core/cli.d.ts

@@ -18,6 +18,7 @@ export declare class BaseCLI extends Logger {
     private indentation;
     protected _debug: boolean;
     protected option: Options;
+    protected uid: string;
     /**
      * Constructs a CLI instance with given options.
      * @param {Options} options - Configuration options for the CLI instance.
@@ -33,6 +34,7 @@ export declare class BaseCLI extends Logger {
      * @returns {this} - The Cli instance for method chaining.
      */
     readonly append: (command: string) => this;
+    setUID(uuid: string): void;
 }
 export declare class CliInteractive extends BaseCLI {
     private shell;
@@ -68,6 +70,7 @@ export declare class Commando {
     setOptions: (options: ExecOptions) => this;
     debug: (debug?: boolean) => this;
     append: (command: string) => this;
+    setUID: (uid: string) => this;
     execute: () => Promise<{
         stdout: string;
         stderr: string;
@@ -93,6 +96,7 @@ export declare class Commando {
 export declare class CommandoInteractive {
     cli: CliInteractive;
     static create<T extends Constructor<CliWrapper>[]>(...plugins: T): CommandoInteractive & Commando & import("./class-merger").MergeTypes<T>;
+    setUID: (uid: string) => this;
     close: () => this;
 }
 export {};

package/core/cli.js

@@ -23,6 +23,7 @@ class BaseCLI extends ts_common_1.Logger {
         this.commands = [];
         this.indentation = 0;
         this._debug = false;
+        this.uid = (0, ts_common_1.generateHex)((8));
         this.getIndentation = () => {
             return ' '.repeat(this.option.indentation * this.indentation);
         };
@@ -48,6 +49,9 @@ class BaseCLI extends ts_common_1.Logger {
         this._debug = debug !== null && debug !== void 0 ? debug : !this._debug;
         return this._debug;
     }
+    setUID(uuid) {
+        this.setTag(uuid);
+    }
 }
 exports.BaseCLI = BaseCLI;
 class CliInteractive extends BaseCLI {
@@ -59,7 +63,7 @@ class CliInteractive extends BaseCLI {
                 this.logDebug(`executing: `, `"""\n${command}\n"""`);
             this.shell.stdin.write(command + this.option.newlineDelimiter, 'utf-8', (err) => {
                 if (err)
-                    ts_common_1.StaticLogger.logError('error', err);
+                    this.logError(`error`, err);
             });
             this.commands = [];
         };
@@ -72,7 +76,7 @@ class CliInteractive extends BaseCLI {
             const message = data.toString().trim();
             if (!message.length)
                 return;
-            ts_common_1.StaticLogger.logInfo(message);
+            this.logInfo(`${message}`);
         };
         this.shell.stdout.on('data', printer);
         this.shell.stderr.on('data', printer);
@@ -80,7 +84,7 @@ class CliInteractive extends BaseCLI {
         this.shell.on('data', printer);
         // Handle shell exit
         this.shell.on('close', (code) => {
-            ts_common_1.StaticLogger.logInfo(`child process exited with code ${code}`);
+            this.logInfo(`child process exited with code ${code}`);
         });
     }
 }
@@ -168,6 +172,10 @@ class Commando {
             commando.cli.append(command);
             return commando;
         };
+        commando.setUID = (uid) => {
+            commando.cli.setUID(uid);
+            return commando;
+        };
         return commando;
     }
     constructor() {
@@ -175,6 +183,7 @@ class Commando {
         this.setOptions = (options) => this;
         this.debug = (debug) => this;
         this.append = (command) => this;
+        this.setUID = (uid) => this;
         this.execute = async () => ({ stdout: '', stderr: '', }); // placeholder
         /**
          * Executes a given file.
@@ -191,6 +200,7 @@ class Commando {
 exports.Commando = Commando;
 class CommandoInteractive {
     constructor() {
+        this.setUID = (uid) => this;
         this.close = () => this;
     }
     static create(...plugins) {
@@ -199,6 +209,10 @@ class CommandoInteractive {
         const cli = new CliInteractive();
         cli.setMinLevel(ts_common_1.LogLevel.Verbose);
         commando.cli = cli;
+        commando.setUID = (uid) => {
+            commando.cli.setUID(uid);
+            return commando;
+        };
         commando.close = () => {
             return commando;
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/commando",
-  "version": "0.204.17",
+  "version": "0.204.19",
   "description": "",
   "keywords": [
     "TacB0sS",