@aws/nx-plugin 0.94.1 → 0.95.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws/nx-plugin",
-  "version": "0.94.1",
+  "version": "0.95.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/awslabs/nx-plugin-for-aws.git",
@@ -19,8 +19,8 @@
   },
   "generators": "./generators.json",
   "peerDependencies": {
-    "nx": "22.6.4",
-    "prettier": "3.8.1"
+    "nx": "22.6.5",
+    "prettier": "3.8.2"
   },
   "dependencies": {
     "@apidevtools/swagger-parser": "12.1.0",
@@ -28,13 +28,13 @@
     "@hey-api/openapi-ts": "0.64.13",
     "@iarna/toml": "2.2.5",
     "@modelcontextprotocol/sdk": "1.29.0",
-    "@nx/devkit": "22.6.4",
-    "@nx/eslint": "22.6.4",
-    "@nx/js": "22.6.4",
-    "@nx/react": "22.6.4",
-    "@nx/vite": "22.6.4",
+    "@nx/devkit": "22.6.5",
+    "@nx/eslint": "22.6.5",
+    "@nx/js": "22.6.5",
+    "@nx/react": "22.6.5",
+    "@nx/vite": "22.6.5",
     "@nxlv/python": "22.1.1",
-    "@phenomnomnominal/tsquery": "6.1.4",
+    "@phenomnomnominal/tsquery": "6.2.0",
     "enquirer": "2.4.1",
     "fast-glob": "3.3.3",
     "lodash.camelcase": "4.3.0",
@@ -47,8 +47,8 @@
     "openapi-types": "12.1.3",
     "pip-requirements-js": "1.0.3",
     "typescript": "6.0.2",
-    "vite": "8.0.3",
-    "vitest": "4.1.2",
+    "vite": "8.0.8",
+    "vitest": "4.1.4",
     "zod": "4.3.6"
   },
   "types": "./src/index.d.ts"

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

@@ -2,10 +2,10 @@
 
 exports[`infra generator > should add required dependencies to package.json > dependencies 1`] = `
 {
-  "aws-cdk": "2.1117.0",
+  "aws-cdk": "2.1118.0",
   "aws-cdk-lib": "2.248.0",
   "constructs": "10.6.0",
-  "esbuild": "0.27.4",
+  "esbuild": "0.28.0",
   "source-map-support": "0.5.21",
 }
 `;
