@fnd-platform/cli 1.0.0-alpha.24 → 1.0.0-alpha.25

package/lib/commands/test.js

@@ -0,0 +1,193 @@
+import { Command } from 'commander';
+import { execSync } from 'child_process';
+import { requireProjectRoot } from '../lib/project.js';
+import { logger } from '../lib/logger.js';
+import { PerformanceTimer } from '../lib/timer.js';
+import { parseNxOutput } from '../lib/nx-stats.js';
+/**
+ * Creates the `fnd test` command.
+ *
+ * @returns Commander command instance
+ *
+ * @example
+ * ```typescript
+ * import { testCommand } from '@fnd-platform/cli';
+ *
+ * const program = new Command();
+ * program.addCommand(testCommand());
+ * program.parse(['node', 'fnd', 'test']);
+ * ```
+ */
+export function testCommand() {
+    return new Command('test')
+        .description('Run tests across all packages using NX')
+        .option('--package <name>', 'Test specific package only')
+        .option('--coverage', 'Generate coverage report')
+        .option('--watch', 'Watch mode')
+        .option('--update', 'Update snapshots')
+        .option('--ci', 'CI mode (no watch, fail on threshold)')
+        .option('--skip-cache', 'Skip NX cache')
+        .option('--parallel <n>', 'Number of parallel tasks')
+        .action(async (options) => {
+        await runTest(options);
+    });
+}
+/**
+ * Runs the NX test.
+ *
+ * @param options - Command options
+ *
+ * @example
+ * ```typescript
+ * // Run all tests
+ * await runTest({});
+ *
+ * // Test a specific package with coverage
+ * await runTest({ package: 'api', coverage: true });
+ *
+ * // Run tests in watch mode
+ * await runTest({ watch: true });
+ *
+ * // Run tests in CI mode
+ * await runTest({ ci: true });
+ * ```
+ */
+export async function runTest(options) {
+    // Initialize profiling if enabled
+    const timer = PerformanceTimer.isEnabled() ? new PerformanceTimer('fnd test') : null;
+    let projectRoot;
+    timer?.start('project-detection');
+    try {
+        projectRoot = requireProjectRoot();
+    }
+    catch (error) {
+        if (timer) {
+            timer.end('project-detection');
+            logger.report(timer.getReport(false));
+        }
+        logger.error(error.message);
+        process.exit(1);
+    }
+    const detectResult = timer?.end('project-detection');
+    if (detectResult) {
+        logger.timing('project-detection', detectResult.durationMs);
+    }
+    logger.info('Running tests...');
+    logger.debug(`Project root: ${projectRoot}`);
+    // Build the NX command arguments
+    const args = buildNxTestArgs(options);
+    const command = args.join(' ');
+    logger.debug(`Running: ${command}`);
+    timer?.start('nx-test');
+    try {
+        if (timer) {
+            // Capture output for cache statistics when profiling is enabled
+            const output = execSync(command, {
+                cwd: projectRoot,
+                stdio: 'pipe',
+                encoding: 'utf-8',
+            });
+            const testResult = timer.end('nx-test');
+            logger.timing('nx-test', testResult.durationMs);
+            // Print output since we captured it
+            console.log(output);
+            // Parse and display NX cache statistics
+            const stats = parseNxOutput(output);
+            if (stats) {
+                logger.cacheStats(stats);
+            }
+            logger.success('Tests complete');
+            logger.report(timer.getReport(true));
+        }
+        else {
+            // Normal execution without profiling
+            execSync(command, {
+                cwd: projectRoot,
+                stdio: 'inherit',
+            });
+            logger.success('Tests complete');
+        }
+    }
+    catch (error) {
+        if (timer) {
+            timer.end('nx-test');
+            logger.report(timer.getReport(false));
+        }
+        logger.error('Tests failed');
+        logger.debug(`Error: ${error.message}`);
+        process.exit(1);
+    }
+}
+/**
+ * Builds the NX command arguments based on options.
+ *
+ * @param options - Command options
+ * @returns Array of command arguments
+ *
+ * @example
+ * ```typescript
+ * // Run all tests
+ * buildNxTestArgs({});
+ * // Returns: ['npx', 'nx', 'run-many', '--target=test', '--all']
+ *
+ * // Test specific package with coverage
+ * buildNxTestArgs({ package: 'api', coverage: true });
+ * // Returns: ['npx', 'nx', 'run', 'api:test', '--', '--coverage']
+ *
+ * // Run all tests in CI mode
+ * buildNxTestArgs({ ci: true });
+ * // Returns: ['npx', 'nx', 'run-many', '--target=test', '--all', '--', '--ci']
+ * ```
+ */
+export function buildNxTestArgs(options) {
+    // If testing a specific package
+    if (options.package) {
+        const args = ['npx', 'nx', 'run', `${options.package}:test`];
+        if (options.skipCache) {
+            args.push('--skip-nx-cache');
+        }
+        // Vitest/Jest options go after --
+        const vitestArgs = buildVitestArgs(options);
+        if (vitestArgs.length > 0) {
+            args.push('--', ...vitestArgs);
+        }
+        return args;
+    }
+    // Testing all packages
+    const args = ['npx', 'nx', 'run-many', '--target=test', '--all'];
+    if (options.skipCache) {
+        args.push('--skip-nx-cache');
+    }
+    if (options.parallel) {
+        args.push(`--parallel=${options.parallel}`);
+    }
+    // Vitest/Jest options go after --
+    const vitestArgs = buildVitestArgs(options);
+    if (vitestArgs.length > 0) {
+        args.push('--', ...vitestArgs);
+    }
+    return args;
+}
+/**
+ * Builds Vitest/Jest specific arguments.
+ *
+ * @param options - Command options
+ * @returns Array of test runner arguments
+ */
+function buildVitestArgs(options) {
+    const args = [];
+    if (options.coverage) {
+        args.push('--coverage');
+    }
+    if (options.watch) {
+        args.push('--watch');
+    }
+    if (options.update) {
+        args.push('--update');
+    }
+    if (options.ci) {
+        args.push('--ci');
+    }
+    return args;
+}
+//# sourceMappingURL=test.js.map

