@riebeckite/plugin-l10n 0.0.16 → 0.0.18

package/README.md

@@ -17,16 +17,9 @@ export default defineConfig({
 
 ## Locale detection
 
-Use `README_ja.md`-style filenames with an underscore as the recommended form, matching this repository's convention. The plugin also accepts `README.en.md`, `README-en.md`, and configured BCP 47-style tags such as `README.en-US.md` and `README.zh-CN.md`.
+Use `README.ja.md`-style filenames with a dot as the recommended form, matching this repository's convention. The plugin also accepts `README-ja.md`, `README_ja.md`, and configured BCP 47-style tags such as `README.en-US.md` and `README.zh-CN.md`.
 
-Directory detection is also supported:
-
-```text
-content/en/README.md
-content/ja/README.md
-```
-
-Only directories matching configured `languages` are treated as locales. Frontmatter works anywhere:
+Directory detection is not supported. Only filename suffixes and frontmatter are used to infer a language. Frontmatter works anywhere:
 
 ```md
 ---
@@ -35,7 +28,7 @@ translation: getting-started
 ---
 ```
 
-Conventions may be mixed. Built-in precedence is **frontmatter > filename > directory > default language**. Conflicts emit `L10N_LANGUAGE_CONFLICT`; use `strict: true` to fail the build instead. A duplicate `translation + lang` emits `L10N_DUPLICATE_TRANSLATION` (and also fails in strict mode).
+Conventions may be mixed. Built-in precedence is **frontmatter > custom detector > filename > default language**. Conflicts emit `L10N_LANGUAGE_CONFLICT`; use `strict: true` to fail the build instead. A duplicate `translation + lang` emits `L10N_DUPLICATE_TRANSLATION` (and also fails in strict mode).
 
 `translation` is independent of locale and filename. Use it to group files with unrelated paths or names:
 
@@ -52,7 +45,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.
@@ -73,7 +66,7 @@ Themes can override the default component through its `.l10n-switcher` CSS class
 
 ## Custom detector
 
-For another convention, provide `detect`. Its language is considered after frontmatter and before filename/directory; its `translationId` is explicit.
+For another convention, provide `detect`. Its language is considered after frontmatter and before filename; its `translationId` is explicit.
 
 ```ts
 l10n({
@@ -92,5 +85,5 @@ Each translated entry receives one `<link rel="alternate" hreflang="…">` per e
 
 ## See also
 
-- [Plugin guide](../../../docs/en/docs/reference/plugin-api.md)
+- [Plugin guide](../../../docs/docs/reference/plugin-api.en.md)
 

package/README_ja.md

@@ -14,7 +14,7 @@ l10n({ defaultLang: "ja", languages: ["ja", "en", "zh-CN"] });
 
 ## ロケール検出と翻訳グループ
 
-ファイル名はこのリポジトリの慣例に合わせ、アンダースコアの `README_ja.md` 形式を推奨します。`README.ja.md`、`README-ja.md`、`README.en.md`、`README.en-US.md`、`README.zh-CN.md` も利用できます。設定済みの言語名に一致する先頭ディレクトリ（`en/README.md`）も検出します。
+ファイル名はこのリポジトリの慣例に合わせ、ドットの `README.ja.md` 形式を推奨します。`README-ja.md`、`README_ja.md`、`README.en-US.md`、`README.zh-CN.md` も利用できます。ディレクトリ名による検出は行いません。
 
 frontmatter も利用できます。
 
@@ -25,7 +25,7 @@ translation: getting-started
 ---
 ```
 
-組み合わせた場合の組み込み規則の優先順位は **frontmatter > ファイル名 > ディレクトリ > 既定言語** です。矛盾は `L10N_LANGUAGE_CONFLICT`、同一 `translation + lang` の重複は `L10N_DUPLICATE_TRANSLATION` として診断します。`strict: true` ではビルドを失敗させます。
+組み合わせた場合の組み込み規則の優先順位は **frontmatter > 独自検出 > ファイル名 > 既定言語** です。矛盾は `L10N_LANGUAGE_CONFLICT`、同一 `translation + lang` の重複は `L10N_DUPLICATE_TRANSLATION` として診断します。`strict: true` ではビルドを失敗させます。
 
 `translation` はロケール検出とは別です。異なるパス・ファイル名でも明示的な ID でグループ化できます。翻訳がない言語のページを複製・生成することはありません。
 
@@ -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 だけを無効化します。
@@ -69,8 +69,8 @@ l10n({
 });
 ```
 
-独自検出の言語は frontmatter より弱く、ファイル名・ディレクトリより強く扱われます。`translationId` は明示的な翻訳グループ ID です。
+独自検出の言語は frontmatter より弱く、ファイル名より強く扱われます。`translationId` は明示的な翻訳グループ ID です。
 
 ## 関連リンク
 
-- [プラグイン API](../../../docs/ja/docs/reference/plugin-api.md)
+- [プラグイン API](../../../docs/docs/reference/plugin-api.md)

package/dist/index.js

@@ -1,6 +1,7 @@
 // src/l10n.ts
 import {
   appendContentBodySlot,
+  attachErrorPath,
   createStyleAsset,
   definePlugin
 } from "@riebeckite/core";
@@ -24,7 +25,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 +109,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 +117,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,14 +134,14 @@ 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.metadata?.[LANGUAGE_METADATA_KEY]).find(
+  return manifest.discoverableEntries.map((entry) => entry.publicLocation.language).find(
     (language) => language?.toLocaleLowerCase() === firstSegment.toLocaleLowerCase()
   );
 }
@@ -208,7 +208,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
   };
 }
@@ -233,16 +233,11 @@ function detectContents(entries, options) {
       entry.path,
       options.languageByLowercase
     );
-    const directoryLanguage = detectDirectoryLanguage(
-      entry.path,
-      options.languageByLowercase
-    );
     const detectorContext = {
       path: entry.path,
       slug: entry.slug,
       frontmatter,
-      filenameLanguage,
-      directoryLanguage
+      filenameLanguage
     };
     const custom = options.detect?.(detectorContext);
     const frontmatterLanguage = configuredLanguage(
@@ -252,8 +247,7 @@ function detectContents(entries, options) {
     const signals = compactSignals({
       custom: configuredLanguage(custom?.lang, options.languageByLowercase),
       frontmatter: frontmatterLanguage,
-      filename: filenameLanguage,
-      directory: directoryLanguage
+      filename: filenameLanguage
     });
     addUnknownLanguageDiagnostic(
       diagnostics,
@@ -272,8 +266,8 @@ function detectContents(entries, options) {
     if (new Set(Object.values(signals)).size > 1) {
       diagnostics.push(conflictDiagnostic(entry, signals, options.strict));
     }
-    const lang = signals.frontmatter ?? signals.custom ?? signals.filename ?? signals.directory ?? options.defaultLang;
-    const translationId = readTranslationId(custom?.translationId ?? frontmatter.translation) ?? deriveTranslationId(entry.path, filenameLanguage, directoryLanguage);
+    const lang = signals.frontmatter ?? signals.custom ?? signals.filename ?? options.defaultLang;
+    const translationId = readTranslationId(custom?.translationId ?? frontmatter.translation) ?? deriveTranslationId(entry.path, filenameLanguage);
     const content = {
       path: entry.path,
       slug: entry.slug,
@@ -299,7 +293,12 @@ function parseFrontmatter(entry) {
     /^(?:\uFEFF)?---\s*\r?\n([\s\S]*?)\r?\n---\s*(?:\r?\n|$)/
   );
   if (!match) return {};
-  const value = parse(match[1] ?? "");
+  let value;
+  try {
+    value = parse(match[1] ?? "");
+  } catch (error) {
+    throw attachErrorPath(error, entry.path);
+  }
   if (value === null || typeof value !== "object" || Array.isArray(value)) {
     throw new Error(`Invalid frontmatter object: ${entry.path}`);
   }
@@ -313,10 +312,6 @@ function detectFilenameLanguage(path, languages) {
   }
   return void 0;
 }
-function detectDirectoryLanguage(path, languages) {
-  const first = path.split("/")[0]?.toLowerCase();
-  return first ? languages.get(first) : void 0;
-}
 function configuredLanguage(value, languages) {
   if (typeof value !== "string" || !value.trim()) return void 0;
   try {
@@ -325,9 +320,8 @@ function configuredLanguage(value, languages) {
     return void 0;
   }
 }
-function deriveTranslationId(path, filenameLanguage, directoryLanguage) {
+function deriveTranslationId(path, filenameLanguage) {
   const parts = path.replace(/\.md$/i, "").split("/");
-  if (directoryLanguage) parts.shift();
   const last = parts.pop() ?? "";
   const language = filenameLanguage?.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   parts.push(
@@ -347,13 +341,13 @@ function withLocalization(location, 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
     }
   };
@@ -369,13 +363,6 @@ function removeLocalePathSegments(permalink, content) {
     const suffix = new RegExp(`([._-])${escapeRegExp(filenameLanguage)}$`, "i");
     result = result.replace(suffix, "");
   }
-  const directoryLanguage = content.signals.directory;
-  if (directoryLanguage) {
-    result = result.replace(
-      new RegExp(`^/${escapeRegExp(directoryLanguage)}(?=/|$)`, "i"),
-      ""
-    );
-  }
   return result || "/";
 }
 function prefixLanguage(permalink, language) {
@@ -411,7 +398,7 @@ function addLocalizationHeadTags(manifest, state) {
         tag: "link",
         attrs: {
           rel: "alternate",
-          hreflang: translation.publicLocation.metadata?.[LANGUAGE_METADATA_KEY] ?? "",
+          hreflang: translation.publicLocation.language ?? "",
           href: translation.permalink
         }
       })
@@ -440,10 +427,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) {
@@ -461,10 +446,10 @@ function conflictDiagnostic(entry, signals, strict) {
     slug: entry.slug,
     message: `Conflicting localization metadata (${Object.entries(signals).map(([source, language]) => `${source}: ${language}`).join(
       ", "
-    )}); resolved to ${signals.frontmatter ?? signals.custom ?? signals.filename ?? signals.directory}.`,
+    )}); resolved to ${signals.frontmatter ?? signals.custom ?? signals.filename}.`,
     meta: {
       detected: signals,
-      resolved: signals.frontmatter ?? signals.custom ?? signals.filename ?? signals.directory
+      resolved: signals.frontmatter ?? signals.custom ?? signals.filename
     }
   };
 }

package/dist/src/l10n.d.ts

@@ -6,7 +6,6 @@ export type L10nContent = {
 };
 export type L10nDetectorContext = L10nContent & {
     readonly filenameLanguage: string | undefined;
-    readonly directoryLanguage: string | undefined;
 };
 /** A detector may provide a language and/or an explicit translation identity. */
 export type L10nDetectorResult = {
@@ -25,7 +24,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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riebeckite/plugin-l10n",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/index.js",
@@ -16,11 +16,11 @@
   },
   "dependencies": {
     "yaml": "^2.9.0",
-    "@riebeckite/core": "0.0.16"
+    "@riebeckite/core": "0.0.18"
   },
   "devDependencies": {
     "tsx": "^4.22.4",
-    "@riebeckite/plugin-obsidian-markdown": "0.0.16"
+    "@riebeckite/plugin-obsidian-markdown": "0.0.18"
   },
   "publishConfig": {
     "access": "public"