@nu-art/build-and-install 0.204.49 → 0.204.50

package/build-and-install.js

@@ -20,7 +20,6 @@ projectManager.registerPhase(phases_1.Phase_PackagePurge);
 projectManager.registerPhase(phases_1.Phase_InstallGlobals);
 projectManager.registerPhase(phases_1.Phase_InstallPackages);
 projectManager.registerPhase(phases_1.Phase_InstallPythonPackages);
-projectManager.registerPhase(phases_1.Phase_Clean);
 projectManager.registerPhase(phases_1.Phase_Lint);
 projectManager.registerPhase(phases_1.Phase_PrepareCompile);
 projectManager.registerPhase(phases_1.Phase_PreCompile);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/build-and-install",
-  "version": "0.204.49",
+  "version": "0.204.50",
   "description": "",
   "keywords": [
     "TacB0sS",
@@ -33,11 +33,13 @@
   "dependencies": {
     "chokidar": "^3.6.0",
     "neo-blessed": "^0.2.0",
+    "blessed": "^0.1.81",
     "glob": "^10.3.14",
     "@nu-art/ts-common": "~0.204.0",
     "@nu-art/commando": "~0.204.0"
   },
   "devDependencies": {
-    "@types/node": "^18.0.0"
+    "@types/node": "^18.0.0",
+    "@types/blessed": "^0.1.25"
   }
 }

package/phases/phases.d.ts

@@ -13,7 +13,6 @@ export declare const Phase_PackagePurge: BuildPhase;
 export declare const Phase_InstallGlobals: BuildPhase;
 export declare const Phase_InstallPackages: BuildPhase;
 export declare const Phase_InstallPythonPackages: BuildPhase;
-export declare const Phase_Clean: BuildPhase;
 export declare const Phase_Lint: BuildPhase;
 export declare const Phase_Debug: BuildPhase;
 export declare const Phase_PrepareCompile: BuildPhase;

package/phases/phases.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Phase_DeployBackend = exports.Phase_DeployFrontend = exports.Phase_Launch = exports.Phase_CompileWatch = exports.Phase_Compile = exports.Phase_PreCompile = exports.Phase_PrepareCompile = exports.Phase_Debug = exports.Phase_Lint = exports.Phase_Clean = exports.Phase_InstallPythonPackages = exports.Phase_InstallPackages = exports.Phase_InstallGlobals = exports.Phase_PackagePurge = exports.Phase_PrintEnv = exports.Phase_CheckCyclicImports = exports.Phase_PrintDependencyTree = exports.Phase_ResolvePackages = exports.Phase_ResolveEnv = exports.Phase_ResolveTemplate = exports.Phase_PrepareParams = exports.Phase_SetupProject = exports.Phase_SetWithThunderstorm = exports.Phase_PrintHelp = void 0;
+exports.Phase_DeployBackend = exports.Phase_DeployFrontend = exports.Phase_Launch = exports.Phase_CompileWatch = exports.Phase_Compile = exports.Phase_PreCompile = exports.Phase_PrepareCompile = exports.Phase_Debug = exports.Phase_Lint = exports.Phase_InstallPythonPackages = exports.Phase_InstallPackages = exports.Phase_InstallGlobals = exports.Phase_PackagePurge = exports.Phase_PrintEnv = exports.Phase_CheckCyclicImports = exports.Phase_PrintDependencyTree = exports.Phase_ResolvePackages = exports.Phase_ResolveEnv = exports.Phase_ResolveTemplate = exports.Phase_PrepareParams = exports.Phase_SetupProject = exports.Phase_SetWithThunderstorm = exports.Phase_PrintHelp = void 0;
 const ProjectManager_1 = require("../logic/ProjectManager");
 const map_project_packages_1 = require("../logic/map-project-packages");
 const fs = __importStar(require("fs"));
@@ -344,21 +344,6 @@ exports.Phase_InstallPythonPackages = {
             .execute();
     }
 };
