nano-git 0.2.0 → 0.2.1

package/dist/workdir/session.d.mts

@@ -0,0 +1,18 @@
+import { ObjectDatabase } from "../core/types/odb.mjs";
+import { CreateVirtualWorkdirSessionOptions, VirtualWorkdirSession } from "./core.mjs";
+
+//#region src/workdir/session.d.ts
+/**
+ * 基于 ObjectDatabase 创建 VirtualWorkdirSession
+ *
+ * @example
+ * ```ts
+ * const repo = createMemoryRepository();
+ * const tree = repo.createTree([]);
+ * const session = createVirtualWorkdirSession(repo.objects, { baseTree: tree });
+ * expect(session.readdir()).toEqual([]);
+ * ```
+ */
+declare function createVirtualWorkdirSession(source: ObjectDatabase, options: CreateVirtualWorkdirSessionOptions): VirtualWorkdirSession;
+//#endregion
+export { createVirtualWorkdirSession };

package/dist/workdir/session.mjs

@@ -0,0 +1,380 @@
+import { VirtualNotDirectoryError, VirtualNotFileError, VirtualNotSymlinkError, VirtualPathAlreadyExistsError, VirtualPathNotFoundError, VirtualRevertNotSupportedError } from "../core/errors.mjs";
+import { VIRTUAL_ROOT_NODE_ID, createNodeId } from "./ids.mjs";
+import { overlayBindEntry, overlayRenameEntry, overlayTombstoneEntry } from "./overlay.mjs";
+import { cloneSessionNodeForCopy, createRootDirectoryNode, revertNodeState } from "./nodes.mjs";
+import { createVirtualWorkdirMemoryState } from "./memory-backend.mjs";
+import { modeToVirtualEntryKind, readRepoBlobContent } from "./origin.mjs";
+import { assertValidVirtualPath, baseName, normalizeDirectoryPath, parentPath } from "./path.mjs";
+import { listDirectoryChildren, resolveChild, resolvePath } from "./session-internal.mjs";
+import { writeTreeFromSession } from "./write-tree.mjs";
+//#region src/workdir/session.ts
+/**
+* VirtualWorkdirSession 行为编排
+*
+* Phase 5：完整文件/目录 rename 与 copy 语义。
+*/
+/**
+* 基于 ObjectDatabase 创建 VirtualWorkdirSession
+*
+* @example
+* ```ts
+* const repo = createMemoryRepository();
+* const tree = repo.createTree([]);
+* const session = createVirtualWorkdirSession(repo.objects, { baseTree: tree });
+* expect(session.readdir()).toEqual([]);
+* ```
+*/
+function createVirtualWorkdirSession(source, options) {
+	return buildSessionApi(source, createVirtualWorkdirMemoryState(options.baseTree));
+}
+function buildSessionApi(source, state) {
+	return {
+		get baseTree() {
+			return state.baseTree;
+		},
+		exists(path) {
+			if (path === "") return true;
+			return resolvePath(source, state, path).found;
+		},
+		stat(path) {
+			if (path === "") return statDirectoryNode(getRootNode(state));
+			const resolved = resolvePath(source, state, path);
+			if (!resolved.found || resolved.node === null) return null;
+			return statNode(source, resolved.node, path);
+		},
+		readdir(dirPath) {
+			const normalized = normalizeDirectoryPath(dirPath);
+			const resolved = normalized === "" ? {
+				found: true,
+				node: getRootNode(state)
+			} : resolvePath(source, state, normalized);
+			if (!resolved.found || resolved.node === null) throw new VirtualPathNotFoundError(normalized);
+			if (resolved.node.state.kind !== "directory") throw new VirtualNotDirectoryError(normalized);
+			return listDirectoryChildren(source, state, resolved.node, normalized).map((child) => ({
+				name: child.name,
+				kind: modeToVirtualEntryKind(child.mode),
+				mode: child.mode
+			}));
+		},
+		readFile(path) {
+			assertValidVirtualPath(path);
+			const resolved = resolvePath(source, state, path);
+			if (!resolved.found || resolved.node === null) throw new VirtualPathNotFoundError(path);
+			const node = resolved.node;
+			if (node.state.kind === "file") {
+				if (node.state.content !== void 0) return node.state.content;
+				if (node.origin.kind === "repo-blob") return readRepoBlobContent(source, node.origin.hash, path);
+				throw new VirtualPathNotFoundError(path);
+			}
+			if (node.state.kind === "symlink") throw new VirtualNotFileError(path);
+			throw new VirtualNotFileError(path);
+		},
+		readLink(path) {
+			assertValidVirtualPath(path);
+			const resolved = resolvePath(source, state, path);
+			if (!resolved.found || resolved.node === null) throw new VirtualPathNotFoundError(path);
+			const node = resolved.node;
+			if (node.state.kind !== "symlink") throw new VirtualNotSymlinkError(path);
+			if (node.state.target !== void 0) return node.state.target.toString("utf-8");
+			if (node.origin.kind === "repo-blob") return readRepoBlobContent(source, node.origin.hash, path).toString("utf-8");
+			throw new VirtualPathNotFoundError(path);
+		},
+		mkdir(path) {
+			assertValidVirtualPath(path);
+			const parent = parentPath(path);
+			const name = baseName(path);
+			const parentResolved = parent !== null ? resolvePath(source, state, parent) : {
+				found: true,
+				node: getRootNode(state)
+			};
+			if (!parentResolved.found || parentResolved.node === null) throw new VirtualPathNotFoundError(parent ?? path);
+			const parentNode = parentResolved.node;
+			if (parentNode.state.kind !== "directory") throw new VirtualNotDirectoryError(parent ?? path);
+			const existing = resolveChild(source, state, parentNode, parent ?? "", name);
+			if (existing.found && existing.node !== null) throw new VirtualPathAlreadyExistsError(path);
+			const nodeId = createNodeId();
+			const newNode = {
+				id: nodeId,
+				origin: { kind: "none" },
+				state: {
+					kind: "directory",
+					overlay: {
+						addedEntries: /* @__PURE__ */ new Map(),
+						deletedNames: /* @__PURE__ */ new Set()
+					}
+				}
+			};
+			state.nodes.set(nodeId, newNode);
+			updateParentOverlay(state, parentNode.id, overlayBindEntry(parentNode.state.overlay, name, nodeId));
+			state.changeLog.append({
+				op: "add",
+				path
+			});
+		},
+		writeFile(path, content, options) {
+			assertValidVirtualPath(path);
+			const mode = options?.mode ?? "100644";
+			const parent = parentPath(path);
+			const name = baseName(path);
+			const parentResolved = parent !== null ? resolvePath(source, state, parent) : {
+				found: true,
+				node: getRootNode(state)
+			};
+			if (!parentResolved.found || parentResolved.node === null) throw new VirtualPathNotFoundError(parent ?? path);
+			const parentNode = parentResolved.node;
+			if (parentNode.state.kind !== "directory") throw new VirtualNotDirectoryError(parent ?? path);
+			const existing = resolveChild(source, state, parentNode, parent ?? "", name);
+			if (existing.found && existing.node !== null) {
+				if (existing.node.state.kind === "directory") throw new VirtualNotFileError(path);
+			}
+			const isNew = !existing.found || existing.node === null;
+			const nodeId = existing.found ? existing.node.id : createNodeId();
+			const fileNode = {
+				id: nodeId,
+				origin: existing.found ? existing.node.origin : { kind: "none" },
+				state: {
+					kind: "file",
+					mode,
+					content
+				}
+			};
+			state.nodes.set(nodeId, fileNode);
+			updateParentOverlay(state, parentNode.id, overlayBindEntry(parentNode.state.overlay, name, nodeId));
+			state.changeLog.append({
+				op: isNew ? "add" : "modify",
+				path
+			});
+		},
+		writeLink(path, target) {
+			assertValidVirtualPath(path);
+			const parent = parentPath(path);
+			const name = baseName(path);
+			const parentResolved = parent !== null ? resolvePath(source, state, parent) : {
+				found: true,
+				node: getRootNode(state)
+			};
+			if (!parentResolved.found || parentResolved.node === null) throw new VirtualPathNotFoundError(parent ?? path);
+			const parentNode = parentResolved.node;
+			if (parentNode.state.kind !== "directory") throw new VirtualNotDirectoryError(parent ?? path);
+			const existing = resolveChild(source, state, parentNode, parent ?? "", name);
+			if (existing.found && existing.node !== null) {
+				if (existing.node.state.kind === "directory") throw new VirtualNotFileError(path);
+			}
+			const isNew = !existing.found || existing.node === null;
+			const nodeId = existing.found ? existing.node.id : createNodeId();
+			const linkNode = {
+				id: nodeId,
+				origin: existing.found ? existing.node.origin : { kind: "none" },
+				state: {
+					kind: "symlink",
+					mode: "120000",
+					target: Buffer.from(target)
+				}
+			};
+			state.nodes.set(nodeId, linkNode);
+			updateParentOverlay(state, parentNode.id, overlayBindEntry(parentNode.state.overlay, name, nodeId));
+			state.changeLog.append({
+				op: isNew ? "add" : "modify",
+				path
+			});
+		},
+		delete(path) {
+			assertValidVirtualPath(path);
+			const parent = parentPath(path);
+			const name = baseName(path);
+			const parentResolved = parent !== null ? resolvePath(source, state, parent) : {
+				found: true,
+				node: getRootNode(state)
+			};
+			if (!parentResolved.found || parentResolved.node === null) throw new VirtualPathNotFoundError(parent ?? path);
+			const parentNode = parentResolved.node;
+			if (parentNode.state.kind !== "directory") throw new VirtualNotDirectoryError(parent ?? path);
+			const existing = resolveChild(source, state, parentNode, parent ?? "", name);
+			if (!existing.found || existing.node === null) throw new VirtualPathNotFoundError(path);
+			updateParentOverlay(state, parentNode.id, overlayTombstoneEntry(parentNode.state.overlay, name));
+			state.changeLog.append({
+				op: "delete",
+				path
+			});
+		},
+		rename(from, to) {
+			assertValidVirtualPath(from);
+			assertValidVirtualPath(to);
+			if (from === to) return;
+			const fromParent = parentPath(from);
+			const fromName = baseName(from);
+			const fromParentResolved = fromParent !== null ? resolvePath(source, state, fromParent) : {
+				found: true,
+				node: getRootNode(state)
+			};
+			if (!fromParentResolved.found || fromParentResolved.node === null) throw new VirtualPathNotFoundError(from);
+			const fromParentNode = fromParentResolved.node;
+			if (fromParentNode.state.kind !== "directory") throw new VirtualNotDirectoryError(from);
+			const fromChild = resolveChild(source, state, fromParentNode, fromParent ?? "", fromName);
+			if (!fromChild.found || fromChild.node === null) throw new VirtualPathNotFoundError(from);
+			const sourceNode = fromChild.node;
+			const toParent = parentPath(to);
+			const toName = baseName(to);
+			const toParentResolved = toParent !== null ? resolvePath(source, state, toParent) : {
+				found: true,
+				node: getRootNode(state)
+			};
+			if (!toParentResolved.found || toParentResolved.node === null) throw new VirtualPathNotFoundError(to);
+			const toParentNode = toParentResolved.node;
+			if (toParentNode.state.kind !== "directory") throw new VirtualNotDirectoryError(to);
+			const toExisting = resolveChild(source, state, toParentNode, toParent ?? "", toName);
+			if (toExisting.found && toExisting.node !== null) throw new VirtualPathAlreadyExistsError(to);
+			if (sourceNode.state.kind === "directory") {
+				const toPath = to;
+				const fromPath = from;
+				if (toPath.startsWith(fromPath + "/") || toPath === fromPath) throw new Error(`Cannot rename '${from}' to '${to}': destination is a subdirectory of source`);
+			}
+			if (fromParentNode.id === toParentNode.id) updateParentOverlay(state, fromParentNode.id, overlayRenameEntry(fromParentNode.state.overlay, fromName, toName, sourceNode.id));
+			else {
+				updateParentOverlay(state, fromParentNode.id, overlayTombstoneEntry(fromParentNode.state.overlay, fromName));
+				updateParentOverlay(state, toParentNode.id, overlayBindEntry(toParentNode.state.overlay, toName, sourceNode.id));
+			}
+			state.changeLog.append({
+				op: "rename",
+				from,
+				to
+			});
+		},
+		copy(from, to) {
+			assertValidVirtualPath(from);
+			assertValidVirtualPath(to);
+			if (from === to) throw new VirtualPathAlreadyExistsError(to);
+			const fromParent = parentPath(from);
+			const fromName = baseName(from);
+			const fromParentResolved = fromParent !== null ? resolvePath(source, state, fromParent) : {
+				found: true,
+				node: getRootNode(state)
+			};
+			if (!fromParentResolved.found || fromParentResolved.node === null) throw new VirtualPathNotFoundError(from);
+			const fromParentNode = fromParentResolved.node;
+			if (fromParentNode.state.kind !== "directory") throw new VirtualNotDirectoryError(from);
+			const fromChild = resolveChild(source, state, fromParentNode, fromParent ?? "", fromName);
+			if (!fromChild.found || fromChild.node === null) throw new VirtualPathNotFoundError(from);
+			const sourceNode = fromChild.node;
+			const toParent = parentPath(to);
+			const toName = baseName(to);
+			const toParentResolved = toParent !== null ? resolvePath(source, state, toParent) : {
+				found: true,
+				node: getRootNode(state)
+			};
+			if (!toParentResolved.found || toParentResolved.node === null) throw new VirtualPathNotFoundError(to);
+			const toParentNode = toParentResolved.node;
+			if (toParentNode.state.kind !== "directory") throw new VirtualNotDirectoryError(to);
+			const toExisting = resolveChild(source, state, toParentNode, toParent ?? "", toName);
+			if (toExisting.found && toExisting.node !== null) throw new VirtualPathAlreadyExistsError(to);
+			const newNodeId = cloneNodeGraphForCopy(source, state, sourceNode, from);
+			updateParentOverlay(state, toParentNode.id, overlayBindEntry(toParentNode.state.overlay, toName, newNodeId));
+			state.changeLog.append({
+				op: "copy",
+				from,
+				to
+			});
+		},
+		revert(path) {
+			assertValidVirtualPath(path);
+			const resolved = resolvePath(source, state, path);
+			if (!resolved.found || resolved.node === null) throw new VirtualPathNotFoundError(path);
+			const node = resolved.node;
+			const reverted = revertNodeState(node);
+			if (reverted === node) throw new VirtualRevertNotSupportedError(path);
+			state.nodes.set(node.id, reverted);
+			state.changeLog.append({
+				op: "revert",
+				path
+			});
+		},
+		writeTree() {
+			return writeTreeFromSession(source, state);
+		},
+		reset(baseTree) {
+			state.baseTree = baseTree;
+			state.nodes.clear();
+			state.nodes.set(VIRTUAL_ROOT_NODE_ID, createRootDirectoryNode(baseTree));
+			state.changeLog.clear();
+		},
+		listChanges() {
+			return state.changeLog.toVirtualChanges();
+		}
+	};
+}
+function getRootNode(state) {
+	const root = state.nodes.get(VIRTUAL_ROOT_NODE_ID);
+	if (root === void 0) throw new Error("Virtual workdir session is missing root node");
+	return root;
+}
+/**
+* 更新父节点的 overlay（创建新节点对象替代 Map 中的旧引用）
+*/
+function updateParentOverlay(state, parentId, newOverlay) {
+	const parentNode = state.nodes.get(parentId);
+	if (!parentNode || parentNode.state.kind !== "directory") throw new Error("updateParentOverlay: parent is not a directory");
+	state.nodes.set(parentId, {
+		...parentNode,
+		state: {
+			...parentNode.state,
+			overlay: newOverlay
+		}
+	});
+}
+function statNode(source, node, path) {
+	if (node.state.kind === "directory") return statDirectoryNode(node);
+	if (node.state.kind === "symlink") {
+		const hash = node.origin.kind === "repo-blob" ? node.origin.hash : null;
+		let size = 0;
+		if (node.state.target !== void 0) size = node.state.target.length;
+		else if (hash !== null) size = readRepoBlobContent(source, hash, path).length;
+		return {
+			kind: "symlink",
+			mode: "120000",
+			size,
+			hash
+		};
+	}
+	const hash = node.origin.kind === "repo-blob" ? node.origin.hash : null;
+	let size = 0;
+	if (node.state.content !== void 0) size = node.state.content.length;
+	else if (hash !== null) size = readRepoBlobContent(source, hash, path).length;
+	return {
+		kind: "blob",
+		mode: node.state.mode,
+		size,
+		hash
+	};
+}
+function statDirectoryNode(node) {
+	return {
+		kind: "tree",
+		mode: "40000",
+		size: 0,
+		hash: node.origin.kind === "repo-tree" ? node.origin.hash : null
+	};
+}
+function cloneNodeGraphForCopy(source, state, node, path) {
+	const newNodeId = createNodeId();
+	const cloned = cloneSessionNodeForCopy(node, newNodeId);
+	state.nodes.set(newNodeId, cloned);
+	if (node.state.kind !== "directory" || cloned.state.kind !== "directory") return newNodeId;
+	let overlay = cloned.state.overlay;
+	const children = listDirectoryChildren(source, state, node, path);
+	for (const child of children) {
+		const childNode = state.nodes.get(child.nodeId);
+		if (childNode === void 0) continue;
+		const clonedChildId = cloneNodeGraphForCopy(source, state, childNode, path === "" ? child.name : `${path}/${child.name}`);
+		overlay = overlayBindEntry(overlay, child.name, clonedChildId);
+	}
+	state.nodes.set(newNodeId, {
+		...cloned,
+		state: {
+			kind: "directory",
+			overlay
+		}
+	});
+	return newNodeId;
+}
+//#endregion
+export { createVirtualWorkdirSession };

