@nu-art/build-and-install 0.204.74 → 0.204.76

package/core/params/params.d.ts

@@ -26,8 +26,8 @@ export declare const BaiParam_LaunchFrontend: BaseCliParam<'launchFrontend', boo
 export declare const BaiParam_LaunchBackend: BaseCliParam<'launchBackend', boolean>;
 export declare const BaiParam_DebugBackend: BaseCliParam<'debugBackend', boolean>;
 export declare const BaiParam_Deploy: BaseCliParam<'deploy', string>;
-export declare const BaiParam_DeployBackend: BaseCliParam<'deployBackend', boolean>;
-export declare const BaiParam_DeployFrontend: BaseCliParam<'deployFrontend', boolean>;
+export declare const BaiParam_DeployBackend: BaseCliParam<'deployBackend', string>;
+export declare const BaiParam_DeployFrontend: BaseCliParam<'deployFrontend', string>;
 export declare const BaiParam_NoGit: BaseCliParam<'noGit', boolean>;
 export declare const BaiParam_Debug: BaseCliParam<'debug', boolean>;
 export declare const BaiParam_QuickDeploy: BaseCliParam<'quickDeploy', boolean>;
@@ -36,5 +36,5 @@ export declare const BaiParam_AllLogs: BaseCliParam<'allLogs', boolean>;
 export declare const BaiParam_EncounterManager: BaseCliParam<'encounterManager', boolean>;
 export declare const BaiParam_EncounterManagerListen: BaseCliParam<'encounterManagerListen', boolean>;
 export declare const BaiParam_UsePackage: BaseCliParam<'usePackage', string[]>;
