@aws/nx-plugin 1.0.0-rc.97 → 1.0.0

package/src/ts/agent/a2a-connection/__snapshots__/generator.spec.ts.snap

@@ -1,13 +1,13 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`ts#agent#a2a-connection generator > should match snapshot for agent-connection src files > agent-connection-index.ts 1`] = `
-"export * from './app/remote-client-strands.js';
+"// Export your library code here
+export * from './app/remote-client-strands.js';
 export * from './core/tool-errors-strands.js';
 export * from './core/model-errors-strands.js';
 export * from './core/with-session-id-strands.js';
 export * from './core/runtime-config.js';
 export * from './core/session-context.js';
-// Export your library code here
 "
 `;
 

package/src/ts/agent/gateway-connection/__snapshots__/generator.spec.ts.snap

@@ -1,13 +1,13 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`ts#agent#gateway-connection generator > should match snapshot for agent-connection src files > agent-connection-index.ts 1`] = `
-"export * from './app/my-gateway-client-strands.js';
+"// Export your library code here
+export * from './app/my-gateway-client-strands.js';
 export * from './core/tool-errors-strands.js';
 export * from './core/model-errors-strands.js';
 export * from './core/with-session-id-strands.js';
 export * from './core/runtime-config.js';
 export * from './core/session-context.js';
-// Export your library code here
 "
 `;
 

package/src/ts/agent/mcp-connection/__snapshots__/generator.spec.ts.snap

@@ -1,13 +1,13 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`ts#agent#mcp-connection generator > should match snapshot for agent-connection src files > agent-connection-index.ts 1`] = `
-"export * from './app/inventory-mcp-client-strands.js';
+"// Export your library code here
+export * from './app/inventory-mcp-client-strands.js';
 export * from './core/tool-errors-strands.js';
 export * from './core/model-errors-strands.js';
 export * from './core/with-session-id-strands.js';
 export * from './core/runtime-config.js';
 export * from './core/session-context.js';
-// Export your library code here
 "
 `;
 

package/src/ts/agent/react-connection/generator.d.ts

