runCliJson should return unknown since it's unvalidated

Author: mario-campos

lib/entry-points.js

@@ -514,13 +514,9 @@ async function getCodeQLForCmd(
     async getVersion() {
       let result = util.getCachedCodeQlVersion(cmd);
       if (result === undefined) {
-        result = await runCliJson<VersionInfo>(
-          cmd,
-          ["version", "--format=json"],
-          {
-            noStreamStdout: true,
-          },
-        );
+        result = (await runCliJson(cmd, ["version", "--format=json"], {
+          noStreamStdout: true,
+        })) as VersionInfo;
         util.cacheCodeQlVersion(cmd, result);
       }
       return result;
@@ -728,7 +724,7 @@ async function getCodeQLForCmd(
         filterToLanguagesWithQueries: boolean;
       } = { filterToLanguagesWithQueries: false },
     ) {
-      return runCliJson<ResolveLanguagesOutput>(cmd, [
+      return (await runCliJson(cmd, [
         "resolve",
         "languages",
         "--format=betterjson",
@@ -741,7 +737,7 @@ async function getCodeQLForCmd(
           ? ["--filter-to-languages-with-queries"]
           : []),
         ...getExtraOptionsFromEnv(["resolve", "languages"]),
-      ]);
+      ])) as ResolveLanguagesOutput;
     },
     async resolveBuildEnvironment(
       workingDir: string | undefined,
@@ -757,7 +753,10 @@ async function getCodeQLForCmd(
       if (workingDir !== undefined) {
         codeqlArgs.push("--working-dir", workingDir);
       }
-      return await runCliJson<ResolveBuildEnvironmentOutput>(cmd, codeqlArgs);
+      return (await runCliJson(
+        cmd,
+        codeqlArgs,
+      )) as ResolveBuildEnvironmentOutput;
     },
     async databaseRunQueries(
       databasePath: string,
@@ -959,9 +958,9 @@ async function getCodeQLForCmd(
         ...getExtraOptionsFromEnv(["resolve", "queries"]),
         ...queries,
       ];
-      return await runCliJson<string[]>(cmd, codeqlArgs, {
+      return (await runCliJson(cmd, codeqlArgs, {
         noStreamStdout: true,
-      });
+      })) as string[];
     },
     async resolveDatabase(
       databasePath: string,
@@ -973,9 +972,9 @@ async function getCodeQLForCmd(
         "--format=json",
         ...getExtraOptionsFromEnv(["resolve", "database"]),
       ];
-      return await runCliJson<ResolveDatabaseOutput>(cmd, codeqlArgs, {
+      return (await runCliJson(cmd, codeqlArgs, {
         noStreamStdout: true,
-      });
+      })) as ResolveDatabaseOutput;
     },
     async mergeResults(
       sarifFiles: string[],
@@ -1140,14 +1139,14 @@ async function runCli(
  * @param opts.noStreamStdout Optional boolean to indicate whether to stream the command's standard output.
  * @returns The parsed JSON output from the command.
  */
-async function runCliJson<T>(
+async function runCliJson(
   cmd: string,
   args: string[] = [],
   opts: { stdin?: string; noStreamStdout?: boolean } = {},
-): Promise<T> {
+): Promise<unknown> {
   const output = await runCli(cmd, args, opts);
   try {
-    return JSON.parse(output) as T;
+    return JSON.parse(output);
   } catch (e) {
     throw Error(
       `Unexpected output from codeql ${args.join(" ")}: ${getErrorMessage(e)}`,