@@ -13,60 +13,60 @@ exports[`infra generator > should add required dependencies to package.json > de
 exports[`infra generator > should add required dependencies to package.json > dev-dependencies 1`] = `
 {
   "@eslint/js": "^9.8.0",
-  "@nx/eslint": "22.6.4",
-  "@nx/eslint-plugin": "22.6.4",
-  "@nx/js": "22.6.4",
-  "@nx/vitest": "22.6.4",
+  "@nx/eslint": "22.6.5",
+  "@nx/eslint-plugin": "22.6.5",
+  "@nx/js": "22.6.5",
+  "@nx/vitest": "22.6.5",
   "@swc-node/register": "~1.11.1",
   "@swc/core": "~1.15.5",
   "@swc/helpers": "~0.5.18",
-  "@types/node": "25.5.2",
-  "@vitest/coverage-v8": "4.1.2",
+  "@types/node": "25.6.0",
+  "@vitest/coverage-v8": "4.1.4",
   "eslint": "^9.8.0",
   "eslint-config-prettier": "^10.0.0",
   "eslint-plugin-prettier": "5.5.5",
   "jsdom": "^27.1.0",
   "jsonc-eslint-parser": "3.1.0",
-  "prettier": "3.8.1",
+  "prettier": "3.8.2",
   "tsx": "4.21.0",
   "typescript": "~5.9.2",
   "typescript-eslint": "^8.40.0",
-  "vite": "8.0.3",
-  "vitest": "4.1.2",
+  "vite": "8.0.8",
+  "vitest": "4.1.4",
 }
 `;
 
 exports[`infra generator > should add required dependencies to package.json > package-json 1`] = `
 {
   "dependencies": {
-    "aws-cdk": "2.1117.0",
+    "aws-cdk": "2.1118.0",
     "aws-cdk-lib": "2.248.0",
     "constructs": "10.6.0",
-    "esbuild": "0.27.4",
+    "esbuild": "0.28.0",
     "source-map-support": "0.5.21",
   },
   "devDependencies": {
     "@eslint/js": "^9.8.0",
-    "@nx/eslint": "22.6.4",
-    "@nx/eslint-plugin": "22.6.4",
-    "@nx/js": "22.6.4",
-    "@nx/vitest": "22.6.4",
+    "@nx/eslint": "22.6.5",
+    "@nx/eslint-plugin": "22.6.5",
+    "@nx/js": "22.6.5",
+    "@nx/vitest": "22.6.5",
     "@swc-node/register": "~1.11.1",
     "@swc/core": "~1.15.5",
     "@swc/helpers": "~0.5.18",
-    "@types/node": "25.5.2",
-    "@vitest/coverage-v8": "4.1.2",
+    "@types/node": "25.6.0",
+    "@vitest/coverage-v8": "4.1.4",
     "eslint": "^9.8.0",
     "eslint-config-prettier": "^10.0.0",
     "eslint-plugin-prettier": "5.5.5",
     "jsdom": "^27.1.0",
     "jsonc-eslint-parser": "3.1.0",
-    "prettier": "3.8.1",
+    "prettier": "3.8.2",
     "tsx": "4.21.0",
     "typescript": "~5.9.2",
     "typescript-eslint": "^8.40.0",
-    "vite": "8.0.3",
-    "vitest": "4.1.2",
+    "vite": "8.0.8",
+    "vitest": "4.1.4",
   },
   "name": "@proj/source",
   "type": "module",
@@ -84,7 +84,7 @@ exports[`infra generator > should configure Checkov target correctly > checkov-t
     "{workspaceRoot}/dist/{projectRoot}/cdk.out",
   ],
   "options": {
-    "command": "uvx --from checkov==3.2.513 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
+    "command": "uvx --from checkov==3.2.519 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
   },
   "outputs": [
     "{workspaceRoot}/dist/{projectRoot}/checkov",
@@ -177,7 +177,7 @@ exports[`infra generator > should configure project.json with correct targets >
         "{workspaceRoot}/dist/{projectRoot}/cdk.out",
       ],
       "options": {
-        "command": "uvx --from checkov==3.2.513 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
+        "command": "uvx --from checkov==3.2.519 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
       },
       "outputs": [
         "{workspaceRoot}/dist/{projectRoot}/checkov",
@@ -739,7 +739,7 @@ exports[`infra generator > should handle custom project names correctly > custom
         "{workspaceRoot}/dist/{projectRoot}/cdk.out",
       ],
       "options": {
-        "command": "uvx --from checkov==3.2.513 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
+        "command": "uvx --from checkov==3.2.519 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
       },
       "outputs": [
         "{workspaceRoot}/dist/{projectRoot}/checkov",

package/src/preset/__snapshots__/generator.spec.ts.snap

@@ -192,14 +192,14 @@ exports[`preset generator > should run successfully > package.json 1`] = `
   "name": "@proj/source",
   "dependencies": {},
   "devDependencies": {
-    "@nx/js": "22.6.4",
-    "@nx/workspace": "22.6.4",
+    "@nx/js": "22.6.5",
+    "@nx/workspace": "22.6.5",
     "@swc-node/register": "~1.11.1",
     "@swc/core": "~1.15.5",
     "@swc/helpers": "~0.5.18",
     "prettier": "~3.6.2",
     "typescript": "6.0.2",
-    "typescript-eslint": "8.58.0"
+    "typescript-eslint": "8.58.1"
   },
   "type": "module",
   "scripts": {

package/src/py/fast-api/__snapshots__/generator.spec.ts.snap

@@ -656,20 +656,6 @@ export interface HttpApiIntegration {
   options?: Omit<AddRoutesOptions, 'path' | 'methods' | 'integration'>;
 }
 
-/**
- * Common options shared by all IntegrationBuilder configurations
- */
-interface IntegrationBuilderPropsBase<
-  TOperation extends string,
-  TDefaultIntegrationProps extends object,
-> {
-  /** Map of operation names to their API path and HTTP method details */
-  operations: Record<TOperation, OperationDetails>;
-
-  /** Default configuration options for integrations */
-  defaultIntegrationOptions: TDefaultIntegrationProps;
-}
-
 /**
  * Options for constructing an IntegrationBuilder with a shared integration pattern.
  * A single default integration is built once (for '$router') and reused for all operations.
@@ -678,8 +664,12 @@ interface SharedIntegrationBuilderProps<
   TOperation extends string,
   TDefaultIntegrationProps extends object,
   TDefaultIntegration,
-> extends IntegrationBuilderPropsBase<TOperation, TDefaultIntegrationProps> {
+> {
   pattern: 'shared';
+  /** Map of operation names to their API path and HTTP method details */
+  operations: Record<TOperation, OperationDetails>;
+  /** Default configuration options for integrations */
+  defaultIntegrationOptions: TDefaultIntegrationProps;
   /** Function to create a default integration for the shared router */
   buildDefaultIntegration: (
     op: '$router',
@@ -695,8 +685,12 @@ interface IsolatedIntegrationBuilderProps<
   TOperation extends string,
   TDefaultIntegrationProps extends object,
   TDefaultIntegration,
-> extends IntegrationBuilderPropsBase<TOperation, TDefaultIntegrationProps> {
+> {
   pattern: 'isolated';
+  /** Map of operation names to their API path and HTTP method details */
+  operations: Record<TOperation, OperationDetails>;
+  /** Default configuration options for integrations */
+  defaultIntegrationOptions: TDefaultIntegrationProps;
   /** Function to create a default integration for an operation */
   buildDefaultIntegration: (
     op: TOperation,
@@ -724,25 +718,6 @@ export type IntegrationBuilderProps<
       TDefaultIntegration
     >;
 
-/**
- * Extracts the IntegrationBuilderProps variant matching the given pattern.
- */
-type IntegrationBuilderPropsForPattern<
-  TOperation extends string,
-  TBaseIntegration,
-  TDefaultIntegrationProps extends object,
-  TDefaultIntegration extends TBaseIntegration,
-  TPattern extends 'shared' | 'isolated',
-> = Extract<
-  IntegrationBuilderProps<
-    TOperation,
-    TBaseIntegration,
-    TDefaultIntegrationProps,
-    TDefaultIntegration
-  >,
-  { pattern: TPattern }
->;
-
 /**
  * Resolves the default integration keys based on the pattern.
  * - 'shared': only '$router' is a default key
@@ -802,22 +777,65 @@ export class IntegrationBuilder<
   private integrations: Partial<TIntegrations> = {};
 
   /**
-   * Create an Integration Builder for an HTTP API
+   * Create an Integration Builder for an HTTP API with a shared pattern
    */
-  public static http = <
+  public static http<
     TOperation extends string,
     TDefaultIntegrationProps extends object,
     TDefaultIntegration extends HttpApiIntegration,
-    TPattern extends 'shared' | 'isolated',
   >(
-    options: IntegrationBuilderPropsForPattern<
+    options: SharedIntegrationBuilderProps<
       TOperation,
-      HttpApiIntegration,
       TDefaultIntegrationProps,
-      TDefaultIntegration,
-      TPattern
+      TDefaultIntegration
+    >,
+  ): IntegrationBuilder<
+    TOperation,
+    HttpApiIntegration,
+    Record<'$router', TDefaultIntegration>,
+    TDefaultIntegrationProps,
+    TDefaultIntegration,
+    'shared'
+  >;
+  /**
+   * Create an Integration Builder for an HTTP API with an isolated pattern
+   */
+  public static http<
+    TOperation extends string,
+    TDefaultIntegrationProps extends object,
+    TDefaultIntegration extends HttpApiIntegration,
+  >(
+    options: IsolatedIntegrationBuilderProps<
+      TOperation,
+      TDefaultIntegrationProps,
+      TDefaultIntegration
     >,
-  ) => {
+  ): IntegrationBuilder<
+    TOperation,
+    HttpApiIntegration,
+    Record<TOperation, TDefaultIntegration>,
+    TDefaultIntegrationProps,
+    TDefaultIntegration,
+    'isolated'
+  >;
+  public static http<
+    TOperation extends string,
+    TDefaultIntegrationProps extends object,
+    TDefaultIntegration extends HttpApiIntegration,
+    TPattern extends 'shared' | 'isolated',
+  >(
+    options:
+      | SharedIntegrationBuilderProps<
+          TOperation,
+          TDefaultIntegrationProps,
+          TDefaultIntegration
+        >
+      | IsolatedIntegrationBuilderProps<
+          TOperation,
+          TDefaultIntegrationProps,
+          TDefaultIntegration
+        >,
+  ) {
     return new IntegrationBuilder<
       TOperation,
       HttpApiIntegration,
@@ -826,25 +844,68 @@ export class IntegrationBuilder<
       TDefaultIntegration,
       TPattern
     >(options);
-  };
+  }
 
   /**
-   * Create an Integration Builder for a REST API
+   * Create an Integration Builder for a REST API with a shared pattern
    */
-  public static rest = <
+  public static rest<
     TOperation extends string,
     TDefaultIntegrationProps extends object,
     TDefaultIntegration extends RestApiIntegration,
-    TPattern extends 'shared' | 'isolated',
   >(
-    options: IntegrationBuilderPropsForPattern<
+    options: SharedIntegrationBuilderProps<
       TOperation,
-      RestApiIntegration,
       TDefaultIntegrationProps,
-      TDefaultIntegration,
-      TPattern
+      TDefaultIntegration
+    >,
+  ): IntegrationBuilder<
+    TOperation,
+    RestApiIntegration,
+    Record<'$router', TDefaultIntegration>,
+    TDefaultIntegrationProps,
+    TDefaultIntegration,
+    'shared'
+  >;
+  /**
+   * Create an Integration Builder for a REST API with an isolated pattern
+   */
+  public static rest<
+    TOperation extends string,
+    TDefaultIntegrationProps extends object,
+    TDefaultIntegration extends RestApiIntegration,
+  >(
+    options: IsolatedIntegrationBuilderProps<
+      TOperation,
+      TDefaultIntegrationProps,
+      TDefaultIntegration
     >,
-  ) => {
+  ): IntegrationBuilder<
+    TOperation,
+    RestApiIntegration,
+    Record<TOperation, TDefaultIntegration>,
+    TDefaultIntegrationProps,
+    TDefaultIntegration,
+    'isolated'
+  >;
+  public static rest<
+    TOperation extends string,
+    TDefaultIntegrationProps extends object,
+    TDefaultIntegration extends RestApiIntegration,
+    TPattern extends 'shared' | 'isolated',
+  >(
+    options:
+      | SharedIntegrationBuilderProps<
+          TOperation,
+          TDefaultIntegrationProps,
+          TDefaultIntegration
+        >
+      | IsolatedIntegrationBuilderProps<
+          TOperation,
+          TDefaultIntegrationProps,
+          TDefaultIntegration
+        >,
+  ) {
     return new IntegrationBuilder<
       TOperation,
       RestApiIntegration,
@@ -853,7 +914,7 @@ export class IntegrationBuilder<
       TDefaultIntegration,
       TPattern
     >(options);
-  };
+  }
 
   private constructor(
     options: IntegrationBuilderProps<
@@ -1389,20 +1450,6 @@ export interface HttpApiIntegration {
   options?: Omit<AddRoutesOptions, 'path' | 'methods' | 'integration'>;
 }
 
-/**
- * Common options shared by all IntegrationBuilder configurations
- */
-interface IntegrationBuilderPropsBase<
-  TOperation extends string,
-  TDefaultIntegrationProps extends object,
-> {
-  /** Map of operation names to their API path and HTTP method details */
-  operations: Record<TOperation, OperationDetails>;
-
-  /** Default configuration options for integrations */
-  defaultIntegrationOptions: TDefaultIntegrationProps;
-}
-
 /**
  * Options for constructing an IntegrationBuilder with a shared integration pattern.
  * A single default integration is built once (for '$router') and reused for all operations.
@@ -1411,8 +1458,12 @@ interface SharedIntegrationBuilderProps<
   TOperation extends string,
   TDefaultIntegrationProps extends object,
   TDefaultIntegration,
-> extends IntegrationBuilderPropsBase<TOperation, TDefaultIntegrationProps> {
+> {
   pattern: 'shared';
+  /** Map of operation names to their API path and HTTP method details */
+  operations: Record<TOperation, OperationDetails>;
+  /** Default configuration options for integrations */
+  defaultIntegrationOptions: TDefaultIntegrationProps;
   /** Function to create a default integration for the shared router */
   buildDefaultIntegration: (
     op: '$router',
@@ -1428,8 +1479,12 @@ interface IsolatedIntegrationBuilderProps<
   TOperation extends string,
   TDefaultIntegrationProps extends object,
   TDefaultIntegration,
-> extends IntegrationBuilderPropsBase<TOperation, TDefaultIntegrationProps> {
+> {
   pattern: 'isolated';
+  /** Map of operation names to their API path and HTTP method details */
+  operations: Record<TOperation, OperationDetails>;
+  /** Default configuration options for integrations */
+  defaultIntegrationOptions: TDefaultIntegrationProps;
   /** Function to create a default integration for an operation */
   buildDefaultIntegration: (
     op: TOperation,
@@ -1457,25 +1512,6 @@ export type IntegrationBuilderProps<
       TDefaultIntegration
     >;
 
-/**
- * Extracts the IntegrationBuilderProps variant matching the given pattern.
- */
-type IntegrationBuilderPropsForPattern<
-  TOperation extends string,
-  TBaseIntegration,
-  TDefaultIntegrationProps extends object,
-  TDefaultIntegration extends TBaseIntegration,
-  TPattern extends 'shared' | 'isolated',
-> = Extract<
-  IntegrationBuilderProps<
-    TOperation,
-    TBaseIntegration,
-    TDefaultIntegrationProps,
-    TDefaultIntegration
-  >,
-  { pattern: TPattern }
->;
-
 /**
  * Resolves the default integration keys based on the pattern.
  * - 'shared': only '$router' is a default key
@@ -1535,22 +1571,65 @@ export class IntegrationBuilder<
   private integrations: Partial<TIntegrations> = {};
 
   /**
-   * Create an Integration Builder for an HTTP API
+   * Create an Integration Builder for an HTTP API with a shared pattern
    */
-  public static http = <
+  public static http<
     TOperation extends string,
     TDefaultIntegrationProps extends object,
     TDefaultIntegration extends HttpApiIntegration,
-    TPattern extends 'shared' | 'isolated',
   >(
-    options: IntegrationBuilderPropsForPattern<
+    options: SharedIntegrationBuilderProps<
       TOperation,
-      HttpApiIntegration,
       TDefaultIntegrationProps,
-      TDefaultIntegration,
-      TPattern
+      TDefaultIntegration
+    >,
+  ): IntegrationBuilder<
+    TOperation,
+    HttpApiIntegration,
+    Record<'$router', TDefaultIntegration>,
+    TDefaultIntegrationProps,
+    TDefaultIntegration,
+    'shared'
+  >;
+  /**
+   * Create an Integration Builder for an HTTP API with an isolated pattern
+   */
+  public static http<
+    TOperation extends string,
+    TDefaultIntegrationProps extends object,
+    TDefaultIntegration extends HttpApiIntegration,
+  >(
+    options: IsolatedIntegrationBuilderProps<
+      TOperation,
+      TDefaultIntegrationProps,
+      TDefaultIntegration
     >,
-  ) => {
+  ): IntegrationBuilder<
+    TOperation,
+    HttpApiIntegration,
+    Record<TOperation, TDefaultIntegration>,
+    TDefaultIntegrationProps,
+    TDefaultIntegration,
+    'isolated'
+  >;
+  public static http<
+    TOperation extends string,
+    TDefaultIntegrationProps extends object,
+    TDefaultIntegration extends HttpApiIntegration,
+    TPattern extends 'shared' | 'isolated',
+  >(
+    options:
+      | SharedIntegrationBuilderProps<
+          TOperation,
+          TDefaultIntegrationProps,
+          TDefaultIntegration
+        >
+      | IsolatedIntegrationBuilderProps<
+          TOperation,
+          TDefaultIntegrationProps,
+          TDefaultIntegration
+        >,
+  ) {
     return new IntegrationBuilder<
       TOperation,
       HttpApiIntegration,
@@ -1559,25 +1638,68 @@ export class IntegrationBuilder<
       TDefaultIntegration,
       TPattern
     >(options);
-  };
+  }
 
   /**
-   * Create an Integration Builder for a REST API
+   * Create an Integration Builder for a REST API with a shared pattern
    */
-  public static rest = <
+  public static rest<
     TOperation extends string,
     TDefaultIntegrationProps extends object,
     TDefaultIntegration extends RestApiIntegration,
-    TPattern extends 'shared' | 'isolated',
   >(
-    options: IntegrationBuilderPropsForPattern<
+    options: SharedIntegrationBuilderProps<
       TOperation,
-      RestApiIntegration,
       TDefaultIntegrationProps,
-      TDefaultIntegration,
-      TPattern
+      TDefaultIntegration
+    >,
+  ): IntegrationBuilder<
+    TOperation,
+    RestApiIntegration,
+    Record<'$router', TDefaultIntegration>,
+    TDefaultIntegrationProps,
+    TDefaultIntegration,
+    'shared'
+  >;
+  /**
+   * Create an Integration Builder for a REST API with an isolated pattern
+   */
+  public static rest<
+    TOperation extends string,
+    TDefaultIntegrationProps extends object,
+    TDefaultIntegration extends RestApiIntegration,
+  >(
+    options: IsolatedIntegrationBuilderProps<
+      TOperation,
+      TDefaultIntegrationProps,
+      TDefaultIntegration
     >,
-  ) => {
+  ): IntegrationBuilder<
+    TOperation,
+    RestApiIntegration,
+    Record<TOperation, TDefaultIntegration>,
+    TDefaultIntegrationProps,
+    TDefaultIntegration,
+    'isolated'
+  >;
+  public static rest<
+    TOperation extends string,
+    TDefaultIntegrationProps extends object,
+    TDefaultIntegration extends RestApiIntegration,
+    TPattern extends 'shared' | 'isolated',
+  >(
+    options:
+      | SharedIntegrationBuilderProps<
+          TOperation,
+          TDefaultIntegrationProps,
+          TDefaultIntegration
+        >
+      | IsolatedIntegrationBuilderProps<
+          TOperation,
+          TDefaultIntegrationProps,
+          TDefaultIntegration
+        >,
+  ) {
     return new IntegrationBuilder<
       TOperation,
       RestApiIntegration,
@@ -1586,7 +1708,7 @@ export class IntegrationBuilder<
       TDefaultIntegration,
       TPattern
     >(options);
-  };
+  }
 
   private constructor(
     options: IntegrationBuilderProps<

package/src/py/mcp-server/__snapshots__/generator.spec.ts.snap

@@ -633,11 +633,11 @@ exports[`py#mcp-server generator > should match snapshot for generated files > u
 name = "proj.test_project"
 version = "0.1.0"
 dependencies = [
-  "aws-lambda-powertools==3.26.0",
+  "aws-lambda-powertools==3.27.0",
   "mcp==1.27.0",
-  "uvicorn==0.43.0",
-  "boto3==1.42.83",
-  "aws-opentelemetry-distro==0.16.0"
+  "uvicorn==0.44.0",
+  "boto3==1.42.88",
+  "aws-opentelemetry-distro==0.17.0"
 ]
 
 [dependency-groups]