@aws/nx-plugin 1.0.0-rc.3 → 1.0.0-rc.31

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 { detectPackageManager } from "@nx/devkit";
+import yaml from "js-yaml";
 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 (detectPackageManager(tree.root) !== '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,10 +47,13 @@ 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`.
@@ -64,22 +63,23 @@ exports.registerPnpmBuiltDependencies = registerPnpmBuiltDependencies;
  * 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') {
+ */ export const ensurePnpmIgnoresWorkspaceRootCheck = (tree)=>{
+    if (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) ?? {};
+    const parsed = yaml.load(original) ?? {};
     if (parsed.ignoreWorkspaceRootCheck === true) {
         return false;
     }
     parsed.ignoreWorkspaceRootCheck = true;
-    tree.write(WORKSPACE_FILE, js_yaml_1.default.dump(parsed, { quotingType: "'" }));
+    tree.write(WORKSPACE_FILE, yaml.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 { detectPackageManager, type Tree } from '@nx/devkit';\nimport yaml from 'js-yaml';\n\nconst WORKSPACE_FILE = 'pnpm-workspace.yaml';\n\ninterface PnpmWorkspaceYaml {\n  allowBuilds?: Record<string, boolean>;\n  onlyBuiltDependencies?: string[];\n  ignoreWorkspaceRootCheck?: boolean;\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 (detectPackageManager(tree.root) !== '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\n/**\n * Set `ignoreWorkspaceRootCheck: true` in `pnpm-workspace.yaml` so `pnpm add`\n * from the workspace root does not error with `ERR_PNPM_ADDING_TO_ROOT`.\n *\n * pnpm 11 no longer honours `ignore-workspace-root-check=true` in `.npmrc`;\n * it must live in `pnpm-workspace.yaml` as the camelCased key. pnpm 10 also\n * accepts the yaml form, so writing it here works for both majors.\n *\n * No-op for non-pnpm workspaces or when `pnpm-workspace.yaml` is absent.\n */\nexport const ensurePnpmIgnoresWorkspaceRootCheck = (tree: Tree): boolean => {\n  if (detectPackageManager(tree.root) !== 'pnpm') {\n    return false;\n  }\n  if (!tree.exists(WORKSPACE_FILE)) {\n    return false;\n  }\n\n  const original = tree.read(WORKSPACE_FILE, 'utf-8') ?? '';\n  const parsed = (yaml.load(original) as PnpmWorkspaceYaml | null) ?? {};\n\n  if (parsed.ignoreWorkspaceRootCheck === true) {\n    return false;\n  }\n\n  parsed.ignoreWorkspaceRootCheck = true;\n  tree.write(WORKSPACE_FILE, yaml.dump(parsed, { quotingType: \"'\" }));\n  return true;\n};\n"],"names":["detectPackageManager","yaml","WORKSPACE_FILE","registerPnpmBuiltDependencies","tree","entries","root","exists","original","read","parsed","load","allowBuilds","onlyBuiltDependencies","Set","changed","pkg","decision","Object","has","add","write","dump","quotingType","ensurePnpmIgnoresWorkspaceRootCheck","ignoreWorkspaceRootCheck"],"mappings":"AAAA;;;CAGC,GACD,SAASA,oBAAoB,QAAmB,aAAa;AAC7D,OAAOC,UAAU,UAAU;AAE3B,MAAMC,iBAAiB;AASvB;;;;;;;;;;;;;;;CAeC,GACD,OAAO,MAAMC,gCAAgC,CAC3CC,MACAC;IAEA,IAAIL,qBAAqBI,KAAKE,IAAI,MAAM,QAAQ;QAC9C;IACF;IACA,IAAI,CAACF,KAAKG,MAAM,CAACL,iBAAiB;QAChC;IACF;IAEA,MAAMM,WAAWJ,KAAKK,IAAI,CAACP,gBAAgB,YAAY;IACvD,MAAMQ,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,OAAOb,OAAO,CAACA,SAAU;QACrD,IAAIO,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;IAEzDT,KAAKiB,KAAK,CAACnB,gBAAgBD,KAAKqB,IAAI,CAACZ,QAAQ;QAAEa,aAAa;IAAI;AAClE,EAAE;AAEF;;;;;;;;;CASC,GACD,OAAO,MAAMC,sCAAsC,CAACpB;IAClD,IAAIJ,qBAAqBI,KAAKE,IAAI,MAAM,QAAQ;QAC9C,OAAO;IACT;IACA,IAAI,CAACF,KAAKG,MAAM,CAACL,iBAAiB;QAChC,OAAO;IACT;IAEA,MAAMM,WAAWJ,KAAKK,IAAI,CAACP,gBAAgB,YAAY;IACvD,MAAMQ,SAAS,AAACT,KAAKU,IAAI,CAACH,aAA0C,CAAC;IAErE,IAAIE,OAAOe,wBAAwB,KAAK,MAAM;QAC5C,OAAO;IACT;IAEAf,OAAOe,wBAAwB,GAAG;IAClCrB,KAAKiB,KAAK,CAACnB,gBAAgBD,KAAKqB,IAAI,CAACZ,QAAQ;QAAEa,aAAa;IAAI;IAChE,OAAO;AACT,EAAE"}

package/src/utils/port.d.ts

@@ -2,9 +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';
+/**
+ * Options for assigning a port to a target within a project.
+ */
+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,18 +1,78 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assignPort = 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";
+/**
+ * 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 ?? [],
+            siblingPort
+        ];
+        return siblingPort;
+    }
+    return assignPort(tree, project, startPort);
+};
 /**
  * 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
@@ -26,16 +86,16 @@ const assignPort = (tree, project, startPort) => {
     }));
     // 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;;;GAGG;AACI,MAAM,UAAU,GAAG,CAAC,IAAU,EAAE,OAA6B,EAAE,SAAiB,EAAE,EAAE;IACzF,0BAA0B;IAC1B,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACrE,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,IAAI,QAAQ,EAAE,KAAK,IAAI,OAAO,QAAQ,CAAC,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3F,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC,CAAC;IAEJ,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;AA7BW,QAAA,UAAU,cA6BrB"}
+{"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/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;

package/src/utils/py.js

@@ -1,90 +1,115 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addWorkspaceDependencyToPyProject = exports.uvxCommand = exports.addDependenciesToDependencyGroupInPyProjectToml = exports.addDependenciesToPyProjectToml = void 0;
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const toml_1 = require("@iarna/toml");
-const devkit_1 = require("@nx/devkit");
-const versions_1 = require("./versions");
-const pip_requirements_js_1 = require("pip-requirements-js");
-const toml_2 = require("./toml");
+ */ import { parse, stringify } from "@iarna/toml";
+import { joinPathFragments } from "@nx/devkit";
+import { parsePipRequirementsLine } from "pip-requirements-js";
+import { normalizeDistributionName } from "./names.js";
+import { readToml, updateToml } from "./toml.js";
+import { withPyVersions } from "./versions.js";
 // Dedup key that distinguishes bare packages from the same package with
 // extras (e.g. `foo` vs `foo[bar]`), so adding a bare dep doesn't drop a
 // previously-added variant with extras.
-const depKey = (dep) => {
-    const parsed = (0, pip_requirements_js_1.parsePipRequirementsLine)(dep);
+const depKey = (dep)=>{
+    const parsed = parsePipRequirementsLine(dep);
     if (parsed?.type !== 'ProjectName') {
         return dep;
     }
-    const extras = [...(parsed.extras ?? [])].sort().join(',');
+    const extras = [
+        ...parsed.extras ?? []
+    ].sort().join(',');
     return extras ? `${parsed.name}[${extras}]` : parsed.name;
 };
-const mergeDeps = (existing, deps) => {
-    const incomingKeys = new Set(deps.map(depKey));
-    return [
-        ...(existing ?? []).filter((dep) => !incomingKeys.has(depKey(dep))),
-        ...(0, versions_1.withPyVersions)(deps),
-    ];
+const mergeDeps = (existing, deps)=>{
+    // Update deps in place by key so re-running does not reorder the list:
+    // existing deps keep their position (with their version refreshed), and only
+    // genuinely-new deps are appended.
+    const incoming = new Map(withPyVersions(deps).map((d)=>[
+            depKey(d),
+            d
+        ]));
+    const merged = (existing ?? []).map((dep)=>incoming.get(depKey(dep)) ?? dep);
+    const existingKeys = new Set((existing ?? []).map(depKey));
+    for (const [key, dep] of incoming){
+        if (!existingKeys.has(key)) {
+            merged.push(dep);
+        }
+    }
+    return merged;
 };
 /**
  * Add dependencies to a pyproject.toml file
- */
-const addDependenciesToPyProjectToml = (tree, projectRoot, deps) => {
-    const projectToml = (0, toml_1.parse)(tree.read((0, devkit_1.joinPathFragments)(projectRoot, 'pyproject.toml'), 'utf8'));
+ */ export const addDependenciesToPyProjectToml = (tree, projectRoot, deps)=>{
+    const projectToml = parse(tree.read(joinPathFragments(projectRoot, 'pyproject.toml'), 'utf8'));
     projectToml.project.dependencies = mergeDeps(projectToml.project?.dependencies, deps);
-    tree.write((0, devkit_1.joinPathFragments)(projectRoot, 'pyproject.toml'), (0, toml_1.stringify)(projectToml));
+    tree.write(joinPathFragments(projectRoot, 'pyproject.toml'), stringify(projectToml));
 };
-exports.addDependenciesToPyProjectToml = addDependenciesToPyProjectToml;
-const addDependenciesToDependencyGroupInPyProjectToml = (tree, projectRoot, group, deps) => {
-    const projectToml = (0, toml_1.parse)(tree.read((0, devkit_1.joinPathFragments)(projectRoot, 'pyproject.toml'), 'utf8'));
+export const addDependenciesToDependencyGroupInPyProjectToml = (tree, projectRoot, group, deps)=>{
+    const projectToml = parse(tree.read(joinPathFragments(projectRoot, 'pyproject.toml'), 'utf8'));
     projectToml['dependency-groups'] = {
         ...projectToml['dependency-groups'],
-        [group]: mergeDeps(projectToml['dependency-groups']?.[group], deps),
+        [group]: mergeDeps(projectToml['dependency-groups']?.[group], deps)
     };
-    tree.write((0, devkit_1.joinPathFragments)(projectRoot, 'pyproject.toml'), (0, toml_1.stringify)(projectToml));
+    tree.write(joinPathFragments(projectRoot, 'pyproject.toml'), stringify(projectToml));
 };
-exports.addDependenciesToDependencyGroupInPyProjectToml = addDependenciesToDependencyGroupInPyProjectToml;
 /**
  * Render a uvx command for a given dependency
  * Pins the version to the one specified in versions.ts
  * Optionally specify withDeps to render uvx --with dep==version
- */
-const uvxCommand = (dep, args, withDeps) => {
-    return `uvx --from ${(0, versions_1.withPyVersions)([dep])[0]} ${withDeps
-        ? `${withDeps
-            .map(({ dep, version, specifier }) => `--with ${dep}${specifier ?? '=='}${version}`)
-            .join(' ')} `
-        : ''}${dep}${args ? ` ${args}` : ''}`;
+ */ export const uvxCommand = (dep, args, withDeps)=>{
+    return `uvx --from ${withPyVersions([
+        dep
+    ])[0]} ${withDeps ? `${withDeps.map(({ dep, version, specifier })=>`--with ${dep}${specifier ?? '=='}${version}`).join(' ')} ` : ''}${dep}${args ? ` ${args}` : ''}`;
+};
+/**
+ * Resolve the PEP 503 distribution name of a Python project from its
+ * `pyproject.toml` `[project].name`, falling back to normalising the supplied
+ * Nx project id when the project has no readable pyproject yet.
+ *
+ * This is the authoritative name uv writes into `uv.lock`, so it is the value
+ * that must appear in a dependent's `[project].dependencies` /
+ * `[tool.uv.sources]` for `@nxlv/python` to infer the workspace dependency
+ * edge. Always normalised so the result is a valid distribution name even if
+ * an older project still carries a dotted `[project].name`.
+ */ const getPyDistributionName = (tree, project)=>{
+    const pyprojectPath = joinPathFragments(project.root, 'pyproject.toml');
+    const projectName = tree.exists(pyprojectPath) ? readToml(tree, pyprojectPath).project?.name : undefined;
+    return normalizeDistributionName(projectName ?? project.name ?? '');
 };
-exports.uvxCommand = uvxCommand;
 /**
  * Add a workspace dependency from one Python project to another.
  * Adds the dependency to [project].dependencies and [tool.uv.sources].
- */
-const addWorkspaceDependencyToPyProject = (tree, projectRoot, dependencyPackageName) => {
-    const pyprojectPath = (0, devkit_1.joinPathFragments)(projectRoot, 'pyproject.toml');
+ *
+ * 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 const addWorkspaceDependencyToPyProject = (tree, dependentProject, dependencyProject)=>{
+    const pyprojectPath = joinPathFragments(dependentProject.root, 'pyproject.toml');
     if (!tree.exists(pyprojectPath)) {
         return;
     }
-    (0, toml_2.updateToml)(tree, pyprojectPath, (toml) => {
+    const distributionName = getPyDistributionName(tree, dependencyProject);
+    updateToml(tree, pyprojectPath, (toml)=>{
         // Add to [project].dependencies if not already present
         const deps = toml.project?.dependencies ?? [];
-        if (!deps.some((d) => d === dependencyPackageName ||
-            d.startsWith(`${dependencyPackageName}>=`) ||
-            d.startsWith(`${dependencyPackageName}==`))) {
-            toml.project.dependencies = [...deps, dependencyPackageName];
+        if (!deps.some((d)=>d === distributionName || d.startsWith(`${distributionName}>=`) || d.startsWith(`${distributionName}==`))) {
+            toml.project.dependencies = [
+                ...deps,
+                distributionName
+            ];
         }
         // Add to [tool.uv.sources] with workspace = true
         toml.tool = toml.tool ?? {};
         toml.tool.uv = toml.tool.uv ?? {};
         toml.tool.uv.sources = toml.tool.uv.sources ?? {};
-        toml.tool.uv.sources[dependencyPackageName] = {
-            workspace: true,
+        toml.tool.uv.sources[distributionName] = {
+            workspace: true
         };
         return toml;
     });
 };
-exports.addWorkspaceDependencyToPyProject = addWorkspaceDependencyToPyProject;
+
 //# sourceMappingURL=py.js.map

package/src/utils/py.js.map

@@ -1 +1 @@
-{"version":3,"file":"py.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/py.ts"],"names":[],"mappings":"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"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/py.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { parse, stringify } from '@iarna/toml';\nimport { joinPathFragments, type Tree } from '@nx/devkit';\nimport { parsePipRequirementsLine } from 'pip-requirements-js';\nimport { normalizeDistributionName } from './names';\nimport type { UVPyprojectToml } from './nxlv-python';\nimport { readToml, updateToml } from './toml';\nimport { type IPyDepVersion, withPyVersions } from './versions';\n\n// Dedup key that distinguishes bare packages from the same package with\n// extras (e.g. `foo` vs `foo[bar]`), so adding a bare dep doesn't drop a\n// previously-added variant with extras.\nconst depKey = (dep: string): string => {\n  const parsed = parsePipRequirementsLine(dep);\n  if (parsed?.type !== 'ProjectName') {\n    return dep;\n  }\n  const extras = [...(parsed.extras ?? [])].sort().join(',');\n  return extras ? `${parsed.name}[${extras}]` : parsed.name;\n};\n\nconst mergeDeps = (\n  existing: readonly string[] | undefined,\n  deps: IPyDepVersion[],\n): string[] => {\n  // Update deps in place by key so re-running does not reorder the list:\n  // existing deps keep their position (with their version refreshed), and only\n  // genuinely-new deps are appended.\n  const incoming = new Map(withPyVersions(deps).map((d) => [depKey(d), d]));\n  const merged = (existing ?? []).map(\n    (dep) => incoming.get(depKey(dep)) ?? dep,\n  );\n  const existingKeys = new Set((existing ?? []).map(depKey));\n  for (const [key, dep] of incoming) {\n    if (!existingKeys.has(key)) {\n      merged.push(dep);\n    }\n  }\n  return merged;\n};\n\n/**\n * Add dependencies to a pyproject.toml file\n */\nexport const addDependenciesToPyProjectToml = (\n  tree: Tree,\n  projectRoot: string,\n  deps: IPyDepVersion[],\n) => {\n  const projectToml = parse(\n    tree.read(joinPathFragments(projectRoot, 'pyproject.toml'), 'utf8'),\n  ) as UVPyprojectToml;\n  projectToml.project.dependencies = mergeDeps(\n    projectToml.project?.dependencies,\n    deps,\n  );\n  tree.write(\n    joinPathFragments(projectRoot, 'pyproject.toml'),\n    stringify(projectToml),\n  );\n};\n\nexport const addDependenciesToDependencyGroupInPyProjectToml = (\n  tree: Tree,\n  projectRoot: string,\n  group: string,\n  deps: IPyDepVersion[],\n) => {\n  const projectToml = parse(\n    tree.read(joinPathFragments(projectRoot, 'pyproject.toml'), 'utf8'),\n  ) as UVPyprojectToml;\n  projectToml['dependency-groups'] = {\n    ...projectToml['dependency-groups'],\n    [group]: mergeDeps(projectToml['dependency-groups']?.[group], deps),\n  };\n  tree.write(\n    joinPathFragments(projectRoot, 'pyproject.toml'),\n    stringify(projectToml),\n  );\n};\n\nexport interface UvxWithDep {\n  dep: string;\n  version: string;\n  specifier?: string;\n}\n\n/**\n * Render a uvx command for a given dependency\n * Pins the version to the one specified in versions.ts\n * Optionally specify withDeps to render uvx --with dep==version\n */\nexport const uvxCommand = (\n  dep: IPyDepVersion,\n  args?: string,\n  withDeps?: UvxWithDep[],\n): string => {\n  return `uvx --from ${withPyVersions([dep])[0]} ${\n    withDeps\n      ? `${withDeps\n          .map(\n            ({ dep, version, specifier }) =>\n              `--with ${dep}${specifier ?? '=='}${version}`,\n          )\n          .join(' ')} `\n      : ''\n  }${dep}${args ? ` ${args}` : ''}`;\n};\n\n/**\n * Resolve the PEP 503 distribution name of a Python project from its\n * `pyproject.toml` `[project].name`, falling back to normalising the supplied\n * Nx project id when the project has no readable pyproject yet.\n *\n * This is the authoritative name uv writes into `uv.lock`, so it is the value\n * that must appear in a dependent's `[project].dependencies` /\n * `[tool.uv.sources]` for `@nxlv/python` to infer the workspace dependency\n * edge. Always normalised so the result is a valid distribution name even if\n * an older project still carries a dotted `[project].name`.\n */\nconst getPyDistributionName = (\n  tree: Tree,\n  project: { name?: string; root: string },\n): string => {\n  const pyprojectPath = joinPathFragments(project.root, 'pyproject.toml');\n  const projectName = tree.exists(pyprojectPath)\n    ? (readToml(tree, pyprojectPath) as unknown as UVPyprojectToml).project\n        ?.name\n    : undefined;\n  return normalizeDistributionName(projectName ?? project.name ?? '');\n};\n\n/**\n * Add a workspace dependency from one Python project to another.\n * Adds the dependency to [project].dependencies and [tool.uv.sources].\n *\n * Both projects are passed as Nx project configurations (not names): the\n * dependency's PEP 503 distribution name is derived from its own\n * `pyproject.toml` here, so callers cannot accidentally pass the dotted Nx id\n * (which @nxlv/python splits on `.` and drops, losing the project-graph edge).\n * This is the single entry point all generators use to wire a Python workspace\n * dependency.\n */\nexport const addWorkspaceDependencyToPyProject = (\n  tree: Tree,\n  dependentProject: { name?: string; root: string },\n  dependencyProject: { name?: string; root: string },\n): void => {\n  const pyprojectPath = joinPathFragments(\n    dependentProject.root,\n    'pyproject.toml',\n  );\n  if (!tree.exists(pyprojectPath)) {\n    return;\n  }\n\n  const distributionName = getPyDistributionName(tree, dependencyProject);\n\n  updateToml(tree, pyprojectPath, (toml: UVPyprojectToml) => {\n    // Add to [project].dependencies if not already present\n    const deps = toml.project?.dependencies ?? [];\n    if (\n      !deps.some(\n        (d) =>\n          d === distributionName ||\n          d.startsWith(`${distributionName}>=`) ||\n          d.startsWith(`${distributionName}==`),\n      )\n    ) {\n      toml.project.dependencies = [...deps, distributionName];\n    }\n\n    // Add to [tool.uv.sources] with workspace = true\n    toml.tool = toml.tool ?? {};\n    (toml.tool as any).uv = (toml.tool as any).uv ?? {};\n    (toml.tool as any).uv.sources = (toml.tool as any).uv.sources ?? {};\n    (toml.tool as any).uv.sources[distributionName] = {\n      workspace: true,\n    };\n\n    return toml;\n  });\n};\n"],"names":["parse","stringify","joinPathFragments","parsePipRequirementsLine","normalizeDistributionName","readToml","updateToml","withPyVersions","depKey","dep","parsed","type","extras","sort","join","name","mergeDeps","existing","deps","incoming","Map","map","d","merged","get","existingKeys","Set","key","has","push","addDependenciesToPyProjectToml","tree","projectRoot","projectToml","read","project","dependencies","write","addDependenciesToDependencyGroupInPyProjectToml","group","uvxCommand","args","withDeps","version","specifier","getPyDistributionName","pyprojectPath","root","projectName","exists","undefined","addWorkspaceDependencyToPyProject","dependentProject","dependencyProject","distributionName","toml","some","startsWith","tool","uv","sources","workspace"],"mappings":"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"}

package/src/utils/rdb-constructs/files/cdk/app/dbs/__nameKebabCase__.ts.template

@@ -1,7 +1,7 @@
 import * as path from 'path';
 import * as url from 'url';
+import { readFileSync } from 'fs';
 import { Construct } from 'constructs';
-import { DB_PACKAGE_NAME } from '<%= databasePackageAlias %>';
 import {
   AuroraDatabase,
   AuroraDatabaseEngines,
@@ -9,6 +9,16 @@ import {
 } from '../../core/rdb/aurora.js';
 import { findWorkspaceRoot } from '../../core/workspace.js';
 
+const { runtimeConfigKey } = JSON.parse(
+  readFileSync(
+    path.join(
+      findWorkspaceRoot(url.fileURLToPath(new URL(import.meta.url))),
+      '<%= projectRoot %>/config.json',
+    ),
+    'utf-8',
+  ),
+) as { runtimeConfigKey: string };
+
 export type <%= nameClassName %>Props = Omit<
   AuroraDatabaseProps,
   | 'databaseName'
@@ -28,7 +38,7 @@ export class <%= nameClassName %> extends AuroraDatabase {
       ...props,
       databaseName: '<%= databaseName %>',
       adminUser: '<%= adminUser %>',
-      runtimeConfigKey: DB_PACKAGE_NAME,
+      runtimeConfigKey,
       migrationBundleDir: path.join(
         findWorkspaceRoot(url.fileURLToPath(new URL(import.meta.url))),
         '<%- migrationBundleDir %>',