-exports.Phase_Clean = {
-    type: ProjectManager_1.PackageBuildPhaseType_PackageWithOutput,
-    name: 'clean',
-    mandatoryPhases: [exports.Phase_ResolveEnv],
-    filter: async (pkg) => params_1.RuntimeParams.clean,
-    action: async (pkg) => {
-        if (pkg.type === types_1.PackageType_Python)
-            return;
-        const projectScreen = ProjectScreen_1.MemKey_ProjectScreen.get();
-        projectScreen.updateOrCreatePackage(pkg.name, 'Cleaning');
-        if (!fs.existsSync(pkg.output))
-            return;
-        await fs_1.promises.rm(pkg.output, { recursive: true, force: true });
-    }
-};
 exports.Phase_Lint = {
     type: 'package',
     name: 'lint',
@@ -420,6 +405,8 @@ exports.Phase_PrepareCompile = {
                     .append(`ENV=${params_1.RuntimeParams.environment} npm run build`);
             }
             else {
+                if (fs.existsSync(pkg.output))
+                    await fs_1.promises.rm(pkg.output, { recursive: true, force: true });
                 try {
                     const otherFiles = [
                         'json',
@@ -630,7 +617,7 @@ exports.Phase_Launch = {
         const projectManager = project_manager_1.MemKey_ProjectManager.get();
         const projectScreen = ProjectScreen_1.MemKey_ProjectScreen.get();
         if (!runningAppsLogs) {
-            projectScreen.dispose().releaseScreen();
+            projectScreen.dispose();
             projectManager.clearLogger();
             runningAppsLogs = new RunningProcessLogs_1.RunningProcessLogs();
             runningAppsLogs.create();

package/screen/ProjectScreen.d.ts

@@ -14,13 +14,13 @@ type State = {
     currentRunningPhase: CurrentRunningPhase;
 };
 export declare class ProjectScreen extends ConsoleScreen<State> {
-    private phaseBox;
+    private phase;
     private packageTable;
     private logger;
     readonly logClient: LogClient_MemBuffer;
     constructor(initialData: PackageStatus[]);
     getPackageData(): PackageStatus[];
-    protected createWidgets(): void;
+    protected createContent(): void;
     protected render(): void;
     private renderCurrentRunningPhase;
     private renderPackageTableTable;

package/screen/ProjectScreen.js

@@ -9,29 +9,26 @@ class ProjectScreen extends ConsoleScreen_1.ConsoleScreen {
         super({
             smartCSR: true,
             title: 'Build and install',
-            keyBinding: [{
-                    keys: ['escape', 'q', 'C-c'],
-                    callback: async () => {
-                        return process.exit(1); // Quit on q, esc, or ctrl-c
-                    }
-                }]
-        });
+        }, [{
+                keys: ['escape', 'q', 'C-c'],
+                callback: async () => {
+                    return process.exit(1); // Quit on q, esc, or ctrl-c
+                }
+            }]);
         this.logClient = new ts_common_1.LogClient_MemBuffer('output.txt');
         this.renderCurrentRunningPhase = () => {
             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.phase.setContent(content);
         };
         this.renderPackageTableTable = () => {
             var _a;
             const scrollPosition = this.packageTable.getScroll();
-            const selectedIndex = this.packageTable.selected;
             const data = [
                 ['Package Name', '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) => {
@@ -65,8 +62,8 @@ class ProjectScreen extends ConsoleScreen_1.ConsoleScreen {
     getPackageData() {
         return this.state.packageData;
     }
-    createWidgets() {
-        this.phaseBox = this.createWidget('text', {
+    createContent() {
+        this.phase = this.createWidget('text', {
             top: 0,
             left: 0,
             height: 3,
@@ -80,7 +77,7 @@ class ProjectScreen extends ConsoleScreen_1.ConsoleScreen {
             },
             align: 'center'
         });
-        this.packageTable = this.createWidget('listtable', {
+        this.packageTable = this.createWidget('listTable', {
             top: 3,
             left: 0,
             width: '40%',

package/screen/RunningProcessLogs.d.ts

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

package/screen/RunningProcessLogs.js

@@ -9,27 +9,26 @@ class RunningProcessLogs extends ConsoleScreen_1.ConsoleScreen {
         super({
             smartCSR: true,
             title: 'Runtime-Logs',
-            keyBinding: [
-                {
-                    keys: ['C-c'],
-                    callback: async () => {
-                        if (killed)
-                            return;
-                        killed = true;
-                        // this.dispose();
-                        await Promise.all(this.onTerminateCallbacks.map(callback => callback()));
-                        process.exit(0);
-                    }
+        }, [
+            {
+                keys: ['C-c'],
+                callback: async () => {
+                    if (killed)
+                        return;
+                    killed = true;
+                    // this.dispose();
+                    await Promise.all(this.onTerminateCallbacks.map(callback => callback()));
+                    process.exit(0);
                 }
-            ]
-        });
+            }
+        ]);
         this.onTerminateCallbacks = [];
         this.addOnTerminateCallback = (callback) => {
             this.onTerminateCallbacks.push(callback);
         };
         this.state = { logs: [] };
     }
-    createWidgets() {
+    createContent() {
         const logs = this.state.logs;
         const fittingGrid = gridPreset[logs.length - 1];
         if (!(0, ts_common_1.exists)(fittingGrid))

package/tsconfig.json

@@ -16,7 +16,10 @@
     "noUnusedLocals": true,
     "module": "commonjs",
     "sourceMap": true,
-    "strict": true
+    "strict": true,
+    "typeRoots": [
+      "../types"
+    ]
   },
   "esModuleInterop": true,
   "module": "ES2020"