vitepress-allyouneed 0.5.3 → 0.5.5

package/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 本项目遵循 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/);版本号遵循 [SemVer](https://semver.org/lang/zh-CN/)。
 
+
+## [Unreleased]
+
+## [0.5.5] - 2026-06-20
+
+## [Unreleased]
+
+### Added
+- **目录可由 dirIndex 排序**:`index.md`、`README.md` 或同名目录页现在是该文件夹 group 的排序锚点。默认 `sortBy: 'order-then-title'` 下,给目录页写 `order: 1` 即可控制目录位置;嵌套目录、`per-folder` 根侧栏和 `autoNav` 均一致生效,无需给文件夹名添加数字前缀。顶级 `groupOrder` 仍具有最高优先级。
+
+### Fixed
+- **嵌套 `index.md` 生成错误的无尾斜杠 URL**:`cleanUrls: true` 下目录页现在输出 `/guide/` 而不是 `/guide`;与 VitePress 的 `guide/index.html` 路由及 dead-link validator 保持一致。
+- **`scanWikilinks` 把合法 `[[folder/]]` 误报为死链**:启动预扫不再维护遗漏 `folderLinkOrder` 的简化解析器,改为与渲染阶段共用 `resolveWikilink`;目录 index、相对路径、自引用锚点和冲突策略现在只有一套解析语义。
+- **同名页面跨 locale / 区域解析错误**:`[[Gravitationsphysik]]` 这类 basename-only Wikilink 不再直接使用全局 `onConflict`。解析器现在先按源页面的同目录和最长共同路径前缀收窄候选(例如 `zh/themen/*` 优先于 `zh/selfcheck/*`,二者都优先于其它 locale),仍有歧义时才执行 `shortest` / `first` / `error`。
+- 强化当前源页面定位:relativePath 精确匹配先于后缀兜底,且后缀存在多个 locale 命中时不再取扫描顺序中的第一个。
+
 ## [0.5.3] - 2026-06-20
 
 0.5.2 的 **Bug 2 修复不完整**(已发到 npm,故 0.5.2 标记 deprecated;请升到 0.5.3)。本版把它彻底修对,并补齐 i18n 实战验证。

package/README.md

@@ -155,7 +155,7 @@ export default defineConfig({
 | `cleanUrls` | `boolean` | 跟 VitePress `cleanUrls` 走 | URL 是否带 `.html` |
 | `caseSensitive` | `boolean` | `false` | wikilink/asset 解析是否大小写敏感 |
 | `deadLink` | `'silent' \| 'warn' \| 'error'` | `'warn'` | 死链处理 |
-| `onConflict` | `'shortest' \| 'first' \| 'error'` | `'shortest'` | 同名文件冲突策略 |
+| `onConflict` | `'shortest' \| 'first' \| 'error'` | `'shortest'` | 同名文件先按当前页面的同目录/共同路径前缀收窄，再执行冲突策略 |
 | `onAliasConflict` | `'first' \| 'error'` | `'first'` | alias 冲突策略 |
 | `slugify` | `(text: string) => string` | `@mdit-vue/shared` | 锚点 slugifier,必须与 VitePress `markdown.anchor.slugify` 一致 |
 | `assets.preserveAssetPaths` | `boolean` | `false` | true 保留原 vault 路径(`/assets/foo.png`)、不哈希;false 走 `/_assets/<hash>-foo.png` |

package/dist/index.cjs

@@ -594,7 +594,8 @@ function computeUrl(rel, options) {
   } else if (!options.cleanUrls) {
     segments.push("index.html");
   }
-  return buildUrl("/", segments);
+  const url = buildUrl("/", segments);
+  return isIndex && options.cleanUrls ? url + "/" : url;
 }
 function pushToArrayMap(m, k, v) {
   const arr = m.get(k);
@@ -721,22 +722,22 @@ function findSelfEntry(currentSourcePath, index) {
   const norm = toPosix(currentSourcePath).replace(/^\.\//, "");
   const byNorm = index.files.get(norm);
   if (byNorm) return byNorm;
-  let suffixHit;
+  const srcDir = toPosix(index.srcDir).replace(/\/$/, "");
+  const relativeNorm = norm.startsWith(srcDir + "/") ? norm.slice(srcDir.length + 1) : norm;
+  const byRelative = index.byRelativePath.get(relativeNorm);
+  if (byRelative) return byRelative;
+  const suffixHits = [];
   for (const e of index.files.values()) {
     const abs = e.absolutePath;
     if (abs === norm || abs.endsWith("/" + norm)) {
-      suffixHit = e;
-      break;
+      suffixHits.push(e);
+      continue;
     }
     if (e.relativePath && norm.endsWith("/" + e.relativePath)) {
-      suffixHit = e;
-      break;
+      suffixHits.push(e);
     }
   }
-  if (suffixHit) return suffixHit;
-  for (const e of index.files.values()) {
-    if (e.relativePath && e.relativePath.replace(/^\.\//, "") === norm) return e;
-  }
+  if (suffixHits.length === 1) return suffixHits[0];
   const bn = basename(norm);
   if (bn) {
     const matches = [];
@@ -808,17 +809,50 @@ function lookupEntry(target, index, options, currentSourcePath, forcePathStyle =
   const candidates = bnMap.get(bnKey);
   if (!candidates || candidates.length === 0) return void 0;
   if (candidates.length === 1) return candidates[0];
+  const contextualCandidates = narrowCandidatesBySource(
+    candidates,
+    currentSourcePath,
+    index
+  );
+  if (contextualCandidates.length === 1) return contextualCandidates[0];
   switch (options.onConflict) {
     case "shortest": {
-      const sorted = sortByShortestPath(candidates);
+      const sorted = sortByShortestPath(contextualCandidates);
       return sorted[0];
     }
     case "first":
-      return candidates[0];
+      return contextualCandidates[0];
     case "error":
       return void 0;
   }
 }
+function narrowCandidatesBySource(candidates, currentSourcePath, index) {
+  if (!currentSourcePath) return candidates;
+  const source = findSelfEntry(currentSourcePath, index);
+  if (!source) return candidates;
+  const sourceDir = directorySegments(source.relativePath);
+  let bestScore = 0;
+  const scored = candidates.map((candidate) => {
+    const candidateDir = directorySegments(candidate.relativePath);
+    const exactDirectory = sourceDir.length === candidateDir.length && sourceDir.every((segment, i) => segment === candidateDir[i]);
+    if (exactDirectory) {
+      return { candidate, score: sourceDir.length + 1 };
+    }
+    let commonPrefix = 0;
+    const limit = Math.min(sourceDir.length, candidateDir.length);
+    while (commonPrefix < limit && sourceDir[commonPrefix] === candidateDir[commonPrefix]) {
+      commonPrefix += 1;
+    }
+    return { candidate, score: commonPrefix };
+  });
+  for (const item of scored) bestScore = Math.max(bestScore, item.score);
+  if (bestScore === 0) return candidates;
+  return scored.filter((item) => item.score === bestScore).map((item) => item.candidate);
+}
+function directorySegments(relativePath) {
+  const parts = toPosix(relativePath).replace(/^\.\//, "").split("/");
+  return parts.slice(0, -1);
+}
 function matchHeading(entry, headingPart, slugify, mode) {
   const exact = entry.headings.find(
     (h) => h.text === headingPart || h.slug === headingPart || h.slug === slugify(headingPart)
@@ -2368,7 +2402,7 @@ function renderTemplate(v) {
 // src/core/views/generate-data.ts
 var import_node_fs6 = __toESM(require("fs"), 1);
 var import_node_path6 = __toESM(require("path"), 1);
-var PLUGIN_VERSION = true ? "0.5.3" : "0.0.0-dev";
+var PLUGIN_VERSION = true ? "0.5.5" : "0.0.0-dev";
 var WIKILINK_RE = /(!?)\[\[([^\]\n]+)\]\]/g;
 var DEFAULT_BODY_TAG_RE = /(?:^|[\s([{,;。,;])#([\p{L}_][\p{L}\p{N}_/-]*)/gu;
 function buildBodyTagRe(userPattern) {
@@ -3420,8 +3454,27 @@ function shouldLinkGroup(opts, isTopLevel) {
 }
 function sortChildKeys(node, opts, isTopLevel) {
   const keys = [...node.children.keys()];
+  const collateOpts = { numeric: true, sensitivity: "base" };
+  const compareFolderKeys = (a, b) => {
+    const aNode = node.children.get(a);
+    const bNode = node.children.get(b);
+    const aAnchor = pickTitleSourceCandidate(aNode);
+    const bAnchor = pickTitleSourceCandidate(bNode);
+    if (opts.sortBy === "mtime-desc") {
+      const am = aAnchor?.mtime ?? Number.NEGATIVE_INFINITY;
+      const bm = bAnchor?.mtime ?? Number.NEGATIVE_INFINITY;
+      if (am !== bm) return bm - am;
+    } else if (opts.sortBy === "order-then-title") {
+      const ao = aAnchor ? readOrder(aAnchor, opts.orderKey) : Number.POSITIVE_INFINITY;
+      const bo = bAnchor ? readOrder(bAnchor, opts.orderKey) : Number.POSITIVE_INFINITY;
+      if (ao !== bo) return ao - bo;
+    }
+    const at = computeGroupText(aNode.path, aAnchor, opts);
+    const bt = computeGroupText(bNode.path, bAnchor, opts);
+    return at.localeCompare(bt, void 0, collateOpts);
+  };
   if (!isTopLevel || opts.groupOrder.length === 0) {
-    return keys.sort();
+    return keys.sort(compareFolderKeys);
   }
   const orderMap = /* @__PURE__ */ new Map();
   opts.groupOrder.forEach((name, i) => {
@@ -3457,7 +3510,7 @@ function sortChildKeys(node, opts, isTopLevel) {
     const ob = orderMap.has(b) ? orderMap.get(b) : orderMap.get(tb);
     return oa - ob;
   });
-  rest.sort();
+  rest.sort(compareFolderKeys);
   return [...indexed, ...rest];
 }
 function toFlatSidebar(root, opts) {
@@ -3507,7 +3560,12 @@ function toPerFolderSidebar(root, opts, options, index) {
   for (const f of sortedRootFiles) {
     rootItems.push({ text: opts.formatItemTitle(f), link: f.url });
   }
-  const topKeys = [...root.children.keys()].sort();
+  const topKeys = sortChildKeys(
+    root,
+    opts,
+    /* isTopLevel */
+    true
+  );
   for (const key of topKeys) {
     const child = root.children.get(key);
     const childWinner = resolveFolderLink(
@@ -3584,7 +3642,12 @@ function generateNav(index, options, autoOptions = {}) {
   const root = buildTree2(visible);
   const base = options.base.endsWith("/") ? options.base : options.base + "/";
   const out = [{ text: opts.homeNavText, link: "/" }];
-  const topKeys = [...root.children.keys()].sort();
+  const topKeys = sortChildKeys(
+    root,
+    opts,
+    /* isTopLevel */
+    true
+  );
   for (const key of topKeys) {
     const child = root.children.get(key);
     const winner = resolveFolderLink(
@@ -3876,9 +3939,14 @@ function scanWikilinks(index, options) {
           if (isAsset) continue;
         }
       }
-      const isSelfAnchor = !rawTarget && !!headingPart;
-      const found = isSelfAnchor || resolveSimple(rawTarget, index, options, f.relativePath);
-      if (!found) {
+      const resolved = resolveWikilink(
+        rawTargetFull,
+        index,
+        options,
+        isEmbed ? "transclusion" : "page",
+        f.absolutePath
+      );
+      if (resolved.isDead) {
         dead.push({
           source: f.relativePath,
           target: rawTarget,
@@ -3887,7 +3955,7 @@ function scanWikilinks(index, options) {
         continue;
       }
       if (scanAmbig && headingPart) {
-        const targetEntry = isSelfAnchor ? f : resolveSimpleEntry(rawTarget, index, options, f.relativePath);
+        const targetEntry = resolved.target;
         if (!targetEntry) continue;
         const matches2 = findAmbiguousLeadingNumberMatches(targetEntry, headingPart);
         if (matches2.length > 1) {
@@ -3909,27 +3977,6 @@ function scanWikilinks(index, options) {
   }
   return { total, dead, ambiguous };
 }
-function resolveSimpleEntry(raw, index, options, currentSourceRel) {
-  const target = stripMarkdownExt(toPosix(raw));
-  if (!target) return void 0;
-  if (target.includes("/")) {
-    const e = index.byRelativePath.get(target) ?? index.byRelativePath.get(target + ".md") ?? index.byRelativePath.get(target + ".markdown");
-    if (e) return e;
-    if (currentSourceRel) {
-      const curDir = currentSourceRel.split("/").slice(0, -1).join("/");
-      if (curDir) {
-        return index.byRelativePath.get(`${curDir}/${target}`) ?? index.byRelativePath.get(`${curDir}/${target}.md`) ?? index.byRelativePath.get(`${curDir}/${target}.markdown`);
-      }
-    }
-    return void 0;
-  }
-  const aliasKey = options.caseSensitive ? target : target.toLowerCase();
-  const aliased = index.byAlias.get(aliasKey);
-  if (aliased) return aliased;
-  const map = options.caseSensitive ? index.byBasename : index.byBasenameLower;
-  const key = options.caseSensitive ? target : target.toLowerCase();
-  return map.get(key)?.[0];
-}
 function logDeadLinks(report, deadLink) {
   if (deadLink === "silent") return;
   if (report.dead.length > 0) {
@@ -3978,27 +4025,6 @@ function extractExt3(target) {
   if (dot <= 0) return "";
   return cleaned.slice(dot + 1).toLowerCase();
 }
-function resolveSimple(raw, index, options, currentSourceRel) {
-  const target = stripMarkdownExt(toPosix(raw));
-  if (!target) return false;
-  if (target.includes("/")) {
-    if (index.byRelativePath.has(target) || index.byRelativePath.has(target + ".md") || index.byRelativePath.has(target + ".markdown")) {
-      return true;
-    }
-    if (currentSourceRel) {
-      const curDir = currentSourceRel.split("/").slice(0, -1).join("/");
-      if (curDir) {
-        return index.byRelativePath.has(`${curDir}/${target}`) || index.byRelativePath.has(`${curDir}/${target}.md`) || index.byRelativePath.has(`${curDir}/${target}.markdown`);
-      }
-    }
-    return false;
-  }
-  const aliasKey = options.caseSensitive ? target : target.toLowerCase();
-  if (index.byAlias.has(aliasKey)) return true;
-  const map = options.caseSensitive ? index.byBasename : index.byBasenameLower;
-  const key = options.caseSensitive ? target : target.toLowerCase();
-  return (map.get(key)?.length ?? 0) > 0;
-}
 
 // src/vitepress.ts
 var autoFolderIndexWarned = false;