@aws/nx-plugin 1.0.0-rc.5 → 1.0.0-rc.51

package/src/utils/pnpm-workspace.d.ts

@@ -2,7 +2,7 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Tree } from '@nx/devkit';
+import type { Tree } from '@nx/devkit';
 /**
  * Merge `allowBuilds` (pnpm 11) / `onlyBuiltDependencies` (pnpm 10) entries
  * into the generated workspace's `pnpm-workspace.yaml`. No-op for non-pnpm
@@ -20,14 +20,3 @@ import { Tree } from '@nx/devkit';
  * allowlist has no equivalent of the `false` decision).
  */
 export declare const registerPnpmBuiltDependencies: (tree: Tree, entries: Record<string, boolean>) => void;
-/**
- * Set `ignoreWorkspaceRootCheck: true` in `pnpm-workspace.yaml` so `pnpm add`
- * from the workspace root does not error with `ERR_PNPM_ADDING_TO_ROOT`.
- *
- * pnpm 11 no longer honours `ignore-workspace-root-check=true` in `.npmrc`;
- * it must live in `pnpm-workspace.yaml` as the camelCased key. pnpm 10 also
- * accepts the yaml form, so writing it here works for both majors.
- *
- * No-op for non-pnpm workspaces or when `pnpm-workspace.yaml` is absent.
- */
-export declare const ensurePnpmIgnoresWorkspaceRootCheck: (tree: Tree) => boolean;

package/src/utils/pnpm-workspace.js

