@nu-art/build-and-install 0.204.92 → 0.204.94

package/build-and-install.js

@@ -16,9 +16,6 @@ runner
         console.log('DEADEDAEDAEDAEDAEDAD');
         return process.exit(0);
     });
-    //TODO: make it an array of non exit params
-    if (!params_1.RuntimeParams.launch && !params_1.RuntimeParams.watch)
-        return process.exit(0);
 })
     .catch(err => {
     ts_common_1.StaticLogger.logError('Failed with error: ', err);

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

@@ -33,6 +33,9 @@ export type FirebaseEnvConfig<Env extends string> = {
             };
         };
     };
+    otherConfig?: {
+        [ModuleName: string]: any;
+    };
 };
 export type FirebasePackageConfig<Env extends string = string> = {
     envs: FirebaseEnvConfig<Env>[];

package/package.json

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

package/v2/phase-runner/PhaseRunner.js

@@ -32,13 +32,12 @@ const MemStorage_1 = require("@nu-art/ts-common/mem-storage/MemStorage");
 const fs_1 = __importStar(require("fs"));
 const thunderstorm_1 = require("../unit/thunderstorm");
 const consts_1 = require("../../defaults/consts");
-const nvm_1 = require("@nu-art/commando/cli/nvm");
-const basic_1 = require("@nu-art/commando/cli/basic");
 const PhaseRunnerDispatcher_1 = require("./PhaseRunnerDispatcher");
 const tools_1 = require("@nu-art/commando/shell/tools");
 const types_1 = require("./types");
 const BAIScreenManager_1 = require("../screens/BAIScreenManager");
 const consts_2 = require("./consts");
+const basic_1 = require("@nu-art/commando/shell/plugins/basic");
 const CONST_ThunderstormVersionKey = 'THUNDERSTORM_SDK_VERSION';
 const CONST_ThunderstormDependencyKey = 'THUNDERSTORM_DEPENDENCY_VERSION';
 const CONST_ProjectVersionKey = 'APP_VERSION';
@@ -383,6 +382,7 @@ class PhaseRunner extends core_1.BaseUnit {
             await this.init();
             await this.buildUnitDependencyTree();
             await this.executeImpl();
+            this.killed = true;
         });
     }
     async killRunner() {
@@ -428,7 +428,7 @@ class PhaseRunner extends core_1.BaseUnit {
         });
     }
     async printEnv() {
-        await nvm_1.NVM.createCommando(basic_1.Cli_Basic)
+        await this.allocateCommando(basic_1.Commando_Basic)
             .append('npm -g list typescript eslint firebase-tools sort-package-json --depth=0')
             .append('echo "npm version:"; npm -v')
             .append('echo "node version:"; node -v')

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

@@ -1,5 +1,9 @@
-import { AsyncVoidFunction, Logger } from '@nu-art/ts-common';
+import { AsyncVoidFunction, Constructor, Logger } 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';
+import { MergeTypes } from '@nu-art/commando/shell/core/class-merger';
+import { Commando_Basic } from '@nu-art/commando/shell/plugins/basic';
 export type BaseUnit_Config = {
     key: string;
     label: string;
@@ -12,20 +16,23 @@ export type BaseUnit_RuntimeConfig = {
 export declare class BaseUnit<C extends BaseUnit_Config = BaseUnit_Config, RTC extends BaseUnit_RuntimeConfig = BaseUnit_RuntimeConfig> extends Logger {
     readonly config: Readonly<C>;
     readonly runtime: RTC;
-    private unitStatus?;
+    private unitStatus;
     private logger;
     private classStack;
     private processTerminator;
+    private timeCounter?;
     constructor(config: C);
     registerTerminatable(terminatable: AsyncVoidFunction): void;
     unregisterTerminatable(terminatable: AsyncVoidFunction): void;
+    allocateCommando<T extends Constructor<any>[]>(...plugins: T): MergeTypes<[...T]> & CommandoInteractive & BaseCommando & Commando_Basic;
+    executeAsyncCommando<T>(commando: CommandoInteractive, callback?: (stdout: string, stderr: string, exitCode: number) => T): Promise<T>;
     protected init(setInitialized?: boolean): Promise<void>;
     protected getRunnerParam(key: RunnerParamKey): string | undefined;
     private initLogClient;
-    protected setStatus(status?: string): void;
+    protected setStatus(status: string, type?: 'start' | 'end'): void;
     protected addToClassStack: (cls: Function) => void;
     isInstanceOf: (cls: Function) => boolean;
-    getStatus(): string | undefined;
+    getStatus(): string;
     kill(): Promise<void>;
     getLogs(): string;
 }

package/v2/unit/core/BaseUnit.js

@@ -4,10 +4,12 @@ exports.BaseUnit = void 0;
 const ts_common_1 = require("@nu-art/ts-common");
 const RunnerParams_1 = require("../../phase-runner/RunnerParams");
 const PhaseRunnerDispatcher_1 = require("../../phase-runner/PhaseRunnerDispatcher");
-const params_1 = require("../../../core/params/params");
+const shell_1 = require("@nu-art/commando/shell");
+const basic_1 = require("@nu-art/commando/shell/plugins/basic");
 class BaseUnit extends ts_common_1.Logger {
     constructor(config) {
         super(config.key);
+        this.unitStatus = 'Pending Initialization';
         this.processTerminator = [];
         //######################### Class Stack Logic #########################
         this.addToClassStack = (cls) => {
@@ -31,6 +33,22 @@ class BaseUnit extends ts_common_1.Logger {
     unregisterTerminatable(terminatable) {
         (0, ts_common_1.removeItemFromArray)(this.processTerminator, terminatable);
     }
+    allocateCommando(...plugins) {
+        const commando = shell_1.CommandoInteractive.create(...plugins, basic_1.Commando_Basic);
+        commando.setUID(this.config.key);
+        return commando;
+    }
+    async executeAsyncCommando(commando, callback) {
+        let pid;
+        const terminatable = () => commando.gracefullyKill(pid);
+        try {
+            this.registerTerminatable(terminatable);
+            return await commando.executeAsync(_pid => pid = _pid, callback);
+        }
+        finally {
+            this.unregisterTerminatable(terminatable);
+        }
+    }
     async init(setInitialized = true) {
         this.setStatus('Initializing');
         //Register the unit to PhaseRunnerEvent dispatcher
@@ -55,10 +73,19 @@ class BaseUnit extends ts_common_1.Logger {
         });
         ts_common_1.BeLogged.addClient(this.logger);
     }
-    setStatus(status) {
-        this.unitStatus = status;
-        if (params_1.RuntimeParams.allLogs)
-            this.logInfo(`Unit status update: ${status}`);
+    setStatus(status, type) {
+        let operationDuration = '';
+        if (type === 'start')
+            this.timeCounter = timeCounter();
+        if (type === 'end')
+            if (!(0, ts_common_1.exists)(this.timeCounter))
+                this.logError(`Got end status: '${status}' - while current status '${this.unitStatus}' was not a start`);
+            else {
+                operationDuration = ` (${this.timeCounter.format('mm:ss')})`;
+                delete this.timeCounter;
+            }
+        this.logInfo(`Unit status update: ${this.unitStatus} => ${status}${operationDuration}`);
+        this.unitStatus = `${status}${operationDuration}`;
         PhaseRunnerDispatcher_1.dispatcher_UnitStatusChange.dispatch(this);
     }
     //######################### Public Functions #########################
@@ -81,3 +108,24 @@ class BaseUnit extends ts_common_1.Logger {
     }
 }
 exports.BaseUnit = BaseUnit;
+function timeCounter() {
+    const started = (0, ts_common_1.currentTimeMillis)();
+    return {
+        dt: () => (0, ts_common_1.currentTimeMillis)() - started,
+        format: (format) => {
+            let dt = (0, ts_common_1.currentTimeMillis)() - started;
+            const hours = Math.floor(dt / ts_common_1.Hour);
+            dt -= hours * ts_common_1.Hour;
+            const minutes = Math.floor(dt / ts_common_1.Minute);
+            dt -= minutes * ts_common_1.Minute;
+            const seconds = Math.floor(dt / ts_common_1.Second);
+            dt -= seconds * ts_common_1.Second;
+            const millis = dt;
+            return format
+                .replace('hh', String(hours).padStart(2, '0'))
+                .replace('mm', String(minutes).padStart(2, '0'))
+                .replace('ss', String(seconds).padStart(2, '0'))
+                .replace('zzz', String(millis).padStart(3, '0'));
+        }
+    };
+}

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

@@ -1,8 +1,6 @@
 import { Phase_Install } from '../../phase';
 import { UnitPhaseImplementor } from '../types';
 import { BaseUnit, BaseUnit_Config, BaseUnit_RuntimeConfig } from './BaseUnit';
-import { Cli_Basic } from '@nu-art/commando/cli/basic';
-import { CommandoInteractive } from '@nu-art/commando/shell';
 export type Unit_Python_Config = BaseUnit_Config & {
     pathToPackage: string;
 };
@@ -12,9 +10,7 @@ export type Unit_Python_RuntimeConfig = BaseUnit_RuntimeConfig & {
     };
 };
 export declare class Unit_Python<C extends Unit_Python_Config = Unit_Python_Config, RTC extends Unit_Python_RuntimeConfig = Unit_Python_RuntimeConfig> extends BaseUnit<C, RTC> implements UnitPhaseImplementor<[Phase_Install]> {
-    protected commando: CommandoInteractive & Cli_Basic;
     constructor(config: Unit_Python<C, RTC>['config']);
     protected init(): Promise<void>;
-    private initCommando;
     install(): Promise<void>;
 }

package/v2/unit/core/Unit_Python.js

@@ -3,38 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Unit_Python = void 0;
 const BaseUnit_1 = require("./BaseUnit");
 const tools_1 = require("@nu-art/commando/shell/tools");
-const basic_1 = require("@nu-art/commando/cli/basic");
-const shell_1 = require("@nu-art/commando/shell");
+const python_1 = require("@nu-art/commando/shell/plugins/python");
 class Unit_Python extends BaseUnit_1.BaseUnit {
     constructor(config) {
         super(config);
         this.addToClassStack(Unit_Python);
-        this.commando = shell_1.CommandoInteractive.create(basic_1.Cli_Basic);
     }
     async init() {
         await super.init();
         this.runtime.pathTo = {
             pkg: (0, tools_1.convertToFullPath)(this.config.pathToPackage),
         };
-        await this.initCommando();
-    }
-    //######################### Internal Logic #########################
-    async initCommando() {
-        this.commando
-            .setUID(this.config.key)
-            .cd(this.runtime.pathTo.pkg)
-            .debug();
-        //Install & Enter VENV
-        await this.commando
-            .append('python3 -m venv venv')
-            .append('source venv/bin/activate')
-            .execute();
-        //Set Python Path
-        await this.commando.append('export PYTHONPATH=.').execute();
     }
     //######################### Phase Implementation #########################
     async install() {
-        await this.commando.append('pip install -r requirements.txt').execute();
+        const commando = await this.allocateCommando(python_1.Commando_Python3)
+            .cd(this.runtime.pathTo.pkg)
+            .installVenv();
+        await commando.sourceVenv().installRequirements();
     }
 }
 exports.Unit_Python = Unit_Python;

package/v2/unit/core/Unit_Typescript.js

@@ -27,11 +27,11 @@ exports.Unit_Typescript = void 0;
 const BaseUnit_1 = require("./BaseUnit");
 const consts_1 = require("../../../core/consts");
 const ts_common_1 = require("@nu-art/ts-common");
-const map_project_packages_1 = require("../../../logic/map-project-packages");
 const fs = __importStar(require("fs"));
 const fs_1 = require("fs");
 const RunnerParams_1 = require("../../phase-runner/RunnerParams");
 const tools_1 = require("@nu-art/commando/shell/tools");
+const tools_2 = require("../tools/tools");
 const PackageJsonTargetKey_Template = 'template';
 const PackageJsonTargetKey_Root = 'root';
 const PackageJsonTargetKey_Dist = 'dist';
@@ -98,7 +98,7 @@ class Unit_Typescript extends BaseUnit_1.BaseUnit {
         //Get the package params for replacing in the template package json
         const projectConfig = RunnerParams_1.MemKey_ProjectConfig.get();
         //Convert template to actual package.json
-        const converted = (0, map_project_packages_1.convertPackageJSONTemplateToPackJSON_Value)(template, (value, key) => projectConfig.params[key] ? 'workspace:*' : projectConfig.params[value]);
+        const converted = (0, tools_2.convertPackageJSONTemplateToPackJSON_Value)(template, (value, key) => projectConfig.params[key] ? 'workspace:*' : projectConfig.params[value]);
         //Set dynamic params for this pkg
         projectConfig.params[converted.name] = converted.version;
         projectConfig.params[`${converted.name}_path`] = `file:.dependencies/${this.config.key}`; //Not sure about this one
@@ -120,7 +120,7 @@ class Unit_Typescript extends BaseUnit_1.BaseUnit {
         if (template.types)
             template.types = template.types.replace('dist/', '');
         //Convert template to actual package.json
-        return (0, map_project_packages_1.convertPackageJSONTemplateToPackJSON_Value)(template, (value, key) => { var _a; return (_a = params[key]) !== null && _a !== void 0 ? _a : params[value]; });
+        return (0, tools_2.convertPackageJSONTemplateToPackJSON_Value)(template, (value, key) => { var _a; return (_a = params[key]) !== null && _a !== void 0 ? _a : params[value]; });
     }
     //######################### Phase Implementations #########################
     async copyPackageJson() {

package/v2/unit/core/Unit_TypescriptLib.js

@@ -24,19 +24,18 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Unit_TypescriptLib = void 0;
-const nvm_1 = require("@nu-art/commando/cli/nvm");
 const Unit_Typescript_1 = require("./Unit_Typescript");
 const fs = __importStar(require("fs"));
 const fs_1 = require("fs");
-const basic_1 = require("@nu-art/commando/cli/basic");
 const ts_common_1 = require("@nu-art/ts-common");
 const RunnerParams_1 = require("../../phase-runner/RunnerParams");
 const consts_1 = require("../../../core/consts");
 const params_1 = require("../../../core/params/params");
 const runner_dispatchers_1 = require("../runner-dispatchers");
 const consts_2 = require("../consts");
-const shell_1 = require("@nu-art/commando/shell");
 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 assetExtensions = [
     'json',
@@ -104,17 +103,11 @@ class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
         const pathToCompile = `${this.runtime.pathTo.pkg}/src/main`;
         const pathToTSConfig = `${pathToCompile}/tsconfig.json`;
         try {
-            let pid;
-            const commando = nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic);
-            this.registerTerminatable(async () => {
-                console.log(`killing ${pid}`);
-                process.kill(pid, 2);
-            });
-            await commando.setUID(this.config.key)
+            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'))
-                .executeAsync(_pid => pid = _pid, (stdout, stderr, exitCode) => {
+                .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);
             });
@@ -134,8 +127,7 @@ class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
     async copyAssetsToOutput() {
         const command = `find . \\( -name ${assetExtensions.map(suffix => `'*.${suffix}'`)
             .join(' -o -name ')} \\) | cpio -pdmuv "${this.runtime.pathTo.output}" > /dev/null 2>&1`;
-        await shell_1.Commando
-            .create(basic_1.Cli_Basic)
+        await this.allocateCommando(basic_1.Commando_Basic)
             .cd(`${this.runtime.pathTo.pkg}/src/main`)
             // .setStdErrorValidator(stderr => {
             // 	return !stderr.match(/\d+\sblock/);
@@ -152,7 +144,7 @@ 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('Compile');
+        this.setStatus('Compiling');
         // check if dist folder must be cleared
         if (shouldRemoveDist)
             await this.removeSpecificFileFromDist(path);
@@ -190,19 +182,19 @@ class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
         if (!fs.existsSync(`${this.config.pathToPackage}/prebuild.sh`))
             return;
         this.setStatus('Pre-Compile');
-        await nvm_1.NVM.createCommando(basic_1.Cli_Basic)
+        await this.allocateCommando(basic_1.Commando_Basic)
             .cd(this.runtime.pathTo.pkg)
             .append('bash prebuild.sh')
             .execute();
     }
     async compile() {
-        this.setStatus('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' : ''}`);
+        this.setStatus(`Compiled${this.compilationError ? ' with error' : ''}`, 'end');
     }
     async purge() {
         await fs_1.promises.rm(this.runtime.pathTo.output, { recursive: true, force: true });
@@ -210,7 +202,7 @@ class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
     async printDependencyTree() {
         const CONST_RunningRoot = process.cwd();
         this.logDebug(`Generating Dependency Tree - ${this.config.label}`);
-        await nvm_1.NVM.createCommando(basic_1.Cli_Basic)
+        await this.allocateCommando(basic_1.Commando_Basic)
             .cd(this.runtime.pathTo.pkg)
             .append(`mkdir -p ${CONST_RunningRoot}/.trash/dependencies`)
             .append(`pnpm list --depth 1000 > "${CONST_RunningRoot}/.trash/dependencies/${this.config.key}.txt"`)
@@ -218,7 +210,7 @@ class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
     }
     async checkCyclicImports() {
         this.logDebug(`Checking Cyclic Imports - ${this.config.label}`);
-        await nvm_1.NVM.createCommando(basic_1.Cli_Basic)
+        await this.allocateCommando(basic_1.Commando_Basic)
             .cd(this.runtime.pathTo.pkg)
             // .setStdErrorValidator(stderr => {
             // 	return !stderr.includes('Finding files') && !stderr.includes('Image created');
@@ -231,7 +223,7 @@ class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
         const pathToProjectESLint = RunnerParams_1.MemKey_RunnerParams.get()[RunnerParams_1.RunnerParamKey_ConfigPath] + '/.eslintrc.js';
         const pathToLint = this.runtime.pathTo.pkg + 'src/main';
         const extensions = extensionsToLint.map(ext => `--ext ${ext}`).join(' ');
-        await nvm_1.NVM.createCommando()
+        await this.allocateCommando(nvm_1.Commando_NVM)
             .append(`eslint --config ${pathToProjectESLint} ${extensions} ${pathToLint}`)
             .execute();
     }

package/v2/unit/core/Unit_TypescriptProject.js

@@ -27,14 +27,15 @@ exports.Unit_TypescriptProject = void 0;
 const Unit_Typescript_1 = require("./Unit_Typescript");
 const params_1 = require("../../../core/params/params");
 const ts_common_1 = require("@nu-art/ts-common");
-const nvm_1 = require("@nu-art/commando/cli/nvm");
-const pnpm_1 = require("@nu-art/commando/cli/pnpm");
 const consts_1 = require("../../phase-runner/consts");
 const chokidar = __importStar(require("chokidar"));
 const runner_dispatchers_1 = require("../runner-dispatchers");
 const consts_2 = require("../consts");
 const Unit_TypescriptLib_1 = require("./Unit_TypescriptLib");
 const firebase_units_1 = require("../firebase-units");
+const nvm_1 = require("@nu-art/commando/shell/plugins/nvm");
+const pnpm_1 = require("@nu-art/commando/shell/plugins/pnpm");
+const pnpm_2 = require("@nu-art/commando/shell/services/pnpm");
 class Unit_TypescriptProject extends Unit_Typescript_1.Unit_Typescript {
     constructor(config) {
         super(config);
@@ -57,16 +58,20 @@ class Unit_TypescriptProject extends Unit_Typescript_1.Unit_Typescript {
             return acc;
         }, []);
         this.logInfo(`Installing Global Packages: ${packages.join(' ')}`);
-        await nvm_1.NVM.createCommando().append(`npm i -g ${packages.join(' ')}`).execute();
+        await this.allocateCommando(nvm_1.Commando_NVM)
+            .append(`npm i -g ${packages.join(' ')}`)
+            .execute();
     }
     async installPackages() {
         if (!params_1.RuntimeParams.install && !params_1.RuntimeParams.installPackages)
             return;
+        this.setStatus('Installing packages', 'start');
         const runner = consts_1.MemKey_PhaseRunner.get();
         const units = runner.getUnits().filter(unit => unit instanceof Unit_Typescript_1.Unit_Typescript);
         const packages = units.map(unit => unit.config.pathToPackage);
-        await pnpm_1.PNPM.createWorkspace(packages);
-        await pnpm_1.PNPM.installPackages(nvm_1.NVM.createCommando());
+        await pnpm_2.PNPM.createWorkspace(packages);
+        await pnpm_2.PNPM.installPackages(this.allocateCommando(nvm_1.Commando_NVM, pnpm_1.Commando_PNPM));
+        this.setStatus('Installed packages', 'end');
     }
     /**
      * Resolve all paths to watch in all project libs
@@ -77,7 +82,8 @@ class Unit_TypescriptProject extends Unit_Typescript_1.Unit_Typescript {
         // Using phase runner instance to resolve all project libs to watch
         const cantBeInstanceOf = [firebase_units_1.Unit_FirebaseHostingApp, firebase_units_1.Unit_FirebaseFunctionsApp];
         const projectLibs = consts_1.MemKey_PhaseRunner.get()
-            .getUnits().filter(unit => unit.isInstanceOf(Unit_TypescriptLib_1.Unit_TypescriptLib) && cantBeInstanceOf.every(_instance => !unit.isInstanceOf(_instance)));
+            .getUnits()
+            .filter(unit => unit.isInstanceOf(Unit_TypescriptLib_1.Unit_TypescriptLib) && cantBeInstanceOf.every(_instance => !unit.isInstanceOf(_instance)));
         //return all paths to watch
         return projectLibs.map(lib => {
             const sourceFolder = `${lib.config.pathToPackage}/src/main`;
@@ -116,9 +122,11 @@ class Unit_TypescriptProject extends Unit_Typescript_1.Unit_Typescript {
                     runner_dispatchers_1.dispatcher_WatchEvent.dispatch(consts_2.WatchEvent_RemoveFile, path);
                 });
             });
-            this.registerTerminatable(async () => {
+            const terminatable = async () => {
                 await watcher.close();
-            });
+                this.unregisterTerminatable(terminatable);
+            };
+            this.registerTerminatable(terminatable);
         });
     }
     async watchImpl() {

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

@@ -8,20 +8,18 @@ const params_1 = require("../../../core/params/params");
 const ts_common_1 = require("@nu-art/ts-common");
 const consts_2 = require("../../../defaults/consts");
 const RunnerParams_1 = require("../../phase-runner/RunnerParams");
-const basic_1 = require("@nu-art/commando/cli/basic");
-const nvm_1 = require("@nu-art/commando/cli/nvm");
-const shell_1 = require("@nu-art/commando/shell");
 const consts_3 = require("../../phase-runner/consts");
 const runner_dispatchers_1 = require("../runner-dispatchers");
+const nvm_1 = require("@nu-art/commando/shell/plugins/nvm");
 const CONST_VersionApp = 'version-app.json';
 class Unit_FirebaseFunctionsApp extends core_1.Unit_TypescriptLib {
     async __onUnitWatchCompiled(unit) {
         if (this.runtime.unitDependencyNames.includes(unit.runtime.dependencyName)) {
-            this.setStatus('Compile');
+            this.setStatus('Compiling', 'start');
             await this.compileImpl();
             await this.copyAssetsToOutput();
             await this.createDependenciesDir();
-            this.setStatus('Compiled');
+            this.setStatus('Compiled', 'end');
         }
     }
     constructor(config) {
@@ -39,7 +37,7 @@ class Unit_FirebaseFunctionsApp extends core_1.Unit_TypescriptLib {
         await this.resolveFunctionsJSON();
     }
     async compile() {
-        this.setStatus('Compile');
+        this.setStatus('Compiling', 'start');
         await this.resolveTSConfig();
         await this.clearOutputDir();
         await this.createAppVersionFile();
@@ -47,7 +45,7 @@ class Unit_FirebaseFunctionsApp extends core_1.Unit_TypescriptLib {
         await this.copyAssetsToOutput();
         await this.createDependenciesDir();
         await this.copyPackageJSONToOutput();
-        this.setStatus('Compiled');
+        this.setStatus('Compiled', 'end');
     }
     async launch() {
         this.setStatus('Launching');
@@ -222,7 +220,7 @@ class Unit_FirebaseFunctionsApp extends core_1.Unit_TypescriptLib {
             const dependencyOutputPath = `${unit.runtime.pathTo.output}/`;
             const targetPath = `${this.runtime.pathTo.output}/.dependencies/${unit.config.key}/`;
             const pjTargetPath = `${targetPath}/${consts_1.CONST_PackageJSON}`;
-            await shell_1.Commando.create()
+            await this.allocateCommando()
                 .append(`mkdir -p ${targetPath}`)
                 .append(`rsync -a --delete ${dependencyOutputPath} ${targetPath}`)
                 .execute();
@@ -235,7 +233,7 @@ class Unit_FirebaseFunctionsApp extends core_1.Unit_TypescriptLib {
     }
     //######################### Launch Logic #########################
     async releasePorts() {
-        const commando = nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic);
+        const commando = this.allocateCommando(nvm_1.Commando_NVM).applyNVM();
         const allPorts = Array.from({ length: 10 }, (_, i) => `${this.config.firebaseConfig.basePort + i}`);
         await commando.setUID(this.config.key)
             .append(`array=($(lsof -ti:${allPorts.join(',')}))`)
@@ -244,38 +242,29 @@ class Unit_FirebaseFunctionsApp extends core_1.Unit_TypescriptLib {
             .execute();
     }
     async runProxy() {
-        let pid;
-        const commando = nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic);
-        const terminatable = () => commando.gracefullyKill(pid);
-        this.registerTerminatable(terminatable);
-        await commando.setUID(this.config.key)
+        const commando = this.allocateCommando(nvm_1.Commando_NVM).applyNVM()
             .cd(this.runtime.pathTo.pkg)
-            .append('ts-node src/main/proxy.ts')
-            .executeAsync(_pid => pid = _pid);
-        this.unregisterTerminatable(terminatable);
+            .append('ts-node src/main/proxy.ts');
+        return this.executeAsyncCommando(commando);
     }
     async runEmulator() {
-        let pid;
-        const commando = nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic);
-        const terminatable = () => commando.gracefullyKill(pid);
-        this.registerTerminatable(terminatable);
-        await commando.setUID(this.config.key)
+        const commando = this.allocateCommando(nvm_1.Commando_NVM).applyNVM()
+            .setUID(this.config.key)
             .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}` : ''}`)
-            .executeAsync(_pid => pid = _pid);
-        this.unregisterTerminatable(terminatable);
+            .append(`firebase emulators:start --export-on-exit --import=.trash/data ${params_1.RuntimeParams.debugBackend ? `--inspect-functions ${this.config.firebaseConfig.debugPort}` : ''}`);
+        return this.executeAsyncCommando(commando);
     }
     //######################### Deploy Logic #########################
     async deployImpl() {
-        await nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic)
+        const commando = this.allocateCommando(nvm_1.Commando_NVM).applyNVM()
             .cd(this.runtime.pathTo.output)
             .ls()
             .cat('package.json')
             .cat('index.js')
             .cd(this.runtime.pathTo.pkg)
-            .append(`firebase --debug deploy --only functions --force`)
-            .execute();
+            .append(`firebase --debug deploy --only functions --force`);
+        return this.executeAsyncCommando(commando);
     }
 }
 Unit_FirebaseFunctionsApp.staggerCount = 0;

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

@@ -6,11 +6,11 @@ const params_1 = require("../../../core/params/params");
 const ts_common_1 = require("@nu-art/ts-common");
 const fs_1 = require("fs");
 const consts_1 = require("../../../core/consts");
-const nvm_1 = require("@nu-art/commando/cli/nvm");
-const basic_1 = require("@nu-art/commando/cli/basic");
 const RunnerParams_1 = require("../../phase-runner/RunnerParams");
 const tools_1 = require("@nu-art/commando/shell/tools");
 const runner_dispatchers_1 = require("../runner-dispatchers");
+const nvm_1 = require("@nu-art/commando/shell/plugins/nvm");
+const basic_1 = require("@nu-art/commando/shell/plugins/basic");
 const CONST_VersionApp = 'version-app.json';
 class Unit_FirebaseHostingApp extends core_1.Unit_TypescriptLib {
     constructor(config) {
@@ -30,12 +30,12 @@ class Unit_FirebaseHostingApp extends core_1.Unit_TypescriptLib {
         await this.resolveHostingRuntimeConfig();
     }
     async compile() {
-        this.setStatus('Compile');
+        this.setStatus('Compiling', 'start');
         await this.resolveTSConfig();
         await this.clearOutputDir();
         await this.createAppVersionFile();
         await this.compileImpl();
-        this.setStatus('Compiled');
+        this.setStatus('Compiled', 'end');
     }
     async launch() {
         this.setStatus('Launching');
@@ -96,11 +96,10 @@ class Unit_FirebaseHostingApp extends core_1.Unit_TypescriptLib {
     }
     //######################### Compile Logic #########################
     async compileImpl() {
-        await nvm_1.NVM
-            .createInteractiveCommando(basic_1.Cli_Basic)
+        const commando = this.allocateCommando(nvm_1.Commando_NVM, basic_1.Commando_Basic).applyNVM()
             .cd(this.runtime.pathTo.pkg)
-            .append(`ENV=${params_1.RuntimeParams.environment} npm run build`)
-            .execute();
+            .append(`ENV=${params_1.RuntimeParams.environment} npm run build`);
+        await this.executeAsyncCommando(commando);
     }
     async createAppVersionFile() {
         //Writing the file to the package source instead of the output is fine,
@@ -112,26 +111,21 @@ class Unit_FirebaseHostingApp extends core_1.Unit_TypescriptLib {
     }
     //######################### Launch Logic #########################
     async runApp() {
-        let pid;
-        const commando = nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic);
-        const terminatable = () => commando.gracefullyKill(pid);
-        this.registerTerminatable(terminatable);
-        await commando
+        const commando = this.allocateCommando(nvm_1.Commando_NVM).applyNVM()
             .setUID(this.config.key)
             .cd(this.runtime.pathTo.pkg)
             .append(`array=($(lsof -ti:${[this.config.firebaseConfig.hostingPort].join(',')}))`)
             .append(`((\${#array[@]} > 0)) && kill -9 "\${array[@]}"`)
             .append('echo ')
-            .append('npm run start')
-            .executeAsync(_pid => pid = _pid);
-        this.unregisterTerminatable(terminatable);
+            .append('npm run start');
+        return this.executeAsyncCommando(commando);
     }
     //######################### Deploy Logic #########################
     async deployImpl() {
-        await nvm_1.NVM.createInteractiveCommando(basic_1.Cli_Basic)
+        const commando = this.allocateCommando(nvm_1.Commando_NVM).applyNVM()
             .cd(this.runtime.pathTo.pkg)
-            .append(`firebase --debug deploy --only hosting`)
-            .execute();
+            .append(`firebase --debug deploy --only hosting`);
+        return this.executeAsyncCommando(commando);
     }
 }
 exports.Unit_FirebaseHostingApp = Unit_FirebaseHostingApp;

package/v2/unit/tools/tools.d.ts

@@ -0,0 +1,2 @@
+import { PackageJson } from '../../../core/types';
+export declare function convertPackageJSONTemplateToPackJSON_Value(template: PackageJson, value: (value: string, key?: string) => string): PackageJson;