Refactor CLI JSON handling into a dedicated runCliJson function

Author: mario-campos

lib/entry-points.js

@@ -524,16 +524,11 @@ async function getCodeQLForCmd(
     },
     async getVersion() {
       async function runCliVersion() {
-        const output = await runCli(cmd, ["version", "--format=json"], {
-          noStreamStdout: true,
-        });
-        try {
-          return JSON.parse(output) as VersionInfo;
-        } catch {
-          throw Error(
-            `Invalid JSON output from \`version --format=json\`: ${output}`,
-          );
-        }
+        return await runCliJson<VersionInfo>(
+          cmd,
+          ["version", "--format=json"],
+          { noStreamStdout: true },
+        );
       }
 
       let result = util.getCachedCodeQlVersion(cmd);
@@ -741,21 +736,12 @@ async function getCodeQLForCmd(
     },
     async resolveLanguages() {
       async function runCliResolveLanguages() {
-        const codeqlArgs = [
+        return await runCliJson<ResolveLanguagesOutput>(cmd, [
           "resolve",
           "languages",
           "--format=json",
           ...getExtraOptionsFromEnv(["resolve", "languages"]),
-        ];
-        const output = await runCli(cmd, codeqlArgs);
-
-        try {
-          return JSON.parse(output) as ResolveLanguagesOutput;
-        } catch (e) {
-          throw new Error(
-            `Unexpected output from codeql resolve languages: ${e}`,
-          );
-        }
+        ]);
       }
 
       let result = util.getCachedCodeQlResolveLanguages(cmd);
@@ -783,15 +769,7 @@ async function getCodeQLForCmd(
           : []),
         ...getExtraOptionsFromEnv(["resolve", "languages"]),
       ];
-      const output = await runCli(cmd, codeqlArgs);
-
-      try {
-        return JSON.parse(output) as BetterResolveLanguagesOutput;
-      } catch (e) {
-        throw new Error(
-          `Unexpected output from codeql resolve languages with --format=betterjson: ${e}`,
-        );
-      }
+      return await runCliJson<BetterResolveLanguagesOutput>(cmd, codeqlArgs);
     },
     async resolveBuildEnvironment(
       workingDir: string | undefined,
@@ -807,15 +785,7 @@ async function getCodeQLForCmd(
       if (workingDir !== undefined) {
         codeqlArgs.push("--working-dir", workingDir);
       }
-      const output = await runCli(cmd, codeqlArgs);
-
-      try {
-        return JSON.parse(output) as ResolveBuildEnvironmentOutput;
-      } catch (e) {
-        throw new Error(
-          `Unexpected output from codeql resolve build-environment: ${e} in\n${output}`,
-        );
-      }
+      return await runCliJson<ResolveBuildEnvironmentOutput>(cmd, codeqlArgs);
     },
     async databaseRunQueries(
       databasePath: string,
@@ -996,15 +966,9 @@ async function getCodeQLForCmd(
         ...getExtraOptionsFromEnv(["resolve", "queries"]),
         ...queries,
       ];
-      const output = await runCli(cmd, codeqlArgs, { noStreamStdout: true });
-
-      try {
-        return JSON.parse(output) as string[];
-      } catch (e) {
-        throw new Error(
-          `Unexpected output from codeql resolve queries --format=startingpacks: ${e}`,
-        );
-      }
+      return await runCliJson<string[]>(cmd, codeqlArgs, {
+        noStreamStdout: true,
+      });
     },
     async resolveDatabase(
       databasePath: string,
@@ -1016,15 +980,9 @@ async function getCodeQLForCmd(
         "--format=json",
         ...getExtraOptionsFromEnv(["resolve", "database"]),
       ];
-      const output = await runCli(cmd, codeqlArgs, { noStreamStdout: true });
-
-      try {
-        return JSON.parse(output) as ResolveDatabaseOutput;
-      } catch (e) {
-        throw new Error(
-          `Unexpected output from codeql resolve database --format=json: ${e}`,
-        );
-      }
+      return await runCliJson<ResolveDatabaseOutput>(cmd, codeqlArgs, {
+        noStreamStdout: true,
+      });
     },
     async mergeResults(
       sarifFiles: string[],
@@ -1180,6 +1138,19 @@ async function runCli(
   }
 }
 
+async function runCliJson<T>(
+  cmd: string,
+  args: string[] = [],
+  opts: { stdin?: string; noStreamStdout?: boolean } = {},
+): Promise<T> {
+  const output = await runCli(cmd, args, opts);
+  try {
+    return JSON.parse(output) as T;
+  } catch {
+    throw Error(`Invalid JSON output from \`${args.join(" ")}\`: ${output}`);
+  }
+}
+
 /**
  * Writes the code scanning configuration that is to be used by the CLI.
  *