@nu-art/build-and-install 0.204.70 → 0.204.72

package/build-and-install.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ts_common_1 = require("@nu-art/ts-common");
 const params_1 = require("./core/params/params");
 const PhaseRunner_1 = require("./v2/phase-runner/PhaseRunner");
-const list_screen_1 = require("./v2/screens/list-screen");
 const thunderstorm_1 = require("./v2/unit/thunderstorm");
+const BAIScreen_UnitList_1 = require("./v2/screens/BAIScreen_UnitList");
 ts_common_1.DebugFlag.DefaultLogLevel = params_1.RuntimeParams.debug ? ts_common_1.LogLevel.Debug : ts_common_1.LogLevel.Info;
 const runner = new PhaseRunner_1.PhaseRunner('./.config/project-config-v2.ts');
-const screen = new list_screen_1.BAI_ListScreen(runner.getUnits());
-screen.setKillCB(async () => await runner.killRunner());
+const screen = new BAIScreen_UnitList_1.BAIScreen_UnitList();
+screen.setOnKillCallback(async () => await runner.killRunner());
 runner.setScreen(screen);
 if (params_1.RuntimeParams.runWithThunderstorm)
     runner.registerUnits(thunderstorm_1.allTSUnits);
@@ -16,6 +16,9 @@ runner
     .execute()
     .then(() => {
     ts_common_1.StaticLogger.logInfo('completed');
+    //TODO: make it an array of non exit params
+    if (!params_1.RuntimeParams.launch)
+        process.exit(0);
 })
     .catch(err => {
     ts_common_1.StaticLogger.logError('Failed with error: ', err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/build-and-install",
-  "version": "0.204.70",
+  "version": "0.204.72",
   "description": "",
   "keywords": [
     "TacB0sS",

package/v2/phase-runner/PhaseRunner.d.ts

@@ -2,7 +2,7 @@ import { RelativePath } from '@nu-art/ts-common';
 import { Phase, Phase_Debug, Phase_Help, Phase_PrintEnv } from '../phase';
 import { UnitPhaseImplementor } from '../unit/types';
 import { BaseUnit } from '../unit/core';
-import { BAI_ListScreen } from '../screens/list-screen';
+import { BAIScreen } from '../screens/BAIScreen';
 export declare class PhaseRunner extends BaseUnit implements UnitPhaseImplementor<[Phase_Help, Phase_PrintEnv, Phase_Debug]> {
     private readonly phases;
     private readonly units;
@@ -68,7 +68,7 @@ export declare class PhaseRunner extends BaseUnit implements UnitPhaseImplemento
     private loadRunningStatus;
     execute(): Promise<void>;
     killRunner(): Promise<void>;
-    setScreen(screen: BAI_ListScreen): void;
+    setScreen(screen: BAIScreen): void;
     printHelp(): Promise<void>;
     printEnv(): Promise<void>;
     debug(): Promise<void>;

package/v2/phase-runner/PhaseRunner.js

@@ -121,7 +121,10 @@ class PhaseRunner extends core_1.BaseUnit {
             if (!useUnits.includes(unit.config.key))
                 unitsToRemove.push(unit);
         }
+        if (!unitsToRemove.length)
+            return;
         unitsToRemove.forEach(unit => (0, ts_common_1.removeItemFromArray)(this.units, unit));
+        PhaseRunnerDispatcher_1.dispatcher_UnitChange.dispatch(this.units);
     }
     async loadProject() {
         if (!fs_1.default.existsSync(this.project.path))
@@ -225,6 +228,7 @@ class PhaseRunner extends core_1.BaseUnit {
             //TS units after project units, but before the rest
             return thunderstorm_1.allTSUnits.includes(unit) ? 2 : 3;
         });
+        PhaseRunnerDispatcher_1.dispatcher_UnitChange.dispatch(this.units);
     }
     getUnitsForPhase(phase) {
         return (0, ts_common_1.filterInstances)(this.unitDependencyTree.map(row => {

package/v2/phase-runner/PhaseRunnerDispatcher.d.ts

@@ -1,11 +1,7 @@
 import { FunctionKeys, ParamResolver } from '@nu-art/ts-common';
 import { Phase } from '../phase/types';
 import { BaseUnit } from '../unit/core';
-export interface PhaseRunnerEventListener {
-    __onPhaseChange: (data: Phase<string>) => void;
-    __onUnitStatusChange: (data: BaseUnit) => void;
-}
-declare class PhaseRunnerDispatcher<K extends FunctionKeys<PhaseRunnerEventListener>, P extends ParamResolver<PhaseRunnerEventListener, K> = ParamResolver<PhaseRunnerEventListener, K>> {
+declare class PhaseRunnerDispatcher<T, K extends FunctionKeys<T> = FunctionKeys<T>, P extends ParamResolver<T, K> = ParamResolver<T, K>> {
     private readonly method;
     constructor(method: K);
     private listeners;
@@ -13,8 +9,14 @@ declare class PhaseRunnerDispatcher<K extends FunctionKeys<PhaseRunnerEventListe
     removeListener(listener: any): void;
     dispatch(...data: P): void;
 }
-export declare const dispatcher_PhaseChange: PhaseRunnerDispatcher<"__onPhaseChange", [data: Phase<string>]>;
-export declare const dispatcher_UnitStatusChange: PhaseRunnerDispatcher<"__onUnitStatusChange", [data: BaseUnit<{}, {}, {
+export interface PhaseRunner_OnPhaseChange {
+    __onPhaseChange: (data: Phase<string>) => void;
+}
+export declare const dispatcher_PhaseChange: PhaseRunnerDispatcher<PhaseRunner_OnPhaseChange, "__onPhaseChange", [data: Phase<string>]>;
+export interface PhaseRunner_OnUnitStatusChange {
+    __onUnitStatusChange: (data: BaseUnit) => void;
+}
+export declare const dispatcher_UnitStatusChange: PhaseRunnerDispatcher<PhaseRunner_OnUnitStatusChange, "__onUnitStatusChange", [data: BaseUnit<{}, {}, {
     key: string;
     label: string;
     filter?: (() => boolean | Promise<boolean>) | undefined;
@@ -22,4 +24,15 @@ export declare const dispatcher_UnitStatusChange: PhaseRunnerDispatcher<"__onUni
     dependencyName: string;
     unitDependencyNames: string[];
 }>]>;
+export interface PhaseRunner_OnUnitsChange {
+    __onUnitsChange: (data: BaseUnit[]) => void;
+}
+export declare const dispatcher_UnitChange: PhaseRunnerDispatcher<PhaseRunner_OnUnitsChange, "__onUnitsChange", [data: BaseUnit<{}, {}, {
+    key: string;
+    label: string;
+    filter?: (() => boolean | Promise<boolean>) | undefined;
+}, {
+    dependencyName: string;
+    unitDependencyNames: string[];
+}>[]]>;
 export {};

package/v2/phase-runner/PhaseRunnerDispatcher.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dispatcher_UnitStatusChange = exports.dispatcher_PhaseChange = void 0;
+exports.dispatcher_UnitChange = exports.dispatcher_UnitStatusChange = exports.dispatcher_PhaseChange = void 0;
 const ts_common_1 = require("@nu-art/ts-common");
 class PhaseRunnerDispatcher {
     constructor(method) {
@@ -24,3 +24,4 @@ class PhaseRunnerDispatcher {
 }
 exports.dispatcher_PhaseChange = new PhaseRunnerDispatcher('__onPhaseChange');
 exports.dispatcher_UnitStatusChange = new PhaseRunnerDispatcher('__onUnitStatusChange');
+exports.dispatcher_UnitChange = new PhaseRunnerDispatcher('__onUnitsChange');

package/v2/screens/BAIScreen.d.ts

@@ -0,0 +1,20 @@
+import { ConsoleContainer } from '@nu-art/commando/console/ConsoleContainer';
+import { AsyncVoidFunction } from '@nu-art/ts-common';
+export declare abstract class BAIScreen<State extends {} = {}> extends ConsoleContainer<'screen', State> {
+    private onKillCallback?;
+    private logClient;
+    /**
+     * Creates an instance of ConsoleScreen.
+     *
+     * @param {Widgets.IScreenOptions} [props] - The properties to apply to the screen widget.
+     * @param {ScreenKeyBinding[]} [keyBinding] - An array of key bindings for the screen widget.
+     */
+    constructor();
+    private createLogClient;
+    startLogClient: () => void;
+    stopLogClient: () => void;
+    protected abstract onLogUpdated: () => void;
+    protected getLogs: () => string;
+    protected onKill(): Promise<never>;
+    setOnKillCallback: (cb: AsyncVoidFunction) => AsyncVoidFunction;
+}

package/v2/screens/BAIScreen.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BAIScreen = void 0;
+const ConsoleContainer_1 = require("@nu-art/commando/console/ConsoleContainer");
+const ts_common_1 = require("@nu-art/ts-common");
+class BAIScreen extends ConsoleContainer_1.ConsoleContainer {
+    //######################### Initialization #########################
+    /**
+     * Creates an instance of ConsoleScreen.
+     *
+     * @param {Widgets.IScreenOptions} [props] - The properties to apply to the screen widget.
+     * @param {ScreenKeyBinding[]} [keyBinding] - An array of key bindings for the screen widget.
+     */
+    constructor() {
+        super('screen', { smartCSR: true, title: 'Build and Install' }, [{
+                keys: ['escape', 'q', 'C-c'],
+                callback: async () => await this.onKill(),
+            }]);
+        //######################### Log Client Interaction #########################
+        this.startLogClient = () => {
+            //Remove terminal from BeLogged
+            ts_common_1.BeLogged.removeConsole(ts_common_1.LogClient_Terminal);
+            //Add this log client to BeLogged
+            ts_common_1.BeLogged.addClient(this.logClient);
+        };
+        this.stopLogClient = () => {
+            ts_common_1.BeLogged.removeClient(this.logClient);
+        };
+        this.getLogs = () => this.logClient.buffers[0];
+        this.setOnKillCallback = (cb) => this.onKillCallback = cb;
+        this.createLogClient();
+    }
+    createLogClient() {
+        //Create the log client
+        this.logClient = new ts_common_1.LogClient_MemBuffer('log-out.txt');
+        //Set for terminal flag
+        this.logClient.setForTerminal();
+        //Set log composer to print logs with timestamps
+        this.logClient.setComposer((tag, level) => {
+            ts_common_1._logger_finalDate.setTime(Date.now() - ts_common_1._logger_timezoneOffset);
+            const date = ts_common_1._logger_finalDate.toISOString().replace(/T/, '_').replace(/Z/, '').substring(0, 23).split('_')[1];
+            return `  ${date} ${(0, ts_common_1._logger_getPrefix)(level)} ${tag}:  `;
+        });
+        //Connect callback to listen when log is appended
+        this.logClient.setLogAppendedListener(() => {
+            this.onLogUpdated();
+        });
+    }
+    //######################### Kill Functionality #########################
+    async onKill() {
+        var _a;
+        this.logInfo('Kill command received');
+        await ((_a = this.onKillCallback) === null || _a === void 0 ? void 0 : _a.call(this));
+        this.logInfo('Killed!');
+        return process.exit(1);
+    }
+}
+exports.BAIScreen = BAIScreen;

package/v2/screens/BAIScreen_UnitList.d.ts

@@ -0,0 +1,31 @@
+import { PhaseRunner_OnPhaseChange, PhaseRunner_OnUnitsChange, PhaseRunner_OnUnitStatusChange } from '../phase-runner/PhaseRunnerDispatcher';
+import { Phase } from '../phase';
+import { BaseUnit } from '../unit/core';
+import { BAIScreen } from './BAIScreen';
+type State = {
+    currentPhaseName?: string;
+    selectedUnit?: BaseUnit;
+};
+export declare class BAIScreen_UnitList extends BAIScreen<State> implements PhaseRunner_OnPhaseChange, PhaseRunner_OnUnitStatusChange, PhaseRunner_OnUnitsChange {
+    private units;
+    private unitWrapperWidget;
+    private unitWidgets;
+    private logWidget;
+    private phaseWidget;
+    __onPhaseChange(phase: Phase<string>): void;
+    __onUnitStatusChange(unit: BaseUnit): void;
+    __onUnitsChange(data: BaseUnit[]): void;
+    protected onLogUpdated: () => void;
+    private destroyUnitListWidget;
+    protected createContent(): void;
+    private createPhaseWidget;
+    private createUnitListWidget;
+    private createUnitItemWidget;
+    private createLogWidget;
+    protected render(): void;
+    private renderPhase;
+    private renderUnitList;
+    private renderLogs;
+    private onUnitSelect;
+}
+export {};

package/v2/screens/{list-screen.js → BAIScreen_UnitList.js}

@@ -1,10 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BAI_ListScreen = void 0;
-const ConsoleContainer_1 = require("@nu-art/commando/console/ConsoleContainer");
+exports.BAIScreen_UnitList = void 0;
 const PhaseRunnerDispatcher_1 = require("../phase-runner/PhaseRunnerDispatcher");
-const ts_common_1 = require("@nu-art/ts-common");
-class BAI_ListScreen extends ConsoleContainer_1.ConsoleContainer {
+const BAIScreen_1 = require("./BAIScreen");
+const consts_1 = require("../phase-runner/consts");
+class BAIScreen_UnitList extends BAIScreen_1.BAIScreen {
+    constructor() {
+        super(...arguments);
+        this.units = [];
+        this.unitWidgets = [];
+        this.onLogUpdated = () => {
+            this.renderLogs();
+        };
+    }
     //######################### Lifecycle #########################
     __onPhaseChange(phase) {
         this.setState({ currentPhaseName: phase.name });
@@ -13,54 +21,28 @@ class BAI_ListScreen extends ConsoleContainer_1.ConsoleContainer {
         this.renderUnitList();
         this.container.screen.render();
     }
-    /**
-     * Creates an instance of ConsoleScreen.
-     *
-     * @param units - The units this screen should keep track of
-     * @param {Widgets.IScreenOptions} [props] - The properties to apply to the screen widget.
-     * @param {ScreenKeyBinding[]} [keyBinding] - An array of key bindings for the screen widget.
-     */
-    constructor(units, props, keyBinding = []) {
-        super('screen', { smartCSR: true, title: 'Build and Install' }, [{
-                keys: ['escape', 'q', 'C-c'],
-                callback: async () => {
-                    var _a;
-                    this.logInfo('Kill command received');
-                    await ((_a = this.onKillCB) === null || _a === void 0 ? void 0 : _a.call(this));
-                    this.logInfo('Killed!');
-                    return process.exit(1);
-                }
-            }]);
-        this.unitWidgets = [];
-        this.units = units;
+    __onUnitsChange(data) {
+        this.createUnitListWidget();
+        this.renderUnitList();
     }
-    initLogger() {
-        this.logClient = new ts_common_1.LogClient_MemBuffer('log-out.txt');
-        ts_common_1.BeLogged.removeConsole(ts_common_1.LogClient_Terminal);
-        ts_common_1.BeLogged.addClient(this.logClient);
-        this.logClient.setForTerminal();
-        this.logClient.setComposer((tag, level) => {
-            ts_common_1._logger_finalDate.setTime(Date.now() - ts_common_1._logger_timezoneOffset);
-            const date = ts_common_1._logger_finalDate.toISOString().replace(/T/, '_').replace(/Z/, '').substring(0, 23).split('_')[1];
-            return `  ${date} ${(0, ts_common_1._logger_getPrefix)(level)} ${tag}:  `;
-        });
-        this.logClient.setLogAppendedListener(() => {
-            this.renderLogs();
-        });
+    //######################### Content Destruction #########################
+    destroyUnitListWidget() {
+        var _a, _b;
+        (_a = this.unitWrapperWidget) === null || _a === void 0 ? void 0 : _a.destroy();
+        (_b = this.unitWidgets) === null || _b === void 0 ? void 0 : _b.forEach(group => group.forEach(widget => widget.destroy()));
     }
     //######################### Content Creation #########################
-    create() {
-        if (!this.logClient)
-            this.initLogger();
-        super.create();
-        return this;
-    }
     createContent() {
+        //Create widgets
         this.createPhaseWidget();
         this.createUnitListWidget();
         this.createLogWidget();
+        //Start listening on dispatchers
         PhaseRunnerDispatcher_1.dispatcher_UnitStatusChange.addListener(this);
         PhaseRunnerDispatcher_1.dispatcher_PhaseChange.addListener(this);
+        PhaseRunnerDispatcher_1.dispatcher_UnitChange.addListener(this);
+        //Start the log client
+        this.startLogClient();
     }
     createPhaseWidget() {
         const props = {
@@ -71,7 +53,7 @@ class BAI_ListScreen extends ConsoleContainer_1.ConsoleContainer {
             content: 'phases',
             border: { type: 'line' },
             tags: true,
-            styles: {
+            style: {
                 border: { fg: 'blue' },
                 fg: 'blue',
             },
@@ -80,6 +62,8 @@ class BAI_ListScreen extends ConsoleContainer_1.ConsoleContainer {
         this.phaseWidget = this.createWidget('text', props);
     }
     createUnitListWidget() {
+        this.units = consts_1.MemKey_PhaseRunner.get().getUnits();
+        this.destroyUnitListWidget();
         const props = {
             top: 3,
             left: 0,
@@ -169,22 +153,10 @@ class BAI_ListScreen extends ConsoleContainer_1.ConsoleContainer {
     }
     renderLogs() {
         const scrollPosition = this.logWidget.getScroll();
-        const content = this.state.selectedUnit ? this.state.selectedUnit.getLogs() : this.logClient.buffers[0];
+        const content = this.state.selectedUnit ? this.state.selectedUnit.getLogs() : this.getLogs();
         this.logWidget.setContent(content);
         this.logWidget.setScroll(scrollPosition);
     }
-    //######################### Kill #########################
-    setKillCB(cb) {
-        this.onKillCB = cb;
-        // Remove all listeners to the process kill event
-        // process.listeners('SIGINT').forEach(listener => process.removeListener('SIGINT', listener));
-        //Register a new listener for process kill event
-        // process.on('SIGINT', async () => {
-        // 	await cb();
-        // 	this.dispose();
-        // 	process.exit(0);
-        // });
-    }
     //######################### Events #########################
     onUnitSelect(unit, index) {
         this.state.selectedUnit = unit === this.state.selectedUnit ? undefined : unit;
@@ -193,4 +165,4 @@ class BAI_ListScreen extends ConsoleContainer_1.ConsoleContainer {
         this.container.screen.render();
     }
 }
-exports.BAI_ListScreen = BAI_ListScreen;
+exports.BAIScreen_UnitList = BAIScreen_UnitList;

package/v2/screens/list-screen.d.ts

@@ -1,47 +0,0 @@
-import { ConsoleContainer } from '@nu-art/commando/console/ConsoleContainer';
-import { Widgets } from 'blessed';
-import { PhaseRunnerEventListener } from '../phase-runner/PhaseRunnerDispatcher';
-import { Phase } from '../phase';
-import { BaseUnit } from '../unit/core';
-import { AsyncVoidFunction } from '@nu-art/ts-common';
-type ScreenKeyBinding = {
-    keys: string[];
-    callback: VoidFunction;
-};
-type State = {
-    currentPhaseName?: string;
-    selectedUnit?: BaseUnit;
-};
-export declare class BAI_ListScreen extends ConsoleContainer<'screen', State> implements PhaseRunnerEventListener {
-    private units;
-    private logClient;
-    private onKillCB?;
-    private unitWrapperWidget;
-    private unitWidgets;
-    private logWidget;
-    private phaseWidget;
-    __onPhaseChange(phase: Phase<string>): void;
-    __onUnitStatusChange(unit: BaseUnit): void;
-    /**
-     * Creates an instance of ConsoleScreen.
-     *
-     * @param units - The units this screen should keep track of
-     * @param {Widgets.IScreenOptions} [props] - The properties to apply to the screen widget.
-     * @param {ScreenKeyBinding[]} [keyBinding] - An array of key bindings for the screen widget.
-     */
-    constructor(units: BaseUnit[], props?: Widgets.IScreenOptions, keyBinding?: ScreenKeyBinding[]);
-    private initLogger;
-    create(): this;
-    protected createContent(): void;
-    private createPhaseWidget;
-    private createUnitListWidget;
-    private createUnitItemWidget;
-    private createLogWidget;
-    protected render(): void;
-    private renderPhase;
-    private renderUnitList;
-    private renderLogs;
-    setKillCB(cb: AsyncVoidFunction): void;
-    private onUnitSelect;
-}
-export {};