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

package/src/ts/rdb/generator.js

@@ -11,6 +11,7 @@ import { updateGitIgnore } from "../../utils/git.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, snakeCase, toClassName } from "../../utils/names.js";
 import { getNpmScope, toScopeAlias } from "../../utils/npm-scope.js";
 import { addDependencyToTargetIfNotPresent, addGeneratorMetadata, getGeneratorInfo } from "../../utils/nx.js";
@@ -78,7 +79,8 @@ export const tsRdbGenerator = async (tree, options)=>{
         localDbPassword,
         containerEngine,
         containerName,
-        dockerImage
+        dockerImage,
+        ...esmVars(tree)
     };
     generateFiles(tree, joinPathFragments(import.meta.dirname, 'files'), dir, templateOptions);
     updateGitIgnore(tree, dir, (patterns)=>[
@@ -91,7 +93,7 @@ export const tsRdbGenerator = async (tree, options)=>{
     const relativePathToRoot = getRelativePathToRootByDirectory(projectConfig.root);
     const fs = new FsCommands(tree);
     const migrationBundleDir = joinPathFragments('dist', projectConfig.root, 'bundle', 'migration');
-    const dockerImageTag = `${getNpmScope(tree)}-${kebabCase(options.name)}-migration:latest`;
+    const migrationDockerImageTag = `${getNpmScope(tree)}-${kebabCase(options.name)}-migration:latest`;
     if (options.infra !== 'none') {
         await addTypeScriptBundleTarget(tree, projectConfig, {
             targetFilePath: 'src/migration-handler.ts',
@@ -178,7 +180,7 @@ export const tsRdbGenerator = async (tree, options)=>{
                 cache: true,
                 executor: 'nx:run-commands',
                 options: {
-                    command: `${containerEngine} build --platform linux/arm64 --provenance=false -t ${dockerImageTag} ${migrationBundleDir}`
+                    command: `${containerEngine} build --platform linux/arm64 --provenance=false -t ${migrationDockerImageTag} ${migrationBundleDir}`
                 },
                 dependsOn: [
                     'bundle'
@@ -210,7 +212,8 @@ export const tsRdbGenerator = async (tree, options)=>{
             engine: options.engine,
             migrationBundleDir,
             createDbUserBundleDir: joinPathFragments('dist', projectConfig.root, 'bundle', 'create-db-user'),
-            dockerImageTag,
+            framework: options.framework,
+            migrationDockerImageTag,
             containerEngine
         });
     }

package/src/ts/rdb/generator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/rdb/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { relative } from 'node:path';\nimport {\n  addDependenciesToPackageJson,\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  readProjectConfiguration,\n  type Tree,\n  updateJson,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { addTypeScriptBundleTarget } from '../../utils/bundle/bundle';\nimport { resolveContainers } from '../../utils/containers';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { FsCommands } from '../../utils/fs';\nimport { updateGitIgnore } from '../../utils/git';\nimport { resolveIac } from '../../utils/iac';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { kebabCase, snakeCase, toClassName } from '../../utils/names';\nimport { getNpmScope, toScopeAlias } from '../../utils/npm-scope';\nimport {\n  addDependencyToTargetIfNotPresent,\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n} from '../../utils/nx';\nimport { getRelativePathToRootByDirectory } from '../../utils/paths';\nimport { registerPnpmBuiltDependencies } from '../../utils/pnpm-workspace';\nimport { assignPort } from '../../utils/port';\nimport { addRdbInfra } from '../../utils/rdb-constructs/rdb-constructs';\nimport { sharedConstructsGenerator } from '../../utils/shared-constructs';\nimport {\n  PACKAGES_DIR,\n  SHARED_SCRIPTS_DIR,\n} from '../../utils/shared-constructs-constants';\nimport { sharedRdbScriptsGenerator } from '../../utils/shared-rdb-scripts';\nimport { TS_VERSIONS, withVersions } from '../../utils/versions';\nimport tsProjectGenerator, { getTsLibDetails } from '../lib/generator';\nimport type { TsRdbGeneratorSchema } from './schema';\n\nexport const TS_RDB_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const tsRdbGenerator = async (\n  tree: Tree,\n  options: TsRdbGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const nameKebabCase = kebabCase(options.name);\n  const nameClassName = toClassName(options.name);\n  const databaseUser = options.databaseUser ?? 'dbadmin';\n  const databaseName = snakeCase(options.databaseName ?? options.name);\n  const containerEngine = await resolveContainers(tree, 'inherit');\n  const { fullyQualifiedName, dir } = getTsLibDetails(tree, {\n    name: options.name,\n    directory: options.directory,\n    subDirectory: options.subDirectory,\n  });\n\n  let projectExists: boolean;\n  try {\n    readProjectConfiguration(tree, fullyQualifiedName);\n    projectExists = true;\n  } catch {\n    projectExists = false;\n  }\n\n  if (!projectExists) {\n    await tsProjectGenerator(tree, {\n      name: options.name,\n      directory: options.directory,\n      preferInstallDependencies: false,\n    });\n  }\n\n  updateJson(tree, joinPathFragments(dir, 'tsconfig.lib.json'), (tsConfig) => ({\n    ...tsConfig,\n    include: ['src/**/*.ts', 'generated/prisma/**/*.ts'],\n  }));\n\n  const projectConfig = readProjectConfiguration(tree, fullyQualifiedName);\n  const localDbPort = assignPort(\n    tree,\n    projectConfig,\n    options.engine === 'mysql' ? 3306 : 5432,\n  );\n  const localDbHost = 'localhost';\n  const localDbUser = options.engine === 'mysql' ? 'root' : 'dbadmin';\n  const localDbPassword = 'password';\n  const containerName = `${getNpmScope(tree)}-${databaseName}`;\n  const dockerImage =\n    options.engine === 'mysql'\n      ? 'public.ecr.aws/docker/library/mysql:8.0.44'\n      : 'public.ecr.aws/docker/library/postgres:17.7';\n\n  const templateOptions = {\n    engine: options.engine,\n    runtimeConfigKey: nameClassName,\n    databasePackageAlias: toScopeAlias(fullyQualifiedName),\n    databaseProvider: options.engine === 'mysql' ? 'mysql' : 'postgresql',\n    prismaVersion: TS_VERSIONS.prisma,\n    prismaAdapterPackage:\n      options.engine === 'mysql'\n        ? '@prisma/adapter-mariadb'\n        : '@prisma/adapter-pg',\n    prismaAdapterClassName:\n      options.engine === 'mysql' ? 'PrismaMariaDb' : 'PrismaPg',\n    localDbPort,\n    localDbHost,\n    localDbName: databaseName,\n    localDbUser,\n    localDbPassword,\n    containerEngine,\n    containerName,\n    dockerImage,\n  };\n\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files'),\n    dir,\n    templateOptions,\n  );\n  updateGitIgnore(tree, dir, (patterns) => [...patterns, 'generated/prisma']);\n  await sharedRdbScriptsGenerator(tree, options.engine);\n  const waitForDbScript =\n    options.engine === 'mysql'\n      ? 'wait-for-mysql-db.ts'\n      : 'wait-for-postgres-db.ts';\n  const scriptsDir = relative(\n    dir,\n    joinPathFragments(PACKAGES_DIR, SHARED_SCRIPTS_DIR, 'src', 'rdb'),\n  );\n  const relativePathToRoot = getRelativePathToRootByDirectory(\n    projectConfig.root,\n  );\n  const fs = new FsCommands(tree);\n  const migrationBundleDir = joinPathFragments(\n    'dist',\n    projectConfig.root,\n    'bundle',\n    'migration',\n  );\n  const dockerImageTag = `${getNpmScope(tree)}-${kebabCase(options.name)}-migration:latest`;\n\n  if (options.infra !== 'none') {\n    await addTypeScriptBundleTarget(tree, projectConfig, {\n      targetFilePath: 'src/migration-handler.ts',\n      bundleOutputDir: 'migration',\n    });\n    await addTypeScriptBundleTarget(tree, projectConfig, {\n      targetFilePath: 'src/create-db-user-handler.ts',\n      bundleOutputDir: 'create-db-user',\n    });\n    const bundleTarget = projectConfig.targets['bundle'];\n    // The bundle target starts with a single rolldown `command`. Wrap it with\n    // the migration asset copy steps, unless it has already been transformed\n    // into a `commands` array on a previous run.\n    if (!bundleTarget.options.commands) {\n      const rolldownCommand = bundleTarget.options.command;\n      delete bundleTarget.options.command;\n      bundleTarget.options = {\n        ...bundleTarget.options,\n        commands: [\n          fs.rm(`${relativePathToRoot}dist/{projectRoot}/bundle/migration`),\n          fs.mkdir(`${relativePathToRoot}dist/{projectRoot}/bundle/migration`),\n          fs.cp(\n            'prisma',\n            `${relativePathToRoot}dist/{projectRoot}/bundle/migration/prisma`,\n          ),\n          fs.cp(\n            'prisma.config.ts',\n            `${relativePathToRoot}dist/{projectRoot}/bundle/migration/prisma.config.ts`,\n          ),\n          fs.cp(\n            'Dockerfile',\n            `${relativePathToRoot}dist/{projectRoot}/bundle/migration/Dockerfile`,\n          ),\n          rolldownCommand,\n        ],\n        parallel: false,\n      };\n    }\n  }\n\n  projectConfig.targets.generate = {\n    executor: 'nx:run-commands',\n    outputs: ['{projectRoot}/generated/prisma'],\n    options: {\n      command: 'prisma generate',\n      cwd: '{projectRoot}',\n    },\n  };\n  projectConfig.targets['pull-image'] = {\n    executor: 'nx:run-commands',\n    options: {\n      command: `tsx ${scriptsDir}/pull-image.ts`,\n      cwd: '{projectRoot}',\n    },\n  };\n  projectConfig.targets['dev'] = {\n    executor: 'nx:run-commands',\n    options: {\n      command: `tsx ${scriptsDir}/start-container.ts`,\n      cwd: '{projectRoot}',\n    },\n    continuous: true,\n  };\n  projectConfig.targets['wait-for-db'] = {\n    executor: 'nx:run-commands',\n    dependsOn: ['dev'],\n    options: {\n      command: `tsx ${scriptsDir}/${waitForDbScript}`,\n      cwd: '{projectRoot}',\n    },\n  };\n  projectConfig.targets.prisma = {\n    executor: 'nx:run-commands',\n    dependsOn: ['dev', 'wait-for-db'],\n    options: {\n      cwd: '{projectRoot}',\n      command: 'prisma',\n      env: {\n        LOCAL_DEV: 'true',\n      },\n    },\n  };\n  if (options.infra !== 'none') {\n    const iac = await resolveIac(tree, options.iac);\n    if (iac === 'terraform') {\n      projectConfig.targets['docker'] = {\n        cache: true,\n        executor: 'nx:run-commands',\n        options: {\n          command: `${containerEngine} build --platform linux/arm64 --provenance=false -t ${dockerImageTag} ${migrationBundleDir}`,\n        },\n        dependsOn: ['bundle'],\n      };\n      addDependencyToTargetIfNotPresent(projectConfig, 'build', 'docker');\n    }\n    addDependencyToTargetIfNotPresent(projectConfig, 'build', 'bundle');\n  }\n  addDependencyToTargetIfNotPresent(projectConfig, 'compile', 'generate');\n  updateProjectConfiguration(tree, fullyQualifiedName, projectConfig);\n  addGeneratorMetadata(tree, fullyQualifiedName, TS_RDB_GENERATOR_INFO, {\n    engine: options.engine,\n  });\n\n  if (options.infra !== 'none') {\n    const iac = await resolveIac(tree, options.iac);\n    await sharedConstructsGenerator(tree, { iac });\n    await addRdbInfra(tree, {\n      iac,\n      projectName: fullyQualifiedName,\n      projectRoot: dir,\n      nameClassName,\n      nameKebabCase,\n      databasePackageAlias: toScopeAlias(fullyQualifiedName),\n      databaseName,\n      adminUser: databaseUser,\n      engine: options.engine,\n      migrationBundleDir,\n      createDbUserBundleDir: joinPathFragments(\n        'dist',\n        projectConfig.root,\n        'bundle',\n        'create-db-user',\n      ),\n      dockerImageTag,\n      containerEngine,\n    });\n  }\n\n  addDependenciesToPackageJson(\n    tree,\n    withVersions([\n      '@aws-lambda-powertools/parameters',\n      '@aws-sdk/client-appconfigdata',\n      '@aws-sdk/client-secrets-manager',\n      '@aws-sdk/rds-signer',\n      '@prisma/client',\n      ...(options.engine === 'mysql'\n        ? (['@prisma/adapter-mariadb', 'mariadb'] as const)\n        : (['@prisma/adapter-pg', 'pg'] as const)),\n    ]),\n    withVersions([\n      'prisma',\n      'tsx',\n      '@types/aws-lambda',\n      ...(options.engine === 'mysql'\n        ? ([] as const)\n        : (['@types/pg'] as const)),\n    ]),\n  );\n\n  registerPnpmBuiltDependencies(tree, {\n    '@prisma/engines': false,\n    prisma: false,\n  });\n\n  await addGeneratorMetricsIfApplicable(tree, [TS_RDB_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default tsRdbGenerator;\n"],"names":["relative","addDependenciesToPackageJson","generateFiles","joinPathFragments","readProjectConfiguration","updateJson","updateProjectConfiguration","addTypeScriptBundleTarget","resolveContainers","formatFilesInSubtree","FsCommands","updateGitIgnore","resolveIac","installDependencies","addGeneratorMetricsIfApplicable","kebabCase","snakeCase","toClassName","getNpmScope","toScopeAlias","addDependencyToTargetIfNotPresent","addGeneratorMetadata","getGeneratorInfo","getRelativePathToRootByDirectory","registerPnpmBuiltDependencies","assignPort","addRdbInfra","sharedConstructsGenerator","PACKAGES_DIR","SHARED_SCRIPTS_DIR","sharedRdbScriptsGenerator","TS_VERSIONS","withVersions","tsProjectGenerator","getTsLibDetails","TS_RDB_GENERATOR_INFO","filename","tsRdbGenerator","tree","options","nameKebabCase","name","nameClassName","databaseUser","databaseName","containerEngine","fullyQualifiedName","dir","directory","subDirectory","projectExists","preferInstallDependencies","tsConfig","include","projectConfig","localDbPort","engine","localDbHost","localDbUser","localDbPassword","containerName","dockerImage","templateOptions","runtimeConfigKey","databasePackageAlias","databaseProvider","prismaVersion","prisma","prismaAdapterPackage","prismaAdapterClassName","localDbName","dirname","patterns","waitForDbScript","scriptsDir","relativePathToRoot","root","fs","migrationBundleDir","dockerImageTag","infra","targetFilePath","bundleOutputDir","bundleTarget","targets","commands","rolldownCommand","command","rm","mkdir","cp","parallel","generate","executor","outputs","cwd","continuous","dependsOn","env","LOCAL_DEV","iac","cache","projectName","projectRoot","adminUser","createDbUserBundleDir","languages"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/rdb/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { relative } from 'node:path';\nimport {\n  addDependenciesToPackageJson,\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  readProjectConfiguration,\n  type Tree,\n  updateJson,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { addTypeScriptBundleTarget } from '../../utils/bundle/bundle';\nimport { resolveContainers } from '../../utils/containers';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { FsCommands } from '../../utils/fs';\nimport { updateGitIgnore } from '../../utils/git';\nimport { resolveIac } from '../../utils/iac';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { esmVars } from '../../utils/module-format';\nimport { kebabCase, snakeCase, toClassName } from '../../utils/names';\nimport { getNpmScope, toScopeAlias } from '../../utils/npm-scope';\nimport {\n  addDependencyToTargetIfNotPresent,\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n} from '../../utils/nx';\nimport { getRelativePathToRootByDirectory } from '../../utils/paths';\nimport { registerPnpmBuiltDependencies } from '../../utils/pnpm-workspace';\nimport { assignPort } from '../../utils/port';\nimport { addRdbInfra } from '../../utils/rdb-constructs/rdb-constructs';\nimport { sharedConstructsGenerator } from '../../utils/shared-constructs';\nimport {\n  PACKAGES_DIR,\n  SHARED_SCRIPTS_DIR,\n} from '../../utils/shared-constructs-constants';\nimport { sharedRdbScriptsGenerator } from '../../utils/shared-rdb-scripts';\nimport { TS_VERSIONS, withVersions } from '../../utils/versions';\nimport tsProjectGenerator, { getTsLibDetails } from '../lib/generator';\nimport type { TsRdbGeneratorSchema } from './schema';\n\nexport const TS_RDB_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const tsRdbGenerator = async (\n  tree: Tree,\n  options: TsRdbGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const nameKebabCase = kebabCase(options.name);\n  const nameClassName = toClassName(options.name);\n  const databaseUser = options.databaseUser ?? 'dbadmin';\n  const databaseName = snakeCase(options.databaseName ?? options.name);\n  const containerEngine = await resolveContainers(tree, 'inherit');\n  const { fullyQualifiedName, dir } = getTsLibDetails(tree, {\n    name: options.name,\n    directory: options.directory,\n    subDirectory: options.subDirectory,\n  });\n\n  let projectExists: boolean;\n  try {\n    readProjectConfiguration(tree, fullyQualifiedName);\n    projectExists = true;\n  } catch {\n    projectExists = false;\n  }\n\n  if (!projectExists) {\n    await tsProjectGenerator(tree, {\n      name: options.name,\n      directory: options.directory,\n      preferInstallDependencies: false,\n    });\n  }\n\n  updateJson(tree, joinPathFragments(dir, 'tsconfig.lib.json'), (tsConfig) => ({\n    ...tsConfig,\n    include: ['src/**/*.ts', 'generated/prisma/**/*.ts'],\n  }));\n\n  const projectConfig = readProjectConfiguration(tree, fullyQualifiedName);\n  const localDbPort = assignPort(\n    tree,\n    projectConfig,\n    options.engine === 'mysql' ? 3306 : 5432,\n  );\n  const localDbHost = 'localhost';\n  const localDbUser = options.engine === 'mysql' ? 'root' : 'dbadmin';\n  const localDbPassword = 'password';\n  const containerName = `${getNpmScope(tree)}-${databaseName}`;\n  const dockerImage =\n    options.engine === 'mysql'\n      ? 'public.ecr.aws/docker/library/mysql:8.0.44'\n      : 'public.ecr.aws/docker/library/postgres:17.7';\n\n  const templateOptions = {\n    engine: options.engine,\n    runtimeConfigKey: nameClassName,\n    databasePackageAlias: toScopeAlias(fullyQualifiedName),\n    databaseProvider: options.engine === 'mysql' ? 'mysql' : 'postgresql',\n    prismaVersion: TS_VERSIONS.prisma,\n    prismaAdapterPackage:\n      options.engine === 'mysql'\n        ? '@prisma/adapter-mariadb'\n        : '@prisma/adapter-pg',\n    prismaAdapterClassName:\n      options.engine === 'mysql' ? 'PrismaMariaDb' : 'PrismaPg',\n    localDbPort,\n    localDbHost,\n    localDbName: databaseName,\n    localDbUser,\n    localDbPassword,\n    containerEngine,\n    containerName,\n    dockerImage,\n    ...esmVars(tree),\n  };\n\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files'),\n    dir,\n    templateOptions,\n  );\n  updateGitIgnore(tree, dir, (patterns) => [...patterns, 'generated/prisma']);\n  await sharedRdbScriptsGenerator(tree, options.engine);\n  const waitForDbScript =\n    options.engine === 'mysql'\n      ? 'wait-for-mysql-db.ts'\n      : 'wait-for-postgres-db.ts';\n  const scriptsDir = relative(\n    dir,\n    joinPathFragments(PACKAGES_DIR, SHARED_SCRIPTS_DIR, 'src', 'rdb'),\n  );\n  const relativePathToRoot = getRelativePathToRootByDirectory(\n    projectConfig.root,\n  );\n  const fs = new FsCommands(tree);\n  const migrationBundleDir = joinPathFragments(\n    'dist',\n    projectConfig.root,\n    'bundle',\n    'migration',\n  );\n  const migrationDockerImageTag = `${getNpmScope(tree)}-${kebabCase(options.name)}-migration:latest`;\n\n  if (options.infra !== 'none') {\n    await addTypeScriptBundleTarget(tree, projectConfig, {\n      targetFilePath: 'src/migration-handler.ts',\n      bundleOutputDir: 'migration',\n    });\n    await addTypeScriptBundleTarget(tree, projectConfig, {\n      targetFilePath: 'src/create-db-user-handler.ts',\n      bundleOutputDir: 'create-db-user',\n    });\n    const bundleTarget = projectConfig.targets['bundle'];\n    // The bundle target starts with a single rolldown `command`. Wrap it with\n    // the migration asset copy steps, unless it has already been transformed\n    // into a `commands` array on a previous run.\n    if (!bundleTarget.options.commands) {\n      const rolldownCommand = bundleTarget.options.command;\n      delete bundleTarget.options.command;\n      bundleTarget.options = {\n        ...bundleTarget.options,\n        commands: [\n          fs.rm(`${relativePathToRoot}dist/{projectRoot}/bundle/migration`),\n          fs.mkdir(`${relativePathToRoot}dist/{projectRoot}/bundle/migration`),\n          fs.cp(\n            'prisma',\n            `${relativePathToRoot}dist/{projectRoot}/bundle/migration/prisma`,\n          ),\n          fs.cp(\n            'prisma.config.ts',\n            `${relativePathToRoot}dist/{projectRoot}/bundle/migration/prisma.config.ts`,\n          ),\n          fs.cp(\n            'Dockerfile',\n            `${relativePathToRoot}dist/{projectRoot}/bundle/migration/Dockerfile`,\n          ),\n          rolldownCommand,\n        ],\n        parallel: false,\n      };\n    }\n  }\n\n  projectConfig.targets.generate = {\n    executor: 'nx:run-commands',\n    outputs: ['{projectRoot}/generated/prisma'],\n    options: {\n      command: 'prisma generate',\n      cwd: '{projectRoot}',\n    },\n  };\n  projectConfig.targets['pull-image'] = {\n    executor: 'nx:run-commands',\n    options: {\n      command: `tsx ${scriptsDir}/pull-image.ts`,\n      cwd: '{projectRoot}',\n    },\n  };\n  projectConfig.targets['dev'] = {\n    executor: 'nx:run-commands',\n    options: {\n      command: `tsx ${scriptsDir}/start-container.ts`,\n      cwd: '{projectRoot}',\n    },\n    continuous: true,\n  };\n  projectConfig.targets['wait-for-db'] = {\n    executor: 'nx:run-commands',\n    dependsOn: ['dev'],\n    options: {\n      command: `tsx ${scriptsDir}/${waitForDbScript}`,\n      cwd: '{projectRoot}',\n    },\n  };\n  projectConfig.targets.prisma = {\n    executor: 'nx:run-commands',\n    dependsOn: ['dev', 'wait-for-db'],\n    options: {\n      cwd: '{projectRoot}',\n      command: 'prisma',\n      env: {\n        LOCAL_DEV: 'true',\n      },\n    },\n  };\n  if (options.infra !== 'none') {\n    const iac = await resolveIac(tree, options.iac);\n    if (iac === 'terraform') {\n      projectConfig.targets['docker'] = {\n        cache: true,\n        executor: 'nx:run-commands',\n        options: {\n          command: `${containerEngine} build --platform linux/arm64 --provenance=false -t ${migrationDockerImageTag} ${migrationBundleDir}`,\n        },\n        dependsOn: ['bundle'],\n      };\n      addDependencyToTargetIfNotPresent(projectConfig, 'build', 'docker');\n    }\n    addDependencyToTargetIfNotPresent(projectConfig, 'build', 'bundle');\n  }\n  addDependencyToTargetIfNotPresent(projectConfig, 'compile', 'generate');\n  updateProjectConfiguration(tree, fullyQualifiedName, projectConfig);\n  addGeneratorMetadata(tree, fullyQualifiedName, TS_RDB_GENERATOR_INFO, {\n    engine: options.engine,\n  });\n\n  if (options.infra !== 'none') {\n    const iac = await resolveIac(tree, options.iac);\n    await sharedConstructsGenerator(tree, { iac });\n    await addRdbInfra(tree, {\n      iac,\n      projectName: fullyQualifiedName,\n      projectRoot: dir,\n      nameClassName,\n      nameKebabCase,\n      databasePackageAlias: toScopeAlias(fullyQualifiedName),\n      databaseName,\n      adminUser: databaseUser,\n      engine: options.engine,\n      migrationBundleDir,\n      createDbUserBundleDir: joinPathFragments(\n        'dist',\n        projectConfig.root,\n        'bundle',\n        'create-db-user',\n      ),\n      framework: options.framework,\n      migrationDockerImageTag,\n      containerEngine,\n    });\n  }\n\n  addDependenciesToPackageJson(\n    tree,\n    withVersions([\n      '@aws-lambda-powertools/parameters',\n      '@aws-sdk/client-appconfigdata',\n      '@aws-sdk/client-secrets-manager',\n      '@aws-sdk/rds-signer',\n      '@prisma/client',\n      ...(options.engine === 'mysql'\n        ? (['@prisma/adapter-mariadb', 'mariadb'] as const)\n        : (['@prisma/adapter-pg', 'pg'] as const)),\n    ]),\n    withVersions([\n      'prisma',\n      'tsx',\n      '@types/aws-lambda',\n      ...(options.engine === 'mysql'\n        ? ([] as const)\n        : (['@types/pg'] as const)),\n    ]),\n  );\n\n  registerPnpmBuiltDependencies(tree, {\n    '@prisma/engines': false,\n    prisma: false,\n  });\n\n  await addGeneratorMetricsIfApplicable(tree, [TS_RDB_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default tsRdbGenerator;\n"],"names":["relative","addDependenciesToPackageJson","generateFiles","joinPathFragments","readProjectConfiguration","updateJson","updateProjectConfiguration","addTypeScriptBundleTarget","resolveContainers","formatFilesInSubtree","FsCommands","updateGitIgnore","resolveIac","installDependencies","addGeneratorMetricsIfApplicable","esmVars","kebabCase","snakeCase","toClassName","getNpmScope","toScopeAlias","addDependencyToTargetIfNotPresent","addGeneratorMetadata","getGeneratorInfo","getRelativePathToRootByDirectory","registerPnpmBuiltDependencies","assignPort","addRdbInfra","sharedConstructsGenerator","PACKAGES_DIR","SHARED_SCRIPTS_DIR","sharedRdbScriptsGenerator","TS_VERSIONS","withVersions","tsProjectGenerator","getTsLibDetails","TS_RDB_GENERATOR_INFO","filename","tsRdbGenerator","tree","options","nameKebabCase","name","nameClassName","databaseUser","databaseName","containerEngine","fullyQualifiedName","dir","directory","subDirectory","projectExists","preferInstallDependencies","tsConfig","include","projectConfig","localDbPort","engine","localDbHost","localDbUser","localDbPassword","containerName","dockerImage","templateOptions","runtimeConfigKey","databasePackageAlias","databaseProvider","prismaVersion","prisma","prismaAdapterPackage","prismaAdapterClassName","localDbName","dirname","patterns","waitForDbScript","scriptsDir","relativePathToRoot","root","fs","migrationBundleDir","migrationDockerImageTag","infra","targetFilePath","bundleOutputDir","bundleTarget","targets","commands","rolldownCommand","command","rm","mkdir","cp","parallel","generate","executor","outputs","cwd","continuous","dependsOn","env","LOCAL_DEV","iac","cache","projectName","projectRoot","adminUser","createDbUserBundleDir","framework","languages"],"mappings":"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"}

package/src/ts/rdb/schema.json

@@ -74,5 +74,5 @@
       "default": true
     }
   },
-  "required": ["name", "infra", "engine", "framework"]
+  "required": ["name"]
 }

package/src/ts/react-website/app/__snapshots__/generator.spec.ts.snap

@@ -131,7 +131,7 @@ exports[`react-website generator > TailwindCSS integration > terraform iac > sho
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
       configuration_aliases = [aws.us_east_1]
     }
     random = {
@@ -696,7 +696,7 @@ resource "null_resource" "upload_website_files" {
   provisioner "local-exec" {
     command = <<-EOT
       cd "$ROOT_PATH"
-      uv run --with boto3==1.43.37 python3 -c "
+      uv run --with boto3==1.43.46 python3 -c "
 import os
 import sys
 import boto3
@@ -819,7 +819,7 @@ resource "null_resource" "cloudfront_invalidation" {
 
   provisioner "local-exec" {
     command = <<-EOT
-      uv run --with boto3==1.43.37 python3 -c "
+      uv run --with boto3==1.43.46 python3 -c "
 import boto3
 import os
 import sys
@@ -905,7 +905,7 @@ output "waf_web_acl_arn" {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
       configuration_aliases = [aws.us_east_1]
     }
   }
@@ -1113,36 +1113,36 @@ exports[`react-website generator > Tanstack router integration > should generate
 "{
   "name": "@proj/source",
   "dependencies": {
-    "@cloudscape-design/board-components": "3.0.197",
-    "@cloudscape-design/components": "3.0.1320",
-    "@cloudscape-design/global-styles": "1.0.61",
-    "aws-cdk-lib": "2.260.0",
+    "@cloudscape-design/board-components": "3.0.201",
+    "@cloudscape-design/components": "3.0.1325",
+    "@cloudscape-design/global-styles": "1.0.62",
+    "aws-cdk-lib": "2.261.0",
     "constructs": "10.6.0",
     "react": "19.2.7",
     "react-dom": "19.2.7",
-    "tailwindcss": "4.2.2"
+    "tailwindcss": "4.3.2"
   },
   "devDependencies": {
-    "@nx/js": "23.0.1",
-    "@nx/react": "23.0.1",
-    "@nx/vite": "23.0.1",
-    "@nx/vitest": "23.0.1",
-    "@nx/web": "23.0.1",
+    "@nx/js": "23.0.2",
+    "@nx/react": "23.0.2",
+    "@nx/vite": "23.0.2",
+    "@nx/vitest": "23.0.2",
+    "@nx/web": "23.0.2",
     "@swc/helpers": "~0.5.18",
-    "@tailwindcss/vite": "4.2.2",
+    "@tailwindcss/vite": "4.3.2",
     "@testing-library/dom": "10.4.0",
     "@testing-library/react": "16.3.0",
-    "@types/node": "25.9.4",
+    "@types/node": "26.1.1",
     "@types/react": "^19.0.0",
     "@types/react-dom": "^19.0.0",
     "@vitejs/plugin-react": "^6.0.0",
-    "@vitest/coverage-v8": "4.1.9",
-    "@vitest/ui": "4.1.9",
+    "@vitest/coverage-v8": "4.1.10",
+    "@vitest/ui": "4.1.10",
     "jiti": "2.4.2",
     "jsdom": "^27.1.0",
     "typescript": "~5.9.2",
-    "vite": "8.1.0",
-    "vitest": "4.1.9"
+    "vite": "8.1.4",
+    "vitest": "4.1.10"
   },
   "type": "module"
 }
@@ -2684,41 +2684,41 @@ exports[`react-website generator > Tanstack router integration > should generate
 "{
   "name": "@proj/source",
   "dependencies": {
-    "@cloudscape-design/board-components": "3.0.197",
-    "@cloudscape-design/components": "3.0.1320",
-    "@cloudscape-design/global-styles": "1.0.61",
-    "@tanstack/react-router": "1.170.16",
-    "aws-cdk-lib": "2.260.0",
+    "@cloudscape-design/board-components": "3.0.201",
+    "@cloudscape-design/components": "3.0.1325",
+    "@cloudscape-design/global-styles": "1.0.62",
+    "@tanstack/react-router": "1.170.17",
+    "aws-cdk-lib": "2.261.0",
     "constructs": "10.6.0",
     "react": "19.2.7",
     "react-dom": "19.2.7",
-    "tailwindcss": "4.2.2"
+    "tailwindcss": "4.3.2"
   },
   "devDependencies": {
-    "@nx/js": "23.0.1",
-    "@nx/react": "23.0.1",
-    "@nx/vite": "23.0.1",
-    "@nx/vitest": "23.0.1",
-    "@nx/web": "23.0.1",
+    "@nx/js": "23.0.2",
+    "@nx/react": "23.0.2",
+    "@nx/vite": "23.0.2",
+    "@nx/vitest": "23.0.2",
+    "@nx/web": "23.0.2",
     "@swc/helpers": "~0.5.18",
-    "@tailwindcss/vite": "4.2.2",
-    "@tanstack/router-generator": "1.167.17",
-    "@tanstack/router-plugin": "1.168.18",
+    "@tailwindcss/vite": "4.3.2",
+    "@tanstack/router-generator": "1.167.18",
+    "@tanstack/router-plugin": "1.168.19",
     "@tanstack/router-utils": "1.162.2",
     "@tanstack/virtual-file-routes": "1.162.0",
     "@testing-library/dom": "10.4.0",
     "@testing-library/react": "16.3.0",
-    "@types/node": "25.9.4",
+    "@types/node": "26.1.1",
     "@types/react": "^19.0.0",
     "@types/react-dom": "^19.0.0",
     "@vitejs/plugin-react": "^6.0.0",
-    "@vitest/coverage-v8": "4.1.9",
-    "@vitest/ui": "4.1.9",
+    "@vitest/coverage-v8": "4.1.10",
+    "@vitest/ui": "4.1.10",
     "jiti": "2.4.2",
     "jsdom": "^27.1.0",
     "typescript": "~5.9.2",
-    "vite": "8.1.0",
-    "vitest": "4.1.9"
+    "vite": "8.1.4",
+    "vitest": "4.1.10"
   },
   "type": "module"
 }
@@ -4990,15 +4990,15 @@ root &&
 
 exports[`react-website generator > should handle npm scope prefix correctly > scoped-dependencies 1`] = `
 {
-  "@cloudscape-design/board-components": "3.0.197",
-  "@cloudscape-design/components": "3.0.1320",
-  "@cloudscape-design/global-styles": "1.0.61",
-  "@tanstack/react-router": "1.170.16",
-  "aws-cdk-lib": "2.260.0",
+  "@cloudscape-design/board-components": "3.0.201",
+  "@cloudscape-design/components": "3.0.1325",
+  "@cloudscape-design/global-styles": "1.0.62",
+  "@tanstack/react-router": "1.170.17",
+  "aws-cdk-lib": "2.261.0",
   "constructs": "10.6.0",
   "react": "19.2.7",
   "react-dom": "19.2.7",
-  "tailwindcss": "4.2.2",
+  "tailwindcss": "4.3.2",
 }
 `;
 

package/src/ts/react-website/cognito-auth/__snapshots__/generator.terraform.spec.ts.snap

@@ -6,7 +6,7 @@ exports[`cognito-auth generator terraform iac > should generate terraform files
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
   }
 }
@@ -63,7 +63,7 @@ resource "null_resource" "add_callback_url" {
 
   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 os
 import sys

package/src/utils/agent-chat/agent-chat.js

@@ -2,6 +2,7 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */ import { generateFiles, joinPathFragments, OverwriteStrategy } from "@nx/devkit";
+import { esmVars } from "../module-format.js";
 /**
  * Emit the chat CLI scripts for an agent. Every protocol gets a small
  * `chat.ts` that connects to the local `dev` server by default, and
@@ -12,7 +13,8 @@
     const templateContext = {
         agentNameClassName: options.agentNameClassName,
         auth: options.auth,
-        relativeAgentImport: options.relativeAgentImport ?? ''
+        relativeAgentImport: options.relativeAgentImport ?? '',
+        ...esmVars(tree)
     };
     // Shared remote-resolution + auth helper, used by every protocol.
     generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'common'), options.scriptsDir, templateContext, {

package/src/utils/agent-chat/agent-chat.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/utils/agent-chat/agent-chat.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport type { Tree } from '@nx/devkit';\nimport {\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n} from '@nx/devkit';\n\nexport type AgentChatProtocol = 'http' | 'a2a' | 'ag-ui';\nexport type AgentChatAuth = 'iam' | 'cognito';\n\nexport interface AddAgentChatScriptsOptions {\n  /** Absolute (tree) directory to emit the chat scripts into. */\n  scriptsDir: string;\n  protocol: AgentChatProtocol;\n  /** Agent server language. Only affects the HTTP chat adapter. */\n  language: 'ts' | 'py';\n  /** Construct class name — the runtime-config key for the deployed agent. */\n  agentNameClassName: string;\n  /** Authentication used by the deployed agent. */\n  auth: AgentChatAuth;\n  /**\n   * Import path to the agent's `client.ts` (TypeScript HTTP agents only),\n   * relative to the chat script.\n   */\n  relativeAgentImport?: string;\n}\n\n/**\n * Emit the chat CLI scripts for an agent. Every protocol gets a small\n * `chat.ts` that connects to the local `dev` server by default, and\n * to the deployed agent on Bedrock AgentCore (resolved from runtime config)\n * when `RUNTIME_CONFIG_APP_ID` is set. The shared `agentcore.ts` helper\n * handles ARN resolution and request authentication.\n */\nexport const addAgentChatScripts = (\n  tree: Tree,\n  options: AddAgentChatScriptsOptions,\n): void => {\n  const templateContext = {\n    agentNameClassName: options.agentNameClassName,\n    auth: options.auth,\n    relativeAgentImport: options.relativeAgentImport ?? '',\n  };\n\n  // Shared remote-resolution + auth helper, used by every protocol.\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'common'),\n    options.scriptsDir,\n    templateContext,\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Protocol-specific chat adapter. HTTP differs by server language; A2A and\n  // AG-UI speak standard protocols so the same script serves both languages.\n  const protocolDir =\n    options.protocol === 'http' ? `http-${options.language}` : options.protocol;\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', protocolDir),\n    options.scriptsDir,\n    templateContext,\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n};\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","addAgentChatScripts","tree","options","templateContext","agentNameClassName","auth","relativeAgentImport","dirname","scriptsDir","overwriteStrategy","KeepExisting","protocolDir","protocol","language"],"mappings":"AAAA;;;CAGC,GAGD,SACEA,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,QACZ,aAAa;AAsBpB;;;;;;CAMC,GACD,OAAO,MAAMC,sBAAsB,CACjCC,MACAC;IAEA,MAAMC,kBAAkB;QACtBC,oBAAoBF,QAAQE,kBAAkB;QAC9CC,MAAMH,QAAQG,IAAI;QAClBC,qBAAqBJ,QAAQI,mBAAmB,IAAI;IACtD;IAEA,kEAAkE;IAClET,cACEI,MACAH,kBAAkB,YAAYS,OAAO,EAAE,SAAS,WAChDL,QAAQM,UAAU,EAClBL,iBACA;QAAEM,mBAAmBV,kBAAkBW,YAAY;IAAC;IAGtD,2EAA2E;IAC3E,2EAA2E;IAC3E,MAAMC,cACJT,QAAQU,QAAQ,KAAK,SAAS,CAAC,KAAK,EAAEV,QAAQW,QAAQ,EAAE,GAAGX,QAAQU,QAAQ;IAC7Ef,cACEI,MACAH,kBAAkB,YAAYS,OAAO,EAAE,SAASI,cAChDT,QAAQM,UAAU,EAClBL,iBACA;QAAEM,mBAAmBV,kBAAkBW,YAAY;IAAC;AAExD,EAAE"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/utils/agent-chat/agent-chat.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport type { Tree } from '@nx/devkit';\nimport {\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n} from '@nx/devkit';\nimport { esmVars } from '../module-format';\n\nexport type AgentChatProtocol = 'http' | 'a2a' | 'ag-ui';\nexport type AgentChatAuth = 'iam' | 'cognito';\n\nexport interface AddAgentChatScriptsOptions {\n  /** Absolute (tree) directory to emit the chat scripts into. */\n  scriptsDir: string;\n  protocol: AgentChatProtocol;\n  /** Agent server language. Only affects the HTTP chat adapter. */\n  language: 'ts' | 'py';\n  /** Construct class name — the runtime-config key for the deployed agent. */\n  agentNameClassName: string;\n  /** Authentication used by the deployed agent. */\n  auth: AgentChatAuth;\n  /**\n   * Import path to the agent's `client.ts` (TypeScript HTTP agents only),\n   * relative to the chat script.\n   */\n  relativeAgentImport?: string;\n}\n\n/**\n * Emit the chat CLI scripts for an agent. Every protocol gets a small\n * `chat.ts` that connects to the local `dev` server by default, and\n * to the deployed agent on Bedrock AgentCore (resolved from runtime config)\n * when `RUNTIME_CONFIG_APP_ID` is set. The shared `agentcore.ts` helper\n * handles ARN resolution and request authentication.\n */\nexport const addAgentChatScripts = (\n  tree: Tree,\n  options: AddAgentChatScriptsOptions,\n): void => {\n  const templateContext = {\n    agentNameClassName: options.agentNameClassName,\n    auth: options.auth,\n    relativeAgentImport: options.relativeAgentImport ?? '',\n    ...esmVars(tree),\n  };\n\n  // Shared remote-resolution + auth helper, used by every protocol.\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'common'),\n    options.scriptsDir,\n    templateContext,\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Protocol-specific chat adapter. HTTP differs by server language; A2A and\n  // AG-UI speak standard protocols so the same script serves both languages.\n  const protocolDir =\n    options.protocol === 'http' ? `http-${options.language}` : options.protocol;\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', protocolDir),\n    options.scriptsDir,\n    templateContext,\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n};\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","esmVars","addAgentChatScripts","tree","options","templateContext","agentNameClassName","auth","relativeAgentImport","dirname","scriptsDir","overwriteStrategy","KeepExisting","protocolDir","protocol","language"],"mappings":"AAAA;;;CAGC,GAGD,SACEA,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,QACZ,aAAa;AACpB,SAASC,OAAO,QAAQ,sBAAmB;AAsB3C;;;;;;CAMC,GACD,OAAO,MAAMC,sBAAsB,CACjCC,MACAC;IAEA,MAAMC,kBAAkB;QACtBC,oBAAoBF,QAAQE,kBAAkB;QAC9CC,MAAMH,QAAQG,IAAI;QAClBC,qBAAqBJ,QAAQI,mBAAmB,IAAI;QACpD,GAAGP,QAAQE,KAAK;IAClB;IAEA,kEAAkE;IAClEL,cACEK,MACAJ,kBAAkB,YAAYU,OAAO,EAAE,SAAS,WAChDL,QAAQM,UAAU,EAClBL,iBACA;QAAEM,mBAAmBX,kBAAkBY,YAAY;IAAC;IAGtD,2EAA2E;IAC3E,2EAA2E;IAC3E,MAAMC,cACJT,QAAQU,QAAQ,KAAK,SAAS,CAAC,KAAK,EAAEV,QAAQW,QAAQ,EAAE,GAAGX,QAAQU,QAAQ;IAC7EhB,cACEK,MACAJ,kBAAkB,YAAYU,OAAO,EAAE,SAASI,cAChDT,QAAQM,UAAU,EAClBL,iBACA;QAAEM,mBAAmBX,kBAAkBY,YAAY;IAAC;AAExD,EAAE"}

package/src/utils/agent-chat/files/a2a/chat.ts.template

@@ -7,7 +7,7 @@ import {
   JsonRpcTransportFactory,
 } from '@a2a-js/sdk/client';
 import { A2AChatAdapter, chatLoop } from 'agent-chat-cli';
-import { createAgentCoreFetch, resolveRemoteAgent } from './agentcore.js';
+import { createAgentCoreFetch, resolveRemoteAgent } from './agentcore<% if (esm) { %>.js<% } %>';
 
 const remote = await resolveRemoteAgent();
 

package/src/utils/agent-chat/files/ag-ui/chat.ts.template

@@ -1,7 +1,7 @@
 // Chat CLI for <%- agentNameClassName %> (AG-UI protocol). Connects to the local
 // `dev` server, or the deployed agent when `RUNTIME_CONFIG_APP_ID` is set.
 import { AGUIChatAdapter, chatLoop } from 'agent-chat-cli';
-import { createAgentCoreFetch, resolveRemoteAgent } from './agentcore.js';
+import { createAgentCoreFetch, resolveRemoteAgent } from './agentcore<% if (esm) { %>.js<% } %>';
 
 const remote = await resolveRemoteAgent();
 

package/src/utils/agent-chat/files/http-py/chat.ts.template

@@ -2,12 +2,12 @@
 // generated client. Connects to the local `dev` server, or the deployed
 // agent when `RUNTIME_CONFIG_APP_ID` is set.
 import { chatLoop, type ChatAdapter } from 'agent-chat-cli';
-import { <%- agentNameClassName %> } from './generated/client.gen.js';
+import { <%- agentNameClassName %> } from './generated/client.gen<% if (esm) { %>.js<% } %>';
 import {
   createAgentCoreFetch,
   resolveRemoteAgent,
   SESSION_ID,
-} from './agentcore.js';
+} from './agentcore<% if (esm) { %>.js<% } %>';
 
 const SESSION_ID_HEADER = 'X-Amzn-Bedrock-AgentCore-Runtime-Session-Id';
 

package/src/utils/agent-chat/files/http-ts/chat.ts.template

@@ -8,7 +8,7 @@ import {
 <%_ if (auth === 'cognito') { _%>
   getAccessToken,
 <%_ } _%>
-} from './agentcore.js';
+} from './agentcore<% if (esm) { %>.js<% } %>';
 
 const remote = await resolveRemoteAgent();
 

package/src/utils/agent-connection/agent-connection.js

@@ -5,6 +5,7 @@
 import pyProjectGenerator, { getPyProjectDetails } from "../../py/project/generator.js";
 import tsProjectGenerator from "../../ts/lib/generator.js";
 import { addStarExport, applyGritQL, matchGritQL } from "../ast.js";
+import { esmVars } from "../module-format.js";
 import { addDependenciesToPyProjectToml } from "../py.js";
 /** Prefix a GritQL pattern with `language python` */ const py = (pattern)=>`language python\n${pattern}`;
 const AGENT_CONNECTION_DIR = 'agent-connection';
@@ -149,7 +150,9 @@ const FRAMEWORKS = {
     'gateway'
 ];
 const tsCoreDir = ()=>joinPathFragments(AGENT_CONNECTION_PROJECT_DIR, 'src', 'core');
-const emitTs = (tree, templateDir)=>generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', templateDir), tsCoreDir(), {}, {
+const emitTs = (tree, templateDir)=>generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', templateDir), tsCoreDir(), {
+        ...esmVars(tree)
+    }, {
         overwriteStrategy: OverwriteStrategy.KeepExisting
     });
 /**