@nu-art/build-and-install 0.204.45 → 0.204.47

package/logic/command-executors/CommandExecutor_FirebaseFunction.d.ts

@@ -9,7 +9,6 @@ export declare class CommandExecutor_FirebaseFunction {
     private readonly pkg;
     private readonly commandos;
     private listeners;
-    private debugMode?;
     private onReadyCallbacks;
     constructor(pkg: Package_FirebaseFunctionsApp);
     private initListeners;
@@ -20,7 +19,6 @@ export declare class CommandExecutor_FirebaseFunction {
     private onReady;
     execute(): Promise<this>;
     kill(): Promise<void>;
-    setDebug(debug: boolean): void;
     addOnReadyCallback(cb: OnReadyCallback): void;
 }
 export {};

package/logic/command-executors/CommandExecutor_FirebaseFunction.js

@@ -5,6 +5,7 @@ const nvm_1 = require("@nu-art/commando/cli/nvm");
 const basic_1 = require("@nu-art/commando/cli/basic");
 const cli_1 = require("@nu-art/commando/core/cli");
 const ts_common_1 = require("@nu-art/ts-common");
+const params_1 = require("../../core/params/params");
 class CommandExecutor_FirebaseFunction {
     constructor(pkg) {
         this.PROXY_PID_LOG = '_PROXY_PID_';
@@ -63,7 +64,7 @@ class CommandExecutor_FirebaseFunction {
         await this.commandos.emulator
             .setUID(this.pkg.name)
             .cd(this.pkg.path)
-            .append(`firebase emulators:start --export-on-exit --import=.trash/data ${this.debugMode ? `--inspect-functions ${this.pkg.envConfig.ssl}` : ''} &`)
+            .append(`firebase emulators:start --export-on-exit --import=.trash/data ${params_1.RuntimeParams.debugBackend ? `--inspect-functions ${this.pkg.envConfig.debugPort}` : ''} &`)
             .append('pid=$!')
             .append(`echo "${this.EMULATOR_PID_LOG}=\${pid}"`)
             .append(`wait \$pid`)
@@ -91,9 +92,6 @@ class CommandExecutor_FirebaseFunction {
         await this.commandos.emulator.gracefullyKill(emulatorPid);
         await this.commandos.proxy.gracefullyKill(proxyPid);
     }
-    setDebug(debug) {
-        this.debugMode = debug;
-    }
     addOnReadyCallback(cb) {
         this.onReadyCallbacks.push(cb);
     }

package/package.json

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

package/phases/phases.js

@@ -740,6 +740,11 @@ exports.Phase_DeployBackend = {
         const counter = timeCounter();
         await nvm_1.NVM.createCommando(basic_1.Cli_Basic)
             .cd(pkg.path)
+            .cd('dist')
+            .ls()
+            .cat('package.json')
+            .cat('index.js')
+            .cd_()
             .append(`firebase --debug deploy --only functions --force`)
             .execute();
         projectScreen.updateOrCreatePackage(pkg.name, `Deployed (${counter.format('mm:ss.zzz')})`);

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

@@ -5,9 +5,12 @@ type Unit<P extends Phase<string>[]> = BaseUnit & UnitPhaseImplementor<P>;
 export declare class PhaseRunner<P extends Phase<string>[]> extends BaseUnit {
     private readonly phases;
     private units;
+    private runnerParams;
     constructor(phases: P);
+    protected init(): Promise<void>;
     registerUnits(units: Unit<P> | Unit<P>[]): void;
     private getUnitsForPhase;
+    private _getRunnerParam;
     private initUnits;
     private executePhase;
     execute(): Promise<void>;

package/v2/phase-runner/PhaseRunner.js

@@ -7,8 +7,14 @@ class PhaseRunner extends BaseUnit_1.BaseUnit {
     constructor(phases) {
         super({ label: 'Phase Runner', key: 'phase-runner' });
         this.units = [];
+        this.runnerParams = {};
+        this._getRunnerParam = (runnerParamKey) => this.runnerParams[runnerParamKey];
         this.phases = phases;
     }
+    async init() {
+        this.runnerParams['rootPath'] = process.cwd();
+        this.runnerParams['configPath'] = this.runnerParams['rootPath'] + '/.config';
+    }
     //######################### Unit Logic #########################
     registerUnits(units) {
         (0, ts_common_1.asArray)(units).forEach(unit => this.units.push(unit));
@@ -18,6 +24,7 @@ class PhaseRunner extends BaseUnit_1.BaseUnit {
     }
     async initUnits() {
         return Promise.all(this.units.map(unit => {
+            unit.setGetRunnerParamCaller(this._getRunnerParam);
             // @ts-ignore
             unit.init();
         }));
@@ -37,6 +44,7 @@ class PhaseRunner extends BaseUnit_1.BaseUnit {
     }
     //######################### Public Functions #########################
     async execute() {
+        await this.init();
         await this.initUnits();
         await this.executeImpl();
     }

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

@@ -10,3 +10,7 @@ export type PhaseImplementor<P extends Phase<string>[]> = {
 export type PhasesImplementor<Phases extends Phase<string>[]> = {
     [K in Phases[number]['method']]?: AsyncVoidFunction;
 };
+export type RunnerParamKeys = 'rootPath' | 'configPath';
+export type RunnerParams = {
+    [K in RunnerParamKeys]: string;
+};

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

@@ -1,12 +1,15 @@
 import { Logger } from '@nu-art/ts-common';
+import { RunnerParamKeys } from '../../phase-runner/types';
 type _Config<Config> = {
     key: string;
     label: string;
 } & Config;
 export declare class BaseUnit<Config extends {} = {}, C extends _Config<Config> = _Config<Config>> extends Logger {
     readonly config: Readonly<C>;
+    protected getRunnerParam: (runnerParamKey: RunnerParamKeys) => string | undefined;
     constructor(config: C);
     protected init(): Promise<void>;
     private initLogClient;
+    setGetRunnerParamCaller: (caller: (runnerParamKey: RunnerParamKeys) => string) => void;
 }
 export {};

package/v2/unit/core/BaseUnit.js

@@ -5,6 +5,9 @@ const ts_common_1 = require("@nu-art/ts-common");
 class BaseUnit extends ts_common_1.Logger {
     constructor(config) {
         super(config.key);
+        this.setGetRunnerParamCaller = (caller) => {
+            this.getRunnerParam = caller;
+        };
         this.config = Object.freeze(config);
         this.initLogClient();
     }

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

@@ -1,10 +1,26 @@
 import { BaseUnit } from './BaseUnit';
 import { Phase_CopyPackageJSON, UnitPhaseImplementor } from './types';
-type PackageJSONTargetKey = 'root' | 'dist' | 'dependency';
+import { PackageJson } from '../../../core/types';
+declare const PackageJsonTargetKeys: readonly ["root", "dist", "dependency"];
+type PackageJsonTargetKey = typeof PackageJsonTargetKeys[number];
 type _Config<Config> = {
     pathToPackage: string;
 } & Config;
 export declare class Unit_Typescript<Config extends {} = {}, C extends _Config<Config> = _Config<Config>> extends BaseUnit<C> implements UnitPhaseImplementor<[Phase_CopyPackageJSON]> {
+    readonly packageJson: {
+        [k in PackageJsonTargetKey]: PackageJson;
+    };
+    /**
+     * Create a packageJson object for each target key
+     * @private
+     */
+    private populatePackageJson;
+    /**
+     * Execute template to packageJson object conversion based on target key
+     * @param targetKey
+     * @param template
+     * @private
+     */
     private convertTemplatePackageJSON;
     /**
      * Converts a template __package.json file into a usable package.json for the unit root
@@ -25,6 +41,6 @@ export declare class Unit_Typescript<Config extends {} = {}, C extends _Config<C
      * @private
      */
     private convertPJForDependency;
-    copyPackageJson(targetKey?: PackageJSONTargetKey): Promise<void>;
+    copyPackageJson(): Promise<void>;
 }
 export {};

package/v2/unit/core/Unit_Typescript.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Unit_Typescript = void 0;
 const BaseUnit_1 = require("./BaseUnit");
@@ -6,21 +29,43 @@ const tools_1 = require("@nu-art/commando/core/tools");
 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 targetKeyPathMap = {
-    'root': '',
-    'dist': '/dist',
-    'dependency': '', //TODO: Fill this in
-};
+const PackageJsonTargetKey_Root = 'root';
+const PackageJsonTargetKey_Dist = 'dist';
+const PackageJsonTargetKey_Dependency = 'dependency';
+const PackageJsonTargetKeys = [PackageJsonTargetKey_Root, PackageJsonTargetKey_Dist, PackageJsonTargetKey_Dependency];
 class Unit_Typescript extends BaseUnit_1.BaseUnit {
+    constructor() {
+        super(...arguments);
+        this.packageJson = {};
+    }
     //######################### Internal Logic #########################
+    /**
+     * Create a packageJson object for each target key
+     * @private
+     */
+    async populatePackageJson() {
+        const unitRootPath = (0, tools_1.convertToFullPath)(this.config.pathToPackage);
+        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}`);
+        const template = JSON.parse(await fs_1.promises.readFile(templatePath, 'utf-8'));
+        PackageJsonTargetKeys.forEach(key => this.packageJson[key] = this.convertTemplatePackageJSON(key, template));
+    }
+    /**
+     * Execute template to packageJson object conversion based on target key
+     * @param targetKey
+     * @param template
+     * @private
+     */
     convertTemplatePackageJSON(targetKey, template) {
         switch (targetKey) {
-            case 'root':
+            case PackageJsonTargetKey_Root:
                 return this.convertPJForRoot(template);
-            case 'dist':
+            case PackageJsonTargetKey_Dist:
                 return this.convertPJForDist(template);
-            case 'dependency':
+            case PackageJsonTargetKey_Dependency:
                 return this.convertPJForDependency(template);
             default:
                 throw new ts_common_1.ImplementationMissingException(`No implementation for targetKey ${targetKey}`);
@@ -44,10 +89,10 @@ class Unit_Typescript extends BaseUnit_1.BaseUnit {
      * @private
      */
     convertPJForDist(template) {
-        var _a, _b;
+        var _a, _b, _c;
         //Get the package params for replacing in the template package json
         const params = (_b = (_a = consts_1.MemKey_Packages.get()) === null || _a === void 0 ? void 0 : _a.params) !== null && _b !== void 0 ? _b : {};
-        const converted = this.convertPJForRoot(template);
+        const converted = (_c = this.packageJson[PackageJsonTargetKey_Root]) !== null && _c !== void 0 ? _c : this.convertPJForRoot(template);
         params[converted.name] = converted.version;
         params[`${converted.name}_path`] = `file:.dependencies/${this.config.key}`; //Not sure about this one
         //Convert template to actual package.json
@@ -60,27 +105,23 @@ class Unit_Typescript extends BaseUnit_1.BaseUnit {
      * @private
      */
     convertPJForDependency(template) {
-        var _a, _b;
+        var _a, _b, _c;
         //Get the package params for replacing in the template package json
         const params = (_b = (_a = consts_1.MemKey_Packages.get()) === null || _a === void 0 ? void 0 : _a.params) !== null && _b !== void 0 ? _b : {};
-        const converted = this.convertPJForRoot(template);
+        const converted = (_c = this.packageJson[PackageJsonTargetKey_Root]) !== null && _c !== void 0 ? _c : this.convertPJForRoot(template);
         params[converted.name] = converted.version;
         params[`${converted.name}_path`] = `file:.dependencies/${this.config.key}`; //Not sure about this one
         //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]; });
     }
     //######################### Phase Implementations #########################
-    async copyPackageJson(targetKey = 'root') {
-        //Find paths
+    async copyPackageJson() {
+        //Populate packageJson objects
+        await this.populatePackageJson();
+        //Get path
         const unitRootPath = (0, tools_1.convertToFullPath)(this.config.pathToPackage);
-        const templatePath = `${unitRootPath}/${consts_1.CONST_PackageJSONTemplate}`;
-        const targetPath = `${unitRootPath + targetKeyPathMap[targetKey]}/${consts_1.CONST_PackageJSON}`;
-        //Get the template __package.json file
-        const template = JSON.parse(await fs_1.promises.readFile(templatePath, 'utf-8'));
-        //Get converted package.json content
-        const packageJSON = this.convertTemplatePackageJSON(targetKey, template);
         //Create the package.json file in target location
-        await fs_1.promises.writeFile(targetPath, JSON.stringify(packageJSON, null, 2), { encoding: 'utf-8' });
+        await fs_1.promises.writeFile(unitRootPath, JSON.stringify(this.packageJson.root, null, 2), { encoding: 'utf-8' });
     }
 }
 exports.Unit_Typescript = Unit_Typescript;

package/v2/unit/core/Unit_TypescriptLib.js

@@ -29,6 +29,7 @@ const Unit_Typescript_1 = require("./Unit_Typescript");
 const fs = __importStar(require("fs"));
 const basic_1 = require("@nu-art/commando/cli/basic");
 const ts_common_1 = require("@nu-art/ts-common");
+const fs_1 = require("fs");
 class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
     //######################### Internal Logic #########################
     async resolveTSConfig() {
@@ -38,10 +39,19 @@ class Unit_TypescriptLib extends Unit_Typescript_1.Unit_Typescript {
         if (this.config.customTSConfig) {
             //If ts config file does not exist in the main folder
             if (!fs.existsSync(pathToUnitTSConfig))
-                throw new ts_common_1.BadImplementationException(`Unit ${this.config.label} missing tsconfig.json file in /src/main`);
+                throw new ts_common_1.BadImplementationException(`Unit ${this.config.label} is set to use a custom tsconfig but is missing a tsconfig.json file in /src/main`);
             return;
         }
         //Copy project ts config file into the unit main folder
+        const pathToProjectConfig = this.getRunnerParam('configPath');
+        if (!pathToProjectConfig)
+            throw new ts_common_1.BadImplementationException('Could not get config path from runner params');
+        //Make sure a project ts config file exists
+        const pathToProjectTSConfig = pathToProjectConfig + '/tsconfig.json';
+        if (!fs.existsSync(pathToProjectTSConfig))
+            throw new ts_common_1.BadImplementationException(`Project is missing a tsconfig.json file in path ${pathToProjectConfig}`);
+        //Copy the file into the unit
+        await fs_1.promises.copyFile(pathToProjectTSConfig, pathToUnitTSConfig);
     }
     //######################### Phase Implementations #########################
     async preCompile() {