@aws/nx-plugin 1.0.0-rc.3 → 1.0.0-rc.30

package/src/connection/local-dev.js

@@ -0,0 +1,37 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { joinPathFragments, updateProjectConfiguration } from "@nx/devkit";
+import { applyGritQL } from "../utils/ast.js";
+import { toClassName } from "../utils/names.js";
+import { addDependencyToTargetIfNotPresent, readProjectConfigurationUnqualified } from "../utils/nx.js";
+/**
+ * Adds the given target project to the source project's dev target
+ * Updates the runtime config provider (if it exists)
+ */ export const addTargetToLocalDev = async (tree, sourceProjectName, targetProjectName, options)=>{
+    const sourceProject = readProjectConfigurationUnqualified(tree, sourceProjectName);
+    const targetProject = readProjectConfigurationUnqualified(tree, targetProjectName);
+    // Target project must have a dev target which is continuous
+    if (!(targetProject.targets?.['dev']?.continuous && sourceProject.targets?.['dev'])) {
+        return;
+    }
+    // Add a dependency on the dev target
+    addDependencyToTargetIfNotPresent(sourceProject, 'dev', {
+        projects: [
+            targetProject.name
+        ],
+        target: 'dev'
+    });
+    for (const additional of options.additionalDependencyTargets ?? []){
+        addDependencyToTargetIfNotPresent(sourceProject, 'dev', additional);
+    }
+    updateProjectConfiguration(tree, sourceProject.name, sourceProject);
+    // Add an override to runtime-config.json for the dev target to use the local url
+    const runtimeConfigProvider = joinPathFragments(sourceProject.root, 'src', 'components', 'RuntimeConfig', 'index.tsx');
+    if (tree.exists(runtimeConfigProvider)) {
+        const className = toClassName(options.apiName);
+        await applyGritQL(tree, runtimeConfigProvider, `\`if ($cond) { $stmts }\` => raw\`if ($cond) {\n    $stmts\n    runtimeConfig.apis.${className} = '${options.url}';\n  }\` where { $cond <: contains \`'local-dev'\`, $stmts <: within \`const applyOverrides = $_\`, $stmts <: not contains \`runtimeConfig.apis.${className}\` }`);
+    }
+};
+
+//# sourceMappingURL=local-dev.js.map

