@aws/nx-plugin 1.0.0-rc.9 → 1.0.0-rc.90

package/src/utils/lambda-runtime-resolution.js

@@ -0,0 +1,83 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { LAMBDA_RUNTIME_VERSIONS } from "./versions.js";
+/**
+ * Resolution of the Lambda runtimes and the CPython patch the version update
+ * pins.
+ *
+ * Lives here rather than beside the script so it is covered by the plugin's test
+ * suite; the script supplies the runtime list and the uv output.
+ */ /** Compare two dotted numeric versions (`24`, `3.14`) ascending. */ export const compareRuntimeVersions = (a, b)=>{
+    const left = a.split('.').map(Number);
+    const right = b.split('.').map(Number);
+    for(let i = 0; i < Math.max(left.length, right.length); i++){
+        const diff = (left[i] ?? 0) - (right[i] ?? 0);
+        if (diff !== 0) {
+            return diff;
+        }
+    }
+    return 0;
+};
+/**
+ * The version a managed runtime identifier names, or undefined for one that isn't
+ * a versioned `nodejs`/`python` runtime.
+ *
+ * `nodejs24.x` -> `24`, `python3.14` -> `3.14`. The bare `nodejs` and
+ * `nodejs4.3-edge` style identifiers carry no comparable version and are skipped.
+ */ export const runtimeIdentifierVersion = (identifier)=>{
+    const node = /^nodejs(\d+)\.x$/.exec(identifier);
+    if (node) {
+        return {
+            language: 'node',
+            version: node[1]
+        };
+    }
+    const python = /^python(\d+\.\d+)$/.exec(identifier);
+    return python ? {
+        language: 'python',
+        version: python[1]
+    } : undefined;
+};
+/**
+ * The latest managed runtime for each language in {@link LAMBDA_RUNTIME_VERSIONS},
+ * from the runtime identifiers `aws-cdk-lib` publishes.
+ *
+ * `Runtime.ALL` is a curated list of the runtimes CDK supports, so a runtime still
+ * in public preview does not appear — which is what makes it a usable source for a
+ * generally-available runtime. Never moves a runtime backwards: a pin ahead of
+ * what CDK offers stays.
+ *
+ * A language the list says nothing about keeps its current pin and is reported
+ * through `unresolved`, so a failure costs this bump alone rather than the whole
+ * version update.
+ */ export const resolveLambdaRuntimes = (identifiers)=>{
+    const unresolved = [];
+    const versions = Object.fromEntries(Object.keys(LAMBDA_RUNTIME_VERSIONS).map((language)=>{
+        const current = LAMBDA_RUNTIME_VERSIONS[language];
+        const available = identifiers.map(runtimeIdentifierVersion).filter((parsed)=>parsed?.language === language).map((parsed)=>parsed.version);
+        if (available.length === 0) {
+            unresolved.push({
+                language,
+                kept: current,
+                reason: 'no-runtimes-listed'
+            });
+            return [
+                language,
+                current
+            ];
+        }
+        const latest = available.reduce((best, version)=>compareRuntimeVersions(version, best) > 0 ? version : best);
+        return [
+            language,
+            compareRuntimeVersions(latest, current) > 0 ? latest : current
+        ];
+    }));
+    return {
+        versions,
+        unresolved
+    };
+};
+/** The warning a language's unresolved runtime reports. */ export const unresolvedRuntimeWarning = (entry)=>`Found no ${entry.language} runtime in the aws-cdk-lib runtime list, so it keeps its pinned runtime (${entry.kept})`;
+
+//# sourceMappingURL=lambda-runtime-resolution.js.map