-export declare const AllBaiParams: (BaseCliParam<"help", boolean> | BaseCliParam<"dependencyTree", boolean> | BaseCliParam<"checkCyclicImports", boolean> | BaseCliParam<"printEnv", boolean> | BaseCliParam<"continue", boolean> | BaseCliParam<"environment", string> | BaseCliParam<"setup", boolean> | BaseCliParam<"install", boolean> | BaseCliParam<"installPackages", boolean> | BaseCliParam<"installGlobals", boolean> | BaseCliParam<"clean", boolean> | BaseCliParam<"purge", boolean> | BaseCliParam<"generate", boolean> | BaseCliParam<"generateDocs", boolean> | BaseCliParam<"noBuild", boolean> | BaseCliParam<"dryRun", boolean> | BaseCliParam<"runWithThunderstorm", boolean> | BaseCliParam<"withCommando", boolean> | BaseCliParam<"noThunderstorm", boolean> | BaseCliParam<"lint", boolean> | BaseCliParam<"watch", boolean> | BaseCliParam<"test", string> | BaseCliParam<"launch", string> | BaseCliParam<"launchFrontend", boolean> | BaseCliParam<"launchBackend", boolean> | BaseCliParam<"debugBackend", boolean> | BaseCliParam<"deploy", string> | BaseCliParam<"deployBackend", boolean> | BaseCliParam<"deployFrontend", boolean> | BaseCliParam<"noGit", boolean> | BaseCliParam<"debug", boolean> | BaseCliParam<"publish", string> | BaseCliParam<"allLogs", boolean> | BaseCliParam<"encounterManager", boolean> | BaseCliParam<"encounterManagerListen", boolean> | BaseCliParam<"usePackage", string[]>)[];
-export declare const RuntimeParams: import("@nu-art/commando/cli/cli-params").CliParams<(BaseCliParam<"help", boolean> | BaseCliParam<"dependencyTree", boolean> | BaseCliParam<"checkCyclicImports", boolean> | BaseCliParam<"printEnv", boolean> | BaseCliParam<"continue", boolean> | BaseCliParam<"environment", string> | BaseCliParam<"setup", boolean> | BaseCliParam<"install", boolean> | BaseCliParam<"installPackages", boolean> | BaseCliParam<"installGlobals", boolean> | BaseCliParam<"clean", boolean> | BaseCliParam<"purge", boolean> | BaseCliParam<"generate", boolean> | BaseCliParam<"generateDocs", boolean> | BaseCliParam<"noBuild", boolean> | BaseCliParam<"dryRun", boolean> | BaseCliParam<"runWithThunderstorm", boolean> | BaseCliParam<"withCommando", boolean> | BaseCliParam<"noThunderstorm", boolean> | BaseCliParam<"lint", boolean> | BaseCliParam<"watch", boolean> | BaseCliParam<"test", string> | BaseCliParam<"launch", string> | BaseCliParam<"launchFrontend", boolean> | BaseCliParam<"launchBackend", boolean> | BaseCliParam<"debugBackend", boolean> | BaseCliParam<"deploy", string> | BaseCliParam<"deployBackend", boolean> | BaseCliParam<"deployFrontend", boolean> | BaseCliParam<"noGit", boolean> | BaseCliParam<"debug", boolean> | BaseCliParam<"publish", string> | BaseCliParam<"allLogs", boolean> | BaseCliParam<"encounterManager", boolean> | BaseCliParam<"encounterManagerListen", boolean> | BaseCliParam<"usePackage", string[]>)[]>;
+export declare const AllBaiParams: (BaseCliParam<"help", boolean> | BaseCliParam<"dependencyTree", boolean> | BaseCliParam<"checkCyclicImports", boolean> | BaseCliParam<"printEnv", boolean> | BaseCliParam<"continue", boolean> | BaseCliParam<"environment", string> | BaseCliParam<"setup", boolean> | BaseCliParam<"install", boolean> | BaseCliParam<"installPackages", boolean> | BaseCliParam<"installGlobals", boolean> | BaseCliParam<"clean", boolean> | BaseCliParam<"purge", boolean> | BaseCliParam<"generate", boolean> | BaseCliParam<"generateDocs", boolean> | BaseCliParam<"noBuild", boolean> | BaseCliParam<"dryRun", boolean> | BaseCliParam<"runWithThunderstorm", boolean> | BaseCliParam<"withCommando", boolean> | BaseCliParam<"noThunderstorm", boolean> | BaseCliParam<"lint", boolean> | BaseCliParam<"watch", boolean> | BaseCliParam<"test", string> | BaseCliParam<"launch", string> | BaseCliParam<"launchFrontend", boolean> | BaseCliParam<"launchBackend", boolean> | BaseCliParam<"debugBackend", boolean> | BaseCliParam<"deploy", string> | BaseCliParam<"deployBackend", string> | BaseCliParam<"deployFrontend", string> | BaseCliParam<"noGit", boolean> | BaseCliParam<"debug", boolean> | BaseCliParam<"publish", string> | BaseCliParam<"allLogs", boolean> | BaseCliParam<"encounterManager", boolean> | BaseCliParam<"encounterManagerListen", boolean> | BaseCliParam<"usePackage", string[]>)[];
+export declare const RuntimeParams: import("@nu-art/commando/cli/cli-params").CliParams<(BaseCliParam<"help", boolean> | BaseCliParam<"dependencyTree", boolean> | BaseCliParam<"checkCyclicImports", boolean> | BaseCliParam<"printEnv", boolean> | BaseCliParam<"continue", boolean> | BaseCliParam<"environment", string> | BaseCliParam<"setup", boolean> | BaseCliParam<"install", boolean> | BaseCliParam<"installPackages", boolean> | BaseCliParam<"installGlobals", boolean> | BaseCliParam<"clean", boolean> | BaseCliParam<"purge", boolean> | BaseCliParam<"generate", boolean> | BaseCliParam<"generateDocs", boolean> | BaseCliParam<"noBuild", boolean> | BaseCliParam<"dryRun", boolean> | BaseCliParam<"runWithThunderstorm", boolean> | BaseCliParam<"withCommando", boolean> | BaseCliParam<"noThunderstorm", boolean> | BaseCliParam<"lint", boolean> | BaseCliParam<"watch", boolean> | BaseCliParam<"test", string> | BaseCliParam<"launch", string> | BaseCliParam<"launchFrontend", boolean> | BaseCliParam<"launchBackend", boolean> | BaseCliParam<"debugBackend", boolean> | BaseCliParam<"deploy", string> | BaseCliParam<"deployBackend", string> | BaseCliParam<"deployFrontend", string> | BaseCliParam<"noGit", boolean> | BaseCliParam<"debug", boolean> | BaseCliParam<"publish", string> | BaseCliParam<"allLogs", boolean> | BaseCliParam<"encounterManager", boolean> | BaseCliParam<"encounterManagerListen", boolean> | BaseCliParam<"usePackage", string[]>)[]>;