@@ -127,15 +127,7 @@ export declare const DEPENDENCIES: import("../../../utils/declared-dependencies.
 } & {
     versionOnly: true;
 }, Omit<{
-    readonly name: "clsx";
-} & {
-    versionOnly: true;
-}, "when"> & {
-    when: (m: TsAgentReactConnectionMetadata) => boolean;
-} & {
-    versionOnly: true;
-}, Omit<{
-    readonly name: "tailwind-merge";
+    readonly name: "cn";
 } & {
     versionOnly: true;
 }, "when"> & {

package/src/ts/astro-docs/files/translation/scripts/translate.ts.template

@@ -237,7 +237,9 @@ Translate the prose. Everything else is copied from the source exactly as it is:
 Two things do change:
 
 - In frontmatter, translate only \`title\` and \`description\`. Leave every other key and value alone. Frontmatter is YAML, so wrap a value in double quotes whenever it would otherwise begin with a character YAML reserves — for example a title starting with \`@aws/nx-plugin\` must be written as \`"@aws/nx-plugin ..."\`.
-- Rewrite link paths that embed the source locale (\`/${config.sourceLanguage}/foo\` becomes \`/${targetLang}/foo\`), and make a \`parentHeading\` match the translated heading it sits under.
+- A \`parentHeading\` matches the translated heading it sits under.
+
+One thing that looks like it should change does not: a \`<Link path="...">\` value is locale-agnostic — the component resolves it against the reader's locale — so copy it exactly and never prepend \`${targetLang}\` to it.
 
 Write the finished file in one \`create\` call, and never with \`str_replace\` — a partial replacement silently duplicates or splices sections. Do not wrap the file in triple backticks.
 
@@ -332,6 +334,43 @@ async function restoreCodeBlocks(
   await fs.writeFile(targetAbsPath, merged.join('\n'), 'utf-8');
 }
 
+/**
+ * Drop a leading locale segment from every `<Link path>` in the translation.
+ *
+ * The component resolves `path` against the reader's locale, so a value that
+ * already names one renders a doubled segment (`/jp/jp/...`) and 404s. The
+ * prompt says to copy these verbatim; this makes it so regardless.
+ *
+ * Only fenced code is skipped — a snippet demonstrating the component is
+ * documentation, not a link to resolve.
+ */
+async function stripLocaleFromLinkPaths(
+  targetAbsPath: string,
+  locales: string[],
+): Promise<void> {
+  const linkPath = new RegExp(
+    `(<Link\\b[^>]*?\\bpath=")/?(?:${locales.join('|')})(/|")`,
+    'g',
+  );
+
+  const original = await fs.readFile(targetAbsPath, 'utf-8');
+  const { prose, code } = splitOnFences(original);
+  const stripped = prose.map((chunk) =>
+    chunk.replace(linkPath, (_match, before: string, after: string) =>
+      // A bare locale is the locale's landing page, which is the docs root.
+      after === '"' ? `${before}"` : `${before}${after}`,
+    ),
+  );
+
+  const merged = stripped.flatMap((chunk, i) =>
+    i < code.length ? [chunk, code[i]] : [chunk],
+  );
+  const result = merged.join('\n');
+  if (result !== original) {
+    await fs.writeFile(targetAbsPath, result, 'utf-8');
+  }
+}
+
 /**
  * Number of times to retry a single (file x language) translation. Large files
  * occasionally hit transient Bedrock streaming errors; a fresh agent invocation
@@ -344,6 +383,7 @@ const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 async function translateFileForLanguage(
   file: FileToTranslate,
   targetLang: string,
+  locales: string[],
 ): Promise<void> {
   const targetAbsPath = path.join(DOCS_DIR, targetLang, file.relativePath);
 
@@ -384,6 +424,7 @@ async function translateFileForLanguage(
       try {
         assertFrontmatterIsParseable(await fs.readFile(targetAbsPath, 'utf-8'));
         await restoreCodeBlocks(file.sourceAbsPath, targetAbsPath);
+        await stripLocaleFromLinkPaths(targetAbsPath, locales);
         return;
       } catch (err) {
         lastError = err;
@@ -510,6 +551,10 @@ async function main() {
     return;
   }
 
+  // Every configured locale, not just the requested ones — a `<Link path>` can
+  // pick up any of them, whichever languages this run happens to cover.
+  const locales = [config.sourceLanguage, ...config.targetLanguages];
+
   // Build one task per (file × target language) — each is a fresh agent invocation,
   // so context windows stay small no matter how big the docs site is. A single
   // failing translation records its error rather than aborting the whole run, so
@@ -519,7 +564,7 @@ async function main() {
     files.map((file) => async () => {
       log.info(`  ${file.relativePath} → ${lang}`);
       try {
-        await translateFileForLanguage(file, lang);
+        await translateFileForLanguage(file, lang, locales);
       } catch (err) {
         log.error(
           `${file.relativePath} → ${lang}: ${err instanceof Error ? err.message : String(err)}`,

package/src/ts/dcr-proxy/__snapshots__/generator.spec.ts.snap

@@ -579,7 +579,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.62.0"
+      version = "6.63.0"
     }
     archive = {
       source  = "hashicorp/archive"

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.62.0"
+      version = "6.63.0"
     }
   }
 }
@@ -232,7 +232,7 @@ exports[`ts#dynamodb generator > should generate terraform modules when iac is t
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.62.0"
+      version = "6.63.0"
     }
     random = {
       source  = "hashicorp/random"
@@ -797,9 +797,9 @@ exports[`ts#dynamodb generator > should generate the dynamodb project > packages
 `;
 
 exports[`ts#dynamodb generator > should generate the dynamodb project > packages/my-table/src/index.ts 1`] = `
-"export { getDynamoDBClient, resolveTableName } from './client.js';
+"// Export your library code here
+export { getDynamoDBClient, resolveTableName } from './client.js';
 export * from './entities/index.js';
-// Export your library code here
 "
 `;
 
@@ -1451,8 +1451,8 @@ exports[`ts#dynamodb generator > should generate with infra=none then upgrade to
 `;
 
 exports[`ts#dynamodb generator > should generate with infra=none then upgrade to infra=dynamodb > packages/my-table/src/index.ts 1`] = `
-"export { getDynamoDBClient, resolveTableName } from './client.js';
+"// Export your library code here
+export { getDynamoDBClient, resolveTableName } from './client.js';
 export * from './entities/index.js';
-// Export your library code here
 "
 `;

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

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

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

@@ -155,7 +155,7 @@ exports[`ts#mcp-server generator > should match snapshot for Terraform generated
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.62.0"
+      version = "6.63.0"
     }
     null = {
       source  = "hashicorp/null"
@@ -514,7 +514,7 @@ resource "null_resource" "runtime_ready" {
 
   provisioner "local-exec" {
     command = <<-EOT
-      uv run --with boto3==1.43.83 python -c "
+      uv run --with boto3==1.43.89 python -c "
 import boto3
 import json
 import os
@@ -737,9 +737,9 @@ output "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.js';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import express, { Request, Response } from 'express';
+import { createServer } from './server.js';
 
 const PORT = parseInt(process.env.PORT || '8000');
 

package/src/ts/mcp-server/files/app/http.ts.template

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import { createServer } from './server<% if (esm) { %>.js<% } %>';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import express, { Request, Response } from 'express';
+import { createServer } from './server<% if (esm) { %>.js<% } %>';
 
 const PORT = parseInt(process.env.PORT || '8000');
 

package/src/ts/nx-generator/__snapshots__/generator.spec.ts.snap

@@ -204,7 +204,7 @@ exports[`nx-generator generator > within @aws/nx-plugin > should update generato
 `;
 
 exports[`nx-generator generator > within another workspace > should generate an example schema, generator and test > local-generator.spec.ts 1`] = `
-"import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
+"import { createTreeUsingTsSolutionSetup } from '@aws/nx-plugin/sdk/utils/test';
 import { Tree } from '@nx/devkit';
 import { fooBarGenerator } from './generator.js';
 
@@ -212,7 +212,7 @@ describe('foo#bar generator', () => {
   let tree: Tree;
 
   beforeEach(() => {
-    tree = createTreeWithEmptyWorkspace();
+    tree = createTreeUsingTsSolutionSetup();
   });
 
   it('should run successfully', async () => {

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

@@ -1,4 +1,4 @@
-import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
+import { createTreeUsingTsSolutionSetup } from '@aws/nx-plugin/sdk/utils/test';
 import { Tree } from '@nx/devkit';
 import { <%- nameCamelCase %>Generator } from './generator<% if (esm) { %>.js<% } %>';
 
@@ -6,7 +6,7 @@ describe('<%- name %> generator', () => {
   let tree: Tree;
 
   beforeEach(() => {
-    tree = createTreeWithEmptyWorkspace();
+    tree = createTreeUsingTsSolutionSetup();
   });
 
   it('should run successfully', async () => {

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

@@ -14,7 +14,7 @@ import { isEsmWorkspace } from "../../utils/module-format.js";
 import { kebabCase } from "../../utils/names.js";
 import { getGeneratorInfo, isNxPluginForAwsWorkspace } from "../../utils/nx.js";
 import { sortObjectKeys } from "../../utils/object.js";
-import { addNxPluginDependencies, configureNxPluginPackageJson, NX_PLUGIN_DEPENDENCIES, readNxPluginProject } from "../nx-plugin/utils.js";
+import { addNxPluginDependencies, addNxPluginManifestAssets, configureNxPluginPackageJson, NX_PLUGIN_DEPENDENCIES, readNxPluginProject } from "../nx-plugin/utils.js";
 export const DEPENDENCIES = declareDependencies()({
     ts: [
         ...NX_PLUGIN_DEPENDENCIES
@@ -55,6 +55,8 @@ export const NX_MIGRATION_GENERATOR_INFO = getGeneratorInfo(import.meta.filename
     const pluginPackageJsonPath = configureNxPluginPackageJson(tree, plugin, 'nx-migrations', {
         migrations: './migrations.json'
     });
+    // migrations.json must reach the published tarball the package.json points at
+    addNxPluginManifestAssets(tree, plugin);
     // Migrations sit three levels below the source root, so in this repo the
     // shared utils are relative. Elsewhere they come from the SDK.
     const formatImportPath = isNxPluginForAws ? '../../../utils/format' : `${PackageJson.name}/sdk/utils/format`;

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/nx-migration/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 PackageJson from '../../../package.json' with { type: 'json' };\nimport { declareDependencies } from '../../utils/declared-dependencies.js';\nimport { formatFilesInSubtree } from '../../utils/format.js';\nimport { installDependencies } from '../../utils/install.js';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics.js';\nimport {\n  LATEST_MIGRATIONS_DIR,\n  migrationKey,\n} from '../../utils/migration-versions.js';\nimport { isEsmWorkspace } from '../../utils/module-format.js';\nimport { kebabCase } from '../../utils/names.js';\nimport {\n  getGeneratorInfo,\n  isNxPluginForAwsWorkspace,\n  type NxGeneratorInfo,\n} from '../../utils/nx.js';\nimport { sortObjectKeys } from '../../utils/object.js';\nimport {\n  addNxPluginDependencies,\n  configureNxPluginPackageJson,\n  NX_PLUGIN_DEPENDENCIES,\n  readNxPluginProject,\n} from '../nx-plugin/utils.js';\nimport type { TsNxMigrationGeneratorSchema } from './schema';\n\nexport const DEPENDENCIES = declareDependencies()({\n  ts: [...NX_PLUGIN_DEPENDENCIES],\n});\n\nexport const NX_MIGRATION_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\n/**\n * Scaffolds a migration in an Nx Plugin project and registers it in the\n * plugin's `migrations.json` (creating the manifest and wiring the\n * `nx-migrations` field into the plugin's `package.json` if absent), so\n * `nx migrate` applies it when users upgrade the plugin.\n *\n * Supports all three migration kinds:\n * - `deterministic`: a codemod (`implementation`).\n * - `agentic`: a `prompt` markdown file applied by the user's agent.\n * - `hybrid`: both — the codemod does the mechanical part and returns\n *   `agentContext`, then the prompt hands off to the agent for the rest.\n *\n * No `version` is written — the plugin author stamps versions at release time.\n */\nexport const tsNxMigrationGenerator = async (\n  tree: Tree,\n  options: TsNxMigrationGeneratorSchema,\n): Promise<GeneratorCallback | void> => {\n  const name = kebabCase(options.name);\n  // Shown by `nx migrate` when the migration runs, so it needs to say something\n  const description =\n    options.description ?? 'TODO: Add short description of the migration';\n  const kind = options.kind ?? 'deterministic';\n\n  const hasImplementation = kind === 'deterministic' || kind === 'hybrid';\n  const hasPrompt = kind === 'agentic' || kind === 'hybrid';\n  const isHybrid = kind === 'hybrid';\n\n  const plugin = readNxPluginProject(tree, options.project);\n\n  const sourceRoot = plugin.sourceRoot ?? joinPathFragments(plugin.root, 'src');\n  const srcDir = sourceRoot.split('/').filter(Boolean).pop();\n  // Migrations are grouped by the release that ships them. A new one lands in\n  // `latest` — the release that picks it up moves it into its version folder.\n  const migrationPath = `${srcDir}/migrations/${LATEST_MIGRATIONS_DIR}/${name}`;\n  const migrationDir = joinPathFragments(\n    sourceRoot,\n    'migrations',\n    LATEST_MIGRATIONS_DIR,\n    name,\n  );\n  const key = migrationKey(LATEST_MIGRATIONS_DIR, name);\n\n  const isNxPluginForAws = isNxPluginForAwsWorkspace(tree);\n\n  // Point the plugin at its migrations manifest so `nx migrate` finds them\n  const pluginPackageJsonPath = configureNxPluginPackageJson(\n    tree,\n    plugin,\n    'nx-migrations',\n    { migrations: './migrations.json' },\n  );\n\n  // Migrations sit three levels below the source root, so in this repo the\n  // shared utils are relative. Elsewhere they come from the SDK.\n  const formatImportPath = isNxPluginForAws\n    ? '../../../utils/format'\n    : `${PackageJson.name}/sdk/utils/format`;\n  const testImportPath = isNxPluginForAws\n    ? '../../../utils/test'\n    : `${PackageJson.name}/sdk/utils/test`;\n  // A generated workspace resolves with `nodenext`, which needs the explicit\n  // extension on the spec's sibling import; this repo resolves with `bundler`,\n  // which takes it extensionless.\n  const esm = !isNxPluginForAws && isEsmWorkspace(tree);\n\n  // One template set covers all kinds — scaffold it, then prune what this kind\n  // doesn't use.\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files'),\n    migrationDir,\n    {\n      name,\n      description,\n      isHybrid,\n      formatImportPath,\n      testImportPath,\n      esm,\n    },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n  if (!hasImplementation) {\n    tree.delete(joinPathFragments(migrationDir, 'migration.ts'));\n    tree.delete(joinPathFragments(migrationDir, 'migration.spec.ts'));\n  }\n  if (!hasPrompt) {\n    tree.delete(joinPathFragments(migrationDir, 'prompt.md'));\n  }\n\n  if (isNxPluginForAws) {\n    // In the plugin's own repo migrations.json is assembled from these folders\n    // at build time (see utils/migration-manifest.ts), so registration is just\n    // the description beside the code — its kind comes from the files present.\n    // Two migration PRs then touch disjoint files rather than one shared manifest.\n    const metadataPath = joinPathFragments(migrationDir, 'metadata.json');\n    if (!tree.exists(metadataPath)) {\n      writeJson(tree, metadataPath, { description });\n    }\n  } else {\n    // Elsewhere, register the migration under its folder-prefixed key. The fields\n    // present discriminate the kind for nx, and paths are relative to\n    // migrations.json. No version is written, but an already-stamped one is kept.\n    const migrationsJsonPath = joinPathFragments(\n      plugin.root,\n      'migrations.json',\n    );\n    const migrationsJson = tree.exists(migrationsJsonPath)\n      ? readJson(tree, migrationsJsonPath)\n      : {\n          $schema: 'http://json-schema.org/schema',\n          name: readJson(tree, pluginPackageJsonPath).name ?? plugin.name,\n          generators: {},\n        };\n    writeJson(tree, migrationsJsonPath, {\n      ...migrationsJson,\n      generators: sortObjectKeys({\n        ...migrationsJson.generators,\n        [key]: {\n          ...(migrationsJson.generators?.[key]?.version\n            ? { version: migrationsJson.generators[key].version }\n            : {}),\n          description,\n          ...(hasImplementation\n            ? { implementation: `./${migrationPath}/migration` }\n            : {}),\n          ...(hasPrompt ? { prompt: `./${migrationPath}/prompt.md` } : {}),\n        },\n      }),\n    });\n  }\n\n  // Codemods import @nx/devkit and the @aws/nx-plugin SDK, both of which must\n  // resolve for nx to run them\n  if (hasImplementation) {\n    addNxPluginDependencies(tree, pluginPackageJsonPath, DEPENDENCIES);\n  }\n\n  await addGeneratorMetricsIfApplicable(tree, [NX_MIGRATION_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n\n  if (hasImplementation && !isNxPluginForAws) {\n    return () =>\n      installDependencies(tree, options.preferInstallDependencies, {\n        languages: ['typescript'],\n        ensureResolvable: ['@nx/devkit'],\n      });\n  }\n};\n\nexport default tsNxMigrationGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","readJson","writeJson","PackageJson","type","declareDependencies","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","LATEST_MIGRATIONS_DIR","migrationKey","isEsmWorkspace","kebabCase","getGeneratorInfo","isNxPluginForAwsWorkspace","sortObjectKeys","addNxPluginDependencies","configureNxPluginPackageJson","NX_PLUGIN_DEPENDENCIES","readNxPluginProject","DEPENDENCIES","ts","NX_MIGRATION_GENERATOR_INFO","filename","tsNxMigrationGenerator","tree","options","name","description","kind","hasImplementation","hasPrompt","isHybrid","plugin","project","sourceRoot","root","srcDir","split","filter","Boolean","pop","migrationPath","migrationDir","key","isNxPluginForAws","pluginPackageJsonPath","migrations","formatImportPath","testImportPath","esm","dirname","overwriteStrategy","KeepExisting","delete","metadataPath","exists","migrationsJsonPath","migrationsJson","$schema","generators","version","implementation","prompt","preferInstallDependencies","languages","ensureResolvable"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/nx-migration/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 PackageJson from '../../../package.json' with { type: 'json' };\nimport { declareDependencies } from '../../utils/declared-dependencies.js';\nimport { formatFilesInSubtree } from '../../utils/format.js';\nimport { installDependencies } from '../../utils/install.js';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics.js';\nimport {\n  LATEST_MIGRATIONS_DIR,\n  migrationKey,\n} from '../../utils/migration-versions.js';\nimport { isEsmWorkspace } from '../../utils/module-format.js';\nimport { kebabCase } from '../../utils/names.js';\nimport {\n  getGeneratorInfo,\n  isNxPluginForAwsWorkspace,\n  type NxGeneratorInfo,\n} from '../../utils/nx.js';\nimport { sortObjectKeys } from '../../utils/object.js';\nimport {\n  addNxPluginDependencies,\n  addNxPluginManifestAssets,\n  configureNxPluginPackageJson,\n  NX_PLUGIN_DEPENDENCIES,\n  readNxPluginProject,\n} from '../nx-plugin/utils.js';\nimport type { TsNxMigrationGeneratorSchema } from './schema';\n\nexport const DEPENDENCIES = declareDependencies()({\n  ts: [...NX_PLUGIN_DEPENDENCIES],\n});\n\nexport const NX_MIGRATION_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\n/**\n * Scaffolds a migration in an Nx Plugin project and registers it in the\n * plugin's `migrations.json` (creating the manifest and wiring the\n * `nx-migrations` field into the plugin's `package.json` if absent), so\n * `nx migrate` applies it when users upgrade the plugin.\n *\n * Supports all three migration kinds:\n * - `deterministic`: a codemod (`implementation`).\n * - `agentic`: a `prompt` markdown file applied by the user's agent.\n * - `hybrid`: both — the codemod does the mechanical part and returns\n *   `agentContext`, then the prompt hands off to the agent for the rest.\n *\n * No `version` is written — the plugin author stamps versions at release time.\n */\nexport const tsNxMigrationGenerator = async (\n  tree: Tree,\n  options: TsNxMigrationGeneratorSchema,\n): Promise<GeneratorCallback | void> => {\n  const name = kebabCase(options.name);\n  // Shown by `nx migrate` when the migration runs, so it needs to say something\n  const description =\n    options.description ?? 'TODO: Add short description of the migration';\n  const kind = options.kind ?? 'deterministic';\n\n  const hasImplementation = kind === 'deterministic' || kind === 'hybrid';\n  const hasPrompt = kind === 'agentic' || kind === 'hybrid';\n  const isHybrid = kind === 'hybrid';\n\n  const plugin = readNxPluginProject(tree, options.project);\n\n  const sourceRoot = plugin.sourceRoot ?? joinPathFragments(plugin.root, 'src');\n  const srcDir = sourceRoot.split('/').filter(Boolean).pop();\n  // Migrations are grouped by the release that ships them. A new one lands in\n  // `latest` — the release that picks it up moves it into its version folder.\n  const migrationPath = `${srcDir}/migrations/${LATEST_MIGRATIONS_DIR}/${name}`;\n  const migrationDir = joinPathFragments(\n    sourceRoot,\n    'migrations',\n    LATEST_MIGRATIONS_DIR,\n    name,\n  );\n  const key = migrationKey(LATEST_MIGRATIONS_DIR, name);\n\n  const isNxPluginForAws = isNxPluginForAwsWorkspace(tree);\n\n  // Point the plugin at its migrations manifest so `nx migrate` finds them\n  const pluginPackageJsonPath = configureNxPluginPackageJson(\n    tree,\n    plugin,\n    'nx-migrations',\n    { migrations: './migrations.json' },\n  );\n\n  // migrations.json must reach the published tarball the package.json points at\n  addNxPluginManifestAssets(tree, plugin);\n\n  // Migrations sit three levels below the source root, so in this repo the\n  // shared utils are relative. Elsewhere they come from the SDK.\n  const formatImportPath = isNxPluginForAws\n    ? '../../../utils/format'\n    : `${PackageJson.name}/sdk/utils/format`;\n  const testImportPath = isNxPluginForAws\n    ? '../../../utils/test'\n    : `${PackageJson.name}/sdk/utils/test`;\n  // A generated workspace resolves with `nodenext`, which needs the explicit\n  // extension on the spec's sibling import; this repo resolves with `bundler`,\n  // which takes it extensionless.\n  const esm = !isNxPluginForAws && isEsmWorkspace(tree);\n\n  // One template set covers all kinds — scaffold it, then prune what this kind\n  // doesn't use.\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files'),\n    migrationDir,\n    {\n      name,\n      description,\n      isHybrid,\n      formatImportPath,\n      testImportPath,\n      esm,\n    },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n  if (!hasImplementation) {\n    tree.delete(joinPathFragments(migrationDir, 'migration.ts'));\n    tree.delete(joinPathFragments(migrationDir, 'migration.spec.ts'));\n  }\n  if (!hasPrompt) {\n    tree.delete(joinPathFragments(migrationDir, 'prompt.md'));\n  }\n\n  if (isNxPluginForAws) {\n    // In the plugin's own repo migrations.json is assembled from these folders\n    // at build time (see utils/migration-manifest.ts), so registration is just\n    // the description beside the code — its kind comes from the files present.\n    // Two migration PRs then touch disjoint files rather than one shared manifest.\n    const metadataPath = joinPathFragments(migrationDir, 'metadata.json');\n    if (!tree.exists(metadataPath)) {\n      writeJson(tree, metadataPath, { description });\n    }\n  } else {\n    // Elsewhere, register the migration under its folder-prefixed key. The fields\n    // present discriminate the kind for nx, and paths are relative to\n    // migrations.json. No version is written, but an already-stamped one is kept.\n    const migrationsJsonPath = joinPathFragments(\n      plugin.root,\n      'migrations.json',\n    );\n    const migrationsJson = tree.exists(migrationsJsonPath)\n      ? readJson(tree, migrationsJsonPath)\n      : {\n          $schema: 'http://json-schema.org/schema',\n          name: readJson(tree, pluginPackageJsonPath).name ?? plugin.name,\n          generators: {},\n        };\n    writeJson(tree, migrationsJsonPath, {\n      ...migrationsJson,\n      generators: sortObjectKeys({\n        ...migrationsJson.generators,\n        [key]: {\n          ...(migrationsJson.generators?.[key]?.version\n            ? { version: migrationsJson.generators[key].version }\n            : {}),\n          description,\n          ...(hasImplementation\n            ? { implementation: `./${migrationPath}/migration` }\n            : {}),\n          ...(hasPrompt ? { prompt: `./${migrationPath}/prompt.md` } : {}),\n        },\n      }),\n    });\n  }\n\n  // Codemods import @nx/devkit and the @aws/nx-plugin SDK, both of which must\n  // resolve for nx to run them\n  if (hasImplementation) {\n    addNxPluginDependencies(tree, pluginPackageJsonPath, DEPENDENCIES);\n  }\n\n  await addGeneratorMetricsIfApplicable(tree, [NX_MIGRATION_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n\n  if (hasImplementation && !isNxPluginForAws) {\n    return () =>\n      installDependencies(tree, options.preferInstallDependencies, {\n        languages: ['typescript'],\n        ensureResolvable: ['@nx/devkit'],\n      });\n  }\n};\n\nexport default tsNxMigrationGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","readJson","writeJson","PackageJson","type","declareDependencies","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","LATEST_MIGRATIONS_DIR","migrationKey","isEsmWorkspace","kebabCase","getGeneratorInfo","isNxPluginForAwsWorkspace","sortObjectKeys","addNxPluginDependencies","addNxPluginManifestAssets","configureNxPluginPackageJson","NX_PLUGIN_DEPENDENCIES","readNxPluginProject","DEPENDENCIES","ts","NX_MIGRATION_GENERATOR_INFO","filename","tsNxMigrationGenerator","tree","options","name","description","kind","hasImplementation","hasPrompt","isHybrid","plugin","project","sourceRoot","root","srcDir","split","filter","Boolean","pop","migrationPath","migrationDir","key","isNxPluginForAws","pluginPackageJsonPath","migrations","formatImportPath","testImportPath","esm","dirname","overwriteStrategy","KeepExisting","delete","metadataPath","exists","migrationsJsonPath","migrationsJson","$schema","generators","version","implementation","prompt","preferInstallDependencies","languages","ensureResolvable"],"mappings":"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"}

package/src/ts/nx-plugin/__snapshots__/generator.spec.ts.snap

@@ -2,9 +2,9 @@
 
 exports[`ts#nx-plugin generator > should generate MCP server files > test-plugin/src/mcp-server/http.ts 1`] = `
 "#!/usr/bin/env node
-import { createServer } from './server.js';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import express, { Request, Response } from 'express';
+import { createServer } from './server.js';
 
 const PORT = parseInt(process.env.PORT || '8000');
 
@@ -271,30 +271,6 @@ Then, install the plugin package to ensure generators are available:
 "
 `;
 
-exports[`ts#nx-plugin generator > should generate MCP server files > test-plugin/src/mcp-server/tools/divide.ts 1`] = `
-"import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { z } from 'zod';
-
-export const registerDivideTool = (server: McpServer) => {
-  server.registerTool(
-    'divide',
-    {
-      description: 'divides two numbers',
-      inputSchema: {
-        a: z.number(),
-        b: z
-          .number()
-          .refine((n) => n !== 0, { message: 'Cannot divide by zero' }),
-      },
-    },
-    async ({ a, b }) => ({
-      content: [{ type: 'text' as const, text: String(a / b) }],
-    }),
-  );
-};
-"
-`;
-
 exports[`ts#nx-plugin generator > should generate MCP server files > test-plugin/src/mcp-server/tools/general-guidance.ts 1`] = `
 "import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import * as fs from 'fs';

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

@@ -11,7 +11,7 @@ import { addDependencyToTargetIfNotPresent, addGeneratorMetadata, getGeneratorIn
 import { sortObjectKeys } from "../../utils/object.js";
 import tsProjectGenerator, { getTsLibDetails } from "../lib/generator.js";
 import tsMcpServerGenerator from "../mcp-server/generator.js";
-import { configureTsProjectAsNxPlugin, NX_PLUGIN_DEPENDENCIES } from "./utils.js";
+import { configureTsProjectAsNxPlugin, NX_PLUGIN_DEPENDENCIES, nxPluginManifestAssets } from "./utils.js";
 export const DEPENDENCIES = declareDependencies()({
     ts: [
         ...NX_PLUGIN_DEPENDENCIES
@@ -54,16 +54,7 @@ export const tsNxPluginGenerator = async (tree, options)=>{
                         glob: '**/*.d.ts',
                         output: './src'
                     },
-                    {
-                        input: './{projectRoot}',
-                        glob: 'generators.json',
-                        output: '.'
-                    },
-                    {
-                        input: './{projectRoot}',
-                        glob: 'executors.json',
-                        output: '.'
-                    }
+                    ...nxPluginManifestAssets()
                 ]
             }
         },
@@ -77,6 +68,17 @@ export const tsNxPluginGenerator = async (tree, options)=>{
     // Sort targets so their order is stable regardless of insertion order.
     project.targets = sortObjectKeys(project.targets);
     updateProjectConfiguration(tree, fullyQualifiedName, project);
+    const mcpPath = joinPathFragments(project.sourceRoot, 'mcp-server');
+    // The sample server and tools ts#mcp-server scaffolds are replaced by the
+    // generator MCP server below. Only the ones it creates in this run are
+    // removed, so a re-run leaves the server the user owns and has customised.
+    const SAMPLE_MCP_FILES = [
+        'server.ts',
+        'tools/add.ts',
+        'tools/divide.ts',
+        'resources/sample-guidance.ts'
+    ];
+    const preexistingSampleFiles = new Set(SAMPLE_MCP_FILES.filter((file)=>tree.exists(joinPathFragments(mcpPath, file))));
     // Add an MCP Server
     await tsMcpServerGenerator(tree, {
         project: fullyQualifiedName,
@@ -84,12 +86,12 @@ export const tsNxPluginGenerator = async (tree, options)=>{
         iac: 'cdk',
         preferInstallDependencies: false
     });
-    const mcpPath = joinPathFragments(project.sourceRoot, 'mcp-server');
-    const mcpServerPath = joinPathFragments(mcpPath, 'server.ts');
-    // Remove the sample server and tools
-    tree.delete(mcpServerPath);
-    tree.delete(joinPathFragments(mcpPath, 'tools', 'add.ts'));
-    tree.delete(joinPathFragments(mcpPath, 'resources', 'sample-guidance.ts'));
+    for (const file of SAMPLE_MCP_FILES){
+        const sampleFilePath = joinPathFragments(mcpPath, file);
+        if (!preexistingSampleFiles.has(file) && tree.exists(sampleFilePath)) {
+            tree.delete(sampleFilePath);
+        }
+    }
     // Add generator MCP server
     generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'mcp-server'), mcpPath, {
         name: fullyQualifiedName,

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 { declareDependencies } from '../../utils/declared-dependencies.js';\nimport { formatFilesInSubtree } from '../../utils/format.js';\nimport { installDependencies } from '../../utils/install.js';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics.js';\nimport { esmVars } from '../../utils/module-format.js';\nimport {\n  addDependencyToTargetIfNotPresent,\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../utils/nx.js';\nimport { sortObjectKeys } from '../../utils/object.js';\nimport tsProjectGenerator, { getTsLibDetails } from '../lib/generator.js';\nimport tsMcpServerGenerator from '../mcp-server/generator.js';\nimport type { TsNxPluginGeneratorSchema } from './schema';\nimport {\n  configureTsProjectAsNxPlugin,\n  NX_PLUGIN_DEPENDENCIES,\n} from './utils.js';\n\nexport const DEPENDENCIES = declareDependencies()({\n  ts: [...NX_PLUGIN_DEPENDENCIES],\n});\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, DEPENDENCIES);\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","declareDependencies","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","esmVars","addDependencyToTargetIfNotPresent","addGeneratorMetadata","getGeneratorInfo","readProjectConfigurationUnqualified","sortObjectKeys","tsProjectGenerator","getTsLibDetails","tsMcpServerGenerator","configureTsProjectAsNxPlugin","NX_PLUGIN_DEPENDENCIES","DEPENDENCIES","ts","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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"}
+{"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 { declareDependencies } from '../../utils/declared-dependencies.js';\nimport { formatFilesInSubtree } from '../../utils/format.js';\nimport { installDependencies } from '../../utils/install.js';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics.js';\nimport { esmVars } from '../../utils/module-format.js';\nimport {\n  addDependencyToTargetIfNotPresent,\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../utils/nx.js';\nimport { sortObjectKeys } from '../../utils/object.js';\nimport tsProjectGenerator, { getTsLibDetails } from '../lib/generator.js';\nimport tsMcpServerGenerator from '../mcp-server/generator.js';\nimport type { TsNxPluginGeneratorSchema } from './schema';\nimport {\n  configureTsProjectAsNxPlugin,\n  NX_PLUGIN_DEPENDENCIES,\n  nxPluginManifestAssets,\n} from './utils.js';\n\nexport const DEPENDENCIES = declareDependencies()({\n  ts: [...NX_PLUGIN_DEPENDENCIES],\n});\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, DEPENDENCIES);\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          ...nxPluginManifestAssets(),\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  const mcpPath = joinPathFragments(project.sourceRoot, 'mcp-server');\n\n  // The sample server and tools ts#mcp-server scaffolds are replaced by the\n  // generator MCP server below. Only the ones it creates in this run are\n  // removed, so a re-run leaves the server the user owns and has customised.\n  const SAMPLE_MCP_FILES = [\n    'server.ts',\n    'tools/add.ts',\n    'tools/divide.ts',\n    'resources/sample-guidance.ts',\n  ];\n  const preexistingSampleFiles = new Set(\n    SAMPLE_MCP_FILES.filter((file) =>\n      tree.exists(joinPathFragments(mcpPath, file)),\n    ),\n  );\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  for (const file of SAMPLE_MCP_FILES) {\n    const sampleFilePath = joinPathFragments(mcpPath, file);\n    if (!preexistingSampleFiles.has(file) && tree.exists(sampleFilePath)) {\n      tree.delete(sampleFilePath);\n    }\n  }\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","declareDependencies","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","esmVars","addDependencyToTargetIfNotPresent","addGeneratorMetadata","getGeneratorInfo","readProjectConfigurationUnqualified","sortObjectKeys","tsProjectGenerator","getTsLibDetails","tsMcpServerGenerator","configureTsProjectAsNxPlugin","NX_PLUGIN_DEPENDENCIES","nxPluginManifestAssets","DEPENDENCIES","ts","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","mcpPath","sourceRoot","SAMPLE_MCP_FILES","preexistingSampleFiles","Set","filter","file","exists","infra","iac","sampleFilePath","has","delete","dirname","name","overwriteStrategy","KeepExisting","languages"],"mappings":"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"}

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

@@ -16,6 +16,27 @@ export declare const NX_PLUGIN_DEPENDENCIES: readonly [{
 export declare const readNxPluginProject: (tree: Tree, projectName: string) => ProjectConfiguration;
 /** `package.json` field pointing Nx at one of a plugin's manifests. */
 type NxPluginManifestField = 'generators' | 'nx-migrations';
+/**
+ * The manifests Nx reads from a published plugin, copied beside the compiled
+ * code by the `package` target. `nx migrate` resolves `migrations.json` from the
+ * tarball, so it ships even though only `ts#nx-migration` writes it.
+ */
+export declare const NX_PLUGIN_MANIFESTS: readonly ["generators.json", "executors.json", "migrations.json"];
+/** The `package` target assets that copy the plugin's manifests into dist. */
+export declare const nxPluginManifestAssets: () => {
+    input: string;
+    glob: string;
+    output: string;
+}[];
+/**
+ * Ensure the plugin's `package` target copies every manifest into dist, so a
+ * manifest added after the project was generated is still published.
+ *
+ * Anchored to the `generators.json` asset the target is vended with: a `package`
+ * target without it belongs to something other than an Nx Plugin, or has been
+ * rewritten, so it is left as it is.
+ */
+export declare const addNxPluginManifestAssets: (tree: Tree, project: ProjectConfiguration) => void;
 /**
  * Create the plugin project's package.json if absent and point it at the given
  * manifest, returning its path.

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

@@ -1,7 +1,7 @@
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */ import { joinPathFragments, updateJson, writeJson } from "@nx/devkit";
+ */ import { joinPathFragments, updateJson, updateProjectConfiguration, writeJson } from "@nx/devkit";
 import { forDependencies } from "../../utils/declared-dependencies.js";
 import { addDependenciesToPackageJson } from "../../utils/dependencies.js";
 import { isEsmWorkspace } from "../../utils/module-format.js";
@@ -23,6 +23,46 @@ import { withVersions } from "../../utils/versions.js";
     }
     return project;
 };
