@riebeckite/plugin-diagnostics 0.0.17 → 0.0.18

package/README.md

@@ -159,4 +159,4 @@ assertNoErrors(report);
 
 ## See also
 
-- [Plugin guide](../../../docs/en/docs/reference/plugin-api.md)
+- [Plugin guide](../../../docs/docs/reference/plugin-api.en.md)

package/README_ja.md

@@ -117,4 +117,4 @@ assertNoErrors(report);
 
 ## 関連資料
 
-- [プラグインシステム](../../../docs/ja/docs/reference/plugin-api.md)
+- [プラグインシステム](../../../docs/docs/reference/plugin-api.md)

package/dist/bin.js

@@ -258,7 +258,11 @@ async function scanVault(config) {
       const note = {
         relativePath: relative,
         slug,
-        language: resolveNoteLanguage(relative, config.languages),
+        language: resolveNoteLanguage(
+          relative,
+          fm.values.lang,
+          config.languages
+        ),
         markdown,
         fm,
         headings: extractHeadings(markdown),
@@ -417,11 +421,23 @@ function fragmentExists(note, fragment) {
 function normalizeMarkdown(markdown) {
   return markdown.replace(/\r\n/g, "\n");
 }
-function resolveNoteLanguage(relativePath, languages) {
+function resolveNoteLanguage(relativePath, frontmatterLang, languages) {
   if (!languages || languages.length === 0) return void 0;
-  const segment = relativePath.split("/")[0]?.toLowerCase();
-  if (!segment) return void 0;
-  return languages.find((language) => language.toLowerCase() === segment);
+  if (typeof frontmatterLang === "string" && frontmatterLang.trim()) {
+    const value = frontmatterLang.trim().toLowerCase();
+    const match = languages.find(
+      (language) => language.toLowerCase() === value
+    );
+    if (match) return match;
+  }
+  const filename = relativePath.split("/").at(-1)?.replace(/\.md$/i, "") ?? "";
+  const lower = filename.toLowerCase();
+  for (const language of languages) {
+    const tag = language.toLowerCase();
+    if (lower.endsWith(`.${tag}`) || lower.endsWith(`-${tag}`) || lower.endsWith(`_${tag}`))
+      return language;
+  }
+  return void 0;
 }
 function getExtension(filePath) {
   const lastSegment = filePath.split("/").pop() ?? filePath;

package/dist/index.js

@@ -254,7 +254,11 @@ async function scanVault(config) {
       const note = {
         relativePath: relative,
         slug,
-        language: resolveNoteLanguage(relative, config.languages),
+        language: resolveNoteLanguage(
+          relative,
+          fm.values.lang,
+          config.languages
+        ),
         markdown,
         fm,
         headings: extractHeadings(markdown),
@@ -413,11 +417,23 @@ function fragmentExists(note, fragment) {
 function normalizeMarkdown(markdown) {
   return markdown.replace(/\r\n/g, "\n");
 }
-function resolveNoteLanguage(relativePath, languages) {
+function resolveNoteLanguage(relativePath, frontmatterLang, languages) {
   if (!languages || languages.length === 0) return void 0;
-  const segment = relativePath.split("/")[0]?.toLowerCase();
-  if (!segment) return void 0;
-  return languages.find((language) => language.toLowerCase() === segment);
+  if (typeof frontmatterLang === "string" && frontmatterLang.trim()) {
+    const value = frontmatterLang.trim().toLowerCase();
+    const match = languages.find(
+      (language) => language.toLowerCase() === value
+    );
+    if (match) return match;
+  }
+  const filename = relativePath.split("/").at(-1)?.replace(/\.md$/i, "") ?? "";
+  const lower = filename.toLowerCase();
+  for (const language of languages) {
+    const tag = language.toLowerCase();
+    if (lower.endsWith(`.${tag}`) || lower.endsWith(`-${tag}`) || lower.endsWith(`_${tag}`))
+      return language;
+  }
+  return void 0;
 }
 function getExtension(filePath) {
   const lastSegment = filePath.split("/").pop() ?? filePath;
@@ -991,6 +1007,7 @@ var PLUGIN_NAME2 = "diagnostics";
 var DEFAULT_SEVERITY2 = {
   "content-integrity:broken-link": "warning",
   "content-integrity:unresolved-wikilink": "warning",
+  "content-integrity:ambiguous-wikilink": "warning",
   "content-integrity:broken-asset": "warning",
   "content-integrity:duplicate-public-location": "error",
   "content-integrity:redirect-target-missing": "warning",
@@ -1006,8 +1023,18 @@ function checkSiteIntegrity(manifest, options = {}) {
   const routeOwners = buildRouteOwners(manifest, diagnostics2, options);
   const publicRoutes = new Set(routeOwners.keys());
   const assetPaths = buildAssetPaths(manifest);
+  const noteSlugs = new Set(manifest.entries.map((entry) => entry.slug));
+  const ambiguities = manifest.contentIndexAmbiguities ?? /* @__PURE__ */ new Map();
   for (const entry of manifest.publicEntries) {
-    checkResolvedLinks(entry, publicSlugs, assetPaths, diagnostics2, options);
+    checkResolvedLinks(
+      entry,
+      publicSlugs,
+      assetPaths,
+      noteSlugs,
+      ambiguities,
+      diagnostics2,
+      options
+    );
     checkHtmlReferences(entry, publicRoutes, assetPaths, diagnostics2, options);
   }
   checkRedirectTargets(manifest, diagnostics2, options);
@@ -1070,9 +1097,24 @@ function reserveRoute(owners, diagnostics2, options, next) {
     })
   );
 }
-function checkResolvedLinks(entry, publicSlugs, assetPaths, diagnostics2, options) {
+function checkResolvedLinks(entry, publicSlugs, assetPaths, noteSlugs, ambiguities, diagnostics2, options) {
   for (const link of entry.links) {
     if (link.kind === "unresolved") {
+      const ambiguity = ambiguities.get(link.raw.toLowerCase());
+      if (ambiguity && ambiguity.length > 0) {
+        diagnostics2.push(
+          createAmbiguousWikilinkDiagnostic(
+            entry,
+            link.raw,
+            link.embed,
+            ambiguity,
+            noteSlugs,
+            publicSlugs,
+            options
+          )
+        );
+        continue;
+      }
       diagnostics2.push(
         diagnostic(options, {
           code: "content-integrity:unresolved-wikilink",
@@ -1118,6 +1160,37 @@ function checkResolvedLinks(entry, publicSlugs, assetPaths, diagnostics2, option
     }
   }
 }
+function createAmbiguousWikilinkDiagnostic(entry, raw, embed, candidates, noteSlugs, publicSlugs, options) {
+  const visible = [];
+  let unpublishedCount = 0;
+  for (const candidate of candidates) {
+    if (!noteSlugs.has(candidate)) {
+      visible.push(candidate);
+      continue;
+    }
+    if (publicSlugs.has(candidate)) visible.push(candidate);
+    else unpublishedCount += 1;
+  }
+  const described = [...visible];
+  if (unpublishedCount > 0)
+    described.push(`${unpublishedCount} unpublished candidate(s)`);
+  const first = visible[0];
+  const suggestion = first ? `Use an explicit path such as [[${first}]].` : "Rename one of the duplicate targets or reference it by a unique path.";
+  return diagnostic(options, {
+    code: "content-integrity:ambiguous-wikilink",
+    slug: entry.slug,
+    filePath: `${entry.slug}.md`,
+    target: raw,
+    message: `WikiLink target "${raw}" matches multiple candidates: ${described.join(", ")}.`,
+    suggestion,
+    meta: {
+      raw,
+      embed,
+      candidates: visible,
+      ...unpublishedCount > 0 ? { unpublishedCandidateCount: unpublishedCount } : {}
+    }
+  });
+}
 function checkHtmlReferences(entry, publicRoutes, assetPaths, diagnostics2, options) {
   for (const href of extractAttributes(entry.html, "href")) {
     if (!isSiteLocalReference(href)) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riebeckite/plugin-diagnostics",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/index.js",
@@ -20,7 +20,7 @@
     "remark-parse": "^11.0.0",
     "unified": "^11.0.5",
     "unist-util-visit": "^5.1.0",
-    "@riebeckite/core": "0.0.17"
+    "@riebeckite/core": "0.0.18"
   },
   "devDependencies": {
     "@types/mdast": "^4.0.4",