npm - @fgbg/mdocs - Versions diffs - 0.7.6 → 0.7.8 - Mend

@fgbg/mdocs 0.7.6 → 0.7.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (90) hide show

package/dist/server/access/access-control.js CHANGED Viewed

@@ -14,6 +14,7 @@
  *   3. restricted 域 → 域成员走 1/2 档；非成员靠 invite
  *   4. private 域 → 按五档实际语义 + invite
  *   5. invite 叠加（与域成员互斥，见 addDocumentInvite）
+ *   6. Invite 管理能力：仅限文档创建者（invites HTTP 路由，见 assertDocumentOwner）
  */
 import { getDb } from "../db/connection.js";
 import { findDocumentById, findDocumentInvite } from "../db/repositories/document.repo.js";
@@ -24,10 +25,13 @@ import { findDomainById, isDomainMember as checkDomainMember } from "../db/repos
 export class DocumentError extends Error {
     status;
     code;
-    constructor(code, message, status = 400) {
+    /** 可选附加信息（如 VERSION_CONFLICT 时返回远端 head 与正文）。 */
+    details;
+    constructor(code, message, status = 400, details) {
         super(message);
         this.code = code;
         this.status = status;
+        this.details = details;
     }
 }
 // ============================================================
@@ -129,8 +133,13 @@ export function canEditDocument(row, visitorId, domainInfo) {
         return row.permission === Permission.PUBLIC_WRITE;
     // 3. 根据域上下文 + 权限值判断
     if (domainInfo.domainPermission === "public") {
-        // public 域仅 3/4 档，仅 4 (public_write) 允许任何人写
-        return row.permission === Permission.PUBLIC_WRITE;
+        // public 域仅 3/4 档：
+        // - 4 (public_write) 任何人可写
+        // - 3 (public_read) 仅创建者可写（已在前面处理）或靠 invite(edit)
+        if (row.permission === Permission.PUBLIC_WRITE)
+            return true;
+        const invite = findDocumentInvite(getDb(), row.document_id, visitorId);
+        return invite?.permission === "edit";
     }
     if (domainInfo.domainPermission === "restricted") {
         // restricted 域仅 1/2 档，仅 2 (domain_write) 允许域成员写
@@ -198,4 +207,20 @@ export function assertDocumentAccess(documentId, visitorId, action) {
         throw new DocumentError("FORBIDDEN", "无权编辑此文档", 403);
     }
 }
+/**
+ * 文档邀请：仅创建者可列出 / 新增 / 移除邀请（与被邀请者的 edit 权限区分）。
+ */
+export function assertDocumentOwner(documentId, visitorId) {
+    if (!visitorId) {
+        throw new DocumentError("UNAUTHENTICATED", "no visitor", 401);
+    }
+    const db = getDb();
+    const row = findDocumentById(db, documentId);
+    if (!row) {
+        throw new DocumentError("DOC_NOT_FOUND", "文档不存在", 404);
+    }
+    if (row.owner_visitor_id !== visitorId) {
+        throw new DocumentError("FORBIDDEN", "仅创建者可管理邀请", 403);
+    }
+}
 //# sourceMappingURL=access-control.js.map

package/dist/server/access/access-control.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"access-control.js","sourceRoot":"","sources":["../../../src/server/access/access-control.ts"],"names":[],"mappings":"AAAA~~;;;;;;;;;;;;;;;;GAgBG~~;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAC3F,OAAO,EAAE,cAAc,EAAE,cAAc,IAAI,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAExG,+DAA+D;AAC/D,UAAU;AACV,+DAA+D;AAE/D,MAAM,OAAO,aAAc,SAAQ,KAAK;IACtC,MAAM,CAAS;IACf,IAAI,CAAS;IACb,YAAY,IAAY,EAAE,OAAe,EAAE,MAAM,GAAG,GAAG;~~QACrD~~,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;~~IACvB~~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~~4CAA4C~~;~~QAC5C~~,~~OAAO~~,GAAG,CAAC,UAAU,KAAK,UAAU,CAAC,YAAY,CAAC;~~IACpD~~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"}
1	+ {"version":3,"file":"access-control.js","sourceRoot":"","sources":["../../../src/server/access/access-control.ts"],"names":[],"mappings":"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"}

package/dist/server/config/index.js CHANGED Viewed

@@ -32,6 +32,8 @@ export function getConfig() {
         filesDir: path.join(dataDir, "files"),
         docsDir: path.join(dataDir, "files", "docs"),
         assetsDir: path.join(dataDir, "files", "assets"),
+        // 历史提交快照：路径仅由正文 SHA-256 决定，见 resolveCommitBlobAbsolutePath
+        commitsDir: path.join(dataDir, "files", "commits"),
         logsDir: path.join(dataDir, "logs"),
         webDistDir: path.resolve(process.cwd(), "dist/web"),
         logging,

package/dist/server/config/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;~~AA0B7B~~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"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/config/index.ts"],"names":[],"mappings":"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"}

package/dist/server/db/repositories/commit.repo.js ADDED Viewed

@@ -0,0 +1,32 @@
+/** 插入一条提交节点（不含 parent 边，边由 insertCommitParent 单独写入）。 */
+export function insertCommit(db, input) {
+    db.prepare(`INSERT INTO document_commits
+     (commit_id, document_id, content_hash, blob_ref, author_visitor_id, created_at)
+     VALUES (?, ?, ?, ?, ?, ?)`).run(input.commitId, input.documentId, input.contentHash, input.blobRef, input.authorVisitorId, input.createdAt);
+}
+/** 插入一条父子边；merge 时对同一 child 调用两次即可表达双父。 */
+export function insertCommitParent(db, input) {
+    db.prepare(`INSERT INTO commit_parents (child_commit_id, parent_commit_id) VALUES (?, ?)`).run(input.childCommitId, input.parentCommitId);
+}
+/** 按 commit_id 查询单条提交。 */
+export function findCommitById(db, commitId) {
+    return db
+        .prepare(`SELECT commit_id, document_id, content_hash, blob_ref, author_visitor_id, created_at
+       FROM document_commits WHERE commit_id = ?`)
+        .get(commitId);
+}
+/** 列出某提交节点的全部直接父节点 id。 */
+export function listParentCommitIds(db, childCommitId) {
+    const rows = db
+        .prepare(`SELECT parent_commit_id FROM commit_parents WHERE child_commit_id = ?`)
+        .all(childCommitId);
+    return rows.map((r) => r.parent_commit_id);
+}
+/** 统计父边数量（线性提交为 1，merge 提交为 2）。 */
+export function countParents(db, childCommitId) {
+    const row = db
+        .prepare(`SELECT COUNT(*) as c FROM commit_parents WHERE child_commit_id = ?`)
+        .get(childCommitId);
+    return row?.c ?? 0;
+}
+//# sourceMappingURL=commit.repo.js.map

