Skip to content

Commit 377976a

Browse files
committed
Improve type of trapCaches now Language is non-exhaustive
1 parent ea05bf2 commit 377976a

10 files changed

+13
-19
lines changed

lib/analyze-action.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/analyze-action.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/config-utils.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/init-action.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/init-action.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/trap-caching.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/analyze-action.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,7 @@ async function sendStatusReport(
9999
...report,
100100
trap_cache_upload_duration_ms: Math.round(trapCacheUploadTime || 0),
101101
trap_cache_upload_size_bytes: Math.round(
102-
await getTotalCacheSize(
103-
Object.values(config.trapCaches).filter((x) => x !== undefined),
104-
logger,
105-
),
102+
await getTotalCacheSize(Object.values(config.trapCaches), logger),
106103
),
107104
};
108105
await statusReport.sendStatusReport(trapCacheUploadStatusReport);

src/config-utils.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ export interface Config {
146146
* Partial map from languages to locations of TRAP caches for that language.
147147
* If a key is omitted, then TRAP caching should not be used for that language.
148148
*/
149-
trapCaches: Partial<Record<Language, string>>;
149+
trapCaches: { [language: Language]: string };
150150

151151
/**
152152
* Time taken to download TRAP caches. Used for status reporting.
@@ -537,10 +537,10 @@ async function downloadCacheWithTime(
537537
languages: Language[],
538538
logger: Logger,
539539
): Promise<{
540-
trapCaches: Partial<Record<Language, string>>;
540+
trapCaches: { [language: string]: string };
541541
trapCacheDownloadTime: number;
542542
}> {
543-
let trapCaches = {};
543+
let trapCaches: { [language: string]: string } = {};
544544
let trapCacheDownloadTime = 0;
545545
if (trapCachingEnabled) {
546546
const start = performance.now();

src/init-action.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,10 +240,7 @@ async function sendCompletedStatusReport(
240240
packs: JSON.stringify(packs),
241241
trap_cache_languages: Object.keys(config.trapCaches).join(","),
242242
trap_cache_download_size_bytes: Math.round(
243-
await getTotalCacheSize(
244-
Object.values(config.trapCaches).filter((x) => x !== undefined),
245-
logger,
246-
),
243+
await getTotalCacheSize(Object.values(config.trapCaches), logger),
247244
),
248245
trap_cache_download_duration_ms: Math.round(config.trapCacheDownloadTime),
249246
overlay_base_database_download_size_bytes:

src/trap-caching.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ export async function downloadTrapCaches(
5050
codeql: CodeQL,
5151
languages: Language[],
5252
logger: Logger,
53-
): Promise<Partial<Record<Language, string>>> {
54-
const result: Partial<Record<Language, string>> = {};
53+
): Promise<{ [language: string]: string }> {
54+
const result: { [language: string]: string } = {};
5555
const languagesSupportingCaching = await getLanguagesSupportingCaching(
5656
codeql,
5757
languages,

0 commit comments

Comments
 (0)