From f4006dbb17c0febd70e0b5a009a77e012d55f189 Mon Sep 17 00:00:00 2001 From: Travis Fischer Date: Wed, 10 Feb 2021 21:48:23 -0500 Subject: [PATCH] bugfix for pageUrlOverrides --- lib/config.ts | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/lib/config.ts b/lib/config.ts index d6f7227..ced2973 100644 --- a/lib/config.ts +++ b/lib/config.ts @@ -24,14 +24,16 @@ export const rootNotionSpaceId: string | null = parsePageId( { uuid: true } ) -export const pageUrlOverrides = cleanPageUrlOverrides( - getSiteConfig('pageUrlOverrides', {}) || {} +export const pageUrlOverrides = cleanPageUrlMap( + getSiteConfig('pageUrlOverrides', {}) || {}, + 'pageUrlOverrides' ) export const inversePageUrlOverrides = invertPageUrlOverrides(pageUrlOverrides) -export const pageUrlAdditions = cleanPageUrlOverrides( - getSiteConfig('pageUrlAdditions', {}) || {} +export const pageUrlAdditions = cleanPageUrlMap( + getSiteConfig('pageUrlAdditions', {}) || {}, + 'pageUrlAdditions' ) // general site config @@ -158,24 +160,25 @@ function getGoogleApplicationCredentials() { } } -function cleanPageUrlOverrides( - pageUrlOverrides: PageUrlOverridesMap +function cleanPageUrlMap( + pageUrlMap: PageUrlOverridesMap, + label: string ): PageUrlOverridesMap { - return Object.keys(pageUrlOverrides).reduce((acc, uri) => { - const pageId = pageUrlOverrides[uri] + return Object.keys(pageUrlMap).reduce((acc, uri) => { + const pageId = pageUrlMap[uri] const uuid = parsePageId(pageId, { uuid: false }) if (!uuid) { - throw new Error(`Invalid pageUrlOverrides page id "${pageId}"`) + throw new Error(`Invalid ${label} page id "${pageId}"`) } if (!uri) { - throw new Error(`Missing pageUrlOverrides value for page "${pageId}"`) + throw new Error(`Missing ${label} value for page "${pageId}"`) } if (!uri.startsWith('/')) { throw new Error( - `Invalid pageUrlOverrides value for page "${pageId}": value "${uri}" should be a relative URI that starts with "/"` + `Invalid ${label} value for page "${pageId}": value "${uri}" should be a relative URI that starts with "/"` ) }