@tnotesjs/core 0.0.1 → 0.0.3

package/README.md

@@ -1,84 +1,84 @@
-# @tnotesjs/core
-
-TNotes 知识库系统的核心框架，以 NPM 包形式发布，被所有 [TNotes.xxx](https://github.com/orgs/tnotesjs/repositories) 知识库引用。
-
-## 简介
-
-`@tnotesjs/core` 包含了 TNotes 知识库系统的 CLI 命令、VitePress 配置/主题、服务层、工具函数等核心代码。各 TNotes.xxx 仓库通过 `npm install @tnotesjs/core` 安装即可使用。
-
-## 目录结构
-
-```
-@tnotesjs/core
-├── commands/           # CLI 命令（dev、build、push、update 等）
-├── config/             # 配置管理（ConfigManager、默认配置、模板）
-├── core/               # 核心模块（GitManager、NoteManager、ReadmeGenerator 等）
-├── services/           # 服务层（file-watcher、git、note、readme、vitepress 等）
-├── types/              # TypeScript 类型定义
-├── utils/              # 工具函数（日志、文件操作、Markdown 解析、校验等）
-├── vitepress/          # VitePress 主题、组件、插件、样式
-│   ├── components/     # 自定义 Vue 组件
-│   ├── config/         # VitePress 配置（defineNotesConfig）
-│   ├── plugins/        # VitePress 插件
-│   └── theme/          # 主题入口与样式
-├── index.ts            # CLI 入口
-└── src/index.ts        # 公共 API 导出
-```
-
-## 安装
-
-```bash
-# 安装核心包
-pnpm add @tnotesjs/core
-
-# 安装 peerDependencies
-pnpm add -D vite vitepress vue
-```
-
-## 使用方式
-
-### VitePress 配置
-
-```ts
-// .vitepress/config.mts
-import { defineNotesConfig } from '@tnotesjs/core/vitepress/config'
-export default defineNotesConfig()
-```
-
-### VitePress 主题
-
-```ts
-// .vitepress/theme/index.ts
-export { default } from '@tnotesjs/core/vitepress/theme'
-```
-
-### CLI 命令
-
-在 `package.json` 中配置脚本：
-
-```json
-{
-  "scripts": {
-    "tn:dev": "tnotes --dev",
-    "tn:build": "tnotes --build",
-    "tn:preview": "tnotes --preview",
-    "tn:update": "tnotes --update",
-    "tn:push": "tnotes --push",
-    "tn:pull": "tnotes --pull",
-    "tn:create-notes": "tnotes --create-notes",
-    "tn:fix-timestamps": "tnotes --fix-timestamps",
-    "tn:help": "tnotes --help"
-  }
-}
-```
-
-## 版本管理
-
-- 版本号遵循 [Semantic Versioning](https://semver.org/lang/zh-CN/)
-- 变更记录见 [CHANGELOG.md](./CHANGELOG.md)
-- 发布：`npm publish --access public`
-- 每个版本通过 Git Tag 标记（如 `v1.0.0`）
-
-## 许可证
-
-MIT
+# @tnotesjs/core
+
+TNotes 知识库系统的核心框架，以 NPM 包形式发布，被所有 [TNotes.xxx](https://github.com/orgs/tnotesjs/repositories) 知识库引用。
+
+## 简介
+
+`@tnotesjs/core` 包含了 TNotes 知识库系统的 CLI 命令、VitePress 配置/主题、服务层、工具函数等核心代码。各 TNotes.xxx 仓库通过 `npm install @tnotesjs/core` 安装即可使用。
+
+## 目录结构
+
+```
+@tnotesjs/core
+├── commands/           # CLI 命令（dev、build、push、update 等）
+├── config/             # 配置管理（ConfigManager、默认配置、模板）
+├── core/               # 核心模块（GitManager、NoteManager、ReadmeGenerator 等）
+├── services/           # 服务层（file-watcher、git、note、readme、vitepress 等）
+├── types/              # TypeScript 类型定义
+├── utils/              # 工具函数（日志、文件操作、Markdown 解析、校验等）
+├── vitepress/          # VitePress 主题、组件、插件、样式
+│   ├── components/     # 自定义 Vue 组件
+│   ├── config/         # VitePress 配置（defineNotesConfig）
+│   ├── plugins/        # VitePress 插件
+│   └── theme/          # 主题入口与样式
+├── index.ts            # CLI 入口
+└── src/index.ts        # 公共 API 导出
+```
+
+## 安装
+
+```bash
+# 安装核心包
+pnpm add @tnotesjs/core
+
+# 安装 peerDependencies
+pnpm add -D vite vitepress vue
+```
+
+## 使用方式
+
+### VitePress 配置
+
+```ts
+// .vitepress/config.mts
+import { defineNotesConfig } from '@tnotesjs/core/vitepress/config'
+export default defineNotesConfig()
+```
+
+### VitePress 主题
+
+```ts
+// .vitepress/theme/index.ts
+export { default } from '@tnotesjs/core/vitepress/theme'
+```
+
+### CLI 命令
+
+在 `package.json` 中配置脚本：
+
+```json
+{
+  "scripts": {
+    "tn:dev": "tnotes --dev",
+    "tn:build": "tnotes --build",
+    "tn:preview": "tnotes --preview",
+    "tn:update": "tnotes --update",
+    "tn:push": "tnotes --push",
+    "tn:pull": "tnotes --pull",
+    "tn:create-notes": "tnotes --create-notes",
+    "tn:fix-timestamps": "tnotes --fix-timestamps",
+    "tn:help": "tnotes --help"
+  }
+}
+```
+
+## 版本管理
+
+- 版本号遵循 [Semantic Versioning](https://semver.org/lang/zh-CN/)
+- 变更记录见 [CHANGELOG.md](./CHANGELOG.md)
+- 发布：`npm publish --access public`
+- 每个版本通过 Git Tag 标记（如 `v1.0.0`）
+
+## 许可证
+
+MIT

package/dist/{chunk-CSSIRO3I.js → chunk-NI5B4S3T.js}

@@ -3355,14 +3355,16 @@ var NoteService = class _NoteService {
 // services/file-watcher/service.ts
 var NOTES_DIR_NOT_SET_ERROR = "NOTES_DIR_PATH \u672A\u8BBE\u7F6E\uFF0C\u65E0\u6CD5\u542F\u52A8\u6587\u4EF6\u76D1\u542C";
 var UPDATE_UNLOCK_DELAY_MS2 = 500;
-var FileWatcherService = class {
+var FileWatcherService = class _FileWatcherService {
   constructor(notesDir = NOTES_DIR_PATH) {
     this.notesDir = notesDir;
     if (!this.notesDir) {
       throw new Error(NOTES_DIR_NOT_SET_ERROR);
     }
     this.init();
+    _FileWatcherService.instance = this;
   }
+  static instance = null;
   watchState;
   scheduler;
   renameDetector;
@@ -3375,6 +3377,9 @@ var FileWatcherService = class {
   readmeService;
   noteIndexCache;
   unlockTimer = null;
+  static getInstance() {
+    return _FileWatcherService.instance;
+  }
   init() {
     this.noteService = NoteService.getInstance();
     this.readmeService = ReadmeService.getInstance();
@@ -3479,6 +3484,24 @@ var FileWatcherService = class {
   isWatching() {
     return this.adapter.isWatching();
   }
+  /**
+   * 挂起文件监听（关闭 fs.watch 句柄），用于需要操作文件夹的场景（如重命名）
+   * Windows 上 fs.watch 会锁住文件夹句柄，必须先关闭才能重命名
+   */
+  suspend() {
+    this.adapter.stop();
+    this.scheduler.setUpdating(true);
+    logger.info("\u6587\u4EF6\u76D1\u542C\u5DF2\u6302\u8D77\uFF08fs.watch \u5DF2\u5173\u95ED\uFF09");
+  }
+  /**
+   * 恢复文件监听（重新启动 fs.watch）
+   */
+  unsuspend() {
+    this.watchState.initializeFromDisk();
+    this.scheduler.setUpdating(false);
+    this.adapter.start();
+    logger.info("\u6587\u4EF6\u76D1\u542C\u5DF2\u6062\u590D\uFF08fs.watch \u5DF2\u91CD\u542F\uFF09");
+  }
   // #region - 私有实现
   onNoteEvent(event) {
     if (!this.isNoteFile(event.path)) return;
@@ -4054,11 +4077,21 @@ var VitepressService = class _VitepressService {
       const child = spawn2(pm, ["vitepress", "build"], {
         cwd: ROOT_DIR_PATH,
         shell: true,
-        stdio: ["inherit", "pipe", "pipe"]
+        stdio: ["inherit", "pipe", "pipe"],
+        env: {
+          ...process.env,
+          NODE_OPTIONS: (process.env.NODE_OPTIONS || "").includes(
+            "--max-old-space-size"
+          ) ? process.env.NODE_OPTIONS : [process.env.NODE_OPTIONS, "--max-old-space-size=4096"].filter(Boolean).join(" ")
+        }
       });
+      let buildSucceeded = false;
       const filterOutput = (data) => {
         const str = data.toString();
         if (str.includes("\u{1F528}") || str.includes("\u2705 \u6784\u5EFA\u6210\u529F") || str.includes("\u274C \u6784\u5EFA\u5931\u8D25") || str.includes("\u{1F4C1}") || str.includes("\u{1F4CA}") || str.includes("\u{1F4E6}") || str.includes("\u23F1\uFE0F") || str.includes("Building [") || str.includes("error") || str.includes("Error")) {
+          if (str.includes("\u2705 \u6784\u5EFA\u6210\u529F")) {
+            buildSucceeded = true;
+          }
           process.stdout.write(data);
           return;
         }
@@ -4072,7 +4105,7 @@ var VitepressService = class _VitepressService {
         reject(err);
       });
       child.on("close", (code) => {
-        if (code === 0) {
+        if (code === 0 || buildSucceeded) {
           resolve2();
         } else {
           reject(new Error(`Command failed with code ${code}`));
@@ -4210,7 +4243,9 @@ var RenameNoteCommand = class extends BaseCommand {
     if (existsSync8(newPath)) {
       throw new Error(`\u76EE\u6807\u6587\u4EF6\u5939\u5DF2\u5B58\u5728: ${newDirName}`);
     }
+    const watcher = FileWatcherService.getInstance();
     try {
+      if (watcher) watcher.suspend();
       renameSync(note.path, newPath);
       this.logger.info(`\u2705 \u6587\u4EF6\u5939\u5DF2\u91CD\u547D\u540D:`);
       this.logger.info(`  \u539F\u540D\u79F0: ${note.dirName}`);
@@ -4219,6 +4254,8 @@ var RenameNoteCommand = class extends BaseCommand {
       throw new Error(
         `\u91CD\u547D\u540D\u6587\u4EF6\u5939\u5931\u8D25: ${error instanceof Error ? error.message : String(error)}`
       );
+    } finally {
+      if (watcher) watcher.unsuspend();
     }
     try {
       this.logger.info("\u6B63\u5728\u66F4\u65B0\u7B14\u8BB0\u5185\u90E8\u6807\u9898...");

package/dist/cli/index.js

@@ -22,7 +22,7 @@ import {
   parseArgs,
   parseReadmeCompletedNotes,
   runCommand
-} from "../chunk-CSSIRO3I.js";
+} from "../chunk-NI5B4S3T.js";
 import {
   ConfigManager
 } from "../chunk-NASIL5FY.js";

package/dist/vitepress/config/index.js

@@ -4,7 +4,7 @@ import {
   UpdateNoteConfigCommand,
   generateAnchor,
   logger
-} from "../../chunk-CSSIRO3I.js";
+} from "../../chunk-NI5B4S3T.js";
 import "../../chunk-NASIL5FY.js";
 
 // vitepress/config/index.ts
@@ -618,6 +618,10 @@ var globalOutDir = "";
 var globalLastPercent = 0;
 var globalFileCount = 0;
 var globalLastLoggedPercent = -1;
+var globalLastOutputTime = 0;
+var globalTransformEndTime = 0;
+var globalLastHookTime = 0;
+var globalStallTimer = null;
 var isTTY = !!(process.stdout.isTTY && process.stderr.isTTY);
 var isCI = !!(process.env.CI || process.env.GITHUB_ACTIONS || process.env.GITLAB_CI || process.env.CIRCLECI || process.env.TRAVIS || process.env.JENKINS_URL);
 var useSingleLineMode = isTTY && !isCI;
@@ -664,10 +668,12 @@ function renderProgress(percent, transforms, chunks, width, complete, incomplete
   if (!useSingleLineMode && !isFinal) {
     const currentPercent = Math.floor(percent * 100);
     const currentBucket = Math.floor(currentPercent / 10) * 10;
-    if (currentBucket <= globalLastLoggedPercent) {
+    const now = Date.now();
+    if (currentBucket <= globalLastLoggedPercent || now - globalLastOutputTime < 500) {
       return;
     }
     globalLastLoggedPercent = currentBucket;
+    globalLastOutputTime = now;
   }
   const filled = Math.floor(percent * width);
   const empty = width - filled;
@@ -698,26 +704,51 @@ function buildProgressPlugin(options = {}) {
           globalHasError = false;
           globalLastPercent = 0;
           globalLastLoggedPercent = -1;
+          globalLastOutputTime = 0;
+          globalTransformEndTime = 0;
+          globalLastHookTime = Date.now();
           globalOutDir = config.build?.outDir || "dist";
           if (!hasCache) {
             globalFileCount = countSourceFiles(process.cwd());
           }
           interceptOutput();
+          globalStallTimer = setInterval(() => {
+            if (!globalIsBuilding || globalLastPercent <= 0 || globalLastPercent >= 0.98)
+              return;
+            const now = Date.now();
+            if (now - globalLastHookTime < 2e3) return;
+            const remaining = 0.98 - globalLastPercent;
+            globalLastPercent += remaining * 0.02;
+            const transformsStr = hasCache ? `${globalTransformCount}/${cache.transformCount * 2}` : `${globalTransformCount}`;
+            const chunksStr = hasCache ? `${globalChunkCount}/${cache.chunkCount * 2}` : `${globalChunkCount}`;
+            renderProgress(
+              globalLastPercent,
+              transformsStr,
+              chunksStr,
+              width,
+              complete,
+              incomplete
+            );
+          }, 1e3);
         }
       }
     },
-    transform(_code, id) {
+    transform(_code, _id) {
       globalTransformCount++;
+      globalLastHookTime = Date.now();
+      const transformWeight = hasCache && cache.transformEndRatio != null ? Math.max(0.1, Math.min(0.85, cache.transformEndRatio * 0.98)) : 0.85;
       if (hasCache) {
-        const total = cache.transformCount * 2 + cache.chunkCount * 2;
-        globalLastPercent = Math.min(0.9, globalTransformCount / total);
+        const totalTransforms = cache.transformCount * 2;
+        globalLastPercent = Math.min(
+          transformWeight,
+          globalTransformCount / totalTransforms * transformWeight
+        );
       } else {
-        if (!id.includes("node_modules") && globalLastPercent < 0.7) {
-          globalLastPercent = Math.min(
-            0.7,
-            globalTransformCount / (globalFileCount * 4)
-          );
-        }
+        const k = 500;
+        globalLastPercent = Math.min(
+          transformWeight,
+          transformWeight * globalTransformCount / (globalTransformCount + k)
+        );
       }
       const transformsStr = hasCache ? `${globalTransformCount}/${cache.transformCount * 2}` : `${globalTransformCount}`;
       const chunksStr = hasCache ? `${globalChunkCount}/${cache.chunkCount * 2}` : `${globalChunkCount}`;
@@ -733,16 +764,21 @@ function buildProgressPlugin(options = {}) {
     },
     renderChunk() {
       globalChunkCount++;
+      globalLastHookTime = Date.now();
+      if (!globalTransformEndTime) {
+        globalTransformEndTime = Date.now();
+      }
+      const transformWeight = hasCache && cache.transformEndRatio != null ? Math.max(0.1, Math.min(0.85, cache.transformEndRatio * 0.98)) : 0.85;
+      const chunkWeight = 0.98 - transformWeight;
       if (hasCache) {
-        const total = cache.transformCount * 2 + cache.chunkCount * 2;
+        const totalChunks = cache.chunkCount * 2;
         globalLastPercent = Math.min(
           0.98,
-          (globalTransformCount + globalChunkCount) / total
+          transformWeight + globalChunkCount / totalChunks * chunkWeight
         );
       } else {
-        if (globalLastPercent < 0.98) {
-          globalLastPercent = Math.min(0.98, globalLastPercent + 3e-3);
-        }
+        globalLastPercent = Math.max(globalLastPercent, transformWeight);
+        globalLastPercent = Math.min(0.98, globalLastPercent + 5e-5);
       }
       const transformsStr = hasCache ? `${globalTransformCount}/${cache.transformCount * 2}` : `${globalTransformCount}`;
       const chunksStr = hasCache ? `${globalChunkCount}/${cache.chunkCount * 2}` : `${globalChunkCount}`;
@@ -764,6 +800,10 @@ function buildProgressPlugin(options = {}) {
     closeBundle() {
       setTimeout(() => {
         if (!globalIsBuilding) return;
+        if (globalStallTimer) {
+          clearInterval(globalStallTimer);
+          globalStallTimer = null;
+        }
         const elapsed = ((Date.now() - globalStartTime) / 1e3).toFixed(1);
         const totalTransforms = hasCache ? cache.transformCount * 2 : globalTransformCount;
         const totalChunks = hasCache ? cache.chunkCount * 2 : globalChunkCount;
@@ -780,9 +820,12 @@ function buildProgressPlugin(options = {}) {
         );
         restoreOutput();
         if (!globalHasError) {
+          const totalTime = Date.now() - globalStartTime;
+          const transformTime = globalTransformEndTime ? globalTransformEndTime - globalStartTime : totalTime;
           setCacheData({
             transformCount: Math.floor(globalTransformCount / 2),
-            chunkCount: Math.floor(globalChunkCount / 2)
+            chunkCount: Math.floor(globalChunkCount / 2),
+            transformEndRatio: transformTime / totalTime
           });
           console.log(`\u2705 \u6784\u5EFA\u6210\u529F\uFF01`);
           console.log(`   \u{1F4C1} \u8F93\u51FA\u76EE\u5F55: ${globalOutDir}`);

package/package.json

@@ -1,77 +1,77 @@
-{
-  "name": "@tnotesjs/core",
-  "version": "0.0.1",
-  "description": "TNotes 知识库核心框架 —— 基于 VitePress 的笔记管理系统",
-  "type": "module",
-  "bin": {
-    "tnotes": "./dist/cli/index.js"
-  },
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
-    },
-    "./vitepress/config": {
-      "import": "./dist/vitepress/config/index.js"
-    },
-    "./vitepress/theme": {
-      "types": "./vitepress/theme/index.ts",
-      "import": "./vitepress/theme/index.ts"
-    },
-    "./vitepress/*": "./vitepress/*"
-  },
-  "files": [
-    "dist/",
-    "vitepress/",
-    "types/"
-  ],
-  "scripts": {
-    "build": "tsup",
-    "build:check": "tsc --noEmit",
-    "dev": "tsup --watch",
-    "release": "node scripts/release.mjs"
-  },
-  "peerDependencies": {
-    "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",
-    "vitepress": "^1.6.0",
-    "vue": "^3.5.0"
-  },
-  "dependencies": {
-    "d3": "^7.9.0",
-    "echarts": "^6.0.0",
-    "github-slugger": "^2.0.0",
-    "markdown-it-container": "^4.0.0",
-    "markdown-it-link-attributes": "^4.0.1",
-    "markdown-it-mathjax3": "^4.3.2",
-    "markdown-it-task-lists": "^2.1.1",
-    "marked": "^15.0.11",
-    "markmap-lib": "^0.18.12",
-    "markmap-toolbar": "^0.18.12",
-    "markmap-view": "^0.18.12",
-    "mermaid": "^11.5.0",
-    "sass-embedded": "^1.90.0",
-    "swiper": "^11.2.1",
-    "uuid": "^11.1.0",
-    "vue-echarts": "^8.0.1"
-  },
-  "devDependencies": {
-    "@types/markdown-it": "^14.1.2",
-    "@types/node": "^24.6.2",
-    "tsup": "^8.5.1",
-    "typescript": "^5.9.3"
-  },
-  "engines": {
-    "node": ">=18.0.0"
-  },
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/tnotesjs/core"
-  },
-  "keywords": [
-    "tnotes",
-    "vitepress",
-    "knowledge-base",
-    "notes"
-  ]
-}
+{
+  "name": "@tnotesjs/core",
+  "version": "0.0.3",
+  "description": "TNotes 知识库核心框架 —— 基于 VitePress 的笔记管理系统",
+  "type": "module",
+  "bin": {
+    "tnotes": "./dist/cli/index.js"
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    },
+    "./vitepress/config": {
+      "import": "./dist/vitepress/config/index.js"
+    },
+    "./vitepress/theme": {
+      "types": "./vitepress/theme/index.ts",
+      "import": "./vitepress/theme/index.ts"
+    },
+    "./vitepress/*": "./vitepress/*"
+  },
+  "files": [
+    "dist/",
+    "vitepress/",
+    "types/"
+  ],
+  "scripts": {
+    "build": "tsup",
+    "build:check": "tsc --noEmit -p tsconfig.build.json",
+    "dev": "tsup --watch",
+    "release": "node scripts/release.mjs"
+  },
+  "peerDependencies": {
+    "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",
+    "vitepress": "^1.6.0",
+    "vue": "^3.5.0"
+  },
+  "dependencies": {
+    "d3": "^7.9.0",
+    "echarts": "^6.0.0",
+    "github-slugger": "^2.0.0",
+    "markdown-it-container": "^4.0.0",
+    "markdown-it-link-attributes": "^4.0.1",
+    "markdown-it-mathjax3": "^4.3.2",
+    "markdown-it-task-lists": "^2.1.1",
+    "marked": "^15.0.11",
+    "markmap-lib": "^0.18.12",
+    "markmap-toolbar": "^0.18.12",
+    "markmap-view": "^0.18.12",
+    "mermaid": "^11.5.0",
+    "sass-embedded": "^1.90.0",
+    "swiper": "^11.2.1",
+    "uuid": "^11.1.0",
+    "vue-echarts": "^8.0.1"
+  },
+  "devDependencies": {
+    "@types/markdown-it": "^14.1.2",
+    "@types/node": "^24.6.2",
+    "tsup": "^8.5.1",
+    "typescript": "^5.9.3"
+  },
+  "engines": {
+    "node": ">=18.0.0"
+  },
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/tnotesjs/core"
+  },
+  "keywords": [
+    "tnotes",
+    "vitepress",
+    "knowledge-base",
+    "notes"
+  ]
+}