@aws/nx-plugin 0.77.0 → 0.78.0

package/LICENSE-THIRD-PARTY

@@ -3352,12 +3352,12 @@ SOFTWARE.
 
 ---
 
-The following software may be included in this product: @esbuild/linux-x64 (0.27.2)
+The following software may be included in this product: @esbuild/darwin-arm64 (0.27.2)
 This software contains the following license and notice below:
 
 MIT License
 
-Copyright (c) The maintainers of @esbuild/linux-x64 <https://github.com/evanw/esbuild#readme>
+Copyright (c) The maintainers of @esbuild/darwin-arm64 <https://github.com/evanw/esbuild#readme>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
 associated documentation files (the "Software"), to deal in the Software without restriction, including 
@@ -3376,12 +3376,12 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ---
 
-The following software may be included in this product: @esbuild/linux-x64 (0.27.3)
+The following software may be included in this product: @esbuild/darwin-arm64 (0.27.3)
 This software contains the following license and notice below:
 
 MIT License
 
-Copyright (c) The maintainers of @esbuild/linux-x64 <https://github.com/evanw/esbuild#readme>
+Copyright (c) The maintainers of @esbuild/darwin-arm64 <https://github.com/evanw/esbuild#readme>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and 
 associated documentation files (the "Software"), to deal in the Software without restriction, including 
@@ -4631,7 +4631,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ---
 
-The following software may be included in this product: @nx/nx-linux-x64-gnu (22.5.1)
+The following software may be included in this product: @nx/nx-darwin-arm64 (22.5.1)
 This software contains the following license and notice below:
 
 (The MIT License)
@@ -5349,7 +5349,7 @@ THE SOFTWARE.
 
 ---
 
-The following software may be included in this product: @rollup/rollup-linux-x64-gnu (4.50.1)
+The following software may be included in this product: @rollup/rollup-darwin-arm64 (4.50.1)
 This software contains the following license and notice below:
 
 MIT License
@@ -5401,7 +5401,7 @@ SOFTWARE.
 
 ---
 
-The following software may be included in this product: @rspack/binding-linux-x64-gnu (1.6.8)
+The following software may be included in this product: @rspack/binding-darwin-arm64 (1.6.8)
 This software contains the following license and notice below:
 
 MIT License
@@ -13165,6 +13165,34 @@ OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHE
 
 ---
 
+The following software may be included in this product: fsevents (2.3.3)
+This software contains the following license and notice below:
+
+MIT License
+-----------
+
+Copyright (C) 2010-2020 by Philipp Dunkel, Ben Noordhuis, Elan Shankar, Paul Miller
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+---
+
 The following software may be included in this product: function-bind (1.1.2)
 This software contains the following license and notice below:
 
@@ -39931,7 +39959,7 @@ defined by the Mozilla Public License, v. 2.0.
 
 ---
 
-The following software may be included in this product: lightningcss-linux-x64-gnu (1.30.2)
+The following software may be included in this product: lightningcss-darwin-arm64 (1.30.2)
 This software contains the following license and notice below:
 
 Mozilla Public License Version 2.0

package/package.json

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

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