package/dist/workdir/write-tree.mjs

@@ -0,0 +1,97 @@
+import { writeObject } from "../objects/raw.mjs";
+import { isDirectoryOverlayDirty } from "./nodes.mjs";
+import { listDirectoryChildren } from "./session-internal.mjs";
+//#region src/workdir/write-tree.ts
+/**
+* Virtual Workdir overlay -> tree 最小化编译
+*
+* 遍历 session 的目录 overlay，将受影响的目录重写为新 tree，
+* 未修改的 repo-backed 子树/文件尽量复用原对象哈希。
+*
+* writeTree() 成功后不清空 overlay，不推进 baseTree。
+*/
+/**
+* 将当前 session 状态编译为新的根 tree
+*
+* 只重写受 overlay 影响的目录；文件/符号链接仅在 materialized 时写新 blob。
+* 未修改的 repo-backed 条目直接复用 origin hash。
+*
+* @param source - 可写对象数据库（用于写入新 blob/tree）
+* @param state - session 内存状态
+* @returns 新根 tree 的 SHA-1
+*
+* @example
+* ```ts
+* const rootHash = writeTreeFromSession(repo.objects, state);
+* ```
+*/
+function writeTreeFromSession(source, state) {
+	const root = state.nodes.get("root");
+	if (!root || root.state.kind !== "directory") throw new Error("Virtual workdir: root node is missing or not a directory");
+	return compileDirectory(source, source, state, root);
+}
+/**
+* 递归编译目录 overlay -> 新 tree
+*
+* 返回新 tree 的 SHA-1（若目录无任何变化则直接复用 origin hash）。
+*/
+function compileDirectory(writeSource, readSource, state, dirNode) {
+	if (dirNode.state.kind !== "directory") throw new Error("compileDirectory called on non-directory node");
+	const children = listDirectoryChildren(readSource, state, dirNode, "");
+	let anyChanged = false;
+	const newEntries = [];
+	for (const child of children) {
+		const node = state.nodes.get(child.nodeId);
+		if (!node) continue;
+		if (node.state.kind === "directory") {
+			const newHash = compileDirectory(writeSource, readSource, state, node);
+			if (newHash !== (node.origin.kind === "repo-tree" ? node.origin.hash : null)) anyChanged = true;
+			newEntries.push({
+				mode: "40000",
+				name: child.name,
+				hash: newHash
+			});
+		} else if (node.state.kind === "file") {
+			if (node.state.content !== void 0) {
+				const hash = writeObject(writeSource, {
+					type: "blob",
+					content: node.state.content
+				});
+				anyChanged = true;
+				newEntries.push({
+					mode: node.state.mode,
+					name: child.name,
+					hash
+				});
+			} else if (node.origin.kind === "repo-blob") newEntries.push({
+				mode: node.state.mode,
+				name: child.name,
+				hash: node.origin.hash
+			});
+		} else if (node.state.target !== void 0) {
+			const hash = writeObject(writeSource, {
+				type: "blob",
+				content: node.state.target
+			});
+			anyChanged = true;
+			newEntries.push({
+				mode: "120000",
+				name: child.name,
+				hash
+			});
+		} else if (node.origin.kind === "repo-blob") newEntries.push({
+			mode: "120000",
+			name: child.name,
+			hash: node.origin.hash
+		});
+	}
+	if (isDirectoryOverlayDirty(dirNode.state.overlay)) anyChanged = true;
+	if (!anyChanged && dirNode.origin.kind === "repo-tree") return dirNode.origin.hash;
+	newEntries.sort((a, b) => a.name.localeCompare(b.name));
+	return writeObject(writeSource, {
+		type: "tree",
+		entries: newEntries
+	});
+}
+//#endregion
+export { writeTreeFromSession };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nano-git",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "files": [
     "dist"
   ],
