@nu-art/build-and-install 0.204.98 → 0.204.100

package/package.json

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

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

@@ -8,6 +8,7 @@ export declare class PhaseRunnerDispatcher<T, K extends FunctionKeys<T> = Functi
     addListener(listener: any): void;
     removeListener(listener: any): void;
     dispatch(...data: P): void;
+    dispatchAsync(...data: P): Promise<void>;
 }
 export interface PhaseRunner_OnPhaseChange {
     __onPhaseChange: (data: Phase<string>) => void;

package/v2/phase-runner/PhaseRunnerDispatcher.js

@@ -23,6 +23,13 @@ class PhaseRunnerDispatcher {
             (_a = listener[this.method]) === null || _a === void 0 ? void 0 : _a.call(listener, ...data);
         });
     }
+    async dispatchAsync(...data) {
+        await Promise.all(this.listeners.map(async (listener) => {
+            var _a;
+            // @ts-ignore
+            return (_a = listener[this.method]) === null || _a === void 0 ? void 0 : _a.call(listener, ...data);
+        }));
+    }
 }
 exports.PhaseRunnerDispatcher = PhaseRunnerDispatcher;
 exports.dispatcher_PhaseChange = new PhaseRunnerDispatcher('__onPhaseChange');

package/v2/screens/BAIScreen.d.ts

@@ -1,6 +1,6 @@
-import { ConsoleContainer } from '@nu-art/commando/console/ConsoleContainer';
 import { AsyncVoidFunction } from '@nu-art/ts-common';
