@nu-art/build-and-install 0.204.95 → 0.204.97

package/build-and-install.js

@@ -11,12 +11,14 @@ if (params_1.RuntimeParams.runWithThunderstorm)
 runner
     .execute()
     .then(() => {
-    ts_common_1.StaticLogger.logInfo('completed');
     process.on('SIGINT', () => {
-        console.log('DEADEDAEDAEDAEDAEDAD');
+        console.log('completed');
         return process.exit(0);
     });
 })
     .catch(err => {
-    ts_common_1.StaticLogger.logError('Failed with error: ', err);
+    process.on('SIGINT', () => {
+        console.log('Failed with error: ', err);
+        return process.exit(1);
+    });
 });

package/package.json

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

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

@@ -6,7 +6,8 @@ export declare class PhaseRunner extends BaseUnit implements UnitPhaseImplemento
     private readonly phases;
     private readonly units;
     private unitDependencyTree;
-    private readonly project;
+    private readonly projectPath;
+    private projectConfig;
     private killed?;
     private runningStatus;
     private phaseFilter;
@@ -16,6 +17,9 @@ export declare class PhaseRunner extends BaseUnit implements UnitPhaseImplemento
      */
     private killCounter;
     private static KILL_THRESHOLD;
+    static instance: PhaseRunner;
+    private readonly screenManager;
+    private defaultFileRoutes;
     constructor(projectPath: RelativePath);
     protected init(): Promise<void>;
     private filterUnits;

package/v2/phase-runner/PhaseRunner.js

@@ -73,10 +73,14 @@ class PhaseRunner extends core_1.BaseUnit {
             }
         };
         this.getPhases = () => [...this.phases];
+        if ((0, ts_common_1.exists)(PhaseRunner.instance))
+            throw new ts_common_1.MUSTNeverHappenException('phase runner instance must be unique');
+        Error.stackTraceLimit = 50;
         this.addToClassStack(PhaseRunner);
+        this.screenManager = new BAIScreenManager_1.BAIScreenManager();
         this.phases = [];
         this.units = [this];
-        this.project = { path: (0, tools_1.convertToFullPath)(projectPath), config: {} };
+        this.projectPath = (0, tools_1.convertToFullPath)(projectPath);
         this.phaseFilter = this.phaseFilters[types_1.PhaseRunnerMode_Normal];
         this.setMinLevel(ts_common_1.LogLevel.Info);
         console.log('RuntimeParams.debug', params_1.RuntimeParams.debug);
