chore: Add comment for the "ts-expect-error"

eslint-community · Apr 7, 2024 · 5ea136a · 5ea136a
1 parent 45009d3
commit 5ea136a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 27 deletions.
diff --git a/lib/typescript-fixes.d.ts b/lib/typescript-fixes.d.ts
diff --git a/lib/util/get-package-json.js b/lib/util/get-package-json.js
@@ -22,9 +22,7 @@ function readPackageJson(dir) {
     const filePath = path.join(dir, "package.json")
     try {
         const text = fs.readFileSync(filePath, "utf8")
-        const data = /** @type {import('type-fest').JsonValue} */ (
-            JSON.parse(text)
-        )
+        const data = JSON.parse(text)
 
         if (
             data != null &&

diff --git a/lib/util/merge-visitors-in-place.js b/lib/util/merge-visitors-in-place.js
@@ -16,23 +16,26 @@ module.exports = function mergeVisitorsInPlace(visitor1, visitor2) {
         const handler1 = visitor1[key]
         const handler2 = visitor2[key]
 
-        if (typeof handler1 === "function") {
-            // @ts-expect-error
-            if (handler1._handlers) {
-                // @ts-expect-error
-                handler1._handlers.push(handler2)
-            } else {
-                const handlers = [handler1, handler2]
-                // @ts-expect-error
-                visitor1[key] = Object.assign(
-                    // @ts-expect-error
-                    dispatch.bind(null, handlers),
-                    { _handlers: handlers }
-                )
-            }
-        } else {
+        if (typeof handler1 !== "function") {
             visitor1[key] = handler2
+            continue
         }
+
+        if (typeof handler2 !== "function") {
+            continue
+        }
+
+        if ("_handlers" in handler1 && Array.isArray(handler1._handlers)) {
+            handler1._handlers.push(handler2)
+            continue
+        }
+
+        const handlers = [handler1, handler2]
+
+        // @ts-expect-error - This is because its expecting a function that can match all {Rule.RuleListener[string]} functions!
+        visitor1[key] = Object.assign(dispatch.bind(null, handlers), {
+            _handlers: handlers,
+        })
     }
 
     return visitor1

diff --git a/tsconfig.json b/tsconfig.json
@@ -20,6 +20,6 @@
         "skipDefaultLibCheck": false,
         "skipLibCheck": false
     },
-    "include": ["./lib/eslint-utils.d.ts", "lib/typescript-fixes.d.ts"],
+    "include": ["./lib/eslint-utils.d.ts"],
     "files": ["./lib/index.js"]
 }