nano-git 0.3.2 → 0.3.3

package/README.md

@@ -381,7 +381,7 @@ Git 使用内容寻址文件系统，所有对象通过 SHA-1 哈希寻址：
 
 存储目录内容，每个条目包含：
 
-- 文件模式（如 `100644` 普通文件，`100755` 可执行文件，`040000` 目录）
+- 文件模式（如 `100644` 普通文件，`100755` 可执行文件，`040000` 目录，API 中均使用规范 6 位形式）
 - 文件名
 - 指向 blob 或子 tree 的哈希
 

package/dist/core/types.d.mts

@@ -48,7 +48,7 @@ interface GitBlob {
 }
 /** Tree 条目 — 目录中的一个文件或子目录 */
 interface TreeEntry {
-  /** 文件模式（如 "100644" 普通文件, "100755" 可执行文件, "40000" 目录） */
+  /** 文件模式（如 "100644" 普通文件, "100755" 可执行文件, "040000" 目录） */
   mode: string;
   /** 文件/目录名 */
   name: string;

package/dist/objects/tree.d.mts

@@ -4,6 +4,8 @@ import { GitTree } from "../core/types.mjs";
 /**
  * 序列化 Tree 对象
  *
+ * 写入时自动将规范 mode 转换为磁盘格式（如 "040000" → "40000"）。
+ *
  * @example
  * ```ts
  * const tree: GitTree = {
@@ -16,6 +18,8 @@ import { GitTree } from "../core/types.mjs";
 declare function serializeTree(tree: GitTree): Buffer;
 /**
  * 反序列化 Tree 对象
+ *
+ * 读取时自动将磁盘 mode 转换为规范形式（如 "40000" → "040000"）。
  */
 declare function deserializeTree(content: Buffer): GitTree;
 //#endregion

package/dist/objects/tree.mjs

@@ -9,10 +9,58 @@ import { sha1 } from "../core/types.mjs";
 * - mode: 文件模式（如 "100644"）
 * - name: 文件名
 * - hash: 20 字节的原始 SHA-1（不是十六进制字符串）
+*
+* mode 规范化说明：
+* Git CLI 显示目录 mode 为 "040000"（6 位八进制，前导补零），但磁盘上存储为 "40000"（5 字节）。
+* 本模块在序列化/反序列化边界做双向转换，内部统一使用规范形式（"040000"）。
+*/
+/**
+* 目录 mode 的磁盘格式（无前导零，5 字节）
 */
+const DIR_MODE_ON_DISK = "40000";
+/**
+* 目录 mode 的规范格式（有前导零，6 字节，与 git cat-file -p 显示一致）
+*/
+const DIR_MODE_CANONICAL = "040000";
+/**
+* 将 mode 转换为规范形式（6 位八进制）
+*
+* 读取磁盘 tree 条目时调用：将 "40000" → "040000"，其他 mode 不变。
+*
+* @param mode - 来自磁盘的 mode 字符串
+* @returns 规范化的 mode 字符串
+*
+* @example
+* ```ts
+* toCanonicalMode("40000")  // => "040000"
+* toCanonicalMode("100644") // => "100644"
+* ```
+*/
+function toCanonicalMode(mode) {
+	return mode === DIR_MODE_ON_DISK ? DIR_MODE_CANONICAL : mode;
+}
+/**
+* 将 mode 转换为磁盘格式（无多余前导零）
+*
+* 写入磁盘 tree 条目时调用：将 "040000" → "40000"，其他 mode 不变。
+*
+* @param mode - 规范形式的 mode 字符串
+* @returns 磁盘形式的 mode 字符串
+*
+* @example
+* ```ts
+* toOnDiskMode("040000") // => "40000"
+* toOnDiskMode("100644") // => "100644"
+* ```
+*/
+function toOnDiskMode(mode) {
+	return mode === DIR_MODE_CANONICAL ? DIR_MODE_ON_DISK : mode;
+}
 /**
 * 序列化 Tree 对象
 *
+* 写入时自动将规范 mode 转换为磁盘格式（如 "040000" → "40000"）。
+*
 * @example
 * ```ts
 * const tree: GitTree = {
@@ -25,7 +73,8 @@ import { sha1 } from "../core/types.mjs";
 function serializeTree(tree) {
 	const buffers = [];
 	for (const entry of tree.entries) {
-		const entryHeader = Buffer.from(`${entry.mode} ${entry.name}\0`, "utf-8");
+		const mode = toOnDiskMode(entry.mode);
+		const entryHeader = Buffer.from(`${mode} ${entry.name}\0`, "utf-8");
 		const entryHash = Buffer.from(entry.hash, "hex");
 		if (entryHash.length !== 20) throw new InvalidObjectError(`invalid SHA-1 hash length: ${entryHash.length}`);
 		buffers.push(entryHeader, entryHash);
@@ -34,6 +83,8 @@ function serializeTree(tree) {
 }
 /**
 * 反序列化 Tree 对象
+*
+* 读取时自动将磁盘 mode 转换为规范形式（如 "40000" → "040000"）。
 */
 function deserializeTree(content) {
 	const entries = [];
@@ -51,7 +102,7 @@ function deserializeTree(content) {
 		if (hashEnd > content.length) throw new InvalidObjectError("tree: truncated hash");
 		const hash = content.subarray(hashStart, hashEnd).toString("hex");
 		entries.push({
-			mode,
+			mode: toCanonicalMode(mode),
 			name,
 			hash: sha1(hash)
 		});

package/dist/repository/tree/tree-patch.mjs

@@ -98,7 +98,7 @@ function processOpsSequentially(objects, rootHash, ops) {
 * 在 tree 中查找路径对应的条目
 *
 * 沿路径依次读取 tree 对象，最后一段返回目标条目。
-* 中间段必须为目录（mode "40000"），否则抛出异常。
+* 中间段必须为目录（mode "040000"），否则抛出异常。
 */
 function findEntryByPath(objects, treeHash, path) {
 	const segments = path.split("/");
@@ -109,7 +109,7 @@ function findEntryByPath(objects, treeHash, path) {
 		const entry = obj.entries.find((e) => e.name === segments[i]);
 		if (!entry) return null;
 		if (i === segments.length - 1) return entry;
-		if (entry.mode !== "40000") throw new Error(`Cannot access '${segments.slice(0, i + 1).join("/")}': not a directory (mode: ${entry.mode})`);
+		if (entry.mode !== "040000") throw new Error(`Cannot access '${segments.slice(0, i + 1).join("/")}': not a directory (mode: ${entry.mode})`);
 		currentHash = entry.hash;
 	}
 	return null;
@@ -174,7 +174,7 @@ function applyPatchRecursive(objects, treeHash, ops, prefix, upsertedPaths) {
 	for (const [name, childOps] of deeperOps) {
 		const existingEntry = existingEntries.find((e) => e.name === name);
 		const existingHash = existingEntry?.hash ?? null;
-		if (existingEntry !== void 0 && existingEntry.mode !== "40000") throw new Error(`Cannot access '${prefix}${name}': existing entry is not a directory (mode: ${existingEntry.mode})`);
+		if (existingEntry !== void 0 && existingEntry.mode !== "040000") throw new Error(`Cannot access '${prefix}${name}': existing entry is not a directory (mode: ${existingEntry.mode})`);
 		if (existingHash === null) {
 			const hasUpsertInBatch = childOps.some((op) => op.op === "upsert") || childOps.some((op) => op.op === "delete" && upsertedPaths.has(`${prefix}${name}/${op.path}`));
 			if (childOps.every((op) => op.op === "delete") && !hasUpsertInBatch) {
@@ -185,7 +185,7 @@ function applyPatchRecursive(objects, treeHash, ops, prefix, upsertedPaths) {
 		const result = applyPatchRecursive(objects, existingHash, childOps, `${prefix}${name}/`, upsertedPaths);
 		writtenTrees.push(...result.written);
 		finalEntryMap.set(name, {
-			mode: "40000",
+			mode: "040000",
 			name,
 			hash: result.hash
 		});

package/dist/repository/tree/tree-walk.mjs

@@ -58,7 +58,7 @@ function walkTreeRecursive(objects, treeHash, prefix, result, visit) {
 		};
 		if (result) result.push(entryWithPath);
 		if (visit) visit(entryWithPath);
-		if (entry.mode === "40000") walkTreeRecursive(objects, entry.hash, path, result, visit);
+		if (entry.mode === "040000") walkTreeRecursive(objects, entry.hash, path, result, visit);
 	}
 }
 //#endregion

package/dist/repository/tree/tree-writer.mjs

@@ -31,7 +31,7 @@ function writeTreeRecursive(store, dirPath) {
 		if (stat.isDirectory()) {
 			const subtreeHash = writeTreeRecursive(store, fullPath);
 			entries.push({
-				mode: "40000",
+				mode: "040000",
 				name,
 				hash: subtreeHash
 			});

package/dist/workdir/change-index.mjs

@@ -195,7 +195,7 @@ function snapshotBaseTree(source, treeHash, dirPath) {
 	const out = [];
 	for (const entry of tree.entries) {
 		const path = joinChildPath(dirPath, entry.name);
-		if (entry.mode === "40000") {
+		if (entry.mode === "040000") {
 			out.push(...snapshotBaseTree(source, entry.hash, path));
 			continue;
 		}

package/dist/workdir/core.d.mts

@@ -18,7 +18,7 @@ type VirtualEntryKind = "blob" | "tree" | "symlink";
 interface VirtualEntryStat {
   /** 条目种类 */
   readonly kind: VirtualEntryKind;
-  /** Git 文件模式（如 "100644"、"100755"、"40000"、"120000"） */
+  /** Git 文件模式（如 "100644"、"100755"、"040000"、"120000"） */
   readonly mode: string;
   /** 文件大小（对 blob 和 symlink 有效；目录返回 0） */
   readonly size: number;

package/dist/workdir/origin.mjs

@@ -28,7 +28,7 @@ function readRepoBlobContent(source, hash, path) {
 * 根据 tree 条目构造节点 origin
 */
 function treeEntryToNodeOrigin(entry) {
-	if (entry.mode === "40000") return {
+	if (entry.mode === "040000") return {
 		kind: "repo-tree",
 		hash: entry.hash
 	};
@@ -47,7 +47,7 @@ function treeEntryToNodeOrigin(entry) {
 * Git mode 转为 VirtualEntryKind
 */
 function modeToVirtualEntryKind(mode) {
-	if (mode === "40000") return "tree";
+	if (mode === "040000") return "tree";
 	if (mode === "120000") return "symlink";
 	return "blob";
 }

package/dist/workdir/workdir-path.mjs

@@ -272,7 +272,7 @@ function ensureNodeFromTreeEntry(state, entry) {
 	if (state.getNode(id) === null) {
 		const origin = treeEntryToNodeOrigin(entry);
 		let nodeState;
-		if (entry.mode === "40000") nodeState = {
+		if (entry.mode === "040000") nodeState = {
 			kind: "directory",
 			overlay: {
 				addedEntries: /* @__PURE__ */ new Map(),
@@ -326,7 +326,7 @@ function buildAddedModes(state, dirNode) {
 	return addedModes;
 }
 function workdirNodeMode(node) {
-	if (node.state.kind === "directory") return "40000";
+	if (node.state.kind === "directory") return "040000";
 	if (node.state.kind === "symlink") return "120000";
 	return node.state.mode;
 }

package/dist/workdir/workdir-transaction.mjs

@@ -79,7 +79,7 @@ function statNode(source, node, path) {
 function statDirectoryNode(node) {
 	return {
 		kind: "tree",
-		mode: "40000",
+		mode: "040000",
 		size: 0,
 		hash: node.origin.kind === "repo-tree" ? node.origin.hash : null
 	};

package/dist/workdir/write-tree.mjs

@@ -101,7 +101,7 @@ function compileChildEntry(writeSource, readSource, state, child) {
 		const originHash = node.origin.kind === "repo-tree" ? node.origin.hash : null;
 		return {
 			entry: {
-				mode: "40000",
+				mode: "040000",
 				name: child.name,
 				hash: newHash
 			},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nano-git",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "files": [
     "dist"
   ],