@aws/nx-plugin 1.0.0-rc.46 → 1.0.0-rc.48

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

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

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

@@ -116,9 +116,14 @@ export const tsNxGeneratorGenerator = async (tree, options)=>{
         NX_GENERATOR_GENERATOR_INFO
     ]);
     await formatFilesInSubtree(tree);
+    // The generated generator.ts imports @nx/devkit, which must resolve for
+    // Nx to run it (bun's isolated layout doesn't hoist it from @nx/js).
     return ()=>installDependencies(tree, options.preferInstallDependencies, {
             languages: [
                 'typescript'
+            ],
+            ensureResolvable: [
+                '@nx/devkit'
             ]
         });
 };

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

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

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

@@ -123,12 +123,11 @@ exports[`ts#nx-plugin generator > should generate MCP server files > test-plugin
 
 ## General Instructions
 
-- Workspaces contain a single \`package.json\` file at the root which defines the dependencies for all projects. Therefore when installing dependencies, you must add these to the root workspace using the appropriate command for your package manager:
-  - pnpm add -w -D <package>
-  - yarn add -D <package>
-  - npm install --legacy-peer-deps -D <package>
-  - bun add -D <package>
-  - (Omit -D for production dependencies)
+- Each project declares the third-party runtime dependencies its source imports in its own \`package.json\`; shared build/test tooling is declared in the root \`package.json\` \`devDependencies\`. Versions follow a single version policy, recorded in the package manager's dependency catalog where supported (referenced as \`catalog:\`). Install with the appropriate command for your package manager:
+  - Add a project runtime dependency: \`pnpm add <package> --filter <project>\` / \`yarn workspace <project> add <package>\` / \`npm install <package> -w <project>\` / \`bun add <package> --cwd <project-directory>\`
+  - Add a shared dev tool at the root: \`pnpm add -Dw <package>\` / \`yarn add -D <package>\` / \`npm install --legacy-peer-deps -D <package>\` / \`bun install -D <package>\`
+- The \`noUndeclaredDependencies\` lint rule enforces that a project's source only imports packages declared in its own \`package.json\`
+- Projects in the same workspace can import one another directly by package name (eg \`@workspace-name/project-name\`) without declaring a dependency in \`package.json\` — TypeScript path aliases in \`tsconfig.base.json\` resolve these imports
 - When specifying project names as arguments to generators, prefer the _fully qualified_ project name, for example \`@workspace-name/project-name\`. Check the \`project.json\` file for the specific package to find its fully qualified name
 - When no generator exists for a specific framework required, look for more generic project generators if availalbe and build on top of these.
 

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

@@ -26,12 +26,11 @@
 
 ## General Instructions
 
-- Workspaces contain a single `package.json` file at the root which defines the dependencies for all projects. Therefore when installing dependencies, you must add these to the root workspace using the appropriate command for your package manager:
-  - pnpm add -w -D <package>
-  - yarn add -D <package>
-  - npm install --legacy-peer-deps -D <package>
-  - bun add -D <package>
-  - (Omit -D for production dependencies)
+- Each project declares the third-party runtime dependencies its source imports in its own `package.json`; shared build/test tooling is declared in the root `package.json` `devDependencies`. Versions follow a single version policy, recorded in the package manager's dependency catalog where supported (referenced as `catalog:`). Install with the appropriate command for your package manager:
+  - Add a project runtime dependency: `pnpm add <package> --filter <project>` / `yarn workspace <project> add <package>` / `npm install <package> -w <project>` / `bun add <package> --cwd <project-directory>`
+  - Add a shared dev tool at the root: `pnpm add -Dw <package>` / `yarn add -D <package>` / `npm install --legacy-peer-deps -D <package>` / `bun install -D <package>`
+- The `noUndeclaredDependencies` lint rule enforces that a project's source only imports packages declared in its own `package.json`
+- Projects in the same workspace can import one another directly by package name (eg `@workspace-name/project-name`) without declaring a dependency in `package.json` — TypeScript path aliases in `tsconfig.base.json` resolve these imports
 - When specifying project names as arguments to generators, prefer the _fully qualified_ project name, for example `@workspace-name/project-name`. Check the `project.json` file for the specific package to find its fully qualified name
 - When no generator exists for a specific framework required, look for more generic project generators if availalbe and build on top of these.
 

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

@@ -1,12 +1,10 @@
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */ import { addDependenciesToPackageJson, joinPathFragments, readJson, updateJson, writeJson } from "@nx/devkit";
-import PackageJson from "../../../package.json" with {
-    type: 'json'
-};
+ */ import { joinPathFragments, updateJson, writeJson } from "@nx/devkit";
+import { addDependenciesToPackageJson } from "../../utils/dependencies.js";
 import { isEsmWorkspace } from "../../utils/module-format.js";
-import { readProjectConfigurationUnqualified } from "../../utils/nx.js";
+import { nxPluginSelfDependency, readProjectConfigurationUnqualified } from "../../utils/nx.js";
 import { withVersions } from "../../utils/versions.js";
 /**
  * Configures a TypeScript project as an Nx Plugin
@@ -41,16 +39,16 @@ import { withVersions } from "../../utils/versions.js";
         pkg.generators ??= './generators.json';
         return pkg;
     });
-    const rootPackageJson = tree.exists('package.json') ? readJson(tree, 'package.json') : undefined;
-    const isNxPluginForAws = rootPackageJson?.name === '@aws/nx-plugin-source';
-    if (!isNxPluginForAws) {
+    const selfDependency = nxPluginSelfDependency(tree);
+    // Empty inside the plugin's own monorepo, where the plugin is the source
+    // rather than a dependency.
+    if (Object.keys(selfDependency).length > 0) {
         // Add the required dependencies to the root package.json, and project's package.json
         const deps = {
             ...withVersions([
                 '@nx/devkit'
             ]),
-            // Include dependency on @aws/nx-plugin
-            [PackageJson.name]: `^${PackageJson.version}`
+            ...selfDependency
         };
         // Generated workspaces are `"type": "module"`, so Nx loads the plugin's
         // `.ts` generators as ESM via Node's native type stripping — no swc/ts-node

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/nx-plugin/utils.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  addDependenciesToPackageJson,\n  joinPathFragments,\n  readJson,\n  type Tree,\n  updateJson,\n  writeJson,\n} from '@nx/devkit';\nimport PackageJson from '../../../package.json' with { type: 'json' };\nimport { isEsmWorkspace } from '../../utils/module-format';\nimport { readProjectConfigurationUnqualified } from '../../utils/nx';\nimport { withVersions } from '../../utils/versions';\n\n/**\n * Configures a TypeScript project as an Nx Plugin\n */\nexport const configureTsProjectAsNxPlugin = (\n  tree: Tree,\n  projectName: string,\n) => {\n  const project = readProjectConfigurationUnqualified(tree, projectName);\n\n  const tsConfigPath = joinPathFragments(project.root, 'tsconfig.json');\n  if (!tree.exists(tsConfigPath)) {\n    throw new Error(\n      `Selected plugin project ${projectName} is not a TypeScript project`,\n    );\n  }\n\n  // Create an empty generators.json if one dosn't exist\n  const generatorsJsonPath = joinPathFragments(project.root, 'generators.json');\n  if (!tree.exists(generatorsJsonPath)) {\n    writeJson(tree, generatorsJsonPath, {\n      generators: {},\n    });\n  }\n\n  // Create a package.json if one doesn't exist, and configure \"type\", \"main\"\n  // and \"generators\"\n  const pluginPackageJsonPath = joinPathFragments(project.root, 'package.json');\n  if (!tree.exists(pluginPackageJsonPath)) {\n    writeJson(tree, pluginPackageJsonPath, {\n      name: project.name,\n    });\n  }\n  const esm = isEsmWorkspace(tree);\n  updateJson(tree, pluginPackageJsonPath, (pkg) => {\n    // Match the plugin's module system to the workspace. Nx loads `.ts`\n    // generators via Node's native type stripping, as ESM (workspace root is\n    // `type: module`) or CommonJS accordingly.\n    pkg.type ??= esm ? 'module' : 'commonjs';\n    pkg.main ??= esm ? './src/index.js' : './src/index';\n    pkg.generators ??= './generators.json';\n    return pkg;\n  });\n\n  const rootPackageJson = tree.exists('package.json')\n    ? readJson(tree, 'package.json')\n    : undefined;\n  const isNxPluginForAws = rootPackageJson?.name === '@aws/nx-plugin-source';\n\n  if (!isNxPluginForAws) {\n    // Add the required dependencies to the root package.json, and project's package.json\n    const deps = {\n      ...withVersions(['@nx/devkit']),\n      // Include dependency on @aws/nx-plugin\n      [PackageJson.name]: `^${PackageJson.version}`,\n    };\n    // Generated workspaces are `\"type\": \"module\"`, so Nx loads the plugin's\n    // `.ts` generators as ESM via Node's native type stripping — no swc/ts-node\n    // transpiler is required.\n    addDependenciesToPackageJson(tree, {}, deps);\n    addDependenciesToPackageJson(tree, deps, {}, pluginPackageJsonPath);\n  }\n};\n"],"names":["addDependenciesToPackageJson","joinPathFragments","readJson","updateJson","writeJson","PackageJson","type","isEsmWorkspace","readProjectConfigurationUnqualified","withVersions","configureTsProjectAsNxPlugin","tree","projectName","project","tsConfigPath","root","exists","Error","generatorsJsonPath","generators","pluginPackageJsonPath","name","esm","pkg","main","rootPackageJson","undefined","isNxPluginForAws","deps","version"],"mappings":"AAAA;;;CAGC,GACD,SACEA,4BAA4B,EAC5BC,iBAAiB,EACjBC,QAAQ,EAERC,UAAU,EACVC,SAAS,QACJ,aAAa;AACpB,OAAOC,iBAAiB,6BAA6B;IAAEC,MAAM;AAAO,EAAE;AACtE,SAASC,cAAc,QAAQ,+BAA4B;AAC3D,SAASC,mCAAmC,QAAQ,oBAAiB;AACrE,SAASC,YAAY,QAAQ,0BAAuB;AAEpD;;CAEC,GACD,OAAO,MAAMC,+BAA+B,CAC1CC,MACAC;IAEA,MAAMC,UAAUL,oCAAoCG,MAAMC;IAE1D,MAAME,eAAeb,kBAAkBY,QAAQE,IAAI,EAAE;IACrD,IAAI,CAACJ,KAAKK,MAAM,CAACF,eAAe;QAC9B,MAAM,IAAIG,MACR,CAAC,wBAAwB,EAAEL,YAAY,4BAA4B,CAAC;IAExE;IAEA,sDAAsD;IACtD,MAAMM,qBAAqBjB,kBAAkBY,QAAQE,IAAI,EAAE;IAC3D,IAAI,CAACJ,KAAKK,MAAM,CAACE,qBAAqB;QACpCd,UAAUO,MAAMO,oBAAoB;YAClCC,YAAY,CAAC;QACf;IACF;IAEA,2EAA2E;IAC3E,mBAAmB;IACnB,MAAMC,wBAAwBnB,kBAAkBY,QAAQE,IAAI,EAAE;IAC9D,IAAI,CAACJ,KAAKK,MAAM,CAACI,wBAAwB;QACvChB,UAAUO,MAAMS,uBAAuB;YACrCC,MAAMR,QAAQQ,IAAI;QACpB;IACF;IACA,MAAMC,MAAMf,eAAeI;IAC3BR,WAAWQ,MAAMS,uBAAuB,CAACG;QACvC,oEAAoE;QACpE,yEAAyE;QACzE,2CAA2C;QAC3CA,IAAIjB,IAAI,KAAKgB,MAAM,WAAW;QAC9BC,IAAIC,IAAI,KAAKF,MAAM,mBAAmB;QACtCC,IAAIJ,UAAU,KAAK;QACnB,OAAOI;IACT;IAEA,MAAME,kBAAkBd,KAAKK,MAAM,CAAC,kBAChCd,SAASS,MAAM,kBACfe;IACJ,MAAMC,mBAAmBF,iBAAiBJ,SAAS;IAEnD,IAAI,CAACM,kBAAkB;QACrB,qFAAqF;QACrF,MAAMC,OAAO;YACX,GAAGnB,aAAa;gBAAC;aAAa,CAAC;YAC/B,uCAAuC;YACvC,CAACJ,YAAYgB,IAAI,CAAC,EAAE,CAAC,CAAC,EAAEhB,YAAYwB,OAAO,EAAE;QAC/C;QACA,wEAAwE;QACxE,4EAA4E;QAC5E,0BAA0B;QAC1B7B,6BAA6BW,MAAM,CAAC,GAAGiB;QACvC5B,6BAA6BW,MAAMiB,MAAM,CAAC,GAAGR;IAC/C;AACF,EAAE"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/nx-plugin/utils.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  joinPathFragments,\n  type Tree,\n  updateJson,\n  writeJson,\n} from '@nx/devkit';\nimport { addDependenciesToPackageJson } from '../../utils/dependencies';\nimport { isEsmWorkspace } from '../../utils/module-format';\nimport {\n  nxPluginSelfDependency,\n  readProjectConfigurationUnqualified,\n} from '../../utils/nx';\nimport { withVersions } from '../../utils/versions';\n\n/**\n * Configures a TypeScript project as an Nx Plugin\n */\nexport const configureTsProjectAsNxPlugin = (\n  tree: Tree,\n  projectName: string,\n) => {\n  const project = readProjectConfigurationUnqualified(tree, projectName);\n\n  const tsConfigPath = joinPathFragments(project.root, 'tsconfig.json');\n  if (!tree.exists(tsConfigPath)) {\n    throw new Error(\n      `Selected plugin project ${projectName} is not a TypeScript project`,\n    );\n  }\n\n  // Create an empty generators.json if one dosn't exist\n  const generatorsJsonPath = joinPathFragments(project.root, 'generators.json');\n  if (!tree.exists(generatorsJsonPath)) {\n    writeJson(tree, generatorsJsonPath, {\n      generators: {},\n    });\n  }\n\n  // Create a package.json if one doesn't exist, and configure \"type\", \"main\"\n  // and \"generators\"\n  const pluginPackageJsonPath = joinPathFragments(project.root, 'package.json');\n  if (!tree.exists(pluginPackageJsonPath)) {\n    writeJson(tree, pluginPackageJsonPath, {\n      name: project.name,\n    });\n  }\n  const esm = isEsmWorkspace(tree);\n  updateJson(tree, pluginPackageJsonPath, (pkg) => {\n    // Match the plugin's module system to the workspace. Nx loads `.ts`\n    // generators via Node's native type stripping, as ESM (workspace root is\n    // `type: module`) or CommonJS accordingly.\n    pkg.type ??= esm ? 'module' : 'commonjs';\n    pkg.main ??= esm ? './src/index.js' : './src/index';\n    pkg.generators ??= './generators.json';\n    return pkg;\n  });\n\n  const selfDependency = nxPluginSelfDependency(tree);\n\n  // Empty inside the plugin's own monorepo, where the plugin is the source\n  // rather than a dependency.\n  if (Object.keys(selfDependency).length > 0) {\n    // Add the required dependencies to the root package.json, and project's package.json\n    const deps = {\n      ...withVersions(['@nx/devkit']),\n      ...selfDependency,\n    };\n    // Generated workspaces are `\"type\": \"module\"`, so Nx loads the plugin's\n    // `.ts` generators as ESM via Node's native type stripping — no swc/ts-node\n    // transpiler is required.\n    addDependenciesToPackageJson(tree, {}, deps);\n    addDependenciesToPackageJson(tree, deps, {}, pluginPackageJsonPath);\n  }\n};\n"],"names":["joinPathFragments","updateJson","writeJson","addDependenciesToPackageJson","isEsmWorkspace","nxPluginSelfDependency","readProjectConfigurationUnqualified","withVersions","configureTsProjectAsNxPlugin","tree","projectName","project","tsConfigPath","root","exists","Error","generatorsJsonPath","generators","pluginPackageJsonPath","name","esm","pkg","type","main","selfDependency","Object","keys","length","deps"],"mappings":"AAAA;;;CAGC,GACD,SACEA,iBAAiB,EAEjBC,UAAU,EACVC,SAAS,QACJ,aAAa;AACpB,SAASC,4BAA4B,QAAQ,8BAA2B;AACxE,SAASC,cAAc,QAAQ,+BAA4B;AAC3D,SACEC,sBAAsB,EACtBC,mCAAmC,QAC9B,oBAAiB;AACxB,SAASC,YAAY,QAAQ,0BAAuB;AAEpD;;CAEC,GACD,OAAO,MAAMC,+BAA+B,CAC1CC,MACAC;IAEA,MAAMC,UAAUL,oCAAoCG,MAAMC;IAE1D,MAAME,eAAeZ,kBAAkBW,QAAQE,IAAI,EAAE;IACrD,IAAI,CAACJ,KAAKK,MAAM,CAACF,eAAe;QAC9B,MAAM,IAAIG,MACR,CAAC,wBAAwB,EAAEL,YAAY,4BAA4B,CAAC;IAExE;IAEA,sDAAsD;IACtD,MAAMM,qBAAqBhB,kBAAkBW,QAAQE,IAAI,EAAE;IAC3D,IAAI,CAACJ,KAAKK,MAAM,CAACE,qBAAqB;QACpCd,UAAUO,MAAMO,oBAAoB;YAClCC,YAAY,CAAC;QACf;IACF;IAEA,2EAA2E;IAC3E,mBAAmB;IACnB,MAAMC,wBAAwBlB,kBAAkBW,QAAQE,IAAI,EAAE;IAC9D,IAAI,CAACJ,KAAKK,MAAM,CAACI,wBAAwB;QACvChB,UAAUO,MAAMS,uBAAuB;YACrCC,MAAMR,QAAQQ,IAAI;QACpB;IACF;IACA,MAAMC,MAAMhB,eAAeK;IAC3BR,WAAWQ,MAAMS,uBAAuB,CAACG;QACvC,oEAAoE;QACpE,yEAAyE;QACzE,2CAA2C;QAC3CA,IAAIC,IAAI,KAAKF,MAAM,WAAW;QAC9BC,IAAIE,IAAI,KAAKH,MAAM,mBAAmB;QACtCC,IAAIJ,UAAU,KAAK;QACnB,OAAOI;IACT;IAEA,MAAMG,iBAAiBnB,uBAAuBI;IAE9C,yEAAyE;IACzE,4BAA4B;IAC5B,IAAIgB,OAAOC,IAAI,CAACF,gBAAgBG,MAAM,GAAG,GAAG;QAC1C,qFAAqF;QACrF,MAAMC,OAAO;YACX,GAAGrB,aAAa;gBAAC;aAAa,CAAC;YAC/B,GAAGiB,cAAc;QACnB;QACA,wEAAwE;QACxE,4EAA4E;QAC5E,0BAA0B;QAC1BrB,6BAA6BM,MAAM,CAAC,GAAGmB;QACvCzB,6BAA6BM,MAAMmB,MAAM,CAAC,GAAGV;IAC/C;AACF,EAAE"}

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

@@ -105,6 +105,7 @@ exports[`ts#rdb generator > should add mysql prisma dependencies when engine is
 
 exports[`ts#rdb generator > should add mysql prisma dependencies when engine is MySQL > packages/db/src/migration-handler.ts 1`] = `
 "import { execFile } from 'node:child_process';
+import { join } from 'node:path';
 import { promisify } from 'node:util';
 import { getDatabaseSecret, withConnectionRetry } from './utils.js';
 
@@ -122,7 +123,8 @@ const buildDatabaseUrl = async (): Promise<string> => {
 export const handler = async () => {
   await withConnectionRetry(async () => {
     const databaseUrl = await buildDatabaseUrl();
-    await promisify(execFile)('npx', ['prisma', 'migrate', 'deploy'], {
+    const prisma = join(__dirname, 'node_modules', '.bin', 'prisma');
+    await promisify(execFile)(prisma, ['migrate', 'deploy'], {
       cwd: __dirname,
       env: {
         ...process.env,
@@ -3882,6 +3884,7 @@ exports[`ts#rdb generator > should generate the aurora shared construct > packag
 
 exports[`ts#rdb generator > should generate the aurora shared construct > packages/db/src/migration-handler.ts 1`] = `
 "import { execFile } from 'node:child_process';
+import { join } from 'node:path';
 import { promisify } from 'node:util';
 import { getDatabaseSecret, withConnectionRetry } from './utils.js';
 
@@ -3899,7 +3902,8 @@ const buildDatabaseUrl = async (): Promise<string> => {
 export const handler = async () => {
   await withConnectionRetry(async () => {
     const databaseUrl = await buildDatabaseUrl();
-    await promisify(execFile)('npx', ['prisma', 'migrate', 'deploy'], {
+    const prisma = join(__dirname, 'node_modules', '.bin', 'prisma');
+    await promisify(execFile)(prisma, ['migrate', 'deploy'], {
       cwd: __dirname,
       env: {
         ...process.env,
@@ -4680,9 +4684,13 @@ WORKDIR \${LAMBDA_TASK_ROOT}
 
 # npm blocks dependency install scripts by default; allow prisma's so its
 # postinstall downloads the schema-engine binary needed to run migrations.
+# npm is removed once prisma is installed — the handler runs prisma's own
+# binary directly, and npm's bundled dependencies would otherwise carry known
+# HIGH/CRITICAL vulnerabilities into the image.
 RUN printf 'allow-scripts[]=prisma\\nallow-scripts[]=@prisma/engines\\n' > .npmrc \\
     && npm install prisma@7.8.0 \\
-    && rm .npmrc
+    && rm .npmrc \\
+    && npm uninstall -g npm
 
 COPY index.js ./index.js
 COPY prisma ./prisma

package/src/ts/rdb/agent-connection/generator.js

@@ -7,7 +7,6 @@ import { addDestructuredImport, applyGritQL } from "../../../utils/ast.js";
 import { formatFilesInSubtree } from "../../../utils/format.js";
 import { addGeneratorMetricsIfApplicable } from "../../../utils/metrics.js";
 import { pascalCase } from "../../../utils/names.js";
-import { toScopeAlias } from "../../../utils/npm-scope.js";
 import { addDependencyToTargetIfNotPresent, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../../utils/nx.js";
 import { injectRdsCaBundleIntoDockerfile } from "../utils.js";
 export const TS_RDB_AGENT_CONNECTION_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
@@ -28,7 +27,7 @@ export const tsRdbAgentConnectionGenerator = async (tree, options)=>{
     const rdbBaseName = targetProject.name.split('/').pop();
     const rdbNameCamel = camelCase(rdbBaseName);
     const rdbNamePascal = pascalCase(rdbBaseName);
-    const rdbPackageAlias = toScopeAlias(targetProject.name);
+    const rdbPackageAlias = targetProject.name;
     const getterAlias = `getPrisma as get${rdbNamePascal}`;
     const agentSourceDir = joinPathFragments(sourceProject.root, 'src', agentName);
     const agentPath = joinPathFragments(agentSourceDir, 'agent.ts');

package/src/ts/rdb/agent-connection/generator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/ts/rdb/agent-connection/generator.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  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport camelCase from 'lodash.camelcase';\nimport { addDestructuredImport, applyGritQL } from '../../../utils/ast';\nimport { formatFilesInSubtree } from '../../../utils/format';\nimport { addGeneratorMetricsIfApplicable } from '../../../utils/metrics';\nimport { pascalCase } from '../../../utils/names';\nimport { toScopeAlias } from '../../../utils/npm-scope';\nimport {\n  addDependencyToTargetIfNotPresent,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../../utils/nx';\nimport { injectRdsCaBundleIntoDockerfile } from '../utils';\nimport type { TsRdbAgentConnectionGeneratorSchema } from './schema';\n\nexport const TS_RDB_AGENT_CONNECTION_GENERATOR_INFO: NxGeneratorInfo =\n  getGeneratorInfo(import.meta.filename);\n\nexport const tsRdbAgentConnectionGenerator = async (\n  tree: Tree,\n  options: TsRdbAgentConnectionGeneratorSchema,\n): Promise<void> => {\n  const sourceProject = readProjectConfigurationUnqualified(\n    tree,\n    options.sourceProject,\n  );\n  const targetProject = readProjectConfigurationUnqualified(\n    tree,\n    options.targetProject,\n  );\n\n  const agentName = options.sourceComponent?.name ?? 'agent';\n  const devTarget = `${agentName}-dev`;\n\n  if (sourceProject.targets?.[devTarget]) {\n    addDependencyToTargetIfNotPresent(sourceProject, devTarget, {\n      projects: [targetProject.name],\n      target: 'dev',\n    });\n    updateProjectConfiguration(tree, sourceProject.name, sourceProject);\n  }\n\n  const rdbBaseName = targetProject.name.split('/').pop();\n  const rdbNameCamel = camelCase(rdbBaseName);\n  const rdbNamePascal = pascalCase(rdbBaseName);\n  const rdbPackageAlias = toScopeAlias(targetProject.name);\n  const getterAlias = `getPrisma as get${rdbNamePascal}`;\n\n  const agentSourceDir = joinPathFragments(\n    sourceProject.root,\n    'src',\n    agentName,\n  );\n  const agentPath = joinPathFragments(agentSourceDir, 'agent.ts');\n\n  // Dockerfile: install RDS CA bundle for direct Aurora SSL connections\n  const dockerfilePath = joinPathFragments(agentSourceDir, 'Dockerfile');\n  injectRdsCaBundleIntoDockerfile(tree, dockerfilePath);\n\n  if (tree.exists(agentPath)) {\n    await addDestructuredImport(\n      tree,\n      agentPath,\n      [getterAlias],\n      rdbPackageAlias,\n    );\n\n    // Block body form: export const getAgent = async () => { ... }\n    await applyGritQL(\n      tree,\n      agentPath,\n      `\\`export const getAgent = async () => { $body }\\` => raw\\`export const getAgent = async () => {\n  const ${rdbNameCamel} = await get${rdbNamePascal}();\n  $body\n}\\` where { $body <: not some \\`const ${rdbNameCamel} = await get${rdbNamePascal}()\\` }`,\n    );\n\n    // Expression body form: export const getAgent = async () => expr\n    await applyGritQL(\n      tree,\n      agentPath,\n      `\\`export const getAgent = async () => $expr\\` => raw\\`export const getAgent = async () => {\n  const ${rdbNameCamel} = await get${rdbNamePascal}();\n  return $expr;\n}\\` where { $expr <: not \\`{ $_ }\\` }`,\n    );\n\n    // Add $on error handler after the db declaration.\n    // Done via string replacement because GritQL treats $on as a metavariable.\n    const dbDecl = `const ${rdbNameCamel} = await get${rdbNamePascal}();`;\n    const onCall = `${rdbNameCamel}.$on('error', console.error);`;\n    const content = tree.read(agentPath, 'utf-8')!;\n    if (content.includes(dbDecl) && !content.includes(`${rdbNameCamel}.$on`)) {\n      tree.write(agentPath, content.replace(dbDecl, `${dbDecl}\\n  ${onCall}`));\n    }\n  }\n\n  await addGeneratorMetricsIfApplicable(tree, [\n    TS_RDB_AGENT_CONNECTION_GENERATOR_INFO,\n  ]);\n  await formatFilesInSubtree(tree);\n};\n\nexport default tsRdbAgentConnectionGenerator;\n"],"names":["joinPathFragments","updateProjectConfiguration","camelCase","addDestructuredImport","applyGritQL","formatFilesInSubtree","addGeneratorMetricsIfApplicable","pascalCase","toScopeAlias","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","injectRdsCaBundleIntoDockerfile","TS_RDB_AGENT_CONNECTION_GENERATOR_INFO","filename","tsRdbAgentConnectionGenerator","tree","options","sourceProject","targetProject","agentName","sourceComponent","name","devTarget","targets","projects","target","rdbBaseName","split","pop","rdbNameCamel","rdbNamePascal","rdbPackageAlias","getterAlias","agentSourceDir","root","agentPath","dockerfilePath","exists","dbDecl","onCall","content","read","includes","write","replace"],"mappings":"AAAA;;;CAGC,GACD,SACEA,iBAAiB,EAEjBC,0BAA0B,QACrB,aAAa;AACpB,OAAOC,eAAe,mBAAmB;AACzC,SAASC,qBAAqB,EAAEC,WAAW,QAAQ,wBAAqB;AACxE,SAASC,oBAAoB,QAAQ,2BAAwB;AAC7D,SAASC,+BAA+B,QAAQ,4BAAyB;AACzE,SAASC,UAAU,QAAQ,0BAAuB;AAClD,SAASC,YAAY,QAAQ,8BAA2B;AACxD,SACEC,iCAAiC,EACjCC,gBAAgB,EAEhBC,mCAAmC,QAC9B,uBAAoB;AAC3B,SAASC,+BAA+B,QAAQ,cAAW;AAG3D,OAAO,MAAMC,yCACXH,iBAAiB,YAAYI,QAAQ,EAAE;AAEzC,OAAO,MAAMC,gCAAgC,OAC3CC,MACAC;IAEA,MAAMC,gBAAgBP,oCACpBK,MACAC,QAAQC,aAAa;IAEvB,MAAMC,gBAAgBR,oCACpBK,MACAC,QAAQE,aAAa;IAGvB,MAAMC,YAAYH,QAAQI,eAAe,EAAEC,QAAQ;IACnD,MAAMC,YAAY,GAAGH,UAAU,IAAI,CAAC;IAEpC,IAAIF,cAAcM,OAAO,EAAE,CAACD,UAAU,EAAE;QACtCd,kCAAkCS,eAAeK,WAAW;YAC1DE,UAAU;gBAACN,cAAcG,IAAI;aAAC;YAC9BI,QAAQ;QACV;QACAzB,2BAA2Be,MAAME,cAAcI,IAAI,EAAEJ;IACvD;IAEA,MAAMS,cAAcR,cAAcG,IAAI,CAACM,KAAK,CAAC,KAAKC,GAAG;IACrD,MAAMC,eAAe5B,UAAUyB;IAC/B,MAAMI,gBAAgBxB,WAAWoB;IACjC,MAAMK,kBAAkBxB,aAAaW,cAAcG,IAAI;IACvD,MAAMW,cAAc,CAAC,gBAAgB,EAAEF,eAAe;IAEtD,MAAMG,iBAAiBlC,kBACrBkB,cAAciB,IAAI,EAClB,OACAf;IAEF,MAAMgB,YAAYpC,kBAAkBkC,gBAAgB;IAEpD,sEAAsE;IACtE,MAAMG,iBAAiBrC,kBAAkBkC,gBAAgB;IACzDtB,gCAAgCI,MAAMqB;IAEtC,IAAIrB,KAAKsB,MAAM,CAACF,YAAY;QAC1B,MAAMjC,sBACJa,MACAoB,WACA;YAACH;SAAY,EACbD;QAGF,+DAA+D;QAC/D,MAAM5B,YACJY,MACAoB,WACA,CAAC;QACC,EAAEN,aAAa,YAAY,EAAEC,cAAc;;sCAEb,EAAED,aAAa,YAAY,EAAEC,cAAc,MAAM,CAAC;QAGpF,iEAAiE;QACjE,MAAM3B,YACJY,MACAoB,WACA,CAAC;QACC,EAAEN,aAAa,YAAY,EAAEC,cAAc;;qCAEd,CAAC;QAGlC,kDAAkD;QAClD,2EAA2E;QAC3E,MAAMQ,SAAS,CAAC,MAAM,EAAET,aAAa,YAAY,EAAEC,cAAc,GAAG,CAAC;QACrE,MAAMS,SAAS,GAAGV,aAAa,6BAA6B,CAAC;QAC7D,MAAMW,UAAUzB,KAAK0B,IAAI,CAACN,WAAW;QACrC,IAAIK,QAAQE,QAAQ,CAACJ,WAAW,CAACE,QAAQE,QAAQ,CAAC,GAAGb,aAAa,IAAI,CAAC,GAAG;YACxEd,KAAK4B,KAAK,CAACR,WAAWK,QAAQI,OAAO,CAACN,QAAQ,GAAGA,OAAO,IAAI,EAAEC,QAAQ;QACxE;IACF;IAEA,MAAMlC,gCAAgCU,MAAM;QAC1CH;KACD;IACD,MAAMR,qBAAqBW;AAC7B,EAAE;AAEF,eAAeD,8BAA8B"}
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/ts/rdb/agent-connection/generator.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  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport camelCase from 'lodash.camelcase';\nimport { addDestructuredImport, applyGritQL } from '../../../utils/ast';\nimport { formatFilesInSubtree } from '../../../utils/format';\nimport { addGeneratorMetricsIfApplicable } from '../../../utils/metrics';\nimport { pascalCase } from '../../../utils/names';\nimport {\n  addDependencyToTargetIfNotPresent,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../../utils/nx';\nimport { injectRdsCaBundleIntoDockerfile } from '../utils';\nimport type { TsRdbAgentConnectionGeneratorSchema } from './schema';\n\nexport const TS_RDB_AGENT_CONNECTION_GENERATOR_INFO: NxGeneratorInfo =\n  getGeneratorInfo(import.meta.filename);\n\nexport const tsRdbAgentConnectionGenerator = async (\n  tree: Tree,\n  options: TsRdbAgentConnectionGeneratorSchema,\n): Promise<void> => {\n  const sourceProject = readProjectConfigurationUnqualified(\n    tree,\n    options.sourceProject,\n  );\n  const targetProject = readProjectConfigurationUnqualified(\n    tree,\n    options.targetProject,\n  );\n\n  const agentName = options.sourceComponent?.name ?? 'agent';\n  const devTarget = `${agentName}-dev`;\n\n  if (sourceProject.targets?.[devTarget]) {\n    addDependencyToTargetIfNotPresent(sourceProject, devTarget, {\n      projects: [targetProject.name],\n      target: 'dev',\n    });\n    updateProjectConfiguration(tree, sourceProject.name, sourceProject);\n  }\n\n  const rdbBaseName = targetProject.name.split('/').pop();\n  const rdbNameCamel = camelCase(rdbBaseName);\n  const rdbNamePascal = pascalCase(rdbBaseName);\n  const rdbPackageAlias = targetProject.name;\n  const getterAlias = `getPrisma as get${rdbNamePascal}`;\n\n  const agentSourceDir = joinPathFragments(\n    sourceProject.root,\n    'src',\n    agentName,\n  );\n  const agentPath = joinPathFragments(agentSourceDir, 'agent.ts');\n\n  // Dockerfile: install RDS CA bundle for direct Aurora SSL connections\n  const dockerfilePath = joinPathFragments(agentSourceDir, 'Dockerfile');\n  injectRdsCaBundleIntoDockerfile(tree, dockerfilePath);\n\n  if (tree.exists(agentPath)) {\n    await addDestructuredImport(\n      tree,\n      agentPath,\n      [getterAlias],\n      rdbPackageAlias,\n    );\n\n    // Block body form: export const getAgent = async () => { ... }\n    await applyGritQL(\n      tree,\n      agentPath,\n      `\\`export const getAgent = async () => { $body }\\` => raw\\`export const getAgent = async () => {\n  const ${rdbNameCamel} = await get${rdbNamePascal}();\n  $body\n}\\` where { $body <: not some \\`const ${rdbNameCamel} = await get${rdbNamePascal}()\\` }`,\n    );\n\n    // Expression body form: export const getAgent = async () => expr\n    await applyGritQL(\n      tree,\n      agentPath,\n      `\\`export const getAgent = async () => $expr\\` => raw\\`export const getAgent = async () => {\n  const ${rdbNameCamel} = await get${rdbNamePascal}();\n  return $expr;\n}\\` where { $expr <: not \\`{ $_ }\\` }`,\n    );\n\n    // Add $on error handler after the db declaration.\n    // Done via string replacement because GritQL treats $on as a metavariable.\n    const dbDecl = `const ${rdbNameCamel} = await get${rdbNamePascal}();`;\n    const onCall = `${rdbNameCamel}.$on('error', console.error);`;\n    const content = tree.read(agentPath, 'utf-8')!;\n    if (content.includes(dbDecl) && !content.includes(`${rdbNameCamel}.$on`)) {\n      tree.write(agentPath, content.replace(dbDecl, `${dbDecl}\\n  ${onCall}`));\n    }\n  }\n\n  await addGeneratorMetricsIfApplicable(tree, [\n    TS_RDB_AGENT_CONNECTION_GENERATOR_INFO,\n  ]);\n  await formatFilesInSubtree(tree);\n};\n\nexport default tsRdbAgentConnectionGenerator;\n"],"names":["joinPathFragments","updateProjectConfiguration","camelCase","addDestructuredImport","applyGritQL","formatFilesInSubtree","addGeneratorMetricsIfApplicable","pascalCase","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","injectRdsCaBundleIntoDockerfile","TS_RDB_AGENT_CONNECTION_GENERATOR_INFO","filename","tsRdbAgentConnectionGenerator","tree","options","sourceProject","targetProject","agentName","sourceComponent","name","devTarget","targets","projects","target","rdbBaseName","split","pop","rdbNameCamel","rdbNamePascal","rdbPackageAlias","getterAlias","agentSourceDir","root","agentPath","dockerfilePath","exists","dbDecl","onCall","content","read","includes","write","replace"],"mappings":"AAAA;;;CAGC,GACD,SACEA,iBAAiB,EAEjBC,0BAA0B,QACrB,aAAa;AACpB,OAAOC,eAAe,mBAAmB;AACzC,SAASC,qBAAqB,EAAEC,WAAW,QAAQ,wBAAqB;AACxE,SAASC,oBAAoB,QAAQ,2BAAwB;AAC7D,SAASC,+BAA+B,QAAQ,4BAAyB;AACzE,SAASC,UAAU,QAAQ,0BAAuB;AAClD,SACEC,iCAAiC,EACjCC,gBAAgB,EAEhBC,mCAAmC,QAC9B,uBAAoB;AAC3B,SAASC,+BAA+B,QAAQ,cAAW;AAG3D,OAAO,MAAMC,yCACXH,iBAAiB,YAAYI,QAAQ,EAAE;AAEzC,OAAO,MAAMC,gCAAgC,OAC3CC,MACAC;IAEA,MAAMC,gBAAgBP,oCACpBK,MACAC,QAAQC,aAAa;IAEvB,MAAMC,gBAAgBR,oCACpBK,MACAC,QAAQE,aAAa;IAGvB,MAAMC,YAAYH,QAAQI,eAAe,EAAEC,QAAQ;IACnD,MAAMC,YAAY,GAAGH,UAAU,IAAI,CAAC;IAEpC,IAAIF,cAAcM,OAAO,EAAE,CAACD,UAAU,EAAE;QACtCd,kCAAkCS,eAAeK,WAAW;YAC1DE,UAAU;gBAACN,cAAcG,IAAI;aAAC;YAC9BI,QAAQ;QACV;QACAxB,2BAA2Bc,MAAME,cAAcI,IAAI,EAAEJ;IACvD;IAEA,MAAMS,cAAcR,cAAcG,IAAI,CAACM,KAAK,CAAC,KAAKC,GAAG;IACrD,MAAMC,eAAe3B,UAAUwB;IAC/B,MAAMI,gBAAgBvB,WAAWmB;IACjC,MAAMK,kBAAkBb,cAAcG,IAAI;IAC1C,MAAMW,cAAc,CAAC,gBAAgB,EAAEF,eAAe;IAEtD,MAAMG,iBAAiBjC,kBACrBiB,cAAciB,IAAI,EAClB,OACAf;IAEF,MAAMgB,YAAYnC,kBAAkBiC,gBAAgB;IAEpD,sEAAsE;IACtE,MAAMG,iBAAiBpC,kBAAkBiC,gBAAgB;IACzDtB,gCAAgCI,MAAMqB;IAEtC,IAAIrB,KAAKsB,MAAM,CAACF,YAAY;QAC1B,MAAMhC,sBACJY,MACAoB,WACA;YAACH;SAAY,EACbD;QAGF,+DAA+D;QAC/D,MAAM3B,YACJW,MACAoB,WACA,CAAC;QACC,EAAEN,aAAa,YAAY,EAAEC,cAAc;;sCAEb,EAAED,aAAa,YAAY,EAAEC,cAAc,MAAM,CAAC;QAGpF,iEAAiE;QACjE,MAAM1B,YACJW,MACAoB,WACA,CAAC;QACC,EAAEN,aAAa,YAAY,EAAEC,cAAc;;qCAEd,CAAC;QAGlC,kDAAkD;QAClD,2EAA2E;QAC3E,MAAMQ,SAAS,CAAC,MAAM,EAAET,aAAa,YAAY,EAAEC,cAAc,GAAG,CAAC;QACrE,MAAMS,SAAS,GAAGV,aAAa,6BAA6B,CAAC;QAC7D,MAAMW,UAAUzB,KAAK0B,IAAI,CAACN,WAAW;QACrC,IAAIK,QAAQE,QAAQ,CAACJ,WAAW,CAACE,QAAQE,QAAQ,CAAC,GAAGb,aAAa,IAAI,CAAC,GAAG;YACxEd,KAAK4B,KAAK,CAACR,WAAWK,QAAQI,OAAO,CAACN,QAAQ,GAAGA,OAAO,IAAI,EAAEC,QAAQ;QACxE;IACF;IAEA,MAAMjC,gCAAgCS,MAAM;QAC1CH;KACD;IACD,MAAMP,qBAAqBU;AAC7B,EAAE;AAEF,eAAeD,8BAA8B"}

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

@@ -14,9 +14,13 @@ WORKDIR ${LAMBDA_TASK_ROOT}
 
 # npm blocks dependency install scripts by default; allow prisma's so its
 # postinstall downloads the schema-engine binary needed to run migrations.
+# npm is removed once prisma is installed — the handler runs prisma's own
+# binary directly, and npm's bundled dependencies would otherwise carry known
+# HIGH/CRITICAL vulnerabilities into the image.
 RUN printf 'allow-scripts[]=prisma\nallow-scripts[]=@prisma/engines\n' > .npmrc \
     && npm install prisma@<%= prismaVersion %> \
-    && rm .npmrc
+    && rm .npmrc \
+    && npm uninstall -g npm
 
 COPY index.js ./index.js
 COPY prisma ./prisma

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

@@ -1,4 +1,5 @@
 import { execFile } from 'node:child_process';
+import { join } from 'node:path';
 import { promisify } from 'node:util';
 import { getDatabaseSecret, withConnectionRetry } from './utils<% if (esm) { %>.js<% } %>';
 
@@ -16,7 +17,8 @@ const buildDatabaseUrl = async (): Promise<string> => {
 export const handler = async () => {
   await withConnectionRetry(async () => {
     const databaseUrl = await buildDatabaseUrl();
-    await promisify(execFile)('npx', ['prisma', 'migrate', 'deploy'], {
+    const prisma = join(__dirname, 'node_modules', '.bin', 'prisma');
+    await promisify(execFile)(prisma, ['migrate', 'deploy'], {
       cwd: __dirname,
       env: {
         ...process.env,

package/src/ts/rdb/generator.js

@@ -2,10 +2,11 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */ import { relative } from "node:path";
-import { addDependenciesToPackageJson, generateFiles, joinPathFragments, readProjectConfiguration, updateJson, updateProjectConfiguration } from "@nx/devkit";
+import { generateFiles, joinPathFragments, readProjectConfiguration, updateJson, updateProjectConfiguration } from "@nx/devkit";
 import { addTypeScriptBundleTarget } from "../../utils/bundle/bundle.js";
 import { resolveContainers } from "../../utils/containers.js";
-import { addDockerScanTarget } from "../../utils/docker.js";
+import { addDependenciesToPackageJson } from "../../utils/dependencies.js";
+import { addDockerScanTarget, nodeImageVersions } from "../../utils/docker.js";
 import { formatFilesInSubtree } from "../../utils/format.js";
 import { FsCommands } from "../../utils/fs.js";
 import { updateGitIgnore } from "../../utils/git.js";
@@ -14,7 +15,7 @@ import { installDependencies } from "../../utils/install.js";
 import { addGeneratorMetricsIfApplicable } from "../../utils/metrics.js";
 import { esmVars } from "../../utils/module-format.js";
 import { kebabCase, snakeCase, toClassName } from "../../utils/names.js";
-import { getNpmScope, toScopeAlias } from "../../utils/npm-scope.js";
+import { getNpmScope } from "../../utils/npm-scope.js";
 import { addDependencyToTargetIfNotPresent, addGeneratorMetadata, getGeneratorInfo } from "../../utils/nx.js";
 import { getRelativePathToRootByDirectory } from "../../utils/paths.js";
 import { registerPnpmBuiltDependencies } from "../../utils/pnpm-workspace.js";
@@ -68,10 +69,10 @@ export const tsRdbGenerator = async (tree, options)=>{
     const templateOptions = {
         engine: options.engine,
         runtimeConfigKey: nameClassName,
-        databasePackageAlias: toScopeAlias(fullyQualifiedName),
+        databasePackageAlias: fullyQualifiedName,
         databaseProvider: options.engine === 'mysql' ? 'mysql' : 'postgresql',
         prismaVersion: TS_VERSIONS.prisma,
-        npmVersion: TS_VERSIONS.npm,
+        ...nodeImageVersions(),
         prismaAdapterPackage: options.engine === 'mysql' ? '@prisma/adapter-mariadb' : '@prisma/adapter-pg',
         prismaAdapterClassName: options.engine === 'mysql' ? 'PrismaMariaDb' : 'PrismaPg',
         localDbPort,
@@ -217,7 +218,7 @@ export const tsRdbGenerator = async (tree, options)=>{
             projectRoot: dir,
             nameClassName,
             nameKebabCase,
-            databasePackageAlias: toScopeAlias(fullyQualifiedName),
+            databasePackageAlias: fullyQualifiedName,
             databaseName,
             adminUser: databaseUser,
             engine: options.engine,
@@ -242,12 +243,15 @@ export const tsRdbGenerator = async (tree, options)=>{
             'pg'
         ]
     ]), withVersions([
-        'prisma',
-        'tsx',
         '@types/aws-lambda',
         ...options.engine === 'mysql' ? [] : [
             '@types/pg'
         ]
+    ]), joinPathFragments(projectConfig.root, 'package.json'));
+    // The prisma CLI and tsx run migration/seed scripts from the root.
+    addDependenciesToPackageJson(tree, {}, withVersions([
+        'prisma',
+        'tsx'
     ]));
     registerPnpmBuiltDependencies(tree, {
         '@prisma/engines': false,