@riebeckite/plugin-l10n 0.0.15 → 0.0.17

package/README.md

@@ -52,7 +52,7 @@ No fallback pages are generated. `getLocalization(manifest, slug)` returns `avai
 
 ## Standard LanguageSwitcher
 
-`l10n(...)` publishes the built-in, styled LanguageSwitcher in the standard `article.after-meta` 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.
+`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.

package/README_ja.md

@@ -37,7 +37,7 @@ translation: getting-started
 
 ## 標準 LanguageSwitcher
 
-`l10n(...)` は標準記事レイアウトの `article.after-meta` スロットへ、組み込みの LanguageSwitcher を登録します。標準 Site consumer がこのスロットを描画するため、l10n 専用の記事レイアウト実装は不要です。実在する翻訳が 2 つ未満のページには表示されません。
+`l10n(...)` は標準記事レイアウトの `article.metadata` スロットへ、組み込みの LanguageSwitcher を登録します。標準 Site consumer がこのスロットを描画するため、l10n 専用の記事レイアウト実装は不要です。実在する翻訳が 2 つ未満のページには表示されません。
 
 ```ts
 // URL とメタデータは維持し、UI だけを無効化します。
@@ -71,7 +71,6 @@ l10n({
 
 独自検出の言語は frontmatter より弱く、ファイル名・ディレクトリより強く扱われます。`translationId` は明示的な翻訳グループ ID です。
 
-## ????
-
-- [?????????](../../../docs/ja/docs/reference/plugin-api.md)
+## 関連リンク
 
+- [プラグイン API](../../../docs/ja/docs/reference/plugin-api.md)

package/dist/index.d.ts

@@ -1 +1 @@
-export { getLocalization, getLocalizedContent, type L10nContent, type L10nDetectorContext, type L10nDetectorResult, type L10nOptions, type L10nUiOptions, type LanguageSwitcherRenderContext, type LocalizedContent, l10n, l10nPlugin, renderLanguageSwitcher, } from "./src/l10n.js";
+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";

package/dist/index.js

@@ -24,7 +24,6 @@ function renderLanguageSwitcher({
 }
 
 // src/l10n.ts
-var LANGUAGE_METADATA_KEY = "l10n.lang";
 var TRANSLATION_METADATA_KEY = "l10n.translationId";
 function l10n(options) {
   const resolved = resolveOptions(options);
@@ -109,7 +108,7 @@ function splitLinkUrl(url) {
 function getLocalization(manifest, slug) {
   const entry = manifest.bySlug.get(slug);
   if (!entry) return null;
-  const lang = entry.publicLocation.metadata?.[LANGUAGE_METADATA_KEY];
+  const lang = entry.publicLocation.language;
   const translationId = entry.publicLocation.metadata?.[TRANSLATION_METADATA_KEY];
   if (!lang || !translationId) return null;
   const candidates = manifest.discoverableEntries.filter(
@@ -117,7 +116,7 @@ function getLocalization(manifest, slug) {
   );
   const translations = Object.fromEntries(
     uniqueLanguageEntries(candidates).map((candidate) => [
-      candidate.publicLocation.metadata?.[LANGUAGE_METADATA_KEY] ?? "",
+      candidate.publicLocation.language ?? "",
       candidate.permalink
     ])
   );
@@ -134,10 +133,17 @@ function getLocalizedContent(manifest, slug, lang) {
   const localization = getLocalization(manifest, slug);
   if (!localization) return null;
   const candidates = manifest.publicEntries.filter(
-    (entry) => entry.publicLocation.metadata?.[TRANSLATION_METADATA_KEY] === localization.translationId && entry.publicLocation.metadata?.[LANGUAGE_METADATA_KEY] === lang
+    (entry) => entry.publicLocation.metadata?.[TRANSLATION_METADATA_KEY] === localization.translationId && entry.publicLocation.language === lang
   );
   return candidates.length === 1 ? candidates[0] ?? null : null;
 }
+function getLanguageFromPath(manifest, pathname) {
+  const firstSegment = pathname.split("/").filter(Boolean)[0];
+  if (!firstSegment) return void 0;
+  return manifest.discoverableEntries.map((entry) => entry.publicLocation.language).find(
+    (language) => language?.toLocaleLowerCase() === firstSegment.toLocaleLowerCase()
+  );
+}
 function resolveOptions(options) {
   const validation = validateOptions(options);
   if (validation.length > 0) throw new Error(validation.join("\n"));
@@ -201,7 +207,7 @@ function validateOptions(options) {
 function resolveUiOptions(ui) {
   if (ui === false) return false;
   return {
-    slot: ui?.slot ?? "article.after-meta",
+    slot: ui?.slot ?? "article.metadata",
     render: ui?.render ?? renderLanguageSwitcher
   };
 }
@@ -336,21 +342,25 @@ function readTranslationId(value) {
   return value.trim();
 }
 function withLocalization(location, content, options) {
-  const unlocalizedPermalink = removeLocalePathSegments(
-    location.permalink,
-    content
-  );
-  const permalink = content.lang === options.defaultLang ? unlocalizedPermalink : prefixLanguage(unlocalizedPermalink, content.lang);
+  const permalink = localizePath(location.permalink, content, options);
   return {
     ...location,
     permalink,
+    language: content.lang,
+    redirects: location.redirects?.map((redirect) => ({
+      ...redirect,
+      path: localizePath(redirect.path, content, options)
+    })),
     metadata: {
       ...location.metadata,
-      [LANGUAGE_METADATA_KEY]: content.lang,
       [TRANSLATION_METADATA_KEY]: content.translationId
     }
   };
 }
+function localizePath(pathname, content, options) {
+  const unlocalizedPath = removeLocalePathSegments(pathname, content);
+  return content.lang === options.defaultLang ? unlocalizedPath : prefixLanguage(unlocalizedPath, content.lang);
+}
 function removeLocalePathSegments(permalink, content) {
   let result = permalink;
   const filenameLanguage = content.signals.filename;
@@ -400,7 +410,7 @@ function addLocalizationHeadTags(manifest, state) {
         tag: "link",
         attrs: {
           rel: "alternate",
-          hreflang: translation.publicLocation.metadata?.[LANGUAGE_METADATA_KEY] ?? "",
+          hreflang: translation.publicLocation.language ?? "",
           href: translation.permalink
         }
       })
@@ -429,10 +439,8 @@ function sameHeadTag(left, right) {
 }
 function uniqueLanguageEntries(entries) {
   return entries.filter((entry) => {
-    const lang = entry.publicLocation.metadata?.[LANGUAGE_METADATA_KEY];
-    return lang !== void 0 && entries.filter(
-      (other) => other.publicLocation.metadata?.[LANGUAGE_METADATA_KEY] === lang
-    ).length === 1;
+    const lang = entry.publicLocation.language;
+    return lang !== void 0 && entries.filter((other) => other.publicLocation.language === lang).length === 1;
   });
 }
 function compactSignals(signals) {
@@ -499,6 +507,7 @@ function emptyState() {
   };
 }
 export {
+  getLanguageFromPath,
   getLocalization,
   getLocalizedContent,
   l10n,

package/dist/src/l10n.d.ts

@@ -25,7 +25,7 @@ export type L10nOptions = {
     ui?: L10nUiOptions;
 };
 export type L10nUiOptions = false | {
-    /** Defaults to the standard `article.after-meta` slot. */
+    /** Defaults to the standard `article.metadata` slot. */
     slot?: ContentBodySlot;
     /** Replaces the built-in server-rendered LanguageSwitcher. */
     render?: (context: LanguageSwitcherRenderContext) => string | null;
@@ -47,4 +47,5 @@ export declare const l10nPlugin: typeof l10n;
 export declare function getLocalization(manifest: ContentManifest, 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.15",
+  "version": "0.0.17",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/index.js",
@@ -16,11 +16,11 @@
   },
   "dependencies": {
     "yaml": "^2.9.0",
-    "@riebeckite/core": "0.0.15"
+    "@riebeckite/core": "0.0.17"
   },
   "devDependencies": {
     "tsx": "^4.22.4",
-    "@riebeckite/plugin-obsidian-markdown": "0.0.15"
+    "@riebeckite/plugin-obsidian-markdown": "0.0.17"
   },
   "publishConfig": {
     "access": "public"