vitepress-allyouneed 0.3.2 → 0.3.4

package/CHANGELOG.md

@@ -2,6 +2,42 @@
 
 本项目遵循 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/);版本号遵循 [SemVer](https://semver.org/lang/zh-CN/)。
 
+## [0.3.4] - 2026-05-20
+
+真实 Obsidian 物理笔记 vault 测试暴露的 9 个 bug + 3 个隐性问题的集中修复。
+
+### Fixed
+- **图片找不到**:`resolveAsset` 之前只查 vault 绝对相对路径(`assetsByRelativePath`),Obsidian "相对当前文件" 路径模式下写 `![[media/image4.png]]` 在 `Themen/X.md` 里时找不到 → 退化为 basename + base → `/image4.png` → Vite 当 public 根 → 404。现接 `currentSourcePath`,**先**查 vault 绝对路径、**再**查相对源文件 dir、**最后**走 basename fallback;`image.ts` / `media.ts` / `transclusion.ts` 三个调用方都已传 `env.currentPath`。
+- **`![[ ]]` transclusion 同样问题**:`renderTransclusionHtml` 和降级版 `handleTransclusion` 调 `resolveWikilink` 时漏传 `currentSourcePath`,现已补。
+- **`autoFolderIndex` 根目录生成 `[[/foo/]]` 死链**:`defaultTemplate` 拼路径时 `dirRelPath===''` 没特判,产出带前导 `/` 的 wikilink,resolver 不识别"绝对 wikilink"全死。改成根用空 prefix(`[[foo/]]`)。
+- **Obsidian 表格内 `\|` 转义被当成路径字符**:`[[Foo\|Bar]]` 是 Obsidian 在表格 cell 里转义 pipe 的标准写法。原 5 处 `inner.split('|')` 把 target 解析成 `Foo\`(带尾巴反斜杠)→ 找不到。统一抽 `utils/wikilink.ts:splitWikilinkInner`,5 处(`wikilinks/rule.ts`、`embeds/block-rule.ts`、`sidebar-auto/parse-sidebar-md.ts`、`views/generate-data.ts`、`core/scan-wikilinks.ts`)替换。
+- **`stripNumericPrefix` 把版本号吃掉**:`/^\d+[-_.\s]+/` 把 `1.2.3-formula.md` 误剥成 `2.3-formula`。`.` 不再算分隔符,只剩 `-` / `_` / 空白。
+- **行内 `#tag` 在 `cleanUrls: false` 下 404**:`<a class="ayn-tag" href>` 直接拼 `/_perspectives_/tags#xxx`,没考虑 `cleanUrls`。现走 `applyCleanUrls`,需要 `.html` 时自动加。
+- **`%% block comment %%` 包了 ``` fence 时提前结束**:扫描闭合 `%%` 没跟踪 fence 状态,fence 内的 `%%` 字面行会把注释关掉,导致 fence 残留。改成同时跟踪 ``` / ~~~ 配对状态,只在 fence 外才允许关闭。
+- **`views.urlPrefix` 自定义后 sidebar fallback 失效**:`buildPerspectivesFallbackSidebar` 硬编码 `_perspectives_/`,用户改 `views.urlPrefix: 'extras'` 后过滤失效,会在视图页 sidebar 看到一个指向自己的"前往 Extras"项。现接 `viewsPrefix` 参数。
+- **i18n locale Perspectives 注入不对称**:(a) per-locale sidebar 生成后没过 `injectViewsSidebar`,EN locale 等丢 Perspectives 组;(b) nav 注入老逻辑要求 `lc.themeConfig.nav !== undefined`,没自定义 nav 的 locale 拿不到下拉。两边都修。
+- **graph 视图丢相对路径 wikilink 边**:`resolveTargetSimple` 不接 `currentSourceRel`,与 `resolver.ts:117` 行为不一致,从而 sibling 笔记的相对链接在 Graph 上看不见。补齐相对路径 fallback。
+- **`_sidebar.md` fence 检测同 `%%` 同症**:`/^```|^~~~/` 任一 marker 都切状态,`~~~` 在 ``` 块里会提前结束。改成 marker 配对跟踪。
+- **`callout` 标题不解析 inline markdown**:`[!info] **Newton**` 之前显示字面 `**Newton**`。Obsidian 实际会渲染。现走 `md.renderInline`(用户传了自定义标题时)。
+- **`webm` 同时在 audio/video 列表**:`classifyMediaExt` video-first,所有 `.webm` 一律渲染为 `<video>`。从 `AUDIO_EXTS` 删掉。
+- **静默 `catch{}` 加日志**:`writeVaultData` 失败、`scanWikilinks` 失败之前都吞错,debug "Graph 不更新"非常难找。改成 `console.warn`。
+
+### Tests
+- 新增 `tests/v034-bugfixes.test.ts`,每个 RED bug 一条回归用例。
+
+## [0.3.3] - 2026-05-20
+
+### Added
+- **`sidebarAuto.foldersFirst`** — 控制同一层级内"普通文件 vs 子目录 group"的相对位置。
+  - `false`(默认)`files → virtualGroups → folders`(老行为,兼容)
+  - `true`           `folders → virtualGroups → files`(Finder / Obsidian 风格)
+  - 仅影响相对位置;段内排序仍由 `sortBy` / `orderKey` / `groupOrder` 决定。
+
+## [0.3.2] - 2026-05-20
+
+### Fixed
+- **根目录无 `index.md` 时 404**:`autoFolderIndex: 'top-level' / 'all'` 模式之前只为 srcDir **下**的目录生成 index,根本身被漏。现在 `dirsToProcess` 把 srcDir 根也加进去,根索引页用 `srcDir` basename 当 H1(fallback `Home`)。
+
 ## [0.3.1] - 2026-05-20
 
 ### Fixed

package/dist/index.cjs

@@ -772,13 +772,47 @@ function defaultLabel(target, headingPart, entry, options) {
   }
   return base;
 }
