@nu-art/build-and-install 0.204.24 → 0.204.26

package/logic/ProjectManager.js

@@ -74,12 +74,12 @@ class ProjectManager extends ts_common_1.Logger {
     showAllLogs() {
         var _a;
         this.clearLogger();
-        (_a = this.projectScreen) === null || _a === void 0 ? void 0 : _a.disable();
+        (_a = this.projectScreen) === null || _a === void 0 ? void 0 : _a.dispose();
         ts_common_1.BeLogged.addClient(this.logger = ts_common_1.LogClient_Terminal);
     }
     showPrettyLogs() {
         this.clearLogger();
-        this.projectScreen.enable();
+        this.projectScreen.create();
         ts_common_1.BeLogged.addClient(this.logger = this.projectScreen.logClient);
     }
     loadPackage() {

package/package.json

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

package/phases/phases.js

@@ -92,7 +92,7 @@ exports.Phase_SetWithThunderstorm = {
         packages.packages = packages.packages.filter(filter);
         packages.packagesDependency = (_a = packages.packagesDependency) === null || _a === void 0 ? void 0 : _a.map(_packageArray => _packageArray.filter(filter));
         const projectScreen = ProjectScreen_1.MemKey_ProjectScreen.get();
-        if (!projectScreen.packageData.length) {
+        if (!projectScreen.getPackageData().length) {
             packages.packagesDependency.map(packages => packages.map(pkg => projectScreen.updateOrCreatePackage(pkg.name, 'Initiated')));
         }
     }
@@ -593,10 +593,10 @@ exports.Phase_Launch = {
         const projectManager = project_manager_1.MemKey_ProjectManager.get();
         const projectScreen = ProjectScreen_1.MemKey_ProjectScreen.get();
         if (!runningAppsLogs) {
-            projectScreen.disable();
+            projectScreen.dispose();
             projectManager.clearLogger();
             runningAppsLogs = new RunningProcessLogs_1.RunningProcessLogs();
-            runningAppsLogs.enable();
+            runningAppsLogs.create();
         }
         const logClient = new ts_common_1.LogClient_MemBuffer(pkg.name);
         logClient.setForTerminal();
@@ -613,23 +613,30 @@ exports.Phase_Launch = {
         if (pkg.type === 'firebase-functions-app') {
             await (0, ts_common_1.sleep)(1000 * counter++);
             const allPorts = Array.from({ length: 10 }, (_, i) => `${pkg.envConfig.basePort + i}`);
-            const command = nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic)
+            runningAppsLogs.registerApp(pkg.name, logClient);
+            await nvm_1.NVM.createCommando(basic_1.Cli_Basic)
+                .setUID(pkg.name).debug()
+                .append(`array=($(lsof -ti:${allPorts.join(',')}))`)
+                .append(`((\${#array[@]} > 0)) && kill -9 "\${array[@]}"`)
+                .execute();
+            await nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic)
                 .setUID(pkg.name)
                 .cd(pkg.path)
-                .append(`nvm use`)
-                .append(`array=($(lsof -ti:${allPorts.join(',')}))`)
-                .append(`((\${#array[@]} > 0)) && kill -9 "\${array[@]}"`);
-            command.append(`firebase emulators:start --export-on-exit --import=.trash/data ${runInDebug ? `--inspect-functions ${pkg.envConfig.ssl}` : ''}`);
-            runningAppsLogs.registerApp(pkg.name, logClient);
-            return command
+                .append(`ts-node src/main/proxy.ts`)
+                .execute();
+            await nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic)
+                .setUID(pkg.name)
+                .cd(pkg.path)
+                .append(`firebase emulators:start --export-on-exit --import=.trash/data ${runInDebug ? `--inspect-functions ${pkg.envConfig.ssl}` : ''}`)
                 .execute();
+            return;
         }
         if (pkg.type === 'firebase-hosting-app') {
             runningAppsLogs.registerApp(pkg.name, logClient);
             if (!pkg.envConfig.hostingPort)
                 throw new ts_common_1.BadImplementationException('Missing hosting port in envConfig');
             return nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic)
-                .setUID(pkg.name)
+                .setUID(pkg.name).debug()
                 .cd(pkg.path)
                 .append(`array=($(lsof -ti:${[pkg.envConfig.hostingPort].join(',')}))`)
                 .append(`((\${#array[@]} > 0)) && kill -9 "\${array[@]}"`)

package/screen/ProjectScreen.d.ts

@@ -1,29 +1,31 @@
 import { MemKey } from '@nu-art/ts-common/mem-storage/MemStorage';
 import { LogClient_MemBuffer } from '@nu-art/ts-common';
+import { ConsoleScreen } from '@nu-art/commando/console/ConsoleScreen';
 export type PackageStatus = {
     packageName: string;
     status: string;
     error?: string;
 };
-export declare class ProjectScreen {
-    readonly packageData: PackageStatus[];
-    private currentRunningPhase;
-    private screen;
+type CurrentRunningPhase = {
+    phaseName: string;
+};
+type State = {
+    packageData: PackageStatus[];
+    currentRunningPhase: CurrentRunningPhase;
+};
+export declare class ProjectScreen extends ConsoleScreen<State> {
     private phaseBox;
     private packageTable;
     private logger;
-    private titleElement;
     readonly logClient: LogClient_MemBuffer;
-    private enabled;
     constructor(initialData: PackageStatus[]);
-    enable(): void;
-    isEnabled(): boolean;
-    disable(): void;
-    renderScreen: () => void;
-    endRun: () => void;
+    getPackageData(): PackageStatus[];
+    protected createWidgets(): void;
+    protected render(): void;
     private renderCurrentRunningPhase;
     private renderPackageTableTable;
     updateOrCreatePackage: (name: string, status: string, error?: string) => void;
     updateRunningPhase: (name: string) => void;
 }
 export declare const MemKey_ProjectScreen: MemKey<ProjectScreen>;
+export {};

package/screen/ProjectScreen.js

@@ -1,80 +1,57 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemKey_ProjectScreen = exports.ProjectScreen = void 0;
-// @ts-ignore
-const blessed = __importStar(require("neo-blessed"));
 const MemStorage_1 = require("@nu-art/ts-common/mem-storage/MemStorage");
 const ts_common_1 = require("@nu-art/ts-common");
-class ProjectScreen {
+const ConsoleScreen_1 = require("@nu-art/commando/console/ConsoleScreen");
+class ProjectScreen extends ConsoleScreen_1.ConsoleScreen {
     constructor(initialData) {
+        super({
+            smartCSR: true,
+            title: 'Build and install',
+            keyBinding: [{
+                    keys: ['escape', 'q', 'C-c'],
+                    callback: () => {
+                        return process.exit(1); // Quit on q, esc, or ctrl-c
+                    }
+                }]
+        });
         this.logClient = new ts_common_1.LogClient_MemBuffer('output.txt');
-        this.enabled = false;
-        this.renderScreen = () => {
-            if (!this.enabled)
-                return;
-            this.renderCurrentRunningPhase();
-            this.renderPackageTableTable();
-            this.logger.setContent(this.logClient.buffers[0]);
-            this.screen.render();
-        };
-        this.endRun = () => {
-            this.disable();
-            console.log(this.logClient.buffers[0]);
-        };
         this.renderCurrentRunningPhase = () => {
-            var _a, _b;
-            const content = `Phase Name: ${(_b = (_a = this.currentRunningPhase) === null || _a === void 0 ? void 0 : _a.phaseName) !== null && _b !== void 0 ? _b : 'No Phase'}\n`;
+            var _a, _b, _c;
+            const content = `Phase Name: ${(_c = (_b = (_a = this.state) === null || _a === void 0 ? void 0 : _a.currentRunningPhase) === null || _b === void 0 ? void 0 : _b.phaseName) !== null && _c !== void 0 ? _c : 'No Phase'}\n`;
             this.phaseBox.setContent(content);
         };
         this.renderPackageTableTable = () => {
+            var _a;
             const scrollPosition = this.packageTable.getScroll();
             const selectedIndex = this.packageTable.selected;
             const data = [
                 ['Package Name', 'Status'],
-                ...this.packageData.map(pkg => [pkg.packageName, pkg.status])
+                ...((_a = this.state.packageData) !== null && _a !== void 0 ? _a : []).map(pkg => [pkg.packageName, pkg.status])
             ];
             this.packageTable.setData(data);
             this.packageTable.select(selectedIndex);
             this.packageTable.setScroll(scrollPosition);
         };
         this.updateOrCreatePackage = (name, status, error) => {
-            const index = this.packageData.findIndex(pkg => pkg.packageName === name);
+            const packageData = this.state.packageData;
+            const index = packageData.findIndex(pkg => pkg.packageName === name);
             if (index !== -1) {
-                this.packageData[index].status = status;
-                this.packageData[index].error = error;
-                return this.renderScreen();
+                packageData[index].status = status;
+                packageData[index].error = error;
+            }
+            else {
+                packageData.push({ packageName: name, status });
             }
-            this.packageData.push({ packageName: name, status });
-            this.renderScreen();
+            this.setState({ packageData });
         };
         this.updateRunningPhase = (name) => {
-            this.currentRunningPhase = { phaseName: name };
-            this.renderScreen();
+            this.setState({ currentRunningPhase: { phaseName: name } });
         };
-        this.packageData = initialData;
+        this.setState({
+            packageData: initialData
+        });
         this.logClient.setForTerminal();
         this.logClient.setComposer((tag, level) => {
             ts_common_1._logger_finalDate.setTime(Date.now() - ts_common_1._logger_timezoneOffset);
@@ -82,21 +59,14 @@ class ProjectScreen {
             return `  ${date} ${(0, ts_common_1._logger_getPrefix)(level)} ${tag}:  `;
         });
         this.logClient.setLogAppendedListener(() => {
-            this.renderScreen();
+            this.setState({});
         });
     }
-    enable() {
-        this.enabled = true;
-        this.screen = blessed.screen({
-            smartCSR: true,
-            title: 'Build and install',
-        });
-        this.screen.key(['escape', 'q', 'C-c'], () => {
-            return process.exit(1); // Quit on q, esc, or ctrl-c
-        });
-        // Create the UI components
-        this.phaseBox = blessed.text({
-            parent: this.screen,
+    getPackageData() {
+        return this.state.packageData;
+    }
+    createWidgets() {
+        this.phaseBox = this.createWidget('text', {
             top: 0,
             left: 0,
             height: 3,
@@ -110,8 +80,7 @@ class ProjectScreen {
             },
             align: 'center'
         });
-        this.packageTable = blessed.listtable({
-            parent: this.screen,
+        this.packageTable = this.createWidget('listtable', {
             top: 3,
             left: 0,
             width: '40%',
@@ -122,6 +91,7 @@ class ProjectScreen {
             tags: true,
             style: {
                 border: { fg: 'blue' },
+                // @ts-ignore
                 header: { bold: true },
                 cell: { fg: 'white', selected: { bg: 'blue' } }
             },
@@ -134,8 +104,7 @@ class ProjectScreen {
                 },
             }
         });
-        this.titleElement = blessed.text({
-            parent: this.screen,
+        this.createWidget('text', {
             top: 0,
             right: 0,
             width: '60%',
@@ -149,8 +118,7 @@ class ProjectScreen {
             },
             align: 'center'
         });
-        this.logger = blessed.log({
-            parent: this.screen,
+        this.logger = this.createWidget('log', {
             top: 3,
             right: 0,
             width: '60%',
@@ -167,21 +135,10 @@ class ProjectScreen {
             align: 'left'
         });
     }
-    isEnabled() {
-        return this.enabled;
-    }
-    disable() {
-        this.enabled = false;
-        if (!this.screen)
-            return;
-        this.phaseBox.detach();
-        this.packageTable.detach();
-        this.titleElement.detach();
-        this.logger.detach();
-        this.screen.detach();
-        this.screen.clear();
-        this.screen.destroy();
-        process.stdout.write('\x1bc'); // This sends the terminal reset escape code
+    render() {
+        this.renderCurrentRunningPhase();
+        this.renderPackageTableTable();
+        this.logger.setContent(this.logClient.buffers[0]);
     }
 }
 exports.ProjectScreen = ProjectScreen;

package/screen/RunningProcessLogs.d.ts

@@ -7,8 +7,8 @@ export declare class RunningProcessLogs extends ConsoleScreen<{
     }[];
 }> {
     constructor();
+    protected createWidgets(): void;
     registerApp(appKey: string, logClient: LogClient_MemBuffer): void;
     unregisterApp(appKey: string): void;
-    private recalculateWidgets;
     protected render(): void;
 }

package/screen/RunningProcessLogs.js

@@ -17,30 +17,8 @@ class RunningProcessLogs extends ConsoleScreen_1.ConsoleScreen {
         });
         this.state = { logs: [] };
     }
-    registerApp(appKey, logClient) {
+    createWidgets() {
         const logs = this.state.logs;
-        const foundLog = logs.find(log => log.key === appKey);
-        if (foundLog)
-            throw new ts_common_1.BadImplementationException(`already have log for appkey: ${appKey}`);
-        logs.push({ key: appKey, logClient });
-        this.recalculateWidgets(logs);
-        logClient.setLogAppendedListener(() => {
-            this.render();
-            // might have a leak.. need to remove the listener at some point
-        });
-        this.setState({ logs });
-    }
-    unregisterApp(appKey) {
-        const foundLog = this.state.logs.find(log => log.key === appKey);
-        if (!foundLog)
-            throw new ts_common_1.BadImplementationException(`Could not find log for appkey: ${appKey}`);
-        const logs = this.state.logs;
-        (0, ts_common_1.removeItemFromArray)(logs, foundLog);
-        this.recalculateWidgets(logs);
-        this.setState({ logs });
-    }
-    recalculateWidgets(logs) {
-        this.clearScreen(false);
         const fittingGrid = gridPreset[logs.length - 1];
         if (!(0, ts_common_1.exists)(fittingGrid))
             return;
@@ -78,10 +56,40 @@ class RunningProcessLogs extends ConsoleScreen_1.ConsoleScreen {
             xPos += column[0][0] * 100;
         });
     }
-    render() {
-        this.state.logs.forEach((log, i) => {
-            this.widgets[i].setContent(log.logClient.buffers[0]);
+    registerApp(appKey, logClient) {
+        const logs = this.state.logs;
+        const foundLog = logs.find(log => log.key === appKey);
+        if (foundLog)
+            throw new ts_common_1.BadImplementationException(`already have log for appkey: ${appKey}`);
+        logs.push({ key: appKey, logClient });
+        this.dispose();
+        this.create();
+        logClient.setLogAppendedListener(() => {
+            this.render();
+            // might have a leak.. need to remove the listener at some point
         });
+        this.setState({ logs });
+    }
+    unregisterApp(appKey) {
+        const foundLog = this.state.logs.find(log => log.key === appKey);
+        if (!foundLog)
+            throw new ts_common_1.BadImplementationException(`Could not find log for appkey: ${appKey}`);
+        const logs = this.state.logs;
+        (0, ts_common_1.removeItemFromArray)(logs, foundLog);
+        this.dispose();
+        this.create();
+        this.setState({ logs });
+    }
+    render() {
+        try {
+            this.state.logs.forEach((log, i) => {
+                var _a, _b;
+                (_a = this.widgets[i]) === null || _a === void 0 ? void 0 : _a.setContent((_b = log.logClient.buffers[0]) !== null && _b !== void 0 ? _b : 'asdsd');
+            });
+        }
+        catch (e) {
+            console.log(e);
+        }
     }
 }
 exports.RunningProcessLogs = RunningProcessLogs;

package/v2/BasePackage.d.ts

@@ -0,0 +1,4 @@
+export declare class BasePackage {
+    readonly name: string;
+    constructor(name: string);
+}

package/v2/BasePackage.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BasePackage = void 0;
+class BasePackage {
+    constructor(name) {
+        this.name = name;
+    }
+}
+exports.BasePackage = BasePackage;

package/v2/ProjectManagerV2.d.ts

@@ -0,0 +1,15 @@
+import { AsyncVoidFunction } from '@nu-art/ts-common';
+export type PhasesImplementor<Phases extends Phase<string>[]> = {
+    [K in Phases[number]['method']]?: AsyncVoidFunction;
+};
+export type Phase<PhaseMethod extends string> = {
+    name?: string;
+    method: PhaseMethod;
+};
+export declare class ProjectManagerV2<Phases extends Phase<string>[]> {
+    private manageables;
+    phases: Phase<string>[];
+    constructor(...phases: Phases);
+    register(item: PhasesImplementor<Phases>): this;
+    execute(): Promise<void>;
+}

package/v2/ProjectManagerV2.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProjectManagerV2 = void 0;
+class ProjectManagerV2 {
+    constructor(...phases) {
+        this.manageables = [];
+        this.phases = [];
+        this.phases = phases;
+    }
+    register(item) {
+        this.manageables.push(item);
+        return this;
+    }
+    async execute() {
+        var _a;
+        for (const phase of this.phases) {
+            for (const manageable of this.manageables) {
+                await ((_a = manageable[phase.method]) === null || _a === void 0 ? void 0 : _a.call(manageable));
+            }
+        }
+    }
+}
+exports.ProjectManagerV2 = ProjectManagerV2;

package/v2/test/test.d.ts

@@ -0,0 +1 @@
+export {};

package/v2/test/test.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ProjectManagerV2_1 = require("../ProjectManagerV2");
+const BasePackage_1 = require("../BasePackage");
+const Phase_A = {
+    name: 'Compile',
+    method: 'compile'
+};
+const Phase_B = {
+    name: 'Launch',
+    method: 'launch'
+};
+const AllPhases = [
+    Phase_A,
+    Phase_B,
+];
+class Package_Typescript extends BasePackage_1.BasePackage {
+}
+class Package_Lib extends Package_Typescript {
+    constructor(name) {
+        super(name);
+        this.compile = async () => {
+            // compile fe custom to fe
+        };
+    }
+}
+class Package_FirebaseHosting extends Package_Typescript {
+    constructor(name) {
+        super(name);
+        this.launch = async () => {
+            // launch FE
+        };
+        this.compile = async () => {
+            // compile fe custom to fe
+        };
+    }
+}
+class Package_FirebaseFunction extends Package_Typescript {
+    constructor(name) {
+        super(name);
+        this.launch = async () => {
+            // launch BE
+        };
+        this.compile = async () => {
+            // compile fe custom to fe
+        };
+    }
+}
+const item1 = new Package_FirebaseHosting('item-1');
+const item2 = new Package_Lib('item-2');
+const item3 = new Package_FirebaseFunction('item-3');
+new ProjectManagerV2_1.ProjectManagerV2(...AllPhases)
+    .register(item1)
+    .register(item2)
+    .register(item3)
+    .execute()
+    .then(() => console.log('completed'))
+    .catch((e) => console.error(e));