package/src/utils/lambda-runtime-resolution.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/lambda-runtime-resolution.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { type ILambdaRuntime, LAMBDA_RUNTIME_VERSIONS } from './versions.js';\n\n/**\n * Resolution of the Lambda runtimes and the CPython patch the version update\n * pins.\n *\n * Lives here rather than beside the script so it is covered by the plugin's test\n * suite; the script supplies the runtime list and the uv output.\n */\n\n/** Compare two dotted numeric versions (`24`, `3.14`) ascending. */\nexport const compareRuntimeVersions = (a: string, b: string): number => {\n  const left = a.split('.').map(Number);\n  const right = b.split('.').map(Number);\n  for (let i = 0; i < Math.max(left.length, right.length); i++) {\n    const diff = (left[i] ?? 0) - (right[i] ?? 0);\n    if (diff !== 0) {\n      return diff;\n    }\n  }\n  return 0;\n};\n\n/**\n * The version a managed runtime identifier names, or undefined for one that isn't\n * a versioned `nodejs`/`python` runtime.\n *\n * `nodejs24.x` -> `24`, `python3.14` -> `3.14`. The bare `nodejs` and\n * `nodejs4.3-edge` style identifiers carry no comparable version and are skipped.\n */\nexport const runtimeIdentifierVersion = (\n  identifier: string,\n): { language: ILambdaRuntime; version: string } | undefined => {\n  const node = /^nodejs(\\d+)\\.x$/.exec(identifier);\n  if (node) {\n    return { language: 'node', version: node[1] };\n  }\n  const python = /^python(\\d+\\.\\d+)$/.exec(identifier);\n  return python ? { language: 'python', version: python[1] } : undefined;\n};\n\n/** Why a language's runtime could not be resolved. */\nexport type UnresolvedReason = 'no-runtimes-listed';\n\nexport interface RuntimeResolution {\n  /** Runtime version per language, holding the current pin where unresolved. */\n  readonly versions: Record<string, string>;\n  /** Languages left on their current pin, and why. */\n  readonly unresolved: {\n    readonly language: string;\n    readonly kept: string;\n    readonly reason: UnresolvedReason;\n  }[];\n}\n\n/**\n * The latest managed runtime for each language in {@link LAMBDA_RUNTIME_VERSIONS},\n * from the runtime identifiers `aws-cdk-lib` publishes.\n *\n * `Runtime.ALL` is a curated list of the runtimes CDK supports, so a runtime still\n * in public preview does not appear — which is what makes it a usable source for a\n * generally-available runtime. Never moves a runtime backwards: a pin ahead of\n * what CDK offers stays.\n *\n * A language the list says nothing about keeps its current pin and is reported\n * through `unresolved`, so a failure costs this bump alone rather than the whole\n * version update.\n */\nexport const resolveLambdaRuntimes = (\n  identifiers: readonly string[],\n): RuntimeResolution => {\n  const unresolved: RuntimeResolution['unresolved'][number][] = [];\n\n  const versions = Object.fromEntries(\n    (Object.keys(LAMBDA_RUNTIME_VERSIONS) as ILambdaRuntime[]).map(\n      (language) => {\n        const current = LAMBDA_RUNTIME_VERSIONS[language];\n        const available = identifiers\n          .map(runtimeIdentifierVersion)\n          .filter((parsed) => parsed?.language === language)\n          .map((parsed) => parsed!.version);\n\n        if (available.length === 0) {\n          unresolved.push({\n            language,\n            kept: current,\n            reason: 'no-runtimes-listed',\n          });\n          return [language, current];\n        }\n\n        const latest = available.reduce((best, version) =>\n          compareRuntimeVersions(version, best) > 0 ? version : best,\n        );\n\n        return [\n          language,\n          compareRuntimeVersions(latest, current) > 0 ? latest : current,\n        ];\n      },\n    ),\n  );\n\n  return { versions, unresolved };\n};\n\n/** The warning a language's unresolved runtime reports. */\nexport const unresolvedRuntimeWarning = (\n  entry: RuntimeResolution['unresolved'][number],\n): string =>\n  `Found no ${entry.language} runtime in the aws-cdk-lib runtime list, so it keeps its pinned runtime (${entry.kept})`;\n"],"names":["LAMBDA_RUNTIME_VERSIONS","compareRuntimeVersions","a","b","left","split","map","Number","right","i","Math","max","length","diff","runtimeIdentifierVersion","identifier","node","exec","language","version","python","undefined","resolveLambdaRuntimes","identifiers","unresolved","versions","Object","fromEntries","keys","current","available","filter","parsed","push","kept","reason","latest","reduce","best","unresolvedRuntimeWarning","entry"],"mappings":"AAAA;;;CAGC,GACD,SAA8BA,uBAAuB,QAAQ,gBAAgB;AAE7E;;;;;;CAMC,GAED,kEAAkE,GAClE,OAAO,MAAMC,yBAAyB,CAACC,GAAWC;IAChD,MAAMC,OAAOF,EAAEG,KAAK,CAAC,KAAKC,GAAG,CAACC;IAC9B,MAAMC,QAAQL,EAAEE,KAAK,CAAC,KAAKC,GAAG,CAACC;IAC/B,IAAK,IAAIE,IAAI,GAAGA,IAAIC,KAAKC,GAAG,CAACP,KAAKQ,MAAM,EAAEJ,MAAMI,MAAM,GAAGH,IAAK;QAC5D,MAAMI,OAAO,AAACT,CAAAA,IAAI,CAACK,EAAE,IAAI,CAAA,IAAMD,CAAAA,KAAK,CAACC,EAAE,IAAI,CAAA;QAC3C,IAAII,SAAS,GAAG;YACd,OAAOA;QACT;IACF;IACA,OAAO;AACT,EAAE;AAEF;;;;;;CAMC,GACD,OAAO,MAAMC,2BAA2B,CACtCC;IAEA,MAAMC,OAAO,mBAAmBC,IAAI,CAACF;IACrC,IAAIC,MAAM;QACR,OAAO;YAAEE,UAAU;YAAQC,SAASH,IAAI,CAAC,EAAE;QAAC;IAC9C;IACA,MAAMI,SAAS,qBAAqBH,IAAI,CAACF;IACzC,OAAOK,SAAS;QAAEF,UAAU;QAAUC,SAASC,MAAM,CAAC,EAAE;IAAC,IAAIC;AAC/D,EAAE;AAgBF;;;;;;;;;;;;CAYC,GACD,OAAO,MAAMC,wBAAwB,CACnCC;IAEA,MAAMC,aAAwD,EAAE;IAEhE,MAAMC,WAAWC,OAAOC,WAAW,CACjC,AAACD,OAAOE,IAAI,CAAC5B,yBAA8CM,GAAG,CAC5D,CAACY;QACC,MAAMW,UAAU7B,uBAAuB,CAACkB,SAAS;QACjD,MAAMY,YAAYP,YACfjB,GAAG,CAACQ,0BACJiB,MAAM,CAAC,CAACC,SAAWA,QAAQd,aAAaA,UACxCZ,GAAG,CAAC,CAAC0B,SAAWA,OAAQb,OAAO;QAElC,IAAIW,UAAUlB,MAAM,KAAK,GAAG;YAC1BY,WAAWS,IAAI,CAAC;gBACdf;gBACAgB,MAAML;gBACNM,QAAQ;YACV;YACA,OAAO;gBAACjB;gBAAUW;aAAQ;QAC5B;QAEA,MAAMO,SAASN,UAAUO,MAAM,CAAC,CAACC,MAAMnB,UACrClB,uBAAuBkB,SAASmB,QAAQ,IAAInB,UAAUmB;QAGxD,OAAO;YACLpB;YACAjB,uBAAuBmC,QAAQP,WAAW,IAAIO,SAASP;SACxD;IACH;IAIJ,OAAO;QAAEJ;QAAUD;IAAW;AAChC,EAAE;AAEF,yDAAyD,GACzD,OAAO,MAAMe,2BAA2B,CACtCC,QAEA,CAAC,SAAS,EAAEA,MAAMtB,QAAQ,CAAC,0EAA0E,EAAEsB,MAAMN,IAAI,CAAC,CAAC,CAAC,CAAC"}

package/src/utils/mcp.d.ts

@@ -11,8 +11,17 @@ export declare const NX_PLUGIN_MCP_SERVER_NAME = "nx-plugin-for-aws";
  * Command used to launch the Nx Plugin for AWS MCP server.
  */
 export declare const NX_PLUGIN_MCP_SERVER_COMMAND = "npx";
