@tnotesjs/core 0.6.0 → 0.7.0

package/dist/cli/index.js

@@ -15,11 +15,9 @@ import {
   NoteService,
   ROOT_CONFIG_PATH,
   ROOT_DIR_PATH,
-  ROOT_README_PATH,
   ROOT_TOC_PATH,
   ReadmeService,
   RenameNoteCommand,
-  TocService,
   UpdateNoteConfigCommand,
   VitepressService,
   buildInitContext,
@@ -30,26 +28,22 @@ import {
   handleError,
   isAlreadyInitialized,
   logger,
-  migrateReadmeToToc,
   parseArgs,
   parseReadmeCompletedNotes,
+  reconcileTocFromFiles,
   runCommand,
   validatePort,
   validateTopic
-} from "../chunk-DUTS75WQ.js";
+} from "../chunk-XNO3PCEH.js";
 import {
   ConfigManager,
   getConfigManager,
   stripDeprecatedRootItemFields
 } from "../chunk-UJG3UU5X.js";
 import {
-  buildFolderTocLine,
-  buildTocLine,
-  parseTocCompletedNotes,
-  processTocEmptyLines,
-  resolveNoteFromIndex
-} from "../chunk-U6IBLREL.js";
-import "../chunk-CZXRQPFJ.js";
+  parseTocCompletedNotes
+} from "../chunk-ZEQS64PE.js";
+import "../chunk-GWG75A5M.js";
 
 // commands/update/UpdateCommand.ts
 import { existsSync, readFileSync, writeFileSync } from "fs";
