@nu-art/build-and-install 0.204.98 → 0.204.99

package/package.json

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

package/v2/screens/BAIScreen.d.ts

@@ -1,6 +1,6 @@
-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> {
+import { ConsoleScreen } from '@nu-art/commando/console/ConsoleScreen';
+export declare abstract class BAIScreen<State extends {} = {}> extends ConsoleScreen<State> {
     private onKillCallback?;
     private logClient;
     /**
@@ -11,6 +11,7 @@ export declare abstract class BAIScreen<State extends {} = {}> extends ConsoleCo
      */
     constructor(logClientKey: string);
     private createLogClient;
+    protected abstract scrollLog(direction: number): void;
     protected abstract onLogUpdated: () => void;
     protected getLogs: () => string;
     startScreen: () => void;

package/v2/screens/BAIScreen.js

@@ -1,10 +1,10 @@
 "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");
 const PhaseRunnerDispatcher_1 = require("../phase-runner/PhaseRunnerDispatcher");
-class BAIScreen extends ConsoleContainer_1.ConsoleContainer {
+const ConsoleScreen_1 = require("@nu-art/commando/console/ConsoleScreen");
+class BAIScreen extends ConsoleScreen_1.ConsoleScreen {
     //######################### Initialization #########################
     /**
      * Creates an instance of ConsoleScreen.
@@ -13,10 +13,24 @@ class BAIScreen extends ConsoleContainer_1.ConsoleContainer {
      * @param {ScreenKeyBinding[]} [keyBinding] - An array of key bindings for the screen widget.
      */
     constructor(logClientKey) {
-        super('screen', { smartCSR: true, title: 'Build and Install' }, [{
+        super({ smartCSR: true, title: 'Build and Install' }, [
+            {
                 keys: ['escape', 'q', 'C-c'],
                 callback: async () => await this.onKill(),
-            }]);
+            },
+            {
+                keys: ['up'],
+                callback: () => {
+                    this.scrollLog(-1);
+                },
+            },
+            {
+                keys: ['down'],
+                callback: () => {
+                    this.scrollLog(1);
+                },
+            },
+        ]);
         this.getLogs = () => this.logClient.buffers[0];
         this.startScreen = () => {
             //Start listening on dispatchers
@@ -38,6 +52,7 @@ class BAIScreen extends ConsoleContainer_1.ConsoleContainer {
             this.container.destroy();
         };
         this.setOnKillCallback = (cb) => this.onKillCallback = cb;
+        this.scrollLog.bind(this);
         this.createLogClient(logClientKey);
     }
     createLogClient(logClientKey) {

package/v2/screens/BAIScreen_Launch.d.ts

@@ -2,16 +2,20 @@ import { BAIScreen } from './BAIScreen';
 import { BaseUnit } from '../unit/core';
 import { PhaseRunner_OnUnitsChange } from '../phase-runner/PhaseRunnerDispatcher';
 export declare class BAIScreen_Launch extends BAIScreen implements PhaseRunner_OnUnitsChange {
-    private units;
+    private allUnits;
+    private focusUnits;
     private gridDimensions;
     private withRunningLogs;
     private gridCellWidgets;
     constructor();
     __onUnitsChange: (data: BaseUnit[]) => void;
+    private rebuildScreens;
     protected onLogUpdated: () => void;
     private updateUnits;
     protected createContent(): void;
+    protected scrollLog(direction: number): void;
     private createGridWidgets;
+    private toggleFullScreenMode;
     private calculateGridDimensions;
     private getGridWidgetLabel;
     protected destroyContent(): void;

package/v2/screens/BAIScreen_Launch.js

@@ -4,30 +4,32 @@ exports.BAIScreen_Launch = void 0;
 const BAIScreen_1 = require("./BAIScreen");
 const consts_1 = require("../phase-runner/consts");
 const firebase_units_1 = require("../unit/firebase-units");
+const ts_common_1 = require("@nu-art/ts-common");
 class BAIScreen_Launch extends BAIScreen_1.BAIScreen {
     //######################### Lifecycle #########################
     constructor() {
         super('bai-launch');
         //######################### Properties #########################
-        this.units = [];
+        this.allUnits = [];
+        this.focusUnits = [];
         this.gridDimensions = [[{ width: 1, height: 1 }]];
         this.withRunningLogs = false;
         //Widgets
         this.gridCellWidgets = [];
         this.__onUnitsChange = (data) => {
             this.updateUnits();
-            this.createGridWidgets();
-            this.renderGridWidgets();
-            this.container.screen.render();
+            this.rebuildScreens();
         };
         this.onLogUpdated = () => {
             this.renderGridWidgets();
         };
         this.updateUnits = () => {
             const runner = consts_1.MemKey_PhaseRunner.get();
-            this.units = runner.getUnits().filter(unit => {
+            this.allUnits = runner.getUnits().filter(unit => {
                 return unit.isInstanceOf(firebase_units_1.Unit_FirebaseHostingApp) || unit.isInstanceOf(firebase_units_1.Unit_FirebaseFunctionsApp);
             });
+            if (!this.focusUnits.length)
+                this.focusUnits = this.allUnits;
         };
         this.createGridWidgets = () => {
             this.destroyGridWidgets();
@@ -47,27 +49,50 @@ class BAIScreen_Launch extends BAIScreen_1.BAIScreen {
                         label: this.getGridWidgetLabel(widgetIndex),
                         border: { type: 'line' },
                         style: {
-                            border: { fg: 'blue' },
+                            hover: { border: { fg: 'blue' } },
+                            border: { fg: 'gray' },
+                            focus: { border: { fg: 'green' } }
                         },
                         valign: 'top',
                         align: 'left',
-                        mouse: true,
+                        interactive: true,
+                        focusable: true,
                     };
-                    this.gridCellWidgets.push(this.createWidget('log', props));
+                    const logWidget = this.createWidget('log', props);
+                    let doubleClickTimestamp = 0;
+                    const unitIndex = widgetIndex;
+                    logWidget.on('mouse', (event) => {
+                        if (!(event.button === 'middle' && event.action === 'mouseup'))
+                            return;
+                        if ((0, ts_common_1.currentTimeMillis)() - doubleClickTimestamp < 500) {
+                            try {
+                                this.toggleFullScreenMode(unitIndex);
+                            }
+                            catch (e) {
+                                console.log(e);
+                                console.log(e);
+                                console.log(e);
+                                console.log(e);
+                                console.log(e);
+                            }
+                            return;
+                        }
+                        doubleClickTimestamp = (0, ts_common_1.currentTimeMillis)();
+                    });
+                    this.gridCellWidgets.push(logWidget);
                     yPos += height; //Assuming all cells in a column have the same height
                     widgetIndex++;
                 });
                 xPos += col[0].width * 100; //Assuming all Cells have the same width
             });
         };
-        this.calculateGridDimensions = () => {
-            let n = this.units.length;
+        this.calculateGridDimensions = (count = this.focusUnits.length) => {
             //Add 1 more window for running logs
             if (this.withRunningLogs)
-                n++;
+                count++;
             const grid = [];
-            const columns = Math.ceil(Math.sqrt(n)); // Calculate number of columns
-            let remainingItems = n;
+            const columns = Math.ceil(Math.sqrt(count)); // Calculate number of columns
+            let remainingItems = count;
             for (let col = 0; col < columns; col++) {
                 const column = [];
                 const itemsInThisColumn = Math.ceil(remainingItems / (columns - col));
@@ -82,22 +107,25 @@ class BAIScreen_Launch extends BAIScreen_1.BAIScreen {
         };
         this.getGridWidgetLabel = (index) => {
             if (!this.withRunningLogs)
-                return this.units[index].config.label;
-            return index === this.units.length ? 'Running Logs' : this.units[index].config.label;
+                return this.focusUnits[index].config.label;
+            return index === this.focusUnits.length ? 'Running Logs' : this.focusUnits[index].config.label;
         };
         this.destroyGridWidgets = () => {
             this.gridCellWidgets.forEach(widget => widget.destroy());
+            this.gridCellWidgets.length = 0;
         };
         this.getContentForWidget = (widgetIndex) => {
             var _a, _b;
             if (!this.withRunningLogs) {
-                const unit = this.units[widgetIndex];
+                const unit = this.focusUnits[widgetIndex];
+                if (!unit)
+                    throw new ts_common_1.WhoCallThisException(`focusedUnits: ${this.focusUnits.length}[${widgetIndex}]`);
                 return (_a = unit.getLogs()) !== null && _a !== void 0 ? _a : `No logs for unit ${unit.config.label}`;
             }
             //With running logs, last index should return the running logs
-            if (widgetIndex === this.units.length)
+            if (widgetIndex === this.focusUnits.length)
                 return this.getLogs();
-            const unit = this.units[widgetIndex];
+            const unit = this.focusUnits[widgetIndex];
             return (_b = unit.getLogs()) !== null && _b !== void 0 ? _b : `No logs for unit ${unit.config.label}`;
         };
         this.renderGridWidgets = () => {
@@ -111,11 +139,29 @@ class BAIScreen_Launch extends BAIScreen_1.BAIScreen {
         //######################### Options #########################
         this.setWithRunningLogs = (val) => this.withRunningLogs = val;
     }
+    rebuildScreens() {
+        this.createGridWidgets();
+        this.renderGridWidgets();
+        this.container.screen.render();
+    }
     //######################### Content Creation #########################
     createContent() {
         this.updateUnits();
         this.createGridWidgets();
     }
+    scrollLog(direction) {
+        var _a;
+        const focusedWidget = this.getFocusedWidget();
+        // @ts-ignore
+        (_a = this.gridCellWidgets.find(log => log._label.content === focusedWidget._label.content)) === null || _a === void 0 ? void 0 : _a.scroll(direction);
+    }
+    toggleFullScreenMode(unitIndex) {
+        if (this.focusUnits.length !== this.allUnits.length)
+            this.focusUnits = this.allUnits;
+        else
+            this.focusUnits = [this.allUnits[unitIndex]];
+        this.rebuildScreens();
+    }
     //######################### Content Destruction #########################
     destroyContent() {
         this.destroyGridWidgets();
@@ -124,7 +170,7 @@ class BAIScreen_Launch extends BAIScreen_1.BAIScreen {
     render() {
         this.renderGridWidgets();
         this.logInfo('GRID DIMENSIONS', this.gridDimensions);
-        this.logInfo('UNITS', this.units.map(unit => unit.config.label));
+        this.logInfo('UNITS', this.focusUnits.map(unit => unit.config.label));
         this.logInfo('RUNNER UNITS', consts_1.MemKey_PhaseRunner.get().getUnits().map(unit => unit.config.label));
     }
 }

package/v2/screens/BAIScreen_UnitList.d.ts

@@ -17,6 +17,7 @@ export declare class BAIScreen_UnitList extends BAIScreen<State> implements Phas
     __onUnitStatusChange(unit: BaseUnit): void;
     __onUnitsChange(data: BaseUnit[]): void;
     protected onLogUpdated: () => void;
+    protected scrollLog(direction: number): void;
     protected destroyContent(): void;
     private destroyPhaseWidget;
     private destroyUnitListWidget;

package/v2/screens/BAIScreen_UnitList.js

@@ -28,6 +28,14 @@ class BAIScreen_UnitList extends BAIScreen_1.BAIScreen {
         this.createUnitListWidget();
         this.renderUnitList();
     }
+    scrollLog(direction) {
+        // const focusedWidget = this.getFocusedWidget();
+        // @ts-ignore
+        // console.log(`ZEVEL ${focusedWidget.type}`);
+        // if (focusedWidget !== this.logWidget)
+        // 	return;
+        this.logWidget.scroll(direction);
+    }
     //######################### Content Destruction #########################
     destroyContent() {
         this.destroyPhaseWidget();
@@ -69,7 +77,6 @@ class BAIScreen_UnitList extends BAIScreen_1.BAIScreen {
             },
             align: 'center',
             label: 'phase',
-            mouse: true
         };
         this.phaseWidget = this.createWidget('text', props);
         this.phaseWidget.on('mouse', (event) => {
@@ -142,9 +149,16 @@ class BAIScreen_UnitList extends BAIScreen_1.BAIScreen {
             style: {
                 border: { fg: 'blue' }
             },
-            valign: 'top',
-            align: 'left',
-            mouse: true,
+            scrollbar: {
+                ch: ' ',
+                track: {
+                    bg: 'grey',
+                },
+                style: {
+                    inverse: true,
+                },
+            },
+            interactive: true // This is typically required for focus management
         };
         this.logWidget = this.createWidget('log', props);
     }
@@ -172,10 +186,10 @@ class BAIScreen_UnitList extends BAIScreen_1.BAIScreen {
         });
     }
     renderLogs() {
-        const scrollPosition = this.logWidget.getScroll();
+        var _a, _b;
         const content = this.state.selectedUnit ? this.state.selectedUnit.getLogs() : this.getLogs();
+        this.logWidget.setLabel(` ${(_b = (_a = this.state.selectedUnit) === null || _a === void 0 ? void 0 : _a.config.label) !== null && _b !== void 0 ? _b : 'All Logs'} `);
         this.logWidget.setContent(content);
-        this.logWidget.setScroll(scrollPosition);
     }
     //######################### Events #########################
     onUnitSelect(unit, index) {
@@ -186,3 +200,4 @@ class BAIScreen_UnitList extends BAIScreen_1.BAIScreen {
     }
 }
 exports.BAIScreen_UnitList = BAIScreen_UnitList;
+// /Users/tacb0ss/.nvm/versions/node/v18.15.0/bin/ts-node -P /Users/tacb0ss/dev/quai/test/quai-web/_thunderstorm/commando/src/test/tsconfig.json /Users/tacb0ss/dev/quai/test/quai-web/_thunderstorm/commando/src/test/console/controlled-scroll/run.ts

package/v2/unit/core/BaseUnit.js

@@ -100,9 +100,11 @@ class BaseUnit extends ts_common_1.Logger {
     async kill() {
         if (!this.processTerminator.length)
             return this.setStatus('Killed');
+        const processTerminator = [...this.processTerminator];
+        this.processTerminator.length = 0;
         this.setStatus('Killing');
         try {
-            await Promise.all(this.processTerminator.map(toTerminate => toTerminate()));
+            await Promise.all(processTerminator.map(toTerminate => toTerminate()));
         }
         finally {
             this.setStatus('Killed');

package/v2/unit/core/Unit_Typescript.js

@@ -60,7 +60,12 @@ class Unit_Typescript extends BaseUnit_1.BaseUnit {
         const templatePath = `${unitRootPath}/${consts_1.CONST_PackageJSONTemplate}`;
         if (!fs.existsSync(templatePath))
             throw new ts_common_1.BadImplementationException(`Missing __package.json file in root for unit ${this.config.label}`);
-        this.packageJson.template = JSON.parse(await fs_1.promises.readFile(templatePath, 'utf-8'));
+        try {
+            this.packageJson.template = JSON.parse(await fs_1.promises.readFile(templatePath, 'utf-8'));
+        }
+        catch (e) {
+            throw new ts_common_1.BadImplementationException(`There is an issue in the __package.json file in root for unit ${this.config.label}`);
+        }
     }
     /**
      * Create a packageJson object for each target key