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

package/src/ts/mcp-server/generator.js

@@ -12,6 +12,7 @@ import { FsCommands } from "../../utils/fs.js";
 import { resolveIac } from "../../utils/iac.js";
 import { installDependencies } from "../../utils/install.js";
 import { addGeneratorMetricsIfApplicable } from "../../utils/metrics.js";
+import { isEsmWorkspace } from "../../utils/module-format.js";
 import { kebabCase, toClassName } from "../../utils/names.js";
 import { getNpmScope } from "../../utils/npm-scope.js";
 import { addComponentDevTarget, addComponentGeneratorMetadata, addDependencyToTargetIfNotPresent, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../utils/nx.js";
@@ -41,8 +42,8 @@ export const tsMcpServerGenerator = async (tree, options)=>{
     const projectPackageJsonPath = joinPathFragments(project.root, 'package.json');
     // Generate esm if the module system is esm, otherwise commonjs. Projects
     // don't typically have their own package.json (dependencies are declared in
-    // the workspace root), so fall back to the root which is esm by default.
-    const esm = readJson(tree, tree.exists(projectPackageJsonPath) ? projectPackageJsonPath : 'package.json').type === 'module';
+    // the workspace root), so fall back to the workspace format when absent.
+    const esm = tree.exists(projectPackageJsonPath) ? readJson(tree, projectPackageJsonPath).type === 'module' : isEsmWorkspace(tree);
     // Generate example server
     generateFiles(tree, joinPathFragments(import.meta.dirname, 'files'), targetSourceDir, {
         name,

package/src/ts/mcp-server/generator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/mcp-server/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  detectPackageManager,\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  readJson,\n  type Tree,\n  updateJson,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { ensureLicenseExceptions } from '../../license/config';\nimport { MCP_INSPECTOR_EXCEPTIONS } from '../../license/known-exceptions';\nimport { addMcpServerInfra } from '../../utils/agent-core-constructs/agent-core-constructs';\nimport { addTypeScriptBundleTarget } from '../../utils/bundle/bundle';\nimport { resolveContainers } from '../../utils/containers';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { FsCommands } from '../../utils/fs';\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  addComponentDevTarget,\n  addComponentGeneratorMetadata,\n  addDependencyToTargetIfNotPresent,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../utils/nx';\nimport { sortObjectKeys } from '../../utils/object';\nimport { assignPort } from '../../utils/port';\nimport { sharedConstructsGenerator } from '../../utils/shared-constructs';\nimport { TS_VERSIONS, withVersions } from '../../utils/versions';\nimport type { TsMcpServerGeneratorSchema } from './schema';\n\nexport const TS_MCP_SERVER_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const tsMcpServerGenerator = async (\n  tree: Tree,\n  options: TsMcpServerGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const project = readProjectConfigurationUnqualified(tree, options.project);\n\n  if (!tree.exists(joinPathFragments(project.root, 'tsconfig.json'))) {\n    throw new Error(\n      `Unsupported project ${options.project}. Expected a TypeScript project (with a tsconfig.json)`,\n    );\n  }\n\n  const defaultName = `${kebabCase(project.name.split('/').pop())}-mcp-server`;\n  const name = kebabCase(options.name || defaultName);\n  const mcpServerNameClassName = toClassName(name);\n  const mcpTargetPrefix = options.name ? name : 'mcp-server';\n  const targetSourceDirRelativeToProjectRoot = joinPathFragments(\n    'src',\n    mcpTargetPrefix,\n  );\n  const targetSourceDir = joinPathFragments(\n    project.root,\n    targetSourceDirRelativeToProjectRoot,\n  );\n  const relativeSourceDir = targetSourceDir.replace(project.root + '/', './');\n  const distDir = joinPathFragments('dist', project.root);\n\n  const infra = options.infra ?? 'agentcore';\n\n  if (infra === 'none' && options.auth && options.auth !== 'iam') {\n    console.warn(\n      'Warning: auth is ignored when no infrastructure is configured (no infrastructure is generated)',\n    );\n  }\n\n  const auth = options.auth ?? 'iam';\n\n  const projectPackageJsonPath = joinPathFragments(\n    project.root,\n    'package.json',\n  );\n\n  // Generate esm if the module system is esm, otherwise commonjs. Projects\n  // don't typically have their own package.json (dependencies are declared in\n  // the workspace root), so fall back to the root which is esm by default.\n  const esm =\n    readJson(\n      tree,\n      tree.exists(projectPackageJsonPath)\n        ? projectPackageJsonPath\n        : 'package.json',\n    ).type === 'module';\n\n  // Generate example server\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files'),\n    targetSourceDir,\n    {\n      name,\n      esm,\n      distDir,\n      adotVersion:\n        TS_VERSIONS['@aws/aws-distro-opentelemetry-node-autoinstrumentation'],\n    },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Add dependencies\n  const deps = withVersions([\n    '@modelcontextprotocol/sdk',\n    'zod',\n    'express',\n    '@aws-lambda-powertools/parameters',\n    '@aws-sdk/client-appconfigdata',\n  ]);\n  const devDeps = withVersions([\n    'tsx',\n    '@types/express',\n    '@modelcontextprotocol/inspector',\n  ]);\n\n  // Add hosting based on infra\n  if (infra === 'agentcore') {\n    const containers = await resolveContainers(tree, 'inherit');\n    const dockerImageTag = `${getNpmScope(tree)}-${name}:latest`;\n\n    // Add bundle target\n    await addTypeScriptBundleTarget(tree, project, {\n      targetFilePath: `${targetSourceDirRelativeToProjectRoot}/http.ts`,\n      bundleOutputDir: joinPathFragments('mcp', name),\n    });\n\n    const dockerOutputDir = joinPathFragments(\n      'dist',\n      project.root,\n      'bundle',\n      'mcp',\n      name,\n    );\n    const dockerTargetName = `${mcpTargetPrefix}-docker`;\n\n    const fs = new FsCommands(tree);\n    project.targets[dockerTargetName] = {\n      cache: true,\n      outputs: [`{workspaceRoot}/${dockerOutputDir}/Dockerfile`],\n      executor: 'nx:run-commands',\n      options: {\n        commands: [\n          fs.cp(\n            `${targetSourceDir}/Dockerfile`,\n            `${dockerOutputDir}/Dockerfile`,\n          ),\n          `${containers} build --platform linux/arm64 -t ${dockerImageTag} ${dockerOutputDir}`,\n        ],\n        parallel: false,\n      },\n      dependsOn: ['bundle'],\n    };\n\n    addDependencyToTargetIfNotPresent(project, 'docker', dockerTargetName);\n    addDependencyToTargetIfNotPresent(project, 'build', 'docker');\n\n    // Add shared constructs\n    const iac = await resolveIac(tree, options.iac);\n    await sharedConstructsGenerator(tree, { iac });\n\n    // Add the construct to deploy the mcp server\n    await addMcpServerInfra(tree, {\n      mcpServerNameKebabCase: name,\n      mcpServerNameClassName,\n      projectName: project.name,\n      dockerImageTag,\n      dockerOutputDir,\n      iac,\n      auth,\n      containers,\n    });\n  } else {\n    // No Dockerfile needed for non-hosted MCP\n    tree.delete(joinPathFragments(targetSourceDir, 'Dockerfile'));\n  }\n\n  addDependenciesToPackageJson(tree, deps, devDeps);\n  // Add to the project's package.json too if it has one (e.g. nx plugins),\n  // otherwise dependencies live in the workspace root only.\n  if (tree.exists(projectPackageJsonPath)) {\n    addDependenciesToPackageJson(tree, deps, devDeps, projectPackageJsonPath);\n  }\n\n  // @modelcontextprotocol/sdk declares zod as a peer dependency with a wide range\n  // (^3.25 || ^4.0). Yarn does not dedupe the peer to the workspace's pinned zod, so\n  // without a resolution it installs a separate zod under the SDK's own node_modules.\n  // The two zod copies have structurally incompatible types, which breaks type\n  // inference for registerTool inputSchema. Scope the resolution to the SDK so\n  // other consumers (e.g. @tanstack/router-generator pinning zod@3) are unaffected.\n  if (detectPackageManager() === 'yarn') {\n    updateJson(tree, 'package.json', (packageJson) => {\n      packageJson.resolutions = {\n        ...packageJson.resolutions,\n        '**/@modelcontextprotocol/sdk/zod': TS_VERSIONS['zod'],\n      };\n      return packageJson;\n    });\n  }\n\n  const localDevPort = assignPort(tree, project, 8000, {\n    component: { info: TS_MCP_SERVER_GENERATOR_INFO, name: mcpTargetPrefix },\n  });\n\n  const mcpTargets = {\n    ...project.targets,\n    // Add targets for running the MCP server\n    [`${mcpTargetPrefix}-serve-stdio`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [`tsx --watch ${relativeSourceDir}/stdio.ts`],\n        cwd: '{projectRoot}',\n      },\n    },\n    [`${mcpTargetPrefix}-serve`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [`tsx --watch ${relativeSourceDir}/http.ts`],\n        cwd: '{projectRoot}',\n        env: {\n          PORT: `${localDevPort}`,\n        },\n      },\n    },\n    [`${mcpTargetPrefix}-dev`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [`tsx --watch ${relativeSourceDir}/http.ts`],\n        cwd: '{projectRoot}',\n        env: {\n          PORT: `${localDevPort}`,\n          LOCAL_DEV: 'true',\n        },\n      },\n    },\n    [`${mcpTargetPrefix}-inspect`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      // Launch the inspector against the locally served HTTP server. The dev\n      // target starts the server and any connected dependencies (e.g. a local\n      // database).\n      dependsOn: [`${mcpTargetPrefix}-dev`],\n      options: {\n        commands: [\n          `mcp-inspector --transport http --server-url http://localhost:${localDevPort}/mcp`,\n        ],\n        cwd: '{projectRoot}',\n      },\n    },\n    [`${mcpTargetPrefix}-inspect-stdio`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [\n          `mcp-inspector -- tsx --watch ${relativeSourceDir}/stdio.ts`,\n        ],\n        cwd: '{projectRoot}',\n      },\n    },\n  };\n\n  // Aggregate `<mcp>-dev` under the project-level `dev` target.\n  addComponentDevTarget(mcpTargets, `${mcpTargetPrefix}-dev`);\n\n  updateProjectConfiguration(tree, project.name, {\n    ...project,\n    // Sort targets so their order is stable regardless of insertion order on\n    // first run vs re-run.\n    targets: sortObjectKeys(mcpTargets),\n  });\n\n  addComponentGeneratorMetadata(\n    tree,\n    project.name,\n    TS_MCP_SERVER_GENERATOR_INFO,\n    targetSourceDirRelativeToProjectRoot,\n    mcpTargetPrefix,\n    {\n      port: localDevPort,\n      rc: mcpServerNameClassName,\n      auth,\n    },\n  );\n\n  await addGeneratorMetricsIfApplicable(tree, [TS_MCP_SERVER_GENERATOR_INFO]);\n\n  await ensureLicenseExceptions(tree, MCP_INSPECTOR_EXCEPTIONS);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default tsMcpServerGenerator;\n"],"names":["addDependenciesToPackageJson","detectPackageManager","generateFiles","joinPathFragments","OverwriteStrategy","readJson","updateJson","updateProjectConfiguration","ensureLicenseExceptions","MCP_INSPECTOR_EXCEPTIONS","addMcpServerInfra","addTypeScriptBundleTarget","resolveContainers","formatFilesInSubtree","FsCommands","resolveIac","installDependencies","addGeneratorMetricsIfApplicable","kebabCase","toClassName","getNpmScope","addComponentDevTarget","addComponentGeneratorMetadata","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","sortObjectKeys","assignPort","sharedConstructsGenerator","TS_VERSIONS","withVersions","TS_MCP_SERVER_GENERATOR_INFO","filename","tsMcpServerGenerator","tree","options","project","exists","root","Error","defaultName","name","split","pop","mcpServerNameClassName","mcpTargetPrefix","targetSourceDirRelativeToProjectRoot","targetSourceDir","relativeSourceDir","replace","distDir","infra","auth","console","warn","projectPackageJsonPath","esm","type","dirname","adotVersion","overwriteStrategy","KeepExisting","deps","devDeps","containers","dockerImageTag","targetFilePath","bundleOutputDir","dockerOutputDir","dockerTargetName","fs","targets","cache","outputs","executor","commands","cp","parallel","dependsOn","iac","mcpServerNameKebabCase","projectName","delete","packageJson","resolutions","localDevPort","component","info","mcpTargets","continuous","cwd","env","PORT","LOCAL_DEV","port","rc","preferInstallDependencies","languages"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/mcp-server/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  detectPackageManager,\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  readJson,\n  type Tree,\n  updateJson,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { ensureLicenseExceptions } from '../../license/config';\nimport { MCP_INSPECTOR_EXCEPTIONS } from '../../license/known-exceptions';\nimport { addMcpServerInfra } from '../../utils/agent-core-constructs/agent-core-constructs';\nimport { addTypeScriptBundleTarget } from '../../utils/bundle/bundle';\nimport { resolveContainers } from '../../utils/containers';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { FsCommands } from '../../utils/fs';\nimport { resolveIac } from '../../utils/iac';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { isEsmWorkspace } from '../../utils/module-format';\nimport { kebabCase, toClassName } from '../../utils/names';\nimport { getNpmScope } from '../../utils/npm-scope';\nimport {\n  addComponentDevTarget,\n  addComponentGeneratorMetadata,\n  addDependencyToTargetIfNotPresent,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../utils/nx';\nimport { sortObjectKeys } from '../../utils/object';\nimport { assignPort } from '../../utils/port';\nimport { sharedConstructsGenerator } from '../../utils/shared-constructs';\nimport { TS_VERSIONS, withVersions } from '../../utils/versions';\nimport type { TsMcpServerGeneratorSchema } from './schema';\n\nexport const TS_MCP_SERVER_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const tsMcpServerGenerator = async (\n  tree: Tree,\n  options: TsMcpServerGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const project = readProjectConfigurationUnqualified(tree, options.project);\n\n  if (!tree.exists(joinPathFragments(project.root, 'tsconfig.json'))) {\n    throw new Error(\n      `Unsupported project ${options.project}. Expected a TypeScript project (with a tsconfig.json)`,\n    );\n  }\n\n  const defaultName = `${kebabCase(project.name.split('/').pop())}-mcp-server`;\n  const name = kebabCase(options.name || defaultName);\n  const mcpServerNameClassName = toClassName(name);\n  const mcpTargetPrefix = options.name ? name : 'mcp-server';\n  const targetSourceDirRelativeToProjectRoot = joinPathFragments(\n    'src',\n    mcpTargetPrefix,\n  );\n  const targetSourceDir = joinPathFragments(\n    project.root,\n    targetSourceDirRelativeToProjectRoot,\n  );\n  const relativeSourceDir = targetSourceDir.replace(project.root + '/', './');\n  const distDir = joinPathFragments('dist', project.root);\n\n  const infra = options.infra ?? 'agentcore';\n\n  if (infra === 'none' && options.auth && options.auth !== 'iam') {\n    console.warn(\n      'Warning: auth is ignored when no infrastructure is configured (no infrastructure is generated)',\n    );\n  }\n\n  const auth = options.auth ?? 'iam';\n\n  const projectPackageJsonPath = joinPathFragments(\n    project.root,\n    'package.json',\n  );\n\n  // Generate esm if the module system is esm, otherwise commonjs. Projects\n  // don't typically have their own package.json (dependencies are declared in\n  // the workspace root), so fall back to the workspace format when absent.\n  const esm = tree.exists(projectPackageJsonPath)\n    ? readJson(tree, projectPackageJsonPath).type === 'module'\n    : isEsmWorkspace(tree);\n\n  // Generate example server\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files'),\n    targetSourceDir,\n    {\n      name,\n      esm,\n      distDir,\n      adotVersion:\n        TS_VERSIONS['@aws/aws-distro-opentelemetry-node-autoinstrumentation'],\n    },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Add dependencies\n  const deps = withVersions([\n    '@modelcontextprotocol/sdk',\n    'zod',\n    'express',\n    '@aws-lambda-powertools/parameters',\n    '@aws-sdk/client-appconfigdata',\n  ]);\n  const devDeps = withVersions([\n    'tsx',\n    '@types/express',\n    '@modelcontextprotocol/inspector',\n  ]);\n\n  // Add hosting based on infra\n  if (infra === 'agentcore') {\n    const containers = await resolveContainers(tree, 'inherit');\n    const dockerImageTag = `${getNpmScope(tree)}-${name}:latest`;\n\n    // Add bundle target\n    await addTypeScriptBundleTarget(tree, project, {\n      targetFilePath: `${targetSourceDirRelativeToProjectRoot}/http.ts`,\n      bundleOutputDir: joinPathFragments('mcp', name),\n    });\n\n    const dockerOutputDir = joinPathFragments(\n      'dist',\n      project.root,\n      'bundle',\n      'mcp',\n      name,\n    );\n    const dockerTargetName = `${mcpTargetPrefix}-docker`;\n\n    const fs = new FsCommands(tree);\n    project.targets[dockerTargetName] = {\n      cache: true,\n      outputs: [`{workspaceRoot}/${dockerOutputDir}/Dockerfile`],\n      executor: 'nx:run-commands',\n      options: {\n        commands: [\n          fs.cp(\n            `${targetSourceDir}/Dockerfile`,\n            `${dockerOutputDir}/Dockerfile`,\n          ),\n          `${containers} build --platform linux/arm64 -t ${dockerImageTag} ${dockerOutputDir}`,\n        ],\n        parallel: false,\n      },\n      dependsOn: ['bundle'],\n    };\n\n    addDependencyToTargetIfNotPresent(project, 'docker', dockerTargetName);\n    addDependencyToTargetIfNotPresent(project, 'build', 'docker');\n\n    // Add shared constructs\n    const iac = await resolveIac(tree, options.iac);\n    await sharedConstructsGenerator(tree, { iac });\n\n    // Add the construct to deploy the mcp server\n    await addMcpServerInfra(tree, {\n      mcpServerNameKebabCase: name,\n      mcpServerNameClassName,\n      projectName: project.name,\n      dockerImageTag,\n      dockerOutputDir,\n      iac,\n      auth,\n      containers,\n    });\n  } else {\n    // No Dockerfile needed for non-hosted MCP\n    tree.delete(joinPathFragments(targetSourceDir, 'Dockerfile'));\n  }\n\n  addDependenciesToPackageJson(tree, deps, devDeps);\n  // Add to the project's package.json too if it has one (e.g. nx plugins),\n  // otherwise dependencies live in the workspace root only.\n  if (tree.exists(projectPackageJsonPath)) {\n    addDependenciesToPackageJson(tree, deps, devDeps, projectPackageJsonPath);\n  }\n\n  // @modelcontextprotocol/sdk declares zod as a peer dependency with a wide range\n  // (^3.25 || ^4.0). Yarn does not dedupe the peer to the workspace's pinned zod, so\n  // without a resolution it installs a separate zod under the SDK's own node_modules.\n  // The two zod copies have structurally incompatible types, which breaks type\n  // inference for registerTool inputSchema. Scope the resolution to the SDK so\n  // other consumers (e.g. @tanstack/router-generator pinning zod@3) are unaffected.\n  if (detectPackageManager() === 'yarn') {\n    updateJson(tree, 'package.json', (packageJson) => {\n      packageJson.resolutions = {\n        ...packageJson.resolutions,\n        '**/@modelcontextprotocol/sdk/zod': TS_VERSIONS['zod'],\n      };\n      return packageJson;\n    });\n  }\n\n  const localDevPort = assignPort(tree, project, 8000, {\n    component: { info: TS_MCP_SERVER_GENERATOR_INFO, name: mcpTargetPrefix },\n  });\n\n  const mcpTargets = {\n    ...project.targets,\n    // Add targets for running the MCP server\n    [`${mcpTargetPrefix}-serve-stdio`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [`tsx --watch ${relativeSourceDir}/stdio.ts`],\n        cwd: '{projectRoot}',\n      },\n    },\n    [`${mcpTargetPrefix}-serve`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [`tsx --watch ${relativeSourceDir}/http.ts`],\n        cwd: '{projectRoot}',\n        env: {\n          PORT: `${localDevPort}`,\n        },\n      },\n    },\n    [`${mcpTargetPrefix}-dev`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [`tsx --watch ${relativeSourceDir}/http.ts`],\n        cwd: '{projectRoot}',\n        env: {\n          PORT: `${localDevPort}`,\n          LOCAL_DEV: 'true',\n        },\n      },\n    },\n    [`${mcpTargetPrefix}-inspect`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      // Launch the inspector against the locally served HTTP server. The dev\n      // target starts the server and any connected dependencies (e.g. a local\n      // database).\n      dependsOn: [`${mcpTargetPrefix}-dev`],\n      options: {\n        commands: [\n          `mcp-inspector --transport http --server-url http://localhost:${localDevPort}/mcp`,\n        ],\n        cwd: '{projectRoot}',\n      },\n    },\n    [`${mcpTargetPrefix}-inspect-stdio`]: {\n      executor: 'nx:run-commands',\n      continuous: true,\n      options: {\n        commands: [\n          `mcp-inspector -- tsx --watch ${relativeSourceDir}/stdio.ts`,\n        ],\n        cwd: '{projectRoot}',\n      },\n    },\n  };\n\n  // Aggregate `<mcp>-dev` under the project-level `dev` target.\n  addComponentDevTarget(mcpTargets, `${mcpTargetPrefix}-dev`);\n\n  updateProjectConfiguration(tree, project.name, {\n    ...project,\n    // Sort targets so their order is stable regardless of insertion order on\n    // first run vs re-run.\n    targets: sortObjectKeys(mcpTargets),\n  });\n\n  addComponentGeneratorMetadata(\n    tree,\n    project.name,\n    TS_MCP_SERVER_GENERATOR_INFO,\n    targetSourceDirRelativeToProjectRoot,\n    mcpTargetPrefix,\n    {\n      port: localDevPort,\n      rc: mcpServerNameClassName,\n      auth,\n    },\n  );\n\n  await addGeneratorMetricsIfApplicable(tree, [TS_MCP_SERVER_GENERATOR_INFO]);\n\n  await ensureLicenseExceptions(tree, MCP_INSPECTOR_EXCEPTIONS);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default tsMcpServerGenerator;\n"],"names":["addDependenciesToPackageJson","detectPackageManager","generateFiles","joinPathFragments","OverwriteStrategy","readJson","updateJson","updateProjectConfiguration","ensureLicenseExceptions","MCP_INSPECTOR_EXCEPTIONS","addMcpServerInfra","addTypeScriptBundleTarget","resolveContainers","formatFilesInSubtree","FsCommands","resolveIac","installDependencies","addGeneratorMetricsIfApplicable","isEsmWorkspace","kebabCase","toClassName","getNpmScope","addComponentDevTarget","addComponentGeneratorMetadata","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","sortObjectKeys","assignPort","sharedConstructsGenerator","TS_VERSIONS","withVersions","TS_MCP_SERVER_GENERATOR_INFO","filename","tsMcpServerGenerator","tree","options","project","exists","root","Error","defaultName","name","split","pop","mcpServerNameClassName","mcpTargetPrefix","targetSourceDirRelativeToProjectRoot","targetSourceDir","relativeSourceDir","replace","distDir","infra","auth","console","warn","projectPackageJsonPath","esm","type","dirname","adotVersion","overwriteStrategy","KeepExisting","deps","devDeps","containers","dockerImageTag","targetFilePath","bundleOutputDir","dockerOutputDir","dockerTargetName","fs","targets","cache","outputs","executor","commands","cp","parallel","dependsOn","iac","mcpServerNameKebabCase","projectName","delete","packageJson","resolutions","localDevPort","component","info","mcpTargets","continuous","cwd","env","PORT","LOCAL_DEV","port","rc","preferInstallDependencies","languages"],"mappings":"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"}

package/src/ts/nx-generator/files/local/generator.ts.template

@@ -1,9 +1,9 @@
 import { type GeneratorCallback, type Tree, generateFiles, joinPathFragments } from "@nx/devkit";
-import type { <%- namePascalCase %>GeneratorSchema } from './schema.js';
+import type { <%- namePascalCase %>GeneratorSchema } from './schema<% if (esm) { %>.js<% } %>';
 
 export const <%- nameCamelCase %>Generator = async (tree: Tree, options: <%- namePascalCase %>GeneratorSchema): Promise<GeneratorCallback | void> => {
   // TODO: implement your generator here, for example:
-  generateFiles(tree, joinPathFragments(import.meta.dirname, 'files'), 'target/dir', options);
+  generateFiles(tree, joinPathFragments(<% if (esm) { %>import.meta.dirname<% } else { %>__dirname<% } %>, 'files'), 'target/dir', options);
 };
 
 export default <%- nameCamelCase %>Generator;

package/src/ts/nx-generator/files/nx-plugin-for-aws/generator/generator.ts.template

@@ -1,12 +1,12 @@
 import { type GeneratorCallback, type Tree } from "@nx/devkit";
-import type { <%- namePascalCase %>GeneratorSchema } from './schema.js';
+import type { <%- namePascalCase %>GeneratorSchema } from './schema<% if (esm) { %>.js<% } %>';
 import { type NxGeneratorInfo, getGeneratorInfo } from '<%- pathToProjectSourceRoot %>utils/nx';
 import { addGeneratorMetricsIfApplicable } from '<%- pathToProjectSourceRoot %>utils/metrics';
 import { formatFilesInSubtree } from '<%- pathToProjectSourceRoot %>utils/format';
 import { installDependencies } from '<%- pathToProjectSourceRoot %>utils/install';
 
 export const <%- nameUpperSnakeCase %>_GENERATOR_INFO: NxGeneratorInfo =
-  getGeneratorInfo(import.meta.filename);
+  getGeneratorInfo(<% if (esm) { %>import.meta.filename<% } else { %>__filename<% } %>);
 
 export const <%- nameCamelCase %>Generator = async (tree: Tree, options: <%- namePascalCase %>GeneratorSchema): Promise<GeneratorCallback> => {
 

package/src/ts/nx-generator/generator.js

@@ -10,6 +10,7 @@ import { addStarExport, applyGritQL } from "../../utils/ast.js";
 import { formatFilesInSubtree } from "../../utils/format.js";
 import { installDependencies } from "../../utils/install.js";
 import { addGeneratorMetricsIfApplicable } from "../../utils/metrics.js";
+import { esmVars } from "../../utils/module-format.js";
 import { kebabCase, pascalCase, snakeCase } from "../../utils/names.js";
 import { addComponentGeneratorMetadata, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../utils/nx.js";
 import { sortObjectKeys } from "../../utils/object.js";
@@ -38,7 +39,8 @@ export const tsNxGeneratorGenerator = async (tree, options)=>{
         isNxPluginForAws,
         pathToProjectSourceRoot: getRelativePathToRootByDirectory(generatorSubDir),
         generatorDir,
-        generatorSubDir
+        generatorSubDir,
+        ...esmVars(tree)
     };
     // Add the common files, preserving any the user has already implemented
     generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'common'), generatorDir, {
@@ -77,7 +79,8 @@ export const tsNxGeneratorGenerator = async (tree, options)=>{
         });
         const indexPath = joinPathFragments(sourceRoot, 'index.ts');
         if (tree.exists(indexPath)) {
-            // NodeNext requires explicit extensions; the local plugin is ESM.
+            // ESM projects require the explicit `.js` extension; `addStarExport`
+            // strips it for CommonJS workspaces.
             await addStarExport(tree, indexPath, `./${generatorSubDir}/generator.js`);
         }
         addComponentGeneratorMetadata(tree, plugin.name, NX_GENERATOR_GENERATOR_INFO, joinPathFragments(srcDir, generatorSubDir), name);

package/src/ts/nx-generator/generator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/nx-generator/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  OverwriteStrategy,\n  readJson,\n  type Tree,\n  writeJson,\n} from '@nx/devkit';\nimport camelCase from 'lodash.camelcase';\nimport PackageJson from '../../../package.json' with { type: 'json' };\nimport { addStarExport, applyGritQL } from '../../utils/ast';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { kebabCase, pascalCase, snakeCase } from '../../utils/names';\nimport {\n  addComponentGeneratorMetadata,\n  getGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../utils/nx';\nimport { sortObjectKeys } from '../../utils/object';\nimport { getRelativePathToRootByDirectory } from '../../utils/paths';\nimport { configureTsProjectAsNxPlugin } from '../nx-plugin/utils';\nimport type { TsNxGeneratorGeneratorSchema } from './schema';\n\nexport const NX_GENERATOR_GENERATOR_INFO = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const tsNxGeneratorGenerator = async (\n  tree: Tree,\n  options: TsNxGeneratorGeneratorSchema,\n): Promise<GeneratorCallback | void> => {\n  const { name, directory, project: pluginProject, description } = options;\n\n  const plugin = readProjectConfigurationUnqualified(tree, pluginProject);\n  const sourceRoot = plugin.sourceRoot ?? joinPathFragments(plugin.root, 'src');\n  const sourceRootParts = sourceRoot.split('/');\n  const srcDir = sourceRootParts[sourceRootParts.length - 1];\n  const generatorSubDir = directory ?? kebabCase(name);\n  const generatorDir = joinPathFragments(sourceRoot, generatorSubDir);\n\n  const rootPackageJson = tree.exists('package.json')\n    ? readJson(tree, 'package.json')\n    : undefined;\n  const isNxPluginForAws = rootPackageJson?.name === '@aws/nx-plugin-source';\n\n  // Configure the targeted project as an Nx Plugin\n  configureTsProjectAsNxPlugin(tree, pluginProject);\n\n  const enhancedOptions = {\n    name,\n    description,\n    namePascalCase: pascalCase(name),\n    nameCamelCase: camelCase(name),\n    nameKebabCase: kebabCase(name),\n    nameUpperSnakeCase: snakeCase(name).toUpperCase(),\n    isNxPluginForAws,\n    pathToProjectSourceRoot: getRelativePathToRootByDirectory(generatorSubDir),\n    generatorDir,\n    generatorSubDir,\n  };\n\n  // Add the common files, preserving any the user has already implemented\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'common'),\n    generatorDir,\n    {\n      ...enhancedOptions,\n    },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Add the files specific to this repo vs a local generator in another project\n  if (isNxPluginForAws) {\n    // Generators should be in the @aws/nx-plugin project\n    if (pluginProject !== PackageJson.name) {\n      throw new Error(\n        `Generators should be added to the ${PackageJson.name} project.`,\n      );\n    }\n\n    // Add the generator\n    generateFiles(\n      tree,\n      joinPathFragments(\n        import.meta.dirname,\n        'files',\n        'nx-plugin-for-aws',\n        'generator',\n      ),\n      generatorDir,\n      {\n        ...enhancedOptions,\n      },\n      { overwriteStrategy: OverwriteStrategy.KeepExisting },\n    );\n\n    // Generate guide page in docs\n    generateFiles(\n      tree,\n      joinPathFragments(\n        import.meta.dirname,\n        'files',\n        'nx-plugin-for-aws',\n        'docs',\n      ),\n      joinPathFragments('docs', 'src', 'content', 'docs', 'en', 'guides'),\n      {\n        ...enhancedOptions,\n      },\n      { overwriteStrategy: OverwriteStrategy.KeepExisting },\n    );\n\n    // Update the docs config to add the page entry to the Generator guides sidebar section\n    await applyGritQL(\n      tree,\n      joinPathFragments('docs', 'astro.config.mjs'),\n      `\\`items: [$items]\\` where { $items <: within \\`sidebar: [$_]\\`, $items <: contains \\`'ts#project'\\`, $items <: not contains \\`'/guides/${enhancedOptions.nameKebabCase}'\\`, $items += \\`, { label: '${name}', link: '/guides/${enhancedOptions.nameKebabCase}' }\\` }`,\n    );\n\n    // Expose the generator from the SDK for known prefixes (ts# / py#)\n    addSdkExport(tree, plugin.root, name, generatorSubDir, enhancedOptions);\n  } else {\n    // Local generator in a project other than nx-plugin-for-aws\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files', 'local'),\n      generatorDir,\n      {\n        ...enhancedOptions,\n      },\n      { overwriteStrategy: OverwriteStrategy.KeepExisting },\n    );\n\n    const indexPath = joinPathFragments(sourceRoot, 'index.ts');\n    if (tree.exists(indexPath)) {\n      // NodeNext requires explicit extensions; the local plugin is ESM.\n      await addStarExport(tree, indexPath, `./${generatorSubDir}/generator.js`);\n    }\n\n    addComponentGeneratorMetadata(\n      tree,\n      plugin.name,\n      NX_GENERATOR_GENERATOR_INFO,\n      joinPathFragments(srcDir, generatorSubDir),\n      name,\n    );\n  }\n\n  const factoryBasePath = `./${srcDir}/${generatorSubDir}`;\n\n  // Update generators.json\n  const generatorsJsonPath = joinPathFragments(plugin.root, 'generators.json');\n  const generatorsJson = tree.exists(generatorsJsonPath)\n    ? readJson(tree, generatorsJsonPath)\n    : { generators: {} };\n  // Metrics are only tracked within the @aws/nx-plugin repo. Reuse the existing\n  // metric for a same-name re-run, otherwise allocate a new one.\n  let metric: string | undefined;\n  if (isNxPluginForAws) {\n    const existingMetrics = Object.values(generatorsJson?.generators ?? {})\n      .map((g: any) => g.metric)\n      .filter((m): m is string => typeof m === 'string');\n    metric =\n      generatorsJson?.generators?.[name]?.metric ??\n      (existingMetrics.length > 0 ? incrementMetric(existingMetrics) : 'g1');\n  }\n  writeJson(tree, generatorsJsonPath, {\n    ...generatorsJson,\n    generators: sortObjectKeys({\n      ...generatorsJson?.generators,\n      [name]: {\n        factory: `${factoryBasePath}/generator`,\n        schema: `${factoryBasePath}/schema.json`,\n        description:\n          description ?? 'TODO: Add short description of the generator',\n        ...(isNxPluginForAws ? { metric } : {}),\n      },\n    }),\n  });\n\n  await addGeneratorMetricsIfApplicable(tree, [NX_GENERATOR_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nconst incrementMetric = (metrics: string[]): string => {\n  const maxMetric = Math.max(...metrics.map((m) => Number(m.slice(1))));\n  return `g${maxMetric + 1}`;\n};\n\n// Maps a generator name prefix to the SDK entry point that should re-export it\nconst SDK_EXPORT_PREFIXES: Record<string, string> = {\n  'ts#': 'ts',\n  'py#': 'py',\n};\n\n// Re-exports a generated generator from the matching SDK entry point so it is\n// available programmatically as part of @aws/nx-plugin's SDK\nconst addSdkExport = (\n  tree: Tree,\n  pluginRoot: string,\n  name: string,\n  generatorSubDir: string,\n  options: { nameCamelCase: string; namePascalCase: string },\n): void => {\n  const prefix = Object.keys(SDK_EXPORT_PREFIXES).find((p) =>\n    name.startsWith(p),\n  );\n  if (!prefix) {\n    return;\n  }\n\n  const sdkPath = joinPathFragments(\n    pluginRoot,\n    'src',\n    'sdk',\n    `${SDK_EXPORT_PREFIXES[prefix]}.ts`,\n  );\n  const generatorExport = `${options.nameCamelCase}Generator`;\n  const schemaExport = `${options.namePascalCase}GeneratorSchema`;\n  const moduleBase = `../${generatorSubDir}`;\n\n  const contents = tree.exists(sdkPath) ? tree.read(sdkPath).toString() : '';\n  // Idempotent: skip if this generator is already exported\n  if (contents.includes(`${moduleBase}/generator`)) {\n    return;\n  }\n\n  const block = `// ${options.namePascalCase} Generator\\nexport { ${generatorExport} } from '${moduleBase}/generator';\\nexport type { ${schemaExport} } from '${moduleBase}/schema';\\n`;\n\n  const prefixContents = contents.trim()\n    ? `${contents.replace(/\\s*$/, '')}\\n\\n`\n    : '';\n  tree.write(sdkPath, `${prefixContents}${block}`);\n};\n\nexport default tsNxGeneratorGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","readJson","writeJson","camelCase","PackageJson","type","addStarExport","applyGritQL","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","kebabCase","pascalCase","snakeCase","addComponentGeneratorMetadata","getGeneratorInfo","readProjectConfigurationUnqualified","sortObjectKeys","getRelativePathToRootByDirectory","configureTsProjectAsNxPlugin","NX_GENERATOR_GENERATOR_INFO","filename","tsNxGeneratorGenerator","tree","options","name","directory","project","pluginProject","description","plugin","sourceRoot","root","sourceRootParts","split","srcDir","length","generatorSubDir","generatorDir","rootPackageJson","exists","undefined","isNxPluginForAws","enhancedOptions","namePascalCase","nameCamelCase","nameKebabCase","nameUpperSnakeCase","toUpperCase","pathToProjectSourceRoot","dirname","overwriteStrategy","KeepExisting","Error","addSdkExport","indexPath","factoryBasePath","generatorsJsonPath","generatorsJson","generators","metric","existingMetrics","Object","values","map","g","filter","m","incrementMetric","factory","schema","preferInstallDependencies","languages","metrics","maxMetric","Math","max","Number","slice","SDK_EXPORT_PREFIXES","pluginRoot","prefix","keys","find","p","startsWith","sdkPath","generatorExport","schemaExport","moduleBase","contents","read","toString","includes","block","prefixContents","trim","replace","write"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/nx-generator/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  OverwriteStrategy,\n  readJson,\n  type Tree,\n  writeJson,\n} from '@nx/devkit';\nimport camelCase from 'lodash.camelcase';\nimport PackageJson from '../../../package.json' with { type: 'json' };\nimport { addStarExport, applyGritQL } from '../../utils/ast';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { esmVars } from '../../utils/module-format';\nimport { kebabCase, pascalCase, snakeCase } from '../../utils/names';\nimport {\n  addComponentGeneratorMetadata,\n  getGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../utils/nx';\nimport { sortObjectKeys } from '../../utils/object';\nimport { getRelativePathToRootByDirectory } from '../../utils/paths';\nimport { configureTsProjectAsNxPlugin } from '../nx-plugin/utils';\nimport type { TsNxGeneratorGeneratorSchema } from './schema';\n\nexport const NX_GENERATOR_GENERATOR_INFO = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const tsNxGeneratorGenerator = async (\n  tree: Tree,\n  options: TsNxGeneratorGeneratorSchema,\n): Promise<GeneratorCallback | void> => {\n  const { name, directory, project: pluginProject, description } = options;\n\n  const plugin = readProjectConfigurationUnqualified(tree, pluginProject);\n  const sourceRoot = plugin.sourceRoot ?? joinPathFragments(plugin.root, 'src');\n  const sourceRootParts = sourceRoot.split('/');\n  const srcDir = sourceRootParts[sourceRootParts.length - 1];\n  const generatorSubDir = directory ?? kebabCase(name);\n  const generatorDir = joinPathFragments(sourceRoot, generatorSubDir);\n\n  const rootPackageJson = tree.exists('package.json')\n    ? readJson(tree, 'package.json')\n    : undefined;\n  const isNxPluginForAws = rootPackageJson?.name === '@aws/nx-plugin-source';\n\n  // Configure the targeted project as an Nx Plugin\n  configureTsProjectAsNxPlugin(tree, pluginProject);\n\n  const enhancedOptions = {\n    name,\n    description,\n    namePascalCase: pascalCase(name),\n    nameCamelCase: camelCase(name),\n    nameKebabCase: kebabCase(name),\n    nameUpperSnakeCase: snakeCase(name).toUpperCase(),\n    isNxPluginForAws,\n    pathToProjectSourceRoot: getRelativePathToRootByDirectory(generatorSubDir),\n    generatorDir,\n    generatorSubDir,\n    ...esmVars(tree),\n  };\n\n  // Add the common files, preserving any the user has already implemented\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'common'),\n    generatorDir,\n    {\n      ...enhancedOptions,\n    },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Add the files specific to this repo vs a local generator in another project\n  if (isNxPluginForAws) {\n    // Generators should be in the @aws/nx-plugin project\n    if (pluginProject !== PackageJson.name) {\n      throw new Error(\n        `Generators should be added to the ${PackageJson.name} project.`,\n      );\n    }\n\n    // Add the generator\n    generateFiles(\n      tree,\n      joinPathFragments(\n        import.meta.dirname,\n        'files',\n        'nx-plugin-for-aws',\n        'generator',\n      ),\n      generatorDir,\n      {\n        ...enhancedOptions,\n      },\n      { overwriteStrategy: OverwriteStrategy.KeepExisting },\n    );\n\n    // Generate guide page in docs\n    generateFiles(\n      tree,\n      joinPathFragments(\n        import.meta.dirname,\n        'files',\n        'nx-plugin-for-aws',\n        'docs',\n      ),\n      joinPathFragments('docs', 'src', 'content', 'docs', 'en', 'guides'),\n      {\n        ...enhancedOptions,\n      },\n      { overwriteStrategy: OverwriteStrategy.KeepExisting },\n    );\n\n    // Update the docs config to add the page entry to the Generator guides sidebar section\n    await applyGritQL(\n      tree,\n      joinPathFragments('docs', 'astro.config.mjs'),\n      `\\`items: [$items]\\` where { $items <: within \\`sidebar: [$_]\\`, $items <: contains \\`'ts#project'\\`, $items <: not contains \\`'/guides/${enhancedOptions.nameKebabCase}'\\`, $items += \\`, { label: '${name}', link: '/guides/${enhancedOptions.nameKebabCase}' }\\` }`,\n    );\n\n    // Expose the generator from the SDK for known prefixes (ts# / py#)\n    addSdkExport(tree, plugin.root, name, generatorSubDir, enhancedOptions);\n  } else {\n    // Local generator in a project other than nx-plugin-for-aws\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files', 'local'),\n      generatorDir,\n      {\n        ...enhancedOptions,\n      },\n      { overwriteStrategy: OverwriteStrategy.KeepExisting },\n    );\n\n    const indexPath = joinPathFragments(sourceRoot, 'index.ts');\n    if (tree.exists(indexPath)) {\n      // ESM projects require the explicit `.js` extension; `addStarExport`\n      // strips it for CommonJS workspaces.\n      await addStarExport(tree, indexPath, `./${generatorSubDir}/generator.js`);\n    }\n\n    addComponentGeneratorMetadata(\n      tree,\n      plugin.name,\n      NX_GENERATOR_GENERATOR_INFO,\n      joinPathFragments(srcDir, generatorSubDir),\n      name,\n    );\n  }\n\n  const factoryBasePath = `./${srcDir}/${generatorSubDir}`;\n\n  // Update generators.json\n  const generatorsJsonPath = joinPathFragments(plugin.root, 'generators.json');\n  const generatorsJson = tree.exists(generatorsJsonPath)\n    ? readJson(tree, generatorsJsonPath)\n    : { generators: {} };\n  // Metrics are only tracked within the @aws/nx-plugin repo. Reuse the existing\n  // metric for a same-name re-run, otherwise allocate a new one.\n  let metric: string | undefined;\n  if (isNxPluginForAws) {\n    const existingMetrics = Object.values(generatorsJson?.generators ?? {})\n      .map((g: any) => g.metric)\n      .filter((m): m is string => typeof m === 'string');\n    metric =\n      generatorsJson?.generators?.[name]?.metric ??\n      (existingMetrics.length > 0 ? incrementMetric(existingMetrics) : 'g1');\n  }\n  writeJson(tree, generatorsJsonPath, {\n    ...generatorsJson,\n    generators: sortObjectKeys({\n      ...generatorsJson?.generators,\n      [name]: {\n        factory: `${factoryBasePath}/generator`,\n        schema: `${factoryBasePath}/schema.json`,\n        description:\n          description ?? 'TODO: Add short description of the generator',\n        ...(isNxPluginForAws ? { metric } : {}),\n      },\n    }),\n  });\n\n  await addGeneratorMetricsIfApplicable(tree, [NX_GENERATOR_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nconst incrementMetric = (metrics: string[]): string => {\n  const maxMetric = Math.max(...metrics.map((m) => Number(m.slice(1))));\n  return `g${maxMetric + 1}`;\n};\n\n// Maps a generator name prefix to the SDK entry point that should re-export it\nconst SDK_EXPORT_PREFIXES: Record<string, string> = {\n  'ts#': 'ts',\n  'py#': 'py',\n};\n\n// Re-exports a generated generator from the matching SDK entry point so it is\n// available programmatically as part of @aws/nx-plugin's SDK\nconst addSdkExport = (\n  tree: Tree,\n  pluginRoot: string,\n  name: string,\n  generatorSubDir: string,\n  options: { nameCamelCase: string; namePascalCase: string },\n): void => {\n  const prefix = Object.keys(SDK_EXPORT_PREFIXES).find((p) =>\n    name.startsWith(p),\n  );\n  if (!prefix) {\n    return;\n  }\n\n  const sdkPath = joinPathFragments(\n    pluginRoot,\n    'src',\n    'sdk',\n    `${SDK_EXPORT_PREFIXES[prefix]}.ts`,\n  );\n  const generatorExport = `${options.nameCamelCase}Generator`;\n  const schemaExport = `${options.namePascalCase}GeneratorSchema`;\n  const moduleBase = `../${generatorSubDir}`;\n\n  const contents = tree.exists(sdkPath) ? tree.read(sdkPath).toString() : '';\n  // Idempotent: skip if this generator is already exported\n  if (contents.includes(`${moduleBase}/generator`)) {\n    return;\n  }\n\n  const block = `// ${options.namePascalCase} Generator\\nexport { ${generatorExport} } from '${moduleBase}/generator';\\nexport type { ${schemaExport} } from '${moduleBase}/schema';\\n`;\n\n  const prefixContents = contents.trim()\n    ? `${contents.replace(/\\s*$/, '')}\\n\\n`\n    : '';\n  tree.write(sdkPath, `${prefixContents}${block}`);\n};\n\nexport default tsNxGeneratorGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","readJson","writeJson","camelCase","PackageJson","type","addStarExport","applyGritQL","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","esmVars","kebabCase","pascalCase","snakeCase","addComponentGeneratorMetadata","getGeneratorInfo","readProjectConfigurationUnqualified","sortObjectKeys","getRelativePathToRootByDirectory","configureTsProjectAsNxPlugin","NX_GENERATOR_GENERATOR_INFO","filename","tsNxGeneratorGenerator","tree","options","name","directory","project","pluginProject","description","plugin","sourceRoot","root","sourceRootParts","split","srcDir","length","generatorSubDir","generatorDir","rootPackageJson","exists","undefined","isNxPluginForAws","enhancedOptions","namePascalCase","nameCamelCase","nameKebabCase","nameUpperSnakeCase","toUpperCase","pathToProjectSourceRoot","dirname","overwriteStrategy","KeepExisting","Error","addSdkExport","indexPath","factoryBasePath","generatorsJsonPath","generatorsJson","generators","metric","existingMetrics","Object","values","map","g","filter","m","incrementMetric","factory","schema","preferInstallDependencies","languages","metrics","maxMetric","Math","max","Number","slice","SDK_EXPORT_PREFIXES","pluginRoot","prefix","keys","find","p","startsWith","sdkPath","generatorExport","schemaExport","moduleBase","contents","read","toString","includes","block","prefixContents","trim","replace","write"],"mappings":"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"}

package/src/ts/nx-plugin/files/mcp-server/server.ts.template

@@ -1,9 +1,9 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { registerCreateWorkspaceCommandTool } from './tools/create-workspace-command.js';
-import { registerGeneralGuidanceTool } from './tools/general-guidance.js';
-import { registerListGeneratorsTool } from './tools/list-generators.js';
-import { registerGeneratorGuideTool } from './tools/generator-guide.js';
-import { getPackageName } from './utils.js';
+import { registerCreateWorkspaceCommandTool } from './tools/create-workspace-command<% if (esm) { %>.js<% } %>';
+import { registerGeneralGuidanceTool } from './tools/general-guidance<% if (esm) { %>.js<% } %>';
+import { registerListGeneratorsTool } from './tools/list-generators<% if (esm) { %>.js<% } %>';
+import { registerGeneratorGuideTool } from './tools/generator-guide<% if (esm) { %>.js<% } %>';
+import { getPackageName } from './utils<% if (esm) { %>.js<% } %>';
 
 /**
  * Create the MCP Server

package/src/ts/nx-plugin/files/mcp-server/tools/create-workspace-command.ts.template

@@ -1,7 +1,7 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { z } from 'zod';
-import { PackageManagerSchema } from '../schema.js';
-import { buildCreateCommand, buildInstallCommand, getPackageName } from '../utils.js';
+import { PackageManagerSchema } from '../schema<% if (esm) { %>.js<% } %>';
+import { buildCreateCommand, buildInstallCommand, getPackageName } from '../utils<% if (esm) { %>.js<% } %>';
 
 /**
  * Registers a tool which tells a model how to create an Nx workspace

package/src/ts/nx-plugin/files/mcp-server/tools/general-guidance.ts.template

@@ -16,7 +16,7 @@ export const registerGeneralGuidanceTool = (server: McpServer) => {
         {
           type: 'text' as const,
           text: fs.readFileSync(
-            path.resolve(import.meta.dirname, '../resources/GENERAL_GUIDANCE.md'),
+            path.resolve(<% if (esm) { %>import.meta.dirname<% } else { %>__dirname<% } %>, '../resources/GENERAL_GUIDANCE.md'),
             'utf-8',
           ),
         },

package/src/ts/nx-plugin/files/mcp-server/tools/generator-guide.ts.template

@@ -1,7 +1,7 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { z } from 'zod';
-import { renderGeneratorInfo, listGenerators } from '../utils.js';
-import { PackageManagerSchema } from '../schema.js';
+import { renderGeneratorInfo, listGenerators } from '../utils<% if (esm) { %>.js<% } %>';
+import { PackageManagerSchema } from '../schema<% if (esm) { %>.js<% } %>';
 import * as fs from 'fs';
 import * as path from 'path';
 

package/src/ts/nx-plugin/files/mcp-server/tools/list-generators.ts.template

@@ -1,6 +1,6 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { PackageManagerSchema } from '../schema.js';
-import { renderGeneratorInfo, listGenerators } from '../utils.js';
+import { PackageManagerSchema } from '../schema<% if (esm) { %>.js<% } %>';
+import { renderGeneratorInfo, listGenerators } from '../utils<% if (esm) { %>.js<% } %>';
 
 /**
  * Registers a tool which lists details about the available generators

package/src/ts/nx-plugin/files/mcp-server/utils.ts.template

@@ -9,20 +9,20 @@ export interface NxGeneratorInfo {
 
 export const getPackageName = (): string =>
   JSON.parse(
-    fs.readFileSync(path.resolve(import.meta.dirname, '../../package.json'), 'utf-8'),
+    fs.readFileSync(path.resolve(<% if (esm) { %>import.meta.dirname<% } else { %>__dirname<% } %>, '../../package.json'), 'utf-8'),
   ).name;
 
 export const listGenerators = (): NxGeneratorInfo[] =>
   Object.entries(
     JSON.parse(
       fs.readFileSync(
-        path.resolve(import.meta.dirname, '../../generators.json'),
+        path.resolve(<% if (esm) { %>import.meta.dirname<% } else { %>__dirname<% } %>, '../../generators.json'),
         'utf-8',
       ),
     ).generators,
   ).map(([id, info]: any) => ({
     id,
-    resolvedPath: path.resolve(import.meta.dirname, '..', '..', info.factory, '..'),
+    resolvedPath: path.resolve(<% if (esm) { %>import.meta.dirname<% } else { %>__dirname<% } %>, '..', '..', info.factory, '..'),
     description: info.description,
   }));
 

package/src/ts/nx-plugin/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 { esmVars } from "../../utils/module-format.js";
 import { addDependencyToTargetIfNotPresent, addGeneratorMetadata, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../utils/nx.js";
 import { sortObjectKeys } from "../../utils/object.js";
 import tsProjectGenerator, { getTsLibDetails } from "../lib/generator.js";
@@ -85,7 +86,8 @@ export const tsNxPluginGenerator = async (tree, options)=>{
     tree.delete(joinPathFragments(mcpPath, 'resources', 'sample-guidance.ts'));
     // Add generator MCP server
     generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'mcp-server'), mcpPath, {
-        name: fullyQualifiedName
+        name: fullyQualifiedName,
+        ...esmVars(tree)
     }, {
         overwriteStrategy: OverwriteStrategy.KeepExisting
     });

package/src/ts/nx-plugin/generator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/nx-plugin/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  OverwriteStrategy,\n  type Tree,\n  updateJson,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport {\n  addDependencyToTargetIfNotPresent,\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../utils/nx';\nimport { sortObjectKeys } from '../../utils/object';\nimport tsProjectGenerator, { getTsLibDetails } from '../lib/generator';\nimport tsMcpServerGenerator from '../mcp-server/generator';\nimport type { TsNxPluginGeneratorSchema } from './schema';\nimport { configureTsProjectAsNxPlugin } from './utils';\n\nexport const TS_NX_PLUGIN_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const tsNxPluginGenerator = async (\n  tree: Tree,\n  options: TsNxPluginGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  // Generate a TypeScript project as the base\n  const { fullyQualifiedName, dir } = getTsLibDetails(tree, options);\n  await tsProjectGenerator(tree, {\n    ...options,\n    preferInstallDependencies: false,\n  });\n\n  // Configure the typescript project as an Nx Plugin\n  configureTsProjectAsNxPlugin(tree, fullyQualifiedName);\n\n  // Add a \"package\" target which creates a package which can be published to NPM\n  const project = readProjectConfigurationUnqualified(tree, fullyQualifiedName);\n  project.targets = {\n    ...project.targets,\n    package: {\n      executor: '@nx/js:tsc',\n      outputs: ['{options.outputPath}'],\n      options: {\n        outputPath: `dist/{projectRoot}/package`,\n        main: `{projectRoot}/src/index.ts`,\n        tsConfig: `{projectRoot}/tsconfig.lib.json`,\n        assets: [\n          `{projectRoot}/*.md`,\n          `{projectRoot}/LICENSE*`,\n          `{projectRoot}/NOTICE`,\n          {\n            input: './{projectRoot}/src',\n            glob: '**/!(*.ts)',\n            output: './src',\n          },\n          {\n            input: './{projectRoot}/src',\n            glob: '**/*.d.ts',\n            output: './src',\n          },\n          {\n            input: './{projectRoot}',\n            glob: 'generators.json',\n            output: '.',\n          },\n          {\n            input: './{projectRoot}',\n            glob: 'executors.json',\n            output: '.',\n          },\n        ],\n      },\n    },\n    build: {\n      ...project.targets?.build,\n    },\n  };\n  // Append the package dependency without moving an existing entry, so re-runs\n  // do not reorder the build dependencies.\n  addDependencyToTargetIfNotPresent(project, 'build', 'package');\n  // Sort targets so their order is stable regardless of insertion order.\n  project.targets = sortObjectKeys(project.targets);\n  updateProjectConfiguration(tree, fullyQualifiedName, project);\n\n  // Add an MCP Server\n  await tsMcpServerGenerator(tree, {\n    project: fullyQualifiedName,\n    infra: 'none',\n    iac: 'cdk', // not used\n    preferInstallDependencies: false,\n  });\n\n  const mcpPath = joinPathFragments(project.sourceRoot, 'mcp-server');\n  const mcpServerPath = joinPathFragments(mcpPath, 'server.ts');\n\n  // Remove the sample server and tools\n  tree.delete(mcpServerPath);\n  tree.delete(joinPathFragments(mcpPath, 'tools', 'add.ts'));\n  tree.delete(joinPathFragments(mcpPath, 'resources', 'sample-guidance.ts'));\n\n  // Add generator MCP server\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'mcp-server'),\n    mcpPath,\n    {\n      name: fullyQualifiedName,\n    },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  addGeneratorMetadata(tree, project.name, TS_NX_PLUGIN_GENERATOR_INFO);\n\n  await addGeneratorMetricsIfApplicable(tree, [TS_NX_PLUGIN_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default tsNxPluginGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","updateProjectConfiguration","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","addDependencyToTargetIfNotPresent","addGeneratorMetadata","getGeneratorInfo","readProjectConfigurationUnqualified","sortObjectKeys","tsProjectGenerator","getTsLibDetails","tsMcpServerGenerator","configureTsProjectAsNxPlugin","TS_NX_PLUGIN_GENERATOR_INFO","filename","tsNxPluginGenerator","tree","options","fullyQualifiedName","dir","preferInstallDependencies","project","targets","package","executor","outputs","outputPath","main","tsConfig","assets","input","glob","output","build","infra","iac","mcpPath","sourceRoot","mcpServerPath","delete","dirname","name","overwriteStrategy","KeepExisting","languages"],"mappings":"AAAA;;;CAGC,GACD,SAEEA,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,EAGjBC,0BAA0B,QACrB,aAAa;AACpB,SAASC,oBAAoB,QAAQ,wBAAqB;AAC1D,SAASC,mBAAmB,QAAQ,yBAAsB;AAC1D,SAASC,+BAA+B,QAAQ,yBAAsB;AACtE,SACEC,iCAAiC,EACjCC,oBAAoB,EACpBC,gBAAgB,EAEhBC,mCAAmC,QAC9B,oBAAiB;AACxB,SAASC,cAAc,QAAQ,wBAAqB;AACpD,OAAOC,sBAAsBC,eAAe,QAAQ,sBAAmB;AACvE,OAAOC,0BAA0B,6BAA0B;AAE3D,SAASC,4BAA4B,QAAQ,aAAU;AAEvD,OAAO,MAAMC,8BAA+CP,iBAC1D,YAAYQ,QAAQ,EACpB;AAEF,OAAO,MAAMC,sBAAsB,OACjCC,MACAC;IAEA,4CAA4C;IAC5C,MAAM,EAAEC,kBAAkB,EAAEC,GAAG,EAAE,GAAGT,gBAAgBM,MAAMC;IAC1D,MAAMR,mBAAmBO,MAAM;QAC7B,GAAGC,OAAO;QACVG,2BAA2B;IAC7B;IAEA,mDAAmD;IACnDR,6BAA6BI,MAAME;IAEnC,+EAA+E;IAC/E,MAAMG,UAAUd,oCAAoCS,MAAME;IAC1DG,QAAQC,OAAO,GAAG;QAChB,GAAGD,QAAQC,OAAO;QAClBC,SAAS;YACPC,UAAU;YACVC,SAAS;gBAAC;aAAuB;YACjCR,SAAS;gBACPS,YAAY,CAAC,0BAA0B,CAAC;gBACxCC,MAAM,CAAC,0BAA0B,CAAC;gBAClCC,UAAU,CAAC,+BAA+B,CAAC;gBAC3CC,QAAQ;oBACN,CAAC,kBAAkB,CAAC;oBACpB,CAAC,sBAAsB,CAAC;oBACxB,CAAC,oBAAoB,CAAC;oBACtB;wBACEC,OAAO;wBACPC,MAAM;wBACNC,QAAQ;oBACV;oBACA;wBACEF,OAAO;wBACPC,MAAM;wBACNC,QAAQ;oBACV;oBACA;wBACEF,OAAO;wBACPC,MAAM;wBACNC,QAAQ;oBACV;oBACA;wBACEF,OAAO;wBACPC,MAAM;wBACNC,QAAQ;oBACV;iBACD;YACH;QACF;QACAC,OAAO;YACL,GAAGZ,QAAQC,OAAO,EAAEW,KAAK;QAC3B;IACF;IACA,6EAA6E;IAC7E,yCAAyC;IACzC7B,kCAAkCiB,SAAS,SAAS;IACpD,uEAAuE;IACvEA,QAAQC,OAAO,GAAGd,eAAea,QAAQC,OAAO;IAChDtB,2BAA2BgB,MAAME,oBAAoBG;IAErD,oBAAoB;IACpB,MAAMV,qBAAqBK,MAAM;QAC/BK,SAASH;QACTgB,OAAO;QACPC,KAAK;QACLf,2BAA2B;IAC7B;IAEA,MAAMgB,UAAUtC,kBAAkBuB,QAAQgB,UAAU,EAAE;IACtD,MAAMC,gBAAgBxC,kBAAkBsC,SAAS;IAEjD,qCAAqC;IACrCpB,KAAKuB,MAAM,CAACD;IACZtB,KAAKuB,MAAM,CAACzC,kBAAkBsC,SAAS,SAAS;IAChDpB,KAAKuB,MAAM,CAACzC,kBAAkBsC,SAAS,aAAa;IAEpD,2BAA2B;IAC3BvC,cACEmB,MACAlB,kBAAkB,YAAY0C,OAAO,EAAE,SAAS,eAChDJ,SACA;QACEK,MAAMvB;IACR,GACA;QAAEwB,mBAAmB3C,kBAAkB4C,YAAY;IAAC;IAGtDtC,qBAAqBW,MAAMK,QAAQoB,IAAI,EAAE5B;IAEzC,MAAMV,gCAAgCa,MAAM;QAACH;KAA4B;IAEzE,MAAMZ,qBAAqBe;IAC3B,OAAO,IACLd,oBAAoBc,MAAMC,QAAQG,yBAAyB,EAAE;YAC3DwB,WAAW;gBAAC;aAAa;QAC3B;AACJ,EAAE;AAEF,eAAe7B,oBAAoB"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/nx-plugin/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  OverwriteStrategy,\n  type Tree,\n  updateJson,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { esmVars } from '../../utils/module-format';\nimport {\n  addDependencyToTargetIfNotPresent,\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../utils/nx';\nimport { sortObjectKeys } from '../../utils/object';\nimport tsProjectGenerator, { getTsLibDetails } from '../lib/generator';\nimport tsMcpServerGenerator from '../mcp-server/generator';\nimport type { TsNxPluginGeneratorSchema } from './schema';\nimport { configureTsProjectAsNxPlugin } from './utils';\n\nexport const TS_NX_PLUGIN_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const tsNxPluginGenerator = async (\n  tree: Tree,\n  options: TsNxPluginGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  // Generate a TypeScript project as the base\n  const { fullyQualifiedName, dir } = getTsLibDetails(tree, options);\n  await tsProjectGenerator(tree, {\n    ...options,\n    preferInstallDependencies: false,\n  });\n\n  // Configure the typescript project as an Nx Plugin\n  configureTsProjectAsNxPlugin(tree, fullyQualifiedName);\n\n  // Add a \"package\" target which creates a package which can be published to NPM\n  const project = readProjectConfigurationUnqualified(tree, fullyQualifiedName);\n  project.targets = {\n    ...project.targets,\n    package: {\n      executor: '@nx/js:tsc',\n      outputs: ['{options.outputPath}'],\n      options: {\n        outputPath: `dist/{projectRoot}/package`,\n        main: `{projectRoot}/src/index.ts`,\n        tsConfig: `{projectRoot}/tsconfig.lib.json`,\n        assets: [\n          `{projectRoot}/*.md`,\n          `{projectRoot}/LICENSE*`,\n          `{projectRoot}/NOTICE`,\n          {\n            input: './{projectRoot}/src',\n            glob: '**/!(*.ts)',\n            output: './src',\n          },\n          {\n            input: './{projectRoot}/src',\n            glob: '**/*.d.ts',\n            output: './src',\n          },\n          {\n            input: './{projectRoot}',\n            glob: 'generators.json',\n            output: '.',\n          },\n          {\n            input: './{projectRoot}',\n            glob: 'executors.json',\n            output: '.',\n          },\n        ],\n      },\n    },\n    build: {\n      ...project.targets?.build,\n    },\n  };\n  // Append the package dependency without moving an existing entry, so re-runs\n  // do not reorder the build dependencies.\n  addDependencyToTargetIfNotPresent(project, 'build', 'package');\n  // Sort targets so their order is stable regardless of insertion order.\n  project.targets = sortObjectKeys(project.targets);\n  updateProjectConfiguration(tree, fullyQualifiedName, project);\n\n  // Add an MCP Server\n  await tsMcpServerGenerator(tree, {\n    project: fullyQualifiedName,\n    infra: 'none',\n    iac: 'cdk', // not used\n    preferInstallDependencies: false,\n  });\n\n  const mcpPath = joinPathFragments(project.sourceRoot, 'mcp-server');\n  const mcpServerPath = joinPathFragments(mcpPath, 'server.ts');\n\n  // Remove the sample server and tools\n  tree.delete(mcpServerPath);\n  tree.delete(joinPathFragments(mcpPath, 'tools', 'add.ts'));\n  tree.delete(joinPathFragments(mcpPath, 'resources', 'sample-guidance.ts'));\n\n  // Add generator MCP server\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'mcp-server'),\n    mcpPath,\n    {\n      name: fullyQualifiedName,\n      ...esmVars(tree),\n    },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  addGeneratorMetadata(tree, project.name, TS_NX_PLUGIN_GENERATOR_INFO);\n\n  await addGeneratorMetricsIfApplicable(tree, [TS_NX_PLUGIN_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nexport default tsNxPluginGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","updateProjectConfiguration","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","esmVars","addDependencyToTargetIfNotPresent","addGeneratorMetadata","getGeneratorInfo","readProjectConfigurationUnqualified","sortObjectKeys","tsProjectGenerator","getTsLibDetails","tsMcpServerGenerator","configureTsProjectAsNxPlugin","TS_NX_PLUGIN_GENERATOR_INFO","filename","tsNxPluginGenerator","tree","options","fullyQualifiedName","dir","preferInstallDependencies","project","targets","package","executor","outputs","outputPath","main","tsConfig","assets","input","glob","output","build","infra","iac","mcpPath","sourceRoot","mcpServerPath","delete","dirname","name","overwriteStrategy","KeepExisting","languages"],"mappings":"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"}

package/src/ts/nx-plugin/utils.js

@@ -5,6 +5,7 @@
 import PackageJson from "../../../package.json" with {
     type: 'json'
 };
+import { isEsmWorkspace } from "../../utils/module-format.js";
 import { readProjectConfigurationUnqualified } from "../../utils/nx.js";
 import { withVersions } from "../../utils/versions.js";
 /**
@@ -30,11 +31,13 @@ import { withVersions } from "../../utils/versions.js";
             name: project.name
         });
     }
+    const esm = isEsmWorkspace(tree);
     updateJson(tree, pluginPackageJsonPath, (pkg)=>{
-        // Mark the plugin as ESM so Nx loads its `.ts` generators as ES modules via
-        // Node's native type stripping (the workspace root is also `type: module`).
-        pkg.type ??= 'module';
-        pkg.main ??= './src/index.js';
+        // Match the plugin's module system to the workspace. Nx loads `.ts`
+        // generators via Node's native type stripping, as ESM (workspace root is
+        // `type: module`) or CommonJS accordingly.
+        pkg.type ??= esm ? 'module' : 'commonjs';
+        pkg.main ??= esm ? './src/index.js' : './src/index';
         pkg.generators ??= './generators.json';
         return pkg;
     });

package/src/ts/nx-plugin/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/nx-plugin/utils.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  joinPathFragments,\n  readJson,\n  type Tree,\n  updateJson,\n  writeJson,\n} from '@nx/devkit';\nimport PackageJson from '../../../package.json' with { type: 'json' };\nimport { readProjectConfigurationUnqualified } from '../../utils/nx';\nimport { withVersions } from '../../utils/versions';\n\n/**\n * Configures a TypeScript project as an Nx Plugin\n */\nexport const configureTsProjectAsNxPlugin = (\n  tree: Tree,\n  projectName: string,\n) => {\n  const project = readProjectConfigurationUnqualified(tree, projectName);\n\n  const tsConfigPath = joinPathFragments(project.root, 'tsconfig.json');\n  if (!tree.exists(tsConfigPath)) {\n    throw new Error(\n      `Selected plugin project ${projectName} is not a TypeScript project`,\n    );\n  }\n\n  // Create an empty generators.json if one dosn't exist\n  const generatorsJsonPath = joinPathFragments(project.root, 'generators.json');\n  if (!tree.exists(generatorsJsonPath)) {\n    writeJson(tree, generatorsJsonPath, {\n      generators: {},\n    });\n  }\n\n  // Create a package.json if one doesn't exist, and configure \"type\", \"main\"\n  // and \"generators\"\n  const pluginPackageJsonPath = joinPathFragments(project.root, 'package.json');\n  if (!tree.exists(pluginPackageJsonPath)) {\n    writeJson(tree, pluginPackageJsonPath, {\n      name: project.name,\n    });\n  }\n  updateJson(tree, pluginPackageJsonPath, (pkg) => {\n    // Mark the plugin as ESM so Nx loads its `.ts` generators as ES modules via\n    // Node's native type stripping (the workspace root is also `type: module`).\n    pkg.type ??= 'module';\n    pkg.main ??= './src/index.js';\n    pkg.generators ??= './generators.json';\n    return pkg;\n  });\n\n  const rootPackageJson = tree.exists('package.json')\n    ? readJson(tree, 'package.json')\n    : undefined;\n  const isNxPluginForAws = rootPackageJson?.name === '@aws/nx-plugin-source';\n\n  if (!isNxPluginForAws) {\n    // Add the required dependencies to the root package.json, and project's package.json\n    const deps = {\n      ...withVersions(['@nx/devkit']),\n      // Include dependency on @aws/nx-plugin\n      [PackageJson.name]: `^${PackageJson.version}`,\n    };\n    // Generated workspaces are `\"type\": \"module\"`, so Nx loads the plugin's\n    // `.ts` generators as ESM via Node's native type stripping — no swc/ts-node\n    // transpiler is required.\n    addDependenciesToPackageJson(tree, {}, deps);\n    addDependenciesToPackageJson(tree, deps, {}, pluginPackageJsonPath);\n  }\n};\n"],"names":["addDependenciesToPackageJson","joinPathFragments","readJson","updateJson","writeJson","PackageJson","type","readProjectConfigurationUnqualified","withVersions","configureTsProjectAsNxPlugin","tree","projectName","project","tsConfigPath","root","exists","Error","generatorsJsonPath","generators","pluginPackageJsonPath","name","pkg","main","rootPackageJson","undefined","isNxPluginForAws","deps","version"],"mappings":"AAAA;;;CAGC,GACD,SACEA,4BAA4B,EAC5BC,iBAAiB,EACjBC,QAAQ,EAERC,UAAU,EACVC,SAAS,QACJ,aAAa;AACpB,OAAOC,iBAAiB,6BAA6B;IAAEC,MAAM;AAAO,EAAE;AACtE,SAASC,mCAAmC,QAAQ,oBAAiB;AACrE,SAASC,YAAY,QAAQ,0BAAuB;AAEpD;;CAEC,GACD,OAAO,MAAMC,+BAA+B,CAC1CC,MACAC;IAEA,MAAMC,UAAUL,oCAAoCG,MAAMC;IAE1D,MAAME,eAAeZ,kBAAkBW,QAAQE,IAAI,EAAE;IACrD,IAAI,CAACJ,KAAKK,MAAM,CAACF,eAAe;QAC9B,MAAM,IAAIG,MACR,CAAC,wBAAwB,EAAEL,YAAY,4BAA4B,CAAC;IAExE;IAEA,sDAAsD;IACtD,MAAMM,qBAAqBhB,kBAAkBW,QAAQE,IAAI,EAAE;IAC3D,IAAI,CAACJ,KAAKK,MAAM,CAACE,qBAAqB;QACpCb,UAAUM,MAAMO,oBAAoB;YAClCC,YAAY,CAAC;QACf;IACF;IAEA,2EAA2E;IAC3E,mBAAmB;IACnB,MAAMC,wBAAwBlB,kBAAkBW,QAAQE,IAAI,EAAE;IAC9D,IAAI,CAACJ,KAAKK,MAAM,CAACI,wBAAwB;QACvCf,UAAUM,MAAMS,uBAAuB;YACrCC,MAAMR,QAAQQ,IAAI;QACpB;IACF;IACAjB,WAAWO,MAAMS,uBAAuB,CAACE;QACvC,4EAA4E;QAC5E,4EAA4E;QAC5EA,IAAIf,IAAI,KAAK;QACbe,IAAIC,IAAI,KAAK;QACbD,IAAIH,UAAU,KAAK;QACnB,OAAOG;IACT;IAEA,MAAME,kBAAkBb,KAAKK,MAAM,CAAC,kBAChCb,SAASQ,MAAM,kBACfc;IACJ,MAAMC,mBAAmBF,iBAAiBH,SAAS;IAEnD,IAAI,CAACK,kBAAkB;QACrB,qFAAqF;QACrF,MAAMC,OAAO;YACX,GAAGlB,aAAa;gBAAC;aAAa,CAAC;YAC/B,uCAAuC;YACvC,CAACH,YAAYe,IAAI,CAAC,EAAE,CAAC,CAAC,EAAEf,YAAYsB,OAAO,EAAE;QAC/C;QACA,wEAAwE;QACxE,4EAA4E;QAC5E,0BAA0B;QAC1B3B,6BAA6BU,MAAM,CAAC,GAAGgB;QACvC1B,6BAA6BU,MAAMgB,MAAM,CAAC,GAAGP;IAC/C;AACF,EAAE"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/nx-plugin/utils.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  joinPathFragments,\n  readJson,\n  type Tree,\n  updateJson,\n  writeJson,\n} from '@nx/devkit';\nimport PackageJson from '../../../package.json' with { type: 'json' };\nimport { isEsmWorkspace } from '../../utils/module-format';\nimport { readProjectConfigurationUnqualified } from '../../utils/nx';\nimport { withVersions } from '../../utils/versions';\n\n/**\n * Configures a TypeScript project as an Nx Plugin\n */\nexport const configureTsProjectAsNxPlugin = (\n  tree: Tree,\n  projectName: string,\n) => {\n  const project = readProjectConfigurationUnqualified(tree, projectName);\n\n  const tsConfigPath = joinPathFragments(project.root, 'tsconfig.json');\n  if (!tree.exists(tsConfigPath)) {\n    throw new Error(\n      `Selected plugin project ${projectName} is not a TypeScript project`,\n    );\n  }\n\n  // Create an empty generators.json if one dosn't exist\n  const generatorsJsonPath = joinPathFragments(project.root, 'generators.json');\n  if (!tree.exists(generatorsJsonPath)) {\n    writeJson(tree, generatorsJsonPath, {\n      generators: {},\n    });\n  }\n\n  // Create a package.json if one doesn't exist, and configure \"type\", \"main\"\n  // and \"generators\"\n  const pluginPackageJsonPath = joinPathFragments(project.root, 'package.json');\n  if (!tree.exists(pluginPackageJsonPath)) {\n    writeJson(tree, pluginPackageJsonPath, {\n      name: project.name,\n    });\n  }\n  const esm = isEsmWorkspace(tree);\n  updateJson(tree, pluginPackageJsonPath, (pkg) => {\n    // Match the plugin's module system to the workspace. Nx loads `.ts`\n    // generators via Node's native type stripping, as ESM (workspace root is\n    // `type: module`) or CommonJS accordingly.\n    pkg.type ??= esm ? 'module' : 'commonjs';\n    pkg.main ??= esm ? './src/index.js' : './src/index';\n    pkg.generators ??= './generators.json';\n    return pkg;\n  });\n\n  const rootPackageJson = tree.exists('package.json')\n    ? readJson(tree, 'package.json')\n    : undefined;\n  const isNxPluginForAws = rootPackageJson?.name === '@aws/nx-plugin-source';\n\n  if (!isNxPluginForAws) {\n    // Add the required dependencies to the root package.json, and project's package.json\n    const deps = {\n      ...withVersions(['@nx/devkit']),\n      // Include dependency on @aws/nx-plugin\n      [PackageJson.name]: `^${PackageJson.version}`,\n    };\n    // Generated workspaces are `\"type\": \"module\"`, so Nx loads the plugin's\n    // `.ts` generators as ESM via Node's native type stripping — no swc/ts-node\n    // transpiler is required.\n    addDependenciesToPackageJson(tree, {}, deps);\n    addDependenciesToPackageJson(tree, deps, {}, pluginPackageJsonPath);\n  }\n};\n"],"names":["addDependenciesToPackageJson","joinPathFragments","readJson","updateJson","writeJson","PackageJson","type","isEsmWorkspace","readProjectConfigurationUnqualified","withVersions","configureTsProjectAsNxPlugin","tree","projectName","project","tsConfigPath","root","exists","Error","generatorsJsonPath","generators","pluginPackageJsonPath","name","esm","pkg","main","rootPackageJson","undefined","isNxPluginForAws","deps","version"],"mappings":"AAAA;;;CAGC,GACD,SACEA,4BAA4B,EAC5BC,iBAAiB,EACjBC,QAAQ,EAERC,UAAU,EACVC,SAAS,QACJ,aAAa;AACpB,OAAOC,iBAAiB,6BAA6B;IAAEC,MAAM;AAAO,EAAE;AACtE,SAASC,cAAc,QAAQ,+BAA4B;AAC3D,SAASC,mCAAmC,QAAQ,oBAAiB;AACrE,SAASC,YAAY,QAAQ,0BAAuB;AAEpD;;CAEC,GACD,OAAO,MAAMC,+BAA+B,CAC1CC,MACAC;IAEA,MAAMC,UAAUL,oCAAoCG,MAAMC;IAE1D,MAAME,eAAeb,kBAAkBY,QAAQE,IAAI,EAAE;IACrD,IAAI,CAACJ,KAAKK,MAAM,CAACF,eAAe;QAC9B,MAAM,IAAIG,MACR,CAAC,wBAAwB,EAAEL,YAAY,4BAA4B,CAAC;IAExE;IAEA,sDAAsD;IACtD,MAAMM,qBAAqBjB,kBAAkBY,QAAQE,IAAI,EAAE;IAC3D,IAAI,CAACJ,KAAKK,MAAM,CAACE,qBAAqB;QACpCd,UAAUO,MAAMO,oBAAoB;YAClCC,YAAY,CAAC;QACf;IACF;IAEA,2EAA2E;IAC3E,mBAAmB;IACnB,MAAMC,wBAAwBnB,kBAAkBY,QAAQE,IAAI,EAAE;IAC9D,IAAI,CAACJ,KAAKK,MAAM,CAACI,wBAAwB;QACvChB,UAAUO,MAAMS,uBAAuB;YACrCC,MAAMR,QAAQQ,IAAI;QACpB;IACF;IACA,MAAMC,MAAMf,eAAeI;IAC3BR,WAAWQ,MAAMS,uBAAuB,CAACG;QACvC,oEAAoE;QACpE,yEAAyE;QACzE,2CAA2C;QAC3CA,IAAIjB,IAAI,KAAKgB,MAAM,WAAW;QAC9BC,IAAIC,IAAI,KAAKF,MAAM,mBAAmB;QACtCC,IAAIJ,UAAU,KAAK;QACnB,OAAOI;IACT;IAEA,MAAME,kBAAkBd,KAAKK,MAAM,CAAC,kBAChCd,SAASS,MAAM,kBACfe;IACJ,MAAMC,mBAAmBF,iBAAiBJ,SAAS;IAEnD,IAAI,CAACM,kBAAkB;QACrB,qFAAqF;QACrF,MAAMC,OAAO;YACX,GAAGnB,aAAa;gBAAC;aAAa,CAAC;YAC/B,uCAAuC;YACvC,CAACJ,YAAYgB,IAAI,CAAC,EAAE,CAAC,CAAC,EAAEhB,YAAYwB,OAAO,EAAE;QAC/C;QACA,wEAAwE;QACxE,4EAA4E;QAC5E,0BAA0B;QAC1B7B,6BAA6BW,MAAM,CAAC,GAAGiB;QACvC5B,6BAA6BW,MAAMiB,MAAM,CAAC,GAAGR;IAC/C;AACF,EAAE"}

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

@@ -792,7 +792,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
     null = {
       source  = "hashicorp/null"
@@ -1554,7 +1554,7 @@ exports[`ts#rdb generator > should generate terraform modules when iac is Terraf
     }
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
     null = {
       source  = "hashicorp/null"
@@ -2281,7 +2281,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
     null = {
       source  = "hashicorp/null"
@@ -3043,7 +3043,7 @@ exports[`ts#rdb generator > should generate terraform modules with MySQL engine
     }
     aws = {
       source  = "hashicorp/aws"
-      version = "6.52.0"
+      version = "6.54.0"
     }
     null = {
       source  = "hashicorp/null"

package/src/ts/rdb/files/src/create-db-user-handler.ts.template

@@ -2,10 +2,10 @@ import type { CloudFormationCustomResourceEvent } from 'aws-lambda';
 import { randomBytes } from 'node:crypto';
 <%_ if (engine === 'mysql') { _%>
 import { createPool, type PoolConnection } from 'mariadb';
-import { getDatabaseSecret, withConnectionRetry } from './utils.js';
+import { getDatabaseSecret, withConnectionRetry } from './utils<% if (esm) { %>.js<% } %>';
 <%_ } else { _%>
 import { Client, escapeIdentifier } from 'pg';
-import { getDatabaseSecret, withConnectionRetry } from './utils.js';
+import { getDatabaseSecret, withConnectionRetry } from './utils<% if (esm) { %>.js<% } %>';
 <%_ } _%>
 
 type OnEventResult = {

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

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

package/src/ts/rdb/files/src/migration-handler.ts.template

@@ -1,6 +1,6 @@
 import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
-import { getDatabaseSecret, withConnectionRetry } from './utils.js';
+import { getDatabaseSecret, withConnectionRetry } from './utils<% if (esm) { %>.js<% } %>';
 
 const buildDatabaseUrl = async (): Promise<string> => {
   const { host, port, dbname, username, password } = await getDatabaseSecret();

package/src/ts/rdb/files/src/prisma.ts.template

@@ -1,18 +1,21 @@
 import { <%= prismaAdapterClassName %> } from '<%= prismaAdapterPackage %>';
 import { Signer } from '@aws-sdk/rds-signer';
-import { Prisma, PrismaClient } from '../generated/prisma/client.js';
+import { Prisma, PrismaClient } from '../generated/prisma/client<% if (esm) { %>.js<% } %>';
 <%_ if (engine === 'postgres') { _%>
 import { Pool } from 'pg';
 <%_ } _%>
 import { readFileSync } from 'fs';
-import { join, dirname } from 'path';
+import { join<% if (esm) { %>, dirname<% } %> } from 'path';
+<%_ if (esm) { _%>
 import { fileURLToPath } from 'url';
-import { getDatabaseConfig } from './utils.js';
+<%_ } _%>
+import { getDatabaseConfig } from './utils<% if (esm) { %>.js<% } %>';
 
 // 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/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)=>[