-export declare abstract class BAIScreen<State extends {} = {}> extends ConsoleContainer<'screen', State> {
+import { ConsoleScreen } from '@nu-art/commando/console/ConsoleScreen';
+export declare abstract class BAIScreen<State extends {} = {}> extends ConsoleScreen<State> {
     private onKillCallback?;
     private logClient;
     /**
@@ -11,6 +11,7 @@ export declare abstract class BAIScreen<State extends {} = {}> extends ConsoleCo
      */
     constructor(logClientKey: string);
     private createLogClient;
+    protected abstract scrollLog(direction: number): void;
     protected abstract onLogUpdated: () => void;
     protected getLogs: () => string;
     startScreen: () => void;

package/v2/screens/BAIScreen.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BAIScreen = void 0;
-const ConsoleContainer_1 = require("@nu-art/commando/console/ConsoleContainer");
 const ts_common_1 = require("@nu-art/ts-common");
 const PhaseRunnerDispatcher_1 = require("../phase-runner/PhaseRunnerDispatcher");
-class BAIScreen extends ConsoleContainer_1.ConsoleContainer {
+const ConsoleScreen_1 = require("@nu-art/commando/console/ConsoleScreen");
+class BAIScreen extends ConsoleScreen_1.ConsoleScreen {
     //######################### Initialization #########################
     /**
      * Creates an instance of ConsoleScreen.
@@ -13,10 +13,24 @@ class BAIScreen extends ConsoleContainer_1.ConsoleContainer {
      * @param {ScreenKeyBinding[]} [keyBinding] - An array of key bindings for the screen widget.
      */
     constructor(logClientKey) {
-        super('screen', { smartCSR: true, title: 'Build and Install' }, [{
+        super({ smartCSR: true, title: 'Build and Install' }, [
+            {
                 keys: ['escape', 'q', 'C-c'],
                 callback: async () => await this.onKill(),
-            }]);
+            },
+            {
+                keys: ['up'],
+                callback: () => {
+                    this.scrollLog(-1);
+                },
+            },
+            {
+                keys: ['down'],
+                callback: () => {
+                    this.scrollLog(1);
+                },
+            },
+        ]);
         this.getLogs = () => this.logClient.buffers[0];
         this.startScreen = () => {
             //Start listening on dispatchers
@@ -38,6 +52,7 @@ class BAIScreen extends ConsoleContainer_1.ConsoleContainer {
             this.container.destroy();
         };
         this.setOnKillCallback = (cb) => this.onKillCallback = cb;
+        this.scrollLog.bind(this);
         this.createLogClient(logClientKey);
     }
     createLogClient(logClientKey) {

package/v2/screens/BAIScreen_Launch.d.ts

@@ -2,16 +2,20 @@ import { BAIScreen } from './BAIScreen';
 import { BaseUnit } from '../unit/core';
 import { PhaseRunner_OnUnitsChange } from '../phase-runner/PhaseRunnerDispatcher';
 export declare class BAIScreen_Launch extends BAIScreen implements PhaseRunner_OnUnitsChange {
-    private units;
+    private allUnits;
+    private focusUnits;
     private gridDimensions;
     private withRunningLogs;
     private gridCellWidgets;
     constructor();
     __onUnitsChange: (data: BaseUnit[]) => void;
+    private rebuildScreens;
     protected onLogUpdated: () => void;
     private updateUnits;
     protected createContent(): void;
+    protected scrollLog(direction: number): void;
     private createGridWidgets;
+    private toggleFullScreenMode;
     private calculateGridDimensions;
     private getGridWidgetLabel;
     protected destroyContent(): void;

package/v2/screens/BAIScreen_Launch.js

@@ -4,30 +4,32 @@ exports.BAIScreen_Launch = void 0;
 const BAIScreen_1 = require("./BAIScreen");
 const consts_1 = require("../phase-runner/consts");
 const firebase_units_1 = require("../unit/firebase-units");
+const ts_common_1 = require("@nu-art/ts-common");
 class BAIScreen_Launch extends BAIScreen_1.BAIScreen {
     //######################### Lifecycle #########################
     constructor() {
         super('bai-launch');
         //######################### Properties #########################
-        this.units = [];
+        this.allUnits = [];
+        this.focusUnits = [];
         this.gridDimensions = [[{ width: 1, height: 1 }]];
         this.withRunningLogs = false;
         //Widgets
         this.gridCellWidgets = [];
         this.__onUnitsChange = (data) => {
             this.updateUnits();
-            this.createGridWidgets();
-            this.renderGridWidgets();
-            this.container.screen.render();
+            this.rebuildScreens();
         };
         this.onLogUpdated = () => {
             this.renderGridWidgets();
         };
         this.updateUnits = () => {
             const runner = consts_1.MemKey_PhaseRunner.get();
-            this.units = runner.getUnits().filter(unit => {
+            this.allUnits = runner.getUnits().filter(unit => {
                 return unit.isInstanceOf(firebase_units_1.Unit_FirebaseHostingApp) || unit.isInstanceOf(firebase_units_1.Unit_FirebaseFunctionsApp);
             });
+            if (!this.focusUnits.length)
+                this.focusUnits = this.allUnits;
         };
         this.createGridWidgets = () => {
             this.destroyGridWidgets();
@@ -47,27 +49,40 @@ class BAIScreen_Launch extends BAIScreen_1.BAIScreen {
                         label: this.getGridWidgetLabel(widgetIndex),
                         border: { type: 'line' },
                         style: {
-                            border: { fg: 'blue' },
+                            hover: { border: { fg: 'blue' } },
+                            border: { fg: 'gray' },
+                            focus: { border: { fg: 'green' } }
                         },
                         valign: 'top',
                         align: 'left',
-                        mouse: true,
+                        interactive: true,
+                        focusable: true,
                     };
-                    this.gridCellWidgets.push(this.createWidget('log', props));
+                    const logWidget = this.createWidget('log', props);
+                    let doubleClickTimestamp = 0;
+                    const unitIndex = widgetIndex;
+                    logWidget.on('mouse', (event) => {
+                        if (!(event.button === 'middle' && event.action === 'mouseup'))
+                            return;
+                        if ((0, ts_common_1.currentTimeMillis)() - doubleClickTimestamp < 500) {
+                            return this.toggleFullScreenMode(unitIndex);
+                        }
+                        doubleClickTimestamp = (0, ts_common_1.currentTimeMillis)();
+                    });
+                    this.gridCellWidgets.push(logWidget);
                     yPos += height; //Assuming all cells in a column have the same height
                     widgetIndex++;
                 });
                 xPos += col[0].width * 100; //Assuming all Cells have the same width
             });
         };
-        this.calculateGridDimensions = () => {
-            let n = this.units.length;
+        this.calculateGridDimensions = (count = this.focusUnits.length) => {
             //Add 1 more window for running logs
             if (this.withRunningLogs)
-                n++;
+                count++;
             const grid = [];
-            const columns = Math.ceil(Math.sqrt(n)); // Calculate number of columns
-            let remainingItems = n;
+            const columns = Math.ceil(Math.sqrt(count)); // Calculate number of columns
+            let remainingItems = count;
             for (let col = 0; col < columns; col++) {
                 const column = [];
                 const itemsInThisColumn = Math.ceil(remainingItems / (columns - col));
@@ -82,22 +97,25 @@ class BAIScreen_Launch extends BAIScreen_1.BAIScreen {
         };
         this.getGridWidgetLabel = (index) => {
             if (!this.withRunningLogs)
-                return this.units[index].config.label;
-            return index === this.units.length ? 'Running Logs' : this.units[index].config.label;
+                return this.focusUnits[index].config.label;
+            return index === this.focusUnits.length ? 'Running Logs' : this.focusUnits[index].config.label;
         };
         this.destroyGridWidgets = () => {
             this.gridCellWidgets.forEach(widget => widget.destroy());
+            this.gridCellWidgets.length = 0;
         };
         this.getContentForWidget = (widgetIndex) => {
             var _a, _b;
             if (!this.withRunningLogs) {
-                const unit = this.units[widgetIndex];
+                const unit = this.focusUnits[widgetIndex];
+                if (!unit)
+                    throw new ts_common_1.WhoCallThisException(`focusedUnits: ${this.focusUnits.length}[${widgetIndex}]`);
                 return (_a = unit.getLogs()) !== null && _a !== void 0 ? _a : `No logs for unit ${unit.config.label}`;
             }
             //With running logs, last index should return the running logs
-            if (widgetIndex === this.units.length)
+            if (widgetIndex === this.focusUnits.length)
                 return this.getLogs();
-            const unit = this.units[widgetIndex];
+            const unit = this.focusUnits[widgetIndex];
             return (_b = unit.getLogs()) !== null && _b !== void 0 ? _b : `No logs for unit ${unit.config.label}`;
         };
         this.renderGridWidgets = () => {
@@ -111,11 +129,29 @@ class BAIScreen_Launch extends BAIScreen_1.BAIScreen {
         //######################### Options #########################
         this.setWithRunningLogs = (val) => this.withRunningLogs = val;
     }
+    rebuildScreens() {
+        this.createGridWidgets();
+        this.renderGridWidgets();
+        this.container.screen.render();
+    }
     //######################### Content Creation #########################
     createContent() {
         this.updateUnits();
         this.createGridWidgets();
     }
+    scrollLog(direction) {
+        var _a;
+        const focusedWidget = this.getFocusedWidget();
+        // @ts-ignore
+        (_a = this.gridCellWidgets.find(log => log._label.content === focusedWidget._label.content)) === null || _a === void 0 ? void 0 : _a.scroll(direction);
+    }
+    toggleFullScreenMode(unitIndex) {
+        if (this.focusUnits.length !== this.allUnits.length)
+            this.focusUnits = this.allUnits;
+        else
+            this.focusUnits = [this.allUnits[unitIndex]];
+        this.rebuildScreens();
+    }
     //######################### Content Destruction #########################
     destroyContent() {
         this.destroyGridWidgets();
@@ -124,7 +160,7 @@ class BAIScreen_Launch extends BAIScreen_1.BAIScreen {
     render() {
         this.renderGridWidgets();
         this.logInfo('GRID DIMENSIONS', this.gridDimensions);
-        this.logInfo('UNITS', this.units.map(unit => unit.config.label));
+        this.logInfo('UNITS', this.focusUnits.map(unit => unit.config.label));
         this.logInfo('RUNNER UNITS', consts_1.MemKey_PhaseRunner.get().getUnits().map(unit => unit.config.label));
     }
 }

package/v2/screens/BAIScreen_UnitList.d.ts

@@ -17,6 +17,7 @@ export declare class BAIScreen_UnitList extends BAIScreen<State> implements Phas
     __onUnitStatusChange(unit: BaseUnit): void;
     __onUnitsChange(data: BaseUnit[]): void;
     protected onLogUpdated: () => void;
+    protected scrollLog(direction: number): void;
     protected destroyContent(): void;
     private destroyPhaseWidget;
     private destroyUnitListWidget;

package/v2/screens/BAIScreen_UnitList.js

@@ -28,6 +28,14 @@ class BAIScreen_UnitList extends BAIScreen_1.BAIScreen {
         this.createUnitListWidget();
         this.renderUnitList();
     }
+    scrollLog(direction) {
+        // const focusedWidget = this.getFocusedWidget();
+        // @ts-ignore
+        // console.log(`ZEVEL ${focusedWidget.type}`);
+        // if (focusedWidget !== this.logWidget)
+        // 	return;
+        this.logWidget.scroll(direction);
+    }
     //######################### Content Destruction #########################
     destroyContent() {
         this.destroyPhaseWidget();
@@ -69,7 +77,6 @@ class BAIScreen_UnitList extends BAIScreen_1.BAIScreen {
             },
             align: 'center',
             label: 'phase',
-            mouse: true
         };
         this.phaseWidget = this.createWidget('text', props);
         this.phaseWidget.on('mouse', (event) => {
@@ -142,9 +149,16 @@ class BAIScreen_UnitList extends BAIScreen_1.BAIScreen {
             style: {
                 border: { fg: 'blue' }
             },
-            valign: 'top',
-            align: 'left',
-            mouse: true,
+            scrollbar: {
+                ch: ' ',
+                track: {
+                    bg: 'grey',
+                },
+                style: {
+                    inverse: true,
+                },
+            },
+            interactive: true // This is typically required for focus management
         };
         this.logWidget = this.createWidget('log', props);
     }
@@ -172,10 +186,10 @@ class BAIScreen_UnitList extends BAIScreen_1.BAIScreen {
         });
     }
     renderLogs() {
-        const scrollPosition = this.logWidget.getScroll();
+        var _a, _b;
         const content = this.state.selectedUnit ? this.state.selectedUnit.getLogs() : this.getLogs();
+        this.logWidget.setLabel(` ${(_b = (_a = this.state.selectedUnit) === null || _a === void 0 ? void 0 : _a.config.label) !== null && _b !== void 0 ? _b : 'All Logs'} `);
         this.logWidget.setContent(content);
-        this.logWidget.setScroll(scrollPosition);
     }
     //######################### Events #########################
     onUnitSelect(unit, index) {
@@ -186,3 +200,4 @@ class BAIScreen_UnitList extends BAIScreen_1.BAIScreen {
     }
 }
 exports.BAIScreen_UnitList = BAIScreen_UnitList;
+// /Users/tacb0ss/.nvm/versions/node/v18.15.0/bin/ts-node -P /Users/tacb0ss/dev/quai/test/quai-web/_thunderstorm/commando/src/test/tsconfig.json /Users/tacb0ss/dev/quai/test/quai-web/_thunderstorm/commando/src/test/console/controlled-scroll/run.ts

package/v2/unit/core/BaseUnit.js

@@ -100,9 +100,11 @@ class BaseUnit extends ts_common_1.Logger {
     async kill() {
         if (!this.processTerminator.length)
             return this.setStatus('Killed');
+        const processTerminator = [...this.processTerminator];
+        this.processTerminator.length = 0;
         this.setStatus('Killing');
         try {
-            await Promise.all(this.processTerminator.map(toTerminate => toTerminate()));
+            await Promise.all(processTerminator.map(toTerminate => toTerminate()));
         }
         finally {
             this.setStatus('Killed');

package/v2/unit/core/Unit_Typescript.js

@@ -60,7 +60,12 @@ class Unit_Typescript extends BaseUnit_1.BaseUnit {
         const templatePath = `${unitRootPath}/${consts_1.CONST_PackageJSONTemplate}`;
         if (!fs.existsSync(templatePath))
             throw new ts_common_1.BadImplementationException(`Missing __package.json file in root for unit ${this.config.label}`);
-        this.packageJson.template = JSON.parse(await fs_1.promises.readFile(templatePath, 'utf-8'));
+        try {
+            this.packageJson.template = JSON.parse(await fs_1.promises.readFile(templatePath, 'utf-8'));
+        }
+        catch (e) {
+            throw new ts_common_1.BadImplementationException(`There is an issue in the __package.json file in root for unit ${this.config.label}`);
+        }
     }
     /**
      * Create a packageJson object for each target key

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

@@ -1,7 +1,7 @@
 import { Unit_Typescript, Unit_Typescript_Config, Unit_Typescript_RuntimeConfig } from './Unit_Typescript';
-import { UnitPhaseImplementor, WatchEventType } from '../types';
+import { UnitPhaseImplementor } from '../types';
 import { Phase_CheckCyclicImports, Phase_Compile, Phase_Lint, Phase_PreCompile, Phase_PrintDependencyTree, Phase_Purge } from '../../phase';
-import { OnWatchEvent } from '../runner-dispatchers';
+import { OnWatchReady } from '../runner-dispatchers';
 export type Unit_TypescriptLib_Config = Unit_Typescript_Config & {
     customTSConfig?: boolean;
     output: string;
@@ -19,23 +19,26 @@ export declare class Unit_TypescriptLib<C extends Unit_TypescriptLib_Config = Un
     Phase_CheckCyclicImports,
     Phase_Purge,
     Phase_Lint
-]>, OnWatchEvent {
-    private debounceWatch?;
+]>, OnWatchReady {
     constructor(config: Unit_TypescriptLib<C, RTC>['config']);
-    __onWatchEvent(type: WatchEventType, path?: string): Promise<void>;
+    __onWatchReady(): Promise<void>;
     protected init(setInitialized?: boolean): Promise<void>;
     protected resolveTSConfig(): Promise<void>;
     protected clearOutputDir(): Promise<void>;
     protected compileImpl(): Promise<void>;
     protected copyAssetsToOutput(): Promise<void>;
     protected copyPackageJSONToOutput(): Promise<void>;
-    protected handleWatchChange(path: string, shouldRemoveDist?: boolean): Promise<void>;
+    /**
+     * Watch compile actions, use this to perform all necessary compile actions for watch.
+     * watch compile is a subset of the general watch action
+     */
+    watchCompile(): Promise<void>;
     /**
      * Remove the deleted file/folder from the dist folder on watch remove file event
      * @param path The path of the currently removed file/folder
      * @private
      */
-    private removeSpecificFileFromDist;
+    removeSpecificFileFromDist(path: string): Promise<void>;
     preCompile(): Promise<void>;
     compile(): Promise<void>;
     purge(): Promise<void>;

package/v2/unit/core/Unit_TypescriptLib.js

@@ -32,7 +32,6 @@ 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 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");
@@ -52,17 +51,12 @@ class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
         super(config);
         this.addToClassStack(Unit_TypescriptLib);
     }
-    async __onWatchEvent(type, path) {
-        if (type === consts_2.WatchEvent_Ready)
-            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 * 2, ts_common_1.Second * 10);
-        this.debounceWatch();
+    async __onWatchReady() {
+        return this.setStatus('Watching');
     }
     async init(setInitialized = true) {
         await super.init(false);
-        runner_dispatchers_1.dispatcher_WatchEvent.addListener(this);
+        runner_dispatchers_1.dispatcher_WatchReady.addListener(this);
         this.runtime.pathTo.output = this.runtime.pathTo.pkg + `/${this.config.output}`;
         if (setInitialized)
             this.setStatus('Initialized');
@@ -131,15 +125,13 @@ class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
         const fileContent = JSON.stringify(this.packageJson.dist, null, 2);
         await fs_1.promises.writeFile(targetPath, fileContent, { encoding: 'utf-8' });
     }
-    async handleWatchChange(path, shouldRemoveDist = false) {
-        // ignore if path doesn't related to unit
-        if (!path.startsWith(this.config.pathToPackage))
-            return;
+    /**
+     * Watch compile actions, use this to perform all necessary compile actions for watch.
+     * watch compile is a subset of the general watch action
+     */
+    async watchCompile() {
         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();
@@ -148,8 +140,6 @@ class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
         catch (e) {
             this.setStatus(`Watching with error`, e);
         }
-        // dispatch unit post compile
-        runner_dispatchers_1.dispatcher_UnitWatchCompile.dispatch(this);
     }
     /**
      * Remove the deleted file/folder from the dist folder on watch remove file event
@@ -157,6 +147,7 @@ class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
      * @private
      */
     async removeSpecificFileFromDist(path) {
+        this.setStatus('Removing files from dist', 'start');
         const distPathBase = path.replace('src/main', 'dist').replace(/\.ts$/, '');
         const pathsToDelete = [
             `${distPathBase}.js`,
@@ -172,6 +163,7 @@ class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
             }
             await fs_1.promises.rm(path, { recursive: true, force: true });
         }
+        this.setStatus('Files Removed and watching', 'end');
     }
     //######################### Phase Implementations #########################
     async preCompile() {

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

@@ -7,6 +7,7 @@ type Unit_TypescriptProject_Config = Unit_Typescript_Config & {
 };
 type Unit_TypescriptProject_RuntimeConfig = Unit_Typescript_RuntimeConfig & {};
 export declare class Unit_TypescriptProject<C extends Unit_TypescriptProject_Config = Unit_TypescriptProject_Config, RTC extends Unit_TypescriptProject_RuntimeConfig = Unit_TypescriptProject_RuntimeConfig> extends Unit_Typescript<C, RTC> implements UnitPhaseImplementor<[Phase_Install, Phase_Watch]> {
+    private watchDebounce;
     private readonly suffixesToWatch;
     constructor(config: Unit_TypescriptProject<C>['config']);
     private installGlobals;
@@ -22,6 +23,7 @@ export declare class Unit_TypescriptProject<C extends Unit_TypescriptProject_Con
      * @private
      */
     private initWatch;
+    private findUnit;
     private watchImpl;
     install(): Promise<void>;
     watch(): Promise<void>;

package/v2/unit/core/Unit_TypescriptProject.js

@@ -30,7 +30,6 @@ const ts_common_1 = require("@nu-art/ts-common");
 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");
@@ -46,6 +45,13 @@ class Unit_TypescriptProject extends Unit_Typescript_1.Unit_Typescript {
             'json',
             'svg'
         ];
+        this.findUnit = (pathDeclarations, currentPath) => {
+            var _a;
+            const unitToReturn = (_a = pathDeclarations.find(declaration => currentPath.startsWith(declaration.pathToPackage))) === null || _a === void 0 ? void 0 : _a.unit;
+            if (!unitToReturn)
+                throw new ts_common_1.MUSTNeverHappenException(`current path doesnt match any declared unit, current path: ${currentPath}`);
+            return unitToReturn;
+        };
         this.addToClassStack(Unit_TypescriptProject);
     }
     //######################### Internal Logic #########################
@@ -86,8 +92,12 @@ class Unit_TypescriptProject extends Unit_Typescript_1.Unit_Typescript {
             .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`;
-            return { paths: this.suffixesToWatch.map(suffix => `${sourceFolder}/**/*.${suffix}`), unit: lib };
+            const sourceFolder = `${lib.runtime.pathTo.pkg}/src/main`;
+            return {
+                paths: this.suffixesToWatch.map(suffix => `${sourceFolder}/**/*.${suffix}`),
+                unit: lib,
+                pathToPackage: lib.runtime.pathTo.pkg
+            };
         });
     }
     /**
@@ -101,25 +111,65 @@ class Unit_TypescriptProject extends Unit_Typescript_1.Unit_Typescript {
         // set all events to watch and handle them
         return new Promise((resolve, error) => {
             this.logInfo('Starting the watcher...');
+            const units = new Set();
+            const pathsToDelete = [];
+            const onUnitChange = (path) => {
+                const unit = this.findUnit(pathDeclarations, path);
+                // @ts-ignore - FIXME: should be a better way
+                unit.setStatus('dirty');
+                //add unit to set
+                units.add(unit);
+                return unit;
+            };
+            // set the debounce event
+            this.watchDebounce = (0, ts_common_1.queuedDebounce)(async () => {
+                const _pathsToDelete = [...pathsToDelete];
+                const unitsToCompile = Array.from(units.values());
+                // clear values in order to start collecting values for next debounce
+                (0, ts_common_1.clearArrayInstance)(pathsToDelete);
+                units.clear();
+                // fire all delete events
+                await (0, ts_common_1.Promise_all_sequentially)(_pathsToDelete.map(path => {
+                    return async () => path.unit.removeSpecificFileFromDist(path.path);
+                }));
+                // fire all compile events
+                await (0, ts_common_1.Promise_all_sequentially)(unitsToCompile.map(unit => {
+                    return async () => unit.watchCompile();
+                }));
+                //dispatch post debounce event to parent
+                await runner_dispatchers_1.dispatcher_UnitWatchCompile.dispatchAsync(unitsToCompile);
+            }, 2 * ts_common_1.Second, 10 * ts_common_1.Second);
             watcher
                 .on('error', (error) => {
                 this.logError('Error while watching', error);
             })
                 .on('ready', () => {
                 this.logInfo('Watching...');
-                runner_dispatchers_1.dispatcher_WatchEvent.dispatch(consts_2.WatchEvent_Ready);
+                runner_dispatchers_1.dispatcher_WatchReady.dispatch();
                 watcher
                     .on('add', (path) => {
-                    runner_dispatchers_1.dispatcher_WatchEvent.dispatch(consts_2.WatchEvent_Add, path);
+                    onUnitChange(path);
+                    //trigger debounce
+                    this.watchDebounce();
                 })
                     .on('change', (path) => {
-                    runner_dispatchers_1.dispatcher_WatchEvent.dispatch(consts_2.WatchEvent_Update, path);
+                    onUnitChange(path);
+                    //trigger debounce
+                    this.watchDebounce();
                 })
                     .on('unlinkDir', (path) => {
-                    runner_dispatchers_1.dispatcher_WatchEvent.dispatch(consts_2.WatchEvent_RemoveDir, path);
+                    const unit = onUnitChange(path);
+                    //update paths to delete
+                    pathsToDelete.push({ path, unit });
+                    //trigger debounce
+                    this.watchDebounce();
                 })
                     .on('unlink', (path) => {
-                    runner_dispatchers_1.dispatcher_WatchEvent.dispatch(consts_2.WatchEvent_RemoveFile, path);
+                    const unit = onUnitChange(path);
+                    //update paths to delete
+                    pathsToDelete.push({ path, unit });
+                    //trigger debounce
+                    this.watchDebounce();
                 });
             });
             const terminatable = async () => {

package/v2/unit/firebase-units/Unit_FirebaseFunctionsApp.d.ts

@@ -9,7 +9,7 @@ export type Unit_FirebaseFunctionsApp_Config = Unit_TypescriptLib_Config & {
 };
 export declare class Unit_FirebaseFunctionsApp<C extends Unit_FirebaseFunctionsApp_Config = Unit_FirebaseFunctionsApp_Config> extends Unit_TypescriptLib<C> implements UnitPhaseImplementor<[Phase_ResolveConfigs, Phase_Launch, Phase_DeployBackend]>, OnUnitWatchCompiled {
     static staggerCount: number;
-    __onUnitWatchCompiled(unit: BaseUnit): Promise<void>;
+    __onUnitWatchCompiled(units: BaseUnit[]): Promise<void>;
     constructor(config: Unit_FirebaseFunctionsApp<C>['config']);
     protected init(setInitialized?: boolean): Promise<void>;
     resolveConfigs(): Promise<void>;

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

@@ -13,8 +13,8 @@ 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)) {
+    async __onUnitWatchCompiled(units) {
+        if (units.some(unit => this.runtime.unitDependencyNames.includes(unit.runtime.dependencyName))) {
             this.setStatus('Compiling', 'start');
             try {
                 await this.compileImpl();
@@ -36,7 +36,7 @@ class Unit_FirebaseFunctionsApp extends core_1.Unit_TypescriptLib {
     async init(setInitialized = true) {
         await super.init(false);
         // only sign on listeners when the unit is being initialized
-        runner_dispatchers_1.dispatcher_WatchEvent.removeListener(this);
+        runner_dispatchers_1.dispatcher_WatchReady.removeListener(this);
         runner_dispatchers_1.dispatcher_UnitWatchCompile.addListener(this);
         if (setInitialized)
             this.setStatus('Initialized');

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

@@ -19,7 +19,7 @@ class Unit_FirebaseHostingApp extends core_1.Unit_TypescriptLib {
     }
     async init(setInitialized = true) {
         await super.init(setInitialized);
-        runner_dispatchers_1.dispatcher_WatchEvent.removeListener(this);
+        runner_dispatchers_1.dispatcher_WatchReady.removeListener(this);
         if (!this.config.firebaseConfig.hostingPort)
             throw new ts_common_1.BadImplementationException(`Unit ${this.config.label} missing hosting port in firebaseConfig`);
     }

package/v2/unit/runner-dispatchers.d.ts

@@ -1,11 +1,10 @@
 import { PhaseRunnerDispatcher } from '../phase-runner/PhaseRunnerDispatcher';
-import { WatchEventType } from './types';
 import { BaseUnit } from './core';
-export interface OnWatchEvent {
-    __onWatchEvent: (type: WatchEventType, path?: string) => void;
+export interface OnWatchReady {
+    __onWatchReady: () => void;
 }
-export declare const dispatcher_WatchEvent: PhaseRunnerDispatcher<OnWatchEvent, "__onWatchEvent", [type: WatchEventType, path?: string | undefined]>;
+export declare const dispatcher_WatchReady: PhaseRunnerDispatcher<OnWatchReady, "__onWatchReady", []>;
 export interface OnUnitWatchCompiled {
-    __onUnitWatchCompiled: (init: BaseUnit) => void;
+    __onUnitWatchCompiled: (units: BaseUnit[]) => void;
 }
-export declare const dispatcher_UnitWatchCompile: PhaseRunnerDispatcher<OnUnitWatchCompiled, "__onUnitWatchCompiled", [init: BaseUnit<import("./core").BaseUnit_Config, import("./core").BaseUnit_RuntimeConfig>]>;
+export declare const dispatcher_UnitWatchCompile: PhaseRunnerDispatcher<OnUnitWatchCompiled, "__onUnitWatchCompiled", [units: BaseUnit<import("./core").BaseUnit_Config, import("./core").BaseUnit_RuntimeConfig>[]]>;

package/v2/unit/runner-dispatchers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dispatcher_UnitWatchCompile = exports.dispatcher_WatchEvent = void 0;
+exports.dispatcher_UnitWatchCompile = exports.dispatcher_WatchReady = void 0;
 const PhaseRunnerDispatcher_1 = require("../phase-runner/PhaseRunnerDispatcher");
-exports.dispatcher_WatchEvent = new PhaseRunnerDispatcher_1.PhaseRunnerDispatcher('__onWatchEvent');
+exports.dispatcher_WatchReady = new PhaseRunnerDispatcher_1.PhaseRunnerDispatcher('__onWatchReady');
 exports.dispatcher_UnitWatchCompile = new PhaseRunnerDispatcher_1.PhaseRunnerDispatcher('__onUnitWatchCompiled');