@@ -284,15 +278,13 @@ var DevCommand = class extends BaseCommand {
     this.fileWatcherService = new FileWatcherService();
     this.noteIndexCache = NoteIndexCache.getInstance();
     this.noteManager = NoteManager.getInstance();
-    this.tocService = TocService.getInstance();
     this.vitepressService = new VitepressService();
   }
   async run() {
     const notes = this.noteManager.scanNotes();
     this.logger.info(`\u626B\u63CF\u5230 ${notes.length} \u7BC7\u7B14\u8BB0`);
     this.noteIndexCache.initialize(notes);
-    this.tocService.ensureTocExists();
-    await this.tocService.regenerateSidebar(notes);
+    await reconcileTocFromFiles(ROOT_DIR_PATH);
     const result = await this.vitepressService.startServer();
     if (result) {
       const versionInfo = result.version ? `\uFF08v${result.version}\uFF09` : "";
@@ -387,11 +379,7 @@ var InitSubRepoCommand = class extends BaseCommand {
     try {
       this.logger.info("");
       this.logger.info("\u6B63\u5728\u89C4\u8303\u5316 TOC.md \u5E76\u751F\u6210 sidebar.json...");
-      const noteService = NoteService.getInstance();
-      const tocService = TocService.getInstance();
-      const notes = noteService.getAllNotes();
-      await tocService.normalizeToc(notes);
-      await tocService.regenerateSidebar(notes);
+      await reconcileTocFromFiles(ROOT_DIR_PATH);
       this.logger.success("sidebar.json \u5DF2\u751F\u6210");
     } catch (error) {
       this.logger.warn(
@@ -470,68 +458,6 @@ var InitSubRepoCommand = class extends BaseCommand {
   }
 };
 
-// commands/init-toc/InitTocCommand.ts
-import { existsSync as existsSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "fs";
-var InitTocCommand = class extends BaseCommand {
-  constructor() {
-    super("init-toc");
-    this.noteManager = NoteManager.getInstance();
-    this.tocService = TocService.getInstance();
-  }
-  async run() {
-    if (!existsSync2(ROOT_README_PATH)) {
-      throw new Error(`README.md \u4E0D\u5B58\u5728: ${ROOT_README_PATH}`);
-    }
-    const readmeContent = readFileSync3(ROOT_README_PATH, "utf-8");
-    const notes = this.noteManager.scanNotes();
-    const { entries, warnings } = migrateReadmeToToc(readmeContent);
-    for (const warning of warnings) {
-      this.logger.warn(warning);
-    }
-    const lines = [];
-    let skipped = 0;
-    for (const entry of entries) {
-      if (entry.kind === "folder") {
-        lines.push(buildFolderTocLine(entry.folderTitle, entry.indent));
-        continue;
-      }
-      const note = resolveNoteFromIndex(entry.noteIndex, notes);
-      if (!note) {
-        skipped++;
-        this.logger.warn(
-          `\u8DF3\u8FC7 README \u4E2D\u5B58\u5728\u4F46 notes/ \u76EE\u5F55\u4E2D\u4E0D\u5B58\u5728\u7684\u7B14\u8BB0: ${entry.noteIndex}`
-        );
-        continue;
-      }
-      lines.push(buildTocLine(note, entry.indent, entry.completed));
-    }
-    if (lines.length === 0) {
-      throw new Error(
-        "\u672A\u80FD\u4ECE README.md \u89E3\u6790\u5230\u4EFB\u4F55\u6709\u6548\u7B14\u8BB0\u6761\u76EE\uFF0CTOC.md \u672A\u5199\u5165"
-      );
-    }
-    const content = processTocEmptyLines(lines).join("\n");
-    writeFileSync2(ROOT_TOC_PATH, content, "utf-8");
-    await this.tocService.regenerateSidebar(notes);
-    this.logger.success(
-      `TOC.md \u5DF2\u4ECE README.md \u521D\u59CB\u5316\uFF08${lines.length} \u6761\u7B14\u8BB0${skipped > 0 ? `\uFF0C\u8DF3\u8FC7 ${skipped} \u6761` : ""}\uFF09`
-    );
-    this.logger.info(`\u8F93\u51FA\u8DEF\u5F84: ${ROOT_TOC_PATH}`);
-    this.logger.info(
-      "\u8FC7\u6E21\u547D\u4EE4 init-toc \u4EC5\u5728 v0.2.x \u63D0\u4F9B\uFF0Cv0.3.x \u5C06\u79FB\u9664\uFF1B\u540E\u7EED\u8BF7\u4F7F\u7528 TOC.md + pnpm tn:update"
-    );
-    const listedIndexes = new Set(
-      entries.filter((e) => e.kind === "note").map((e) => e.noteIndex)
-    );
-    const missingInReadme = notes.filter((n) => !listedIndexes.has(n.index));
-    if (missingInReadme.length > 0) {
-      this.logger.info(
-        `README \u4E2D\u672A\u5217\u51FA ${missingInReadme.length} \u7BC7\u7B14\u8BB0\uFF0C\u53EF\u6267\u884C pnpm tn:update \u8FFD\u52A0\u5230 TOC.md`
-      );
-    }
-  }
-};
-
 // commands/misc/HelpCommand.ts
 var COMMAND_CATEGORIES = {
   \u5F00\u53D1\u548C\u6784\u5EFA: [COMMAND_NAMES.DEV, COMMAND_NAMES.BUILD, COMMAND_NAMES.PREVIEW],
@@ -541,7 +467,6 @@ var COMMAND_CATEGORIES = {
     COMMAND_NAMES.CREATE_NOTES
   ],
   "Git \u64CD\u4F5C": [COMMAND_NAMES.PUSH, COMMAND_NAMES.PULL],
-  "\u8FC1\u79FB\uFF08v0.2.x \u8FC7\u6E21\uFF09": [COMMAND_NAMES.INIT_TOC],
   \u521D\u59CB\u5316: [COMMAND_NAMES.INIT_SUB_REPO],
   \u5176\u4ED6: [COMMAND_NAMES.HELP]
 };
@@ -586,9 +511,6 @@ var HelpCommand = class extends BaseCommand {
     this.logger.info("  pnpm tn:build");
     this.logger.info("  pnpm tn:create-notes     # \u6279\u91CF\u521B\u5EFA\u7B14\u8BB0");
     this.logger.info("  pnpm tn:update");
-    this.logger.info(
-      "  pnpm tn:init-toc              # v0.1.x \u2192 v0.2.x\uFF1A\u4ECE README.md \u751F\u6210 TOC.md"
-    );
     this.logger.info(
       "  pnpm tn:update-completed-count           # \u751F\u6210\u5F53\u524D\u77E5\u8BC6\u5E93\u6700\u8FD1 12 \u4E2A\u6708\u7684\u5B8C\u6210\u7B14\u8BB0\u6570\u91CF\u7EDF\u8BA1"
     );
@@ -728,7 +650,7 @@ var CreateNoteCommand = class extends BaseCommand {
 
 // commands/update-completed-count/UpdateCompletedCountCommand.ts
 import { execSync } from "child_process";
-import { readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
+import { readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "fs";
 var UpdateCompletedCountCommand = class extends BaseCommand {
   constructor() {
     super("update-completed-count");
@@ -742,7 +664,7 @@ var UpdateCompletedCountCommand = class extends BaseCommand {
   async updateCurrentRepo() {
     const startTime = Date.now();
     try {
-      const configContent = readFileSync4(ROOT_CONFIG_PATH, "utf-8");
+      const configContent = readFileSync3(ROOT_CONFIG_PATH, "utf-8");
       const config = JSON.parse(configContent);
       this.logger.info("\u5F00\u59CB\u66F4\u65B0\u5B8C\u6210\u7B14\u8BB0\u6570\u91CF\u5386\u53F2\u8BB0\u5F55...");
       const completedNotesCountHistory = await this.getCompletedNotesCountHistory();
@@ -753,7 +675,7 @@ var UpdateCompletedCountCommand = class extends BaseCommand {
       stripDeprecatedRootItemFields(
         config.root_item
       );
-      writeFileSync3(ROOT_CONFIG_PATH, JSON.stringify(config, null, 2), "utf-8");
+      writeFileSync2(ROOT_CONFIG_PATH, JSON.stringify(config, null, 2), "utf-8");
       const duration = Date.now() - startTime;
       const monthKeys = Object.keys(completedNotesCountHistory);
       const currentKey = monthKeys[monthKeys.length - 1];
@@ -872,7 +794,6 @@ var commandFactories = {
   "create-notes": () => new CreateNoteCommand(),
   "dev": () => new DevCommand(),
   "init-sub-repo": () => new InitSubRepoCommand(),
-  "init-toc": () => new InitTocCommand(),
   "help": () => new HelpCommand(),
   "preview": () => new PreviewCommand(),
   "pull": () => new PullCommand(),

package/dist/markdown/index.cjs

@@ -2,8 +2,7 @@
 
 
 
-var _chunkIHFUHB4Jcjs = require('../chunk-IHFUHB4J.cjs');
-require('../chunk-HXED7KVT.cjs');
+var _chunk7FEANCT6cjs = require('../chunk-7FEANCT6.cjs');
 
 // markdown/components.ts
 var TNOTES_COMPONENTS = [
@@ -79,4 +78,4 @@ function findTNotesComponent(name) {
 
 
 
-exports.NOTE_TOC_END_TAG = _chunkIHFUHB4Jcjs.NOTE_TOC_END_TAG; exports.NOTE_TOC_START_TAG = _chunkIHFUHB4Jcjs.NOTE_TOC_START_TAG; exports.TNOTES_COMPONENTS = TNOTES_COMPONENTS; exports.findTNotesComponent = findTNotesComponent; exports.formatTNotesNote = _chunkIHFUHB4Jcjs.formatTNotesNote;
+exports.NOTE_TOC_END_TAG = _chunk7FEANCT6cjs.NOTE_TOC_END_TAG; exports.NOTE_TOC_START_TAG = _chunk7FEANCT6cjs.NOTE_TOC_START_TAG; exports.TNOTES_COMPONENTS = TNOTES_COMPONENTS; exports.findTNotesComponent = findTNotesComponent; exports.formatTNotesNote = _chunk7FEANCT6cjs.formatTNotesNote;

package/dist/markdown/index.d.cts

@@ -1,4 +1,4 @@
-import { m as WorkspaceNoteConfig } from '../types-CpsEy8lA.cjs';
+import { m as WorkspaceNoteConfig } from '../types-MRBGgJTX.cjs';
 import '../note-oGm44Rw8.cjs';
 
 declare const NOTE_TOC_START_TAG = "<!-- region:toc -->";

package/dist/markdown/index.d.ts

@@ -1,4 +1,4 @@
-import { m as WorkspaceNoteConfig } from '../types-CwBWwNVv.js';
+import { m as WorkspaceNoteConfig } from '../types-C_d0fFeD.js';
 import '../note-oGm44Rw8.js';
 
 declare const NOTE_TOC_START_TAG = "<!-- region:toc -->";

package/dist/markdown/index.js

@@ -2,8 +2,7 @@ import {
   NOTE_TOC_END_TAG,
   NOTE_TOC_START_TAG,
   formatTNotesNote
-} from "../chunk-UNFSW5C2.js";
-import "../chunk-CZXRQPFJ.js";
+} from "../chunk-GWG75A5M.js";
 
 // markdown/components.ts
 var TNOTES_COMPONENTS = [

package/dist/{types-CwBWwNVv.d.ts → types-C_d0fFeD.d.ts}

@@ -86,7 +86,7 @@ interface NoteDocument extends WorkspaceNoteSummary {
 }
 interface ChangedFile {
     path: string;
-    kind: 'created' | 'updated' | 'deleted' | 'renamed';
+    kind: 'created' | 'updated' | 'deleted' | 'renamed' | 'trashed';
     previousPath?: string;
 }
 interface MutationResult<T> {
@@ -211,6 +211,13 @@ interface TNotesWorkspace {
         previewDelete(entry: TocEntryRef): Promise<DeleteTocEntryPreview>;
         deleteEntry(input: DeleteTocEntryInput): Promise<MutationResult<KnowledgeBaseSnapshot>>;
         setDone(input: UpdateNoteConfigInput): Promise<MutationResult<NoteDocument>>;
+        /**
+         * Align TOC.md + sidebar.json with the filesystem truth (files-first).
+         * Valid notes missing from the TOC are appended (root level, by index);
+         * note dirs with a missing/invalid config are soft-deleted to
+         * notes/.trash/. Idempotent: no changes -> changedFiles = [].
+         */
+        reconcileFromFiles(): Promise<MutationResult<KnowledgeBaseSnapshot>>;
     };
     attachments: {
         writeLocal(input: WriteAttachmentInput): Promise<MutationResult<AttachmentResult>>;

package/dist/{types-CpsEy8lA.d.cts → types-MRBGgJTX.d.cts}

@@ -86,7 +86,7 @@ interface NoteDocument extends WorkspaceNoteSummary {
 }
 interface ChangedFile {
     path: string;
-    kind: 'created' | 'updated' | 'deleted' | 'renamed';
+    kind: 'created' | 'updated' | 'deleted' | 'renamed' | 'trashed';
     previousPath?: string;
 }
 interface MutationResult<T> {
@@ -211,6 +211,13 @@ interface TNotesWorkspace {
         previewDelete(entry: TocEntryRef): Promise<DeleteTocEntryPreview>;
         deleteEntry(input: DeleteTocEntryInput): Promise<MutationResult<KnowledgeBaseSnapshot>>;
         setDone(input: UpdateNoteConfigInput): Promise<MutationResult<NoteDocument>>;
+        /**
+         * Align TOC.md + sidebar.json with the filesystem truth (files-first).
+         * Valid notes missing from the TOC are appended (root level, by index);
+         * note dirs with a missing/invalid config are soft-deleted to
+         * notes/.trash/. Idempotent: no changes -> changedFiles = [].
+         */
+        reconcileFromFiles(): Promise<MutationResult<KnowledgeBaseSnapshot>>;
     };
     attachments: {
         writeLocal(input: WriteAttachmentInput): Promise<MutationResult<AttachmentResult>>;