@aws/nx-plugin 1.0.0-rc.96 → 1.0.0-rc.98

package/src/utils/ast.d.ts

@@ -28,6 +28,16 @@ export declare const addSingleImport: (tree: Tree, filePath: string, variableNam
  * Note that this will create the file if it does not exist in the tree.
  */
 export declare const addStarExport: (tree: Tree, filePath: string, from: string) => Promise<void>;
+/**
+ * Adds an `export { <names> } from '<from>';` statement to the given TypeScript
+ * file, merging into an existing re-export of the same module when there is one.
+ * Note that this will create the file if it does not exist in the tree.
+ *
+ * Adding to whatever is already there is what lets a barrel the user curates —
+ * their own entities, models or components — survive a generator re-run while
+ * the generated entry is still registered.
+ */
+export declare const addNamedExport: (tree: Tree, filePath: string, names: string[], from: string) => Promise<void>;
 /**
  * Return whether or not the given identifier is exported in the source file.
  * Checks for both `export { Identifier }` and `export type Identifier = ...`.

package/src/utils/ast.js

@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */ import { QueryBuilder } from "@getgrit/gritql";
 import * as path from "path";
+import { LANGUAGE_COMMENT_SYNTAX, readLicenseConfig } from "../license/config.js";
+import { parseFile } from "../license/sync/generator.js";
 import { updateGitIgnore } from "./git.js";
 import { isEsmWorkspace } from "./module-format.js";
 const GRIT_DIR = '.grit';
@@ -31,6 +33,49 @@ const assertFilePath = (tree, filePath)=>{
         throw new Error(`No file located at ${filePath}`);
     }
 };
