@nu-art/build-and-install 0.401.4 → 0.401.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/build-and-install",
-  "version": "0.401.4",
+  "version": "0.401.6",
   "description": "A build system for monorepos that orchestrates building, testing, and deploying units with dependency-aware phase execution",
   "type": "module",
   "keywords": [
@@ -39,12 +39,12 @@
   },
   "dependencies": {
     "chokidar": "^3.6.0",
-    "@nu-art/cli-params": "0.401.4",
-    "@nu-art/ts-common": "0.401.4",
-    "@nu-art/commando": "0.401.4"
+    "@nu-art/cli-params": "0.401.6",
+    "@nu-art/ts-common": "0.401.6",
+    "@nu-art/commando": "0.401.6"
   },
   "devDependencies": {
-    "@nu-art/testalot": "0.401.4"
+    "@nu-art/testalot": "0.401.6"
   },
   "unitConfig": {
     "type": "typescript-lib"

package/phases/definitions/consts.d.ts

@@ -54,6 +54,9 @@ export declare const phase_MapExports: Phase<'mapExports'>;
 export type Phase_Compile = typeof phase_Compile;
 export declare const phaseKey_Compile = "compile";
 export declare const phase_Compile: Phase<'compile'>;
+export type Phase_PrepareWatch = typeof phase_PrepareWatch;
+export declare const phaseKey_PrepareWatch = "watchPrepare";
+export declare const phase_PrepareWatch: Phase<'watchPrepare'>;
 export type Phase_CompileWatch = typeof phase_CompileWatch;
 export declare const phaseKey_CompileWatch = "watchCompile";
 export declare const phase_CompileWatch: Phase<'watchCompile'>;

package/phases/definitions/consts.js

@@ -38,7 +38,7 @@ export const phase_Prepare = {
     name: 'Prepare',
     method: 'prepare',
     filter: (baiParams) => baiParams.prepare,
-    unitCategory: "project", // All project units need to be prepared
+    unitCategory: 'project', // All project units need to be prepared
 };
 export const phaseKey_Install = 'install';
 export const phase_Install = {
@@ -84,12 +84,21 @@ export const phase_Compile = {
     filter: (baiParams) => !baiParams.noBuild,
     dependencyPhase: [phase_PreCompile],
 };
+export const phaseKey_PrepareWatch = 'watchPrepare';
+export const phase_PrepareWatch = {
+    key: phaseKey_PrepareWatch,
+    name: 'Prepare Watch',
+    method: 'watchPrepare',
+    filter: (baiParams) => baiParams.prepare,
+    unitCategory: 'project', // All project units need to be prepared
+};
 export const phaseKey_CompileWatch = 'watchCompile';
 export const phase_CompileWatch = {
     key: phaseKey_CompileWatch,
     name: 'CompileWatch',
     method: 'watchCompile',
     filter: (baiParams) => !baiParams.noBuild,
+    dependencyPhase: [phase_PrepareWatch],
 };
 export const phaseKey_Test = 'runTests';
 export const phase_Test = {

package/units/implementations/Unit_NodeProject.d.ts

@@ -2,7 +2,7 @@ import { UnitPhaseImplementor } from '../../core/types.js';
 import { StringMap } from '@nu-art/ts-common/utils/types';
 import { Unit_PackageJson, Unit_PackageJson_Config } from './Unit_PackageJson.js';
 import { ProjectUnit } from '../base/ProjectUnit.js';
-import { Phase_Install, Phase_IndicesMcpServer, Phase_PostPublish, Phase_Watch } from '../../phases/definitions/index.js';
+import { Phase_IndicesMcpServer, Phase_Install, Phase_PostPublish, Phase_Watch } from '../../phases/definitions/index.js';
 /**
  * Configuration for NodeProject (root project unit).
  */

package/units/implementations/Unit_NodeProject.js

@@ -1,15 +1,12 @@
 import { _keys, arrayToMap, BadImplementationException, flatArray, lastElement, MUSTNeverHappenException, Promise_all_sequentially, queuedDebounce, Second } from '@nu-art/ts-common';
 import * as chokidar from 'chokidar';
 import { Unit_TypescriptLib } from './Unit_TypescriptLib.js';
-import { Commando_NVM } from '@nu-art/commando';
-import { Commando_PNPM } from '@nu-art/commando';
-import { PNPM } from '@nu-art/commando';
+import { Commando_NVM, Commando_PNPM, CommandoException, PNPM } from '@nu-art/commando';
 import { Unit_PackageJson } from './Unit_PackageJson.js';
 import { resolve } from 'path';
 import { PhaseManager } from '../../phases/PhaseManager.js';
-import { phase_CompileWatch, phase_Prepare } from '../../phases/definitions/index.js';
+import { phase_CompileWatch, phase_PrepareWatch } from '../../phases/definitions/index.js';
 import { UnitsDependencyMapper } from '../../dependencies/UnitsDependencyMapper.js';
-import { CommandoException } from '@nu-art/commando';
 import { CONST_PNPM_LOCK, CONST_PNPM_WORKSPACE } from '../../config/consts.js';
 import { RunningStatusHandler } from '../../runtime/RunningStatusHandler.js';
 import { FileSystemUtils } from '@nu-art/ts-common/utils/FileSystemUtils';
@@ -185,11 +182,13 @@ export class Unit_NodeProject extends Unit_PackageJson {
                 }
                 const watchRuntimeParams = {
                     ...this.runtimeContext.runtimeParams,
+                    watch: false,
+                    prepare: true,
                     noBuild: false,
                     continue: false
                 };
                 const activeUnitKeys = this.runtimeContext.childUnits.map(unit => unit.config.key);
-                const phaseManager = new PhaseManager(new RunningStatusHandler(this.config.fullPath, watchRuntimeParams).isolate(), [[phase_Prepare], [phase_CompileWatch]], unitDependencyTree, activeUnitKeys, activeUnitKeys);
+                const phaseManager = new PhaseManager(new RunningStatusHandler(this.config.fullPath, watchRuntimeParams).isolate(), [[phase_PrepareWatch], [phase_CompileWatch]], unitDependencyTree, activeUnitKeys, activeUnitKeys);
                 // @ts-ignore
                 phaseManager.setTag('PhaseManager-Watcher');
                 const executionPlan = await phaseManager.calculateExecutionSteps();

package/units/implementations/Unit_PackageJson.d.ts

@@ -2,7 +2,7 @@ import { StringMap } from '@nu-art/ts-common';
 import { UnitPhaseImplementor } from '../../core/types.js';
 import { Config_ProjectUnit, ProjectUnit } from '../base/ProjectUnit.js';
 import { TS_PackageJSON } from '../discovery/types.js';
-import { Phase_Prepare, Phase_Purge } from '../../phases/definitions/index.js';
+import { Phase_Prepare, Phase_PrepareWatch, Phase_Purge } from '../../phases/definitions/index.js';
 /**
  * Configuration for PackageJson units (units with package.json).
  */
@@ -30,7 +30,7 @@ export type Unit_PackageJson_Config = Config_ProjectUnit & {
  *
  * **Base For**: Unit_NodeProject, Unit_TypescriptLib, Unit_FirebaseHosting, etc.
  */
-export declare class Unit_PackageJson<C extends Unit_PackageJson_Config = Unit_PackageJson_Config> extends ProjectUnit<C> implements UnitPhaseImplementor<[Phase_Purge, Phase_Prepare]> {
+export declare class Unit_PackageJson<C extends Unit_PackageJson_Config = Unit_PackageJson_Config> extends ProjectUnit<C> implements UnitPhaseImplementor<[Phase_Purge, Phase_Prepare, Phase_PrepareWatch]> {
     constructor(config: C);
     protected npmCommand(command: string): string;
     protected deriveDistDependencies(): StringMap;
@@ -46,6 +46,8 @@ export declare class Unit_PackageJson<C extends Unit_PackageJson_Config = Unit_P
      * **Template Params**: Includes THUNDERSTORM_VERSION, __ENV__, and child unit versions.
      */
     prepare(): Promise<void>;
+    watchPrepare(): Promise<void>;
+    protected sharedPrepare(): Promise<void>;
     /**
      * Purges package.json and node_modules folder.
      *

package/units/implementations/Unit_PackageJson.js

@@ -64,6 +64,12 @@ export class Unit_PackageJson extends ProjectUnit {
      * **Template Params**: Includes THUNDERSTORM_VERSION, __ENV__, and child unit versions.
      */
     async prepare() {
+        await this.sharedPrepare();
+    }
+    async watchPrepare() {
+        await this.sharedPrepare();
+    }
+    async sharedPrepare() {
         const targetPath = resolve(this.config.fullPath, CONST_PackageJSON);
         const params = this.deriveLibDependencies();
         const packageJson = FileSystemUtils.file.template.transform(__stringify(this.config.packageJson, true), params);

package/units/implementations/Unit_TypescriptLib.d.ts

@@ -50,6 +50,8 @@ export declare class Unit_TypescriptLib<C extends Unit_TypescriptLib_Config = Un
     protected clearOutputDir(): Promise<void>;
     protected clearOutputDirImpl(): Promise<void>;
     prepare(): Promise<void>;
+    watchPrepare(): Promise<void>;
+    protected sharedPrepare(): Promise<void>;
     protected compileImpl(): Promise<void>;
     protected copyAssetsToOutput(): Promise<void>;
     ignoreWatchFiles(): string[];

package/units/implementations/Unit_TypescriptLib.js

@@ -2,9 +2,7 @@ import * as fs from 'fs';
 import { copyFileSync, existsSync, promises as _fs, readdirSync, statSync } from 'fs';
 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 '../../config/consts.js';
-import { CommandoException } from '@nu-art/commando';
-import { Commando_NVM } from '@nu-art/commando';
-import { Commando_Basic } from '@nu-art/commando';
+import { Commando_Basic, Commando_NVM, CommandoException } from '@nu-art/commando';
 import { resolve, resolve as pathResolve } from 'path';
 import { Unit_PackageJson } from './Unit_PackageJson.js';
 import { glob } from 'node:fs/promises';
@@ -184,6 +182,13 @@ export class Unit_TypescriptLib extends Unit_PackageJson {
     }
     async prepare() {
         await super.prepare();
+        await this.sharedPrepare();
+    }
+    async watchPrepare() {
+        await super.watchPrepare();
+        await this.sharedPrepare();
+    }
+    async sharedPrepare() {
         await FileSystemUtils.folder.create(this.config.output);
         if (this.config.packageJson.private) {
             // @ts-ignore

package/units/implementations/firebase/Unit_FirebaseHostingApp.js

@@ -193,22 +193,15 @@ export class Unit_FirebaseHostingApp extends Unit_TypescriptLib {
         await FileSystemUtils.folder.delete(stagingDir);
         await FileSystemUtils.folder.create(stagingDir);
         const tarballPath = resolve(buildOutputDir, CONST_HostingBuildTarball);
-        // Ensure firebase.json and .firebaserc exist (they should from prepare phase)
-        await this.resolveHostingRC();
-        await this.resolveHostingJSON();
         // Copy all files to staging directory
-        const firebaseJsonPath = resolve(this.config.fullPath, CONST_FirebaseJSON);
-        const firebaseRcPath = resolve(this.config.fullPath, CONST_FirebaseRC);
         const outputDirName = resolve(this.config.output).split('/').pop() || 'dist';
         // Copy firebase.json, .firebaserc, dist folder, and create deployment-metadata.json
-        await FileSystemUtils.file.copy(firebaseJsonPath, resolve(stagingDir, CONST_FirebaseJSON));
-        await FileSystemUtils.file.copy(firebaseRcPath, resolve(stagingDir, CONST_FirebaseRC));
         await FileSystemUtils.folder.copy(this.config.output, resolve(stagingDir, outputDirName));
         await FileSystemUtils.file.write.json(resolve(stagingDir, CONST_DeploymentMetadata), metadata);
         // Create tarball from staging directory contents
         // Note: Use explicit file list to include hidden files (.*) which * wildcard doesn't match
         commando.cd(stagingDir);
-        await this.executeAsyncCommando(commando, `tar -czf ${tarballPath} ${CONST_FirebaseJSON} ${CONST_FirebaseRC} ${CONST_DeploymentMetadata} ${outputDirName}`, (stdout, stderr, exitCode) => {
+        await this.executeAsyncCommando(commando, `tar -czf ${tarballPath} ${CONST_DeploymentMetadata} ${outputDirName}`, (stdout, stderr, exitCode) => {
             if (exitCode !== 0)
                 throw new CommandoException(`Failed to create tarball (exit code ${exitCode})`, stdout, stderr, exitCode);
         });
@@ -289,19 +282,25 @@ export class Unit_FirebaseHostingApp extends Unit_TypescriptLib {
         this.logInfo(`Locating downloaded tarball...`);
         const downloadedFiles = await FileSystemUtils.folder.list(deployTempDir);
         const tarballFile = downloadedFiles.find(file => file.endsWith('.tar.gz'));
-        if (!tarballFile) {
+        if (!tarballFile)
             throw new ImplementationMissingException(`Downloaded tarball not found in ${deployTempDir}. Files found: ${downloadedFiles.join(', ')}`);
-        }
         const tarballPath = resolve(deployTempDir, tarballFile);
         this.logDebug(`Downloaded tarball: ${tarballPath}`);
         // Extract tarball directly to deployTempDir (contains firebase.json, .firebaserc, and dist/)
         this.logInfo(`Extracting hosting package...`);
+        this.logInfo(`Extracting hosting package...`);
         await this.executeAsyncCommando(commando, `tar -xzf ${tarballPath} -C ${deployTempDir}`, (stdout, stderr, exitCode) => {
             if (exitCode !== 0) {
                 throw new CommandoException(`Failed to extract tarball (exit code ${exitCode})`, stdout, stderr, exitCode);
             }
         });
         this.logInfo(`Extracted hosting package to: ${deployTempDir}`);
+        this.logInfo(`Copying firebase configs..`);
+        const firebaseJsonPath = resolve(this.config.fullPath, CONST_FirebaseJSON);
+        const firebaseRcPath = resolve(this.config.fullPath, CONST_FirebaseRC);
+        await FileSystemUtils.file.copy(firebaseJsonPath, resolve(deployTempDir, CONST_FirebaseJSON));
+        await FileSystemUtils.file.copy(firebaseRcPath, resolve(deployTempDir, CONST_FirebaseRC));
+        this.logDebug(`Copied firebase configs!`);
         // firebase.json and .firebaserc are already in deployTempDir from tarball extraction
         // Deploy using firebase CLI
         const envConfig = this.getEnvConfig();