package/core/params/params.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RuntimeParams = exports.AllBaiParams = exports.BaiParam_UsePackage = exports.BaiParam_EncounterManagerListen = exports.BaiParam_EncounterManager = exports.BaiParam_AllLogs = exports.BaiParam_Publish = exports.BaiParam_QuickDeploy = exports.BaiParam_Debug = exports.BaiParam_NoGit = exports.BaiParam_DeployFrontend = exports.BaiParam_DeployBackend = exports.BaiParam_Deploy = exports.BaiParam_DebugBackend = exports.BaiParam_LaunchBackend = exports.BaiParam_LaunchFrontend = exports.BaiParam_Launch = exports.BaiParam_Test = exports.BaiParam_Watch = exports.BaiParam_Lint = exports.BaiParam_NoThunderstorm = exports.BaiParam_WithCommando = exports.BaiParam_RunWithThunderstorm = exports.BaiParam_DryRun = exports.BaiParam_NoBuild = exports.BaiParam_GenerateDocs = exports.BaiParam_Generate = exports.BaiParam_Purge = exports.BaiParam_Clean = exports.BaiParam_InstallGlobals = exports.BaiParam_InstallPackages = exports.BaiParam_Install = exports.BaiParam_Setup = exports.BaiParam_SetEnv = exports.BaiParam_continue = exports.BaiParam_PrintEnv = exports.BaiParam_CheckCyclicImports = exports.BaiParam_DependencyTree = exports.BaiParam_Help = void 0;
 const cli_params_1 = require("@nu-art/commando/cli/cli-params");
