@levino/shipyard-blog 0.7.4 → 0.7.5

package/astro/BlogArchive.astro

@@ -3,36 +3,30 @@
  * Blog archive page - shows all posts organized by year.
  */
 import { i18n } from 'astro:config/server'
-import { type CollectionEntry, getCollection } from 'astro:content'
-import blogConfig from 'virtual:shipyard-blog/config'
-import type { GetStaticPaths } from 'astro'
+import {
+  type CollectionEntry,
+  type CollectionKey,
+  getCollection,
+} from 'astro:content'
+import blogConfigDefault from 'virtual:shipyard-blog/config'
 import { groupBy, map, pipe, prop, reverse, sortBy, toPairs } from 'ramda'
 import Layout from './Layout.astro'
 
+const blogConfig = Astro.props.blogConfig ?? blogConfigDefault
+const collectionName =
+  Astro.props.collectionName ?? blogConfigDefault.collectionName
+
 const { includeDraftsInDev, routeBasePath } = blogConfig
 
 // Filter out draft and unlisted posts
 const isDev = import.meta.env.DEV
-const shouldIncludePost = (post: CollectionEntry<'blog'>) => {
+const shouldIncludePost = (post: CollectionEntry<CollectionKey>) => {
   if (post.data.unlisted) return false
   if (post.data.draft && !(isDev && includeDraftsInDev)) return false
   return true
 }
 
-export const getStaticPaths = (() => {
-  if (i18n) {
-    return i18n.locales.map((locale) => {
-      if (typeof locale !== 'string') {
-        throw new Error('shipyard does only support strings as locales.')
-      }
-      return { params: { locale } }
-    })
-  } else {
-    return [{ params: {} }]
-  }
-}) satisfies GetStaticPaths
-
-const allPosts = await getCollection('blog')
+const allPosts = await getCollection(collectionName as CollectionKey)
 const filteredPosts = allPosts.filter(shouldIncludePost).filter(({ id }) => {
   if (i18n) {
     const [postLocale] = id.split('/')
@@ -49,10 +43,10 @@ const sortedPosts = filteredPosts.toSorted(
 // Group posts by year
 type YearPosts = {
   year: string
-  posts: CollectionEntry<'blog'>[]
+  posts: CollectionEntry<CollectionKey>[]
 }
 
-const getYearFromPost = (post: CollectionEntry<'blog'>): string =>
+const getYearFromPost = (post: CollectionEntry<CollectionKey>): string =>
   post.data.date.getFullYear().toString()
 
 const groupPostsByYear = pipe(
@@ -61,7 +55,7 @@ const groupPostsByYear = pipe(
   map(([year, posts]): YearPosts => ({ year, posts: posts ?? [] })),
   sortBy(prop('year')),
   reverse,
-) as (posts: CollectionEntry<'blog'>[]) => YearPosts[]
+) as (posts: CollectionEntry<CollectionKey>[]) => YearPosts[]
 
 const postsByYear = groupPostsByYear(sortedPosts)
 
@@ -79,7 +73,7 @@ const getBlogPostLink = (id: string, locale?: string) => {
 }
 ---
 
-<Layout title="Archive">
+<Layout title="Archive" blogConfig={blogConfig} collectionName={collectionName}>
   <div class="max-w-4xl mx-auto">
     <h1 class="text-4xl font-bold mb-8">Archive</h1>
     <p class="text-base-content/60 mb-8">

package/astro/BlogAuthorPage.astro

@@ -1,149 +1,29 @@
 ---
-/**
- * Individual author page showing author info and their posts.
- */
 import { i18n } from 'astro:config/server'
-import { type CollectionEntry, getCollection } from 'astro:content'
-import blogConfig from 'virtual:shipyard-blog/config'
-import Layout from '@levino/shipyard-base/layouts/Page.astro'
 import {
-  filter,
-  flatten,
-  map,
-  pipe,
-  prop,
-  reverse,
-  sortBy,
-  uniqBy,
-} from 'ramda'
+  type CollectionEntry,
+  type CollectionKey,
+  getCollection,
+} from 'astro:content'
+import blogConfigDefault from 'virtual:shipyard-blog/config'
+import Layout from '@levino/shipyard-base/layouts/Page.astro'
+import { filter, pipe, reverse, sortBy } from 'ramda'
 import type { Author } from '../src/index'
 import { getReadingTime } from '../src/readingTime'
 
+const blogConfig = Astro.props.blogConfig ?? blogConfigDefault
+const collectionName =
+  Astro.props.collectionName ?? blogConfigDefault.collectionName
+
 const {
   showReadingTime,
   includeDraftsInDev: includeDraftsInDevConfig,
   routeBasePath,
 } = blogConfig
 
-export async function getStaticPaths() {
-  // Must inline all helper functions and values because Astro hoists getStaticPaths to a separate module
-  const { authorsEnabled, includeDraftsInDev } = blogConfig
-  const isDev = import.meta.env.DEV
-
-  const normalizeAuthorInner = (
-    author:
-      | string
-      | {
-          name: string
-          title?: string
-          url?: string
-          image_url?: string
-          email?: string
-        },
-  ): {
-    name: string
-    title?: string
-    url?: string
-    image_url?: string
-    email?: string
-  } => {
-    if (typeof author === 'string') {
-      return { name: author }
-    }
-    return author
-  }
-
-  const getAuthorsFromPostInner = (
-    post: CollectionEntry<'blog'>,
-  ): {
-    name: string
-    title?: string
-    url?: string
-    image_url?: string
-    email?: string
-  }[] => {
-    const authors = post.data.authors
-    if (!authors) return []
-    if (Array.isArray(authors)) {
-      return authors.map(normalizeAuthorInner)
-    }
-    return [
-      normalizeAuthorInner(
-        authors as
-          | string
-          | {
-              name: string
-              title?: string
-              url?: string
-              image_url?: string
-              email?: string
-            },
-      ),
-    ]
-  }
-
-  const getAuthorSlugInner = (name: string): string =>
-    name.toLowerCase().replace(/\s+/g, '-')
-
-  const shouldIncludePost = (post: CollectionEntry<'blog'>) => {
-    if (post.data.unlisted) return false
-    if (post.data.draft && !(isDev && includeDraftsInDev)) return false
-    return true
-  }
-
-  if (!authorsEnabled) {
-    return []
-  }
-
-  const allPosts = await getCollection('blog')
-
-  // Get all unique authors
-  const getAllAuthors = pipe(
-    filter(shouldIncludePost),
-    map(getAuthorsFromPostInner),
-    flatten,
-    uniqBy(prop('name')),
-  )
-
-  if (i18n) {
-    const paths: {
-      params: { locale: string; author: string }
-      props: { author: Author }
-    }[] = []
-
-    for (const locale of i18n.locales) {
-      if (typeof locale !== 'string') {
-        throw new Error('shipyard does only support strings as locales.')
-      }
-
-      const localePosts = allPosts.filter((post) => {
-        const [postLocale] = post.id.split('/')
-        return postLocale === locale
-      })
-
-      const authors = getAllAuthors(localePosts) as Author[]
-
-      for (const author of authors) {
-        paths.push({
-          params: { locale, author: getAuthorSlugInner(author.name) },
-          props: { author },
-        })
-      }
-    }
-
-    return paths
-  } else {
-    const authors = getAllAuthors(allPosts) as Author[]
-    return authors.map((author) => ({
-      params: { author: getAuthorSlugInner(author.name) },
-      props: { author },
-    }))
-  }
-}
-
 const { author } = Astro.props
 
-const allPosts = await getCollection('blog')
+const allPosts = await getCollection(collectionName as CollectionKey)
 const isDev = import.meta.env.DEV
 
 // Component-level helper functions
@@ -154,7 +34,7 @@ const normalizeAuthor = (authorArg: string | Author): Author => {
   return authorArg
 }
 
-const getAuthorsFromPost = (post: CollectionEntry<'blog'>): Author[] => {
+const getAuthorsFromPost = (post: CollectionEntry<CollectionKey>): Author[] => {
   const authors = post.data.authors
   if (!authors) return []
   if (Array.isArray(authors)) {
@@ -164,7 +44,7 @@ const getAuthorsFromPost = (post: CollectionEntry<'blog'>): Author[] => {
 }
 
 // Filter posts (component-level)
-const shouldIncludePostComponent = (post: CollectionEntry<'blog'>) => {
+const shouldIncludePostComponent = (post: CollectionEntry<CollectionKey>) => {
   if (post.data.unlisted) return false
   if (post.data.draft && !(isDev && includeDraftsInDevConfig)) return false
   return true
@@ -173,23 +53,23 @@ const shouldIncludePostComponent = (post: CollectionEntry<'blog'>) => {
 // Get posts by this author
 const authorPosts = pipe(
   filter(shouldIncludePostComponent),
-  filter((post: CollectionEntry<'blog'>) => {
+  filter((post: CollectionEntry<CollectionKey>) => {
     if (i18n) {
       const [postLocale] = post.id.split('/')
       return postLocale === Astro.currentLocale
     }
     return true
   }),
-  filter((post: CollectionEntry<'blog'>) => {
+  filter((post: CollectionEntry<CollectionKey>) => {
     const authors = getAuthorsFromPost(post)
     return authors.some((a) => a.name === author.name)
   }),
-  sortBy((post: CollectionEntry<'blog'>) => post.data.date.getTime()),
+  sortBy((post: CollectionEntry<CollectionKey>) => post.data.date.getTime()),
   reverse,
-)(allPosts) as CollectionEntry<'blog'>[]
+)(allPosts) as CollectionEntry<CollectionKey>[]
 
 // Generate post URL
-const getPostUrl = (post: CollectionEntry<'blog'>): string => {
+const getPostUrl = (post: CollectionEntry<CollectionKey>): string => {
   if (i18n && Astro.currentLocale) {
     const slug = post.id.replace(`${Astro.currentLocale}/`, '')
     return `/${Astro.currentLocale}/${routeBasePath}/${slug}`

package/astro/BlogAuthorsIndex.astro

@@ -3,48 +3,26 @@
  * Authors index page showing all blog authors.
  */
 import { i18n } from 'astro:config/server'
-import { type CollectionEntry, getCollection } from 'astro:content'
-import blogConfig from 'virtual:shipyard-blog/config'
-import Layout from '@levino/shipyard-base/layouts/Page.astro'
 import {
-  filter,
-  flatten,
-  groupBy,
-  map,
-  pipe,
-  prop,
-  reverse,
-  sortBy,
-  uniqBy,
-  values,
-} from 'ramda'
+  type CollectionEntry,
+  type CollectionKey,
+  getCollection,
+} from 'astro:content'
+import blogConfigDefault from 'virtual:shipyard-blog/config'
+import Layout from '@levino/shipyard-base/layouts/Page.astro'
+import { filter, flatten, map, pipe, prop, sortBy, uniqBy } from 'ramda'
 import type { Author } from '../src/index'
 
-export async function getStaticPaths() {
-  const { authorsEnabled } = blogConfig
-
-  if (!authorsEnabled) {
-    return []
-  }
-
-  if (i18n) {
-    return i18n.locales.map((locale) => {
-      if (typeof locale !== 'string') {
-        throw new Error('shipyard does only support strings as locales.')
-      }
-      return { params: { locale } }
-    })
-  } else {
-    return [{ params: {} }]
-  }
-}
+const blogConfig = Astro.props.blogConfig ?? blogConfigDefault
+const collectionName =
+  Astro.props.collectionName ?? blogConfigDefault.collectionName
 
-const allPosts = await getCollection('blog')
+const allPosts = await getCollection(collectionName as CollectionKey)
 const { includeDraftsInDev, routeBasePath } = blogConfig
 const isDev = import.meta.env.DEV
 
 // Filter posts
-const shouldIncludePost = (post: CollectionEntry<'blog'>) => {
+const shouldIncludePost = (post: CollectionEntry<CollectionKey>) => {
   if (post.data.unlisted) return false
   if (post.data.draft && !(isDev && includeDraftsInDev)) return false
   return true
@@ -52,14 +30,14 @@ const shouldIncludePost = (post: CollectionEntry<'blog'>) => {
 
 const posts = pipe(
   filter(shouldIncludePost),
-  filter((post: CollectionEntry<'blog'>) => {
+  filter((post: CollectionEntry<CollectionKey>) => {
     if (i18n) {
       const [postLocale] = post.id.split('/')
       return postLocale === Astro.currentLocale
     }
     return true
   }),
-)(allPosts) as CollectionEntry<'blog'>[]
+)(allPosts) as CollectionEntry<CollectionKey>[]
 
 // Extract authors from posts
 const normalizeAuthor = (author: string | Author): Author => {
@@ -69,7 +47,7 @@ const normalizeAuthor = (author: string | Author): Author => {
   return author
 }
 
-const getAuthorsFromPost = (post: CollectionEntry<'blog'>): Author[] => {
+const getAuthorsFromPost = (post: CollectionEntry<CollectionKey>): Author[] => {
   const authors = post.data.authors
   if (!authors) return []
   if (Array.isArray(authors)) {

package/astro/BlogEntry.astro

@@ -1,7 +1,12 @@
 ---
 import { i18n } from 'astro:config/server'
-import { type CollectionEntry, getCollection, render } from 'astro:content'
-import blogConfig from 'virtual:shipyard-blog/config'
+import {
+  type CollectionEntry,
+  type CollectionKey,
+  getCollection,
+  render,
+} from 'astro:content'
+import blogConfigDefault from 'virtual:shipyard-blog/config'
 import { TableOfContents } from '@levino/shipyard-base/components'
 import { getEditUrl, getGitMetadata } from '../src/gitMetadata'
 import { type Author, getReadingTime } from '../src/index'
@@ -12,96 +17,21 @@ import BlogReadingTime from './BlogReadingTime.astro'
 import BlogTags from './BlogTags.astro'
 import Layout from './Layout.astro'
 
-export const getStaticPaths = async () => {
-  const allPosts = await getCollection('blog')
-
-  // Filter out draft posts for production - defined inside getStaticPaths
-  const isDev = import.meta.env.DEV
-  const { includeDraftsInDev } = blogConfig
-  const shouldIncludePost = (post: CollectionEntry<'blog'>) => {
-    if (post.data.draft && !(isDev && includeDraftsInDev)) {
-      return false
-    }
-    return true
-  }
-
-  const blogPosts = allPosts.filter(shouldIncludePost)
-
-  // Sort posts by date (newest first)
-  const sortedPosts = blogPosts.toSorted(
-    (a, b) => b.data.date.getTime() - a.data.date.getTime(),
-  )
-
-  const getParams = (slug: string) => {
-    if (i18n) {
-      const [locale, ...rest] = slug.split('/')
-      return {
-        slug: rest.join('/'),
-        locale,
-      }
-    } else {
-      // For non-i18n, treat the entire slug as the path
-      return {
-        slug: slug,
-      }
-    }
-  }
-
-  const getPostUrl = (post: CollectionEntry<'blog'>) => {
-    const { routeBasePath } = blogConfig
-    if (i18n) {
-      const [locale, ...rest] = post.id.split('/')
-      return `/${locale}/${routeBasePath}/${rest.join('/')}`
-    }
-    return `/${routeBasePath}/${post.id}`
-  }
-
-  return sortedPosts.map((entry) => {
-    // Filter posts by locale for pagination
-    let localePosts = sortedPosts
-    if (i18n) {
-      const [locale] = entry.id.split('/')
-      localePosts = sortedPosts.filter((post) =>
-        post.id.startsWith(`${locale}/`),
-      )
-    }
-
-    // Find position within locale-filtered posts
-    const localeIndex = localePosts.findIndex((post) => post.id === entry.id)
-
-    // Newer is previous in the array (lower index), older is next (higher index)
-    const newerPost = localeIndex > 0 ? localePosts[localeIndex - 1] : undefined
-    const olderPost =
-      localeIndex < localePosts.length - 1
-        ? localePosts[localeIndex + 1]
-        : undefined
-
-    return {
-      params: getParams(entry.id),
-      props: {
-        entry,
-        older: olderPost
-          ? { href: getPostUrl(olderPost), title: olderPost.data.title }
-          : undefined,
-        newer: newerPost
-          ? { href: getPostUrl(newerPost), title: newerPost.data.title }
-          : undefined,
-      },
-    }
-  })
-}
+const blogConfig = Astro.props.blogConfig ?? blogConfigDefault
+const collectionName =
+  Astro.props.collectionName ?? blogConfigDefault.collectionName
 
 // In SSR mode (prerender: false), getStaticPaths is not called so Astro.props will be empty.
 // We need to fetch the entry from the collection based on URL params.
 let { entry, older, newer } = Astro.props
 
 if (!entry) {
-  const allPosts = await getCollection('blog')
+  const allPosts = await getCollection(collectionName as CollectionKey)
 
   // Filter out draft posts for production
   const isDev = import.meta.env.DEV
   const { includeDraftsInDev } = blogConfig
-  const shouldIncludePost = (post: CollectionEntry<'blog'>) => {
+  const shouldIncludePost = (post: CollectionEntry<CollectionKey>) => {
     if (post.data.draft && !(isDev && includeDraftsInDev)) {
       return false
     }
@@ -134,7 +64,7 @@ if (!entry) {
 
   // Calculate pagination for SSR mode
   const { routeBasePath } = blogConfig
-  const getPostUrl = (post: CollectionEntry<'blog'>) => {
+  const getPostUrl = (post: CollectionEntry<CollectionKey>) => {
     if (i18n) {
       const [postLocale, ...rest] = post.id.split('/')
       return `/${postLocale}/${routeBasePath}/${rest.join('/')}`
@@ -279,7 +209,7 @@ const formatDate = new Intl.DateTimeFormat(Astro.currentLocale || 'en', {
 const showToc = !hide_table_of_contents && filteredHeadings.length > 0
 ---
 
-<Layout title={seoTitle} canonicalUrl={canonical_url}>
+<Layout title={seoTitle} canonicalUrl={canonical_url} blogConfig={blogConfig} collectionName={collectionName}>
   <div class="grid grid-cols-12 gap-6 max-w-7xl mx-auto">
     <div class:list={['col-span-12', { 'xl:col-span-9': showToc }]}>
       {/* Post header */}

package/astro/BlogIndex.astro

@@ -1,14 +1,21 @@
 ---
 import { Image } from 'astro:assets'
 import { i18n } from 'astro:config/server'
-import { type CollectionEntry, getCollection } from 'astro:content'
-import blogConfig from 'virtual:shipyard-blog/config'
-import type { GetStaticPaths } from 'astro'
+import {
+  type CollectionEntry,
+  type CollectionKey,
+  getCollection,
+} from 'astro:content'
+import blogConfigDefault from 'virtual:shipyard-blog/config'
 import { getReadingTime } from '../src/index'
 import BlogReadingTime from './BlogReadingTime.astro'
 import BlogTags from './BlogTags.astro'
 import Layout from './Layout.astro'
 
+const blogConfig = Astro.props.blogConfig ?? blogConfigDefault
+const collectionName =
+  Astro.props.collectionName ?? blogConfigDefault.collectionName
+
 const {
   postsPerPage,
   showReadingTime,
@@ -19,7 +26,7 @@ const {
 
 // Filter out draft and unlisted posts for production
 const isDev = import.meta.env.DEV
-const shouldIncludePost = (post: CollectionEntry<'blog'>) => {
+const shouldIncludePost = (post: CollectionEntry<CollectionKey>) => {
   // Exclude unlisted posts from listings
   if (post.data.unlisted) return false
   // Include drafts only in dev mode if configured
@@ -27,45 +34,29 @@ const shouldIncludePost = (post: CollectionEntry<'blog'>) => {
   return true
 }
 
-export const getStaticPaths = (() => {
-  if (i18n) {
-    return i18n.locales.map((locale) => {
-      if (typeof locale !== 'string') {
-        throw new Error('shipyard does only support strings as locales.')
-      }
-      return {
-        params: {
-          locale,
-        },
-      }
-    })
-  } else {
-    // For non-i18n, return a single path without locale
-    return [{ params: {} }]
-  }
-}) satisfies GetStaticPaths
-
 // Page 1 is always the index page (no page param)
 const currentPage = 1
 
-const entries = await getCollection('blog').then((posts) => {
-  const filteredPosts = posts.filter(shouldIncludePost)
+const entries = await getCollection(collectionName as CollectionKey).then(
+  (posts) => {
+    const filteredPosts = posts.filter(shouldIncludePost)
 
-  if (i18n) {
-    // With i18n: filter by locale
-    return filteredPosts
-      .filter(({ id }) => {
-        const [postLocale] = id.split('/')
-        return postLocale === Astro.currentLocale
-      })
-      .toSorted((a, b) => b.data.date.getTime() - a.data.date.getTime())
-  } else {
-    // Without i18n: return all posts
-    return filteredPosts.toSorted(
-      (a, b) => b.data.date.getTime() - a.data.date.getTime(),
-    )
-  }
-})
+    if (i18n) {
+      // With i18n: filter by locale
+      return filteredPosts
+        .filter(({ id }) => {
+          const [postLocale] = id.split('/')
+          return postLocale === Astro.currentLocale
+        })
+        .toSorted((a, b) => b.data.date.getTime() - a.data.date.getTime())
+    } else {
+      // Without i18n: return all posts
+      return filteredPosts.toSorted(
+        (a, b) => b.data.date.getTime() - a.data.date.getTime(),
+      )
+    }
+  },
+)
 
 // Calculate pagination
 const totalPosts = entries.length
@@ -134,7 +125,7 @@ const tagBaseUrl = i18n
   : `/${routeBasePath}/tags`
 ---
 
-<Layout title={blogConfig.blogTitle}>
+<Layout title={blogConfig.blogTitle} blogConfig={blogConfig} collectionName={collectionName}>
   <div class="max-w-7xl mx-auto">
     <h1 class="text-4xl font-bold mb-10">{blogConfig.blogTitle}</h1>
     <div class="space-y-6">