Cosmetic

Author: jablko

src/pr-info.ts

@@ -354,7 +354,7 @@ async function getPackageInfosEtc(
     return { pkgInfo: result, popularityLevel: downloadsToPopularityLevel(maxDownloads) };
 }
 
-async function categorizeFile(path: string, contents: (ref: string) => Promise<string | undefined>): Promise<[string|null, FileInfo]> {
+async function categorizeFile(path: string, getContents: (ref: string) => Promise<string | undefined>): Promise<[string|null, FileInfo]> {
     // https://regex101.com/r/eFvtrz/1
     const match = /^types\/(.*?)\/.*?[^\/](?:\.(d\.ts|tsx?|md))?$/.exec(path);
     if (!match) return [null, { path, kind: "infrastructure" }];
@@ -364,26 +364,26 @@ async function categorizeFile(path: string, contents: (ref: string) => Promise<s
         case "ts": case "tsx": return [pkg, { path, kind: "test" }];
         case "md": return [pkg, { path, kind: "markdown" }];
         default:
-            const suspect = await configSuspicious(path, contents);
+            const suspect = await configSuspicious(path, getContents);
             return [pkg, { path, kind: suspect ? "package-meta" : "package-meta-ok", ...suspect }];
     }
 }
 
 interface ConfigSuspicious {
     (path: string, getContents: (ref: string) => Promise<string | undefined>): Promise<{ suspect: string, sugestion?: Suggestion } | undefined>;
-    [basename: string]: (text: string, getContents: (ref: string) => Promise<string | undefined>) => Promise<{ suspect: string, suggestion?: Suggestion } | undefined>;
+    [basename: string]: (newText: string, getContents: (ref: string) => Promise<string | undefined>) => Promise<{ suspect: string, suggestion?: Suggestion } | undefined>;
 };
 const configSuspicious = <ConfigSuspicious>(async (path, getContents) => {
     const basename = path.replace(/.*\//, "");
-    if (!(basename in configSuspicious)) return { suspect: `edited` };
-    const text = await getContents("head");
-    if (text === undefined) return { suspect: `couldn't fetch contents` };
     const tester = configSuspicious[basename];
-    return tester(text, getContents);
+    if (!tester) return { suspect: `edited` };
+    const newText = await getContents("head");
+    if (newText === undefined) return { suspect: `couldn't fetch contents` };
+    return tester(newText, getContents);
 });
-configSuspicious["OTHER_FILES.txt"] = async contents =>
+configSuspicious["OTHER_FILES.txt"] = async newText =>
     // not empty
-    (contents.length === 0) ? { suspect: "empty" }
+    (newText.length === 0) ? { suspect: "empty" }
     : undefined;
 configSuspicious["package.json"] = makeJsonCheckerFromCore(
     { private: true },
@@ -414,9 +414,9 @@ configSuspicious["tsconfig.json"] = makeJsonCheckerFromCore(
 // to it, ignoring some keys (JSON Patch paths).  The ignored properties are in most cases checked
 // elsewhere (dtslint), and in some cases they are irrelevant.
 function makeJsonCheckerFromCore(requiredForm: any, ignoredKeys: string[]) {
-    return async (contents: string, getContents: (ref: string) => Promise<string | undefined>) => {
+    return async (newText: string, getContents: (ref: string) => Promise<string | undefined>) => {
         let suggestion: any;
-        try { suggestion = JSON.parse(contents); } catch (e) { return { suspect: "couldn't parse json" }; }
+        try { suggestion = JSON.parse(newText); } catch (e) { return { suspect: "couldn't parse json" }; }
         const newJson = jsonDiff.deepClone(suggestion);
         jsonDiff.applyPatch(newJson, ignoredKeys.map(path => ({ op: "remove", path })));
         const towardsIt = jsonDiff.deepClone(requiredForm);
@@ -459,7 +459,7 @@ function makeJsonCheckerFromCore(requiredForm: any, ignoredKeys: string[]) {
                     ? prettier.format(JSON.stringify(suggestion), { tabWidth: 4, filepath: ".json" })
                     : JSON.stringify(suggestion, undefined, 4) + "\n"
             ).split(/^/m);
-            const lines = contents.split(/^/m);
+            const lines = newText.split(/^/m);
             // When suggestionLines is empty, that suggests removing all
             // of the different lines
             let startLine = 1;