nano-git 0.3.3 → 0.3.5

package/dist/workdir/change-index.d.mts

@@ -14,7 +14,7 @@ interface NormalizedChangeRecord {
   readonly previous: VirtualDiffObject | null;
   /** 变更后对象 */
   readonly current: VirtualDiffObject | null;
-  /** rename/copy 来源 */
+  /** move/copy 来源 */
   readonly source: VirtualDiffSource | null;
 }
 //#endregion

package/dist/workdir/change-index.mjs

@@ -76,7 +76,7 @@ function rebuildNormalizedChangeIndex(source, state, cache) {
 				previous: renameFrom.previous,
 				current: addRecord.current,
 				source: {
-					kind: "rename",
+					kind: "move",
 					path: renameFrom.path
 				}
 			});
@@ -155,17 +155,17 @@ function refreshChangeRecordForPath(source, state, path, cache) {
 	state.setChangeRecord(nextRecord);
 }
 /**
-* 将单一路径的变更记录折叠为 rename 目标路径。
+* 将单一路径的变更记录折叠为 move 目标路径。
 *
-* 仅适用于叶子节点 rename；
+* 仅适用于叶子节点 move；
 * 目录及无法判定来源的情况应由调用方回退到全量重建。
 */
 function rewriteChangeRecordForRename(source, state, from, to, cache) {
 	const previousRecord = state.getChangeRecord(from);
 	const currentTarget = snapshotCurrentEntryAtPath(source, state, to, cache);
-	if (currentTarget === null) throw new Error(`Cannot rewrite rename change record for missing path: ${to}`);
+	if (currentTarget === null) throw new Error(`Cannot rewrite move change record for missing path: ${to}`);
 	const nextRecord = computeRenameRecordForPath(source, state, from, to, previousRecord, currentTarget);
-	if (nextRecord === null) throw new Error(`Cannot rewrite rename change record from '${from}' to '${to}'`);
+	if (nextRecord === null) throw new Error(`Cannot rewrite move change record from '${from}' to '${to}'`);
 	state.deleteChangeRecord(from);
 	state.setChangeRecord(nextRecord);
 }
