@tnotesjs/core 0.1.10 → 0.1.12

package/README.md

@@ -1,15 +1,15 @@
-# tnotesjs/core
+# @tnotesjs/core
 
-TNotes 知识库系统的核心共享脚本，通过 Git Submodule 被所有 [TNotes.xxx](https://github.com/orgs/tnotesjs/repositories) 知识库引用。
+TNotes 知识库系统的核心框架，以 NPM 包形式发布，被所有 [TNotes.xxx](https://github.com/orgs/tnotesjs/repositories) 知识库引用。
 
 ## 简介
 
-tnotesjs/core 包含了 TNotes 知识库系统的 CLI 命令、VitePress 主题/插件、服务层、工具函数等核心代码。各 TNotes.xxx 仓库不再各自拷贝脚本，而是统一以 Git Submodule 的形式引用本仓库，挂载到 `.vitepress/tnotes/` 路径下。
+`@tnotesjs/core` 包含了 TNotes 知识库系统的 CLI 命令、VitePress 配置/主题、服务层、工具函数等核心代码。各 TNotes.xxx 仓库通过 `npm install @tnotesjs/core` 安装即可使用。
 
 ## 目录结构
 
 ```
-tnotesjs/core/
+@tnotesjs/core
 ├── commands/           # CLI 命令（dev、build、push、update 等）
 ├── config/             # 配置管理（ConfigManager、默认配置、模板）
 ├── core/               # 核心模块（GitManager、NoteManager、ReadmeGenerator 等）
@@ -18,86 +18,95 @@ tnotesjs/core/
 ├── utils/              # 工具函数（日志、文件操作、Markdown 解析、校验等）
 ├── vitepress/          # VitePress 主题、组件、插件、样式
 │   ├── components/     # 自定义 Vue 组件
-│   ├── configs/        # VitePress 配置
+│   ├── config/         # VitePress 配置（defineNotesConfig）
 │   ├── plugins/        # VitePress 插件
 │   └── theme/          # 主题入口与样式
-└── index.ts            # 入口文件
+├── index.ts            # CLI 入口
+└── src/index.ts        # 公共 API 导出
 ```
 
-## 使用方式
-
-### 在现有 TNotes.xxx 仓库中添加
+## 安装
 
 ```bash
-# 1. 删除旧的脚本目录
-rm -rf .vitepress/tnotes
-
-# 2. 添加 submodule
-git submodule add https://github.com/tnotesjs/TNotes.core.git .vitepress/tnotes
+# 安装核心包
+pnpm add @tnotesjs/core
 
-# 3. 提交变更
-git add .gitmodules .vitepress/tnotes
-git commit -m "chore: migrate to TNotes.core submodule"
+# 安装 peerDependencies
+pnpm add -D vite vitepress vue
 ```
 
-### 克隆含 submodule 的仓库
+## 使用方式
 
-```bash
-# 方式一：克隆时一并拉取
-git clone --recurse-submodules https://github.com/tnotesjs/TNotes.xxx.git
+### VitePress 配置
 
-# 方式二：克隆后手动初始化
-git clone https://github.com/tnotesjs/TNotes.xxx.git
-cd TNotes.xxx
-git submodule update --init
+```ts
+// .vitepress/config.mts
+import { defineNotesConfig } from '@tnotesjs/core/vitepress/config'
+export default defineNotesConfig()
 ```
 
-### 更新 submodule 到最新版本
+### VitePress 主题
 
-```bash
-cd .vitepress/tnotes
-git pull origin main
-cd ../..
-git add .vitepress/tnotes
-git commit -m "chore: update TNotes.core"
+```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"
+  }
+}
+```
 
-你可以在任意 TNotes.xxx 仓库中直接编辑 `.vitepress/tnotes/` 下的文件，改动会即时生效（VitePress HMR）。编辑完成后：
+## 开发工作流
 
 ```bash
-# 1. 在 submodule 内提交并推送
-cd .vitepress/tnotes
-git add -A && git commit -m "feat: your change" && git push
+# 克隆 core 仓库
+git clone https://github.com/tnotesjs/core.git
+cd core
+pnpm install
 
-# 2. 回到父仓库，更新 submodule 指针
-cd ../..
-git add .vitepress/tnotes && git commit -m "chore: update TNotes.core"
-```
+# 构建
+pnpm build
 
-其它 TNotes.xxx 仓库要同步这次改动：
+# 类型检查
+pnpm build:check
 
-```bash
-cd .vitepress/tnotes && git pull origin main && cd ../..
-git add .vitepress/tnotes && git commit -m "chore: update TNotes.core"
+# 本地调试（在宿主仓库中 link）
+pnpm link --global
+cd ../TNotes.xxx
+pnpm link --global @tnotesjs/core
 ```
 
 ## CI/CD
 
-各仓库的 GitHub Actions 部署工作流（`deploy.yml`）需要在 checkout 步骤中启用 submodule 拉取：
+各仓库的 GitHub Actions 部署工作流（`deploy.yml`）只需标准 checkout，无需额外配置：
 
 ```yaml
 - uses: actions/checkout@v4
   with:
     fetch-depth: 0
-    submodules: true
 ```
 
 ## 版本管理
 
 - 版本号遵循 [Semantic Versioning](https://semver.org/lang/zh-CN/)
 - 变更记录见 [CHANGELOG.md](./CHANGELOG.md)
+- 发布：`npm publish --access public`
 - 每个版本通过 Git Tag 标记（如 `v1.0.0`）
 
 ## 许可证

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

@@ -14,7 +14,6 @@ var COMMAND_NAMES = {
   PULL: "pull",
   PUSH: "push",
   RENAME_NOTE: "rename-note",
-  SYNC: "sync",
   UPDATE: "update",
   UPDATE_COMPLETED_COUNT: "update-completed-count",
   UPDATE_NOTE_CONFIG: "update-note-config"
@@ -28,7 +27,6 @@ var COMMAND_DESCRIPTIONS = {
   [COMMAND_NAMES.CREATE_NOTES]: "\u65B0\u5EFA\u7B14\u8BB0\uFF08\u652F\u6301\u6279\u91CF\u521B\u5EFA\uFF09",
   [COMMAND_NAMES.PUSH]: "\u5C06\u77E5\u8BC6\u5E93\u63A8\u9001\u5230 GitHub",
   [COMMAND_NAMES.PULL]: "\u5C06 GitHub \u7684\u77E5\u8BC6\u5E93\u62C9\u4E0B\u6765",
-  [COMMAND_NAMES.SYNC]: "\u540C\u6B65\u672C\u5730\u548C\u8FDC\u7A0B\u7684\u77E5\u8BC6\u5E93\u72B6\u6001",
   [COMMAND_NAMES.FIX_TIMESTAMPS]: "\u4FEE\u590D\u6240\u6709\u7B14\u8BB0\u7684\u65F6\u95F4\u6233\uFF08\u57FA\u4E8E git \u5386\u53F2\uFF09",
   [COMMAND_NAMES.UPDATE_NOTE_CONFIG]: "\u66F4\u65B0\u7B14\u8BB0\u914D\u7F6E\u6587\u4EF6",
   [COMMAND_NAMES.RENAME_NOTE]: "\u91CD\u547D\u540D\u7B14\u8BB0",
@@ -3197,7 +3195,6 @@ var NoteService = class _NoteService {
     const readmeContent = noteTitle + "\n" + NEW_NOTES_README_MD_TEMPLATE;
     writeFileSync4(readmePath, readmeContent, "utf-8");
     const configPath = join7(notePath, ".tnotes.json");
-    const now = Date.now();
     const config2 = {
       id: configId || uuidv4(),
       // 配置 ID 使用 UUID（跨知识库唯一）
@@ -3206,9 +3203,8 @@ var NoteService = class _NoteService {
       yuque: [],
       done: false,
       category,
-      enableDiscussions,
-      created_at: now,
-      updated_at: now
+      enableDiscussions
+      // created_at / updated_at 由 tn:push 时 fix-timestamps 自动写入
     };
     this.noteManager.writeNoteConfig(configPath, config2);
     logger.info(`Created new note: ${dirName}`);
@@ -3261,8 +3257,7 @@ var NoteService = class _NoteService {
     const oldConfig = { ...note.config };
     const updatedConfig = {
       ...note.config,
-      ...updates,
-      updated_at: Date.now()
+      ...updates
     };
     this.ignoreNextConfigChange(note.configPath);
     this.noteManager.updateNoteConfig(note, updatedConfig);
@@ -3623,6 +3618,70 @@ var TimestampService = class {
   constructor() {
     this.noteManager = NoteManager.getInstance();
   }
+  /**
+   * 批量获取所有笔记 README.md 的 git 时间戳
+   * 只执行 2 次 git log，构建 filePath → {created_at, updated_at} 的映射
+   *
+   * - 第 1 次：git log --name-only --format=... --diff-filter=A
+   *   获取每个文件的首次提交时间（created_at）
+   * - 第 2 次：git log --name-only --format=...
+   *   获取每个文件的最后修改时间（updated_at）
+   */
+  buildGitTimestampMap() {
+    const createdMap = /* @__PURE__ */ new Map();
+    const updatedMap = /* @__PURE__ */ new Map();
+    try {
+      const createdRaw = execSync3(
+        `git log --name-only --format="---COMMIT---%ct" --diff-filter=A -- "notes/*/README.md"`,
+        {
+          cwd: ROOT_DIR_PATH,
+          encoding: "utf-8",
+          maxBuffer: 100 * 1024 * 1024,
+          stdio: ["pipe", "pipe", "ignore"]
+        }
+      );
+      let currentTimestamp = 0;
+      for (const line of createdRaw.split(/\r?\n/)) {
+        if (line.startsWith("---COMMIT---")) {
+          currentTimestamp = parseInt(line.slice(12)) * 1e3;
+        } else if (line.trim() && currentTimestamp) {
+          createdMap.set(line.trim(), currentTimestamp);
+        }
+      }
+      const updatedRaw = execSync3(
+        `git log --name-only --format="---COMMIT---%ct" -- "notes/*/README.md"`,
+        {
+          cwd: ROOT_DIR_PATH,
+          encoding: "utf-8",
+          maxBuffer: 100 * 1024 * 1024,
+          stdio: ["pipe", "pipe", "ignore"]
+        }
+      );
+      currentTimestamp = 0;
+      for (const line of updatedRaw.split(/\r?\n/)) {
+        if (line.startsWith("---COMMIT---")) {
+          currentTimestamp = parseInt(line.slice(12)) * 1e3;
+        } else if (line.trim() && currentTimestamp) {
+          if (!updatedMap.has(line.trim())) {
+            updatedMap.set(line.trim(), currentTimestamp);
+          }
+        }
+      }
+    } catch (error) {
+      logger.error("\u6279\u91CF\u83B7\u53D6 git \u65F6\u95F4\u6233\u5931\u8D25", error);
+    }
+    const result = /* @__PURE__ */ new Map();
+    for (const [file, created_at] of createdMap) {
+      const updated_at = updatedMap.get(file) ?? created_at;
+      result.set(file, { created_at, updated_at });
+    }
+    for (const [file, updated_at] of updatedMap) {
+      if (!result.has(file)) {
+        result.set(file, { created_at: updated_at, updated_at });
+      }
+    }
+    return result;
+  }
   /**
    * 从 git 获取文件的创建时间和最后修改时间
    * @param noteDirPath - 笔记目录路径
@@ -3664,9 +3723,10 @@ var TimestampService = class {
    * 修复单个笔记的时间戳
    * @param noteDir - 笔记目录名
    * @param forceUpdate - 是否强制更新（忽略现有值）
+   * @param timestampMap - 预构建的时间戳映射（批量模式传入，避免逐个 git log）
    * @returns 是否进行了修复
    */
-  fixNoteTimestamps(noteDir, forceUpdate = false) {
+  fixNoteTimestamps(noteDir, forceUpdate = false, timestampMap) {
     const configPath = join8(NOTES_DIR_PATH, noteDir, ".tnotes.json");
     if (!existsSync7(configPath)) {
       return false;
@@ -3674,8 +3734,8 @@ var TimestampService = class {
     try {
       const configContent = readFileSync6(configPath, "utf-8");
       const config2 = JSON.parse(configContent);
-      const noteDirPath = join8(NOTES_DIR_PATH, noteDir);
-      const timestamps = this.getGitTimestamps(noteDirPath);
+      const readmeRelPath = `notes/${noteDir}/README.md`;
+      const timestamps = timestampMap ? timestampMap.get(readmeRelPath) ?? null : this.getGitTimestamps(join8(NOTES_DIR_PATH, noteDir));
       if (!timestamps) {
         return false;
       }
@@ -3773,6 +3833,8 @@ var TimestampService = class {
     if (rootConfigFixed) {
       logger.success("\u2705 \u6839\u914D\u7F6E\u6587\u4EF6\u65F6\u95F4\u6233\u5DF2\u4FEE\u590D");
     }
+    const timestampMap = this.buildGitTimestampMap();
+    logger.info(`\u5DF2\u4ECE git \u5386\u53F2\u4E2D\u63D0\u53D6 ${timestampMap.size} \u4E2A\u6587\u4EF6\u7684\u65F6\u95F4\u6233\u4FE1\u606F`);
     if (!existsSync7(NOTES_DIR_PATH)) {
       logger.error("notes \u76EE\u5F55\u4E0D\u5B58\u5728");
       return { fixed: 0, skipped: 0, total: 0, rootConfigFixed };
@@ -3784,7 +3846,7 @@ var TimestampService = class {
     let fixedCount = 0;
     let skippedCount = 0;
     for (const noteDir of noteDirs) {
-      const fixed = this.fixNoteTimestamps(noteDir, forceUpdate);
+      const fixed = this.fixNoteTimestamps(noteDir, forceUpdate, timestampMap);
       if (fixed) {
         fixedCount++;
       } else {
@@ -4212,6 +4274,7 @@ export {
   ROOT_DIR_PATH,
   ROOT_CONFIG_PATH,
   NoteManager,
+  runCommand,
   BaseCommand,
   NoteIndexCache,
   ReadmeService,

package/dist/cli/index.js

@@ -19,8 +19,9 @@ import {
   handleError,
   logger,
   parseArgs,
-  parseReadmeCompletedNotes
-} from "../chunk-IGIIUJDF.js";
+  parseReadmeCompletedNotes,
+  runCommand
+} from "../chunk-CSSIRO3I.js";
 import {
   ConfigManager
 } from "../chunk-NASIL5FY.js";
@@ -97,11 +98,9 @@ var UpdateCommand = class extends BaseCommand {
         ...config.root_item.completed_notes_count || {},
         [currentKey]: completedCount
       };
-      const updatedAt = Date.now();
       config.root_item = {
         ...config.root_item,
-        completed_notes_count: completedNotesCount,
-        updated_at: updatedAt
+        completed_notes_count: completedNotesCount
       };
       delete config.root_item.completed_notes_count_last_month;
       writeFileSync(ROOT_CONFIG_PATH, JSON.stringify(config, null, 2), "utf-8");
@@ -140,11 +139,12 @@ var UpdateCompletedCountCommand = class extends BaseCommand {
       const configContent = readFileSync2(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(config.root_item.created_at);
+      const completedNotesCountHistory = await this.getCompletedNotesCountHistory(
+        config.root_item.created_at ?? Date.now()
+      );
       config.root_item = {
         ...config.root_item,
-        completed_notes_count: completedNotesCountHistory,
-        updated_at: Date.now()
+        completed_notes_count: completedNotesCountHistory
       };
       writeFileSync2(ROOT_CONFIG_PATH, JSON.stringify(config, null, 2), "utf-8");
       const duration = Date.now() - startTime;
@@ -277,29 +277,35 @@ var PushCommand = class extends BaseCommand {
         this.logger.info("\u6CA1\u6709\u66F4\u6539\u9700\u8981\u63A8\u9001");
         return;
       }
-      if (hasPendingCommits && !status.hasChanges) {
-        this.logger.info(`\u68C0\u6D4B\u5230 ${status.ahead} \u4E2A\u672A\u63A8\u9001\u7684\u63D0\u4EA4\uFF0C\u76F4\u63A5\u63A8\u9001...`);
+      const force = this.options.force === true;
+      if (force) {
+        this.logger.warn("\u4F7F\u7528\u5F3A\u5236\u63A8\u9001\u6A21\u5F0F (--force)");
       }
       if (status.hasChanges) {
-        const changedFiles = status.files.map((f) => f.path);
-        this.logger.info(`\u5171\u8BA1\u68C0\u6D4B\u5230 ${changedFiles.length} \u4E2A\u53D8\u66F4\u6587\u4EF6`);
-        const changedNotes = this.timestampService.getChangedNotes(changedFiles);
         this.logger.info(
-          `\u5DE5\u5177\u68C0\u6D4B\u5230 ${changedNotes.length} \u4E2A\u53D8\u66F4\u7B14\u8BB0\uFF08README.md\uFF09`
+          `\u68C0\u6D4B\u5230 ${status.files.length} \u4E2A\u53D8\u66F4\u6587\u4EF6\uFF0C\u6B63\u5728\u63D0\u4EA4...`
+        );
+        const commitMessage = this.gitService.generateCommitMessage();
+        await runCommand("git add -A", ROOT_DIR_PATH);
+        await runCommand(`git commit -m "${commitMessage}"`, ROOT_DIR_PATH);
+        this.logger.info("\u4FEE\u590D\u7B14\u8BB0\u65F6\u95F4\u6233...");
+        await this.timestampService.fixAllTimestamps(false);
+        const afterFixStatus = await runCommand(
+          "git -c core.quotePath=false status --porcelain",
+          ROOT_DIR_PATH
         );
-        if (changedNotes.length > 0) {
-          this.logger.info(
-            `\u68C0\u6D4B\u5230 ${changedNotes.length} \u7BC7\u7B14\u8BB0\u7684 README.md \u6709\u53D8\u66F4\uFF0C\u66F4\u65B0\u65F6\u95F4\u6233...`
-          );
-          await this.timestampService.updateNotesTimestamp(changedNotes);
+        const hasTimestampChanges = afterFixStatus.split(/\r?\n/).filter(Boolean).some((line) => line.includes(".tnotes.json"));
+        if (hasTimestampChanges) {
+          this.logger.info("\u5C06\u65F6\u95F4\u6233\u53D8\u66F4\u5408\u5E76\u5230 commit...");
+          await runCommand("git add -u", ROOT_DIR_PATH);
+          await runCommand("git commit --amend --no-edit", ROOT_DIR_PATH);
         }
-      }
-      const force = this.options.force === true;
-      if (force) {
-        this.logger.warn("\u4F7F\u7528\u5F3A\u5236\u63A8\u9001\u6A21\u5F0F (--force)");
+      } else {
+        this.logger.info(`\u68C0\u6D4B\u5230 ${status.ahead} \u4E2A\u672A\u63A8\u9001\u7684\u63D0\u4EA4\uFF0C\u76F4\u63A5\u63A8\u9001...`);
       }
       this.logger.info("\u6B63\u5728\u63A8\u9001\u5230\u8FDC\u7A0B\u4ED3\u5E93...");
-      await this.gitService.quickPush({ force, skipCheck: true });
+      const pushCmd = force ? "git push --force" : "git push";
+      await runCommand(pushCmd, ROOT_DIR_PATH);
       this.logger.success("\u63A8\u9001\u5B8C\u6210");
     } catch (error) {
       this.logger.error("\u63A8\u9001\u5931\u8D25:", error);
@@ -322,26 +328,6 @@ var PullCommand = class extends BaseCommand {
   }
 };
 
-// commands/git/SyncCommand.ts
-var SyncCommand = class extends BaseCommand {
-  gitService;
-  constructor() {
-    super("sync");
-    this.gitService = new GitService();
-  }
-  async run() {
-    this.logger.info("\u6B63\u5728\u540C\u6B65\u4ED3\u5E93...");
-    const hasChanges = await this.gitService.hasChanges();
-    if (hasChanges) {
-      const message = this.gitService.generateCommitMessage();
-      await this.gitService.sync(message);
-    } else {
-      await this.gitService.sync();
-    }
-    this.logger.success("\u540C\u6B65\u5B8C\u6210");
-  }
-};
-
 // commands/dev/DevCommand.ts
 var DevCommand = class extends BaseCommand {
   fileWatcherService;
@@ -573,7 +559,7 @@ var COMMAND_CATEGORIES = {
     COMMAND_NAMES.UPDATE_COMPLETED_COUNT,
     COMMAND_NAMES.CREATE_NOTES
   ],
-  "Git \u64CD\u4F5C": [COMMAND_NAMES.PUSH, COMMAND_NAMES.PULL, COMMAND_NAMES.SYNC],
+  "Git \u64CD\u4F5C": [COMMAND_NAMES.PUSH, COMMAND_NAMES.PULL],
   \u5176\u4ED6: [COMMAND_NAMES.FIX_TIMESTAMPS, COMMAND_NAMES.HELP]
 };
 var COMMAND_OPTIONS_INFO = {
@@ -646,7 +632,6 @@ var commandFactories = {
   "update-completed-count": () => new UpdateCompletedCountCommand(),
   push: () => new PushCommand(),
   pull: () => new PullCommand(),
-  sync: () => new SyncCommand(),
   "create-notes": () => new CreateNoteCommand(),
   "fix-timestamps": () => new FixTimestampsCommand(),
   "update-note-config": () => new UpdateNoteConfigCommand(),

package/dist/vitepress/config/index.js

@@ -4,7 +4,7 @@ import {
   UpdateNoteConfigCommand,
   generateAnchor,
   logger
-} from "../../chunk-IGIIUJDF.js";
+} from "../../chunk-CSSIRO3I.js";
 import "../../chunk-NASIL5FY.js";
 
 // vitepress/config/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tnotesjs/core",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "description": "TNotes 知识库核心框架 —— 基于 VitePress 的笔记管理系统",
   "type": "module",
   "bin": {

package/types/config.ts

@@ -55,7 +55,7 @@ export interface RootItem {
   completed_notes_count: Record<string, number>
   details: string
   link: string
-  created_at: number
-  updated_at: number
-  days_since_birth: number
+  created_at?: number
+  updated_at?: number
+  days_since_birth?: number
 }

package/types/note.ts

@@ -16,8 +16,8 @@ export interface NoteConfig {
   category?: string
   enableDiscussions: boolean
   description?: string // 笔记简介(一句话描述)
-  created_at: number
-  updated_at: number
+  created_at?: number
+  updated_at?: number
 }
 
 /**