@@ -87,28 +91,36 @@ class PhaseRunner extends core_1.BaseUnit {
     }
     //######################### Initialization #########################
     async init() {
-        // await super.init(false);
-        //Set phase runner to MemKey, so it can be referenced in the runtime
+        var _a;
         consts_2.MemKey_PhaseRunner.set(this);
-        //Init screen manager
-        new BAIScreenManager_1.BAIScreenManager();
-        //Load project for use in the phase runner
-        await this.loadProject();
-        //Filter specific units
-        this.filterUnits();
-        this.logDebug('Runtime params:', params_1.RuntimeParams);
-        //Set runner params
+        BAIScreenManager_1.MemKey_BAIScreenManager.set(this.screenManager);
         const runnerParams = {
             rootPath: process.cwd(),
             configPath: process.cwd() + '/.config',
         };
         RunnerParams_1.MemKey_RunnerParams.set(runnerParams);
+        if (this.projectConfig) {
+            const projectParams = this.prepareProjectParams();
+            RunnerParams_1.MemKey_ProjectConfig.set(Object.assign(Object.assign({}, this.projectConfig), { params: projectParams }));
+        }
+        if (this.defaultFileRoutes)
+            consts_1.MemKey_DefaultFiles.set(this.defaultFileRoutes);
+        if (PhaseRunner.instance) {
+            return;
+        }
+        PhaseRunner.instance = this;
+        //Load project for use in the phase runner
+        (_a = this.projectConfig) !== null && _a !== void 0 ? _a : (this.projectConfig = await this.loadProject());
+        //Filter specific units
+        this.filterUnits();
+        this.logDebug('Runtime params:', params_1.RuntimeParams);
+        //Set runner params
         //Set Project Params
         const projectParams = this.prepareProjectParams();
-        RunnerParams_1.MemKey_ProjectConfig.set(Object.assign(Object.assign({}, this.project.config), { params: projectParams }));
+        RunnerParams_1.MemKey_ProjectConfig.set(Object.assign(Object.assign({}, this.projectConfig), { params: projectParams }));
         //Set Default File Routes
-        const defaultFileRoutes = this.prepareDefaultFileRouts();
-        consts_1.MemKey_DefaultFiles.set(defaultFileRoutes);
+        this.defaultFileRoutes = this.prepareDefaultFileRouts();
+        consts_1.MemKey_DefaultFiles.set(this.defaultFileRoutes);
         //Load running status
         await this.loadRunningStatus();
         //Print init results
@@ -136,20 +148,20 @@ class PhaseRunner extends core_1.BaseUnit {
         PhaseRunnerDispatcher_1.dispatcher_UnitChange.dispatch(this.units);
     }
     async loadProject() {
-        if (!fs_1.default.existsSync(this.project.path))
-            throw new ts_common_1.ImplementationMissingException(`Missing project config file, could not find in path: ${this.project.path}`);
-        const projectConfigCB = require(this.project.path).default;
+        if (!fs_1.default.existsSync(this.projectPath))
+            throw new ts_common_1.ImplementationMissingException(`Missing project config file, could not find in path: ${this.projectPath}`);
+        const projectConfigCB = require(this.projectPath).default;
         if (typeof projectConfigCB !== 'function')
             throw new ts_common_1.BadImplementationException('Config file must be an asynchronous function returning a ProjectConfigV2 object');
-        this.project.config = await projectConfigCB();
+        return projectConfigCB();
     }
     prepareProjectParams() {
         var _a;
-        const params = (_a = this.project.config.params) !== null && _a !== void 0 ? _a : {};
-        params[CONST_ThunderstormVersionKey] = this.project.config.thunderstormVersion;
-        params[CONST_ThunderstormDependencyKey] = this.project.config.thunderstormVersion;
-        params[CONST_ProjectVersionKey] = this.project.config.projectVersion;
-        params[CONST_ProjectDependencyKey] = this.project.config.projectVersion;
+        const params = (_a = this.projectConfig.params) !== null && _a !== void 0 ? _a : {};
+        params[CONST_ThunderstormVersionKey] = this.projectConfig.thunderstormVersion;
+        params[CONST_ThunderstormDependencyKey] = this.projectConfig.thunderstormVersion;
+        params[CONST_ProjectVersionKey] = this.projectConfig.projectVersion;
+        params[CONST_ProjectDependencyKey] = this.projectConfig.projectVersion;
         return params;
     }
     prepareDefaultFileRouts() {
@@ -376,13 +388,23 @@ class PhaseRunner extends core_1.BaseUnit {
     //######################### Public Functions #########################
     async execute() {
         return new MemStorage_1.MemStorage().init(async () => {
-            process.on('SIGINT', () => {
-                this.killRunner();
-            });
-            await this.init();
-            await this.buildUnitDependencyTree();
-            await this.executeImpl();
-            this.killed = true;
+            try {
+                process.on('SIGINT', () => {
+                    this.killRunner();
+                });
+                await this.init();
+                await this.buildUnitDependencyTree();
+                await this.executeImpl();
+                this.killed = true;
+                this.logInfo('Completed successfully');
+                if (params_1.RuntimeParams.closeOnExit)
+                    process.exit(0);
+            }
+            catch (error) {
+                // this.logError('Finished with Errors: ', error);
+                if (params_1.RuntimeParams.closeOnExit)
+                    process.exit(1);
+            }
         });
     }
     async killRunner() {

package/v2/screens/BAIScreenManager.js

@@ -25,7 +25,6 @@ class BAIScreenManager {
                 return;
             (0, ts_common_1.removeFromArrayByIndex)(this.screens, index);
         };
-        exports.MemKey_BAIScreenManager.set(this);
         PhaseRunnerDispatcher_1.dispatcher_PhaseChange.addListener(this);
         this.assignTerminal();
     }

package/v2/screens/BAIScreen_UnitList.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BAIScreen_UnitList = void 0;
 const BAIScreen_1 = require("./BAIScreen");
 const consts_1 = require("../phase-runner/consts");
+const PhaseRunner_1 = require("../phase-runner/PhaseRunner");
+const params_1 = require("../../core/params/params");
 class BAIScreen_UnitList extends BAIScreen_1.BAIScreen {
     //######################### Lifecycle #########################
     constructor() {
@@ -22,6 +24,7 @@ class BAIScreen_UnitList extends BAIScreen_1.BAIScreen {
         this.container.screen.render();
     }
     __onUnitsChange(data) {
+        this.destroyUnitListWidget();
         this.createUnitListWidget();
         this.renderUnitList();
     }
@@ -65,8 +68,18 @@ class BAIScreen_UnitList extends BAIScreen_1.BAIScreen {
                 fg: 'blue',
             },
             align: 'center',
+            label: 'phase',
+            mouse: true
         };
         this.phaseWidget = this.createWidget('text', props);
+        this.phaseWidget.on('mouse', (event) => {
+            if (event.button === 'left' && event.action === 'mousedown') {
+                params_1.RuntimeParams.continue = true;
+                PhaseRunner_1.PhaseRunner.instance.execute().then(() => this.logInfo('Completed')).catch((e) => {
+                    this.logError('Error: ', e);
+                });
+            }
+        });
     }
     createUnitListWidget() {
         this.units = consts_1.MemKey_PhaseRunner.get().getUnits();

package/v2/unit/core/BaseUnit.d.ts

@@ -1,4 +1,4 @@
-import { AsyncVoidFunction, Constructor, Logger } from '@nu-art/ts-common';
+import { AsyncVoidFunction, Constructor, Logger, LogLevel } from '@nu-art/ts-common';
 import { RunnerParamKey } from '../../phase-runner/RunnerParams';
 import { CommandoInteractive } from '@nu-art/commando/shell';
 import { BaseCommando } from '@nu-art/commando/shell/core/BaseCommando';
@@ -29,7 +29,8 @@ export declare class BaseUnit<C extends BaseUnit_Config = BaseUnit_Config, RTC e
     protected init(setInitialized?: boolean): Promise<void>;
     protected getRunnerParam(key: RunnerParamKey): string | undefined;
     private initLogClient;
-    protected setStatus(status: string, type?: 'start' | 'end'): void;
+    protected setErrorStatus(status: string, error: Error): void;
+    protected setStatus(status: string, type?: 'start' | 'end', logLevel?: LogLevel): void;
     protected addToClassStack: (cls: Function) => void;
     isInstanceOf: (cls: Function) => boolean;
     getStatus(): string;

package/v2/unit/core/BaseUnit.js

@@ -63,6 +63,7 @@ class BaseUnit extends ts_common_1.Logger {
     }
     initLogClient() {
         this.logger = new ts_common_1.LogClient_MemBuffer(this.tag);
+        this.logger.keepLogsNaturalColors();
         this.logger.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];
@@ -73,7 +74,11 @@ class BaseUnit extends ts_common_1.Logger {
         });
         ts_common_1.BeLogged.addClient(this.logger);
     }
-    setStatus(status, type) {
+    setErrorStatus(status, error) {
+        this.setStatus(status, 'end', ts_common_1.LogLevel.Error);
+        this.logError(error);
+    }
+    setStatus(status, type, logLevel = ts_common_1.LogLevel.Info) {
         let operationDuration = '';
         if (type === 'start')
             this.timeCounter = timeCounter();
@@ -84,7 +89,7 @@ class BaseUnit extends ts_common_1.Logger {
                 operationDuration = ` (${this.timeCounter.format('mm:ss')})`;
                 delete this.timeCounter;
             }
-        this.logInfo(`Unit status update: ${this.unitStatus} => ${status}${operationDuration}`);
+        this.log(logLevel, false, [`Unit status update: ${this.unitStatus} => ${status}${operationDuration}`]);
         this.unitStatus = `${status}${operationDuration}`;
         PhaseRunnerDispatcher_1.dispatcher_UnitStatusChange.dispatch(this);
     }

package/v2/unit/core/Unit_TypescriptLib.d.ts

@@ -20,7 +20,6 @@ export declare class Unit_TypescriptLib<C extends Unit_TypescriptLib_Config = Un
     Phase_Purge,
     Phase_Lint
 ]>, OnWatchEvent {
-    private compilationError;
     private debounceWatch?;
     constructor(config: Unit_TypescriptLib<C, RTC>['config']);
     __onWatchEvent(type: WatchEventType, path?: string): Promise<void>;

package/v2/unit/core/Unit_TypescriptLib.js

@@ -36,7 +36,7 @@ const consts_2 = require("../consts");
 const CliError_1 = require("@nu-art/commando/shell/core/CliError");
 const nvm_1 = require("@nu-art/commando/shell/plugins/nvm");
 const basic_1 = require("@nu-art/commando/shell/plugins/basic");
-const extensionsToLint = ['.ts', '.tsx'];
+const extensionsToLint = ['ts', 'tsx'];
 const assetExtensions = [
     'json',
     'scss',
@@ -50,7 +50,6 @@ const assetExtensions = [
 class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
     constructor(config) {
         super(config);
-        this.compilationError = false;
         this.addToClassStack(Unit_TypescriptLib);
         runner_dispatchers_1.dispatcher_WatchEvent.addListener(this);
     }
@@ -59,7 +58,7 @@ class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
             return this.setStatus('Watching');
         if (this.debounceWatch)
             delete this.debounceWatch;
-        this.debounceWatch = (0, ts_common_1.debounce)(() => this.handleWatchChange(path, [consts_2.WatchEvent_RemoveFile, consts_2.WatchEvent_RemoveDir].includes(type)), ts_common_1.Second * 4, ts_common_1.Second * 10);
+        this.debounceWatch = (0, ts_common_1.debounce)(() => this.handleWatchChange(path, [consts_2.WatchEvent_RemoveFile, consts_2.WatchEvent_RemoveDir].includes(type)), ts_common_1.Second * 2, ts_common_1.Second * 10);
         this.debounceWatch();
     }
     async init(setInitialized = true) {
@@ -102,27 +101,19 @@ class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
     async compileImpl() {
         const pathToCompile = `${this.runtime.pathTo.pkg}/src/main`;
         const pathToTSConfig = `${pathToCompile}/tsconfig.json`;
-        try {
-            const commando = this.allocateCommando(nvm_1.Commando_NVM, basic_1.Commando_Basic)
-                .cd(this.runtime.pathTo.pkg)
-                .append(`tsc -p "${pathToTSConfig}" --rootDir "${pathToCompile}" --outDir "${this.runtime.pathTo.output}"`)
-                .addLogProcessor((log) => !log.includes('Now using node') && !log.includes('.nvmrc\' with version'));
-            await this.executeAsyncCommando(commando, (stdout, stderr, exitCode) => {
-                if (exitCode > 0)
-                    throw new CliError_1.CommandoException(`Error compiling`, stdout, stderr, exitCode);
-            });
-            // set compilation error status on success
-            this.compilationError = false;
-        }
-        catch (e) {
-            //In order to finish compile when running watch we just log the error instead of throwing it
-            if (params_1.RuntimeParams.watch) {
-                // set compilation error status on error
-                this.compilationError = true;
-                return this.logError(e);
-            }
-            throw e;
-        }
+        const commando = this.allocateCommando(nvm_1.Commando_NVM, basic_1.Commando_Basic)
+            .cd(this.runtime.pathTo.pkg)
+            .append(`tsc -p "${pathToTSConfig}" --rootDir "${pathToCompile}" --outDir "${this.runtime.pathTo.output}"`)
+            .setLogLevelFilter((log, std) => {
+            return ts_common_1.LogLevel.Error;
+        })
+            .addLogProcessor((log) => !log.includes('Now using node') && !log.includes('.nvmrc\' with version'));
+        await this.executeAsyncCommando(commando, (stdout, stderr, exitCode) => {
+            if (stderr.length)
+                this.logError(stderr);
+            if (exitCode > 0)
+                throw new CliError_1.CommandoException(`Error compiling`, stdout, stderr, exitCode);
+        });
     }
     async copyAssetsToOutput() {
         const command = `find . \\( -name ${assetExtensions.map(suffix => `'*.${suffix}'`)
@@ -144,14 +135,19 @@ class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
         // ignore if path doesn't related to unit
         if (!path.startsWith(this.config.pathToPackage))
             return;
-        this.setStatus('Compiling');
-        // check if dist folder must be cleared
-        if (shouldRemoveDist)
-            await this.removeSpecificFileFromDist(path);
-        // perform all watch actions
-        await this.compileImpl();
-        await this.copyAssetsToOutput();
-        this.setStatus(`Watching${this.compilationError ? ' with error' : ''}`);
+        try {
+            this.setStatus('Compiling', 'start');
+            // check if dist folder must be cleared
+            if (shouldRemoveDist)
+                await this.removeSpecificFileFromDist(path);
+            // perform all watch actions
+            await this.compileImpl();
+            await this.copyAssetsToOutput();
+            this.setStatus(`Compiled and Watching`, 'end');
+        }
+        catch (e) {
+            this.setStatus(`Watching with error`, e);
+        }
         // dispatch unit post compile
         runner_dispatchers_1.dispatcher_UnitWatchCompile.dispatch(this);
     }
@@ -188,13 +184,19 @@ class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
             .execute();
     }
     async compile() {
-        this.setStatus('Compile', 'start');
-        await this.resolveTSConfig();
-        await this.clearOutputDir();
-        await this.compileImpl();
-        await this.copyAssetsToOutput();
-        await this.copyPackageJSONToOutput();
-        this.setStatus(`Compiled${this.compilationError ? ' with error' : ''}`, 'end');
+        try {
+            this.setStatus('Compiling', 'start');
+            await this.resolveTSConfig();
+            await this.clearOutputDir();
+            await this.compileImpl();
+            await this.copyAssetsToOutput();
+            await this.copyPackageJSONToOutput();
+            this.setStatus(`Compiled`, 'end');
+        }
+        catch (e) {
+            this.setErrorStatus('Compilation Error', e);
+            throw e;
+        }
     }
     async purge() {
         await fs_1.promises.rm(this.runtime.pathTo.output, { recursive: true, force: true });
@@ -220,8 +222,8 @@ class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
             .execute();
     }
     async lint() {
-        const pathToProjectESLint = RunnerParams_1.MemKey_RunnerParams.get()[RunnerParams_1.RunnerParamKey_ConfigPath] + '/.eslintrc.js';
-        const pathToLint = this.runtime.pathTo.pkg + 'src/main';
+        const pathToProjectESLint = `${RunnerParams_1.MemKey_RunnerParams.get()[RunnerParams_1.RunnerParamKey_ConfigPath]}/eslint.config.cjs`;
+        const pathToLint = `${this.runtime.pathTo.pkg}src/main`;
         const extensions = extensionsToLint.map(ext => `--ext ${ext}`).join(' ');
         await this.allocateCommando(nvm_1.Commando_NVM)
             .append(`eslint --config ${pathToProjectESLint} ${extensions} ${pathToLint}`)

package/v2/unit/firebase-units/Unit_FirebaseFunctionsApp.js

@@ -16,10 +16,17 @@ class Unit_FirebaseFunctionsApp extends core_1.Unit_TypescriptLib {
     async __onUnitWatchCompiled(unit) {
         if (this.runtime.unitDependencyNames.includes(unit.runtime.dependencyName)) {
             this.setStatus('Compiling', 'start');
-            await this.compileImpl();
-            await this.copyAssetsToOutput();
-            await this.createDependenciesDir();
-            this.setStatus('Compiled', 'end');
+            try {
+                await this.compileImpl();
+                await this.copyAssetsToOutput();
+                await this.createDependenciesDir();
+                this.setStatus('Compiled', 'end');
+            }
+            catch (e) {
+                this.setErrorStatus('Compilation Error', e);
+                this.logError(e);
+                // throw e;
+            }
         }
     }
     constructor(config) {
@@ -37,14 +44,20 @@ class Unit_FirebaseFunctionsApp extends core_1.Unit_TypescriptLib {
     }
     async compile() {
         this.setStatus('Compiling', 'start');
-        await this.resolveTSConfig();
-        await this.clearOutputDir();
-        await this.createAppVersionFile();
-        await this.compileImpl();
-        await this.copyAssetsToOutput();
-        await this.createDependenciesDir();
-        await this.copyPackageJSONToOutput();
-        this.setStatus('Compiled', 'end');
+        try {
+            await this.resolveTSConfig();
+            await this.clearOutputDir();
+            await this.createAppVersionFile();
+            await this.compileImpl();
+            await this.copyAssetsToOutput();
+            await this.createDependenciesDir();
+            await this.copyPackageJSONToOutput();
+            this.setStatus('Compiled', 'end');
+        }
+        catch (e) {
+            this.setErrorStatus('Compilation Error', e);
+            throw e;
+        }
     }
     async launch() {
         this.setStatus('Launching');
@@ -245,7 +258,8 @@ class Unit_FirebaseFunctionsApp extends core_1.Unit_TypescriptLib {
         const commando = this.allocateCommando(nvm_1.Commando_NVM).applyNVM()
             .cd(this.runtime.pathTo.pkg)
             .append('ts-node src/main/proxy.ts');
-        return this.executeAsyncCommando(commando);
+        await this.executeAsyncCommando(commando);
+        this.logWarning('PROXY TERMINATED');
     }
     async runEmulator() {
         const commando = this.allocateCommando(nvm_1.Commando_NVM).applyNVM()
@@ -253,7 +267,8 @@ class Unit_FirebaseFunctionsApp extends core_1.Unit_TypescriptLib {
             .cd(this.runtime.pathTo.pkg)
             .onLog(/.*Emulator Hub running.*/, () => this.setStatus('Launch Complete'))
             .append(`firebase emulators:start --export-on-exit --import=.trash/data ${params_1.RuntimeParams.debugBackend ? `--inspect-functions ${this.config.firebaseConfig.debugPort}` : ''}`);
-        return this.executeAsyncCommando(commando);
+        await this.executeAsyncCommando(commando);
+        this.logWarning('EMULATORS TERMINATED');
     }
     //######################### Deploy Logic #########################
     async deployImpl() {

package/v2/unit/firebase-units/Unit_FirebaseHostingApp.js

@@ -31,11 +31,17 @@ class Unit_FirebaseHostingApp extends core_1.Unit_TypescriptLib {
     }
     async compile() {
         this.setStatus('Compiling', 'start');
-        await this.resolveTSConfig();
-        await this.clearOutputDir();
-        await this.createAppVersionFile();
-        await this.compileImpl();
-        this.setStatus('Compiled', 'end');
+        try {
+            await this.resolveTSConfig();
+            await this.clearOutputDir();
+            await this.createAppVersionFile();
+            await this.compileImpl();
+            this.setStatus('Compiled', 'end');
+        }
+        catch (e) {
+            this.setErrorStatus('Compilation Error', e);
+            throw e;
+        }
     }
     async launch() {
         this.setStatus('Launching');
@@ -118,7 +124,8 @@ class Unit_FirebaseHostingApp extends core_1.Unit_TypescriptLib {
             .append(`((\${#array[@]} > 0)) && kill -9 "\${array[@]}"`)
             .append('echo ')
             .append('npm run start');
-        return this.executeAsyncCommando(commando);
+        await this.executeAsyncCommando(commando);
+        this.logWarning('HOSTING TERMINATED');
     }
     //######################### Deploy Logic #########################
     async deployImpl() {