@@ -942,7 +942,10 @@ export class TestApi<
       } satisfies FunctionProps,
       buildDefaultIntegration: (op, props: FunctionProps) => {
         const handler = new Function(scope, \`TestApi\${op}Handler\`, props);
-        return { handler, integration: new LambdaIntegration(handler) };
+        return {
+          handler,
+          integration: new LambdaIntegration(handler),
+        };
       },
     });
   };
@@ -3123,7 +3126,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "~> 6.33"
     }
   }
 }
@@ -3270,7 +3273,7 @@ output "api_root_resource_id" {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "~> 6.33"
     }
   }
 }
@@ -3467,8 +3470,8 @@ resource "aws_api_gateway_integration" "lambda_integration" {
   http_method = aws_api_gateway_method.proxy_method.http_method
 
   integration_http_method = "POST"
-  type                   = "AWS_PROXY"
-  uri                    = aws_lambda_function.api_lambda.invoke_arn
+  type                    = "AWS_PROXY"
+  uri                     = aws_lambda_function.api_lambda.invoke_arn
 
   depends_on = [aws_lambda_function.api_lambda]
 }
@@ -3759,7 +3762,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "~> 6.33"
     }
   }
 }
@@ -3906,7 +3909,7 @@ output "api_root_resource_id" {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "~> 6.33"
     }
   }
 }
@@ -4085,8 +4088,8 @@ resource "aws_api_gateway_integration" "lambda_integration" {
   http_method = aws_api_gateway_method.proxy_method.http_method
 
   integration_http_method = "POST"
-  type                   = "AWS_PROXY"
-  uri                    = aws_lambda_function.api_lambda.invoke_arn
+  type                    = "AWS_PROXY"
+  uri                     = aws_lambda_function.api_lambda.invoke_arn
 
   depends_on = [aws_lambda_function.api_lambda]
 }
@@ -4387,7 +4390,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "~> 6.33"
     }
   }
 }
@@ -4534,7 +4537,7 @@ output "api_root_resource_id" {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "~> 6.33"
     }
   }
 }
@@ -4713,8 +4716,8 @@ resource "aws_api_gateway_integration" "lambda_integration" {
   http_method = aws_api_gateway_method.proxy_method.http_method
 
   integration_http_method = "POST"
-  type                   = "AWS_PROXY"
-  uri                    = aws_lambda_function.api_lambda.invoke_arn
+  type                    = "AWS_PROXY"
+  uri                     = aws_lambda_function.api_lambda.invoke_arn
 
   depends_on = [aws_lambda_function.api_lambda]
 }

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

@@ -182,7 +182,7 @@ const useCreateTestApiClient = (): TestApi => {
     () =>
       new TestApi({
         url: apiUrl,
-        fetch: sigv4Client,
+        fetch: sigv4Client.fetch,
       }),
     [apiUrl, sigv4Client],
   );

package/src/smithy/react-connection/__snapshots__/generator.spec.ts.snap

@@ -57,7 +57,7 @@ const useCreateTestApiClient = (): TestApi => {
     () =>
       new TestApi({
         url: apiUrl,
-        fetch: sigv4Client,
+        fetch: sigv4Client.fetch,
       }),
     [apiUrl, sigv4Client],
   );
@@ -175,7 +175,7 @@ const useCreateTestApiClient = (): TestApi => {
     () =>
       new TestApi({
         url: apiUrl,
-        fetch: sigv4Client,
+        fetch: sigv4Client.fetch,
       }),
     [apiUrl, sigv4Client],
   );

package/src/smithy/ts/api/__snapshots__/generator.spec.ts.snap

@@ -123,7 +123,10 @@ export class TestApi<
       } satisfies FunctionProps,
       buildDefaultIntegration: (op, props: FunctionProps) => {
         const handler = new Function(scope, \`TestApi\${op}Handler\`, props);
-        return { handler, integration: new LambdaIntegration(handler) };
+        return {
+          handler,
+          integration: new LambdaIntegration(handler),
+        };
       },
     });
   };
@@ -281,7 +284,10 @@ export class TestApi<
       } satisfies FunctionProps,
       buildDefaultIntegration: (op, props: FunctionProps) => {
         const handler = new Function(scope, \`TestApi\${op}Handler\`, props);
-        return { handler, integration: new LambdaIntegration(handler) };
+        return {
+          handler,
+          integration: new LambdaIntegration(handler),
+        };
       },
     });
   };
@@ -385,7 +391,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "~> 6.33"
     }
   }
 }
@@ -535,7 +541,7 @@ exports[`tsSmithyApiGenerator > should generate smithy ts api with Terraform pro
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "~> 6.33"
     }
   }
 }
@@ -714,8 +720,8 @@ resource "aws_api_gateway_integration" "lambda_integration" {
   http_method = aws_api_gateway_method.proxy_method.http_method
 
   integration_http_method = "POST"
-  type                   = "AWS_PROXY"
-  uri                    = aws_lambda_function.api_lambda.invoke_arn
+  type                    = "AWS_PROXY"
+  uri                     = aws_lambda_function.api_lambda.invoke_arn
 
   depends_on = [aws_lambda_function.api_lambda]
 }
