@aws/nx-plugin 1.0.0-rc.54 → 1.0.0-rc.56

package/src/py/project/generator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/py/project/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  ensurePackage,\n  type GeneratorCallback,\n  joinPathFragments,\n  readNxJson,\n  readProjectConfiguration,\n  type Tree,\n  updateNxJson,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport {\n  addLicenseCheckToLintTarget,\n  ensurePythonLicenseCollector,\n} from '../../license/config';\nimport { addDependenciesToPackageJson } from '../../utils/dependencies';\nimport { updateGitIgnore } from '../../utils/git';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { normalizeDistributionName, toSnakeCase } from '../../utils/names';\nimport { getNpmScope } from '../../utils/npm-scope';\nimport {\n  addDependencyToTargetIfNotPresent,\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  projectExists,\n} from '../../utils/nx';\nimport type { UVPyprojectToml } from '../../utils/nxlv-python';\nimport {\n  migrateToSharedVenvGenerator,\n  uvProjectGenerator,\n} from '../../utils/nxlv-python';\nimport { sortObjectKeys } from '../../utils/object';\nimport { addDependenciesToDependencyGroupInPyProjectToml } from '../../utils/py';\nimport { updateToml } from '../../utils/toml';\nimport { withVersions } from '../../utils/versions';\nimport type { PyProjectGeneratorSchema } from './schema';\n\nexport const PY_PROJECT_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\n// Transient artifacts that pytest, coverage and ruff create and remove while\n// the test, typecheck and compile targets run concurrently. `.coverage.*` are\n// the per-process data files pytest-cov writes (`.coverage.<host>.<pid>.<rand>`)\n// before combining them. Both `ty` (which respects .gitignore) and the\n// `@nxlv/python:build` copy (which respects `ignorePaths`) would otherwise fail\n// when they read one of these mid-deletion.\nconst PYTHON_TRANSIENT_ARTIFACTS = [\n  '__pycache__',\n  '.coverage',\n  '.coverage.*',\n  '.pytest_cache',\n  'pytest-cache-files-*',\n  '.ruff_cache',\n];\n\nexport interface PyProjectDetails {\n  /**\n   * Fully qualified Nx project id including scope, in dot notation (eg foo.bar).\n   * This is the identifier Nx uses (readProjectConfiguration, the project\n   * graph, target references) and is intentionally kept dotted.\n   */\n  readonly fullyQualifiedName: string;\n  /**\n   * PEP 503 normalised Python distribution name (eg foo-bar). This is the name\n   * written to the project's `[project].name`, the root `[tool.uv.sources]`\n   * key, and any inter-project dependency string. It is hyphenated (not dotted)\n   * so `uv` and `@nxlv/python` can match it: uv writes `uv.lock` keyed by the\n   * PEP 503 hyphenated name, and `@nxlv/python`'s dependency inference splits a\n   * dotted name on `.` and so would otherwise drop the edge entirely. Keeping\n   * the distribution name decoupled from `fullyQualifiedName` is what lets the\n   * workspace dependency edge appear in the Nx project graph.\n   */\n  readonly distributionName: string;\n  /**\n   * Directory of the library relative to the root\n   */\n  readonly dir: string;\n  /**\n   * Module name for the project\n   */\n  readonly normalizedModuleName: string;\n}\n\n/**\n * Returns details about the Python project to be created\n */\nexport const getPyProjectDetails = (\n  tree: Tree,\n  schema: {\n    name: string;\n    directory?: string;\n    subDirectory?: string;\n    moduleName?: string;\n  },\n): PyProjectDetails => {\n  const scope = toSnakeCase(getNpmScope(tree));\n  const normalizedName = toSnakeCase(schema.name);\n  const normalizedModuleName = toSnakeCase(\n    schema.moduleName ?? `${scope}_${normalizedName}`,\n  );\n  const fullyQualifiedName = `${scope}.${normalizedName}`;\n  // The Python distribution name is the PEP 503 normalised form of the\n  // fully qualified name: hyphenated, never dotted. See PyProjectDetails.\n  const distributionName = normalizeDistributionName(fullyQualifiedName);\n  // NB: interactive nx generator cli can pass empty string\n  const dir = joinPathFragments(\n    schema.directory || '.',\n    schema.subDirectory || normalizedName,\n  );\n  return { dir, fullyQualifiedName, distributionName, normalizedModuleName };\n};\n\n/**\n * Generates a Python project\n */\nexport const pyProjectGenerator = async (\n  tree: Tree,\n  schema: PyProjectGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const { dir, normalizedModuleName, fullyQualifiedName, distributionName } =\n    getPyProjectDetails(tree, schema);\n\n  const pythonPlugin = withVersions(['@nxlv/python']);\n  addDependenciesToPackageJson(tree, {}, pythonPlugin);\n\n  Object.entries(pythonPlugin).forEach(([name, version]) =>\n    ensurePackage(name, version),\n  );\n\n  const nxJson = readNxJson(tree);\n\n  // Only rewrite nx.json when the plugin needs adding, so re-running does not\n  // reserialize (and reformat) the file when nothing has changed.\n  if (\n    !nxJson.plugins?.find((p) =>\n      typeof p === 'string'\n        ? p === '@nxlv/python'\n        : p.plugin === '@nxlv/python',\n    )\n  ) {\n    nxJson.plugins = [\n      ...(nxJson.plugins ?? []),\n      {\n        plugin: '@nxlv/python',\n        options: {\n          packageManager: 'uv',\n        },\n      },\n    ];\n    updateNxJson(tree, nxJson);\n  }\n\n  // Only scaffold the project when it does not already exist so re-running with\n  // the same name does not throw. The rest of the generator still runs to apply\n  // any changed options to the existing project.\n  if (!projectExists(tree, fullyQualifiedName)) {\n    if (!tree.exists('uv.lock')) {\n      await migrateToSharedVenvGenerator(tree, {\n        autoActivate: true,\n        packageManager: 'uv',\n        moveDevDependencies: false,\n        pyenvPythonVersion: '3.14.0',\n        pyprojectPythonDependency: '>=3.14',\n      });\n    }\n\n    await uvProjectGenerator(tree, {\n      // The Nx project id (and `uv.workspace.members` etc.) keys off `name`, so\n      // keep it dotted. `packageName` is the separate PEP 503 distribution name\n      // written to `[project].name` and the root `[tool.uv.sources]` key; it is\n      // hyphenated so `@nxlv/python` infers the workspace dependency edge (it\n      // splits a dotted name on `.` and would otherwise drop it). This split is\n      // the whole fix (see PyProjectDetails.distributionName).\n      name: fullyQualifiedName,\n      packageName: distributionName,\n      publishable: false,\n      buildLockedVersions: true,\n      buildBundleLocalDependencies: true,\n      linter: 'ruff',\n      rootPyprojectDependencyGroup: 'main',\n      pyenvPythonVersion: '3.14.0',\n      pyprojectPythonDependency: '>=3.14',\n      projectType: schema.type,\n      projectNameAndRootFormat: 'as-provided',\n      moduleName: normalizedModuleName,\n      directory: dir,\n      unitTestRunner: 'pytest',\n      codeCoverage: true,\n      codeCoverageHtmlReport: true,\n      codeCoverageXmlReport: true,\n      unitTestHtmlReport: true,\n      unitTestJUnitReport: true,\n      buildSystem: 'hatch',\n      srcDir: false,\n    });\n\n    // Remove generated hello.py and test_hello.py as they are not needed\n    [\n      joinPathFragments(dir, normalizedModuleName, 'hello.py'),\n      joinPathFragments(dir, 'tests', 'test_hello.py'),\n    ].forEach((f) => tree.delete(f));\n\n    // Add a placeholder test so pytest doesn't fail with \"no tests collected\"\n    tree.write(\n      joinPathFragments(dir, 'tests', 'test_noop.py'),\n      'def test_noop():\\n    pass\\n',\n    );\n  }\n\n  const outputPath = '{workspaceRoot}/dist/{projectRoot}';\n  const buildOutputPath = joinPathFragments(outputPath, 'build');\n  const projectConfiguration = readProjectConfiguration(\n    tree,\n    fullyQualifiedName,\n  );\n  projectConfiguration.name = fullyQualifiedName;\n  // Derive the compile target from the uv build target, and rewrite build to\n  // orchestrate the other targets. This only runs on first creation: on re-run\n  // build has already been transformed, so re-deriving would corrupt compile\n  // and duplicate the build dependencies.\n  if (!projectConfiguration.targets.compile) {\n    const buildTarget = projectConfiguration.targets.build;\n    projectConfiguration.targets.compile = {\n      ...buildTarget,\n      inputs: ['default', '^production'],\n      outputs: [buildOutputPath],\n      options: {\n        ...buildTarget.options,\n        outputPath: buildOutputPath,\n        // The build executor copies the project to a temp folder; exclude the\n        // executor defaults plus transient artifacts so the copy does not race\n        // a concurrent test/typecheck target deleting a file mid-copy.\n        ignorePaths: ['.venv', '.tox', 'tests', ...PYTHON_TRANSIENT_ARTIFACTS],\n      },\n    };\n    projectConfiguration.targets.build = {\n      inputs: ['default', '^production'],\n      dependsOn: [\n        'lint',\n        'compile',\n        'test',\n        'typecheck',\n        ...(buildTarget.dependsOn ?? []),\n      ],\n      options: {\n        outputPath,\n      },\n    };\n  }\n  projectConfiguration.targets.typecheck = {\n    cache: true,\n    inputs: ['default', '^production'],\n    executor: '@nxlv/python:run-commands',\n    options: {\n      command: 'uv run ty check',\n      cwd: '{projectRoot}',\n    },\n  };\n\n  // Set the default line length to 120, as 88 is a little too strict\n  updateToml(\n    tree,\n    joinPathFragments(dir, 'pyproject.toml'),\n    (pyProjectToml: UVPyprojectToml) => {\n      if ((pyProjectToml.tool as any)?.ruff) {\n        (pyProjectToml.tool as any).ruff['line-length'] = 120;\n      }\n      return pyProjectToml;\n    },\n  );\n\n  // Pin ruff to the version generation-time formatting uses (PY_VERSIONS), so\n  // generated files stay `ruff format --check`-clean across ruff releases.\n  addDependenciesToDependencyGroupInPyProjectToml(tree, '.', 'dev', [\n    'ruff',\n    'ty',\n  ]);\n\n  // Base format target checks rather than writes (so build/lint don't rewrite\n  // source); `fix` writes, and `skip-lint` writes without failing so it stays\n  // a no-op when propagated through the lint -> format dependency.\n  projectConfiguration.targets.format = {\n    ...projectConfiguration.targets.format,\n    cache: true,\n    inputs: ['default', '^production'],\n    options: {\n      ...projectConfiguration.targets.format?.options,\n      check: true,\n    },\n    configurations: {\n      ...projectConfiguration.targets.format?.configurations,\n      fix: {\n        check: false,\n      },\n      'skip-lint': {\n        check: false,\n      },\n    },\n  };\n\n  // Add a dependency on the format target for lint in order to reduce the number of\n  // fixable lint errors (eg line too long)\n  projectConfiguration.targets.lint = {\n    ...projectConfiguration.targets.lint,\n    cache: true,\n    inputs: ['default', '^production'],\n    configurations: {\n      ...projectConfiguration.targets.lint?.configurations,\n      fix: {\n        fix: true,\n      },\n      'skip-lint': {\n        exitZero: true,\n      },\n    },\n  };\n  // Append `format` without moving an existing entry, so re-running does not\n  // reorder lint dependencies (e.g. relative to a later-added license-check).\n  addDependencyToTargetIfNotPresent(projectConfiguration, 'lint', 'format');\n\n  projectConfiguration.targets = sortObjectKeys(projectConfiguration.targets);\n  updateProjectConfiguration(tree, fullyQualifiedName, projectConfiguration);\n\n  addGeneratorMetadata(tree, fullyQualifiedName, PY_PROJECT_GENERATOR_INFO);\n\n  // Update root .gitignore\n  updateGitIgnore(tree, '.', (patterns) => [...patterns, '/reports']);\n\n  // Update project level .gitignore. The cache directories are also kept out\n  // of type checking: `ty` respects .gitignore, and pytest creates and removes\n  // transient `pytest-cache-files-*` directories while the test and typecheck\n  // targets run concurrently, which would otherwise make `ty` fail with an I/O\n  // error when it scans one mid-deletion.\n  updateGitIgnore(tree, dir, (patterns) => [\n    ...patterns,\n    '**/__pycache__',\n    ...PYTHON_TRANSIENT_ARTIFACTS.filter((p) => p !== '__pycache__'),\n  ]);\n\n  await addGeneratorMetricsIfApplicable(tree, [PY_PROJECT_GENERATOR_INFO]);\n\n  await ensurePythonLicenseCollector(tree);\n\n  // If license checking is configured, make this project's lint target depend\n  // on the root license-check target. No-op if license checking isn't set up;\n  // the license generator wires up existing projects itself, so the dependency\n  // is added regardless of which generator runs first.\n  addLicenseCheckToLintTarget(tree, fullyQualifiedName);\n\n  return () =>\n    installDependencies(tree, schema.preferInstallDependencies, {\n      languages: ['typescript', 'python'],\n    });\n};\nexport default pyProjectGenerator;\n"],"names":["ensurePackage","joinPathFragments","readNxJson","readProjectConfiguration","updateNxJson","updateProjectConfiguration","addLicenseCheckToLintTarget","ensurePythonLicenseCollector","addDependenciesToPackageJson","updateGitIgnore","installDependencies","addGeneratorMetricsIfApplicable","normalizeDistributionName","toSnakeCase","getNpmScope","addDependencyToTargetIfNotPresent","addGeneratorMetadata","getGeneratorInfo","projectExists","migrateToSharedVenvGenerator","uvProjectGenerator","sortObjectKeys","addDependenciesToDependencyGroupInPyProjectToml","updateToml","withVersions","PY_PROJECT_GENERATOR_INFO","filename","PYTHON_TRANSIENT_ARTIFACTS","getPyProjectDetails","tree","schema","scope","normalizedName","name","normalizedModuleName","moduleName","fullyQualifiedName","distributionName","dir","directory","subDirectory","pyProjectGenerator","pythonPlugin","Object","entries","forEach","version","nxJson","plugins","find","p","plugin","options","packageManager","exists","autoActivate","moveDevDependencies","pyenvPythonVersion","pyprojectPythonDependency","packageName","publishable","buildLockedVersions","buildBundleLocalDependencies","linter","rootPyprojectDependencyGroup","projectType","type","projectNameAndRootFormat","unitTestRunner","codeCoverage","codeCoverageHtmlReport","codeCoverageXmlReport","unitTestHtmlReport","unitTestJUnitReport","buildSystem","srcDir","f","delete","write","outputPath","buildOutputPath","projectConfiguration","targets","compile","buildTarget","build","inputs","outputs","ignorePaths","dependsOn","typecheck","cache","executor","command","cwd","pyProjectToml","tool","ruff","format","check","configurations","fix","lint","exitZero","patterns","filter","preferInstallDependencies","languages"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/py/project/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  ensurePackage,\n  type GeneratorCallback,\n  joinPathFragments,\n  readNxJson,\n  readProjectConfiguration,\n  type Tree,\n  updateNxJson,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport {\n  addLicenseCheckToLintTarget,\n  ensurePythonLicenseCollector,\n} from '../../license/config';\nimport {\n  addPyDependencies,\n  addTsDependencies,\n} from '../../utils/add-dependencies';\nimport { declareDependencies } from '../../utils/declared-dependencies';\nimport { updateGitIgnore } from '../../utils/git';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { normalizeDistributionName, toSnakeCase } from '../../utils/names';\nimport { getNpmScope } from '../../utils/npm-scope';\nimport {\n  addDependencyToTargetIfNotPresent,\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  projectExists,\n} from '../../utils/nx';\nimport type { UVPyprojectToml } from '../../utils/nxlv-python';\nimport {\n  migrateToSharedVenvGenerator,\n  uvProjectGenerator,\n} from '../../utils/nxlv-python';\nimport { sortObjectKeys } from '../../utils/object';\nimport { updateToml } from '../../utils/toml';\nimport { withVersions } from '../../utils/versions';\nimport type { PyProjectGeneratorSchema } from './schema';\n\nexport const DEPENDENCIES = declareDependencies()({\n  ts: [{ name: '@nxlv/python', dev: true, root: true }],\n  py: [\n    // The linting and type checking tools live in the workspace root pyproject.\n    // Pinned to the version generation-time formatting uses, so generated files\n    // stay `ruff format --check`-clean across ruff releases.\n    { name: 'ruff', group: 'dev', root: true },\n    { name: 'ty', group: 'dev', root: true },\n  ],\n});\n\nexport const PY_PROJECT_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\n// Transient artifacts that pytest, coverage and ruff create and remove while\n// the test, typecheck and compile targets run concurrently. `.coverage.*` are\n// the per-process data files pytest-cov writes (`.coverage.<host>.<pid>.<rand>`)\n// before combining them. Both `ty` (which respects .gitignore) and the\n// `@nxlv/python:build` copy (which respects `ignorePaths`) would otherwise fail\n// when they read one of these mid-deletion.\nconst PYTHON_TRANSIENT_ARTIFACTS = [\n  '__pycache__',\n  '.coverage',\n  '.coverage.*',\n  '.pytest_cache',\n  'pytest-cache-files-*',\n  '.ruff_cache',\n];\n\nexport interface PyProjectDetails {\n  /**\n   * Fully qualified Nx project id including scope, in dot notation (eg foo.bar).\n   * This is the identifier Nx uses (readProjectConfiguration, the project\n   * graph, target references) and is intentionally kept dotted.\n   */\n  readonly fullyQualifiedName: string;\n  /**\n   * PEP 503 normalised Python distribution name (eg foo-bar). This is the name\n   * written to the project's `[project].name`, the root `[tool.uv.sources]`\n   * key, and any inter-project dependency string. It is hyphenated (not dotted)\n   * so `uv` and `@nxlv/python` can match it: uv writes `uv.lock` keyed by the\n   * PEP 503 hyphenated name, and `@nxlv/python`'s dependency inference splits a\n   * dotted name on `.` and so would otherwise drop the edge entirely. Keeping\n   * the distribution name decoupled from `fullyQualifiedName` is what lets the\n   * workspace dependency edge appear in the Nx project graph.\n   */\n  readonly distributionName: string;\n  /**\n   * Directory of the library relative to the root\n   */\n  readonly dir: string;\n  /**\n   * Module name for the project\n   */\n  readonly normalizedModuleName: string;\n}\n\n/**\n * Returns details about the Python project to be created\n */\nexport const getPyProjectDetails = (\n  tree: Tree,\n  schema: {\n    name: string;\n    directory?: string;\n    subDirectory?: string;\n    moduleName?: string;\n  },\n): PyProjectDetails => {\n  const scope = toSnakeCase(getNpmScope(tree));\n  const normalizedName = toSnakeCase(schema.name);\n  const normalizedModuleName = toSnakeCase(\n    schema.moduleName ?? `${scope}_${normalizedName}`,\n  );\n  const fullyQualifiedName = `${scope}.${normalizedName}`;\n  // The Python distribution name is the PEP 503 normalised form of the\n  // fully qualified name: hyphenated, never dotted. See PyProjectDetails.\n  const distributionName = normalizeDistributionName(fullyQualifiedName);\n  // NB: interactive nx generator cli can pass empty string\n  const dir = joinPathFragments(\n    schema.directory || '.',\n    schema.subDirectory || normalizedName,\n  );\n  return { dir, fullyQualifiedName, distributionName, normalizedModuleName };\n};\n\n/**\n * Generates a Python project\n */\nexport const pyProjectGenerator = async (\n  tree: Tree,\n  schema: PyProjectGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const { dir, normalizedModuleName, fullyQualifiedName, distributionName } =\n    getPyProjectDetails(tree, schema);\n\n  addTsDependencies(tree, DEPENDENCIES);\n\n  const pythonPlugin = withVersions(DEPENDENCIES, ['@nxlv/python']);\n  Object.entries(pythonPlugin).forEach(([name, version]) =>\n    ensurePackage(name, version),\n  );\n\n  const nxJson = readNxJson(tree);\n\n  // Only rewrite nx.json when the plugin needs adding, so re-running does not\n  // reserialize (and reformat) the file when nothing has changed.\n  if (\n    !nxJson.plugins?.find((p) =>\n      typeof p === 'string'\n        ? p === '@nxlv/python'\n        : p.plugin === '@nxlv/python',\n    )\n  ) {\n    nxJson.plugins = [\n      ...(nxJson.plugins ?? []),\n      {\n        plugin: '@nxlv/python',\n        options: {\n          packageManager: 'uv',\n        },\n      },\n    ];\n    updateNxJson(tree, nxJson);\n  }\n\n  // Only scaffold the project when it does not already exist so re-running with\n  // the same name does not throw. The rest of the generator still runs to apply\n  // any changed options to the existing project.\n  if (!projectExists(tree, fullyQualifiedName)) {\n    if (!tree.exists('uv.lock')) {\n      await migrateToSharedVenvGenerator(tree, {\n        autoActivate: true,\n        packageManager: 'uv',\n        moveDevDependencies: false,\n        pyenvPythonVersion: '3.14.0',\n        pyprojectPythonDependency: '>=3.14',\n      });\n    }\n\n    await uvProjectGenerator(tree, {\n      // The Nx project id (and `uv.workspace.members` etc.) keys off `name`, so\n      // keep it dotted. `packageName` is the separate PEP 503 distribution name\n      // written to `[project].name` and the root `[tool.uv.sources]` key; it is\n      // hyphenated so `@nxlv/python` infers the workspace dependency edge (it\n      // splits a dotted name on `.` and would otherwise drop it). This split is\n      // the whole fix (see PyProjectDetails.distributionName).\n      name: fullyQualifiedName,\n      packageName: distributionName,\n      publishable: false,\n      buildLockedVersions: true,\n      buildBundleLocalDependencies: true,\n      linter: 'ruff',\n      rootPyprojectDependencyGroup: 'main',\n      pyenvPythonVersion: '3.14.0',\n      pyprojectPythonDependency: '>=3.14',\n      projectType: schema.type,\n      projectNameAndRootFormat: 'as-provided',\n      moduleName: normalizedModuleName,\n      directory: dir,\n      unitTestRunner: 'pytest',\n      codeCoverage: true,\n      codeCoverageHtmlReport: true,\n      codeCoverageXmlReport: true,\n      unitTestHtmlReport: true,\n      unitTestJUnitReport: true,\n      buildSystem: 'hatch',\n      srcDir: false,\n    });\n\n    // Remove generated hello.py and test_hello.py as they are not needed\n    [\n      joinPathFragments(dir, normalizedModuleName, 'hello.py'),\n      joinPathFragments(dir, 'tests', 'test_hello.py'),\n    ].forEach((f) => tree.delete(f));\n\n    // Add a placeholder test so pytest doesn't fail with \"no tests collected\"\n    tree.write(\n      joinPathFragments(dir, 'tests', 'test_noop.py'),\n      'def test_noop():\\n    pass\\n',\n    );\n  }\n\n  const outputPath = '{workspaceRoot}/dist/{projectRoot}';\n  const buildOutputPath = joinPathFragments(outputPath, 'build');\n  const projectConfiguration = readProjectConfiguration(\n    tree,\n    fullyQualifiedName,\n  );\n  projectConfiguration.name = fullyQualifiedName;\n  // Derive the compile target from the uv build target, and rewrite build to\n  // orchestrate the other targets. This only runs on first creation: on re-run\n  // build has already been transformed, so re-deriving would corrupt compile\n  // and duplicate the build dependencies.\n  if (!projectConfiguration.targets.compile) {\n    const buildTarget = projectConfiguration.targets.build;\n    projectConfiguration.targets.compile = {\n      ...buildTarget,\n      inputs: ['default', '^production'],\n      outputs: [buildOutputPath],\n      options: {\n        ...buildTarget.options,\n        outputPath: buildOutputPath,\n        // The build executor copies the project to a temp folder; exclude the\n        // executor defaults plus transient artifacts so the copy does not race\n        // a concurrent test/typecheck target deleting a file mid-copy.\n        ignorePaths: ['.venv', '.tox', 'tests', ...PYTHON_TRANSIENT_ARTIFACTS],\n      },\n    };\n    projectConfiguration.targets.build = {\n      inputs: ['default', '^production'],\n      dependsOn: [\n        'lint',\n        'compile',\n        'test',\n        'typecheck',\n        ...(buildTarget.dependsOn ?? []),\n      ],\n      options: {\n        outputPath,\n      },\n    };\n  }\n  projectConfiguration.targets.typecheck = {\n    cache: true,\n    inputs: ['default', '^production'],\n    executor: '@nxlv/python:run-commands',\n    options: {\n      command: 'uv run ty check',\n      cwd: '{projectRoot}',\n    },\n  };\n\n  // Set the default line length to 120, as 88 is a little too strict\n  updateToml(\n    tree,\n    joinPathFragments(dir, 'pyproject.toml'),\n    (pyProjectToml: UVPyprojectToml) => {\n      if ((pyProjectToml.tool as any)?.ruff) {\n        (pyProjectToml.tool as any).ruff['line-length'] = 120;\n      }\n      return pyProjectToml;\n    },\n  );\n\n  addPyDependencies(tree, DEPENDENCIES);\n\n  // Base format target checks rather than writes (so build/lint don't rewrite\n  // source); `fix` writes, and `skip-lint` writes without failing so it stays\n  // a no-op when propagated through the lint -> format dependency.\n  projectConfiguration.targets.format = {\n    ...projectConfiguration.targets.format,\n    cache: true,\n    inputs: ['default', '^production'],\n    options: {\n      ...projectConfiguration.targets.format?.options,\n      check: true,\n    },\n    configurations: {\n      ...projectConfiguration.targets.format?.configurations,\n      fix: {\n        check: false,\n      },\n      'skip-lint': {\n        check: false,\n      },\n    },\n  };\n\n  // Add a dependency on the format target for lint in order to reduce the number of\n  // fixable lint errors (eg line too long)\n  projectConfiguration.targets.lint = {\n    ...projectConfiguration.targets.lint,\n    cache: true,\n    inputs: ['default', '^production'],\n    configurations: {\n      ...projectConfiguration.targets.lint?.configurations,\n      fix: {\n        fix: true,\n      },\n      'skip-lint': {\n        exitZero: true,\n      },\n    },\n  };\n  // Append `format` without moving an existing entry, so re-running does not\n  // reorder lint dependencies (e.g. relative to a later-added license-check).\n  addDependencyToTargetIfNotPresent(projectConfiguration, 'lint', 'format');\n\n  projectConfiguration.targets = sortObjectKeys(projectConfiguration.targets);\n  updateProjectConfiguration(tree, fullyQualifiedName, projectConfiguration);\n\n  addGeneratorMetadata(tree, fullyQualifiedName, PY_PROJECT_GENERATOR_INFO);\n\n  // Update root .gitignore\n  updateGitIgnore(tree, '.', (patterns) => [...patterns, '/reports']);\n\n  // Update project level .gitignore. The cache directories are also kept out\n  // of type checking: `ty` respects .gitignore, and pytest creates and removes\n  // transient `pytest-cache-files-*` directories while the test and typecheck\n  // targets run concurrently, which would otherwise make `ty` fail with an I/O\n  // error when it scans one mid-deletion.\n  updateGitIgnore(tree, dir, (patterns) => [\n    ...patterns,\n    '**/__pycache__',\n    ...PYTHON_TRANSIENT_ARTIFACTS.filter((p) => p !== '__pycache__'),\n  ]);\n\n  await addGeneratorMetricsIfApplicable(tree, [PY_PROJECT_GENERATOR_INFO]);\n\n  await ensurePythonLicenseCollector(tree);\n\n  // If license checking is configured, make this project's lint target depend\n  // on the root license-check target. No-op if license checking isn't set up;\n  // the license generator wires up existing projects itself, so the dependency\n  // is added regardless of which generator runs first.\n  addLicenseCheckToLintTarget(tree, fullyQualifiedName);\n\n  return () =>\n    installDependencies(tree, schema.preferInstallDependencies, {\n      languages: ['typescript', 'python'],\n    });\n};\nexport default pyProjectGenerator;\n"],"names":["ensurePackage","joinPathFragments","readNxJson","readProjectConfiguration","updateNxJson","updateProjectConfiguration","addLicenseCheckToLintTarget","ensurePythonLicenseCollector","addPyDependencies","addTsDependencies","declareDependencies","updateGitIgnore","installDependencies","addGeneratorMetricsIfApplicable","normalizeDistributionName","toSnakeCase","getNpmScope","addDependencyToTargetIfNotPresent","addGeneratorMetadata","getGeneratorInfo","projectExists","migrateToSharedVenvGenerator","uvProjectGenerator","sortObjectKeys","updateToml","withVersions","DEPENDENCIES","ts","name","dev","root","py","group","PY_PROJECT_GENERATOR_INFO","filename","PYTHON_TRANSIENT_ARTIFACTS","getPyProjectDetails","tree","schema","scope","normalizedName","normalizedModuleName","moduleName","fullyQualifiedName","distributionName","dir","directory","subDirectory","pyProjectGenerator","pythonPlugin","Object","entries","forEach","version","nxJson","plugins","find","p","plugin","options","packageManager","exists","autoActivate","moveDevDependencies","pyenvPythonVersion","pyprojectPythonDependency","packageName","publishable","buildLockedVersions","buildBundleLocalDependencies","linter","rootPyprojectDependencyGroup","projectType","type","projectNameAndRootFormat","unitTestRunner","codeCoverage","codeCoverageHtmlReport","codeCoverageXmlReport","unitTestHtmlReport","unitTestJUnitReport","buildSystem","srcDir","f","delete","write","outputPath","buildOutputPath","projectConfiguration","targets","compile","buildTarget","build","inputs","outputs","ignorePaths","dependsOn","typecheck","cache","executor","command","cwd","pyProjectToml","tool","ruff","format","check","configurations","fix","lint","exitZero","patterns","filter","preferInstallDependencies","languages"],"mappings":"AAAA;;;CAGC,GACD,SACEA,aAAa,EAEbC,iBAAiB,EACjBC,UAAU,EACVC,wBAAwB,EAExBC,YAAY,EACZC,0BAA0B,QACrB,aAAa;AACpB,SACEC,2BAA2B,EAC3BC,4BAA4B,QACvB,0BAAuB;AAC9B,SACEC,iBAAiB,EACjBC,iBAAiB,QACZ,kCAA+B;AACtC,SAASC,mBAAmB,QAAQ,uCAAoC;AACxE,SAASC,eAAe,QAAQ,qBAAkB;AAClD,SAASC,mBAAmB,QAAQ,yBAAsB;AAC1D,SAASC,+BAA+B,QAAQ,yBAAsB;AACtE,SAASC,yBAAyB,EAAEC,WAAW,QAAQ,uBAAoB;AAC3E,SAASC,WAAW,QAAQ,2BAAwB;AACpD,SACEC,iCAAiC,EACjCC,oBAAoB,EACpBC,gBAAgB,EAEhBC,aAAa,QACR,oBAAiB;AAExB,SACEC,4BAA4B,EAC5BC,kBAAkB,QACb,6BAA0B;AACjC,SAASC,cAAc,QAAQ,wBAAqB;AACpD,SAASC,UAAU,QAAQ,sBAAmB;AAC9C,SAASC,YAAY,QAAQ,0BAAuB;AAGpD,OAAO,MAAMC,eAAehB,sBAAsB;IAChDiB,IAAI;QAAC;YAAEC,MAAM;YAAgBC,KAAK;YAAMC,MAAM;QAAK;KAAE;IACrDC,IAAI;QACF,4EAA4E;QAC5E,4EAA4E;QAC5E,yDAAyD;QACzD;YAAEH,MAAM;YAAQI,OAAO;YAAOF,MAAM;QAAK;QACzC;YAAEF,MAAM;YAAMI,OAAO;YAAOF,MAAM;QAAK;KACxC;AACH,GAAG;AAEH,OAAO,MAAMG,4BAA6Cd,iBACxD,YAAYe,QAAQ,EACpB;AAEF,6EAA6E;AAC7E,8EAA8E;AAC9E,iFAAiF;AACjF,uEAAuE;AACvE,gFAAgF;AAChF,4CAA4C;AAC5C,MAAMC,6BAA6B;IACjC;IACA;IACA;IACA;IACA;IACA;CACD;AA8BD;;CAEC,GACD,OAAO,MAAMC,sBAAsB,CACjCC,MACAC;IAOA,MAAMC,QAAQxB,YAAYC,YAAYqB;IACtC,MAAMG,iBAAiBzB,YAAYuB,OAAOV,IAAI;IAC9C,MAAMa,uBAAuB1B,YAC3BuB,OAAOI,UAAU,IAAI,GAAGH,MAAM,CAAC,EAAEC,gBAAgB;IAEnD,MAAMG,qBAAqB,GAAGJ,MAAM,CAAC,EAAEC,gBAAgB;IACvD,qEAAqE;IACrE,wEAAwE;IACxE,MAAMI,mBAAmB9B,0BAA0B6B;IACnD,yDAAyD;IACzD,MAAME,MAAM5C,kBACVqC,OAAOQ,SAAS,IAAI,KACpBR,OAAOS,YAAY,IAAIP;IAEzB,OAAO;QAAEK;QAAKF;QAAoBC;QAAkBH;IAAqB;AAC3E,EAAE;AAEF;;CAEC,GACD,OAAO,MAAMO,qBAAqB,OAChCX,MACAC;IAEA,MAAM,EAAEO,GAAG,EAAEJ,oBAAoB,EAAEE,kBAAkB,EAAEC,gBAAgB,EAAE,GACvER,oBAAoBC,MAAMC;IAE5B7B,kBAAkB4B,MAAMX;IAExB,MAAMuB,eAAexB,aAAaC,cAAc;QAAC;KAAe;IAChEwB,OAAOC,OAAO,CAACF,cAAcG,OAAO,CAAC,CAAC,CAACxB,MAAMyB,QAAQ,GACnDrD,cAAc4B,MAAMyB;IAGtB,MAAMC,SAASpD,WAAWmC;IAE1B,4EAA4E;IAC5E,gEAAgE;IAChE,IACE,CAACiB,OAAOC,OAAO,EAAEC,KAAK,CAACC,IACrB,OAAOA,MAAM,WACTA,MAAM,iBACNA,EAAEC,MAAM,KAAK,iBAEnB;QACAJ,OAAOC,OAAO,GAAG;eACXD,OAAOC,OAAO,IAAI,EAAE;YACxB;gBACEG,QAAQ;gBACRC,SAAS;oBACPC,gBAAgB;gBAClB;YACF;SACD;QACDxD,aAAaiC,MAAMiB;IACrB;IAEA,8EAA8E;IAC9E,8EAA8E;IAC9E,+CAA+C;IAC/C,IAAI,CAAClC,cAAciB,MAAMM,qBAAqB;QAC5C,IAAI,CAACN,KAAKwB,MAAM,CAAC,YAAY;YAC3B,MAAMxC,6BAA6BgB,MAAM;gBACvCyB,cAAc;gBACdF,gBAAgB;gBAChBG,qBAAqB;gBACrBC,oBAAoB;gBACpBC,2BAA2B;YAC7B;QACF;QAEA,MAAM3C,mBAAmBe,MAAM;YAC7B,0EAA0E;YAC1E,0EAA0E;YAC1E,0EAA0E;YAC1E,wEAAwE;YACxE,0EAA0E;YAC1E,yDAAyD;YACzDT,MAAMe;YACNuB,aAAatB;YACbuB,aAAa;YACbC,qBAAqB;YACrBC,8BAA8B;YAC9BC,QAAQ;YACRC,8BAA8B;YAC9BP,oBAAoB;YACpBC,2BAA2B;YAC3BO,aAAalC,OAAOmC,IAAI;YACxBC,0BAA0B;YAC1BhC,YAAYD;YACZK,WAAWD;YACX8B,gBAAgB;YAChBC,cAAc;YACdC,wBAAwB;YACxBC,uBAAuB;YACvBC,oBAAoB;YACpBC,qBAAqB;YACrBC,aAAa;YACbC,QAAQ;QACV;QAEA,qEAAqE;QACrE;YACEjF,kBAAkB4C,KAAKJ,sBAAsB;YAC7CxC,kBAAkB4C,KAAK,SAAS;SACjC,CAACO,OAAO,CAAC,CAAC+B,IAAM9C,KAAK+C,MAAM,CAACD;QAE7B,0EAA0E;QAC1E9C,KAAKgD,KAAK,CACRpF,kBAAkB4C,KAAK,SAAS,iBAChC;IAEJ;IAEA,MAAMyC,aAAa;IACnB,MAAMC,kBAAkBtF,kBAAkBqF,YAAY;IACtD,MAAME,uBAAuBrF,yBAC3BkC,MACAM;IAEF6C,qBAAqB5D,IAAI,GAAGe;IAC5B,2EAA2E;IAC3E,6EAA6E;IAC7E,2EAA2E;IAC3E,wCAAwC;IACxC,IAAI,CAAC6C,qBAAqBC,OAAO,CAACC,OAAO,EAAE;QACzC,MAAMC,cAAcH,qBAAqBC,OAAO,CAACG,KAAK;QACtDJ,qBAAqBC,OAAO,CAACC,OAAO,GAAG;YACrC,GAAGC,WAAW;YACdE,QAAQ;gBAAC;gBAAW;aAAc;YAClCC,SAAS;gBAACP;aAAgB;YAC1B5B,SAAS;gBACP,GAAGgC,YAAYhC,OAAO;gBACtB2B,YAAYC;gBACZ,sEAAsE;gBACtE,uEAAuE;gBACvE,+DAA+D;gBAC/DQ,aAAa;oBAAC;oBAAS;oBAAQ;uBAAY5D;iBAA2B;YACxE;QACF;QACAqD,qBAAqBC,OAAO,CAACG,KAAK,GAAG;YACnCC,QAAQ;gBAAC;gBAAW;aAAc;YAClCG,WAAW;gBACT;gBACA;gBACA;gBACA;mBACIL,YAAYK,SAAS,IAAI,EAAE;aAChC;YACDrC,SAAS;gBACP2B;YACF;QACF;IACF;IACAE,qBAAqBC,OAAO,CAACQ,SAAS,GAAG;QACvCC,OAAO;QACPL,QAAQ;YAAC;YAAW;SAAc;QAClCM,UAAU;QACVxC,SAAS;YACPyC,SAAS;YACTC,KAAK;QACP;IACF;IAEA,mEAAmE;IACnE7E,WACEa,MACApC,kBAAkB4C,KAAK,mBACvB,CAACyD;QACC,IAAKA,cAAcC,IAAI,EAAUC,MAAM;YACpCF,cAAcC,IAAI,CAASC,IAAI,CAAC,cAAc,GAAG;QACpD;QACA,OAAOF;IACT;IAGF9F,kBAAkB6B,MAAMX;IAExB,4EAA4E;IAC5E,4EAA4E;IAC5E,iEAAiE;IACjE8D,qBAAqBC,OAAO,CAACgB,MAAM,GAAG;QACpC,GAAGjB,qBAAqBC,OAAO,CAACgB,MAAM;QACtCP,OAAO;QACPL,QAAQ;YAAC;YAAW;SAAc;QAClClC,SAAS;YACP,GAAG6B,qBAAqBC,OAAO,CAACgB,MAAM,EAAE9C,OAAO;YAC/C+C,OAAO;QACT;QACAC,gBAAgB;YACd,GAAGnB,qBAAqBC,OAAO,CAACgB,MAAM,EAAEE,cAAc;YACtDC,KAAK;gBACHF,OAAO;YACT;YACA,aAAa;gBACXA,OAAO;YACT;QACF;IACF;IAEA,kFAAkF;IAClF,yCAAyC;IACzClB,qBAAqBC,OAAO,CAACoB,IAAI,GAAG;QAClC,GAAGrB,qBAAqBC,OAAO,CAACoB,IAAI;QACpCX,OAAO;QACPL,QAAQ;YAAC;YAAW;SAAc;QAClCc,gBAAgB;YACd,GAAGnB,qBAAqBC,OAAO,CAACoB,IAAI,EAAEF,cAAc;YACpDC,KAAK;gBACHA,KAAK;YACP;YACA,aAAa;gBACXE,UAAU;YACZ;QACF;IACF;IACA,2EAA2E;IAC3E,4EAA4E;IAC5E7F,kCAAkCuE,sBAAsB,QAAQ;IAEhEA,qBAAqBC,OAAO,GAAGlE,eAAeiE,qBAAqBC,OAAO;IAC1EpF,2BAA2BgC,MAAMM,oBAAoB6C;IAErDtE,qBAAqBmB,MAAMM,oBAAoBV;IAE/C,yBAAyB;IACzBtB,gBAAgB0B,MAAM,KAAK,CAAC0E,WAAa;eAAIA;YAAU;SAAW;IAElE,2EAA2E;IAC3E,6EAA6E;IAC7E,4EAA4E;IAC5E,6EAA6E;IAC7E,wCAAwC;IACxCpG,gBAAgB0B,MAAMQ,KAAK,CAACkE,WAAa;eACpCA;YACH;eACG5E,2BAA2B6E,MAAM,CAAC,CAACvD,IAAMA,MAAM;SACnD;IAED,MAAM5C,gCAAgCwB,MAAM;QAACJ;KAA0B;IAEvE,MAAM1B,6BAA6B8B;IAEnC,4EAA4E;IAC5E,4EAA4E;IAC5E,6EAA6E;IAC7E,qDAAqD;IACrD/B,4BAA4B+B,MAAMM;IAElC,OAAO,IACL/B,oBAAoByB,MAAMC,OAAO2E,yBAAyB,EAAE;YAC1DC,WAAW;gBAAC;gBAAc;aAAS;QACrC;AACJ,EAAE;AACF,eAAelE,mBAAmB"}

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

