clarity-theme 0.1.0 → 0.1.2

package/{config → src/config}/content.ts

@@ -1,71 +1,71 @@
-import type { ReadTimeResults } from 'reading-time'
+import type { ReadTimeResults } from 'reading-time'
 import type { ClarityConfig } from './schema'
 import { defineCollection, defineContentConfig } from '@nuxt/content'
-import { defineSitemapSchema } from '@nuxtjs/sitemap/content'
+import { defineSitemapSchema } from '@nuxtjs/sitemap/content'
 import { z } from 'zod'
-import { clarityConfigSchema } from './schema'
-
-export interface ArticleSchema {
-	title?: string
-	description?: string
-	date?: string
-	updated?: string
-	published?: string
-	categories?: string[]
-	tags?: string[]
-	type?: keyof ClarityConfig['article']['types']
-
-	image?: string
-	recommend?: number
-	references?: { title?: string, link?: string }[]
-	draft?: boolean
-	permalink?: string
-
-	readingTime?: ReadTimeResults
-}
-
+import { clarityConfigSchema } from './schema'
+
+export interface ArticleSchema {
+	title?: string
+	description?: string
+	date?: string
+	updated?: string
+	published?: string
+	categories?: string[]
+	tags?: string[]
+	type?: keyof ClarityConfig['article']['types']
+
+	image?: string
+	recommend?: number
+	references?: { title?: string, link?: string }[]
+	draft?: boolean
+	permalink?: string
+
+	readingTime?: ReadTimeResults
+}
+
 function createArticleSchema(config: ClarityConfig) {
 	// 兜底：types 为空时 z.enum([]) 非法，统一回退到默认版式
 	const articleTypes = Object.keys(config.article.types)
 	const typeValues = articleTypes.length > 0 ? articleTypes : ['tech']
-
-	return z.object({
-		title: z.string().optional(),
-		description: z.string().optional(),
-		date: z.string().optional(),
-		updated: z.string().optional(),
-		published: z.string().optional(),
-		categories: z.array(z.string()).default([config.article.defaultCategory]),
-		tags: z.array(z.string()).default([]),
+
+	return z.object({
+		title: z.string().optional(),
+		description: z.string().optional(),
+		date: z.string().optional(),
+		updated: z.string().optional(),
+		published: z.string().optional(),
+		categories: z.array(z.string()).default([config.article.defaultCategory]),
+		tags: z.array(z.string()).default([]),
 		type: z.enum(typeValues as any).optional().default(typeValues[0]),
-
-		image: z.string().optional(),
-		recommend: z.number().optional(),
-		references: z.array(z.object({
-			title: z.string().optional(),
-			link: z.string().optional(),
-		})).optional(),
-		draft: z.boolean().default(false),
-		permalink: z.string().optional(),
-
-		readingTime: z.object({
-			text: z.string(),
-			minutes: z.number(),
-			time: z.number(),
-			words: z.number(),
-		}),
-	}) satisfies z.ZodType<ArticleSchema>
-}
-
-/**
- * 在消费项目 content.config.ts 中生成 Clarity Content 集合：
- *
- * ```ts
- * import clarityConfig from './clarity.config'
- * import { createClarityContentConfig } from 'clarity-theme/content'
- * export default createClarityContentConfig(clarityConfig)
- * ```
- */
+
+		image: z.string().optional(),
+		recommend: z.number().optional(),
+		references: z.array(z.object({
+			title: z.string().optional(),
+			link: z.string().optional(),
+		})).optional(),
+		draft: z.boolean().default(false),
+		permalink: z.string().optional(),
+
+		readingTime: z.object({
+			text: z.string(),
+			minutes: z.number(),
+			time: z.number(),
+			words: z.number(),
+		}),
+	}) satisfies z.ZodType<ArticleSchema>
+}
+
+/**
+ * 在消费项目 content.config.ts 中生成 Clarity Content 集合：
+ *
+ * ```ts
+ * import clarityConfig from './clarity.config'
+ * import { createClarityContentConfig } from 'clarity-theme/content'
+ * export default createClarityContentConfig(clarityConfig)
+ * ```
+ */
 export function createClarityContentConfig(config: ClarityConfig) {
 	const parsed = clarityConfigSchema.parse(config)
 	return defineContentConfig({
@@ -74,18 +74,18 @@ export function createClarityContentConfig(config: ClarityConfig) {
 				source: '**',
 				type: 'page',
 				schema: createArticleSchema(parsed).extend({
-					sitemap: defineSitemapSchema({
-						name: 'content',
-						onUrl: (url, entry) => {
-							const lastmod = (entry.updated || entry.published || entry.date) as string | undefined
-							if (lastmod) {
-								url.lastmod = new Date(lastmod).toLocaleDateString('sv')
-							}
-						},
-						z,
-					}),
-				}),
-			}),
-		},
-	})
-}
+					sitemap: defineSitemapSchema({
+						name: 'content',
+						onUrl: (url, entry) => {
+							const lastmod = (entry.updated || entry.published || entry.date) as string | undefined
+							if (lastmod) {
+								url.lastmod = new Date(lastmod).toLocaleDateString('sv')
+							}
+						},
+						z,
+					}),
+				}),
+			}),
+		},
+	})
+}

