follow, walker: fix types of follow, reduce confusion

Author: jesec

lib/follow.ts

@@ -1,11 +1,11 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
 import { core, sync, SyncOpts } from 'resolve';
 import assert from 'assert';
 import fs from 'fs';
 import path from 'path';
 import { toNormalizedRealPath } from './common';
 
+import type { PackageJson } from './types';
+
 Object.keys(core).forEach((key) => {
   // 'resolve' hardcodes the list to host's one, but i need
   // to be able to allow 'worker_threads' (target 12) on host 8
@@ -35,10 +35,10 @@ function parentDirectoriesContain(parent: string, directory: string) {
   }
 }
 
-interface FollowOptions
-  extends Pick<SyncOpts, 'basedir' | 'extensions' | 'packageFilter'> {
+interface FollowOptions extends Pick<SyncOpts, 'basedir' | 'extensions'> {
   ignoreFile?: string;
-  readFile?: (file: string) => void;
+  catchReadFile?: (file: string) => void;
+  catchPackageFilter?: (config: PackageJson, base: string, dir: string) => void;
 }
 
 export function follow(x: string, opts: FollowOptions) {
@@ -100,15 +100,15 @@ export function follow(x: string, opts: FollowOptions) {
             return Buffer.from(`{"main":"${PROOF}"}`);
           }
 
-          if (opts.readFile) {
-            opts.readFile(file);
+          if (opts.catchReadFile) {
+            opts.catchReadFile(file);
           }
 
           return fs.readFileSync(file);
         },
-        packageFilter: (config, base) => {
-          if (opts.packageFilter) {
-            opts.packageFilter(config, base);
+        packageFilter: (config, base, dir) => {
+          if (opts.catchPackageFilter) {
+            opts.catchPackageFilter(config, base, dir);
           }
 
           return config;

lib/walker.ts

@@ -762,8 +762,8 @@ class Walker {
         // is not taken in require('./typos')
         // in 'normalize-package-data/lib/fixer.js'
         extensions: ['.js', '.json', '.node'],
-        readFile: catchReadFile,
-        packageFilter: catchPackageFilter,
+        catchReadFile,
+        catchPackageFilter,
       });
     } catch (error) {
       failure = error as Error;