+/**
+ * Insert `statement` at the top of a file, below any hashbang and leading
+ * comment block. Keeps a license header first in the file, so `license#sync`
+ * doesn't see it displaced and prepend a second one.
+ *
+ * The leading comment is skipped whatever it says — a header, a placeholder or a
+ * note — so nothing here has to identify a license.
+ *
+ * Splits the file with the sync generator's own `parseFile`, resolving the
+ * comment syntax the way the sync does: the workspace's configured
+ * `commentSyntax` for the extension first, then the built-in table. That way an
+ * extension only the user's config covers is still recognised. An extension
+ * neither covers has no comment syntax to find, so the statement goes at the top.
+ */ const insertBelowLeadingComments = async (tree, filePath, contents, statement)=>{
+    const extension = filePath.split('.').pop() ?? '';
+    let syntax;
+    try {
+        syntax = (await readLicenseConfig(tree))?.source?.header?.commentSyntax?.[extension];
+    } catch  {
+    // Reading the config evaluates it, which throws on a config that doesn't
+    // load — including this file itself while a generator is mid-edit. A config
+    // we can't read must not stop an import being added, so fall back to the
+    // defaults. (A config that simply doesn't exist reads as undefined.)
+    }
+    syntax ??= LANGUAGE_COMMENT_SYNTAX[extension];
+    if (!syntax) {
+        return `${statement}\n${contents}`;
+    }
+    const { hashbang, header, body } = parseFile(contents, syntax);
+    if (!hashbang && !header) {
+        return `${statement}\n${contents}`;
+    }
+    return [
+        ...hashbang ? [
+            hashbang
+        ] : [],
+        ...header ? [
+            header
+        ] : [],
+        statement,
+        body
+    ].join('\n');
+};
 export const addDestructuredImport = async (tree, filePath, variableNames, from)=>{
     assertFilePath(tree, filePath);
     from = normalizeModuleSpecifier(tree, from);
@@ -44,16 +89,10 @@ export const addDestructuredImport = async (tree, filePath, variableNames, from)
             await applyGritQL(tree, filePath, `\`import { $imports } from '${from}'\` => \`import { $imports, ${variableName} } from '${from}'\` where { $imports <: not contains \`${localName}\` }`);
         }
     } else {
-        // No existing import — prepend a new one (after shebang if present)
+        // No existing import — add a new one below any hashbang and leading comment
         const specifiers = variableNames.join(', ');
         const contents = tree.read(filePath).toString();
-        const newImport = `import { ${specifiers} } from '${from}';\n`;
-        if (contents.startsWith('#!')) {
-            const newlineIndex = contents.indexOf('\n');
-            tree.write(filePath, `${contents.substring(0, newlineIndex + 1)}${newImport}${contents.substring(newlineIndex + 1)}`);
-        } else {
-            tree.write(filePath, `${newImport}${contents}`);
-        }
+        tree.write(filePath, await insertBelowLeadingComments(tree, filePath, contents, `import { ${specifiers} } from '${from}';`));
     }
 };
 /**
@@ -93,10 +132,11 @@ export const addDestructuredImport = async (tree, filePath, variableNames, from)
     if (allAlreadyPresent) {
         return;
     }
-    // No existing `from <module> import` line — prepend one. Ruff's import
-    // sorter will place it in the right group on the next formatter pass.
+    // No existing `from <module> import` line — add one below any hashbang and
+    // leading comment. Ruff's import sorter will place it in the right group on
+    // the next formatter pass.
     const specifiers = variableNames.join(', ');
-    tree.write(filePath, `from ${from} import ${specifiers}\n${beforeContents}`);
+    tree.write(filePath, await insertBelowLeadingComments(tree, filePath, beforeContents, `from ${from} import ${specifiers}`));
 };
 /**
  * Adds an `import <variableName> from '<from>'; statement to the beginning of the file,
@@ -115,9 +155,9 @@ export const addDestructuredImport = async (tree, filePath, variableNames, from)
     if (identifierTaken) {
         throw new Error(`Cannot import ${variableName} from '${from}' in ${filePath}: ${variableName} is already imported from a different module. Rename the project so its generated identifier does not collide.`);
     }
-    // Prepend new import to file
+    // Add the import below any hashbang and leading comment
     const contents = tree.read(filePath).toString();
-    tree.write(filePath, `import ${variableName} from '${from}';\n${contents}`);
+    tree.write(filePath, await insertBelowLeadingComments(tree, filePath, contents, `import ${variableName} from '${from}';`));
 };
 /**
  * Adds an `export * from '<from>'; statement to the given TypeScript file.
@@ -135,8 +175,40 @@ export const addDestructuredImport = async (tree, filePath, variableNames, from)
     if (alreadyExported) {
         return;
     }
-    // Prepend new export to file
-    tree.write(filePath, `export * from '${from}';\n${contents}`);
+    tree.write(filePath, await insertBelowLeadingComments(tree, filePath, contents, `export * from '${from}';`));
+};
+/**
+ * Adds an `export { <names> } from '<from>';` statement to the given TypeScript
+ * file, merging into an existing re-export of the same module when there is one.
+ * Note that this will create the file if it does not exist in the tree.
+ *
+ * Adding to whatever is already there is what lets a barrel the user curates —
+ * their own entities, models or components — survive a generator re-run while
+ * the generated entry is still registered.
+ */ export const addNamedExport = async (tree, filePath, names, from)=>{
+    from = normalizeModuleSpecifier(tree, from);
+    const contents = tree.read(filePath)?.toString() ?? '';
+    if (!contents.trim()) {
+        tree.write(filePath, `export { ${names.join(', ')} } from '${from}';\n`);
+        return;
+    }
+    const hasExistingExport = await matchGritQL(tree, filePath, `\`export { $_ } from '${from}'\``);
+    if (hasExistingExport) {
+        for (const name of names){
+            await applyGritQL(tree, filePath, `\`export { $names } from '${from}'\` => \`export { $names, ${name} } from '${from}'\` where { $names <: not contains \`${name}\` }`);
+        }
+        return;
+    }
+    const missing = [];
+    for (const name of names){
+        if (!await matchGritQL(tree, filePath, `\`${name}\``)) {
+            missing.push(name);
+        }
+    }
+    if (missing.length === 0) {
+        return;
+    }
+    tree.write(filePath, await insertBelowLeadingComments(tree, filePath, contents, `export { ${missing.join(', ')} } from '${from}';`));
 };
 /**
  * Return whether or not the given identifier is exported in the source file.

package/src/utils/ast.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/ast.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { QueryBuilder } from '@getgrit/gritql';\nimport type { Tree } from '@nx/devkit';\nimport * as path from 'path';\nimport { updateGitIgnore } from './git.js';\nimport { isEsmWorkspace } from './module-format.js';\n\nconst GRIT_DIR = '.grit';\n\n/**\n * Normalize a relative module specifier for the workspace's module format.\n * ESM (`nodenext`) requires an explicit `.js` extension on relative imports;\n * CommonJS (`node16`) resolves them extensionless. Callers always pass the ESM\n * form (with `.js`); this strips the extension for CommonJS workspaces.\n */\nconst normalizeModuleSpecifier = (tree: Tree, from: string): string => {\n  if (isEsmWorkspace(tree)) {\n    return from;\n  }\n  const isRelative = from.startsWith('./') || from.startsWith('../');\n  return isRelative && from.endsWith('.js')\n    ? from.slice(0, -'.js'.length)\n    : from;\n};\n\n// Pin the gritql native library's \"global\" stdlib directory to <workspace>/.grit so it doesn't try to write to /usr/local/.grit (or wherever node's grandparent resolves to).\nconst ensureGritDir = (tree: Tree) => {\n  process.env.GRIT_GLOBAL_DIR ??= path.join(tree.root, GRIT_DIR);\n  updateGitIgnore(tree, '.', (patterns) => [...patterns, GRIT_DIR]);\n};\n\nconst assertFilePath = (tree: Tree, filePath: string) => {\n  if (!tree.exists(filePath)) {\n    throw new Error(`No file located at ${filePath}`);\n  }\n};\n\nexport const addDestructuredImport = async (\n  tree: Tree,\n  filePath: string,\n  variableNames: string[],\n  from: string,\n) => {\n  assertFilePath(tree, filePath);\n  from = normalizeModuleSpecifier(tree, from);\n\n  // Check if there's an existing import from this module\n  const hasExistingImport = await matchGritQL(\n    tree,\n    filePath,\n    `\\`import { $_ } from '${from}'\\``,\n  );\n\n  if (hasExistingImport) {\n    // For each new variable, use GritQL rewrite to add it if not already present\n    for (const variableName of variableNames) {\n      const localName = variableName.includes(' as ')\n        ? variableName.split(' as ')[1]\n        : variableName;\n      // Use rewrite (=>) which correctly handles comma-separated import specifier lists\n      await applyGritQL(\n        tree,\n        filePath,\n        `\\`import { $imports } from '${from}'\\` => \\`import { $imports, ${variableName} } from '${from}'\\` where { $imports <: not contains \\`${localName}\\` }`,\n      );\n    }\n  } else {\n    // No existing import — prepend a new one (after shebang if present)\n    const specifiers = variableNames.join(', ');\n    const contents = tree.read(filePath)!.toString();\n    const newImport = `import { ${specifiers} } from '${from}';\\n`;\n    if (contents.startsWith('#!')) {\n      const newlineIndex = contents.indexOf('\\n');\n      tree.write(\n        filePath,\n        `${contents.substring(0, newlineIndex + 1)}${newImport}${contents.substring(newlineIndex + 1)}`,\n      );\n    } else {\n      tree.write(filePath, `${newImport}${contents}`);\n    }\n  }\n};\n\n/**\n * Ensure a Python `from <module> import <name1>, <name2>, ...` statement\n * exists in the given file. If the module already has a `from <module> import`\n * line, any missing names are appended; otherwise a fresh import statement is\n * prepended to the file (ruff's import sorter will reorder it into place on\n * the next format pass).\n *\n * We try to append first (which only succeeds if an import-from for the\n * module already exists AND the name isn't yet in the list). If nothing\n * was rewritten after trying every requested name, we fall back to checking\n * whether the module is imported at all; if not, we prepend a fresh\n * `from <module> import ...` line.\n */\nexport const addPythonDestructuredImport = async (\n  tree: Tree,\n  filePath: string,\n  variableNames: string[],\n  from: string,\n) => {\n  assertFilePath(tree, filePath);\n\n  // Determine whether there's any `from <module> import ...` line in the file.\n  // We detect this by attempting a no-op transformation — the file is unchanged,\n  // but a successful match tells us the line exists.\n  const beforeContents = tree.read(filePath)!.toString();\n  let moduleAlreadyImported = false;\n  for (const variableName of variableNames) {\n    // Appends the name if the import-from exists and the name isn't already there.\n    const appended = await applyGritQL(\n      tree,\n      filePath,\n      `language python\\n\\`from ${from} import $names\\` where { $names <: not contains \\`${variableName}\\`, $names += \\`, ${variableName}\\` }`,\n    );\n    if (appended) {\n      moduleAlreadyImported = true;\n    }\n  }\n\n  // If the append succeeded for at least one name, we know the module line\n  // exists; we're done. If nothing was appended we need to distinguish\n  // between \"module not imported\" (need to add a new line) and \"module\n  // imported but all names already present\" (no-op).\n  if (moduleAlreadyImported) {\n    return;\n  }\n\n  const allAlreadyPresent = await matchGritQL(\n    tree,\n    filePath,\n    `language python\\n\\`from ${from} import $names\\` where { ${variableNames\n      .map((n) => `$names <: contains \\`${n}\\``)\n      .join(', ')} }`,\n  );\n  if (allAlreadyPresent) {\n    return;\n  }\n\n  // No existing `from <module> import` line — prepend one. Ruff's import\n  // sorter will place it in the right group on the next formatter pass.\n  const specifiers = variableNames.join(', ');\n  tree.write(filePath, `from ${from} import ${specifiers}\\n${beforeContents}`);\n};\n\n/**\n * Adds an `import <variableName> from '<from>'; statement to the beginning of the file,\n * if it doesn't already exist\n */\nexport const addSingleImport = async (\n  tree: Tree,\n  filePath: string,\n  variableName: string,\n  from: string,\n) => {\n  assertFilePath(tree, filePath);\n  from = normalizeModuleSpecifier(tree, from);\n\n  // Check if default import already exists using GritQL\n  const alreadyImported = await matchGritQL(\n    tree,\n    filePath,\n    `\\`import ${variableName} from '${from}'\\``,\n  );\n  if (alreadyImported) {\n    return;\n  }\n\n  // The same identifier bound to a different module would be a duplicate\n  // declaration, so refuse rather than emit a file that cannot compile.\n  const identifierTaken = await matchGritQL(\n    tree,\n    filePath,\n    `\\`import ${variableName} from $module\\``,\n  );\n  if (identifierTaken) {\n    throw new Error(\n      `Cannot import ${variableName} from '${from}' in ${filePath}: ${variableName} is already imported from a different module. Rename the project so its generated identifier does not collide.`,\n    );\n  }\n\n  // Prepend new import to file\n  const contents = tree.read(filePath)!.toString();\n  tree.write(filePath, `import ${variableName} from '${from}';\\n${contents}`);\n};\n\n/**\n * Adds an `export * from '<from>'; statement to the given TypeScript file.\n * Note that this will create the file if it does not exist in the tree.\n */\nexport const addStarExport = async (\n  tree: Tree,\n  filePath: string,\n  from: string,\n) => {\n  from = normalizeModuleSpecifier(tree, from);\n  const contents = tree.read(filePath)?.toString() ?? '';\n\n  // For empty/non-existent files, just write the export\n  if (!contents.trim()) {\n    tree.write(filePath, `export * from '${from}';\\n`);\n    return;\n  }\n\n  // Check if already exported using GritQL\n  const alreadyExported = await matchGritQL(\n    tree,\n    filePath,\n    `\\`export * from '${from}'\\``,\n  );\n  if (alreadyExported) {\n    return;\n  }\n\n  // Prepend new export to file\n  tree.write(filePath, `export * from '${from}';\\n${contents}`);\n};\n\n/**\n * Return whether or not the given identifier is exported in the source file.\n * Checks for both `export { Identifier }` and `export type Identifier = ...`.\n */\nexport const hasExportDeclaration = async (\n  tree: Tree,\n  source: string,\n  identifierName: string,\n): Promise<boolean> => {\n  ensureGritDir(tree);\n  const patterns = [\n    `\\`export type ${identifierName} = $_\\``,\n    `\\`export { ${identifierName} }\\``,\n    `\\`export type { ${identifierName} } from $_\\``,\n  ];\n\n  for (const pattern of patterns) {\n    try {\n      const q = new QueryBuilder(`$p => $p where { $p <: ${pattern} }`);\n      const result = await q.applyToFile({\n        path: 'check.ts',\n        content: source,\n      });\n      if (result !== null) return true;\n    } catch {\n      // Pattern didn't match, try next\n    }\n  }\n\n  return false;\n};\n\n/**\n * Apply a GritQL pattern to a file in the Nx tree.\n */\nexport const applyGritQL = async (\n  tree: Tree,\n  filePath: string,\n  pattern: string,\n): Promise<boolean> => {\n  if (!tree.exists(filePath)) throw new Error(`No file at ${filePath}`);\n  ensureGritDir(tree);\n  const source = tree.read(filePath)!.toString();\n  const query = new QueryBuilder(pattern);\n  const result = await query.applyToFile({ path: filePath, content: source });\n  if (result && result.content !== source) {\n    tree.write(filePath, result.content);\n    return true;\n  }\n  return false;\n};\n\n/**\n * Check whether a GritQL pattern matches anywhere in a file.\n * Returns true if the pattern matches at least once.\n *\n * Accepts raw GritQL, including patterns that start with a `language <name>`\n * header (e.g. `language python\\n\\`print($_)\\``) — the pattern is passed\n * straight through to QueryBuilder without any wrapping rewrite.\n */\nexport const matchGritQL = async (\n  tree: Tree,\n  filePath: string,\n  pattern: string,\n): Promise<boolean> => {\n  if (!tree.exists(filePath)) return false;\n  ensureGritDir(tree);\n  const source = tree.read(filePath)!.toString();\n  let matched = false;\n  try {\n    const query = new QueryBuilder(pattern);\n    query.filter(() => {\n      matched = true;\n      return true;\n    });\n    await query.applyToFile({ path: filePath, content: source });\n  } catch {\n    return false;\n  }\n  return matched;\n};\n\n/**\n * Capture the source text of the first match of a GritQL pattern.\n *\n * For example `` `dependencyCheck: $_` `` returns the whole\n * `dependencyCheck: { ... }` property text. Returns undefined if nothing\n * matches. The file is not modified.\n */\nexport const captureGritQL = async (\n  tree: Tree,\n  filePath: string,\n  pattern: string,\n): Promise<string | undefined> => {\n  if (!tree.exists(filePath)) return undefined;\n  ensureGritDir(tree);\n  const source = tree.read(filePath)!.toString();\n  let captured: string | undefined;\n  try {\n    const query = new QueryBuilder(pattern);\n    query.filter((node) => {\n      captured ??= node.text();\n      return true;\n    });\n    await query.applyToFile({ path: filePath, content: source });\n  } catch {\n    return undefined;\n  }\n  return captured;\n};\n\n/**\n * Like `captureGritQL`, but returns one metavariable's binding (e.g. `mod`\n * for `$mod`) instead of the whole matched node.\n */\nexport const captureGritQLVariable = async (\n  tree: Tree,\n  filePath: string,\n  pattern: string,\n  variableName: string,\n): Promise<string | undefined> => {\n  if (!tree.exists(filePath)) return undefined;\n  ensureGritDir(tree);\n  const source = tree.read(filePath)!.toString();\n  // The underlying binding lookup requires the `$` sigil.\n  const name = variableName.startsWith('$') ? variableName : `$${variableName}`;\n  let captured: string | undefined;\n  try {\n    const query = new QueryBuilder(pattern);\n    query.filter((node) => {\n      captured ??= node.var(name) ?? undefined;\n      return true;\n    });\n    await query.applyToFile({ path: filePath, content: source });\n  } catch {\n    return undefined;\n  }\n  return captured;\n};\n\n/**\n * Like {@link captureAllGritQL}, but returns one metavariable's binding for every\n * match rather than the whole matched node.\n *\n * This is what lets a caller work on the value a pattern isolated — matching\n * `` `runtime: $value` `` and reading `$value` gives `Runtime.NODEJS_24_X` alone,\n * so nothing downstream has to re-derive the assignment around it.\n *\n * A match whose metavariable is unbound contributes nothing, so the result holds\n * only real bindings. Returns undefined if the pattern could not be applied,\n * which an empty array cannot express.\n */\nexport const captureAllGritQLVariable = async (\n  tree: Tree,\n  filePath: string,\n  pattern: string,\n  variableName: string,\n): Promise<string[] | undefined> => {\n  if (!tree.exists(filePath)) return undefined;\n  ensureGritDir(tree);\n  const source = tree.read(filePath)!.toString();\n  // The underlying binding lookup requires the `$` sigil.\n  const name = variableName.startsWith('$') ? variableName : `$${variableName}`;\n  const captured: string[] = [];\n  try {\n    const query = new QueryBuilder(pattern);\n    query.filter((node) => {\n      const bound = node.var(name);\n      if (bound !== null && bound !== undefined) {\n        captured.push(bound);\n      }\n      return true;\n    });\n    await query.applyToFile({ path: filePath, content: source });\n  } catch {\n    return undefined;\n  }\n  return captured;\n};\n\n/**\n * Return the text of every node matching the GritQL pattern, in document order.\n */\nexport const captureAllGritQL = async (\n  tree: Tree,\n  filePath: string,\n  pattern: string,\n): Promise<string[]> => {\n  if (!tree.exists(filePath)) return [];\n  ensureGritDir(tree);\n  const source = tree.read(filePath)!.toString();\n  const captured: string[] = [];\n  try {\n    const query = new QueryBuilder(pattern);\n    query.filter((node) => {\n      captured.push(node.text());\n      return true;\n    });\n    await query.applyToFile({ path: filePath, content: source });\n  } catch {\n    return [];\n  }\n  return captured;\n};\n\n/**\n * A unique token that is a valid identifier, so it can stand in for an array\n * element or object property inside a GritQL rewrite.\n */\nexport const GRIT_INSERT_PLACEHOLDER = '__GRIT_INSERT_PLACEHOLDER__';\n\n/**\n * Apply a GritQL rewrite that inserts {@link GRIT_INSERT_PLACEHOLDER}, then\n * replace the placeholder with `text`. Routing user-provided text through a\n * placeholder keeps it out of the GritQL pattern, where quotes, backticks or\n * `${...}` would otherwise break parsing.\n *\n * Any separator (e.g. a leading `, ` when appending to an array) must be part\n * of the GritQL pattern, not `text`. The one adjustment made here: if the\n * placeholder lands after a trailing line comment (`// ...`) — which would\n * comment out the text — the text is moved to its own line.\n *\n * The caller formats afterwards. Returns true if the pattern matched and the\n * file changed.\n */\nexport const insertViaGritQL = async (\n  tree: Tree,\n  filePath: string,\n  pattern: string,\n  text: string,\n): Promise<boolean> => {\n  if (!(await applyGritQL(tree, filePath, pattern))) return false;\n  const content = tree.read(filePath)!.toString();\n  const at = content.indexOf(GRIT_INSERT_PLACEHOLDER);\n  const lineSoFar = content.slice(content.lastIndexOf('\\n', at) + 1, at);\n  const replacement = lineSoFar.includes('//') ? `\\n${text}` : text;\n\n  // Function replacer so `$` in `text` isn't treated as a replacement pattern.\n  tree.write(\n    filePath,\n    content.replace(GRIT_INSERT_PLACEHOLDER, () => replacement),\n  );\n  return true;\n};\n\n/**\n * Append `entry` to an array, skipping arrays that already contain it, e.g.\n * `` appendToArrayViaGritQL(tree, file, 'tools:', 'myTool', { scope: 'new Agent($_)' }) ``\n * turns `tools: [a, b]` into `tools: [a, b, myTool]`.\n *\n * `arrayPrefix` is whatever precedes the array literal, including its separator —\n * `'tools:'` for an object property, `'tools='` for a keyword argument or\n * assignment, `'\"tools\":'` for a quoted key. Which separator applies depends on\n * the construct rather than the language, so the caller states it.\n *\n * Appends after the last *element* rather than rewriting the element list with\n * `=>`. GritQL binds a `[$items]` list to its trailing comma too, so\n * `` `[$items]` => `[$items, entry]` `` emits the sparse array `[a, b, , entry]`\n * once the formatter has wrapped the array — a hole that is `undefined` at\n * runtime. (Accumulating with `$items += \", entry\"` is safe by comparison, since\n * it appends within the list rather than re-emitting it; both forms appear in\n * this repo.)\n *\n * `scope` limits the match to an enclosing pattern, so same-named arrays\n * elsewhere in the file are left alone. `skipIfContains` overrides what the\n * append dedupes on, for when the rendered entry is not the identifier to match.\n *\n * The caller formats afterwards. Returns true if the entry was appended.\n */\nexport const appendToArrayViaGritQL = async (\n  tree: Tree,\n  filePath: string,\n  arrayPrefix: string,\n  entry: string,\n  options: { scope?: string; skipIfContains?: string; language?: 'py' } = {},\n): Promise<boolean> => {\n  const { scope, skipIfContains, language } = options;\n  const within = (variable: string) =>\n    scope ? `${variable} <: within \\`${scope}\\`, ` : '';\n  const pattern =\n    `or {` +\n    // An empty array has no last element to append after.\n    ` \\`${arrayPrefix}$arr\\` where { $arr <: \\`[]\\`, ${within('$arr')}` +\n    ` $arr => \\`[${GRIT_INSERT_PLACEHOLDER}]\\` },` +\n    // Dedupe on the list, append after its last element.\n    ` \\`${arrayPrefix}[$items]\\` where {` +\n    ` $items <: not contains \\`${skipIfContains ?? entry}\\`, ${within('$items')}` +\n    ` $items <: [$..., $last], $last += \\`, ${GRIT_INSERT_PLACEHOLDER}\\` }` +\n    ` }`;\n\n  return insertViaGritQL(\n    tree,\n    filePath,\n    language === 'py' ? `language python\\n${pattern}` : pattern,\n    entry,\n  );\n};\n"],"names":["QueryBuilder","path","updateGitIgnore","isEsmWorkspace","GRIT_DIR","normalizeModuleSpecifier","tree","from","isRelative","startsWith","endsWith","slice","length","ensureGritDir","process","env","GRIT_GLOBAL_DIR","join","root","patterns","assertFilePath","filePath","exists","Error","addDestructuredImport","variableNames","hasExistingImport","matchGritQL","variableName","localName","includes","split","applyGritQL","specifiers","contents","read","toString","newImport","newlineIndex","indexOf","write","substring","addPythonDestructuredImport","beforeContents","moduleAlreadyImported","appended","allAlreadyPresent","map","n","addSingleImport","alreadyImported","identifierTaken","addStarExport","trim","alreadyExported","hasExportDeclaration","source","identifierName","pattern","q","result","applyToFile","content","query","matched","filter","captureGritQL","undefined","captured","node","text","captureGritQLVariable","name","var","captureAllGritQLVariable","bound","push","captureAllGritQL","GRIT_INSERT_PLACEHOLDER","insertViaGritQL","at","lineSoFar","lastIndexOf","replacement","replace","appendToArrayViaGritQL","arrayPrefix","entry","options","scope","skipIfContains","language","within","variable"],"mappings":"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"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/ast.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { QueryBuilder } from '@getgrit/gritql';\nimport type { Tree } from '@nx/devkit';\nimport * as path from 'path';\nimport {\n  LANGUAGE_COMMENT_SYNTAX,\n  readLicenseConfig,\n} from '../license/config.js';\nimport type { CommentSyntax } from '../license/config-types.js';\nimport { parseFile } from '../license/sync/generator.js';\nimport { updateGitIgnore } from './git.js';\nimport { isEsmWorkspace } from './module-format.js';\n\nconst GRIT_DIR = '.grit';\n\n/**\n * Normalize a relative module specifier for the workspace's module format.\n * ESM (`nodenext`) requires an explicit `.js` extension on relative imports;\n * CommonJS (`node16`) resolves them extensionless. Callers always pass the ESM\n * form (with `.js`); this strips the extension for CommonJS workspaces.\n */\nconst normalizeModuleSpecifier = (tree: Tree, from: string): string => {\n  if (isEsmWorkspace(tree)) {\n    return from;\n  }\n  const isRelative = from.startsWith('./') || from.startsWith('../');\n  return isRelative && from.endsWith('.js')\n    ? from.slice(0, -'.js'.length)\n    : from;\n};\n\n// Pin the gritql native library's \"global\" stdlib directory to <workspace>/.grit so it doesn't try to write to /usr/local/.grit (or wherever node's grandparent resolves to).\nconst ensureGritDir = (tree: Tree) => {\n  process.env.GRIT_GLOBAL_DIR ??= path.join(tree.root, GRIT_DIR);\n  updateGitIgnore(tree, '.', (patterns) => [...patterns, GRIT_DIR]);\n};\n\nconst assertFilePath = (tree: Tree, filePath: string) => {\n  if (!tree.exists(filePath)) {\n    throw new Error(`No file located at ${filePath}`);\n  }\n};\n\n/**\n * Insert `statement` at the top of a file, below any hashbang and leading\n * comment block. Keeps a license header first in the file, so `license#sync`\n * doesn't see it displaced and prepend a second one.\n *\n * The leading comment is skipped whatever it says — a header, a placeholder or a\n * note — so nothing here has to identify a license.\n *\n * Splits the file with the sync generator's own `parseFile`, resolving the\n * comment syntax the way the sync does: the workspace's configured\n * `commentSyntax` for the extension first, then the built-in table. That way an\n * extension only the user's config covers is still recognised. An extension\n * neither covers has no comment syntax to find, so the statement goes at the top.\n */\nconst insertBelowLeadingComments = async (\n  tree: Tree,\n  filePath: string,\n  contents: string,\n  statement: string,\n): Promise<string> => {\n  const extension = filePath.split('.').pop() ?? '';\n  let syntax: CommentSyntax | undefined;\n  try {\n    syntax = (await readLicenseConfig(tree))?.source?.header?.commentSyntax?.[\n      extension\n    ];\n  } catch {\n    // Reading the config evaluates it, which throws on a config that doesn't\n    // load — including this file itself while a generator is mid-edit. A config\n    // we can't read must not stop an import being added, so fall back to the\n    // defaults. (A config that simply doesn't exist reads as undefined.)\n  }\n  syntax ??= LANGUAGE_COMMENT_SYNTAX[extension];\n  if (!syntax) {\n    return `${statement}\\n${contents}`;\n  }\n\n  const { hashbang, header, body } = parseFile(contents, syntax);\n  if (!hashbang && !header) {\n    return `${statement}\\n${contents}`;\n  }\n  return [\n    ...(hashbang ? [hashbang] : []),\n    ...(header ? [header] : []),\n    statement,\n    body,\n  ].join('\\n');\n};\n\nexport const addDestructuredImport = async (\n  tree: Tree,\n  filePath: string,\n  variableNames: string[],\n  from: string,\n) => {\n  assertFilePath(tree, filePath);\n  from = normalizeModuleSpecifier(tree, from);\n\n  // Check if there's an existing import from this module\n  const hasExistingImport = await matchGritQL(\n    tree,\n    filePath,\n    `\\`import { $_ } from '${from}'\\``,\n  );\n\n  if (hasExistingImport) {\n    // For each new variable, use GritQL rewrite to add it if not already present\n    for (const variableName of variableNames) {\n      const localName = variableName.includes(' as ')\n        ? variableName.split(' as ')[1]\n        : variableName;\n      // Use rewrite (=>) which correctly handles comma-separated import specifier lists\n      await applyGritQL(\n        tree,\n        filePath,\n        `\\`import { $imports } from '${from}'\\` => \\`import { $imports, ${variableName} } from '${from}'\\` where { $imports <: not contains \\`${localName}\\` }`,\n      );\n    }\n  } else {\n    // No existing import — add a new one below any hashbang and leading comment\n    const specifiers = variableNames.join(', ');\n    const contents = tree.read(filePath)!.toString();\n    tree.write(\n      filePath,\n      await insertBelowLeadingComments(\n        tree,\n        filePath,\n        contents,\n        `import { ${specifiers} } from '${from}';`,\n      ),\n    );\n  }\n};\n\n/**\n * Ensure a Python `from <module> import <name1>, <name2>, ...` statement\n * exists in the given file. If the module already has a `from <module> import`\n * line, any missing names are appended; otherwise a fresh import statement is\n * prepended to the file (ruff's import sorter will reorder it into place on\n * the next format pass).\n *\n * We try to append first (which only succeeds if an import-from for the\n * module already exists AND the name isn't yet in the list). If nothing\n * was rewritten after trying every requested name, we fall back to checking\n * whether the module is imported at all; if not, we prepend a fresh\n * `from <module> import ...` line.\n */\nexport const addPythonDestructuredImport = async (\n  tree: Tree,\n  filePath: string,\n  variableNames: string[],\n  from: string,\n) => {\n  assertFilePath(tree, filePath);\n\n  // Determine whether there's any `from <module> import ...` line in the file.\n  // We detect this by attempting a no-op transformation — the file is unchanged,\n  // but a successful match tells us the line exists.\n  const beforeContents = tree.read(filePath)!.toString();\n  let moduleAlreadyImported = false;\n  for (const variableName of variableNames) {\n    // Appends the name if the import-from exists and the name isn't already there.\n    const appended = await applyGritQL(\n      tree,\n      filePath,\n      `language python\\n\\`from ${from} import $names\\` where { $names <: not contains \\`${variableName}\\`, $names += \\`, ${variableName}\\` }`,\n    );\n    if (appended) {\n      moduleAlreadyImported = true;\n    }\n  }\n\n  // If the append succeeded for at least one name, we know the module line\n  // exists; we're done. If nothing was appended we need to distinguish\n  // between \"module not imported\" (need to add a new line) and \"module\n  // imported but all names already present\" (no-op).\n  if (moduleAlreadyImported) {\n    return;\n  }\n\n  const allAlreadyPresent = await matchGritQL(\n    tree,\n    filePath,\n    `language python\\n\\`from ${from} import $names\\` where { ${variableNames\n      .map((n) => `$names <: contains \\`${n}\\``)\n      .join(', ')} }`,\n  );\n  if (allAlreadyPresent) {\n    return;\n  }\n\n  // No existing `from <module> import` line — add one below any hashbang and\n  // leading comment. Ruff's import sorter will place it in the right group on\n  // the next formatter pass.\n  const specifiers = variableNames.join(', ');\n  tree.write(\n    filePath,\n    await insertBelowLeadingComments(\n      tree,\n      filePath,\n      beforeContents,\n      `from ${from} import ${specifiers}`,\n    ),\n  );\n};\n\n/**\n * Adds an `import <variableName> from '<from>'; statement to the beginning of the file,\n * if it doesn't already exist\n */\nexport const addSingleImport = async (\n  tree: Tree,\n  filePath: string,\n  variableName: string,\n  from: string,\n) => {\n  assertFilePath(tree, filePath);\n  from = normalizeModuleSpecifier(tree, from);\n\n  // Check if default import already exists using GritQL\n  const alreadyImported = await matchGritQL(\n    tree,\n    filePath,\n    `\\`import ${variableName} from '${from}'\\``,\n  );\n  if (alreadyImported) {\n    return;\n  }\n\n  // The same identifier bound to a different module would be a duplicate\n  // declaration, so refuse rather than emit a file that cannot compile.\n  const identifierTaken = await matchGritQL(\n    tree,\n    filePath,\n    `\\`import ${variableName} from $module\\``,\n  );\n  if (identifierTaken) {\n    throw new Error(\n      `Cannot import ${variableName} from '${from}' in ${filePath}: ${variableName} is already imported from a different module. Rename the project so its generated identifier does not collide.`,\n    );\n  }\n\n  // Add the import below any hashbang and leading comment\n  const contents = tree.read(filePath)!.toString();\n  tree.write(\n    filePath,\n    await insertBelowLeadingComments(\n      tree,\n      filePath,\n      contents,\n      `import ${variableName} from '${from}';`,\n    ),\n  );\n};\n\n/**\n * Adds an `export * from '<from>'; statement to the given TypeScript file.\n * Note that this will create the file if it does not exist in the tree.\n */\nexport const addStarExport = async (\n  tree: Tree,\n  filePath: string,\n  from: string,\n) => {\n  from = normalizeModuleSpecifier(tree, from);\n  const contents = tree.read(filePath)?.toString() ?? '';\n\n  // For empty/non-existent files, just write the export\n  if (!contents.trim()) {\n    tree.write(filePath, `export * from '${from}';\\n`);\n    return;\n  }\n\n  // Check if already exported using GritQL\n  const alreadyExported = await matchGritQL(\n    tree,\n    filePath,\n    `\\`export * from '${from}'\\``,\n  );\n  if (alreadyExported) {\n    return;\n  }\n\n  tree.write(\n    filePath,\n    await insertBelowLeadingComments(\n      tree,\n      filePath,\n      contents,\n      `export * from '${from}';`,\n    ),\n  );\n};\n\n/**\n * Adds an `export { <names> } from '<from>';` statement to the given TypeScript\n * file, merging into an existing re-export of the same module when there is one.\n * Note that this will create the file if it does not exist in the tree.\n *\n * Adding to whatever is already there is what lets a barrel the user curates —\n * their own entities, models or components — survive a generator re-run while\n * the generated entry is still registered.\n */\nexport const addNamedExport = async (\n  tree: Tree,\n  filePath: string,\n  names: string[],\n  from: string,\n) => {\n  from = normalizeModuleSpecifier(tree, from);\n  const contents = tree.read(filePath)?.toString() ?? '';\n\n  if (!contents.trim()) {\n    tree.write(filePath, `export { ${names.join(', ')} } from '${from}';\\n`);\n    return;\n  }\n\n  const hasExistingExport = await matchGritQL(\n    tree,\n    filePath,\n    `\\`export { $_ } from '${from}'\\``,\n  );\n\n  if (hasExistingExport) {\n    for (const name of names) {\n      await applyGritQL(\n        tree,\n        filePath,\n        `\\`export { $names } from '${from}'\\` => \\`export { $names, ${name} } from '${from}'\\` where { $names <: not contains \\`${name}\\` }`,\n      );\n    }\n    return;\n  }\n\n  const missing: string[] = [];\n  for (const name of names) {\n    if (!(await matchGritQL(tree, filePath, `\\`${name}\\``))) {\n      missing.push(name);\n    }\n  }\n  if (missing.length === 0) {\n    return;\n  }\n\n  tree.write(\n    filePath,\n    await insertBelowLeadingComments(\n      tree,\n      filePath,\n      contents,\n      `export { ${missing.join(', ')} } from '${from}';`,\n    ),\n  );\n};\n\n/**\n * Return whether or not the given identifier is exported in the source file.\n * Checks for both `export { Identifier }` and `export type Identifier = ...`.\n */\nexport const hasExportDeclaration = async (\n  tree: Tree,\n  source: string,\n  identifierName: string,\n): Promise<boolean> => {\n  ensureGritDir(tree);\n  const patterns = [\n    `\\`export type ${identifierName} = $_\\``,\n    `\\`export { ${identifierName} }\\``,\n    `\\`export type { ${identifierName} } from $_\\``,\n  ];\n\n  for (const pattern of patterns) {\n    try {\n      const q = new QueryBuilder(`$p => $p where { $p <: ${pattern} }`);\n      const result = await q.applyToFile({\n        path: 'check.ts',\n        content: source,\n      });\n      if (result !== null) return true;\n    } catch {\n      // Pattern didn't match, try next\n    }\n  }\n\n  return false;\n};\n\n/**\n * Apply a GritQL pattern to a file in the Nx tree.\n */\nexport const applyGritQL = async (\n  tree: Tree,\n  filePath: string,\n  pattern: string,\n): Promise<boolean> => {\n  if (!tree.exists(filePath)) throw new Error(`No file at ${filePath}`);\n  ensureGritDir(tree);\n  const source = tree.read(filePath)!.toString();\n  const query = new QueryBuilder(pattern);\n  const result = await query.applyToFile({ path: filePath, content: source });\n  if (result && result.content !== source) {\n    tree.write(filePath, result.content);\n    return true;\n  }\n  return false;\n};\n\n/**\n * Check whether a GritQL pattern matches anywhere in a file.\n * Returns true if the pattern matches at least once.\n *\n * Accepts raw GritQL, including patterns that start with a `language <name>`\n * header (e.g. `language python\\n\\`print($_)\\``) — the pattern is passed\n * straight through to QueryBuilder without any wrapping rewrite.\n */\nexport const matchGritQL = async (\n  tree: Tree,\n  filePath: string,\n  pattern: string,\n): Promise<boolean> => {\n  if (!tree.exists(filePath)) return false;\n  ensureGritDir(tree);\n  const source = tree.read(filePath)!.toString();\n  let matched = false;\n  try {\n    const query = new QueryBuilder(pattern);\n    query.filter(() => {\n      matched = true;\n      return true;\n    });\n    await query.applyToFile({ path: filePath, content: source });\n  } catch {\n    return false;\n  }\n  return matched;\n};\n\n/**\n * Capture the source text of the first match of a GritQL pattern.\n *\n * For example `` `dependencyCheck: $_` `` returns the whole\n * `dependencyCheck: { ... }` property text. Returns undefined if nothing\n * matches. The file is not modified.\n */\nexport const captureGritQL = async (\n  tree: Tree,\n  filePath: string,\n  pattern: string,\n): Promise<string | undefined> => {\n  if (!tree.exists(filePath)) return undefined;\n  ensureGritDir(tree);\n  const source = tree.read(filePath)!.toString();\n  let captured: string | undefined;\n  try {\n    const query = new QueryBuilder(pattern);\n    query.filter((node) => {\n      captured ??= node.text();\n      return true;\n    });\n    await query.applyToFile({ path: filePath, content: source });\n  } catch {\n    return undefined;\n  }\n  return captured;\n};\n\n/**\n * Like `captureGritQL`, but returns one metavariable's binding (e.g. `mod`\n * for `$mod`) instead of the whole matched node.\n */\nexport const captureGritQLVariable = async (\n  tree: Tree,\n  filePath: string,\n  pattern: string,\n  variableName: string,\n): Promise<string | undefined> => {\n  if (!tree.exists(filePath)) return undefined;\n  ensureGritDir(tree);\n  const source = tree.read(filePath)!.toString();\n  // The underlying binding lookup requires the `$` sigil.\n  const name = variableName.startsWith('$') ? variableName : `$${variableName}`;\n  let captured: string | undefined;\n  try {\n    const query = new QueryBuilder(pattern);\n    query.filter((node) => {\n      captured ??= node.var(name) ?? undefined;\n      return true;\n    });\n    await query.applyToFile({ path: filePath, content: source });\n  } catch {\n    return undefined;\n  }\n  return captured;\n};\n\n/**\n * Like {@link captureAllGritQL}, but returns one metavariable's binding for every\n * match rather than the whole matched node.\n *\n * This is what lets a caller work on the value a pattern isolated — matching\n * `` `runtime: $value` `` and reading `$value` gives `Runtime.NODEJS_24_X` alone,\n * so nothing downstream has to re-derive the assignment around it.\n *\n * A match whose metavariable is unbound contributes nothing, so the result holds\n * only real bindings. Returns undefined if the pattern could not be applied,\n * which an empty array cannot express.\n */\nexport const captureAllGritQLVariable = async (\n  tree: Tree,\n  filePath: string,\n  pattern: string,\n  variableName: string,\n): Promise<string[] | undefined> => {\n  if (!tree.exists(filePath)) return undefined;\n  ensureGritDir(tree);\n  const source = tree.read(filePath)!.toString();\n  // The underlying binding lookup requires the `$` sigil.\n  const name = variableName.startsWith('$') ? variableName : `$${variableName}`;\n  const captured: string[] = [];\n  try {\n    const query = new QueryBuilder(pattern);\n    query.filter((node) => {\n      const bound = node.var(name);\n      if (bound !== null && bound !== undefined) {\n        captured.push(bound);\n      }\n      return true;\n    });\n    await query.applyToFile({ path: filePath, content: source });\n  } catch {\n    return undefined;\n  }\n  return captured;\n};\n\n/**\n * Return the text of every node matching the GritQL pattern, in document order.\n */\nexport const captureAllGritQL = async (\n  tree: Tree,\n  filePath: string,\n  pattern: string,\n): Promise<string[]> => {\n  if (!tree.exists(filePath)) return [];\n  ensureGritDir(tree);\n  const source = tree.read(filePath)!.toString();\n  const captured: string[] = [];\n  try {\n    const query = new QueryBuilder(pattern);\n    query.filter((node) => {\n      captured.push(node.text());\n      return true;\n    });\n    await query.applyToFile({ path: filePath, content: source });\n  } catch {\n    return [];\n  }\n  return captured;\n};\n\n/**\n * A unique token that is a valid identifier, so it can stand in for an array\n * element or object property inside a GritQL rewrite.\n */\nexport const GRIT_INSERT_PLACEHOLDER = '__GRIT_INSERT_PLACEHOLDER__';\n\n/**\n * Apply a GritQL rewrite that inserts {@link GRIT_INSERT_PLACEHOLDER}, then\n * replace the placeholder with `text`. Routing user-provided text through a\n * placeholder keeps it out of the GritQL pattern, where quotes, backticks or\n * `${...}` would otherwise break parsing.\n *\n * Any separator (e.g. a leading `, ` when appending to an array) must be part\n * of the GritQL pattern, not `text`. The one adjustment made here: if the\n * placeholder lands after a trailing line comment (`// ...`) — which would\n * comment out the text — the text is moved to its own line.\n *\n * The caller formats afterwards. Returns true if the pattern matched and the\n * file changed.\n */\nexport const insertViaGritQL = async (\n  tree: Tree,\n  filePath: string,\n  pattern: string,\n  text: string,\n): Promise<boolean> => {\n  if (!(await applyGritQL(tree, filePath, pattern))) return false;\n  const content = tree.read(filePath)!.toString();\n  const at = content.indexOf(GRIT_INSERT_PLACEHOLDER);\n  const lineSoFar = content.slice(content.lastIndexOf('\\n', at) + 1, at);\n  const replacement = lineSoFar.includes('//') ? `\\n${text}` : text;\n\n  // Function replacer so `$` in `text` isn't treated as a replacement pattern.\n  tree.write(\n    filePath,\n    content.replace(GRIT_INSERT_PLACEHOLDER, () => replacement),\n  );\n  return true;\n};\n\n/**\n * Append `entry` to an array, skipping arrays that already contain it, e.g.\n * `` appendToArrayViaGritQL(tree, file, 'tools:', 'myTool', { scope: 'new Agent($_)' }) ``\n * turns `tools: [a, b]` into `tools: [a, b, myTool]`.\n *\n * `arrayPrefix` is whatever precedes the array literal, including its separator —\n * `'tools:'` for an object property, `'tools='` for a keyword argument or\n * assignment, `'\"tools\":'` for a quoted key. Which separator applies depends on\n * the construct rather than the language, so the caller states it.\n *\n * Appends after the last *element* rather than rewriting the element list with\n * `=>`. GritQL binds a `[$items]` list to its trailing comma too, so\n * `` `[$items]` => `[$items, entry]` `` emits the sparse array `[a, b, , entry]`\n * once the formatter has wrapped the array — a hole that is `undefined` at\n * runtime. (Accumulating with `$items += \", entry\"` is safe by comparison, since\n * it appends within the list rather than re-emitting it; both forms appear in\n * this repo.)\n *\n * `scope` limits the match to an enclosing pattern, so same-named arrays\n * elsewhere in the file are left alone. `skipIfContains` overrides what the\n * append dedupes on, for when the rendered entry is not the identifier to match.\n *\n * The caller formats afterwards. Returns true if the entry was appended.\n */\nexport const appendToArrayViaGritQL = async (\n  tree: Tree,\n  filePath: string,\n  arrayPrefix: string,\n  entry: string,\n  options: { scope?: string; skipIfContains?: string; language?: 'py' } = {},\n): Promise<boolean> => {\n  const { scope, skipIfContains, language } = options;\n  const within = (variable: string) =>\n    scope ? `${variable} <: within \\`${scope}\\`, ` : '';\n  const pattern =\n    `or {` +\n    // An empty array has no last element to append after.\n    ` \\`${arrayPrefix}$arr\\` where { $arr <: \\`[]\\`, ${within('$arr')}` +\n    ` $arr => \\`[${GRIT_INSERT_PLACEHOLDER}]\\` },` +\n    // Dedupe on the list, append after its last element.\n    ` \\`${arrayPrefix}[$items]\\` where {` +\n    ` $items <: not contains \\`${skipIfContains ?? entry}\\`, ${within('$items')}` +\n    ` $items <: [$..., $last], $last += \\`, ${GRIT_INSERT_PLACEHOLDER}\\` }` +\n    ` }`;\n\n  return insertViaGritQL(\n    tree,\n    filePath,\n    language === 'py' ? `language python\\n${pattern}` : pattern,\n    entry,\n  );\n};\n"],"names":["QueryBuilder","path","LANGUAGE_COMMENT_SYNTAX","readLicenseConfig","parseFile","updateGitIgnore","isEsmWorkspace","GRIT_DIR","normalizeModuleSpecifier","tree","from","isRelative","startsWith","endsWith","slice","length","ensureGritDir","process","env","GRIT_GLOBAL_DIR","join","root","patterns","assertFilePath","filePath","exists","Error","insertBelowLeadingComments","contents","statement","extension","split","pop","syntax","source","header","commentSyntax","hashbang","body","addDestructuredImport","variableNames","hasExistingImport","matchGritQL","variableName","localName","includes","applyGritQL","specifiers","read","toString","write","addPythonDestructuredImport","beforeContents","moduleAlreadyImported","appended","allAlreadyPresent","map","n","addSingleImport","alreadyImported","identifierTaken","addStarExport","trim","alreadyExported","addNamedExport","names","hasExistingExport","name","missing","push","hasExportDeclaration","identifierName","pattern","q","result","applyToFile","content","query","matched","filter","captureGritQL","undefined","captured","node","text","captureGritQLVariable","var","captureAllGritQLVariable","bound","captureAllGritQL","GRIT_INSERT_PLACEHOLDER","insertViaGritQL","at","indexOf","lineSoFar","lastIndexOf","replacement","replace","appendToArrayViaGritQL","arrayPrefix","entry","options","scope","skipIfContains","language","within","variable"],"mappings":"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"}

