vitepress-allyouneed 0.5.3 → 0.5.4

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 本项目遵循 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/);版本号遵循 [SemVer](https://semver.org/lang/zh-CN/)。
 
+## [Unreleased]
+
+### Fixed
+- **同名页面跨 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

@@ -721,22 +721,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 +808,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 +2401,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.4" : "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) {