+/**
+ * Package providing the Nx Plugin for AWS MCP server.
+ */
+export declare const NX_PLUGIN_MCP_PACKAGE_NAME = "@aws/nx-plugin-mcp";
 /**
  * Arguments used to launch the Nx Plugin for AWS MCP server.
+ *
+ * npx prefers a locally installed package over the registry, and generators
+ * declare this package as a workspace devDependency, so the server tracks the
+ * version in the workspace's lockfile. `-y` falls back to fetching from the
+ * registry for a workspace where it isn't installed.
  */
 export declare const NX_PLUGIN_MCP_SERVER_ARGS: string[];
 /**

package/src/utils/mcp.js

@@ -1,42 +1,44 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.configureMcpServers = exports.NX_PLUGIN_MCP_SERVER_ARGS = exports.NX_PLUGIN_MCP_SERVER_COMMAND = exports.NX_PLUGIN_MCP_SERVER_NAME = void 0;
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const toml_1 = require("./toml");
+ */ import { readJson, writeJson } from "@nx/devkit";
+import { updateToml } from "./toml.js";
 /**
  * Name of the Nx Plugin for AWS MCP server, used as the key in each agent's config.
- */
-exports.NX_PLUGIN_MCP_SERVER_NAME = 'nx-plugin-for-aws';
+ */ export const NX_PLUGIN_MCP_SERVER_NAME = 'nx-plugin-for-aws';
 /**
  * Command used to launch the Nx Plugin for AWS MCP server.
- */
-exports.NX_PLUGIN_MCP_SERVER_COMMAND = 'npx';
+ */ export const NX_PLUGIN_MCP_SERVER_COMMAND = 'npx';
+/**
+ * Package providing the Nx Plugin for AWS MCP server.
+ */ export const NX_PLUGIN_MCP_PACKAGE_NAME = '@aws/nx-plugin-mcp';
 /**
  * Arguments used to launch the Nx Plugin for AWS MCP server.
- */
-exports.NX_PLUGIN_MCP_SERVER_ARGS = ['-y', '@aws/nx-plugin-mcp@next'];
+ *
+ * npx prefers a locally installed package over the registry, and generators
+ * declare this package as a workspace devDependency, so the server tracks the
+ * version in the workspace's lockfile. `-y` falls back to fetching from the
+ * registry for a workspace where it isn't installed.
+ */ export const NX_PLUGIN_MCP_SERVER_ARGS = [
+    '-y',
+    NX_PLUGIN_MCP_PACKAGE_NAME
+];
 /**
  * A single stdio MCP server entry, shared by agents that use the `mcpServers` config shape.
- */
-const stdioServerEntry = () => ({
-    command: exports.NX_PLUGIN_MCP_SERVER_COMMAND,
-    args: exports.NX_PLUGIN_MCP_SERVER_ARGS,
-});
+ */ const stdioServerEntry = ()=>({
+        command: NX_PLUGIN_MCP_SERVER_COMMAND,
+        args: NX_PLUGIN_MCP_SERVER_ARGS
+    });
 /**
  * Merge the Nx Plugin for AWS MCP server into a JSON config file under the given key,
  * preserving any other servers already configured. Creates the file if it does not exist.
- */
-const mergeJsonMcpConfig = (tree, filePath, key, entry) => {
-    const config = tree.exists(filePath) ? (0, devkit_1.readJson)(tree, filePath) : {};
+ */ const mergeJsonMcpConfig = (tree, filePath, key, entry)=>{
+    const config = tree.exists(filePath) ? readJson(tree, filePath) : {};
     config[key] = {
         ...config[key],
-        [exports.NX_PLUGIN_MCP_SERVER_NAME]: entry,
+        [NX_PLUGIN_MCP_SERVER_NAME]: entry
     };
-    (0, devkit_1.writeJson)(tree, filePath, config);
+    writeJson(tree, filePath, config);
 };
 /**
  * Configure the Nx Plugin for AWS MCP server across the project-level config locations
@@ -44,38 +46,37 @@ const mergeJsonMcpConfig = (tree, filePath, key, entry) => {
  * AWS projects with the Nx Plugin for AWS.
  *
  * Existing servers and unrelated config in each file are preserved.
- */
-const configureMcpServers = (tree) => {
+ */ export const configureMcpServers = (tree)=>{
     // Agents using the `mcpServers` config shape (Claude Code, Cursor, Kiro, Gemini CLI)
     const mcpServersFiles = [
-        '.mcp.json', // Claude Code
-        '.cursor/mcp.json', // Cursor
-        '.kiro/settings/mcp.json', // Kiro
-        '.gemini/settings.json', // Gemini CLI
+        '.mcp.json',
+        '.cursor/mcp.json',
+        '.kiro/settings/mcp.json',
+        '.gemini/settings.json'
     ];
-    for (const filePath of mcpServersFiles) {
+    for (const filePath of mcpServersFiles){
         mergeJsonMcpConfig(tree, filePath, 'mcpServers', stdioServerEntry());
     }
     // GitHub Copilot uses the `servers` key with an explicit `type`
     mergeJsonMcpConfig(tree, '.vscode/mcp.json', 'servers', {
         type: 'stdio',
-        ...stdioServerEntry(),
+        ...stdioServerEntry()
     });
     // OpenAI Codex CLI uses TOML under the `mcp_servers` table
     const codexConfig = '.codex/config.toml';
     if (!tree.exists(codexConfig)) {
         tree.write(codexConfig, '');
     }
-    (0, toml_1.updateToml)(tree, codexConfig, (prev) => ({
-        ...prev,
-        mcp_servers: {
-            ...prev.mcp_servers,
-            [exports.NX_PLUGIN_MCP_SERVER_NAME]: {
-                command: exports.NX_PLUGIN_MCP_SERVER_COMMAND,
-                args: exports.NX_PLUGIN_MCP_SERVER_ARGS,
-            },
-        },
-    }));
+    updateToml(tree, codexConfig, (prev)=>({
+            ...prev,
+            mcp_servers: {
+                ...prev.mcp_servers,
+                [NX_PLUGIN_MCP_SERVER_NAME]: {
+                    command: NX_PLUGIN_MCP_SERVER_COMMAND,
+                    args: NX_PLUGIN_MCP_SERVER_ARGS
+                }
+            }
+        }));
 };
-exports.configureMcpServers = configureMcpServers;
+
 //# sourceMappingURL=mcp.js.map

package/src/utils/mcp.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/mcp.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAA4D;AAC5D,iCAAoC;AAEpC;;GAEG;AACU,QAAA,yBAAyB,GAAG,mBAAmB,CAAC;AAE7D;;GAEG;AACU,QAAA,4BAA4B,GAAG,KAAK,CAAC;AAElD;;GAEG;AACU,QAAA,yBAAyB,GAAG,CAAC,IAAI,EAAE,yBAAyB,CAAC,CAAC;AAE3E;;GAEG;AACH,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,CAAC;IAC9B,OAAO,EAAE,oCAA4B;IACrC,IAAI,EAAE,iCAAyB;CAChC,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,kBAAkB,GAAG,CACzB,IAAU,EACV,QAAgB,EAChB,GAA6B,EAC7B,KAA8B,EAC9B,EAAE;IACF,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAQ,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACrE,MAAM,CAAC,GAAG,CAAC,GAAG;QACZ,GAAG,MAAM,CAAC,GAAG,CAAC;QACd,CAAC,iCAAyB,CAAC,EAAE,KAAK;KACnC,CAAC;IACF,IAAA,kBAAS,EAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AACpC,CAAC,CAAC;AAEF;;;;;;GAMG;AACI,MAAM,mBAAmB,GAAG,CAAC,IAAU,EAAE,EAAE;IAChD,qFAAqF;IACrF,MAAM,eAAe,GAAG;QACtB,WAAW,EAAE,cAAc;QAC3B,kBAAkB,EAAE,SAAS;QAC7B,yBAAyB,EAAE,OAAO;QAClC,uBAAuB,EAAE,aAAa;KACvC,CAAC;IACF,KAAK,MAAM,QAAQ,IAAI,eAAe,EAAE,CAAC;QACvC,kBAAkB,CAAC,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,gBAAgB,EAAE,CAAC,CAAC;IACvE,CAAC;IAED,gEAAgE;IAChE,kBAAkB,CAAC,IAAI,EAAE,kBAAkB,EAAE,SAAS,EAAE;QACtD,IAAI,EAAE,OAAO;QACb,GAAG,gBAAgB,EAAE;KACtB,CAAC,CAAC;IAEH,2DAA2D;IAC3D,MAAM,WAAW,GAAG,oBAAoB,CAAC;IACzC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;QAC9B,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAC9B,CAAC;IACD,IAAA,iBAAU,EAAC,IAAI,EAAE,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACvC,GAAG,IAAI;QACP,WAAW,EAAE;YACX,GAAI,IAAI,CAAC,WAAsB;YAC/B,CAAC,iCAAyB,CAAC,EAAE;gBAC3B,OAAO,EAAE,oCAA4B;gBACrC,IAAI,EAAE,iCAAyB;aAChC;SACF;KACF,CAAC,CAAC,CAAC;AACN,CAAC,CAAC;AAjCW,QAAA,mBAAmB,uBAiC9B"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/mcp.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { readJson, type Tree, writeJson } from '@nx/devkit';\nimport { updateToml } from './toml.js';\n\n/**\n * Name of the Nx Plugin for AWS MCP server, used as the key in each agent's config.\n */\nexport const NX_PLUGIN_MCP_SERVER_NAME = 'nx-plugin-for-aws';\n\n/**\n * Command used to launch the Nx Plugin for AWS MCP server.\n */\nexport const NX_PLUGIN_MCP_SERVER_COMMAND = 'npx';\n\n/**\n * Package providing the Nx Plugin for AWS MCP server.\n */\nexport const NX_PLUGIN_MCP_PACKAGE_NAME = '@aws/nx-plugin-mcp';\n\n/**\n * Arguments used to launch the Nx Plugin for AWS MCP server.\n *\n * npx prefers a locally installed package over the registry, and generators\n * declare this package as a workspace devDependency, so the server tracks the\n * version in the workspace's lockfile. `-y` falls back to fetching from the\n * registry for a workspace where it isn't installed.\n */\nexport const NX_PLUGIN_MCP_SERVER_ARGS = ['-y', NX_PLUGIN_MCP_PACKAGE_NAME];\n\n/**\n * A single stdio MCP server entry, shared by agents that use the `mcpServers` config shape.\n */\nconst stdioServerEntry = () => ({\n  command: NX_PLUGIN_MCP_SERVER_COMMAND,\n  args: NX_PLUGIN_MCP_SERVER_ARGS,\n});\n\n/**\n * Merge the Nx Plugin for AWS MCP server into a JSON config file under the given key,\n * preserving any other servers already configured. Creates the file if it does not exist.\n */\nconst mergeJsonMcpConfig = (\n  tree: Tree,\n  filePath: string,\n  key: 'mcpServers' | 'servers',\n  entry: Record<string, unknown>,\n) => {\n  const config = tree.exists(filePath) ? readJson(tree, filePath) : {};\n  config[key] = {\n    ...config[key],\n    [NX_PLUGIN_MCP_SERVER_NAME]: entry,\n  };\n  writeJson(tree, filePath, config);\n};\n\n/**\n * Configure the Nx Plugin for AWS MCP server across the project-level config locations\n * used by common coding agents, so agents working in the workspace can use it to scaffold\n * AWS projects with the Nx Plugin for AWS.\n *\n * Existing servers and unrelated config in each file are preserved.\n */\nexport const configureMcpServers = (tree: Tree) => {\n  // Agents using the `mcpServers` config shape (Claude Code, Cursor, Kiro, Gemini CLI)\n  const mcpServersFiles = [\n    '.mcp.json', // Claude Code\n    '.cursor/mcp.json', // Cursor\n    '.kiro/settings/mcp.json', // Kiro\n    '.gemini/settings.json', // Gemini CLI\n  ];\n  for (const filePath of mcpServersFiles) {\n    mergeJsonMcpConfig(tree, filePath, 'mcpServers', stdioServerEntry());\n  }\n\n  // GitHub Copilot uses the `servers` key with an explicit `type`\n  mergeJsonMcpConfig(tree, '.vscode/mcp.json', 'servers', {\n    type: 'stdio',\n    ...stdioServerEntry(),\n  });\n\n  // OpenAI Codex CLI uses TOML under the `mcp_servers` table\n  const codexConfig = '.codex/config.toml';\n  if (!tree.exists(codexConfig)) {\n    tree.write(codexConfig, '');\n  }\n  updateToml(tree, codexConfig, (prev) => ({\n    ...prev,\n    mcp_servers: {\n      ...(prev.mcp_servers as object),\n      [NX_PLUGIN_MCP_SERVER_NAME]: {\n        command: NX_PLUGIN_MCP_SERVER_COMMAND,\n        args: NX_PLUGIN_MCP_SERVER_ARGS,\n      },\n    },\n  }));\n};\n"],"names":["readJson","writeJson","updateToml","NX_PLUGIN_MCP_SERVER_NAME","NX_PLUGIN_MCP_SERVER_COMMAND","NX_PLUGIN_MCP_PACKAGE_NAME","NX_PLUGIN_MCP_SERVER_ARGS","stdioServerEntry","command","args","mergeJsonMcpConfig","tree","filePath","key","entry","config","exists","configureMcpServers","mcpServersFiles","type","codexConfig","write","prev","mcp_servers"],"mappings":"AAAA;;;CAGC,GACD,SAASA,QAAQ,EAAaC,SAAS,QAAQ,aAAa;AAC5D,SAASC,UAAU,QAAQ,YAAY;AAEvC;;CAEC,GACD,OAAO,MAAMC,4BAA4B,oBAAoB;AAE7D;;CAEC,GACD,OAAO,MAAMC,+BAA+B,MAAM;AAElD;;CAEC,GACD,OAAO,MAAMC,6BAA6B,qBAAqB;AAE/D;;;;;;;CAOC,GACD,OAAO,MAAMC,4BAA4B;IAAC;IAAMD;CAA2B,CAAC;AAE5E;;CAEC,GACD,MAAME,mBAAmB,IAAO,CAAA;QAC9BC,SAASJ;QACTK,MAAMH;IACR,CAAA;AAEA;;;CAGC,GACD,MAAMI,qBAAqB,CACzBC,MACAC,UACAC,KACAC;IAEA,MAAMC,SAASJ,KAAKK,MAAM,CAACJ,YAAYZ,SAASW,MAAMC,YAAY,CAAC;IACnEG,MAAM,CAACF,IAAI,GAAG;QACZ,GAAGE,MAAM,CAACF,IAAI;QACd,CAACV,0BAA0B,EAAEW;IAC/B;IACAb,UAAUU,MAAMC,UAAUG;AAC5B;AAEA;;;;;;CAMC,GACD,OAAO,MAAME,sBAAsB,CAACN;IAClC,qFAAqF;IACrF,MAAMO,kBAAkB;QACtB;QACA;QACA;QACA;KACD;IACD,KAAK,MAAMN,YAAYM,gBAAiB;QACtCR,mBAAmBC,MAAMC,UAAU,cAAcL;IACnD;IAEA,gEAAgE;IAChEG,mBAAmBC,MAAM,oBAAoB,WAAW;QACtDQ,MAAM;QACN,GAAGZ,kBAAkB;IACvB;IAEA,2DAA2D;IAC3D,MAAMa,cAAc;IACpB,IAAI,CAACT,KAAKK,MAAM,CAACI,cAAc;QAC7BT,KAAKU,KAAK,CAACD,aAAa;IAC1B;IACAlB,WAAWS,MAAMS,aAAa,CAACE,OAAU,CAAA;YACvC,GAAGA,IAAI;YACPC,aAAa;gBACX,GAAID,KAAKC,WAAW;gBACpB,CAACpB,0BAA0B,EAAE;oBAC3BK,SAASJ;oBACTK,MAAMH;gBACR;YACF;QACF,CAAA;AACF,EAAE"}

package/src/utils/metrics.d.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { type Tree } from '@nx/devkit';
-import { type NxGeneratorInfo } from './nx';
+import { type NxGeneratorInfo } from './nx.js';
 export declare const METRIC_ID = "uksb-4wk0bqpg5s";
 export declare const METRICS_ASPECT_FILE_PATH: string;
 export declare const TERRAFORM_METRICS_FILE_PATH: string;

package/src/utils/metrics.js

@@ -1,29 +1,25 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addGeneratorMetricsIfApplicable = exports.TERRAFORM_METRICS_FILE_PATH = exports.METRICS_ASPECT_FILE_PATH = exports.METRIC_ID = void 0;
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const ast_1 = require("./ast");
-const format_1 = require("./format");
-const nx_1 = require("./nx");
-const shared_constructs_constants_1 = require("./shared-constructs-constants");
+ */ import { joinPathFragments } from "@nx/devkit";
+import { appendToArrayViaGritQL, applyGritQL, captureAllGritQL } from "./ast.js";
+import { formatFilesInSubtree } from "./format.js";
+import { getPackageVersion } from "./nx.js";
+import { PACKAGES_DIR, SHARED_CONSTRUCTS_DIR, SHARED_TERRAFORM_DIR } from "./shared-constructs-constants.js";
 // Used to identify @aws/nx-plugin in AWS metrics
-exports.METRIC_ID = 'uksb-4wk0bqpg5s';
+export const METRIC_ID = 'uksb-4wk0bqpg5s';
 // File in which the MetricsAspect may exist (CDK)
-exports.METRICS_ASPECT_FILE_PATH = (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'core', 'app.ts');
+export const METRICS_ASPECT_FILE_PATH = joinPathFragments(PACKAGES_DIR, SHARED_CONSTRUCTS_DIR, 'src', 'core', 'app.ts');
 // File in which the Terraform metrics CloudFormation stack may exist
-exports.TERRAFORM_METRICS_FILE_PATH = (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_TERRAFORM_DIR, 'src', 'metrics', 'metrics.tf');
+export const TERRAFORM_METRICS_FILE_PATH = joinPathFragments(PACKAGES_DIR, SHARED_TERRAFORM_DIR, 'src', 'metrics', 'metrics.tf');
 // GritQL `within` clause to scope matches to the MetricsAspect class body
 const WITHIN_METRICS_ASPECT = '$old <: within `class MetricsAspect implements $_ { $_ }`';
 // Strip the surrounding quotes from a captured string literal (eg 'g1' or "g1")
-const unquote = (literal) => literal.slice(1, -1);
+const unquote = (literal)=>literal.slice(1, -1);
 // Extracts the existing metric tags from the CDK MetricsAspect tags array
-const readCdkMetricTags = async (tree) => (await (0, ast_1.captureAllGritQL)(tree, exports.METRICS_ASPECT_FILE_PATH, `\`$tag\` where { $tag <: string(), $tag <: within \`const tags: string[] = $_\` }`)).map(unquote);
+const readCdkMetricTags = async (tree)=>(await captureAllGritQL(tree, METRICS_ASPECT_FILE_PATH, `\`$tag\` where { $tag <: string(), $tag <: within \`const tags: string[] = $_\` }`)).map(unquote);
 // Extracts the existing metric tags from the Terraform metric_tags array
-const readTerraformMetricTags = async (tree) => (await (0, ast_1.captureAllGritQL)(tree, exports.TERRAFORM_METRICS_FILE_PATH, '`"$tag"` where { $tag <: within `metric_tags = $_` }')).map(unquote);
+const readTerraformMetricTags = async (tree)=>(await captureAllGritQL(tree, TERRAFORM_METRICS_FILE_PATH, '`"$tag"` where { $tag <: within `metric_tags = $_` }')).map(unquote);
 /**
  * Instruments metrics by updating the MetricsAspect in common/constructs/src/core/app.ts if the file exists,
  * and/or updating the Terraform metrics CloudFormation stack if it exists.
@@ -33,10 +29,9 @@ const readTerraformMetricTags = async (tree) => (await (0, ast_1.captureAllGritQ
  * deterministic regardless of the order in which metrics files are created
  * across a multi-generator run, so re-running the same set of generators does
  * not grow the tags.
- */
-const addGeneratorMetricsIfApplicable = async (tree, generatorInfo) => {
-    const cdkExists = tree.exists(exports.METRICS_ASPECT_FILE_PATH);
-    const terraformExists = tree.exists(exports.TERRAFORM_METRICS_FILE_PATH);
+ */ export const addGeneratorMetricsIfApplicable = async (tree, generatorInfo)=>{
+    const cdkExists = tree.exists(METRICS_ASPECT_FILE_PATH);
+    const terraformExists = tree.exists(TERRAFORM_METRICS_FILE_PATH);
     if (!cdkExists && !terraformExists) {
         return;
     }
@@ -44,10 +39,10 @@ const addGeneratorMetricsIfApplicable = async (tree, generatorInfo) => {
     // regardless of when each metrics file was created.
     const tags = [
         ...new Set([
-            ...(await readCdkMetricTags(tree)),
-            ...(await readTerraformMetricTags(tree)),
-            ...generatorInfo.map((info) => info.metric),
-        ]),
+            ...await readCdkMetricTags(tree),
+            ...await readTerraformMetricTags(tree),
+            ...generatorInfo.map((info)=>info.metric)
+        ])
     ];
     if (cdkExists) {
         await updateCdkMetrics(tree, tags);
@@ -56,40 +51,30 @@ const addGeneratorMetricsIfApplicable = async (tree, generatorInfo) => {
         await updateTerraformMetrics(tree, tags);
     }
 };
-exports.addGeneratorMetricsIfApplicable = addGeneratorMetricsIfApplicable;
 /**
  * Updates the CDK MetricsAspect with the metric id, version and tags
- */
-const updateCdkMetrics = async (tree, tags) => {
+ */ const updateCdkMetrics = async (tree, tags)=>{
     // Update the id
-    await (0, ast_1.applyGritQL)(tree, exports.METRICS_ASPECT_FILE_PATH, `\`const id = $old\` => \`const id = '${exports.METRIC_ID}'\`` +
-        ` where { ${WITHIN_METRICS_ASPECT} }`);
+    await applyGritQL(tree, METRICS_ASPECT_FILE_PATH, `\`const id = $old\` => \`const id = '${METRIC_ID}'\`` + ` where { ${WITHIN_METRICS_ASPECT} }`);
     // Update the version
-    await (0, ast_1.applyGritQL)(tree, exports.METRICS_ASPECT_FILE_PATH, `\`const version = $old\` => \`const version = '${(0, nx_1.getPackageVersion)()}'\`` +
-        ` where { ${WITHIN_METRICS_ASPECT} }`);
+    await applyGritQL(tree, METRICS_ASPECT_FILE_PATH, `\`const version = $old\` => \`const version = '${getPackageVersion()}'\`` + ` where { ${WITHIN_METRICS_ASPECT} }`);
     // Add each tag, leaving existing tags in place to keep re-runs stable
-    for (const tag of tags) {
-        await (0, ast_1.applyGritQL)(tree, exports.METRICS_ASPECT_FILE_PATH, `\`const tags: string[] = $old\`` +
-            ` where { ${WITHIN_METRICS_ASPECT},` +
-            ` if ($old <: \`[]\`) { $old => \`['${tag}']\` }` +
-            ` else { $old <: \`[$items]\` where { $items += \`, '${tag}'\` } },` +
-            ` $old <: not contains \`'${tag}'\` }`);
+    for (const tag of tags){
+        await applyGritQL(tree, METRICS_ASPECT_FILE_PATH, `\`const tags: string[] = $old\`` + ` where { ${WITHIN_METRICS_ASPECT},` + ` if ($old <: \`[]\`) { $old => \`['${tag}']\` }` + ` else { $old <: \`[$items]\` where { $items += \`, '${tag}'\` } },` + ` $old <: not contains \`'${tag}'\` }`);
     }
-    await (0, format_1.formatFilesInSubtree)(tree, exports.METRICS_ASPECT_FILE_PATH);
+    await formatFilesInSubtree(tree, METRICS_ASPECT_FILE_PATH);
 };
 /**
  * Updates the Terraform metrics CloudFormation stack with the metric id, version and tags
- */
-const updateTerraformMetrics = async (tree, tags) => {
+ */ const updateTerraformMetrics = async (tree, tags)=>{
     // Update metric_id
-    await (0, ast_1.applyGritQL)(tree, exports.TERRAFORM_METRICS_FILE_PATH, `\`metric_id = $old\` => \`metric_id = "${exports.METRIC_ID}"\``);
+    await applyGritQL(tree, TERRAFORM_METRICS_FILE_PATH, `\`metric_id = $old\` => \`metric_id = "${METRIC_ID}"\``);
     // Update metric_version
-    await (0, ast_1.applyGritQL)(tree, exports.TERRAFORM_METRICS_FILE_PATH, `\`metric_version = $old\` => \`metric_version = "${(0, nx_1.getPackageVersion)()}"\``);
+    await applyGritQL(tree, TERRAFORM_METRICS_FILE_PATH, `\`metric_version = $old\` => \`metric_version = "${getPackageVersion()}"\``);
     // Add each tag, leaving existing tags in place to keep re-runs stable
-    for (const tag of tags) {
-        await (0, ast_1.applyGritQL)(tree, exports.TERRAFORM_METRICS_FILE_PATH, `or { \`metric_tags = []\` => \`metric_tags = ["${tag}"]\`,` +
-            ` \`metric_tags = [$items]\` where { $items += \`, "${tag}"\` }` +
-            ` where { $items <: not contains \`"${tag}"\` } }`);
+    for (const tag of tags){
+        await appendToArrayViaGritQL(tree, TERRAFORM_METRICS_FILE_PATH, 'metric_tags =', `"${tag}"`);
     }
 };
+
 //# sourceMappingURL=metrics.js.map

package/src/utils/metrics.js.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/metrics.ts"],"names":[],"mappings":"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"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/metrics.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { joinPathFragments, type Tree } from '@nx/devkit';\nimport {\n  appendToArrayViaGritQL,\n  applyGritQL,\n  captureAllGritQL,\n} from './ast.js';\nimport { formatFilesInSubtree } from './format.js';\nimport { getPackageVersion, type NxGeneratorInfo } from './nx.js';\nimport {\n  PACKAGES_DIR,\n  SHARED_CONSTRUCTS_DIR,\n  SHARED_TERRAFORM_DIR,\n} from './shared-constructs-constants.js';\n\n// Used to identify @aws/nx-plugin in AWS metrics\nexport const METRIC_ID = 'uksb-4wk0bqpg5s';\n\n// File in which the MetricsAspect may exist (CDK)\nexport const METRICS_ASPECT_FILE_PATH = joinPathFragments(\n  PACKAGES_DIR,\n  SHARED_CONSTRUCTS_DIR,\n  'src',\n  'core',\n  'app.ts',\n);\n\n// File in which the Terraform metrics CloudFormation stack may exist\nexport const TERRAFORM_METRICS_FILE_PATH = joinPathFragments(\n  PACKAGES_DIR,\n  SHARED_TERRAFORM_DIR,\n  'src',\n  'metrics',\n  'metrics.tf',\n);\n\n// GritQL `within` clause to scope matches to the MetricsAspect class body\nconst WITHIN_METRICS_ASPECT =\n  '$old <: within `class MetricsAspect implements $_ { $_ }`';\n\n// Strip the surrounding quotes from a captured string literal (eg 'g1' or \"g1\")\nconst unquote = (literal: string): string => literal.slice(1, -1);\n\n// Extracts the existing metric tags from the CDK MetricsAspect tags array\nconst readCdkMetricTags = async (tree: Tree): Promise<string[]> =>\n  (\n    await captureAllGritQL(\n      tree,\n      METRICS_ASPECT_FILE_PATH,\n      `\\`$tag\\` where { $tag <: string(), $tag <: within \\`const tags: string[] = $_\\` }`,\n    )\n  ).map(unquote);\n\n// Extracts the existing metric tags from the Terraform metric_tags array\nconst readTerraformMetricTags = async (tree: Tree): Promise<string[]> =>\n  (\n    await captureAllGritQL(\n      tree,\n      TERRAFORM_METRICS_FILE_PATH,\n      '`\"$tag\"` where { $tag <: within `metric_tags = $_` }',\n    )\n  ).map(unquote);\n\n/**\n * Instruments metrics by updating the MetricsAspect in common/constructs/src/core/app.ts if the file exists,\n * and/or updating the Terraform metrics CloudFormation stack if it exists.\n *\n * Both files are converged to the same tag set (the union of tags already\n * present in either file plus the incoming generators). This keeps the tag set\n * deterministic regardless of the order in which metrics files are created\n * across a multi-generator run, so re-running the same set of generators does\n * not grow the tags.\n */\nexport const addGeneratorMetricsIfApplicable = async (\n  tree: Tree,\n  generatorInfo: NxGeneratorInfo[],\n) => {\n  const cdkExists = tree.exists(METRICS_ASPECT_FILE_PATH);\n  const terraformExists = tree.exists(TERRAFORM_METRICS_FILE_PATH);\n\n  if (!cdkExists && !terraformExists) {\n    return;\n  }\n\n  // Converge both files to the union of all known tags so the set is stable\n  // regardless of when each metrics file was created.\n  const tags = [\n    ...new Set([\n      ...(await readCdkMetricTags(tree)),\n      ...(await readTerraformMetricTags(tree)),\n      ...generatorInfo.map((info) => info.metric),\n    ]),\n  ];\n\n  if (cdkExists) {\n    await updateCdkMetrics(tree, tags);\n  }\n\n  if (terraformExists) {\n    await updateTerraformMetrics(tree, tags);\n  }\n};\n\n/**\n * Updates the CDK MetricsAspect with the metric id, version and tags\n */\nconst updateCdkMetrics = async (tree: Tree, tags: string[]) => {\n  // Update the id\n  await applyGritQL(\n    tree,\n    METRICS_ASPECT_FILE_PATH,\n    `\\`const id = $old\\` => \\`const id = '${METRIC_ID}'\\`` +\n      ` where { ${WITHIN_METRICS_ASPECT} }`,\n  );\n\n  // Update the version\n  await applyGritQL(\n    tree,\n    METRICS_ASPECT_FILE_PATH,\n    `\\`const version = $old\\` => \\`const version = '${getPackageVersion()}'\\`` +\n      ` where { ${WITHIN_METRICS_ASPECT} }`,\n  );\n\n  // Add each tag, leaving existing tags in place to keep re-runs stable\n  for (const tag of tags) {\n    await applyGritQL(\n      tree,\n      METRICS_ASPECT_FILE_PATH,\n      `\\`const tags: string[] = $old\\`` +\n        ` where { ${WITHIN_METRICS_ASPECT},` +\n        ` if ($old <: \\`[]\\`) { $old => \\`['${tag}']\\` }` +\n        ` else { $old <: \\`[$items]\\` where { $items += \\`, '${tag}'\\` } },` +\n        ` $old <: not contains \\`'${tag}'\\` }`,\n    );\n  }\n\n  await formatFilesInSubtree(tree, METRICS_ASPECT_FILE_PATH);\n};\n\n/**\n * Updates the Terraform metrics CloudFormation stack with the metric id, version and tags\n */\nconst updateTerraformMetrics = async (tree: Tree, tags: string[]) => {\n  // Update metric_id\n  await applyGritQL(\n    tree,\n    TERRAFORM_METRICS_FILE_PATH,\n    `\\`metric_id = $old\\` => \\`metric_id = \"${METRIC_ID}\"\\``,\n  );\n\n  // Update metric_version\n  await applyGritQL(\n    tree,\n    TERRAFORM_METRICS_FILE_PATH,\n    `\\`metric_version = $old\\` => \\`metric_version = \"${getPackageVersion()}\"\\``,\n  );\n\n  // Add each tag, leaving existing tags in place to keep re-runs stable\n  for (const tag of tags) {\n    await appendToArrayViaGritQL(\n      tree,\n      TERRAFORM_METRICS_FILE_PATH,\n      'metric_tags =',\n      `\"${tag}\"`,\n    );\n  }\n};\n"],"names":["joinPathFragments","appendToArrayViaGritQL","applyGritQL","captureAllGritQL","formatFilesInSubtree","getPackageVersion","PACKAGES_DIR","SHARED_CONSTRUCTS_DIR","SHARED_TERRAFORM_DIR","METRIC_ID","METRICS_ASPECT_FILE_PATH","TERRAFORM_METRICS_FILE_PATH","WITHIN_METRICS_ASPECT","unquote","literal","slice","readCdkMetricTags","tree","map","readTerraformMetricTags","addGeneratorMetricsIfApplicable","generatorInfo","cdkExists","exists","terraformExists","tags","Set","info","metric","updateCdkMetrics","updateTerraformMetrics","tag"],"mappings":"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"}

package/src/utils/migration-manifest.d.ts

@@ -0,0 +1,58 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { MigrationsJson } from './migration-versions.js';
+/**
+ * `migrations.json` is assembled from the plugin's source rather than committed,
+ * so two PRs each adding a migration touch disjoint files and never conflict on
+ * a shared manifest.
+ *
+ * The pieces it is assembled from:
+ * - one folder per migration under `src/migrations/<dir>/<name>/`, where `<dir>`
+ *   is `latest` until a release claims it and `v<version>` after — the folder
+ *   carries a `metadata.json` (its description) beside the code, and its files
+ *   discriminate the kind: a `migration.ts` makes it deterministic, a `prompt.md`
+ *   agentic, both hybrid;
+ * - `packageJsonUpdates.json`, the nx bumps the weekly update maintains, kept in
+ *   its own file so that churn never shares an edit with a migration PR;
+ * - the version sync entry, a fixed `everyMigration` codemod that runs on every
+ *   upgrade and so has no folder.
+ *
+ * The assembled manifest is unversioned — release-time stamping resolves versions
+ * (see `migration-versions.ts`).
+ */
+/** JSON schema the manifest declares, matching what nx expects. */
+export declare const MIGRATIONS_JSON_SCHEMA = "http://json-schema.org/schema";
+/** Key the version sync migration is registered under. */
+export declare const SYNC_VENDED_MIGRATION_KEY = "sync-vended-versions";
+/**
+ * The version sync migration entry. Committed as code rather than a folder: it
+ * carries no release-specific registration and must run on every upgrade, so it
+ * is fixed and can't conflict.
+ */
+export declare const syncVendedMigrationEntry: () => NonNullable<MigrationsJson["generators"]>[string];
+/** A migration folder discovered under `src/migrations`. */
+export interface DiscoveredMigration {
+    /** Folder grouping the migration by release: `latest` or `v<version>`. */
+    dir: string;
+    /** Migration folder name. */
+    name: string;
+    /** Description read from the folder's `metadata.json`. */
+    description: string;
+    /** A `migration.ts` is present, so the migration has a codemod. */
+    hasImplementation: boolean;
+    /** A `prompt.md` is present, so the migration hands off to an agent. */
+    hasPrompt: boolean;
+}
+/**
+ * Assemble the plugin's `migrations.json` from its source pieces: the discovered
+ * migration folders, the version sync entry, and the nx `packageJsonUpdates`.
+ *
+ * Deterministic — keys are sorted — so regenerating always yields the same file.
+ *
+ * @param pluginName the plugin package name the manifest is for
+ * @param migrations migration folders discovered under `src/migrations`
+ * @param packageJsonUpdates parsed `packageJsonUpdates.json`, if present
+ */
+export declare const assembleMigrations: (pluginName: string, migrations: DiscoveredMigration[], packageJsonUpdates?: MigrationsJson["packageJsonUpdates"]) => MigrationsJson;

package/src/utils/migration-manifest.js

@@ -0,0 +1,76 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { isValidVersion, LATEST_MIGRATIONS_DIR, migrationKey } from "./migration-versions.js";
+import { sortObjectKeys } from "./object.js";
+/**
+ * `migrations.json` is assembled from the plugin's source rather than committed,
+ * so two PRs each adding a migration touch disjoint files and never conflict on
+ * a shared manifest.
+ *
+ * The pieces it is assembled from:
+ * - one folder per migration under `src/migrations/<dir>/<name>/`, where `<dir>`
+ *   is `latest` until a release claims it and `v<version>` after — the folder
+ *   carries a `metadata.json` (its description) beside the code, and its files
+ *   discriminate the kind: a `migration.ts` makes it deterministic, a `prompt.md`
+ *   agentic, both hybrid;
+ * - `packageJsonUpdates.json`, the nx bumps the weekly update maintains, kept in
+ *   its own file so that churn never shares an edit with a migration PR;
+ * - the version sync entry, a fixed `everyMigration` codemod that runs on every
+ *   upgrade and so has no folder.
+ *
+ * The assembled manifest is unversioned — release-time stamping resolves versions
+ * (see `migration-versions.ts`).
+ */ /** JSON schema the manifest declares, matching what nx expects. */ export const MIGRATIONS_JSON_SCHEMA = 'http://json-schema.org/schema';
+/** Key the version sync migration is registered under. */ export const SYNC_VENDED_MIGRATION_KEY = 'sync-vended-versions';
+/**
+ * The version sync migration entry. Committed as code rather than a folder: it
+ * carries no release-specific registration and must run on every upgrade, so it
+ * is fixed and can't conflict.
+ */ export const syncVendedMigrationEntry = ()=>({
+        description: 'Sync vended dependency versions and the tracked plugin version to those vended by this release',
+        implementation: './src/utils/version-upgrade-migration/migration',
+        everyMigration: true
+    });
+/** Registration for a single discovered migration folder. */ const migrationEntry = (migration)=>{
+    const path = `./src/migrations/${migration.dir}/${migration.name}`;
+    return {
+        // A migration in a `v<version>` folder has already been claimed by that
+        // release; its version is the folder. One in `latest` is left for stamping.
+        ...migration.dir !== LATEST_MIGRATIONS_DIR && isValidVersion(migration.dir.replace(/^v/, '')) ? {
+            version: migration.dir.replace(/^v/, '')
+        } : {},
+        description: migration.description,
+        ...migration.hasImplementation ? {
+            implementation: `${path}/migration`
+        } : {},
+        ...migration.hasPrompt ? {
+            prompt: `${path}/prompt.md`
+        } : {}
+    };
+};
+/**
+ * Assemble the plugin's `migrations.json` from its source pieces: the discovered
+ * migration folders, the version sync entry, and the nx `packageJsonUpdates`.
+ *
+ * Deterministic — keys are sorted — so regenerating always yields the same file.
+ *
+ * @param pluginName the plugin package name the manifest is for
+ * @param migrations migration folders discovered under `src/migrations`
+ * @param packageJsonUpdates parsed `packageJsonUpdates.json`, if present
+ */ export const assembleMigrations = (pluginName, migrations, packageJsonUpdates)=>({
+        $schema: MIGRATIONS_JSON_SCHEMA,
+        name: pluginName,
+        generators: sortObjectKeys({
+            [SYNC_VENDED_MIGRATION_KEY]: syncVendedMigrationEntry(),
+            ...Object.fromEntries(migrations.map((migration)=>[
+                    migrationKey(migration.dir, migration.name),
+                    migrationEntry(migration)
+                ]))
+        }),
+        ...packageJsonUpdates && Object.keys(packageJsonUpdates).length > 0 ? {
+            packageJsonUpdates
+        } : {}
+    });
+
+//# sourceMappingURL=migration-manifest.js.map

package/src/utils/migration-manifest.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/migration-manifest.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport type { MigrationsJson } from './migration-versions.js';\nimport {\n  isValidVersion,\n  LATEST_MIGRATIONS_DIR,\n  migrationKey,\n} from './migration-versions.js';\nimport { sortObjectKeys } from './object.js';\n\n/**\n * `migrations.json` is assembled from the plugin's source rather than committed,\n * so two PRs each adding a migration touch disjoint files and never conflict on\n * a shared manifest.\n *\n * The pieces it is assembled from:\n * - one folder per migration under `src/migrations/<dir>/<name>/`, where `<dir>`\n *   is `latest` until a release claims it and `v<version>` after — the folder\n *   carries a `metadata.json` (its description) beside the code, and its files\n *   discriminate the kind: a `migration.ts` makes it deterministic, a `prompt.md`\n *   agentic, both hybrid;\n * - `packageJsonUpdates.json`, the nx bumps the weekly update maintains, kept in\n *   its own file so that churn never shares an edit with a migration PR;\n * - the version sync entry, a fixed `everyMigration` codemod that runs on every\n *   upgrade and so has no folder.\n *\n * The assembled manifest is unversioned — release-time stamping resolves versions\n * (see `migration-versions.ts`).\n */\n\n/** JSON schema the manifest declares, matching what nx expects. */\nexport const MIGRATIONS_JSON_SCHEMA = 'http://json-schema.org/schema';\n\n/** Key the version sync migration is registered under. */\nexport const SYNC_VENDED_MIGRATION_KEY = 'sync-vended-versions';\n\n/**\n * The version sync migration entry. Committed as code rather than a folder: it\n * carries no release-specific registration and must run on every upgrade, so it\n * is fixed and can't conflict.\n */\nexport const syncVendedMigrationEntry = (): NonNullable<\n  MigrationsJson['generators']\n>[string] => ({\n  description:\n    'Sync vended dependency versions and the tracked plugin version to those vended by this release',\n  implementation: './src/utils/version-upgrade-migration/migration',\n  everyMigration: true,\n});\n\n/** A migration folder discovered under `src/migrations`. */\nexport interface DiscoveredMigration {\n  /** Folder grouping the migration by release: `latest` or `v<version>`. */\n  dir: string;\n  /** Migration folder name. */\n  name: string;\n  /** Description read from the folder's `metadata.json`. */\n  description: string;\n  /** A `migration.ts` is present, so the migration has a codemod. */\n  hasImplementation: boolean;\n  /** A `prompt.md` is present, so the migration hands off to an agent. */\n  hasPrompt: boolean;\n}\n\n/** Registration for a single discovered migration folder. */\nconst migrationEntry = (\n  migration: DiscoveredMigration,\n): NonNullable<MigrationsJson['generators']>[string] => {\n  const path = `./src/migrations/${migration.dir}/${migration.name}`;\n  return {\n    // A migration in a `v<version>` folder has already been claimed by that\n    // release; its version is the folder. One in `latest` is left for stamping.\n    ...(migration.dir !== LATEST_MIGRATIONS_DIR &&\n    isValidVersion(migration.dir.replace(/^v/, ''))\n      ? { version: migration.dir.replace(/^v/, '') }\n      : {}),\n    description: migration.description,\n    ...(migration.hasImplementation\n      ? { implementation: `${path}/migration` }\n      : {}),\n    ...(migration.hasPrompt ? { prompt: `${path}/prompt.md` } : {}),\n  };\n};\n\n/**\n * Assemble the plugin's `migrations.json` from its source pieces: the discovered\n * migration folders, the version sync entry, and the nx `packageJsonUpdates`.\n *\n * Deterministic — keys are sorted — so regenerating always yields the same file.\n *\n * @param pluginName the plugin package name the manifest is for\n * @param migrations migration folders discovered under `src/migrations`\n * @param packageJsonUpdates parsed `packageJsonUpdates.json`, if present\n */\nexport const assembleMigrations = (\n  pluginName: string,\n  migrations: DiscoveredMigration[],\n  packageJsonUpdates?: MigrationsJson['packageJsonUpdates'],\n): MigrationsJson => ({\n  $schema: MIGRATIONS_JSON_SCHEMA,\n  name: pluginName,\n  generators: sortObjectKeys({\n    [SYNC_VENDED_MIGRATION_KEY]: syncVendedMigrationEntry(),\n    ...Object.fromEntries(\n      migrations.map((migration) => [\n        migrationKey(migration.dir, migration.name),\n        migrationEntry(migration),\n      ]),\n    ),\n  }),\n  ...(packageJsonUpdates && Object.keys(packageJsonUpdates).length > 0\n    ? { packageJsonUpdates }\n    : {}),\n});\n"],"names":["isValidVersion","LATEST_MIGRATIONS_DIR","migrationKey","sortObjectKeys","MIGRATIONS_JSON_SCHEMA","SYNC_VENDED_MIGRATION_KEY","syncVendedMigrationEntry","description","implementation","everyMigration","migrationEntry","migration","path","dir","name","replace","version","hasImplementation","hasPrompt","prompt","assembleMigrations","pluginName","migrations","packageJsonUpdates","$schema","generators","Object","fromEntries","map","keys","length"],"mappings":"AAAA;;;CAGC,GAED,SACEA,cAAc,EACdC,qBAAqB,EACrBC,YAAY,QACP,0BAA0B;AACjC,SAASC,cAAc,QAAQ,cAAc;AAE7C;;;;;;;;;;;;;;;;;;CAkBC,GAED,iEAAiE,GACjE,OAAO,MAAMC,yBAAyB,gCAAgC;AAEtE,wDAAwD,GACxD,OAAO,MAAMC,4BAA4B,uBAAuB;AAEhE;;;;CAIC,GACD,OAAO,MAAMC,2BAA2B,IAE1B,CAAA;QACZC,aACE;QACFC,gBAAgB;QAChBC,gBAAgB;IAClB,CAAA,EAAG;AAgBH,2DAA2D,GAC3D,MAAMC,iBAAiB,CACrBC;IAEA,MAAMC,OAAO,CAAC,iBAAiB,EAAED,UAAUE,GAAG,CAAC,CAAC,EAAEF,UAAUG,IAAI,EAAE;IAClE,OAAO;QACL,wEAAwE;QACxE,4EAA4E;QAC5E,GAAIH,UAAUE,GAAG,KAAKZ,yBACtBD,eAAeW,UAAUE,GAAG,CAACE,OAAO,CAAC,MAAM,OACvC;YAAEC,SAASL,UAAUE,GAAG,CAACE,OAAO,CAAC,MAAM;QAAI,IAC3C,CAAC,CAAC;QACNR,aAAaI,UAAUJ,WAAW;QAClC,GAAII,UAAUM,iBAAiB,GAC3B;YAAET,gBAAgB,GAAGI,KAAK,UAAU,CAAC;QAAC,IACtC,CAAC,CAAC;QACN,GAAID,UAAUO,SAAS,GAAG;YAAEC,QAAQ,GAAGP,KAAK,UAAU,CAAC;QAAC,IAAI,CAAC,CAAC;IAChE;AACF;AAEA;;;;;;;;;CASC,GACD,OAAO,MAAMQ,qBAAqB,CAChCC,YACAC,YACAC,qBACoB,CAAA;QACpBC,SAASpB;QACTU,MAAMO;QACNI,YAAYtB,eAAe;YACzB,CAACE,0BAA0B,EAAEC;YAC7B,GAAGoB,OAAOC,WAAW,CACnBL,WAAWM,GAAG,CAAC,CAACjB,YAAc;oBAC5BT,aAAaS,UAAUE,GAAG,EAAEF,UAAUG,IAAI;oBAC1CJ,eAAeC;iBAChB,EACF;QACH;QACA,GAAIY,sBAAsBG,OAAOG,IAAI,CAACN,oBAAoBO,MAAM,GAAG,IAC/D;YAAEP;QAAmB,IACrB,CAAC,CAAC;IACR,CAAA,EAAG"}