@nx/eslint 17.0.2 → 17.0.4

package/src/generators/lint-project/lint-project.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lintProjectGenerator = exports.mapLintPattern = void 0;
+exports.lintProjectGeneratorInternal = exports.lintProjectGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const eslint_file_1 = require("../utils/eslint-file");
 const path_1 = require("path");
@@ -9,34 +9,64 @@ const init_migration_1 = require("../init/init-migration");
 const project_configuration_1 = require("nx/src/generators/utils/project-configuration");
 const flat_config_1 = require("../../utils/flat-config");
 const ast_utils_1 = require("../utils/flat-config/ast-utils");
-function mapLintPattern(projectRoot, extension, rootProject) {
-    if (rootProject && (projectRoot === '.' || projectRoot === '')) {
-        return `${projectRoot}/src/**/*.${extension}`;
-    }
-    else {
-        return `${projectRoot}/**/*.${extension}`;
-    }
+const config_file_1 = require("../../utils/config-file");
+const plugin_1 = require("../utils/plugin");
+const setup_root_eslint_1 = require("./setup-root-eslint");
+function lintProjectGenerator(tree, options) {
+    return lintProjectGeneratorInternal(tree, { addPlugin: false, ...options });
 }
-exports.mapLintPattern = mapLintPattern;
-async function lintProjectGenerator(tree, options) {
-    const installTask = (0, init_1.lintInitGenerator)(tree, {
-        linter: options.linter,
+exports.lintProjectGenerator = lintProjectGenerator;
+async function lintProjectGeneratorInternal(tree, options) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
+    options.addPlugin ??= addPluginDefault;
+    const tasks = [];
+    const initTask = await (0, init_1.lintInitGenerator)(tree, {
+        skipPackageJson: options.skipPackageJson,
+        addPlugin: options.addPlugin,
+    });
+    tasks.push(initTask);
+    const rootEsLintTask = (0, setup_root_eslint_1.setupRootEsLint)(tree, {
         unitTestRunner: options.unitTestRunner,
         skipPackageJson: options.skipPackageJson,
         rootProject: options.rootProject,
     });
+    tasks.push(rootEsLintTask);
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const lintFilePatterns = options.eslintFilePatterns ?? [];
-    if (isBuildableLibraryProject(projectConfig)) {
-        lintFilePatterns.push(`${projectConfig.root}/package.json`);
+    let lintFilePatterns = options.eslintFilePatterns;
+    if (!lintFilePatterns && options.rootProject && projectConfig.root === '.') {
+        lintFilePatterns = ['./src'];
+    }
+    if (lintFilePatterns &&
+        lintFilePatterns.length &&
+        !lintFilePatterns.includes('{projectRoot}') &&
+        isBuildableLibraryProject(projectConfig)) {
+        lintFilePatterns.push(`{projectRoot}/package.json`);
+    }
+    const hasPlugin = (0, plugin_1.hasEslintPlugin)(tree);
+    if (hasPlugin && !options.addExplicitTargets) {
+        if (lintFilePatterns &&
+            lintFilePatterns.length &&
+            lintFilePatterns.some((p) => !['./src', '{projectRoot}', projectConfig.root].includes(p))) {
+            projectConfig.targets['lint'] = {
+                command: `eslint ${lintFilePatterns
+                    .join(' ')
+                    .replace('{projectRoot}', projectConfig.root)}`,
+            };
+        }
+    }
+    else {
+        projectConfig.targets['lint'] = {
+            executor: '@nx/eslint:lint',
+        };
+        if (lintFilePatterns && lintFilePatterns.length) {
+            // only add lintFilePatterns if they are explicitly defined
+            projectConfig.targets['lint'].options = {
+                lintFilePatterns,
+            };
+        }
     }
-    projectConfig.targets['lint'] = {
-        executor: '@nx/eslint:lint',
-        outputs: ['{options.outputFile}'],
-        options: {
-            lintFilePatterns: lintFilePatterns,
-        },
-    };
     // we are adding new project which is not the root project or
     // companion e2e app so we should check if migration to
     // monorepo style is needed
@@ -51,14 +81,14 @@ async function lintProjectGenerator(tree, options) {
                     filteredProjects.push(project);
                 }
             });
-            (0, init_migration_1.migrateConfigToMonorepoStyle)(filteredProjects, tree, options.unitTestRunner);
+            (0, init_migration_1.migrateConfigToMonorepoStyle)(filteredProjects, tree, options.unitTestRunner, options.keepExistingVersions);
         }
     }
     // our root `.eslintrc` is already the project config, so we should not override it
     // additionally, the companion e2e app would have `rootProject: true`
     // so we need to check for the root path as well
     if (!options.rootProject || projectConfig.root !== '.') {
-        createEsLintConfiguration(tree, projectConfig, options.setParserOptionsProject);
+        createEsLintConfiguration(tree, projectConfig, options.setParserOptionsProject, options.rootProject);
     }
     // Buildable libs need source analysis enabled for linting `package.json`.
     if (isBuildableLibraryProject(projectConfig) &&
@@ -74,13 +104,14 @@ async function lintProjectGenerator(tree, options) {
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return installTask;
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.lintProjectGenerator = lintProjectGenerator;
-function createEsLintConfiguration(tree, projectConfig, setParserOptionsProject) {
-    const eslintConfig = (0, eslint_file_1.findEslintFile)(tree);
-    const pathToRootConfig = eslintConfig
-        ? `${(0, devkit_1.offsetFromRoot)(projectConfig.root)}${eslintConfig}`
+exports.lintProjectGeneratorInternal = lintProjectGeneratorInternal;
+function createEsLintConfiguration(tree, projectConfig, setParserOptionsProject, rootProject) {
+    // we are only extending root for non-standalone projects or their complementary e2e apps
+    const extendedRootConfig = rootProject ? undefined : (0, eslint_file_1.findEslintFile)(tree);
+    const pathToRootConfig = extendedRootConfig
+        ? `${(0, devkit_1.offsetFromRoot)(projectConfig.root)}${extendedRootConfig}`
         : undefined;
     const addDependencyChecks = isBuildableLibraryProject(projectConfig);
     const overrides = [
@@ -132,20 +163,20 @@ function createEsLintConfiguration(tree, projectConfig, setParserOptionsProject)
         const isCompatNeeded = addDependencyChecks;
         const nodes = [];
         const importMap = new Map();
-        if (eslintConfig) {
+        if (extendedRootConfig) {
             importMap.set(pathToRootConfig, 'baseConfig');
             nodes.push((0, ast_utils_1.generateSpreadElement)('baseConfig'));
         }
         overrides.forEach((override) => {
-            nodes.push((0, ast_utils_1.generateFlatOverride)(override, projectConfig.root));
+            nodes.push((0, ast_utils_1.generateFlatOverride)(override));
         });
         const nodeList = (0, ast_utils_1.createNodeList)(importMap, nodes, isCompatNeeded);
-        const content = (0, ast_utils_1.stringifyNodeList)(nodeList, projectConfig.root, 'eslint.config.js');
+        const content = (0, ast_utils_1.stringifyNodeList)(nodeList);
         tree.write((0, path_1.join)(projectConfig.root, 'eslint.config.js'), content);
     }
     else {
         (0, devkit_1.writeJson)(tree, (0, path_1.join)(projectConfig.root, `.eslintrc.json`), {
-            extends: eslintConfig ? [pathToRootConfig] : undefined,
+            extends: extendedRootConfig ? [pathToRootConfig] : undefined,
             // Include project files to be linted since the global one excludes all files.
             ignorePatterns: ['!**/*'],
             overrides,
@@ -169,8 +200,8 @@ function isBuildableLibraryProject(projectConfig) {
  */
 function isMigrationToMonorepoNeeded(projects, tree) {
     // the base config is already created, migration has been done
-    if (tree.exists(eslint_file_1.baseEsLintConfigFile) ||
-        tree.exists(eslint_file_1.baseEsLintFlatConfigFile)) {
+    if (tree.exists(config_file_1.baseEsLintConfigFile) ||
+        tree.exists(config_file_1.baseEsLintFlatConfigFile)) {
         return false;
     }
     const configs = Object.values(projects);
@@ -182,10 +213,15 @@ function isMigrationToMonorepoNeeded(projects, tree) {
     if (!rootProject || !rootProject.targets) {
         return false;
     }
+    // check if we're inferring lint target from `@nx/eslint/plugin`
+    if ((0, plugin_1.hasEslintPlugin)(tree)) {
+        for (const f of config_file_1.ESLINT_CONFIG_FILENAMES) {
+            if (tree.exists(f)) {
+                return true;
+            }
+        }
+    }
     // find if root project has lint target
     const lintTarget = (0, init_migration_1.findLintTarget)(rootProject);
-    if (!lintTarget) {
-        return false;
-    }
-    return true;
+    return !!lintTarget;
 }

package/src/generators/lint-project/setup-root-eslint.d.ts

@@ -0,0 +1,7 @@
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+export type SetupRootEsLintOptions = {
+    unitTestRunner?: string;
+    skipPackageJson?: boolean;
+    rootProject?: boolean;
+};
+export declare function setupRootEsLint(tree: Tree, options: SetupRootEsLintOptions): GeneratorCallback;

package/src/generators/lint-project/setup-root-eslint.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupRootEsLint = void 0;
+const devkit_1 = require("@nx/devkit");
+const versions_1 = require("../../utils/versions");
+const global_eslint_config_1 = require("../init/global-eslint-config");
+const eslint_file_1 = require("../utils/eslint-file");
+function setupRootEsLint(tree, options) {
+    const rootEslintFile = (0, eslint_file_1.findEslintFile)(tree);
+    if (rootEslintFile) {
+        return () => { };
+    }
+    (0, devkit_1.writeJson)(tree, '.eslintrc.json', (0, global_eslint_config_1.getGlobalEsLintConfiguration)(options.unitTestRunner, options.rootProject));
+    if (tree.exists('.eslintignore')) {
+        let content = tree.read('.eslintignore', 'utf-8');
+        if (!/^node_modules$/gm.test(content)) {
+            content = `${content}\nnode_modules\n`;
+            tree.write('.eslintignore', content);
+        }
+    }
+    else {
+        tree.write('.eslintignore', 'node_modules\n');
+    }
+    return !options.skipPackageJson
+        ? (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+            '@nx/eslint-plugin': versions_1.nxVersion,
+            '@typescript-eslint/parser': versions_1.typescriptESLintVersion,
+            '@typescript-eslint/eslint-plugin': versions_1.typescriptESLintVersion,
+            'eslint-config-prettier': versions_1.eslintConfigPrettierVersion,
+        })
+        : () => { };
+}
+exports.setupRootEsLint = setupRootEsLint;

package/src/generators/utils/eslint-file.d.ts

@@ -1,8 +1,5 @@
-import { Tree } from '@nx/devkit';
-import { Linter } from 'eslint';
-export declare const eslintConfigFileWhitelist: string[];
-export declare const baseEsLintConfigFile = ".eslintrc.base.json";
-export declare const baseEsLintFlatConfigFile = "eslint.base.config.js";
+import type { Tree } from '@nx/devkit';
+import type { Linter } from 'eslint';
 export declare function findEslintFile(tree: Tree, projectRoot?: string): string | null;
 export declare function isEslintConfigSupported(tree: Tree, projectRoot?: string): boolean;
 export declare function updateRelativePathsInConfig(tree: Tree, sourcePath: string, destinationPath: string): void;

package/src/generators/utils/eslint-file.js

@@ -1,28 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPluginImport = exports.addIgnoresToLintConfig = exports.addPluginsToLintConfig = exports.addExtendsToLintConfig = exports.replaceOverridesInLintConfig = exports.lintConfigHasOverride = exports.updateOverrideInLintConfig = exports.addOverrideToLintConfig = exports.updateRelativePathsInConfig = exports.isEslintConfigSupported = exports.findEslintFile = exports.baseEsLintFlatConfigFile = exports.baseEsLintConfigFile = exports.eslintConfigFileWhitelist = void 0;
+exports.getPluginImport = exports.addIgnoresToLintConfig = exports.addPluginsToLintConfig = exports.addExtendsToLintConfig = exports.replaceOverridesInLintConfig = exports.lintConfigHasOverride = exports.updateOverrideInLintConfig = exports.addOverrideToLintConfig = exports.updateRelativePathsInConfig = exports.isEslintConfigSupported = exports.findEslintFile = void 0;
 const devkit_1 = require("@nx/devkit");
 const flat_config_1 = require("../../utils/flat-config");
 const ast_utils_1 = require("./flat-config/ast-utils");
-exports.eslintConfigFileWhitelist = [
-    '.eslintrc',
-    '.eslintrc.js',
-    '.eslintrc.cjs',
-    '.eslintrc.yaml',
-    '.eslintrc.yml',
-    '.eslintrc.json',
-    'eslint.config.js',
-];
-exports.baseEsLintConfigFile = '.eslintrc.base.json';
-exports.baseEsLintFlatConfigFile = 'eslint.base.config.js';
-function findEslintFile(tree, projectRoot = '') {
-    if (projectRoot === '' && tree.exists(exports.baseEsLintConfigFile)) {
-        return exports.baseEsLintConfigFile;
+const path_utils_1 = require("./flat-config/path-utils");
+const config_file_1 = require("../../utils/config-file");
+function findEslintFile(tree, projectRoot) {
+    if (projectRoot === undefined && tree.exists(config_file_1.baseEsLintConfigFile)) {
+        return config_file_1.baseEsLintConfigFile;
     }
-    if (projectRoot === '' && tree.exists(exports.baseEsLintFlatConfigFile)) {
-        return exports.baseEsLintFlatConfigFile;
+    if (projectRoot === undefined && tree.exists(config_file_1.baseEsLintFlatConfigFile)) {
+        return config_file_1.baseEsLintFlatConfigFile;
     }
-    for (const file of exports.eslintConfigFileWhitelist) {
+    projectRoot ??= '';
+    for (const file of config_file_1.ESLINT_CONFIG_FILENAMES) {
         if (tree.exists((0, devkit_1.joinPathFragments)(projectRoot, file))) {
             return file;
         }
@@ -93,7 +85,7 @@ function replaceFlatConfigPaths(config, sourceRoot, offset, destinationRoot, tre
     return newConfig;
 }
 function offsetFilePath(projectRoot, pathToFile, offset, tree) {
-    if (exports.eslintConfigFileWhitelist.some((eslintFile) => pathToFile.includes(eslintFile))) {
+    if (config_file_1.ESLINT_CONFIG_FILENAMES.some((eslintFile) => pathToFile.includes(eslintFile))) {
         // if the file is point to base eslint
         const rootEslint = findEslintFile(tree);
         if (rootEslint) {
@@ -111,8 +103,8 @@ function addOverrideToLintConfig(tree, root, override, options = {
 }) {
     const isBase = options.checkBaseConfig && findEslintFile(tree, root).includes('.base');
     if ((0, flat_config_1.useFlatConfig)(tree)) {
-        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? exports.baseEsLintFlatConfigFile : 'eslint.config.js');
-        const flatOverride = (0, ast_utils_1.generateFlatOverride)(override, root);
+        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? config_file_1.baseEsLintFlatConfigFile : 'eslint.config.js');
+        const flatOverride = (0, ast_utils_1.generateFlatOverride)(override);
         let content = tree.read(fileName, 'utf8');
         // we will be using compat here so we need to make sure it's added
         if (overrideNeedsCompat(override)) {
@@ -121,9 +113,9 @@ function addOverrideToLintConfig(tree, root, override, options = {
         tree.write(fileName, (0, ast_utils_1.addBlockToFlatConfigExport)(content, flatOverride, options));
     }
     else {
-        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? exports.baseEsLintConfigFile : '.eslintrc.json');
+        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? config_file_1.baseEsLintConfigFile : '.eslintrc.json');
         (0, devkit_1.updateJson)(tree, fileName, (json) => {
-            json.overrides ?? [];
+            json.overrides ??= [];
             if (options.insertAtTheEnd) {
                 json.overrides.push(override);
             }
@@ -136,7 +128,7 @@ function addOverrideToLintConfig(tree, root, override, options = {
 }
 exports.addOverrideToLintConfig = addOverrideToLintConfig;
 function overrideNeedsCompat(override) {
-    return (!override.env && !override.extends && !override.plugins && !override.parser);
+    return (override.env || override.extends || override.plugins || override.parser);
 }
 function updateOverrideInLintConfig(tree, root, lookup, update) {
     if ((0, flat_config_1.useFlatConfig)(tree)) {
@@ -147,10 +139,23 @@ function updateOverrideInLintConfig(tree, root, lookup, update) {
     }
     else {
         const fileName = (0, devkit_1.joinPathFragments)(root, '.eslintrc.json');
+        if (!tree.exists(fileName)) {
+            return;
+        }
+        const existingJson = (0, devkit_1.readJson)(tree, fileName);
+        if (!existingJson.overrides || !existingJson.overrides.some(lookup)) {
+            return;
+        }
         (0, devkit_1.updateJson)(tree, fileName, (json) => {
             const index = json.overrides.findIndex(lookup);
             if (index !== -1) {
-                json.overrides[index] = update(json.overrides[index]);
+                const newOverride = update(json.overrides[index]);
+                if (newOverride) {
+                    json.overrides[index] = newOverride;
+                }
+                else {
+                    json.overrides.splice(index, 1);
+                }
             }
             return json;
         });
@@ -163,12 +168,12 @@ function lintConfigHasOverride(tree, root, lookup, checkBaseConfig = false) {
     }
     const isBase = checkBaseConfig && findEslintFile(tree, root).includes('.base');
     if ((0, flat_config_1.useFlatConfig)(tree)) {
-        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? exports.baseEsLintFlatConfigFile : 'eslint.config.js');
+        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? config_file_1.baseEsLintFlatConfigFile : 'eslint.config.js');
         const content = tree.read(fileName, 'utf8');
         return (0, ast_utils_1.hasOverride)(content, lookup);
     }
     else {
-        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? exports.baseEsLintConfigFile : '.eslintrc.json');
+        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? config_file_1.baseEsLintConfigFile : '.eslintrc.json');
         return (0, devkit_1.readJson)(tree, fileName).overrides?.some(lookup) || false;
     }
 }
@@ -183,7 +188,7 @@ function replaceOverridesInLintConfig(tree, root, overrides) {
         }
         content = (0, ast_utils_1.removeOverridesFromLintConfig)(content);
         overrides.forEach((override) => {
-            const flatOverride = (0, ast_utils_1.generateFlatOverride)(override, root);
+            const flatOverride = (0, ast_utils_1.generateFlatOverride)(override);
             (0, ast_utils_1.addBlockToFlatConfigExport)(content, flatOverride);
         });
         tree.write(fileName, content);
@@ -202,7 +207,9 @@ function addExtendsToLintConfig(tree, root, plugin) {
     if ((0, flat_config_1.useFlatConfig)(tree)) {
         const fileName = (0, devkit_1.joinPathFragments)(root, 'eslint.config.js');
         const pluginExtends = (0, ast_utils_1.generatePluginExtendsElement)(plugins);
-        tree.write(fileName, (0, ast_utils_1.addBlockToFlatConfigExport)(tree.read(fileName, 'utf8'), pluginExtends));
+        let content = tree.read(fileName, 'utf8');
+        content = (0, ast_utils_1.addCompatToFlatConfig)(content);
+        tree.write(fileName, (0, ast_utils_1.addBlockToFlatConfigExport)(content, pluginExtends));
     }
     else {
         const fileName = (0, devkit_1.joinPathFragments)(root, '.eslintrc.json');
@@ -247,7 +254,7 @@ function addIgnoresToLintConfig(tree, root, ignorePatterns) {
     if ((0, flat_config_1.useFlatConfig)(tree)) {
         const fileName = (0, devkit_1.joinPathFragments)(root, 'eslint.config.js');
         const block = (0, ast_utils_1.generateAst)({
-            ignores: ignorePatterns.map((path) => (0, ast_utils_1.mapFilePath)(path, root)),
+            ignores: ignorePatterns.map((path) => (0, path_utils_1.mapFilePath)(path)),
         });
         tree.write(fileName, (0, ast_utils_1.addBlockToFlatConfigExport)(tree.read(fileName, 'utf8'), block));
     }

package/src/generators/utils/flat-config/ast-utils.d.ts

@@ -8,7 +8,7 @@ export declare function hasOverride(content: string, lookup: (override: Linter.C
 /**
  * Finds an override matching the lookup function and applies the update function to it
  */
-export declare function replaceOverride(content: string, root: string, lookup: (override: Linter.ConfigOverride<Linter.RulesRecord>) => boolean, update: (override: Linter.ConfigOverride<Linter.RulesRecord>) => Linter.ConfigOverride<Linter.RulesRecord>): string;
+export declare function replaceOverride(content: string, root: string, lookup: (override: Linter.ConfigOverride<Linter.RulesRecord>) => boolean, update?: (override: Linter.ConfigOverride<Linter.RulesRecord>) => Linter.ConfigOverride<Linter.RulesRecord>): string;
 /**
  * Adding require statement to the top of the file
  */
@@ -44,7 +44,7 @@ export declare function generatePluginExtendsElement(plugins: string[]): ts.Spre
 /**
  * Stringifies TS nodes to file content string
  */
-export declare function stringifyNodeList(nodes: ts.NodeArray<ts.VariableStatement | ts.Identifier | ts.ExpressionStatement | ts.SourceFile>, root: string, fileName: string): string;
+export declare function stringifyNodeList(nodes: ts.NodeArray<ts.VariableStatement | ts.Identifier | ts.ExpressionStatement | ts.SourceFile>): string;
 /**
  * generates AST require statement
  */
@@ -52,9 +52,8 @@ export declare function generateRequire(variableName: string | ts.ObjectBindingP
 /**
  * Generates AST object or spread element based on JSON override object
  */
-export declare function generateFlatOverride(override: Linter.ConfigOverride<Linter.RulesRecord>, root: string): ts.ObjectLiteralExpression | ts.SpreadElement;
-export declare function mapFilePaths(override: Linter.ConfigOverride<Linter.RulesRecord>, root: string): void;
-export declare function mapFilePath(filePath: string, root: string): string;
+export declare function generateFlatOverride(override: Linter.ConfigOverride<Linter.RulesRecord>): ts.ObjectLiteralExpression | ts.SpreadElement;
+export declare function mapFilePaths(override: Linter.ConfigOverride<Linter.RulesRecord>): void;
 /**
  * Generates an AST from a JSON-type input
  */

package/src/generators/utils/flat-config/ast-utils.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateAst = exports.mapFilePath = exports.mapFilePaths = exports.generateFlatOverride = exports.generateRequire = exports.stringifyNodeList = exports.generatePluginExtendsElement = exports.generateSpreadElement = exports.createNodeList = exports.addCompatToFlatConfig = exports.addPluginsToExportsBlock = exports.removeCompatExtends = exports.removePlugin = exports.addBlockToFlatConfigExport = exports.addImportToFlatConfig = exports.replaceOverride = exports.hasOverride = exports.removeOverridesFromLintConfig = void 0;
+exports.generateAst = exports.mapFilePaths = exports.generateFlatOverride = exports.generateRequire = exports.stringifyNodeList = exports.generatePluginExtendsElement = exports.generateSpreadElement = exports.createNodeList = exports.addCompatToFlatConfig = exports.addPluginsToExportsBlock = exports.removeCompatExtends = exports.removePlugin = exports.addBlockToFlatConfigExport = exports.addImportToFlatConfig = exports.replaceOverride = exports.hasOverride = exports.removeOverridesFromLintConfig = void 0;
 const devkit_1 = require("@nx/devkit");
 const ts = require("typescript");
+const path_utils_1 = require("./path-utils");
 /**
  * Remove all overrides from the config file
  */
@@ -63,7 +64,7 @@ function hasOverride(content, lookup) {
                 // strip any spread elements
                 objSource = fullNodeText.replace(/\s*\.\.\.[a-zA-Z0-9_]+,?\n?/, '');
             }
-            const data = JSON.parse(objSource
+            const data = (0, devkit_1.parseJson)(objSource
                 // ensure property names have double quotes so that JSON.parse works
                 .replace(/'/g, '"')
                 .replace(/\s([a-zA-Z0-9_]+)\s*:/g, ' "$1": '));
@@ -77,7 +78,7 @@ function hasOverride(content, lookup) {
 exports.hasOverride = hasOverride;
 const STRIP_SPREAD_ELEMENTS = /\s*\.\.\.[a-zA-Z0-9_]+,?\n?/g;
 function parseTextToJson(text) {
-    return JSON.parse(text
+    return (0, devkit_1.parseJson)(text
         // ensure property names have double quotes so that JSON.parse works
         .replace(/'/g, '"')
         .replace(/\s([a-zA-Z0-9_]+)\s*:/g, ' "$1": '));
@@ -118,12 +119,14 @@ function replaceOverride(content, root, lookup, update) {
                     length: end - start,
                 });
                 const updatedData = update(data);
-                mapFilePaths(updatedData, root);
-                changes.push({
-                    type: devkit_1.ChangeType.Insert,
-                    index: start,
-                    text: JSON.stringify(updatedData, null, 2).slice(2, -2), // remove curly braces and start/end line breaks since we are injecting just properties
-                });
+                if (updatedData) {
+                    mapFilePaths(updatedData);
+                    changes.push({
+                        type: devkit_1.ChangeType.Insert,
+                        index: start,
+                        text: JSON.stringify(updatedData, null, 2).slice(2, -2), // remove curly braces and start/end line breaks since we are injecting just properties
+                    });
+                }
             }
         }
     });
@@ -223,19 +226,23 @@ function addBlockToFlatConfigExport(content, config, options = {
     });
     const insert = printer.printNode(ts.EmitHint.Expression, config, source);
     if (options.insertAtTheEnd) {
+        const index = exportsArray.length > 0
+            ? exportsArray.at(exportsArray.length - 1).end
+            : exportsArray.pos;
         return (0, devkit_1.applyChangesToString)(content, [
             {
                 type: devkit_1.ChangeType.Insert,
-                index: exportsArray[exportsArray.length - 1].end,
+                index,
                 text: `,\n${insert}`,
             },
         ]);
     }
     else {
+        const index = exportsArray.length > 0 ? exportsArray.at(0).pos : exportsArray.pos;
         return (0, devkit_1.applyChangesToString)(content, [
             {
                 type: devkit_1.ChangeType.Insert,
-                index: exportsArray[0].pos,
+                index,
                 text: `\n${insert},`,
             },
         ]);
@@ -466,10 +473,15 @@ exports.generatePluginExtendsElement = generatePluginExtendsElement;
 /**
  * Stringifies TS nodes to file content string
  */
-function stringifyNodeList(nodes, root, fileName) {
+function stringifyNodeList(nodes) {
     const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
-    const resultFile = ts.createSourceFile((0, devkit_1.joinPathFragments)(root, fileName), '', ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
-    return printer.printList(ts.ListFormat.MultiLine, nodes, resultFile);
+    const resultFile = ts.createSourceFile('', '', ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
+    return (printer
+        .printList(ts.ListFormat.MultiLine, nodes, resultFile)
+        // add new line before compat initialization
+        .replace(/const compat = new FlatCompat/, '\nconst compat = new FlatCompat')
+        // add new line before module.exports = ...
+        .replace(/module\.exports/, '\nmodule.exports'));
 }
 exports.stringifyNodeList = stringifyNodeList;
 /**
@@ -484,21 +496,30 @@ exports.generateRequire = generateRequire;
 /**
  * Generates AST object or spread element based on JSON override object
  */
-function generateFlatOverride(override, root) {
-    mapFilePaths(override, root);
+function generateFlatOverride(override) {
+    mapFilePaths(override);
     if (!override.env &&
         !override.extends &&
         !override.plugins &&
         !override.parser) {
+        if (override.parserOptions) {
+            const { parserOptions, ...rest } = override;
+            return generateAst({ ...rest, languageSettings: { parserOptions } });
+        }
         return generateAst(override);
     }
-    const { files, excludedFiles, rules, ...rest } = override;
+    const { files, excludedFiles, rules, parserOptions, ...rest } = override;
     const objectLiteralElements = [
         ts.factory.createSpreadAssignment(ts.factory.createIdentifier('config')),
     ];
     addTSObjectProperty(objectLiteralElements, 'files', files);
     addTSObjectProperty(objectLiteralElements, 'excludedFiles', excludedFiles);
     addTSObjectProperty(objectLiteralElements, 'rules', rules);
+    if (parserOptions) {
+        addTSObjectProperty(objectLiteralElements, 'languageSettings', {
+            parserOptions,
+        });
+    }
     return ts.factory.createSpreadElement(ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier('compat'), ts.factory.createIdentifier('config')), undefined, [generateAst(rest)]), ts.factory.createIdentifier('map')), undefined, [
         ts.factory.createArrowFunction(undefined, undefined, [
             ts.factory.createParameterDeclaration(undefined, undefined, 'config'),
@@ -506,41 +527,21 @@ function generateFlatOverride(override, root) {
     ]));
 }
 exports.generateFlatOverride = generateFlatOverride;
-function mapFilePaths(override, root) {
+function mapFilePaths(override) {
     if (override.files) {
         override.files = Array.isArray(override.files)
             ? override.files
             : [override.files];
-        override.files = override.files.map((file) => mapFilePath(file, root));
+        override.files = override.files.map((file) => (0, path_utils_1.mapFilePath)(file));
     }
     if (override.excludedFiles) {
         override.excludedFiles = Array.isArray(override.excludedFiles)
             ? override.excludedFiles
             : [override.excludedFiles];
-        override.excludedFiles = override.excludedFiles.map((file) => mapFilePath(file, root));
+        override.excludedFiles = override.excludedFiles.map((file) => (0, path_utils_1.mapFilePath)(file));
     }
 }
 exports.mapFilePaths = mapFilePaths;
-function mapFilePath(filePath, root) {
-    if (filePath.startsWith('!')) {
-        const fileWithoutBang = filePath.slice(1);
-        if (fileWithoutBang.startsWith('*.')) {
-            return `!${(0, devkit_1.joinPathFragments)(root, '**', fileWithoutBang)}`;
-        }
-        else if (!fileWithoutBang.startsWith(root)) {
-            return `!${(0, devkit_1.joinPathFragments)(root, fileWithoutBang)}`;
-        }
-        return filePath;
-    }
-    if (filePath.startsWith('*.')) {
-        return (0, devkit_1.joinPathFragments)(root, '**', filePath);
-    }
-    else if (!filePath.startsWith(root)) {
-        return (0, devkit_1.joinPathFragments)(root, filePath);
-    }
-    return filePath;
-}
-exports.mapFilePath = mapFilePath;
 function addTSObjectProperty(elements, key, value) {
     if (value) {
         elements.push(ts.factory.createPropertyAssignment(key, generateAst(value)));

package/src/generators/utils/flat-config/path-utils.d.ts

@@ -1,2 +1,3 @@
 import type { Linter } from 'eslint';
-export declare function updateFiles(override: Linter.ConfigOverride<Linter.RulesRecord>, root: string): Linter.ConfigOverride<Linter.RulesRecord>;
+export declare function updateFiles(override: Linter.ConfigOverride<Linter.RulesRecord>): Linter.ConfigOverride<Linter.RulesRecord>;
+export declare function mapFilePath(filePath: string): string;

package/src/generators/utils/flat-config/path-utils.js

@@ -1,31 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateFiles = void 0;
+exports.mapFilePath = exports.updateFiles = void 0;
 const devkit_1 = require("@nx/devkit");
-function updateFiles(override, root) {
+function updateFiles(override) {
     if (override.files) {
         override.files = Array.isArray(override.files)
             ? override.files
             : [override.files];
-        override.files = override.files.map((file) => mapFilePath(file, root));
+        override.files = override.files.map((file) => mapFilePath(file));
     }
     return override;
 }
 exports.updateFiles = updateFiles;
-function mapFilePath(filePath, root) {
+function mapFilePath(filePath) {
     if (filePath.startsWith('!')) {
         const fileWithoutBang = filePath.slice(1);
         if (fileWithoutBang.startsWith('*.')) {
-            return `!${(0, devkit_1.joinPathFragments)(root, '**', fileWithoutBang)}`;
-        }
-        else {
-            return `!${(0, devkit_1.joinPathFragments)(root, fileWithoutBang)}`;
+            return `!${(0, devkit_1.joinPathFragments)('**', fileWithoutBang)}`;
         }
+        return filePath;
     }
     if (filePath.startsWith('*.')) {
-        return (0, devkit_1.joinPathFragments)(root, '**', filePath);
-    }
-    else {
-        return (0, devkit_1.joinPathFragments)(root, filePath);
+        return (0, devkit_1.joinPathFragments)('**', filePath);
     }
+    return filePath;
 }
+exports.mapFilePath = mapFilePath;

package/src/generators/utils/plugin.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export declare function hasEslintPlugin(tree: Tree): boolean;