Unverified Commit 0f6b3571 authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

Improve typing of resolve metadata (#48670)

Improve array resolving in metadata, remove ts comments for errors
parent 9863935f
function resolveArray<T>(value: T): T[] { function resolveArray<T>(value: T | T[]): T[] {
if (Array.isArray(value)) { if (Array.isArray(value)) {
return value return value as any
} }
return [value] return [value] as any
} }
function resolveAsArrayOrUndefined<T extends unknown | readonly unknown[]>( function resolveAsArrayOrUndefined<T>(
value: T | T[] | undefined | null value: T | T[] | undefined | null
): undefined | T[] { ): T extends undefined | null ? undefined : T[] {
if (typeof value === 'undefined' || value === null) { if (typeof value === 'undefined' || value === null) {
return undefined return undefined as any
} }
if (Array.isArray(value)) { return resolveArray(value) as any
return value
}
return [value]
} }
export { resolveAsArrayOrUndefined, resolveArray } export { resolveAsArrayOrUndefined, resolveArray }
...@@ -161,11 +161,12 @@ function merge({ ...@@ -161,11 +161,12 @@ function merge({
case 'archives': case 'archives':
case 'assets': case 'assets':
case 'bookmarks': case 'bookmarks':
case 'keywords': case 'keywords': {
target[key] = resolveAsArrayOrUndefined(source[key])
break
}
case 'authors': { case 'authors': {
// FIXME: type inferring target[key] = resolveAsArrayOrUndefined(source.authors)
// @ts-ignore
target[key] = resolveAsArrayOrUndefined(source[key]) || null
break break
} }
// directly assign fields that fallback to null // directly assign fields that fallback to null
......
...@@ -83,7 +83,7 @@ function resolveUrlValuesOfObject( ...@@ -83,7 +83,7 @@ function resolveUrlValuesOfObject(
if (typeof value === 'string' || value instanceof URL) { if (typeof value === 'string' || value instanceof URL) {
result[key] = [ result[key] = [
{ {
url: resolveAlternateUrl(value, metadataBase, pathname), // metadataBase ? resolveUrl(value, metadataBase)! : value, url: resolveAlternateUrl(value, metadataBase, pathname),
}, },
] ]
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment