@riebeckite/plugin-l10n 0.0.14 → 0.0.16

package/README.md

@@ -92,4 +92,5 @@ Each translated entry receives one `<link rel="alternate" hreflang="…">` per e
 
 ## See also
 
-- [Plugin guide](../../../docs/en/reference/plugin-api.md)
+- [Plugin guide](../../../docs/en/docs/reference/plugin-api.md)
+

package/README_ja.md

@@ -71,6 +71,6 @@ l10n({
 
 独自検出の言語は frontmatter より弱く、ファイル名・ディレクトリより強く扱われます。`translationId` は明示的な翻訳グループ ID です。
 
-## ????
+## 関連リンク
 
-- [?????????](../../../docs/ja/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

@@ -31,6 +31,8 @@ function l10n(options) {
   let state = emptyState();
   return definePlugin({
     name: "l10n",
+    provides: ["content.localization"],
+    outputDependencies: [{ type: "global" }],
     options,
     assets: [createStyleAsset("l10n")],
     validateOptions: () => validateOptions(options).map((message) => ({ path: "l10n", message })),
@@ -110,7 +112,7 @@ function getLocalization(manifest, slug) {
   const lang = entry.publicLocation.metadata?.[LANGUAGE_METADATA_KEY];
   const translationId = entry.publicLocation.metadata?.[TRANSLATION_METADATA_KEY];
   if (!lang || !translationId) return null;
-  const candidates = manifest.entries.filter(
+  const candidates = manifest.discoverableEntries.filter(
     (candidate) => candidate.publicLocation.metadata?.[TRANSLATION_METADATA_KEY] === translationId
   );
   const translations = Object.fromEntries(
@@ -131,11 +133,18 @@ function getLocalization(manifest, slug) {
 function getLocalizedContent(manifest, slug, lang) {
   const localization = getLocalization(manifest, slug);
   if (!localization) return null;
-  const candidates = manifest.entries.filter(
+  const candidates = manifest.publicEntries.filter(
     (entry) => entry.publicLocation.metadata?.[TRANSLATION_METADATA_KEY] === localization.translationId && entry.publicLocation.metadata?.[LANGUAGE_METADATA_KEY] === 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.metadata?.[LANGUAGE_METADATA_KEY]).find(
+    (language) => language?.toLocaleLowerCase() === firstSegment.toLocaleLowerCase()
+  );
+}
 function resolveOptions(options) {
   const validation = validateOptions(options);
   if (validation.length > 0) throw new Error(validation.join("\n"));
@@ -334,14 +343,14 @@ 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,
+    redirects: location.redirects?.map((redirect) => ({
+      ...redirect,
+      path: localizePath(redirect.path, content, options)
+    })),
     metadata: {
       ...location.metadata,
       [LANGUAGE_METADATA_KEY]: content.lang,
@@ -349,6 +358,10 @@ function withLocalization(location, content, options) {
     }
   };
 }
+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;
@@ -385,36 +398,46 @@ function resolveLocalizedTarget(state, source, targetSlug) {
   return findTranslation(state, target.translationId, source.lang) ?? target;
 }
 function addLocalizationHeadTags(manifest, state) {
-  for (const entry of manifest.entries) {
+  for (const entry of manifest.discoverableEntries) {
     const content = state.contents.get(entry.slug);
     if (!content) continue;
     const translations = uniqueLanguageEntries(
-      manifest.entries.filter(
+      manifest.discoverableEntries.filter(
         (candidate) => candidate.publicLocation.metadata?.[TRANSLATION_METADATA_KEY] === content.translationId
       )
     );
-    entry.headTags = [
-      ...entry.headTags ?? [],
-      ...translations.map((translation) => ({
+    const headTags = translations.map(
+      (translation) => ({
         tag: "link",
         attrs: {
           rel: "alternate",
           hreflang: translation.publicLocation.metadata?.[LANGUAGE_METADATA_KEY] ?? "",
           href: translation.permalink
         }
-      }))
+      })
+    );
+    entry.headTags = [
+      ...(entry.headTags ?? []).filter(
+        (tag) => !headTags.some((generated) => sameHeadTag(tag, generated))
+      ),
+      ...headTags
     ];
   }
 }
 function addLanguageSwitchers(manifest, ui) {
   if (ui === false) return;
-  for (const entry of manifest.entries) {
+  for (const entry of manifest.discoverableEntries) {
     const localization = getLocalization(manifest, entry.slug);
     if (!localization) continue;
     const html = ui.render({ localization });
-    if (html) appendContentBodySlot(entry, ui.slot, html);
+    if (html && !entry.bodySlots?.[ui.slot]?.includes(html)) {
+      appendContentBodySlot(entry, ui.slot, html);
+    }
   }
 }
+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.metadata?.[LANGUAGE_METADATA_KEY];
@@ -487,6 +510,7 @@ function emptyState() {
   };
 }
 export {
+  getLanguageFromPath,
   getLocalization,
   getLocalizedContent,
   l10n,

package/dist/src/l10n.d.ts

@@ -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.14",
+  "version": "0.0.16",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/index.js",
@@ -16,11 +16,11 @@
   },
   "dependencies": {
     "yaml": "^2.9.0",
-    "@riebeckite/core": "0.0.14"
+    "@riebeckite/core": "0.0.16"
   },
   "devDependencies": {
     "tsx": "^4.22.4",
-    "@riebeckite/plugin-obsidian-markdown": "0.0.14"
+    "@riebeckite/plugin-obsidian-markdown": "0.0.16"
   },
   "publishConfig": {
     "access": "public"