package/{config → src/config}/define.ts

@@ -1,6 +1,6 @@
-import type { ClarityConfig, ClarityConfigInput } from './schema'
-import { clarityConfigSchema } from './schema'
-
+import type { ClarityConfig, ClarityConfigInput } from './schema'
+import { clarityConfigSchema } from './schema'
+
 /**
  * 定义 Clarity Theme 站点配置
  *

package/src/config/feeds.empty.ts

@@ -0,0 +1,6 @@
+import type { FeedGroup } from '../types/feed'
+
+/** 消费项目未提供 feeds.ts 时的空数据兜底 */
+const emptyFeeds: FeedGroup[] = []
+
+export default emptyFeeds

package/{config → src/config}/index.ts

@@ -1,4 +1,4 @@
-export type { Nav, NavItem } from '../app/types/nav'
+export type { Nav, NavItem } from '../types/nav'
 export type { ClarityAppConfig, ClarityUiConfig, ClarityUiConfigInput, NavGroup } from './app'
 export { defineClarityConfig } from './define'
 export type { Arch, FeedEntry, FeedGroup } from './feed'

package/{config → src/config}/schema.ts

@@ -5,50 +5,50 @@ import { z } from 'zod'
  * 未知字段直接报错，而不是被静默丢弃（防止拼写错误悄悄失效）。
  * 唯一例外：article.types 的值使用 looseObject，作为版式扩展位。
  */