package/dist/server/db/repositories/commit.repo.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"commit.repo.js","sourceRoot":"","sources":["../../../../src/server/db/repositories/commit.repo.ts"],"names":[],"mappings":"AAYA,wDAAwD;AACxD,MAAM,UAAU,YAAY,CAC1B,EAAqB,EACrB,KAOC;IAED,EAAE,CAAC,OAAO,CACR;;+BAE2B,CAC5B,CAAC,GAAG,CACH,KAAK,CAAC,QAAQ,EACd,KAAK,CAAC,UAAU,EAChB,KAAK,CAAC,WAAW,EACjB,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,eAAe,EACrB,KAAK,CAAC,SAAS,CAChB,CAAC;AACJ,CAAC;AAED,2CAA2C;AAC3C,MAAM,UAAU,kBAAkB,CAChC,EAAqB,EACrB,KAAwD;IAExD,EAAE,CAAC,OAAO,CACR,8EAA8E,CAC/E,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;AACnD,CAAC;AAED,0BAA0B;AAC1B,MAAM,UAAU,cAAc,CAAC,EAAqB,EAAE,QAAgB;IACpE,OAAO,EAAE;SACN,OAAO,CACN;iDAC2C,CAC5C;SACA,GAAG,CAAC,QAAQ,CAAC,CAAC;AACnB,CAAC;AAED,0BAA0B;AAC1B,MAAM,UAAU,mBAAmB,CACjC,EAAqB,EACrB,aAAqB;IAErB,MAAM,IAAI,GAAG,EAAE;SACZ,OAAO,CACN,uEAAuE,CACxE;SACA,GAAG,CAAC,aAAa,CAAC,CAAC;IACtB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;AAC7C,CAAC;AAED,mCAAmC;AACnC,MAAM,UAAU,YAAY,CAAC,EAAqB,EAAE,aAAqB;IACvE,MAAM,GAAG,GAAG,EAAE;SACX,OAAO,CACN,oEAAoE,CACrE;SACA,GAAG,CAAC,aAAa,CAAC,CAAC;IACtB,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;AACrB,CAAC"}

package/dist/server/db/repositories/document.repo.js CHANGED Viewed