package/src/utils/dependencies.d.ts

@@ -16,3 +16,13 @@ export declare const catalogsEnabled: (tree: Tree) => boolean;
  * and the root for shared tooling.
  */
 export declare const addDependenciesToPackageJson: (tree: Tree, dependencies: Record<string, string>, devDependencies: Record<string, string>, packageJsonPath?: string) => GeneratorCallback;
+/**
+ * Drop-in replacement for devkit's `removeDependenciesFromPackageJson` that
+ * also drops the package manager's catalog entry, which devkit leaves behind
+ * pointing at a package nothing declares any more.
+ *
+ * The entry is only dropped once no manifest in the workspace declares the
+ * package, so removing it from one project leaves another project's reference
+ * resolvable.
+ */
+export declare const removeDependenciesFromPackageJson: (tree: Tree, dependencies: string[], devDependencies: string[], packageJsonPath?: string) => GeneratorCallback;

package/src/utils/dependencies.js

@@ -1,7 +1,7 @@
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */ import { detectPackageManager, addDependenciesToPackageJson as devkitAddDependenciesToPackageJson, getPackageManagerVersion, readJson, updateJson } from "@nx/devkit";
+ */ import { detectPackageManager, addDependenciesToPackageJson as devkitAddDependenciesToPackageJson, removeDependenciesFromPackageJson as devkitRemoveDependenciesFromPackageJson, getPackageManagerVersion, getProjects, joinPathFragments, readJson, updateJson } from "@nx/devkit";
 import yaml from "js-yaml";
 import { coerce, gt, gte } from "semver";
 import { readAwsNxPluginConfig } from "./config/utils.js";