package/lib/commands/test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../src/commands/test.ts"],"names":[],"mappings":"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"}

package/lib/index.d.ts

@@ -6,10 +6,19 @@
  * @packageDocumentation
  */
 /**
- * Runs the fnd CLI.
+ * Gets the CLI version.
+ */
+export declare function getVersion(): string;
+/**
+ * Runs the fnd CLI in traditional Commander.js mode.
  *
  * @param args - Command line arguments (defaults to process.argv)
  * @returns Promise that resolves when command completes
  */
-export declare function run(args?: string[]): Promise<void>;
+export declare function runCommander(args?: string[]): Promise<void>;
+/**
+ * Backward-compatible alias for runCommander.
+ * @deprecated Use runCommander instead.
+ */
+export declare const run: typeof runCommander;
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAsBH;;;;;GAKG;AACH,wBAAsB,GAAG,CAAC,IAAI,GAAE,MAAM,EAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CA0BtE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAwBH;;GAEG;AACH,wBAAgB,UAAU,IAAI,MAAM,CAEnC;AAED;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,IAAI,GAAE,MAAM,EAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2B/E;AAED;;;GAGG;AACH,eAAO,MAAM,GAAG,qBAAe,CAAC"}

package/lib/index.js

@@ -1,4 +1,3 @@
-"use strict";
 /**
  * @fnd-platform/cli
  *
@@ -6,37 +5,44 @@
  *
  * @packageDocumentation
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.run = run;
-const commander_1 = require("commander");
-const fs_1 = require("fs");
-const path_1 = require("path");
-const index_js_1 = require("./commands/index.js");
+import { Command } from 'commander';
+import { readFileSync } from 'fs';
+import { dirname, join } from 'path';
+import { fileURLToPath } from 'url';
+import { newCommand, synthCommand, buildCommand, testCommand, addCommand, deployCommand, destroyCommand, } from './commands/index.js';
 /**
  * CLI version from package.json.
  */
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-const pkg = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(__dirname, '..', 'package.json'), 'utf-8'));
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const pkg = JSON.parse(readFileSync(join(__dirname, '..', 'package.json'), 'utf-8'));
 const VERSION = pkg.version;
 /**
- * Runs the fnd CLI.
+ * Gets the CLI version.
+ */
+export function getVersion() {
+    return VERSION;
+}
+/**
+ * Runs the fnd CLI in traditional Commander.js mode.
  *
  * @param args - Command line arguments (defaults to process.argv)
  * @returns Promise that resolves when command completes
  */
