astro-pure 1.2.3 → 1.2.4

package/components/pages/ArticleBottom.astro

@@ -61,7 +61,7 @@ const next = collections[index + 1]
       next && (
         <a
           href={`${path}/${next.id}`}
-          class='group inline-flex items-center gap-x-2 rounded-xl px-4 py-2 text-right no-underline transition-colors duration-300 hover:bg-muted max-sm:max-w-[80%] sm:flex'
+          class='group inline-flex items-center gap-x-2 rounded-xl px-4 py-2 text-right no-underline transition-colors duration-300 hover:bg-muted max-sm:float-end max-sm:max-w-[80%] sm:flex'
         >
           <p class='truncate font-medium transition-colors'>{next.data.title}</p>
           <svg

package/components/pages/Copyright.astro

@@ -6,8 +6,8 @@ import { cn, getFormattedDate } from '../../utils'
 import { QRCode } from '../advanced'
 import { Icon } from '../user'
 
-interface Props {
-  data: InferEntrySchema<CollectionKey>
+interface Props<T extends CollectionKey> {
+  data: InferEntrySchema<T>
   class?: string
 }
 
@@ -51,16 +51,18 @@ const shares = {
       <span>Author</span>
       <span class='text-sm text-foreground max-sm:place-self-center'>{config.author}</span>
     </div>
-    <div class='flex gap-x-2 sm:min-w-16 sm:flex-col'>
-      <span>Published at</span>
-      <span class='text-sm text-foreground max-sm:place-self-center'
-        >{
-          getFormattedDate(publishDate, {
-            month: 'long'
-          })
-        }</span
-      >
-    </div>
+    {
+      publishDate && (
+        <div class='flex gap-x-2 sm:min-w-16 sm:flex-col'>
+          <span>Published at</span>
+          <span class='text-sm text-foreground max-sm:place-self-center'>
+            {getFormattedDate(publishDate, {
+              month: 'long'
+            })}
+          </span>
+        </div>
+      )
+    }
     <div class='flex gap-x-2 sm:flex-col'>
       <span>Copyright</span>
       <a

package/components/pages/Hero.astro

@@ -1,12 +1,12 @@
 ---
 import { Image } from 'astro:assets'
-import { type CollectionKey, type InferEntrySchema } from 'astro:content'
+import type { InferEntrySchema } from 'astro:content'
 
 import { PageInfo } from '.'
 import { FormattedDate, Icon } from '../user'
 
 interface Props {
-  data: InferEntrySchema<CollectionKey>
+  data: InferEntrySchema<'blog'>
   remarkPluginFrontmatter: Record<string, unknown>
 }
 
@@ -38,15 +38,15 @@ const dateTimeOptions: Intl.DateTimeFormatOptions = {
         class='cover-image relative z-10 h-auto w-full max-w-[65ch] rounded-2xl object-contain'
         fetchpriority='high'
         loading='eager'
-        src={heroImage.src}
+        {...heroImage}
       />
       <Image
         alt='Blur image'
         fetchpriority='high'
         loading='eager'
-        src={heroImage.src}
         id='blurImage'
         class='absolute end-0 top-4 z-0 mt-0 h-full max-w-[65ch] rounded-3xl opacity-60 blur-xl transition-opacity duration-300'
+        {...heroImage}
       />
     </div>
   )

package/components/pages/PostPreview.astro

@@ -43,10 +43,10 @@ const postDate = data.updatedDate ?? data.publishDate
     {
       detailed && data.heroImage && (
         <Image
-          src={data.heroImage.src}
           alt={data.heroImage.alt || data.title}
           class='cover-image absolute end-0 top-0 z-0 h-2/3 w-full rounded-2xl object-cover opacity-50 transition-opacity duration-300 group-hover/card:opacity-70 md:h-full md:w-3/5'
           loading='eager'
+          {...data.heroImage}
         />
       )
     }

package/components/pages/TOC.astro

@@ -7,6 +7,7 @@ import TOCHeading from './TOCHeading.astro'
 interface Props {
   headings: MarkdownHeading[]
   class?: string
+  id?: string
 }
 
 const { headings, class: className, ...props } = Astro.props
@@ -14,14 +15,12 @@ const { headings, class: className, ...props } = Astro.props
 const toc = generateToc(headings)
 ---
 
-<aside class={className} id='sidebar' {...props}>
-  <toc-heading>
-    <h2 class='font-semibold'>TABLE OF CONTENTS</h2>
-    <ul class='mt-4 max-h-[70vh] overflow-y-scroll text-card-foreground'>
-      {toc.map((heading) => <TOCHeading heading={heading} />)}
-    </ul>
-  </toc-heading>
-</aside>
+<toc-heading class={className} {...props}>
+  <h2 class='font-semibold'>TABLE OF CONTENTS</h2>
+  <ul class='mt-4 text-card-foreground'>
+    {toc.map((heading) => <TOCHeading heading={heading} />)}
+  </ul>
+</toc-heading>
 
 <script>
   // This script tag is useful only if you want to display the TOC alongside the blog post...

package/components/user/CardList.astro

@@ -1,27 +1,33 @@
 ---
 import type { CardListData } from '../../types'
+import { cn } from '../../utils'
 import Collapse from '../user/Collapse.astro'
 import CardListChildren from './CardListChildren.astro'
 
 type Props = CardListData & {
   collapse?: boolean
   class?: string
+  style?: string | Record<string, string>
 }
 
-const { title, list, collapse, class: className } = Astro.props
+const { title, list, collapse, class: className, ...props } = Astro.props
 ---
 
-<div class={className}>
-  {
-    collapse ? (
-      <Collapse title={title} class='not-prose'>
-        <CardListChildren children={list} />
-      </Collapse>
-    ) : (
-      <div class='not-prose my-3 flex flex-col gap-y-2 rounded-xl border px-4 py-3 sm:py-4'>
-        <p class='text-lg font-medium text-foreground'>{title}</p>
-        <CardListChildren children={list} />
-      </div>
-    )
-  }
-</div>
+{
+  collapse ? (
+    <Collapse title={title} class={cn('not-prose', className)} {...props}>
+      <CardListChildren children={list} main />
+    </Collapse>
+  ) : (
+    <div
+      class={cn(
+        'not-prose my-3 flex flex-col gap-y-2 rounded-xl border px-4 py-3 sm:py-4',
+        className
+      )}
+      {...props}
+    >
+      <p class='text-lg font-medium text-foreground'>{title}</p>
+      <CardListChildren children={list} main />
+    </div>
+  )
+}

package/components/user/CardListChildren.astro

@@ -2,17 +2,24 @@
 import type { CardList } from '../../types'
 import { cn } from '../../utils'
 
-type Props = { children: CardList }
-const { children } = Astro.props
+type Props = { main?: boolean; children: CardList }
+const { main = false, children } = Astro.props
 ---
 
-<ul class='ms-5 flex list-disc flex-col gap-y-1'>
+<ul class={cn('flex flex-col gap-y-1', !main && 'list-disc ms-5')}>
   {
     children.map((child) => {
       const Tag = child.link ? 'a' : 'p'
       return (
         <li>
-          <Tag href={child.link} class={cn('block', Tag == 'a' && 'text-foreground')}>
+          <Tag
+            href={child.link}
+            class={cn(
+              'block',
+              main ? 'text-foreground' : 'text-muted-foreground',
+              Tag == 'p' && 'mb-2 mt-1'
+            )}
+          >
             {child.title}
           </Tag>
           {child.children && child.children.length > 0 && <Astro.self children={child.children} />}

package/index.ts

@@ -1,5 +1,5 @@
 import { spawn } from 'node:child_process'
-import { dirname, relative } from 'node:path'
+import path, { dirname, relative } from 'node:path'
 import { fileURLToPath } from 'node:url'
 // Astro
 import type { AstroIntegration, RehypePlugins, RemarkPlugins } from 'astro'
@@ -25,7 +25,7 @@ export default function AstroPureIntegration(opts: UserInputConfig): AstroIntegr
         let userConfig = parseWithFriendlyErrors(
           UserConfigSchema,
           opts,
-          'Invalid config passed to starlight integration'
+          'Invalid config passed to astro-pure integration'
         )
 
         // Add built-in integrations only if they are not already added by the user through the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-pure",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "A simple, clean but powerful blog theme build by astro.",
   "type": "module",
   "author": "CWorld",

package/schemas/links.ts

@@ -9,20 +9,20 @@ export const FriendLinksSchema = () =>
           content: z.string()
         })
       ),
-      applyTip: z.object({
-        name: z.string(),
-        desc: z.string(),
-        url: z.string(),
-        avatar: z.string()
-      })
+      applyTip: z.array(
+        z.object({
+          name: z.string(),
+          val: z.string()
+        })
+      )
     })
     .default({
       logbook: [],
-      applyTip: {
-        name: 'Astro Pure',
-        desc: 'Stay hungry, stay foolish.',
-        url: 'https://astro-pure.js.org',
-        avatar: 'https://astro-pure.js.org/favicon/favicon.ico'
-      }
+      applyTip: [
+        { name: 'Name', val: 'Astro Pure' },
+        { name: 'Desc', val: 'Null' },
+        { name: 'Link', val: 'https://astro-pure.js.org/' },
+        { name: 'Avatar', val: 'https://astro-pure.js.org/favicon/favicon.ico' }
+      ]
     })
     .describe('Friend links for your website.')

package/scripts/check.mjs

@@ -0,0 +1,39 @@
+import { exec } from 'child_process'
+
+const runCommand = (command, cwd, timeout = 5000) => {
+  return new Promise((resolve, reject) => {
+    const child = exec(command, { cwd, timeout }, (error, stdout, stderr) => {
+      if (error) {
+        reject(`Error: ${stderr}`)
+      } else {
+        resolve(stdout)
+      }
+    })
+
+    child.on('error', (error) => {
+      reject(`Execution error: ${error.message}`)
+    })
+
+    child.on('exit', (code) => {
+      if (code !== 0) {
+        reject(`Command exited with code ${code}`)
+      }
+    })
+  })
+}
+
+export default async function main() {
+  if (process.env.BUN_LINK_PKG === 'true') {
+    try {
+      console.log('Running "bun link" at "./packages/pure"')
+      console.log(await runCommand('bun link', './packages/pure'))
+      console.log('Running "bun link astro-pure" at "."')
+      console.log(await runCommand('bun link astro-pure', '.'))
+      console.log('Commands executed successfully.')
+    } catch (error) {
+      console.error(error)
+    }
+  } else {
+    console.log('BUN_LINK_PKG is not set to true. Skipping commands.')
+  }
+}

package/scripts/index.js

@@ -5,12 +5,16 @@ import { readFileSync } from 'fs'
 import { dirname, join } from 'path'
 import { fileURLToPath } from 'url'
 
+import checkFunc from './check.mjs'
 import minimist from './libs/minimist.cjs'
 import newFunc from './new.mjs'
 
 const args = minimist(process.argv.slice(2))
 
 switch (args._[0]) {
+  case 'check':
+    await checkFunc()
+    break
   case 'new':
     const newArgs = process.argv.slice(3)
     newFunc(newArgs)

package/types/index.ts

@@ -2,7 +2,7 @@ import { Icons } from '../libs/icons'
 
 export type { IntegrationUserConfig } from './integrations-config'
 export type { ThemeUserConfig } from './theme-config'
-export type { UserInputConfig as Config } from './user-config'
+export type { UserInputConfig as Config, UserConfig as ConfigOutput } from './user-config'
 
 export interface SiteMeta {
   title: string

package/utils/server.ts

@@ -12,15 +12,23 @@ export async function getBlogCollection(contentType: CollectionKey = 'blog') {
   })
 }
 
+function getYearFromCollection<T extends CollectionKey>(
+  collection: CollectionEntry<T>
+): number | undefined {
+  const dateStr = collection.data.updatedDate ?? collection.data.publishDate
+  return dateStr ? new Date(dateStr).getFullYear() : undefined
+}
 export function groupCollectionsByYear<T extends CollectionKey>(
   collections: Collections
 ): [number, CollectionEntry<T>[]][] {
   const collectionsByYear = collections.reduce((acc, collection) => {
-    const year = new Date(collection.data.updatedDate ?? collection.data.publishDate).getFullYear()
-    if (!acc.has(year)) {
-      acc.set(year, [])
+    const year = getYearFromCollection(collection)
+    if (year !== undefined) {
+      if (!acc.has(year)) {
+        acc.set(year, [])
+      }
+      acc.get(year)!.push(collection)
     }
-    acc.get(year)!.push(collection)
     return acc
   }, new Map<number, Collections>())
 
@@ -29,10 +37,10 @@ export function groupCollectionsByYear<T extends CollectionKey>(
   ).sort((a, b) => b[0] - a[0])
 }
 
-export function sortMDByDate(collections: Collections) {
+export function sortMDByDate(collections: Collections): Collections {
   return collections.sort((a, b) => {
-    const aDate = new Date(a.data.updatedDate ?? a.data.publishDate).valueOf()
-    const bDate = new Date(b.data.updatedDate ?? b.data.publishDate).valueOf()
+    const aDate = new Date(a.data.updatedDate ?? a.data.publishDate ?? 0).valueOf()
+    const bDate = new Date(b.data.updatedDate ?? b.data.publishDate ?? 0).valueOf()
     return bDate - aDate
   })
 }