+const ts_common_1 = require("@nu-art/ts-common");
+//util regex function
+const regexTemplate = (regexp) => (0, ts_common_1.exists)(regexp) ? `.*${regexp}.*` : '.*';
 exports.BaiParam_Help = {
     keys: ['--help', '-h'],
     keyName: 'help',
@@ -157,14 +160,14 @@ exports.BaiParam_Test = {
     type: 'string',
     group: 'Test',
     description: 'Run the tests in all the project packages\naccepts test label to run optionally. default will be empty string',
-    process: (regexp) => regexp !== null && regexp !== void 0 ? regexp : '.*',
+    process: regexTemplate,
 };
 exports.BaiParam_Launch = {
     keys: ['--launch', '-l'],
     keyName: 'launch',
     type: 'string',
     group: 'Apps',
-    process: (regexp) => regexp !== null && regexp !== void 0 ? regexp : '.*',
+    process: regexTemplate,
     description: 'It will add the provided App to the launch list \nrequired input: path-to-app-to-launch(string)'
 };
 exports.BaiParam_LaunchFrontend = {
@@ -193,21 +196,23 @@ exports.BaiParam_Deploy = {
     keyName: 'deploy',
     type: 'string',
     group: 'Apps',
-    process: (regexp) => regexp !== null && regexp !== void 0 ? regexp : '.*',
+    process: regexTemplate,
     description: 'Will add the provided App to the deploy list or all applications'
 };
 exports.BaiParam_DeployBackend = {
     keys: ['--deploy-backend', '-db'],
     keyName: 'deployBackend',
     group: 'Apps',
-    type: 'boolean',
+    type: 'string',
+    process: regexTemplate,
     description: 'Will add the app-backend to the deploy list'
 };
 exports.BaiParam_DeployFrontend = {
     keys: ['--deploy-frontend', '-df'],
     keyName: 'deployFrontend',
-    type: 'boolean',
+    type: 'string',
     group: 'Apps',
+    process: regexTemplate,
     description: 'Will add the app frontend to the deploy list'
 };
 exports.BaiParam_NoGit = {

package/package.json

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

package/v2/phase/consts.js

@@ -132,7 +132,7 @@ exports.phase_DeployFrontend = {
     key: exports.phaseKey_DeployFrontend,
     name: 'Deploy Frontend',
     method: 'deployFrontend',
-    filter: () => params_1.RuntimeParams.deployFrontend,
+    filter: () => !!params_1.RuntimeParams.deployFrontend,
     dependencyPhaseKeys: [exports.phaseKey_Lint, exports.phaseKey_Compile],
 };
 exports.phaseKey_DeployBackend = 'deploy-backend';
@@ -140,7 +140,7 @@ exports.phase_DeployBackend = {
     key: exports.phaseKey_DeployBackend,
     name: 'Deploy Backend',
     method: 'deployBackend',
-    filter: () => params_1.RuntimeParams.deployBackend,
+    filter: () => !!params_1.RuntimeParams.deployBackend,
     dependencyPhaseKeys: [exports.phaseKey_Lint, exports.phaseKey_Compile],
 };
 exports.phases_Deploy = [exports.phase_DeployFrontend, exports.phase_DeployBackend];

package/v2/phase/types.d.ts

@@ -1,8 +1,10 @@
+import { BaseUnit } from '../unit/core';
 export type Phase<PhaseMethod extends string> = {
     key: string;
     name: string;
     method: PhaseMethod;
     filter?: () => (Promise<boolean> | boolean);
+    unitFilter?: (unit: BaseUnit) => (Promise<boolean> | boolean);
     terminateAfterPhase?: boolean;
     runUnitsInDependency?: boolean;
     dependencyPhaseKeys?: string[];

package/v2/phase-runner/PhaseRunner.js

@@ -230,15 +230,22 @@ class PhaseRunner extends core_1.BaseUnit {
         });
         PhaseRunnerDispatcher_1.dispatcher_UnitChange.dispatch(this.units);
     }
-    getUnitsForPhase(phase) {
-        return (0, ts_common_1.filterInstances)(this.unitDependencyTree.map(row => {
-            const filteredRow = row.filter(unit => {
+    async getUnitsForPhase(phase) {
+        return (0, ts_common_1.filterInstances)(await Promise.all(this.unitDependencyTree.map(async (row) => {
+            const filteredRow = await Promise.all(row.map(async (unit) => {
+                // Unit filter did not pass
                 if ((0, ts_common_1.exists)(unit.config.filter) && !unit.config.filter())
-                    return false;
-                return (0, ts_common_1.exists)(unit[phase.method]);
-            });
-            return filteredRow.length ? filteredRow : undefined;
-        }));
+                    return null;
+                // Unit doesn't implement the phase method
+                if (!(0, ts_common_1.exists)(unit[phase.method]))
+                    return null;
+                // If phase implements unit filter and unit doesn't pass
+                if ((0, ts_common_1.exists)(phase.unitFilter) && !(await phase.unitFilter(unit)))
+                    return null;
+                return unit;
+            }));
+            return (0, ts_common_1.filterInstances)(filteredRow);
+        })).then(rows => rows.filter(row => row.length)));
     }
     getUnits() {
         return this.units;
@@ -257,7 +264,7 @@ class PhaseRunner extends core_1.BaseUnit {
             this.logDebug(`Will not execute phase: ${phase.name}, did not pass filter`);
             return false;
         }
-        const units = this.getUnitsForPhase(phase);
+        const units = await this.getUnitsForPhase(phase);
         if (!units.length) {
             this.logDebug(`Will not execute phase: ${phase.name}, no units to execute`);
             return false;
@@ -376,7 +383,9 @@ class PhaseRunner extends core_1.BaseUnit {
         });
     }
     async killRunner() {
+        this.logDebug('Killing units');
         await Promise.all(this.units.map(unit => unit.kill()));
+        this.logDebug('Units killed');
         await this.setRunningStatus();
     }
     setScreen(screen) {

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

@@ -287,10 +287,12 @@ class Unit_FirebaseFunctionsApp extends core_1.Unit_TypescriptLib {
     async kill() {
         if (!this.launchCommandos)
             return;
+        this.logWarning(`Killing unit - ${this.config.label}`);
         const emulatorPid = this.getPID(this.listeners.emulator.pid);
         const proxyPid = this.getPID(this.listeners.proxy.pid);
         await this.launchCommandos.emulator.gracefullyKill(emulatorPid);
         await this.launchCommandos.proxy.gracefullyKill(proxyPid);
+        this.logWarning(`Unit killed - ${this.config.label}`);
     }
     //######################### Deploy Logic #########################
     async printFiles() {

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

@@ -145,8 +145,10 @@ class Unit_FirebaseHostingApp extends core_1.Unit_TypescriptLib {
         var _a;
         if (!this.launchCommando)
             return;
+        this.logWarning(`Killing unit - ${this.config.label}`);
         const appPid = this.getPID();
         await ((_a = this.launchCommando) === null || _a === void 0 ? void 0 : _a.gracefullyKill(appPid));
+        this.logWarning(`Unit killed - ${this.config.label}`);
     }
     //######################### Deploy Logic #########################
     async deployImpl() {