chore(repo): correctly pin ktfmt version (#34917)

ktfmt... is supposed to be pinned

ktfmt is now actually pinned

(cherry picked from commit 537543e)

chore: formatting

chore(linter): format ast-utils.ts

Co-authored-by: llwt <[email protected]>

chore(eslint): format ast-utils.ts

Co-authored-by: llwt <[email protected]>

fix(eslint): restore generic type arguments

Co-authored-by: llwt <[email protected]>

Author: FrozenPandaz

gradle/libs.versions.toml

@@ -10,7 +10,7 @@ kotlinx-coroutines = "1.7.3"
 slf4j = "1.7.10"
 gradle-tooling-api = "8.13"
 shadow = "8.1.1"
-ktfmt = "0.52.0"
+ktfmt = "0.25.0"
 nx-project-graph = "0.1.7"
 gradle-plugin-publish = "1.2.1"
 
@@ -27,6 +27,6 @@ gradle-tooling-api = { module = "org.gradle:gradle-tooling-api", version.ref = "
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
-ktfmt = { id = "com.ncorti.ktfmt.gradle", version = "+" }
+ktfmt = { id = "com.ncorti.ktfmt.gradle", version.ref = "ktfmt" }
 nx-project-graph = { id = "dev.nx.gradle.project-graph", version.ref = "nx-project-graph" }
 gradle-plugin-publish = { id = "com.gradle.plugin-publish", version.ref = "gradle-plugin-publish" }

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

@@ -187,7 +187,7 @@ export function hasOverride(
   }
   for (const node of exportsArray) {
     if (isOverride(node)) {
-      let data: Partial<Linter.ConfigOverride<Linter.RulesRecord>>;
+      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<Linter.RulesRecord>)) {
+      if (
+        lookup(data as unknown as Linter.ConfigOverride<Linter.RulesRecord>)
+      ) {
         return true;
       }
     }
@@ -279,7 +281,7 @@ function extractLiteralValue(node: ts.Node): unknown {
  */
 function extractPropertiesFromObjectLiteral(
   node: ts.ObjectLiteralExpression
-): Partial<Linter.ConfigOverride<Linter.RulesRecord>> {
+): Partial<Record<string, unknown>> {
   const result: Record<string, unknown> = {};
   for (const prop of node.properties) {
     if (ts.isPropertyAssignment(prop)) {
@@ -291,7 +293,7 @@ function extractPropertiesFromObjectLiteral(
     }
   }
 
-  return result as Partial<Linter.ConfigOverride<Linter.RulesRecord>>;
+  return result as Partial<Record<string, unknown>>;
 }
 
 /**
@@ -398,11 +400,13 @@ 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<Linter.RulesRecord>)) {
+    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);
 
@@ -448,7 +452,10 @@ export function replaceOverride(
             changes.push({
               type: ChangeType.Insert,
               index: insertPos,
-              text: `${needsComma}\n    "${propName}": ${serializeValue(updatedValue, format)}`,
+              text: `${needsComma}\n    "${propName}": ${serializeValue(
+                updatedValue,
+                format
+              )}`,
             });
           }
         }
@@ -1892,9 +1899,7 @@ export function generateAst<T>(
 ): T {
   if (Array.isArray(input)) {
     return ts.factory.createArrayLiteralExpression(
-      input.map((item) =>
-        generateAst<ts.Expression>(item, propertyAssignmentReplacer)
-      ),
+      input.map((item) => generateAst(item, propertyAssignmentReplacer)),
       true // Always treat as multiline, using item.length does not work in all cases
     ) as T;
   }
@@ -1945,7 +1950,7 @@ function generatePropertyAssignmentsFromObjectEntries(
     .map(([key, value]) => {
       const original = ts.factory.createPropertyAssignment(
         isValidKey(key) ? key : ts.factory.createStringLiteral(key),
-        generateAst<ts.Expression>(value, propertyAssignmentReplacer)
+        generateAst(value, propertyAssignmentReplacer)
       );
       if (
         propertyAssignmentReplacer &&