@@ -279,7 +279,7 @@ function computeRenameRecordForPath(source, state, from, to, previousRecord, cur
 	if (derivedFromPrevious !== void 0) return derivedFromPrevious;
 	const baseEntry = baseSnapshotEntryAtPath(source, state.readBaseTree(), from);
 	if (baseEntry === null) return null;
-	return createNormalizedChangeRecord(to, baseEntry.object, currentTarget.object, createDiffSource("rename", from));
+	return createNormalizedChangeRecord(to, baseEntry.object, currentTarget.object, createDiffSource("move", from));
 }
 function deriveCopySource(from, sourceRecord, source, state) {
 	const fromRecordSource = sourceRecord?.source;
@@ -288,7 +288,7 @@ function deriveCopySource(from, sourceRecord, source, state) {
 	return null;
 }
 function preserveLineageRecordForPath(path, previousRecord, currentEntry) {
-	if (previousRecord?.source?.kind === "rename" && previousRecord.previous !== null) {
+	if (previousRecord?.source?.kind === "move" && previousRecord.previous !== null) {
 		if (currentEntry === null) return null;
 		return createNormalizedChangeRecord(path, previousRecord.previous, currentEntry.object, previousRecord.source);
 	}
@@ -302,7 +302,7 @@ function deriveRenameRecordFromPreviousRecord(from, to, previousRecord, currentT
 	if (previousRecord.current === null) return null;
 	if (previousRecord.source !== null) return createNormalizedChangeRecord(to, previousRecord.previous, currentTarget.object, previousRecord.source);
 	if (previousRecord.previous === null) return createNormalizedChangeRecord(to, null, currentTarget.object);
-	return createNormalizedChangeRecord(to, previousRecord.previous, currentTarget.object, createDiffSource("rename", from));
+	return createNormalizedChangeRecord(to, previousRecord.previous, currentTarget.object, createDiffSource("move", from));
 }
 function snapshotCurrentEntryAtPath(source, state, path, cache) {
 	const resolved = resolveCurrentLeafAtPath(source, state, path);

package/dist/workdir/core.d.mts

@@ -50,11 +50,11 @@ interface VirtualDiffObject {
   readonly hash: SHA1;
 }
 /**
- * rename/copy 来源描述
+ * move/copy 来源描述
  */
 interface VirtualDiffSource {
   /** 来源类型 */
-  readonly kind: "rename" | "copy";
+  readonly kind: "move" | "copy";
   /** 来源路径 */
   readonly path: string;
 }
@@ -77,7 +77,7 @@ interface VirtualDiffChanges {
 type VirtualDiffEntry = {
   /** 新建路径 */readonly kind: "create"; /** 当前路径 */
   readonly path: string; /** 当前对象 */
-  readonly current: VirtualDiffObject; /** rename/copy 的来源 */
+  readonly current: VirtualDiffObject; /** move/copy 的来源 */
   readonly source?: VirtualDiffSource;
 } | {
   /** 删除路径 */readonly kind: "remove"; /** 当前路径 */
@@ -88,7 +88,7 @@ type VirtualDiffEntry = {
   readonly path: string; /** 更新前对象 */
   readonly previous: VirtualDiffObject; /** 更新后对象 */
   readonly current: VirtualDiffObject; /** 变化维度 */
-  readonly changes: VirtualDiffChanges; /** rename/copy 的来源 */
+  readonly changes: VirtualDiffChanges; /** move/copy 的来源 */
   readonly source?: VirtualDiffSource;
 };
 /**
@@ -140,17 +140,31 @@ interface VirtualWorkdir {
   }): void;
   /** 写入符号链接（新建或覆盖） */
   writeLink(path: string, target: string): void;
-  /** 创建目录（含必要父目录） */
-  mkdir(path: string): void;
-  /** 删除路径（文件、目录或符号链接） */
-  delete(path: string): void;
   /**
-   * 重命名路径
+   * 创建目录
+   *
+   * 默认要求各级父目录已存在；`recursive: true` 时自动创建缺失的父目录，
+   * 且目标路径已是目录时不报错。路径上任意段为文件（非目录）时抛出 `VirtualNotDirectoryError`。
+   */
+  mkdir(path: string, options?: {
+    readonly recursive?: boolean;
+  }): void;
+  /**
+   * 删除路径（文件、目录或符号链接）
+   *
+   * 默认要求路径已存在；`force: true` 时路径不存在则静默忽略（与 Node `fs.rm` 的 `force` 语义一致）。
+   */
+  delete(path: string, options?: {
+    readonly force?: boolean;
+  }): void;
+  /**
+   * 移动路径（可跨目录树）
    *
    * 只做路径重绑定，不退化为 delete + write。
-   * 目录重命名后，子项保持懒加载。
+   * 目标父目录不存在时会自动创建中间目录。
+   * 目录移动后，子项保持懒加载。
    */
-  rename(from: string, to: string): void;
+  move(from: string, to: string): void;
   /**
    * 复制路径
    *

package/dist/workdir/file-backend.mjs

@@ -372,8 +372,19 @@ function restoreChangeRecord(record) {
 			...record.current,
 			hash: record.current.hash
 		},
-		source: record.source
+		source: record.source === null ? null : readFileDiffSource(record.source)
+	};
+}
+function readFileDiffSource(source) {
+	if (source.kind === "copy") return {
+		kind: "copy",
+		path: source.path
+	};
+	if (source.kind === "move" || source.kind === "rename") return {
+		kind: "move",
+		path: source.path
 	};
+	throw new Error(`Invalid file workdir diff source kind: ${String(source.kind)}`);
 }
 function serializeDirtyDirSummary(summary) {
 	return {

package/dist/workdir/overlay.mjs

@@ -58,7 +58,7 @@ function mergeDirectoryChildren(originChildren, overlay, addedEntryModes) {
 	return merged;
 }
 /**
-* 在目录 overlay 中绑定或覆盖条目（create / modify / rename 目标 / copy 目标）
+* 在目录 overlay 中绑定或覆盖条目（create / modify / move 目标 / copy 目标）
 */
 function overlayBindEntry(overlay, name, nodeId) {
 	const addedEntries = new Map(overlay.addedEntries);
@@ -84,7 +84,7 @@ function overlayTombstoneEntry(overlay, name) {
 	};
 }
 /**
-* 在同一目录内重命名：复用 nodeId，仅改绑定名
+* 在同一目录内 move：复用 nodeId，仅改绑定名
 */
 function overlayRenameEntry(overlay, fromName, toName, nodeId) {
 	let next = overlayTombstoneEntry(overlay, fromName);

package/dist/workdir/sqlite-backend.mjs

@@ -381,8 +381,10 @@ function readDiffObjectMode(raw) {
 	if (raw === "100644" || raw === "100755" || raw === "120000") return raw;
 	throw new Error(`Invalid SQLite workdir diff object mode: ${raw}`);
 }
+/** 解析 diff 来源种类；旧版 `rename` 读入时规范为 `move`。 */
 function readDiffSourceKind(raw) {
-	if (raw === "rename" || raw === "copy") return raw;
+	if (raw === "move" || raw === "copy") return raw;
+	if (raw === "rename") return "move";
 	throw new Error(`Invalid SQLite workdir diff source kind: ${raw}`);
 }
 function readDirtyDirSummary(row) {

package/dist/workdir/workdir-path.mjs

@@ -180,7 +180,7 @@ function resolveCurrentLeafAtPath(source, state, path) {
 	};
 }
 /**
-* 解析 `rename` / `copy` 这类“已存在源 -> 目标路径”的双路径上下文。
+* 解析 `move` / `copy` 这类“已存在源 -> 目标路径”的双路径上下文。
 *
 * @example
 * ```ts

package/dist/workdir/workdir.mjs

@@ -2,7 +2,7 @@ import { VirtualNotDirectoryError, VirtualNotFileError, VirtualNotSymlinkError,
 import { createNodeId } from "./ids.mjs";
 import { modeToVirtualEntryKind, readRepoBlobContent } from "./origin.mjs";
 import { overlayBindEntry, overlayRenameEntry, overlayTombstoneEntry } from "./overlay.mjs";
-import { assertValidVirtualPath, normalizeDirectoryPath } from "./path.mjs";
+import { assertValidVirtualPath, normalizeDirectoryPath, parentPath, splitPathSegments } from "./path.mjs";
 import { getDirectoryChildrenView, getRootNode, requireExistingWriteTarget, requireMissingWriteTarget, resolveLeafWriteTarget, resolvePath, resolveWriteTransfer } from "./workdir-path.mjs";
 import { createChangeIndexPlanner } from "./change-index-plan.mjs";
 import { computeVirtualDiff, rebuildNormalizedChangeIndex, refreshChangeRecordForPath, replaceChangeRecords, rewriteChangeRecordForRename, writeChangeRecordForCopy } from "./change-index.mjs";
@@ -15,7 +15,7 @@ import { writeTreeFromSession } from "./write-tree.mjs";
 /**
 * VirtualWorkdir 行为编排
 *
-* Phase 5：完整文件/目录 rename 与 copy 语义。
+* Phase 5：完整文件/目录 move 与 copy 语义。
 */
 /**
 * 基于 ObjectDatabase 创建 VirtualWorkdir
@@ -90,6 +90,35 @@ function openVirtualWorkdir(source, state) {
 	});
 	const dirtyDirPlanner = createDirtyDirPlanner(source, state);
 	refreshChangeIndex();
+	const createDirectoryAtPath = (path) => {
+		const target = requireMissingWriteTarget(source, state, path);
+		const nodeId = createNodeId();
+		const newNode = {
+			id: nodeId,
+			origin: { kind: "none" },
+			state: {
+				kind: "directory",
+				overlay: {
+					addedEntries: /* @__PURE__ */ new Map(),
+					deletedNames: /* @__PURE__ */ new Set()
+				}
+			}
+		};
+		state.setNode(newNode);
+		updateParentOverlay(state, target.parentNode.id, overlayBindEntry(target.parentNode.state.overlay, target.name, nodeId));
+	};
+	const mkdirRecursive = (path) => {
+		const segments = splitPathSegments(path);
+		for (let i = 0; i < segments.length; i++) {
+			const partialPath = segments.slice(0, i + 1).join("/");
+			const resolved = resolvePath(source, state, partialPath);
+			if (resolved.found && resolved.node !== null) {
+				if (resolved.node.state.kind !== "directory") throw new VirtualNotDirectoryError(partialPath);
+				continue;
+			}
+			createDirectoryAtPath(partialPath);
+		}
+	};
 	return {
 		get baseTree() {
 			return state.readBaseTree();
@@ -141,23 +170,18 @@ function openVirtualWorkdir(source, state) {
 			if (node.origin.kind === "repo-blob") return readRepoBlobContent(source, node.origin.hash, path).toString("utf-8");
 			throw new VirtualPathNotFoundError(path);
 		},
-		mkdir(path) {
-			runInWriteTransaction(state, () => dirtyDirPlanner.rebuild([path]), invalidateDiffCaches, () => {
-				const target = requireMissingWriteTarget(source, state, path);
-				const nodeId = createNodeId();
-				const newNode = {
-					id: nodeId,
-					origin: { kind: "none" },
-					state: {
-						kind: "directory",
-						overlay: {
-							addedEntries: /* @__PURE__ */ new Map(),
-							deletedNames: /* @__PURE__ */ new Set()
-						}
-					}
-				};
-				state.setNode(newNode);
-				updateParentOverlay(state, target.parentNode.id, overlayBindEntry(target.parentNode.state.overlay, target.name, nodeId));
+		mkdir(path, options) {
+			const recursive = options?.recursive === true;
+			runInWriteTransaction(state, () => {
+				if (recursive) {
+					const segments = splitPathSegments(path);
+					const paths = [];
+					for (let i = 0; i < segments.length; i++) paths.push(segments.slice(0, i + 1).join("/"));
+					dirtyDirPlanner.rebuild(paths);
+				} else dirtyDirPlanner.rebuild([path]);
+			}, invalidateDiffCaches, () => {
+				if (recursive) mkdirRecursive(path);
+				else createDirectoryAtPath(path);
 			});
 		},
 		writeFile(path, content, options) {
@@ -201,7 +225,10 @@ function openVirtualWorkdir(source, state) {
 				if (writeTarget.existing === null || writeTarget.parentNode.state.overlay.addedEntries.has(writeTarget.name)) updateParentOverlay(state, writeTarget.parentNode.id, overlayBindEntry(writeTarget.parentNode.state.overlay, writeTarget.name, nodeId));
 			});
 		},
-		delete(path) {
+		delete(path, options) {
+			if (options?.force === true) {
+				if (path !== "" && !resolvePath(source, state, path).found) return;
+			}
 			runInWriteTransaction(state, () => {
 				changeIndexPlanner.apply(changeIndexPlanner.planRefreshForPath(path, { treatMissingAsIncremental: true }));
 				dirtyDirPlanner.rebuild([path]);
@@ -210,21 +237,29 @@ function openVirtualWorkdir(source, state) {
 				updateParentOverlay(state, target.parentNode.id, overlayTombstoneEntry(target.parentNode.state.overlay, target.name));
 			});
 		},
-		rename(from, to) {
+		move(from, to) {
 			runInWriteTransaction(state, () => {
 				changeIndexPlanner.apply(changeIndexPlanner.planRewriteForRename(from, to));
-				dirtyDirPlanner.rebuild([from, to]);
+				const dirtyPaths = [from, to];
+				const toParent = parentPath(to);
+				if (toParent !== null) {
+					const segments = splitPathSegments(toParent);
+					for (let i = 0; i < segments.length; i++) dirtyPaths.push(segments.slice(0, i + 1).join("/"));
+				}
+				dirtyDirPlanner.rebuild(dirtyPaths);
 			}, invalidateDiffCaches, () => {
 				assertValidVirtualPath(from);
 				assertValidVirtualPath(to);
 				if (from === to) return;
+				const toParent = parentPath(to);
+				if (toParent !== null) mkdirRecursive(toParent);
 				const { from: fromTarget, to: toTarget } = resolveWriteTransfer(source, state, from, to);
 				const sourceNode = fromTarget.existing.node;
 				if (toTarget.existing !== 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 (toPath.startsWith(fromPath + "/") || toPath === fromPath) throw new Error(`Cannot move '${from}' to '${to}': destination is a subdirectory of source`);
 				}
 				if (fromTarget.parentNode.id === toTarget.parentNode.id) updateParentOverlay(state, fromTarget.parentNode.id, overlayRenameEntry(fromTarget.parentNode.state.overlay, fromTarget.name, toTarget.name, sourceNode.id));
 				else {

package/package.json

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