@go-to-k/cdkd 0.18.0 → 0.18.1

package/dist/cli.js

@@ -537,10 +537,122 @@ var destroyOptions = [
   )
 ];
 
+// src/provisioning/resource-name.ts
+import { AsyncLocalStorage } from "node:async_hooks";
+import { createHash } from "node:crypto";
+var stackNameStore = new AsyncLocalStorage();
+function withStackName(stackName, fn) {
+  return stackNameStore.run(stackName, fn);
+}
+function getCurrentStackName() {
+  return stackNameStore.getStore();
+}
+function generateResourceName(name, options) {
+  const { maxLength, lowercase = false, allowedPattern = /[^a-zA-Z0-9-]/g } = options;
+  const currentStackName = stackNameStore.getStore();
+  const fullName = currentStackName ? `${currentStackName}-${name}` : name;
+  let sanitized = lowercase ? fullName.toLowerCase() : fullName;
+  sanitized = sanitized.replace(allowedPattern, "-");
+  sanitized = sanitized.replace(/-{2,}/g, "-").replace(/^-+|-+$/g, "");
+  if (sanitized.length <= maxLength) {
+    return sanitized;
+  }
+  const hash = createHash("sha256").update(fullName).digest("hex").substring(0, 8);
+  const maxPrefixLength = maxLength - hash.length - 1;
+  const prefix = sanitized.substring(0, maxPrefixLength).replace(/-+$/, "");
+  return `${prefix}-${hash}`;
+}
+var FALLBACK_NAME_RULES = {
+  "AWS::S3::Bucket": { nameProperty: "BucketName", options: { maxLength: 63, lowercase: true } },
+  "AWS::SQS::Queue": { nameProperty: "QueueName", options: { maxLength: 80 } },
+  "AWS::SNS::Topic": { nameProperty: "TopicName", options: { maxLength: 256 } },
+  "AWS::Lambda::Function": { nameProperty: "FunctionName", options: { maxLength: 64 } },
+  "AWS::Lambda::LayerVersion": { nameProperty: "LayerName", options: { maxLength: 64 } },
+  "AWS::IAM::Role": { nameProperty: "RoleName", options: { maxLength: 64 } },
+  "AWS::IAM::Policy": { nameProperty: "PolicyName", options: { maxLength: 64 } },
+  "AWS::IAM::User": { nameProperty: "UserName", options: { maxLength: 64 } },
+  "AWS::IAM::Group": { nameProperty: "GroupName", options: { maxLength: 128 } },
+  "AWS::IAM::InstanceProfile": {
+    nameProperty: "InstanceProfileName",
+    options: { maxLength: 128 }
+  },
+  "AWS::DynamoDB::Table": { nameProperty: "TableName", options: { maxLength: 255 } },
+  "AWS::ECR::Repository": {
+    nameProperty: "RepositoryName",
+    options: { maxLength: 256, lowercase: true }
+  },
+  "AWS::ECS::Cluster": { nameProperty: "ClusterName", options: { maxLength: 255 } },
+  "AWS::ECS::Service": { nameProperty: "ServiceName", options: { maxLength: 255 } },
+  "AWS::Logs::LogGroup": { nameProperty: "LogGroupName", options: { maxLength: 512 } },
+  "AWS::CloudWatch::Alarm": { nameProperty: "AlarmName", options: { maxLength: 256 } },
+  "AWS::Events::Rule": { nameProperty: "Name", options: { maxLength: 64 } },
+  "AWS::Events::EventBus": { nameProperty: "Name", options: { maxLength: 256 } },
+  "AWS::Kinesis::Stream": { nameProperty: "Name", options: { maxLength: 128 } },
+  "AWS::StepFunctions::StateMachine": {
+    nameProperty: "StateMachineName",
+    options: { maxLength: 80 }
+  },
+  "AWS::SecretsManager::Secret": {
+    nameProperty: "Name",
+    options: { maxLength: 512, allowedPattern: /[^a-zA-Z0-9-/_]/g }
+  },
+  "AWS::SSM::Parameter": { nameProperty: "Name", options: { maxLength: 2048 } },
+  "AWS::Cognito::UserPool": { nameProperty: "UserPoolName", options: { maxLength: 128 } },
+  "AWS::ElastiCache::SubnetGroup": {
+    nameProperty: "CacheSubnetGroupName",
+    options: { maxLength: 255, lowercase: true }
+  },
+  "AWS::ElastiCache::CacheCluster": {
+    nameProperty: "ClusterName",
+    options: { maxLength: 40, lowercase: true }
+  },
+  "AWS::RDS::DBSubnetGroup": {
+    nameProperty: "DBSubnetGroupName",
+    options: { maxLength: 255, lowercase: true }
+  },
+  "AWS::RDS::DBCluster": {
+    nameProperty: "DBClusterIdentifier",
+    options: { maxLength: 63, lowercase: true }
+  },
+  "AWS::RDS::DBInstance": {
+    nameProperty: "DBInstanceIdentifier",
+    options: { maxLength: 63, lowercase: true }
+  },
+  "AWS::ElasticLoadBalancingV2::LoadBalancer": {
+    nameProperty: "Name",
+    options: { maxLength: 32 }
+  },
+  "AWS::ElasticLoadBalancingV2::TargetGroup": {
+    nameProperty: "Name",
+    options: { maxLength: 32 }
+  },
+  "AWS::WAFv2::WebACL": { nameProperty: "Name", options: { maxLength: 128 } },
+  "AWS::CodeBuild::Project": { nameProperty: "Name", options: { maxLength: 255 } },
+  "AWS::S3Express::DirectoryBucket": {
+    nameProperty: "BucketName",
+    options: { maxLength: 63, lowercase: true }
+  }
+};
+function applyDefaultNameForFallback(logicalId, resourceType, properties) {
+  const rule = FALLBACK_NAME_RULES[resourceType];
+  if (!rule)
+    return properties;
+  if (properties[rule.nameProperty])
+    return properties;
+  const generatedName = generateResourceName(logicalId, rule.options);
+  return {
+    ...properties,
+    [rule.nameProperty]: generatedName
+  };
+}
+
 // src/utils/live-renderer.ts
 var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
 var FRAME_INTERVAL_MS = 80;
 var ESC = "\x1B[";