-function resolveAsset(rawTarget, index, options) {
+function resolveAsset(rawTarget, index, options, currentSourcePath) {
   const target = toPosix(rawTarget).trim();
   if (target.includes("/")) {
-    return {
-      asset: index.assetsByRelativePath.get(target),
-      rawBasename: basename(target)
-    };
+    const direct = index.assetsByRelativePath.get(target);
+    if (direct) {
+      return { asset: direct, rawBasename: basename(target) };
+    }
+    if (currentSourcePath) {
+      const srcDirAbs = index.srcDir;
+      const cur = toPosix(currentSourcePath);
+      const rel = cur.startsWith(srcDirAbs + "/") ? cur.slice(srcDirAbs.length + 1) : "";
+      if (rel) {
+        const curDir = rel.split("/").slice(0, -1).join("/");
+        if (curDir) {
+          const relAsset = index.assetsByRelativePath.get(`${curDir}/${target}`);
+          if (relAsset) {
+            return { asset: relAsset, rawBasename: basename(target) };
+          }
+        }
+      }
+    }
+    const bn0 = options.caseSensitive ? basename(target) : basename(target).toLowerCase();
+    const map0 = options.caseSensitive ? index.assetsByBasename : index.assetsByBasenameLower;
+    const fallback = map0.get(bn0);
+    if (fallback && fallback.length === 1) {
+      return { asset: fallback[0], rawBasename: basename(target) };
+    }
+    if (fallback && fallback.length > 1) {
+      switch (options.onConflict) {
+        case "shortest":
+          return {
+            asset: sortByShortestPath(fallback)[0],
+            rawBasename: basename(target)
+          };
+        case "first":
+          return { asset: fallback[0], rawBasename: basename(target) };
+        case "error":
+          return { asset: void 0, rawBasename: basename(target) };
+      }
+    }
+    return { asset: void 0, rawBasename: basename(target) };
   }
   const bn = options.caseSensitive ? target : target.toLowerCase();
   const map = options.caseSensitive ? index.assetsByBasename : index.assetsByBasenameLower;
@@ -903,7 +937,7 @@ function renderImageHtml(rawTarget, aliasParts, env) {
   const { index, options } = env;
   const { altText, dim } = parseAltAndDim(aliasParts);
   const processedTarget = options.embeds.postProcessImageTarget(rawTarget);
-  const { asset } = resolveAsset(processedTarget, index, options);
+  const { asset } = resolveAsset(processedTarget, index, options, env.currentPath);
   let src;
   if (asset) {
     asset.referencedBy.add(env.currentPath ?? "<unknown>");
@@ -997,7 +1031,13 @@ function escapeAttrName(k) {
 // src/modules/embeds/transclusion.ts
 function renderTransclusionHtml(md, rawTarget, aliasParts, env) {
   const { index, options } = env;
-  const result = resolveWikilink(rawTarget, index, options, "transclusion");
+  const result = resolveWikilink(
+    rawTarget,
+    index,
+    options,
+    "transclusion",
+    env.currentPath
+  );
   if (result.isDead || !result.target) {
     return `<div class="transclusion transclusion--dead" data-target="${escapeHtml(
       rawTarget
@@ -1070,7 +1110,7 @@ function handleTransclusion(state, rawTarget, aliasParts, env) {
     );
   }
   const { index, options } = env;
-  const result = resolveWikilink(rawTarget, index, options, "page");
+  const result = resolveWikilink(rawTarget, index, options, "page", env.currentPath);
   const url = result.url;
   const label = aliasParts.length ? aliasParts.join("|").trim() : result.defaultLabel;
   const html = `<a class="wikilink wikilink--inline-transclusion-degraded" href="${escapeHtml(url)}" data-wikilink-target="${escapeHtml(rawTarget)}" title="\u884C\u5185 transclusion \u5DF2\u964D\u7EA7,\u89C1\u63A7\u5236\u53F0">${escapeHtml(label)}</a>`;
@@ -1108,7 +1148,7 @@ function getCache(env) {
 }
 
 // src/modules/embeds/media.ts
-var AUDIO_EXTS = ["mp3", "wav", "ogg", "m4a", "flac", "aac", "webm"];
+var AUDIO_EXTS = ["mp3", "wav", "ogg", "m4a", "flac", "aac"];
 var VIDEO_EXTS = ["mp4", "webm", "mov", "m4v", "avi", "mkv"];
 var PDF_EXTS = ["pdf"];
 function isAudioExt(ext) {
@@ -1146,7 +1186,7 @@ function parseAliasDim(parts) {
 function resolveSrc(rawTarget, env) {
   const { index, options } = env;
   const processedTarget = options.embeds.postProcessImageTarget(rawTarget);
-  const { asset } = resolveAsset(processedTarget, index, options);
+  const { asset } = resolveAsset(processedTarget, index, options, env.currentPath);
   if (asset) {
     asset.referencedBy.add(env.currentPath ?? "<unknown>");
     env.referencedAssets?.add(asset);
@@ -1188,6 +1228,11 @@ function handleMediaEmbed(state, kind, rawTarget, aliasParts, env) {
   return true;
 }
 
+// src/utils/wikilink.ts
+function splitWikilinkInner(inner) {
+  return inner.split(/\\?\|/).map((p) => p.trim());
+}
+
 // src/modules/wikilinks/rule.ts
 function makeWikilinkRule(scope) {
   return function wikilinkRule(state, silent) {
@@ -1216,7 +1261,7 @@ function makeWikilinkRule(scope) {
       return false;
     }
     state.pos = closeIdx + 2;
-    const parts = inner.split("|").map((p) => p.trim());
+    const parts = splitWikilinkInner(inner);
     const rawTarget = parts[0];
     const aliasParts = parts.slice(1);
     if (isEmbed) {
@@ -1310,7 +1355,7 @@ function makeRule(md) {
     const env = state.env;
     if (!env || !env.index || !env.options) return false;
     const inner = m[1];
-    const parts = inner.split("|").map((p) => p.trim());
+    const parts = splitWikilinkInner(inner);
     const rawTarget = parts[0];
     const aliasParts = parts.slice(1);
     const ext = extractExt2(rawTarget);
@@ -1445,7 +1490,7 @@ function registerCalloutsCore(md) {
         const header = extractHeader(inner);
         if (!header) continue;
         const bodyHtml = renderBody(inner, header.firstLineRest, md, state.env);
-        const html = renderCallout(header.parsed, bodyHtml);
+        const html = renderCallout(header.parsed, bodyHtml, md, state.env);
         const newToken = new state.Token("html_block", "", 0);
         newToken.content = html + "\n";
         newToken.map = t.map;
@@ -1502,16 +1547,17 @@ function renderBody(inner, firstLineRest, md, env) {
   }
   return md.renderer.render(cloned, md.options, env);
 }
-function renderCallout(header, bodyHtml) {
+function renderCallout(header, bodyHtml, md, env) {
   const { type, foldable, title } = header;
-  const displayTitle = title || DEFAULT_TITLES[type];
+  const rawTitle = title || DEFAULT_TITLES[type];
+  const titleHtml = title ? md.renderInline(rawTitle, env) : escapeHtml(rawTitle);
   const iconSvg = `<svg class="callout-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">` + CALLOUT_ICONS[type] + `</svg>`;
   const cls = `callout callout--${type}` + (foldable ? " callout--foldable" : "");
   if (foldable) {
     const isOpen = foldable === "open";
-    return `<details class="${cls}" data-callout="${type}"${isOpen ? " open" : ""}><summary class="callout-title">${iconSvg}<span class="callout-title-text">${escapeHtml(displayTitle)}</span></summary><div class="callout-content">${bodyHtml}</div></details>`;
+    return `<details class="${cls}" data-callout="${type}"${isOpen ? " open" : ""}><summary class="callout-title">${iconSvg}<span class="callout-title-text">${titleHtml}</span></summary><div class="callout-content">${bodyHtml}</div></details>`;
   }
-  return `<div class="${cls}" data-callout="${type}"><div class="callout-title">${iconSvg}<span class="callout-title-text">${escapeHtml(displayTitle)}</span></div><div class="callout-content">${bodyHtml}</div></div>`;
+  return `<div class="${cls}" data-callout="${type}"><div class="callout-title">${iconSvg}<span class="callout-title-text">${titleHtml}</span></div><div class="callout-content">${bodyHtml}</div></div>`;
 }
 
 // src/modules/callouts/index.ts
@@ -1666,12 +1712,25 @@ function makeCommentBlockRule() {
     if (silent) return true;
     let next = startLine + 1;
     let closed = false;
+    let fenceMarker = null;
     while (next < endLine) {
       const lpos = state.bMarks[next] + state.tShift[next];
       const lmax = state.eMarks[next];
-      if (lpos + 2 <= lmax && state.src.charCodeAt(lpos) === PCT && state.src.charCodeAt(lpos + 1) === PCT && state.src.slice(lpos + 2, lmax).trim() === "") {
-        closed = true;
-        break;
+      const lineText = state.src.slice(lpos, lmax);
+      const trimmed = lineText.trim();
+      const fm = /^(`{3,}|~{3,})/.exec(trimmed);
+      if (fm) {
+        const ch = fm[1][0];
+        if (fenceMarker === null) fenceMarker = ch;
+        else if (fenceMarker === ch) fenceMarker = null;
+        next += 1;
+        continue;
+      }
+      if (fenceMarker === null) {
+        if (lpos + 2 <= lmax && state.src.charCodeAt(lpos) === PCT && state.src.charCodeAt(lpos + 1) === PCT && state.src.slice(lpos + 2, lmax).trim() === "") {
+          closed = true;
+          break;
+        }
       }
       next += 1;
     }
@@ -2085,7 +2144,7 @@ function renderTemplate(v) {
 var import_node_fs6 = __toESM(require("fs"), 1);
 var import_node_path7 = __toESM(require("path"), 1);
 var PLUGIN_VERSION = "0.2.0-beta.0";
-var WIKILINK_RE = /(!?)\[\[([^\]\n|#]+)(?:#[^\]\n|]*)?(?:\|[^\]\n]*)?\]\]/g;
+var WIKILINK_RE = /(!?)\[\[([^\]\n]+)\]\]/g;
 var BODY_TAG_RE = /(?:^|[\s([{,;。,;])#([\p{L}_][\p{L}\p{N}_/-]*)/gu;
 function buildVaultData(index, options) {
   const viewsPrefix = options.views.urlPrefix ? options.views.urlPrefix.replace(/^\/+|\/+$/g, "") + "/" : "";
@@ -2112,8 +2171,13 @@ function buildVaultData(index, options) {
     const matches = f.content.matchAll(WIKILINK_RE);
     for (const m of matches) {
       const isEmbed = m[1] === "!";
-      const rawTarget = m[2].trim();
-      const target = resolveTargetSimple(rawTarget, index, options);
+      const inner = m[2];
+      let rawTarget = splitWikilinkInner(inner)[0] ?? "";
+      const hashIdx = rawTarget.indexOf("#");
+      if (hashIdx >= 0) rawTarget = rawTarget.slice(0, hashIdx);
+      rawTarget = rawTarget.trim();
+      if (!rawTarget) continue;
+      const target = resolveTargetSimple(rawTarget, index, options, f.relativePath);
       if (!target) continue;
       if (isPerspective(target)) continue;
       if (target.relativePath === f.relativePath) continue;
@@ -2204,11 +2268,28 @@ function pickTitle(f) {
   }
   return f.basename;
 }
-function resolveTargetSimple(rawTarget, index, options) {
+function resolveTargetSimple(rawTarget, index, options, currentSourceRel) {
   const target = stripMarkdownExt(toPosix(rawTarget));
   if (!target) return void 0;
   if (target.includes("/")) {
-    return index.byRelativePath.get(target) ?? index.byRelativePath.get(target + ".md") ?? index.byRelativePath.get(target + ".markdown");
+    const direct = index.byRelativePath.get(target) ?? index.byRelativePath.get(target + ".md") ?? index.byRelativePath.get(target + ".markdown") ?? index.byRelativePath.get(target + "/index.md") ?? index.byRelativePath.get(target + "/index.markdown");
+    if (direct) return direct;
+    if (currentSourceRel) {
+      const curDir = currentSourceRel.split("/").slice(0, -1).join("/");
+      if (curDir) {
+        for (const v of [
+          `${curDir}/${target}`,
+          `${curDir}/${target}.md`,
+          `${curDir}/${target}.markdown`,
+          `${curDir}/${target}/index.md`,
+          `${curDir}/${target}/index.markdown`
+        ]) {
+          const e = index.byRelativePath.get(v);
+          if (e) return e;
+        }
+      }
+    }
+    return void 0;
   }
   const aliasKey = options.caseSensitive ? target : target.toLowerCase();
   const aliased = index.byAlias.get(aliasKey);
@@ -2323,7 +2404,11 @@ function viteAllYouNeed(userOptions = {}) {
       if (resolved.modules.views) {
         try {
           writeVaultData(index, resolved);
-        } catch {
+        } catch (e) {
+          console.warn(
+            "vitepress-allyouneed: \u91CD\u65B0\u5199 vault-data.json \u5931\u8D25,Graph/Stats/Tags \u53EF\u80FD\u4E0D\u66F4\u65B0\u3002",
+            e instanceof Error ? e.message : String(e)
+          );
         }
       }
     },
@@ -2392,8 +2477,10 @@ function makeTagRule() {
     const tagsViewName = env.options?.views?.names?.tags ?? "tags";
     const urlPrefix = env.options?.views?.urlPrefix ?? "_perspectives_";
     const base = env.options?.base ?? "/";
+    const cleanUrls = env.options?.cleanUrls ?? true;
     const prefixSeg = urlPrefix ? `${urlPrefix}/` : "";
-    const href = `${base}${prefixSeg}${tagsViewName}#${encodeURIComponent(tag)}`;
+    const pagePath = applyCleanUrls(`${prefixSeg}${tagsViewName}`, cleanUrls);
+    const href = `${base}${pagePath}#${encodeURIComponent(tag)}`;
     const html = `<a class="ayn-tag" data-tag="${escapeHtml(tag)}" href="${escapeHtml(href)}">#${escapeHtml(tag)}</a>`;
     const token = state.push("html_inline", "", 0);
     token.content = html;
@@ -2434,7 +2521,8 @@ function injectViewsSidebar(sidebar, options) {
         sidebar[persPath] = buildPerspectivesFallbackSidebar(
           sidebar,
           group,
-          options.base.endsWith("/") ? options.base : options.base + "/"
+          options.base.endsWith("/") ? options.base : options.base + "/",
+          prefix
         );
       }
     }
@@ -2442,10 +2530,11 @@ function injectViewsSidebar(sidebar, options) {
   }
   return [group];
 }
-function buildPerspectivesFallbackSidebar(allSidebars, group, base) {
+function buildPerspectivesFallbackSidebar(allSidebars, group, base, viewsPrefix) {
   const out = [{ text: "Home", link: "/" }];
+  const persSuffix = `/${viewsPrefix}/`;
   const topPaths = Object.keys(allSidebars).filter(
-    (p) => p !== base && !p.endsWith("/_perspectives_/")
+    (p) => p !== base && !p.endsWith(persSuffix)
   );
   for (const p of topPaths) {
     const seg = p.replace(/^\/|\/$/g, "").split("/").filter(Boolean).pop() ?? p;
@@ -2522,18 +2611,22 @@ function normalizeItems(items) {
   });
 }
 var LINE_RE2 = /^(\s*)-\s+(.*)$/;
-var WIKILINK_RE2 = /^\[\[([^\]\n|#]+)(?:#[^\]\n|]*)?(?:\|([^\]\n]+))?\]\]/;
+var WIKILINK_RE2 = /^\[\[([^\]\n]+)\]\]/;
 var MD_LINK_RE = /^\[([^\]]+)\]\(([^)]+)\)/;
 function parseList(src, entry, index, options) {
   const lines = src.split(/\r?\n/);
   const parsed = [];
-  let inFence = false;
+  let fenceMarker = null;
   for (const raw of lines) {
-    if (/^```|^~~~/.test(raw.trim())) {
-      inFence = !inFence;
+    const trimmed = raw.trim();
+    const fenceMatch = /^(`{3,}|~{3,})/.exec(trimmed);
+    if (fenceMatch) {
+      const ch = fenceMatch[1][0];
+      if (fenceMarker === null) fenceMarker = ch;
+      else if (fenceMarker === ch) fenceMarker = null;
       continue;
     }
-    if (inFence) continue;
+    if (fenceMarker !== null) continue;
     const m = LINE_RE2.exec(raw);
     if (!m) continue;
     const indent = m[1].replace(/\t/g, "  ").length;
@@ -2545,12 +2638,16 @@ function parseList(src, entry, index, options) {
 function parseLineBody(indent, body, entry, index, options) {
   const wl = WIKILINK_RE2.exec(body);
   if (wl) {
-    const target = wl[1].trim();
-    const customText = wl[2]?.trim();
-    const resolved = resolveTarget(target, index, options, entry);
+    const inner = wl[1];
+    const parts = splitWikilinkInner(inner);
+    let rawTarget = parts[0];
+    const customText = parts[1] ?? void 0;
+    const hashIdx = rawTarget.indexOf("#");
+    if (hashIdx >= 0) rawTarget = rawTarget.slice(0, hashIdx);
+    const resolved = resolveTarget(rawTarget, index, options, entry);
     return {
       indent,
-      text: customText ?? defaultTextForTarget(target, resolved),
+      text: customText ?? defaultTextForTarget(rawTarget, resolved),
       link: resolved?.url ?? null
     };
   }
@@ -2663,7 +2760,8 @@ function resolveSidebarAutoOptions(user = {}) {
     maxDepth: user.maxDepth,
     groupLink: user.groupLink ?? "all",
     includePrefix: user.includePrefix,
-    excludePrefixes: user.excludePrefixes ?? []
+    excludePrefixes: user.excludePrefixes ?? [],
+    foldersFirst: user.foldersFirst ?? false
   };
 }
 function defaultItemTitle(entry, strip) {
@@ -2678,7 +2776,7 @@ function defaultItemTitle(entry, strip) {
 }
 function humanize(name, strip) {
   let s = name;
-  if (strip) s = s.replace(/^\d+[-_.\s]+/, "");
+  if (strip) s = s.replace(/^\d+[-_\s]+/, "");
   return s.replace(/[-_]+/g, " ").replace(/\s+/g, " ").trim().replace(/\b\w/g, (m) => m.toUpperCase());
 }
 function newNode(path) {
@@ -2787,7 +2885,6 @@ function renderNode(node, opts, depth, isRoot, index, options) {
     const override = parseSidebarOverride(node.sidebarOverride, index, options);
     if (override) return override;
   }
-  const out = [];
   const virtualGroups = /* @__PURE__ */ new Map();
   const normalFiles = [];
   for (const f of node.files) {
@@ -2801,18 +2898,21 @@ function renderNode(node, opts, depth, isRoot, index, options) {
     }
   }
   normalFiles.sort((a, b) => compareEntries(a, b, opts));
-  for (const f of normalFiles) {
-    out.push({ text: opts.formatItemTitle(f), link: f.url });
-  }
+  const fileItems = normalFiles.map((f) => ({
+    text: opts.formatItemTitle(f),
+    link: f.url
+  }));
   const virtualKeys = [...virtualGroups.keys()].sort();
+  const virtualItems = [];
   for (const name of virtualKeys) {
     const items = virtualGroups.get(name).sort((a, b) => compareEntries(a, b, opts));
-    out.push({
+    virtualItems.push({
       text: name,
       collapsed: opts.collapsed,
       items: items.map((f) => ({ text: opts.formatItemTitle(f), link: f.url }))
     });
   }
+  const folderItems = [];
   const childKeys = sortChildKeys(node, opts, isRoot);
   for (const key of childKeys) {
     const child = node.children.get(key);
@@ -2826,9 +2926,12 @@ function renderNode(node, opts, depth, isRoot, index, options) {
     if (child.dirIndex && !child.dirIndexEmpty && shouldLinkGroup(opts, isRoot)) {
       group.link = child.dirIndex.url;
     }
-    out.push(group);
+    folderItems.push(group);
   }
-  return out;
+  if (opts.foldersFirst) {
+    return [...folderItems, ...virtualItems, ...fileItems];
+  }
+  return [...fileItems, ...virtualItems, ...folderItems];
 }
 function findFirstPageUrl(node, opts) {
   if (node.dirIndex && !node.dirIndexEmpty) return node.dirIndex.url;
@@ -3249,11 +3352,12 @@ function matchGlob(path, pat) {
 function humanize2(name, stripNumeric) {
   let s = name;
   if (stripNumeric) {
-    s = s.replace(/^\d+[-_.\s]+/, "");
+    s = s.replace(/^\d+[-_\s]+/, "");
   }
   return s.replace(/[-_]+/g, " ").replace(/\s+/g, " ").trim().replace(/\b\w/g, (m) => m.toUpperCase());
 }
 function defaultTemplate(ctx) {
+  const prefix = ctx.dirRelPath === "" ? "" : `${ctx.dirRelPath}/`;
   const lines = [];
   lines.push("---");
   lines.push(`title: ${ctx.title}`);
@@ -3267,7 +3371,7 @@ function defaultTemplate(ctx) {
     lines.push("## Sections");
     lines.push("");
     for (const d of ctx.subDirs) {
-      lines.push(`- [[${ctx.dirRelPath}/${d.name}/|${d.title}]]`);
+      lines.push(`- [[${prefix}${d.name}/|${d.title}]]`);
     }
     lines.push("");
   }
@@ -3275,7 +3379,7 @@ function defaultTemplate(ctx) {
     lines.push("## Pages");
     lines.push("");
     for (const f of ctx.files) {
-      lines.push(`- [[${ctx.dirRelPath}/${f.relPath}|${f.title}]]`);
+      lines.push(`- [[${prefix}${f.relPath}|${f.title}]]`);
     }
     lines.push("");
   }
@@ -3283,7 +3387,7 @@ function defaultTemplate(ctx) {
 }
 
 // src/core/scan-wikilinks.ts
-var WIKILINK_RE3 = /(!?)\[\[([^\]\n|#]+)(?:#[^\]\n|]*)?(?:\|[^\]\n]*)?\]\]/g;
+var WIKILINK_RE3 = /(!?)\[\[([^\]\n]+)\]\]/g;
 function stripCodeForScan(src) {
   let r = src.replace(/```[\s\S]*?```/g, (m) => " ".repeat(m.length));
   r = r.replace(/~~~[\s\S]*?~~~/g, (m) => " ".repeat(m.length));
@@ -3299,7 +3403,12 @@ function scanWikilinks(index, options) {
     for (const m of matches) {
       total += 1;
       const isEmbed = m[1] === "!";
-      const rawTarget = m[2].trim();
+      const inner = m[2];
+      let rawTarget = splitWikilinkInner(inner)[0] ?? "";
+      const hashIdx = rawTarget.indexOf("#");
+      if (hashIdx >= 0) rawTarget = rawTarget.slice(0, hashIdx);
+      rawTarget = rawTarget.trim();
+      if (!rawTarget) continue;
       if (isEmbed) {
         const ext = extractExt3(rawTarget);
         if (ext) {
@@ -3439,7 +3548,11 @@ function defineConfigWithAllYouNeed(config, pluginOptions = {}) {
         try {
           const report = scanWikilinks(index, resolvedForWrapper);
           logDeadLinks(report, resolvedForWrapper.deadLink);
-        } catch {
+        } catch (e) {
+          console.warn(
+            "vitepress-allyouneed: scanWikilinks \u5931\u8D25,\u8DF3\u8FC7\u6B7B\u94FE\u6C47\u603B\u3002",
+            e instanceof Error ? e.message : String(e)
+          );
         }
         const localesObj = config.locales;
         const localeKeys = localesObj ? Object.keys(localesObj).filter((k) => k !== "root") : [];
@@ -3488,17 +3601,25 @@ function defineConfigWithAllYouNeed(config, pluginOptions = {}) {
       themeConfig.nav,
       resolvedForWrapper
     );
-    const localesForNav = config.locales;
-    if (localesForNav) {
-      for (const lang of Object.keys(localesForNav)) {
-        const lc = localesForNav[lang];
-        if (!lc.themeConfig) continue;
-        if (lc.themeConfig.nav !== void 0) {
-          lc.themeConfig.nav = injectViewsNav(
-            lc.themeConfig.nav,
+    const localesForViews = config.locales;
+    if (localesForViews) {
+      for (const lang of Object.keys(localesForViews)) {
+        if (lang === "root") continue;
+        const lc = localesForViews[lang];
+        if (!lc.themeConfig) lc.themeConfig = {};
+        if (lc.themeConfig.sidebar !== void 0) {
+          lc.themeConfig.sidebar = injectViewsSidebar(
+            lc.themeConfig.sidebar,
             resolvedForWrapper
           );
         }
+        const navInjected = injectViewsNav(
+          lc.themeConfig.nav,
+          resolvedForWrapper
+        );
+        if (navInjected !== void 0) {
+          lc.themeConfig.nav = navInjected;
+        }
       }
     }
   }