@@ -113,6 +113,98 @@ export const catalogsEnabled = (tree)=>{
     }
     return callback;
 };
+/**
+ * Drop-in replacement for devkit's `removeDependenciesFromPackageJson` that
+ * also drops the package manager's catalog entry, which devkit leaves behind
+ * pointing at a package nothing declares any more.
+ *
+ * The entry is only dropped once no manifest in the workspace declares the
+ * package, so removing it from one project leaves another project's reference
+ * resolvable.
+ */ export const removeDependenciesFromPackageJson = (tree, dependencies, devDependencies, packageJsonPath = 'package.json')=>{
+    const callback = devkitRemoveDependenciesFromPackageJson(tree, dependencies, devDependencies, packageJsonPath);
+    if (catalogsEnabled(tree)) {
+        const manifests = workspaceManifests(tree, packageJsonPath);
+        const removed = [
+            ...new Set([
+                ...dependencies,
+                ...devDependencies
+            ])
+        ].filter((packageName)=>!manifests.some((manifest)=>MANIFEST_DEPENDENCY_FIELDS.some((field)=>manifest[field]?.[packageName] !== undefined)));
+        removeCatalogVersions(tree, removed);
+    }
+    return callback;
+};
+/**
+ * Every manifest that can hold a catalog reference: the root, each project's,
+ * and the one just written. Project manifests come from the project graph
+ * rather than a tree walk, so a manifest belonging to no project is not seen.
+ */ const workspaceManifests = (tree, packageJsonPath)=>[
+        ...new Set([
+            'package.json',
+            packageJsonPath,
+            ...Array.from(getProjects(tree).values()).map((project)=>joinPathFragments(project.root, 'package.json'))
+        ])
+    ].filter((path)=>tree.exists(path)).map((path)=>readJson(tree, path));
+const MANIFEST_DEPENDENCY_FIELDS = [
+    'dependencies',
+    'devDependencies',
+    'optionalDependencies',
+    'peerDependencies'
+];
+// Drop entries from the default catalog, mirroring `writeCatalogVersions`.
+const removeCatalogVersions = (tree, packageNames)=>{
+    if (packageNames.length === 0) {
+        return;
+    }
+    const withoutRemoved = (catalog)=>{
+        if (!catalog || !packageNames.some((name)=>name in catalog)) {
+            return undefined;
+        }
+        return Object.fromEntries(Object.entries(catalog).filter(([name])=>!packageNames.includes(name)));
+    };
+    switch(detectWorkspacePackageManager(tree)){
+        case 'pnpm':
+            {
+                const workspaceYaml = yaml.load(tree.read('pnpm-workspace.yaml', 'utf-8') ?? '') ?? {};
+                const catalog = withoutRemoved(workspaceYaml.catalog);
+                if (catalog) {
+                    tree.write('pnpm-workspace.yaml', yaml.dump({
+                        ...workspaceYaml,
+                        catalog
+                    }, {
+                        quotingType: "'"
+                    }));
+                }
+                break;
+            }
+        case 'yarn':
+            {
+                const yarnRc = yaml.load(tree.read('.yarnrc.yml', 'utf-8') ?? '') ?? {};
+                const catalog = withoutRemoved(yarnRc.catalog);
+                if (catalog) {
+                    tree.write('.yarnrc.yml', yaml.dump({
+                        ...yarnRc,
+                        catalog
+                    }, {
+                        quotingType: "'"
+                    }));
+                }
+                break;
+            }
+        case 'bun':
+            {
+                const catalog = withoutRemoved(readJson(tree, 'package.json').catalog);
+                if (catalog) {
+                    updateJson(tree, 'package.json', (json)=>({
+                            ...json,
+                            catalog
+                        }));
+                }
+                break;
+            }
+    }
+};
 // Convert direct version ranges to `catalog:` references in a single manifest
 // and record the range in the workspace catalog. Protocol specifiers
 // (catalog:/workspace:/...) are left alone.