+/**
+ * The manifests Nx reads from a published plugin, copied beside the compiled
+ * code by the `package` target. `nx migrate` resolves `migrations.json` from the
+ * tarball, so it ships even though only `ts#nx-migration` writes it.
+ */ export const NX_PLUGIN_MANIFESTS = [
+    'generators.json',
+    'executors.json',
+    'migrations.json'
+];
+/** The `package` target assets that copy the plugin's manifests into dist. */ export const nxPluginManifestAssets = ()=>NX_PLUGIN_MANIFESTS.map((glob)=>({
+            input: './{projectRoot}',
+            glob,
+            output: '.'
+        }));
+/**
+ * Ensure the plugin's `package` target copies every manifest into dist, so a
+ * manifest added after the project was generated is still published.
+ *
+ * Anchored to the `generators.json` asset the target is vended with: a `package`
+ * target without it belongs to something other than an Nx Plugin, or has been
+ * rewritten, so it is left as it is.
+ */ export const addNxPluginManifestAssets = (tree, project)=>{
+    const assets = project.targets?.package?.options?.assets;
+    if (!Array.isArray(assets)) {
+        return;
+    }
+    const globs = new Set(assets.filter((asset)=>typeof asset === 'object' && asset !== null).map((asset)=>asset.glob));
+    if (!globs.has('generators.json')) {
+        return;
+    }
+    const missing = nxPluginManifestAssets().filter((asset)=>!globs.has(asset.glob));
+    if (missing.length === 0) {
+        return;
+    }
+    project.targets.package.options.assets = [
+        ...assets,
+        ...missing
+    ];
+    updateProjectConfiguration(tree, project.name, project);
+};
 /**
  * Create the plugin project's package.json if absent and point it at the given
  * manifest, returning its path.