@aws/nx-plugin 1.0.0-rc.7 → 1.0.0-rc.71

package/src/connection/supported-connections.js

@@ -0,0 +1,163 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ // Supported source/target project types: either project-level types (resolved
+// by introspection) or component generator ids (from component metadata).
+export const SUPPORTED_PROJECT_TYPES = [
+    'ts#trpc-api',
+    'py#fast-api',
+    'ts#react-website',
+    'ts#smithy-api',
+    'ts#rdb',
+    'py#rdb',
+    'ts#dynamodb',
+    'py#dynamodb',
+    'agentcore-gateway'
+];
+// The single source of truth for supported connections, in a dependency-free
+// module so the e2e connection matrix can import it without pulling in the
+// generator implementation graph.
+export const SUPPORTED_CONNECTIONS = [
+    {
+        source: 'ts#trpc-api',
+        target: 'ts#rdb'
+    },
+    {
+        source: 'ts#trpc-api',
+        target: 'ts#dynamodb'
+    },
+    {
+        source: 'ts#agent',
+        target: 'ts#rdb'
+    },
+    {
+        source: 'ts#smithy-api',
+        target: 'ts#rdb'
+    },
+    {
+        source: 'ts#smithy-api',
+        target: 'ts#dynamodb'
+    },
+    {
+        source: 'ts#mcp-server',
+        target: 'ts#rdb'
+    },
+    {
+        source: 'ts#mcp-server',
+        target: 'ts#dynamodb'
+    },
+    {
+        source: 'ts#react-website',
+        target: 'ts#trpc-api'
+    },
+    {
+        source: 'ts#react-website',
+        target: 'py#fast-api'
+    },
+    {
+        source: 'ts#react-website',
+        target: 'ts#smithy-api'
+    },
+    {
+        source: 'ts#react-website',
+        target: 'ts#agent'
+    },
+    {
+        source: 'ts#react-website',
+        target: 'py#agent'
+    },
+    {
+        source: 'ts#agent',
+        target: 'ts#mcp-server'
+    },
+    {
+        source: 'ts#agent',
+        target: 'py#mcp-server'
+    },
+    {
+        source: 'ts#agent',
+        target: 'ts#dynamodb'
+    },
+    {
+        source: 'py#agent',
+        target: 'ts#mcp-server'
+    },
+    {
+        source: 'py#agent',
+        target: 'py#mcp-server'
+    },
+    {
+        source: 'ts#agent',
+        target: 'ts#agent'
+    },
+    {
+        source: 'ts#agent',
+        target: 'py#agent'
+    },
+    {
+        source: 'py#agent',
+        target: 'ts#agent'
+    },
+    {
+        source: 'py#agent',
+        target: 'py#agent'
+    },
+    {
+        source: 'ts#agent',
+        target: 'agentcore-gateway'
+    },
+    {
+        source: 'py#agent',
+        target: 'agentcore-gateway'
+    },
+    {
+        source: 'ts#react-website',
+        target: 'agentcore-gateway'
+    },
+    {
+        source: 'agentcore-gateway',
+        target: 'ts#agent'
+    },
+    {
+        source: 'agentcore-gateway',
+        target: 'py#agent'
+    },
+    {
+        source: 'agentcore-gateway',
+        target: 'ts#mcp-server'
+    },
+    {
+        source: 'agentcore-gateway',
+        target: 'py#mcp-server'
+    },
+    {
+        source: 'agentcore-gateway',
+        target: 'agentcore-gateway'
+    },
+    {
+        source: 'py#fast-api',
+        target: 'py#dynamodb'
+    },
+    {
+        source: 'py#agent',
+        target: 'py#dynamodb'
+    },
+    {
+        source: 'py#mcp-server',
+        target: 'py#dynamodb'
+    },
+    {
+        source: 'py#fast-api',
+        target: 'py#rdb'
+    },
+    {
+        source: 'py#agent',
+        target: 'py#rdb'
+    },
+    {
+        source: 'py#mcp-server',
+        target: 'py#rdb'
+    }
+];
+
+//# sourceMappingURL=supported-connections.js.map