package/src/utils/dependencies.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/dependencies.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  addDependenciesToPackageJson as devkitAddDependenciesToPackageJson,\n  type GeneratorCallback,\n  getPackageManagerVersion,\n  type PackageManager,\n  readJson,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport yaml from 'js-yaml';\nimport { coerce, gt, gte } from 'semver';\nimport { readAwsNxPluginConfig } from './config/utils.js';\n\n// Minimum version that introduced catalog support per package manager (npm has none).\nconst CATALOG_SUPPORT: Partial<Record<PackageManager, string>> = {\n  pnpm: '9.5.0',\n  yarn: '4.10.0',\n  bun: '1.2.14',\n};\n\n// Prefer tree markers over devkit's `detectPackageManager`, which reads the\n// real filesystem and is nondeterministic for virtual trees in tests.\nexport const detectWorkspacePackageManager = (tree: Tree): PackageManager =>\n  tree.exists('pnpm-workspace.yaml') ? 'pnpm' : detectPackageManager(tree.root);\n\n// Coerce a single simple range to a version. Rejects compound ranges\n// (whitespace / `||`), which coerce would silently reduce, plus tags/protocols.\nconst parseSimpleRange = (version: string) => {\n  const trimmed = version.trim();\n  if (/\\s|\\|\\|/.test(trimmed)) {\n    return undefined;\n  }\n  return coerce(trimmed, { includePrerelease: true }) ?? undefined;\n};\n\nconst versionAtLeast = (version: string, minimum: string): boolean =>\n  gte(\n    parseSimpleRange(version) ?? '0.0.0',\n    parseSimpleRange(minimum) ?? '0.0.0',\n  );\n\n// Only a strict upgrade replaces an existing catalog entry, so generating a\n// project never downgrades a version the user raised. Uncomparable entries\n// (tags, complex ranges) are kept.\nconst isVersionUpgrade = (incoming: string, existing: string): boolean => {\n  const existingParsed = parseSimpleRange(existing);\n  const incomingParsed = parseSimpleRange(incoming);\n  if (!existingParsed || !incomingParsed) {\n    return false;\n  }\n  return gt(incomingParsed, existingParsed);\n};\n\n// Keyed by root + package manager; detecting support shells out for a version.\nconst catalogSupportCache = new Map<string, boolean>();\n\n/** Clears the catalog support cache. Only needed by tests. */\nexport const resetCatalogSupportCache = (): void => {\n  catalogSupportCache.clear();\n};\n\n// Local-project specifier: the `workspace:` protocol where supported (pnpm,\n// bun, yarn berry), `*` on npm and yarn classic which reject it.\nexport const getLocalDependencySpecifier = (tree: Tree): string => {\n  const packageManager = detectWorkspacePackageManager(tree);\n  if (packageManager === 'npm') {\n    return '*';\n  }\n  if (packageManager === 'yarn') {\n    let major = 2;\n    try {\n      major = Number.parseInt(\n        getPackageManagerVersion('yarn', tree.root).split('.')[0],\n        10,\n      );\n    } catch {\n      // Not installed (e.g. tests) — assume berry.\n    }\n    if (major < 2) {\n      return '*';\n    }\n  }\n  return 'workspace:*';\n};\n\nexport const supportsCatalogs = (tree: Tree): boolean => {\n  const packageManager = detectWorkspacePackageManager(tree);\n  const cacheKey = `${tree.root}|${packageManager}`;\n  const cached = catalogSupportCache.get(cacheKey);\n  if (cached !== undefined) {\n    return cached;\n  }\n  const minimumVersion = CATALOG_SUPPORT[packageManager];\n  let supported = false;\n  if (minimumVersion) {\n    try {\n      supported = versionAtLeast(\n        getPackageManagerVersion(packageManager, tree.root),\n        minimumVersion,\n      );\n    } catch {\n      // Not installed (e.g. tests) — assume a modern version.\n      supported = true;\n    }\n  }\n  catalogSupportCache.set(cacheKey, supported);\n  return supported;\n};\n\n// True when the package manager supports catalogs and the workspace hasn't\n// opted out via `packageManager.catalogs: false` in aws-nx-plugin.config.mts.\nexport const catalogsEnabled = (tree: Tree): boolean => {\n  if (!supportsCatalogs(tree)) {\n    return false;\n  }\n  const config = readAwsNxPluginConfig(tree);\n  return config?.packageManager?.catalogs !== false;\n};\n\n/**\n * Drop-in replacement for devkit's `addDependenciesToPackageJson` that records\n * versions in the package manager's catalog when enabled. Callers pass a\n * project manifest path for runtime deps (so `noUndeclaredDependencies` passes)\n * and the root for shared tooling.\n */\nexport const addDependenciesToPackageJson = (\n  tree: Tree,\n  dependencies: Record<string, string>,\n  devDependencies: Record<string, string>,\n  packageJsonPath = 'package.json',\n): GeneratorCallback => {\n  const callback = devkitAddDependenciesToPackageJson(\n    tree,\n    dependencies,\n    devDependencies,\n    packageJsonPath,\n  );\n\n  if (catalogsEnabled(tree)) {\n    const packageNames = [\n      ...Object.keys(dependencies),\n      ...Object.keys(devDependencies),\n    ];\n    convertDependenciesToCatalog(tree, packageJsonPath, packageNames);\n    // Convert any matching root ranges Nx wrote behind our back (e.g.\n    // `@types/node`, `react`) so they don't resolve to a second copy alongside\n    // the catalog version. Skipped when the caller already targeted the root.\n    if (packageJsonPath !== 'package.json') {\n      convertDependenciesToCatalog(tree, 'package.json', packageNames);\n    }\n  }\n\n  return callback;\n};\n\n// Convert direct version ranges to `catalog:` references in a single manifest\n// and record the range in the workspace catalog. Protocol specifiers\n// (catalog:/workspace:/...) are left alone.\nconst convertDependenciesToCatalog = (\n  tree: Tree,\n  packageJsonPath: string,\n  packageNames: string[],\n): void => {\n  const catalogUpdates: Record<string, string> = {};\n\n  updateJson(tree, packageJsonPath, (json) => {\n    for (const field of ['dependencies', 'devDependencies'] as const) {\n      for (const packageName of packageNames) {\n        const version = json[field]?.[packageName];\n        if (version && !version.includes(':')) {\n          catalogUpdates[packageName] = version;\n          json[field][packageName] = 'catalog:';\n        }\n      }\n    }\n    return json;\n  });\n\n  if (Object.keys(catalogUpdates).length > 0) {\n    writeCatalogVersions(tree, catalogUpdates);\n  }\n};\n\n// Record ranges in the default catalog, creating it if absent. Only strict\n// upgrades replace existing entries (see `isVersionUpgrade`).\nconst writeCatalogVersions = (\n  tree: Tree,\n  updates: Record<string, string>,\n): void => {\n  const applyUpdates = (\n    catalog: Record<string, string> | undefined,\n  ): Record<string, string> | undefined => {\n    const existing = catalog ?? {};\n    const applicable = Object.fromEntries(\n      Object.entries(updates).filter(\n        ([name, version]) =>\n          existing[name] === undefined ||\n          isVersionUpgrade(version, existing[name]),\n      ),\n    );\n    if (Object.keys(applicable).length === 0) {\n      return undefined;\n    }\n    return { ...existing, ...applicable };\n  };\n\n  switch (detectWorkspacePackageManager(tree)) {\n    case 'pnpm': {\n      const workspaceYaml =\n        (yaml.load(tree.read('pnpm-workspace.yaml', 'utf-8') ?? '') as Record<\n          string,\n          unknown\n        >) ?? {};\n      const catalog = applyUpdates(\n        workspaceYaml.catalog as Record<string, string> | undefined,\n      );\n      if (catalog) {\n        tree.write(\n          'pnpm-workspace.yaml',\n          yaml.dump({ ...workspaceYaml, catalog }, { quotingType: \"'\" }),\n        );\n      }\n      break;\n    }\n    case 'yarn': {\n      const yarnRc =\n        (yaml.load(tree.read('.yarnrc.yml', 'utf-8') ?? '') as Record<\n          string,\n          unknown\n        >) ?? {};\n      const catalog = applyUpdates(\n        yarnRc.catalog as Record<string, string> | undefined,\n      );\n      if (catalog) {\n        tree.write(\n          '.yarnrc.yml',\n          yaml.dump({ ...yarnRc, catalog }, { quotingType: \"'\" }),\n        );\n      }\n      break;\n    }\n    case 'bun': {\n      const catalog = applyUpdates(\n        readJson<{ catalog?: Record<string, string> }>(tree, 'package.json')\n          .catalog,\n      );\n      if (catalog) {\n        updateJson(tree, 'package.json', (json) => ({ ...json, catalog }));\n      }\n      break;\n    }\n  }\n};\n"],"names":["detectPackageManager","addDependenciesToPackageJson","devkitAddDependenciesToPackageJson","getPackageManagerVersion","readJson","updateJson","yaml","coerce","gt","gte","readAwsNxPluginConfig","CATALOG_SUPPORT","pnpm","yarn","bun","detectWorkspacePackageManager","tree","exists","root","parseSimpleRange","version","trimmed","trim","test","undefined","includePrerelease","versionAtLeast","minimum","isVersionUpgrade","incoming","existing","existingParsed","incomingParsed","catalogSupportCache","Map","resetCatalogSupportCache","clear","getLocalDependencySpecifier","packageManager","major","Number","parseInt","split","supportsCatalogs","cacheKey","cached","get","minimumVersion","supported","set","catalogsEnabled","config","catalogs","dependencies","devDependencies","packageJsonPath","callback","packageNames","Object","keys","convertDependenciesToCatalog","catalogUpdates","json","field","packageName","includes","length","writeCatalogVersions","updates","applyUpdates","catalog","applicable","fromEntries","entries","filter","name","workspaceYaml","load","read","write","dump","quotingType","yarnRc"],"mappings":"AAAA;;;CAGC,GACD,SACEA,oBAAoB,EACpBC,gCAAgCC,kCAAkC,EAElEC,wBAAwB,EAExBC,QAAQ,EAERC,UAAU,QACL,aAAa;AACpB,OAAOC,UAAU,UAAU;AAC3B,SAASC,MAAM,EAAEC,EAAE,EAAEC,GAAG,QAAQ,SAAS;AACzC,SAASC,qBAAqB,QAAQ,oBAAoB;AAE1D,sFAAsF;AACtF,MAAMC,kBAA2D;IAC/DC,MAAM;IACNC,MAAM;IACNC,KAAK;AACP;AAEA,4EAA4E;AAC5E,sEAAsE;AACtE,OAAO,MAAMC,gCAAgC,CAACC,OAC5CA,KAAKC,MAAM,CAAC,yBAAyB,SAASjB,qBAAqBgB,KAAKE,IAAI,EAAE;AAEhF,qEAAqE;AACrE,gFAAgF;AAChF,MAAMC,mBAAmB,CAACC;IACxB,MAAMC,UAAUD,QAAQE,IAAI;IAC5B,IAAI,UAAUC,IAAI,CAACF,UAAU;QAC3B,OAAOG;IACT;IACA,OAAOjB,OAAOc,SAAS;QAAEI,mBAAmB;IAAK,MAAMD;AACzD;AAEA,MAAME,iBAAiB,CAACN,SAAiBO,UACvClB,IACEU,iBAAiBC,YAAY,SAC7BD,iBAAiBQ,YAAY;AAGjC,4EAA4E;AAC5E,2EAA2E;AAC3E,mCAAmC;AACnC,MAAMC,mBAAmB,CAACC,UAAkBC;IAC1C,MAAMC,iBAAiBZ,iBAAiBW;IACxC,MAAME,iBAAiBb,iBAAiBU;IACxC,IAAI,CAACE,kBAAkB,CAACC,gBAAgB;QACtC,OAAO;IACT;IACA,OAAOxB,GAAGwB,gBAAgBD;AAC5B;AAEA,+EAA+E;AAC/E,MAAME,sBAAsB,IAAIC;AAEhC,4DAA4D,GAC5D,OAAO,MAAMC,2BAA2B;IACtCF,oBAAoBG,KAAK;AAC3B,EAAE;AAEF,4EAA4E;AAC5E,iEAAiE;AACjE,OAAO,MAAMC,8BAA8B,CAACrB;IAC1C,MAAMsB,iBAAiBvB,8BAA8BC;IACrD,IAAIsB,mBAAmB,OAAO;QAC5B,OAAO;IACT;IACA,IAAIA,mBAAmB,QAAQ;QAC7B,IAAIC,QAAQ;QACZ,IAAI;YACFA,QAAQC,OAAOC,QAAQ,CACrBtC,yBAAyB,QAAQa,KAAKE,IAAI,EAAEwB,KAAK,CAAC,IAAI,CAAC,EAAE,EACzD;QAEJ,EAAE,OAAM;QACN,6CAA6C;QAC/C;QACA,IAAIH,QAAQ,GAAG;YACb,OAAO;QACT;IACF;IACA,OAAO;AACT,EAAE;AAEF,OAAO,MAAMI,mBAAmB,CAAC3B;IAC/B,MAAMsB,iBAAiBvB,8BAA8BC;IACrD,MAAM4B,WAAW,GAAG5B,KAAKE,IAAI,CAAC,CAAC,EAAEoB,gBAAgB;IACjD,MAAMO,SAASZ,oBAAoBa,GAAG,CAACF;IACvC,IAAIC,WAAWrB,WAAW;QACxB,OAAOqB;IACT;IACA,MAAME,iBAAiBpC,eAAe,CAAC2B,eAAe;IACtD,IAAIU,YAAY;IAChB,IAAID,gBAAgB;QAClB,IAAI;YACFC,YAAYtB,eACVvB,yBAAyBmC,gBAAgBtB,KAAKE,IAAI,GAClD6B;QAEJ,EAAE,OAAM;YACN,wDAAwD;YACxDC,YAAY;QACd;IACF;IACAf,oBAAoBgB,GAAG,CAACL,UAAUI;IAClC,OAAOA;AACT,EAAE;AAEF,2EAA2E;AAC3E,8EAA8E;AAC9E,OAAO,MAAME,kBAAkB,CAAClC;IAC9B,IAAI,CAAC2B,iBAAiB3B,OAAO;QAC3B,OAAO;IACT;IACA,MAAMmC,SAASzC,sBAAsBM;IACrC,OAAOmC,QAAQb,gBAAgBc,aAAa;AAC9C,EAAE;AAEF;;;;;CAKC,GACD,OAAO,MAAMnD,+BAA+B,CAC1Ce,MACAqC,cACAC,iBACAC,kBAAkB,cAAc;IAEhC,MAAMC,WAAWtD,mCACfc,MACAqC,cACAC,iBACAC;IAGF,IAAIL,gBAAgBlC,OAAO;QACzB,MAAMyC,eAAe;eAChBC,OAAOC,IAAI,CAACN;eACZK,OAAOC,IAAI,CAACL;SAChB;QACDM,6BAA6B5C,MAAMuC,iBAAiBE;QACpD,kEAAkE;QAClE,2EAA2E;QAC3E,0EAA0E;QAC1E,IAAIF,oBAAoB,gBAAgB;YACtCK,6BAA6B5C,MAAM,gBAAgByC;QACrD;IACF;IAEA,OAAOD;AACT,EAAE;AAEF,8EAA8E;AAC9E,qEAAqE;AACrE,4CAA4C;AAC5C,MAAMI,+BAA+B,CACnC5C,MACAuC,iBACAE;IAEA,MAAMI,iBAAyC,CAAC;IAEhDxD,WAAWW,MAAMuC,iBAAiB,CAACO;QACjC,KAAK,MAAMC,SAAS;YAAC;YAAgB;SAAkB,CAAW;YAChE,KAAK,MAAMC,eAAeP,aAAc;gBACtC,MAAMrC,UAAU0C,IAAI,CAACC,MAAM,EAAE,CAACC,YAAY;gBAC1C,IAAI5C,WAAW,CAACA,QAAQ6C,QAAQ,CAAC,MAAM;oBACrCJ,cAAc,CAACG,YAAY,GAAG5C;oBAC9B0C,IAAI,CAACC,MAAM,CAACC,YAAY,GAAG;gBAC7B;YACF;QACF;QACA,OAAOF;IACT;IAEA,IAAIJ,OAAOC,IAAI,CAACE,gBAAgBK,MAAM,GAAG,GAAG;QAC1CC,qBAAqBnD,MAAM6C;IAC7B;AACF;AAEA,2EAA2E;AAC3E,8DAA8D;AAC9D,MAAMM,uBAAuB,CAC3BnD,MACAoD;IAEA,MAAMC,eAAe,CACnBC;QAEA,MAAMxC,WAAWwC,WAAW,CAAC;QAC7B,MAAMC,aAAab,OAAOc,WAAW,CACnCd,OAAOe,OAAO,CAACL,SAASM,MAAM,CAC5B,CAAC,CAACC,MAAMvD,QAAQ,GACdU,QAAQ,CAAC6C,KAAK,KAAKnD,aACnBI,iBAAiBR,SAASU,QAAQ,CAAC6C,KAAK;QAG9C,IAAIjB,OAAOC,IAAI,CAACY,YAAYL,MAAM,KAAK,GAAG;YACxC,OAAO1C;QACT;QACA,OAAO;YAAE,GAAGM,QAAQ;YAAE,GAAGyC,UAAU;QAAC;IACtC;IAEA,OAAQxD,8BAA8BC;QACpC,KAAK;YAAQ;gBACX,MAAM4D,gBACJ,AAACtE,KAAKuE,IAAI,CAAC7D,KAAK8D,IAAI,CAAC,uBAAuB,YAAY,OAGlD,CAAC;gBACT,MAAMR,UAAUD,aACdO,cAAcN,OAAO;gBAEvB,IAAIA,SAAS;oBACXtD,KAAK+D,KAAK,CACR,uBACAzE,KAAK0E,IAAI,CAAC;wBAAE,GAAGJ,aAAa;wBAAEN;oBAAQ,GAAG;wBAAEW,aAAa;oBAAI;gBAEhE;gBACA;YACF;QACA,KAAK;YAAQ;gBACX,MAAMC,SACJ,AAAC5E,KAAKuE,IAAI,CAAC7D,KAAK8D,IAAI,CAAC,eAAe,YAAY,OAG1C,CAAC;gBACT,MAAMR,UAAUD,aACda,OAAOZ,OAAO;gBAEhB,IAAIA,SAAS;oBACXtD,KAAK+D,KAAK,CACR,eACAzE,KAAK0E,IAAI,CAAC;wBAAE,GAAGE,MAAM;wBAAEZ;oBAAQ,GAAG;wBAAEW,aAAa;oBAAI;gBAEzD;gBACA;YACF;QACA,KAAK;YAAO;gBACV,MAAMX,UAAUD,aACdjE,SAA+CY,MAAM,gBAClDsD,OAAO;gBAEZ,IAAIA,SAAS;oBACXjE,WAAWW,MAAM,gBAAgB,CAAC8C,OAAU,CAAA;4BAAE,GAAGA,IAAI;4BAAEQ;wBAAQ,CAAA;gBACjE;gBACA;YACF;IACF;AACF"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/dependencies.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  addDependenciesToPackageJson as devkitAddDependenciesToPackageJson,\n  removeDependenciesFromPackageJson as devkitRemoveDependenciesFromPackageJson,\n  type GeneratorCallback,\n  getPackageManagerVersion,\n  getProjects,\n  joinPathFragments,\n  type PackageManager,\n  readJson,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport yaml from 'js-yaml';\nimport { coerce, gt, gte } from 'semver';\nimport { readAwsNxPluginConfig } from './config/utils.js';\n\n// Minimum version that introduced catalog support per package manager (npm has none).\nconst CATALOG_SUPPORT: Partial<Record<PackageManager, string>> = {\n  pnpm: '9.5.0',\n  yarn: '4.10.0',\n  bun: '1.2.14',\n};\n\n// Prefer tree markers over devkit's `detectPackageManager`, which reads the\n// real filesystem and is nondeterministic for virtual trees in tests.\nexport const detectWorkspacePackageManager = (tree: Tree): PackageManager =>\n  tree.exists('pnpm-workspace.yaml') ? 'pnpm' : detectPackageManager(tree.root);\n\n// Coerce a single simple range to a version. Rejects compound ranges\n// (whitespace / `||`), which coerce would silently reduce, plus tags/protocols.\nconst parseSimpleRange = (version: string) => {\n  const trimmed = version.trim();\n  if (/\\s|\\|\\|/.test(trimmed)) {\n    return undefined;\n  }\n  return coerce(trimmed, { includePrerelease: true }) ?? undefined;\n};\n\nconst versionAtLeast = (version: string, minimum: string): boolean =>\n  gte(\n    parseSimpleRange(version) ?? '0.0.0',\n    parseSimpleRange(minimum) ?? '0.0.0',\n  );\n\n// Only a strict upgrade replaces an existing catalog entry, so generating a\n// project never downgrades a version the user raised. Uncomparable entries\n// (tags, complex ranges) are kept.\nconst isVersionUpgrade = (incoming: string, existing: string): boolean => {\n  const existingParsed = parseSimpleRange(existing);\n  const incomingParsed = parseSimpleRange(incoming);\n  if (!existingParsed || !incomingParsed) {\n    return false;\n  }\n  return gt(incomingParsed, existingParsed);\n};\n\n// Keyed by root + package manager; detecting support shells out for a version.\nconst catalogSupportCache = new Map<string, boolean>();\n\n/** Clears the catalog support cache. Only needed by tests. */\nexport const resetCatalogSupportCache = (): void => {\n  catalogSupportCache.clear();\n};\n\n// Local-project specifier: the `workspace:` protocol where supported (pnpm,\n// bun, yarn berry), `*` on npm and yarn classic which reject it.\nexport const getLocalDependencySpecifier = (tree: Tree): string => {\n  const packageManager = detectWorkspacePackageManager(tree);\n  if (packageManager === 'npm') {\n    return '*';\n  }\n  if (packageManager === 'yarn') {\n    let major = 2;\n    try {\n      major = Number.parseInt(\n        getPackageManagerVersion('yarn', tree.root).split('.')[0],\n        10,\n      );\n    } catch {\n      // Not installed (e.g. tests) — assume berry.\n    }\n    if (major < 2) {\n      return '*';\n    }\n  }\n  return 'workspace:*';\n};\n\nexport const supportsCatalogs = (tree: Tree): boolean => {\n  const packageManager = detectWorkspacePackageManager(tree);\n  const cacheKey = `${tree.root}|${packageManager}`;\n  const cached = catalogSupportCache.get(cacheKey);\n  if (cached !== undefined) {\n    return cached;\n  }\n  const minimumVersion = CATALOG_SUPPORT[packageManager];\n  let supported = false;\n  if (minimumVersion) {\n    try {\n      supported = versionAtLeast(\n        getPackageManagerVersion(packageManager, tree.root),\n        minimumVersion,\n      );\n    } catch {\n      // Not installed (e.g. tests) — assume a modern version.\n      supported = true;\n    }\n  }\n  catalogSupportCache.set(cacheKey, supported);\n  return supported;\n};\n\n// True when the package manager supports catalogs and the workspace hasn't\n// opted out via `packageManager.catalogs: false` in aws-nx-plugin.config.mts.\nexport const catalogsEnabled = (tree: Tree): boolean => {\n  if (!supportsCatalogs(tree)) {\n    return false;\n  }\n  const config = readAwsNxPluginConfig(tree);\n  return config?.packageManager?.catalogs !== false;\n};\n\n/**\n * Drop-in replacement for devkit's `addDependenciesToPackageJson` that records\n * versions in the package manager's catalog when enabled. Callers pass a\n * project manifest path for runtime deps (so `noUndeclaredDependencies` passes)\n * and the root for shared tooling.\n */\nexport const addDependenciesToPackageJson = (\n  tree: Tree,\n  dependencies: Record<string, string>,\n  devDependencies: Record<string, string>,\n  packageJsonPath = 'package.json',\n): GeneratorCallback => {\n  const callback = devkitAddDependenciesToPackageJson(\n    tree,\n    dependencies,\n    devDependencies,\n    packageJsonPath,\n  );\n\n  if (catalogsEnabled(tree)) {\n    const packageNames = [\n      ...Object.keys(dependencies),\n      ...Object.keys(devDependencies),\n    ];\n    convertDependenciesToCatalog(tree, packageJsonPath, packageNames);\n    // Convert any matching root ranges Nx wrote behind our back (e.g.\n    // `@types/node`, `react`) so they don't resolve to a second copy alongside\n    // the catalog version. Skipped when the caller already targeted the root.\n    if (packageJsonPath !== 'package.json') {\n      convertDependenciesToCatalog(tree, 'package.json', packageNames);\n    }\n  }\n\n  return callback;\n};\n\n/**\n * Drop-in replacement for devkit's `removeDependenciesFromPackageJson` that\n * also drops the package manager's catalog entry, which devkit leaves behind\n * pointing at a package nothing declares any more.\n *\n * The entry is only dropped once no manifest in the workspace declares the\n * package, so removing it from one project leaves another project's reference\n * resolvable.\n */\nexport const removeDependenciesFromPackageJson = (\n  tree: Tree,\n  dependencies: string[],\n  devDependencies: string[],\n  packageJsonPath = 'package.json',\n): GeneratorCallback => {\n  const callback = devkitRemoveDependenciesFromPackageJson(\n    tree,\n    dependencies,\n    devDependencies,\n    packageJsonPath,\n  );\n\n  if (catalogsEnabled(tree)) {\n    const manifests = workspaceManifests(tree, packageJsonPath);\n    const removed = [...new Set([...dependencies, ...devDependencies])].filter(\n      (packageName) =>\n        !manifests.some((manifest) =>\n          MANIFEST_DEPENDENCY_FIELDS.some(\n            (field) => manifest[field]?.[packageName] !== undefined,\n          ),\n        ),\n    );\n    removeCatalogVersions(tree, removed);\n  }\n\n  return callback;\n};\n\ntype Manifest = Record<string, Record<string, string> | undefined>;\n\n/**\n * Every manifest that can hold a catalog reference: the root, each project's,\n * and the one just written. Project manifests come from the project graph\n * rather than a tree walk, so a manifest belonging to no project is not seen.\n */\nconst workspaceManifests = (tree: Tree, packageJsonPath: string): Manifest[] =>\n  [\n    ...new Set([\n      'package.json',\n      packageJsonPath,\n      ...Array.from(getProjects(tree).values()).map((project) =>\n        joinPathFragments(project.root, 'package.json'),\n      ),\n    ]),\n  ]\n    .filter((path) => tree.exists(path))\n    .map((path) => readJson<Manifest>(tree, path));\n\nconst MANIFEST_DEPENDENCY_FIELDS = [\n  'dependencies',\n  'devDependencies',\n  'optionalDependencies',\n  'peerDependencies',\n] as const;\n\n// Drop entries from the default catalog, mirroring `writeCatalogVersions`.\nconst removeCatalogVersions = (tree: Tree, packageNames: string[]): void => {\n  if (packageNames.length === 0) {\n    return;\n  }\n\n  const withoutRemoved = (\n    catalog: Record<string, string> | undefined,\n  ): Record<string, string> | undefined => {\n    if (!catalog || !packageNames.some((name) => name in catalog)) {\n      return undefined;\n    }\n    return Object.fromEntries(\n      Object.entries(catalog).filter(([name]) => !packageNames.includes(name)),\n    );\n  };\n\n  switch (detectWorkspacePackageManager(tree)) {\n    case 'pnpm': {\n      const workspaceYaml =\n        (yaml.load(tree.read('pnpm-workspace.yaml', 'utf-8') ?? '') as Record<\n          string,\n          unknown\n        >) ?? {};\n      const catalog = withoutRemoved(\n        workspaceYaml.catalog as Record<string, string> | undefined,\n      );\n      if (catalog) {\n        tree.write(\n          'pnpm-workspace.yaml',\n          yaml.dump({ ...workspaceYaml, catalog }, { quotingType: \"'\" }),\n        );\n      }\n      break;\n    }\n    case 'yarn': {\n      const yarnRc =\n        (yaml.load(tree.read('.yarnrc.yml', 'utf-8') ?? '') as Record<\n          string,\n          unknown\n        >) ?? {};\n      const catalog = withoutRemoved(\n        yarnRc.catalog as Record<string, string> | undefined,\n      );\n      if (catalog) {\n        tree.write(\n          '.yarnrc.yml',\n          yaml.dump({ ...yarnRc, catalog }, { quotingType: \"'\" }),\n        );\n      }\n      break;\n    }\n    case 'bun': {\n      const catalog = withoutRemoved(\n        readJson<{ catalog?: Record<string, string> }>(tree, 'package.json')\n          .catalog,\n      );\n      if (catalog) {\n        updateJson(tree, 'package.json', (json) => ({ ...json, catalog }));\n      }\n      break;\n    }\n  }\n};\n\n// Convert direct version ranges to `catalog:` references in a single manifest\n// and record the range in the workspace catalog. Protocol specifiers\n// (catalog:/workspace:/...) are left alone.\nconst convertDependenciesToCatalog = (\n  tree: Tree,\n  packageJsonPath: string,\n  packageNames: string[],\n): void => {\n  const catalogUpdates: Record<string, string> = {};\n\n  updateJson(tree, packageJsonPath, (json) => {\n    for (const field of ['dependencies', 'devDependencies'] as const) {\n      for (const packageName of packageNames) {\n        const version = json[field]?.[packageName];\n        if (version && !version.includes(':')) {\n          catalogUpdates[packageName] = version;\n          json[field][packageName] = 'catalog:';\n        }\n      }\n    }\n    return json;\n  });\n\n  if (Object.keys(catalogUpdates).length > 0) {\n    writeCatalogVersions(tree, catalogUpdates);\n  }\n};\n\n// Record ranges in the default catalog, creating it if absent. Only strict\n// upgrades replace existing entries (see `isVersionUpgrade`).\nconst writeCatalogVersions = (\n  tree: Tree,\n  updates: Record<string, string>,\n): void => {\n  const applyUpdates = (\n    catalog: Record<string, string> | undefined,\n  ): Record<string, string> | undefined => {\n    const existing = catalog ?? {};\n    const applicable = Object.fromEntries(\n      Object.entries(updates).filter(\n        ([name, version]) =>\n          existing[name] === undefined ||\n          isVersionUpgrade(version, existing[name]),\n      ),\n    );\n    if (Object.keys(applicable).length === 0) {\n      return undefined;\n    }\n    return { ...existing, ...applicable };\n  };\n\n  switch (detectWorkspacePackageManager(tree)) {\n    case 'pnpm': {\n      const workspaceYaml =\n        (yaml.load(tree.read('pnpm-workspace.yaml', 'utf-8') ?? '') as Record<\n          string,\n          unknown\n        >) ?? {};\n      const catalog = applyUpdates(\n        workspaceYaml.catalog as Record<string, string> | undefined,\n      );\n      if (catalog) {\n        tree.write(\n          'pnpm-workspace.yaml',\n          yaml.dump({ ...workspaceYaml, catalog }, { quotingType: \"'\" }),\n        );\n      }\n      break;\n    }\n    case 'yarn': {\n      const yarnRc =\n        (yaml.load(tree.read('.yarnrc.yml', 'utf-8') ?? '') as Record<\n          string,\n          unknown\n        >) ?? {};\n      const catalog = applyUpdates(\n        yarnRc.catalog as Record<string, string> | undefined,\n      );\n      if (catalog) {\n        tree.write(\n          '.yarnrc.yml',\n          yaml.dump({ ...yarnRc, catalog }, { quotingType: \"'\" }),\n        );\n      }\n      break;\n    }\n    case 'bun': {\n      const catalog = applyUpdates(\n        readJson<{ catalog?: Record<string, string> }>(tree, 'package.json')\n          .catalog,\n      );\n      if (catalog) {\n        updateJson(tree, 'package.json', (json) => ({ ...json, catalog }));\n      }\n      break;\n    }\n  }\n};\n"],"names":["detectPackageManager","addDependenciesToPackageJson","devkitAddDependenciesToPackageJson","removeDependenciesFromPackageJson","devkitRemoveDependenciesFromPackageJson","getPackageManagerVersion","getProjects","joinPathFragments","readJson","updateJson","yaml","coerce","gt","gte","readAwsNxPluginConfig","CATALOG_SUPPORT","pnpm","yarn","bun","detectWorkspacePackageManager","tree","exists","root","parseSimpleRange","version","trimmed","trim","test","undefined","includePrerelease","versionAtLeast","minimum","isVersionUpgrade","incoming","existing","existingParsed","incomingParsed","catalogSupportCache","Map","resetCatalogSupportCache","clear","getLocalDependencySpecifier","packageManager","major","Number","parseInt","split","supportsCatalogs","cacheKey","cached","get","minimumVersion","supported","set","catalogsEnabled","config","catalogs","dependencies","devDependencies","packageJsonPath","callback","packageNames","Object","keys","convertDependenciesToCatalog","manifests","workspaceManifests","removed","Set","filter","packageName","some","manifest","MANIFEST_DEPENDENCY_FIELDS","field","removeCatalogVersions","Array","from","values","map","project","path","length","withoutRemoved","catalog","name","fromEntries","entries","includes","workspaceYaml","load","read","write","dump","quotingType","yarnRc","json","catalogUpdates","writeCatalogVersions","updates","applyUpdates","applicable"],"mappings":"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"}

