clarity-theme 0.1.1 → 0.1.3

package/{modules → src/modules}/clarity-config/index.ts

@@ -21,7 +21,10 @@ import { toServerClarityConfig } from '../../config/server'
 import handleMirror from './anti-mirror-client'
 
 const moduleDir = dirname(fileURLToPath(import.meta.url))
-const themeDir = resolve(moduleDir, '../..')
+/** Theme 运行时源码根（src/）：模块位于 src/modules/clarity-config */
+const themeSrcDir = resolve(moduleDir, '../..')
+/** Theme npm 包根（nuxt.config.ts / package.json 所在层） */
+const themePkgDir = resolve(moduleDir, '../../..')
 
 /** app/app.config.ts 的 clarity 键只允许 UI 覆盖（站点级字段属于 clarity.config.ts） */
 const uiConfigKeys = new Set(['component', 'footer', 'header', 'link', 'nav', 'pagination', 'themes'])
@@ -42,7 +45,7 @@ export default defineNuxtModule<ModuleOptions>({
 		const rootDir = nuxt.options.rootDir
 
 		const configPath = resolve(rootDir, options.configFile ?? findConfigFile(rootDir))
-		const feedsPath = findFeedsFile(rootDir, themeDir)
+		const feedsPath = findFeedsFile(rootDir, themeSrcDir)
 
 		// ---- 依赖注入层：Theme 内部不感知消费项目的文件布局 ----
 		Object.assign(nuxt.options.alias, {
@@ -51,14 +54,14 @@ export default defineNuxtModule<ModuleOptions>({
 		})
 
 		// @pinia/nuxt 不会自动扫描 Layer 的 stores 目录，需显式注册
-		addImportsDir(resolve(themeDir, 'app/stores'))
+		addImportsDir(resolve(themeSrcDir, 'stores'))
 
 		// ---- AppConfig 类型化：消费者 defineAppConfig({ clarity: ... }) 获得完整类型提示 ----
 		// 注意：类型文件生成于 buildDir/types/ 下，相对路径必须以其为基准计算，
 		// 否则导入解析失败会因 skipLibCheck 静默退化为 any（审计发现 #9）。
 		const appConfigTypeDir = resolve(nuxt.options.buildDir, 'types')
-		const appConfigTypePath = relative(appConfigTypeDir, resolve(themeDir, 'config/app.ts')).replaceAll('\\', '/')
-		const globalsTypePath = relative(appConfigTypeDir, resolve(themeDir, 'app/types/index.ts')).replaceAll('\\', '/')
+		const appConfigTypePath = relative(appConfigTypeDir, resolve(themeSrcDir, 'config/app.ts')).replaceAll('\\', '/')
+		const globalsTypePath = relative(appConfigTypeDir, resolve(themeSrcDir, 'types/index.ts')).replaceAll('\\', '/')
 		addTypeTemplate({
 			filename: 'types/clarity-app-config.d.ts',
 			getContents: () => [
@@ -86,7 +89,7 @@ export default defineNuxtModule<ModuleOptions>({
 		// 需置于 '~' 之前以保证 Vite 别名前缀优先匹配
 		if (!existsSync(resolve(nuxt.options.srcDir, 'shiki.config.ts'))) {
 			nuxt.options.alias = {
-				'~/shiki.config': resolve(themeDir, 'app/shiki.config.ts'),
+				'~/shiki.config': resolve(themeSrcDir, 'shiki.config.ts'),
 				...nuxt.options.alias,
 			}
 		}
@@ -176,7 +179,7 @@ export default defineNuxtModule<ModuleOptions>({
 
 		// ---- 构建信息（供 BlogTech 等 Widget 使用） ----
 		const consumerPkg = await loadJson(resolve(rootDir, 'package.json'), jiti)
-		const themePkg = await loadJson(resolve(themeDir, 'package.json'), jiti)
+		const themePkg = await loadJson(resolve(themePkgDir, 'package.json'), jiti)
 		nuxt.options.runtimeConfig.public.clarity = {
 			theme: 'Clarity',
 			themeVersion: String(themePkg?.version ?? ''),
@@ -308,13 +311,13 @@ function findConfigFile(rootDir: string) {
 	return 'clarity.config.ts'
 }
 
-function findFeedsFile(rootDir: string, themeDir: string) {
+function findFeedsFile(rootDir: string, themeSrcDir: string) {
 	for (const name of ['feeds.ts', 'feeds.mjs', 'feeds.js']) {
 		if (existsSync(resolve(rootDir, name))) {
 			return { found: true, resolved: resolve(rootDir, name) }
 		}
 	}
-	return { found: false, resolved: resolve(themeDir, 'config/feeds.empty.ts') }
+	return { found: false, resolved: resolve(themeSrcDir, 'config/feeds.empty.ts') }
 }
 
 async function loadJson(path: string, jiti: ReturnType<typeof createJiti>) {

package/src/modules/clarity-source-layout/index.ts

@@ -0,0 +1,78 @@
+import type { Nuxt } from '@nuxt/schema'
+import { dirname, relative, resolve } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { defineNuxtModule, getLayerDirectories } from 'nuxt/kit'
+
+const moduleDir = dirname(fileURLToPath(import.meta.url))
+const themeSrcDir = resolve(moduleDir, '../..')
+const themePkgDir = resolve(moduleDir, '../../..')
+
+/**
+ * Clarity keeps all runtime source under `src/`. These values must only apply
+ * to the theme layer; declaring them statically in `nuxt.config.ts` would let
+ * c12 merge them into consumers which do not explicitly override them.
+ */
+export default defineNuxtModule({
+	meta: {
+		name: 'clarity-source-layout',
+	},
+
+	setup(_options, nuxt) {
+		const layer = findThemeLayer(nuxt)
+		if (!layer) {
+			return
+		}
+
+		const sourceDir = withTrailingSlash(themeSrcDir)
+		const directories = {
+			layouts: withTrailingSlash(resolve(themeSrcDir, 'layouts')),
+			middleware: withTrailingSlash(resolve(themeSrcDir, 'middleware')),
+			modules: withTrailingSlash(resolve(themeSrcDir, 'modules')),
+			pages: withTrailingSlash(resolve(themeSrcDir, 'pages')),
+			plugins: withTrailingSlash(resolve(themeSrcDir, 'plugins')),
+			public: withTrailingSlash(resolve(themeSrcDir, 'public')),
+			server: withTrailingSlash(resolve(themeSrcDir, 'server')),
+			shared: withTrailingSlash(resolve(themeSrcDir, 'shared')),
+		}
+
+		layer.config.srcDir = sourceDir
+		layer.config.serverDir = directories.server
+		layer.config.dir = {
+			...layer.config.dir,
+			app: sourceDir,
+			modules: directories.modules,
+			public: directories.public,
+			shared: directories.shared,
+		}
+
+		// `getLayerDirectories()` caches a plain metadata object per layer before
+		// modules are installed. Nuxt exposes no invalidation API, so update the
+		// cached paths in place as well as `layer.config`.
+		const cached = getLayerDirectories(nuxt).find(directory => isSamePath(directory.root, themePkgDir))
+		if (cached) {
+			Object.assign(cached, {
+				app: sourceDir,
+				appLayouts: directories.layouts,
+				appMiddleware: directories.middleware,
+				appPages: directories.pages,
+				appPlugins: directories.plugins,
+				modules: directories.modules,
+				public: directories.public,
+				server: directories.server,
+				shared: directories.shared,
+			})
+		}
+	},
+})
+
+function findThemeLayer(nuxt: Nuxt) {
+	return nuxt.options._layers.find(layer => isSamePath(layer.config.rootDir ?? layer.cwd, themePkgDir))
+}
+
+function isSamePath(left: string, right: string) {
+	return left === right || relative(resolve(left), resolve(right)) === ''
+}
+
+function withTrailingSlash(path: string) {
+	return `${path.replace(/[\\/]$/, '').replaceAll('\\', '/')}/`
+}

package/{server → src/server}/routes/subscriptions.opml.get.ts

@@ -1,4 +1,4 @@
-import type { FeedEntry, FeedGroup } from '../../app/types/feed'
+import type { FeedEntry, FeedGroup } from '../../types/feed'
 import XmlBuilder from 'fast-xml-builder'
 import { toZonedTemporal } from '../../shared/utils/time'
 

package/{app → src}/types/article.ts

@@ -1,6 +1,6 @@
-import type { ClarityAppConfig } from '../../config/app'
-import type { ArticleSchema } from '../../config/content'
-import type { MetaSlotsTree } from '../../remark-plugins/rehype-meta-slots'
+import type { ClarityAppConfig } from '../config/app'
+import type { ArticleSchema } from '../config/content'
+import type { MetaSlotsTree } from '../remark-plugins/rehype-meta-slots'
 
 export type ArticleOrderType = keyof ClarityAppConfig['article']['order']
 

package/src/types/feed.ts

@@ -0,0 +1 @@
+export type { FeedEntry, FeedGroup } from '../config/feed'

package/app/types/feed.ts

@@ -1 +0,0 @@
-export type { FeedEntry, FeedGroup } from '../../config/feed'