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

package/src/ts/astro-docs/generator.js

@@ -5,6 +5,7 @@
 import { formatFilesInSubtree } from "../../utils/format.js";
 import { installDependencies } from "../../utils/install.js";
 import { addGeneratorMetricsIfApplicable } from "../../utils/metrics.js";
+import { isEsmWorkspace } from "../../utils/module-format.js";
 import { toKebabCase } from "../../utils/names.js";
 import { getNpmScopePrefix } from "../../utils/npm-scope.js";
 import { addGeneratorMetadata, getGeneratorInfo, projectExists } from "../../utils/nx.js";
@@ -81,6 +82,7 @@ export const tsAstroDocsGenerator = async (tree, schema)=>{
         title: schema.name,
         includeTranslation,
         includeBlog,
+        esm: isEsmWorkspace(tree),
         pkgMgrCmd: getPackageManagerDisplayCommands().exec,
         today: new Date().toISOString().slice(0, 10)
     };

package/src/ts/astro-docs/generator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/astro-docs/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  addProjectConfiguration,\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type ProjectConfiguration,\n  type Tree,\n} from '@nx/devkit';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { toKebabCase } from '../../utils/names';\nimport { getNpmScopePrefix } from '../../utils/npm-scope';\nimport {\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  projectExists,\n} from '../../utils/nx';\nimport { getPackageManagerDisplayCommands } from '../../utils/pkg-manager';\nimport { type ITsDepVersion, withVersions } from '../../utils/versions';\nimport type { TsAstroDocsGeneratorSchema } from './schema';\n\nexport const TS_ASTRO_DOCS_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const tsAstroDocsGenerator = async (\n  tree: Tree,\n  schema: TsAstroDocsGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const includeTranslation = !(schema.noTranslation ?? false);\n  const includeBlog = !(schema.noBlog ?? false);\n  const npmScopePrefix = getNpmScopePrefix(tree);\n  const docsNameKebabCase = toKebabCase(schema.name);\n  const fullyQualifiedName = `${npmScopePrefix}${docsNameKebabCase}`;\n  // NB: interactive nx generator cli can pass empty string\n  const dir = joinPathFragments(\n    schema.directory || '.',\n    schema.subDirectory || docsNameKebabCase,\n  );\n\n  const alreadyExists = projectExists(tree, fullyQualifiedName);\n\n  const targets: ProjectConfiguration['targets'] = {\n    build: {\n      executor: 'nx:run-commands',\n      options: {\n        command: 'astro build',\n        cwd: dir,\n      },\n      outputs: [`{workspaceRoot}/${dir}/dist`],\n      cache: true,\n    },\n    start: {\n      executor: 'nx:run-commands',\n      options: {\n        command: 'astro dev',\n        cwd: dir,\n      },\n      continuous: true,\n    },\n    serve: {\n      dependsOn: ['start'],\n    },\n    preview: {\n      executor: 'nx:run-commands',\n      options: {\n        command: 'astro preview',\n        cwd: dir,\n      },\n      dependsOn: ['build'],\n      continuous: true,\n    },\n  };\n\n  if (includeTranslation) {\n    targets['translate'] = {\n      executor: 'nx:run-commands',\n      options: {\n        command: 'tsx ./scripts/translate.ts',\n        cwd: dir,\n        forwardAllArgs: true,\n      },\n    };\n  }\n\n  if (!alreadyExists) {\n    addProjectConfiguration(tree, fullyQualifiedName, {\n      name: fullyQualifiedName,\n      root: dir,\n      sourceRoot: joinPathFragments(dir, 'src'),\n      projectType: 'application',\n      targets,\n    });\n  }\n\n  const templateOptions = {\n    fullyQualifiedName,\n    title: schema.name,\n    includeTranslation,\n    includeBlog,\n    pkgMgrCmd: getPackageManagerDisplayCommands().exec,\n    today: new Date().toISOString().slice(0, 10),\n  };\n\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'base'),\n    dir,\n    templateOptions,\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // The sample blog post is always emitted above — drop it if the user opted out.\n  if (!includeBlog) {\n    tree.delete(\n      joinPathFragments(\n        dir,\n        'src',\n        'content',\n        'docs',\n        'en',\n        'blog',\n        'welcome.mdx',\n      ),\n    );\n  }\n\n  if (includeTranslation) {\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files', 'translation'),\n      dir,\n      templateOptions,\n      { overwriteStrategy: OverwriteStrategy.KeepExisting },\n    );\n  }\n\n  addGeneratorMetadata(tree, fullyQualifiedName, TS_ASTRO_DOCS_GENERATOR_INFO, {\n    framework: 'astro',\n    includeTranslation,\n    includeBlog,\n  });\n\n  const dependencies: ITsDepVersion[] = ['astro', '@astrojs/starlight'];\n  const devDependencies: ITsDepVersion[] = [];\n\n  if (includeBlog) {\n    dependencies.push('starlight-blog');\n  }\n\n  if (includeTranslation) {\n    dependencies.push(\n      '@strands-agents/sdk',\n      'commander',\n      'fast-glob',\n      'fs-extra',\n      'simple-git',\n    );\n    devDependencies.push('tsx', '@types/fs-extra');\n  }\n\n  addDependenciesToPackageJson(\n    tree,\n    withVersions(dependencies),\n    withVersions(devDependencies),\n  );\n\n  await addGeneratorMetricsIfApplicable(tree, [TS_ASTRO_DOCS_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, schema.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default tsAstroDocsGenerator;\n"],"names":["addDependenciesToPackageJson","addProjectConfiguration","generateFiles","joinPathFragments","OverwriteStrategy","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","toKebabCase","getNpmScopePrefix","addGeneratorMetadata","getGeneratorInfo","projectExists","getPackageManagerDisplayCommands","withVersions","TS_ASTRO_DOCS_GENERATOR_INFO","filename","tsAstroDocsGenerator","tree","schema","includeTranslation","noTranslation","includeBlog","noBlog","npmScopePrefix","docsNameKebabCase","name","fullyQualifiedName","dir","directory","subDirectory","alreadyExists","targets","build","executor","options","command","cwd","outputs","cache","start","continuous","serve","dependsOn","preview","forwardAllArgs","root","sourceRoot","projectType","templateOptions","title","pkgMgrCmd","exec","today","Date","toISOString","slice","dirname","overwriteStrategy","KeepExisting","delete","framework","dependencies","devDependencies","push","preferInstallDependencies","languages"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/astro-docs/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  addProjectConfiguration,\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type ProjectConfiguration,\n  type Tree,\n} from '@nx/devkit';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { isEsmWorkspace } from '../../utils/module-format';\nimport { toKebabCase } from '../../utils/names';\nimport { getNpmScopePrefix } from '../../utils/npm-scope';\nimport {\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  projectExists,\n} from '../../utils/nx';\nimport { getPackageManagerDisplayCommands } from '../../utils/pkg-manager';\nimport { type ITsDepVersion, withVersions } from '../../utils/versions';\nimport type { TsAstroDocsGeneratorSchema } from './schema';\n\nexport const TS_ASTRO_DOCS_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const tsAstroDocsGenerator = async (\n  tree: Tree,\n  schema: TsAstroDocsGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const includeTranslation = !(schema.noTranslation ?? false);\n  const includeBlog = !(schema.noBlog ?? false);\n  const npmScopePrefix = getNpmScopePrefix(tree);\n  const docsNameKebabCase = toKebabCase(schema.name);\n  const fullyQualifiedName = `${npmScopePrefix}${docsNameKebabCase}`;\n  // NB: interactive nx generator cli can pass empty string\n  const dir = joinPathFragments(\n    schema.directory || '.',\n    schema.subDirectory || docsNameKebabCase,\n  );\n\n  const alreadyExists = projectExists(tree, fullyQualifiedName);\n\n  const targets: ProjectConfiguration['targets'] = {\n    build: {\n      executor: 'nx:run-commands',\n      options: {\n        command: 'astro build',\n        cwd: dir,\n      },\n      outputs: [`{workspaceRoot}/${dir}/dist`],\n      cache: true,\n    },\n    start: {\n      executor: 'nx:run-commands',\n      options: {\n        command: 'astro dev',\n        cwd: dir,\n      },\n      continuous: true,\n    },\n    serve: {\n      dependsOn: ['start'],\n    },\n    preview: {\n      executor: 'nx:run-commands',\n      options: {\n        command: 'astro preview',\n        cwd: dir,\n      },\n      dependsOn: ['build'],\n      continuous: true,\n    },\n  };\n\n  if (includeTranslation) {\n    targets['translate'] = {\n      executor: 'nx:run-commands',\n      options: {\n        command: 'tsx ./scripts/translate.ts',\n        cwd: dir,\n        forwardAllArgs: true,\n      },\n    };\n  }\n\n  if (!alreadyExists) {\n    addProjectConfiguration(tree, fullyQualifiedName, {\n      name: fullyQualifiedName,\n      root: dir,\n      sourceRoot: joinPathFragments(dir, 'src'),\n      projectType: 'application',\n      targets,\n    });\n  }\n\n  const templateOptions = {\n    fullyQualifiedName,\n    title: schema.name,\n    includeTranslation,\n    includeBlog,\n    esm: isEsmWorkspace(tree),\n    pkgMgrCmd: getPackageManagerDisplayCommands().exec,\n    today: new Date().toISOString().slice(0, 10),\n  };\n\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'base'),\n    dir,\n    templateOptions,\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // The sample blog post is always emitted above — drop it if the user opted out.\n  if (!includeBlog) {\n    tree.delete(\n      joinPathFragments(\n        dir,\n        'src',\n        'content',\n        'docs',\n        'en',\n        'blog',\n        'welcome.mdx',\n      ),\n    );\n  }\n\n  if (includeTranslation) {\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files', 'translation'),\n      dir,\n      templateOptions,\n      { overwriteStrategy: OverwriteStrategy.KeepExisting },\n    );\n  }\n\n  addGeneratorMetadata(tree, fullyQualifiedName, TS_ASTRO_DOCS_GENERATOR_INFO, {\n    framework: 'astro',\n    includeTranslation,\n    includeBlog,\n  });\n\n  const dependencies: ITsDepVersion[] = ['astro', '@astrojs/starlight'];\n  const devDependencies: ITsDepVersion[] = [];\n\n  if (includeBlog) {\n    dependencies.push('starlight-blog');\n  }\n\n  if (includeTranslation) {\n    dependencies.push(\n      '@strands-agents/sdk',\n      'commander',\n      'fast-glob',\n      'fs-extra',\n      'simple-git',\n    );\n    devDependencies.push('tsx', '@types/fs-extra');\n  }\n\n  addDependenciesToPackageJson(\n    tree,\n    withVersions(dependencies),\n    withVersions(devDependencies),\n  );\n\n  await addGeneratorMetricsIfApplicable(tree, [TS_ASTRO_DOCS_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, schema.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default tsAstroDocsGenerator;\n"],"names":["addDependenciesToPackageJson","addProjectConfiguration","generateFiles","joinPathFragments","OverwriteStrategy","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","isEsmWorkspace","toKebabCase","getNpmScopePrefix","addGeneratorMetadata","getGeneratorInfo","projectExists","getPackageManagerDisplayCommands","withVersions","TS_ASTRO_DOCS_GENERATOR_INFO","filename","tsAstroDocsGenerator","tree","schema","includeTranslation","noTranslation","includeBlog","noBlog","npmScopePrefix","docsNameKebabCase","name","fullyQualifiedName","dir","directory","subDirectory","alreadyExists","targets","build","executor","options","command","cwd","outputs","cache","start","continuous","serve","dependsOn","preview","forwardAllArgs","root","sourceRoot","projectType","templateOptions","title","esm","pkgMgrCmd","exec","today","Date","toISOString","slice","dirname","overwriteStrategy","KeepExisting","delete","framework","dependencies","devDependencies","push","preferInstallDependencies","languages"],"mappings":"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"}

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

@@ -35,7 +35,7 @@ exports[`ts#dynamodb generator > should generate terraform modules when iac is t
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
   }
 }
@@ -192,7 +192,7 @@ exports[`ts#dynamodb generator > should generate terraform modules when iac is t
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
     random = {
       source  = "hashicorp/random"

package/src/ts/dynamodb/files/src/client.ts.template

@@ -1,13 +1,16 @@
 import { DynamoDBClient } from '@aws-sdk/client-dynamodb';
 import { getAppConfig } from '@aws-lambda-powertools/parameters/appconfig';
 import { readFileSync } from 'fs';
-import { join, dirname } from 'path';
+import { join<% if (esm) { %>, dirname<% } %> } from 'path';
+<%_ if (esm) { _%>
 import { fileURLToPath } from 'url';
+<%_ } _%>
 
 // Generated: must match runtimeConfigKey in config.json
 const runtimeConfigKey = '<%= runtimeConfigKey %>';
-
+<% if (esm) { %>
 const __dirname = dirname(fileURLToPath(import.meta.url));
+<%_ } _%>
 // config.json is only present in local dev (not included in the deployed bundle); guard with LOCAL_DEV check
 const localDev = () =>
   JSON.parse(readFileSync(join(__dirname, '../config.json'), 'utf-8')).localDev;

package/src/ts/dynamodb/files/src/entities/example.ts.template

@@ -1,5 +1,5 @@
 import { Entity } from 'electrodb';
-import { getDynamoDBClient, resolveTableName } from '../client.js';
+import { getDynamoDBClient, resolveTableName } from '../client<% if (esm) { %>.js<% } %>';
 
 // Example entity - replace with your own entities using ElectroDB
 // See https://electrodb.dev/en/modeling/entities/ for documentation

package/src/ts/dynamodb/files/src/entities/index.ts.template

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

package/src/ts/dynamodb/files/src/index.ts.template

@@ -1,2 +1,2 @@
-export { getDynamoDBClient, resolveTableName } from './client.js';
-export * from './entities/index.js';
+export { getDynamoDBClient, resolveTableName } from './client<% if (esm) { %>.js<% } %>';
+export * from './entities/index<% if (esm) { %>.js<% } %>';

package/src/ts/dynamodb/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 { getNpmScope } from "../../utils/npm-scope.js";
 import { addGeneratorMetadata, getGeneratorInfo } from "../../utils/nx.js";
@@ -51,7 +52,8 @@ export const tsDynamoDBGenerator = async (tree, options)=>{
         localDynamoDBPort,
         localTableName,
         containerName,
-        containerEngine
+        containerEngine,
+        ...esmVars(tree)
     };
     generateFiles(tree, joinPathFragments(import.meta.dirname, 'files'), dir, templateOptions);
     await sharedDynamoDBScriptsGenerator(tree);

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/dynamodb/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { relative } from 'node:path';\nimport {\n  addDependenciesToPackageJson,\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  readProjectConfiguration,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { resolveContainers } from '../../utils/containers';\nimport { addDynamoDBInfra } from '../../utils/dynamodb-constructs/dynamodb-constructs';\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 { getNpmScope } from '../../utils/npm-scope';\nimport {\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n} from '../../utils/nx';\nimport { assignSharedPort } from '../../utils/port';\nimport { sharedConstructsGenerator } from '../../utils/shared-constructs';\nimport {\n  DYNAMODB_GENERATOR_IDS,\n  PACKAGES_DIR,\n  SHARED_SCRIPTS_DIR,\n} from '../../utils/shared-constructs-constants';\nimport { sharedDynamoDBScriptsGenerator } from '../../utils/shared-dynamodb-scripts';\nimport { withVersions } from '../../utils/versions';\nimport tsProjectGenerator, { getTsLibDetails } from '../lib/generator';\nimport type { TsDynamoDBGeneratorSchema } from './schema';\n\nexport const TS_DYNAMODB_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const tsDynamoDBGenerator = async (\n  tree: Tree,\n  options: TsDynamoDBGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const nameKebabCase = kebabCase(options.name);\n  const nameClassName = toClassName(options.name);\n  const localTableName = `${getNpmScope(tree)}-${kebabCase(options.tableName ?? 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  const projectConfig = readProjectConfiguration(tree, fullyQualifiedName);\n\n  const localDynamoDBPort = assignSharedPort(\n    tree,\n    projectConfig,\n    DYNAMODB_GENERATOR_IDS,\n    8000,\n  );\n\n  const containerName = `${getNpmScope(tree)}-dynamodb`;\n\n  const templateOptions = {\n    runtimeConfigKey: nameClassName,\n    localDynamoDBPort,\n    localTableName,\n    containerName,\n    containerEngine,\n  };\n\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files'),\n    dir,\n    templateOptions,\n  );\n\n  await sharedDynamoDBScriptsGenerator(tree);\n\n  const scriptsDir = relative(\n    dir,\n    joinPathFragments(PACKAGES_DIR, SHARED_SCRIPTS_DIR, 'src', 'dynamodb'),\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    continuous: true,\n    options: {\n      commands: [\n        `tsx ${scriptsDir}/start-container.ts`,\n        `tsx ${scriptsDir}/create-local-table.ts`,\n      ],\n      parallel: true,\n      cwd: '{projectRoot}',\n    },\n  };\n\n  updateProjectConfiguration(tree, fullyQualifiedName, projectConfig);\n  addGeneratorMetadata(tree, fullyQualifiedName, TS_DYNAMODB_GENERATOR_INFO);\n\n  if (options.infra !== 'none') {\n    const iac = await resolveIac(tree, options.iac);\n    await sharedConstructsGenerator(tree, { iac });\n    await addDynamoDBInfra(tree, {\n      iac,\n      projectName: fullyQualifiedName,\n      nameClassName,\n      nameKebabCase,\n      tableName: localTableName,\n      projectRoot: dir,\n    });\n  }\n\n  addDependenciesToPackageJson(\n    tree,\n    withVersions([\n      '@aws-sdk/client-dynamodb',\n      'electrodb',\n      '@aws-lambda-powertools/parameters',\n      '@aws-sdk/client-appconfigdata',\n    ]),\n    withVersions(['tsx', '@types/aws-lambda', '@types/node']),\n  );\n\n  await addGeneratorMetricsIfApplicable(tree, [TS_DYNAMODB_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default tsDynamoDBGenerator;\n"],"names":["relative","addDependenciesToPackageJson","generateFiles","joinPathFragments","readProjectConfiguration","updateProjectConfiguration","resolveContainers","addDynamoDBInfra","formatFilesInSubtree","resolveIac","installDependencies","addGeneratorMetricsIfApplicable","kebabCase","toClassName","getNpmScope","addGeneratorMetadata","getGeneratorInfo","assignSharedPort","sharedConstructsGenerator","DYNAMODB_GENERATOR_IDS","PACKAGES_DIR","SHARED_SCRIPTS_DIR","sharedDynamoDBScriptsGenerator","withVersions","tsProjectGenerator","getTsLibDetails","TS_DYNAMODB_GENERATOR_INFO","filename","tsDynamoDBGenerator","tree","options","nameKebabCase","name","nameClassName","localTableName","tableName","containerEngine","fullyQualifiedName","dir","directory","subDirectory","projectExists","preferInstallDependencies","projectConfig","localDynamoDBPort","containerName","templateOptions","runtimeConfigKey","dirname","scriptsDir","targets","executor","command","cwd","continuous","commands","parallel","infra","iac","projectName","projectRoot","languages"],"mappings":"AAAA;;;CAGC,GAED,SAASA,QAAQ,QAAQ,YAAY;AACrC,SACEC,4BAA4B,EAE5BC,aAAa,EACbC,iBAAiB,EACjBC,wBAAwB,EAExBC,0BAA0B,QACrB,aAAa;AACpB,SAASC,iBAAiB,QAAQ,4BAAyB;AAC3D,SAASC,gBAAgB,QAAQ,yDAAsD;AACvF,SAASC,oBAAoB,QAAQ,wBAAqB;AAC1D,SAASC,UAAU,QAAQ,qBAAkB;AAC7C,SAASC,mBAAmB,QAAQ,yBAAsB;AAC1D,SAASC,+BAA+B,QAAQ,yBAAsB;AACtE,SAASC,SAAS,EAAEC,WAAW,QAAQ,uBAAoB;AAC3D,SAASC,WAAW,QAAQ,2BAAwB;AACpD,SACEC,oBAAoB,EACpBC,gBAAgB,QAEX,oBAAiB;AACxB,SAASC,gBAAgB,QAAQ,sBAAmB;AACpD,SAASC,yBAAyB,QAAQ,mCAAgC;AAC1E,SACEC,sBAAsB,EACtBC,YAAY,EACZC,kBAAkB,QACb,6CAA0C;AACjD,SAASC,8BAA8B,QAAQ,yCAAsC;AACrF,SAASC,YAAY,QAAQ,0BAAuB;AACpD,OAAOC,sBAAsBC,eAAe,QAAQ,sBAAmB;AAGvE,OAAO,MAAMC,6BAA8CV,iBACzD,YAAYW,QAAQ,EACpB;AAEF,OAAO,MAAMC,sBAAsB,OACjCC,MACAC;IAEA,MAAMC,gBAAgBnB,UAAUkB,QAAQE,IAAI;IAC5C,MAAMC,gBAAgBpB,YAAYiB,QAAQE,IAAI;IAC9C,MAAME,iBAAiB,GAAGpB,YAAYe,MAAM,CAAC,EAAEjB,UAAUkB,QAAQK,SAAS,IAAIL,QAAQE,IAAI,GAAG;IAC7F,MAAMI,kBAAkB,MAAM9B,kBAAkBuB,MAAM;IACtD,MAAM,EAAEQ,kBAAkB,EAAEC,GAAG,EAAE,GAAGb,gBAAgBI,MAAM;QACxDG,MAAMF,QAAQE,IAAI;QAClBO,WAAWT,QAAQS,SAAS;QAC5BC,cAAcV,QAAQU,YAAY;IACpC;IAEA,IAAIC;IACJ,IAAI;QACFrC,yBAAyByB,MAAMQ;QAC/BI,gBAAgB;IAClB,EAAE,OAAM;QACNA,gBAAgB;IAClB;IAEA,IAAI,CAACA,eAAe;QAClB,MAAMjB,mBAAmBK,MAAM;YAC7BG,MAAMF,QAAQE,IAAI;YAClBO,WAAWT,QAAQS,SAAS;YAC5BG,2BAA2B;QAC7B;IACF;IAEA,MAAMC,gBAAgBvC,yBAAyByB,MAAMQ;IAErD,MAAMO,oBAAoB3B,iBACxBY,MACAc,eACAxB,wBACA;IAGF,MAAM0B,gBAAgB,GAAG/B,YAAYe,MAAM,SAAS,CAAC;IAErD,MAAMiB,kBAAkB;QACtBC,kBAAkBd;QAClBW;QACAV;QACAW;QACAT;IACF;IAEAlC,cACE2B,MACA1B,kBAAkB,YAAY6C,OAAO,EAAE,UACvCV,KACAQ;IAGF,MAAMxB,+BAA+BO;IAErC,MAAMoB,aAAajD,SACjBsC,KACAnC,kBAAkBiB,cAAcC,oBAAoB,OAAO;IAG7DsB,cAAcO,OAAO,CAAC,aAAa,GAAG;QACpCC,UAAU;QACVrB,SAAS;YACPsB,SAAS,CAAC,IAAI,EAAEH,WAAW,cAAc,CAAC;YAC1CI,KAAK;QACP;IACF;IACAV,cAAcO,OAAO,CAAC,MAAM,GAAG;QAC7BC,UAAU;QACVG,YAAY;QACZxB,SAAS;YACPyB,UAAU;gBACR,CAAC,IAAI,EAAEN,WAAW,mBAAmB,CAAC;gBACtC,CAAC,IAAI,EAAEA,WAAW,sBAAsB,CAAC;aAC1C;YACDO,UAAU;YACVH,KAAK;QACP;IACF;IAEAhD,2BAA2BwB,MAAMQ,oBAAoBM;IACrD5B,qBAAqBc,MAAMQ,oBAAoBX;IAE/C,IAAII,QAAQ2B,KAAK,KAAK,QAAQ;QAC5B,MAAMC,MAAM,MAAMjD,WAAWoB,MAAMC,QAAQ4B,GAAG;QAC9C,MAAMxC,0BAA0BW,MAAM;YAAE6B;QAAI;QAC5C,MAAMnD,iBAAiBsB,MAAM;YAC3B6B;YACAC,aAAatB;YACbJ;YACAF;YACAI,WAAWD;YACX0B,aAAatB;QACf;IACF;IAEArC,6BACE4B,MACAN,aAAa;QACX;QACA;QACA;QACA;KACD,GACDA,aAAa;QAAC;QAAO;QAAqB;KAAc;IAG1D,MAAMZ,gCAAgCkB,MAAM;QAACH;KAA2B;IAExE,MAAMlB,qBAAqBqB;IAC3B,OAAO,IACLnB,oBAAoBmB,MAAMC,QAAQY,yBAAyB,EAAE;YAC3DmB,WAAW;gBAAC;aAAa;QAC3B;AACJ,EAAE;AAEF,eAAejC,oBAAoB"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/dynamodb/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { relative } from 'node:path';\nimport {\n  addDependenciesToPackageJson,\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  readProjectConfiguration,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { resolveContainers } from '../../utils/containers';\nimport { addDynamoDBInfra } from '../../utils/dynamodb-constructs/dynamodb-constructs';\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 { getNpmScope } from '../../utils/npm-scope';\nimport {\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n} from '../../utils/nx';\nimport { assignSharedPort } from '../../utils/port';\nimport { sharedConstructsGenerator } from '../../utils/shared-constructs';\nimport {\n  DYNAMODB_GENERATOR_IDS,\n  PACKAGES_DIR,\n  SHARED_SCRIPTS_DIR,\n} from '../../utils/shared-constructs-constants';\nimport { sharedDynamoDBScriptsGenerator } from '../../utils/shared-dynamodb-scripts';\nimport { withVersions } from '../../utils/versions';\nimport tsProjectGenerator, { getTsLibDetails } from '../lib/generator';\nimport type { TsDynamoDBGeneratorSchema } from './schema';\n\nexport const TS_DYNAMODB_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const tsDynamoDBGenerator = async (\n  tree: Tree,\n  options: TsDynamoDBGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const nameKebabCase = kebabCase(options.name);\n  const nameClassName = toClassName(options.name);\n  const localTableName = `${getNpmScope(tree)}-${kebabCase(options.tableName ?? 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  const projectConfig = readProjectConfiguration(tree, fullyQualifiedName);\n\n  const localDynamoDBPort = assignSharedPort(\n    tree,\n    projectConfig,\n    DYNAMODB_GENERATOR_IDS,\n    8000,\n  );\n\n  const containerName = `${getNpmScope(tree)}-dynamodb`;\n\n  const templateOptions = {\n    runtimeConfigKey: nameClassName,\n    localDynamoDBPort,\n    localTableName,\n    containerName,\n    containerEngine,\n    ...esmVars(tree),\n  };\n\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files'),\n    dir,\n    templateOptions,\n  );\n\n  await sharedDynamoDBScriptsGenerator(tree);\n\n  const scriptsDir = relative(\n    dir,\n    joinPathFragments(PACKAGES_DIR, SHARED_SCRIPTS_DIR, 'src', 'dynamodb'),\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    continuous: true,\n    options: {\n      commands: [\n        `tsx ${scriptsDir}/start-container.ts`,\n        `tsx ${scriptsDir}/create-local-table.ts`,\n      ],\n      parallel: true,\n      cwd: '{projectRoot}',\n    },\n  };\n\n  updateProjectConfiguration(tree, fullyQualifiedName, projectConfig);\n  addGeneratorMetadata(tree, fullyQualifiedName, TS_DYNAMODB_GENERATOR_INFO);\n\n  if (options.infra !== 'none') {\n    const iac = await resolveIac(tree, options.iac);\n    await sharedConstructsGenerator(tree, { iac });\n    await addDynamoDBInfra(tree, {\n      iac,\n      projectName: fullyQualifiedName,\n      nameClassName,\n      nameKebabCase,\n      tableName: localTableName,\n      projectRoot: dir,\n    });\n  }\n\n  addDependenciesToPackageJson(\n    tree,\n    withVersions([\n      '@aws-sdk/client-dynamodb',\n      'electrodb',\n      '@aws-lambda-powertools/parameters',\n      '@aws-sdk/client-appconfigdata',\n    ]),\n    withVersions(['tsx', '@types/aws-lambda', '@types/node']),\n  );\n\n  await addGeneratorMetricsIfApplicable(tree, [TS_DYNAMODB_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default tsDynamoDBGenerator;\n"],"names":["relative","addDependenciesToPackageJson","generateFiles","joinPathFragments","readProjectConfiguration","updateProjectConfiguration","resolveContainers","addDynamoDBInfra","formatFilesInSubtree","resolveIac","installDependencies","addGeneratorMetricsIfApplicable","esmVars","kebabCase","toClassName","getNpmScope","addGeneratorMetadata","getGeneratorInfo","assignSharedPort","sharedConstructsGenerator","DYNAMODB_GENERATOR_IDS","PACKAGES_DIR","SHARED_SCRIPTS_DIR","sharedDynamoDBScriptsGenerator","withVersions","tsProjectGenerator","getTsLibDetails","TS_DYNAMODB_GENERATOR_INFO","filename","tsDynamoDBGenerator","tree","options","nameKebabCase","name","nameClassName","localTableName","tableName","containerEngine","fullyQualifiedName","dir","directory","subDirectory","projectExists","preferInstallDependencies","projectConfig","localDynamoDBPort","containerName","templateOptions","runtimeConfigKey","dirname","scriptsDir","targets","executor","command","cwd","continuous","commands","parallel","infra","iac","projectName","projectRoot","languages"],"mappings":"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"}

package/src/ts/lambda-function/__snapshots__/generator.spec.ts.snap

@@ -139,7 +139,7 @@ exports[`ts-lambda-function generator > terraform iac > should generate terrafor
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
     archive = {
       source  = "hashicorp/archive"
@@ -320,7 +320,7 @@ exports[`ts-lambda-function generator > terraform iac > should match snapshot fo
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
     archive = {
       source  = "hashicorp/archive"

package/src/ts/lib/generator.js

@@ -6,6 +6,7 @@ import { libraryGenerator } from "@nx/js";
 import { formatFilesInSubtree } from "../../utils/format.js";
 import { installDependencies } from "../../utils/install.js";
 import { addGeneratorMetricsIfApplicable } from "../../utils/metrics.js";
+import { isEsmWorkspace } from "../../utils/module-format.js";
 import { toKebabCase } from "../../utils/names.js";
 import { getNpmScopePrefix } from "../../utils/npm-scope.js";
 import { addGeneratorMetadata, getGeneratorInfo, projectExists } from "../../utils/nx.js";
@@ -30,6 +31,9 @@ export const TS_LIB_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
  * Generates a typescript project
  */ export const tsProjectGenerator = async (tree, schema)=>{
     const { fullyQualifiedName, dir } = getTsLibDetails(tree, schema);
+    // The module format is workspace-wide, established by the preset when the
+    // workspace is created, so vending generators always infer it from the tree.
+    const esm = isEsmWorkspace(tree);
     // Only scaffold the project on first run; on re-run skip creation so user
     // edits are preserved, but continue to (re)apply the configuration below.
     if (!projectExists(tree, fullyQualifiedName)) {
@@ -49,6 +53,7 @@ export const TS_LIB_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
         tree.delete(joinPathFragments(dir, 'src'));
         generateFiles(tree, joinPathFragments(import.meta.dirname, 'files'), joinPathFragments(dir), {
             fullyQualifiedName,
+            esm,
             pkgMgrCmd: getPackageManagerDisplayCommands().exec
         }, {
             overwriteStrategy: OverwriteStrategy.KeepExisting
@@ -56,7 +61,8 @@ export const TS_LIB_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
     }
     await configureTsProject(tree, {
         dir,
-        fullyQualifiedName
+        fullyQualifiedName,
+        esm
     });
     const projectConfiguration = readProjectConfiguration(tree, fullyQualifiedName);
     const targets = projectConfiguration.targets;

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/lib/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  type NxJsonConfiguration,\n  OverwriteStrategy,\n  readProjectConfiguration,\n  type Tree,\n  updateJson,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { libraryGenerator } from '@nx/js';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { toKebabCase } from '../../utils/names';\nimport { getNpmScopePrefix } from '../../utils/npm-scope';\nimport {\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  projectExists,\n} from '../../utils/nx';\nimport { sortObjectKeys } from '../../utils/object';\nimport { getPackageManagerDisplayCommands } from '../../utils/pkg-manager';\nimport type { TsProjectGeneratorSchema } from './schema';\nimport { configureTsProject } from './ts-project-utils';\n\nexport const TS_LIB_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport interface TsLibDetails {\n  /**\n   * Full package name including scope (eg @foo/bar)\n   */\n  readonly fullyQualifiedName: string;\n  /**\n   * Directory of the library relative to the root\n   */\n  readonly dir: string;\n}\n\n/**\n * Returns details about the TS library to be created\n */\nexport const getTsLibDetails = (\n  tree: Tree,\n  schema: TsProjectGeneratorSchema,\n): TsLibDetails => {\n  const scope = getNpmScopePrefix(tree);\n  const normalizedName = toKebabCase(schema.name);\n  const fullyQualifiedName = `${scope}${normalizedName}`;\n  // NB: interactive nx generator cli can pass empty string\n  const dir = joinPathFragments(\n    schema.directory || '.',\n    schema.subDirectory || normalizedName,\n  );\n  return { dir, fullyQualifiedName };\n};\n\n/**\n * Generates a typescript project\n */\nexport const tsProjectGenerator = async (\n  tree: Tree,\n  schema: TsProjectGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const { fullyQualifiedName, dir } = getTsLibDetails(tree, schema);\n\n  // Only scaffold the project on first run; on re-run skip creation so user\n  // edits are preserved, but continue to (re)apply the configuration below.\n  if (!projectExists(tree, fullyQualifiedName)) {\n    await libraryGenerator(tree, {\n      ...schema,\n      name: fullyQualifiedName,\n      directory: dir,\n      skipPackageJson: true,\n      bundler: 'tsc', // TODO: consider supporting others\n      linter: 'none',\n      unitTestRunner: 'vitest',\n      // Register the @nx/vitest plugin so the test target is inferred rather\n      // than emitting the deprecated @nx/vitest:test executor target.\n      addPlugin: true,\n    });\n\n    // Replace with simpler sample source code\n    tree.delete(joinPathFragments(dir, 'src'));\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files'),\n      joinPathFragments(dir),\n      {\n        fullyQualifiedName,\n        pkgMgrCmd: getPackageManagerDisplayCommands().exec,\n      },\n      {\n        overwriteStrategy: OverwriteStrategy.KeepExisting,\n      },\n    );\n  }\n  await configureTsProject(tree, {\n    dir,\n    fullyQualifiedName,\n  });\n\n  const projectConfiguration = readProjectConfiguration(\n    tree,\n    fullyQualifiedName,\n  );\n  const targets = projectConfiguration.targets;\n\n  targets['compile'] = {\n    executor: 'nx:run-commands',\n    outputs: ['{workspaceRoot}/dist/{projectRoot}/tsc'],\n    options: {\n      command: 'tsc --build tsconfig.lib.json',\n      cwd: '{projectRoot}',\n    },\n  };\n  targets['build'] = {\n    dependsOn: ['lint', 'compile', 'test'],\n  };\n  projectConfiguration.targets = sortObjectKeys(targets);\n\n  updateProjectConfiguration(tree, fullyQualifiedName, projectConfiguration);\n\n  addGeneratorMetadata(tree, fullyQualifiedName, TS_LIB_GENERATOR_INFO);\n\n  updateJson(tree, 'nx.json', (nxJson: NxJsonConfiguration) => {\n    nxJson.namedInputs = {\n      ...nxJson.namedInputs,\n      default: [\n        ...(nxJson.namedInputs?.default ?? []).filter(\n          (input) =>\n            typeof input !== 'object' ||\n            !('dependentTasksOutputFiles' in input) ||\n            !(input.dependentTasksOutputFiles === '**/*' && input.transitive),\n        ),\n        {\n          dependentTasksOutputFiles: '**/*',\n          transitive: true,\n        },\n      ],\n    };\n\n    nxJson.targetDefaults = {\n      ...nxJson.targetDefaults,\n      compile: {\n        cache: true,\n        ...nxJson.targetDefaults?.compile,\n        inputs: [\n          ...(nxJson.targetDefaults?.compile?.inputs ?? []).filter(\n            (i) => i !== 'default',\n          ),\n          'default',\n        ],\n      },\n      build: {\n        cache: true,\n        ...nxJson.targetDefaults?.build,\n        inputs: [\n          ...(nxJson.targetDefaults?.build?.inputs ?? []).filter(\n            (i) => i !== 'default',\n          ),\n          'default',\n        ],\n      },\n      test: {\n        ...nxJson.targetDefaults?.test,\n        inputs: [\n          ...(nxJson.targetDefaults?.test?.inputs ?? []).filter(\n            (i) => i !== 'default',\n          ),\n          'default',\n        ],\n      },\n    };\n\n    // Ensure we only declare a single typescript plugin with the correct settings\n    nxJson.plugins = [\n      {\n        plugin: '@nx/js/typescript',\n        options: {\n          typecheck: {\n            targetName: 'typecheck',\n          },\n          build: {\n            targetName: 'compile',\n            configName: 'tsconfig.lib.json',\n            buildDepsName: 'build-deps',\n            watchDepsName: 'watch-deps',\n          },\n        },\n      },\n      ...(nxJson.plugins ?? []).filter(\n        (p) => typeof p === 'string' || p.plugin !== '@nx/js/typescript',\n      ),\n    ];\n\n    return nxJson;\n  });\n\n  await addGeneratorMetricsIfApplicable(tree, [TS_LIB_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n\n  // `installDependencies` ensures vitest resolves for the `typescript` language (the\n  // generated vitest.config.mts imports it and Nx loads that config when\n  // computing the project graph), so a deferred install still runs when needed.\n  return () =>\n    installDependencies(tree, schema.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\nexport default tsProjectGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","readProjectConfiguration","updateJson","updateProjectConfiguration","libraryGenerator","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","toKebabCase","getNpmScopePrefix","addGeneratorMetadata","getGeneratorInfo","projectExists","sortObjectKeys","getPackageManagerDisplayCommands","configureTsProject","TS_LIB_GENERATOR_INFO","filename","getTsLibDetails","tree","schema","scope","normalizedName","name","fullyQualifiedName","dir","directory","subDirectory","tsProjectGenerator","skipPackageJson","bundler","linter","unitTestRunner","addPlugin","delete","dirname","pkgMgrCmd","exec","overwriteStrategy","KeepExisting","projectConfiguration","targets","executor","outputs","options","command","cwd","dependsOn","nxJson","namedInputs","default","filter","input","dependentTasksOutputFiles","transitive","targetDefaults","compile","cache","inputs","i","build","test","plugins","plugin","typecheck","targetName","configName","buildDepsName","watchDepsName","p","preferInstallDependencies","languages"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/lib/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  type NxJsonConfiguration,\n  OverwriteStrategy,\n  readProjectConfiguration,\n  type Tree,\n  updateJson,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { libraryGenerator } from '@nx/js';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { isEsmWorkspace } from '../../utils/module-format';\nimport { toKebabCase } from '../../utils/names';\nimport { getNpmScopePrefix } from '../../utils/npm-scope';\nimport {\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  projectExists,\n} from '../../utils/nx';\nimport { sortObjectKeys } from '../../utils/object';\nimport { getPackageManagerDisplayCommands } from '../../utils/pkg-manager';\nimport type { TsProjectGeneratorSchema } from './schema';\nimport { configureTsProject } from './ts-project-utils';\n\nexport const TS_LIB_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport interface TsLibDetails {\n  /**\n   * Full package name including scope (eg @foo/bar)\n   */\n  readonly fullyQualifiedName: string;\n  /**\n   * Directory of the library relative to the root\n   */\n  readonly dir: string;\n}\n\n/**\n * Returns details about the TS library to be created\n */\nexport const getTsLibDetails = (\n  tree: Tree,\n  schema: TsProjectGeneratorSchema,\n): TsLibDetails => {\n  const scope = getNpmScopePrefix(tree);\n  const normalizedName = toKebabCase(schema.name);\n  const fullyQualifiedName = `${scope}${normalizedName}`;\n  // NB: interactive nx generator cli can pass empty string\n  const dir = joinPathFragments(\n    schema.directory || '.',\n    schema.subDirectory || normalizedName,\n  );\n  return { dir, fullyQualifiedName };\n};\n\n/**\n * Generates a typescript project\n */\nexport const tsProjectGenerator = async (\n  tree: Tree,\n  schema: TsProjectGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const { fullyQualifiedName, dir } = getTsLibDetails(tree, schema);\n  // The module format is workspace-wide, established by the preset when the\n  // workspace is created, so vending generators always infer it from the tree.\n  const esm = isEsmWorkspace(tree);\n\n  // Only scaffold the project on first run; on re-run skip creation so user\n  // edits are preserved, but continue to (re)apply the configuration below.\n  if (!projectExists(tree, fullyQualifiedName)) {\n    await libraryGenerator(tree, {\n      ...schema,\n      name: fullyQualifiedName,\n      directory: dir,\n      skipPackageJson: true,\n      bundler: 'tsc', // TODO: consider supporting others\n      linter: 'none',\n      unitTestRunner: 'vitest',\n      // Register the @nx/vitest plugin so the test target is inferred rather\n      // than emitting the deprecated @nx/vitest:test executor target.\n      addPlugin: true,\n    });\n\n    // Replace with simpler sample source code\n    tree.delete(joinPathFragments(dir, 'src'));\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files'),\n      joinPathFragments(dir),\n      {\n        fullyQualifiedName,\n        esm,\n        pkgMgrCmd: getPackageManagerDisplayCommands().exec,\n      },\n      {\n        overwriteStrategy: OverwriteStrategy.KeepExisting,\n      },\n    );\n  }\n  await configureTsProject(tree, {\n    dir,\n    fullyQualifiedName,\n    esm,\n  });\n\n  const projectConfiguration = readProjectConfiguration(\n    tree,\n    fullyQualifiedName,\n  );\n  const targets = projectConfiguration.targets;\n\n  targets['compile'] = {\n    executor: 'nx:run-commands',\n    outputs: ['{workspaceRoot}/dist/{projectRoot}/tsc'],\n    options: {\n      command: 'tsc --build tsconfig.lib.json',\n      cwd: '{projectRoot}',\n    },\n  };\n  targets['build'] = {\n    dependsOn: ['lint', 'compile', 'test'],\n  };\n  projectConfiguration.targets = sortObjectKeys(targets);\n\n  updateProjectConfiguration(tree, fullyQualifiedName, projectConfiguration);\n\n  addGeneratorMetadata(tree, fullyQualifiedName, TS_LIB_GENERATOR_INFO);\n\n  updateJson(tree, 'nx.json', (nxJson: NxJsonConfiguration) => {\n    nxJson.namedInputs = {\n      ...nxJson.namedInputs,\n      default: [\n        ...(nxJson.namedInputs?.default ?? []).filter(\n          (input) =>\n            typeof input !== 'object' ||\n            !('dependentTasksOutputFiles' in input) ||\n            !(input.dependentTasksOutputFiles === '**/*' && input.transitive),\n        ),\n        {\n          dependentTasksOutputFiles: '**/*',\n          transitive: true,\n        },\n      ],\n    };\n\n    nxJson.targetDefaults = {\n      ...nxJson.targetDefaults,\n      compile: {\n        cache: true,\n        ...nxJson.targetDefaults?.compile,\n        inputs: [\n          ...(nxJson.targetDefaults?.compile?.inputs ?? []).filter(\n            (i) => i !== 'default',\n          ),\n          'default',\n        ],\n      },\n      build: {\n        cache: true,\n        ...nxJson.targetDefaults?.build,\n        inputs: [\n          ...(nxJson.targetDefaults?.build?.inputs ?? []).filter(\n            (i) => i !== 'default',\n          ),\n          'default',\n        ],\n      },\n      test: {\n        ...nxJson.targetDefaults?.test,\n        inputs: [\n          ...(nxJson.targetDefaults?.test?.inputs ?? []).filter(\n            (i) => i !== 'default',\n          ),\n          'default',\n        ],\n      },\n    };\n\n    // Ensure we only declare a single typescript plugin with the correct settings\n    nxJson.plugins = [\n      {\n        plugin: '@nx/js/typescript',\n        options: {\n          typecheck: {\n            targetName: 'typecheck',\n          },\n          build: {\n            targetName: 'compile',\n            configName: 'tsconfig.lib.json',\n            buildDepsName: 'build-deps',\n            watchDepsName: 'watch-deps',\n          },\n        },\n      },\n      ...(nxJson.plugins ?? []).filter(\n        (p) => typeof p === 'string' || p.plugin !== '@nx/js/typescript',\n      ),\n    ];\n\n    return nxJson;\n  });\n\n  await addGeneratorMetricsIfApplicable(tree, [TS_LIB_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n\n  // `installDependencies` ensures vitest resolves for the `typescript` language (the\n  // generated vitest.config.mts imports it and Nx loads that config when\n  // computing the project graph), so a deferred install still runs when needed.\n  return () =>\n    installDependencies(tree, schema.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\nexport default tsProjectGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","readProjectConfiguration","updateJson","updateProjectConfiguration","libraryGenerator","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","isEsmWorkspace","toKebabCase","getNpmScopePrefix","addGeneratorMetadata","getGeneratorInfo","projectExists","sortObjectKeys","getPackageManagerDisplayCommands","configureTsProject","TS_LIB_GENERATOR_INFO","filename","getTsLibDetails","tree","schema","scope","normalizedName","name","fullyQualifiedName","dir","directory","subDirectory","tsProjectGenerator","esm","skipPackageJson","bundler","linter","unitTestRunner","addPlugin","delete","dirname","pkgMgrCmd","exec","overwriteStrategy","KeepExisting","projectConfiguration","targets","executor","outputs","options","command","cwd","dependsOn","nxJson","namedInputs","default","filter","input","dependentTasksOutputFiles","transitive","targetDefaults","compile","cache","inputs","i","build","test","plugins","plugin","typecheck","targetName","configName","buildDepsName","watchDepsName","p","preferInstallDependencies","languages"],"mappings":"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"}

package/src/ts/lib/ts-project-utils.js

@@ -4,6 +4,7 @@
  */ import { joinPathFragments, updateJson } from "@nx/devkit";
 import { join, relative } from "path";
 import { addLicenseCheckToLintTarget } from "../../license/config.js";
+import { isEsmWorkspace } from "../../utils/module-format.js";
 import { toScopeAlias } from "../../utils/npm-scope.js";
 import { configureBiomeLint } from "./biome.js";
 import { configureVitest } from "./vitest.js";
@@ -27,7 +28,11 @@ import { configureVitest } from "./vitest.js";
 /**
  * Updates typescript projects
  */ export const configureTsProject = async (tree, options)=>{
-    // Remove conflicting commonjs module from tsconfig
+    // When the caller doesn't specify a module format, infer it from the
+    // workspace root package.json (defaulting to ESM for a fresh workspace).
+    const esm = options.esm ?? isEsmWorkspace(tree);
+    // Remove a conflicting `module: commonjs` from the project tsconfig.json
+    // (CommonJS is configured on tsconfig.lib.json below when needed).
     updateJson(tree, join(options.dir, 'tsconfig.json'), (tsConfig)=>({
             ...tsConfig,
             compilerOptions: {
@@ -46,7 +51,15 @@ import { configureVitest } from "./vitest.js";
                     baseUrl: undefined,
                     rootDir: '.',
                     outDir: distDir,
-                    tsBuildInfoFile: join(distDir, 'tsconfig.lib.tsbuildinfo')
+                    tsBuildInfoFile: join(distDir, 'tsconfig.lib.tsbuildinfo'),
+                    // @nx/js configures the lib for ESM (module `nodenext`). CommonJS
+                    // projects use `node16`, which honours the workspace's
+                    // `type: commonjs`, emits CommonJS and resolves extensionless relative
+                    // imports. (Plain `commonjs`/`node` is deprecated in TypeScript 6.)
+                    ...esm ? {} : {
+                        module: 'node16',
+                        moduleResolution: 'node16'
+                    }
                 }
             }));
     }
@@ -79,10 +92,12 @@ import { configureVitest } from "./vitest.js";
                 ])
             }));
     }
-    // Update the root package.json
+    // Update the root package.json. ESM projects require `type: module`; for
+    // CommonJS we write an explicit `type: commonjs` marker (which Node treats
+    // identically to an absent `type`).
     updateJson(tree, 'package.json', (packageJson)=>({
             ...packageJson,
-            type: 'module'
+            type: esm ? 'module' : 'commonjs'
         }));
     // Remove package.json if it exists
     if (tree.exists(join(options.dir, 'package.json'))) {

package/src/ts/lib/ts-project-utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/lib/ts-project-utils.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { joinPathFragments, type Tree, updateJson } from '@nx/devkit';\nimport { join, relative } from 'path';\nimport { addLicenseCheckToLintTarget } from '../../license/config';\nimport { toScopeAlias } from '../../utils/npm-scope';\nimport { configureBiomeLint } from './biome';\nimport type { ConfigureProjectOptions } from './types';\nimport { configureVitest } from './vitest';\n\ninterface TsConfigReference {\n  path: string;\n}\n\n/**\n * Merges new TypeScript project references into existing ones, deduplicating by\n * path and preserving the order of existing references so re-running a\n * generator neither duplicates nor reorders references.\n */\nexport const mergeTsReferences = (\n  existing: TsConfigReference[] | undefined,\n  toAdd: TsConfigReference[],\n): TsConfigReference[] => {\n  const references = [...(existing ?? [])];\n  const existingPaths = new Set(references.map((ref) => ref.path));\n  for (const ref of toAdd) {\n    if (!existingPaths.has(ref.path)) {\n      references.push(ref);\n      existingPaths.add(ref.path);\n    }\n  }\n  return references;\n};\n\n/**\n * Updates typescript projects\n */\nexport const configureTsProject = async (\n  tree: Tree,\n  options: ConfigureProjectOptions,\n) => {\n  // Remove conflicting commonjs module from tsconfig\n  updateJson(tree, join(options.dir, 'tsconfig.json'), (tsConfig) => ({\n    ...tsConfig,\n    compilerOptions: {\n      ...tsConfig.compilerOptions,\n      module:\n        tsConfig.compilerOptions?.module === 'commonjs'\n          ? undefined\n          : tsConfig.compilerOptions?.module,\n    },\n  }));\n  const outDirToRootRelativePath = relative(\n    join(tree.root, options.dir),\n    tree.root,\n  );\n  const distDir = join(outDirToRootRelativePath, 'dist', options.dir, 'tsc');\n  // Remove baseUrl and rootDir from the tsconfig.lib.json\n  if (tree.exists(join(options.dir, 'tsconfig.lib.json'))) {\n    updateJson(tree, join(options.dir, 'tsconfig.lib.json'), (tsConfig) => ({\n      ...tsConfig,\n      compilerOptions: {\n        ...tsConfig.compilerOptions,\n        baseUrl: undefined,\n        rootDir: '.',\n        outDir: distDir,\n        tsBuildInfoFile: join(distDir, 'tsconfig.lib.tsbuildinfo'),\n      },\n    }));\n  }\n  // Update root project tsconfig\n  updateJson(tree, 'tsconfig.base.json', (tsConfig) => ({\n    ...tsConfig,\n    compilerOptions: {\n      ...tsConfig.compilerOptions,\n      // baseUrl is deprecated in TypeScript 6 — use ./ prefix in paths instead\n      baseUrl: undefined,\n      rootDir: '.',\n      paths: {\n        // Remove any path aliases for this project with the npm scope prefix (eg remove @foo/bar)\n        ...Object.fromEntries(\n          Object.entries(tsConfig.compilerOptions?.paths ?? {}).filter(\n            ([k]) => k !== options.fullyQualifiedName,\n          ),\n        ),\n        // Add aliases which begin with colon (eg :foo/bar) to avoid sniping attacks\n        [toScopeAlias(options.fullyQualifiedName)]: [\n          `./${joinPathFragments(options.dir, 'src', 'index.ts')}`,\n        ],\n      },\n    },\n  }));\n  if (tree.exists('tsconfig.json')) {\n    updateJson(tree, 'tsconfig.json', (tsConfig) => ({\n      ...tsConfig,\n      // Add project references, deduplicating and preserving existing order\n      references: mergeTsReferences(tsConfig.references, [\n        { path: `./${options.dir}` },\n      ]),\n    }));\n  }\n  // Update the root package.json\n  updateJson(tree, 'package.json', (packageJson) => ({\n    ...packageJson,\n    type: 'module',\n  }));\n  // Remove package.json if it exists\n  if (tree.exists(join(options.dir, 'package.json'))) {\n    tree.delete(join(options.dir, 'package.json'));\n  }\n\n  await configureBiomeLint(tree, options);\n  await configureVitest(tree, options);\n\n  // If license checking is configured, make this project's lint target depend\n  // on the root license-check target. No-op if there's no license-check target\n  // (i.e. the license generator hasn't run); the license generator wires up\n  // existing projects itself, so this works regardless of generator order.\n  addLicenseCheckToLintTarget(tree, options.fullyQualifiedName);\n};\n"],"names":["joinPathFragments","updateJson","join","relative","addLicenseCheckToLintTarget","toScopeAlias","configureBiomeLint","configureVitest","mergeTsReferences","existing","toAdd","references","existingPaths","Set","map","ref","path","has","push","add","configureTsProject","tree","options","dir","tsConfig","compilerOptions","module","undefined","outDirToRootRelativePath","root","distDir","exists","baseUrl","rootDir","outDir","tsBuildInfoFile","paths","Object","fromEntries","entries","filter","k","fullyQualifiedName","packageJson","type","delete"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/lib/ts-project-utils.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { joinPathFragments, type Tree, updateJson } from '@nx/devkit';\nimport { join, relative } from 'path';\nimport { addLicenseCheckToLintTarget } from '../../license/config';\nimport { isEsmWorkspace } from '../../utils/module-format';\nimport { toScopeAlias } from '../../utils/npm-scope';\nimport { configureBiomeLint } from './biome';\nimport type { ConfigureProjectOptions } from './types';\nimport { configureVitest } from './vitest';\n\ninterface TsConfigReference {\n  path: string;\n}\n\n/**\n * Merges new TypeScript project references into existing ones, deduplicating by\n * path and preserving the order of existing references so re-running a\n * generator neither duplicates nor reorders references.\n */\nexport const mergeTsReferences = (\n  existing: TsConfigReference[] | undefined,\n  toAdd: TsConfigReference[],\n): TsConfigReference[] => {\n  const references = [...(existing ?? [])];\n  const existingPaths = new Set(references.map((ref) => ref.path));\n  for (const ref of toAdd) {\n    if (!existingPaths.has(ref.path)) {\n      references.push(ref);\n      existingPaths.add(ref.path);\n    }\n  }\n  return references;\n};\n\n/**\n * Updates typescript projects\n */\nexport const configureTsProject = async (\n  tree: Tree,\n  options: ConfigureProjectOptions,\n) => {\n  // When the caller doesn't specify a module format, infer it from the\n  // workspace root package.json (defaulting to ESM for a fresh workspace).\n  const esm = options.esm ?? isEsmWorkspace(tree);\n\n  // Remove a conflicting `module: commonjs` from the project tsconfig.json\n  // (CommonJS is configured on tsconfig.lib.json below when needed).\n  updateJson(tree, join(options.dir, 'tsconfig.json'), (tsConfig) => ({\n    ...tsConfig,\n    compilerOptions: {\n      ...tsConfig.compilerOptions,\n      module:\n        tsConfig.compilerOptions?.module === 'commonjs'\n          ? undefined\n          : tsConfig.compilerOptions?.module,\n    },\n  }));\n  const outDirToRootRelativePath = relative(\n    join(tree.root, options.dir),\n    tree.root,\n  );\n  const distDir = join(outDirToRootRelativePath, 'dist', options.dir, 'tsc');\n  // Remove baseUrl and rootDir from the tsconfig.lib.json\n  if (tree.exists(join(options.dir, 'tsconfig.lib.json'))) {\n    updateJson(tree, join(options.dir, 'tsconfig.lib.json'), (tsConfig) => ({\n      ...tsConfig,\n      compilerOptions: {\n        ...tsConfig.compilerOptions,\n        baseUrl: undefined,\n        rootDir: '.',\n        outDir: distDir,\n        tsBuildInfoFile: join(distDir, 'tsconfig.lib.tsbuildinfo'),\n        // @nx/js configures the lib for ESM (module `nodenext`). CommonJS\n        // projects use `node16`, which honours the workspace's\n        // `type: commonjs`, emits CommonJS and resolves extensionless relative\n        // imports. (Plain `commonjs`/`node` is deprecated in TypeScript 6.)\n        ...(esm ? {} : { module: 'node16', moduleResolution: 'node16' }),\n      },\n    }));\n  }\n  // Update root project tsconfig\n  updateJson(tree, 'tsconfig.base.json', (tsConfig) => ({\n    ...tsConfig,\n    compilerOptions: {\n      ...tsConfig.compilerOptions,\n      // baseUrl is deprecated in TypeScript 6 — use ./ prefix in paths instead\n      baseUrl: undefined,\n      rootDir: '.',\n      paths: {\n        // Remove any path aliases for this project with the npm scope prefix (eg remove @foo/bar)\n        ...Object.fromEntries(\n          Object.entries(tsConfig.compilerOptions?.paths ?? {}).filter(\n            ([k]) => k !== options.fullyQualifiedName,\n          ),\n        ),\n        // Add aliases which begin with colon (eg :foo/bar) to avoid sniping attacks\n        [toScopeAlias(options.fullyQualifiedName)]: [\n          `./${joinPathFragments(options.dir, 'src', 'index.ts')}`,\n        ],\n      },\n    },\n  }));\n  if (tree.exists('tsconfig.json')) {\n    updateJson(tree, 'tsconfig.json', (tsConfig) => ({\n      ...tsConfig,\n      // Add project references, deduplicating and preserving existing order\n      references: mergeTsReferences(tsConfig.references, [\n        { path: `./${options.dir}` },\n      ]),\n    }));\n  }\n  // Update the root package.json. ESM projects require `type: module`; for\n  // CommonJS we write an explicit `type: commonjs` marker (which Node treats\n  // identically to an absent `type`).\n  updateJson(tree, 'package.json', (packageJson) => ({\n    ...packageJson,\n    type: esm ? 'module' : 'commonjs',\n  }));\n  // Remove package.json if it exists\n  if (tree.exists(join(options.dir, 'package.json'))) {\n    tree.delete(join(options.dir, 'package.json'));\n  }\n\n  await configureBiomeLint(tree, options);\n  await configureVitest(tree, options);\n\n  // If license checking is configured, make this project's lint target depend\n  // on the root license-check target. No-op if there's no license-check target\n  // (i.e. the license generator hasn't run); the license generator wires up\n  // existing projects itself, so this works regardless of generator order.\n  addLicenseCheckToLintTarget(tree, options.fullyQualifiedName);\n};\n"],"names":["joinPathFragments","updateJson","join","relative","addLicenseCheckToLintTarget","isEsmWorkspace","toScopeAlias","configureBiomeLint","configureVitest","mergeTsReferences","existing","toAdd","references","existingPaths","Set","map","ref","path","has","push","add","configureTsProject","tree","options","esm","dir","tsConfig","compilerOptions","module","undefined","outDirToRootRelativePath","root","distDir","exists","baseUrl","rootDir","outDir","tsBuildInfoFile","moduleResolution","paths","Object","fromEntries","entries","filter","k","fullyQualifiedName","packageJson","type","delete"],"mappings":"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"}

package/src/ts/lib/types.d.ts

@@ -11,4 +11,10 @@ export interface ConfigureProjectOptions {
      * Directory of the project relative to the root
      */
     readonly dir: string;
+    /**
+     * Whether the project uses ES modules. When false, the project is configured
+     * for CommonJS (tsconfig `module`/`moduleResolution`, no root `type: module`).
+     * Defaults to true (ESM) when not specified.
+     */
+    readonly esm?: boolean;
 }

package/src/ts/lib/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/lib/types.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nexport interface ConfigureProjectOptions {\n  /**\n   * Full package name including scope (eg @foo/bar)\n   */\n  readonly fullyQualifiedName: string;\n  /**\n   * Directory of the project relative to the root\n   */\n  readonly dir: string;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GACD,WASC"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/lib/types.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nexport interface ConfigureProjectOptions {\n  /**\n   * Full package name including scope (eg @foo/bar)\n   */\n  readonly fullyQualifiedName: string;\n  /**\n   * Directory of the project relative to the root\n   */\n  readonly dir: string;\n  /**\n   * Whether the project uses ES modules. When false, the project is configured\n   * for CommonJS (tsconfig `module`/`moduleResolution`, no root `type: module`).\n   * Defaults to true (ESM) when not specified.\n   */\n  readonly esm?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GACD,WAeC"}

package/src/ts/mcp-server/__snapshots__/generator.spec.ts.snap

@@ -135,7 +135,7 @@ exports[`ts#mcp-server generator > should match snapshot for Terraform generated
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
     null = {
       source  = "hashicorp/null"
@@ -201,6 +201,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)
@@ -436,6 +460,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}"
@@ -462,7 +508,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 {
@@ -489,7 +543,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
@@ -564,6 +618,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
+}
 "
 `;
 
@@ -590,6 +649,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
@@ -605,6 +683,9 @@ module "agent_core_runtime" {
   agent_runtime_name = "TerraformSnapshotServer"
   docker_image_tag = "proj-terraform-snapshot-server:latest"
   server_protocol = "MCP"
+  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
@@ -647,12 +728,17 @@ 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
+}
 "
 `;
 
 exports[`ts#mcp-server generator > should match snapshot for generated files > mcp-server-http.ts 1`] = `
 "#!/usr/bin/env node
-import { createServer } from './server';
+import { createServer } from './server.js';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import express, { Request, Response } from 'express';
 
@@ -740,14 +826,14 @@ void (async () => {
 `;
 
 exports[`ts#mcp-server generator > should match snapshot for generated files > mcp-server-index.ts 1`] = `
-"export * from './server';
+"export * from './server.js';
 "
 `;
 
 exports[`ts#mcp-server generator > should match snapshot for generated files > mcp-server-server.ts 1`] = `
 "import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { registerDivideTool } from './tools/divide';
-import { registerSampleGuidanceResource } from './resources/sample-guidance';
+import { registerDivideTool } from './tools/divide.js';
+import { registerSampleGuidanceResource } from './resources/sample-guidance.js';
 
 /**
  * Create the MCP Server
@@ -769,7 +855,7 @@ export const createServer = async () => {
 exports[`ts#mcp-server generator > should match snapshot for generated files > mcp-server-stdio.ts 1`] = `
 "#!/usr/bin/env node
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { createServer } from './server';
+import { createServer } from './server.js';
 
 export const startMcpServer = async () => {
   const transport = new StdioServerTransport();