-
-/** 注入到 <head> 的脚本（统计、评论等第三方脚本） */
-export const clarityHeadScriptSchema = z.record(z.string(), z.union([
-	z.string(),
-	z.number(),
-	z.boolean(),
-]))
-
+
+/** 注入到 <head> 的脚本（统计、评论等第三方脚本） */
+export const clarityHeadScriptSchema = z.record(z.string(), z.union([
+	z.string(),
+	z.number(),
+	z.boolean(),
+]))
+
 export const clarityAuthorSchema = z.strictObject({
-	name: z.string().min(1),
-	avatar: z.string().optional(),
-	email: z.string().optional(),
-	homepage: z.string().optional(),
-})
-
+	name: z.string().min(1),
+	avatar: z.string().optional(),
+	email: z.string().optional(),
+	homepage: z.string().optional(),
+})
+
 export const claritySiteSchema = z.strictObject({
-	title: z.string().min(1),
-	subtitle: z.string().optional(),
-	description: z.string().min(1),
+	title: z.string().min(1),
+	subtitle: z.string().optional(),
+	description: z.string().min(1),
 	/** 站点规范 URL（以 / 结尾，用于 new URL() 相对路径解析） */
 	url: z.string().url().refine(
 		value => value.endsWith('/'),
 		'站点 URL 必须以 / 结尾（例如 https://example.com/）',
 	),
-	language: z.string().default('zh-CN'),
-	timezone: z.string().default('Asia/Shanghai'),
-	/** 建站日期 */
-	established: z.string().optional(),
-	favicon: z.string().default('/favicon.svg'),
-	author: clarityAuthorSchema,
+	language: z.string().default('zh-CN'),
+	timezone: z.string().default('Asia/Shanghai'),
+	/** 建站日期 */
+	established: z.string().optional(),
+	favicon: z.string().default('/favicon.svg'),
+	author: clarityAuthorSchema,
 	copyright: z.strictObject({
-		abbr: z.string().optional(),
-		name: z.string().optional(),
-		url: z.string().optional(),
-	}).optional(),
-})
-
+		abbr: z.string().optional(),
+		name: z.string().optional(),
+		url: z.string().optional(),
+	}).optional(),
+})
+
 export const clarityArticleSchema = z.strictObject({
-	defaultCategory: z.string().default('未分类'),
+	defaultCategory: z.string().default('未分类'),
 	categories: z.record(z.string(), z.strictObject({
-		icon: z.string().optional(),
-		color: z.string().optional(),
-	})).default({}),
-	/** 文章版式，首个为默认版式 */
+		icon: z.string().optional(),
+		color: z.string().optional(),
+	})).default({}),
+	/** 文章版式，首个为默认版式 */
 	types: z.record(z.string(), z.looseObject({})).default({ tech: {} }),
 	/** 分类排序方式，键为排序字段，值为显示名称 */
 	order: z.record(z.string(), z.string()).default({ date: '创建日期', updated: '更新日期' }),
@@ -56,54 +56,54 @@ export const clarityArticleSchema = z.strictObject({
 	hidePostPrefix: z.boolean().default(true),
 	/** 禁止搜索引擎收录的路径，仅模块构建期使用 */
 	robotsNotIndex: z.array(z.string()).default([]),
-})
-
+})
+
 export const clarityFeedSchema = z.strictObject({
-	/** 订阅源最大文章数量 */
-	limit: z.number().int().positive().default(50),
-	/** 订阅源是否启用 XSLT 样式 */
-	enableStyle: z.boolean().default(true),
-})
-
+	/** 订阅源最大文章数量 */
+	limit: z.number().int().positive().default(50),
+	/** 订阅源是否启用 XSLT 样式 */
+	enableStyle: z.boolean().default(true),
+})
+
 export const clarityStatsSchema = z.strictObject({
-	/**
-	 * 统计范围，匹配 content 下不含扩展名的路径（stem）；空数组统计全部内容
-	 * 使用 SQL LIKE 语法： % 匹配任意长度字符， _ 匹配单个字符
-	 */
-	includePaths: z.array(z.string()).default([]),
-})
-
+	/**
+	 * 统计范围，匹配 content 下不含扩展名的路径（stem）；空数组统计全部内容
+	 * 使用 SQL LIKE 语法： % 匹配任意长度字符， _ 匹配单个字符
+	 */
+	includePaths: z.array(z.string()).default([]),
+})
+
 export const clarityIntegrationsSchema = z.strictObject({
-	/** Twikoo 评论系统，未配置时不渲染评论区 */
+	/** Twikoo 评论系统，未配置时不渲染评论区 */
 	twikoo: z.strictObject({
-		envId: z.string(),
-		/** 预连接地址，默认使用 envId */
-		preload: z.string().optional(),
-	}).optional(),
+		envId: z.string(),
+		/** 预连接地址，默认使用 envId */
+		preload: z.string().optional(),
+	}).optional(),
 	/** 向 <head> 中添加的脚本，仅模块构建期注入，不进入 appConfig */
 	scripts: z.array(clarityHeadScriptSchema).default([]),
