@aws/nx-plugin 1.0.0-rc.85 → 1.0.0-rc.87

package/src/utils/ast.js

@@ -257,6 +257,42 @@ export const addDestructuredImport = async (tree, filePath, variableNames, from)
     }
     return captured;
 };
+/**
+ * Like {@link captureAllGritQL}, but returns one metavariable's binding for every
+ * match rather than the whole matched node.
+ *
+ * This is what lets a caller work on the value a pattern isolated — matching
+ * `` `runtime: $value` `` and reading `$value` gives `Runtime.NODEJS_24_X` alone,
+ * so nothing downstream has to re-derive the assignment around it.
+ *
+ * A match whose metavariable is unbound contributes nothing, so the result holds
+ * only real bindings. Returns undefined if the pattern could not be applied,
+ * which an empty array cannot express.
+ */ export const captureAllGritQLVariable = async (tree, filePath, pattern, variableName)=>{
+    if (!tree.exists(filePath)) return undefined;
+    ensureGritDir(tree);
+    const source = tree.read(filePath).toString();
+    // The underlying binding lookup requires the `$` sigil.
+    const name = variableName.startsWith('$') ? variableName : `$${variableName}`;
+    const captured = [];
+    try {
+        const query = new QueryBuilder(pattern);
+        query.filter((node)=>{
+            const bound = node.var(name);
+            if (bound !== null && bound !== undefined) {
+                captured.push(bound);
+            }
+            return true;
+        });
+        await query.applyToFile({
+            path: filePath,
+            content: source
+        });
+    } catch  {
+        return undefined;
+    }
+    return captured;
+};
 /**
  * Return the text of every node matching the GritQL pattern, in document order.
  */ export const captureAllGritQL = async (tree, filePath, pattern)=>{

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 * 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","captureAllGritQL","push","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 { 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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"}

package/src/utils/bundle/bundle.js

@@ -7,7 +7,7 @@ import { forDependencies } from "../declared-dependencies.js";
 import { addDependenciesToPackageJson } from "../dependencies.js";
 import { addDependencyToTargetIfNotPresent, normalizeTargetKeyOrder } from "../nx.js";
 import { getRelativePathToRoot } from "../paths.js";
-import { withVersions } from "../versions.js";
+import { LAMBDA_RUNTIME_VERSIONS, withVersions } from "../versions.js";
 /** Dependencies a caller must declare to add a TypeScript bundle target. */ export const BUNDLE_DEPENDENCIES = [
     {
         name: 'rolldown'
@@ -29,7 +29,10 @@ import { withVersions } from "../versions.js";
         options: {
             commands: [
                 `uv export --frozen --no-dev --no-editable --project {projectRoot} --package ${packageName} -o dist/{projectRoot}/${bundleTargetName}/requirements.txt`,
-                `uv pip install -n --no-deps --no-installer-metadata --no-compile-bytecode --python-platform ${pythonPlatform} --target dist/{projectRoot}/${bundleTargetName} -r dist/{projectRoot}/${bundleTargetName}/requirements.txt`
+                // `--python-version` pins wheel resolution to the Lambda Python runtime,
+                // so the bundle cannot be built against whichever interpreter happens to
+                // be on the build machine.
+                `uv pip install -n --no-deps --no-installer-metadata --no-compile-bytecode --python-platform ${pythonPlatform} --python-version ${LAMBDA_RUNTIME_VERSIONS.python} --target dist/{projectRoot}/${bundleTargetName} -r dist/{projectRoot}/${bundleTargetName}/requirements.txt`
             ],
             parallel: false
         }

package/src/utils/bundle/bundle.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/utils/bundle/bundle.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport {\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type ProjectConfiguration,\n  type TargetConfiguration,\n  type Tree,\n} from '@nx/devkit';\nimport { applyGritQL } from '../ast.js';\nimport {\n  type DependencyDeclaration,\n  forDependencies,\n  type MustDeclare,\n} from '../declared-dependencies.js';\nimport { addDependenciesToPackageJson } from '../dependencies.js';\nimport {\n  addDependencyToTargetIfNotPresent,\n  normalizeTargetKeyOrder,\n} from '../nx.js';\nimport { getRelativePathToRoot } from '../paths.js';\nimport { type ITsDepVersion, withVersions } from '../versions.js';\n\n/** Dependencies a caller must declare to add a TypeScript bundle target. */\nexport const BUNDLE_DEPENDENCIES = [\n  { name: 'rolldown' },\n] as const satisfies readonly { name: ITsDepVersion }[];\n\nexport interface AddPythonBundleTargetOptions {\n  /**\n   * Python platform\n   * @default x86_64-manylinux_2_28\n   */\n  pythonPlatform?: 'x86_64-manylinux_2_28' | 'aarch64-manylinux_2_28';\n}\n\ninterface CreatePythonBundleTargetOptions\n  extends Required<AddPythonBundleTargetOptions> {\n  /**\n   * Python package name\n   */\n  packageName: string;\n\n  /**\n   * Name of the bundle target, used for the outdir for the bundle\n   */\n  bundleTargetName: string;\n}\n\n/**\n * Create a target for bundling a python project\n */\nconst createPythonBundleTarget = ({\n  packageName,\n  pythonPlatform,\n  bundleTargetName,\n}: CreatePythonBundleTargetOptions): TargetConfiguration => {\n  return {\n    cache: true,\n    inputs: ['default', '^production'],\n    executor: 'nx:run-commands',\n    outputs: [`{workspaceRoot}/dist/{projectRoot}/${bundleTargetName}`],\n    options: {\n      commands: [\n        `uv export --frozen --no-dev --no-editable --project {projectRoot} --package ${packageName} -o dist/{projectRoot}/${bundleTargetName}/requirements.txt`,\n        `uv pip install -n --no-deps --no-installer-metadata --no-compile-bytecode --python-platform ${pythonPlatform} --target dist/{projectRoot}/${bundleTargetName} -r dist/{projectRoot}/${bundleTargetName}/requirements.txt`,\n      ],\n      parallel: false,\n    },\n  };\n};\n\n/**\n * Adds a bundle target to the given project if it does not exist, and updates the build target to depend on it\n */\nexport const addPythonBundleTarget = (\n  project: ProjectConfiguration,\n  opts?: AddPythonBundleTargetOptions,\n) => {\n  if (!project.targets) {\n    project.targets = {};\n  }\n\n  const pythonPlatform = opts?.pythonPlatform ?? 'x86_64-manylinux_2_28';\n  const bundleTargetName =\n    pythonPlatform === 'aarch64-manylinux_2_28' ? 'bundle-arm' : 'bundle-x86';\n\n  if (!project.targets?.[bundleTargetName]) {\n    project.targets[bundleTargetName] = normalizeTargetKeyOrder({\n      ...createPythonBundleTarget({\n        packageName: project.name,\n        pythonPlatform,\n        bundleTargetName,\n      }),\n      dependsOn: ['compile'],\n    });\n  }\n\n  // Add a \"bundle\" target which depends on either bundle-arm or bundle-x86 (or both)\n  addDependencyToTargetIfNotPresent(project, 'bundle', bundleTargetName);\n  addDependencyToTargetIfNotPresent(project, 'build', 'bundle');\n\n  return {\n    bundleTargetName,\n    bundleOutputDir: joinPathFragments('dist', project.root, bundleTargetName),\n  };\n};\n\nexport interface AddTypeScriptBundleTargetOptions {\n  /**\n   * Path to the target file relative to the project dir\n   */\n  targetFilePath: string;\n\n  /**\n   * Sub directory to write bundled index.js file to (if any)\n   * Outputs to dist/{projectRoot}/bundle/{bundleOutputDir}/index.js\n   */\n  bundleOutputDir?: string;\n\n  /**\n   * Modules to omit from the bundle and treat as external\n   */\n  external?: (string | RegExp)[];\n\n  /**\n   * Target platform for the bundle\n   * @default 'node'\n   */\n  platform?: 'node' | 'browser' | 'neutral';\n}\n\n/**\n * Add a TypeScript bundle target using rolldown\n */\nexport const addTypeScriptBundleTarget = async <\n  const D extends DependencyDeclaration,\n>(\n  tree: Tree,\n  project: ProjectConfiguration,\n  opts: AddTypeScriptBundleTargetOptions,\n  declaration: D & MustDeclare<typeof BUNDLE_DEPENDENCIES, D>,\n) => {\n  project.targets ??= {};\n\n  // Generate empty rolldown config if it doesn't exist\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'ts'),\n    project.root,\n    {},\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Add the bundle target\n  if (!project.targets.bundle) {\n    project.targets.bundle = normalizeTargetKeyOrder({\n      cache: true,\n      outputs: [`{workspaceRoot}/dist/{projectRoot}/bundle`],\n      executor: 'nx:run-commands',\n      options: {\n        command: 'rolldown -c rolldown.config.ts',\n        cwd: '{projectRoot}',\n      },\n      dependsOn: ['compile'],\n    });\n  }\n\n  // Add bundle to the build target\n  addDependencyToTargetIfNotPresent(project, 'build', 'bundle');\n\n  const rolldownConfigPath = joinPathFragments(\n    project.root,\n    'rolldown.config.ts',\n  );\n\n  const outputFile = joinPathFragments(\n    getRelativePathToRoot(tree, project.name),\n    'dist',\n    project.root,\n    'bundle',\n    opts.bundleOutputDir ?? '.',\n    'index.js',\n  );\n\n  const external = opts.external?.length\n    ? opts.external\n        .map((ext) =>\n          typeof ext === 'string' ? `'${ext}'` : `/${ext.source}/`,\n        )\n        .join(', ')\n    : '';\n\n  const entry = `{\n    tsconfig: 'tsconfig.lib.json',\n    input: '${opts.targetFilePath}',\n    output: { file: '${outputFile}', format: 'cjs', codeSplitting: false },\n    platform: '${opts.platform ?? 'node'}',\n    ${external ? `external: [${external}],` : ''}\n  }`;\n\n  // Use GritQL to append the config entry to the defineConfig array.\n  // First try the non-empty array case using the accumulate (+=) operator,\n  // with an idempotency guard that checks the input path is not already present.\n  const appended = await applyGritQL(\n    tree,\n    rolldownConfigPath,\n    `\\`defineConfig([$items])\\` where { $items <: not contains \\`'${opts.targetFilePath}'\\`, $items += \", ${entry}\" }`,\n  );\n\n  if (!appended) {\n    // Empty array — GritQL's += cannot accumulate into an empty list, so we\n    // first insert a placeholder to make the array non-empty, then replace\n    // the placeholder with the real entry via += (which handles regex\n    // literals that are invalid inside GritQL backtick snippets).\n    const inserted = await applyGritQL(\n      tree,\n      rolldownConfigPath,\n      `\\`defineConfig([])\\` => \\`defineConfig([__PLACEHOLDER__])\\``,\n    );\n    if (inserted) {\n      await applyGritQL(\n        tree,\n        rolldownConfigPath,\n        `\\`defineConfig([$items])\\` where { $items <: \\`__PLACEHOLDER__\\` => ., $items += \"${entry}\" }`,\n      );\n    }\n  }\n\n  addDependenciesToPackageJson(\n    tree,\n    {},\n    withVersions(forDependencies<typeof BUNDLE_DEPENDENCIES>(declaration), [\n      'rolldown',\n    ]),\n  );\n};\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","applyGritQL","forDependencies","addDependenciesToPackageJson","addDependencyToTargetIfNotPresent","normalizeTargetKeyOrder","getRelativePathToRoot","withVersions","BUNDLE_DEPENDENCIES","name","createPythonBundleTarget","packageName","pythonPlatform","bundleTargetName","cache","inputs","executor","outputs","options","commands","parallel","addPythonBundleTarget","project","opts","targets","dependsOn","bundleOutputDir","root","addTypeScriptBundleTarget","tree","declaration","dirname","overwriteStrategy","KeepExisting","bundle","command","cwd","rolldownConfigPath","outputFile","external","length","map","ext","source","join","entry","targetFilePath","platform","appended","inserted"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/utils/bundle/bundle.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport {\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type ProjectConfiguration,\n  type TargetConfiguration,\n  type Tree,\n} from '@nx/devkit';\nimport { applyGritQL } from '../ast.js';\nimport {\n  type DependencyDeclaration,\n  forDependencies,\n  type MustDeclare,\n} from '../declared-dependencies.js';\nimport { addDependenciesToPackageJson } from '../dependencies.js';\nimport {\n  addDependencyToTargetIfNotPresent,\n  normalizeTargetKeyOrder,\n} from '../nx.js';\nimport { getRelativePathToRoot } from '../paths.js';\nimport {\n  type ITsDepVersion,\n  LAMBDA_RUNTIME_VERSIONS,\n  withVersions,\n} from '../versions.js';\n\n/** Dependencies a caller must declare to add a TypeScript bundle target. */\nexport const BUNDLE_DEPENDENCIES = [\n  { name: 'rolldown' },\n] as const satisfies readonly { name: ITsDepVersion }[];\n\nexport interface AddPythonBundleTargetOptions {\n  /**\n   * Python platform\n   * @default x86_64-manylinux_2_28\n   */\n  pythonPlatform?: 'x86_64-manylinux_2_28' | 'aarch64-manylinux_2_28';\n}\n\ninterface CreatePythonBundleTargetOptions\n  extends Required<AddPythonBundleTargetOptions> {\n  /**\n   * Python package name\n   */\n  packageName: string;\n\n  /**\n   * Name of the bundle target, used for the outdir for the bundle\n   */\n  bundleTargetName: string;\n}\n\n/**\n * Create a target for bundling a python project\n */\nconst createPythonBundleTarget = ({\n  packageName,\n  pythonPlatform,\n  bundleTargetName,\n}: CreatePythonBundleTargetOptions): TargetConfiguration => {\n  return {\n    cache: true,\n    inputs: ['default', '^production'],\n    executor: 'nx:run-commands',\n    outputs: [`{workspaceRoot}/dist/{projectRoot}/${bundleTargetName}`],\n    options: {\n      commands: [\n        `uv export --frozen --no-dev --no-editable --project {projectRoot} --package ${packageName} -o dist/{projectRoot}/${bundleTargetName}/requirements.txt`,\n        // `--python-version` pins wheel resolution to the Lambda Python runtime,\n        // so the bundle cannot be built against whichever interpreter happens to\n        // be on the build machine.\n        `uv pip install -n --no-deps --no-installer-metadata --no-compile-bytecode --python-platform ${pythonPlatform} --python-version ${LAMBDA_RUNTIME_VERSIONS.python} --target dist/{projectRoot}/${bundleTargetName} -r dist/{projectRoot}/${bundleTargetName}/requirements.txt`,\n      ],\n      parallel: false,\n    },\n  };\n};\n\n/**\n * Adds a bundle target to the given project if it does not exist, and updates the build target to depend on it\n */\nexport const addPythonBundleTarget = (\n  project: ProjectConfiguration,\n  opts?: AddPythonBundleTargetOptions,\n) => {\n  if (!project.targets) {\n    project.targets = {};\n  }\n\n  const pythonPlatform = opts?.pythonPlatform ?? 'x86_64-manylinux_2_28';\n  const bundleTargetName =\n    pythonPlatform === 'aarch64-manylinux_2_28' ? 'bundle-arm' : 'bundle-x86';\n\n  if (!project.targets?.[bundleTargetName]) {\n    project.targets[bundleTargetName] = normalizeTargetKeyOrder({\n      ...createPythonBundleTarget({\n        packageName: project.name,\n        pythonPlatform,\n        bundleTargetName,\n      }),\n      dependsOn: ['compile'],\n    });\n  }\n\n  // Add a \"bundle\" target which depends on either bundle-arm or bundle-x86 (or both)\n  addDependencyToTargetIfNotPresent(project, 'bundle', bundleTargetName);\n  addDependencyToTargetIfNotPresent(project, 'build', 'bundle');\n\n  return {\n    bundleTargetName,\n    bundleOutputDir: joinPathFragments('dist', project.root, bundleTargetName),\n  };\n};\n\nexport interface AddTypeScriptBundleTargetOptions {\n  /**\n   * Path to the target file relative to the project dir\n   */\n  targetFilePath: string;\n\n  /**\n   * Sub directory to write bundled index.js file to (if any)\n   * Outputs to dist/{projectRoot}/bundle/{bundleOutputDir}/index.js\n   */\n  bundleOutputDir?: string;\n\n  /**\n   * Modules to omit from the bundle and treat as external\n   */\n  external?: (string | RegExp)[];\n\n  /**\n   * Target platform for the bundle\n   * @default 'node'\n   */\n  platform?: 'node' | 'browser' | 'neutral';\n}\n\n/**\n * Add a TypeScript bundle target using rolldown\n */\nexport const addTypeScriptBundleTarget = async <\n  const D extends DependencyDeclaration,\n>(\n  tree: Tree,\n  project: ProjectConfiguration,\n  opts: AddTypeScriptBundleTargetOptions,\n  declaration: D & MustDeclare<typeof BUNDLE_DEPENDENCIES, D>,\n) => {\n  project.targets ??= {};\n\n  // Generate empty rolldown config if it doesn't exist\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'ts'),\n    project.root,\n    {},\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Add the bundle target\n  if (!project.targets.bundle) {\n    project.targets.bundle = normalizeTargetKeyOrder({\n      cache: true,\n      outputs: [`{workspaceRoot}/dist/{projectRoot}/bundle`],\n      executor: 'nx:run-commands',\n      options: {\n        command: 'rolldown -c rolldown.config.ts',\n        cwd: '{projectRoot}',\n      },\n      dependsOn: ['compile'],\n    });\n  }\n\n  // Add bundle to the build target\n  addDependencyToTargetIfNotPresent(project, 'build', 'bundle');\n\n  const rolldownConfigPath = joinPathFragments(\n    project.root,\n    'rolldown.config.ts',\n  );\n\n  const outputFile = joinPathFragments(\n    getRelativePathToRoot(tree, project.name),\n    'dist',\n    project.root,\n    'bundle',\n    opts.bundleOutputDir ?? '.',\n    'index.js',\n  );\n\n  const external = opts.external?.length\n    ? opts.external\n        .map((ext) =>\n          typeof ext === 'string' ? `'${ext}'` : `/${ext.source}/`,\n        )\n        .join(', ')\n    : '';\n\n  const entry = `{\n    tsconfig: 'tsconfig.lib.json',\n    input: '${opts.targetFilePath}',\n    output: { file: '${outputFile}', format: 'cjs', codeSplitting: false },\n    platform: '${opts.platform ?? 'node'}',\n    ${external ? `external: [${external}],` : ''}\n  }`;\n\n  // Use GritQL to append the config entry to the defineConfig array.\n  // First try the non-empty array case using the accumulate (+=) operator,\n  // with an idempotency guard that checks the input path is not already present.\n  const appended = await applyGritQL(\n    tree,\n    rolldownConfigPath,\n    `\\`defineConfig([$items])\\` where { $items <: not contains \\`'${opts.targetFilePath}'\\`, $items += \", ${entry}\" }`,\n  );\n\n  if (!appended) {\n    // Empty array — GritQL's += cannot accumulate into an empty list, so we\n    // first insert a placeholder to make the array non-empty, then replace\n    // the placeholder with the real entry via += (which handles regex\n    // literals that are invalid inside GritQL backtick snippets).\n    const inserted = await applyGritQL(\n      tree,\n      rolldownConfigPath,\n      `\\`defineConfig([])\\` => \\`defineConfig([__PLACEHOLDER__])\\``,\n    );\n    if (inserted) {\n      await applyGritQL(\n        tree,\n        rolldownConfigPath,\n        `\\`defineConfig([$items])\\` where { $items <: \\`__PLACEHOLDER__\\` => ., $items += \"${entry}\" }`,\n      );\n    }\n  }\n\n  addDependenciesToPackageJson(\n    tree,\n    {},\n    withVersions(forDependencies<typeof BUNDLE_DEPENDENCIES>(declaration), [\n      'rolldown',\n    ]),\n  );\n};\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","applyGritQL","forDependencies","addDependenciesToPackageJson","addDependencyToTargetIfNotPresent","normalizeTargetKeyOrder","getRelativePathToRoot","LAMBDA_RUNTIME_VERSIONS","withVersions","BUNDLE_DEPENDENCIES","name","createPythonBundleTarget","packageName","pythonPlatform","bundleTargetName","cache","inputs","executor","outputs","options","commands","python","parallel","addPythonBundleTarget","project","opts","targets","dependsOn","bundleOutputDir","root","addTypeScriptBundleTarget","tree","declaration","dirname","overwriteStrategy","KeepExisting","bundle","command","cwd","rolldownConfigPath","outputFile","external","length","map","ext","source","join","entry","targetFilePath","platform","appended","inserted"],"mappings":"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"}

package/src/utils/dcr-proxy-constructs/dcr-proxy-constructs.js

@@ -6,7 +6,7 @@ import { addStarExport } from "../ast.js";
 import { esmVars } from "../module-format.js";
 import { addDependencyToTargetIfNotPresent } from "../nx.js";
 import { PACKAGES_DIR, SHARED_CONSTRUCTS_DIR, SHARED_TERRAFORM_DIR } from "../shared-constructs-constants.js";
-import { terraformProviderVersions } from "../versions.js";
+import { cdkLambdaRuntimeVars, terraformLambdaRuntimeVars, terraformProviderVersions } from "../versions.js";
 /**
  * The DCR proxy Lambda handlers. Each is bundled independently and wired to a
  * dedicated route on the HTTP API.
@@ -61,7 +61,8 @@ import { terraformProviderVersions } from "../versions.js";
         nameClassName: options.dcrProxyNameClassName,
         nameKebabCase: options.dcrProxyNameKebabCase,
         bundlePathsFromRoot: options.bundlePathsFromRoot,
-        ...esmVars(tree)
+        ...esmVars(tree),
+        ...cdkLambdaRuntimeVars()
     }, {
         overwriteStrategy: OverwriteStrategy.KeepExisting
     });
@@ -84,7 +85,8 @@ import { terraformProviderVersions } from "../versions.js";
         nameClassName: options.dcrProxyNameClassName,
         nameKebabCase: options.dcrProxyNameKebabCase,
         bundlePathsFromRoot: options.bundlePathsFromRoot,
-        ...terraformProviderVersions()
+        ...terraformProviderVersions(),
+        ...terraformLambdaRuntimeVars()
     }, {
         overwriteStrategy: OverwriteStrategy.KeepExisting
     });

package/src/utils/dcr-proxy-constructs/dcr-proxy-constructs.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/utils/dcr-proxy-constructs/dcr-proxy-constructs.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type ProjectConfiguration,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport { addStarExport } from '../ast.js';\nimport type { Iac } from '../iac.js';\nimport { esmVars } from '../module-format.js';\nimport { addDependencyToTargetIfNotPresent } from '../nx.js';\nimport {\n  PACKAGES_DIR,\n  SHARED_CONSTRUCTS_DIR,\n  SHARED_TERRAFORM_DIR,\n} from '../shared-constructs-constants.js';\nimport { terraformProviderVersions } from '../versions.js';\n\n/**\n * The DCR proxy Lambda handlers. Each is bundled independently and wired to a\n * dedicated route on the HTTP API.\n */\nexport const DCR_PROXY_HANDLERS = [\n  'authorization-server-metadata',\n  'authorize',\n  'mcp-proxy',\n  'protected-resource-metadata',\n  'register',\n  'token',\n] as const;\n\nexport type DcrProxyHandler = (typeof DCR_PROXY_HANDLERS)[number];\n\nexport interface AddDcrProxyInfraProps {\n  dcrProxyNameClassName: string;\n  dcrProxyNameKebabCase: string;\n\n  /**\n   * Fully qualified name of the TypeScript project that owns the bundled\n   * handlers, used to wire the shared package build to depend on it.\n   */\n  proxyProjectName: string;\n\n  /**\n   * Map of handler name to the workspace-root-relative path of its bundle\n   * output directory (e.g. `dist/packages/dcr-proxy/bundle/token`).\n   */\n  bundlePathsFromRoot: Record<DcrProxyHandler, string>;\n\n  iac: Iac;\n}\n\n/**\n * Add a DCR proxy infrastructure (CDK construct or Terraform module) to the\n * relevant shared package.\n *\n * The infrastructure exposes props/variables for the caller to inject their\n * Cognito identifiers and the upstream MCP server URL from their own stack,\n * since these may or may not be generated by this plugin. The Lambda handlers\n * live in a standalone TypeScript project and are bundled by rolldown; both\n * IaC providers reference the same bundle output.\n */\nexport const addDcrProxyInfra = async (\n  tree: Tree,\n  options: AddDcrProxyInfraProps,\n) => {\n  if (options.iac === 'cdk') {\n    await addDcrProxyCdkConstructs(tree, options);\n  } else if (options.iac === 'terraform') {\n    addDcrProxyTerraformModules(tree, options);\n  } else {\n    throw new Error(`Unsupported iac ${options.iac}`);\n  }\n\n  // Ensure the handler bundles are built before the shared package\n  updateJson(\n    tree,\n    joinPathFragments(\n      PACKAGES_DIR,\n      options.iac === 'cdk' ? SHARED_CONSTRUCTS_DIR : SHARED_TERRAFORM_DIR,\n      'project.json',\n    ),\n    (config: ProjectConfiguration) => {\n      addDependencyToTargetIfNotPresent(\n        config,\n        'build',\n        `${options.proxyProjectName}:build`,\n      );\n      return config;\n    },\n  );\n};\n\n/**\n * Add the DCR proxy CDK construct to the shared constructs package.\n */\nconst addDcrProxyCdkConstructs = async (\n  tree: Tree,\n  options: AddDcrProxyInfraProps,\n) => {\n  // Ensure the core HTTP API construct + utils are available (the proxy reuses\n  // them). These are shared with the api generators and safe to (re)generate\n  // with KeepExisting.\n  for (const coreApiFile of ['http', 'utils']) {\n    generateFiles(\n      tree,\n      joinPathFragments(\n        import.meta.dirname,\n        '..',\n        'api-constructs',\n        'files',\n        'cdk',\n        'core',\n        'api',\n        coreApiFile,\n      ),\n      joinPathFragments(\n        PACKAGES_DIR,\n        SHARED_CONSTRUCTS_DIR,\n        'src',\n        'core',\n        'api',\n      ),\n      { ...esmVars(tree) },\n      {\n        overwriteStrategy: OverwriteStrategy.KeepExisting,\n      },\n    );\n  }\n\n  generateFiles(\n    tree,\n    joinPathFragments(\n      import.meta.dirname,\n      'files',\n      'cdk',\n      'app',\n      'dcr-proxies',\n    ),\n    joinPathFragments(\n      PACKAGES_DIR,\n      SHARED_CONSTRUCTS_DIR,\n      'src',\n      'app',\n      'dcr-proxies',\n    ),\n    {\n      nameClassName: options.dcrProxyNameClassName,\n      nameKebabCase: options.dcrProxyNameKebabCase,\n      bundlePathsFromRoot: options.bundlePathsFromRoot,\n      ...esmVars(tree),\n    },\n    {\n      overwriteStrategy: OverwriteStrategy.KeepExisting,\n    },\n  );\n\n  // Export the construct\n  await addStarExport(\n    tree,\n    joinPathFragments(\n      PACKAGES_DIR,\n      SHARED_CONSTRUCTS_DIR,\n      'src',\n      'app',\n      'dcr-proxies',\n      'index.ts',\n    ),\n    `./${options.dcrProxyNameKebabCase}/${options.dcrProxyNameKebabCase}.js`,\n  );\n  await addStarExport(\n    tree,\n    joinPathFragments(\n      PACKAGES_DIR,\n      SHARED_CONSTRUCTS_DIR,\n      'src',\n      'app',\n      'index.ts',\n    ),\n    './dcr-proxies/index.js',\n  );\n};\n\n/**\n * Add the DCR proxy Terraform module to the shared terraform package.\n */\nconst addDcrProxyTerraformModules = (\n  tree: Tree,\n  options: AddDcrProxyInfraProps,\n) => {\n  // Ensure the core HTTP API module is available (the proxy reuses it). This is\n  // shared with the api generators and safe to (re)generate with KeepExisting.\n  generateFiles(\n    tree,\n    joinPathFragments(\n      import.meta.dirname,\n      '..',\n      'api-constructs',\n      'files',\n      'terraform',\n      'core',\n      'api',\n      'http',\n    ),\n    joinPathFragments(PACKAGES_DIR, SHARED_TERRAFORM_DIR, 'src', 'core', 'api'),\n    { ...terraformProviderVersions() },\n    {\n      overwriteStrategy: OverwriteStrategy.KeepExisting,\n    },\n  );\n\n  // Generate the app specific terraform module\n  generateFiles(\n    tree,\n    joinPathFragments(\n      import.meta.dirname,\n      'files',\n      'terraform',\n      'app',\n      'dcr-proxies',\n    ),\n    joinPathFragments(\n      PACKAGES_DIR,\n      SHARED_TERRAFORM_DIR,\n      'src',\n      'app',\n      'dcr-proxies',\n    ),\n    {\n      nameClassName: options.dcrProxyNameClassName,\n      nameKebabCase: options.dcrProxyNameKebabCase,\n      bundlePathsFromRoot: options.bundlePathsFromRoot,\n      ...terraformProviderVersions(),\n    },\n    {\n      overwriteStrategy: OverwriteStrategy.KeepExisting,\n    },\n  );\n};\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","updateJson","addStarExport","esmVars","addDependencyToTargetIfNotPresent","PACKAGES_DIR","SHARED_CONSTRUCTS_DIR","SHARED_TERRAFORM_DIR","terraformProviderVersions","DCR_PROXY_HANDLERS","addDcrProxyInfra","tree","options","iac","addDcrProxyCdkConstructs","addDcrProxyTerraformModules","Error","config","proxyProjectName","coreApiFile","dirname","overwriteStrategy","KeepExisting","nameClassName","dcrProxyNameClassName","nameKebabCase","dcrProxyNameKebabCase","bundlePathsFromRoot"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/utils/dcr-proxy-constructs/dcr-proxy-constructs.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type ProjectConfiguration,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport { addStarExport } from '../ast.js';\nimport type { Iac } from '../iac.js';\nimport { esmVars } from '../module-format.js';\nimport { addDependencyToTargetIfNotPresent } from '../nx.js';\nimport {\n  PACKAGES_DIR,\n  SHARED_CONSTRUCTS_DIR,\n  SHARED_TERRAFORM_DIR,\n} from '../shared-constructs-constants.js';\nimport {\n  cdkLambdaRuntimeVars,\n  terraformLambdaRuntimeVars,\n  terraformProviderVersions,\n} from '../versions.js';\n\n/**\n * The DCR proxy Lambda handlers. Each is bundled independently and wired to a\n * dedicated route on the HTTP API.\n */\nexport const DCR_PROXY_HANDLERS = [\n  'authorization-server-metadata',\n  'authorize',\n  'mcp-proxy',\n  'protected-resource-metadata',\n  'register',\n  'token',\n] as const;\n\nexport type DcrProxyHandler = (typeof DCR_PROXY_HANDLERS)[number];\n\nexport interface AddDcrProxyInfraProps {\n  dcrProxyNameClassName: string;\n  dcrProxyNameKebabCase: string;\n\n  /**\n   * Fully qualified name of the TypeScript project that owns the bundled\n   * handlers, used to wire the shared package build to depend on it.\n   */\n  proxyProjectName: string;\n\n  /**\n   * Map of handler name to the workspace-root-relative path of its bundle\n   * output directory (e.g. `dist/packages/dcr-proxy/bundle/token`).\n   */\n  bundlePathsFromRoot: Record<DcrProxyHandler, string>;\n\n  iac: Iac;\n}\n\n/**\n * Add a DCR proxy infrastructure (CDK construct or Terraform module) to the\n * relevant shared package.\n *\n * The infrastructure exposes props/variables for the caller to inject their\n * Cognito identifiers and the upstream MCP server URL from their own stack,\n * since these may or may not be generated by this plugin. The Lambda handlers\n * live in a standalone TypeScript project and are bundled by rolldown; both\n * IaC providers reference the same bundle output.\n */\nexport const addDcrProxyInfra = async (\n  tree: Tree,\n  options: AddDcrProxyInfraProps,\n) => {\n  if (options.iac === 'cdk') {\n    await addDcrProxyCdkConstructs(tree, options);\n  } else if (options.iac === 'terraform') {\n    addDcrProxyTerraformModules(tree, options);\n  } else {\n    throw new Error(`Unsupported iac ${options.iac}`);\n  }\n\n  // Ensure the handler bundles are built before the shared package\n  updateJson(\n    tree,\n    joinPathFragments(\n      PACKAGES_DIR,\n      options.iac === 'cdk' ? SHARED_CONSTRUCTS_DIR : SHARED_TERRAFORM_DIR,\n      'project.json',\n    ),\n    (config: ProjectConfiguration) => {\n      addDependencyToTargetIfNotPresent(\n        config,\n        'build',\n        `${options.proxyProjectName}:build`,\n      );\n      return config;\n    },\n  );\n};\n\n/**\n * Add the DCR proxy CDK construct to the shared constructs package.\n */\nconst addDcrProxyCdkConstructs = async (\n  tree: Tree,\n  options: AddDcrProxyInfraProps,\n) => {\n  // Ensure the core HTTP API construct + utils are available (the proxy reuses\n  // them). These are shared with the api generators and safe to (re)generate\n  // with KeepExisting.\n  for (const coreApiFile of ['http', 'utils']) {\n    generateFiles(\n      tree,\n      joinPathFragments(\n        import.meta.dirname,\n        '..',\n        'api-constructs',\n        'files',\n        'cdk',\n        'core',\n        'api',\n        coreApiFile,\n      ),\n      joinPathFragments(\n        PACKAGES_DIR,\n        SHARED_CONSTRUCTS_DIR,\n        'src',\n        'core',\n        'api',\n      ),\n      { ...esmVars(tree) },\n      {\n        overwriteStrategy: OverwriteStrategy.KeepExisting,\n      },\n    );\n  }\n\n  generateFiles(\n    tree,\n    joinPathFragments(\n      import.meta.dirname,\n      'files',\n      'cdk',\n      'app',\n      'dcr-proxies',\n    ),\n    joinPathFragments(\n      PACKAGES_DIR,\n      SHARED_CONSTRUCTS_DIR,\n      'src',\n      'app',\n      'dcr-proxies',\n    ),\n    {\n      nameClassName: options.dcrProxyNameClassName,\n      nameKebabCase: options.dcrProxyNameKebabCase,\n      bundlePathsFromRoot: options.bundlePathsFromRoot,\n      ...esmVars(tree),\n      ...cdkLambdaRuntimeVars(),\n    },\n    {\n      overwriteStrategy: OverwriteStrategy.KeepExisting,\n    },\n  );\n\n  // Export the construct\n  await addStarExport(\n    tree,\n    joinPathFragments(\n      PACKAGES_DIR,\n      SHARED_CONSTRUCTS_DIR,\n      'src',\n      'app',\n      'dcr-proxies',\n      'index.ts',\n    ),\n    `./${options.dcrProxyNameKebabCase}/${options.dcrProxyNameKebabCase}.js`,\n  );\n  await addStarExport(\n    tree,\n    joinPathFragments(\n      PACKAGES_DIR,\n      SHARED_CONSTRUCTS_DIR,\n      'src',\n      'app',\n      'index.ts',\n    ),\n    './dcr-proxies/index.js',\n  );\n};\n\n/**\n * Add the DCR proxy Terraform module to the shared terraform package.\n */\nconst addDcrProxyTerraformModules = (\n  tree: Tree,\n  options: AddDcrProxyInfraProps,\n) => {\n  // Ensure the core HTTP API module is available (the proxy reuses it). This is\n  // shared with the api generators and safe to (re)generate with KeepExisting.\n  generateFiles(\n    tree,\n    joinPathFragments(\n      import.meta.dirname,\n      '..',\n      'api-constructs',\n      'files',\n      'terraform',\n      'core',\n      'api',\n      'http',\n    ),\n    joinPathFragments(PACKAGES_DIR, SHARED_TERRAFORM_DIR, 'src', 'core', 'api'),\n    { ...terraformProviderVersions() },\n    {\n      overwriteStrategy: OverwriteStrategy.KeepExisting,\n    },\n  );\n\n  // Generate the app specific terraform module\n  generateFiles(\n    tree,\n    joinPathFragments(\n      import.meta.dirname,\n      'files',\n      'terraform',\n      'app',\n      'dcr-proxies',\n    ),\n    joinPathFragments(\n      PACKAGES_DIR,\n      SHARED_TERRAFORM_DIR,\n      'src',\n      'app',\n      'dcr-proxies',\n    ),\n    {\n      nameClassName: options.dcrProxyNameClassName,\n      nameKebabCase: options.dcrProxyNameKebabCase,\n      bundlePathsFromRoot: options.bundlePathsFromRoot,\n      ...terraformProviderVersions(),\n      ...terraformLambdaRuntimeVars(),\n    },\n    {\n      overwriteStrategy: OverwriteStrategy.KeepExisting,\n    },\n  );\n};\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","updateJson","addStarExport","esmVars","addDependencyToTargetIfNotPresent","PACKAGES_DIR","SHARED_CONSTRUCTS_DIR","SHARED_TERRAFORM_DIR","cdkLambdaRuntimeVars","terraformLambdaRuntimeVars","terraformProviderVersions","DCR_PROXY_HANDLERS","addDcrProxyInfra","tree","options","iac","addDcrProxyCdkConstructs","addDcrProxyTerraformModules","Error","config","proxyProjectName","coreApiFile","dirname","overwriteStrategy","KeepExisting","nameClassName","dcrProxyNameClassName","nameKebabCase","dcrProxyNameKebabCase","bundlePathsFromRoot"],"mappings":"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"}

package/src/utils/dcr-proxy-constructs/files/cdk/app/dcr-proxies/__nameKebabCase__/__nameKebabCase__.ts.template

@@ -139,7 +139,7 @@ export class <%- nameClassName %> extends Construct {
       new lambda.Function(this, id_, {
         code: asset(bundlePathFromRoot),
         handler: 'index.handler',
-        runtime: lambda.Runtime.NODEJS_22_X,
+        runtime: lambda.<%- nodeRuntime %>,
         architecture: lambda.Architecture.ARM_64,
         timeout: Duration.seconds(10),
         memorySize: 256,

package/src/utils/dcr-proxy-constructs/files/terraform/app/dcr-proxies/__nameKebabCase__/__nameKebabCase__.tf.template

@@ -240,7 +240,7 @@ resource "aws_lambda_function" "standard" {
   function_name    = "<%- nameKebabCase %>-${each.key}-${random_string.suffix.result}"
   role             = each.key == "token" ? aws_iam_role.token.arn : aws_iam_role.proxy.arn
   handler          = "index.handler"
-  runtime          = "nodejs22.x"
+  runtime          = "<%- nodeRuntime %>"
   architectures    = ["arm64"]
   source_code_hash = data.archive_file.handler_zip[each.key].output_base64sha256
   timeout          = 10
@@ -269,7 +269,7 @@ resource "aws_lambda_function" "mcp_proxy" {
   function_name    = "<%- nameKebabCase %>-mcp-proxy-${random_string.suffix.result}"
   role             = aws_iam_role.proxy.arn
   handler          = "index.handler"
-  runtime          = "nodejs22.x"
+  runtime          = "<%- nodeRuntime %>"
   architectures    = ["arm64"]
   source_code_hash = data.archive_file.handler_zip["mcp-proxy"].output_base64sha256
   timeout          = var.mcp_proxy_timeout

package/src/utils/files/common/scripts/src/infra/stage-credentials/cdk-command.ts.template

@@ -1,9 +1,10 @@
 /**
  * Builds the CDK command as an array of arguments for spawnSync.
  *
- * Defaults to --require-approval=never (standard for local dev deploys).
+ * Deploys default to --require-approval=never (standard for local dev deploys).
  * If the user explicitly passes --require-approval with any value, we
- * respect their choice and don't add the default.
+ * respect their choice and don't add the default. `cdk destroy` has no
+ * --require-approval option, so nothing is added for it.
  *
  * Pass --express to opt into CloudFormation express mode for faster
  * iteration; it is not enabled by default so deploys wait for full
@@ -16,6 +17,9 @@ export function buildCdkCommand(
   const hasRequireApproval = remainingArgs.some(
     (a) => a === '--require-approval' || a.startsWith('--require-approval='),
   );
-  const defaults = hasRequireApproval ? [] : ['--require-approval=never'];
+  const defaults =
+    action === 'destroy' || hasRequireApproval
+      ? []
+      : ['--require-approval=never'];
   return ['cdk', action, ...defaults, ...remainingArgs];
 }

package/src/utils/function-constructs/function-constructs.js

@@ -6,7 +6,7 @@ import { addStarExport } from "../ast.js";
 import { esmVars } from "../module-format.js";
 import { addDependencyToTargetIfNotPresent } from "../nx.js";
 import { PACKAGES_DIR, SHARED_CONSTRUCTS_DIR, SHARED_TERRAFORM_DIR } from "../shared-constructs-constants.js";
-import { terraformProviderVersions } from "../versions.js";
+import { cdkLambdaRuntime, terraformLambdaRuntime, terraformProviderVersions } from "../versions.js";
 /**
  * Add infrastructure for a lambda function
  */ export const addLambdaFunctionInfra = async (tree, options)=>{
@@ -26,7 +26,7 @@ const addLambdaFunctionCdkConstructs = async (tree, options)=>{
     // Generate app specific CDK construct
     generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'cdk', 'app', 'lambda-functions'), joinPathFragments(PACKAGES_DIR, SHARED_CONSTRUCTS_DIR, 'src', 'app', 'lambda-functions'), {
         ...options,
-        runtime: `Runtime.${options.runtime === 'python' ? 'PYTHON_3_14' : 'NODEJS_LATEST'}`,
+        runtime: cdkLambdaRuntime(options.runtime),
         ...esmVars(tree)
     }, {
         overwriteStrategy: OverwriteStrategy.KeepExisting
@@ -39,7 +39,7 @@ const addLambdaFunctionTerraformModules = (tree, options)=>{
     // Generate app specific terraform module
     generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'terraform', 'app', 'lambda-functions'), joinPathFragments(PACKAGES_DIR, SHARED_TERRAFORM_DIR, 'src', 'app', 'lambda-functions'), {
         ...options,
-        runtime: options.runtime === 'python' ? 'python3.14' : 'nodejs22.x',
+        runtime: terraformLambdaRuntime(options.runtime),
         ...terraformProviderVersions()
     }, {
         overwriteStrategy: OverwriteStrategy.KeepExisting

package/src/utils/function-constructs/function-constructs.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/utils/function-constructs/function-constructs.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type ProjectConfiguration,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport { addStarExport } from '../ast.js';\nimport type { Iac } from '../iac.js';\nimport { esmVars } from '../module-format.js';\nimport { addDependencyToTargetIfNotPresent } from '../nx.js';\nimport {\n  PACKAGES_DIR,\n  SHARED_CONSTRUCTS_DIR,\n  SHARED_TERRAFORM_DIR,\n} from '../shared-constructs-constants.js';\nimport { terraformProviderVersions } from '../versions.js';\n\nexport interface AddLambdaFunctionConstructOptions {\n  functionProjectName: string;\n  nameClassName: string;\n  nameKebabCase: string;\n  bundlePathFromRoot: string;\n  handler: string;\n  runtime: 'node' | 'python';\n}\n\n/**\n * Add infrastructure for a lambda function\n */\nexport const addLambdaFunctionInfra = async (\n  tree: Tree,\n  options: AddLambdaFunctionConstructOptions & {\n    iac: Iac;\n  },\n) => {\n  if (options.iac === 'cdk') {\n    await addLambdaFunctionCdkConstructs(tree, options);\n  } else if (options.iac === 'terraform') {\n    addLambdaFunctionTerraformModules(tree, options);\n  } else {\n    throw new Error(`Unsupported iac ${options.iac}`);\n  }\n\n  updateJson(\n    tree,\n    joinPathFragments(\n      PACKAGES_DIR,\n      options.iac === 'cdk' ? SHARED_CONSTRUCTS_DIR : SHARED_TERRAFORM_DIR,\n      'project.json',\n    ),\n    (config: ProjectConfiguration) => {\n      addDependencyToTargetIfNotPresent(\n        config,\n        'build',\n        `${options.functionProjectName}:build`,\n      );\n      return config;\n    },\n  );\n};\n\nconst addLambdaFunctionCdkConstructs = async (\n  tree: Tree,\n  options: AddLambdaFunctionConstructOptions,\n) => {\n  // Generate app specific CDK construct\n  generateFiles(\n    tree,\n    joinPathFragments(\n      import.meta.dirname,\n      'files',\n      'cdk',\n      'app',\n      'lambda-functions',\n    ),\n    joinPathFragments(\n      PACKAGES_DIR,\n      SHARED_CONSTRUCTS_DIR,\n      'src',\n      'app',\n      'lambda-functions',\n    ),\n    {\n      ...options,\n      runtime: `Runtime.${options.runtime === 'python' ? 'PYTHON_3_14' : 'NODEJS_LATEST'}`,\n      ...esmVars(tree),\n    },\n    {\n      overwriteStrategy: OverwriteStrategy.KeepExisting,\n    },\n  );\n\n  // Export app specific CDK construct\n  await addStarExport(\n    tree,\n    joinPathFragments(\n      PACKAGES_DIR,\n      SHARED_CONSTRUCTS_DIR,\n      'src',\n      'app',\n      'lambda-functions',\n      'index.ts',\n    ),\n    `./${options.nameKebabCase}.js`,\n  );\n  await addStarExport(\n    tree,\n    joinPathFragments(\n      PACKAGES_DIR,\n      SHARED_CONSTRUCTS_DIR,\n      'src',\n      'app',\n      'index.ts',\n    ),\n    './lambda-functions/index.js',\n  );\n};\n\nconst addLambdaFunctionTerraformModules = (\n  tree: Tree,\n  options: AddLambdaFunctionConstructOptions,\n) => {\n  // Generate app specific terraform module\n  generateFiles(\n    tree,\n    joinPathFragments(\n      import.meta.dirname,\n      'files',\n      'terraform',\n      'app',\n      'lambda-functions',\n    ),\n    joinPathFragments(\n      PACKAGES_DIR,\n      SHARED_TERRAFORM_DIR,\n      'src',\n      'app',\n      'lambda-functions',\n    ),\n    {\n      ...options,\n      runtime: options.runtime === 'python' ? 'python3.14' : 'nodejs22.x',\n      ...terraformProviderVersions(),\n    },\n    {\n      overwriteStrategy: OverwriteStrategy.KeepExisting,\n    },\n  );\n};\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","updateJson","addStarExport","esmVars","addDependencyToTargetIfNotPresent","PACKAGES_DIR","SHARED_CONSTRUCTS_DIR","SHARED_TERRAFORM_DIR","terraformProviderVersions","addLambdaFunctionInfra","tree","options","iac","addLambdaFunctionCdkConstructs","addLambdaFunctionTerraformModules","Error","config","functionProjectName","dirname","runtime","overwriteStrategy","KeepExisting","nameKebabCase"],"mappings":"AAAA;;;CAGC,GACD,SACEA,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,EAGjBC,UAAU,QACL,aAAa;AACpB,SAASC,aAAa,QAAQ,YAAY;AAE1C,SAASC,OAAO,QAAQ,sBAAsB;AAC9C,SAASC,iCAAiC,QAAQ,WAAW;AAC7D,SACEC,YAAY,EACZC,qBAAqB,EACrBC,oBAAoB,QACf,oCAAoC;AAC3C,SAASC,yBAAyB,QAAQ,iBAAiB;AAW3D;;CAEC,GACD,OAAO,MAAMC,yBAAyB,OACpCC,MACAC;IAIA,IAAIA,QAAQC,GAAG,KAAK,OAAO;QACzB,MAAMC,+BAA+BH,MAAMC;IAC7C,OAAO,IAAIA,QAAQC,GAAG,KAAK,aAAa;QACtCE,kCAAkCJ,MAAMC;IAC1C,OAAO;QACL,MAAM,IAAII,MAAM,CAAC,gBAAgB,EAAEJ,QAAQC,GAAG,EAAE;IAClD;IAEAX,WACES,MACAX,kBACEM,cACAM,QAAQC,GAAG,KAAK,QAAQN,wBAAwBC,sBAChD,iBAEF,CAACS;QACCZ,kCACEY,QACA,SACA,GAAGL,QAAQM,mBAAmB,CAAC,MAAM,CAAC;QAExC,OAAOD;IACT;AAEJ,EAAE;AAEF,MAAMH,iCAAiC,OACrCH,MACAC;IAEA,sCAAsC;IACtCb,cACEY,MACAX,kBACE,YAAYmB,OAAO,EACnB,SACA,OACA,OACA,qBAEFnB,kBACEM,cACAC,uBACA,OACA,OACA,qBAEF;QACE,GAAGK,OAAO;QACVQ,SAAS,CAAC,QAAQ,EAAER,QAAQQ,OAAO,KAAK,WAAW,gBAAgB,iBAAiB;QACpF,GAAGhB,QAAQO,KAAK;IAClB,GACA;QACEU,mBAAmBpB,kBAAkBqB,YAAY;IACnD;IAGF,oCAAoC;IACpC,MAAMnB,cACJQ,MACAX,kBACEM,cACAC,uBACA,OACA,OACA,oBACA,aAEF,CAAC,EAAE,EAAEK,QAAQW,aAAa,CAAC,GAAG,CAAC;IAEjC,MAAMpB,cACJQ,MACAX,kBACEM,cACAC,uBACA,OACA,OACA,aAEF;AAEJ;AAEA,MAAMQ,oCAAoC,CACxCJ,MACAC;IAEA,yCAAyC;IACzCb,cACEY,MACAX,kBACE,YAAYmB,OAAO,EACnB,SACA,aACA,OACA,qBAEFnB,kBACEM,cACAE,sBACA,OACA,OACA,qBAEF;QACE,GAAGI,OAAO;QACVQ,SAASR,QAAQQ,OAAO,KAAK,WAAW,eAAe;QACvD,GAAGX,2BAA2B;IAChC,GACA;QACEY,mBAAmBpB,kBAAkBqB,YAAY;IACnD;AAEJ"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/utils/function-constructs/function-constructs.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type ProjectConfiguration,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport { addStarExport } from '../ast.js';\nimport type { Iac } from '../iac.js';\nimport { esmVars } from '../module-format.js';\nimport { addDependencyToTargetIfNotPresent } from '../nx.js';\nimport {\n  PACKAGES_DIR,\n  SHARED_CONSTRUCTS_DIR,\n  SHARED_TERRAFORM_DIR,\n} from '../shared-constructs-constants.js';\nimport {\n  cdkLambdaRuntime,\n  terraformLambdaRuntime,\n  terraformProviderVersions,\n} from '../versions.js';\n\nexport interface AddLambdaFunctionConstructOptions {\n  functionProjectName: string;\n  nameClassName: string;\n  nameKebabCase: string;\n  bundlePathFromRoot: string;\n  handler: string;\n  runtime: 'node' | 'python';\n}\n\n/**\n * Add infrastructure for a lambda function\n */\nexport const addLambdaFunctionInfra = async (\n  tree: Tree,\n  options: AddLambdaFunctionConstructOptions & {\n    iac: Iac;\n  },\n) => {\n  if (options.iac === 'cdk') {\n    await addLambdaFunctionCdkConstructs(tree, options);\n  } else if (options.iac === 'terraform') {\n    addLambdaFunctionTerraformModules(tree, options);\n  } else {\n    throw new Error(`Unsupported iac ${options.iac}`);\n  }\n\n  updateJson(\n    tree,\n    joinPathFragments(\n      PACKAGES_DIR,\n      options.iac === 'cdk' ? SHARED_CONSTRUCTS_DIR : SHARED_TERRAFORM_DIR,\n      'project.json',\n    ),\n    (config: ProjectConfiguration) => {\n      addDependencyToTargetIfNotPresent(\n        config,\n        'build',\n        `${options.functionProjectName}:build`,\n      );\n      return config;\n    },\n  );\n};\n\nconst addLambdaFunctionCdkConstructs = async (\n  tree: Tree,\n  options: AddLambdaFunctionConstructOptions,\n) => {\n  // Generate app specific CDK construct\n  generateFiles(\n    tree,\n    joinPathFragments(\n      import.meta.dirname,\n      'files',\n      'cdk',\n      'app',\n      'lambda-functions',\n    ),\n    joinPathFragments(\n      PACKAGES_DIR,\n      SHARED_CONSTRUCTS_DIR,\n      'src',\n      'app',\n      'lambda-functions',\n    ),\n    {\n      ...options,\n      runtime: cdkLambdaRuntime(options.runtime),\n      ...esmVars(tree),\n    },\n    {\n      overwriteStrategy: OverwriteStrategy.KeepExisting,\n    },\n  );\n\n  // Export app specific CDK construct\n  await addStarExport(\n    tree,\n    joinPathFragments(\n      PACKAGES_DIR,\n      SHARED_CONSTRUCTS_DIR,\n      'src',\n      'app',\n      'lambda-functions',\n      'index.ts',\n    ),\n    `./${options.nameKebabCase}.js`,\n  );\n  await addStarExport(\n    tree,\n    joinPathFragments(\n      PACKAGES_DIR,\n      SHARED_CONSTRUCTS_DIR,\n      'src',\n      'app',\n      'index.ts',\n    ),\n    './lambda-functions/index.js',\n  );\n};\n\nconst addLambdaFunctionTerraformModules = (\n  tree: Tree,\n  options: AddLambdaFunctionConstructOptions,\n) => {\n  // Generate app specific terraform module\n  generateFiles(\n    tree,\n    joinPathFragments(\n      import.meta.dirname,\n      'files',\n      'terraform',\n      'app',\n      'lambda-functions',\n    ),\n    joinPathFragments(\n      PACKAGES_DIR,\n      SHARED_TERRAFORM_DIR,\n      'src',\n      'app',\n      'lambda-functions',\n    ),\n    {\n      ...options,\n      runtime: terraformLambdaRuntime(options.runtime),\n      ...terraformProviderVersions(),\n    },\n    {\n      overwriteStrategy: OverwriteStrategy.KeepExisting,\n    },\n  );\n};\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","updateJson","addStarExport","esmVars","addDependencyToTargetIfNotPresent","PACKAGES_DIR","SHARED_CONSTRUCTS_DIR","SHARED_TERRAFORM_DIR","cdkLambdaRuntime","terraformLambdaRuntime","terraformProviderVersions","addLambdaFunctionInfra","tree","options","iac","addLambdaFunctionCdkConstructs","addLambdaFunctionTerraformModules","Error","config","functionProjectName","dirname","runtime","overwriteStrategy","KeepExisting","nameKebabCase"],"mappings":"AAAA;;;CAGC,GACD,SACEA,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,EAGjBC,UAAU,QACL,aAAa;AACpB,SAASC,aAAa,QAAQ,YAAY;AAE1C,SAASC,OAAO,QAAQ,sBAAsB;AAC9C,SAASC,iCAAiC,QAAQ,WAAW;AAC7D,SACEC,YAAY,EACZC,qBAAqB,EACrBC,oBAAoB,QACf,oCAAoC;AAC3C,SACEC,gBAAgB,EAChBC,sBAAsB,EACtBC,yBAAyB,QACpB,iBAAiB;AAWxB;;CAEC,GACD,OAAO,MAAMC,yBAAyB,OACpCC,MACAC;IAIA,IAAIA,QAAQC,GAAG,KAAK,OAAO;QACzB,MAAMC,+BAA+BH,MAAMC;IAC7C,OAAO,IAAIA,QAAQC,GAAG,KAAK,aAAa;QACtCE,kCAAkCJ,MAAMC;IAC1C,OAAO;QACL,MAAM,IAAII,MAAM,CAAC,gBAAgB,EAAEJ,QAAQC,GAAG,EAAE;IAClD;IAEAb,WACEW,MACAb,kBACEM,cACAQ,QAAQC,GAAG,KAAK,QAAQR,wBAAwBC,sBAChD,iBAEF,CAACW;QACCd,kCACEc,QACA,SACA,GAAGL,QAAQM,mBAAmB,CAAC,MAAM,CAAC;QAExC,OAAOD;IACT;AAEJ,EAAE;AAEF,MAAMH,iCAAiC,OACrCH,MACAC;IAEA,sCAAsC;IACtCf,cACEc,MACAb,kBACE,YAAYqB,OAAO,EACnB,SACA,OACA,OACA,qBAEFrB,kBACEM,cACAC,uBACA,OACA,OACA,qBAEF;QACE,GAAGO,OAAO;QACVQ,SAASb,iBAAiBK,QAAQQ,OAAO;QACzC,GAAGlB,QAAQS,KAAK;IAClB,GACA;QACEU,mBAAmBtB,kBAAkBuB,YAAY;IACnD;IAGF,oCAAoC;IACpC,MAAMrB,cACJU,MACAb,kBACEM,cACAC,uBACA,OACA,OACA,oBACA,aAEF,CAAC,EAAE,EAAEO,QAAQW,aAAa,CAAC,GAAG,CAAC;IAEjC,MAAMtB,cACJU,MACAb,kBACEM,cACAC,uBACA,OACA,OACA,aAEF;AAEJ;AAEA,MAAMU,oCAAoC,CACxCJ,MACAC;IAEA,yCAAyC;IACzCf,cACEc,MACAb,kBACE,YAAYqB,OAAO,EACnB,SACA,aACA,OACA,qBAEFrB,kBACEM,cACAE,sBACA,OACA,OACA,qBAEF;QACE,GAAGM,OAAO;QACVQ,SAASZ,uBAAuBI,QAAQQ,OAAO;QAC/C,GAAGX,2BAA2B;IAChC,GACA;QACEY,mBAAmBtB,kBAAkBuB,YAAY;IACnD;AAEJ"}

package/src/utils/lambda-runtime-resolution.d.ts

@@ -0,0 +1,74 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type ILambdaRuntime } from './versions.js';
+/**
+ * Resolution of the Lambda runtimes and the CPython patch the version update
+ * pins.
+ *
+ * Lives here rather than beside the script so it is covered by the plugin's test
+ * suite; the script supplies the runtime list and the uv output.
+ */
+/** Compare two dotted numeric versions (`24`, `3.14`) ascending. */
+export declare const compareRuntimeVersions: (a: string, b: string) => number;
+/**
+ * The version a managed runtime identifier names, or undefined for one that isn't
+ * a versioned `nodejs`/`python` runtime.
+ *
+ * `nodejs24.x` -> `24`, `python3.14` -> `3.14`. The bare `nodejs` and
+ * `nodejs4.3-edge` style identifiers carry no comparable version and are skipped.
+ */
+export declare const runtimeIdentifierVersion: (identifier: string) => {
+    language: ILambdaRuntime;
+    version: string;
+} | undefined;
+/** Why a language's runtime could not be resolved. */
+export type UnresolvedReason = 'no-runtimes-listed';
+export interface RuntimeResolution {
+    /** Runtime version per language, holding the current pin where unresolved. */
+    readonly versions: Record<string, string>;
+    /** Languages left on their current pin, and why. */
+    readonly unresolved: {
+        readonly language: string;
+        readonly kept: string;
+        readonly reason: UnresolvedReason;
+    }[];
+}
+/**
+ * The latest managed runtime for each language in {@link LAMBDA_RUNTIME_VERSIONS},
+ * from the runtime identifiers `aws-cdk-lib` publishes.
+ *
+ * `Runtime.ALL` is a curated list of the runtimes CDK supports, so a runtime still
+ * in public preview does not appear — which is what makes it a usable source for a
+ * generally-available runtime. Never moves a runtime backwards: a pin ahead of
+ * what CDK offers stays.
+ *
+ * A language the list says nothing about keeps its current pin and is reported
+ * through `unresolved`, so a failure costs this bump alone rather than the whole
+ * version update.
+ */
+export declare const resolveLambdaRuntimes: (identifiers: readonly string[]) => RuntimeResolution;
+/** The warning a language's unresolved runtime reports. */
+export declare const unresolvedRuntimeWarning: (entry: RuntimeResolution["unresolved"][number]) => string;
+/** A CPython build as `uv python list --output-format json` reports it. */
+export interface UvPythonEntry {
+    readonly version: string;
+    readonly version_parts: {
+        readonly major: number;
+        readonly minor: number;
+        readonly patch: number;
+    };
+    readonly implementation: string;
+    readonly variant?: string;
+}
+/**
+ * The latest CPython patch uv can install for a `major.minor`, or undefined when
+ * it lists none.
+ *
+ * Lambda names only `major.minor` and patches the interpreter itself, but uv pins
+ * an exact `major.minor.patch`, so the patch is resolved from what uv can actually
+ * install for the runtime's minor. Pre-releases and the free-threaded variant are
+ * excluded: a generated project needs the default build of a final release.
+ */
+export declare const resolveLatestPythonPatch: (entries: readonly UvPythonEntry[], minor?: string) => string | undefined;