@@ -14,6 +14,7 @@
     "./backend/sqlite": "./src/backend/sqlite.ts",
     "./errors": "./src/errors.ts",
     "./hash-file": "./src/hash-file.ts",
+    "./log": "./src/log/index.ts",
     "./objects": "./src/objects/index.ts",
     "./odb/file": "./src/odb/file.ts",
     "./odb/memory": "./src/odb/memory.ts",
@@ -40,7 +41,9 @@
     "./transport/receive-pack": "./src/transport/receive-pack.ts",
     "./transport/server/receive-pack": "./src/transport/server/receive-pack/index.ts",
     "./transport/server/upload-pack": "./src/transport/server/upload-pack/index.ts",
-    "./transport/upload-pack": "./src/transport/upload-pack.ts"
+    "./transport/upload-pack": "./src/transport/upload-pack.ts",
+    "./workdir/core": "./src/workdir/core.ts",
+    "./workdir/memory": "./src/workdir/memory.ts"
   },
   "publishConfig": {
     "exports": {
@@ -51,6 +54,7 @@
       "./backend/sqlite": "./dist/backend/sqlite.mjs",
       "./errors": "./dist/errors.mjs",
       "./hash-file": "./dist/hash-file.mjs",
+      "./log": "./dist/log/index.mjs",
       "./objects": "./dist/objects/index.mjs",
       "./odb/file": "./dist/odb/file.mjs",
       "./odb/memory": "./dist/odb/memory.mjs",
@@ -77,7 +81,9 @@
       "./transport/receive-pack": "./dist/transport/receive-pack.mjs",
       "./transport/server/receive-pack": "./dist/transport/server/receive-pack/index.mjs",
       "./transport/server/upload-pack": "./dist/transport/server/upload-pack/index.mjs",
-      "./transport/upload-pack": "./dist/transport/upload-pack.mjs"
+      "./transport/upload-pack": "./dist/transport/upload-pack.mjs",
+      "./workdir/core": "./dist/workdir/core.mjs",
+      "./workdir/memory": "./dist/workdir/memory.mjs"
     }
   },
   "scripts": {