@nx/eslint 0.0.0-pr-31222-862e973 → 0.0.0-pr-31313-387cdca

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

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeOverridesFromLintConfig = removeOverridesFromLintConfig;
+exports.addPatternsToFlatConfigIgnoresBlock = addPatternsToFlatConfigIgnoresBlock;
+exports.hasFlatConfigIgnoresBlock = hasFlatConfigIgnoresBlock;
 exports.hasOverride = hasOverride;
 exports.replaceOverride = replaceOverride;
 exports.addImportToFlatConfig = addImportToFlatConfig;
@@ -17,6 +19,7 @@ exports.generatePluginExtendsElement = generatePluginExtendsElement;
 exports.generatePluginExtendsElementWithCompatFixup = generatePluginExtendsElementWithCompatFixup;
 exports.stringifyNodeList = stringifyNodeList;
 exports.generateRequire = generateRequire;
+exports.generateESMImport = generateESMImport;
 exports.overrideNeedsCompat = overrideNeedsCompat;
 exports.generateFlatOverride = generateFlatOverride;
 exports.generateFlatPredefinedConfig = generateFlatPredefinedConfig;
@@ -35,7 +38,8 @@ const SPREAD_ELEMENTS_REGEXP = /\s*\.\.\.[a-zA-Z0-9_]+(\.[a-zA-Z0-9_]+)*,?\n?/g;
  */
 function removeOverridesFromLintConfig(content) {
     const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
-    const exportsArray = findAllBlocks(source);
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
+    const exportsArray = format === 'mjs' ? findExportDefault(source) : findModuleExports(source);
     if (!exportsArray) {
         return content;
     }
@@ -52,7 +56,16 @@ function removeOverridesFromLintConfig(content) {
     });
     return (0, devkit_1.applyChangesToString)(content, changes);
 }
-function findAllBlocks(source) {
+// TODO Change name
+function findExportDefault(source) {
+    return ts.forEachChild(source, function analyze(node) {
+        if (ts.isExportAssignment(node) &&
+            ts.isArrayLiteralExpression(node.expression)) {
+            return node.expression.elements;
+        }
+    });
+}
+function findModuleExports(source) {
     return ts.forEachChild(source, function analyze(node) {
         if (ts.isExpressionStatement(node) &&
             ts.isBinaryExpression(node.expression) &&
@@ -62,9 +75,58 @@ function findAllBlocks(source) {
         }
     });
 }
+function addPatternsToFlatConfigIgnoresBlock(content, ignorePatterns) {
+    const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
+    const exportsArray = format === 'mjs' ? findExportDefault(source) : findModuleExports(source);
+    if (!exportsArray) {
+        return content;
+    }
+    const changes = [];
+    for (const node of exportsArray) {
+        if (!isFlatConfigIgnoresBlock(node)) {
+            continue;
+        }
+        const start = node.properties.pos + 1; // keep leading line break
+        const data = parseTextToJson(node.getFullText());
+        changes.push({
+            type: devkit_1.ChangeType.Delete,
+            start,
+            length: node.properties.end - start,
+        });
+        data.ignores = Array.from(new Set([...(data.ignores ?? []), ...ignorePatterns]));
+        changes.push({
+            type: devkit_1.ChangeType.Insert,
+            index: start,
+            text: '    ' +
+                JSON.stringify(data, null, 2)
+                    .slice(2, -2) // Remove curly braces and start/end line breaks
+                    .replaceAll(/\n/g, '\n    '), // Maintain indentation
+        });
+        break;
+    }
+    return (0, devkit_1.applyChangesToString)(content, changes);
+}
+function hasFlatConfigIgnoresBlock(content) {
+    const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
+    const exportsArray = format === 'mjs' ? findExportDefault(source) : findModuleExports(source);
+    if (!exportsArray) {
+        return false;
+    }
+    return exportsArray.some(isFlatConfigIgnoresBlock);
+}
+function isFlatConfigIgnoresBlock(node) {
+    return (ts.isObjectLiteralExpression(node) &&
+        node.properties.length === 1 &&
+        (node.properties[0].name.getText() === 'ignores' ||
+            node.properties[0].name.getText() === '"ignores"') &&
+        ts.isPropertyAssignment(node.properties[0]) &&
+        ts.isArrayLiteralExpression(node.properties[0].initializer));
+}
 function isOverride(node) {
     return ((ts.isObjectLiteralExpression(node) &&
-        node.properties.some((p) => p.name.getText() === 'files')) ||
+        node.properties.some((p) => p.name.getText() === 'files' || p.name.getText() === '"files"')) ||
         // detect ...compat.config(...).map(...)
         (ts.isSpreadElement(node) &&
             ts.isCallExpression(node.expression) &&
@@ -74,7 +136,8 @@ function isOverride(node) {
 }
 function hasOverride(content, lookup) {
     const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
-    const exportsArray = findAllBlocks(source);
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
+    const exportsArray = format === 'mjs' ? findExportDefault(source) : findModuleExports(source);
     if (!exportsArray) {
         return false;
     }
@@ -105,14 +168,16 @@ function parseTextToJson(text) {
         .replace(/'/g, '"')
         .replace(/\s([a-zA-Z0-9_]+)\s*:/g, ' "$1": ')
         // stringify any require calls to avoid JSON parsing errors, turn them into just the string value being required
-        .replace(/require\(['"]([^'"]+)['"]\)/g, '"$1"'));
+        .replace(/require\(['"]([^'"]+)['"]\)/g, '"$1"')
+        .replace(/\(?await import\(['"]([^'"]+)['"]\)\)?/g, '"$1"'));
 }
 /**
  * Finds an override matching the lookup function and applies the update function to it
  */
 function replaceOverride(content, root, lookup, update) {
     const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
-    const exportsArray = findAllBlocks(source);
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
+    const exportsArray = format === 'mjs' ? findExportDefault(source) : findModuleExports(source);
     if (!exportsArray) {
         return content;
     }
@@ -145,15 +210,17 @@ function replaceOverride(content, root, lookup, update) {
                 let updatedData = update(data);
                 if (updatedData) {
                     updatedData = mapFilePaths(updatedData);
+                    const parserReplacement = format === 'mjs'
+                        ? (parser) => `(await import('${parser}'))`
+                        : (parser) => `require('${parser}')`;
                     changes.push({
                         type: devkit_1.ChangeType.Insert,
                         index: start,
-                        text: JSON.stringify(updatedData, null, 2)
-                            // restore any parser require calls that were stripped during JSON parsing
-                            .replace(/"parser": "([^"]+)"/g, (_, parser) => {
-                            return `"parser": require('${parser}')`;
-                        })
-                            .slice(2, -2), // remove curly braces and start/end line breaks since we are injecting just properties
+                        text: '    ' +
+                            JSON.stringify(updatedData, null, 2)
+                                .replace(/"parser": "([^"]+)"/g, (_, parser) => `"parser": ${parserReplacement(parser)}`)
+                                .slice(2, -2) // Remove curly braces and start/end line breaks
+                                .replaceAll(/\n/g, '\n    '), // Maintain indentation
                     });
                 }
             }
@@ -162,11 +229,89 @@ function replaceOverride(content, root, lookup, update) {
     return (0, devkit_1.applyChangesToString)(content, changes);
 }
 /**
- * Adding require statement to the top of the file
+ * Adding import statement to the top of the file
+ * The imports are added based on a few rules:
+ * 1. If it's a default import and matches the variable, return content unchanged.
+ * 2. If it's a named import and the variables are not part of the import object, add them.
+ * 3. If no existing import and variable is a string, add a default import.
+ * 4. If no existing import and variable is an array, add it as an object import.
  */
 function addImportToFlatConfig(content, variable, imp) {
     const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
     const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
+    if (format === 'mjs') {
+        return addESMImportToFlatConfig(source, printer, content, variable, imp);
+    }
+    return addCJSImportToFlatConfig(source, printer, content, variable, imp);
+}
+function addESMImportToFlatConfig(source, printer, content, variable, imp) {
+    let existingImport;
+    ts.forEachChild(source, (node) => {
+        if (ts.isImportDeclaration(node) &&
+            ts.isStringLiteral(node.moduleSpecifier) &&
+            node.moduleSpecifier.text === imp) {
+            existingImport = node;
+        }
+    });
+    // Rule 1:
+    if (existingImport &&
+        typeof variable === 'string' &&
+        existingImport.importClause?.name?.getText() === variable) {
+        return content;
+    }
+    // Rule 2:
+    if (existingImport &&
+        existingImport.importClause?.namedBindings &&
+        Array.isArray(variable)) {
+        const namedImports = existingImport.importClause
+            .namedBindings;
+        const existingElements = namedImports.elements;
+        // Filter out variables that are already imported
+        const newVariables = variable.filter((v) => !existingElements.some((e) => e.name.getText() === v));
+        if (newVariables.length === 0) {
+            return content;
+        }
+        const newImportSpecifiers = newVariables.map((v) => ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier(v)));
+        const lastElement = existingElements[existingElements.length - 1];
+        const insertIndex = lastElement
+            ? lastElement.getEnd()
+            : namedImports.getEnd();
+        const insertText = printer.printList(ts.ListFormat.NamedImportsOrExportsElements, ts.factory.createNodeArray(newImportSpecifiers), source);
+        return (0, devkit_1.applyChangesToString)(content, [
+            {
+                type: devkit_1.ChangeType.Insert,
+                index: insertIndex,
+                text: `, ${insertText}`,
+            },
+        ]);
+    }
+    // Rule 3:
+    if (!existingImport && typeof variable === 'string') {
+        const defaultImport = ts.factory.createImportDeclaration(undefined, ts.factory.createImportClause(false, ts.factory.createIdentifier(variable), undefined), ts.factory.createStringLiteral(imp));
+        const insert = printer.printNode(ts.EmitHint.Unspecified, defaultImport, source);
+        return (0, devkit_1.applyChangesToString)(content, [
+            {
+                type: devkit_1.ChangeType.Insert,
+                index: 0,
+                text: `${insert}\n`,
+            },
+        ]);
+    }
+    // Rule 4:
+    if (!existingImport && Array.isArray(variable)) {
+        const objectImport = ts.factory.createImportDeclaration(undefined, ts.factory.createImportClause(false, undefined, ts.factory.createNamedImports(variable.map((v) => ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier(v))))), ts.factory.createStringLiteral(imp));
+        const insert = printer.printNode(ts.EmitHint.Unspecified, objectImport, source);
+        return (0, devkit_1.applyChangesToString)(content, [
+            {
+                type: devkit_1.ChangeType.Insert,
+                index: 0,
+                text: `${insert}\n`,
+            },
+        ]);
+    }
+}
+function addCJSImportToFlatConfig(source, printer, content, variable, imp) {
     const foundBindingVars = ts.forEachChild(source, function analyze(node) {
         // we can only combine object binding patterns
         if (!Array.isArray(variable)) {
@@ -235,11 +380,48 @@ function addImportToFlatConfig(content, variable, imp) {
         },
     ]);
 }
+function existsAsNamedOrDefaultImport(node, variable) {
+    const isNamed = node.importClause.namedBindings &&
+        ts.isNamedImports(node.importClause.namedBindings);
+    if (Array.isArray(variable)) {
+        return isNamed || variable.includes(node.importClause?.name?.getText());
+    }
+    return ((node.importClause.namedBindings &&
+        ts.isNamedImports(node.importClause.namedBindings)) ||
+        node.importClause?.name?.getText() === variable);
+}
 /**
  * Remove an import from flat config
  */
 function removeImportFromFlatConfig(content, variable, imp) {
     const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
+    if (format === 'mjs') {
+        return removeImportFromFlatConfigESM(source, content, variable, imp);
+    }
+    else {
+        return removeImportFromFlatConfigCJS(source, content, variable, imp);
+    }
+}
+function removeImportFromFlatConfigESM(source, content, variable, imp) {
+    const changes = [];
+    ts.forEachChild(source, (node) => {
+        // we can only combine object binding patterns
+        if (ts.isImportDeclaration(node) &&
+            ts.isStringLiteral(node.moduleSpecifier) &&
+            node.moduleSpecifier.text === imp &&
+            node.importClause &&
+            existsAsNamedOrDefaultImport(node, variable)) {
+            changes.push({
+                type: devkit_1.ChangeType.Delete,
+                start: node.pos,
+                length: node.end - node.pos,
+            });
+        }
+    });
+    return (0, devkit_1.applyChangesToString)(content, changes);
+}
+function removeImportFromFlatConfigCJS(source, content, variable, imp) {
     const changes = [];
     ts.forEachChild(source, (node) => {
         // we can only combine object binding patterns
@@ -262,13 +444,44 @@ function removeImportFromFlatConfig(content, variable, imp) {
     return (0, devkit_1.applyChangesToString)(content, changes);
 }
 /**
- * Injects new ts.expression to the end of the module.exports array.
+ * Injects new ts.expression to the end of the module.exports or export default array.
  */
 function addBlockToFlatConfigExport(content, config, options = {
     insertAtTheEnd: true,
 }) {
     const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
     const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
+    // find the export default array statement
+    if (format === 'mjs') {
+        return addBlockToFlatConfigExportESM(content, config, source, printer, options);
+    }
+    else {
+        return addBlockToFlatConfigExportCJS(content, config, source, printer, options);
+    }
+}
+function addBlockToFlatConfigExportESM(content, config, source, printer, options = {
+    insertAtTheEnd: true,
+}) {
+    const exportDefaultStatement = source.statements.find((statement) => ts.isExportAssignment(statement) &&
+        ts.isArrayLiteralExpression(statement.expression));
+    if (!exportDefaultStatement)
+        return content;
+    const exportArrayLiteral = exportDefaultStatement.expression;
+    const updatedArrayElements = options.insertAtTheEnd
+        ? [...exportArrayLiteral.elements, config]
+        : [config, ...exportArrayLiteral.elements];
+    const updatedExportDefault = ts.factory.createExportAssignment(undefined, false, ts.factory.createArrayLiteralExpression(updatedArrayElements, true));
+    // update the existing export default array
+    const updatedStatements = source.statements.map((statement) => statement === exportDefaultStatement ? updatedExportDefault : statement);
+    const updatedSource = ts.factory.updateSourceFile(source, updatedStatements);
+    return printer
+        .printFile(updatedSource)
+        .replace(/export default/, '\nexport default');
+}
+function addBlockToFlatConfigExportCJS(content, config, source, printer, options = {
+    insertAtTheEnd: true,
+}) {
     const exportsArray = ts.forEachChild(source, function analyze(node) {
         if (ts.isExpressionStatement(node) &&
             ts.isBinaryExpression(node.expression) &&
@@ -282,7 +495,10 @@ function addBlockToFlatConfigExport(content, config, options = {
     // base config was not generated by Nx.
     if (!exportsArray)
         return content;
-    const insert = printer.printNode(ts.EmitHint.Expression, config, source);
+    const insert = '    ' +
+        printer
+            .printNode(ts.EmitHint.Expression, config, source)
+            .replaceAll(/\n/g, '\n    ');
     if (options.insertAtTheEnd) {
         const index = exportsArray.length > 0
             ? exportsArray.at(exportsArray.length - 1).end
@@ -301,35 +517,54 @@ function addBlockToFlatConfigExport(content, config, options = {
             {
                 type: devkit_1.ChangeType.Insert,
                 index,
-                text: `\n${insert},`,
+                text: `\n${insert},\n`,
             },
         ]);
     }
 }
 function removePlugin(content, pluginName, pluginImport) {
     const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
     const changes = [];
+    if (format === 'mjs') {
+        ts.forEachChild(source, function analyze(node) {
+            if (ts.isImportDeclaration(node) &&
+                ts.isStringLiteral(node.moduleSpecifier) &&
+                node.moduleSpecifier.text === pluginImport) {
+                const importClause = node.importClause;
+                if ((importClause && importClause.name) ||
+                    (importClause.namedBindings &&
+                        ts.isNamedImports(importClause.namedBindings))) {
+                    changes.push({
+                        type: devkit_1.ChangeType.Delete,
+                        start: node.pos,
+                        length: node.end - node.pos,
+                    });
+                }
+            }
+        });
+    }
+    else {
+        ts.forEachChild(source, function analyze(node) {
+            if (ts.isVariableStatement(node) &&
+                ts.isVariableDeclaration(node.declarationList.declarations[0]) &&
+                ts.isCallExpression(node.declarationList.declarations[0].initializer) &&
+                node.declarationList.declarations[0].initializer.arguments.length &&
+                ts.isStringLiteral(node.declarationList.declarations[0].initializer.arguments[0]) &&
+                node.declarationList.declarations[0].initializer.arguments[0].text ===
+                    pluginImport) {
+                changes.push({
+                    type: devkit_1.ChangeType.Delete,
+                    start: node.pos,
+                    length: node.end - node.pos,
+                });
+            }
+        });
+    }
     ts.forEachChild(source, function analyze(node) {
-        if (ts.isVariableStatement(node) &&
-            ts.isVariableDeclaration(node.declarationList.declarations[0]) &&
-            ts.isCallExpression(node.declarationList.declarations[0].initializer) &&
-            node.declarationList.declarations[0].initializer.arguments.length &&
-            ts.isStringLiteral(node.declarationList.declarations[0].initializer.arguments[0]) &&
-            node.declarationList.declarations[0].initializer.arguments[0].text ===
-                pluginImport) {
-            changes.push({
-                type: devkit_1.ChangeType.Delete,
-                start: node.pos,
-                length: node.end - node.pos,
-            });
-        }
-    });
-    ts.forEachChild(source, function analyze(node) {
-        if (ts.isExpressionStatement(node) &&
-            ts.isBinaryExpression(node.expression) &&
-            node.expression.left.getText() === 'module.exports' &&
-            ts.isArrayLiteralExpression(node.expression.right)) {
-            const blockElements = node.expression.right.elements;
+        if (ts.isExportAssignment(node) &&
+            ts.isArrayLiteralExpression(node.expression)) {
+            const blockElements = node.expression.elements;
             blockElements.forEach((element) => {
                 if (ts.isObjectLiteralExpression(element)) {
                     const pluginsElem = element.properties.find((prop) => prop.name?.getText() === 'plugins');
@@ -419,7 +654,12 @@ function removePlugin(content, pluginName, pluginImport) {
 function removeCompatExtends(content, compatExtends) {
     const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
     const changes = [];
-    findAllBlocks(source)?.forEach((node) => {
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
+    const exportsArray = format === 'mjs' ? findExportDefault(source) : findModuleExports(source);
+    if (!exportsArray) {
+        return content;
+    }
+    exportsArray.forEach((node) => {
         if (ts.isSpreadElement(node) &&
             ts.isCallExpression(node.expression) &&
             ts.isArrowFunction(node.expression.arguments[0]) &&
@@ -453,9 +693,14 @@ function removeCompatExtends(content, compatExtends) {
 }
 function removePredefinedConfigs(content, moduleImport, moduleVariable, configs) {
     const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
     const changes = [];
     let removeImport = true;
-    findAllBlocks(source)?.forEach((node) => {
+    const exportsArray = format === 'mjs' ? findExportDefault(source) : findModuleExports(source);
+    if (!exportsArray) {
+        return content;
+    }
+    exportsArray.forEach((node) => {
         if (ts.isSpreadElement(node) &&
             ts.isElementAccessExpression(node.expression) &&
             ts.isPropertyAccessExpression(node.expression.expression) &&
@@ -500,14 +745,22 @@ function addPluginsToExportsBlock(content, plugins) {
  * Adds compat if missing to flat config
  */
 function addFlatCompatToFlatConfig(content) {
-    let result = content;
-    result = addImportToFlatConfig(result, 'js', '@eslint/js');
+    const result = addImportToFlatConfig(content, 'js', '@eslint/js');
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
     if (result.includes('const compat = new FlatCompat')) {
         return result;
     }
-    result = addImportToFlatConfig(result, ['FlatCompat'], '@eslint/eslintrc');
-    const index = result.indexOf('module.exports');
-    return (0, devkit_1.applyChangesToString)(result, [
+    if (format === 'mjs') {
+        return addFlatCompatToFlatConfigESM(result);
+    }
+    else {
+        return addFlatCompatToFlatConfigCJS(result);
+    }
+}
+function addFlatCompatToFlatConfigCJS(content) {
+    content = addImportToFlatConfig(content, ['FlatCompat'], '@eslint/eslintrc');
+    const index = content.indexOf('module.exports');
+    return (0, devkit_1.applyChangesToString)(content, [
         {
             type: devkit_1.ChangeType.Insert,
             index: index - 1,
@@ -520,25 +773,62 @@ const compat = new FlatCompat({
         },
     ]);
 }
+function addFlatCompatToFlatConfigESM(content) {
+    const importsToAdd = [
+        { variable: 'js', module: '@eslint/js' },
+        { variable: ['fileURLToPath'], module: 'url' },
+        { variable: ['dirname'], module: 'path' },
+        { variable: ['FlatCompat'], module: '@eslint/eslintrc' },
+    ];
+    for (const { variable, module } of importsToAdd) {
+        content = addImportToFlatConfig(content, variable, module);
+    }
+    const index = content.indexOf('export default');
+    return (0, devkit_1.applyChangesToString)(content, [
+        {
+            type: devkit_1.ChangeType.Insert,
+            index: index - 1,
+            text: `
+const compat = new FlatCompat({
+  baseDirectory: dirname(fileURLToPath(import.meta.url)),
+  recommendedConfig: js.configs.recommended,
+});\n
+`,
+        },
+    ]);
+}
 /**
  * Generate node list representing the imports and the exports blocks
  * Optionally add flat compat initialization
  */
-function createNodeList(importsMap, exportElements) {
+function createNodeList(importsMap, exportElements, format) {
     const importsList = [];
-    // generateRequire(varName, imp, ts.factory);
     Array.from(importsMap.entries()).forEach(([imp, varName]) => {
-        importsList.push(generateRequire(varName, imp));
+        if (format === 'mjs') {
+            importsList.push(generateESMImport(varName, imp));
+        }
+        else {
+            importsList.push(generateRequire(varName, imp));
+        }
     });
+    const exports = format === 'mjs'
+        ? generateESMExport(exportElements)
+        : generateCJSExport(exportElements);
     return ts.factory.createNodeArray([
         // add plugin imports
         ...importsList,
         ts.createSourceFile('', '', ts.ScriptTarget.Latest, false, ts.ScriptKind.JS),
-        // creates:
-        // module.exports = [ ... ];
-        ts.factory.createExpressionStatement(ts.factory.createBinaryExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier('module'), ts.factory.createIdentifier('exports')), ts.factory.createToken(ts.SyntaxKind.EqualsToken), ts.factory.createArrayLiteralExpression(exportElements, true))),
+        exports,
     ]);
 }
+function generateESMExport(elements) {
+    // creates: export default = [...]
+    return ts.factory.createExportAssignment(undefined, false, ts.factory.createArrayLiteralExpression(elements, true));
+}
+function generateCJSExport(elements) {
+    // creates: module.exports = [...]
+    return ts.factory.createExpressionStatement(ts.factory.createBinaryExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier('module'), ts.factory.createIdentifier('exports')), ts.factory.createToken(ts.SyntaxKind.EqualsToken), ts.factory.createArrayLiteralExpression(elements, true)));
+}
 function generateSpreadElement(name) {
     return ts.factory.createSpreadElement(ts.factory.createIdentifier(name));
 }
@@ -556,12 +846,17 @@ function generatePluginExtendsElementWithCompatFixup(plugin) {
 function stringifyNodeList(nodes) {
     const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
     const resultFile = ts.createSourceFile('', '', ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
-    return (printer
+    const result = 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'));
+        .replace(/const compat = new FlatCompat/, '\nconst compat = new FlatCompat');
+    if (result.includes('export default')) {
+        return result // add new line before export default = ...
+            .replace(/export default/, '\nexport default');
+    }
+    else {
+        return result.replace(/module.exports/, '\nmodule.exports');
+    }
 }
 /**
  * generates AST require statement
@@ -571,6 +866,26 @@ function generateRequire(variableName, imp) {
         ts.factory.createVariableDeclaration(variableName, undefined, undefined, ts.factory.createCallExpression(ts.factory.createIdentifier('require'), undefined, [ts.factory.createStringLiteral(imp)])),
     ], ts.NodeFlags.Const));
 }
+// Top level imports
+function generateESMImport(variableName, imp) {
+    let importClause;
+    if (typeof variableName === 'string') {
+        // For single variable import e.g import foo from 'module';
+        importClause = ts.factory.createImportClause(false, ts.factory.createIdentifier(variableName), undefined);
+    }
+    else {
+        // For object binding pattern import e.g import { a, b, c } from 'module';
+        importClause = ts.factory.createImportClause(false, undefined, ts.factory.createNamedImports(variableName.elements.map((element) => {
+            const propertyName = element.propertyName
+                ? ts.isIdentifier(element.propertyName)
+                    ? element.propertyName
+                    : ts.factory.createIdentifier(element.propertyName.getText())
+                : undefined;
+            return ts.factory.createImportSpecifier(false, propertyName, element.name);
+        })));
+    }
+    return ts.factory.createImportDeclaration(undefined, importClause, ts.factory.createStringLiteral(imp));
+}
 /**
  * FROM: https://github.com/eslint/rewrite/blob/e2a7ec809db20e638abbad250d105ddbde88a8d5/packages/migrate-config/src/migrate-config.js#L222
  *
@@ -596,7 +911,7 @@ function overrideNeedsCompat(override) {
  * Generates an AST object or spread element representing a modern flat config entry,
  * based on a given legacy eslintrc JSON override object
  */
-function generateFlatOverride(_override) {
+function generateFlatOverride(_override, format) {
     const override = mapFilePaths(_override);
     // We do not need the compat tooling for this override
     if (!overrideNeedsCompat(override)) {
@@ -652,21 +967,41 @@ function generateFlatOverride(_override) {
                     return propertyAssignment;
                 }
                 else {
-                    // Change parser to require statement.
-                    return ts.factory.createPropertyAssignment('parser', ts.factory.createCallExpression(ts.factory.createIdentifier('require'), undefined, [
-                        ts.factory.createStringLiteral(override['languageOptions']?.['parserOptions']?.parser ??
-                            override['languageOptions']?.parser ??
-                            override.parser),
-                    ]));
+                    // Change parser to import statement.
+                    return format === 'mjs'
+                        ? generateESMParserImport(override)
+                        : generateCJSParserImport(override);
                 }
             },
         });
     }
     // At this point we are applying the flat config compat tooling to the override
-    const { excludedFiles, parser, parserOptions, rules, files, ...rest } = override;
+    let { excludedFiles, parser, parserOptions, rules, files, ...rest } = override;
     const objectLiteralElements = [
         ts.factory.createSpreadAssignment(ts.factory.createIdentifier('config')),
     ];
+    // If converting the JS rule, then we need to match ESLint default and also include .cjs and .mjs files.
+    if ((Array.isArray(rest.extends) &&
+        rest.extends.includes('plugin:@nx/javascript')) ||
+        rest.extends === 'plugin:@nx/javascript') {
+        const newFiles = new Set(files);
+        newFiles.add('**/*.js');
+        newFiles.add('**/*.jsx');
+        newFiles.add('**/*.cjs');
+        newFiles.add('**/*.mjs');
+        files = Array.from(newFiles);
+    }
+    // If converting the TS rule, then we need to match ESLint default and also include .cts and .mts files.
+    if ((Array.isArray(rest.extends) &&
+        rest.extends.includes('plugin:@nx/typescript')) ||
+        rest.extends === 'plugin:@nx/typescript') {
+        const newFiles = new Set(files);
+        newFiles.add('**/*.ts');
+        newFiles.add('**/*.tsx');
+        newFiles.add('**/*.cts');
+        newFiles.add('**/*.mts');
+        files = Array.from(newFiles);
+    }
     addTSObjectProperty(objectLiteralElements, 'files', files);
     addTSObjectProperty(objectLiteralElements, 'excludedFiles', excludedFiles);
     // Apply rules (and spread ...config.rules into it as the first assignment)
@@ -690,6 +1025,20 @@ function generateFlatOverride(_override) {
         ], undefined, ts.factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken), ts.factory.createParenthesizedExpression(ts.factory.createObjectLiteralExpression(objectLiteralElements, true))),
     ]));
 }
+function generateESMParserImport(override) {
+    return ts.factory.createPropertyAssignment('parser', ts.factory.createAwaitExpression(ts.factory.createCallExpression(ts.factory.createIdentifier('import'), undefined, [
+        ts.factory.createStringLiteral(override['languageOptions']?.['parserOptions']?.parser ??
+            override['languageOptions']?.parser ??
+            override.parser),
+    ])));
+}
+function generateCJSParserImport(override) {
+    return ts.factory.createPropertyAssignment('parser', ts.factory.createCallExpression(ts.factory.createIdentifier('require'), undefined, [
+        ts.factory.createStringLiteral(override['languageOptions']?.['parserOptions']?.parser ??
+            override['languageOptions']?.parser ??
+            override.parser),
+    ]));
+}
 function generateFlatPredefinedConfig(predefinedConfigName, moduleName = 'nx', spread = true) {
     const node = ts.factory.createElementAccessExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier(moduleName), ts.factory.createIdentifier('configs')), ts.factory.createStringLiteral(predefinedConfigName));
     return spread ? ts.factory.createSpreadElement(node) : node;
@@ -722,14 +1071,14 @@ function addTSObjectProperty(elements, key, value) {
  */
 function generateAst(input, propertyAssignmentReplacer) {
     if (Array.isArray(input)) {
-        return ts.factory.createArrayLiteralExpression(input.map((item) => generateAst(item, propertyAssignmentReplacer)), input.length > 1 // multiline only if more than one item
+        return ts.factory.createArrayLiteralExpression(input.map((item) => generateAst(item, propertyAssignmentReplacer)), true // Always treat as multiline, using item.length does not work in all cases
         );
     }
     if (input === null) {
         return ts.factory.createNull();
     }
     if (typeof input === 'object') {
-        return ts.factory.createObjectLiteralExpression(generatePropertyAssignmentsFromObjectEntries(input, propertyAssignmentReplacer), Object.keys(input).length > 1 // multiline only if more than one property
+        return ts.factory.createObjectLiteralExpression(generatePropertyAssignmentsFromObjectEntries(input, propertyAssignmentReplacer), true // Always treat as multiline, using  Object.keys(input).length > 1 does not work in all cases
         );
     }
     if (typeof input === 'string') {