@@ -41,6 +41,15 @@ CMD ["python", "-m", "proj_my_agent.custom_agent.main"]
 exports[`py#rdb agent-connection generator > should add rdb dev dependency to agent dev 1`] = `
 {
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "metadata": {
+    "components": [
+      {
+        "generator": "py#rdb#agent-connection",
+        "name": "agent-db",
+        "path": "packages/db",
+      },
+    ],
+  },
   "name": "my-agent",
   "root": "packages/my-agent",
   "sourceRoot": "packages/my-agent/src/proj_my_agent",
@@ -83,6 +92,16 @@ CMD ["python", "-m", "proj_my_agent.agent.main"]
 exports[`py#rdb agent-connection generator > should use sourceComponent name when provided 1`] = `
 {
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "metadata": {
+    "components": [
+      {
+        "generator": "py#rdb#agent-connection",
+        "name": "custom-agent-db",
+        "path": "packages/db",
+        "sourcePath": "src/proj_my_agent/custom_agent",
+      },
+    ],
+  },
   "name": "my-agent",
   "root": "packages/my-agent",
   "sourceRoot": "packages/my-agent/src/proj_my_agent",

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

@@ -6,7 +6,7 @@ import { formatFilesInSubtree } from "../../../utils/format.js";
 import { installDependencies } from "../../../utils/install.js";
 import { addGeneratorMetricsIfApplicable } from "../../../utils/metrics.js";
 import { toSnakeCase } from "../../../utils/names.js";
-import { addDependencyToTargetIfNotPresent, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../../utils/nx.js";
+import { addComponentGeneratorMetadata, addDependencyToTargetIfNotPresent, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../../utils/nx.js";
 import { addWorkspaceDependencyToPyProject } from "../../../utils/py.js";
 import { injectRdsCaBundleIntoDockerfile } from "../utils.js";
 export const PY_RDB_AGENT_CONNECTION_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
@@ -30,6 +30,12 @@ export const pyRdbAgentConnectionGenerator = async (tree, options)=>{
         });
         updateProjectConfiguration(tree, sourceProject.name, sourceProject);
     }
+    // Recorded so the version sync can identify this connection.
+    addComponentGeneratorMetadata(tree, sourceProject.name, PY_RDB_AGENT_CONNECTION_GENERATOR_INFO, targetProject.root, `${agentName}-${targetProject.name}`, // The source component this connection is made from, so the pair is
+    // identifiable rather than just the two projects.
+    {
+        sourcePath: options.sourceComponent?.path
+    });
     await addGeneratorMetricsIfApplicable(tree, [
         PY_RDB_AGENT_CONNECTION_GENERATOR_INFO
     ]);

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/py/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  type GeneratorCallback,\n  joinPathFragments,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { formatFilesInSubtree } from '../../../utils/format';\nimport { installDependencies } from '../../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../../utils/metrics';\nimport { toSnakeCase } from '../../../utils/names';\nimport {\n  addDependencyToTargetIfNotPresent,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../../utils/nx';\nimport { addWorkspaceDependencyToPyProject } from '../../../utils/py';\nimport { injectRdsCaBundleIntoDockerfile } from '../utils';\nimport type { PyRdbAgentConnectionGeneratorSchema } from './schema';\n\nexport const PY_RDB_AGENT_CONNECTION_GENERATOR_INFO: NxGeneratorInfo =\n  getGeneratorInfo(import.meta.filename);\n\nexport const pyRdbAgentConnectionGenerator = async (\n  tree: Tree,\n  options: PyRdbAgentConnectionGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const sourceProject = readProjectConfigurationUnqualified(\n    tree,\n    options.sourceProject,\n  );\n  const targetProject = readProjectConfigurationUnqualified(\n    tree,\n    options.targetProject,\n  );\n\n  addWorkspaceDependencyToPyProject(tree, sourceProject, targetProject);\n\n  const agentName = options.sourceComponent?.name ?? 'agent';\n  const devTarget = `${agentName}-dev`;\n  const agentSourceDir = options.sourceComponent?.path\n    ? joinPathFragments(sourceProject.root, options.sourceComponent.path)\n    : sourceProject.sourceRoot\n      ? joinPathFragments(sourceProject.sourceRoot, toSnakeCase(agentName))\n      : undefined;\n  const dockerfilePath = agentSourceDir\n    ? joinPathFragments(agentSourceDir, 'Dockerfile')\n    : undefined;\n\n  if (dockerfilePath) {\n    injectRdsCaBundleIntoDockerfile(tree, dockerfilePath);\n  }\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  await addGeneratorMetricsIfApplicable(tree, [\n    PY_RDB_AGENT_CONNECTION_GENERATOR_INFO,\n  ]);\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript', 'python'],\n    });\n};\n\nexport default pyRdbAgentConnectionGenerator;\n"],"names":["joinPathFragments","updateProjectConfiguration","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","toSnakeCase","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","addWorkspaceDependencyToPyProject","injectRdsCaBundleIntoDockerfile","PY_RDB_AGENT_CONNECTION_GENERATOR_INFO","filename","pyRdbAgentConnectionGenerator","tree","options","sourceProject","targetProject","agentName","sourceComponent","name","devTarget","agentSourceDir","path","root","sourceRoot","undefined","dockerfilePath","targets","projects","target","preferInstallDependencies","languages"],"mappings":"AAAA;;;CAGC,GACD,SAEEA,iBAAiB,EAEjBC,0BAA0B,QACrB,aAAa;AACpB,SAASC,oBAAoB,QAAQ,2BAAwB;AAC7D,SAASC,mBAAmB,QAAQ,4BAAyB;AAC7D,SAASC,+BAA+B,QAAQ,4BAAyB;AACzE,SAASC,WAAW,QAAQ,0BAAuB;AACnD,SACEC,iCAAiC,EACjCC,gBAAgB,EAEhBC,mCAAmC,QAC9B,uBAAoB;AAC3B,SAASC,iCAAiC,QAAQ,uBAAoB;AACtE,SAASC,+BAA+B,QAAQ,cAAW;AAG3D,OAAO,MAAMC,yCACXJ,iBAAiB,YAAYK,QAAQ,EAAE;AAEzC,OAAO,MAAMC,gCAAgC,OAC3CC,MACAC;IAEA,MAAMC,gBAAgBR,oCACpBM,MACAC,QAAQC,aAAa;IAEvB,MAAMC,gBAAgBT,oCACpBM,MACAC,QAAQE,aAAa;IAGvBR,kCAAkCK,MAAME,eAAeC;IAEvD,MAAMC,YAAYH,QAAQI,eAAe,EAAEC,QAAQ;IACnD,MAAMC,YAAY,GAAGH,UAAU,IAAI,CAAC;IACpC,MAAMI,iBAAiBP,QAAQI,eAAe,EAAEI,OAC5CvB,kBAAkBgB,cAAcQ,IAAI,EAAET,QAAQI,eAAe,CAACI,IAAI,IAClEP,cAAcS,UAAU,GACtBzB,kBAAkBgB,cAAcS,UAAU,EAAEpB,YAAYa,cACxDQ;IACN,MAAMC,iBAAiBL,iBACnBtB,kBAAkBsB,gBAAgB,gBAClCI;IAEJ,IAAIC,gBAAgB;QAClBjB,gCAAgCI,MAAMa;IACxC;IAEA,IAAIX,cAAcY,OAAO,EAAE,CAACP,UAAU,EAAE;QACtCf,kCAAkCU,eAAeK,WAAW;YAC1DQ,UAAU;gBAACZ,cAAcG,IAAI;aAAC;YAC9BU,QAAQ;QACV;QACA7B,2BAA2Ba,MAAME,cAAcI,IAAI,EAAEJ;IACvD;IAEA,MAAMZ,gCAAgCU,MAAM;QAC1CH;KACD;IACD,MAAMT,qBAAqBY;IAC3B,OAAO,IACLX,oBAAoBW,MAAMC,QAAQgB,yBAAyB,EAAE;YAC3DC,WAAW;gBAAC;gBAAc;aAAS;QACrC;AACJ,EAAE;AAEF,eAAenB,8BAA8B"}
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/py/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  type GeneratorCallback,\n  joinPathFragments,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { formatFilesInSubtree } from '../../../utils/format';\nimport { installDependencies } from '../../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../../utils/metrics';\nimport { toSnakeCase } from '../../../utils/names';\nimport {\n  addComponentGeneratorMetadata,\n  addDependencyToTargetIfNotPresent,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../../utils/nx';\nimport { addWorkspaceDependencyToPyProject } from '../../../utils/py';\nimport { injectRdsCaBundleIntoDockerfile } from '../utils';\nimport type { PyRdbAgentConnectionGeneratorSchema } from './schema';\n\nexport const PY_RDB_AGENT_CONNECTION_GENERATOR_INFO: NxGeneratorInfo =\n  getGeneratorInfo(import.meta.filename);\n\nexport const pyRdbAgentConnectionGenerator = async (\n  tree: Tree,\n  options: PyRdbAgentConnectionGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const sourceProject = readProjectConfigurationUnqualified(\n    tree,\n    options.sourceProject,\n  );\n  const targetProject = readProjectConfigurationUnqualified(\n    tree,\n    options.targetProject,\n  );\n\n  addWorkspaceDependencyToPyProject(tree, sourceProject, targetProject);\n\n  const agentName = options.sourceComponent?.name ?? 'agent';\n  const devTarget = `${agentName}-dev`;\n  const agentSourceDir = options.sourceComponent?.path\n    ? joinPathFragments(sourceProject.root, options.sourceComponent.path)\n    : sourceProject.sourceRoot\n      ? joinPathFragments(sourceProject.sourceRoot, toSnakeCase(agentName))\n      : undefined;\n  const dockerfilePath = agentSourceDir\n    ? joinPathFragments(agentSourceDir, 'Dockerfile')\n    : undefined;\n\n  if (dockerfilePath) {\n    injectRdsCaBundleIntoDockerfile(tree, dockerfilePath);\n  }\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  // Recorded so the version sync can identify this connection.\n  addComponentGeneratorMetadata(\n    tree,\n    sourceProject.name,\n    PY_RDB_AGENT_CONNECTION_GENERATOR_INFO,\n    targetProject.root,\n    `${agentName}-${targetProject.name}`,\n    // The source component this connection is made from, so the pair is\n    // identifiable rather than just the two projects.\n    { sourcePath: options.sourceComponent?.path },\n  );\n\n  await addGeneratorMetricsIfApplicable(tree, [\n    PY_RDB_AGENT_CONNECTION_GENERATOR_INFO,\n  ]);\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript', 'python'],\n    });\n};\n\nexport default pyRdbAgentConnectionGenerator;\n"],"names":["joinPathFragments","updateProjectConfiguration","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","toSnakeCase","addComponentGeneratorMetadata","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","addWorkspaceDependencyToPyProject","injectRdsCaBundleIntoDockerfile","PY_RDB_AGENT_CONNECTION_GENERATOR_INFO","filename","pyRdbAgentConnectionGenerator","tree","options","sourceProject","targetProject","agentName","sourceComponent","name","devTarget","agentSourceDir","path","root","sourceRoot","undefined","dockerfilePath","targets","projects","target","sourcePath","preferInstallDependencies","languages"],"mappings":"AAAA;;;CAGC,GACD,SAEEA,iBAAiB,EAEjBC,0BAA0B,QACrB,aAAa;AACpB,SAASC,oBAAoB,QAAQ,2BAAwB;AAC7D,SAASC,mBAAmB,QAAQ,4BAAyB;AAC7D,SAASC,+BAA+B,QAAQ,4BAAyB;AACzE,SAASC,WAAW,QAAQ,0BAAuB;AACnD,SACEC,6BAA6B,EAC7BC,iCAAiC,EACjCC,gBAAgB,EAEhBC,mCAAmC,QAC9B,uBAAoB;AAC3B,SAASC,iCAAiC,QAAQ,uBAAoB;AACtE,SAASC,+BAA+B,QAAQ,cAAW;AAG3D,OAAO,MAAMC,yCACXJ,iBAAiB,YAAYK,QAAQ,EAAE;AAEzC,OAAO,MAAMC,gCAAgC,OAC3CC,MACAC;IAEA,MAAMC,gBAAgBR,oCACpBM,MACAC,QAAQC,aAAa;IAEvB,MAAMC,gBAAgBT,oCACpBM,MACAC,QAAQE,aAAa;IAGvBR,kCAAkCK,MAAME,eAAeC;IAEvD,MAAMC,YAAYH,QAAQI,eAAe,EAAEC,QAAQ;IACnD,MAAMC,YAAY,GAAGH,UAAU,IAAI,CAAC;IACpC,MAAMI,iBAAiBP,QAAQI,eAAe,EAAEI,OAC5CxB,kBAAkBiB,cAAcQ,IAAI,EAAET,QAAQI,eAAe,CAACI,IAAI,IAClEP,cAAcS,UAAU,GACtB1B,kBAAkBiB,cAAcS,UAAU,EAAErB,YAAYc,cACxDQ;IACN,MAAMC,iBAAiBL,iBACnBvB,kBAAkBuB,gBAAgB,gBAClCI;IAEJ,IAAIC,gBAAgB;QAClBjB,gCAAgCI,MAAMa;IACxC;IAEA,IAAIX,cAAcY,OAAO,EAAE,CAACP,UAAU,EAAE;QACtCf,kCAAkCU,eAAeK,WAAW;YAC1DQ,UAAU;gBAACZ,cAAcG,IAAI;aAAC;YAC9BU,QAAQ;QACV;QACA9B,2BAA2Bc,MAAME,cAAcI,IAAI,EAAEJ;IACvD;IAEA,6DAA6D;IAC7DX,8BACES,MACAE,cAAcI,IAAI,EAClBT,wCACAM,cAAcO,IAAI,EAClB,GAAGN,UAAU,CAAC,EAAED,cAAcG,IAAI,EAAE,EACpC,oEAAoE;IACpE,kDAAkD;IAClD;QAAEW,YAAYhB,QAAQI,eAAe,EAAEI;IAAK;IAG9C,MAAMpB,gCAAgCW,MAAM;QAC1CH;KACD;IACD,MAAMV,qBAAqBa;IAC3B,OAAO,IACLZ,oBAAoBY,MAAMC,QAAQiB,yBAAyB,EAAE;YAC3DC,WAAW;gBAAC;gBAAc;aAAS;QACrC;AACJ,EAAE;AAEF,eAAepB,8BAA8B"}