+function scopedKey(id, stackName) {
+  return stackName ? `${stackName}:${id}` : id;
+}
 var LiveRenderer = class {
   constructor(stream = process.stdout) {
     this.stream = stream;
@@ -594,12 +706,14 @@ var LiveRenderer = class {
     this.active = false;
   }
   addTask(id, label) {
-    this.tasks.set(id, { label, startedAt: Date.now() });
+    const stackName = getCurrentStackName();
+    this.tasks.set(scopedKey(id, stackName), { label, startedAt: Date.now(), stackName });
     if (this.active)
       this.draw();
   }
   removeTask(id) {
-    if (!this.tasks.delete(id))
+    const stackName = getCurrentStackName();
+    if (!this.tasks.delete(scopedKey(id, stackName)))
       return;
     if (this.active)
       this.draw();
@@ -635,11 +749,16 @@ var LiveRenderer = class {
       return;
     const frame = SPINNER_FRAMES[this.spinnerIndex % SPINNER_FRAMES.length];
     this.spinnerIndex++;
+    const distinctStacks = /* @__PURE__ */ new Set();
+    for (const task of this.tasks.values())
+      distinctStacks.add(task.stackName);
+    const showStackPrefix = distinctStacks.size > 1;
     const cols = this.stream.columns ?? 80;
     const lines = [];
     for (const task of this.tasks.values()) {
       const elapsed = ((Date.now() - task.startedAt) / 1e3).toFixed(1);
-      const raw = `  ${frame} ${task.label} (${elapsed}s)`;
+      const prefix = showStackPrefix && task.stackName ? `[${task.stackName}] ` : "";
+      const raw = `  ${frame} ${prefix}${task.label} (${elapsed}s)`;
       lines.push(this.truncate(raw, cols));
     }
     this.stream.write(lines.join("\n") + "\n");
@@ -672,6 +791,24 @@ function getLiveRenderer() {
   return globalRenderer;
 }
 
+// src/utils/stack-context.ts
+import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
+var outputBufferStore = new AsyncLocalStorage2();
+async function runStackBuffered(fn) {
+  const buffer = { lines: [] };
+  return outputBufferStore.run(buffer, async () => {
+    try {
+      const result = await fn();
+      return { ok: true, result, lines: buffer.lines };
+    } catch (error) {
+      return { ok: false, error, lines: buffer.lines };
+    }
+  });
+}
+function getCurrentStackOutputBuffer() {
+  return outputBufferStore.getStore();
+}
+
 // src/utils/logger.ts
 var colors = {
   reset: "\x1B[0m",
@@ -726,28 +863,48 @@ var ConsoleLogger = class {
     }
     return `${message}${formattedArgs}`;
   }
+  /**
+   * Route a formatted log line. When a per-stack output buffer is active in
+   * the current async context (parallel multi-stack deploy), capture the
+   * line into the buffer so it can be flushed as one atomic block when the
+   * stack finishes. Otherwise fall through to the live renderer / console
+   * as before.
+   */
+  emit(level, formatted) {
+    const buffer = getCurrentStackOutputBuffer();
+    if (buffer) {
+      buffer.lines.push(formatted);
+      return;
+    }
+    getLiveRenderer().printAbove(() => {
+      if (level === "error")
+        console.error(formatted);
+      else if (level === "warn")
+        console.warn(formatted);
+      else if (level === "info")
+        console.info(formatted);
+      else
+        console.debug(formatted);
+    });
+  }
   debug(message, ...args) {
     if (this.shouldLog("debug")) {
-      const formatted = this.formatMessage("debug", message, ...args);
-      getLiveRenderer().printAbove(() => console.debug(formatted));
+      this.emit("debug", this.formatMessage("debug", message, ...args));
     }
   }
   info(message, ...args) {
     if (this.shouldLog("info")) {
-      const formatted = this.formatMessage("info", message, ...args);
-      getLiveRenderer().printAbove(() => console.info(formatted));
+      this.emit("info", this.formatMessage("info", message, ...args));
     }
   }
   warn(message, ...args) {
     if (this.shouldLog("warn")) {
-      const formatted = this.formatMessage("warn", message, ...args);
-      getLiveRenderer().printAbove(() => console.warn(formatted));
+      this.emit("warn", this.formatMessage("warn", message, ...args));
     }
   }
   error(message, ...args) {
     if (this.shouldLog("error")) {
-      const formatted = this.formatMessage("error", message, ...args);
-      getLiveRenderer().printAbove(() => console.error(formatted));
+      this.emit("error", this.formatMessage("error", message, ...args));
     }
   }
   /**
@@ -7765,112 +7922,6 @@ import {
 } from "@aws-sdk/client-iam";
 init_aws_clients();
 
-// src/provisioning/resource-name.ts
-import { AsyncLocalStorage } from "node:async_hooks";
-import { createHash } from "node:crypto";
-var stackNameStore = new AsyncLocalStorage();
-function withStackName(stackName, fn) {
-  return stackNameStore.run(stackName, fn);
-}
-function generateResourceName(name, options) {
-  const { maxLength, lowercase = false, allowedPattern = /[^a-zA-Z0-9-]/g } = options;
-  const currentStackName = stackNameStore.getStore();
-  const fullName = currentStackName ? `${currentStackName}-${name}` : name;
-  let sanitized = lowercase ? fullName.toLowerCase() : fullName;
-  sanitized = sanitized.replace(allowedPattern, "-");
-  sanitized = sanitized.replace(/-{2,}/g, "-").replace(/^-+|-+$/g, "");
-  if (sanitized.length <= maxLength) {
-    return sanitized;
-  }
-  const hash = createHash("sha256").update(fullName).digest("hex").substring(0, 8);
-  const maxPrefixLength = maxLength - hash.length - 1;
-  const prefix = sanitized.substring(0, maxPrefixLength).replace(/-+$/, "");
-  return `${prefix}-${hash}`;
-}
-var FALLBACK_NAME_RULES = {
-  "AWS::S3::Bucket": { nameProperty: "BucketName", options: { maxLength: 63, lowercase: true } },
-  "AWS::SQS::Queue": { nameProperty: "QueueName", options: { maxLength: 80 } },
-  "AWS::SNS::Topic": { nameProperty: "TopicName", options: { maxLength: 256 } },
-  "AWS::Lambda::Function": { nameProperty: "FunctionName", options: { maxLength: 64 } },
-  "AWS::Lambda::LayerVersion": { nameProperty: "LayerName", options: { maxLength: 64 } },
-  "AWS::IAM::Role": { nameProperty: "RoleName", options: { maxLength: 64 } },
-  "AWS::IAM::Policy": { nameProperty: "PolicyName", options: { maxLength: 64 } },
-  "AWS::IAM::User": { nameProperty: "UserName", options: { maxLength: 64 } },
-  "AWS::IAM::Group": { nameProperty: "GroupName", options: { maxLength: 128 } },
-  "AWS::IAM::InstanceProfile": {
-    nameProperty: "InstanceProfileName",
-    options: { maxLength: 128 }
-  },
-  "AWS::DynamoDB::Table": { nameProperty: "TableName", options: { maxLength: 255 } },
-  "AWS::ECR::Repository": {
-    nameProperty: "RepositoryName",
-    options: { maxLength: 256, lowercase: true }
-  },
-  "AWS::ECS::Cluster": { nameProperty: "ClusterName", options: { maxLength: 255 } },
-  "AWS::ECS::Service": { nameProperty: "ServiceName", options: { maxLength: 255 } },
-  "AWS::Logs::LogGroup": { nameProperty: "LogGroupName", options: { maxLength: 512 } },
-  "AWS::CloudWatch::Alarm": { nameProperty: "AlarmName", options: { maxLength: 256 } },
-  "AWS::Events::Rule": { nameProperty: "Name", options: { maxLength: 64 } },
-  "AWS::Events::EventBus": { nameProperty: "Name", options: { maxLength: 256 } },
-  "AWS::Kinesis::Stream": { nameProperty: "Name", options: { maxLength: 128 } },
-  "AWS::StepFunctions::StateMachine": {
-    nameProperty: "StateMachineName",
-    options: { maxLength: 80 }
-  },
-  "AWS::SecretsManager::Secret": {
-    nameProperty: "Name",
-    options: { maxLength: 512, allowedPattern: /[^a-zA-Z0-9-/_]/g }
-  },
-  "AWS::SSM::Parameter": { nameProperty: "Name", options: { maxLength: 2048 } },
-  "AWS::Cognito::UserPool": { nameProperty: "UserPoolName", options: { maxLength: 128 } },
-  "AWS::ElastiCache::SubnetGroup": {
-    nameProperty: "CacheSubnetGroupName",
-    options: { maxLength: 255, lowercase: true }
-  },
-  "AWS::ElastiCache::CacheCluster": {
-    nameProperty: "ClusterName",
-    options: { maxLength: 40, lowercase: true }
-  },
-  "AWS::RDS::DBSubnetGroup": {
-    nameProperty: "DBSubnetGroupName",
-    options: { maxLength: 255, lowercase: true }
-  },
-  "AWS::RDS::DBCluster": {
-    nameProperty: "DBClusterIdentifier",
-    options: { maxLength: 63, lowercase: true }
-  },
-  "AWS::RDS::DBInstance": {
-    nameProperty: "DBInstanceIdentifier",
-    options: { maxLength: 63, lowercase: true }
-  },
-  "AWS::ElasticLoadBalancingV2::LoadBalancer": {
-    nameProperty: "Name",
-    options: { maxLength: 32 }
-  },
-  "AWS::ElasticLoadBalancingV2::TargetGroup": {
-    nameProperty: "Name",
-    options: { maxLength: 32 }
-  },
-  "AWS::WAFv2::WebACL": { nameProperty: "Name", options: { maxLength: 128 } },
-  "AWS::CodeBuild::Project": { nameProperty: "Name", options: { maxLength: 255 } },
-  "AWS::S3Express::DirectoryBucket": {
-    nameProperty: "BucketName",
-    options: { maxLength: 63, lowercase: true }
-  }
-};
-function applyDefaultNameForFallback(logicalId, resourceType, properties) {
-  const rule = FALLBACK_NAME_RULES[resourceType];
-  if (!rule)
-    return properties;
-  if (properties[rule.nameProperty])
-    return properties;
-  const generatedName = generateResourceName(logicalId, rule.options);
-  return {
-    ...properties,
-    [rule.nameProperty]: generatedName
-  };
-}
-
 // src/provisioning/import-helpers.ts
 function readNameProperty(input, propertyName) {
   const value = input.properties?.[propertyName];
@@ -29998,6 +30049,68 @@ async function deployCommand(stacks, options) {
     }
     const summary = workGraph.summary();
     logger.debug(`Work graph: ${summary["asset-publish"]} asset(s), ${summary["stack"]} stack(s)`);
+    const bufferStackOutput = targetStacks.length > 1;
+    const runStack = async (stackInfo) => {
+      const stackRegion = stackInfo.region || baseRegion;
+      logger.info(
+        `
+Deploying stack: ${stackInfo.stackName}${stackRegion !== baseRegion ? ` (region: ${stackRegion})` : ""}`
+      );
+      switchRegion(stackRegion);
+      const stackAwsClients = new AwsClients({
+        region: stackRegion,
+        ...options.profile && { profile: options.profile }
+      });
+      setAwsClients(stackAwsClients);
+      const stateS3Client = new AwsClients({
+        region: baseRegion,
+        ...options.profile && { profile: options.profile }
+      });
+      const stackStateBackend = new S3StateBackend(stateS3Client.s3, stateConfig, {
+        region: baseRegion,
+        ...options.profile && { profile: options.profile }
+      });
+      const stackLockManager = new LockManager(stateS3Client.s3, stateConfig);
+      const stackProviderRegistry = new ProviderRegistry();
+      registerAllProviders(stackProviderRegistry);
+      stackProviderRegistry.setCustomResourceResponseBucket(stateBucket, baseRegion);
+      const stackDeployEngine = new DeployEngine(
+        stackStateBackend,
+        stackLockManager,
+        dagBuilder,
+        diffCalculator,
+        stackProviderRegistry,
+        {
+          concurrency: options.concurrency,
+          dryRun: options.dryRun,
+          noRollback: !options.rollback
+        },
+        stackRegion
+      );
+      try {
+        const deployResult = await stackDeployEngine.deploy(
+          stackInfo.stackName,
+          stackInfo.template
+        );
+        logger.info("\nDeployment Summary:");
+        logger.info(`  Stack: ${deployResult.stackName}`);
+        logger.info(`  Created: ${deployResult.created}`);
+        logger.info(`  Updated: ${deployResult.updated}`);
+        logger.info(`  Deleted: ${deployResult.deleted}`);
+        logger.info(`  Unchanged: ${deployResult.unchanged}`);
+        logger.info(`  Duration: ${(deployResult.durationMs / 1e3).toFixed(2)}s`);
+        if (options.dryRun) {
+          logger.info("\n\u2713 Dry run completed - no actual changes made");
+        } else {
+          logger.info("\n\u2713 Deployment completed successfully");
+        }
+      } finally {
+        stackAwsClients.destroy();
+        stateS3Client.destroy();
+        switchRegion(baseRegion);
+        setAwsClients(awsClients);
+      }
+    };
     await workGraph.execute(
       {
         "asset-build": options.imageBuildConcurrency,
@@ -30009,65 +30122,16 @@ async function deployCommand(stacks, options) {
           await assetPublisher.executeNode(node);
         } else {
           const { stack: stackInfo } = node.data;
-          const stackRegion = stackInfo.region || baseRegion;
-          logger.info(
-            `
-Deploying stack: ${stackInfo.stackName}${stackRegion !== baseRegion ? ` (region: ${stackRegion})` : ""}`
-          );
-          switchRegion(stackRegion);
-          const stackAwsClients = new AwsClients({
-            region: stackRegion,
-            ...options.profile && { profile: options.profile }
-          });
-          setAwsClients(stackAwsClients);
-          const stateS3Client = new AwsClients({
-            region: baseRegion,
-            ...options.profile && { profile: options.profile }
-          });
-          const stackStateBackend = new S3StateBackend(stateS3Client.s3, stateConfig, {
-            region: baseRegion,
-            ...options.profile && { profile: options.profile }
-          });
-          const stackLockManager = new LockManager(stateS3Client.s3, stateConfig);
-          const stackProviderRegistry = new ProviderRegistry();
-          registerAllProviders(stackProviderRegistry);
-          stackProviderRegistry.setCustomResourceResponseBucket(stateBucket, baseRegion);
-          const stackDeployEngine = new DeployEngine(
-            stackStateBackend,
-            stackLockManager,
-            dagBuilder,
-            diffCalculator,
-            stackProviderRegistry,
-            {
-              concurrency: options.concurrency,
-              dryRun: options.dryRun,
-              noRollback: !options.rollback
-            },
-            stackRegion
-          );
-          try {
-            const deployResult = await stackDeployEngine.deploy(
-              stackInfo.stackName,
-              stackInfo.template
-            );
-            logger.info("\nDeployment Summary:");
-            logger.info(`  Stack: ${deployResult.stackName}`);
-            logger.info(`  Created: ${deployResult.created}`);
-            logger.info(`  Updated: ${deployResult.updated}`);
-            logger.info(`  Deleted: ${deployResult.deleted}`);
-            logger.info(`  Unchanged: ${deployResult.unchanged}`);
-            logger.info(`  Duration: ${(deployResult.durationMs / 1e3).toFixed(2)}s`);
-            if (options.dryRun) {
-              logger.info("\n\u2713 Dry run completed - no actual changes made");
-            } else {
-              logger.info("\n\u2713 Deployment completed successfully");
-            }
-          } finally {
-            stackAwsClients.destroy();
-            stateS3Client.destroy();
-            switchRegion(baseRegion);
-            setAwsClients(awsClients);
+          if (!bufferStackOutput) {
+            await runStack(stackInfo);
+            return;
+          }
+          const outcome = await runStackBuffered(() => runStack(stackInfo));
+          if (outcome.lines.length > 0) {
+            process.stdout.write(outcome.lines.join("\n") + "\n");
           }
+          if (!outcome.ok)
+            throw outcome.error;
         }
       }
     );
@@ -32326,7 +32390,7 @@ function reorderArgs(argv) {
 }
 async function main() {
   const program = new Command13();
-  program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.18.0");
+  program.name("cdkd").description("CDK Direct - Deploy AWS CDK apps directly via SDK/Cloud Control API").version("0.18.1");
   program.addCommand(createBootstrapCommand());
   program.addCommand(createSynthCommand());
   program.addCommand(createListCommand());