@aws/nx-plugin 1.0.0-rc.32 → 1.0.0-rc.34

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

@@ -3142,7 +3142,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
   }
 }
@@ -3389,7 +3389,7 @@ output "api_log_group_arn" {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
   }
 }
@@ -3856,7 +3856,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
   }
 }
@@ -4103,7 +4103,7 @@ output "api_log_group_arn" {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
   }
 }
@@ -4642,7 +4642,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
   }
 }
@@ -4889,7 +4889,7 @@ output "api_log_group_arn" {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
   }
 }
@@ -5333,7 +5333,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
     random = {
       source  = "hashicorp/random"
@@ -5589,7 +5589,7 @@ output "waf_web_acl_arn" {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
   }
 }
@@ -6281,7 +6281,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
     random = {
       source  = "hashicorp/random"
@@ -6537,7 +6537,7 @@ output "waf_web_acl_arn" {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
   }
 }
@@ -7218,7 +7218,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
     random = {
       source  = "hashicorp/random"
@@ -7474,7 +7474,7 @@ output "waf_web_acl_arn" {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
   }
 }

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

@@ -7,7 +7,7 @@ import {
 import { AwsClient } from 'aws4fetch';
 import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
 <%_ } _%>
-import { AppRouter } from "../router.js";
+import { AppRouter } from "../router<% if (esm) { %>.js<% } %>";
 
 <%_ if (auth === 'iam') { %>
 const credentialProvider = fromNodeProviderChain();

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

@@ -7,7 +7,7 @@ import {
   <%_ } _%>
 } from '@trpc/server/adapters/aws-lambda';
 import type { <%- apiGatewayEventType %> } from 'aws-lambda';
