@aws/nx-plugin 1.0.0-rc.3 → 1.0.0-rc.30

package/src/utils/format.js

@@ -1,110 +1,361 @@
-"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 { execFileSync, execSync } from "child_process";
+import { existsSync, readFileSync } from "fs";
+import { createRequire } from "module";
+import path from "path";
+import { readToml } from "./toml.js";
+const require = createRequire(import.meta.url);
+export const DEFAULT_BIOME_CONFIG = {
+    $schema: 'https://biomejs.dev/schemas/2.4.16/schema.json',
+    root: true,
+    formatter: {
+        enabled: true,
+        indentStyle: 'space',
+        indentWidth: 2,
+        lineWidth: 80
+    },
+    javascript: {
+        formatter: {
+            quoteStyle: 'single',
+            trailingCommas: 'all'
+        }
+    },
+    css: {
+        formatter: {
+            quoteStyle: 'single'
+        },
+        linter: {
+            enabled: false
+        }
+    },
+    linter: {
+        enabled: true,
+        rules: {
+            recommended: false,
+            correctness: {
+                noUndeclaredDependencies: 'warn'
+            }
+        }
+    },
+    assist: {
+        actions: {
+            source: {
+                organizeImports: 'on'
+            }
+        }
+    },
+    files: {
+        includes: [
+            '**',
+            '!**/dist',
+            '!**/out-tsc',
+            '!**/node_modules',
+            '!**/.nx',
+            '!**/.venv',
+            '!**/*.css'
+        ]
+    }
+};
+const BIOME_FORMATTABLE_EXTENSIONS = new Set([
+    '.ts',
+    '.tsx',
+    '.js',
+    '.jsx',
+    '.mjs',
+    '.cjs',
+    '.mts',
+    '.cts',
+    '.json',
+    '.jsonc',
+    '.css'
+]);
 /**
  * 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)));
+    // 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, hasRuffConfigOnDisk(tree, file.path), getOwningProjectRuffConfig(file.path, pythonProjectConfigs));
             tree.write(file.path, content);
-        }
-        catch {
-            // Silently skip ruff formatting failures
+        } catch  {
+        // Silently skip ruff formatting failures
         }
     }
-    // Format other files with prettier
-    let prettier;
-    try {
-        prettier = await Promise.resolve().then(() => tslib_1.__importStar(require('prettier')));
+    if (otherFiles.length === 0) return;
+    // Use the workspace's own Biome CLI (its version and config) when biome.json
+    // exists on disk; otherwise format via the bundled library API with the
+    // in-memory tree config. The CLI path does not see in-tree config changes.
+    if (existsSync(path.join(tree.root, 'biome.json'))) {
+        formatWithBiomeCli(tree, otherFiles);
+    } else {
+        formatWithBiomeApi(tree, otherFiles);
     }
-    catch {
-        // Skip formatting if prettier cannot be imported
+}
+/**
+ * Format files via the workspace's Biome CLI, run from the workspace root so it
+ * discovers the on-disk biome.json.
+ */ function formatWithBiomeCli(tree, files) {
+    const biome = getBiomeCommand(tree.root);
+    if (!biome) {
+        // Fall back to the library API if the CLI cannot be resolved
+        formatWithBiomeApi(tree, files);
         return;
     }
-    const changedPrettierInTree = getChangedPrettierConfigInTree(tree);
-    await Promise.all(otherFiles.map(async (file) => {
+    for (const file of files){
         try {
-            const systemPath = path_1.default.join(tree.root, file.path);
-            const resolvedOptions = await prettier.resolveConfig(systemPath, {
-                editorconfig: true,
+            const content = execFileSync(biome.command, [
+                ...biome.args,
+                'format',
+                `--stdin-file-path=${file.path}`
+            ], {
+                input: file.content?.toString('utf-8') ?? '',
+                encoding: 'utf-8',
+                cwd: tree.root,
+                stdio: [
+                    'pipe',
+                    'pipe',
+                    'pipe'
+                ]
             });
-            const options = {
-                trailingComma: 'all',
-                ...resolvedOptions,
-                ...changedPrettierInTree,
-                filepath: systemPath,
-            };
-            const support = await prettier.getFileInfo(systemPath, options);
-            if (support.ignored || !support.inferredParser) {
-                return;
+            tree.write(file.path, content);
+        } catch  {
+        // Leave individual files that fail to format untouched
+        }
+    }
+}
+/**
+ * Format files via the bundled Biome library API, applying the in-memory tree
+ * config.
+ */ function formatWithBiomeApi(tree, files) {
+    try {
+        const biome = new Biome();
+        const { projectKey } = biome.openProject();
+        // Apply the workspace biome.json if it exists in the tree, otherwise the defaults.
+        const treeConfig = tree.read('biome.json', 'utf-8');
+        biome.applyConfiguration(projectKey, treeConfig ? JSON.parse(treeConfig) : DEFAULT_BIOME_CONFIG);
+        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
+    }
+}
+/**
+ * Resolve the `@biomejs/biome` CLI from the user's workspace, falling back to a
+ * `biome` binary on the PATH.
+ */ const _biomeCommands = new Map();
+function getBiomeCommand(root) {
+    if (_biomeCommands.has(root)) {
+        return _biomeCommands.get(root) ?? undefined;
+    }
+    // Run via node for cross-platform execution of the bin shim.
+    try {
+        const pkgJsonPath = require.resolve('@biomejs/biome/package.json', {
+            paths: [
+                root,
+                import.meta.dirname
+            ]
+        });
+        const pkgJson = JSON.parse(readFileSync(pkgJsonPath, 'utf-8'));
+        const binRelative = typeof pkgJson.bin === 'string' ? pkgJson.bin : pkgJson.bin?.biome;
+        if (binRelative) {
+            const binPath = path.join(path.dirname(pkgJsonPath), binRelative);
+            const command = {
+                command: process.execPath,
+                args: [
+                    binPath
+                ]
+            };
+            _biomeCommands.set(root, command);
+            return command;
         }
-    }));
+    } catch  {
+    // Fall back to a biome binary on the PATH
+    }
+    try {
+        execSync('biome --version', {
+            encoding: 'utf-8',
+            stdio: [
+                'pipe',
+                'pipe',
+                'pipe'
+            ]
+        });
+        const command = {
+            command: 'biome',
+            args: []
+        };
+        _biomeCommands.set(root, command);
+        return command;
+    } catch  {
+        _biomeCommands.set(root, null);
+        return undefined;
+    }
 }
 /**
  * Find the ruff command. Tries 'uv run ruff', then 'uvx ruff'.
  * Matches how @nxlv/python runs ruff via the UV provider.
- */
-let _ruffCommand;
+ */ let _ruffCommand;
 function getRuffCommand() {
     if (_ruffCommand !== undefined) {
         return _ruffCommand || undefined;
     }
-    for (const cmd of ['uv run ruff', 'uvx ruff']) {
+    for (const cmd of [
+        'uv run ruff',
+        'uvx ruff'
+    ]){
         try {
-            (0, child_process_1.execSync)(`${cmd} --version`, {
+            execSync(`${cmd} --version`, {
                 encoding: 'utf-8',
-                stdio: ['pipe', 'pipe', 'pipe'],
+                stdio: [
+                    'pipe',
+                    'pipe',
+                    'pipe'
+                ]
             });
             _ruffCommand = cmd;
             return cmd;
-        }
-        catch {
-            // Try next command
+        } catch  {
+        // Try next command
         }
     }
     _ruffCommand = '';
     return undefined;
 }
+/**
+ * Whether ruff would discover a config on disk 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 ruff itself
+ * resolves. The walk stops at `tree.root` so a stray config in a parent of the
+ * workspace (or the home directory) is never treated as the project's. Used to
+ * decide whether to nudge ruff towards import sorting (see
+ * {@link ruffFixAndFormat}).
+ */ function hasRuffConfigOnDisk(tree, filePath) {
+    const root = path.resolve(tree.root);
+    let dir = path.resolve(root, path.dirname(filePath));
+    while(true){
+        if (existsSync(path.join(dir, '.ruff.toml')) || existsSync(path.join(dir, 'ruff.toml'))) {
+            return true;
+        }
+        const pyproject = path.join(dir, 'pyproject.toml');
+        if (existsSync(pyproject) && readFileSync(pyproject, 'utf-8').includes('[tool.ruff')) {
+            return true;
+        }
+        const parent = path.dirname(dir);
+        // Stop once the workspace root has been checked (or we hit the FS root).
+        if (dir === root || parent === dir) {
+            return false;
+        }
+        dir = parent;
+    }
+}
+/**
+ * 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`) and its `[tool.ruff].line-length`.
+ */ function getPythonProjectRuffConfigs(tree) {
+    const configs = [];
+    for (const project of getProjects(tree).values()){
+        const pyprojectPath = path.join(project.root, 'pyproject.toml');
+        if (tree.exists(pyprojectPath)) {
+            try {
+                const pyproject = readToml(tree, pyprojectPath);
+                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'];
+                if (modules.length || typeof lineLength === 'number') {
+                    configs.push({
+                        root: project.root.split(path.sep).join('/'),
+                        modules,
+                        lineLength: typeof lineLength === 'number' ? lineLength : undefined
+                    });
+                }
+            } catch  {
+            // Skip projects whose pyproject.toml cannot be parsed
+            }
+        }
+    }
+    return configs;
+}
+/**
+ * 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;
+        }
+    }
+    return owner;
+}
 /**
  * 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) {
+ *
+ * When no ruff config exists on disk (`hasConfig` false) ruff falls back to its
+ * defaults, which omit isort — but generated projects enable rule `I` and their
+ * build fails on unsorted imports (I001). In that case we add `--extend-select
+ * I` so import sorting matches what the build enforces. When a config does
+ * exist we defer to it entirely, honouring the user's rule selection.
+ *
+ * `projectConfig` carries the owning project's ruff settings, which ruff cannot
+ * detect from the filesystem during generation because the project lives only
+ * in the tree. We pass them via `--config` so in-tree formatting matches the
+ * on-disk build: `known-first-party` (the project's own modules) keeps its
+ * imports in their own group, and `line-length` keeps wrapping consistent (the
+ * generated config raises it above ruff's default of 88). These are additive to
+ * any on-disk config, so they are safe to pass regardless of `hasConfig`.
+ */ function ruffFixAndFormat(content, filePath, hasConfig, projectConfig) {
     const ruff = getRuffCommand();
-    if (!ruff)
-        return content;
+    if (!ruff) return content;
+    const extendSelect = hasConfig ? '' : ' --extend-select I';
+    const configArgs = [];
+    if (projectConfig?.modules.length) {
+        configArgs.push(`lint.isort.known-first-party = ${JSON.stringify(projectConfig.modules)}`);
+    }
+    if (typeof projectConfig?.lineLength === 'number') {
+        configArgs.push(`line-length = ${projectConfig.lineLength}`);
+    }
+    const config = configArgs.map((arg)=>` --config ${JSON.stringify(arg)}`).join('');
     // 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'] });
+        const result = execSync(`${ruff} check --fix${extendSelect}${config} --stdin-filename ${filePath} -`, {
+            input: content,
+            encoding: 'utf-8',
+            stdio: [
+                'pipe',
+                'pipe',
+                'pipe'
+            ]
+        });
         content = result;
-    }
-    catch (e) {
+    } catch (e) {
         // ruff check exits non-zero when it finds unfixable issues,
         // but stdout still contains the fixed content
         if (e.stdout) {
@@ -113,28 +364,19 @@ function ruffFixAndFormat(content, filePath) {
     }
     // Then apply formatting
     try {
-        content = (0, child_process_1.execSync)(`${ruff} format --stdin-filename ${filePath} -`, {
+        content = execSync(`${ruff} format${config} --stdin-filename ${filePath} -`, {
             input: content,
             encoding: 'utf-8',
-            stdio: ['pipe', 'pipe', 'pipe'],
+            stdio: [
+                'pipe',
+                'pipe',
+                'pipe'
+            ]
         });
-    }
-    catch {
-        // Fall through with whatever content we have
+    } catch  {
+    // Fall through with whatever content we have
     }
     return content;
 }
-function getChangedPrettierConfigInTree(tree) {
-    if (tree.listChanges().find((file) => file.path === '.prettierrc')) {
-        try {
-            return (0, devkit_1.readJson)(tree, '.prettierrc');
-        }
-        catch {
-            return null;
-        }
-    }
-    else {
-        return null;
-    }
-}
+
 //# 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 { execFileSync, execSync } from 'child_process';\nimport { existsSync, readFileSync } from 'fs';\nimport { createRequire } from 'module';\nimport path from 'path';\nimport { readToml } from './toml';\n\nconst require = createRequire(import.meta.url);\n\nexport const DEFAULT_BIOME_CONFIG = {\n  $schema: 'https://biomejs.dev/schemas/2.4.16/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  },\n  css: {\n    formatter: {\n      quoteStyle: 'single',\n    },\n    linter: {\n      enabled: false,\n    },\n  },\n  linter: {\n    enabled: true,\n    rules: {\n      recommended: false,\n      correctness: {\n        noUndeclaredDependencies: 'warn',\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      '!**/*.css',\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/**\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((file) =>\n    BIOME_FORMATTABLE_EXTENSIONS.has(path.extname(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        hasRuffConfigOnDisk(tree, file.path),\n        getOwningProjectRuffConfig(file.path, pythonProjectConfigs),\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  // Use the workspace's own Biome CLI (its version and config) when biome.json\n  // exists on disk; otherwise format via the bundled library API with the\n  // in-memory tree config. The CLI path does not see in-tree config changes.\n  if (existsSync(path.join(tree.root, 'biome.json'))) {\n    formatWithBiomeCli(tree, otherFiles);\n  } else {\n    formatWithBiomeApi(tree, otherFiles);\n  }\n}\n\n/**\n * Format files via the workspace's Biome CLI, run from the workspace root so it\n * discovers the on-disk biome.json.\n */\nfunction formatWithBiomeCli(\n  tree: Tree,\n  files: { path: string; content: Buffer | null }[],\n): void {\n  const biome = getBiomeCommand(tree.root);\n  if (!biome) {\n    // Fall back to the library API if the CLI cannot be resolved\n    formatWithBiomeApi(tree, files);\n    return;\n  }\n\n  for (const file of files) {\n    try {\n      const content = execFileSync(\n        biome.command,\n        [...biome.args, 'format', `--stdin-file-path=${file.path}`],\n        {\n          input: file.content?.toString('utf-8') ?? '',\n          encoding: 'utf-8',\n          cwd: tree.root,\n          stdio: ['pipe', 'pipe', 'pipe'],\n        },\n      );\n      tree.write(file.path, content);\n    } catch {\n      // Leave individual files that fail to format untouched\n    }\n  }\n}\n\n/**\n * Format files via the bundled Biome library API, applying the in-memory tree\n * config.\n */\nfunction formatWithBiomeApi(\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    // Apply the workspace biome.json if it exists in the tree, otherwise the defaults.\n    const treeConfig = tree.read('biome.json', 'utf-8');\n    biome.applyConfiguration(\n      projectKey,\n      treeConfig ? JSON.parse(treeConfig) : DEFAULT_BIOME_CONFIG,\n    );\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\ninterface BiomeCommand {\n  command: string;\n  args: string[];\n}\n\n/**\n * Resolve the `@biomejs/biome` CLI from the user's workspace, falling back to a\n * `biome` binary on the PATH.\n */\nconst _biomeCommands = new Map<string, BiomeCommand | null>();\nfunction getBiomeCommand(root: string): BiomeCommand | undefined {\n  if (_biomeCommands.has(root)) {\n    return _biomeCommands.get(root) ?? undefined;\n  }\n\n  // Run via node for cross-platform execution of the bin shim.\n  try {\n    const pkgJsonPath = require.resolve('@biomejs/biome/package.json', {\n      paths: [root, import.meta.dirname],\n    });\n    const pkgJson = JSON.parse(readFileSync(pkgJsonPath, 'utf-8'));\n    const binRelative =\n      typeof pkgJson.bin === 'string' ? pkgJson.bin : pkgJson.bin?.biome;\n    if (binRelative) {\n      const binPath = path.join(path.dirname(pkgJsonPath), binRelative);\n      const command = { command: process.execPath, args: [binPath] };\n      _biomeCommands.set(root, command);\n      return command;\n    }\n  } catch {\n    // Fall back to a biome binary on the PATH\n  }\n\n  try {\n    execSync('biome --version', {\n      encoding: 'utf-8',\n      stdio: ['pipe', 'pipe', 'pipe'],\n    });\n    const command = { command: 'biome', args: [] };\n    _biomeCommands.set(root, command);\n    return command;\n  } catch {\n    _biomeCommands.set(root, null);\n    return undefined;\n  }\n}\n\n/**\n * Find the ruff command. Tries 'uv run ruff', then 'uvx ruff'.\n * Matches how @nxlv/python runs ruff via the UV provider.\n */\nlet _ruffCommand: string | undefined;\nfunction getRuffCommand(): string | undefined {\n  if (_ruffCommand !== undefined) {\n    return _ruffCommand || undefined;\n  }\n  for (const cmd of ['uv run ruff', 'uvx ruff']) {\n    try {\n      execSync(`${cmd} --version`, {\n        encoding: 'utf-8',\n        stdio: ['pipe', 'pipe', 'pipe'],\n      });\n      _ruffCommand = cmd;\n      return cmd;\n    } catch {\n      // Try next command\n    }\n  }\n  _ruffCommand = '';\n  return undefined;\n}\n\n/**\n * Whether ruff would discover a config on disk for a file, by walking from its\n * directory up to the workspace root looking for `.ruff.toml`, `ruff.toml`, or a\n * `pyproject.toml` with a `[tool.ruff]` section — the same files ruff itself\n * resolves. The walk stops at `tree.root` so a stray config in a parent of the\n * workspace (or the home directory) is never treated as the project's. Used to\n * decide whether to nudge ruff towards import sorting (see\n * {@link ruffFixAndFormat}).\n */\nfunction hasRuffConfigOnDisk(tree: Tree, filePath: string): boolean {\n  const root = path.resolve(tree.root);\n  let dir = path.resolve(root, path.dirname(filePath));\n  while (true) {\n    if (\n      existsSync(path.join(dir, '.ruff.toml')) ||\n      existsSync(path.join(dir, 'ruff.toml'))\n    ) {\n      return true;\n    }\n    const pyproject = path.join(dir, 'pyproject.toml');\n    if (\n      existsSync(pyproject) &&\n      readFileSync(pyproject, 'utf-8').includes('[tool.ruff')\n    ) {\n      return true;\n    }\n    const parent = path.dirname(dir);\n    // Stop once the workspace root has been checked (or we hit the FS root).\n    if (dir === root || parent === dir) {\n      return false;\n    }\n    dir = parent;\n  }\n}\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\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`) and its `[tool.ruff].line-length`.\n */\nfunction getPythonProjectRuffConfigs(tree: Tree): PythonProjectRuffConfig[] {\n  const configs: PythonProjectRuffConfig[] = [];\n\n  for (const project of getProjects(tree).values()) {\n    const pyprojectPath = path.join(project.root, 'pyproject.toml');\n    if (tree.exists(pyprojectPath)) {\n      try {\n        const pyproject = readToml(tree, pyprojectPath) as any;\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        if (modules.length || typeof lineLength === 'number') {\n          configs.push({\n            root: project.root.split(path.sep).join('/'),\n            modules,\n            lineLength: typeof lineLength === 'number' ? lineLength : undefined,\n          });\n        }\n      } catch {\n        // Skip projects whose pyproject.toml cannot be parsed\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 * Run ruff check --fix and ruff format on Python file content via stdin.\n * Applies all configured lint fixes (including import sorting) and formatting.\n *\n * When no ruff config exists on disk (`hasConfig` false) ruff falls back to its\n * defaults, which omit isort — but generated projects enable rule `I` and their\n * build fails on unsorted imports (I001). In that case we add `--extend-select\n * I` so import sorting matches what the build enforces. When a config does\n * exist we defer to it entirely, honouring the user's rule selection.\n *\n * `projectConfig` carries the owning project's ruff settings, which ruff cannot\n * detect from the filesystem during generation because the project lives only\n * in the tree. We pass them via `--config` so in-tree formatting matches the\n * on-disk build: `known-first-party` (the project's own modules) keeps its\n * imports in their own group, and `line-length` keeps wrapping consistent (the\n * generated config raises it above ruff's default of 88). These are additive to\n * any on-disk config, so they are safe to pass regardless of `hasConfig`.\n */\nfunction ruffFixAndFormat(\n  content: string,\n  filePath: string,\n  hasConfig: boolean,\n  projectConfig?: PythonProjectRuffConfig,\n): string {\n  const ruff = getRuffCommand();\n  if (!ruff) return content;\n\n  const extendSelect = hasConfig ? '' : ' --extend-select I';\n  const configArgs: string[] = [];\n  if (projectConfig?.modules.length) {\n    configArgs.push(\n      `lint.isort.known-first-party = ${JSON.stringify(projectConfig.modules)}`,\n    );\n  }\n  if (typeof projectConfig?.lineLength === 'number') {\n    configArgs.push(`line-length = ${projectConfig.lineLength}`);\n  }\n  const config = configArgs\n    .map((arg) => ` --config ${JSON.stringify(arg)}`)\n    .join('');\n\n  // First apply lint fixes (import sorting, unused imports, etc.)\n  try {\n    const result = execSync(\n      `${ruff} check --fix${extendSelect}${config} --stdin-filename ${filePath} -`,\n      { input: content, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] },\n    );\n    content = result;\n  } catch (e: any) {\n    // ruff check exits non-zero when it finds unfixable issues,\n    // but stdout still contains the fixed content\n    if (e.stdout) {\n      content = e.stdout;\n    }\n  }\n\n  // Then apply formatting\n  try {\n    content = execSync(\n      `${ruff} format${config} --stdin-filename ${filePath} -`,\n      {\n        input: content,\n        encoding: 'utf-8',\n        stdio: ['pipe', 'pipe', 'pipe'],\n      },\n    );\n  } catch {\n    // Fall through with whatever content we have\n  }\n\n  return content;\n}\n"],"names":["Biome","getProjects","execFileSync","execSync","existsSync","readFileSync","createRequire","path","readToml","require","url","DEFAULT_BIOME_CONFIG","$schema","root","formatter","enabled","indentStyle","indentWidth","lineWidth","javascript","quoteStyle","trailingCommas","css","linter","rules","recommended","correctness","noUndeclaredDependencies","assist","actions","source","organizeImports","files","includes","BIOME_FORMATTABLE_EXTENSIONS","Set","formatFilesInSubtree","tree","dir","changedFiles","listChanges","filter","file","type","startsWith","pyFiles","endsWith","otherFiles","has","extname","pythonProjectConfigs","length","getPythonProjectRuffConfigs","content","ruffFixAndFormat","toString","hasRuffConfigOnDisk","getOwningProjectRuffConfig","write","join","formatWithBiomeCli","formatWithBiomeApi","biome","getBiomeCommand","command","args","input","encoding","cwd","stdio","projectKey","openProject","treeConfig","read","applyConfiguration","JSON","parse","formatContent","filePath","_biomeCommands","Map","get","undefined","pkgJsonPath","resolve","paths","dirname","pkgJson","binRelative","bin","binPath","process","execPath","set","_ruffCommand","getRuffCommand","cmd","pyproject","parent","configs","project","values","pyprojectPath","exists","wheelPackages","tool","hatch","build","targets","wheel","packages","modules","Array","isArray","pkg","map","split","lineLength","ruff","push","sep","owner","config","hasConfig","projectConfig","extendSelect","configArgs","stringify","arg","result","e","stdout"],"mappings":"AAAA;;;CAGC,GAED,SAASA,KAAK,QAAQ,yBAAyB;AAC/C,SAASC,WAAW,QAAmB,aAAa;AACpD,SAASC,YAAY,EAAEC,QAAQ,QAAQ,gBAAgB;AACvD,SAASC,UAAU,EAAEC,YAAY,QAAQ,KAAK;AAC9C,SAASC,aAAa,QAAQ,SAAS;AACvC,OAAOC,UAAU,OAAO;AACxB,SAASC,QAAQ,QAAQ,YAAS;AAElC,MAAMC,UAAUH,cAAc,YAAYI,GAAG;AAE7C,OAAO,MAAMC,uBAAuB;IAClCC,SAAS;IACTC,MAAM;IACNC,WAAW;QACTC,SAAS;QACTC,aAAa;QACbC,aAAa;QACbC,WAAW;IACb;IACAC,YAAY;QACVL,WAAW;YACTM,YAAY;YACZC,gBAAgB;QAClB;IACF;IACAC,KAAK;QACHR,WAAW;YACTM,YAAY;QACd;QACAG,QAAQ;YACNR,SAAS;QACX;IACF;IACAQ,QAAQ;QACNR,SAAS;QACTS,OAAO;YACLC,aAAa;YACbC,aAAa;gBACXC,0BAA0B;YAC5B;QACF;IACF;IACAC,QAAQ;QACNC,SAAS;YACPC,QAAQ;gBACNC,iBAAiB;YACnB;QACF;IACF;IACAC,OAAO;QACLC,UAAU;YACR;YACA;YACA;YACA;YACA;YACA;YACA;SACD;IACH;AACF,EAAE;AAEF,MAAMC,+BAA+B,IAAIC,IAAI;IAC3C;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;CACD;AAED;;;;CAIC,GACD,OAAO,eAAeC,qBACpBC,IAAU,EACVC,GAAY;IAEZ,MAAMC,eAAeF,KAClBG,WAAW,GACXC,MAAM,CAAC,CAACC,OAASA,KAAKC,IAAI,KAAK,UAC/BF,MAAM,CAAC,CAACC,OAAUJ,MAAMI,KAAKnC,IAAI,CAACqC,UAAU,CAACN,OAAO;IAEvD,MAAMO,UAAUN,aAAaE,MAAM,CAAC,CAACC,OAASA,KAAKnC,IAAI,CAACuC,QAAQ,CAAC;IACjE,MAAMC,aAAaR,aAAaE,MAAM,CAAC,CAACC,OACtCR,6BAA6Bc,GAAG,CAACzC,KAAK0C,OAAO,CAACP,KAAKnC,IAAI;IAGzD,4EAA4E;IAC5E,8EAA8E;IAC9E,MAAM2C,uBAAuBL,QAAQM,MAAM,GACvCC,4BAA4Bf,QAC5B,EAAE;IAEN,0DAA0D;IAC1D,KAAK,MAAMK,QAAQG,QAAS;QAC1B,IAAI;YACF,MAAMQ,UAAUC,iBACdZ,KAAKW,OAAO,CAACE,QAAQ,CAAC,UACtBb,KAAKnC,IAAI,EACTiD,oBAAoBnB,MAAMK,KAAKnC,IAAI,GACnCkD,2BAA2Bf,KAAKnC,IAAI,EAAE2C;YAExCb,KAAKqB,KAAK,CAAChB,KAAKnC,IAAI,EAAE8C;QACxB,EAAE,OAAM;QACN,yCAAyC;QAC3C;IACF;IAEA,IAAIN,WAAWI,MAAM,KAAK,GAAG;IAE7B,6EAA6E;IAC7E,wEAAwE;IACxE,2EAA2E;IAC3E,IAAI/C,WAAWG,KAAKoD,IAAI,CAACtB,KAAKxB,IAAI,EAAE,gBAAgB;QAClD+C,mBAAmBvB,MAAMU;IAC3B,OAAO;QACLc,mBAAmBxB,MAAMU;IAC3B;AACF;AAEA;;;CAGC,GACD,SAASa,mBACPvB,IAAU,EACVL,KAAiD;IAEjD,MAAM8B,QAAQC,gBAAgB1B,KAAKxB,IAAI;IACvC,IAAI,CAACiD,OAAO;QACV,6DAA6D;QAC7DD,mBAAmBxB,MAAML;QACzB;IACF;IAEA,KAAK,MAAMU,QAAQV,MAAO;QACxB,IAAI;YACF,MAAMqB,UAAUnD,aACd4D,MAAME,OAAO,EACb;mBAAIF,MAAMG,IAAI;gBAAE;gBAAU,CAAC,kBAAkB,EAAEvB,KAAKnC,IAAI,EAAE;aAAC,EAC3D;gBACE2D,OAAOxB,KAAKW,OAAO,EAAEE,SAAS,YAAY;gBAC1CY,UAAU;gBACVC,KAAK/B,KAAKxB,IAAI;gBACdwD,OAAO;oBAAC;oBAAQ;oBAAQ;iBAAO;YACjC;YAEFhC,KAAKqB,KAAK,CAAChB,KAAKnC,IAAI,EAAE8C;QACxB,EAAE,OAAM;QACN,uDAAuD;QACzD;IACF;AACF;AAEA;;;CAGC,GACD,SAASQ,mBACPxB,IAAU,EACVL,KAAiD;IAEjD,IAAI;QACF,MAAM8B,QAAQ,IAAI9D;QAClB,MAAM,EAAEsE,UAAU,EAAE,GAAGR,MAAMS,WAAW;QACxC,mFAAmF;QACnF,MAAMC,aAAanC,KAAKoC,IAAI,CAAC,cAAc;QAC3CX,MAAMY,kBAAkB,CACtBJ,YACAE,aAAaG,KAAKC,KAAK,CAACJ,cAAc7D;QAGxC,KAAK,MAAM+B,QAAQV,MAAO;YACxB,IAAI;gBACF,MAAM,EAAEqB,OAAO,EAAE,GAAGS,MAAMe,aAAa,CACrCP,YACA5B,KAAKW,OAAO,EAAEE,SAAS,YAAY,IACnC;oBAAEuB,UAAUpC,KAAKnC,IAAI;gBAAC;gBAExB8B,KAAKqB,KAAK,CAAChB,KAAKnC,IAAI,EAAE8C;YACxB,EAAE,OAAM;YACN,uDAAuD;YACzD;QACF;IACF,EAAE,OAAM;IACN,oCAAoC;IACtC;AACF;AAOA;;;CAGC,GACD,MAAM0B,iBAAiB,IAAIC;AAC3B,SAASjB,gBAAgBlD,IAAY;IACnC,IAAIkE,eAAe/B,GAAG,CAACnC,OAAO;QAC5B,OAAOkE,eAAeE,GAAG,CAACpE,SAASqE;IACrC;IAEA,6DAA6D;IAC7D,IAAI;QACF,MAAMC,cAAc1E,QAAQ2E,OAAO,CAAC,+BAA+B;YACjEC,OAAO;gBAACxE;gBAAM,YAAYyE,OAAO;aAAC;QACpC;QACA,MAAMC,UAAUZ,KAAKC,KAAK,CAACvE,aAAa8E,aAAa;QACrD,MAAMK,cACJ,OAAOD,QAAQE,GAAG,KAAK,WAAWF,QAAQE,GAAG,GAAGF,QAAQE,GAAG,EAAE3B;QAC/D,IAAI0B,aAAa;YACf,MAAME,UAAUnF,KAAKoD,IAAI,CAACpD,KAAK+E,OAAO,CAACH,cAAcK;YACrD,MAAMxB,UAAU;gBAAEA,SAAS2B,QAAQC,QAAQ;gBAAE3B,MAAM;oBAACyB;iBAAQ;YAAC;YAC7DX,eAAec,GAAG,CAAChF,MAAMmD;YACzB,OAAOA;QACT;IACF,EAAE,OAAM;IACN,0CAA0C;IAC5C;IAEA,IAAI;QACF7D,SAAS,mBAAmB;YAC1BgE,UAAU;YACVE,OAAO;gBAAC;gBAAQ;gBAAQ;aAAO;QACjC;QACA,MAAML,UAAU;YAAEA,SAAS;YAASC,MAAM,EAAE;QAAC;QAC7Cc,eAAec,GAAG,CAAChF,MAAMmD;QACzB,OAAOA;IACT,EAAE,OAAM;QACNe,eAAec,GAAG,CAAChF,MAAM;QACzB,OAAOqE;IACT;AACF;AAEA;;;CAGC,GACD,IAAIY;AACJ,SAASC;IACP,IAAID,iBAAiBZ,WAAW;QAC9B,OAAOY,gBAAgBZ;IACzB;IACA,KAAK,MAAMc,OAAO;QAAC;QAAe;KAAW,CAAE;QAC7C,IAAI;YACF7F,SAAS,GAAG6F,IAAI,UAAU,CAAC,EAAE;gBAC3B7B,UAAU;gBACVE,OAAO;oBAAC;oBAAQ;oBAAQ;iBAAO;YACjC;YACAyB,eAAeE;YACf,OAAOA;QACT,EAAE,OAAM;QACN,mBAAmB;QACrB;IACF;IACAF,eAAe;IACf,OAAOZ;AACT;AAEA;;;;;;;;CAQC,GACD,SAAS1B,oBAAoBnB,IAAU,EAAEyC,QAAgB;IACvD,MAAMjE,OAAON,KAAK6E,OAAO,CAAC/C,KAAKxB,IAAI;IACnC,IAAIyB,MAAM/B,KAAK6E,OAAO,CAACvE,MAAMN,KAAK+E,OAAO,CAACR;IAC1C,MAAO,KAAM;QACX,IACE1E,WAAWG,KAAKoD,IAAI,CAACrB,KAAK,kBAC1BlC,WAAWG,KAAKoD,IAAI,CAACrB,KAAK,eAC1B;YACA,OAAO;QACT;QACA,MAAM2D,YAAY1F,KAAKoD,IAAI,CAACrB,KAAK;QACjC,IACElC,WAAW6F,cACX5F,aAAa4F,WAAW,SAAShE,QAAQ,CAAC,eAC1C;YACA,OAAO;QACT;QACA,MAAMiE,SAAS3F,KAAK+E,OAAO,CAAChD;QAC5B,yEAAyE;QACzE,IAAIA,QAAQzB,QAAQqF,WAAW5D,KAAK;YAClC,OAAO;QACT;QACAA,MAAM4D;IACR;AACF;AAWA;;;;CAIC,GACD,SAAS9C,4BAA4Bf,IAAU;IAC7C,MAAM8D,UAAqC,EAAE;IAE7C,KAAK,MAAMC,WAAWnG,YAAYoC,MAAMgE,MAAM,GAAI;QAChD,MAAMC,gBAAgB/F,KAAKoD,IAAI,CAACyC,QAAQvF,IAAI,EAAE;QAC9C,IAAIwB,KAAKkE,MAAM,CAACD,gBAAgB;YAC9B,IAAI;gBACF,MAAML,YAAYzF,SAAS6B,MAAMiE;gBACjC,MAAME,gBACJP,WAAWQ,MAAMC,OAAOC,OAAOC,SAASC,OAAOC;gBACjD,qEAAqE;gBACrE,oCAAoC;gBACpC,MAAMC,UAAUC,MAAMC,OAAO,CAACT,iBAC1BA,cACG/D,MAAM,CAAC,CAACyE,MAAuB,OAAOA,QAAQ,YAAY,CAAC,CAACA,KAC5DC,GAAG,CAAC,CAACD,MAAQA,IAAIE,KAAK,CAAC,IAAI,CAAC,EAAE,IACjC,EAAE;gBACN,MAAMC,aAAsBpB,WAAWQ,MAAMa,MAAM,CAAC,cAAc;gBAClE,IAAIP,QAAQ5D,MAAM,IAAI,OAAOkE,eAAe,UAAU;oBACpDlB,QAAQoB,IAAI,CAAC;wBACX1G,MAAMuF,QAAQvF,IAAI,CAACuG,KAAK,CAAC7G,KAAKiH,GAAG,EAAE7D,IAAI,CAAC;wBACxCoD;wBACAM,YAAY,OAAOA,eAAe,WAAWA,aAAanC;oBAC5D;gBACF;YACF,EAAE,OAAM;YACN,sDAAsD;YACxD;QACF;IACF;IAEA,OAAOiB;AACT;AAEA;;;;;;;CAOC,GACD,SAAS1C,2BACPqB,QAAgB,EAChBqB,OAAkC;IAElC,IAAIsB;IACJ,KAAK,MAAMC,UAAUvB,QAAS;QAC5B,IACE,AAACrB,CAAAA,aAAa4C,OAAO7G,IAAI,IAAIiE,SAASlC,UAAU,CAAC,GAAG8E,OAAO7G,IAAI,CAAC,CAAC,CAAC,CAAA,KACjE,CAAA,CAAC4G,SAASC,OAAO7G,IAAI,CAACsC,MAAM,GAAGsE,MAAM5G,IAAI,CAACsC,MAAM,AAAD,GAChD;YACAsE,QAAQC;QACV;IACF;IACA,OAAOD;AACT;AAEA;;;;;;;;;;;;;;;;;CAiBC,GACD,SAASnE,iBACPD,OAAe,EACfyB,QAAgB,EAChB6C,SAAkB,EAClBC,aAAuC;IAEvC,MAAMN,OAAOvB;IACb,IAAI,CAACuB,MAAM,OAAOjE;IAElB,MAAMwE,eAAeF,YAAY,KAAK;IACtC,MAAMG,aAAuB,EAAE;IAC/B,IAAIF,eAAeb,QAAQ5D,QAAQ;QACjC2E,WAAWP,IAAI,CACb,CAAC,+BAA+B,EAAE5C,KAAKoD,SAAS,CAACH,cAAcb,OAAO,GAAG;IAE7E;IACA,IAAI,OAAOa,eAAeP,eAAe,UAAU;QACjDS,WAAWP,IAAI,CAAC,CAAC,cAAc,EAAEK,cAAcP,UAAU,EAAE;IAC7D;IACA,MAAMK,SAASI,WACZX,GAAG,CAAC,CAACa,MAAQ,CAAC,UAAU,EAAErD,KAAKoD,SAAS,CAACC,MAAM,EAC/CrE,IAAI,CAAC;IAER,gEAAgE;IAChE,IAAI;QACF,MAAMsE,SAAS9H,SACb,GAAGmH,KAAK,YAAY,EAAEO,eAAeH,OAAO,kBAAkB,EAAE5C,SAAS,EAAE,CAAC,EAC5E;YAAEZ,OAAOb;YAASc,UAAU;YAASE,OAAO;gBAAC;gBAAQ;gBAAQ;aAAO;QAAC;QAEvEhB,UAAU4E;IACZ,EAAE,OAAOC,GAAQ;QACf,4DAA4D;QAC5D,8CAA8C;QAC9C,IAAIA,EAAEC,MAAM,EAAE;YACZ9E,UAAU6E,EAAEC,MAAM;QACpB;IACF;IAEA,wBAAwB;IACxB,IAAI;QACF9E,UAAUlD,SACR,GAAGmH,KAAK,OAAO,EAAEI,OAAO,kBAAkB,EAAE5C,SAAS,EAAE,CAAC,EACxD;YACEZ,OAAOb;YACPc,UAAU;YACVE,OAAO;gBAAC;gBAAQ;gBAAQ;aAAO;QACjC;IAEJ,EAAE,OAAM;IACN,6CAA6C;IAC/C;IAEA,OAAOhB;AACT"}

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 "@nx/devkit";
+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 { addDependenciesToPackageJson, type Tree } from '@nx/devkit';\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,GACD,SAASA,4BAA4B,QAAmB,aAAa;AACrE,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/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;