-})
-
-export const clarityAntiMirrorSchema = z.union([
-	z.boolean(),
+})
+
+export const clarityAntiMirrorSchema = z.union([
+	z.boolean(),
 	z.strictObject({
-		/** 需要跳转回源站的镜像站域名后缀 */
-		blacklist: z.array(z.string()).default([]),
-	}),
-])
-
+		/** 需要跳转回源站的镜像站域名后缀 */
+		blacklist: z.array(z.string()).default([]),
+	}),
+])
+
 export const clarityFeaturesSchema = z.strictObject({
-	atom: z.boolean().default(true),
-	opml: z.boolean().default(true),
-	stats: z.boolean().default(true),
-	antiMirror: clarityAntiMirrorSchema.default(false),
-})
-
+	atom: z.boolean().default(true),
+	opml: z.boolean().default(true),
+	stats: z.boolean().default(true),
+	antiMirror: clarityAntiMirrorSchema.default(false),
+})
+
 export const clarityChangelogEntrySchema = z.strictObject({
-	date: z.string(),
-	text: z.string(),
-})
-
+	date: z.string(),
+	text: z.string(),
+})
+
 export const clarityConfigSchema = z.strictObject({
 	site: claritySiteSchema,
 	article: clarityArticleSchema.prefault({}),
@@ -111,19 +111,19 @@ export const clarityConfigSchema = z.strictObject({
 	stats: clarityStatsSchema.prefault({}),
 	integrations: clarityIntegrationsSchema.prefault({}),
 	features: clarityFeaturesSchema.prefault({}),
-	/** 更新日志组件数据，按时间倒序展示 */
-	changelog: z.array(clarityChangelogEntrySchema).default([]),
-})
-
-export type ClarityHeadScript = z.output<typeof clarityHeadScriptSchema>
-export type ClarityAuthor = z.output<typeof clarityAuthorSchema>
-export type ClaritySiteConfig = z.output<typeof claritySiteSchema>
-export type ClarityArticleConfig = z.output<typeof clarityArticleSchema>
-export type ClarityFeedConfig = z.output<typeof clarityFeedSchema>
-export type ClarityStatsConfig = z.output<typeof clarityStatsSchema>
-export type ClarityIntegrationsConfig = z.output<typeof clarityIntegrationsSchema>
-export type ClarityAntiMirrorConfig = z.output<typeof clarityAntiMirrorSchema>
-export type ClarityFeaturesConfig = z.output<typeof clarityFeaturesSchema>
-export type ClarityChangelogEntry = z.output<typeof clarityChangelogEntrySchema>
-export type ClarityConfig = z.output<typeof clarityConfigSchema>
-export type ClarityConfigInput = z.input<typeof clarityConfigSchema>
+	/** 更新日志组件数据，按时间倒序展示 */
+	changelog: z.array(clarityChangelogEntrySchema).default([]),
+})
+
+export type ClarityHeadScript = z.output<typeof clarityHeadScriptSchema>
+export type ClarityAuthor = z.output<typeof clarityAuthorSchema>
+export type ClaritySiteConfig = z.output<typeof claritySiteSchema>
+export type ClarityArticleConfig = z.output<typeof clarityArticleSchema>
+export type ClarityFeedConfig = z.output<typeof clarityFeedSchema>
+export type ClarityStatsConfig = z.output<typeof clarityStatsSchema>
+export type ClarityIntegrationsConfig = z.output<typeof clarityIntegrationsSchema>
+export type ClarityAntiMirrorConfig = z.output<typeof clarityAntiMirrorSchema>
+export type ClarityFeaturesConfig = z.output<typeof clarityFeaturesSchema>
+export type ClarityChangelogEntry = z.output<typeof clarityChangelogEntrySchema>
+export type ClarityConfig = z.output<typeof clarityConfigSchema>
+export type ClarityConfigInput = z.input<typeof clarityConfigSchema>

package/{app → src}/error.vue

