@nu-art/build-and-install 0.204.3 → 0.204.4

package/core/types/package/package.d.ts

@@ -1,16 +1,41 @@
 export declare const PackageType_InfraLib: "infra-lib";
 export declare const PackageType_ProjectLib: "project-lib";
 export declare const PackageType_FirebaseHostingApp: "firebase-hosting-app";
+export declare const PackageType_FirebaseHostingAndFunctionApp: "firebase-app";
 export declare const PackageType_FirebaseFunctionsApp: "firebase-functions-app";
 export declare const PackageType_Sourceless: "sourceless";
 export declare const PackageTypes: readonly ["infra-lib", "project-lib", "firebase-hosting-app", "firebase-functions-app", "sourceless"];
 export declare const PackageTypesWithOutput: ("infra-lib" | "project-lib" | "firebase-hosting-app" | "firebase-functions-app")[];
 export type PackageType = typeof PackageTypes[number];
-export type FirebasePackageConfig<Env extends string = string> = {
-    envs: Env[];
-    projectIds: {
-        [env in Env]: string;
+export type FirebaseEnvConfig<Env extends string> = {
+    env: Env;
+    isLocal?: boolean;
+    projectId: string;
+    name: string;
+    backend: {
+        url: string;
+        minLogLevel?: 'Verbose' | 'Debug' | 'Info' | 'Warning' | 'Error';
+        compress?: boolean;
+        timeout?: number;
+    };
+    firebase: {
+        listener?: {
+            config: {
+                apiKey: string;
+                authDomain: string;
+                databaseURL: string;
+                projectId: string;
+                storageBucket: string;
+                messagingSenderId: string;
+                appId: string;
+                measurementId: string;
+            };
+        };
     };
+};
+export type FirebasePackageConfig<Env extends string = string> = {
+    envs: FirebaseEnvConfig<Env>[];
+    name: string;
     debugPort: number;
     basePort: number;
     pathToFirebaseConfig: string;
@@ -36,30 +61,27 @@ export type Package_Base = {
 export type Package_Sourceless = Package_Base & {
     type: typeof PackageType_Sourceless;
 };
-export type Package_FirebaseHostingApp = Package_Base & {
-    type: typeof PackageType_FirebaseHostingApp;
+export type Package_WithSources = Package_Base & {
     output: string;
     customTsConfig?: boolean;
     sources?: string[];
+};
+export type Package_FirebaseBase = Package_WithSources & {
     envConfig: FirebasePackageConfig;
 };
-export type Package_FirebaseFunctionsApp = Package_Base & {
+export type Package_FirebaseHostingApp = Package_FirebaseBase & {
+    type: typeof PackageType_FirebaseHostingApp;
+};
+export type Package_FirebaseFunctionsApp = Package_FirebaseBase & {
     type: typeof PackageType_FirebaseFunctionsApp;
-    output: string;
-    customTsConfig?: boolean;
-    sources?: string[];
-    envConfig: FirebasePackageConfig;
 };
-export type Package_InfraLib = Package_Base & {
+export type Package_FirebaseHostingAndFunctionApp = Package_FirebaseBase & {
+    type: typeof PackageType_FirebaseHostingAndFunctionApp;
+};
+export type Package_InfraLib = Package_WithSources & {
     type: typeof PackageType_InfraLib;
-    output: string;
-    customTsConfig?: boolean;
-    sources?: string[];
 };
-export type Package_ProjectLib = Package_Base & {
+export type Package_ProjectLib = Package_WithSources & {
     type: typeof PackageType_ProjectLib;
-    output: string;
-    customTsConfig?: boolean;
-    sources?: string[];
 };
 export type Package = Package_Sourceless | Package_FirebaseHostingApp | Package_FirebaseFunctionsApp | Package_InfraLib | Package_ProjectLib;

package/core/types/package/package.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PackageTypesWithOutput = exports.PackageTypes = exports.PackageType_Sourceless = exports.PackageType_FirebaseFunctionsApp = exports.PackageType_FirebaseHostingApp = exports.PackageType_ProjectLib = exports.PackageType_InfraLib = void 0;
+exports.PackageTypesWithOutput = exports.PackageTypes = exports.PackageType_Sourceless = exports.PackageType_FirebaseFunctionsApp = exports.PackageType_FirebaseHostingAndFunctionApp = exports.PackageType_FirebaseHostingApp = exports.PackageType_ProjectLib = exports.PackageType_InfraLib = void 0;
 exports.PackageType_InfraLib = 'infra-lib';
 exports.PackageType_ProjectLib = 'project-lib';
 exports.PackageType_FirebaseHostingApp = 'firebase-hosting-app';
+exports.PackageType_FirebaseHostingAndFunctionApp = 'firebase-app';
 exports.PackageType_FirebaseFunctionsApp = 'firebase-functions-app';
 exports.PackageType_Sourceless = 'sourceless';
 exports.PackageTypes = [exports.PackageType_InfraLib, exports.PackageType_ProjectLib, exports.PackageType_FirebaseHostingApp, exports.PackageType_FirebaseFunctionsApp, exports.PackageType_Sourceless];

package/defaults/consts.d.ts

@@ -15,6 +15,8 @@ export declare const Default_Files: {
 };
 export declare const Const_FirebaseConfigKeys: (keyof typeof Default_Files['firebaseConfig'])[];
 export declare const Default_OutputFiles: {
+    output: string;
+    outputLogs: string;
     runningStatus: string;
 };
 export declare const MemKey_DefaultFiles: MemKey<{

package/defaults/consts.js

@@ -27,8 +27,11 @@ exports.Const_FirebaseConfigKeys = [
     'firestoreRules',
     'storageRules',
 ];
+const Default_OutputPath = './.trash';
 exports.Default_OutputFiles = {
-    runningStatus: './.trash/running-status.json'
+    output: Default_OutputPath,
+    outputLogs: `${Default_OutputPath}/logs`,
+    runningStatus: `${Default_OutputPath}/running-status.json`
 };
 exports.MemKey_DefaultFiles = new MemStorage_1.MemKey('default-files');
 exports.MemKey_RunningStatus = new MemStorage_1.MemKey('running-status');

package/logic/ProjectManager.d.ts

@@ -32,7 +32,11 @@ export declare class ProjectManager extends Logger {
     private dryRun;
     private terminate;
     private prevRunningStatus?;
+    private readonly projectScreen;
+    private logger?;
     constructor();
+    showAllLogs(): void;
+    showPrettyLogs(): void;
     private loadPackage;
     registerPhase(phase: BuildPhase): void;
     updateRunningStatus: (runningStatus?: RunningStatus) => Promise<void>;

package/logic/ProjectManager.js

@@ -1,4 +1,27 @@
 "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.ProjectManager = exports.PackageBuildPhaseType_Project = exports.PackageBuildPhaseType_PackageWithOutput = exports.PackageBuildPhaseType_Package = void 0;
 const ts_common_1 = require("@nu-art/ts-common");
@@ -6,11 +29,12 @@ const params_1 = require("../core/params/params");
 const tools_1 = require("@nu-art/commando/core/tools");
 const map_project_packages_1 = require("./map-project-packages");
 const consts_1 = require("../core/consts");
-const fs = require("fs");
+const fs = __importStar(require("fs"));
 const fs_1 = require("fs");
 const consts_2 = require("../defaults/consts");
 const MemStorage_1 = require("@nu-art/ts-common/mem-storage/MemStorage");
 const project_manager_1 = require("../project-manager");
+const ProjectScreen_1 = require("../screen/ProjectScreen");
 exports.PackageBuildPhaseType_Package = 'package';
 exports.PackageBuildPhaseType_PackageWithOutput = 'package-with-output';
 exports.PackageBuildPhaseType_Project = 'project';
@@ -24,6 +48,7 @@ function resolveAllMandatoryPhases(phase) {
     }
     return (0, ts_common_1.filterDuplicates)(result, result => result.name);
 }
+ts_common_1.DebugFlag.DefaultLogLevel = ts_common_1.LogLevel.Verbose;
 class ProjectManager extends ts_common_1.Logger {
     constructor() {
         super();
@@ -31,11 +56,27 @@ class ProjectManager extends ts_common_1.Logger {
         this.dryRun = params_1.RuntimeParams.dryRun;
         this.terminate = false;
         this.updateRunningStatus = async (runningStatus = consts_2.MemKey_RunningStatus.get(undefined)) => {
-            if (runningStatus)
-                return fs_1.promises.writeFile(consts_2.Default_OutputFiles.runningStatus, (0, ts_common_1.__stringify)(runningStatus, true));
+            if (!runningStatus)
+                return;
+            if (!fs.existsSync(consts_2.Default_OutputFiles.output))
+                await fs_1.promises.mkdir(consts_2.Default_OutputFiles.output, { recursive: true });
+            await fs_1.promises.writeFile(consts_2.Default_OutputFiles.runningStatus, (0, ts_common_1.__stringify)(runningStatus, true));
         };
-        ts_common_1.BeLogged.addClient(ts_common_1.LogClient_Terminal);
-        this.setMinLevel(ts_common_1.LogLevel.Verbose);
+        this.projectScreen = new ProjectScreen_1.ProjectScreen([]);
+        params_1.RuntimeParams.allLogs ? this.showAllLogs() : this.showPrettyLogs();
+    }
+    showAllLogs() {
+        var _a;
+        if (this.logger)
+            ts_common_1.BeLogged.removeConsole(this.logger);
+        (_a = this.projectScreen) === null || _a === void 0 ? void 0 : _a.disable();
+        ts_common_1.BeLogged.addClient(this.logger = ts_common_1.LogClient_Terminal);
+    }
+    showPrettyLogs() {
+        if (this.logger)
+            ts_common_1.BeLogged.removeConsole(this.logger);
+        this.projectScreen.enable();
+        ts_common_1.BeLogged.addClient(this.logger = this.projectScreen.logClient);
     }
     loadPackage() {
         const pathToConfig = (0, tools_1.convertToFullPath)('./.config/project-config.ts');
@@ -75,6 +116,7 @@ class ProjectManager extends ts_common_1.Logger {
         this.logDebug('Scheduling phases: ', phasesToRun.map(mapToName));
         if (phasesToRun[0].type === 'project')
             return async () => {
+                var _a;
                 if (this.terminate)
                     return this.logInfo(`Skipping project phases:`, phasesToRun.map(mapToName));
                 let didRun = false;
@@ -93,6 +135,8 @@ class ProjectManager extends ts_common_1.Logger {
                         this.logVerbose('Skipping duo continue');
                         continue;
                     }
+                    //Update project screen
+                    (_a = this.projectScreen) === null || _a === void 0 ? void 0 : _a.updateRunningPhase(phase.name);
                     if (this.dryRun) {
                         await (0, ts_common_1.sleep)(200);
                     }
@@ -115,6 +159,7 @@ class ProjectManager extends ts_common_1.Logger {
                         delete this.prevRunningStatus;
                     let didPrintPackages = false;
                     const values = (0, ts_common_1.flatArray)(packages.map(async (pkg) => {
+                        var _a, _b, _c;
                         for (const phase of phasesToRun) {
                             if (ProjectManager.isAborted())
                                 return;
@@ -133,9 +178,17 @@ class ProjectManager extends ts_common_1.Logger {
                             }
                             didRun = true;
                             this.logDebug(`   - ${pkg.name}:${phase.name}`);
+                            //Update project screen
+                            (_a = this.projectScreen) === null || _a === void 0 ? void 0 : _a.updateRunningPhase(phase.name);
                             // if prev running status still exists skip execution
                             if (this.prevRunningStatus && !phase.isMandatory) {
+                                continue;
+                            }
+                            // skip packages indexes
+                            const packageDependencyIndex = (_c = (_b = this.prevRunningStatus) === null || _b === void 0 ? void 0 : _b.packageDependencyIndex) !== null && _c !== void 0 ? _c : 0;
+                            if (packageDependencyIndex > i) {
                                 this.logVerbose('Skipping duo continue');
+                                this.projectScreen.updateOrCreatePackage(pkg.name, 'Skipped');
                                 continue;
                             }
                             if (this.dryRun) {
@@ -173,6 +226,8 @@ class ProjectManager extends ts_common_1.Logger {
             consts_2.MemKey_DefaultFiles.set(consts_2.Default_Files);
             // Set default value to memKey
             consts_2.MemKey_RunningStatus.set({ phaseKey: '' });
+            //Set project screen
+            ProjectScreen_1.MemKey_ProjectScreen.set(this.projectScreen);
             const listener = async (status) => {
                 this.logDebug('SIGINT - running status:', status);
                 await this.updateRunningStatus();
@@ -200,6 +255,7 @@ class ProjectManager extends ts_common_1.Logger {
             catch (e) {
                 this.logError(e);
             }
+            ProjectScreen_1.MemKey_ProjectScreen.get().endRun();
             process.off('SIGINT', listener);
             await this.updateRunningStatus();
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/build-and-install",
-  "version": "0.204.3",
+  "version": "0.204.4",
   "description": "",
   "keywords": [
     "TacB0sS",
@@ -32,6 +32,8 @@
   },
   "dependencies": {
     "chokidar": "^3.6.0",
+    "neo-blessed": "^0.2.0",
+    "glob": "^10.3.14",
     "@nu-art/ts-common": "~0.204.0",
     "@nu-art/commando": "~0.204.0"
   },

package/phases/phases.d.ts

@@ -17,7 +17,8 @@ export declare const Phase_InstallPackages: BuildPhase;
 export declare const Phase_Clean: BuildPhase;
 export declare const Phase_Lint: BuildPhase;
 export declare const Phase_Debug: BuildPhase;
-export declare const Phase_PrepareWatch: BuildPhase;
+export declare const Phase_PrepareCompile: BuildPhase;
+export declare const Phase_PreCompile: BuildPhase;
 export declare const Phase_Compile: BuildPhase;
 export declare const Phase_CompileWatch: BuildPhase;
 export declare const Phase_Launch: BuildPhase;