@@ -1,13 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensurePnpmIgnoresWorkspaceRootCheck = exports.registerPnpmBuiltDependencies = void 0;
-const tslib_1 = require("tslib");
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+ */ import yaml from "js-yaml";
+import { detectWorkspacePackageManager } from "./dependencies.js";
 const WORKSPACE_FILE = 'pnpm-workspace.yaml';
 /**
  * Merge `allowBuilds` (pnpm 11) / `onlyBuiltDependencies` (pnpm 10) entries
@@ -24,20 +19,21 @@ const WORKSPACE_FILE = 'pnpm-workspace.yaml';
  *
  * Only `true` entries are also added to `onlyBuiltDependencies` (pnpm 10's
  * allowlist has no equivalent of the `false` decision).
- */
-const registerPnpmBuiltDependencies = (tree, entries) => {
-    if ((0, devkit_1.detectPackageManager)(tree.root) !== 'pnpm') {
+ */ export const registerPnpmBuiltDependencies = (tree, entries)=>{
+    if (detectWorkspacePackageManager(tree) !== 'pnpm') {
         return;
     }
     if (!tree.exists(WORKSPACE_FILE)) {
         return;
     }
     const original = tree.read(WORKSPACE_FILE, 'utf-8') ?? '';
-    const parsed = js_yaml_1.default.load(original) ?? {};
-    const allowBuilds = { ...(parsed.allowBuilds ?? {}) };
+    const parsed = yaml.load(original) ?? {};
+    const allowBuilds = {
+        ...parsed.allowBuilds ?? {}
+    };
     const onlyBuiltDependencies = new Set(parsed.onlyBuiltDependencies ?? []);
     let changed = false;
-    for (const [pkg, decision] of Object.entries(entries)) {
+    for (const [pkg, decision] of Object.entries(entries)){
         if (allowBuilds[pkg] !== decision) {
             allowBuilds[pkg] = decision;
             changed = true;
@@ -51,35 +47,12 @@ const registerPnpmBuiltDependencies = (tree, entries) => {
         return;
     }
     parsed.allowBuilds = allowBuilds;
-    parsed.onlyBuiltDependencies = [...onlyBuiltDependencies];
-    tree.write(WORKSPACE_FILE, js_yaml_1.default.dump(parsed, { quotingType: "'" }));
+    parsed.onlyBuiltDependencies = [
+        ...onlyBuiltDependencies
+    ];
+    tree.write(WORKSPACE_FILE, yaml.dump(parsed, {
+        quotingType: "'"
+    }));
 };
-exports.registerPnpmBuiltDependencies = registerPnpmBuiltDependencies;
-/**
- * Set `ignoreWorkspaceRootCheck: true` in `pnpm-workspace.yaml` so `pnpm add`
- * from the workspace root does not error with `ERR_PNPM_ADDING_TO_ROOT`.
- *
- * pnpm 11 no longer honours `ignore-workspace-root-check=true` in `.npmrc`;
- * it must live in `pnpm-workspace.yaml` as the camelCased key. pnpm 10 also
- * accepts the yaml form, so writing it here works for both majors.
- *
- * No-op for non-pnpm workspaces or when `pnpm-workspace.yaml` is absent.
- */
-const ensurePnpmIgnoresWorkspaceRootCheck = (tree) => {
-    if ((0, devkit_1.detectPackageManager)(tree.root) !== 'pnpm') {
-        return false;
-    }
-    if (!tree.exists(WORKSPACE_FILE)) {
-        return false;
-    }
-    const original = tree.read(WORKSPACE_FILE, 'utf-8') ?? '';
-    const parsed = js_yaml_1.default.load(original) ?? {};
-    if (parsed.ignoreWorkspaceRootCheck === true) {
-        return false;
-    }
-    parsed.ignoreWorkspaceRootCheck = true;
-    tree.write(WORKSPACE_FILE, js_yaml_1.default.dump(parsed, { quotingType: "'" }));
-    return true;
-};
-exports.ensurePnpmIgnoresWorkspaceRootCheck = ensurePnpmIgnoresWorkspaceRootCheck;
+
 //# sourceMappingURL=pnpm-workspace.js.map

package/src/utils/pnpm-workspace.js.map

@@ -1 +1 @@
-{"version":3,"file":"pnpm-workspace.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/pnpm-workspace.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAAwD;AACxD,8DAA2B;AAE3B,MAAM,cAAc,GAAG,qBAAqB,CAAC;AAS7C;;;;;;;;;;;;;;;GAeG;AACI,MAAM,6BAA6B,GAAG,CAC3C,IAAU,EACV,OAAgC,EAC1B,EAAE;IACR,IAAI,IAAA,6BAAoB,EAAC,IAAI,CAAC,IAAI,CAAC,KAAK,MAAM,EAAE,CAAC;QAC/C,OAAO;IACT,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;QACjC,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;IAC1D,MAAM,MAAM,GAAI,iBAAI,CAAC,IAAI,CAAC,QAAQ,CAA8B,IAAI,EAAE,CAAC;IAEvE,MAAM,WAAW,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC,EAAE,CAAC;IACtD,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC;IAC1E,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,KAAK,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACtD,IAAI,WAAW,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE,CAAC;YAClC,WAAW,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;YAC5B,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;QACD,IAAI,QAAQ,KAAK,IAAI,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACzD,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC/B,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;IACH,CAAC;IAED,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO;IACT,CAAC;IAED,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,MAAM,CAAC,qBAAqB,GAAG,CAAC,GAAG,qBAAqB,CAAC,CAAC;IAE1D,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,iBAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC;AArCW,QAAA,6BAA6B,iCAqCxC;AAEF;;;;;;;;;GASG;AACI,MAAM,mCAAmC,GAAG,CAAC,IAAU,EAAW,EAAE;IACzE,IAAI,IAAA,6BAAoB,EAAC,IAAI,CAAC,IAAI,CAAC,KAAK,MAAM,EAAE,CAAC;QAC/C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;QACjC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;IAC1D,MAAM,MAAM,GAAI,iBAAI,CAAC,IAAI,CAAC,QAAQ,CAA8B,IAAI,EAAE,CAAC;IAEvE,IAAI,MAAM,CAAC,wBAAwB,KAAK,IAAI,EAAE,CAAC;QAC7C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,CAAC,wBAAwB,GAAG,IAAI,CAAC;IACvC,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,iBAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IACpE,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAlBW,QAAA,mCAAmC,uCAkB9C"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/pnpm-workspace.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport type { Tree } from '@nx/devkit';\nimport yaml from 'js-yaml';\nimport { detectWorkspacePackageManager } from './dependencies';\n\nconst WORKSPACE_FILE = 'pnpm-workspace.yaml';\n\ninterface PnpmWorkspaceYaml {\n  allowBuilds?: Record<string, boolean>;\n  onlyBuiltDependencies?: string[];\n  [key: string]: unknown;\n}\n\n/**\n * Merge `allowBuilds` (pnpm 11) / `onlyBuiltDependencies` (pnpm 10) entries\n * into the generated workspace's `pnpm-workspace.yaml`. No-op for non-pnpm\n * workspaces.\n *\n * Generators call this when they introduce a dependency whose install\n * script pnpm would otherwise reject under pnpm 11's default\n * `strictDepBuilds=true`. Keeping the allowlist explicit — rather than\n * globally disabling strictness — preserves the supply-chain audit pnpm 11\n * intends: each build-script dep is reviewed by the generator author and\n * entered as either `true` (run the script) or `false` (known dep we\n * don't want to run but have seen).\n *\n * Only `true` entries are also added to `onlyBuiltDependencies` (pnpm 10's\n * allowlist has no equivalent of the `false` decision).\n */\nexport const registerPnpmBuiltDependencies = (\n  tree: Tree,\n  entries: Record<string, boolean>,\n): void => {\n  if (detectWorkspacePackageManager(tree) !== 'pnpm') {\n    return;\n  }\n  if (!tree.exists(WORKSPACE_FILE)) {\n    return;\n  }\n\n  const original = tree.read(WORKSPACE_FILE, 'utf-8') ?? '';\n  const parsed = (yaml.load(original) as PnpmWorkspaceYaml | null) ?? {};\n\n  const allowBuilds = { ...(parsed.allowBuilds ?? {}) };\n  const onlyBuiltDependencies = new Set(parsed.onlyBuiltDependencies ?? []);\n  let changed = false;\n\n  for (const [pkg, decision] of Object.entries(entries)) {\n    if (allowBuilds[pkg] !== decision) {\n      allowBuilds[pkg] = decision;\n      changed = true;\n    }\n    if (decision === true && !onlyBuiltDependencies.has(pkg)) {\n      onlyBuiltDependencies.add(pkg);\n      changed = true;\n    }\n  }\n\n  if (!changed) {\n    return;\n  }\n\n  parsed.allowBuilds = allowBuilds;\n  parsed.onlyBuiltDependencies = [...onlyBuiltDependencies];\n\n  tree.write(WORKSPACE_FILE, yaml.dump(parsed, { quotingType: \"'\" }));\n};\n"],"names":["yaml","detectWorkspacePackageManager","WORKSPACE_FILE","registerPnpmBuiltDependencies","tree","entries","exists","original","read","parsed","load","allowBuilds","onlyBuiltDependencies","Set","changed","pkg","decision","Object","has","add","write","dump","quotingType"],"mappings":"AAAA;;;CAGC,GAED,OAAOA,UAAU,UAAU;AAC3B,SAASC,6BAA6B,QAAQ,oBAAiB;AAE/D,MAAMC,iBAAiB;AAQvB;;;;;;;;;;;;;;;CAeC,GACD,OAAO,MAAMC,gCAAgC,CAC3CC,MACAC;IAEA,IAAIJ,8BAA8BG,UAAU,QAAQ;QAClD;IACF;IACA,IAAI,CAACA,KAAKE,MAAM,CAACJ,iBAAiB;QAChC;IACF;IAEA,MAAMK,WAAWH,KAAKI,IAAI,CAACN,gBAAgB,YAAY;IACvD,MAAMO,SAAS,AAACT,KAAKU,IAAI,CAACH,aAA0C,CAAC;IAErE,MAAMI,cAAc;QAAE,GAAIF,OAAOE,WAAW,IAAI,CAAC,CAAC;IAAE;IACpD,MAAMC,wBAAwB,IAAIC,IAAIJ,OAAOG,qBAAqB,IAAI,EAAE;IACxE,IAAIE,UAAU;IAEd,KAAK,MAAM,CAACC,KAAKC,SAAS,IAAIC,OAAOZ,OAAO,CAACA,SAAU;QACrD,IAAIM,WAAW,CAACI,IAAI,KAAKC,UAAU;YACjCL,WAAW,CAACI,IAAI,GAAGC;YACnBF,UAAU;QACZ;QACA,IAAIE,aAAa,QAAQ,CAACJ,sBAAsBM,GAAG,CAACH,MAAM;YACxDH,sBAAsBO,GAAG,CAACJ;YAC1BD,UAAU;QACZ;IACF;IAEA,IAAI,CAACA,SAAS;QACZ;IACF;IAEAL,OAAOE,WAAW,GAAGA;IACrBF,OAAOG,qBAAqB,GAAG;WAAIA;KAAsB;IAEzDR,KAAKgB,KAAK,CAAClB,gBAAgBF,KAAKqB,IAAI,CAACZ,QAAQ;QAAEa,aAAa;IAAI;AAClE,EAAE"}

package/src/utils/port.d.ts

@@ -2,15 +2,37 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { ProjectConfiguration, Tree } from '@nx/devkit';
+import { type ProjectConfiguration, type Tree } from '@nx/devkit';
 /**
- * Assign a port shared across all projects created by the same generator.
- * If a sibling project already has a port assigned, reuse it; otherwise assign a fresh one.
- * Mutates the project to register the port in its metadata.ports.
+ * Options for assigning a port to a target within a project.
  */
-export declare const assignSharedPort: (tree: Tree, project: ProjectConfiguration, generatorId: string, startPort: number) => number;
+export interface AssignPortOptions {
+    /**
+     * Identifies the component the port is being assigned for. When provided, a
+     * port already assigned to this component is reused so re-runs are
+     * idempotent. Use this for projects which host a port per component.
+     */
+    component?: {
+        info: {
+            id: string;
+        };
+        name?: string;
+    };
+}
+/**
+ * Assign a port shared across all projects created by the same generator (or
+ * family of generators). If this project already has a port, or a sibling
+ * project created by any of the given generator IDs has one, reuse it;
+ * otherwise assign a fresh one. Mutates the project to register the port in
+ * its metadata.ports.
+ */
+export declare const assignSharedPort: (tree: Tree, project: ProjectConfiguration, generatorId: string | string[], startPort: number) => number;
 /**
  * Assign a port for a particular target within a project.
- * Mutates the project to add/update its metadata.ports with the newly assigned port
+ * Mutates the project to add/update its metadata.ports with the newly assigned port.
+ *
+ * Re-runs are idempotent: a port previously assigned to this project (or, when
+ * `options.component` is provided, to this component) is returned as-is without
+ * registering a duplicate.
  */
-export declare const assignPort: (tree: Tree, project: ProjectConfiguration, startPort: number) => number;
+export declare const assignPort: (tree: Tree, project: ProjectConfiguration, startPort: number, options?: AssignPortOptions) => number;

package/src/utils/port.js

@@ -1,62 +1,101 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assignPort = exports.assignSharedPort = void 0;
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
+ */ import { getProjects } from "@nx/devkit";
 /**
- * Assign a port shared across all projects created by the same generator.
- * If a sibling project already has a port assigned, reuse it; otherwise assign a fresh one.
- * Mutates the project to register the port in its metadata.ports.
- */
-const assignSharedPort = (tree, project, generatorId, startPort) => {
-    const existingPort = [...(0, devkit_1.getProjects)(tree).values()].find((p) => p.metadata?.generator === generatorId)?.metadata;
-    if (existingPort?.ports?.[0] !== undefined) {
-        const port = existingPort.ports[0];
+ * Return the first port already registered in a project's own metadata, if any.
+ * Supports both the metadata.ports array and the legacy metadata.port.
+ */ const getExistingProjectPort = (project)=>{
+    const metadata = project.metadata;
+    if (Array.isArray(metadata?.ports) && typeof metadata.ports[0] === 'number') {
+        return metadata.ports[0];
+    }
+    if (typeof metadata?.port === 'number') {
+        return metadata.port;
+    }
+    return undefined;
+};
+/**
+ * Return the port previously assigned to a particular component within a
+ * project, if any. Projects which host multiple components (e.g. one agent or
+ * MCP server per component) record a port per component in metadata.components.
+ */ const getExistingComponentPort = (project, component)=>{
+    const components = project.metadata?.components ?? [];
+    const match = components.find((c)=>c.generator === component.info.id && c.name === component.name);
+    return typeof match?.port === 'number' ? match.port : undefined;
+};
+/**
+ * Assign a port shared across all projects created by the same generator (or
+ * family of generators). If this project already has a port, or a sibling
+ * project created by any of the given generator IDs has one, reuse it;
+ * otherwise assign a fresh one. Mutates the project to register the port in
+ * its metadata.ports.
+ */ export const assignSharedPort = (tree, project, generatorId, startPort)=>{
+    const generatorIds = Array.isArray(generatorId) ? generatorId : [
+        generatorId
+    ];
+    // Reuse this project's own port if it already has one (idempotent on re-run)
+    const ownPort = getExistingProjectPort(project);
+    if (ownPort !== undefined) {
+        return ownPort;
+    }
+    // Otherwise reuse a sibling project's shared port if one exists
+    const siblingPort = [
+        ...getProjects(tree).values()
+    ].filter((p)=>p.name !== project.name).map((p)=>({
+            generator: p.metadata?.generator,
+            port: getExistingProjectPort(p)
+        })).find((p)=>generatorIds.includes(p.generator) && p.port !== undefined)?.port;
+    if (siblingPort !== undefined) {
         project.metadata ??= {};
         project.metadata.ports = [
-            ...(project.metadata.ports ?? []),
-            port,
+            ...project.metadata.ports ?? [],
+            siblingPort
         ];
-        return port;
+        return siblingPort;
     }
-    return (0, exports.assignPort)(tree, project, startPort);
+    return assignPort(tree, project, startPort);
 };
-exports.assignSharedPort = assignSharedPort;
 /**
  * Assign a port for a particular target within a project.
- * Mutates the project to add/update its metadata.ports with the newly assigned port
- */
-const assignPort = (tree, project, startPort) => {
+ * Mutates the project to add/update its metadata.ports with the newly assigned port.
+ *
+ * Re-runs are idempotent: a port previously assigned to this project (or, when
+ * `options.component` is provided, to this component) is returned as-is without
+ * registering a duplicate.
+ */ export const assignPort = (tree, project, startPort, options)=>{
+    // Reuse a port already assigned to this project/component on re-run
+    const existingPort = options?.component ? getExistingComponentPort(project, options.component) : getExistingProjectPort(project);
+    if (existingPort !== undefined) {
+        return existingPort;
+    }
     // Find all existing ports
-    const allPorts = new Set([...(0, devkit_1.getProjects)(tree).values()].flatMap((p) => {
+    const allPorts = new Set([
+        ...getProjects(tree).values()
+    ].flatMap((p)=>{
         const metadata = p.metadata;
         const ports = [];
         // Support old port assignment where each project registered a single port
         if (metadata?.port && typeof metadata.port === 'number') {
             ports.push(metadata.port);
         }
-        if (metadata?.ports &&
-            typeof metadata.ports === 'object' &&
-            Array.isArray(metadata.ports)) {
+        if (metadata?.ports && typeof metadata.ports === 'object' && Array.isArray(metadata.ports)) {
             ports.push(...metadata.ports);
         }
         return ports;
     }));
     // Find the next available port higher than the start port
     let candidatePort = startPort;
-    while (allPorts.has(candidatePort)) {
+    while(allPorts.has(candidatePort)){
         candidatePort++;
     }
     project.metadata ??= {};
     project.metadata.ports ??= [];
     project.metadata.ports = [
         ...project.metadata.ports,
-        candidatePort,
+        candidatePort
     ];
     return candidatePort;
 };
-exports.assignPort = assignPort;
+
 //# sourceMappingURL=port.js.map

package/src/utils/port.js.map

@@ -1 +1 @@
-{"version":3,"file":"port.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/port.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAAqE;AAErE;;;;GAIG;AACI,MAAM,gBAAgB,GAAG,CAC9B,IAAU,EACV,OAA6B,EAC7B,WAAmB,EACnB,SAAiB,EACT,EAAE;IACV,MAAM,YAAY,GAAG,CAAC,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CACvD,CAAC,CAAC,EAAE,EAAE,CAAE,CAAC,CAAC,QAAgB,EAAE,SAAS,KAAK,WAAW,CACtD,EAAE,QAAe,CAAC;IAEnB,IAAI,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;QAC3C,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAW,CAAC;QAC7C,OAAO,CAAC,QAAQ,KAAK,EAAE,CAAC;QACvB,OAAO,CAAC,QAAgB,CAAC,KAAK,GAAG;YAChC,GAAG,CAAE,OAAO,CAAC,QAAgB,CAAC,KAAK,IAAI,EAAE,CAAC;YAC1C,IAAI;SACL,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,IAAA,kBAAU,EAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;AAC9C,CAAC,CAAC;AArBW,QAAA,gBAAgB,oBAqB3B;AAEF;;;GAGG;AACI,MAAM,UAAU,GAAG,CACxB,IAAU,EACV,OAA6B,EAC7B,SAAiB,EACjB,EAAE;IACF,0BAA0B;IAC1B,MAAM,QAAQ,GAAG,IAAI,GAAG,CACtB,CAAC,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5C,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAe,CAAC;QACnC,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,0EAA0E;QAC1E,IAAI,QAAQ,EAAE,IAAI,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACxD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;QACD,IACE,QAAQ,EAAE,KAAK;YACf,OAAO,QAAQ,CAAC,KAAK,KAAK,QAAQ;YAClC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAC7B,CAAC;YACD,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CACH,CAAC;IAEF,0DAA0D;IAC1D,IAAI,aAAa,GAAG,SAAS,CAAC;IAC9B,OAAO,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;QACnC,aAAa,EAAE,CAAC;IAClB,CAAC;IAED,OAAO,CAAC,QAAQ,KAAK,EAAE,CAAC;IACvB,OAAO,CAAC,QAAgB,CAAC,KAAK,KAAK,EAAE,CAAC;IACtC,OAAO,CAAC,QAAgB,CAAC,KAAK,GAAG;QAChC,GAAI,OAAO,CAAC,QAAgB,CAAC,KAAK;QAClC,aAAa;KACd,CAAC;IAEF,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC;AAvCW,QAAA,UAAU,cAuCrB"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/port.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { getProjects, type ProjectConfiguration, type Tree } from '@nx/devkit';\n\n/**\n * Return the first port already registered in a project's own metadata, if any.\n * Supports both the metadata.ports array and the legacy metadata.port.\n */\nconst getExistingProjectPort = (\n  project: ProjectConfiguration,\n): number | undefined => {\n  const metadata = project.metadata as any;\n  if (Array.isArray(metadata?.ports) && typeof metadata.ports[0] === 'number') {\n    return metadata.ports[0];\n  }\n  if (typeof metadata?.port === 'number') {\n    return metadata.port;\n  }\n  return undefined;\n};\n\n/**\n * Return the port previously assigned to a particular component within a\n * project, if any. Projects which host multiple components (e.g. one agent or\n * MCP server per component) record a port per component in metadata.components.\n */\nconst getExistingComponentPort = (\n  project: ProjectConfiguration,\n  component: { info: { id: string }; name?: string },\n): number | undefined => {\n  const components = (project.metadata as any)?.components ?? [];\n  const match = components.find(\n    (c: any) => c.generator === component.info.id && c.name === component.name,\n  );\n  return typeof match?.port === 'number' ? match.port : undefined;\n};\n\n/**\n * Options for assigning a port to a target within a project.\n */\nexport interface AssignPortOptions {\n  /**\n   * Identifies the component the port is being assigned for. When provided, a\n   * port already assigned to this component is reused so re-runs are\n   * idempotent. Use this for projects which host a port per component.\n   */\n  component?: { info: { id: string }; name?: string };\n}\n\n/**\n * Assign a port shared across all projects created by the same generator (or\n * family of generators). If this project already has a port, or a sibling\n * project created by any of the given generator IDs has one, reuse it;\n * otherwise assign a fresh one. Mutates the project to register the port in\n * its metadata.ports.\n */\nexport const assignSharedPort = (\n  tree: Tree,\n  project: ProjectConfiguration,\n  generatorId: string | string[],\n  startPort: number,\n): number => {\n  const generatorIds = Array.isArray(generatorId) ? generatorId : [generatorId];\n\n  // Reuse this project's own port if it already has one (idempotent on re-run)\n  const ownPort = getExistingProjectPort(project);\n  if (ownPort !== undefined) {\n    return ownPort;\n  }\n\n  // Otherwise reuse a sibling project's shared port if one exists\n  const siblingPort = [...getProjects(tree).values()]\n    .filter((p) => p.name !== project.name)\n    .map((p) => ({\n      generator: (p.metadata as any)?.generator,\n      port: getExistingProjectPort(p),\n    }))\n    .find(\n      (p) => generatorIds.includes(p.generator) && p.port !== undefined,\n    )?.port;\n\n  if (siblingPort !== undefined) {\n    project.metadata ??= {};\n    (project.metadata as any).ports = [\n      ...((project.metadata as any).ports ?? []),\n      siblingPort,\n    ];\n    return siblingPort;\n  }\n\n  return assignPort(tree, project, startPort);\n};\n\n/**\n * Assign a port for a particular target within a project.\n * Mutates the project to add/update its metadata.ports with the newly assigned port.\n *\n * Re-runs are idempotent: a port previously assigned to this project (or, when\n * `options.component` is provided, to this component) is returned as-is without\n * registering a duplicate.\n */\nexport const assignPort = (\n  tree: Tree,\n  project: ProjectConfiguration,\n  startPort: number,\n  options?: AssignPortOptions,\n) => {\n  // Reuse a port already assigned to this project/component on re-run\n  const existingPort = options?.component\n    ? getExistingComponentPort(project, options.component)\n    : getExistingProjectPort(project);\n  if (existingPort !== undefined) {\n    return existingPort;\n  }\n\n  // Find all existing ports\n  const allPorts = new Set(\n    [...getProjects(tree).values()].flatMap((p) => {\n      const metadata = p.metadata as any;\n      const ports: number[] = [];\n      // Support old port assignment where each project registered a single port\n      if (metadata?.port && typeof metadata.port === 'number') {\n        ports.push(metadata.port);\n      }\n      if (\n        metadata?.ports &&\n        typeof metadata.ports === 'object' &&\n        Array.isArray(metadata.ports)\n      ) {\n        ports.push(...metadata.ports);\n      }\n      return ports;\n    }),\n  );\n\n  // Find the next available port higher than the start port\n  let candidatePort = startPort;\n  while (allPorts.has(candidatePort)) {\n    candidatePort++;\n  }\n\n  project.metadata ??= {};\n  (project.metadata as any).ports ??= [];\n  (project.metadata as any).ports = [\n    ...(project.metadata as any).ports,\n    candidatePort,\n  ];\n\n  return candidatePort;\n};\n"],"names":["getProjects","getExistingProjectPort","project","metadata","Array","isArray","ports","port","undefined","getExistingComponentPort","component","components","match","find","c","generator","info","id","name","assignSharedPort","tree","generatorId","startPort","generatorIds","ownPort","siblingPort","values","filter","p","map","includes","assignPort","options","existingPort","allPorts","Set","flatMap","push","candidatePort","has"],"mappings":"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"}

package/src/utils/project-package-json.d.ts

@@ -0,0 +1,39 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type Tree } from '@nx/devkit';
+export interface EnsureProjectPackageJsonOptions {
+    /** Directory of the project relative to the workspace root */
+    readonly dir: string;
+    /** Full package name including scope (eg @foo/bar) */
+    readonly fullyQualifiedName: string;
+    /** Module format. Defaults to the workspace format, written explicitly. */
+    readonly esm?: boolean;
+}
+/**
+ * Ensure the project has its own minimal private package.json, so the workspace
+ * follows the standard npm package layout (package managers link projects,
+ * filtered installs work, nearest-package.json `type` lookup resolves).
+ * Cross-project imports resolve via tsconfig `paths` aliases, not the manifest.
+ */
+export declare const ensureProjectPackageJson: (tree: Tree, options: EnsureProjectPackageJsonOptions) => void;
+/**
+ * Ensure the package manager's workspace globs match the given project
+ * directory, so the project's package.json participates in workspace
+ * resolution and filtered installs.
+ *
+ * pnpm reads globs from `pnpm-workspace.yaml`; other package managers read
+ * the root package.json `workspaces` field. A directory not covered by an
+ * existing glob is added as an exact entry.
+ */
+export declare const ensureWorkspaceGlobCovers: (tree: Tree, dir: string) => void;
+/**
+ * The root package.json `workspaces` field: an array of globs, or the object
+ * form (`{ "packages": [...] }`) accepted by yarn and bun.
+ */
+export type WorkspacesField = string[] | {
+    packages?: string[];
+};
+/** The workspace globs carried by either form of the `workspaces` field. */
+export declare const workspaceGlobs: (workspaces: WorkspacesField | undefined) => string[];

package/src/utils/project-package-json.js

@@ -0,0 +1,119 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ import { joinPathFragments, readJson, updateJson, writeJson } from "@nx/devkit";
+import yaml from "js-yaml";
+import { minimatch } from "minimatch";
+import { detectWorkspacePackageManager } from "./dependencies.js";
+import { isEsmWorkspace } from "./module-format.js";
+/**
+ * Ensure the project has its own minimal private package.json, so the workspace
+ * follows the standard npm package layout (package managers link projects,
+ * filtered installs work, nearest-package.json `type` lookup resolves).
+ * Cross-project imports resolve via tsconfig `paths` aliases, not the manifest.
+ */ export const ensureProjectPackageJson = (tree, options)=>{
+    const packageJsonPath = joinPathFragments(options.dir, 'package.json');
+    const esm = options.esm ?? isEsmWorkspace(tree);
+    if (!tree.exists(packageJsonPath)) {
+        writeJson(tree, packageJsonPath, {
+            name: options.fullyQualifiedName,
+            version: '0.0.0',
+            private: true
+        });
+    }
+    updateJson(tree, packageJsonPath, (packageJson)=>{
+        // Strip @nx/js's default `./dist` entry points: that path doesn't exist in
+        // this layout (tsc outputs to `dist/<project>/tsc` at the root) and imports
+        // resolve via tsconfig aliases. User-customised entry points are kept.
+        for (const field of [
+            'main',
+            'module',
+            'types'
+        ]){
+            if (packageJson[field]?.startsWith('./dist/')) {
+                delete packageJson[field];
+            }
+        }
+        if (packageJson.exports?.['.']?.import?.startsWith('./dist/')) {
+            // Drop only the stale default entry; user-added subpath exports are kept.
+            // Its './package.json' companion is dropped too, since an exports map
+            // without '.' would block root imports.
+            delete packageJson.exports['.'];
+            const remaining = Object.keys(packageJson.exports);
+            if (remaining.length === 0 || remaining.length === 1 && remaining[0] === './package.json') {
+                delete packageJson.exports;
+            }
+        }
+        return {
+            ...packageJson,
+            name: options.fullyQualifiedName,
+            private: packageJson.private ?? true,
+            // Written explicitly so the module format is stable however consumed.
+            type: esm ? 'module' : 'commonjs'
+        };
+    });
+    ensureWorkspaceGlobCovers(tree, options.dir);
+};
+/**
+ * Ensure the package manager's workspace globs match the given project
+ * directory, so the project's package.json participates in workspace
+ * resolution and filtered installs.
+ *
+ * pnpm reads globs from `pnpm-workspace.yaml`; other package managers read
+ * the root package.json `workspaces` field. A directory not covered by an
+ * existing glob is added as an exact entry.
+ */ export const ensureWorkspaceGlobCovers = (tree, dir)=>{
+    // Update whichever markers the workspace carries (both when both are
+    // present, e.g. the test helper).
+    const usePnpmWorkspace = detectWorkspacePackageManager(tree) === 'pnpm';
+    if (usePnpmWorkspace) {
+        const parsed = yaml.load(tree.read('pnpm-workspace.yaml', 'utf-8') ?? '') ?? {};
+        const packages = parsed.packages ?? [];
+        if (!globsCover(packages, dir)) {
+            tree.write('pnpm-workspace.yaml', yaml.dump({
+                ...parsed,
+                packages: [
+                    ...packages,
+                    dir
+                ]
+            }, {
+                quotingType: "'"
+            }));
+        }
+    }
+    if (tree.exists('package.json')) {
+        const { workspaces } = readJson(tree, 'package.json');
+        if (workspaces !== undefined && !globsCover(workspaceGlobs(workspaces), dir)) {
+            updateJson(tree, 'package.json', (packageJson)=>({
+                    ...packageJson,
+                    workspaces: appendWorkspaceGlob(packageJson.workspaces, dir)
+                }));
+        } else if (workspaces === undefined && !usePnpmWorkspace) {
+            updateJson(tree, 'package.json', (packageJson)=>({
+                    ...packageJson,
+                    workspaces: [
+                        dir
+                    ]
+                }));
+        }
+    }
+};
+/** The workspace globs carried by either form of the `workspaces` field. */ export const workspaceGlobs = (workspaces)=>Array.isArray(workspaces) ? workspaces : workspaces?.packages ?? [];
+/** Append a glob to the `workspaces` field, preserving its existing form. */ const appendWorkspaceGlob = (workspaces, glob)=>{
+    const globs = [
+        ...workspaceGlobs(workspaces),
+        glob
+    ];
+    return workspaces !== undefined && !Array.isArray(workspaces) ? {
+        ...workspaces,
+        packages: globs
+    } : globs;
+};
+/**
+ * Whether the workspace globs match the directory. Negated globs (`!foo`)
+ * always exclude, regardless of where they appear in the list — package
+ * managers apply exclusions after expanding the positive patterns, so
+ * ordering is not significant.
+ */ const globsCover = (globs, dir)=>globs.some((glob)=>!glob.startsWith('!') && minimatch(dir, glob)) && !globs.some((glob)=>glob.startsWith('!') && minimatch(dir, glob.slice(1)));
+
+//# sourceMappingURL=project-package-json.js.map

package/src/utils/project-package-json.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/project-package-json.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  joinPathFragments,\n  readJson,\n  type Tree,\n  updateJson,\n  writeJson,\n} from '@nx/devkit';\nimport yaml from 'js-yaml';\nimport { minimatch } from 'minimatch';\nimport { detectWorkspacePackageManager } from './dependencies';\nimport { isEsmWorkspace } from './module-format';\n\nexport interface EnsureProjectPackageJsonOptions {\n  /** Directory of the project relative to the workspace root */\n  readonly dir: string;\n  /** Full package name including scope (eg @foo/bar) */\n  readonly fullyQualifiedName: string;\n  /** Module format. Defaults to the workspace format, written explicitly. */\n  readonly esm?: boolean;\n}\n\n/**\n * Ensure the project has its own minimal private package.json, so the workspace\n * follows the standard npm package layout (package managers link projects,\n * filtered installs work, nearest-package.json `type` lookup resolves).\n * Cross-project imports resolve via tsconfig `paths` aliases, not the manifest.\n */\nexport const ensureProjectPackageJson = (\n  tree: Tree,\n  options: EnsureProjectPackageJsonOptions,\n): void => {\n  const packageJsonPath = joinPathFragments(options.dir, 'package.json');\n  const esm = options.esm ?? isEsmWorkspace(tree);\n\n  if (!tree.exists(packageJsonPath)) {\n    writeJson(tree, packageJsonPath, {\n      name: options.fullyQualifiedName,\n      version: '0.0.0',\n      private: true,\n    });\n  }\n\n  updateJson(tree, packageJsonPath, (packageJson) => {\n    // Strip @nx/js's default `./dist` entry points: that path doesn't exist in\n    // this layout (tsc outputs to `dist/<project>/tsc` at the root) and imports\n    // resolve via tsconfig aliases. User-customised entry points are kept.\n    for (const field of ['main', 'module', 'types'] as const) {\n      if (packageJson[field]?.startsWith('./dist/')) {\n        delete packageJson[field];\n      }\n    }\n    if (packageJson.exports?.['.']?.import?.startsWith('./dist/')) {\n      // Drop only the stale default entry; user-added subpath exports are kept.\n      // Its './package.json' companion is dropped too, since an exports map\n      // without '.' would block root imports.\n      delete packageJson.exports['.'];\n      const remaining = Object.keys(packageJson.exports);\n      if (\n        remaining.length === 0 ||\n        (remaining.length === 1 && remaining[0] === './package.json')\n      ) {\n        delete packageJson.exports;\n      }\n    }\n    return {\n      ...packageJson,\n      name: options.fullyQualifiedName,\n      private: packageJson.private ?? true,\n      // Written explicitly so the module format is stable however consumed.\n      type: esm ? 'module' : 'commonjs',\n    };\n  });\n\n  ensureWorkspaceGlobCovers(tree, options.dir);\n};\n\n/**\n * Ensure the package manager's workspace globs match the given project\n * directory, so the project's package.json participates in workspace\n * resolution and filtered installs.\n *\n * pnpm reads globs from `pnpm-workspace.yaml`; other package managers read\n * the root package.json `workspaces` field. A directory not covered by an\n * existing glob is added as an exact entry.\n */\nexport const ensureWorkspaceGlobCovers = (tree: Tree, dir: string): void => {\n  // Update whichever markers the workspace carries (both when both are\n  // present, e.g. the test helper).\n  const usePnpmWorkspace = detectWorkspacePackageManager(tree) === 'pnpm';\n\n  if (usePnpmWorkspace) {\n    const parsed =\n      (yaml.load(tree.read('pnpm-workspace.yaml', 'utf-8') ?? '') as Record<\n        string,\n        unknown\n      >) ?? {};\n    const packages = (parsed.packages as string[]) ?? [];\n    if (!globsCover(packages, dir)) {\n      tree.write(\n        'pnpm-workspace.yaml',\n        yaml.dump(\n          { ...parsed, packages: [...packages, dir] },\n          { quotingType: \"'\" },\n        ),\n      );\n    }\n  }\n\n  if (tree.exists('package.json')) {\n    const { workspaces } = readJson<{ workspaces?: WorkspacesField }>(\n      tree,\n      'package.json',\n    );\n    if (\n      workspaces !== undefined &&\n      !globsCover(workspaceGlobs(workspaces), dir)\n    ) {\n      updateJson(tree, 'package.json', (packageJson) => ({\n        ...packageJson,\n        workspaces: appendWorkspaceGlob(packageJson.workspaces, dir),\n      }));\n    } else if (workspaces === undefined && !usePnpmWorkspace) {\n      updateJson(tree, 'package.json', (packageJson) => ({\n        ...packageJson,\n        workspaces: [dir],\n      }));\n    }\n  }\n};\n\n/**\n * The root package.json `workspaces` field: an array of globs, or the object\n * form (`{ \"packages\": [...] }`) accepted by yarn and bun.\n */\nexport type WorkspacesField = string[] | { packages?: string[] };\n\n/** The workspace globs carried by either form of the `workspaces` field. */\nexport const workspaceGlobs = (\n  workspaces: WorkspacesField | undefined,\n): string[] =>\n  Array.isArray(workspaces) ? workspaces : (workspaces?.packages ?? []);\n\n/** Append a glob to the `workspaces` field, preserving its existing form. */\nconst appendWorkspaceGlob = (\n  workspaces: WorkspacesField | undefined,\n  glob: string,\n): WorkspacesField => {\n  const globs = [...workspaceGlobs(workspaces), glob];\n  return workspaces !== undefined && !Array.isArray(workspaces)\n    ? { ...workspaces, packages: globs }\n    : globs;\n};\n\n/**\n * Whether the workspace globs match the directory. Negated globs (`!foo`)\n * always exclude, regardless of where they appear in the list — package\n * managers apply exclusions after expanding the positive patterns, so\n * ordering is not significant.\n */\nconst globsCover = (globs: string[], dir: string): boolean =>\n  globs.some((glob) => !glob.startsWith('!') && minimatch(dir, glob)) &&\n  !globs.some((glob) => glob.startsWith('!') && minimatch(dir, glob.slice(1)));\n"],"names":["joinPathFragments","readJson","updateJson","writeJson","yaml","minimatch","detectWorkspacePackageManager","isEsmWorkspace","ensureProjectPackageJson","tree","options","packageJsonPath","dir","esm","exists","name","fullyQualifiedName","version","private","packageJson","field","startsWith","exports","import","remaining","Object","keys","length","type","ensureWorkspaceGlobCovers","usePnpmWorkspace","parsed","load","read","packages","globsCover","write","dump","quotingType","workspaces","undefined","workspaceGlobs","appendWorkspaceGlob","Array","isArray","glob","globs","some","slice"],"mappings":"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"}

package/src/utils/py.d.ts

@@ -1,5 +1,5 @@
-import { Tree } from '@nx/devkit';
-import { IPyDepVersion } from './versions';
+import { type Tree } from '@nx/devkit';
+import { type IPyDepVersion } from './versions';
 /**
  * Add dependencies to a pyproject.toml file
  */
@@ -19,5 +19,18 @@ export declare const uvxCommand: (dep: IPyDepVersion, args?: string, withDeps?:
 /**
  * Add a workspace dependency from one Python project to another.
  * Adds the dependency to [project].dependencies and [tool.uv.sources].
+ *
+ * Both projects are passed as Nx project configurations (not names): the
+ * dependency's PEP 503 distribution name is derived from its own
+ * `pyproject.toml` here, so callers cannot accidentally pass the dotted Nx id
+ * (which @nxlv/python splits on `.` and drops, losing the project-graph edge).
+ * This is the single entry point all generators use to wire a Python workspace
+ * dependency.
  */
-export declare const addWorkspaceDependencyToPyProject: (tree: Tree, projectRoot: string, dependencyPackageName: string) => void;
+export declare const addWorkspaceDependencyToPyProject: (tree: Tree, dependentProject: {
+    name?: string;
+    root: string;
+}, dependencyProject: {
+    name?: string;
+    root: string;
+}) => void;