-import { appRouter } from './router.js';
+import { appRouter } from './router<% if (esm) { %>.js<% } %>';
 
 <%_ if (infra === 'rest-lambda') { _%>
 export const handler = awslambda.streamifyResponse(

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

@@ -1,5 +1,5 @@
-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 type { AppRouter } from './router<% if (esm) { %>.js<% } %>';
+export { appRouter } from './router<% if (esm) { %>.js<% } %>';
+export type { Context } from './init<% if (esm) { %>.js<% } %>';
+export * from './client/index<% if (esm) { %>.js<% } %>';
+export * from './schema/index<% if (esm) { %>.js<% } %>';

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

@@ -5,7 +5,7 @@ import {
   createMetricsPlugin,
   createTracerPlugin,
   IMiddlewareContext,
-} from './middleware/index.js';
+} from './middleware/index<% if (esm) { %>.js<% } %>';
 
 process.env.POWERTOOLS_SERVICE_NAME = '<%= apiNameClassName %>';
 process.env.POWERTOOLS_METRICS_NAMESPACE = '<%= apiNameClassName %>';

package/src/trpc/backend/files/src/local-server.ts.template

@@ -1,5 +1,5 @@
 import { createHTTPServer } from '@trpc/server/adapters/standalone';
-import { appRouter } from './router.js';
+import { appRouter } from './router<% if (esm) { %>.js<% } %>';
 import cors from 'cors';
 
 const PORT = <%- port %>;

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

@@ -1,13 +1,13 @@
 import { CreateAWSLambdaContextOptions } from '@trpc/server/adapters/aws-lambda';
 import type { <%- apiGatewayEventType %> } from 'aws-lambda';
-import { ILoggerContext } from './logger.js';
-import { IMetricsContext } from './metrics.js';
-import { ITracerContext } from './tracer.js';
+import { ILoggerContext } from './logger<% if (esm) { %>.js<% } %>';
+import { IMetricsContext } from './metrics<% if (esm) { %>.js<% } %>';
+import { ITracerContext } from './tracer<% if (esm) { %>.js<% } %>';
 
-export * from './logger.js';
-export * from './metrics.js';
-export * from './tracer.js';
-export * from './error.js';
+export * from './logger<% if (esm) { %>.js<% } %>';
+export * from './metrics<% if (esm) { %>.js<% } %>';
+export * from './tracer<% if (esm) { %>.js<% } %>';
+export * from './error<% if (esm) { %>.js<% } %>';
 
 export type IMiddlewareContext = CreateAWSLambdaContextOptions<<%- apiGatewayEventType %>>
   & ILoggerContext

package/src/trpc/backend/files/src/procedures/echo.ts.template

@@ -1,5 +1,5 @@
-import { publicProcedure } from '../init.js';
-import { EchoInputSchema, EchoOutputSchema } from '../schema/index.js';
+import { publicProcedure } from '../init<% if (esm) { %>.js<% } %>';
+import { EchoInputSchema, EchoOutputSchema } from '../schema/index<% if (esm) { %>.js<% } %>';
 
 
 export const echo = publicProcedure

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

@@ -1,5 +1,5 @@
-import { echo } from './procedures/echo.js';
-import { t } from './init.js';
+import { echo } from './procedures/echo<% if (esm) { %>.js<% } %>';
+import { t } from './init<% if (esm) { %>.js<% } %>';
 
 export const router = t.router;
 

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

@@ -1 +1 @@
-export * from './echo.js';
+export * from './echo<% if (esm) { %>.js<% } %>';

package/src/trpc/backend/generator.js

@@ -9,6 +9,7 @@ import { formatFilesInSubtree } from "../../utils/format.js";
 import { resolveIac } from "../../utils/iac.js";
 import { installDependencies } from "../../utils/install.js";
 import { addGeneratorMetricsIfApplicable } from "../../utils/metrics.js";
+import { esmVars } from "../../utils/module-format.js";
 import { kebabCase, toClassName } from "../../utils/names.js";
 import { getNpmScopePrefix, toScopeAlias } from "../../utils/npm-scope.js";
 import { addDependencyToTargetIfNotPresent, addGeneratorMetadata, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../utils/nx.js";
@@ -62,7 +63,8 @@ export async function tsTrpcApiGenerator(tree, options) {
         pkgMgrCmd: getPackageManagerDisplayCommands().exec,
         apiGatewayEventType: getApiGatewayEventType(options),
         port,
-        ...options
+        ...options,
+        ...esmVars(tree)
     };
     if (options.infra !== 'none') {
         const iac = await resolveIac(tree, options.iac);

package/src/trpc/backend/generator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/trpc/backend/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  addDependenciesToPackageJson,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport tsProjectGenerator from '../../ts/lib/generator';\nimport { addApiGatewayInfra } from '../../utils/api-constructs/api-constructs';\nimport { addTypeScriptBundleTarget } from '../../utils/bundle/bundle';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { resolveIac } from '../../utils/iac';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { kebabCase, toClassName } from '../../utils/names';\nimport { getNpmScopePrefix, toScopeAlias } from '../../utils/npm-scope';\nimport {\n  addDependencyToTargetIfNotPresent,\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../utils/nx';\nimport { sortObjectKeys } from '../../utils/object';\nimport { getPackageManagerDisplayCommands } from '../../utils/pkg-manager';\nimport { assignPort } from '../../utils/port';\nimport { sharedConstructsGenerator } from '../../utils/shared-constructs';\nimport { withVersions } from '../../utils/versions';\nimport type { TsTrpcApiGeneratorSchema } from './schema';\n\nexport const TRPC_BACKEND_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nconst VALID_TRPC_INTEGRATION_PERMUTATIONS = new Set([\n  'rest-lambda::isolated',\n  'rest-lambda::shared',\n  'http-lambda::isolated',\n  'http-lambda::shared',\n  'none::isolated',\n  'none::shared',\n]);\n\nexport async function tsTrpcApiGenerator(\n  tree: Tree,\n  options: TsTrpcApiGeneratorSchema,\n) {\n  if (options.infra !== 'none') {\n    validateTrpcInfraAndIntegrationPatternCombination(options);\n  }\n\n  const apiNamespace = getNpmScopePrefix(tree);\n  const apiNameKebabCase = kebabCase(options.name);\n  const apiNameClassName = toClassName(options.name);\n\n  const backendName = apiNameKebabCase;\n  const backendProjectName = `${apiNamespace}${backendName}`;\n\n  let projectExists: boolean;\n  try {\n    readProjectConfigurationUnqualified(tree, backendProjectName);\n    projectExists = true;\n  } catch {\n    projectExists = false;\n  }\n\n  if (!projectExists) {\n    await tsProjectGenerator(tree, {\n      name: backendName,\n      directory: options.directory,\n      subDirectory: options.subDirectory,\n      preferInstallDependencies: false,\n    });\n  }\n\n  const projectConfig = readProjectConfigurationUnqualified(\n    tree,\n    backendProjectName,\n  );\n  const backendRoot = projectConfig.root;\n\n  const port = assignPort(tree, projectConfig, 2022);\n\n  const enhancedOptions = {\n    backendProjectName,\n    backendProjectAlias: toScopeAlias(backendProjectName),\n    apiNameKebabCase,\n    apiNameClassName,\n    backendRoot,\n    pkgMgrCmd: getPackageManagerDisplayCommands().exec,\n    apiGatewayEventType: getApiGatewayEventType(options),\n    port,\n    ...options,\n  };\n\n  if (options.infra !== 'none') {\n    const iac = await resolveIac(tree, options.iac);\n\n    await sharedConstructsGenerator(tree, {\n      iac,\n    });\n\n    await addApiGatewayInfra(tree, {\n      apiProjectName: backendProjectName,\n      apiNameClassName,\n      apiNameKebabCase,\n      constructType: options.infra === 'http-lambda' ? 'http' : 'rest',\n      backend: {\n        type: 'trpc',\n        projectAlias: enhancedOptions.backendProjectAlias,\n        bundleOutputDir: joinPathFragments('dist', backendRoot, 'bundle'),\n        integrationPattern: getIntegrationPattern(options),\n        ...(options.auth === 'custom' && {\n          authorizerBundleOutputDir: joinPathFragments(\n            'dist',\n            backendRoot,\n            'bundle',\n            'authorizer',\n          ),\n        }),\n      },\n      auth: options.auth,\n      iac,\n    });\n  }\n\n  projectConfig.metadata = {\n    ...projectConfig.metadata,\n    apiName: options.name,\n    apiType: 'trpc',\n    auth: options.auth,\n    infra: options.infra,\n    integrationPattern: getIntegrationPattern(options),\n  } as unknown;\n\n  projectConfig.targets.serve = {\n    executor: 'nx:run-commands',\n    continuous: true,\n    options: {\n      commands: ['tsx --watch src/local-server.ts'],\n      cwd: '{projectRoot}',\n    },\n  };\n\n  projectConfig.targets['dev'] = {\n    ...projectConfig.targets['dev'],\n    ...projectConfig.targets.serve,\n    options: {\n      ...projectConfig.targets.serve.options,\n      env: {\n        LOCAL_DEV: 'true',\n      },\n    },\n  };\n\n  if (options.infra !== 'none') {\n    await addTypeScriptBundleTarget(tree, projectConfig, {\n      targetFilePath: 'src/handler.ts',\n      external: [/@aws-sdk\\/.*/], // lambda runtime provides aws sdk\n    });\n\n    if (options.auth === 'custom') {\n      await addTypeScriptBundleTarget(tree, projectConfig, {\n        targetFilePath: 'src/authorizer.ts',\n        bundleOutputDir: 'authorizer',\n        external: [/@aws-sdk\\/.*/],\n      });\n    }\n\n    addDependencyToTargetIfNotPresent(projectConfig, 'build', 'bundle');\n  }\n\n  projectConfig.targets = sortObjectKeys(projectConfig.targets);\n\n  updateProjectConfiguration(tree, projectConfig.name, projectConfig);\n\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files'),\n    backendRoot,\n    enhancedOptions,\n    {\n      overwriteStrategy: OverwriteStrategy.Overwrite,\n    },\n  );\n\n  tree.delete(joinPathFragments(backendRoot, 'src', 'lib'));\n\n  if (options.infra !== 'none' && options.auth === 'custom') {\n    const authorizerType = options.infra === 'http-lambda' ? 'http' : 'rest';\n    generateFiles(\n      tree,\n      joinPathFragments(\n        import.meta.dirname,\n        '..',\n        '..',\n        'utils',\n        'api-constructs',\n        'files',\n        'cdk',\n        'authorizer',\n        authorizerType,\n      ),\n      joinPathFragments(backendRoot, 'src'),\n      {},\n      {\n        overwriteStrategy: OverwriteStrategy.KeepExisting,\n      },\n    );\n  }\n\n  // Remove streaming schema helper for HTTP APIs (API Gateway HTTP API doesn't support streaming)\n  if (options.infra !== 'rest-lambda' && options.infra !== 'none') {\n    tree.delete(\n      joinPathFragments(backendRoot, 'src', 'schema', 'z-async-iterable.ts'),\n    );\n  }\n\n  addDependenciesToPackageJson(\n    tree,\n    withVersions([\n      'aws-xray-sdk-core',\n      'zod',\n      '@aws-lambda-powertools/logger',\n      '@aws-lambda-powertools/metrics',\n      '@aws-lambda-powertools/parameters',\n      '@aws-lambda-powertools/tracer',\n      '@aws-sdk/client-appconfigdata',\n      '@trpc/server',\n      '@trpc/client',\n      'aws4fetch',\n      '@aws-sdk/credential-providers',\n      ...(options.auth === 'custom'\n        ? (['@middy/core', '@aws-lambda-powertools/parser'] as const)\n        : []),\n    ]),\n    withVersions(['@types/aws-lambda', 'tsx', 'cors', '@types/cors']),\n  );\n  tree.delete(joinPathFragments(backendRoot, 'package.json'));\n\n  addGeneratorMetadata(tree, backendName, TRPC_BACKEND_GENERATOR_INFO);\n\n  await addGeneratorMetricsIfApplicable(tree, [TRPC_BACKEND_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n}\n\nconst validateTrpcInfraAndIntegrationPatternCombination = (\n  options: TsTrpcApiGeneratorSchema,\n) => {\n  const integrationPattern = getIntegrationPattern(options);\n  const permutation = `${options.infra}::${integrationPattern}`;\n\n  if (!VALID_TRPC_INTEGRATION_PERMUTATIONS.has(permutation)) {\n    throw new Error(\n      `Invalid tRPC infra/integrationPattern combination: ${options.infra} + ${integrationPattern}.`,\n    );\n  }\n};\n\nconst getIntegrationPattern = (\n  options: TsTrpcApiGeneratorSchema,\n): 'isolated' | 'shared' => {\n  return options.integrationPattern ?? 'isolated';\n};\n\nconst getApiGatewayEventType = (options: TsTrpcApiGeneratorSchema): string => {\n  if (options.infra === 'rest-lambda') {\n    return 'APIGatewayProxyEvent';\n  }\n  if (options.auth === 'iam') {\n    return 'APIGatewayProxyEventV2WithIAMAuthorizer';\n  } else if (options.auth === 'cognito') {\n    return 'APIGatewayProxyEventV2WithJWTAuthorizer';\n  }\n  return 'APIGatewayProxyEventV2';\n};\n\nexport default tsTrpcApiGenerator;\n"],"names":["addDependenciesToPackageJson","generateFiles","joinPathFragments","OverwriteStrategy","updateProjectConfiguration","tsProjectGenerator","addApiGatewayInfra","addTypeScriptBundleTarget","formatFilesInSubtree","resolveIac","installDependencies","addGeneratorMetricsIfApplicable","kebabCase","toClassName","getNpmScopePrefix","toScopeAlias","addDependencyToTargetIfNotPresent","addGeneratorMetadata","getGeneratorInfo","readProjectConfigurationUnqualified","sortObjectKeys","getPackageManagerDisplayCommands","assignPort","sharedConstructsGenerator","withVersions","TRPC_BACKEND_GENERATOR_INFO","filename","VALID_TRPC_INTEGRATION_PERMUTATIONS","Set","tsTrpcApiGenerator","tree","options","infra","validateTrpcInfraAndIntegrationPatternCombination","apiNamespace","apiNameKebabCase","name","apiNameClassName","backendName","backendProjectName","projectExists","directory","subDirectory","preferInstallDependencies","projectConfig","backendRoot","root","port","enhancedOptions","backendProjectAlias","pkgMgrCmd","exec","apiGatewayEventType","getApiGatewayEventType","iac","apiProjectName","constructType","backend","type","projectAlias","bundleOutputDir","integrationPattern","getIntegrationPattern","auth","authorizerBundleOutputDir","metadata","apiName","apiType","targets","serve","executor","continuous","commands","cwd","env","LOCAL_DEV","targetFilePath","external","dirname","overwriteStrategy","Overwrite","delete","authorizerType","KeepExisting","languages","permutation","has","Error"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/trpc/backend/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  addDependenciesToPackageJson,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport tsProjectGenerator from '../../ts/lib/generator';\nimport { addApiGatewayInfra } from '../../utils/api-constructs/api-constructs';\nimport { addTypeScriptBundleTarget } from '../../utils/bundle/bundle';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { resolveIac } from '../../utils/iac';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { esmVars } from '../../utils/module-format';\nimport { kebabCase, toClassName } from '../../utils/names';\nimport { getNpmScopePrefix, toScopeAlias } from '../../utils/npm-scope';\nimport {\n  addDependencyToTargetIfNotPresent,\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../utils/nx';\nimport { sortObjectKeys } from '../../utils/object';\nimport { getPackageManagerDisplayCommands } from '../../utils/pkg-manager';\nimport { assignPort } from '../../utils/port';\nimport { sharedConstructsGenerator } from '../../utils/shared-constructs';\nimport { withVersions } from '../../utils/versions';\nimport type { TsTrpcApiGeneratorSchema } from './schema';\n\nexport const TRPC_BACKEND_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nconst VALID_TRPC_INTEGRATION_PERMUTATIONS = new Set([\n  'rest-lambda::isolated',\n  'rest-lambda::shared',\n  'http-lambda::isolated',\n  'http-lambda::shared',\n  'none::isolated',\n  'none::shared',\n]);\n\nexport async function tsTrpcApiGenerator(\n  tree: Tree,\n  options: TsTrpcApiGeneratorSchema,\n) {\n  if (options.infra !== 'none') {\n    validateTrpcInfraAndIntegrationPatternCombination(options);\n  }\n\n  const apiNamespace = getNpmScopePrefix(tree);\n  const apiNameKebabCase = kebabCase(options.name);\n  const apiNameClassName = toClassName(options.name);\n\n  const backendName = apiNameKebabCase;\n  const backendProjectName = `${apiNamespace}${backendName}`;\n\n  let projectExists: boolean;\n  try {\n    readProjectConfigurationUnqualified(tree, backendProjectName);\n    projectExists = true;\n  } catch {\n    projectExists = false;\n  }\n\n  if (!projectExists) {\n    await tsProjectGenerator(tree, {\n      name: backendName,\n      directory: options.directory,\n      subDirectory: options.subDirectory,\n      preferInstallDependencies: false,\n    });\n  }\n\n  const projectConfig = readProjectConfigurationUnqualified(\n    tree,\n    backendProjectName,\n  );\n  const backendRoot = projectConfig.root;\n\n  const port = assignPort(tree, projectConfig, 2022);\n\n  const enhancedOptions = {\n    backendProjectName,\n    backendProjectAlias: toScopeAlias(backendProjectName),\n    apiNameKebabCase,\n    apiNameClassName,\n    backendRoot,\n    pkgMgrCmd: getPackageManagerDisplayCommands().exec,\n    apiGatewayEventType: getApiGatewayEventType(options),\n    port,\n    ...options,\n    ...esmVars(tree),\n  };\n\n  if (options.infra !== 'none') {\n    const iac = await resolveIac(tree, options.iac);\n\n    await sharedConstructsGenerator(tree, {\n      iac,\n    });\n\n    await addApiGatewayInfra(tree, {\n      apiProjectName: backendProjectName,\n      apiNameClassName,\n      apiNameKebabCase,\n      constructType: options.infra === 'http-lambda' ? 'http' : 'rest',\n      backend: {\n        type: 'trpc',\n        projectAlias: enhancedOptions.backendProjectAlias,\n        bundleOutputDir: joinPathFragments('dist', backendRoot, 'bundle'),\n        integrationPattern: getIntegrationPattern(options),\n        ...(options.auth === 'custom' && {\n          authorizerBundleOutputDir: joinPathFragments(\n            'dist',\n            backendRoot,\n            'bundle',\n            'authorizer',\n          ),\n        }),\n      },\n      auth: options.auth,\n      iac,\n    });\n  }\n\n  projectConfig.metadata = {\n    ...projectConfig.metadata,\n    apiName: options.name,\n    apiType: 'trpc',\n    auth: options.auth,\n    infra: options.infra,\n    integrationPattern: getIntegrationPattern(options),\n  } as unknown;\n\n  projectConfig.targets.serve = {\n    executor: 'nx:run-commands',\n    continuous: true,\n    options: {\n      commands: ['tsx --watch src/local-server.ts'],\n      cwd: '{projectRoot}',\n    },\n  };\n\n  projectConfig.targets['dev'] = {\n    ...projectConfig.targets['dev'],\n    ...projectConfig.targets.serve,\n    options: {\n      ...projectConfig.targets.serve.options,\n      env: {\n        LOCAL_DEV: 'true',\n      },\n    },\n  };\n\n  if (options.infra !== 'none') {\n    await addTypeScriptBundleTarget(tree, projectConfig, {\n      targetFilePath: 'src/handler.ts',\n      external: [/@aws-sdk\\/.*/], // lambda runtime provides aws sdk\n    });\n\n    if (options.auth === 'custom') {\n      await addTypeScriptBundleTarget(tree, projectConfig, {\n        targetFilePath: 'src/authorizer.ts',\n        bundleOutputDir: 'authorizer',\n        external: [/@aws-sdk\\/.*/],\n      });\n    }\n\n    addDependencyToTargetIfNotPresent(projectConfig, 'build', 'bundle');\n  }\n\n  projectConfig.targets = sortObjectKeys(projectConfig.targets);\n\n  updateProjectConfiguration(tree, projectConfig.name, projectConfig);\n\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files'),\n    backendRoot,\n    enhancedOptions,\n    {\n      overwriteStrategy: OverwriteStrategy.Overwrite,\n    },\n  );\n\n  tree.delete(joinPathFragments(backendRoot, 'src', 'lib'));\n\n  if (options.infra !== 'none' && options.auth === 'custom') {\n    const authorizerType = options.infra === 'http-lambda' ? 'http' : 'rest';\n    generateFiles(\n      tree,\n      joinPathFragments(\n        import.meta.dirname,\n        '..',\n        '..',\n        'utils',\n        'api-constructs',\n        'files',\n        'cdk',\n        'authorizer',\n        authorizerType,\n      ),\n      joinPathFragments(backendRoot, 'src'),\n      {},\n      {\n        overwriteStrategy: OverwriteStrategy.KeepExisting,\n      },\n    );\n  }\n\n  // Remove streaming schema helper for HTTP APIs (API Gateway HTTP API doesn't support streaming)\n  if (options.infra !== 'rest-lambda' && options.infra !== 'none') {\n    tree.delete(\n      joinPathFragments(backendRoot, 'src', 'schema', 'z-async-iterable.ts'),\n    );\n  }\n\n  addDependenciesToPackageJson(\n    tree,\n    withVersions([\n      'aws-xray-sdk-core',\n      'zod',\n      '@aws-lambda-powertools/logger',\n      '@aws-lambda-powertools/metrics',\n      '@aws-lambda-powertools/parameters',\n      '@aws-lambda-powertools/tracer',\n      '@aws-sdk/client-appconfigdata',\n      '@trpc/server',\n      '@trpc/client',\n      'aws4fetch',\n      '@aws-sdk/credential-providers',\n      ...(options.auth === 'custom'\n        ? (['@middy/core', '@aws-lambda-powertools/parser'] as const)\n        : []),\n    ]),\n    withVersions(['@types/aws-lambda', 'tsx', 'cors', '@types/cors']),\n  );\n  tree.delete(joinPathFragments(backendRoot, 'package.json'));\n\n  addGeneratorMetadata(tree, backendName, TRPC_BACKEND_GENERATOR_INFO);\n\n  await addGeneratorMetricsIfApplicable(tree, [TRPC_BACKEND_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n}\n\nconst validateTrpcInfraAndIntegrationPatternCombination = (\n  options: TsTrpcApiGeneratorSchema,\n) => {\n  const integrationPattern = getIntegrationPattern(options);\n  const permutation = `${options.infra}::${integrationPattern}`;\n\n  if (!VALID_TRPC_INTEGRATION_PERMUTATIONS.has(permutation)) {\n    throw new Error(\n      `Invalid tRPC infra/integrationPattern combination: ${options.infra} + ${integrationPattern}.`,\n    );\n  }\n};\n\nconst getIntegrationPattern = (\n  options: TsTrpcApiGeneratorSchema,\n): 'isolated' | 'shared' => {\n  return options.integrationPattern ?? 'isolated';\n};\n\nconst getApiGatewayEventType = (options: TsTrpcApiGeneratorSchema): string => {\n  if (options.infra === 'rest-lambda') {\n    return 'APIGatewayProxyEvent';\n  }\n  if (options.auth === 'iam') {\n    return 'APIGatewayProxyEventV2WithIAMAuthorizer';\n  } else if (options.auth === 'cognito') {\n    return 'APIGatewayProxyEventV2WithJWTAuthorizer';\n  }\n  return 'APIGatewayProxyEventV2';\n};\n\nexport default tsTrpcApiGenerator;\n"],"names":["addDependenciesToPackageJson","generateFiles","joinPathFragments","OverwriteStrategy","updateProjectConfiguration","tsProjectGenerator","addApiGatewayInfra","addTypeScriptBundleTarget","formatFilesInSubtree","resolveIac","installDependencies","addGeneratorMetricsIfApplicable","esmVars","kebabCase","toClassName","getNpmScopePrefix","toScopeAlias","addDependencyToTargetIfNotPresent","addGeneratorMetadata","getGeneratorInfo","readProjectConfigurationUnqualified","sortObjectKeys","getPackageManagerDisplayCommands","assignPort","sharedConstructsGenerator","withVersions","TRPC_BACKEND_GENERATOR_INFO","filename","VALID_TRPC_INTEGRATION_PERMUTATIONS","Set","tsTrpcApiGenerator","tree","options","infra","validateTrpcInfraAndIntegrationPatternCombination","apiNamespace","apiNameKebabCase","name","apiNameClassName","backendName","backendProjectName","projectExists","directory","subDirectory","preferInstallDependencies","projectConfig","backendRoot","root","port","enhancedOptions","backendProjectAlias","pkgMgrCmd","exec","apiGatewayEventType","getApiGatewayEventType","iac","apiProjectName","constructType","backend","type","projectAlias","bundleOutputDir","integrationPattern","getIntegrationPattern","auth","authorizerBundleOutputDir","metadata","apiName","apiType","targets","serve","executor","continuous","commands","cwd","env","LOCAL_DEV","targetFilePath","external","dirname","overwriteStrategy","Overwrite","delete","authorizerType","KeepExisting","languages","permutation","has","Error"],"mappings":"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"}

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

@@ -748,6 +748,25 @@ variable "tags" {
   default     = {}
 }
 
+# VPC Configuration (optional)
+variable "enable_vpc" {
+  description = "Run the agent core runtime inside a VPC. Set alongside vpc_id/subnet_ids."
+  type        = bool
+  default     = false
+}
+
+variable "vpc_id" {
+  description = "VPC ID to run the agent core runtime in. Required when enable_vpc is true."
+  type        = string
+  default     = null
+}
+
+variable "subnet_ids" {
+  description = "Subnet IDs to run the agent core runtime in. Required when enable_vpc is true."
+  type        = list(string)
+  default     = null
+}
+
 variable "appconfig_application_id" {
   description = "ID of the shared runtime-config AppConfig application (from \`core/runtime-config/appconfig.application_id\`). The agent reads its runtime configuration from this application."
   type        = string
@@ -763,6 +782,9 @@ module "agent_core_runtime" {
   agent_runtime_name = "TerraformSnapshotAgent"
   docker_image_tag = "proj-terraform-snapshot-agent:latest"
   server_protocol = "HTTP"
+  enable_vpc = var.enable_vpc
+  vpc_id = var.vpc_id
+  subnet_ids = var.subnet_ids
 
   env = merge({
     RUNTIME_CONFIG_APP_ID = var.appconfig_application_id
@@ -817,6 +839,11 @@ output "appconfig_application_id" {
   description = "AppConfig Application ID for runtime config (passthrough of the shared \`appconfig_application_id\` input)."
   value       = var.appconfig_application_id
 }
+
+output "security_group_id" {
+  description = "Security group ID of the agent core runtime, for use in ingress rules on resources it must reach (e.g. a database). Null unless enable_vpc is true."
+  value       = module.agent_core_runtime.security_group_id
+}
 "
 `;
 
@@ -827,7 +854,7 @@ exports[`ts#agent generator > should match snapshot for Terraform generated file
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
     null = {
       source  = "hashicorp/null"
@@ -893,6 +920,30 @@ variable "additional_iam_policy_statements" {
   default = []
 }
 
+# VPC Configuration (optional)
+variable "enable_vpc" {
+  description = "Run the agent core runtime inside a VPC. Set alongside vpc_id/subnet_ids."
+  type        = bool
+  default     = false
+}
+
+variable "vpc_id" {
+  description = "VPC ID to run the agent core runtime in. Required when enable_vpc is true."
+  type        = string
+  default     = null
+
+  validation {
+    condition     = !var.enable_vpc || (var.vpc_id != null && var.subnet_ids != null)
+    error_message = "vpc_id and subnet_ids must be set when enable_vpc is true."
+  }
+}
+
+variable "subnet_ids" {
+  description = "Subnet IDs to run the agent core runtime in. Required when enable_vpc is true."
+  type        = list(string)
+  default     = null
+}
+
 variable "tags" {
   description = "Tags to apply to resources"
   type        = map(string)
@@ -1128,6 +1179,28 @@ resource "null_resource" "docker_publish" {
   depends_on = [aws_ecr_repository_policy.agent_core_ecr_policy]
 }
 
+# Security group for the agent core runtime, used when running inside a VPC
+resource "aws_security_group" "agent_core_runtime" {
+  count = var.enable_vpc ? 1 : 0
+
+  #checkov:skip=CKV2_AWS_5:Attached to the runtime via network_configuration; Checkov cannot resolve this reference
+  name_prefix = "\${var.agent_runtime_name}-runtime-"
+  description = "Security group for the \${var.agent_runtime_name} agent core runtime"
+  vpc_id      = var.vpc_id
+  tags        = var.tags
+}
+
+resource "aws_vpc_security_group_egress_rule" "agent_core_runtime_https" {
+  count = var.enable_vpc ? 1 : 0
+
+  security_group_id = aws_security_group.agent_core_runtime[0].id
+  cidr_ipv4         = "0.0.0.0/0"
+  from_port         = 443
+  to_port           = 443
+  ip_protocol       = "tcp"
+  description       = "Allow outbound HTTPS to AWS service endpoints"
+}
+
 # Bedrock AgentCore Agent Runtime
 resource "aws_bedrockagentcore_agent_runtime" "agent_runtime" {
   agent_runtime_name = "\${var.agent_runtime_name}_\${random_id.unique_suffix.hex}"
@@ -1154,7 +1227,15 @@ resource "aws_bedrockagentcore_agent_runtime" "agent_runtime" {
   }
 
   network_configuration {
-    network_mode = "PUBLIC"
+    network_mode = var.enable_vpc ? "VPC" : "PUBLIC"
+
+    dynamic "network_mode_config" {
+      for_each = var.enable_vpc ? [1] : []
+      content {
+        security_groups = [aws_security_group.agent_core_runtime[0].id]
+        subnets         = var.subnet_ids
+      }
+    }
   }
 
   protocol_configuration {
@@ -1181,7 +1262,7 @@ resource "null_resource" "runtime_ready" {
 
   provisioner "local-exec" {
     command = <<-EOT
-      uv run --with boto3==1.43.37 python -c "
+      uv run --with boto3==1.43.46 python -c "
 import boto3
 import json
 import os
@@ -1256,6 +1337,11 @@ output "agent_runtime_version" {
   description = "Version of the Bedrock Agent Core runtime"
   value       = aws_bedrockagentcore_agent_runtime.agent_runtime.agent_runtime_version
 }
+
+output "security_group_id" {
+  description = "Security group ID of the agent core runtime, for use in ingress rules on resources it must reach (e.g. a database). Null unless enable_vpc is true."
+  value       = var.enable_vpc ? aws_security_group.agent_core_runtime[0].id : null
+}
 "
 `;
 

package/src/ts/agent/a2a-connection/files/agent-connection/app/__targetAgentKebabCase__-client-strands.ts.template

@@ -1,6 +1,6 @@
 import { A2AAgent } from '@strands-agents/sdk/a2a';
-import { AgentCoreA2aClientStrands } from '../core/agentcore-a2a-client-strands.js';
-import { getAgentCoreRuntimeConfig } from '../core/runtime-config.js';
+import { AgentCoreA2aClientStrands } from '../core/agentcore-a2a-client-strands<% if (esm) { %>.js<% } %>';
+import { getAgentCoreRuntimeConfig } from '../core/runtime-config<% if (esm) { %>.js<% } %>';
 
 /** Strands client for the <%- targetAgentClassName %> A2A agent. */
 export class <%- targetAgentClassName %>ClientStrands {

package/src/ts/agent/a2a-connection/generator.js

@@ -7,6 +7,7 @@ import { addDestructuredImport, addStarExport, applyGritQL } from "../../../util
 import { formatFilesInSubtree } from "../../../utils/format.js";
 import { installDependencies } from "../../../utils/install.js";
 import { addGeneratorMetricsIfApplicable } from "../../../utils/metrics.js";
+import { esmVars } from "../../../utils/module-format.js";
 import { kebabCase } from "../../../utils/names.js";
 import { getNpmScope } from "../../../utils/npm-scope.js";
 import { addDependencyToTargetIfNotPresent, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../../utils/nx.js";
@@ -38,7 +39,8 @@ export const tsAgentA2aConnectionGenerator = async (tree, options)=>{
     generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'agent-connection', 'app'), joinPathFragments(AGENT_CONNECTION_PROJECT_DIR, 'src', 'app'), {
         targetAgentKebabCase,
         targetAgentClassName,
-        targetAgentPort
+        targetAgentPort,
+        ...esmVars(tree)
     }, {
         overwriteStrategy: OverwriteStrategy.KeepExisting
     });

package/src/ts/agent/a2a-connection/generator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/ts/agent/a2a-connection/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  addDependenciesToPackageJson,\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport {\n  AGENT_CONNECTION_PROJECT_DIR,\n  addTypeScriptCoreClient,\n  ensureTypeScriptAgentConnectionProject,\n} from '../../../utils/agent-connection/agent-connection';\nimport {\n  addDestructuredImport,\n  addStarExport,\n  applyGritQL,\n} from '../../../utils/ast';\nimport { formatFilesInSubtree } from '../../../utils/format';\nimport { installDependencies } from '../../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../../utils/metrics';\nimport { kebabCase } from '../../../utils/names';\nimport { getNpmScope } from '../../../utils/npm-scope';\nimport {\n  addDependencyToTargetIfNotPresent,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../../utils/nx';\nimport { withVersions } from '../../../utils/versions';\nimport type { TsAgentA2aConnectionGeneratorSchema } from './schema';\n\nexport const TS_AGENT_A2A_CONNECTION_GENERATOR_INFO: NxGeneratorInfo =\n  getGeneratorInfo(import.meta.filename);\n\nexport const tsAgentA2aConnectionGenerator = async (\n  tree: Tree,\n  options: TsAgentA2aConnectionGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const sourceProject = readProjectConfigurationUnqualified(\n    tree,\n    options.sourceProject,\n  );\n  const targetProject = readProjectConfigurationUnqualified(\n    tree,\n    options.targetProject,\n  );\n\n  const agentComponent = options.sourceComponent;\n  const targetAgentComponent = options.targetComponent;\n\n  if (!agentComponent || !targetAgentComponent) {\n    throw new Error(\n      'Both sourceComponent and targetComponent must be provided for ts#agent -> a2a connections',\n    );\n  }\n\n  if ((targetAgentComponent.protocol ?? '').toLowerCase() !== 'a2a') {\n    throw new Error(\n      `Target agent '${targetAgentComponent.name}' uses the ${targetAgentComponent.protocol ?? 'http'} protocol — only A2A agents can be connected as tools.`,\n    );\n  }\n\n  if (\n    targetAgentComponent.auth &&\n    targetAgentComponent.auth.toLowerCase() !== 'iam'\n  ) {\n    throw new Error(\n      `A2A agent connection currently only supports IAM authentication, but '${targetAgentComponent.name}' uses '${targetAgentComponent.auth}' authentication.`,\n    );\n  }\n\n  const targetAgentComponentName = targetAgentComponent.name ?? 'agent';\n  const targetAgentClassName = targetAgentComponent.rc as string;\n  const targetAgentKebabCase = kebabCase(targetAgentClassName);\n  const targetAgentPort = targetAgentComponent.port ?? 9000;\n\n  const npmScope = getNpmScope(tree);\n\n  // 1. Ensure the shared agent-connection project exists + has the A2A core client\n  await ensureTypeScriptAgentConnectionProject(tree);\n  await addTypeScriptCoreClient(tree, 'a2a');\n\n  // 2. Generate the per-connection <Name>Client into app/\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'agent-connection', 'app'),\n    joinPathFragments(AGENT_CONNECTION_PROJECT_DIR, 'src', 'app'),\n    {\n      targetAgentKebabCase,\n      targetAgentClassName,\n      targetAgentPort,\n    },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Add re-export to index.ts\n  await addStarExport(\n    tree,\n    joinPathFragments(AGENT_CONNECTION_PROJECT_DIR, 'src', 'index.ts'),\n    `./app/${targetAgentKebabCase}-client-strands.js`,\n  );\n\n  // 3. AST transform agent.ts to add the remote A2A agent as a tool\n  const agentSourceDir = joinPathFragments(\n    sourceProject.root,\n    agentComponent.path ?? 'src',\n  );\n  const agentFilePath = joinPathFragments(agentSourceDir, 'agent.ts');\n\n  if (tree.exists(agentFilePath)) {\n    const clientClassName = `${targetAgentClassName}ClientStrands`;\n    const clientVarName =\n      targetAgentClassName.charAt(0).toLowerCase() +\n      targetAgentClassName.slice(1);\n    const toolName = `ask${targetAgentClassName}`;\n    const toolVarName = `${clientVarName}Tool`;\n\n    // Ensure tool + z imports are available\n    await addDestructuredImport(\n      tree,\n      agentFilePath,\n      ['tool'],\n      '@strands-agents/sdk',\n    );\n    await addDestructuredImport(tree, agentFilePath, ['z'], 'zod');\n    await addDestructuredImport(\n      tree,\n      agentFilePath,\n      [clientClassName],\n      `:${npmScope}/agent-connection`,\n    );\n\n    // Build the tool creation + Agent wiring.\n    const toolCreationBlock = `const ${clientVarName} = await ${clientClassName}.create();\n  const ${toolVarName} = tool({\n    name: '${toolName}',\n    description: 'Delegate a question to the remote ${targetAgentClassName} A2A agent and return its reply.',\n    inputSchema: z.object({ prompt: z.string() }),\n    callback: async ({ prompt }) => (await ${clientVarName}.invoke(prompt)).toString(),\n  });`;\n\n    // Transform the arrow function that contains `new Agent`:\n    // - Expression body: wrap in block with tool creation and return\n    // - Block body: prepend tool creation statement\n    await applyGritQL(\n      tree,\n      agentFilePath,\n      `or { \\`async ($p) => new Agent($args)\\` => raw\\`async ($p) => {\n  ${toolCreationBlock}\n  return new Agent($args);\n}\\` where { $program <: not contains \\`${clientClassName}.create\\` }, \\`async ($p) => { $body }\\` => raw\\`async ($p) => {\n  ${toolCreationBlock}\n  $body\n}\\` where { $body <: contains \\`new Agent($_)\\`, $program <: not contains \\`${clientClassName}.create\\` } }`,\n    );\n\n    // Append the tool to the tools array (after existing items)\n    await applyGritQL(\n      tree,\n      agentFilePath,\n      `\\`tools: [$items]\\` => \\`tools: [$items, ${toolVarName}]\\` where { $items <: within \\`new Agent($_)\\`, $items <: not contains \\`${toolVarName}\\` }`,\n    );\n  }\n\n  // 4. Set up dev target — depend on the target agent's dev\n  //    so running the host's dev also spins up the remote A2A agent.\n  const agentName = agentComponent.name ?? 'agent';\n  const devTargetName = `${agentName}-dev`;\n  const targetDevTargetName = `${targetAgentComponentName}-dev`;\n\n  if (sourceProject.targets?.[devTargetName]) {\n    addDependencyToTargetIfNotPresent(sourceProject, devTargetName, {\n      projects: [targetProject.name],\n      target: targetDevTargetName,\n    });\n    updateProjectConfiguration(tree, sourceProject.name, sourceProject);\n  }\n\n  // 5. Add dependencies\n  addDependenciesToPackageJson(\n    tree,\n    withVersions([\n      '@a2a-js/sdk',\n      '@strands-agents/sdk',\n      '@aws-lambda-powertools/parameters',\n      '@aws-sdk/client-appconfigdata',\n      'aws4fetch',\n      '@aws-sdk/credential-providers',\n      'zod',\n    ]),\n    {},\n  );\n\n  await addGeneratorMetricsIfApplicable(tree, [\n    TS_AGENT_A2A_CONNECTION_GENERATOR_INFO,\n  ]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default tsAgentA2aConnectionGenerator;\n"],"names":["addDependenciesToPackageJson","generateFiles","joinPathFragments","OverwriteStrategy","updateProjectConfiguration","AGENT_CONNECTION_PROJECT_DIR","addTypeScriptCoreClient","ensureTypeScriptAgentConnectionProject","addDestructuredImport","addStarExport","applyGritQL","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","kebabCase","getNpmScope","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","withVersions","TS_AGENT_A2A_CONNECTION_GENERATOR_INFO","filename","tsAgentA2aConnectionGenerator","tree","options","sourceProject","targetProject","agentComponent","sourceComponent","targetAgentComponent","targetComponent","Error","protocol","toLowerCase","name","auth","targetAgentComponentName","targetAgentClassName","rc","targetAgentKebabCase","targetAgentPort","port","npmScope","dirname","overwriteStrategy","KeepExisting","agentSourceDir","root","path","agentFilePath","exists","clientClassName","clientVarName","charAt","slice","toolName","toolVarName","toolCreationBlock","agentName","devTargetName","targetDevTargetName","targets","projects","target","preferInstallDependencies","languages"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/ts/agent/a2a-connection/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  addDependenciesToPackageJson,\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport {\n  AGENT_CONNECTION_PROJECT_DIR,\n  addTypeScriptCoreClient,\n  ensureTypeScriptAgentConnectionProject,\n} from '../../../utils/agent-connection/agent-connection';\nimport {\n  addDestructuredImport,\n  addStarExport,\n  applyGritQL,\n} from '../../../utils/ast';\nimport { formatFilesInSubtree } from '../../../utils/format';\nimport { installDependencies } from '../../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../../utils/metrics';\nimport { esmVars } from '../../../utils/module-format';\nimport { kebabCase } from '../../../utils/names';\nimport { getNpmScope } from '../../../utils/npm-scope';\nimport {\n  addDependencyToTargetIfNotPresent,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../../utils/nx';\nimport { withVersions } from '../../../utils/versions';\nimport type { TsAgentA2aConnectionGeneratorSchema } from './schema';\n\nexport const TS_AGENT_A2A_CONNECTION_GENERATOR_INFO: NxGeneratorInfo =\n  getGeneratorInfo(import.meta.filename);\n\nexport const tsAgentA2aConnectionGenerator = async (\n  tree: Tree,\n  options: TsAgentA2aConnectionGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const sourceProject = readProjectConfigurationUnqualified(\n    tree,\n    options.sourceProject,\n  );\n  const targetProject = readProjectConfigurationUnqualified(\n    tree,\n    options.targetProject,\n  );\n\n  const agentComponent = options.sourceComponent;\n  const targetAgentComponent = options.targetComponent;\n\n  if (!agentComponent || !targetAgentComponent) {\n    throw new Error(\n      'Both sourceComponent and targetComponent must be provided for ts#agent -> a2a connections',\n    );\n  }\n\n  if ((targetAgentComponent.protocol ?? '').toLowerCase() !== 'a2a') {\n    throw new Error(\n      `Target agent '${targetAgentComponent.name}' uses the ${targetAgentComponent.protocol ?? 'http'} protocol — only A2A agents can be connected as tools.`,\n    );\n  }\n\n  if (\n    targetAgentComponent.auth &&\n    targetAgentComponent.auth.toLowerCase() !== 'iam'\n  ) {\n    throw new Error(\n      `A2A agent connection currently only supports IAM authentication, but '${targetAgentComponent.name}' uses '${targetAgentComponent.auth}' authentication.`,\n    );\n  }\n\n  const targetAgentComponentName = targetAgentComponent.name ?? 'agent';\n  const targetAgentClassName = targetAgentComponent.rc as string;\n  const targetAgentKebabCase = kebabCase(targetAgentClassName);\n  const targetAgentPort = targetAgentComponent.port ?? 9000;\n\n  const npmScope = getNpmScope(tree);\n\n  // 1. Ensure the shared agent-connection project exists + has the A2A core client\n  await ensureTypeScriptAgentConnectionProject(tree);\n  await addTypeScriptCoreClient(tree, 'a2a');\n\n  // 2. Generate the per-connection <Name>Client into app/\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'agent-connection', 'app'),\n    joinPathFragments(AGENT_CONNECTION_PROJECT_DIR, 'src', 'app'),\n    {\n      targetAgentKebabCase,\n      targetAgentClassName,\n      targetAgentPort,\n      ...esmVars(tree),\n    },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Add re-export to index.ts\n  await addStarExport(\n    tree,\n    joinPathFragments(AGENT_CONNECTION_PROJECT_DIR, 'src', 'index.ts'),\n    `./app/${targetAgentKebabCase}-client-strands.js`,\n  );\n\n  // 3. AST transform agent.ts to add the remote A2A agent as a tool\n  const agentSourceDir = joinPathFragments(\n    sourceProject.root,\n    agentComponent.path ?? 'src',\n  );\n  const agentFilePath = joinPathFragments(agentSourceDir, 'agent.ts');\n\n  if (tree.exists(agentFilePath)) {\n    const clientClassName = `${targetAgentClassName}ClientStrands`;\n    const clientVarName =\n      targetAgentClassName.charAt(0).toLowerCase() +\n      targetAgentClassName.slice(1);\n    const toolName = `ask${targetAgentClassName}`;\n    const toolVarName = `${clientVarName}Tool`;\n\n    // Ensure tool + z imports are available\n    await addDestructuredImport(\n      tree,\n      agentFilePath,\n      ['tool'],\n      '@strands-agents/sdk',\n    );\n    await addDestructuredImport(tree, agentFilePath, ['z'], 'zod');\n    await addDestructuredImport(\n      tree,\n      agentFilePath,\n      [clientClassName],\n      `:${npmScope}/agent-connection`,\n    );\n\n    // Build the tool creation + Agent wiring.\n    const toolCreationBlock = `const ${clientVarName} = await ${clientClassName}.create();\n  const ${toolVarName} = tool({\n    name: '${toolName}',\n    description: 'Delegate a question to the remote ${targetAgentClassName} A2A agent and return its reply.',\n    inputSchema: z.object({ prompt: z.string() }),\n    callback: async ({ prompt }) => (await ${clientVarName}.invoke(prompt)).toString(),\n  });`;\n\n    // Transform the arrow function that contains `new Agent`:\n    // - Expression body: wrap in block with tool creation and return\n    // - Block body: prepend tool creation statement\n    await applyGritQL(\n      tree,\n      agentFilePath,\n      `or { \\`async ($p) => new Agent($args)\\` => raw\\`async ($p) => {\n  ${toolCreationBlock}\n  return new Agent($args);\n}\\` where { $program <: not contains \\`${clientClassName}.create\\` }, \\`async ($p) => { $body }\\` => raw\\`async ($p) => {\n  ${toolCreationBlock}\n  $body\n}\\` where { $body <: contains \\`new Agent($_)\\`, $program <: not contains \\`${clientClassName}.create\\` } }`,\n    );\n\n    // Append the tool to the tools array (after existing items)\n    await applyGritQL(\n      tree,\n      agentFilePath,\n      `\\`tools: [$items]\\` => \\`tools: [$items, ${toolVarName}]\\` where { $items <: within \\`new Agent($_)\\`, $items <: not contains \\`${toolVarName}\\` }`,\n    );\n  }\n\n  // 4. Set up dev target — depend on the target agent's dev\n  //    so running the host's dev also spins up the remote A2A agent.\n  const agentName = agentComponent.name ?? 'agent';\n  const devTargetName = `${agentName}-dev`;\n  const targetDevTargetName = `${targetAgentComponentName}-dev`;\n\n  if (sourceProject.targets?.[devTargetName]) {\n    addDependencyToTargetIfNotPresent(sourceProject, devTargetName, {\n      projects: [targetProject.name],\n      target: targetDevTargetName,\n    });\n    updateProjectConfiguration(tree, sourceProject.name, sourceProject);\n  }\n\n  // 5. Add dependencies\n  addDependenciesToPackageJson(\n    tree,\n    withVersions([\n      '@a2a-js/sdk',\n      '@strands-agents/sdk',\n      '@aws-lambda-powertools/parameters',\n      '@aws-sdk/client-appconfigdata',\n      'aws4fetch',\n      '@aws-sdk/credential-providers',\n      'zod',\n    ]),\n    {},\n  );\n\n  await addGeneratorMetricsIfApplicable(tree, [\n    TS_AGENT_A2A_CONNECTION_GENERATOR_INFO,\n  ]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default tsAgentA2aConnectionGenerator;\n"],"names":["addDependenciesToPackageJson","generateFiles","joinPathFragments","OverwriteStrategy","updateProjectConfiguration","AGENT_CONNECTION_PROJECT_DIR","addTypeScriptCoreClient","ensureTypeScriptAgentConnectionProject","addDestructuredImport","addStarExport","applyGritQL","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","esmVars","kebabCase","getNpmScope","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","withVersions","TS_AGENT_A2A_CONNECTION_GENERATOR_INFO","filename","tsAgentA2aConnectionGenerator","tree","options","sourceProject","targetProject","agentComponent","sourceComponent","targetAgentComponent","targetComponent","Error","protocol","toLowerCase","name","auth","targetAgentComponentName","targetAgentClassName","rc","targetAgentKebabCase","targetAgentPort","port","npmScope","dirname","overwriteStrategy","KeepExisting","agentSourceDir","root","path","agentFilePath","exists","clientClassName","clientVarName","charAt","slice","toolName","toolVarName","toolCreationBlock","agentName","devTargetName","targetDevTargetName","targets","projects","target","preferInstallDependencies","languages"],"mappings":"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"}

package/src/ts/agent/files/a2a/index.ts.template

@@ -2,7 +2,7 @@ import { A2AExpressServer } from '@strands-agents/sdk/a2a/express';
 import express, { type Request, type Response, type NextFunction } from 'express';
 import { randomUUID } from 'node:crypto';
 import { runWithSessionId, withSessionId } from '<%- agentConnectionImport %>';
-import { getAgent } from './agent.js';
+import { getAgent } from './agent<% if (esm) { %>.js<% } %>';
 
 const PORT = parseInt(process.env.PORT || '9000');
 const HOST = '0.0.0.0';

package/src/ts/agent/files/ag-ui/index.ts.template

@@ -3,7 +3,7 @@ import { createStrandsApp } from '@ag-ui/aws-strands/server';
 import { randomUUID } from 'node:crypto';
 import type { Request, Response, NextFunction } from 'express';
 import { runWithSessionId } from '<%- agentConnectionImport %>';
-import { getAgent } from './agent.js';
+import { getAgent } from './agent<% if (esm) { %>.js<% } %>';
 
 const PORT = parseInt(process.env.PORT || '8080');
 const HOST = '0.0.0.0';

package/src/ts/agent/files/http/client.ts.template

@@ -1,5 +1,5 @@
-import { AppRouter } from './router.js';
-import { AgentCoreTrpcClient, WebSocketTrpcClient } from './agent-core-trpc-client.js';
+import { AppRouter } from './router<% if (esm) { %>.js<% } %>';
+import { AgentCoreTrpcClient, WebSocketTrpcClient } from './agent-core-trpc-client<% if (esm) { %>.js<% } %>';
 
 /**
  * Client for connecting to <%- agentNameClassName %> on Bedrock AgentCore Runtime via WebSocket from a NodeJS environment

package/src/ts/agent/files/http/index.ts.template

@@ -4,14 +4,14 @@ import {
   CreateHTTPContextOptions,
   createHTTPHandler,
 } from '@trpc/server/adapters/standalone';
-import { appRouter, AppRouter } from './router.js';
+import { appRouter, AppRouter } from './router<% if (esm) { %>.js<% } %>';
 import { WebSocketServer } from 'ws';
 import cors from 'cors';
 import {
   CreateWSSContextFnOptions,
   applyWSSHandler,
 } from '@trpc/server/adapters/ws';
-import { Context } from './init.js';
+import { Context } from './init<% if (esm) { %>.js<% } %>';
 
 const PORT = parseInt(process.env.PORT || '8080');
 

package/src/ts/agent/files/http/router.ts.template

@@ -1,8 +1,8 @@
-import { publicProcedure, t } from './init.js';
+import { publicProcedure, t } from './init<% if (esm) { %>.js<% } %>';
 import { z } from 'zod';
-import { zAsyncIterable } from './schema/z-async-iterable.js';
+import { zAsyncIterable } from './schema/z-async-iterable<% if (esm) { %>.js<% } %>';
 import { enterSessionContext, withSessionId } from '<%- agentConnectionImport %>';
-import { getAgent } from './agent.js';
+import { getAgent } from './agent<% if (esm) { %>.js<% } %>';
 
 export const router = t.router;
 

package/src/ts/agent/gateway-connection/files/agent-connection/app/__gatewayKebabCase__-client-strands.ts.template

@@ -1,6 +1,6 @@
 import { McpClient } from '@strands-agents/sdk';
-import { AgentCoreGatewayMcpClientStrands } from '../core/agentcore-gateway-mcp-client-strands.js';
-import { getAgentCoreRuntimeConfig } from '../core/runtime-config.js';
+import { AgentCoreGatewayMcpClientStrands } from '../core/agentcore-gateway-mcp-client-strands<% if (esm) { %>.js<% } %>';
+import { getAgentCoreRuntimeConfig } from '../core/runtime-config<% if (esm) { %>.js<% } %>';
 
 /**
  * Strands client for the <%- gatewayClassName %> AgentCore Gateway.

package/src/ts/agent/gateway-connection/generator.js

@@ -8,6 +8,7 @@ import { addDestructuredImport, addStarExport } from "../../../utils/ast.js";
 import { formatFilesInSubtree } from "../../../utils/format.js";
 import { installDependencies } from "../../../utils/install.js";
 import { addGeneratorMetricsIfApplicable } from "../../../utils/metrics.js";
+import { esmVars } from "../../../utils/module-format.js";
 import { kebabCase } from "../../../utils/names.js";
 import { getNpmScope } from "../../../utils/npm-scope.js";
 import { addDependencyToTargetIfNotPresent, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../../utils/nx.js";
@@ -45,7 +46,8 @@ export const tsAgentGatewayConnectionGenerator = async (tree, options)=>{
     generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'agent-connection', 'app'), joinPathFragments(AGENT_CONNECTION_PROJECT_DIR, 'src', 'app'), {
         gatewayKebabCase,
         gatewayClassName,
-        gatewayPort: gateway.port
+        gatewayPort: gateway.port,
+        ...esmVars(tree)
     }, {
         overwriteStrategy: OverwriteStrategy.KeepExisting
     });