@nu-art/build-and-install 0.400.7 → 0.400.9

package/build-and-install-v3.js

@@ -8,7 +8,7 @@ import { ProjectUnit } from './v3/units/ProjectUnit.js';
 import { PhaseManager } from './v3/PhaseManager.js';
 import { Unit_NodeProject } from './v3/units/index.js';
 import { resolve } from 'path';
-import { CONST_BaiConfig, CONST_NodeModules } from './core/consts.js';
+import { CONST_BaiConfig, CONST_NodeModules, CONST_VersionApp } from './core/consts.js';
 import { UnitMapper_FirebaseFunction, UnitMapper_FirebaseHosting, UnitMapper_NodeLib, UnitMapper_NodeProject } from './v3/UnitsMapper/resolvers/index.js';
 import { CLIParamsResolver } from '@nu-art/commando/cli-params/CLIParamsResolver';
 import { RunningStatusHandler } from './v3/RunningStatusHandler.js';
@@ -93,8 +93,11 @@ export class BuildAndInstall extends Logger {
         }));
         const globalOutputFolder = resolve(this.pathToProject, '.trash/output');
         this.unitsDependencyMapper = new UnitsDependencyMapper(unitsDependencies, globalOutputFolder);
+        const versionFilePath = resolve(this.pathToProject, CONST_VersionApp);
+        this.logInfo('loading version from: ', versionFilePath);
+        const version = await FileSystemUtils.file.read.json(versionFilePath, { version: '1.0.0' });
         const runtimeContext = ({
-            version: '',
+            version: version.version,
             parentUnit: this.nodeProjectUnit,
             childUnits: allProjectUnits,
             baiConfig,

package/core/consts.d.ts

@@ -1,5 +1,6 @@
 import { MemKey } from '@nu-art/ts-common/mem-storage/index';
 import { RuntimeProjectConfig } from './types/index.js';
+export declare const CONST_VersionApp = "version-app.json";
 export declare const CONST_PackageJSONTemplate = "__package.json";
 export declare const CONST_PackageJSON = "package.json";
 export declare const CONST_NodeModules = "node_modules";

package/core/consts.js

@@ -1,4 +1,5 @@
 import { MemKey } from '@nu-art/ts-common/mem-storage/index';
+export const CONST_VersionApp = 'version-app.json';
 export const CONST_PackageJSONTemplate = '__package.json';
 export const CONST_PackageJSON = 'package.json';
 export const CONST_NodeModules = 'node_modules';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/build-and-install",
-  "version": "0.400.7",
+  "version": "0.400.9",
   "description": "",
   "type": "module",
   "keywords": [
@@ -31,8 +31,8 @@
   },
   "dependencies": {
     "chokidar": "^3.6.0",
-    "@nu-art/ts-common": "0.400.7",
-    "@nu-art/commando": "0.400.7"
+    "@nu-art/ts-common": "0.400.9",
+    "@nu-art/commando": "0.400.9"
   },
   "unitConfig": {
     "type": "typescript-lib"

package/v3/units/Unit_PackageJson.d.ts

@@ -8,6 +8,7 @@ export type Unit_PackageJson_Config = Config_ProjectUnit & {
 };
 export declare class Unit_PackageJson<C extends Unit_PackageJson_Config = Unit_PackageJson_Config> extends ProjectUnit<C> implements UnitPhaseImplementor<[Phase_Purge, Phase_Prepare]> {
     constructor(config: C);
+    protected npmCommand(command: string): string;
     protected deriveDistDependencies(): StringMap;
     protected deriveLibDependencies(): StringMap;
     prepare(): Promise<void>;

package/v3/units/Unit_PackageJson.js

@@ -10,6 +10,9 @@ export class Unit_PackageJson extends ProjectUnit {
         this.addToClassStack(Unit_PackageJson);
     }
     //######################### Internal Logic #########################
+    npmCommand(command) {
+        return resolve(this.runtimeContext.parentUnit.config.fullPath, './node_modules/.bin', command);
+    }
     deriveDistDependencies() {
         const params = this.runtimeContext.childUnits.reduce((dependencies, unit) => {
             dependencies[unit.config.key] = unit.config.packageJson.version;

package/v3/units/Unit_TypescriptLib.js

@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import { copyFileSync, existsSync, promises as _fs, readdirSync, statSync } from 'fs';
 import { __stringify, arrayToMap, BadImplementationException, ImplementationMissingException, LogLevel, NotImplementedYetException } from '@nu-art/ts-common';
-import { CONST_BaiConfig, CONST_FirebaseJSON, CONST_FirebaseRC, CONST_NodeModules, CONST_PackageJSON, CONST_PackageJSONTemplate, CONST_TS_CONFIG } from '../../core/consts.js';
+import { CONST_BaiConfig, CONST_FirebaseJSON, CONST_FirebaseRC, CONST_PackageJSON, CONST_PackageJSONTemplate, CONST_TS_CONFIG } from '../../core/consts.js';
 import { CommandoException } from '@nu-art/commando/shell/core/CliError';
 import { Commando_NVM } from '@nu-art/commando/shell/plugins/nvm';
 import { Commando_Basic } from '@nu-art/commando/shell/plugins/basic';
@@ -160,8 +160,7 @@ export class Unit_TypescriptLib extends Unit_PackageJson {
             return LogLevel.Error;
         })
             .addLogProcessor((log) => !log.includes('Now using node') && !log.includes('.nvmrc\' with version'));
-        const command = resolve(this.runtimeContext.parentUnit.config.fullPath, CONST_NodeModules, 'typescript', 'bin', 'tsc');
-        await this.executeAsyncCommando(commando, `${command} -p "${pathToTSConfig}" --rootDir "${pathToCompile}" --outDir "${this.config.output}"`, (stdout, stderr, exitCode) => {
+        await this.executeAsyncCommando(commando, `${this.npmCommand('tsc')} -p "${pathToTSConfig}" --rootDir "${pathToCompile}" --outDir "${this.config.output}"`, (stdout, stderr, exitCode) => {
             if (stderr.length)
                 this.logError(stderr);
             if (exitCode > 0)

package/v3/units/firebase/Unit_FirebaseFunctionsApp.d.ts

@@ -43,6 +43,7 @@ export declare class Unit_FirebaseFunctionsApp<C extends Unit_FirebaseFunctionsA
     protected copyPackageJSONToOutput(): Promise<void>;
     prepare(): Promise<void>;
     resolveConfigs(): Promise<void>;
+    compile(): Promise<void>;
     postCompile(): Promise<void>;
     launch(): Promise<void>;
     releaseEmulatorPorts(): Promise<void>;

package/v3/units/firebase/Unit_FirebaseFunctionsApp.js

@@ -1,5 +1,4 @@
-import { CONST_FirebaseJSON, CONST_FirebaseRC, CONST_NodeModules, CONST_PackageJSON } from '../../../core/consts.js';
-import { promises as _fs } from 'fs';
+import { CONST_FirebaseJSON, CONST_FirebaseRC, CONST_PackageJSON, CONST_VersionApp } from '../../../core/consts.js';
 import { __stringify, _keys, _logger_logPrefixes, deepClone, ImplementationMissingException, LogLevel, Second, sleep } from '@nu-art/ts-common';
 import { Const_FirebaseConfigKeys, Const_FirebaseDefaultsKeyToFile } from '../../../defaults/consts.js';
 import { Commando_NVM } from '@nu-art/commando/shell/plugins/nvm';
@@ -80,8 +79,11 @@ export class Unit_FirebaseFunctionsApp extends Unit_TypescriptLib {
         await this.resolveFunctionsRuntimeConfig();
         await this.resolveFunctionsJSON();
     }
-    async postCompile() {
+    async compile() {
         await this.createAppVersionFile();
+        await super.compile();
+    }
+    async postCompile() {
         await this.createDependenciesDir();
     }
     async launch() {
@@ -109,7 +111,7 @@ export class Unit_FirebaseFunctionsApp extends Unit_TypescriptLib {
             this.functions[match[1]] = match[2];
         });
         const debug = this.runtimeContext.runtimeParams.verbose ? ' --debug' : '';
-        await this.executeAsyncCommando(commando, `firebase${debug} deploy --only functions --force`, (stdout, stderr, exitCode) => {
+        await this.executeAsyncCommando(commando, `${this.npmCommand('firebase')}${debug} deploy --only functions --force`, (stdout, stderr, exitCode) => {
             if (exitCode === 0)
                 return;
             throw new CommandoException(`Failed to deploy function with exit code ${exitCode}`, stdout, stderr, exitCode);
@@ -137,8 +139,8 @@ export class Unit_FirebaseFunctionsApp extends Unit_TypescriptLib {
                 }
             }
         };
-        const targetPath = `${this.config.fullPath}/${CONST_FirebaseRC}`;
-        await _fs.writeFile(targetPath, JSON.stringify(rcConfig, null, 2), { encoding: 'utf-8' });
+        const targetPath = resolve(this.config.fullPath, CONST_FirebaseRC);
+        await FileSystemUtils.file.write.json(targetPath, rcConfig);
     }
     async resolveProxyFile() {
         const envConfig = this.getEnvConfig();
@@ -230,7 +232,7 @@ export class Unit_FirebaseFunctionsApp extends Unit_TypescriptLib {
                 }
             };
         }
-        await _fs.writeFile(targetPath, JSON.stringify(fileContent, null, 2), { encoding: 'utf-8' });
+        await FileSystemUtils.file.write.json(targetPath, fileContent);
     }
     async resolveFunctionsRuntimeConfig() {
         const envConfig = this.getEnvConfig();
@@ -243,16 +245,15 @@ export class Unit_FirebaseFunctionsApp extends Unit_TypescriptLib {
         };
         const inLocalIgnoreTLS = `${envConfig.isLocal ? '// @ts-ignore\nprocess.env[\'NODE_TLS_REJECT_UNAUTHORIZED\'] = 0;\n\n' : ''}`;
         const fileContent = `${inLocalIgnoreTLS}export const Environment = ${JSON.stringify(beConfig)};`;
-        await _fs.writeFile(targetPath, fileContent, { encoding: 'utf-8' });
+        await FileSystemUtils.file.write(targetPath, fileContent);
     }
     //######################### Compile Logic #########################
     async createAppVersionFile() {
         //Writing the file to the package source instead of the output is fine,
         //copyAssetsToOutput will move the file to output
-        // const targetPath = `${this.config.fullPath}/src/main/${CONST_VersionApp}`;
-        // const appVersion = MemKey_ProjectConfig.get().projectVersion;
-        // const fileContent = JSON.stringify({version: appVersion}, null, 2);
-        // await _fs.writeFile(targetPath, fileContent, {encoding: 'utf-8'});
+        const targetPath = `${this.config.fullPath}/src/main/${CONST_VersionApp}`;
+        const appVersion = this.runtimeContext.version;
+        await FileSystemUtils.file.write.json(targetPath, { version: appVersion });
     }
     deriveDistDependencies() {
         return this.dependencyUnits.reduce((dependencies, unit) => {
@@ -277,8 +278,7 @@ export class Unit_FirebaseFunctionsApp extends Unit_TypescriptLib {
         await this.resolveProxyFile();
         const commando = this.allocateCommando(Commando_NVM).applyNVM()
             .cd(this.config.fullPath);
-        const command = `${this.runtimeContext.parentUnit.config.fullPath}/${CONST_NodeModules}/.bin/tsx`;
-        await this.executeAsyncCommando(commando, `${command} src/main/proxy.ts`);
+        await this.executeAsyncCommando(commando, `${this.npmCommand('tsx')} src/main/proxy.ts`);
         this.logWarning('PROXY TERMINATED');
     }
     async runEmulator() {
@@ -292,7 +292,7 @@ export class Unit_FirebaseFunctionsApp extends Unit_TypescriptLib {
                 return LogLevel.Warning;
         })
             .onLog(/.*Emulator Hub running.*/, () => this.setStatus('Launch Complete'));
-        await this.executeAsyncCommando(commando, `firebase emulators:start --project ${this.config.envConfig.projectId} --export-on-exit --import=${this.config.pathToEmulatorData} ${this.runtimeContext.runtimeParams.debugBackend
+        await this.executeAsyncCommando(commando, `${this.npmCommand('firebase')} emulators:start --project ${this.config.envConfig.projectId} --export-on-exit --import=${this.config.pathToEmulatorData} ${this.runtimeContext.runtimeParams.debugBackend
             ? `--inspect-functions ${this.config.debugPort}` : ''}`);
         this.logWarning('EMULATORS TERMINATED');
     }

package/v3/units/firebase/Unit_FirebaseHostingApp.js

@@ -1,13 +1,12 @@
 import { ImplementationMissingException, LogLevel } from '@nu-art/ts-common';
-import { promises as _fs } from 'fs';
-import { CONST_FirebaseJSON, CONST_FirebaseRC } from '../../../core/consts.js';
+import { CONST_FirebaseJSON, CONST_FirebaseRC, CONST_VersionApp } from '../../../core/consts.js';
 import { Commando_NVM } from '@nu-art/commando/shell/plugins/nvm';
 import { Commando_Basic } from '@nu-art/commando/shell/plugins/basic';
 import { resolve } from 'path';
 import { Unit_TypescriptLib } from '../Unit_TypescriptLib.js';
 import { CommandoException } from '@nu-art/commando/shell/core/CliError';
 import { deployLogFilter } from './common.js';
-const CONST_VersionApp = 'version-app.json';
+import { FileSystemUtils } from '@nu-art/ts-common/utils/FileSystemUtils';
 export class Unit_FirebaseHostingApp extends Unit_TypescriptLib {
     hosting = {};
     static DefaultConfig_FirebaseHosting = {
@@ -48,7 +47,7 @@ export class Unit_FirebaseHostingApp extends Unit_TypescriptLib {
             this.hosting[match[1]] = match[2];
         });
         const debug = this.runtimeContext.runtimeParams.verbose ? ' --debug' : '';
-        await this.executeAsyncCommando(commando, `firebase${debug} deploy --only hosting`);
+        await this.executeAsyncCommando(commando, `${this.npmCommand('firebase')}${debug} deploy --only hosting`);
     }
     //######################### ResolveConfig Logic #########################
     getEnvConfig() {
@@ -61,7 +60,7 @@ export class Unit_FirebaseHostingApp extends Unit_TypescriptLib {
         const envConfig = this.getEnvConfig();
         const rcConfig = { projects: { default: envConfig.projectId } };
         const targetPath = `${this.config.fullPath}/${CONST_FirebaseRC}`;
-        await _fs.writeFile(targetPath, JSON.stringify(rcConfig, null, 2), { encoding: 'utf-8' });
+        await FileSystemUtils.file.write.json(targetPath, rcConfig);
     }
     async resolveHostingJSON() {
         const envConfig = this.getEnvConfig();
@@ -78,13 +77,13 @@ export class Unit_FirebaseHostingApp extends Unit_TypescriptLib {
                     ]
                 }
             };
-        await _fs.writeFile(targetPath, JSON.stringify(fileContent, null, 2), { encoding: 'utf-8' });
+        await FileSystemUtils.file.write.json(targetPath, fileContent);
     }
     async resolveHostingRuntimeConfig() {
         const envConfig = this.getEnvConfig().config;
         const targetPath = resolve(this.config.fullPath, `./src/main/config.ts`);
         const fileContent = `export const config = ${JSON.stringify(envConfig, null, 2)};`;
-        await _fs.writeFile(targetPath, fileContent, { encoding: 'utf-8' });
+        await FileSystemUtils.file.write(targetPath, fileContent);
     }
     //######################### Compile Logic #########################
     async compileImpl() {
@@ -100,8 +99,7 @@ export class Unit_FirebaseHostingApp extends Unit_TypescriptLib {
         //Webpack bundles files into the output automatically!
         const targetPath = `${this.config.fullPath}/src/main/${CONST_VersionApp}`;
         const appVersion = this.runtimeContext.version;
-        const fileContent = JSON.stringify({ version: appVersion }, null, 2);
-        await _fs.writeFile(targetPath, fileContent, { encoding: 'utf-8' });
+        await FileSystemUtils.file.write.json(targetPath, { version: appVersion });
     }
     //######################### Launch Logic #########################
     async runApp() {