@aws/nx-plugin 0.94.1 → 0.94.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws/nx-plugin",
-  "version": "0.94.1",
+  "version": "0.94.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/awslabs/nx-plugin-for-aws.git",

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<