package/src/py/rdb/fast-api-connection/__snapshots__/generator.spec.ts.snap

@@ -5,6 +5,13 @@ exports[`py#rdb fast-api-connection generator > should add rdb dev dependency to
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "metadata": {
     "apiName": "api",
+    "components": [
+      {
+        "generator": "py#rdb#fast-api-connection",
+        "name": "db",
+        "path": "proj_api/dependencies/db.py",
+      },
+    ],
   },
   "name": "api",
   "root": "packages/api",

package/src/py/rdb/fast-api-connection/generator.js

@@ -7,7 +7,7 @@ import { installDependencies } from "../../../utils/install.js";
 import { addGeneratorMetricsIfApplicable } from "../../../utils/metrics.js";
 import { toClassName, toSnakeCase } from "../../../utils/names.js";
 import { getNpmScope } from "../../../utils/npm-scope.js";
-import { addDependencyToTargetIfNotPresent, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../../utils/nx.js";
+import { addComponentGeneratorMetadata, addDependencyToTargetIfNotPresent, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../../utils/nx.js";
 import { addWorkspaceDependencyToPyProject } from "../../../utils/py.js";
 export const PY_RDB_FAST_API_CONNECTION_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
 export const pyRdbFastApiConnectionGenerator = async (tree, options)=>{
@@ -38,6 +38,8 @@ export const pyRdbFastApiConnectionGenerator = async (tree, options)=>{
     }, {
         overwriteStrategy: OverwriteStrategy.KeepExisting
     });
+    // Recorded so the version sync can identify this connection.
+    addComponentGeneratorMetadata(tree, sourceProject.name, PY_RDB_FAST_API_CONNECTION_GENERATOR_INFO, joinPathFragments(apiModuleName, 'dependencies', `${rdbNameSnake}.py`), rdbNameSnake);
     await addGeneratorMetricsIfApplicable(tree, [
         PY_RDB_FAST_API_CONNECTION_GENERATOR_INFO
     ]);

package/src/py/rdb/fast-api-connection/generator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/py/rdb/fast-api-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  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { formatFilesInSubtree } from '../../../utils/format';\nimport { installDependencies } from '../../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../../utils/metrics';\nimport { toClassName, toSnakeCase } from '../../../utils/names';\nimport { getNpmScope } from '../../../utils/npm-scope';\nimport {\n  addDependencyToTargetIfNotPresent,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../../utils/nx';\nimport { addWorkspaceDependencyToPyProject } from '../../../utils/py';\nimport type { PyRdbFastApiConnectionGeneratorSchema } from './schema';\n\nexport const PY_RDB_FAST_API_CONNECTION_GENERATOR_INFO: NxGeneratorInfo =\n  getGeneratorInfo(import.meta.filename);\n\nexport const pyRdbFastApiConnectionGenerator = async (\n  tree: Tree,\n  options: PyRdbFastApiConnectionGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const sourceProject = readProjectConfigurationUnqualified(\n    tree,\n    options.sourceProject,\n  );\n  const targetProject = readProjectConfigurationUnqualified(\n    tree,\n    options.targetProject,\n  );\n\n  addWorkspaceDependencyToPyProject(tree, sourceProject, targetProject);\n\n  if (sourceProject.targets?.['dev']) {\n    addDependencyToTargetIfNotPresent(sourceProject, 'dev', {\n      projects: [targetProject.name],\n      target: 'dev',\n    });\n    updateProjectConfiguration(tree, sourceProject.name, sourceProject);\n  }\n\n  const scope = toSnakeCase(getNpmScope(tree));\n  const rdbLocalName = targetProject.name.split('.').pop()!;\n  const databasePackageAlias = `${scope}_${rdbLocalName}`;\n  const rdbNameSnake = toSnakeCase(rdbLocalName);\n  const rdbNameClassName = toClassName(rdbLocalName);\n  const apiName = (sourceProject.metadata as any)?.apiName as string;\n  const apiModuleName = toSnakeCase(`${scope}_${toSnakeCase(apiName)}`);\n\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files'),\n    sourceProject.root,\n    { databasePackageAlias, rdbNameSnake, rdbNameClassName, apiModuleName },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  await addGeneratorMetricsIfApplicable(tree, [\n    PY_RDB_FAST_API_CONNECTION_GENERATOR_INFO,\n  ]);\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript', 'python'],\n    });\n};\n\nexport default pyRdbFastApiConnectionGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","updateProjectConfiguration","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","toClassName","toSnakeCase","getNpmScope","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","addWorkspaceDependencyToPyProject","PY_RDB_FAST_API_CONNECTION_GENERATOR_INFO","filename","pyRdbFastApiConnectionGenerator","tree","options","sourceProject","targetProject","targets","projects","name","target","scope","rdbLocalName","split","pop","databasePackageAlias","rdbNameSnake","rdbNameClassName","apiName","metadata","apiModuleName","dirname","root","overwriteStrategy","KeepExisting","preferInstallDependencies","languages"],"mappings":"AAAA;;;CAGC,GACD,SAEEA,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,EAEjBC,0BAA0B,QACrB,aAAa;AACpB,SAASC,oBAAoB,QAAQ,2BAAwB;AAC7D,SAASC,mBAAmB,QAAQ,4BAAyB;AAC7D,SAASC,+BAA+B,QAAQ,4BAAyB;AACzE,SAASC,WAAW,EAAEC,WAAW,QAAQ,0BAAuB;AAChE,SAASC,WAAW,QAAQ,8BAA2B;AACvD,SACEC,iCAAiC,EACjCC,gBAAgB,EAEhBC,mCAAmC,QAC9B,uBAAoB;AAC3B,SAASC,iCAAiC,QAAQ,uBAAoB;AAGtE,OAAO,MAAMC,4CACXH,iBAAiB,YAAYI,QAAQ,EAAE;AAEzC,OAAO,MAAMC,kCAAkC,OAC7CC,MACAC;IAEA,MAAMC,gBAAgBP,oCACpBK,MACAC,QAAQC,aAAa;IAEvB,MAAMC,gBAAgBR,oCACpBK,MACAC,QAAQE,aAAa;IAGvBP,kCAAkCI,MAAME,eAAeC;IAEvD,IAAID,cAAcE,OAAO,EAAE,CAAC,MAAM,EAAE;QAClCX,kCAAkCS,eAAe,OAAO;YACtDG,UAAU;gBAACF,cAAcG,IAAI;aAAC;YAC9BC,QAAQ;QACV;QACArB,2BAA2Bc,MAAME,cAAcI,IAAI,EAAEJ;IACvD;IAEA,MAAMM,QAAQjB,YAAYC,YAAYQ;IACtC,MAAMS,eAAeN,cAAcG,IAAI,CAACI,KAAK,CAAC,KAAKC,GAAG;IACtD,MAAMC,uBAAuB,GAAGJ,MAAM,CAAC,EAAEC,cAAc;IACvD,MAAMI,eAAetB,YAAYkB;IACjC,MAAMK,mBAAmBxB,YAAYmB;IACrC,MAAMM,UAAWb,cAAcc,QAAQ,EAAUD;IACjD,MAAME,gBAAgB1B,YAAY,GAAGiB,MAAM,CAAC,EAAEjB,YAAYwB,UAAU;IAEpEhC,cACEiB,MACAhB,kBAAkB,YAAYkC,OAAO,EAAE,UACvChB,cAAciB,IAAI,EAClB;QAAEP;QAAsBC;QAAcC;QAAkBG;IAAc,GACtE;QAAEG,mBAAmBnC,kBAAkBoC,YAAY;IAAC;IAGtD,MAAMhC,gCAAgCW,MAAM;QAC1CH;KACD;IACD,MAAMV,qBAAqBa;IAC3B,OAAO,IACLZ,oBAAoBY,MAAMC,QAAQqB,yBAAyB,EAAE;YAC3DC,WAAW;gBAAC;gBAAc;aAAS;QACrC;AACJ,EAAE;AAEF,eAAexB,gCAAgC"}
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/py/rdb/fast-api-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  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { formatFilesInSubtree } from '../../../utils/format';\nimport { installDependencies } from '../../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../../utils/metrics';\nimport { toClassName, toSnakeCase } from '../../../utils/names';\nimport { getNpmScope } from '../../../utils/npm-scope';\nimport {\n  addComponentGeneratorMetadata,\n  addDependencyToTargetIfNotPresent,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  readProjectConfigurationUnqualified,\n} from '../../../utils/nx';\nimport { addWorkspaceDependencyToPyProject } from '../../../utils/py';\nimport type { PyRdbFastApiConnectionGeneratorSchema } from './schema';\n\nexport const PY_RDB_FAST_API_CONNECTION_GENERATOR_INFO: NxGeneratorInfo =\n  getGeneratorInfo(import.meta.filename);\n\nexport const pyRdbFastApiConnectionGenerator = async (\n  tree: Tree,\n  options: PyRdbFastApiConnectionGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const sourceProject = readProjectConfigurationUnqualified(\n    tree,\n    options.sourceProject,\n  );\n  const targetProject = readProjectConfigurationUnqualified(\n    tree,\n    options.targetProject,\n  );\n\n  addWorkspaceDependencyToPyProject(tree, sourceProject, targetProject);\n\n  if (sourceProject.targets?.['dev']) {\n    addDependencyToTargetIfNotPresent(sourceProject, 'dev', {\n      projects: [targetProject.name],\n      target: 'dev',\n    });\n    updateProjectConfiguration(tree, sourceProject.name, sourceProject);\n  }\n\n  const scope = toSnakeCase(getNpmScope(tree));\n  const rdbLocalName = targetProject.name.split('.').pop()!;\n  const databasePackageAlias = `${scope}_${rdbLocalName}`;\n  const rdbNameSnake = toSnakeCase(rdbLocalName);\n  const rdbNameClassName = toClassName(rdbLocalName);\n  const apiName = (sourceProject.metadata as any)?.apiName as string;\n  const apiModuleName = toSnakeCase(`${scope}_${toSnakeCase(apiName)}`);\n\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files'),\n    sourceProject.root,\n    { databasePackageAlias, rdbNameSnake, rdbNameClassName, apiModuleName },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Recorded so the version sync can identify this connection.\n  addComponentGeneratorMetadata(\n    tree,\n    sourceProject.name,\n    PY_RDB_FAST_API_CONNECTION_GENERATOR_INFO,\n    joinPathFragments(apiModuleName, 'dependencies', `${rdbNameSnake}.py`),\n    rdbNameSnake,\n  );\n\n  await addGeneratorMetricsIfApplicable(tree, [\n    PY_RDB_FAST_API_CONNECTION_GENERATOR_INFO,\n  ]);\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript', 'python'],\n    });\n};\n\nexport default pyRdbFastApiConnectionGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","updateProjectConfiguration","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","toClassName","toSnakeCase","getNpmScope","addComponentGeneratorMetadata","addDependencyToTargetIfNotPresent","getGeneratorInfo","readProjectConfigurationUnqualified","addWorkspaceDependencyToPyProject","PY_RDB_FAST_API_CONNECTION_GENERATOR_INFO","filename","pyRdbFastApiConnectionGenerator","tree","options","sourceProject","targetProject","targets","projects","name","target","scope","rdbLocalName","split","pop","databasePackageAlias","rdbNameSnake","rdbNameClassName","apiName","metadata","apiModuleName","dirname","root","overwriteStrategy","KeepExisting","preferInstallDependencies","languages"],"mappings":"AAAA;;;CAGC,GACD,SAEEA,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,EAEjBC,0BAA0B,QACrB,aAAa;AACpB,SAASC,oBAAoB,QAAQ,2BAAwB;AAC7D,SAASC,mBAAmB,QAAQ,4BAAyB;AAC7D,SAASC,+BAA+B,QAAQ,4BAAyB;AACzE,SAASC,WAAW,EAAEC,WAAW,QAAQ,0BAAuB;AAChE,SAASC,WAAW,QAAQ,8BAA2B;AACvD,SACEC,6BAA6B,EAC7BC,iCAAiC,EACjCC,gBAAgB,EAEhBC,mCAAmC,QAC9B,uBAAoB;AAC3B,SAASC,iCAAiC,QAAQ,uBAAoB;AAGtE,OAAO,MAAMC,4CACXH,iBAAiB,YAAYI,QAAQ,EAAE;AAEzC,OAAO,MAAMC,kCAAkC,OAC7CC,MACAC;IAEA,MAAMC,gBAAgBP,oCACpBK,MACAC,QAAQC,aAAa;IAEvB,MAAMC,gBAAgBR,oCACpBK,MACAC,QAAQE,aAAa;IAGvBP,kCAAkCI,MAAME,eAAeC;IAEvD,IAAID,cAAcE,OAAO,EAAE,CAAC,MAAM,EAAE;QAClCX,kCAAkCS,eAAe,OAAO;YACtDG,UAAU;gBAACF,cAAcG,IAAI;aAAC;YAC9BC,QAAQ;QACV;QACAtB,2BAA2Be,MAAME,cAAcI,IAAI,EAAEJ;IACvD;IAEA,MAAMM,QAAQlB,YAAYC,YAAYS;IACtC,MAAMS,eAAeN,cAAcG,IAAI,CAACI,KAAK,CAAC,KAAKC,GAAG;IACtD,MAAMC,uBAAuB,GAAGJ,MAAM,CAAC,EAAEC,cAAc;IACvD,MAAMI,eAAevB,YAAYmB;IACjC,MAAMK,mBAAmBzB,YAAYoB;IACrC,MAAMM,UAAWb,cAAcc,QAAQ,EAAUD;IACjD,MAAME,gBAAgB3B,YAAY,GAAGkB,MAAM,CAAC,EAAElB,YAAYyB,UAAU;IAEpEjC,cACEkB,MACAjB,kBAAkB,YAAYmC,OAAO,EAAE,UACvChB,cAAciB,IAAI,EAClB;QAAEP;QAAsBC;QAAcC;QAAkBG;IAAc,GACtE;QAAEG,mBAAmBpC,kBAAkBqC,YAAY;IAAC;IAGtD,6DAA6D;IAC7D7B,8BACEQ,MACAE,cAAcI,IAAI,EAClBT,2CACAd,kBAAkBkC,eAAe,gBAAgB,GAAGJ,aAAa,GAAG,CAAC,GACrEA;IAGF,MAAMzB,gCAAgCY,MAAM;QAC1CH;KACD;IACD,MAAMX,qBAAqBc;IAC3B,OAAO,IACLb,oBAAoBa,MAAMC,QAAQqB,yBAAyB,EAAE;YAC3DC,WAAW;gBAAC;gBAAc;aAAS;QACrC;AACJ,EAAE;AAEF,eAAexB,gCAAgC"}

package/src/py/rdb/generator.d.ts

@@ -1,6 +1,95 @@
 import { type GeneratorCallback, type Tree } from '@nx/devkit';
 import { type NxGeneratorInfo } from '../../utils/nx';
+import { type IacMetadata } from '../../utils/shared-constructs-constants';
 import type { PyRdbGeneratorSchema } from './schema';
+/** The metadata this generator records, which its predicates read. */
+export interface PyRdbMetadata extends IacMetadata {
+    readonly engine: PyRdbGeneratorSchema['engine'];
+}
+export declare const DEPENDENCIES: import("../../utils/declared-dependencies").DependencyDeclaration<readonly [{
+    readonly name: "mariadb";
+    readonly when: (m: PyRdbMetadata) => boolean;
+    readonly root: true;
+}, {
+    readonly name: "pg";
+    readonly when: (m: PyRdbMetadata) => boolean;
+    readonly root: true;
+}, {
+    readonly name: "@types/pg";
+    readonly when: (m: PyRdbMetadata) => boolean;
+    readonly dev: true;
+    readonly root: true;
+}, {
+    readonly name: "ncp";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "rimraf";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "make-dir-cli";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "ncp";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "rimraf";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "make-dir-cli";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "constructs";
+    readonly when: (m: IacMetadata) => boolean;
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "aws-cdk-lib";
+    readonly when: (m: IacMetadata) => boolean;
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "@types/node";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "pg";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "@types/pg";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "mariadb";
+} & {
+    versionOnly: true;
+}, {
+    readonly name: "tsx";
+} & {
+    versionOnly: true;
+}], readonly [{
+    readonly name: "sqlmodel";
+}, {
+    readonly name: "alembic";
+}, {
+    readonly name: "greenlet";
+}, {
+    readonly name: "aiomysql";
+    readonly when: (m: PyRdbMetadata) => boolean;
+}, {
+    readonly name: "asyncpg";
+    readonly when: (m: PyRdbMetadata) => boolean;
+}, {
+    readonly name: "boto3";
+}, {
+    readonly name: "aws-lambda-powertools";
+}]>;
 export declare const PY_RDB_GENERATOR_INFO: NxGeneratorInfo;
 export declare const pyRdbGenerator: (tree: Tree, options: PyRdbGeneratorSchema) => Promise<GeneratorCallback>;
 export default pyRdbGenerator;

package/src/py/rdb/generator.js

@@ -3,12 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */ import { relative } from "node:path";
 import { generateFiles, joinPathFragments, readProjectConfiguration, updateProjectConfiguration } from "@nx/devkit";
+import { addPyDependencies, addTsDependencies } from "../../utils/add-dependencies.js";
 import { addPythonBundleTarget } from "../../utils/bundle/bundle.js";
 import { resolveContainers } from "../../utils/containers.js";
-import { addDependenciesToPackageJson } from "../../utils/dependencies.js";
-import { addDockerScanTarget } from "../../utils/docker.js";
+import { declareDependencies, ownedElsewhere } from "../../utils/declared-dependencies.js";
+import { addDockerScanTarget, DOCKER_DEPENDENCIES } from "../../utils/docker.js";
 import { formatFilesInSubtree } from "../../utils/format.js";
-import { FsCommands } from "../../utils/fs.js";
+import { FS_DEPENDENCIES, FsCommands } from "../../utils/fs.js";
 import { resolveIac } from "../../utils/iac.js";
 import { installDependencies } from "../../utils/install.js";
 import { addGeneratorMetricsIfApplicable } from "../../utils/metrics.js";
@@ -16,13 +17,70 @@ import { kebabCase, snakeCase, toClassName } from "../../utils/names.js";
 import { getNpmScope } from "../../utils/npm-scope.js";
 import { addDependencyToTargetIfNotPresent, addGeneratorMetadata, getGeneratorInfo, projectExists } from "../../utils/nx.js";
 import { assignPort } from "../../utils/port.js";
-import { addDependenciesToPyProjectToml } from "../../utils/py.js";
 import { addRdbInfra } from "../../utils/rdb-constructs/rdb-constructs.js";
-import { sharedConstructsGenerator } from "../../utils/shared-constructs.js";
+import { SHARED_CONSTRUCTS_DEPENDENCIES, sharedConstructsGenerator } from "../../utils/shared-constructs.js";
 import { PACKAGES_DIR, SHARED_SCRIPTS_DIR } from "../../utils/shared-constructs-constants.js";
-import { sharedRdbScriptsGenerator } from "../../utils/shared-rdb-scripts.js";
-import { PY_VERSIONS, withVersions } from "../../utils/versions.js";
+import { SHARED_RDB_SCRIPTS_DEPENDENCIES, sharedRdbScriptsGenerator } from "../../utils/shared-rdb-scripts.js";
+import { PY_VERSIONS } from "../../utils/versions.js";
 import pyProjectGenerator, { getPyProjectDetails } from "../project/generator.js";
+/** The Postgres engine, which MySQL takes none of. */ const isPostgres = (m)=>m.engine !== 'mysql';
+// Each entry names the engine branch it belongs to, so the same declaration
+// drives both adding and the version sync.
+export const DEPENDENCIES = declareDependencies()({
+    ts: [
+        // The engine client the local dev script wait-for-*-db.ts imports.
+        {
+            name: 'mariadb',
+            when: (m)=>m.engine === 'mysql',
+            root: true
+        },
+        {
+            name: 'pg',
+            when: isPostgres,
+            root: true
+        },
+        {
+            name: '@types/pg',
+            when: isPostgres,
+            dev: true,
+            root: true
+        },
+        // Added by the helpers that own the projects they belong to.
+        ...ownedElsewhere(FS_DEPENDENCIES),
+        ...ownedElsewhere(DOCKER_DEPENDENCIES),
+        ...ownedElsewhere(SHARED_CONSTRUCTS_DEPENDENCIES),
+        ...ownedElsewhere(SHARED_RDB_SCRIPTS_DEPENDENCIES)
+    ],
+    py: [
+        {
+            name: 'sqlmodel'
+        },
+        {
+            name: 'alembic'
+        },
+        // SQLAlchemy's async engine (used by connection.py for both engines)
+        // requires greenlet at runtime. Vend it explicitly at a pinned version so
+        // the dependency graph is fully determined and doesn't float to an
+        // unpublished-wheel release at install time.
+        {
+            name: 'greenlet'
+        },
+        {
+            name: 'aiomysql',
+            when: (m)=>m.engine === 'mysql'
+        },
+        {
+            name: 'asyncpg',
+            when: (m)=>m.engine !== 'mysql'
+        },
+        {
+            name: 'boto3'
+        },
+        {
+            name: 'aws-lambda-powertools'
+        }
+    ]
+});
 export const PY_RDB_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
 export const pyRdbGenerator = async (tree, options)=>{
     const nameClassName = toClassName(options.name);
@@ -44,6 +102,17 @@ export const pyRdbGenerator = async (tree, options)=>{
     }
     const projectConfig = readProjectConfiguration(tree, fullyQualifiedName);
     const { engine } = options;
+    // Recorded in the metadata below so the version sync can tell a CDK project
+    // from a Terraform one; undefined when no infrastructure was generated.
+    const iac = options.infra !== 'none' ? await resolveIac(tree, options.iac) : undefined;
+    // Recorded below and read by the declaration's predicates, so the packages
+    // added here are exactly the ones the version sync will own.
+    const metadata = {
+        engine,
+        ...iac ? {
+            iac
+        } : {}
+    };
     const localDbPort = assignPort(tree, projectConfig, engine === 'mysql' ? 3306 : 5432);
     const localDbHost = 'localhost';
     const localDbUser = engine === 'mysql' ? 'root' : 'dbadmin';
@@ -70,15 +139,9 @@ export const pyRdbGenerator = async (tree, options)=>{
         awsLambdaPowertoolsVersion: PY_VERSIONS['aws-lambda-powertools']
     };
     generateFiles(tree, joinPathFragments(import.meta.dirname, 'files'), dir, templateOptions);
-    await sharedRdbScriptsGenerator(tree, engine);
-    // Used by local dev script wait-for-*-db.ts
-    addDependenciesToPackageJson(tree, withVersions([
-        engine === 'mysql' ? 'mariadb' : 'pg'
-    ]), engine === 'mysql' ? {} : withVersions([
-        '@types/pg'
-    ]));
+    await sharedRdbScriptsGenerator(tree, engine, DEPENDENCIES);
     const scriptsDir = relative(dir, joinPathFragments(PACKAGES_DIR, SHARED_SCRIPTS_DIR, 'src', 'rdb'));
-    const fs = new FsCommands(tree);
+    const fs = new FsCommands(tree, DEPENDENCIES);
     const migrationBundleDir = joinPathFragments('dist', projectConfig.root, 'docker', 'migration');
     const createDbUserBundleDir = joinPathFragments('dist', projectConfig.root, 'docker', 'create-db-user');
     const migrationDockerImageTag = `${getNpmScope(tree)}-${kebabCase(options.name)}-migration:latest`;
@@ -187,7 +250,6 @@ export const pyRdbGenerator = async (tree, options)=>{
         }
     };
     if (options.infra !== 'none') {
-        const iac = await resolveIac(tree, options.iac);
         if (iac === 'terraform') {
             projectConfig.targets.docker = {
                 cache: true,
@@ -214,20 +276,17 @@ export const pyRdbGenerator = async (tree, options)=>{
                     migrationDockerImageTag,
                     createDbUserDockerImageTag
                 ]
-            });
+            }, DEPENDENCIES);
         }
         addDependencyToTargetIfNotPresent(projectConfig, 'build', 'bundle-migration');
         addDependencyToTargetIfNotPresent(projectConfig, 'build', 'bundle-create-db-user');
     }
     updateProjectConfiguration(tree, fullyQualifiedName, projectConfig);
-    addGeneratorMetadata(tree, fullyQualifiedName, PY_RDB_GENERATOR_INFO, {
-        engine
-    });
+    addGeneratorMetadata(tree, fullyQualifiedName, PY_RDB_GENERATOR_INFO, metadata);
     if (options.infra !== 'none') {
-        const iac = await resolveIac(tree, options.iac);
         await sharedConstructsGenerator(tree, {
             iac
-        });
+        }, DEPENDENCIES);
         await addRdbInfra(tree, {
             iac,
             projectName: fullyQualifiedName,
@@ -246,24 +305,13 @@ export const pyRdbGenerator = async (tree, options)=>{
             containerEngine
         });
     }
-    addDependenciesToPyProjectToml(tree, dir, [
-        'sqlmodel',
-        'alembic',
-        // SQLAlchemy's async engine (used by connection.py for both engines)
-        // requires greenlet at runtime. Vend it explicitly at a pinned version so
-        // the dependency graph is fully determined and doesn't float to an
-        // unpublished-wheel release at install time.
-        'greenlet',
-        ...engine === 'mysql' ? [
-            'aiomysql',
-            'boto3',
-            'aws-lambda-powertools'
-        ] : [
-            'asyncpg',
-            'boto3',
-            'aws-lambda-powertools'
-        ]
-    ]);
+    addPyDependencies(tree, DEPENDENCIES, {
+        metadata,
+        projectRoot: dir
+    });
+    addTsDependencies(tree, DEPENDENCIES, {
+        metadata
+    });
     await addGeneratorMetricsIfApplicable(tree, [
         PY_RDB_GENERATOR_INFO
     ]);