package/src/connection/supported-connections.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/connection/supported-connections.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nexport type Connection = { source: string; target: string };\n\n// Supported source/target project types: either project-level types (resolved\n// by introspection) or component generator ids (from component metadata).\nexport const SUPPORTED_PROJECT_TYPES = [\n  'ts#trpc-api',\n  'py#fast-api',\n  'ts#react-website',\n  'ts#smithy-api',\n  'ts#rdb',\n  'py#rdb',\n  'ts#dynamodb',\n  'py#dynamodb',\n  'agentcore-gateway',\n] as const;\n\n// The single source of truth for supported connections, in a dependency-free\n// module so the e2e connection matrix can import it without pulling in the\n// generator implementation graph.\nexport const SUPPORTED_CONNECTIONS = [\n  { source: 'ts#trpc-api', target: 'ts#rdb' },\n  { source: 'ts#trpc-api', target: 'ts#dynamodb' },\n  { source: 'ts#agent', target: 'ts#rdb' },\n  { source: 'ts#smithy-api', target: 'ts#rdb' },\n  { source: 'ts#smithy-api', target: 'ts#dynamodb' },\n  { source: 'ts#mcp-server', target: 'ts#rdb' },\n  { source: 'ts#mcp-server', target: 'ts#dynamodb' },\n  { source: 'ts#react-website', target: 'ts#trpc-api' },\n  { source: 'ts#react-website', target: 'py#fast-api' },\n  { source: 'ts#react-website', target: 'ts#smithy-api' },\n  { source: 'ts#react-website', target: 'ts#agent' },\n  { source: 'ts#react-website', target: 'py#agent' },\n  { source: 'ts#agent', target: 'ts#mcp-server' },\n  { source: 'ts#agent', target: 'py#mcp-server' },\n  { source: 'ts#agent', target: 'ts#dynamodb' },\n  { source: 'py#agent', target: 'ts#mcp-server' },\n  { source: 'py#agent', target: 'py#mcp-server' },\n  { source: 'ts#agent', target: 'ts#agent' },\n  { source: 'ts#agent', target: 'py#agent' },\n  { source: 'py#agent', target: 'ts#agent' },\n  { source: 'py#agent', target: 'py#agent' },\n  { source: 'ts#agent', target: 'agentcore-gateway' },\n  { source: 'py#agent', target: 'agentcore-gateway' },\n  { source: 'ts#react-website', target: 'agentcore-gateway' },\n  { source: 'agentcore-gateway', target: 'ts#agent' },\n  { source: 'agentcore-gateway', target: 'py#agent' },\n  { source: 'agentcore-gateway', target: 'ts#mcp-server' },\n  { source: 'agentcore-gateway', target: 'py#mcp-server' },\n  { source: 'agentcore-gateway', target: 'agentcore-gateway' },\n  { source: 'py#fast-api', target: 'py#dynamodb' },\n  { source: 'py#agent', target: 'py#dynamodb' },\n  { source: 'py#mcp-server', target: 'py#dynamodb' },\n  { source: 'py#fast-api', target: 'py#rdb' },\n  { source: 'py#agent', target: 'py#rdb' },\n  { source: 'py#mcp-server', target: 'py#rdb' },\n] as const satisfies readonly Connection[];\n\n// `<source> -> <target>` string union of every supported connection. Used to\n// key exhaustive maps so a new connection is a compile error until handled.\nexport type ConnectionKey =\n  (typeof SUPPORTED_CONNECTIONS)[number] extends infer C\n    ? C extends Connection\n      ? `${C['source']} -> ${C['target']}`\n      : never\n    : never;\n"],"names":["SUPPORTED_PROJECT_TYPES","SUPPORTED_CONNECTIONS","source","target"],"mappings":"AAAA;;;CAGC,GAID,8EAA8E;AAC9E,0EAA0E;AAC1E,OAAO,MAAMA,0BAA0B;IACrC;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;CACD,CAAU;AAEX,6EAA6E;AAC7E,2EAA2E;AAC3E,kCAAkC;AAClC,OAAO,MAAMC,wBAAwB;IACnC;QAAEC,QAAQ;QAAeC,QAAQ;IAAS;IAC1C;QAAED,QAAQ;QAAeC,QAAQ;IAAc;IAC/C;QAAED,QAAQ;QAAYC,QAAQ;IAAS;IACvC;QAAED,QAAQ;QAAiBC,QAAQ;IAAS;IAC5C;QAAED,QAAQ;QAAiBC,QAAQ;IAAc;IACjD;QAAED,QAAQ;QAAiBC,QAAQ;IAAS;IAC5C;QAAED,QAAQ;QAAiBC,QAAQ;IAAc;IACjD;QAAED,QAAQ;QAAoBC,QAAQ;IAAc;IACpD;QAAED,QAAQ;QAAoBC,QAAQ;IAAc;IACpD;QAAED,QAAQ;QAAoBC,QAAQ;IAAgB;IACtD;QAAED,QAAQ;QAAoBC,QAAQ;IAAW;IACjD;QAAED,QAAQ;QAAoBC,QAAQ;IAAW;IACjD;QAAED,QAAQ;QAAYC,QAAQ;IAAgB;IAC9C;QAAED,QAAQ;QAAYC,QAAQ;IAAgB;IAC9C;QAAED,QAAQ;QAAYC,QAAQ;IAAc;IAC5C;QAAED,QAAQ;QAAYC,QAAQ;IAAgB;IAC9C;QAAED,QAAQ;QAAYC,QAAQ;IAAgB;IAC9C;QAAED,QAAQ;QAAYC,QAAQ;IAAW;IACzC;QAAED,QAAQ;QAAYC,QAAQ;IAAW;IACzC;QAAED,QAAQ;QAAYC,QAAQ;IAAW;IACzC;QAAED,QAAQ;QAAYC,QAAQ;IAAW;IACzC;QAAED,QAAQ;QAAYC,QAAQ;IAAoB;IAClD;QAAED,QAAQ;QAAYC,QAAQ;IAAoB;IAClD;QAAED,QAAQ;QAAoBC,QAAQ;IAAoB;IAC1D;QAAED,QAAQ;QAAqBC,QAAQ;IAAW;IAClD;QAAED,QAAQ;QAAqBC,QAAQ;IAAW;IAClD;QAAED,QAAQ;QAAqBC,QAAQ;IAAgB;IACvD;QAAED,QAAQ;QAAqBC,QAAQ;IAAgB;IACvD;QAAED,QAAQ;QAAqBC,QAAQ;IAAoB;IAC3D;QAAED,QAAQ;QAAeC,QAAQ;IAAc;IAC/C;QAAED,QAAQ;QAAYC,QAAQ;IAAc;IAC5C;QAAED,QAAQ;QAAiBC,QAAQ;IAAc;IACjD;QAAED,QAAQ;QAAeC,QAAQ;IAAS;IAC1C;QAAED,QAAQ;QAAYC,QAAQ;IAAS;IACvC;QAAED,QAAQ;QAAiBC,QAAQ;IAAS;CAC7C,CAA0C"}