@@ -23,7 +23,7 @@ export function countDocumentsByDomain(db, domainId) {
 export function listDocumentsByDomain(db, domainId) {
     return db
         .prepare(`SELECT document_id, domain_id, relative_path, display_name, owner_visitor_id,
-              created_by, updated_by, content_hash, created_at, updated_at, permission,
+              created_by, updated_by, content_hash, head_commit_id, created_at, updated_at, permission,
               file_type, parent_id
        FROM documents WHERE domain_id = ? ORDER BY relative_path`)
         .all(domainId);
@@ -53,7 +53,7 @@ export function listDocumentsByVisitor(db, visitorId) {
 export function findDocumentById(db, documentId) {
     return db
         .prepare(`SELECT document_id, domain_id, relative_path, display_name, owner_visitor_id,
-              created_by, updated_by, content_hash, created_at, updated_at, permission,
+              created_by, updated_by, content_hash, head_commit_id, created_at, updated_at, permission,
               file_type, parent_id
        FROM documents WHERE document_id = ?`)
         .get(documentId);
@@ -72,7 +72,7 @@ export function findDocumentById(db, documentId) {
 export function findDocumentByPath(db, domainId, relativePath) {
     return db
         .prepare(`SELECT document_id, domain_id, relative_path, display_name, owner_visitor_id,
-              created_by, updated_by, content_hash, created_at, updated_at, permission,
+              created_by, updated_by, content_hash, head_commit_id, created_at, updated_at, permission,
               file_type, parent_id
        FROM documents WHERE domain_id = ? AND relative_path = ?`)
         .get(domainId, relativePath);
@@ -86,9 +86,15 @@ export function findDocumentByPath(db, domainId, relativePath) {
 export function insertDocument(db, input) {
     db.prepare(`INSERT INTO documents
      (document_id, domain_id, relative_path, display_name, owner_visitor_id,
-      created_by, updated_by, content_hash, created_at, updated_at, permission,
+      created_by, updated_by, content_hash, head_commit_id, created_at, updated_at, permission,
       file_type, parent_id)
-     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(input.documentId, input.domainId, input.relativePath, input.displayName, input.ownerVisitorId, input.createdBy, input.updatedBy, input.contentHash, input.createdAt, input.updatedAt, input.permission, input.fileType ?? 'md', input.parentId ?? null);
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(input.documentId, input.domainId, input.relativePath, input.displayName, input.ownerVisitorId, input.createdBy, input.updatedBy, input.contentHash, input.headCommitId ?? null, input.createdAt, input.updatedAt, input.permission, input.fileType ?? 'md', input.parentId ?? null);
+}
+/** 更新 documents.head_commit_id，指向当前对外生效的最新提交。 */
+export function updateDocumentHeadCommit(db, input) {
+    db.prepare(`UPDATE documents
+     SET head_commit_id = ?, updated_by = ?, updated_at = ?
+     WHERE document_id = ?`).run(input.headCommitId, input.updatedBy, input.updatedAt, input.documentId);
 }
 /**
  * 更新文档内容与元数据。

package/dist/server/db/repositories/document.repo.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"document.repo.js","sourceRoot":"","sources":["../../../../src/server/db/repositories/document.repo.ts"],"names":[],"mappings":"~~AA8CA~~;;;;;;GAMG;AACH,MAAM,UAAU,sBAAsB,CAAC,EAAqB,EAAE,QAAgB;IAC5E,mCAAmC;IACnC,MAAM,GAAG,GAAG,EAAE;SACX,OAAO,CACN,yDAAyD,CAC1D;SACA,GAAG,CAAC,QAAQ,CAAC,CAAC;IACjB,oBAAoB;IACpB,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;AACrB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,qBAAqB,CAAC,EAAqB,EAAE,QAAgB;IAC3E,OAAO,EAAE;SACN,OAAO,CACN;;;iEAG2D,CAC5D;SACA,GAAG,CAAC,QAAQ,CAAC,CAAC;AACnB,CAAC;AAmBD,MAAM,UAAU,sBAAsB,CAAC,EAAqB,EAAE,SAAiB;IAC7E,MAAM,IAAI,GAAG,EAAE;SACZ,OAAO,CASN;0EACoE,CACrE;SACA,GAAG,CAAC,SAAS,CAAC,CAAC;IAElB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACxB,UAAU,EAAE,GAAG,CAAC,WAAW;QAC3B,QAAQ,EAAE,GAAG,CAAC,SAAS;QACvB,YAAY,EAAE,GAAG,CAAC,aAAa;QAC/B,WAAW,EAAE,GAAG,CAAC,YAAY;QAC7B,SAAS,EAAE,GAAG,CAAC,UAAU;QACzB,SAAS,EAAE,GAAG,CAAC,UAAU;QACzB,UAAU,EAAE,GAAG,CAAC,UAAU;KAC3B,CAAC,CAAC,CAAC;AACN,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAAC,EAAqB,EAAE,UAAkB;IACxE,OAAO,EAAE;SACN,OAAO,CACN;;;4CAGsC,CACvC;SACA,GAAG,CAAC,UAAU,CAAC,CAAC;AACrB,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,kBAAkB,CAAC,EAAqB,EAAE,QAAgB,EAAE,YAAoB;IAC9F,OAAO,EAAE;SACN,OAAO,CACN;;;gEAG0D,CAC3D;SACA,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;AACjC,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,EAAqB,EAAE,KAA0B;IAC9E,EAAE,CAAC,OAAO,CACR;;;;~~oDAIgD~~,~~CACjD~~,CAAC,GAAG,CACH,KAAK,CAAC,UAAU,EAChB,KAAK,CAAC,QAAQ,EACd,KAAK,CAAC,YAAY,EAClB,KAAK,CAAC,WAAW,EACjB,KAAK,CAAC,cAAc,EACpB,KAAK,CAAC,SAAS,EACf,KAAK,CAAC,SAAS,EACf,KAAK,CAAC,WAAW,EACjB,KAAK,CAAC,SAAS,EACf,KAAK,CAAC,SAAS,EACf,KAAK,CAAC,UAAU,EAChB,KAAK,CAAC,QAAQ,IAAI,IAAI,EACtB,KAAK,CAAC,QAAQ,IAAI,IAAI,CACvB,CAAC;AACJ,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,qBAAqB,CAAC,EAAqB,EAAE,KAAiC;IAC5F,+BAA+B;IAC/B,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QACnC,EAAE,CAAC,OAAO,CACR;;6BAEuB,CACxB,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACpH,CAAC;SAAM,CAAC;QACN,EAAE,CAAC,OAAO,CACR;;6BAEuB,CACxB,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAClG,CAAC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,cAAc,CAAC,EAAqB,EAAE,UAAkB;IACtE,EAAE,CAAC,OAAO,CAAC,6CAA6C,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AAC5E,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,yBAAyB,CACvC,EAAqB,EACrB,QAAgB,EAChB,UAAkB;IAElB,OAAO,EAAE;SACN,OAAO,CACN,sEAAsE,CACvE;SACA,GAAG,CAAC,QAAQ,EAAE,GAAG,UAAU,GAAG,CAAC,CAAC;AACrC,CAAC;AASD;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAChC,EAAqB,EACrB,UAAkB,EAClB,SAAiB;IAEjB,OAAO,EAAE;SACN,OAAO,CACN,2GAA2G,CAC5G;SACA,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;AAChC,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,oBAAoB,CAClC,EAAqB,EACrB,UAAkB,EAClB,SAAiB,EACjB,UAAkB;IAElB,EAAE,CAAC,OAAO,CACR;yFACqF,CACtF,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAC3C,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAAC,EAAqB,EAAE,UAAkB,EAAE,SAAiB;IAC/F,EAAE,CAAC,OAAO,CAAC,uEAAuE,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;AACjH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CAAC,EAAqB,EAAE,UAAkB;IAC3E,OAAO,EAAE;SACN,OAAO,CACN,wFAAwF,CACzF;SACA,GAAG,CAAC,UAAU,CAAC,CAAC;AACrB,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,yCAAyC,CAAC,EAAqB,EAAE,SAAiB;IAChG,MAAM,IAAI,GAAG,EAAE;SACZ,OAAO,CACN;;;+BAGyB,CAC1B;SACA,GAAG,CAAC,SAAS,CAAC,CAAC;IAClB,gBAAgB;IAChB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AACtC,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,yBAAyB,CACvC,EAAqB,EACrB,QAAgB,EAChB,SAAiB;IAEjB,MAAM,GAAG,GAAG,EAAE;SACX,OAAO,CACN;;;;eAIS,CACV;SACA,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC5B,iCAAiC;IACjC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC;AAC9B,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAAC,EAAqB,EAAE,QAAgB;IAC1E,OAAO,EAAE;SACN,OAAO,CACN;;;iEAG2D,CAC5D;SACA,GAAG,CAAC,QAAQ,CAAC,CAAC;AACnB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,qBAAqB,CAAC,EAAqB,EAAE,QAAgB;IAC3E,MAAM,GAAG,GAAG,EAAE;SACX,OAAO,CACN,yDAAyD,CAC1D;SACA,GAAG,CAAC,QAAQ,CAAC,CAAC;IACjB,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;AACrB,CAAC"}
1	+ {"version":3,"file":"document.repo.js","sourceRoot":"","sources":["../../../../src/server/db/repositories/document.repo.ts"],"names":[],"mappings":"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"}

package/dist/server/db/schema.js CHANGED Viewed

@@ -38,6 +38,7 @@ const SCHEMA_STATEMENTS = [
     created_by TEXT NOT NULL,
     updated_by TEXT NOT NULL,
     content_hash TEXT NOT NULL,
+    head_commit_id TEXT,
     created_at TEXT NOT NULL,
     updated_at TEXT NOT NULL,
     permission INTEGER NOT NULL DEFAULT 1,
@@ -48,6 +49,24 @@ const SCHEMA_STATEMENTS = [
   )`,
     `CREATE INDEX IF NOT EXISTS idx_documents_domain ON documents (domain_id)`,
     `CREATE INDEX IF NOT EXISTS idx_documents_owner ON documents (owner_visitor_id)`,
+    // document_commits：每次 publish 一条节点；commit_parents：DAG 边（merge 时一子多父）
+    `CREATE TABLE IF NOT EXISTS document_commits (
+    commit_id TEXT PRIMARY KEY,
+    document_id TEXT NOT NULL,
+    content_hash TEXT NOT NULL,
+    blob_ref TEXT NOT NULL,
+    author_visitor_id TEXT NOT NULL,
+    created_at TEXT NOT NULL,
+    FOREIGN KEY (document_id) REFERENCES documents(document_id) ON DELETE CASCADE
+  )`,
+    `CREATE INDEX IF NOT EXISTS idx_document_commits_document ON document_commits (document_id, created_at DESC)`,
+    `CREATE TABLE IF NOT EXISTS commit_parents (
+    child_commit_id TEXT NOT NULL,
+    parent_commit_id TEXT NOT NULL,
+    PRIMARY KEY (child_commit_id, parent_commit_id),
+    FOREIGN KEY (child_commit_id) REFERENCES document_commits(commit_id) ON DELETE CASCADE,
+    FOREIGN KEY (parent_commit_id) REFERENCES document_commits(commit_id) ON DELETE CASCADE
+  )`,
     `CREATE TABLE IF NOT EXISTS attachments (
     attachment_id TEXT PRIMARY KEY,
     document_id TEXT,
@@ -161,6 +180,7 @@ export function applySchema(db) {
         migrateDomainNameUnique(db);
         migrateDocumentsTable(db);
         migrateDocumentsDirty(db);
+        migrateDocumentsHeadCommit(db);
         migrateVisitorsRecoveryCode(db);
         migrateVisitorsPasswordHash(db);
         migrateVisitorSessions(db);
@@ -281,6 +301,13 @@ function migrateDocumentsDirty(db) {
         return;
     db.exec(`ALTER TABLE documents ADD COLUMN is_dirty INTEGER NOT NULL DEFAULT 1`);
 }
+/** 为 documents 表添加 head_commit_id 列（若不存在）。 */
+function migrateDocumentsHeadCommit(db) {
+    const names = documentColumnNames(db);
+    if (names.has("head_commit_id"))
+        return;
+    db.exec(`ALTER TABLE documents ADD COLUMN head_commit_id TEXT`);
+}
 function documentColumnNames(db) {
     const rows = db.prepare(`PRAGMA table_info(documents)`).all();
     return new Set(rows.map((r) => r.name));

package/dist/server/db/schema.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/server/db/schema.ts"],"names":[],"mappings":"AAEA,gCAAgC;AAChC,MAAM,iBAAiB,GAAa;IAClC;;;;;;;;IAQE;IACF,qFAAqF;IACrF;;;;;;;;IAQE;IACF,0FAA0F;IAC1F,6FAA6F;IAC7F;;;;;;;IAOE;IACF~~;;;;;;;;;;;;;;;;IAgBE~~;IACF,0EAA0E;IAC1E,gFAAgF;IAChF;;;;;;;;IAQE;IACF;;;;;;;;IAQE;IACF,6EAA6E;IAC7E,oFAAoF;IACpF,yCAAyC;IACzC,+BAA+B;IAC/B;;;;;;IAME;IACF;;;;;IAKE;IACF,uFAAuF;IACvF;;;;;IAKE;IACF,oFAAoF;IACpF,sFAAsF;IACtF;;;;;;;IAOE;IACF,6GAA6G;IAC7G;;;IAGE;IACF;;;;;;;;;IASE;IACF;;;;;;;IAOE;IACF,8EAA8E;IAC9E;;;;;IAKE;IACF,qFAAqF;IACrF;;;;;;;;;;;;IAYE;IACF,sGAAsG;IACtG,iFAAiF;IACjF,mFAAmF;CACpF,CAAC;AAGF;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,EAAqB;IAC/C,MAAM,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;QAC7B,KAAK,MAAM,IAAI,IAAI,iBAAiB,EAAE,CAAC;YACrC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC;QACD,mBAAmB,CAAC,EAAE,CAAC,CAAC;QACxB,uBAAuB,CAAC,EAAE,CAAC,CAAC;QAC5B,qBAAqB,CAAC,EAAE,CAAC,CAAC;QAC1B,qBAAqB,CAAC,EAAE,CAAC,CAAC;QAC1B,2BAA2B,CAAC,EAAE,CAAC,CAAC;QAChC,2BAA2B,CAAC,EAAE,CAAC,CAAC;QAChC,sBAAsB,CAAC,EAAE,CAAC,CAAC;QAC3B,mBAAmB,CAAC,EAAE,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IACH,EAAE,EAAE,CAAC;AACP,CAAC;AAED,6BAA6B;AAC7B,SAAS,iBAAiB,CAAC,EAAqB;IAC9C,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC,GAAG,EAAwB,CAAC;IAClF,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,oFAAoF;AACpF,SAAS,mBAAmB,CAAC,EAAqB;IAChD,IAAI,KAAK,GAAG,iBAAiB,CAAC,EAAE,CAAC,CAAC;IAClC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC;QAAE,OAAO;IAEpC,uCAAuC;IACvC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;QAC7B,EAAE,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;QAC1D,EAAE,CAAC,OAAO,CAAC,qEAAqE,CAAC,CAAC,GAAG,EAAE,CAAC;QACxF,KAAK,GAAG,iBAAiB,CAAC,EAAE,CAAC,CAAC;IAChC,CAAC;IAED,0CAA0C;IAC1C,IAAI,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,CAAC;QAChE,EAAE,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;IAChF,CAAC;AACH,CAAC;AAED,2DAA2D;AAC3D,SAAS,uBAAuB,CAAC,EAAqB;IACpD,iCAAiC;IACjC,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC,GAAG,EAAwB,CAAC;IACrF,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CACjC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,4BAA4B,IAAI,GAAG,CAAC,IAAI,KAAK,yBAAyB,CAC7F,CAAC;IACF,IAAI,cAAc;QAAE,OAAO;IAE3B,iCAAiC;IACjC,MAAM,OAAO,GAAG,EAAE;SACf,OAAO,CACN,sFAAsF,CACvF;SACA,GAAG,EAAE,CAAC;IAET,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QAC1B,MAAM,IAAI,GAAG,EAAE;aACZ,OAAO,CACN,sFAAsF,CACvF;aACA,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACxB,oBAAoB;QACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACrC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAE,CAAC;YACrB,MAAM,OAAO,GAAG,GAAG,GAAG,CAAC,WAAW,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC;YAChD,EAAE,CAAC,OAAO,CAAC,wDAAwD,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;QACnG,CAAC;IACH,CAAC;IAED,uBAAuB;IACvB,EAAE,CAAC,IAAI,CAAC;;;;;;;IAON,CAAC,CAAC;IAEJ,EAAE,CAAC,IAAI,CAAC;;;iBAGO,CAAC,CAAC;IAEjB,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAC9B,EAAE,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;AACvD,CAAC;AAED,uCAAuC;AACvC,SAAS,mBAAmB,CAAC,EAAqB;IAChD,MAAM,GAAG,GAAG,EAAE;SACX,OAAO,CAAC,mDAAmD,CAAC;SAC5D,GAAG,CAAC,SAAS,CAAC,CAAC;IAClB,IAAI,GAAG;QAAE,OAAO;IAChB,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACrC,EAAE,CAAC,OAAO,CACR;+BAC2B,CAC5B,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;AAC5D,CAAC;AAED,0EAA0E;AAC1E,SAAS,qBAAqB,CAAC,EAAqB;IAClD,MAAM,KAAK,GAAG,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACtC,0BAA0B;IAC1B,IAAI,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC;QAAE,OAAO;IAEnC,oCAAoC;IACpC,kCAAkC;IAClC,EAAE,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;IAeN,CAAC,CAAC;IAEJ,EAAE,CAAC,IAAI,CAAC;;;;;mBAKS,CAAC,CAAC;IAEnB,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IAChC,EAAE,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;IAEzD,OAAO;IACP,EAAE,CAAC,IAAI,CAAC,0EAA0E,CAAC,CAAC;IACpF,EAAE,CAAC,IAAI,CAAC,gFAAgF,CAAC,CAAC;AAC5F,CAAC;AAED,2EAA2E;AAC3E,SAAS,qBAAqB,CAAC,EAAqB;IAClD,MAAM,KAAK,GAAG,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACtC,IAAI,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC;QAAE,OAAO;IAClC,EAAE,CAAC,IAAI,CAAC,sEAAsE,CAAC,CAAC;AAClF,CAAC;AAED,SAAS,mBAAmB,CAAC,EAAqB;IAChD,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC,GAAG,EAAwB,CAAC;IACpF,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,iDAAiD;AACjD,SAAS,2BAA2B,CAAC,EAAqB;IACxD,MAAM,KAAK,GAAG,kBAAkB,CAAC,EAAE,CAAC,CAAC;IACrC,IAAI,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC;QAAE,OAAO;IAC5C,EAAE,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;AACrE,CAAC;AAED,SAAS,kBAAkB,CAAC,EAAqB;IAC/C,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC,GAAG,EAAwB,CAAC;IACnF,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,4CAA4C;AAC5C,SAAS,2BAA2B,CAAC,EAAqB;IACxD,MAAM,KAAK,GAAG,kBAAkB,CAAC,EAAE,CAAC,CAAC;IACrC,IAAI,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC;QAAE,OAAO;IACvC,EAAE,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;AAChE,CAAC;AAED,wDAAwD;AACxD,SAAS,sBAAsB,CAAC,EAAqB;IACnD,+BAA+B;IAC/B,MAAM,WAAW,GAAG,EAAE,CAAC,OAAO,CAAC,6CAA6C,CAAC,CAAC,GAAG,EAA+B,CAAC;IACjH,IAAI,WAAW;QAAE,OAAO;IAExB,6DAA6D;IAC7D,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC;;;;;;;;;;;GAWvB,CAAC,CAAC;IACH,IAAI,CAAC,GAAG,EAAE,CAAC;AACb,CAAC"}
1	+ {"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/server/db/schema.ts"],"names":[],"mappings":"AAEA,gCAAgC;AAChC,MAAM,iBAAiB,GAAa;IAClC;;;;;;;;IAQE;IACF,qFAAqF;IACrF;;;;;;;;IAQE;IACF,0FAA0F;IAC1F,6FAA6F;IAC7F;;;;;;;IAOE;IACF;;;;;;;;;;;;;;;;;IAiBE;IACF,0EAA0E;IAC1E,gFAAgF;IAChF,qEAAqE;IACrE;;;;;;;;IAQE;IACF,6GAA6G;IAC7G;;;;;;IAME;IACF;;;;;;;;IAQE;IACF;;;;;;;;IAQE;IACF,6EAA6E;IAC7E,oFAAoF;IACpF,yCAAyC;IACzC,+BAA+B;IAC/B;;;;;;IAME;IACF;;;;;IAKE;IACF,uFAAuF;IACvF;;;;;IAKE;IACF,oFAAoF;IACpF,sFAAsF;IACtF;;;;;;;IAOE;IACF,6GAA6G;IAC7G;;;IAGE;IACF;;;;;;;;;IASE;IACF;;;;;;;IAOE;IACF,8EAA8E;IAC9E;;;;;IAKE;IACF,qFAAqF;IACrF;;;;;;;;;;;;IAYE;IACF,sGAAsG;IACtG,iFAAiF;IACjF,mFAAmF;CACpF,CAAC;AAGF;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,EAAqB;IAC/C,MAAM,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;QAC7B,KAAK,MAAM,IAAI,IAAI,iBAAiB,EAAE,CAAC;YACrC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC;QACD,mBAAmB,CAAC,EAAE,CAAC,CAAC;QACxB,uBAAuB,CAAC,EAAE,CAAC,CAAC;QAC5B,qBAAqB,CAAC,EAAE,CAAC,CAAC;QAC1B,qBAAqB,CAAC,EAAE,CAAC,CAAC;QAC1B,0BAA0B,CAAC,EAAE,CAAC,CAAC;QAC/B,2BAA2B,CAAC,EAAE,CAAC,CAAC;QAChC,2BAA2B,CAAC,EAAE,CAAC,CAAC;QAChC,sBAAsB,CAAC,EAAE,CAAC,CAAC;QAC3B,mBAAmB,CAAC,EAAE,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IACH,EAAE,EAAE,CAAC;AACP,CAAC;AAED,6BAA6B;AAC7B,SAAS,iBAAiB,CAAC,EAAqB;IAC9C,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC,GAAG,EAAwB,CAAC;IAClF,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,oFAAoF;AACpF,SAAS,mBAAmB,CAAC,EAAqB;IAChD,IAAI,KAAK,GAAG,iBAAiB,CAAC,EAAE,CAAC,CAAC;IAClC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC;QAAE,OAAO;IAEpC,uCAAuC;IACvC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;QAC7B,EAAE,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;QAC1D,EAAE,CAAC,OAAO,CAAC,qEAAqE,CAAC,CAAC,GAAG,EAAE,CAAC;QACxF,KAAK,GAAG,iBAAiB,CAAC,EAAE,CAAC,CAAC;IAChC,CAAC;IAED,0CAA0C;IAC1C,IAAI,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,CAAC;QAChE,EAAE,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;IAChF,CAAC;AACH,CAAC;AAED,2DAA2D;AAC3D,SAAS,uBAAuB,CAAC,EAAqB;IACpD,iCAAiC;IACjC,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC,GAAG,EAAwB,CAAC;IACrF,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CACjC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,4BAA4B,IAAI,GAAG,CAAC,IAAI,KAAK,yBAAyB,CAC7F,CAAC;IACF,IAAI,cAAc;QAAE,OAAO;IAE3B,iCAAiC;IACjC,MAAM,OAAO,GAAG,EAAE;SACf,OAAO,CACN,sFAAsF,CACvF;SACA,GAAG,EAAE,CAAC;IAET,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QAC1B,MAAM,IAAI,GAAG,EAAE;aACZ,OAAO,CACN,sFAAsF,CACvF;aACA,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACxB,oBAAoB;QACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACrC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAE,CAAC;YACrB,MAAM,OAAO,GAAG,GAAG,GAAG,CAAC,WAAW,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC;YAChD,EAAE,CAAC,OAAO,CAAC,wDAAwD,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;QACnG,CAAC;IACH,CAAC;IAED,uBAAuB;IACvB,EAAE,CAAC,IAAI,CAAC;;;;;;;IAON,CAAC,CAAC;IAEJ,EAAE,CAAC,IAAI,CAAC;;;iBAGO,CAAC,CAAC;IAEjB,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAC9B,EAAE,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;AACvD,CAAC;AAED,uCAAuC;AACvC,SAAS,mBAAmB,CAAC,EAAqB;IAChD,MAAM,GAAG,GAAG,EAAE;SACX,OAAO,CAAC,mDAAmD,CAAC;SAC5D,GAAG,CAAC,SAAS,CAAC,CAAC;IAClB,IAAI,GAAG;QAAE,OAAO;IAChB,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACrC,EAAE,CAAC,OAAO,CACR;+BAC2B,CAC5B,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;AAC5D,CAAC;AAED,0EAA0E;AAC1E,SAAS,qBAAqB,CAAC,EAAqB;IAClD,MAAM,KAAK,GAAG,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACtC,0BAA0B;IAC1B,IAAI,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC;QAAE,OAAO;IAEnC,oCAAoC;IACpC,kCAAkC;IAClC,EAAE,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;IAeN,CAAC,CAAC;IAEJ,EAAE,CAAC,IAAI,CAAC;;;;;mBAKS,CAAC,CAAC;IAEnB,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IAChC,EAAE,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;IAEzD,OAAO;IACP,EAAE,CAAC,IAAI,CAAC,0EAA0E,CAAC,CAAC;IACpF,EAAE,CAAC,IAAI,CAAC,gFAAgF,CAAC,CAAC;AAC5F,CAAC;AAED,2EAA2E;AAC3E,SAAS,qBAAqB,CAAC,EAAqB;IAClD,MAAM,KAAK,GAAG,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACtC,IAAI,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC;QAAE,OAAO;IAClC,EAAE,CAAC,IAAI,CAAC,sEAAsE,CAAC,CAAC;AAClF,CAAC;AAED,8CAA8C;AAC9C,SAAS,0BAA0B,CAAC,EAAqB;IACvD,MAAM,KAAK,GAAG,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACtC,IAAI,KAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC;QAAE,OAAO;IACxC,EAAE,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;AAClE,CAAC;AAED,SAAS,mBAAmB,CAAC,EAAqB;IAChD,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC,GAAG,EAAwB,CAAC;IACpF,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,iDAAiD;AACjD,SAAS,2BAA2B,CAAC,EAAqB;IACxD,MAAM,KAAK,GAAG,kBAAkB,CAAC,EAAE,CAAC,CAAC;IACrC,IAAI,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC;QAAE,OAAO;IAC5C,EAAE,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;AACrE,CAAC;AAED,SAAS,kBAAkB,CAAC,EAAqB;IAC/C,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC,GAAG,EAAwB,CAAC;IACnF,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,4CAA4C;AAC5C,SAAS,2BAA2B,CAAC,EAAqB;IACxD,MAAM,KAAK,GAAG,kBAAkB,CAAC,EAAE,CAAC,CAAC;IACrC,IAAI,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC;QAAE,OAAO;IACvC,EAAE,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;AAChE,CAAC;AAED,wDAAwD;AACxD,SAAS,sBAAsB,CAAC,EAAqB;IACnD,+BAA+B;IAC/B,MAAM,WAAW,GAAG,EAAE,CAAC,OAAO,CAAC,6CAA6C,CAAC,CAAC,GAAG,EAA+B,CAAC;IACjH,IAAI,WAAW;QAAE,OAAO;IAExB,6DAA6D;IAC7D,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC;;;;;;;;;;;GAWvB,CAAC,CAAC;IACH,IAAI,CAAC,GAAG,EAAE,CAAC;AACb,CAAC"}

package/dist/server/documents/commit-graph.js ADDED Viewed

@@ -0,0 +1,52 @@
+import { DocumentError } from "../access/access-control.js";
+import { findCommitById, listParentCommitIds } from "../db/repositories/commit.repo.js";
+/**
+ * 判断 ancestorId 是否位于 nodeId 的祖先链上（含「自身」）。
+ * 沿 commit_parents 边从 nodeId 向上 BFS。
+ */
+export function isAncestorOf(db, ancestorId, nodeId) {
+    if (ancestorId === nodeId)
+        return true;
+    // hash set优化
+    const visited = new Set();
+    const queue = [nodeId];
+    while (queue.length > 0) {
+        const cur = queue.shift();
+        const parents = listParentCommitIds(db, cur);
+        for (const p of parents) {
+            if (p === ancestorId)
+                return true;
+            // bfs的时候会存在重复遍历的情况，set 去重
+            if (!visited.has(p)) {
+                visited.add(p);
+                queue.push(p);
+            }
+        }
+    }
+    return false;
+}
+/** 校验 commit 存在且属于指定文档，否则 400。 */
+export function assertCommitBelongsToDocument(db, commitId, documentId) {
+    const row = findCommitById(db, commitId);
+    if (!row || row.document_id !== documentId) {
+        throw new DocumentError("INVALID_COMMIT", "提交节点不存在或不属于该文档", 400);
+    }
+}
+/**
+ * merge 发布前校验分叉关系。
+ * - base 与 expectedHead 不能相同（否则应走普通线性发布）
+ * - base 必须是 expectedHead 的祖先（共同祖先之后分两路改）
+ */
+export function assertMergeFork(db, baseCommitId, expectedHeadCommitId) {
+    /*
+     * 如果 base(本地 commit 的父节点) 和 expect(远端文章最新的节点)相同
+     * 则不走 conflict merge逻辑, 应该走普通线性发布逻辑
+     */
+    if (baseCommitId === expectedHeadCommitId) {
+        throw new DocumentError("BAD_REQUEST", "合并发布要求 base 与 expectedHead 不同", 400);
+    }
+    if (!isAncestorOf(db, baseCommitId, expectedHeadCommitId)) {
+        throw new DocumentError("BAD_REQUEST", "base 不是 expectedHead 的祖先，无法合并", 400);
+    }
+}
+//# sourceMappingURL=commit-graph.js.map

package/dist/server/documents/commit-graph.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"commit-graph.js","sourceRoot":"","sources":["../../../src/server/documents/commit-graph.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAExF;;;GAGG;AACH,MAAM,UAAU,YAAY,CAC1B,EAAqB,EACrB,UAAkB,EAClB,MAAc;IAEd,IAAI,UAAU,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IACvC,aAAa;IACb,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,CAAC;IACvB,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,EAAG,CAAC;QAC3B,MAAM,OAAO,GAAG,mBAAmB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC7C,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACxB,IAAI,CAAC,KAAK,UAAU;gBAAE,OAAO,IAAI,CAAC;YAClC,0BAA0B;YAC1B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACf,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAChB,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,kCAAkC;AAClC,MAAM,UAAU,6BAA6B,CAC3C,EAAqB,EACrB,QAAgB,EAChB,UAAkB;IAElB,MAAM,GAAG,GAAG,cAAc,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IACzC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,WAAW,KAAK,UAAU,EAAE,CAAC;QAC3C,MAAM,IAAI,aAAa,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,GAAG,CAAC,CAAC;IACnE,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAC7B,EAAqB,EACrB,YAAoB,EACpB,oBAA4B;IAE5B;;;OAGG;IACH,IAAI,YAAY,KAAK,oBAAoB,EAAE,CAAC;QAC1C,MAAM,IAAI,aAAa,CACrB,aAAa,EACb,+BAA+B,EAC/B,GAAG,CACJ,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,YAAY,EAAE,oBAAoB,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,aAAa,CACrB,aAAa,EACb,+BAA+B,EAC/B,GAAG,CACJ,CAAC;IACJ,CAAC;AACH,CAAC"}

package/dist/server/documents/commit-graph.test.js ADDED Viewed

@@ -0,0 +1,52 @@
+import { describe, it, expect, beforeAll } from "vitest";
+import Database from "better-sqlite3";
+import { applySchema } from "../db/schema.js";
+import { insertCommit, insertCommitParent } from "../db/repositories/commit.repo.js";
+import { isAncestorOf, assertMergeFork } from "./commit-graph.js";
+import { DocumentError } from "../access/access-control.js";
+describe("commit-graph", () => {
+    let db;
+    const DOC = "doc-1";
+    const now = "2024-01-01T00:00:00.000Z";
+    beforeAll(() => {
+        db = new Database(":memory:");
+        applySchema(db);
+        db.prepare(`INSERT INTO documents (
+        document_id, domain_id, relative_path, display_name, owner_visitor_id,
+        created_by, updated_by, content_hash, head_commit_id, created_at, updated_at,
+        permission, file_type, parent_id
+      ) VALUES (?, 'default', 't.md', 'T', 'v1', 'v1', 'v1', 'h', NULL, ?, ?, 1, 'md', NULL)`).run(DOC, now, now);
+        // a -> c -> d
+        const a = "commit-a";
+        const c = "commit-c";
+        const d = "commit-d";
+        for (const [id, hash] of [
+            [a, "ha"],
+            [c, "hc"],
+            [d, "hd"],
+        ]) {
+            insertCommit(db, {
+                commitId: id,
+                documentId: DOC,
+                contentHash: hash,
+                blobRef: `${hash}/blob`,
+                authorVisitorId: "v1",
+                createdAt: now,
+            });
+        }
+        insertCommitParent(db, { childCommitId: c, parentCommitId: a });
+        insertCommitParent(db, { childCommitId: d, parentCommitId: c });
+        db.prepare(`UPDATE documents SET head_commit_id = ? WHERE document_id = ?`).run(d, DOC);
+    });
+    it("isAncestorOf：祖先关系", () => {
+        expect(isAncestorOf(db, "commit-a", "commit-d")).toBe(true);
+        expect(isAncestorOf(db, "commit-c", "commit-d")).toBe(true);
+        expect(isAncestorOf(db, "commit-d", "commit-a")).toBe(false);
+    });
+    it("assertMergeFork：base 必须是 expectedHead 的真祖先", () => {
+        expect(() => assertMergeFork(db, "commit-a", "commit-d")).not.toThrow();
+        expect(() => assertMergeFork(db, "commit-d", "commit-d")).toThrow(DocumentError);
+        expect(() => assertMergeFork(db, "commit-d", "commit-a")).toThrow(DocumentError);
+    });
+});
+//# sourceMappingURL=commit-graph.test.js.map

package/dist/server/documents/commit-graph.test.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"commit-graph.test.js","sourceRoot":"","sources":["../../../src/server/documents/commit-graph.test.ts"],"names":[],"mappings":"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"}

package/dist/server/documents/document-commit.integration.test.js ADDED Viewed

@@ -0,0 +1,197 @@
+/**
+ * 文档提交链：冲突检测与 merge 发布
+ */
+import { describe, it, expect, beforeAll, afterEach, vi } from "vitest";
+import Database from "better-sqlite3";
+import { applySchema } from "../db/schema.js";
+import { createHash } from "node:crypto";
+const testDbRef = vi.hoisted(() => ({ db: null }));
+const fileStoreMocks = vi.hoisted(() => ({
+    lastWriteContent: "",
+    reset() {
+        fileStoreMocks.lastWriteContent = "";
+    },
+}));
+vi.mock("../db/connection.js", () => ({
+    getDb: () => testDbRef.db,
+}));
+vi.mock("../storage/file-store.js", () => ({
+    writeDocument: (_domainId, _relativePath, content) => {
+        fileStoreMocks.lastWriteContent = content;
+        const hash = createHash("sha256").update(content).digest("hex");
+        return { contentHash: hash, bytes: content.length };
+    },
+    readDocument: () => ({
+        content: fileStoreMocks.lastWriteContent || "{}",
+        contentHash: createHash("sha256")
+            .update(fileStoreMocks.lastWriteContent || "{}")
+            .digest("hex"),
+    }),
+    writeCommitBlob: (contentHash, content) => ({
+        blobRef: `${contentHash.slice(0, 2)}/${contentHash.slice(2)}`,
+        bytes: content.length,
+    }),
+    deleteDocumentFile: () => { },
+    sha256: (buf) => createHash("sha256").update(buf).digest("hex"),
+}));
+import { DocumentError } from "../access/access-control.js";
+import { createDocument, updateDocument } from "./document.service.js";
+import { findDocumentById } from "../db/repositories/document.repo.js";
+import { countParents, listParentCommitIds, } from "../db/repositories/commit.repo.js";
+const OWNER = "owner-commit-test";
+beforeAll(() => {
+    const db = new Database(":memory:");
+    applySchema(db);
+    testDbRef.db = db;
+    const now = new Date().toISOString();
+    db.prepare(`INSERT INTO visitors (visitor_id, visitor_name, visitor_token_hash, created_at)
+     VALUES (?, ?, ?, ?)`).run(OWNER, "Owner", "hash", now);
+});
+afterEach(() => {
+    const db = testDbRef.db;
+    db.exec("DELETE FROM commit_parents");
+    db.exec("DELETE FROM document_commits");
+    db.exec("DELETE FROM documents");
+    db.exec("DELETE FROM audit_logs");
+    fileStoreMocks.reset();
+});
+describe("updateDocument 版本冲突", () => {
+    it("base 与 head 一致时成功并推进 head", () => {
+        const created = createDocument({
+            actorVisitorId: OWNER,
+            fileName: "v1.md",
+            content: '{"v":1}',
+            domainId: "default",
+        });
+        const base = created.headCommitId;
+        const updated = updateDocument({
+            actorVisitorId: OWNER,
+            documentId: created.documentId,
+            content: '{"v":2}',
+            version: { baseCommitId: base },
+        });
+        expect(updated.headCommitId).not.toBe(base);
+        const row = findDocumentById(testDbRef.db, created.documentId);
+        expect(row?.head_commit_id).toBe(updated.headCommitId);
+    });
+    it("base 落后时返回 409 且带远端详情", () => {
+        const created = createDocument({
+            actorVisitorId: OWNER,
+            fileName: "conflict.md",
+            content: '{"v":1}',
+            domainId: "default",
+        });
+        const base = created.headCommitId;
+        updateDocument({
+            actorVisitorId: OWNER,
+            documentId: created.documentId,
+            content: '{"v":2}',
+            version: { baseCommitId: base },
+        });
+        fileStoreMocks.lastWriteContent = '{"v":2}';
+        expect(() => updateDocument({
+            actorVisitorId: OWNER,
+            documentId: created.documentId,
+            content: '{"v":3}',
+            version: { baseCommitId: base },
+        })).toThrow(DocumentError);
+        try {
+            updateDocument({
+                actorVisitorId: OWNER,
+                documentId: created.documentId,
+                content: '{"v":3}',
+                version: { baseCommitId: base },
+            });
+        }
+        catch (e) {
+            const err = e;
+            expect(err.code).toBe("VERSION_CONFLICT");
+            expect(err.status).toBe(409);
+            expect(err.details).toMatchObject({
+                headCommitId: expect.any(String),
+                content: expect.any(String),
+            });
+        }
+    });
+    it("未传 version 时不做冲突校验（兼容旧客户端）", () => {
+        const created = createDocument({
+            actorVisitorId: OWNER,
+            fileName: "legacy.md",
+            content: "{}",
+            domainId: "default",
+        });
+        expect(() => updateDocument({
+            actorVisitorId: OWNER,
+            documentId: created.documentId,
+            content: '{"noBase":true}',
+        })).not.toThrow();
+    });
+});
+describe("updateDocument merge 发布", () => {
+    it("插入 r_local 与双父 merge 节点", () => {
+        const created = createDocument({
+            actorVisitorId: OWNER,
+            fileName: "merge.md",
+            content: '{"base":true}',
+            domainId: "default",
+        });
+        const base = created.headCommitId;
+        const remote = updateDocument({
+            actorVisitorId: OWNER,
+            documentId: created.documentId,
+            content: '{"remote":true}',
+            version: { baseCommitId: base },
+        });
+        const head = remote.headCommitId;
+        const merged = updateDocument({
+            actorVisitorId: OWNER,
+            documentId: created.documentId,
+            content: '{"merged":true}',
+            version: {
+                baseCommitId: base,
+                merge: {
+                    expectedHeadCommitId: head,
+                    localSnapshotContent: '{"local":true}',
+                },
+            },
+        });
+        expect(merged.headCommitId).not.toBe(head);
+        expect(countParents(testDbRef.db, merged.headCommitId)).toBe(2);
+        const parents = listParentCommitIds(testDbRef.db, merged.headCommitId);
+        expect(parents).toContain(head);
+        const localCommitId = parents.find((p) => p !== head);
+        expect(localCommitId).toBeTruthy();
+        expect(listParentCommitIds(testDbRef.db, localCommitId)).toEqual([base]);
+    });
+    it("expectedHead 与当前 head 不一致时 409", () => {
+        const created = createDocument({
+            actorVisitorId: OWNER,
+            fileName: "merge-stale.md",
+            content: "{}",
+            domainId: "default",
+        });
+        const base = created.headCommitId;
+        const remote = updateDocument({
+            actorVisitorId: OWNER,
+            documentId: created.documentId,
+            content: '{"r":1}',
+            version: { baseCommitId: base },
+        });
+        updateDocument({
+            actorVisitorId: OWNER,
+            documentId: created.documentId,
+            content: '{"r":2}',
+            version: { baseCommitId: remote.headCommitId },
+        });
+        expect(() => updateDocument({
+            actorVisitorId: OWNER,
+            documentId: created.documentId,
+            content: '{"m":1}',
+            version: {
+                baseCommitId: base,
+                merge: { expectedHeadCommitId: remote.headCommitId },
+            },
+        })).toThrow(DocumentError);
+    });
+});
+//# sourceMappingURL=document-commit.integration.test.js.map

package/dist/server/documents/document-commit.integration.test.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"document-commit.integration.test.js","sourceRoot":"","sources":["../../../src/server/documents/document-commit.integration.test.ts"],"names":[],"mappings":"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"}