@nu-art/build-and-install 0.400.8 → 0.400.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/build-and-install",
-  "version": "0.400.8",
+  "version": "0.400.10",
   "description": "",
   "type": "module",
   "keywords": [
@@ -31,8 +31,8 @@
   },
   "dependencies": {
     "chokidar": "^3.6.0",
-    "@nu-art/ts-common": "0.400.8",
-    "@nu-art/commando": "0.400.8"
+    "@nu-art/ts-common": "0.400.10",
+    "@nu-art/commando": "0.400.10"
   },
   "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.d.ts

@@ -1,7 +1,8 @@
-import { TypedMap } from '@nu-art/ts-common';
+import { RecursivePartial, TypedMap } from '@nu-art/ts-common';
 import { UnitPhaseImplementor } from '../core/types.js';
 import { Unit_PackageJson, Unit_PackageJson_Config } from './Unit_PackageJson.js';
 import { Phase_CheckCyclicImports, Phase_Compile, Phase_Lint, Phase_PreCompile, Phase_PrintDependencyTree, Phase_Publish, Phase_Test, Phase_ToESM } from '../phase/index.js';
+import { TsConfig } from './types.js';
 export type Unit_TypescriptLib_Config = Unit_PackageJson_Config & {
     customESLintConfig: boolean;
     customTSConfig: boolean;
@@ -40,7 +41,7 @@ export declare class Unit_TypescriptLib<C extends Unit_TypescriptLib_Config = Un
     lint(): Promise<void>;
     private resolveESLintConfig;
     protected deriveTSConfigPaths(): TypedMap<string[]>;
-    protected resolveTSConfig(srcFolder: string, sourceFolderType: string): Promise<void>;
+    protected resolveTSConfig(srcFolder: string, sourceFolderType: string, tsConfigOverride?: RecursivePartial<TsConfig>): Promise<void>;
     publish(): Promise<void>;
     convertToESM(): Promise<void>;
 }

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 { __stringify, arrayToMap, BadImplementationException, ImplementationMissingException, LogLevel, merge, NotImplementedYetException } from '@nu-art/ts-common';
+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)
@@ -329,7 +328,7 @@ export class Unit_TypescriptLib extends Unit_PackageJson {
             return dependencies;
         }, {});
     }
-    async resolveTSConfig(srcFolder, sourceFolderType) {
+    async resolveTSConfig(srcFolder, sourceFolderType, tsConfigOverride) {
         const entryPath = pathResolve(srcFolder, sourceFolderType);
         if (!statSync(entryPath).isDirectory()) {
             return this.logError(`Unexpected non-directory entry in src/: ${sourceFolderType}`);
@@ -344,15 +343,25 @@ export class Unit_TypescriptLib extends Unit_PackageJson {
         // const defaultTsConfigTemplate = pathResolve(baiDefaultsPath, `tsconfig-${entry}.json`);
         const projectDefaultTsConfig = pathResolve(this.runtimeContext.parentUnit.config.fullPath, this.runtimeContext.baiConfig.files?.typescript?.tsConfig?.[sourceFolderType] ?? `tsconfig-${sourceFolderType}.json`);
         if (existsSync(projectDefaultTsConfig)) {
-            this.logDebug(`Copying project-level default tsconfig for source: ${sourceFolderType}`);
-            const dependencyPaths = {}; //this.deriveTSConfigPaths();
-            const includeSources = `"sourceMap": true,
-    "sourceRoot": "${entryPath}",`;
-            const templateParams = {
-                INCLUDE_SOURCES: this.runtimeContext.runtimeParams.publish ? '' : includeSources,
-                PATHS: __stringify(dependencyPaths, true)
+            this.logDebug(`Reading and merging project-level default tsconfig for source: ${sourceFolderType}`);
+            // Read the template JSON file
+            const templateConfig = await FileSystemUtils.file.read.json(projectDefaultTsConfig);
+            // Build the override config with conditional sourceMap settings
+            const overrideConfig = {
+                ...tsConfigOverride,
+                compilerOptions: {
+                    ...tsConfigOverride?.compilerOptions,
+                    ...(this.runtimeContext.runtimeParams.publish ? {} : {
+                        sourceMap: true,
+                        sourceRoot: entryPath
+                    })
+                }
             };
-            return FileSystemUtils.file.template.copy(projectDefaultTsConfig, tsConfigPath, templateParams);
+            // Merge template with override
+            const mergedConfig = merge(templateConfig, overrideConfig);
+            // Write the merged config
+            await FileSystemUtils.file.write.json(tsConfigPath, mergedConfig);
+            return;
         }
         // if (existsSync(defaultTsConfigTemplate)) {
         // 	this.logDebug(`Copying default tsconfig for source: ${entry}`);

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,4 +1,4 @@
-import { CONST_FirebaseJSON, CONST_FirebaseRC, CONST_NodeModules, CONST_PackageJSON, CONST_VersionApp } from '../../../core/consts.js';
+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';
@@ -79,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() {
@@ -108,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);
@@ -275,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() {
@@ -290,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

@@ -25,7 +25,7 @@ export class Unit_FirebaseHostingApp extends Unit_TypescriptLib {
         await this.resolveHostingRuntimeConfig();
     }
     async compile() {
-        await this.resolveTSConfig(resolve(this.config.fullPath, './src'), 'main');
+        await this.resolveTSConfig(resolve(this.config.fullPath, './src'), 'main', { compilerOptions: { declaration: false } });
         await this.clearOutputDir();
         await this.createAppVersionFile();
         await this.compileImpl();
@@ -47,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() {

package/v3/units/index.d.ts

@@ -3,3 +3,4 @@ export * from './ProjectUnit.js';
 export * from './Unit_TypescriptLib.js';
 export * from './Unit_PackageJson.js';
 export * from './Unit_NodeProject.js';
+export * from './types.js';

package/v3/units/index.js

@@ -3,3 +3,4 @@ export * from './ProjectUnit.js';
 export * from './Unit_TypescriptLib.js';
 export * from './Unit_PackageJson.js';
 export * from './Unit_NodeProject.js';
+export * from './types.js';

package/v3/units/types.d.ts

@@ -0,0 +1,41 @@
+import { TypedMap } from '@nu-art/ts-common';
+/**
+ * TypeScript compiler options type based on tsconfig.json schema
+ */
+export type TsConfigCompilerOptions = {
+    module?: string;
+    moduleResolution?: string;
+    target?: string;
+    jsx?: string;
+    allowJs?: boolean;
+    lib?: string[];
+    noEmit?: boolean;
+    sourceMap?: boolean;
+    sourceRoot?: string;
+    declaration?: boolean;
+    resolveJsonModule?: boolean;
+    esModuleInterop?: boolean;
+    experimentalDecorators?: boolean;
+    allowSyntheticDefaultImports?: boolean;
+    noUnusedLocals?: boolean;
+    strict?: boolean;
+    paths?: TypedMap<string[]>;
+    baseUrl?: string;
+    rootDir?: string;
+    outDir?: string;
+    include?: string[];
+    exclude?: string[];
+    extends?: string;
+    compilerOptions?: TsConfigCompilerOptions;
+    [key: string]: any;
+};
+/**
+ * Full TypeScript configuration type
+ */
+export type TsConfig = {
+    compilerOptions?: TsConfigCompilerOptions;
+    include?: string[];
+    exclude?: string[];
+    extends?: string;
+    [key: string]: any;
+};

package/v3/units/types.js

@@ -0,0 +1 @@
+export {};