clarity-theme 0.1.3 → 0.2.0

package/src/pages/preview.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
-const clarity = useClarityConfig()
+const appConfig = useAppConfig()
 useSeoMeta({
 	title: '预览',
-	description: `${clarity.site.title}的文章预览。`,
+	description: `${appConfig.title}的文章预览。`,
 })
 const { data: listRaw } = await useAsyncData('previews:index', () => getArticleIndexOptions('previews/%'), { default: () => [] })
 const { listSorted, isAscending, sortOrder } = useArticleSort(listRaw)

package/src/server/api/stats.get.ts

@@ -1,6 +1,5 @@
-import type { ClarityContentRow } from '../../shared/types/content'
 import { queryCollection } from '@nuxt/content/server'
-import { toZonedTemporal } from '../../shared/utils/time'
+import blogConfig from '~~/blog.config'
 
 interface StatsEntry {
 	posts: number
@@ -14,11 +13,6 @@ interface CategoryEntry {
 }
 
 export default defineEventHandler(async (event) => {
-	const { site, stats: statsConfig, features } = useClarityServerConfig()
-	if (!features.stats) {
-		throw createError({ statusCode: 404, statusMessage: 'Stats output is disabled' })
-	}
-
 	const stats = {
 		total: { posts: 0, words: 0 },
 		annual: <Record<number, StatsEntry>>{},
@@ -28,18 +22,14 @@ export default defineEventHandler(async (event) => {
 
 	const existedPaths = new Set<string>()
 
-	const query = queryCollection(event, 'content' as never)
-	if (statsConfig.includePaths.length) {
-		// @nuxt/content 3.16+ 的 orWhere 组内条件以 OR 连接：
-		// 多个 includePaths 必须取并集（posts/% + notes/% → 两类文章都计入）。
-		query.orWhere((group) => {
-			for (const path of statsConfig.includePaths) {
-				group.where('stem', 'LIKE', path)
-			}
-			return group
-		})
+	const query = queryCollection(event, 'content')
+	if (blogConfig.stats.includePaths.length) {
+		query.orWhere(group => blogConfig.stats.includePaths.reduce(
+			(group, path) => group.where('stem', 'LIKE', path),
+			group,
+		))
 	}
-	const posts = await query.all() as ClarityContentRow[]
+	const posts = await query.all()
 
 	const findOrCreateCategory = (
 		name: string,
@@ -65,7 +55,7 @@ export default defineEventHandler(async (event) => {
 
 		// 年文章/年字数计数
 		try {
-			const year = toZonedTemporal(post.date || '', site.timezone).year
+			const year = toZonedTemporal(post.date || '').year
 			if (!stats.annual[year]) {
 				stats.annual[year] = { posts: 0, words: 0 }
 			}

package/src/server/routes/atom.xml.get.ts

@@ -1,7 +1,11 @@
-import type { ClarityContentRow } from '../../shared/types/content'
+import type { ContentCollectionItem } from '@nuxt/content'
 import { queryCollection } from '@nuxt/content/server'
+import { pascalCase } from 'es-toolkit/string'
 import XmlBuilder from 'fast-xml-builder'
-import { toZonedTemporal } from '../../shared/utils/time'
+import { Temporal } from 'temporal-polyfill'
+import blogConfig from '~~/blog.config'
+import packageJson from '~~/package.json'
+import { toZonedTemporal } from '~~/shared/utils/time'
 
 const runtimeConfig = useRuntimeConfig()
 
@@ -13,48 +17,42 @@ const builder = new XmlBuilder({
 	textNodeName: '_',
 })
 
-export default defineEventHandler(async (event) => {
-	const { site, feed, features } = useClarityServerConfig()
-	if (!features.atom) {
-		throw createError({ statusCode: 404, statusMessage: 'Atom feed is disabled' })
+function formatIsoDate(date?: string) {
+	if (!date)
+		return
+	try {
+		return toZonedTemporal(date).toInstant().toString()
 	}
-	const themeInfo = runtimeConfig.public.clarity as { theme: string, themeVersion: string, themeHomepage: string }
-
-	function formatIsoDate(date?: string) {
-		if (!date)
-			return
-		try {
-			return toZonedTemporal(date, site.timezone).toInstant().toString()
-		}
-		catch {
-			console.error('Invalid date format', date)
-			return date
-		}
+	catch {
+		console.error('Invalid date format', date)
+		return date
 	}
+}
 
-	function getUrl(path: string | undefined) {
-		return new URL(path ?? '', site.url).toString()
-	}
+function getUrl(path: string | undefined) {
+	return new URL(path ?? '', blogConfig.url).toString()
+}
 
-	function renderContent(post: ClarityContentRow) {
-		return [
-			post.image && `<img src="${post.image}" alt="${post.title}" />`,
-			post.description && `<p>${post.description}</p>`,
-			`<a class="view-full" href="${getUrl(post.path)}" target="_blank">点击查看全文</a>`,
-		].filter(Boolean).join(' ')
-	}
+function renderContent(post: ContentCollectionItem) {
+	return [
+		post.image && `<img src="${post.image}" alt="${post.title}" />`,
+		post.description && `<p>${post.description}</p>`,
+		`<a class="view-full" href="${getUrl(post.path)}" target="_blank">点击查看全文</a>`,
+	].join(' ')
+}
 
-	const posts = await queryCollection(event, 'content' as never)
+export default defineEventHandler(async (event) => {
+	const posts = await queryCollection(event, 'content')
 		.where('stem', 'LIKE', 'posts/%')
 		.order('updated', 'DESC')
-		.limit(feed.limit)
-		.all() as ClarityContentRow[]
+		.limit(blogConfig.feed.limit)
+		.all()
 
 	const entries = posts.map(post => ({
 		id: getUrl(post.path),
 		title: post.title ?? '',
 		updated: formatIsoDate(post.updated),
-		author: { name: (post as any).author || site.author.name },
+		author: { name: post.author || blogConfig.author.name },
 		content: {
 			$type: 'html',
 			$: renderContent(post),
@@ -65,37 +63,37 @@ export default defineEventHandler(async (event) => {
 		published: formatIsoDate(post.published ?? post.date),
 	}))
 
-	const feedData = {
+	const feed = {
 		$xmlns: 'http://www.w3.org/2005/Atom',
-		id: site.url,
-		title: site.title,
+		id: blogConfig.url,
+		title: blogConfig.title,
 		updated: runtimeConfig.public.buildTime,
-		description: site.description,
+		description: blogConfig.description, // RSS 2.0
 		author: {
-			name: site.author.name,
-			email: site.author.email,
-			uri: site.author.homepage,
+			name: blogConfig.author.name,
+			email: blogConfig.author.email,
+			uri: blogConfig.author.homepage,
 		},
 		link: [
 			{ $href: getUrl('atom.xml'), $rel: 'self' },
-			{ $href: site.url, $rel: 'alternate' },
+			{ $href: blogConfig.url, $rel: 'alternate' },
 		],
-		language: site.language,
+		language: blogConfig.language, // RSS 2.0
 		generator: {
-			$uri: themeInfo.themeHomepage,
-			$version: themeInfo.themeVersion,
-			_: themeInfo.theme,
+			$uri: 'https://github.com/L33Z22L11/blog-v3',
+			$version: packageJson.version,
+			_: pascalCase(packageJson.name),
 		},
-		icon: site.favicon,
-		logo: site.author.avatar,
-		rights: `© ${new Date().getFullYear()} ${site.author.name}`,
-		subtitle: site.subtitle || site.description,
+		icon: blogConfig.favicon,
+		logo: blogConfig.author.avatar, // Ratio should be 2:1
+		rights: `© ${Temporal.Now.plainDateISO().year.toString()} ${blogConfig.author.name}`,
+		subtitle: blogConfig.subtitle || blogConfig.description,
 		entry: entries,
 	}
 
 	return builder.build({
 		'?xml': { $version: '1.0', $encoding: 'UTF-8' },
-		'?xml-stylesheet': feed.enableStyle ? { $type: 'text/xsl', $href: '/assets/atom.xsl' } : undefined,
-		'feed': feedData,
+		'?xml-stylesheet': blogConfig.feed.enableStyle ? { $type: 'text/xsl', $href: '/assets/atom.xsl' } : undefined,
+		feed,
 	})
 })

package/src/server/routes/subscriptions.opml.get.ts

@@ -1,6 +1,7 @@
 import type { FeedEntry, FeedGroup } from '../../types/feed'
 import XmlBuilder from 'fast-xml-builder'
-import { toZonedTemporal } from '../../shared/utils/time'
+import blogConfig, { myFeed } from '~~/blog.config'
+import feeds from '~/feeds'
 
 const runtimeConfig = useRuntimeConfig()
 
@@ -10,54 +11,36 @@ const builder = new XmlBuilder({
 	ignoreAttributes: false,
 })
 
-function mapEntry(item: FeedEntry, timeZone: string) {
+function mapEntry(item: FeedEntry) {
 	return {
 		$text: item.title || item.sitenick || item.author,
 		$type: 'rss',
 		$xmlUrl: item.feed,
-		$created: toZonedTemporal(item.date, timeZone).toInstant().toString(),
+		$created: toZonedTemporal(item.date).toInstant().toString(),
 		$description: item.desc,
 		$htmlUrl: item.link || item.feed,
 	}
 }
 
-function flattenGroups(groups: FeedGroup[], timeZone: string) {
-	return groups.flatMap(({ entries }) => entries.filter(({ feed }) => feed).map(item => mapEntry(item, timeZone)))
+function flattenGroups(groups: FeedGroup[]) {
+	return groups.flatMap(({ entries }) => entries.filter(({ feed }) => feed).map(mapEntry))
 }
 
-export default defineEventHandler(async () => {
-	const { site, features } = useClarityServerConfig()
-	if (!features.opml) {
-		throw createError({ statusCode: 404, statusMessage: 'OPML subscription output is disabled' })
-	}
-	const feeds = (await import('#clarity/feeds')).default as FeedGroup[]
-	const myFeed: FeedEntry = {
-		author: site.author.name,
-		title: site.title,
-		desc: site.subtitle || site.description,
-		link: site.url,
-		feed: new URL('/atom.xml', site.url).toString(),
-		icon: site.favicon,
-		avatar: site.author.avatar || site.favicon,
-		date: site.established || '',
-	}
-
+export default defineEventHandler(async (_e) => {
 	const outlines = [
-		mapEntry(myFeed, site.timezone),
-		...flattenGroups(feeds, site.timezone),
+		mapEntry(myFeed),
+		...flattenGroups(feeds),
 	]
 
 	const opml = {
 		$version: '2.0',
 		head: {
-			title: `${site.title}的友链订阅`,
-			dateCreated: site.established
-				? toZonedTemporal(site.established, site.timezone).toInstant().toString()
-				: undefined,
+			title: `${blogConfig.title}的友链订阅`,
+			dateCreated: toZonedTemporal(blogConfig.timeEstablished).toInstant().toString(),
 			dateModified: runtimeConfig.public.buildTime,
-			ownerName: site.author.name,
-			ownerEmail: site.author.email,
-			ownerId: site.author.homepage,
+			ownerName: blogConfig.author.name,
+			ownerEmail: blogConfig.author.email,
+			ownerId: blogConfig.author.homepage,
 			docs: 'https://opml.org/spec2.opml',
 		},
 		body: { outline: outlines },

package/src/server/utils/clarity.ts

@@ -4,7 +4,7 @@ import type { ClarityServerConfig } from '../../config/server'
  * 获取服务端专用 Clarity 配置（完整 site/feed/stats 与 feature 路由开关）。
  *
  * 数据来自 Nitro 私有 runtimeConfig，不会进入客户端 bundle；
- * 请只在 server/ 侧调用，客户端渲染请使用 useClarityConfig()。
+ * 请只在 server/ 侧调用；客户端渲染读取扁平 app config（useAppConfig()）。
  */
 export function useClarityServerConfig(): ClarityServerConfig {
 	return useRuntimeConfig().clarity as ClarityServerConfig

package/src/shared/utils/time.ts

@@ -1,9 +1,10 @@
 import { Temporal } from 'temporal-polyfill'
+import blogConfig from '~~/blog.config'
 
-export function isSameUnit(date1: string, date2: string, unit: 'year' | 'month' | 'week' | 'day' | 'hour' | 'minute' | 'second', timeZone = 'UTC') {
+export function isSameUnit(date1: string, date2: string, unit: Temporal.DateTimeUnit) {
 	try {
-		const p1 = toZonedTemporal(date1, timeZone).toPlainDateTime()
-		const p2 = toZonedTemporal(date2, timeZone).toPlainDateTime()
+		const p1 = toZonedTemporal(date1).toPlainDateTime()
+		const p2 = toZonedTemporal(date2).toPlainDateTime()
 		return p1.until(p2, {
 			largestUnit: unit,
 			smallestUnit: unit,
@@ -19,7 +20,6 @@ export function isSameUnit(date1: string, date2: string, unit: 'year' | 'month'
 export function isTimeDiffSignificant(
 	date1?: string,
 	date2?: string,
-	timeZone = 'UTC',
 	/** 对于时间差的敏感程度，0~1 之间，1:不同则认为显著，>1:始终认为显著 */
 	threshold = 0.6,
 ) {
@@ -29,8 +29,8 @@ export function isTimeDiffSignificant(
 		return true
 	try {
 		const now = Temporal.Now.instant().epochMilliseconds
-		const diff1 = now - toZonedTemporal(date1, timeZone).epochMilliseconds
-		const diff2 = now - toZonedTemporal(date2, timeZone).epochMilliseconds
+		const diff1 = now - toZonedTemporal(date1).epochMilliseconds
+		const diff2 = now - toZonedTemporal(date2).epochMilliseconds
 		return diff1 / diff2 < threshold || diff2 / diff1 < threshold
 	}
 	catch {
@@ -63,25 +63,20 @@ export function timeElapse(date: string | Temporal.PlainDateTime, maxDepth = 2)
 	return timeString || '刚刚'
 }
 
-export function toInstantString(date: string | Temporal.ZonedDateTime, timeZone = 'UTC') {
-	return (typeof date === 'string' ? toZonedTemporal(date, timeZone) : date).toInstant().toString()
+export function toInstantString(date: string | Temporal.ZonedDateTime) {
+	return (typeof date === 'string' ? toZonedTemporal(date) : date).toInstant().toString()
 }
 
-/**
- * 将日期字符串解析为带时区的 Temporal 对象
- * @param date 日期字符串
- * @param timeZone 无时区信息时使用的默认时区（来自站点配置）
- */
-export function toZonedTemporal(date: string, timeZone = 'UTC') {
+export function toZonedTemporal(date: string) {
 	try {
 		return Temporal.ZonedDateTime.from(date)
 	}
 	catch {
 		try {
-			return Temporal.Instant.from(date).toZonedDateTimeISO(timeZone)
+			return Temporal.Instant.from(date).toZonedDateTimeISO(blogConfig.timeZone)
 		}
 		catch {
-			return Temporal.PlainDateTime.from(date).toZonedDateTime(timeZone)
+			return Temporal.PlainDateTime.from(date).toZonedDateTime(blogConfig.timeZone)
 		}
 	}
 }
@@ -110,7 +105,7 @@ export const dateTimeFormat = {
 
 export type dateTimeFormatOptions = keyof typeof dateTimeFormat | Intl.DateTimeFormatOptions
 
-export function toZdtLocaleString(date: string | Temporal.ZonedDateTime, format: dateTimeFormatOptions = 'full', timeZone = 'UTC') {
-	return (typeof date === 'string' ? toZonedTemporal(date, timeZone) : date)
+export function toZdtLocaleString(date: string | Temporal.ZonedDateTime, format: dateTimeFormatOptions = 'full') {
+	return (typeof date === 'string' ? toZonedTemporal(date) : date)
 		.toLocaleString(undefined, typeof format === 'string' ? dateTimeFormat[format] : format)
 }

package/src/types/article.ts

@@ -1,8 +1,8 @@
-import type { ClarityAppConfig } from '../config/app'
+import type { AppConfig } from 'nuxt/schema'
 import type { ArticleSchema } from '../config/content'
 import type { MetaSlotsTree } from '../remark-plugins/rehype-meta-slots'
 
-export type ArticleOrderType = keyof ClarityAppConfig['article']['order']
+export type ArticleOrderType = keyof AppConfig['article']['order']
 
 export interface ArticleProps extends ArticleSchema {
 	path: string

package/src/types/feed.ts

@@ -1 +1,35 @@
-export type { FeedEntry, FeedGroup } from '../config/feed'
+export interface FeedEntry {
+	/** 博客作者，使用作者明确的自称 */
+	author: string
+	/** 友链卡片的作者名后缀；作者自称明确且较短时，可填简短站名，避免重复作者名 */
+	sitenick?: string
+	/** 悬浮卡片与订阅源使用的完整站点标题；与作者名相同时省略，默认使用 sitenick 或 author */
+	title?: string
+	/** 个人简介/博客描述 */
+	desc?: string
+	/** 博客地址 */
+	link: string
+	/** 订阅源 */
+	feed?: string
+	/** 站点小图标 */
+	icon: string
+	/** 个人头像 */
+	avatar: string
+	/** 博客技术架构 */
+	archs?: Arch[]
+	/** 申请/评论日期；主动收录时使用收录日期 */
+	date: string
+	/** 博主备注 */
+	comment?: string
+	/** 错误信息 */
+	error?: string
+}
+
+export interface FeedGroup {
+	/** 分组名 */
+	name: string
+	/** 描述 */
+	desc?: string
+	/** 友链列表 */
+	entries: FeedEntry[]
+}

package/src/types/upstream-compat.d.ts

@@ -0,0 +1,17 @@
+export {}
+
+/**
+ * 上游同步代码的类型兼容垫片。
+ *
+ * blog-v3 仓库不运行 typecheck，以下问题在上游真实存在；
+ * 为保持同步文件 byte-identical，通过模块增强补齐类型：
+ */
+
+declare module '@nuxt/content' {
+	interface PageCollectionItemBase {
+		/** 上游 atom.xml 读取 post.author（frontmatter 可选字段），上游 schema 未声明 */
+		author?: string
+	}
+}
+
+/// <reference path="./yaml-modules.d.ts" />

package/src/types/yaml-modules.d.ts

@@ -0,0 +1,26 @@
+/**
+ * YAML 导入类型（与 unplugin-yaml 官方声明一致）。
+ *
+ * Theme 直接注册 unplugin-yaml/vite 插件而非其 nuxt 模块：后者会向消费项目
+ * compilerOptions.types 注入 pnpm 严格布局下无法解析的条目。通配符模块声明
+ * 必须位于非模块（script）文件中才能全局生效。
+ */
+declare module '*.yaml' {
+	const value: Record<string, unknown>
+	export default value
+}
+
+declare module '*.yml' {
+	const value: Record<string, unknown>
+	export default value
+}
+
+declare module '*.yaml?raw' {
+	const value: string
+	export default value
+}
+
+declare module '*.yml?raw' {
+	const value: string
+	export default value
+}

package/src/shared/types/content.ts

@@ -1,30 +0,0 @@
-import type { PageCollectionItemBase } from '@nuxt/content'
-
-/**
- * Theme 内部使用的 content 集合行类型。
- *
- * 消费项目的精确集合类型由 @nuxt/content 按站点 schema 生成，并通过
- * module augmentation 注入消费项目上下文。Theme 作为 node_modules Layer
- * 解析到的 @nuxt/content 类型实例无法稳定共享该 augmentation（pnpm 严格
- * 布局下会形成双实例），因此 Theme 内部只依赖自身 schema 的稳定字段。
- */
-export type ClarityContentRow = PageCollectionItemBase & {
-	title?: string
-	description?: string
-	date?: string
-	updated?: string
-	published?: string
-	categories?: string[]
-	tags?: string[]
-	type?: string
-	image?: string
-	recommend?: number
-	draft?: boolean
-	permalink?: string
-	readingTime: {
-		text: string
-		minutes: number
-		time: number
-		words: number
-	}
-}

package/src/shared/utils/clarity.ts

@@ -1,34 +0,0 @@
-import type { ClarityAppConfig } from '../../config/app'
-import type { FeedEntry } from '../../config/feed'
-import type { ClaritySiteConfig } from '../../config/schema'
-
-/** 获取完整 Clarity 配置（站点配置 + UI 配置） */
-export function useClarityConfig(): ClarityAppConfig {
-	return useAppConfig().clarity as unknown as ClarityAppConfig
-}
-
-/** 获取站点配置（标题、作者、URL 等） */
-export function useClaritySite(): ClaritySiteConfig {
-	return useClarityConfig().site
-}
-
-/** 获取文章配置的客户端子集（分类图标/颜色、排序方式） */
-export function useClarityArticle(): ClarityAppConfig['article'] {
-	return useClarityConfig().article
-}
-
-/** 由站点配置生成本站订阅源条目（用于友链页与 OPML） */
-export function useClaritySiteFeedEntry(): FeedEntry {
-	const site = useClaritySite()
-	return {
-		author: site.author.name,
-		title: site.title,
-		desc: site.subtitle || site.description,
-		link: site.url,
-		feed: new URL('/atom.xml', site.url).toString(),
-		icon: site.favicon,
-		avatar: site.author.avatar || site.favicon,
-		date: site.established || '',
-		comment: '这是我自己',
-	}
-}

package/src/types/modal.ts

@@ -1,16 +0,0 @@
-/**
- * 与 @bikariya/modals 的 runtime/types 保持一致的类型定义。
- *
- * 该包 exports 未暴露 runtime/types 子路径，其 `#modals` 虚拟别名在
- * 真实 npm 消费项目中无法被 Vue SFC 编译器稳定解析，因此 Theme 内联维护。
- */
-export interface ModalProps {
-	/** 过渡动画时长 (ms) @default 400 */
-	duration?: number
-	/** 模态框开关状态 @internal */
-	open?: boolean
-}
-
-export interface ModalEmits {
-	close: []
-}