@riebeckite/plugin-l10n 0.0.22 → 0.0.24

package/README.md

@@ -34,7 +34,7 @@ Conventions may be mixed. Built-in precedence is **frontmatter > custom detector
 
 `translation` is independent of locale and filename. Use it to group files with unrelated paths or names:
 
-```text
+```
 日本語/はじめに.md       lang: ja, translation: getting-started
 English/getting-started.md lang: en, translation: getting-started
 ```
@@ -45,26 +45,7 @@ The default language keeps Core's resolved URL (`/about`); other languages are p
 
 No fallback pages are generated. `getLocalization(manifest, slug)` returns `availableLanguages` and language-to-href `translations` only for notes that exist; `getLocalizedContent(manifest, slug, lang)` returns `null` for a missing translation.
 
-## Standard LanguageSwitcher
-
-`l10n(...)` publishes the built-in, styled LanguageSwitcher in the standard `article.metadata` layout slot. A standard Site consumer renders that slot, so no l10n-specific article integration is needed. It is omitted when a page has fewer than two real translations.
-
-```ts
-// Keep URLs and metadata but do not publish UI.
-l10n({ defaultLang: "ja", languages: ["ja", "en"], ui: false });
-
-// Use another standard slot, or replace the server-rendered component.
-l10n({
-  defaultLang: "ja",
-  languages: ["ja", "en"],
-  ui: {
-    slot: "article.footer",
-    render: ({ localization }) => `<p>${localization.lang}</p>`,
-  },
-});
-```
-
-Themes can override the default component through its `.l10n-switcher` CSS classes. `ui.render` is framework-neutral HTML so custom Sites can supply their own server-rendered component without coupling the plugin to a specific app.
+`l10n(...)` publishes the built-in, styled LanguageSwitcher in the standard article layout. A standard Site consumer renders that, so no l10n-specific article integration is needed. It is omitted when a page has fewer than two real translations.
 
 ## Custom detector
 

package/README_ja.md

@@ -44,26 +44,7 @@ English/getting-started.md lang: en, translation: getting-started
 
 テーマは `getLocalization(manifest, slug)` から現在の言語、存在する言語、各翻訳の href を取得できます。`getLocalizedContent()` は翻訳がなければ `null` を返します。
 
-## 標準 LanguageSwitcher
-
-`l10n(...)` は標準記事レイアウトの `article.metadata` スロットへ、組み込みの LanguageSwitcher を登録します。標準 Site consumer がこのスロットを描画するため、l10n 専用の記事レイアウト実装は不要です。実在する翻訳が 2 つ未満のページには表示されません。
-
-```ts
-// URL とメタデータは維持し、UI だけを無効化します。
-l10n({ defaultLang: "ja", languages: ["ja", "en"], ui: false });
-
-// 配置の変更、またはサーバー描画コンポーネントの置換。
-l10n({
-  defaultLang: "ja",
-  languages: ["ja", "en"],
-  ui: {
-    slot: "article.footer",
-    render: ({ localization }) => `<p>${localization.lang}</p>`,
-  },
-});
-```
-
-Theme は `.l10n-switcher` の CSS class を上書きできます。`ui.render` はフレームワーク非依存の HTML renderer なので、カスタム Site は任意のサーバー描画コンポーネントへ置き換えられます。
+`l10n(...)` は標準記事レイアウトへ組み込みの言語切替 UI を登録します。標準 Site consumer がこの UI を描画するため、l10n 専用の記事レイアウト実装は不要です。実在する翻訳が 2 つ未満のページには表示されません。
 
 各ページには Core の `headTags` 拡張を通じ、実在する翻訳だけを対象に `hreflang` の alternate link を追加します。サイトシェルはこれらのタグの描画と、リクエストに応じた `<html lang>` の選択を担当します。WikiLink の Content Graph は同言語の翻訳を優先し、なければ元のリンク先を使います。本文では Obsidian WikiLink を `@riebeckite/plugin-obsidian-markdown` が解決した後、WikiLink と Markdown の内部リンクを同じ規則で処理します。現在のページと同じ言語の翻訳があればその URL に切り替え、なければ original/default のリンク先を維持します。クエリ文字列とフラグメントは維持し、外部 URL、フラグメントのみのリンク、不明な URL、asset などコンテンツ以外の URL は変更しません。Content Graph と本文リンクは同じ解決ポリシーを使います。
 

package/dist/components/language-switcher.d.ts

@@ -0,0 +1,6 @@
+import type { LocalizedContent } from "../src/l10n.js";
+export type LanguageSwitcherProps = {
+    localization: LocalizedContent | null;
+};
+declare const LanguageSwitcher: (props: Readonly<LanguageSwitcherProps>) => import("hono/jsx/jsx-dev-runtime").JSX.Element;
+export default LanguageSwitcher;

package/dist/components/language-switcher.js

@@ -0,0 +1,28 @@
+// components/language-switcher.tsx
+import { jsx, jsxs } from "hono/jsx/jsx-runtime";
+var LanguageSwitcher = ((props) => {
+  const localization = props.localization;
+  if (!localization || localization.availableLanguages.length < 2) return null;
+  return /* @__PURE__ */ jsxs("nav", { class: "l10n-switcher", "aria-label": "Language", children: [
+    /* @__PURE__ */ jsx("span", { class: "l10n-switcher__label", children: "Language" }),
+    /* @__PURE__ */ jsx("ul", { class: "l10n-switcher__list", children: localization.availableLanguages.map((lang) => {
+      const href = localization.translations[lang];
+      if (!href) return null;
+      return /* @__PURE__ */ jsx("li", { children: /* @__PURE__ */ jsx(
+        "a",
+        {
+          class: "l10n-switcher__link",
+          href,
+          hreflang: lang,
+          lang,
+          "aria-current": lang === localization.lang ? "page" : void 0,
+          children: lang
+        }
+      ) }, lang);
+    }) })
+  ] });
+});
+var language_switcher_default = LanguageSwitcher;
+export {
+  language_switcher_default as default
+};

package/dist/index.d.ts

@@ -1 +1,3 @@
-export { getLanguageFromPath, getLocalization, getLocalizedContent, type L10nContent, type L10nDetectorContext, type L10nDetectorResult, type L10nOptions, type L10nUiOptions, type LanguageSwitcherRenderContext, type LocalizedContent, l10n, l10nPlugin, renderLanguageSwitcher, } from "./src/l10n.js";
+export type { LanguageSwitcherProps } from "./components/language-switcher.js";
+export { default as LanguageSwitcher } from "./components/language-switcher.js";
+export { getLanguageFromPath, getLocalization, getLocalizedContent, type L10nContent, type L10nDetectorContext, type L10nDetectorResult, type L10nOptions, type LocalizedContent, l10n, l10nPlugin, } from "./src/l10n.js";

package/dist/index.js

@@ -1,43 +1,57 @@
+// components/language-switcher.tsx
+import { jsx, jsxs } from "hono/jsx/jsx-runtime";
+var LanguageSwitcher = ((props) => {
+  const localization = props.localization;
+  if (!localization || localization.availableLanguages.length < 2) return null;
+  return /* @__PURE__ */ jsxs("nav", { class: "l10n-switcher", "aria-label": "Language", children: [
+    /* @__PURE__ */ jsx("span", { class: "l10n-switcher__label", children: "Language" }),
+    /* @__PURE__ */ jsx("ul", { class: "l10n-switcher__list", children: localization.availableLanguages.map((lang) => {
+      const href = localization.translations[lang];
+      if (!href) return null;
+      return /* @__PURE__ */ jsx("li", { children: /* @__PURE__ */ jsx(
+        "a",
+        {
+          class: "l10n-switcher__link",
+          href,
+          hreflang: lang,
+          lang,
+          "aria-current": lang === localization.lang ? "page" : void 0,
+          children: lang
+        }
+      ) }, lang);
+    }) })
+  ] });
+});
+var language_switcher_default = LanguageSwitcher;
+
 // src/l10n.ts
 import {
-  appendContentBodySlot,
   attachErrorPath,
   createStyleAsset,
   definePlugin
 } from "@riebeckite/core";
 import { parse } from "yaml";
-
-// src/language-switcher.ts
-import { escapeHtml, escapeHtmlAttribute } from "@riebeckite/core";
-function renderLanguageSwitcher({
-  localization
-}) {
-  if (localization.availableLanguages.length < 2) return null;
-  const links = localization.availableLanguages.map((lang) => {
-    const href = localization.translations[lang];
-    if (!href) return "";
-    const current = lang === localization.lang ? ' aria-current="page"' : "";
-    const escaped = escapeHtml(lang);
-    return `<li><a class="l10n-switcher__link" href="${escapeHtmlAttribute(href)}" hreflang="${escapeHtmlAttribute(lang)}" lang="${escapeHtmlAttribute(lang)}"${current}>${escaped}</a></li>`;
-  }).join("");
-  if (!links) return null;
-  return `<nav class="l10n-switcher" aria-label="Language"><span class="l10n-switcher__label">Language</span><ul class="l10n-switcher__list">${links}</ul></nav>`;
-}
-
-// src/l10n.ts
 var TRANSLATION_METADATA_KEY = "l10n.translationId";
 function l10n(options) {
   const resolved = resolveOptions(options);
   let state = emptyState();
   return definePlugin({
     name: "l10n",
+    processedContentCache: {
+      version: "l10n-global-content-locations-v1",
+      dependencyMode: "global"
+    },
     provides: ["content.localization"],
-    outputDependencies: [{ type: "global" }],
+    contentOutputDependencies: [{ type: "global" }],
     options,
-    assets: [createStyleAsset("l10n")],
+    assets: [createStyleAsset("l10n", "@riebeckite/plugin-l10n/style.css")],
     validateOptions: () => validateOptions(options).map((message) => ({ path: "l10n", message })),
     extendContentLocations: ({ entries, locations }) => {
-      state = { ...detectContents(entries, resolved), locations };
+      state = {
+        ...detectContents(entries, resolved),
+        locations,
+        slugsByPermalink: /* @__PURE__ */ new Map()
+      };
       throwForStrictDiagnostics(state.diagnostics, resolved.strict);
       for (const content of state.contents.values()) {
         const location = locations.get(content.slug);
@@ -47,6 +61,12 @@ function l10n(options) {
           withLocalization(location, content, resolved)
         );
       }
+      state = {
+        ...state,
+        slugsByPermalink: new Map(
+          [...locations].map(([slug, location]) => [location.permalink, slug])
+        )
+      };
     },
     extendMarkdownPipeline: (pipeline, context) => {
       pipeline.use(remarkLocalizedLinks, {
@@ -68,7 +88,6 @@ function l10n(options) {
     },
     onManifestCreated: ({ manifest }) => {
       addLocalizationHeadTags(manifest, state);
-      addLanguageSwitchers(manifest, resolved.ui);
     },
     addDiagnostics: () => state.diagnostics
   });
@@ -78,13 +97,7 @@ function remarkLocalizedLinks(options) {
   return (tree) => {
     const source = options.sourceSlug ? options.state.contents.get(options.sourceSlug) : void 0;
     if (!source || !options.state.locations) return;
-    const slugsByPermalink = new Map(
-      [...options.state.locations].map(([slug, location]) => [
-        location.permalink,
-        slug
-      ])
-    );
-    localizeLinks(tree, source, options, slugsByPermalink);
+    localizeLinks(tree, source, options, options.state.slugsByPermalink);
   };
 }
 function localizeLinks(node, source, options, slugsByPermalink) {
@@ -106,13 +119,13 @@ function splitLinkUrl(url) {
   const suffixIndex = url.search(/[?#]/);
   return suffixIndex < 0 ? { permalink: url, suffix: "" } : { permalink: url.slice(0, suffixIndex), suffix: url.slice(suffixIndex) };
 }
-function getLocalization(manifest, slug) {
-  const entry = manifest.bySlug.get(slug);
+function getLocalization(view, slug) {
+  const entry = findLocalizedEntry(view, slug);
   if (!entry) return null;
   const lang = entry.publicLocation.language;
   const translationId = entry.publicLocation.metadata?.[TRANSLATION_METADATA_KEY];
   if (!lang || !translationId) return null;
-  const candidates = manifest.discoverableEntries.filter(
+  const candidates = getLocalizedDiscoverableEntries(view).filter(
     (candidate) => candidate.publicLocation.metadata?.[TRANSLATION_METADATA_KEY] === translationId
   );
   const translations = Object.fromEntries(
@@ -130,6 +143,12 @@ function getLocalization(manifest, slug) {
     translations
   };
 }
+function findLocalizedEntry(view, slug) {
+  return "findRoutableBySlug" in view ? view.findRoutableBySlug(slug) : view.bySlug.get(slug);
+}
+function getLocalizedDiscoverableEntries(view) {
+  return view.discoverableEntries;
+}
 function getLocalizedContent(manifest, slug, lang) {
   const localization = getLocalization(manifest, slug);
   if (!localization) return null;
@@ -158,8 +177,7 @@ function resolveOptions(options) {
       languages.map((language) => [language.toLowerCase(), language])
     ),
     strict: options.strict ?? false,
-    detect: options.detect,
-    ui: resolveUiOptions(options.ui)
+    detect: options.detect
   };
 }
 function validateOptions(options) {
@@ -194,24 +212,8 @@ function validateOptions(options) {
   if (options.detect !== void 0 && typeof options.detect !== "function") {
     errors.push("l10n.detect must be a function.");
   }
-  if (options.ui !== void 0 && options.ui !== false) {
-    if (typeof options.ui !== "object") {
-      errors.push("l10n.ui must be false or an object.");
-    } else if (options.ui.slot !== void 0 && (typeof options.ui.slot !== "string" || !options.ui.slot.trim())) {
-      errors.push("l10n.ui.slot must be a non-empty string.");
-    } else if (options.ui.render !== void 0 && typeof options.ui.render !== "function") {
-      errors.push("l10n.ui.render must be a function.");
-    }
-  }
   return errors;
 }
-function resolveUiOptions(ui) {
-  if (ui === false) return false;
-  return {
-    slot: ui?.slot ?? "article.metadata",
-    render: ui?.render ?? renderLanguageSwitcher
-  };
-}
 function canonicalLanguage(value) {
   if (typeof value !== "string" || !value.trim()) {
     throw new Error("A l10n language tag must be a non-empty string.");
@@ -224,6 +226,7 @@ function canonicalLanguage(value) {
 }
 function detectContents(entries, options) {
   const contents = /* @__PURE__ */ new Map();
+  const contentsByTranslationAndLanguage = /* @__PURE__ */ new Map();
   const diagnostics = [];
   const owners = /* @__PURE__ */ new Map();
   const conflictedGroups = /* @__PURE__ */ new Set();
@@ -284,9 +287,17 @@ function detectContents(entries, options) {
       diagnostics.push(duplicateDiagnostic(previous, content, options.strict));
     } else {
       owners.set(key, content);
+      contentsByTranslationAndLanguage.set(key, content);
     }
   }
-  return { contents, diagnostics, conflictedGroups, locations: null };
+  return {
+    contents,
+    contentsByTranslationAndLanguage,
+    diagnostics,
+    conflictedGroups,
+    locations: null,
+    slugsByPermalink: /* @__PURE__ */ new Map()
+  };
 }
 function parseFrontmatter(entry) {
   const match = entry.markdown.match(
@@ -375,9 +386,7 @@ function escapeRegExp(value) {
 function findTranslation(state, translationId, lang) {
   const key = `${translationId}\0${lang}`;
   if (state.conflictedGroups.has(key)) return null;
-  return [...state.contents.values()].find(
-    (content) => content.translationId === translationId && content.lang === lang
-  ) ?? null;
+  return state.contentsByTranslationAndLanguage.get(key) ?? null;
 }
 function resolveLocalizedTarget(state, source, targetSlug) {
   const target = state.contents.get(targetSlug);
@@ -385,14 +394,11 @@ function resolveLocalizedTarget(state, source, targetSlug) {
   return findTranslation(state, target.translationId, source.lang) ?? target;
 }
 function addLocalizationHeadTags(manifest, state) {
+  const translationsById = collectDiscoverableTranslations(manifest);
   for (const entry of manifest.discoverableEntries) {
     const content = state.contents.get(entry.slug);
     if (!content) continue;
-    const translations = uniqueLanguageEntries(
-      manifest.discoverableEntries.filter(
-        (candidate) => candidate.publicLocation.metadata?.[TRANSLATION_METADATA_KEY] === content.translationId
-      )
-    );
+    const translations = translationsById.get(content.translationId) ?? [];
     const headTags = translations.map(
       (translation) => ({
         tag: "link",
@@ -411,25 +417,35 @@ function addLocalizationHeadTags(manifest, state) {
     ];
   }
 }
-function addLanguageSwitchers(manifest, ui) {
-  if (ui === false) return;
+function collectDiscoverableTranslations(manifest) {
+  const candidatesById = /* @__PURE__ */ new Map();
   for (const entry of manifest.discoverableEntries) {
-    const localization = getLocalization(manifest, entry.slug);
-    if (!localization) continue;
-    const html = ui.render({ localization });
-    if (html && !entry.bodySlots?.[ui.slot]?.includes(html)) {
-      appendContentBodySlot(entry, ui.slot, html);
-    }
+    const translationId = entry.publicLocation.metadata?.[TRANSLATION_METADATA_KEY];
+    if (!translationId) continue;
+    const candidates = candidatesById.get(translationId) ?? [];
+    candidates.push(entry);
+    candidatesById.set(translationId, candidates);
   }
+  return new Map(
+    [...candidatesById].map(([translationId, candidates]) => [
+      translationId,
+      uniqueLanguageEntries(candidates)
+    ])
+  );
 }
 function sameHeadTag(left, right) {
   return left.tag === right.tag && left.attrs?.rel === right.attrs?.rel && left.attrs?.hreflang === right.attrs?.hreflang && left.attrs?.href === right.attrs?.href;
 }
 function uniqueLanguageEntries(entries) {
-  return entries.filter((entry) => {
-    const lang = entry.publicLocation.language;
-    return lang !== void 0 && entries.filter((other) => other.publicLocation.language === lang).length === 1;
-  });
+  const entriesByLanguage = /* @__PURE__ */ new Map();
+  for (const entry of entries) {
+    const language = entry.publicLocation.language;
+    if (!language) continue;
+    const candidates = entriesByLanguage.get(language) ?? [];
+    candidates.push(entry);
+    entriesByLanguage.set(language, candidates);
+  }
+  return [...entriesByLanguage.values()].filter((candidates) => candidates.length === 1).flatMap((candidates) => candidates[0] ? [candidates[0]] : []);
 }
 function compactSignals(signals) {
   return Object.fromEntries(
@@ -489,16 +505,18 @@ function throwForStrictDiagnostics(diagnostics, strict) {
 function emptyState() {
   return {
     contents: /* @__PURE__ */ new Map(),
+    contentsByTranslationAndLanguage: /* @__PURE__ */ new Map(),
     diagnostics: [],
     conflictedGroups: /* @__PURE__ */ new Set(),
-    locations: null
+    locations: null,
+    slugsByPermalink: /* @__PURE__ */ new Map()
   };
 }
 export {
+  language_switcher_default as LanguageSwitcher,
   getLanguageFromPath,
   getLocalization,
   getLocalizedContent,
   l10n,
-  l10nPlugin,
-  renderLanguageSwitcher
+  l10nPlugin
 };

package/dist/src/l10n.d.ts

@@ -1,4 +1,4 @@
-import { type ContentBodySlot, type ContentManifest, type ContentManifestEntry, type PostFrontmatter } from "@riebeckite/core";
+import { type ContentManifest, type ContentManifestEntry, type PostFrontmatter, type PublicContentView } from "@riebeckite/core";
 export type L10nContent = {
     readonly path: string;
     readonly slug: string;
@@ -17,17 +17,6 @@ export type L10nOptions = {
     languages: readonly string[];
     strict?: boolean;
     detect?: (content: L10nDetectorContext) => L10nDetectorResult | undefined;
-    /**
-     * Publishes the built-in switcher into a standard article layout slot.
-     * Pass `false` to keep localization metadata and URLs without UI.
-     */
-    ui?: L10nUiOptions;
-};
-export type L10nUiOptions = false | {
-    /** Defaults to the standard `article.metadata` slot. */
-    slot?: ContentBodySlot;
-    /** Replaces the built-in server-rendered LanguageSwitcher. */
-    render?: (context: LanguageSwitcherRenderContext) => string | null;
 };
 export type LocalizedContent = {
     readonly slug: string;
@@ -37,14 +26,10 @@ export type LocalizedContent = {
     readonly availableLanguages: readonly string[];
     readonly translations: Readonly<Record<string, string>>;
 };
-export type LanguageSwitcherRenderContext = {
-    readonly localization: LocalizedContent;
-};
 export declare function l10n(options: L10nOptions): import("@riebeckite/core").RiebeckitePlugin<L10nOptions>;
 export declare const l10nPlugin: typeof l10n;
 /** Returns one entry's language and available real translations. */
-export declare function getLocalization(manifest: ContentManifest, slug: string): LocalizedContent | null;
+export declare function getLocalization(view: ContentManifest | PublicContentView, slug: string): LocalizedContent | null;
 /** Resolves an existing translation; missing translations return `null`. */
 export declare function getLocalizedContent(manifest: ContentManifest, slug: string, lang: string): ContentManifestEntry | null;
 export declare function getLanguageFromPath(manifest: ContentManifest, pathname: string): string | undefined;
-export { renderLanguageSwitcher } from "./language-switcher.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riebeckite/plugin-l10n",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/index.js",
@@ -12,15 +12,22 @@
       "source": "./index.ts",
       "default": "./dist/index.js"
     },
+    "./components": {
+      "types": "./dist/components/language-switcher.d.ts",
+      "import": "./dist/components/language-switcher.js",
+      "source": "./components/language-switcher.tsx",
+      "default": "./dist/components/language-switcher.js"
+    },
     "./style.css": "./style.css"
   },
   "dependencies": {
+    "hono": "^4.12.25",
     "yaml": "^2.9.0",
-    "@riebeckite/core": "0.0.22"
+    "@riebeckite/core": "0.0.24"
   },
   "devDependencies": {
     "tsx": "^4.22.4",
-    "@riebeckite/plugin-obsidian-markdown": "0.0.22"
+    "@riebeckite/plugin-obsidian-markdown": "0.0.24"
   },
   "publishConfig": {
     "access": "public"

package/dist/src/language-switcher.d.ts

@@ -1,3 +0,0 @@
-import type { LanguageSwitcherRenderContext } from "./l10n.js";
-/** Framework-neutral default renderer for the standard LanguageSwitcher. */
-export declare function renderLanguageSwitcher({ localization, }: LanguageSwitcherRenderContext): string | null;