@@ -1,34 +1,34 @@
-<script setup lang="ts">
-import type { NuxtError } from '#app'
-
-defineProps<{
-	error: NuxtError & { url?: string }
-}>()
-</script>
-
-<template>
-<NuxtLayout>
-	<template #aside>
-		<WidgetBlogLog />
-	</template>
-
-	<div class="app-error">
-		<ZError
-			:code="error.stack"
-			:message="error.url"
-			:title="`[${error.status}] ${error.message}`"
-		>
-			<template #operation>
-				<ZButton text="返回主页" @click="clearError({ redirect: '/' })" />
-				<ZButton text="尝试忽略" @click="clearError()" />
-			</template>
-		</ZError>
-	</div>
-</NuxtLayout>
-</template>
-
-<style lang="scss" scoped>
+<script setup lang="ts">
+import type { NuxtError } from '#app'
+
+defineProps<{
+	error: NuxtError & { url?: string }
+}>()
+</script>
+
+<template>
+<NuxtLayout>
+	<template #aside>
+		<WidgetBlogLog />
+	</template>
+
+	<div class="app-error">
+		<ZError
+			:code="error.stack"
+			:message="error.url"
+			:title="`[${error.status}] ${error.message}`"
+		>
+			<template #operation>
+				<ZButton text="返回主页" @click="clearError({ redirect: '/' })" />
+				<ZButton text="尝试忽略" @click="clearError()" />
+			</template>
+		</ZError>
+	</div>
+</NuxtLayout>
+</template>
+
+<style lang="scss" scoped>
 .app-error {
 	margin: 1rem;
 }
-</style>
+</style>

package/{img → src/img}/index.ts

@@ -1,8 +1,8 @@
 /**
  * `clarity-theme/img` 类型真源。
  *
- * 类型实现复用 `app/utils/img.ts`（Layer 内部与包导出共享同一份签名），
+ * 类型实现复用 `src/utils/img.ts`（Layer 内部与包导出共享同一份签名），
  * 运行时实现在同目录 index.mjs：Node 原生 TS 剥离不允许
  * node_modules 内的 TS 文件，因此包入口运行时必须是 .mjs。
  */
-export * from '../app/utils/img'
+export * from '../utils/img'

package/{app → src}/layouts/default.vue

@@ -1,27 +1,27 @@
-<script setup lang="ts">
-const { slots } = inject<any>(Symbol.for('dxup:layout-slots')) || {}
-</script>
-
-<template>
-<NuxtLoadingIndicator />
-<NuxtRouteAnnouncer :style="{ position: 'absolute' }" />
-<BlogSkipToContent />
-<BlogSidebar />
-<div id="content">
-	<main id="main-content">
-		<slot />
-		<BlogFooter />
-	</main>
-	<BlogAside>
-		<slot name="aside" />
-	</BlogAside>
-</div>
-<BlogPanel :has-aside="!!slots?.aside" />
-<BikariyaModals />
-</template>
-
-<!-- eslint-disable-next-line vue/enforce-style-attribute -->
-<style lang="scss">
+<script setup lang="ts">
+const { slots } = inject<any>(Symbol.for('dxup:layout-slots')) || {}
+</script>
+
+<template>
+<NuxtLoadingIndicator />
+<NuxtRouteAnnouncer :style="{ position: 'absolute' }" />
+<BlogSkipToContent />
+<BlogSidebar />
+<div id="content">
+	<main id="main-content">
+		<slot />
+		<BlogFooter />
+	</main>
+	<BlogAside>
+		<slot name="aside" />
+	</BlogAside>
+</div>
+<BlogPanel :has-aside="!!slots?.aside" />
+<BikariyaModals />
+</template>
+
+<!-- eslint-disable-next-line vue/enforce-style-attribute -->
+<style lang="scss">
 #blog-root {
 	display: flex;
 	justify-content: center;
@@ -63,4 +63,4 @@ const { slots } = inject<any>(Symbol.for('dxup:layout-slots')) || {}
 		min-width: 0;
 	}
 }
-</style>
+</style>