@aws/nx-plugin 1.0.0-rc.5 → 1.0.0-rc.50

package/src/utils/format.js

@@ -1,140 +1,358 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatFilesInSubtree = formatFilesInSubtree;
-const tslib_1 = require("tslib");
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const path_1 = tslib_1.__importDefault(require("path"));
-const child_process_1 = require("child_process");
+ */ import { Biome } from "@biomejs/js-api/nodejs";
+import { getProjects } from "@nx/devkit";
+import path from "path";
+import { ruffFixAndFormat } from "./ruff.js";
+import { tryReadToml } from "./toml.js";
+import { TS_VERSIONS } from "./versions.js";
+/**
+ * The biome.json vended into a new workspace. The pnpm catalog resolver is only
+ * included on pnpm workspaces, since `experimentalPnpmCatalogs` is Biome's only
+ * catalog resolver and reads `pnpm-workspace.yaml` exclusively — it does nothing
+ * for yarn or bun catalogs, so vending it there would be misleading.
+ */ export const getDefaultBiomeConfig = (tree)=>({
+        $schema: `https://biomejs.dev/schemas/${TS_VERSIONS['@biomejs/biome']}/schema.json`,
+        root: true,
+        formatter: {
+            enabled: true,
+            indentStyle: 'space',
+            indentWidth: 2,
+            lineWidth: 80
+        },
+        javascript: {
+            formatter: {
+                quoteStyle: 'single',
+                trailingCommas: 'all'
+            },
+            // Resolve `catalog:` versions from pnpm-workspace.yaml (pnpm workspaces only).
+            ...tree.exists('pnpm-workspace.yaml') ? {
+                resolver: {
+                    experimentalPnpmCatalogs: true
+                }
+            } : {}
+        },
+        css: {
+            formatter: {
+                quoteStyle: 'single'
+            },
+            linter: {
+                enabled: false
+            }
+        },
+        linter: {
+            enabled: true,
+            rules: {
+                preset: 'none',
+                correctness: {
+                    // Every project must declare the third-party dependencies its source
+                    // code imports in its own package.json.
+                    noUndeclaredDependencies: 'error'
+                }
+            }
+        },
+        assist: {
+            actions: {
+                source: {
+                    organizeImports: 'on'
+                }
+            }
+        },
+        files: {
+            includes: [
+                '**',
+                '!**/dist',
+                '!**/out-tsc',
+                '!**/node_modules',
+                '!**/.nx',
+                '!**/.venv',
+                // GritQL codemod cache written by generators — its sample sources
+                // otherwise pollute a bare `biome check .` with parse errors.
+                '!**/.grit',
+                '!**/*.css',
+                '!**/*.gen.*',
+                '!**/generated/**',
+                '!**/tsconfig*.json'
+            ]
+        },
+        // Config files, build scripts and tests use root tooling rather than
+        // declaring it per-project, so the undeclared-dependency rule is off for them.
+        overrides: [
+            {
+                includes: [
+                    '**/*.config.{ts,mts,cts,js,mjs,cjs}',
+                    '**/*.{spec,test}.{ts,tsx,mts,cts,js,jsx,mjs,cjs}',
+                    '**/*.stories.{ts,tsx}'
+                ],
+                linter: {
+                    rules: {
+                        correctness: {
+                            noUndeclaredDependencies: 'off'
+                        }
+                    }
+                }
+            }
+        ]
+    });
+const BIOME_FORMATTABLE_EXTENSIONS = new Set([
+    '.ts',
+    '.tsx',
+    '.js',
+    '.jsx',
+    '.mjs',
+    '.cjs',
+    '.mts',
+    '.cts',
+    '.json',
+    '.jsonc',
+    '.css'
+]);
+/** Matches `tsconfig.json` and variants like `tsconfig.lib.json`. */ const isTsConfig = (filePath)=>/(^|\/)tsconfig[^/]*\.json$/.test(filePath);
 /**
  * Format files in the given directory within the tree.
- * Handles both TypeScript/JavaScript (via prettier) and Python (via ruff) files.
+ * Handles both TypeScript/JavaScript/JSON (via biome) and Python (via ruff) files.
  * See https://github.com/nrwl/nx/blob/4cd640a9187954505d12de5b6d76a90d8ce4c2eb/packages/devkit/src/generators/format-files.ts#L11
- */
-async function formatFilesInSubtree(tree, dir) {
-    const changedFiles = tree
-        .listChanges()
-        .filter((file) => file.type !== 'DELETE')
-        .filter((file) => (dir ? file.path.startsWith(dir) : true));
-    const pyFiles = changedFiles.filter((file) => file.path.endsWith('.py'));
-    const otherFiles = changedFiles.filter((file) => !file.path.endsWith('.py'));
+ */ export async function formatFilesInSubtree(tree, dir) {
+    const changedFiles = tree.listChanges().filter((file)=>file.type !== 'DELETE').filter((file)=>dir ? file.path.startsWith(dir) : true);
+    const pyFiles = changedFiles.filter((file)=>file.path.endsWith('.py'));
+    const otherFiles = changedFiles.filter((file)=>BIOME_FORMATTABLE_EXTENSIONS.has(path.extname(file.path)) && // tsconfigs are not biome-managed: they're excluded from the vended
+        // format target (Nx's typescript-sync rewrites them without formatting),
+        // so formatting them at generation would only diverge from the form
+        // written on later runs. Leave them as updateJson/writeJson emit them so
+        // repeated generation stays idempotent.
+        !isTsConfig(file.path));
+    // Resolve each project's ruff settings (module names, line-length) so files
+    // are formatted to match the on-disk build (see getPythonProjectRuffConfigs).
+    const pythonProjectConfigs = pyFiles.length ? getPythonProjectRuffConfigs(tree) : [];
     // Format Python files with ruff (lint fixes + formatting)
-    for (const file of pyFiles) {
+    for (const file of pyFiles){
         try {
-            const content = ruffFixAndFormat(file.content.toString('utf-8'), file.path);
+            const content = ruffFixAndFormat(file.content.toString('utf-8'), file.path, resolveRuffOptions(readRuffConfig(tree, file.path), getOwningProjectRuffConfig(file.path, pythonProjectConfigs)));
             tree.write(file.path, content);
+        } catch  {
+        // Silently skip ruff formatting failures
         }
-        catch {
-            // Silently skip ruff formatting failures
+    }
+    if (otherFiles.length === 0) return;
+    formatWithBiome(tree, otherFiles);
+}
+/**
+ * The Biome configuration to format with: the workspace's own `biome.json`, else
+ * the config we vend.
+ *
+ * Read through the tree, which falls back to disk for a file it doesn't hold. So
+ * this resolves the most current config either way — the workspace's on-disk one,
+ * or the version a generator has just written to the tree and not yet flushed,
+ * which shelling out to the CLI could never see.
+ */ function readBiomeConfig(tree) {
+    const config = tree.read('biome.json', 'utf-8');
+    if (config) {
+        try {
+            return JSON.parse(config);
+        } catch  {
+        // Malformed config — fall through to the config we vend
         }
     }
-    // Format other files with prettier
-    let prettier;
+    return getDefaultBiomeConfig(tree);
+}
+/**
+ * Format files with Biome in-process, reusing one instance across the batch.
+ *
+ * Replaces one `biome format --stdin-file-path` process per file, which
+ * dominated generation at ~70ms each: `formatFilesInSubtree` formats every
+ * change accumulated in the tree, not only the ones its caller made, so
+ * generators sharing a tree reformat the same files once per call. In-process is
+ * ~0.5ms per file. Output was verified byte-identical across the plugin's whole
+ * source tree, except that the CLI corrupts control characters passed through
+ * stdin (a NUL in a template literal) where formatting in-process preserves them.
+ */ function formatWithBiome(tree, files) {
     try {
-        prettier = await Promise.resolve().then(() => tslib_1.__importStar(require('prettier')));
-    }
-    catch {
-        // Skip formatting if prettier cannot be imported
-        return;
-    }
-    const changedPrettierInTree = getChangedPrettierConfigInTree(tree);
-    await Promise.all(otherFiles.map(async (file) => {
-        try {
-            const systemPath = path_1.default.join(tree.root, file.path);
-            const resolvedOptions = await prettier.resolveConfig(systemPath, {
-                editorconfig: true,
-            });
-            const options = {
-                trailingComma: 'all',
-                ...resolvedOptions,
-                ...changedPrettierInTree,
-                filepath: systemPath,
-            };
-            const support = await prettier.getFileInfo(systemPath, options);
-            if (support.ignored || !support.inferredParser) {
-                return;
+        const biome = new Biome();
+        const { projectKey } = biome.openProject();
+        biome.applyConfiguration(projectKey, readBiomeConfig(tree));
+        for (const file of files){
+            try {
+                const { content } = biome.formatContent(projectKey, file.content?.toString('utf-8') ?? '', {
+                    filePath: file.path
+                });
+                tree.write(file.path, content);
+            } catch  {
+            // Leave individual files that fail to format untouched
             }
-            tree.write(file.path, 
-            // In prettier v3 the format result is a promise
-            await prettier.format(file.content.toString('utf-8'), options));
-        }
-        catch (e) {
-            console.warn(`Could not format ${file.path}. Error: "${e.message}"`);
         }
-    }));
+    } catch  {
+    // Silently skip formatting failures
+    }
 }
 /**
- * Find the ruff command. Tries 'uv run ruff', then 'uvx ruff'.
- * Matches how @nxlv/python runs ruff via the UV provider.
- */
-let _ruffCommand;
-function getRuffCommand() {
-    if (_ruffCommand !== undefined) {
-        return _ruffCommand || undefined;
-    }
-    for (const cmd of ['uv run ruff', 'uvx ruff']) {
-        try {
-            (0, child_process_1.execSync)(`${cmd} --version`, {
-                encoding: 'utf-8',
-                stdio: ['pipe', 'pipe', 'pipe'],
-            });
-            _ruffCommand = cmd;
-            return cmd;
+ * Read the ruff config for a file, by walking from its directory up to the
+ * workspace root looking for `.ruff.toml`, `ruff.toml`, or a `pyproject.toml`
+ * with a `[tool.ruff]` section — the same files, in the same order, that ruff
+ * itself resolves. The walk stops at the workspace root so a stray config in a
+ * parent of the workspace (or the home directory) is never treated as the
+ * project's.
+ *
+ * The settings are read rather than merely detected because formatting runs
+ * in-process against tree content, so ruff never sees the file's location and
+ * cannot resolve the config itself (see {@link resolveRuffOptions}).
+ *
+ * Reads go through the tree, which falls through to disk for files this run has
+ * not touched, so a config the generator has just written in memory is picked up
+ * as well as one already on disk.
+ */ function readRuffConfig(tree, filePath) {
+    let dir = path.dirname(filePath);
+    while(true){
+        for (const name of [
+            '.ruff.toml',
+            'ruff.toml'
+        ]){
+            const config = tryReadToml(tree, path.join(dir, name));
+            if (config) {
+                return config;
+            }
         }
-        catch {
-            // Try next command
+        const ruff = tryReadToml(tree, path.join(dir, 'pyproject.toml'))?.tool?.ruff;
+        if (ruff) {
+            return ruff;
         }
+        // Stop once the workspace root ('.') has been checked.
+        if (dir === '.' || dir === '' || dir === path.dirname(dir)) {
+            return undefined;
+        }
+        dir = path.dirname(dir);
     }
-    _ruffCommand = '';
-    return undefined;
 }
 /**
- * Run ruff check --fix and ruff format on Python file content via stdin.
- * Applies all configured lint fixes (including import sorting) and formatting.
- */
-function ruffFixAndFormat(content, filePath) {
-    const ruff = getRuffCommand();
-    if (!ruff)
-        return content;
-    // First apply lint fixes (import sorting, unused imports, etc.)
-    try {
-        const result = (0, child_process_1.execSync)(`${ruff} check --fix --stdin-filename ${filePath} -`, { input: content, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
-        content = result;
+ * The `[tool.ruff.lint].select` generated Python projects vend. Generation
+ * formats before that config lands on disk, so it is pinned here to keep
+ * generated files clean under the project's own `lint` target rather than under
+ * whatever ruff's defaults happen to be for the pinned release.
+ */ const DEFAULT_RUFF_SELECT = [
+    'E',
+    'F',
+    'UP',
+    'B',
+    'SIM',
+    'I'
+];
+/**
+ * Derive ruff's `target-version` (eg `py314`) from a PEP 508
+ * `requires-python` specifier (eg `>=3.14`). Ruff targets the minimum
+ * supported version, so take the lowest `major.minor` mentioned.
+ */ export const requiresPythonToRuffTarget = (requiresPython)=>{
+    if (typeof requiresPython !== 'string') {
+        return undefined;
     }
-    catch (e) {
-        // ruff check exits non-zero when it finds unfixable issues,
-        // but stdout still contains the fixed content
-        if (e.stdout) {
-            content = e.stdout;
+    let min;
+    for (const match of requiresPython.matchAll(/(\d+)\.(\d+)/g)){
+        const major = Number(match[1]);
+        const minor = Number(match[2]);
+        if (!min || major < min.major || major === min.major && minor < min.minor) {
+            min = {
+                major,
+                minor
+            };
         }
     }
-    // Then apply formatting
-    try {
-        content = (0, child_process_1.execSync)(`${ruff} format --stdin-filename ${filePath} -`, {
-            input: content,
-            encoding: 'utf-8',
-            stdio: ['pipe', 'pipe', 'pipe'],
-        });
-    }
-    catch {
-        // Fall through with whatever content we have
+    return min ? `py${min.major}${min.minor}` : undefined;
+};
+/**
+ * Map each Nx project with a `pyproject.toml` to the ruff settings the on-disk
+ * build enforces for it: its top-level module names (from
+ * `[tool.hatch.build.targets.wheel].packages`), its `[tool.ruff].line-length`
+ * and its `[tool.ruff.lint].select`.
+ */ function getPythonProjectRuffConfigs(tree) {
+    const configs = [];
+    for (const project of getProjects(tree).values()){
+        // Projects without a pyproject.toml, or whose one cannot be parsed, have no
+        // ruff settings to contribute.
+        const pyproject = tryReadToml(tree, path.join(project.root, 'pyproject.toml'));
+        if (!pyproject) {
+            continue;
+        }
+        const wheelPackages = pyproject?.tool?.hatch?.build?.targets?.wheel?.packages;
+        // Record the top-level module segment (`pkg/sub` -> `pkg`), which is
+        // all `known-first-party` keys off.
+        const modules = Array.isArray(wheelPackages) ? wheelPackages.filter((pkg)=>typeof pkg === 'string' && !!pkg).map((pkg)=>pkg.split('/')[0]) : [];
+        const lineLength = pyproject?.tool?.ruff?.['line-length'];
+        const targetVersion = requiresPythonToRuffTarget(pyproject?.project?.['requires-python']);
+        const selected = pyproject?.tool?.ruff?.lint?.select;
+        const select = Array.isArray(selected) ? selected.filter((rule)=>typeof rule === 'string' && !!rule) : undefined;
+        if (modules.length || typeof lineLength === 'number' || targetVersion || select?.length) {
+            configs.push({
+                root: project.root.split(path.sep).join('/'),
+                modules,
+                lineLength: typeof lineLength === 'number' ? lineLength : undefined,
+                targetVersion,
+                select: select?.length ? select : undefined
+            });
+        }
     }
-    return content;
+    return configs;
 }
-function getChangedPrettierConfigInTree(tree) {
-    if (tree.listChanges().find((file) => file.path === '.prettierrc')) {
-        try {
-            return (0, devkit_1.readJson)(tree, '.prettierrc');
-        }
-        catch {
-            return null;
+/**
+ * Resolve the ruff config for the project that owns a file (the project with
+ * the longest root that is a prefix of the file path). Ruff runs per-project on
+ * disk, so a file's settings come from its own project — only its own module is
+ * first-party (sibling workspace packages are third-party) and its own
+ * line-length applies — and scoping this way keeps in-tree formatting
+ * consistent with the on-disk build.
+ */ function getOwningProjectRuffConfig(filePath, configs) {
+    let owner;
+    for (const config of configs){
+        if ((filePath === config.root || filePath.startsWith(`${config.root}/`)) && (!owner || config.root.length > owner.root.length)) {
+            owner = config;
         }
     }
-    else {
-        return null;
+    return owner;
+}
+/**
+ * Resolve the ruff settings to format a Python file with, mirroring what the
+ * file's build enforces.
+ *
+ * Ruff's own config discovery never runs: settings are passed to the linter
+ * directly rather than resolved from the file's location, which it never sees.
+ * That also means a stray config above the workspace (or in the home directory)
+ * can never be picked up.
+ *
+ * `config` is the file's nearest ruff config, whose rule selection is honoured
+ * as-is. Without one, ruff would fall back to its own defaults, which change
+ * between releases — 0.16 widened them from `E` and `F` to 36 rule prefixes — so
+ * generation would apply fixes the project's build never asks for (eg `RUF022`
+ * reordering `__all__`). Instead the project's own `lint.select` is pinned, so
+ * generation enforces exactly what `lint` does and nothing more.
+ *
+ * `projectConfig` layers on the settings derived from the owning project rather
+ * than declared under `[tool.ruff]`: `known-first-party` (the project's own
+ * modules, from its wheel packages) keeps its imports in their own group, and
+ * `target-version` (from its `requires-python`) matches the formatting the build
+ * produces.
+ */ function resolveRuffOptions(config, projectConfig) {
+    const lint = {
+        ...config?.lint
+    };
+    // Pin the rule selection only when deferring to ruff's defaults would
+    // otherwise apply rules the project's build does not enforce.
+    if (!config) {
+        lint.select = projectConfig?.select ?? DEFAULT_RUFF_SELECT;
+    }
+    if (projectConfig?.modules.length) {
+        lint.isort = {
+            ...lint.isort,
+            'known-first-party': projectConfig.modules
+        };
     }
+    return {
+        ...config,
+        ...typeof projectConfig?.lineLength === 'number' ? {
+            'line-length': projectConfig.lineLength
+        } : {},
+        ...projectConfig?.targetVersion ? {
+            'target-version': projectConfig.targetVersion
+        } : {},
+        lint
+    };
 }
+
 //# sourceMappingURL=format.js.map

package/src/utils/format.js.map

@@ -1 +1 @@
-{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/format.ts"],"names":[],"mappings":"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"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/format.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { Biome } from '@biomejs/js-api/nodejs';\nimport { getProjects, type Tree } from '@nx/devkit';\nimport path from 'path';\nimport { type RuffOptions, ruffFixAndFormat } from './ruff';\nimport { tryReadToml } from './toml';\nimport { TS_VERSIONS } from './versions';\n\n/**\n * The biome.json vended into a new workspace. The pnpm catalog resolver is only\n * included on pnpm workspaces, since `experimentalPnpmCatalogs` is Biome's only\n * catalog resolver and reads `pnpm-workspace.yaml` exclusively — it does nothing\n * for yarn or bun catalogs, so vending it there would be misleading.\n */\nexport const getDefaultBiomeConfig = (tree: Tree) => ({\n  $schema: `https://biomejs.dev/schemas/${TS_VERSIONS['@biomejs/biome']}/schema.json`,\n  root: true,\n  formatter: {\n    enabled: true,\n    indentStyle: 'space',\n    indentWidth: 2,\n    lineWidth: 80,\n  },\n  javascript: {\n    formatter: {\n      quoteStyle: 'single',\n      trailingCommas: 'all',\n    },\n    // Resolve `catalog:` versions from pnpm-workspace.yaml (pnpm workspaces only).\n    ...(tree.exists('pnpm-workspace.yaml')\n      ? { resolver: { experimentalPnpmCatalogs: true } }\n      : {}),\n  },\n  css: {\n    formatter: {\n      quoteStyle: 'single',\n    },\n    linter: {\n      enabled: false,\n    },\n  },\n  linter: {\n    enabled: true,\n    rules: {\n      preset: 'none',\n      correctness: {\n        // Every project must declare the third-party dependencies its source\n        // code imports in its own package.json.\n        noUndeclaredDependencies: 'error',\n      },\n    },\n  },\n  assist: {\n    actions: {\n      source: {\n        organizeImports: 'on',\n      },\n    },\n  },\n  files: {\n    includes: [\n      '**',\n      '!**/dist',\n      '!**/out-tsc',\n      '!**/node_modules',\n      '!**/.nx',\n      '!**/.venv',\n      // GritQL codemod cache written by generators — its sample sources\n      // otherwise pollute a bare `biome check .` with parse errors.\n      '!**/.grit',\n      '!**/*.css',\n      '!**/*.gen.*',\n      '!**/generated/**',\n      '!**/tsconfig*.json',\n    ],\n  },\n  // Config files, build scripts and tests use root tooling rather than\n  // declaring it per-project, so the undeclared-dependency rule is off for them.\n  overrides: [\n    {\n      includes: [\n        '**/*.config.{ts,mts,cts,js,mjs,cjs}',\n        '**/*.{spec,test}.{ts,tsx,mts,cts,js,jsx,mjs,cjs}',\n        '**/*.stories.{ts,tsx}',\n      ],\n      linter: {\n        rules: {\n          correctness: {\n            noUndeclaredDependencies: 'off',\n          },\n        },\n      },\n    },\n  ],\n});\n\nconst BIOME_FORMATTABLE_EXTENSIONS = new Set([\n  '.ts',\n  '.tsx',\n  '.js',\n  '.jsx',\n  '.mjs',\n  '.cjs',\n  '.mts',\n  '.cts',\n  '.json',\n  '.jsonc',\n  '.css',\n]);\n\n/** Matches `tsconfig.json` and variants like `tsconfig.lib.json`. */\nconst isTsConfig = (filePath: string): boolean =>\n  /(^|\\/)tsconfig[^/]*\\.json$/.test(filePath);\n\n/**\n * Format files in the given directory within the tree.\n * Handles both TypeScript/JavaScript/JSON (via biome) and Python (via ruff) files.\n * See https://github.com/nrwl/nx/blob/4cd640a9187954505d12de5b6d76a90d8ce4c2eb/packages/devkit/src/generators/format-files.ts#L11\n */\nexport async function formatFilesInSubtree(\n  tree: Tree,\n  dir?: string,\n): Promise<void> {\n  const changedFiles = tree\n    .listChanges()\n    .filter((file) => file.type !== 'DELETE')\n    .filter((file) => (dir ? file.path.startsWith(dir) : true));\n\n  const pyFiles = changedFiles.filter((file) => file.path.endsWith('.py'));\n  const otherFiles = changedFiles.filter(\n    (file) =>\n      BIOME_FORMATTABLE_EXTENSIONS.has(path.extname(file.path)) &&\n      // tsconfigs are not biome-managed: they're excluded from the vended\n      // format target (Nx's typescript-sync rewrites them without formatting),\n      // so formatting them at generation would only diverge from the form\n      // written on later runs. Leave them as updateJson/writeJson emit them so\n      // repeated generation stays idempotent.\n      !isTsConfig(file.path),\n  );\n\n  // Resolve each project's ruff settings (module names, line-length) so files\n  // are formatted to match the on-disk build (see getPythonProjectRuffConfigs).\n  const pythonProjectConfigs = pyFiles.length\n    ? getPythonProjectRuffConfigs(tree)\n    : [];\n\n  // Format Python files with ruff (lint fixes + formatting)\n  for (const file of pyFiles) {\n    try {\n      const content = ruffFixAndFormat(\n        file.content.toString('utf-8'),\n        file.path,\n        resolveRuffOptions(\n          readRuffConfig(tree, file.path),\n          getOwningProjectRuffConfig(file.path, pythonProjectConfigs),\n        ),\n      );\n      tree.write(file.path, content);\n    } catch {\n      // Silently skip ruff formatting failures\n    }\n  }\n\n  if (otherFiles.length === 0) return;\n\n  formatWithBiome(tree, otherFiles);\n}\n\n/**\n * The Biome configuration to format with: the workspace's own `biome.json`, else\n * the config we vend.\n *\n * Read through the tree, which falls back to disk for a file it doesn't hold. So\n * this resolves the most current config either way — the workspace's on-disk one,\n * or the version a generator has just written to the tree and not yet flushed,\n * which shelling out to the CLI could never see.\n */\nfunction readBiomeConfig(tree: Tree): unknown {\n  const config = tree.read('biome.json', 'utf-8');\n  if (config) {\n    try {\n      return JSON.parse(config);\n    } catch {\n      // Malformed config — fall through to the config we vend\n    }\n  }\n  return getDefaultBiomeConfig(tree);\n}\n\n/**\n * Format files with Biome in-process, reusing one instance across the batch.\n *\n * Replaces one `biome format --stdin-file-path` process per file, which\n * dominated generation at ~70ms each: `formatFilesInSubtree` formats every\n * change accumulated in the tree, not only the ones its caller made, so\n * generators sharing a tree reformat the same files once per call. In-process is\n * ~0.5ms per file. Output was verified byte-identical across the plugin's whole\n * source tree, except that the CLI corrupts control characters passed through\n * stdin (a NUL in a template literal) where formatting in-process preserves them.\n */\nfunction formatWithBiome(\n  tree: Tree,\n  files: { path: string; content: Buffer | null }[],\n): void {\n  try {\n    const biome = new Biome();\n    const { projectKey } = biome.openProject();\n    biome.applyConfiguration(projectKey, readBiomeConfig(tree));\n\n    for (const file of files) {\n      try {\n        const { content } = biome.formatContent(\n          projectKey,\n          file.content?.toString('utf-8') ?? '',\n          { filePath: file.path },\n        );\n        tree.write(file.path, content);\n      } catch {\n        // Leave individual files that fail to format untouched\n      }\n    }\n  } catch {\n    // Silently skip formatting failures\n  }\n}\n\n/**\n * Read the ruff config for a file, by walking from its directory up to the\n * workspace root looking for `.ruff.toml`, `ruff.toml`, or a `pyproject.toml`\n * with a `[tool.ruff]` section — the same files, in the same order, that ruff\n * itself resolves. The walk stops at the workspace root so a stray config in a\n * parent of the workspace (or the home directory) is never treated as the\n * project's.\n *\n * The settings are read rather than merely detected because formatting runs\n * in-process against tree content, so ruff never sees the file's location and\n * cannot resolve the config itself (see {@link resolveRuffOptions}).\n *\n * Reads go through the tree, which falls through to disk for files this run has\n * not touched, so a config the generator has just written in memory is picked up\n * as well as one already on disk.\n */\nfunction readRuffConfig(tree: Tree, filePath: string): RuffOptions | undefined {\n  let dir = path.dirname(filePath);\n  while (true) {\n    for (const name of ['.ruff.toml', 'ruff.toml']) {\n      const config = tryReadToml(tree, path.join(dir, name));\n      if (config) {\n        return config as RuffOptions;\n      }\n    }\n    const ruff = (tryReadToml(tree, path.join(dir, 'pyproject.toml')) as any)\n      ?.tool?.ruff;\n    if (ruff) {\n      return ruff as RuffOptions;\n    }\n    // Stop once the workspace root ('.') has been checked.\n    if (dir === '.' || dir === '' || dir === path.dirname(dir)) {\n      return undefined;\n    }\n    dir = path.dirname(dir);\n  }\n}\n\n/**\n * The `[tool.ruff.lint].select` generated Python projects vend. Generation\n * formats before that config lands on disk, so it is pinned here to keep\n * generated files clean under the project's own `lint` target rather than under\n * whatever ruff's defaults happen to be for the pinned release.\n */\nconst DEFAULT_RUFF_SELECT = ['E', 'F', 'UP', 'B', 'SIM', 'I'];\n\ninterface PythonProjectRuffConfig {\n  /** Project root, normalised to use forward slashes. */\n  readonly root: string;\n  /** Top-level importable module names declared by the project. */\n  readonly modules: string[];\n  /** The project's `[tool.ruff].line-length`, if set. */\n  readonly lineLength?: number;\n  /**\n   * Ruff `target-version` (eg `py314`) derived from `[project].requires-python`.\n   * Generation formats via stdin with no pyproject, so it must be passed\n   * explicitly — ruff's formatting differs by target.\n   */\n  readonly targetVersion?: string;\n  /** The project's `[tool.ruff.lint].select`, if set. */\n  readonly select?: string[];\n}\n\n/**\n * Derive ruff's `target-version` (eg `py314`) from a PEP 508\n * `requires-python` specifier (eg `>=3.14`). Ruff targets the minimum\n * supported version, so take the lowest `major.minor` mentioned.\n */\nexport const requiresPythonToRuffTarget = (\n  requiresPython: unknown,\n): string | undefined => {\n  if (typeof requiresPython !== 'string') {\n    return undefined;\n  }\n  let min: { major: number; minor: number } | undefined;\n  for (const match of requiresPython.matchAll(/(\\d+)\\.(\\d+)/g)) {\n    const major = Number(match[1]);\n    const minor = Number(match[2]);\n    if (\n      !min ||\n      major < min.major ||\n      (major === min.major && minor < min.minor)\n    ) {\n      min = { major, minor };\n    }\n  }\n  return min ? `py${min.major}${min.minor}` : undefined;\n};\n\n/**\n * Map each Nx project with a `pyproject.toml` to the ruff settings the on-disk\n * build enforces for it: its top-level module names (from\n * `[tool.hatch.build.targets.wheel].packages`), its `[tool.ruff].line-length`\n * and its `[tool.ruff.lint].select`.\n */\nfunction getPythonProjectRuffConfigs(tree: Tree): PythonProjectRuffConfig[] {\n  const configs: PythonProjectRuffConfig[] = [];\n\n  for (const project of getProjects(tree).values()) {\n    // Projects without a pyproject.toml, or whose one cannot be parsed, have no\n    // ruff settings to contribute.\n    const pyproject = tryReadToml(\n      tree,\n      path.join(project.root, 'pyproject.toml'),\n    ) as any;\n    if (!pyproject) {\n      continue;\n    }\n    const wheelPackages: unknown =\n      pyproject?.tool?.hatch?.build?.targets?.wheel?.packages;\n    // Record the top-level module segment (`pkg/sub` -> `pkg`), which is\n    // all `known-first-party` keys off.\n    const modules = Array.isArray(wheelPackages)\n      ? wheelPackages\n          .filter((pkg): pkg is string => typeof pkg === 'string' && !!pkg)\n          .map((pkg) => pkg.split('/')[0])\n      : [];\n    const lineLength: unknown = pyproject?.tool?.ruff?.['line-length'];\n    const targetVersion = requiresPythonToRuffTarget(\n      pyproject?.project?.['requires-python'],\n    );\n    const selected: unknown = pyproject?.tool?.ruff?.lint?.select;\n    const select = Array.isArray(selected)\n      ? selected.filter(\n          (rule): rule is string => typeof rule === 'string' && !!rule,\n        )\n      : undefined;\n    if (\n      modules.length ||\n      typeof lineLength === 'number' ||\n      targetVersion ||\n      select?.length\n    ) {\n      configs.push({\n        root: project.root.split(path.sep).join('/'),\n        modules,\n        lineLength: typeof lineLength === 'number' ? lineLength : undefined,\n        targetVersion,\n        select: select?.length ? select : undefined,\n      });\n    }\n  }\n\n  return configs;\n}\n\n/**\n * Resolve the ruff config for the project that owns a file (the project with\n * the longest root that is a prefix of the file path). Ruff runs per-project on\n * disk, so a file's settings come from its own project — only its own module is\n * first-party (sibling workspace packages are third-party) and its own\n * line-length applies — and scoping this way keeps in-tree formatting\n * consistent with the on-disk build.\n */\nfunction getOwningProjectRuffConfig(\n  filePath: string,\n  configs: PythonProjectRuffConfig[],\n): PythonProjectRuffConfig | undefined {\n  let owner: PythonProjectRuffConfig | undefined;\n  for (const config of configs) {\n    if (\n      (filePath === config.root || filePath.startsWith(`${config.root}/`)) &&\n      (!owner || config.root.length > owner.root.length)\n    ) {\n      owner = config;\n    }\n  }\n  return owner;\n}\n\n/**\n * Resolve the ruff settings to format a Python file with, mirroring what the\n * file's build enforces.\n *\n * Ruff's own config discovery never runs: settings are passed to the linter\n * directly rather than resolved from the file's location, which it never sees.\n * That also means a stray config above the workspace (or in the home directory)\n * can never be picked up.\n *\n * `config` is the file's nearest ruff config, whose rule selection is honoured\n * as-is. Without one, ruff would fall back to its own defaults, which change\n * between releases — 0.16 widened them from `E` and `F` to 36 rule prefixes — so\n * generation would apply fixes the project's build never asks for (eg `RUF022`\n * reordering `__all__`). Instead the project's own `lint.select` is pinned, so\n * generation enforces exactly what `lint` does and nothing more.\n *\n * `projectConfig` layers on the settings derived from the owning project rather\n * than declared under `[tool.ruff]`: `known-first-party` (the project's own\n * modules, from its wheel packages) keeps its imports in their own group, and\n * `target-version` (from its `requires-python`) matches the formatting the build\n * produces.\n */\nfunction resolveRuffOptions(\n  config: RuffOptions | undefined,\n  projectConfig?: PythonProjectRuffConfig,\n): RuffOptions {\n  const lint: Record<string, unknown> = { ...config?.lint };\n  // Pin the rule selection only when deferring to ruff's defaults would\n  // otherwise apply rules the project's build does not enforce.\n  if (!config) {\n    lint.select = projectConfig?.select ?? DEFAULT_RUFF_SELECT;\n  }\n  if (projectConfig?.modules.length) {\n    lint.isort = {\n      ...(lint.isort as object | undefined),\n      'known-first-party': projectConfig.modules,\n    };\n  }\n  return {\n    ...config,\n    ...(typeof projectConfig?.lineLength === 'number'\n      ? { 'line-length': projectConfig.lineLength }\n      : {}),\n    ...(projectConfig?.targetVersion\n      ? { 'target-version': projectConfig.targetVersion }\n      : {}),\n    lint,\n  };\n}\n"],"names":["Biome","getProjects","path","ruffFixAndFormat","tryReadToml","TS_VERSIONS","getDefaultBiomeConfig","tree","$schema","root","formatter","enabled","indentStyle","indentWidth","lineWidth","javascript","quoteStyle","trailingCommas","exists","resolver","experimentalPnpmCatalogs","css","linter","rules","preset","correctness","noUndeclaredDependencies","assist","actions","source","organizeImports","files","includes","overrides","BIOME_FORMATTABLE_EXTENSIONS","Set","isTsConfig","filePath","test","formatFilesInSubtree","dir","changedFiles","listChanges","filter","file","type","startsWith","pyFiles","endsWith","otherFiles","has","extname","pythonProjectConfigs","length","getPythonProjectRuffConfigs","content","toString","resolveRuffOptions","readRuffConfig","getOwningProjectRuffConfig","write","formatWithBiome","readBiomeConfig","config","read","JSON","parse","biome","projectKey","openProject","applyConfiguration","formatContent","dirname","name","join","ruff","tool","undefined","DEFAULT_RUFF_SELECT","requiresPythonToRuffTarget","requiresPython","min","match","matchAll","major","Number","minor","configs","project","values","pyproject","wheelPackages","hatch","build","targets","wheel","packages","modules","Array","isArray","pkg","map","split","lineLength","targetVersion","selected","lint","select","rule","push","sep","owner","projectConfig","isort"],"mappings":"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"}

package/src/utils/fs.d.ts

@@ -2,7 +2,7 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Tree } from '@nx/devkit';
+import type { Tree } from '@nx/devkit';
 /**
  * Utility class for creating platform agnostic commands for filesystem operations.
  * Adds the required dependencies to the root package json

package/src/utils/fs.js

@@ -1,33 +1,34 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FsCommands = void 0;
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const versions_1 = require("./versions");
+ */ import { addDependenciesToPackageJson } from "./dependencies.js";
+import { withVersions } from "./versions.js";
 /**
  * Utility class for creating platform agnostic commands for filesystem operations.
  * Adds the required dependencies to the root package json
- */
-class FsCommands {
+ */ export class FsCommands {
     tree;
-    constructor(tree) {
+    constructor(tree){
         this.tree = tree;
     }
     cp(src, dst) {
-        (0, devkit_1.addDependenciesToPackageJson)(this.tree, {}, (0, versions_1.withVersions)(['ncp']));
+        addDependenciesToPackageJson(this.tree, {}, withVersions([
+            'ncp'
+        ]));
         return `ncp ${src} ${dst}`;
     }
     rm(dir) {
-        (0, devkit_1.addDependenciesToPackageJson)(this.tree, {}, (0, versions_1.withVersions)(['rimraf']));
+        addDependenciesToPackageJson(this.tree, {}, withVersions([
+            'rimraf'
+        ]));
         return `rimraf ${dir}`;
     }
     mkdir(dir) {
-        (0, devkit_1.addDependenciesToPackageJson)(this.tree, {}, (0, versions_1.withVersions)(['make-dir-cli']));
+        addDependenciesToPackageJson(this.tree, {}, withVersions([
+            'make-dir-cli'
+        ]));
         return `make-dir ${dir}`;
     }
 }
-exports.FsCommands = FsCommands;
+
 //# sourceMappingURL=fs.js.map

package/src/utils/fs.js.map

@@ -1 +1 @@
-{"version":3,"file":"fs.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/fs.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAAgE;AAChE,yCAA0C;AAE1C;;;GAGG;AACH,MAAa,UAAU;IACb,IAAI,CAAO;IAEnB,YAAY,IAAU;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAEM,EAAE,CAAC,GAAW,EAAE,GAAW;QAChC,IAAA,qCAA4B,EAAC,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,IAAA,uBAAY,EAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnE,OAAO,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;IAC7B,CAAC;IAEM,EAAE,CAAC,GAAW;QACnB,IAAA,qCAA4B,EAAC,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,IAAA,uBAAY,EAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACtE,OAAO,UAAU,GAAG,EAAE,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,GAAW;QACtB,IAAA,qCAA4B,EAAC,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,IAAA,uBAAY,EAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QAC5E,OAAO,YAAY,GAAG,EAAE,CAAC;IAC3B,CAAC;CACF;AArBD,gCAqBC"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/fs.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport type { Tree } from '@nx/devkit';\nimport { addDependenciesToPackageJson } from './dependencies';\nimport { withVersions } from './versions';\n\n/**\n * Utility class for creating platform agnostic commands for filesystem operations.\n * Adds the required dependencies to the root package json\n */\nexport class FsCommands {\n  private tree: Tree;\n\n  constructor(tree: Tree) {\n    this.tree = tree;\n  }\n\n  public cp(src: string, dst: string) {\n    addDependenciesToPackageJson(this.tree, {}, withVersions(['ncp']));\n    return `ncp ${src} ${dst}`;\n  }\n\n  public rm(dir: string) {\n    addDependenciesToPackageJson(this.tree, {}, withVersions(['rimraf']));\n    return `rimraf ${dir}`;\n  }\n\n  public mkdir(dir: string) {\n    addDependenciesToPackageJson(this.tree, {}, withVersions(['make-dir-cli']));\n    return `make-dir ${dir}`;\n  }\n}\n"],"names":["addDependenciesToPackageJson","withVersions","FsCommands","tree","cp","src","dst","rm","dir","mkdir"],"mappings":"AAAA;;;CAGC,GAED,SAASA,4BAA4B,QAAQ,oBAAiB;AAC9D,SAASC,YAAY,QAAQ,gBAAa;AAE1C;;;CAGC,GACD,OAAO,MAAMC;IACHC,KAAW;IAEnB,YAAYA,IAAU,CAAE;QACtB,IAAI,CAACA,IAAI,GAAGA;IACd;IAEOC,GAAGC,GAAW,EAAEC,GAAW,EAAE;QAClCN,6BAA6B,IAAI,CAACG,IAAI,EAAE,CAAC,GAAGF,aAAa;YAAC;SAAM;QAChE,OAAO,CAAC,IAAI,EAAEI,IAAI,CAAC,EAAEC,KAAK;IAC5B;IAEOC,GAAGC,GAAW,EAAE;QACrBR,6BAA6B,IAAI,CAACG,IAAI,EAAE,CAAC,GAAGF,aAAa;YAAC;SAAS;QACnE,OAAO,CAAC,OAAO,EAAEO,KAAK;IACxB;IAEOC,MAAMD,GAAW,EAAE;QACxBR,6BAA6B,IAAI,CAACG,IAAI,EAAE,CAAC,GAAGF,aAAa;YAAC;SAAe;QACzE,OAAO,CAAC,SAAS,EAAEO,KAAK;IAC1B;AACF"}

package/src/utils/function-constructs/files/cdk/app/lambda-functions/__nameKebabCase__.ts.template

@@ -12,7 +12,7 @@ export class <%= nameClassName %> extends Function {
         code: Code.fromAsset(url.fileURLToPath(
           new URL(
             '../../../../../../<%- bundlePathFromRoot %>',
-            import.meta.url
+            <% if (esm) { %>import.meta.url<% } else { %>require('url').pathToFileURL(__filename).href<% } %>
           )
         )),
         tracing: Tracing.ACTIVE,

package/src/utils/function-constructs/files/terraform/app/lambda-functions/__nameKebabCase__/__nameKebabCase__.tf.template

@@ -2,11 +2,11 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "<%- awsProviderVersion %>"
     }
     archive = {
       source  = "hashicorp/archive"
-      version = "~> 2.0"
+      version = "<%- archiveProviderVersion %>"
     }
   }
 }

package/src/utils/function-constructs/function-constructs.d.ts

@@ -2,8 +2,8 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Tree } from '@nx/devkit';
-import { Iac } from '../iac';
+import { type Tree } from '@nx/devkit';
+import type { Iac } from '../iac';
 export interface AddLambdaFunctionConstructOptions {
     functionProjectName: string;
     nameClassName: string;