vitepress-plugin-filelist 0.2.1 → 0.2.3

package/README.md

@@ -5,8 +5,8 @@
 ## 功能
 
 - 📁 树形目录，文件夹按需加载
-- ✅ 勾选文件；选中文件夹会连带其已加载的子项
-- 📦 批量打包 ZIP（基于 `fflate`），带进度
+- ✅ 勾选文件；选中文件夹会自动加载并选中其下所有层级的文件
+- 📦 批量打包 ZIP（基于 `fflate`），带进度；保留目录结构，不同目录的同名文件不会互相覆盖
 - ⬇️ 单文件下载与预览（`/d/`、`/p/`、`fs/get` 的 `raw_url`）
 - 🔐 目录密码输入，可选只读 token
 - 🔎 当前树过滤，按名称 / 大小 / 日期排序
@@ -99,8 +99,8 @@ export default {
 
 - 目录路径挂载为根文件夹，默认折叠；`expanded` 可为全局或单个 source 打开
 - 文件路径挂载为一条文件记录，直接预览/下载
-- 根目录复选框与勾选、全选效果一致：选中根目录会选中其已加载的子项
-- 每个 source 可单独设置 `title`、`password`
+- 勾选根目录会加载并选中其下所有文件；ZIP 内以根节点名称（`title` 或路径末段）作为顶层文件夹，文件根保留原文件名
+- 每个 source 可单独设置 `title`、`password`；未设置 `password` 的 source 使用组件的 `password` 或运行时输入的密码，遇到需要密码的目录会弹出密码输入框
 - 根节点顺序按 `sources` 顺序，子项仍按名称/大小/日期排序
 
 ```ts
@@ -181,7 +181,7 @@ Deno 可以安装 npm 依赖，但目前用 Deno 构建 VitePress 会在 rolldow
 ## 说明
 
 - 批量 ZIP 通过 `raw_url`（OpenList `/p/` 代理）下载，CORS 保持在 OpenList 源上
-- 全选只统计已加载的文件；页脚会显示还有多少文件夹未展开
+- 表头全选只统计已加载的文件，页脚会显示还有多少文件夹未展开；勾选单个文件夹则会递归加载其全部子目录（目录很深或很多时会逐个请求，可能较慢）
 - 目录以 `per_page: 0` 请求全部条目；超大目录可能较慢，暂未实现分页
 
 ## 开发
@@ -190,7 +190,7 @@ Deno 可以安装 npm 依赖，但目前用 Deno 构建 VitePress 会在 rolldow
 pnpm install
 pnpm run build       # 生成 dist/node、dist/client/ssr、dist/client/browser、style.css
 pnpm run typecheck
-pnpm test            # Vitest：utils + locale helpers
+pnpm test            # Vitest：utils、locale helpers、FileList 组件
 pnpm run pack:check
 ```
 
@@ -200,8 +200,8 @@ pnpm run pack:check
 
 ```bash
 cd demo
-npm install
-npm run build
+pnpm install
+pnpm run build
 ```
 
 ## License

package/dist/client/browser/index.d.ts

@@ -171,6 +171,18 @@ export interface SortableNode {
 export type SortKey = 'name' | 'size' | 'modified';
 export declare function joinPath(parent: string, name: string): string;
 export declare function encodePath(path: string): string;
+/**
+ * Make one path segment safe as a ZIP entry segment: no separators,
+ * no `.` / `..` traversal, no empty names.
+ */
+export declare function zipSegment(name: string): string;
+/** Join path segments into a ZIP entry name, sanitising each segment. */
+export declare function zipEntryName(segments: string[]): string;
+/**
+ * Return `name`, or `name (2)`, `name (3)`... when it is already in `used`.
+ * The suffix goes before the extension of the last segment. Adds the result to `used`.
+ */
+export declare function uniqueEntryName(name: string, used: Set<string>): string;
 export declare function formatSize(size: number): string;
 export declare function formatDate(iso: string): string;
 export declare function extOf(name: string): string;

package/dist/client/browser/index.js

@@ -87,6 +87,41 @@ function joinPath(parent, name) {
 function encodePath(path) {
 	return path.split("/").map(encodeURIComponent).join("/");
 }
+/**
+* Make one path segment safe as a ZIP entry segment: no separators,
+* no `.` / `..` traversal, no empty names.
+*/
+function zipSegment(name) {
+	const cleaned = name.replace(/[\\/]/g, "_").trim();
+	if (!cleaned || cleaned === "." || cleaned === "..") return "_";
+	return cleaned;
+}
+/** Join path segments into a ZIP entry name, sanitising each segment. */
+function zipEntryName(segments) {
+	return segments.map(zipSegment).join("/");
+}
+/**
+* Return `name`, or `name (2)`, `name (3)`... when it is already in `used`.
+* The suffix goes before the extension of the last segment. Adds the result to `used`.
+*/
+function uniqueEntryName(name, used) {
+	let candidate = name;
+	if (used.has(candidate)) {
+		const slash = name.lastIndexOf("/");
+		const dir = name.slice(0, slash + 1);
+		const base = name.slice(slash + 1);
+		const dot = base.lastIndexOf(".");
+		const stem = dot > 0 ? base.slice(0, dot) : base;
+		const ext = dot > 0 ? base.slice(dot) : "";
+		let index = 2;
+		do {
+			candidate = `${dir}${stem} (${index})${ext}`;
+			index += 1;
+		} while (used.has(candidate));
+	}
+	used.add(candidate);
+	return candidate;
+}
 function formatSize(size) {
 	if (!size || !Number.isFinite(size)) return "-";
 	const units = [
@@ -258,6 +293,9 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		function errorText(error) {
 			return error instanceof Error ? error.message : String(error);
 		}
+		function isPasswordError(error) {
+			return /password|密码/i.test(errorText(error));
+		}
 		const DEMO_TREE = {
 			"/": [
 				{
@@ -472,7 +510,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			nodes.sort((a, b) => compareNodes(a, b, sortKey.value, sortAsc.value));
 			for (const node of nodes) if (node.children.length) sortTree(node.children);
 		}
-		function toNodes(items, parent, depth, password = "") {
+		function toNodes(items, parent, depth, password = "", zipParent = []) {
 			return items.map((item) => ({
 				...item,
 				path: joinPath(parent, item.name),
@@ -481,7 +519,8 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				loaded: false,
 				loading: false,
 				children: [],
-				password
+				password,
+				zipPath: [...zipParent, item.name]
 			}));
 		}
 		function setSort(key) {
@@ -502,11 +541,12 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			if (node.loaded) return true;
 			node.loading = true;
 			try {
-				node.children = toNodes(await listDir(node.path, node.password), node.path, node.depth + 1, node.password);
+				node.children = toNodes(await listDir(node.path, node.password || activePassword.value), node.path, node.depth + 1, node.password, node.zipPath);
 				sortTree(node.children);
 				node.loaded = true;
 				return true;
 			} catch (error) {
+				if (isPasswordError(error)) needsPassword.value = true;
 				showToast(t("folderFailed", { message: errorText(error) }));
 				return false;
 			} finally {
@@ -531,16 +571,17 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			} else try {
 				const data = await request("/api/fs/get", {
 					path,
-					password
+					password: password || activePassword.value
 				});
 				item = {
 					...item,
 					...data
 				};
 			} catch {}
+			const name = source.title || item.name || sourceName(path);
 			return {
 				...item,
-				name: source.title || item.name || sourceName(path),
+				name,
 				path,
 				depth: 0,
 				expanded: source.expanded ?? props.expanded,
@@ -548,7 +589,8 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				loading: false,
 				children: [],
 				password,
-				isRoot: true
+				isRoot: true,
+				zipPath: [item.is_dir ? name : item.name || sourceName(path)]
 			};
 		}
 		async function loadRoot() {
@@ -571,7 +613,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				downloadCache.clear();
 			} catch (error) {
 				const message = errorText(error);
-				if (/password|密码/i.test(message)) needsPassword.value = true;
+				if (isPasswordError(error)) needsPassword.value = true;
 				else errorMsg.value = message;
 			} finally {
 				loadingRoot.value = false;
@@ -613,10 +655,27 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			const hit = files.filter((file) => selected.value.has(file.path)).length;
 			return hit > 0 && hit < files.length;
 		}
-		async function toggleCheck(node) {
-			if (node.is_dir && !node.loaded) await toggleExpand(node);
+		/** Load a directory and all of its sub-directories. */
+		async function loadTree(node) {
+			if (!node.is_dir) return true;
+			if (!await loadChildren(node)) return false;
+			for (const child of node.children) if (child.is_dir && !await loadTree(child)) return false;
+			return true;
+		}
+		async function toggleCheck(node, event) {
+			const input = event?.target;
+			if (node.is_dir && !isChecked(node)) {
+				if (await loadTree(node)) node.expanded = true;
+				else {
+					if (input) input.checked = isChecked(node);
+					return;
+				}
+			}
 			const files = descendantFiles(node);
-			if (!files.length) return;
+			if (!files.length) {
+				if (input) input.checked = false;
+				return;
+			}
 			const next = new Set(selected.value);
 			if (files.every((file) => next.has(file.path))) files.forEach((file) => next.delete(file.path));
 			else files.forEach((file) => next.add(file.path));
@@ -696,6 +755,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			batchProgress.value = 0;
 			try {
 				const entries = {};
+				const usedNames = /* @__PURE__ */ new Set();
 				const queue = [...files];
 				let done = 0;
 				const worker = async () => {
@@ -704,7 +764,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 						if (!file) break;
 						const response = await fetch(await resolveUrl(file));
 						if (!response.ok) throw new Error(`${file.name}：HTTP ${response.status}`);
-						entries[file.name] = new Uint8Array(await response.arrayBuffer());
+						entries[uniqueEntryName(zipEntryName(file.zipPath), usedNames)] = new Uint8Array(await response.arrayBuffer());
 						done += 1;
 						batchProgress.value = Math.round(done / files.length * 90);
 					}
@@ -816,7 +876,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 							type: "checkbox",
 							checked: isChecked(node),
 							".indeterminate": isIndeterminate(node),
-							onChange: ($event) => toggleCheck(node)
+							onChange: ($event) => toggleCheck(node, $event)
 						}, null, 40, _hoisted_23)]),
 						createElementVNode("span", {
 							class: "fl-cell fl-cell-name",
@@ -906,4 +966,4 @@ function enhanceAppWithFileList({ app }) {
 	if (!app._context.components.FileList) app.component("FileList", _sfc_main);
 	if (!app._context.components.VPFileList) app.component("VPFileList", _sfc_main);
 }
-export { _sfc_main as FileList, _sfc_main as VPFileList, compareNodes, encodePath, enhanceAppWithFileList, extOf, fileListLocales, formatDate, formatLabel, formatSize, joinPath, resolveLabels };
+export { _sfc_main as FileList, _sfc_main as VPFileList, compareNodes, encodePath, enhanceAppWithFileList, extOf, fileListLocales, formatDate, formatLabel, formatSize, joinPath, resolveLabels, uniqueEntryName, zipEntryName, zipSegment };

package/dist/client/ssr/index.d.ts

@@ -171,6 +171,18 @@ export interface SortableNode {
 export type SortKey = 'name' | 'size' | 'modified';
 export declare function joinPath(parent: string, name: string): string;
 export declare function encodePath(path: string): string;
+/**
+ * Make one path segment safe as a ZIP entry segment: no separators,
+ * no `.` / `..` traversal, no empty names.
+ */
+export declare function zipSegment(name: string): string;
+/** Join path segments into a ZIP entry name, sanitising each segment. */
+export declare function zipEntryName(segments: string[]): string;
+/**
+ * Return `name`, or `name (2)`, `name (3)`... when it is already in `used`.
+ * The suffix goes before the extension of the last segment. Adds the result to `used`.
+ */
+export declare function uniqueEntryName(name: string, used: Set<string>): string;
 export declare function formatSize(size: number): string;
 export declare function formatDate(iso: string): string;
 export declare function extOf(name: string): string;

package/dist/client/ssr/index.js

@@ -87,6 +87,41 @@ function joinPath(parent, name) {
 function encodePath(path) {
 	return path.split("/").map(encodeURIComponent).join("/");
 }
+/**
+* Make one path segment safe as a ZIP entry segment: no separators,
+* no `.` / `..` traversal, no empty names.
+*/
+function zipSegment(name) {
+	const cleaned = name.replace(/[\\/]/g, "_").trim();
+	if (!cleaned || cleaned === "." || cleaned === "..") return "_";
+	return cleaned;
+}
+/** Join path segments into a ZIP entry name, sanitising each segment. */
+function zipEntryName(segments) {
+	return segments.map(zipSegment).join("/");
+}
+/**
+* Return `name`, or `name (2)`, `name (3)`... when it is already in `used`.
+* The suffix goes before the extension of the last segment. Adds the result to `used`.
+*/
+function uniqueEntryName(name, used) {
+	let candidate = name;
+	if (used.has(candidate)) {
+		const slash = name.lastIndexOf("/");
+		const dir = name.slice(0, slash + 1);
+		const base = name.slice(slash + 1);
+		const dot = base.lastIndexOf(".");
+		const stem = dot > 0 ? base.slice(0, dot) : base;
+		const ext = dot > 0 ? base.slice(dot) : "";
+		let index = 2;
+		do {
+			candidate = `${dir}${stem} (${index})${ext}`;
+			index += 1;
+		} while (used.has(candidate));
+	}
+	used.add(candidate);
+	return candidate;
+}
 function formatSize(size) {
 	if (!size || !Number.isFinite(size)) return "-";
 	const units = [
@@ -181,6 +216,9 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		function errorText(error) {
 			return error instanceof Error ? error.message : String(error);
 		}
+		function isPasswordError(error) {
+			return /password|密码/i.test(errorText(error));
+		}
 		const DEMO_TREE = {
 			"/": [
 				{
@@ -364,7 +402,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			nodes.sort((a, b) => compareNodes(a, b, sortKey.value, sortAsc.value));
 			for (const node of nodes) if (node.children.length) sortTree(node.children);
 		}
-		function toNodes(items, parent, depth, password = "") {
+		function toNodes(items, parent, depth, password = "", zipParent = []) {
 			return items.map((item) => ({
 				...item,
 				path: joinPath(parent, item.name),
@@ -373,7 +411,8 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				loaded: false,
 				loading: false,
 				children: [],
-				password
+				password,
+				zipPath: [...zipParent, item.name]
 			}));
 		}
 		function sourceName(path) {
@@ -384,11 +423,12 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			if (node.loaded) return true;
 			node.loading = true;
 			try {
-				node.children = toNodes(await listDir(node.path, node.password), node.path, node.depth + 1, node.password);
+				node.children = toNodes(await listDir(node.path, node.password || activePassword.value), node.path, node.depth + 1, node.password, node.zipPath);
 				sortTree(node.children);
 				node.loaded = true;
 				return true;
 			} catch (error) {
+				if (isPasswordError(error)) needsPassword.value = true;
 				showToast(t("folderFailed", { message: errorText(error) }));
 				return false;
 			} finally {
@@ -413,16 +453,17 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			} else try {
 				const data = await request("/api/fs/get", {
 					path,
-					password
+					password: password || activePassword.value
 				});
 				item = {
 					...item,
 					...data
 				};
 			} catch {}
+			const name = source.title || item.name || sourceName(path);
 			return {
 				...item,
-				name: source.title || item.name || sourceName(path),
+				name,
 				path,
 				depth: 0,
 				expanded: source.expanded ?? props.expanded,
@@ -430,7 +471,8 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				loading: false,
 				children: [],
 				password,
-				isRoot: true
+				isRoot: true,
+				zipPath: [item.is_dir ? name : item.name || sourceName(path)]
 			};
 		}
 		async function loadRoot() {
@@ -453,7 +495,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				downloadCache.clear();
 			} catch (error) {
 				const message = errorText(error);
-				if (/password|密码/i.test(message)) needsPassword.value = true;
+				if (isPasswordError(error)) needsPassword.value = true;
 				else errorMsg.value = message;
 			} finally {
 				loadingRoot.value = false;
@@ -588,4 +630,4 @@ function enhanceAppWithFileList({ app }) {
 	if (!app._context.components.FileList) app.component("FileList", _sfc_main);
 	if (!app._context.components.VPFileList) app.component("VPFileList", _sfc_main);
 }
-export { _sfc_main as FileList, _sfc_main as VPFileList, compareNodes, encodePath, enhanceAppWithFileList, extOf, fileListLocales, formatDate, formatLabel, formatSize, joinPath, resolveLabels };
+export { _sfc_main as FileList, _sfc_main as VPFileList, compareNodes, encodePath, enhanceAppWithFileList, extOf, fileListLocales, formatDate, formatLabel, formatSize, joinPath, resolveLabels, uniqueEntryName, zipEntryName, zipSegment };

package/dist/client/style.css

@@ -125,10 +125,6 @@
   background: var(--vp-c-bg-soft);
 }
 
-.fl-row-root .fl-name {
-  font-weight: 600;
-}
-
 .fl-row-selected {
   background: var(--vp-c-brand-soft);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vitepress-plugin-filelist",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "packageManager": "pnpm@11.25.0",
   "type": "module",
   "description": "OpenList file browser for VitePress: tree view, batch ZIP download, i18n, password and token support.",
@@ -54,6 +54,8 @@
   },
   "devDependencies": {
     "@types/node": "^22.10.0",
+    "@vue/test-utils": "^2.5.1",
+    "happy-dom": "^21.0.4",
     "tsdown": "^0.23.7",
     "typescript": "^5.6.0",
     "unplugin-vue": "^8.0.1",