-async function run(args = process.argv) {
-    const program = new commander_1.Command();
+export async function runCommander(args = process.argv) {
+    const program = new Command();
     program
         .name('fnd')
         .description('fnd-platform CLI - Scaffold AWS-native TypeScript monorepo projects')
         .version(VERSION, '-v, --version', 'Display version number');
     // Register commands
-    program.addCommand((0, index_js_1.newCommand)());
-    program.addCommand((0, index_js_1.synthCommand)());
-    program.addCommand((0, index_js_1.buildCommand)());
-    program.addCommand((0, index_js_1.addCommand)());
-    program.addCommand((0, index_js_1.deployCommand)());
-    program.addCommand((0, index_js_1.destroyCommand)());
+    program.addCommand(newCommand());
+    program.addCommand(synthCommand());
+    program.addCommand(buildCommand());
+    program.addCommand(testCommand());
+    program.addCommand(addCommand());
+    program.addCommand(deployCommand());
+    program.addCommand(destroyCommand());
     // Handle unknown commands
     program.on('command:*', () => {
         console.error(`Invalid command: ${program.args.join(' ')}\n` +
@@ -45,4 +51,9 @@ async function run(args = process.argv) {
     });
     await program.parseAsync(args);
 }
+/**
+ * Backward-compatible alias for runCommander.
+ * @deprecated Use runCommander instead.
+ */
+export const run = runCommander;
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AA4BH,kBA0BC;AApDD,yCAAoC;AACpC,2BAAkC;AAClC,+BAAqC;AAErC,kDAO6B;AAE7B;;GAEG;AACH,iEAAiE;AACjE,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;AACrF,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;AAE5B;;;;;GAKG;AACI,KAAK,UAAU,GAAG,CAAC,OAAiB,OAAO,CAAC,IAAI;IACrD,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;IAE9B,OAAO;SACJ,IAAI,CAAC,KAAK,CAAC;SACX,WAAW,CAAC,qEAAqE,CAAC;SAClF,OAAO,CAAC,OAAO,EAAE,eAAe,EAAE,wBAAwB,CAAC,CAAC;IAE/D,oBAAoB;IACpB,OAAO,CAAC,UAAU,CAAC,IAAA,qBAAU,GAAE,CAAC,CAAC;IACjC,OAAO,CAAC,UAAU,CAAC,IAAA,uBAAY,GAAE,CAAC,CAAC;IACnC,OAAO,CAAC,UAAU,CAAC,IAAA,uBAAY,GAAE,CAAC,CAAC;IACnC,OAAO,CAAC,UAAU,CAAC,IAAA,qBAAU,GAAE,CAAC,CAAC;IACjC,OAAO,CAAC,UAAU,CAAC,IAAA,wBAAa,GAAE,CAAC,CAAC;IACpC,OAAO,CAAC,UAAU,CAAC,IAAA,yBAAc,GAAE,CAAC,CAAC;IAErC,0BAA0B;IAC1B,OAAO,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;QAC3B,OAAO,CAAC,KAAK,CACX,oBAAoB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI;YAC5C,8CAA8C,CACjD,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;AACjC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EACL,UAAU,EACV,YAAY,EACZ,YAAY,EACZ,WAAW,EACX,UAAU,EACV,aAAa,EACb,cAAc,GACf,MAAM,qBAAqB,CAAC;AAE7B;;GAEG;AACH,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AACtC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;AACrF,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;AAE5B;;GAEG;AACH,MAAM,UAAU,UAAU;IACxB,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAAiB,OAAO,CAAC,IAAI;IAC9D,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAE9B,OAAO;SACJ,IAAI,CAAC,KAAK,CAAC;SACX,WAAW,CAAC,qEAAqE,CAAC;SAClF,OAAO,CAAC,OAAO,EAAE,eAAe,EAAE,wBAAwB,CAAC,CAAC;IAE/D,oBAAoB;IACpB,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC;IACjC,OAAO,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC,CAAC;IACnC,OAAO,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC,CAAC;IACnC,OAAO,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;IAClC,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC;IACjC,OAAO,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,CAAC;IACpC,OAAO,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC,CAAC;IAErC,0BAA0B;IAC1B,OAAO,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;QAC3B,OAAO,CAAC,KAAK,CACX,oBAAoB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI;YAC5C,8CAA8C,CACjD,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;AACjC,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,YAAY,CAAC"}

package/lib/lib/deploy-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy-utils.d.ts","sourceRoot":"","sources":["../../src/lib/deploy-utils.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;GAWG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAKhD;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAyB1D;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAYlF;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,sBAAsB;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uEAAuE;IACvE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,0CAA0C;IAC1C,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kEAAkE;IAClE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qCAAqC;IACrC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,2BAA2B;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kCAAkC;IAClC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,CA6BhF;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAG5E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAwBrE;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAY1E;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAG5F;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe,GAAG,IAAI,CAczF;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe,GAAG,IAAI,CAwB3F;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe,GAAG,IAAI,CAqBhG;AAED;;;;GAIG;AACH,wBAAgB,cAAc,IAAI,IAAI,CAiBrC;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAwB9E"}
+{"version":3,"file":"deploy-utils.d.ts","sourceRoot":"","sources":["../../src/lib/deploy-utils.ts"],"names":[],"mappings":"AAaA;;;;;;;;;;;GAWG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAKhD;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAyB1D;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA0BlF;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,sBAAsB;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uEAAuE;IACvE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,0CAA0C;IAC1C,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kEAAkE;IAClE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qCAAqC;IACrC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,2BAA2B;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kCAAkC;IAClC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,CA6BhF;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAG5E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAwBrE;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAY1E;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAG5F;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe,GAAG,IAAI,CAgBzF;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe,GAAG,IAAI,CA+B3F;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe,GAAG,IAAI,CAqBhG;AAED;;;;GAIG;AACH,wBAAgB,cAAc,IAAI,IAAI,CAiBrC;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAwB9E"}

package/lib/lib/deploy-utils.js

@@ -1,23 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.toPascalCase = toPascalCase;
-exports.getProjectName = getProjectName;
-exports.getStackOutput = getStackOutput;
-exports.getStackOutputs = getStackOutputs;
-exports.hasPackage = hasPackage;
-exports.findBuildDirectory = findBuildDirectory;
-exports.promptConfirmation = promptConfirmation;
-exports.buildStackName = buildStackName;
-exports.syncToS3 = syncToS3;
-exports.invalidateCloudFront = invalidateCloudFront;
-exports.buildPackage = buildPackage;
-exports.validateAwsCli = validateAwsCli;
-exports.listProjectStacks = listProjectStacks;
-const child_process_1 = require("child_process");
-const fs_1 = require("fs");
-const path_1 = require("path");
-const readline_1 = require("readline");
-const logger_js_1 = require("./logger.js");
+import { execSync, execFileSync } from 'child_process';
+import { existsSync, readFileSync, readdirSync } from 'fs';
+import { join } from 'path';
+import { createInterface } from 'readline';
+import { logger } from './logger.js';
+import { validateStackName, validateStackOutputKey, validateBucketName, validateDistributionId, validateLocalPath, } from './validation.js';
 /**
  * Converts a string to PascalCase.
  *
@@ -30,7 +16,7 @@ const logger_js_1 = require("./logger.js");
  * toPascalCase('hello_world');     // 'HelloWorld'
  * ```
  */
-function toPascalCase(str) {
+export function toPascalCase(str) {
     return str
         .split(/[-_\s]+/)
         .map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
@@ -49,21 +35,21 @@ function toPascalCase(str) {
  * // Returns 'my-app'
  * ```
  */
-function getProjectName(projectRoot) {
-    const projenrcPath = (0, path_1.join)(projectRoot, '.projenrc.ts');
-    if (!(0, fs_1.existsSync)(projenrcPath)) {
+export function getProjectName(projectRoot) {
+    const projenrcPath = join(projectRoot, '.projenrc.ts');
+    if (!existsSync(projenrcPath)) {
         throw new Error(`.projenrc.ts not found at ${projenrcPath}`);
     }
-    const content = (0, fs_1.readFileSync)(projenrcPath, 'utf-8');
+    const content = readFileSync(projenrcPath, 'utf-8');
     // Try to match: name: 'project-name' or name: "project-name"
     const nameMatch = content.match(/name:\s*['"]([^'"]+)['"]/);
     if (nameMatch) {
         return nameMatch[1];
     }
     // Fallback: try to get from package.json
-    const packageJsonPath = (0, path_1.join)(projectRoot, 'package.json');
-    if ((0, fs_1.existsSync)(packageJsonPath)) {
-        const packageJson = JSON.parse((0, fs_1.readFileSync)(packageJsonPath, 'utf-8'));
+    const packageJsonPath = join(projectRoot, 'package.json');
+    if (existsSync(packageJsonPath)) {
+        const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf-8'));
         if (packageJson.name) {
             return packageJson.name;
         }
@@ -83,13 +69,25 @@ function getProjectName(projectRoot) {
  * // Returns 'https://abc123.execute-api.us-east-1.amazonaws.com/dev'
  * ```
  */
-function getStackOutput(stackName, outputKey) {
+export function getStackOutput(stackName, outputKey) {
     try {
-        const result = (0, child_process_1.execSync)(`aws cloudformation describe-stacks --stack-name "${stackName}" --query "Stacks[0].Outputs[?OutputKey=='${outputKey}'].OutputValue" --output text`, { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+        // Validate inputs to prevent command injection
+        validateStackName(stackName);
+        validateStackOutputKey(outputKey);
+        const result = execFileSync('aws', [
+            'cloudformation',
+            'describe-stacks',
+            '--stack-name',
+            stackName,
+            '--query',
+            `Stacks[0].Outputs[?OutputKey=='${outputKey}'].OutputValue`,
+            '--output',
+            'text',
+        ], { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
         return result && result !== 'None' ? result : null;
     }
     catch {
-        logger_js_1.logger.debug(`Failed to get output ${outputKey} from stack ${stackName}`);
+        logger.debug(`Failed to get output ${outputKey} from stack ${stackName}`);
         return null;
     }
 }
@@ -106,7 +104,7 @@ function getStackOutput(stackName, outputKey) {
  * console.log(outputs.apiUrl);
  * ```
  */
-function getStackOutputs(projectRoot, stage) {
+export function getStackOutputs(projectRoot, stage) {
     const projectName = getProjectName(projectRoot);
     const pascalName = toPascalCase(projectName);
     const outputs = {};
@@ -144,9 +142,9 @@ function getStackOutputs(projectRoot, stage) {
  * }
  * ```
  */
-function hasPackage(projectRoot, packageName) {
-    const packagePath = (0, path_1.join)(projectRoot, 'packages', packageName);
-    return (0, fs_1.existsSync)(packagePath);
+export function hasPackage(projectRoot, packageName) {
+    const packagePath = join(projectRoot, 'packages', packageName);
+    return existsSync(packagePath);
 }
 /**
  * Finds the build output directory for a package.
@@ -161,24 +159,24 @@ function hasPackage(projectRoot, packageName) {
  * // Returns '/path/to/project/packages/frontend/build/client'
  * ```
  */
-function findBuildDirectory(packagePath) {
+export function findBuildDirectory(packagePath) {
     // Check for Remix/Vite SPA build output (build/client)
-    const buildClientDir = (0, path_1.join)(packagePath, 'build', 'client');
-    if ((0, fs_1.existsSync)(buildClientDir)) {
+    const buildClientDir = join(packagePath, 'build', 'client');
+    if (existsSync(buildClientDir)) {
         return buildClientDir;
     }
     // Check for standard build directory
-    const buildDir = (0, path_1.join)(packagePath, 'build');
-    if ((0, fs_1.existsSync)(buildDir)) {
+    const buildDir = join(packagePath, 'build');
+    if (existsSync(buildDir)) {
         // If build exists but we need client assets, look for index.html
-        const hasIndex = (0, fs_1.existsSync)((0, path_1.join)(buildDir, 'index.html'));
+        const hasIndex = existsSync(join(buildDir, 'index.html'));
         if (hasIndex) {
             return buildDir;
         }
     }
     // Check for dist directory (some build tools use this)
-    const distDir = (0, path_1.join)(packagePath, 'dist');
-    if ((0, fs_1.existsSync)(distDir)) {
+    const distDir = join(packagePath, 'dist');
+    if (existsSync(distDir)) {
         return distDir;
     }
     return null;
@@ -197,8 +195,8 @@ function findBuildDirectory(packagePath) {
  * }
  * ```
  */
-async function promptConfirmation(message) {
-    const rl = (0, readline_1.createInterface)({
+export async function promptConfirmation(message) {
+    const rl = createInterface({
         input: process.stdin,
         output: process.stdout,
     });
@@ -223,7 +221,7 @@ async function promptConfirmation(message) {
  * // Returns 'MyAppFrontendStack-dev'
  * ```
  */
-function buildStackName(projectName, stackType, stage) {
+export function buildStackName(projectName, stackType, stage) {
     const pascalName = toPascalCase(projectName);
     return `${pascalName}${stackType}Stack-${stage}`;
 }
@@ -239,15 +237,17 @@ function buildStackName(projectName, stackType, stage) {
  * syncToS3('/path/to/build', 'my-app-frontend-dev-123456789', true);
  * ```
  */
-function syncToS3(localDir, bucket, verbose = false) {
-    logger_js_1.logger.info(`Syncing ${localDir} to s3://${bucket}/`);
-    const command = `aws s3 sync "${localDir}" "s3://${bucket}/" --delete`;
-    logger_js_1.logger.debug(`Running: ${command}`);
+export function syncToS3(localDir, bucket, verbose = false) {
+    // Validate inputs to prevent command injection
+    validateLocalPath(localDir);
+    validateBucketName(bucket);
+    logger.info(`Syncing ${localDir} to s3://${bucket}/`);
+    logger.debug(`Running: aws s3 sync ${localDir} s3://${bucket}/ --delete`);
     try {
-        (0, child_process_1.execSync)(command, {
+        execFileSync('aws', ['s3', 'sync', localDir, `s3://${bucket}/`, '--delete'], {
             stdio: verbose ? 'inherit' : ['pipe', 'pipe', 'pipe'],
         });
-        logger_js_1.logger.success(`Synced assets to s3://${bucket}/`);
+        logger.success(`Synced assets to s3://${bucket}/`);
     }
     catch (error) {
         throw new Error(`Failed to sync to S3: ${error.message}`);
@@ -264,23 +264,24 @@ function syncToS3(localDir, bucket, verbose = false) {
  * invalidateCloudFront('E1234567890ABC', true);
  * ```
  */
-function invalidateCloudFront(distributionId, verbose = false) {
-    logger_js_1.logger.info(`Invalidating CloudFront distribution ${distributionId}`);
-    const command = `aws cloudfront create-invalidation --distribution-id "${distributionId}" --paths "/*"`;
-    logger_js_1.logger.debug(`Running: ${command}`);
+export function invalidateCloudFront(distributionId, verbose = false) {
+    // Validate input to prevent command injection
+    validateDistributionId(distributionId);
+    logger.info(`Invalidating CloudFront distribution ${distributionId}`);
+    logger.debug(`Running: aws cloudfront create-invalidation --distribution-id ${distributionId} --paths "/*"`);
     try {
-        const result = (0, child_process_1.execSync)(command, {
+        const result = execFileSync('aws', ['cloudfront', 'create-invalidation', '--distribution-id', distributionId, '--paths', '/*'], {
             encoding: 'utf-8',
             stdio: verbose ? 'inherit' : ['pipe', 'pipe', 'pipe'],
         });
-        if (!verbose) {
+        if (!verbose && typeof result === 'string') {
             // Extract invalidation ID from response
             const invalidationMatch = result.match(/"Id":\s*"([^"]+)"/);
             if (invalidationMatch) {
-                logger_js_1.logger.info(`CloudFront invalidation created: ${invalidationMatch[1]}`);
+                logger.info(`CloudFront invalidation created: ${invalidationMatch[1]}`);
             }
         }
-        logger_js_1.logger.success('CloudFront invalidation initiated (runs asynchronously)');
+        logger.success('CloudFront invalidation initiated (runs asynchronously)');
     }
     catch (error) {
         throw new Error(`Failed to invalidate CloudFront: ${error.message}`);
@@ -298,13 +299,13 @@ function invalidateCloudFront(distributionId, verbose = false) {
  * buildPackage('/path/to/frontend', 'https://api.example.com', true);
  * ```
  */
-function buildPackage(packagePath, apiUrl, verbose = false) {
+export function buildPackage(packagePath, apiUrl, verbose = false) {
     const packageName = packagePath.split('/').pop();
-    logger_js_1.logger.info(`Building ${packageName} with API URL: ${apiUrl}`);
+    logger.info(`Building ${packageName} with API URL: ${apiUrl}`);
     const command = 'pnpm build';
-    logger_js_1.logger.debug(`Running: ${command} in ${packagePath}`);
+    logger.debug(`Running: ${command} in ${packagePath}`);
     try {
-        (0, child_process_1.execSync)(command, {
+        execSync(command, {
             cwd: packagePath,
             stdio: verbose ? 'inherit' : ['pipe', 'pipe', 'pipe'],
             env: {
@@ -313,7 +314,7 @@ function buildPackage(packagePath, apiUrl, verbose = false) {
                 API_URL: apiUrl,
             },
         });
-        logger_js_1.logger.success(`Built ${packageName}`);
+        logger.success(`Built ${packageName}`);
     }
     catch (error) {
         throw new Error(`Failed to build ${packageName}: ${error.message}`);
@@ -324,16 +325,16 @@ function buildPackage(packagePath, apiUrl, verbose = false) {
  *
  * @throws Error if AWS CLI is not available or not configured
  */
-function validateAwsCli() {
+export function validateAwsCli() {
     try {
-        (0, child_process_1.execSync)('aws --version', { stdio: ['pipe', 'pipe', 'pipe'] });
+        execSync('aws --version', { stdio: ['pipe', 'pipe', 'pipe'] });
     }
     catch {
         throw new Error('AWS CLI is not installed or not in PATH. ' +
             'Install it from https://aws.amazon.com/cli/ and run `aws configure`.');
     }
     try {
-        (0, child_process_1.execSync)('aws sts get-caller-identity', { stdio: ['pipe', 'pipe', 'pipe'] });
+        execSync('aws sts get-caller-identity', { stdio: ['pipe', 'pipe', 'pipe'] });
     }
     catch {
         throw new Error('AWS credentials not configured. Run `aws configure` or set AWS environment variables.');
@@ -346,14 +347,14 @@ function validateAwsCli() {
  * @param stage - Deployment stage
  * @returns Array of stack names
  */
-function listProjectStacks(projectRoot, stage) {
+export function listProjectStacks(projectRoot, stage) {
     const projectName = getProjectName(projectRoot);
     const pascalName = toPascalCase(projectName);
     const stacks = [];
     // Check for infrastructure stacks directory
-    const stacksDir = (0, path_1.join)(projectRoot, 'packages', 'infra', 'src', 'stacks');
-    if ((0, fs_1.existsSync)(stacksDir)) {
-        const files = (0, fs_1.readdirSync)(stacksDir);
+    const stacksDir = join(projectRoot, 'packages', 'infra', 'src', 'stacks');
+    if (existsSync(stacksDir)) {
+        const files = readdirSync(stacksDir);
         for (const file of files) {
             if (file.endsWith('-stack.ts')) {
                 // Extract stack name from file (e.g., 'api-stack.ts' -> 'Api')