package/src/connection/local-dev.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/connection/local-dev.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  joinPathFragments,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { applyGritQL } from '../utils/ast';\nimport { toClassName } from '../utils/names';\nimport {\n  addDependencyToTargetIfNotPresent,\n  readProjectConfigurationUnqualified,\n} from '../utils/nx';\n\nexport interface LocalDevOptions {\n  apiName: string;\n  url: string;\n  additionalDependencyTargets?: string[];\n}\n\n/**\n * Adds the given target project to the source project's dev target\n * Updates the runtime config provider (if it exists)\n */\nexport const addTargetToLocalDev = async (\n  tree: Tree,\n  sourceProjectName: string,\n  targetProjectName: string,\n  options: LocalDevOptions,\n) => {\n  const sourceProject = readProjectConfigurationUnqualified(\n    tree,\n    sourceProjectName,\n  );\n  const targetProject = readProjectConfigurationUnqualified(\n    tree,\n    targetProjectName,\n  );\n\n  // Target project must have a dev target which is continuous\n  if (\n    !(\n      targetProject.targets?.['dev']?.continuous &&\n      sourceProject.targets?.['dev']\n    )\n  ) {\n    return;\n  }\n\n  // Add a dependency on the dev target\n  addDependencyToTargetIfNotPresent(sourceProject, 'dev', {\n    projects: [targetProject.name],\n    target: 'dev',\n  });\n  for (const additional of options.additionalDependencyTargets ?? []) {\n    addDependencyToTargetIfNotPresent(sourceProject, 'dev', additional);\n  }\n  updateProjectConfiguration(tree, sourceProject.name, sourceProject);\n\n  // Add an override to runtime-config.json for the dev target to use the local url\n  const runtimeConfigProvider = joinPathFragments(\n    sourceProject.root,\n    'src',\n    'components',\n    'RuntimeConfig',\n    'index.tsx',\n  );\n  if (tree.exists(runtimeConfigProvider)) {\n    const className = toClassName(options.apiName);\n    await applyGritQL(\n      tree,\n      runtimeConfigProvider,\n      `\\`if ($cond) { $stmts }\\` => raw\\`if ($cond) {\\n    $stmts\\n    runtimeConfig.apis.${className} = '${options.url}';\\n  }\\` where { $cond <: contains \\`'local-dev'\\`, $stmts <: within \\`const applyOverrides = $_\\`, $stmts <: not contains \\`runtimeConfig.apis.${className}\\` }`,\n    );\n  }\n};\n"],"names":["joinPathFragments","updateProjectConfiguration","applyGritQL","toClassName","addDependencyToTargetIfNotPresent","readProjectConfigurationUnqualified","addTargetToLocalDev","tree","sourceProjectName","targetProjectName","options","sourceProject","targetProject","targets","continuous","projects","name","target","additional","additionalDependencyTargets","runtimeConfigProvider","root","exists","className","apiName","url"],"mappings":"AAAA;;;CAGC,GACD,SACEA,iBAAiB,EAEjBC,0BAA0B,QACrB,aAAa;AACpB,SAASC,WAAW,QAAQ,kBAAe;AAC3C,SAASC,WAAW,QAAQ,oBAAiB;AAC7C,SACEC,iCAAiC,EACjCC,mCAAmC,QAC9B,iBAAc;AAQrB;;;CAGC,GACD,OAAO,MAAMC,sBAAsB,OACjCC,MACAC,mBACAC,mBACAC;IAEA,MAAMC,gBAAgBN,oCACpBE,MACAC;IAEF,MAAMI,gBAAgBP,oCACpBE,MACAE;IAGF,4DAA4D;IAC5D,IACE,CACEG,CAAAA,cAAcC,OAAO,EAAE,CAAC,MAAM,EAAEC,cAChCH,cAAcE,OAAO,EAAE,CAAC,MAAM,AAAD,GAE/B;QACA;IACF;IAEA,qCAAqC;IACrCT,kCAAkCO,eAAe,OAAO;QACtDI,UAAU;YAACH,cAAcI,IAAI;SAAC;QAC9BC,QAAQ;IACV;IACA,KAAK,MAAMC,cAAcR,QAAQS,2BAA2B,IAAI,EAAE,CAAE;QAClEf,kCAAkCO,eAAe,OAAOO;IAC1D;IACAjB,2BAA2BM,MAAMI,cAAcK,IAAI,EAAEL;IAErD,iFAAiF;IACjF,MAAMS,wBAAwBpB,kBAC5BW,cAAcU,IAAI,EAClB,OACA,cACA,iBACA;IAEF,IAAId,KAAKe,MAAM,CAACF,wBAAwB;QACtC,MAAMG,YAAYpB,YAAYO,QAAQc,OAAO;QAC7C,MAAMtB,YACJK,MACAa,uBACA,CAAC,mFAAmF,EAAEG,UAAU,IAAI,EAAEb,QAAQe,GAAG,CAAC,iJAAiJ,EAAEF,UAAU,IAAI,CAAC;IAExR;AACF,EAAE"}

package/src/connection/schema.d.js

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ export { };
+
+//# sourceMappingURL=schema.d.js.map

package/src/connection/schema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/connection/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nexport interface ConnectionGeneratorSchema {\n  sourceProject: string;\n  targetProject: string;\n  sourceComponent?: string;\n  targetComponent?: string;\n  preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAED,WAMC"}

package/src/connection/schema.d.ts

@@ -8,4 +8,5 @@ export interface ConnectionGeneratorSchema {
   targetProject: string;
   sourceComponent?: string;
   targetComponent?: string;
+  preferInstallDependencies?: boolean;
 }

package/src/connection/schema.json

@@ -27,6 +27,11 @@
     "targetComponent": {
       "type": "string",
       "description": "The target component to connect to (component name, path relative to target project root, or generator id). Use '.' to explicitly select the project as the target."
+    },
+    "preferInstallDependencies": {
+      "type": "boolean",
+      "description": "Whether to prefer installing dependencies after the generator runs. Set to false to defer installing when batching multiple generators (an install still runs if needed so subsequent generators can compute the Nx project graph); install once at the end.",
+      "default": true
     }
   },
   "required": ["sourceProject", "targetProject"]

package/src/connection/supported-connections.d.ts

@@ -0,0 +1,98 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export type Connection = {
+    source: string;
+    target: string;
+};
+export declare const SUPPORTED_PROJECT_TYPES: readonly ["ts#trpc-api", "py#fast-api", "ts#react-website", "ts#smithy-api", "ts#rdb", "ts#dynamodb", "py#dynamodb", "agentcore-gateway"];
+export declare const SUPPORTED_CONNECTIONS: readonly [{
+    readonly source: "ts#trpc-api";
+    readonly target: "ts#rdb";
+}, {
+    readonly source: "ts#trpc-api";
+    readonly target: "ts#dynamodb";
+}, {
+    readonly source: "ts#agent";
+    readonly target: "ts#rdb";
+}, {
+    readonly source: "ts#smithy-api";
+    readonly target: "ts#rdb";
+}, {
+    readonly source: "ts#smithy-api";
+    readonly target: "ts#dynamodb";
+}, {
+    readonly source: "ts#mcp-server";
+    readonly target: "ts#rdb";
+}, {
+    readonly source: "ts#mcp-server";
+    readonly target: "ts#dynamodb";
+}, {
+    readonly source: "ts#react-website";
+    readonly target: "ts#trpc-api";
+}, {
+    readonly source: "ts#react-website";
+    readonly target: "py#fast-api";
+}, {
+    readonly source: "ts#react-website";
+    readonly target: "ts#smithy-api";
+}, {
+    readonly source: "ts#react-website";
+    readonly target: "ts#agent";
+}, {
+    readonly source: "ts#react-website";
+    readonly target: "py#agent";
+}, {
+    readonly source: "ts#agent";
+    readonly target: "ts#mcp-server";
+}, {
+    readonly source: "ts#agent";
+    readonly target: "py#mcp-server";
+}, {
+    readonly source: "ts#agent";
+    readonly target: "ts#dynamodb";
+}, {
+    readonly source: "py#agent";
+    readonly target: "ts#mcp-server";
+}, {
+    readonly source: "py#agent";
+    readonly target: "py#mcp-server";
+}, {
+    readonly source: "ts#agent";
+    readonly target: "ts#agent";
+}, {
+    readonly source: "ts#agent";
+    readonly target: "py#agent";
+}, {
+    readonly source: "py#agent";
+    readonly target: "ts#agent";
+}, {
+    readonly source: "py#agent";
+    readonly target: "py#agent";
+}, {
+    readonly source: "ts#agent";
+    readonly target: "agentcore-gateway";
+}, {
+    readonly source: "py#agent";
+    readonly target: "agentcore-gateway";
+}, {
+    readonly source: "agentcore-gateway";
+    readonly target: "ts#mcp-server";
+}, {
+    readonly source: "agentcore-gateway";
+    readonly target: "py#mcp-server";
+}, {
+    readonly source: "agentcore-gateway";
+    readonly target: "agentcore-gateway";
+}, {
+    readonly source: "py#fast-api";
+    readonly target: "py#dynamodb";
+}, {
+    readonly source: "py#agent";
+    readonly target: "py#dynamodb";
+}, {
+    readonly source: "py#mcp-server";
+    readonly target: "py#dynamodb";
+}];
+export type ConnectionKey = (typeof SUPPORTED_CONNECTIONS)[number] extends infer C ? C extends Connection ? `${C['source']} -> ${C['target']}` : never : never;

package/src/connection/supported-connections.js

@@ -0,0 +1,138 @@
+/**
+ * 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',
+    '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: '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'
+    }
+];
+
+//# 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  '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: '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] 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;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;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;CAClD,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

@@ -2,71 +2,49 @@
 
 exports[`infra generator > should add required dependencies to package.json > dependencies 1`] = `
 {
-  "aws-cdk": "2.1125.0",
-  "aws-cdk-lib": "2.257.0",
+  "aws-cdk": "2.1129.0",
+  "aws-cdk-lib": "2.260.0",
   "constructs": "10.6.0",
-  "esbuild": "0.28.0",
+  "esbuild": "0.28.1",
   "source-map-support": "0.5.21",
 }
 `;
 
 exports[`infra generator > should add required dependencies to package.json > dev-dependencies 1`] = `
 {
-  "@eslint/js": "^9.8.0",
-  "@nx/eslint": "22.7.5",
-  "@nx/eslint-plugin": "22.7.5",
-  "@nx/js": "22.7.5",
-  "@nx/vitest": "22.7.5",
-  "@swc-node/register": "~1.11.1",
-  "@swc/core": "~1.15.5",
+  "@nx/js": "23.0.1",
+  "@nx/vitest": "23.0.1",
   "@swc/helpers": "~0.5.18",
-  "@types/node": "25.9.1",
-  "@vitest/coverage-v8": "4.1.7",
-  "eslint": "^9.8.0",
-  "eslint-config-prettier": "^10.0.0",
-  "eslint-plugin-prettier": "5.5.6",
+  "@types/node": "25.9.4",
+  "@vitest/coverage-v8": "4.1.9",
   "jsdom": "^27.1.0",
-  "jsonc-eslint-parser": "3.1.0",
-  "prettier": "3.8.3",
   "tsx": "4.22.4",
   "typescript": "~5.9.2",
-  "typescript-eslint": "^8.40.0",
-  "vite": "8.0.14",
-  "vitest": "4.1.7",
+  "vite": "8.1.0",
+  "vitest": "4.1.9",
 }
 `;
 
 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",
+    "aws-cdk": "2.1129.0",
+    "aws-cdk-lib": "2.260.0",
     "constructs": "10.6.0",
-    "esbuild": "0.28.0",
+    "esbuild": "0.28.1",
     "source-map-support": "0.5.21",
   },
   "devDependencies": {
-    "@eslint/js": "^9.8.0",
-    "@nx/eslint": "22.7.5",
-    "@nx/eslint-plugin": "22.7.5",
-    "@nx/js": "22.7.5",
-    "@nx/vitest": "22.7.5",
-    "@swc-node/register": "~1.11.1",
-    "@swc/core": "~1.15.5",
+    "@nx/js": "23.0.1",
+    "@nx/vitest": "23.0.1",
     "@swc/helpers": "~0.5.18",
-    "@types/node": "25.9.1",
-    "@vitest/coverage-v8": "4.1.7",
-    "eslint": "^9.8.0",
-    "eslint-config-prettier": "^10.0.0",
-    "eslint-plugin-prettier": "5.5.6",
+    "@types/node": "25.9.4",
+    "@vitest/coverage-v8": "4.1.9",
     "jsdom": "^27.1.0",
-    "jsonc-eslint-parser": "3.1.0",
-    "prettier": "3.8.3",
     "tsx": "4.22.4",
     "typescript": "~5.9.2",
-    "typescript-eslint": "^8.40.0",
-    "vite": "8.0.14",
-    "vitest": "4.1.7",
+    "vite": "8.1.0",
+    "vitest": "4.1.9",
   },
   "name": "@proj/source",
   "type": "module",
@@ -84,7 +62,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.6 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
   },
   "outputs": [
     "{workspaceRoot}/dist/{projectRoot}/checkov",
@@ -177,7 +155,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.6 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
       },
       "outputs": [
         "{workspaceRoot}/dist/{projectRoot}/checkov",
@@ -233,16 +211,19 @@ exports[`infra generator > should configure project.json with correct targets >
       "cache": true,
       "configurations": {
         "fix": {
-          "fix": true,
+          "command": "biome check --write {projectRoot}",
         },
         "skip-lint": {
-          "force": true,
+          "command": "node -e """,
         },
       },
-      "executor": "@nx/eslint:lint",
+      "executor": "nx:run-commands",
       "inputs": [
-        "eslint",
+        "biome",
       ],
+      "options": {
+        "command": "biome lint {projectRoot}",
+      },
     },
     "synth": {
       "cache": true,
@@ -262,15 +243,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}",
-      ],
-    },
   },
 }
 `;
@@ -739,7 +711,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.6 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
       },
       "outputs": [
         "{workspaceRoot}/dist/{projectRoot}/checkov",
@@ -795,16 +767,19 @@ exports[`infra generator > should handle custom project names correctly > custom
       "cache": true,
       "configurations": {
         "fix": {
-          "fix": true,
+          "command": "biome check --write {projectRoot}",
         },
         "skip-lint": {
-          "force": true,
+          "command": "node -e """,
         },
       },
-      "executor": "@nx/eslint:lint",
+      "executor": "nx:run-commands",
       "inputs": [
-        "eslint",
+        "biome",
       ],
+      "options": {
+        "command": "biome lint {projectRoot}",
+      },
     },
     "synth": {
       "cache": true,
@@ -824,15 +799,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}",
-      ],
-    },
   },
 }
 `;
@@ -993,30 +959,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,
@@ -1025,14 +995,13 @@ 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`] = `
+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';
 
 /**
@@ -1081,8 +1050,9 @@ export async function buildChildEnv(
       let STSClient: typeof import('@aws-sdk/client-sts').STSClient;
       let AssumeRoleCommand: typeof import('@aws-sdk/client-sts').AssumeRoleCommand;
       try {
-        ({ STSClient, AssumeRoleCommand } =
-          await import('@aws-sdk/client-sts'));
+        ({ STSClient, AssumeRoleCommand } = await import(
+          '@aws-sdk/client-sts'
+        ));
       } catch {
         console.error(
           '[infra-deploy] Error: @aws-sdk/client-sts is required for assumeRole credentials but is not installed.',
@@ -1133,7 +1103,7 @@ 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 { parseStageName } from './stage-parser.js';
@@ -1189,7 +1159,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/generator.d.ts

@@ -2,9 +2,9 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Tree, GeneratorCallback } from '@nx/devkit';
-import { TsInfraGeneratorSchema } from './schema';
-import { NxGeneratorInfo } from '../../utils/nx';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../utils/nx';
+import type { TsInfraGeneratorSchema } from './schema';
 export declare const INFRA_APP_GENERATOR_INFO: NxGeneratorInfo;
 export declare function tsInfraGenerator(tree: Tree, schema: TsInfraGeneratorSchema): Promise<GeneratorCallback>;
 export default tsInfraGenerator;