package/src/utils/docker.d.ts

@@ -43,6 +43,17 @@ export declare const NODE_IMAGE_DEPENDENCIES: readonly [{
 }, {
     readonly name: "minimatch";
 }];
+/**
+ * Packages the prisma CLI install in a vended RDB migration `Dockerfile` pins.
+ * The CLI's own ranges resolve both below a known HIGH vulnerability's fix, so
+ * the image overrides them. Spread through `ownedElsewhere` for the same reason
+ * as {@link NODE_IMAGE_DEPENDENCIES}.
+ */
+export declare const PRISMA_IMAGE_DEPENDENCIES: readonly [{
+    readonly name: "deepmerge-ts";
+}, {
+    readonly name: "mysql2";
+}];
 /**
  * Packages the AWS Distro for OpenTelemetry install in a vended `Dockerfile`
  * pins, for the images that auto-instrument with it. Spread through

package/src/utils/docker.js

@@ -4,7 +4,7 @@
  */ import { joinPathFragments } from "@nx/devkit";
 import { forDependencies } from "./declared-dependencies.js";
 import { FS_DEPENDENCIES, FsCommands } from "./fs.js";
-import { addDependencyToTargetIfNotPresent } from "./nx.js";
+import { addDependencyToTargetIfNotPresent, normalizeTargetKeyOrder } from "./nx.js";
 import { containerImage, TS_VERSIONS } from "./versions.js";
 /** Dependencies a caller must declare to add a Docker scan target. */ export const DOCKER_DEPENDENCIES = [
     ...FS_DEPENDENCIES
@@ -49,6 +49,19 @@ const TRIVY_IGNORE_CONTENTS = `# Trivy ignore file. Add one vulnerability ID (e.
         name: 'minimatch'
     }
 ];
+/**
+ * Packages the prisma CLI install in a vended RDB migration `Dockerfile` pins.
+ * The CLI's own ranges resolve both below a known HIGH vulnerability's fix, so
+ * the image overrides them. Spread through `ownedElsewhere` for the same reason
+ * as {@link NODE_IMAGE_DEPENDENCIES}.
+ */ export const PRISMA_IMAGE_DEPENDENCIES = [
+    {
+        name: 'deepmerge-ts'
+    },
+    {
+        name: 'mysql2'
+    }
+];
 /**
  * Packages the AWS Distro for OpenTelemetry install in a vended `Dockerfile`
  * pins, for the images that auto-instrument with it. Spread through
@@ -102,7 +115,7 @@ const TRIVY_IGNORE_CONTENTS = `# Trivy ignore file. Add one vulnerability ID (e.
         commands.push(`${containerEngine} save -o ${joinPathFragments(scanDir, tarName)} ${imageTag}`, `${containerEngine} run --rm -v "./${scanDir}":/scan ${trivyImage} image --input /scan/${tarName} --ignorefile /scan/${TRIVY_IGNORE_FILE} --scanners vuln --severity HIGH,CRITICAL --ignore-unfixed --exit-code 1 --no-progress -q`);
     });
     project.targets ??= {};
-    project.targets[trivyTargetName] = {
+    project.targets[trivyTargetName] = normalizeTargetKeyOrder({
         // The image being scanned is only reachable through the container engine,
         // so a restored cache entry would report a pass for an image that may no
         // longer exist. The scan re-runs and either scans the real image or fails.
@@ -120,7 +133,7 @@ const TRIVY_IGNORE_CONTENTS = `# Trivy ignore file. Add one vulnerability ID (e.
         dependsOn: [
             dockerTargetName
         ]
-    };
+    });
     // Aggregate per-component scan targets under a single `trivy` target. The
     // scan is intentionally NOT wired into `build`: image scanning is slow and
     // its result depends on the ever-changing vulnerability database (a scan