@tnotesjs/core 0.6.1 → 0.8.0

package/services/readme/service.ts

@@ -12,7 +12,7 @@ import {
 } from 'fs'
 
 import { ConfigManager } from '../../config/ConfigManager'
-import { ROOT_README_PATH, VP_SIDEBAR_PATH } from '../../config/constants'
+import { ROOT_DIR_PATH, ROOT_README_PATH, VP_SIDEBAR_PATH } from '../../config/constants'
 import { NoteIndexCache } from '../../core/NoteIndexCache'
 import { NoteManager } from '../../core/NoteManager'
 import { ReadmeGenerator } from '../../core/ReadmeGenerator'
@@ -24,7 +24,8 @@ import {
   genHierarchicalSidebar,
   processEmptyLines,
 } from '../../utils'
-import { TocService } from '../toc/service'
+import { reconcileTocFromFiles } from '../reconcileToc'
+
 
 import type { NoteInfo, NoteConfig } from '../../types'
 
@@ -60,14 +61,12 @@ export class ReadmeService {
   private readmeGenerator: ReadmeGenerator
   private configManager: ConfigManager
   private noteIndexCache: NoteIndexCache
-  private tocService: TocService
 
   private constructor() {
     this.noteManager = NoteManager.getInstance()
     this.readmeGenerator = new ReadmeGenerator()
     this.configManager = ConfigManager.getInstance()
     this.noteIndexCache = NoteIndexCache.getInstance()
-    this.tocService = TocService.getInstance()
   }
 
   static getInstance(): ReadmeService {
@@ -121,10 +120,9 @@ export class ReadmeService {
       await this.updateHomeReadme(notes)
     }
 
-    // 规范化 TOC.md 并更新 sidebar.json
+    // files→TOC 对齐（Workspace）：规范化 TOC.md 并重建 sidebar.json
     if (updateSidebar) {
-      await this.tocService.normalizeToc(notes)
-      await this.tocService.regenerateSidebar(notes)
+      await reconcileTocFromFiles(ROOT_DIR_PATH)
     }
 
     logger.info('知识库更新完成！')
@@ -618,23 +616,18 @@ export class ReadmeService {
   /**
    * 更新 TOC.md 和 sidebar，不重写每篇笔记 README
    */
-  async refreshHomeReadmeAndSidebar(notes?: NoteInfo[]): Promise<void> {
-    const allNotes =
-      notes ??
-      (this.noteIndexCache.isInitialized()
-        ? this.noteIndexCache.toNoteInfoList()
-        : this.noteManager.scanNotes())
-
-    await this.tocService.normalizeToc(allNotes)
-    await this.tocService.regenerateSidebar(allNotes)
+  async refreshHomeReadmeAndSidebar(_notes?: NoteInfo[]): Promise<void> {
+    // files→TOC 对齐（Workspace）：TOC.md 规范化 + sidebar 重建
+    await reconcileTocFromFiles(ROOT_DIR_PATH)
   }
 
   /**
    * 重新生成 sidebar.json（基于当前 TOC.md）
    * @param notes - 可选的笔记列表，不传则内部扫描
    */
-  async regenerateSidebar(notes?: NoteInfo[]): Promise<void> {
-    await this.tocService.regenerateSidebar(notes)
+  async regenerateSidebar(_notes?: NoteInfo[]): Promise<void> {
+    // files→TOC 对齐（Workspace）：sidebar 由重建的 TOC 派生
+    await reconcileTocFromFiles(ROOT_DIR_PATH)
     logger.info('重新生成 sidebar.json')
   }
 

package/services/reconcileToc.ts

@@ -0,0 +1,20 @@
+/**
+ * services/reconcileToc.ts
+ *
+ * CLI / 服务侧的「files→TOC 对齐」入口（0004 方案 B）：
+ * 统一的 TOC/sidebar 写入都收敛到 Core Workspace 的
+ * `toc.reconcileFromFiles()`，不再直接操作 TocService。
+ */
+import { createWorkspace, type TNotesWorkspace } from '../workspace'
+
+const workspaces = new Map<string, TNotesWorkspace>()
+
+/** 知识库根目录 → 常驻 Workspace 实例（幂等，可重复调用）。 */
+export async function reconcileTocFromFiles(repoRoot: string): Promise<void> {
+  let workspace = workspaces.get(repoRoot)
+  if (!workspace) {
+    workspace = createWorkspace({ rootPath: repoRoot })
+    workspaces.set(repoRoot, workspace)
+  }
+  await workspace.toc.reconcileFromFiles()
+}

package/utils/index.ts

@@ -52,15 +52,6 @@ export type {
   TocSidebarItem,
   TocLineKind,
 } from './tocHelpers'
-export {
-  migrateReadmeToToc,
-  extractReadmeBodyAfterToc,
-  README_TOC_END_TAG,
-} from './migrateReadmeToToc'
-export type {
-  MigratedTocEntry,
-  MigrateReadmeToTocResult,
-} from './migrateReadmeToToc'
 export { isPortInUse, killPortProcess, waitForPort } from './portUtils'
 export {
   parseNoteLine,

package/{services/toc → utils}/moveTocInside.test.ts

@@ -11,7 +11,7 @@ import {
   getTocEntrySubtreeRange,
   parseTocLine,
   TOC_INDENT_SPACES,
-} from '../../utils/tocHelpers'
+} from './tocHelpers'
 
 function adjustSubtreeIndent(lines: string[], delta: number): string[] {
   if (delta === 0) return lines

package/vitepress/components/BilibiliOutsidePlayer/BilibiliOutsidePlayer.vue

@@ -1,24 +1,15 @@
-<!-- 
-vitepress/components/BilibiliOutsidePlayer/BilibiliOutsidePlayer.vue 
+<!--
+  Deprecated local shell. Canonical implementation lives in @tnotesjs/ui as
+  BilibiliVideo. Kept so deep path imports do not break during migration.
 -->
-
 <template>
-  <iframe
-    style="width: 100%; aspect-ratio: 16/9; margin: 1rem 0"
-    :src="'//player.bilibili.com/player.html?isOutside=true&bvid=' + id"
-    scrolling="no"
-    border="0"
-    frameborder="no"
-    framespacing="0"
-    allowfullscreen="true"
-  ></iframe>
+  <BilibiliVideo :id="id" />
 </template>
 
 <script setup lang="ts">
-defineProps({
-  id: {
-    type: String,
-    required: true,
-  },
-})
+import { BilibiliVideo } from '@tnotesjs/ui'
+
+defineProps<{
+  id: string
+}>()
 </script>