@riebeckite/plugin-diagnostics 0.0.16 → 0.0.18

package/README.md

@@ -32,7 +32,7 @@ export default defineConfig({
 
 - `addDiagnostics` — runs the analysis at build time; results go to
   `manifest.diagnostics`
-- `onBuildEnd` — with `failOnError: true`, throws `DiagnosticsFailure` when
+- `buildEnd` — with `failOnError: true`, throws `DiagnosticsFailure` when
   error-level diagnostics exist
 
 ## Checks
@@ -48,8 +48,8 @@ export default defineConfig({
 | `publish-conflict` | `warning` | `publish: true` combined with `draft: true` / `private: true` |
 | `duplicate-title` | `warning` | Multiple published notes share a title within the same language |
 | `slug-collision` | `error` | Slugs collide case-insensitively |
-| `duplicate-content-id` | `error` | Published notes share a stable content ID (`id`/`uid`) |
-| `invalid-content-id` | `error` | `id`/`uid` frontmatter violates the stable content ID contract |
+| `duplicate-content-id` | `error` | Published notes share a stable content ID (`id`) |
+| `invalid-content-id` | `error` | `id` frontmatter violates the stable content ID contract |
 | `excluded-public` | `warning` | Excluded note is marked `publish: true` |
 | `publish-boundary` | `warning` | Published content links to or embeds non-published content |
 | `analytics-untracked` | `info` | Published note has no stable `id` and the analytics plugin will not track it (enabled with `reportAnalyticsCoverage`, or automatically when the config enables the analytics plugin) |
@@ -159,5 +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

@@ -24,6 +24,8 @@ export default defineConfig({
 });
 ```
 
+`failOnError: true` を指定すると、`buildEnd` で error レベルの Diagnostics が残っている場合に `DiagnosticsFailure` を送出します。
+
 ## 検出する問題
 
 | コード | 既定の重要度 | 内容 |
@@ -37,8 +39,8 @@ export default defineConfig({
 | `publish-conflict` | warning | `publish: true` と `draft: true` または `private: true` が同居している |
 | `duplicate-title` | warning | 同じ言語の公開ノート同士でタイトルが重複している |
 | `slug-collision` | error | 大文字・小文字を区別しない slug が衝突している |
-| `duplicate-content-id` | error | 公開ノート同士で安定コンテンツ ID（`id`/`uid`）が重複している |
-| `invalid-content-id` | error | `id`/`uid` の frontmatter が安定コンテンツ ID の要件を満たしていない |
+| `duplicate-content-id` | error | 公開ノート同士で安定コンテンツ ID（`id`）が重複している |
+| `invalid-content-id` | error | `id` の frontmatter が安定コンテンツ ID の要件を満たしていない |
 | `excluded-public` | warning | 除外されたノートに `publish: true` が指定されている |
 | `publish-boundary` | warning | 公開コンテンツから非公開コンテンツへリンク・埋め込みしている |
 | `analytics-untracked` | info | 安定 `id` のない公開ノートは analytics プラグインで計測されない（`reportAnalyticsCoverage` で有効化。設定で analytics プラグインが有効な場合は自動で有効化） |
@@ -115,5 +117,4 @@ assertNoErrors(report);
 
 ## 関連資料
 
-- [プラグインシステム](../../../docs/ja/docs/reference/plugin-api.md)
-
+- [プラグインシステム](../../../docs/docs/reference/plugin-api.md)

package/dist/bin.js

@@ -143,7 +143,7 @@ function checkAnalyticsCoverage(source, options, diagnostics) {
   }
 }
 function hasAnalyticsId(note) {
-  return hasField(note.fm.values, "id") || hasField(note.fm.values, "uid");
+  return hasField(note.fm.values, "id");
 }
 
 // src/checks/assets.ts
@@ -180,7 +180,7 @@ function checkContentIdIntegrity(source, options, diagnostics) {
         "invalid-content-id",
         `invalid content id frontmatter: ${toErrorMessage(error)}`,
         void 0,
-        'set a unique, trimmed "id" value and remove a conflicting "uid" value'
+        'set a unique, trimmed "id" value'
       );
       continue;
     }
@@ -200,7 +200,7 @@ function checkContentIdIntegrity(source, options, diagnostics) {
         "duplicate-content-id",
         `content id "${id}" is used by multiple published notes: ${slugs}`,
         id,
-        'give each note a unique "id" (or "uid") frontmatter value'
+        'give each note a unique "id" frontmatter value'
       );
     }
   }
@@ -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

@@ -139,7 +139,7 @@ function checkAnalyticsCoverage(source, options, diagnostics2) {
   }
 }
 function hasAnalyticsId(note) {
-  return hasField(note.fm.values, "id") || hasField(note.fm.values, "uid");
+  return hasField(note.fm.values, "id");
 }
 
 // src/checks/assets.ts
@@ -176,7 +176,7 @@ function checkContentIdIntegrity(source, options, diagnostics2) {
         "invalid-content-id",
         `invalid content id frontmatter: ${toErrorMessage(error)}`,
         void 0,
-        'set a unique, trimmed "id" value and remove a conflicting "uid" value'
+        'set a unique, trimmed "id" value'
       );
       continue;
     }
@@ -196,7 +196,7 @@ function checkContentIdIntegrity(source, options, diagnostics2) {
         "duplicate-content-id",
         `content id "${id}" is used by multiple published notes: ${slugs}`,
         id,
-        'give each note a unique "id" (or "uid") frontmatter value'
+        'give each note a unique "id" frontmatter value'
       );
     }
   }
@@ -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);
@@ -1049,13 +1076,6 @@ function buildRouteOwners(manifest, diagnostics2, options) {
       });
     }
   }
-  for (const output of manifest.generatedOutputs ?? []) {
-    reserveRoute(owners, diagnostics2, options, {
-      path: normalizeRoutePath(output.path),
-      slug: "(generated-output)",
-      kind: "output"
-    });
-  }
   return owners;
 }
 function reserveRoute(owners, diagnostics2, options, next) {
@@ -1072,14 +1092,29 @@ function reserveRoute(owners, diagnostics2, options, next) {
       slug: next.slug.startsWith("(") ? void 0 : next.slug,
       target: next.path,
       message: `Public path "${next.path}" is claimed by both ${describeOwner(previous)} and ${describeOwner(next)}.`,
-      suggestion: "Change one permalink, alias, redirect, page path, or generated output path.",
+      suggestion: "Change one permalink, alias, redirect, or page path.",
       meta: { previous, 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",
@@ -1125,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;
@@ -1225,8 +1291,6 @@ function buildAssetPaths(manifest) {
   }
   for (const asset of manifest.assets ?? [])
     paths.add(asset.path.replace(/^\/+/, ""));
-  for (const output of manifest.generatedOutputs ?? [])
-    paths.add(output.path.replace(/^\/+/, ""));
   return paths;
 }
 function extractAttributes(html, attribute) {
@@ -1359,7 +1423,7 @@ function diagnostics(options = {}) {
     onManifestCreated: ({ manifest, diagnostics: diagnostics2 }) => {
       diagnostics2.push(...checkSiteIntegrity(manifest, options));
     },
-    onBuildEnd: ({ manifest }) => {
+    buildEnd: ({ manifest }) => {
       if (!options.failOnError) return void 0;
       const errors = manifest.diagnostics.filter(
         (diagnostic2) => diagnostic2.pluginName === PLUGIN_NAME3 && diagnostic2.severity === "error"

package/dist/src/checks/analytics.d.ts

@@ -5,8 +5,8 @@ import { type NormalizedOptions } from "./shared.js";
  * Reports published content that the analytics plugin will not track.
  *
  * The analytics browser initializer emits a page view only for entries that
- * carry Core's source-authored stable content ID (`id`, or the compatible
- * `uid`). Content without that ID builds and publishes normally but is silently
+ * carry Core's source-authored stable content ID (`id`). Content without that
+ * ID builds and publishes normally but is silently
  * absent from analytics. This check surfaces that gap as factual, read-only
  * `info` findings; the analytics plugin itself never autofixes content.
  */

package/dist/src/checks/content_identity.d.ts

@@ -5,9 +5,8 @@ import { type NormalizedOptions } from "./shared.js";
  * Checks stable content ID integrity.
  *
  * Stable content IDs come from the optional source-authored `id` frontmatter
- * field (`uid` is accepted for legacy content). They are the identity key for
- * per-content consumers such as analytics page views, so duplicates silently
- * merge per-content metrics and conflicting declarations break the build.
+ * field. They are the identity key for per-content consumers such as analytics
+ * page views, so duplicates silently merge per-content metrics.
  * This check is intentionally generic: it validates the content-model invariant
  * without knowing which plugin consumes the ID.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riebeckite/plugin-diagnostics",
-  "version": "0.0.16",
+  "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.16"
+    "@riebeckite/core": "0.0.18"
   },
   "devDependencies": {
     "@types/mdast": "^4.0.4",