@nu-art/build-and-install 0.300.6 → 0.300.7

package/package.json

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

package/v2/phase/consts.js

@@ -58,6 +58,7 @@ exports.phase_Purge = {
 exports.phaseKey_CopyPackageJSON = 'copy-package-json';
 exports.phase_CopyPackageJSON = {
     key: exports.phaseKey_CopyPackageJSON,
+    unitFilter: (unit) => 'copyPackageJson' in unit,
     name: 'Copy Package JSON',
     method: 'copyPackageJson',
 };

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

@@ -22,16 +22,17 @@ export declare class PhaseRunner extends BaseUnit implements UnitPhaseImplemento
     private defaultFileRoutes;
     constructor(projectPath: RelativePath);
     protected init(): Promise<void>;
-    private filterUnits;
     private loadProject;
     private prepareProjectParams;
     private prepareDefaultFileRouts;
     private buildUnitDependencyTree;
     private phaseFilters;
     private executeImpl;
-    executePhaseTest<P extends Phase<string>>(phase: P, unit: BaseUnit, index: number): Promise<void>;
-    registerUnits(units: BaseUnit | BaseUnit[]): void;
+    executePhase<P extends Phase<string>>(phase: P, unit: BaseUnit, index: number): Promise<void>;
+    private executePhaseImpl;
+    private executePhaseDryRun;
     private willUnitRunForPhase;
+    registerUnits(units: BaseUnit | BaseUnit[]): void;
     getUnits(): BaseUnit<import("../unit/core").BaseUnit_Config, import("../unit/core").BaseUnit_RuntimeConfig>[];
     /**
      * Will add a phase to the start of the phase array.

package/v2/phase-runner/PhaseRunner.js

@@ -72,14 +72,18 @@ class PhaseRunner extends core_1.BaseUnit {
             }
         };
         this.willUnitRunForPhase = async (phase, unit) => {
-            // Unit filter did not pass
-            if ((0, ts_common_1.exists)(unit.config.filter) && !unit.config.filter())
-                return false;
+            var _a, _b;
             // Unit doesn't implement the phase method
             if (!(0, ts_common_1.exists)(unit[phase.method]))
                 return false;
-            // If phase implements unit filter and unit doesn't pass
-            if ((0, ts_common_1.exists)(phase.unitFilter) && !(await phase.unitFilter(unit)))
+            // If phase implements unit filter whether unit doesn't pass
+            if ((0, ts_common_1.exists)(phase.unitFilter))
+                return (await phase.unitFilter(unit));
+            // Runtime input is stronger than the unit default filter
+            if (params_1.RuntimeParams.usePackage)
+                return (((_a = params_1.RuntimeParams.usePackage) === null || _a === void 0 ? void 0 : _a.includes(unit.config.key)) || ((_b = params_1.RuntimeParams.usePackage) === null || _b === void 0 ? void 0 : _b.includes(unit.config.label)));
+            // Unit filter itself
+            if ((0, ts_common_1.exists)(unit.config.filter) && !await unit.config.filter())
                 return false;
             return true;
         };
@@ -123,7 +127,7 @@ class PhaseRunner extends core_1.BaseUnit {
         //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.filterUnits();
         this.logDebug('Runtime params:', params_1.RuntimeParams);
         //Set runner params
         //Set Project Params
@@ -142,22 +146,25 @@ class PhaseRunner extends core_1.BaseUnit {
             return unit.init();
         }));
     }
-    filterUnits() {
-        const useUnits = params_1.RuntimeParams.usePackage;
-        if (!useUnits || !useUnits.length)
-            return;
-        const unitsToRemove = [];
-        for (const unit of this.units) {
-            if (unit === this)
-                continue;
-            if (!useUnits.includes(unit.config.key))
-                unitsToRemove.push(unit);
-        }
-        if (!unitsToRemove.length)
-            return;
-        unitsToRemove.forEach(unit => (0, ts_common_1.removeItemFromArray)(this.units, unit));
-        PhaseRunnerDispatcher_1.dispatcher_UnitChange.dispatch(this.units);
-    }
+    // private filterUnits() {
+    // 	const useUnits = RuntimeParams.usePackage;
+    // 	if (!useUnits || !useUnits.length)
+    // 		return;
+    //
+    // 	const unitsToRemove: BaseUnit[] = [];
+    // 	for (const unit of this.units) {
+    // 		if (unit === this)
+    // 			continue;
+    //
+    // 		if (!useUnits.includes(unit.config.key))
+    // 			unitsToRemove.push(unit);
+    // 	}
+    //
+    // 	if (!unitsToRemove.length)
+    // 		return;
+    //
+    // 	unitsToRemove.forEach(unit => removeItemFromArray(this.units, unit));
+    // }
     async loadProject() {
         if (!fs_1.default.existsSync(this.projectPath))
             throw new ts_common_1.ImplementationMissingException(`Missing project config file, could not find in path: ${this.projectPath}`);
@@ -244,7 +251,7 @@ class PhaseRunner extends core_1.BaseUnit {
                     continue;
                 }
                 lastPhase = phase;
-                this.logInfo(`Will execute phase: ${phase.name}`);
+                this.logVerbose(`Will execute phase: ${phase.name}`);
                 if (phase.breakPhases) {
                     phasesBlocks.push(phasesBlock);
                     phasesBlocks.push([phase]);
@@ -263,23 +270,33 @@ class PhaseRunner extends core_1.BaseUnit {
         if (params_1.RuntimeParams.debug)
             this.logDebug('phasesBlock: ', phasesBlock);
         const executionQueue = phasesBlocks.map((_phasesBlock, index) => {
+            this.logDebug(`Executing phases #${index}: ${_phasesBlock.map(p => p.name).join(', ')}`);
             return async () => {
                 return (0, ts_common_1.Promise_all_sequentially)(this.unitDependencyTree.map(unitGroup => () => {
-                    return Promise.all(unitGroup.map(unit => (0, ts_common_1.Promise_all_sequentially)(_phasesBlock.map(phase => () => this.executePhaseTest(phase, unit, index)))));
+                    return Promise.all(unitGroup.map(unit => (0, ts_common_1.Promise_all_sequentially)(_phasesBlock.map(phase => () => this.executePhase(phase, unit, index)))));
                 }));
             };
         });
         await (0, ts_common_1.Promise_all_sequentially)(executionQueue);
         this.killed = false;
     }
-    async executePhaseTest(phase, unit, index) {
-        var _a, _b;
+    async executePhase(phase, unit, index) {
         if (!params_1.RuntimeParams.dryRun)
-            return (_b = (_a = unit)[phase.method]) === null || _b === void 0 ? void 0 : _b.call(_a);
+            return this.executePhaseImpl(phase, unit, index);
+        return this.executePhaseDryRun(phase, unit, index);
+    }
+    async executePhaseImpl(phase, unit, index) {
+        var _a, _b;
+        if (!await this.willUnitRunForPhase(phase, unit))
+            return;
+        unit.logDebug(`Running phase #${index}: ${phase.name}`);
+        return (_b = (_a = unit)[phase.method]) === null || _b === void 0 ? void 0 : _b.call(_a);
+    }
+    async executePhaseDryRun(phase, unit, index) {
         if (!(await this.willUnitRunForPhase(phase, unit)))
             unit.logWarning(`will NOT run phase #${index}: ${phase.name}`);
         else
-            unit.logWarning(`running phase #${index}: ${phase.name}`);
+            unit.logWarning(`Running phase #${index}: ${phase.name}`);
     }
     //######################### Unit Logic #########################
     registerUnits(units) {
@@ -296,12 +313,6 @@ class PhaseRunner extends core_1.BaseUnit {
         });
         PhaseRunnerDispatcher_1.dispatcher_UnitChange.dispatch(this.units);
     }
-    // private async getUnitsForPhase<P extends Phase<string>>(phase: P) {
-    // 	return filterInstances(await Promise.all(this.unitDependencyTree.map(async row => {
-    // 		const filteredRow = await Promise.all(row.filter((unit) => this.willUnitRunForPhase(phase, unit)));
-    // 		return filterInstances(filteredRow);
-    // 	})).then(rows => rows.filter(row => row.length)));
-    // }
     getUnits() {
         return this.units;
     }
@@ -449,10 +460,10 @@ class PhaseRunner extends core_1.BaseUnit {
         this.logDebug('Runner Params:', RunnerParams_1.MemKey_RunnerParams.get());
         this.logDebug('Project Config:', RunnerParams_1.MemKey_ProjectConfig.get());
         this.logDebug('Default File Routes:', consts_1.MemKey_DefaultFiles.get());
+        this.logDebug('All Phases:', this.phases.map(phase => phase.name));
         this.logDebug('Filtered Units:', this.units.map(unit => unit.config.label));
         const dependencyTree = this.unitDependencyTree.map(row => row.map(unit => unit.config.label));
         this.logInfo('Unit Dependencies Tree:', dependencyTree);
-        this.logInfo('Phases:', this.phases.map(phase => phase.name));
         if (params_1.RuntimeParams.debugLifecycle)
             process.exit(0);
     }