@@ -1391,7 +1397,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "~> 6.33"
     }
   }
 }
@@ -1538,7 +1544,7 @@ output "api_root_resource_id" {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "~> 6.33"
     }
   }
 }
@@ -1735,8 +1741,8 @@ resource "aws_api_gateway_integration" "lambda_integration" {
   http_method = aws_api_gateway_method.proxy_method.http_method
 
   integration_http_method = "POST"
-  type                   = "AWS_PROXY"
-  uri                    = aws_lambda_function.api_lambda.invoke_arn
+  type                    = "AWS_PROXY"
+  uri                     = aws_lambda_function.api_lambda.invoke_arn
 
   depends_on = [aws_lambda_function.api_lambda]
 }
@@ -2027,7 +2033,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "~> 6.33"
     }
   }
 }
@@ -2174,7 +2180,7 @@ output "api_root_resource_id" {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "~> 6.33"
     }
   }
 }
@@ -2353,8 +2359,8 @@ resource "aws_api_gateway_integration" "lambda_integration" {
   http_method = aws_api_gateway_method.proxy_method.http_method
 
   integration_http_method = "POST"
-  type                   = "AWS_PROXY"
-  uri                    = aws_lambda_function.api_lambda.invoke_arn
+  type                    = "AWS_PROXY"
+  uri                     = aws_lambda_function.api_lambda.invoke_arn
 
   depends_on = [aws_lambda_function.api_lambda]
 }
