@aws/nx-plugin 0.94.0 → 0.94.2

package/src/trpc/backend/__snapshots__/generator.spec.ts.snap

@@ -1586,20 +1586,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.
@@ -1608,8 +1594,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',
@@ -1625,8 +1615,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,
@@ -1654,25 +1648,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
@@ -1732,22 +1707,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,
@@ -1756,25 +1774,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,
@@ -1783,7 +1844,7 @@ export class IntegrationBuilder<
       TDefaultIntegration,
       TPattern
     >(options);
-  };
+  }
 
   private constructor(
     options: IntegrationBuilderProps<
@@ -2377,20 +2438,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.
@@ -2399,8 +2446,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',
@@ -2416,8 +2467,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,
@@ -2445,25 +2500,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
@@ -2523,22 +2559,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,
@@ -2547,25 +2626,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,
@@ -2574,7 +2696,7 @@ export class IntegrationBuilder<
       TDefaultIntegration,
       TPattern
     >(options);
-  };
+  }
 
   private constructor(
     options: IntegrationBuilderProps<

package/src/utils/api-constructs/files/cdk/core/api/utils/utils.ts.template

@@ -48,20 +48,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.
@@ -70,8 +56,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',
@@ -87,8 +77,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,
@@ -116,25 +110,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
@@ -194,22 +169,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,
@@ -218,25 +236,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,
@@ -245,7 +306,7 @@ export class IntegrationBuilder<
       TDefaultIntegration,
       TPattern
     >(options);
-  };
+  }
 
   private constructor(
     options: IntegrationBuilderProps<