diff options
Diffstat (limited to 'packages/astro-rss/src/index.ts')
| -rw-r--r-- | packages/astro-rss/src/index.ts | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/packages/astro-rss/src/index.ts b/packages/astro-rss/src/index.ts index c8cf19d60..b866365ab 100644 --- a/packages/astro-rss/src/index.ts +++ b/packages/astro-rss/src/index.ts @@ -32,9 +32,9 @@ export type RSSOptions = { export type RSSFeedItem = { /** Link to item */ - link: string; + link: z.infer<typeof rssSchema>['link']; /** Full content of the item. Should be valid HTML */ - content?: string | undefined; + content?: z.infer<typeof rssSchema>['content']; /** Title of item */ title: z.infer<typeof rssSchema>['title']; /** Publication date of item */ @@ -55,11 +55,10 @@ export type RSSFeedItem = { enclosure?: z.infer<typeof rssSchema>['enclosure']; }; -type ValidatedRSSFeedItem = z.infer<typeof rssFeedItemValidator>; +type ValidatedRSSFeedItem = z.infer<typeof rssSchema>; type ValidatedRSSOptions = z.infer<typeof rssOptionsValidator>; type GlobResult = z.infer<typeof globResultValidator>; -const rssFeedItemValidator = rssSchema.extend({ link: z.string(), content: z.string().optional() }); const globResultValidator = z.record(z.function().returns(z.promise(z.any()))); const rssOptionsValidator = z.object({ @@ -67,7 +66,7 @@ const rssOptionsValidator = z.object({ description: z.string(), site: z.preprocess((url) => (url instanceof URL ? url.href : url), z.string().url()), items: z - .array(rssFeedItemValidator) + .array(rssSchema) .or(globResultValidator) .transform((items) => { if (!Array.isArray(items)) { @@ -117,7 +116,7 @@ async function validateRssOptions(rssOptions: RSSOptions) { if (path === 'items' && code === 'invalid_union') { return [ message, - `The \`items\` property requires properly typed \`title\`, \`pubDate\`, and \`link\` keys.`, + `The \`items\` property requires at least the \`title\` or \`description\` key. They must be properly typed, as well as \`pubDate\` and \`link\` keys if provided.`, `Check your collection's schema, and visit https://docs.astro.build/en/guides/rss/#generating-items for more info.`, ].join('\n'); } @@ -138,10 +137,7 @@ export function pagesGlobToRssItems(items: GlobResult): Promise<ValidatedRSSFeed `[RSS] You can only glob entries within 'src/pages/' when passing import.meta.glob() directly. Consider mapping the result to an array of RSSFeedItems. See the RSS docs for usage examples: https://docs.astro.build/en/guides/rss/#2-list-of-rss-feed-objects` ); } - const parsedResult = rssFeedItemValidator.safeParse( - { ...frontmatter, link: url }, - { errorMap } - ); + const parsedResult = rssSchema.safeParse({ ...frontmatter, link: url }, { errorMap }); if (parsedResult.success) { return parsedResult.data; @@ -210,15 +206,19 @@ async function generateRSS(rssOptions: ValidatedRSSOptions): Promise<string> { ); // items root.rss.channel.item = items.map((result) => { - // If the item's link is already a valid URL, don't mess with it. - const itemLink = isValidURL(result.link) - ? result.link - : createCanonicalURL(result.link, rssOptions.trailingSlash, site).href; - const item: any = { - title: result.title, - link: itemLink, - guid: { '#text': itemLink, '@_isPermaLink': 'true' }, - }; + const item: Record<string, unknown> = {}; + + if (result.title) { + item.title = result.title; + } + if (typeof result.link === 'string') { + // If the item's link is already a valid URL, don't mess with it. + const itemLink = isValidURL(result.link) + ? result.link + : createCanonicalURL(result.link, rssOptions.trailingSlash, site).href; + item.link = itemLink; + item.guid = { '#text': itemLink, '@_isPermaLink': 'true' }; + } if (result.description) { item.description = result.description; } |