fix(eslint): restore generic type arguments

Co-authored-by: llwt <llwt@users.noreply.github.com>

Author: nx-cloud[bot]

packages/eslint/src/generators/utils/flat-config/ast-utils.ts

@@ -51,7 +51,7 @@ export function removeOverridesFromLintConfig(content: string): string {
 }
 
 // TODO Change name
-function findExportDefault(source: ts.SourceFile): ts.NodeArray {
+function findExportDefault(source: ts.SourceFile): ts.NodeArray<ts.Node> {
   return ts.forEachChild(source, function analyze(node) {
     if (
       ts.isExportAssignment(node) &&
@@ -62,7 +62,7 @@ function findExportDefault(source: ts.SourceFile): ts.NodeArray {
   });
 }
 
-function findModuleExports(source: ts.SourceFile): ts.NodeArray {
+function findModuleExports(source: ts.SourceFile): ts.NodeArray<ts.Node> {
   return ts.forEachChild(source, function analyze(node) {
     if (
       ts.isExpressionStatement(node) &&
@@ -170,7 +170,7 @@ function isOverride(node: ts.Node): boolean {
 
 export function hasOverride(
   content: string,
-  lookup: (override: Linter.ConfigOverride) => boolean
+  lookup: (override: Linter.ConfigOverride<Linter.RulesRecord>) => boolean
 ): boolean {
   const source = ts.createSourceFile(
     '',
@@ -187,7 +187,7 @@ export function hasOverride(
   }
   for (const node of exportsArray) {
     if (isOverride(node)) {
-      let data: Partial;
+      let data: Partial<Record<string, unknown>>;
 
       if (ts.isObjectLiteralExpression(node)) {
         data = extractPropertiesFromObjectLiteral(node);
@@ -201,7 +201,9 @@ export function hasOverride(
         }
       }
 
-      if (lookup(data as Linter.ConfigOverride)) {
+      if (
+        lookup(data as unknown as Linter.ConfigOverride<Linter.RulesRecord>)
+      ) {
         return true;
       }
     }
@@ -247,7 +249,7 @@ function extractLiteralValue(node: ts.Node): unknown {
   }
 
   if (ts.isObjectLiteralExpression(node)) {
-    const obj: Record = {};
+    const obj: Record<string, unknown> = {};
     for (const prop of node.properties) {
       if (ts.isPropertyAssignment(prop)) {
         const name = prop.name.getText().replace(/['"]/g, '');
@@ -279,8 +281,8 @@ function extractLiteralValue(node: ts.Node): unknown {
  */
 function extractPropertiesFromObjectLiteral(
   node: ts.ObjectLiteralExpression
-): Partial {
-  const result: Record = {};
+): Partial<Record<string, unknown>> {
+  const result: Record<string, unknown> = {};
   for (const prop of node.properties) {
     if (ts.isPropertyAssignment(prop)) {
       const name = prop.name.getText().replace(/['"]/g, '');
@@ -291,7 +293,7 @@ function extractPropertiesFromObjectLiteral(
     }
   }
 
-  return result as Partial;
+  return result as Partial<Record<string, unknown>>;
 }
 
 /**
@@ -315,7 +317,10 @@ function findPropertyNode(
 /**
  * Find properties that are added, changed, or removed.
  */
-function findChangedProperties(original: Record, updated: Record): string[] {
+function findChangedProperties(
+  original: Record<string, unknown>,
+  updated: Record<string, unknown>
+): string[] {
   const changed: string[] = [];
   // Check modified/added properties
   for (const key of Object.keys(updated)) {
@@ -356,8 +361,10 @@ function serializeValue(value: unknown, format: 'mjs' | 'cjs'): string {
 export function replaceOverride(
   content: string,
   root: string,
-  lookup: (override: Linter.ConfigOverride) => boolean,
-  update?: (override: Partial) => Partial
+  lookup: (override: Linter.ConfigOverride<Linter.RulesRecord>) => boolean,
+  update?: (
+    override: Partial<Linter.ConfigOverride<Linter.RulesRecord>>
+  ) => Partial<Linter.ConfigOverride<Linter.RulesRecord>>
 ): string {
   const source = ts.createSourceFile(
     '',
@@ -393,17 +400,19 @@ export function replaceOverride(
 
     // Use AST-based extraction to handle variable references (e.g., plugins: { 'abc': abc })
     const data = extractPropertiesFromObjectLiteral(objectLiteralNode);
-    if (lookup(data as Linter.ConfigOverride)) {
+    if (lookup(data as unknown as Linter.ConfigOverride<Linter.RulesRecord>)) {
       // Deep clone before update (update functions may mutate nested objects)
       const originalData = structuredClone(data);
 
-      let updatedData = update?.(data);
+      let updatedData = update?.(
+        data as Partial<Linter.ConfigOverride<Linter.RulesRecord>>
+      );
       if (updatedData) {
         updatedData = mapFilePaths(updatedData);
 
         const changedProps = findChangedProperties(
-          originalData as Record,
-          updatedData as Record
+          originalData as Record<string, unknown>,
+          updatedData as Record<string, unknown>
         );
 
         for (const propName of changedProps) {
@@ -632,7 +641,7 @@ function addCJSImportToFlatConfig(
   variable: string | string[],
   imp: string
 ): string {
-  const foundBindingVars: ts.NodeArray = ts.forEachChild(
+  const foundBindingVars: ts.NodeArray<ts.BindingElement> = ts.forEachChild(
     source,
     function analyze(node) {
       // we can only combine object binding patterns
@@ -1356,10 +1365,12 @@ const compat = new FlatCompat({
  * Optionally add flat compat initialization
  */
 export function createNodeList(
-  importsMap: Map,
+  importsMap: Map<string, string>,
   exportElements: ts.Expression[],
   format: 'mjs' | 'cjs'
-): ts.NodeArray {
+): ts.NodeArray<
+  ts.VariableStatement | ts.Identifier | ts.ExpressionStatement | ts.SourceFile
+> {
   const importsList = [];
 
   Array.from(importsMap.entries()).forEach(([imp, varName]) => {
@@ -1455,7 +1466,14 @@ export function generatePluginExtendsElementWithCompatFixup(
 /**
  * Stringifies TS nodes to file content string
  */
-export function stringifyNodeList(nodes: ts.NodeArray): string {
+export function stringifyNodeList(
+  nodes: ts.NodeArray<
+    | ts.VariableStatement
+    | ts.Identifier
+    | ts.ExpressionStatement
+    | ts.SourceFile
+  >
+): string {
   const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
   const resultFile = ts.createSourceFile(
     '',
@@ -1571,7 +1589,9 @@ function convertGlobPattern(pattern: string): string {
 // FROM: https://github.com/eslint/rewrite/blob/e2a7ec809db20e638abbad250d105ddbde88a8d5/packages/migrate-config/src/migrate-config.js#L38
 const keysToCopy = ['settings', 'rules', 'processor'];
 
-export function overrideNeedsCompat(override: Partial) {
+export function overrideNeedsCompat(
+  override: Partial<Linter.ConfigOverride<Linter.RulesRecord>>
+) {
   return override.env || override.extends || override.plugins;
 }
 
@@ -1580,7 +1600,7 @@ export function overrideNeedsCompat(override: Partial) {
  * based on a given legacy eslintrc JSON override object
  */
 export function generateFlatOverride(
-  _override: Partial & {
+  _override: Partial<Linter.ConfigOverride<Linter.RulesRecord>> & {
     ignores?: Linter.FlatConfig['ignores'];
   },
   format: 'mjs' | 'cjs'
@@ -1772,7 +1792,7 @@ export function generateFlatOverride(
 }
 
 function generateESMParserImport(
-  override: Partial & {
+  override: Partial<Linter.ConfigOverride<Linter.RulesRecord>> & {
     ignores?: Linter.FlatConfig['ignores'];
   }
 ): ts.PropertyAssignment {
@@ -1795,7 +1815,7 @@ function generateESMParserImport(
 }
 
 function generateCJSParserImport(
-  override: Partial & {
+  override: Partial<Linter.ConfigOverride<Linter.RulesRecord>> & {
     ignores?: Linter.FlatConfig['ignores'];
   }
 ): ts.PropertyAssignment {
@@ -1831,7 +1851,9 @@ export function generateFlatPredefinedConfig(
   return spread ? ts.factory.createSpreadElement(node) : node;
 }
 
-export function mapFilePaths<T extends Partial>(_override: T) {
+export function mapFilePaths<
+  T extends Partial<Linter.ConfigOverride<Linter.RulesRecord>>
+>(_override: T) {
   const override: T = {
     ..._override,
   };