fix cache types

renovatebot · Oct 3, 2020 · b0fa1aa · b0fa1aa
1 parent 7c7c088
commit b0fa1aa
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/lib/datasource/index.ts b/lib/datasource/index.ts
@@ -220,10 +220,10 @@ function getRawReleases(
     registryUrls
   )}`;
   // By returning a Promise and reusing it, we should only fetch each package at most once
-  const cachedResult = memCache.get<ReleaseResult>(cacheKey);
+  const cachedResult = memCache.get<Promise<ReleaseResult | null>>(cacheKey);
   // istanbul ignore if
-  if (cachedResult) {
-    return Promise.resolve(cachedResult);
+  if (cachedResult !== undefined) {
+    return cachedResult;
   }
   const promisedRes = fetchReleases(config);
   memCache.set(cacheKey, promisedRes);

diff --git a/lib/datasource/packagist/index.ts b/lib/datasource/packagist/index.ts
@@ -204,10 +204,10 @@ async function getAllPackages(regUrl: string): Promise<AllPackages | null> {
 
 function getAllCachedPackages(regUrl: string): Promise<AllPackages | null> {
   const cacheKey = `packagist-${regUrl}`;
-  const cachedResult = memCache.get<AllPackages>(cacheKey);
+  const cachedResult = memCache.get<Promise<AllPackages | null>>(cacheKey);
   // istanbul ignore if
-  if (cachedResult) {
-    return Promise.resolve(cachedResult);
+  if (cachedResult !== undefined) {
+    return cachedResult;
   }
   const promisedRes = getAllPackages(regUrl);
   memCache.set(cacheKey, promisedRes);

diff --git a/lib/workers/pr/changelog/release-notes.ts b/lib/workers/pr/changelog/release-notes.ts
@@ -42,10 +42,10 @@ export function getCachedReleaseList(
   repository: string
 ): Promise<ChangeLogNotes[]> {
   const cacheKey = `getReleaseList-${apiBaseUrl}-${repository}`;
-  const cachedResult = memCache.get<ChangeLogNotes[]>(cacheKey);
+  const cachedResult = memCache.get<Promise<ChangeLogNotes[]>>(cacheKey);
   // istanbul ignore if
-  if (cachedResult) {
-    return Promise.resolve(cachedResult);
+  if (cachedResult !== undefined) {
+    return cachedResult;
   }
   const promisedRes = getReleaseList(apiBaseUrl, repository);
   memCache.set(cacheKey, promisedRes);
@@ -179,12 +179,12 @@ export async function getReleaseNotesMdFileInner(
 export function getReleaseNotesMdFile(
   repository: string,
   apiBaseUrl: string
-): Promise<ChangeLogFile> | null {
+): Promise<ChangeLogFile | null> {
   const cacheKey = `getReleaseNotesMdFile-${repository}-${apiBaseUrl}`;
-  const cachedResult = memCache.get<ChangeLogFile>(cacheKey);
+  const cachedResult = memCache.get<Promise<ChangeLogFile | null>>(cacheKey);
   // istanbul ignore if
-  if (cachedResult) {
-    return Promise.resolve(cachedResult);
+  if (cachedResult !== undefined) {
+    return cachedResult;
   }
   const promisedRes = getReleaseNotesMdFileInner(repository, apiBaseUrl);
   memCache.set(cacheKey, promisedRes);

diff --git a/lib/workers/pr/changelog/source-github.ts b/lib/workers/pr/changelog/source-github.ts
@@ -16,10 +16,10 @@ function getCachedTags(
   repository: string
 ): Promise<string[]> {
   const cacheKey = `getTags-${endpoint}-${repository}`;
-  const cachedResult = memCache.get<string[]>(cacheKey);
+  const cachedResult = memCache.get<Promise<string[]>>(cacheKey);
   // istanbul ignore if
-  if (cachedResult) {
-    return Promise.resolve(cachedResult);
+  if (cachedResult !== undefined) {
+    return cachedResult;
   }
   const promisedRes = getTags(endpoint, repository);
   memCache.set(cacheKey, promisedRes);

diff --git a/lib/workers/pr/changelog/source-gitlab.ts b/lib/workers/pr/changelog/source-gitlab.ts
@@ -18,10 +18,10 @@ function getCachedTags(
   repository: string
 ): Promise<string[]> {
   const cacheKey = `getTags-${endpoint}-${versionScheme}-${repository}`;
-  const cachedResult = memCache.get<string[]>(cacheKey);
+  const cachedResult = memCache.get<Promise<string[]>>(cacheKey);
   // istanbul ignore if
-  if (cachedResult) {
-    return Promise.resolve(cachedResult);
+  if (cachedResult !== undefined) {
+    return cachedResult;
   }
   const promisedRes = getTags(endpoint, repository);
   memCache.set(cacheKey, promisedRes);