package/src/index.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-tslib_1.__exportStar(require("./utils/config"), exports);
+ */ export * from "./utils/config/index.js";
+
 //# sourceMappingURL=index.js.map

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/nx-plugin/src/index.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,yDAA+B"}
+{"version":3,"sources":["../../../../packages/nx-plugin/src/index.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nexport * from './utils/config';\n"],"names":[],"mappings":"AAAA;;;CAGC,GACD,cAAc,0BAAiB"}

package/src/infra/app/__snapshots__/generator.spec.ts.snap

@@ -1,57 +1,47 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`infra generator > should add required dependencies to package.json > dependencies 1`] = `
-{
-  "aws-cdk": "2.1125.0",
-  "aws-cdk-lib": "2.257.0",
-  "constructs": "10.6.0",
-  "esbuild": "0.28.0",
-  "source-map-support": "0.5.21",
-}
-`;
+exports[`infra generator > should add required dependencies to package.json > dependencies 1`] = `{}`;
 
 exports[`infra generator > should add required dependencies to package.json > dev-dependencies 1`] = `
 {
-  "@nx/js": "22.7.5",
-  "@nx/vitest": "22.7.5",
-  "@swc-node/register": "~1.11.1",
-  "@swc/core": "~1.15.5",
+  "@nx/js": "23.1.1",
+  "@nx/vitest": "23.1.1",
   "@swc/helpers": "~0.5.18",
-  "@types/node": "25.9.1",
-  "@vitest/coverage-v8": "4.1.7",
+  "@types/node": "catalog:",
+  "@vitest/coverage-v8": "catalog:",
+  "aws-cdk": "catalog:",
+  "esbuild": "catalog:",
   "jsdom": "^27.1.0",
-  "tsx": "4.22.4",
-  "typescript": "~5.9.2",
-  "vite": "8.0.14",
-  "vitest": "4.1.7",
+  "tsx": "catalog:",
+  "typescript": "~6.0.3",
+  "vite": "catalog:",
+  "vitest": "catalog:",
 }
 `;
 
 exports[`infra generator > should add required dependencies to package.json > package-json 1`] = `
 {
-  "dependencies": {
-    "aws-cdk": "2.1125.0",
-    "aws-cdk-lib": "2.257.0",
-    "constructs": "10.6.0",
-    "esbuild": "0.28.0",
-    "source-map-support": "0.5.21",
-  },
+  "dependencies": {},
   "devDependencies": {
-    "@nx/js": "22.7.5",
-    "@nx/vitest": "22.7.5",
-    "@swc-node/register": "~1.11.1",
-    "@swc/core": "~1.15.5",
+    "@nx/js": "23.1.1",
+    "@nx/vitest": "23.1.1",
     "@swc/helpers": "~0.5.18",
-    "@types/node": "25.9.1",
-    "@vitest/coverage-v8": "4.1.7",
+    "@types/node": "catalog:",
+    "@vitest/coverage-v8": "catalog:",
+    "aws-cdk": "catalog:",
+    "esbuild": "catalog:",
     "jsdom": "^27.1.0",
-    "tsx": "4.22.4",
-    "typescript": "~5.9.2",
-    "vite": "8.0.14",
-    "vitest": "4.1.7",
+    "tsx": "catalog:",
+    "typescript": "~6.0.3",
+    "vite": "catalog:",
+    "vitest": "catalog:",
   },
   "name": "@proj/source",
   "type": "module",
+  "workspaces": [
+    "packages/*",
+    "packages/common/constructs",
+  ],
 }
 `;
 