@@ -2651,7 +2657,7 @@ exports[`tsSmithyApiGenerator > terraform iacProvider > should generate terrafor
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "~> 6.33"
     }
   }
 }
@@ -2830,8 +2836,8 @@ resource "aws_api_gateway_integration" "lambda_integration" {
   http_method = aws_api_gateway_method.proxy_method.http_method
 
   integration_http_method = "POST"
-  type                   = "AWS_PROXY"
-  uri                    = aws_lambda_function.api_lambda.invoke_arn
+  type                    = "AWS_PROXY"
+  uri                     = aws_lambda_function.api_lambda.invoke_arn
 
   depends_on = [aws_lambda_function.api_lambda]
 }

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

@@ -29,6 +29,23 @@ export const createTestApiClient = (config: TestApiClientConfig) => {
 "
 `;
 
+exports[`trpc backend generator > should generate the project > apps/test-api/src/handler.ts 1`] = `
+"import {
+  CreateAWSLambdaContextOptions,
+  awsLambdaRequestHandler,
+} from '@trpc/server/adapters/aws-lambda';
+import type { APIGatewayProxyEventV2WithIAMAuthorizer } from 'aws-lambda';
+import { appRouter } from './router.js';
+
+export const handler = awsLambdaRequestHandler({
+  router: appRouter,
+  createContext: (
+    ctx: CreateAWSLambdaContextOptions<APIGatewayProxyEventV2WithIAMAuthorizer>,
+  ) => ctx,
+});
+"
+`;
+
 exports[`trpc backend generator > should generate the project > apps/test-api/src/index.ts 1`] = `
 "export type { AppRouter } from './router.js';
 export { appRouter } from './router.js';
@@ -269,13 +286,8 @@ export const echo = publicProcedure
 `;
 
 exports[`trpc backend generator > should generate the project > apps/test-api/src/router.ts 1`] = `
-"import {
-  awsLambdaRequestHandler,
-  CreateAWSLambdaContextOptions,
-} from '@trpc/server/adapters/aws-lambda';
-import { echo } from './procedures/echo.js';
+"import { echo } from './procedures/echo.js';
 import { t } from './init.js';
-import type { APIGatewayProxyEventV2WithIAMAuthorizer } from 'aws-lambda';
 
 export const router = t.router;
 
@@ -283,13 +295,6 @@ export const appRouter = router({
   echo,
 });
 
-export const handler = awsLambdaRequestHandler({
-  router: appRouter,
-  createContext: (
-    ctx: CreateAWSLambdaContextOptions<APIGatewayProxyEventV2WithIAMAuthorizer>,
-  ) => ctx,
-});
-
 export type AppRouter = typeof appRouter;
 "
 `;
@@ -359,6 +364,7 @@ import {
   AuthorizationType,
   Cors,
   LambdaIntegration,
+  ResponseTransferMode,
   CognitoUserPoolsAuthorizer,
 } from 'aws-cdk-lib/aws-apigateway';
 import { Duration } from 'aws-cdk-lib';
@@ -437,7 +443,12 @@ export class TestApi<
       } satisfies FunctionProps,
       buildDefaultIntegration: (op, props: FunctionProps) => {
         const handler = new Function(scope, \`TestApi\${op}Handler\`, props);
-        return { handler, integration: new LambdaIntegration(handler) };
+        return {
+          handler,
+          integration: new LambdaIntegration(handler, {
+            responseTransferMode: ResponseTransferMode.STREAM,
+          }),
+        };
       },
     });
   };
@@ -747,6 +758,7 @@ import {
   AuthorizationType,
   Cors,
   LambdaIntegration,
+  ResponseTransferMode,
 } from 'aws-cdk-lib/aws-apigateway';
 import { Duration } from 'aws-cdk-lib';
 import {
@@ -817,7 +829,12 @@ export class TestApi<
       } satisfies FunctionProps,
       buildDefaultIntegration: (op, props: FunctionProps) => {
         const handler = new Function(scope, \`TestApi\${op}Handler\`, props);
-        return { handler, integration: new LambdaIntegration(handler) };
+        return {
+          handler,
+          integration: new LambdaIntegration(handler, {
+            responseTransferMode: ResponseTransferMode.STREAM,
+          }),
+        };
       },
     });
   };
@@ -1436,9 +1453,9 @@ export const routerToOperations = <TRouter extends AnyTRPCRouter>(
                 {
                   path: fullPath,
                   method:
-                    procedureOrRouter._def.type === 'query'
-                      ? HttpMethod.GET
-                      : HttpMethod.POST,
+                    procedureOrRouter._def.type === 'mutation'
+                      ? HttpMethod.POST
+                      : HttpMethod.GET,
                 },
               ],
             ];
@@ -1827,6 +1844,7 @@ import {
   AuthorizationType,
   Cors,
   LambdaIntegration,
+  ResponseTransferMode,
 } from 'aws-cdk-lib/aws-apigateway';
 import { Duration } from 'aws-cdk-lib';
 import {
@@ -1899,7 +1917,12 @@ export class TestApi<
       } satisfies FunctionProps,
       buildDefaultIntegration: (op, props: FunctionProps) => {
         const handler = new Function(scope, \`TestApi\${op}Handler\`, props);
-        return { handler, integration: new LambdaIntegration(handler) };
+        return {
+          handler,
+          integration: new LambdaIntegration(handler, {
+            responseTransferMode: ResponseTransferMode.STREAM,
+          }),
+        };
       },
     });
   };
@@ -2051,9 +2074,9 @@ export const routerToOperations = <TRouter extends AnyTRPCRouter>(
                 {
                   path: fullPath,
                   method:
-                    procedureOrRouter._def.type === 'query'
-                      ? HttpMethod.GET
-                      : HttpMethod.POST,
+                    procedureOrRouter._def.type === 'mutation'
+                      ? HttpMethod.POST
+                      : HttpMethod.GET,
                 },
               ],
             ];
@@ -4151,7 +4174,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "~> 6.33"
     }
   }
 }
@@ -4298,7 +4321,7 @@ output "api_root_resource_id" {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "~> 6.33"
     }
   }
 }
@@ -4495,8 +4518,9 @@ resource "aws_api_gateway_integration" "lambda_integration" {
   http_method = aws_api_gateway_method.proxy_method.http_method
 
   integration_http_method = "POST"
-  type                   = "AWS_PROXY"
-  uri                    = aws_lambda_function.api_lambda.invoke_arn
+  type                    = "AWS_PROXY"
+  uri                     = aws_lambda_function.api_lambda.response_streaming_invoke_arn
+  response_transfer_mode  = "STREAM"
 
   depends_on = [aws_lambda_function.api_lambda]
 }
@@ -4787,7 +4811,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "~> 6.33"
     }
   }
 }
@@ -4934,7 +4958,7 @@ output "api_root_resource_id" {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "~> 6.33"
     }
   }
 }
@@ -5113,8 +5137,9 @@ resource "aws_api_gateway_integration" "lambda_integration" {
   http_method = aws_api_gateway_method.proxy_method.http_method
 
   integration_http_method = "POST"
-  type                   = "AWS_PROXY"
-  uri                    = aws_lambda_function.api_lambda.invoke_arn
+  type                    = "AWS_PROXY"
+  uri                     = aws_lambda_function.api_lambda.response_streaming_invoke_arn
+  response_transfer_mode  = "STREAM"
 
   depends_on = [aws_lambda_function.api_lambda]
 }
@@ -5415,7 +5440,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "~> 6.33"
     }
   }
 }
@@ -5562,7 +5587,7 @@ output "api_root_resource_id" {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "~> 6.33"
     }
   }
 }
@@ -5741,8 +5766,9 @@ resource "aws_api_gateway_integration" "lambda_integration" {
   http_method = aws_api_gateway_method.proxy_method.http_method
 
   integration_http_method = "POST"
-  type                   = "AWS_PROXY"
-  uri                    = aws_lambda_function.api_lambda.invoke_arn
+  type                    = "AWS_PROXY"
+  uri                     = aws_lambda_function.api_lambda.response_streaming_invoke_arn
+  response_transfer_mode  = "STREAM"
 
   depends_on = [aws_lambda_function.api_lambda]
 }

package/src/trpc/backend/files/src/handler.ts.template

@@ -0,0 +1,48 @@
+import {
+  CreateAWSLambdaContextOptions,
+  <%_ if (computeType === 'ServerlessApiGatewayRestApi') { _%>
+  awsLambdaStreamingRequestHandler,
+  <%_ } else { _%>
+  awsLambdaRequestHandler,
+  <%_ } _%>
+} from '@trpc/server/adapters/aws-lambda';
+import type { <%- apiGatewayEventType %> } from 'aws-lambda';
+import { appRouter } from './router.js';
+
+<%_ if (computeType === 'ServerlessApiGatewayRestApi') { _%>
+export const handler = awslambda.streamifyResponse(
+  awsLambdaStreamingRequestHandler({
+    router: appRouter,
+    createContext: (ctx: CreateAWSLambdaContextOptions<<%- apiGatewayEventType %>>) => ctx,
+    responseMeta: ({ ctx }) => ({
+      headers: {
+        'Access-Control-Allow-Origin': getAllowedOrigin(ctx?.event),
+        'Access-Control-Allow-Methods': '*',
+      },
+    }),
+  }),
+);
+
+/**
+ * Restricts CORS origins to localhost and the domains specified in
+ * the ALLOWED_ORIGINS environment variable if set, or * otherwise.
+ * Customise using `restrictCorsTo` in your API CDK construct
+ */
+const getAllowedOrigin = (event: <%- apiGatewayEventType %> | undefined) => {
+  const origin = event?.headers?.origin ?? event?.headers?.Origin;
+  const allowedOrigins = process.env.ALLOWED_ORIGINS?.split(',') ?? [];
+  const isLocalHost =
+    origin && new Set(['localhost', '127.0.0.1']).has(new URL(origin).hostname);
+  const isAllowedOrigin = origin && allowedOrigins.includes(origin);
+  let corsOrigin = '*';
+  if (allowedOrigins.length > 0 && !isLocalHost) {
+    corsOrigin = isAllowedOrigin ? origin : allowedOrigins[0];
+  }
+  return corsOrigin;
+};
+<%_ } else { _%>
+export const handler = awsLambdaRequestHandler({
+  router: appRouter,
+  createContext: (ctx: CreateAWSLambdaContextOptions<<%- apiGatewayEventType %>>) => ctx,
+});
+<%_ } _%>

package/src/trpc/backend/files/src/index.ts.template

@@ -2,4 +2,4 @@ export type { AppRouter } from './router.js';
 export { appRouter } from './router.js';
 export type { Context } from './init.js';
 export * from './client/index.js';
-export * from './schema/index.js';
+export * from './schema/index.js';