@@ -66,7 +56,7 @@ exports[`infra generator > should configure Checkov target correctly > checkov-t
     "{workspaceRoot}/dist/{projectRoot}/cdk.out",
   ],
   "options": {
-    "command": "uvx --from checkov==3.2.532 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
+    "command": "uvx --from checkov==3.3.9 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
   },
   "outputs": [
     "{workspaceRoot}/dist/{projectRoot}/checkov",
@@ -119,6 +109,7 @@ exports[`infra generator > should configure project.json with correct targets >
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "metadata": {
     "generator": "ts#infra",
+    "iac": "cdk",
   },
   "name": "@proj/test",
   "projectType": "application",
@@ -159,7 +150,7 @@ exports[`infra generator > should configure project.json with correct targets >
         "{workspaceRoot}/dist/{projectRoot}/cdk.out",
       ],
       "options": {
-        "command": "uvx --from checkov==3.2.532 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
+        "command": "uvx --from checkov==3.3.9 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
       },
       "outputs": [
         "{workspaceRoot}/dist/{projectRoot}/checkov",
@@ -193,6 +184,17 @@ exports[`infra generator > should configure project.json with correct targets >
         "cwd": "{projectRoot}",
       },
     },
+    "deploy-sandbox": {
+      "dependsOn": [
+        "^build",
+        "compile",
+      ],
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "cdk deploy --require-approval=never "proj-test-sandbox/*"",
+        "cwd": "{projectRoot}",
+      },
+    },
     "destroy": {
       "dependsOn": [
         "^build",
@@ -211,6 +213,24 @@ exports[`infra generator > should configure project.json with correct targets >
         "cwd": "{projectRoot}",
       },
     },
+    "format": {
+      "cache": true,
+      "configurations": {
+        "fix": {
+          "command": "biome format --write {projectRoot}",
+        },
+        "skip-lint": {
+          "command": "node -e """,
+        },
+      },
+      "executor": "nx:run-commands",
+      "inputs": [
+        "biome",
+      ],
+      "options": {
+        "command": "biome format {projectRoot}",
+      },
+    },
     "lint": {
       "cache": true,
       "configurations": {
@@ -221,6 +241,9 @@ exports[`infra generator > should configure project.json with correct targets >
           "command": "node -e """,
         },
       },
+      "dependsOn": [
+        "format",
+      ],
       "executor": "nx:run-commands",
       "inputs": [
         "biome",
@@ -247,15 +270,6 @@ exports[`infra generator > should configure project.json with correct targets >
         "{workspaceRoot}/dist/{projectRoot}/cdk.out",
       ],
     },
-    "test": {
-      "executor": "@nx/vitest:test",
-      "options": {
-        "reportsDirectory": "{workspaceRoot}/coverage/{projectRoot}",
-      },
-      "outputs": [
-        "{options.reportsDirectory}",
-      ],
-    },
   },
 }
 `;
@@ -395,7 +409,7 @@ exports[`infra generator > should generate consistent file content across runs >
 }
 ",
   "src/main.ts": "import { ApplicationStage } from './stages/application-stage.js';
-import { App } from ':proj/common-constructs';
+import { App } from '@proj/common-constructs';
 
 const app = new App();
 
@@ -407,6 +421,8 @@ new ApplicationStage(app, 'proj-test-sandbox', {
   },
 });
 
+// Define other instances of stages, such as beta and prod, below
+
 app.synth();
 ",
   "src/stacks/application-stack.ts": "import { Stack, StackProps } from 'aws-cdk-lib';
@@ -547,7 +563,7 @@ exports[`infra generator > should generate files with correct content > cdk-json
 
 exports[`infra generator > should generate files with correct content > main-ts 1`] = `
 "import { ApplicationStage } from './stages/application-stage.js';
-import { App } from ':proj/common-constructs';
+import { App } from '@proj/common-constructs';
 
 const app = new App();
 
@@ -559,6 +575,8 @@ new ApplicationStage(app, 'proj-test-sandbox', {
   },
 });
 
+// Define other instances of stages, such as beta and prod, below
+
 app.synth();
 "
 `;
@@ -634,7 +652,7 @@ exports[`infra generator > should handle custom project names correctly > custom
 }
 ",
   "src/main.ts": "import { ApplicationStage } from './stages/application-stage.js';
-import { App } from ':proj/common-constructs';
+import { App } from '@proj/common-constructs';
 
 const app = new App();
 
@@ -646,6 +664,8 @@ new ApplicationStage(app, 'proj-custom-infra-sandbox', {
   },
 });
 
+// Define other instances of stages, such as beta and prod, below
+
 app.synth();
 ",
   "src/stacks/application-stack.ts": "import { Stack, StackProps } from 'aws-cdk-lib';
@@ -684,6 +704,7 @@ exports[`infra generator > should handle custom project names correctly > custom
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "metadata": {
     "generator": "ts#infra",
+    "iac": "cdk",
   },
   "name": "@proj/custom-infra",
   "projectType": "application",
@@ -724,7 +745,7 @@ exports[`infra generator > should handle custom project names correctly > custom
         "{workspaceRoot}/dist/{projectRoot}/cdk.out",
       ],
       "options": {
-        "command": "uvx --from checkov==3.2.532 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
+        "command": "uvx --from checkov==3.3.9 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
       },
       "outputs": [
         "{workspaceRoot}/dist/{projectRoot}/checkov",
@@ -758,6 +779,17 @@ exports[`infra generator > should handle custom project names correctly > custom
         "cwd": "{projectRoot}",
       },
     },
+    "deploy-sandbox": {
+      "dependsOn": [
+        "^build",
+        "compile",
+      ],
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "cdk deploy --require-approval=never "proj-custom-infra-sandbox/*"",
+        "cwd": "{projectRoot}",
+      },
+    },
     "destroy": {
       "dependsOn": [
         "^build",
@@ -776,6 +808,24 @@ exports[`infra generator > should handle custom project names correctly > custom
         "cwd": "{projectRoot}",
       },
     },
+    "format": {
+      "cache": true,
+      "configurations": {
+        "fix": {
+          "command": "biome format --write {projectRoot}",
+        },
+        "skip-lint": {
+          "command": "node -e """,
+        },
+      },
+      "executor": "nx:run-commands",
+      "inputs": [
+        "biome",
+      ],
+      "options": {
+        "command": "biome format {projectRoot}",
+      },
+    },
     "lint": {
       "cache": true,
       "configurations": {
@@ -786,6 +836,9 @@ exports[`infra generator > should handle custom project names correctly > custom
           "command": "node -e """,
         },
       },
+      "dependsOn": [
+        "format",
+      ],
       "executor": "nx:run-commands",
       "inputs": [
         "biome",
@@ -812,15 +865,6 @@ exports[`infra generator > should handle custom project names correctly > custom
         "{workspaceRoot}/dist/{projectRoot}/cdk.out",
       ],
     },
-    "test": {
-      "executor": "@nx/vitest:test",
-      "options": {
-        "reportsDirectory": "{workspaceRoot}/coverage/{projectRoot}",
-      },
-      "outputs": [
-        "{options.reportsDirectory}",
-      ],
-    },
   },
 }
 `;
@@ -981,30 +1025,34 @@ export type StagesConfig = {
 "
 `;
 
-exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/index.ts 1`] = `
+exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/infra/index.ts 1`] = `
 "// Scripts (infra-deploy, infra-destroy) are the public interface of this package.
 "
 `;
 
-exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/infra-deploy.ts 1`] = `
+exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/infra/infra-deploy.ts 1`] = `
 "import { run } from './stage-credentials/run.js';
 run('deploy');
 "
 `;
 
-exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/infra-destroy.ts 1`] = `
+exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/infra/infra-destroy.ts 1`] = `
 "import { run } from './stage-credentials/run.js';
 run('destroy');
 "
 `;
 
-exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/stage-credentials/cdk-command.ts 1`] = `
+exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/infra/stage-credentials/cdk-command.ts 1`] = `
 "/**
  * Builds the CDK command as an array of arguments for spawnSync.
  *
  * Defaults to --require-approval=never (standard for local dev deploys).
  * If the user explicitly passes --require-approval with any value, we
  * respect their choice and don't add the default.
+ *
+ * Pass --express to opt into CloudFormation express mode for faster
+ * iteration; it is not enabled by default so deploys wait for full
+ * resource stabilization.
  */
 export function buildCdkCommand(
   action: string,
@@ -1013,15 +1061,14 @@ export function buildCdkCommand(
   const hasRequireApproval = remainingArgs.some(
     (a) => a === '--require-approval' || a.startsWith('--require-approval='),
   );
-  return hasRequireApproval
-    ? ['cdk', action, ...remainingArgs]
-    : ['cdk', action, '--require-approval=never', ...remainingArgs];
+  const defaults = hasRequireApproval ? [] : ['--require-approval=never'];
+  return ['cdk', action, ...defaults, ...remainingArgs];
 }
 "
 `;
 
-exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/stage-credentials/credentials.ts 1`] = `
-"import type { StageCredentials, StagesConfig } from ':proj/common-infra-config';
+exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/infra/stage-credentials/credentials.ts 1`] = `
+"import type { StageCredentials, StagesConfig } from '@proj/common-infra-config';
 
 /**
  * Looks up credentials for a given project + stage combination.
@@ -1122,9 +1169,9 @@ export function describeCredentials(creds: StageCredentials): string {
 "
 `;
 
-exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/stage-credentials/run.ts 1`] = `
+exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/infra/stage-credentials/run.ts 1`] = `
 "import { spawnSync } from 'child_process';
-import stagesConfig from ':proj/common-infra-config';
+import stagesConfig from '@proj/common-infra-config';
 import { parseStageName } from './stage-parser.js';
 import {
   lookupCredentials,
@@ -1178,7 +1225,7 @@ export async function run(action: 'deploy' | 'destroy'): Promise<void> {
 "
 `;
 
-exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/stage-credentials/stage-parser.ts 1`] = `
+exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/infra/stage-credentials/stage-parser.ts 1`] = `
 "/**
  * Extracts the CDK stage name from the first positional argument.
  *

package/src/infra/app/files/app/README.md.template

@@ -27,13 +27,17 @@ You can also automatically fix some lint errors by running the following command
 
 ## Deploy to AWS
 
-### Deploy all Stacks
+### Deploy your Sandbox Stage
 
-Run `<%= pkgMgrCmd %> nx deploy <%= fullyQualifiedName %> --all`
+Run `<%= pkgMgrCmd %> nx deploy-sandbox <%= fullyQualifiedName %>`
+
+### Deploy all Stacks in a Stage
+
+Run `<%= pkgMgrCmd %> nx deploy <%= fullyQualifiedName %> "[stageName]/*"`
 
 ### Deploy a single Stack
 
-Run `<%= pkgMgrCmd %> nx deploy <%= fullyQualifiedName %> [stackName]`
+Run `<%= pkgMgrCmd %> nx deploy <%= fullyQualifiedName %> [stageName]/[stackName]`
 
 ### Hotswap deployment
 
@@ -44,7 +48,7 @@ Use the --hotswap flag with the deploy target to attempt to update your AWS reso
 
 Currently hot swapping supports Lambda functions, Step Functions state machines, and Amazon ECS container images. The --hotswap flag also disables rollback (i.e., implies --no-rollback).
 
-Run `<%= pkgMgrCmd %> nx deploy <%= fullyQualifiedName %> --hotswap --all`
+Run `<%= pkgMgrCmd %> nx deploy-sandbox <%= fullyQualifiedName %> --hotswap`
 
 ## Checkov Rule Suppressions
 

package/src/infra/app/files/app/src/main.ts.template

@@ -1,4 +1,4 @@
-import { ApplicationStage } from './stages/application-stage.js';
+import { ApplicationStage } from './stages/application-stage<% if (esm) { %>.js<% } %>';
 import { App } from '<%= scopeAlias %>common-constructs';
 <% if (stageConfig) { %>import { resolveStage } from '<%= scopeAlias %>common-infra-config';
 <% } %>
@@ -17,6 +17,8 @@ new ApplicationStage(app, '<%= namespace %>-sandbox', {
     region: sandboxConfig?.region ?? process.env.CDK_DEFAULT_REGION,
   },
 });
+
+// Define other instances of stages, such as beta and prod, below
 <% } else { %>
 // Use this to deploy your own sandbox environment (assumes your CLI credentials)
 new ApplicationStage(app, '<%= namespace %>-sandbox', {
@@ -25,5 +27,7 @@ new ApplicationStage(app, '<%= namespace %>-sandbox', {
     region: process.env.CDK_DEFAULT_REGION,
   },
 });
+
+// Define other instances of stages, such as beta and prod, below
 <% } %>
 app.synth();

package/src/infra/app/files/app/src/stages/application-stage.ts.template

@@ -1,6 +1,6 @@
 import { Stage, StageProps } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
-import { ApplicationStack } from '../stacks/application-stack.js';
+import { ApplicationStack } from '../stacks/application-stack<% if (esm) { %>.js<% } %>';
 
 /**
  * Defines a collection of CDK Stacks which make up your application