lightnet 4.0.7 → 4.1.0

package/src/layouts/components/PageNavigation.astro

@@ -9,28 +9,24 @@ import Menu from "./Menu.astro"
 import MenuItem from "./MenuItem.astro"
 
 const currentPath = Astro.url.pathname
-const { t, tMap, currentLocale } = Astro.locals.i18n
+const { t, tConfigField, currentLocale } = Astro.locals.i18n
 
-const items = (config.mainMenu ?? []).map(
-  ({ href, label, requiresLocale }, index) => {
-    const isExternal = isExternalUrl(href)
-    const path =
-      isExternal || !requiresLocale ? href : localizePath(currentLocale, href)
-    const isActive =
-      !isExternal &&
-      (currentPath === localizePath(currentLocale, href) ||
-        currentPath === localizePath(currentLocale, `${href}/`) ||
-        currentPath === href)
-    return {
-      path,
-      isExternal,
-      labelText: tMap(label, {
-        path: ["config", "mainMenu", index, "label"],
-      }),
-      isActive,
-    }
-  },
-)
+const items = (config.mainMenu ?? []).map(({ href, label, requiresLocale }) => {
+  const isExternal = isExternalUrl(href)
+  const path =
+    isExternal || !requiresLocale ? href : localizePath(currentLocale, href)
+  const isActive =
+    !isExternal &&
+    (currentPath === localizePath(currentLocale, href) ||
+      currentPath === localizePath(currentLocale, `${href}/`) ||
+      currentPath === href)
+  return {
+    path,
+    isExternal,
+    labelText: tConfigField(label, config),
+    isActive,
+  }
+})
 ---
 
 <nav class="-me-3 flex items-center">

package/src/layouts/components/PageTitle.astro

@@ -14,18 +14,14 @@ function getWidth(logo: ImageMetadata) {
   return Math.floor(size * Math.max(1, logo.width / logo.height))
 }
 
-const { currentLocale, tMap } = Astro.locals.i18n
+const { currentLocale, tConfigField } = Astro.locals.i18n
 
 const logoAlt = (() => {
   if (config.logo?.alt) {
-    return tMap(config.logo.alt, {
-      path: ["config", "logo", "alt"],
-    })
+    return tConfigField(config.logo.alt, config)
   }
   if (config.logo?.replacesTitle) {
-    return tMap(config.title, {
-      path: ["config", "title"],
-    })
+    return tConfigField(config.title, config)
   }
   return ""
 })()
@@ -53,10 +49,5 @@ const logoAlt = (() => {
           loading="eager"
         />
       ))
-  }{
-    !config.logo?.replacesTitle &&
-      tMap(config.title, {
-        path: ["config", "title"],
-      })
-  }</a
+  }{!config.logo?.replacesTitle && tConfigField(config.title, config)}</a
 >

package/src/pages/details-page/DefaultDetailsPage.astro

@@ -1,5 +1,4 @@
 ---
-import type { TranslationMap } from "../../i18n/translate-map"
 import ContentSection from "./components/ContentSection.astro"
 import DescriptionSection from "./components/DescriptionSection.astro"
 import DetailsPage from "./components/DetailsPage.astro"
@@ -10,25 +9,13 @@ import MoreDetailsSection from "./components/MoreDetailsSection.astro"
 
 export type Props = {
   mediaId: string
-  openActionLabel?: TranslationMap
 }
-
-const defaultOpenActionLabel = Object.fromEntries(
-  Astro.locals.i18n.locales.map((locale) => [
-    locale,
-    Astro.locals.i18n.t("ln.details.open", { lng: locale }),
-  ]),
-)
-const { mediaId, openActionLabel = defaultOpenActionLabel } = Astro.props
+const { mediaId } = Astro.props
 ---
 
 <DetailsPage mediaId={mediaId}>
   <MainDetailsSection mediaId={mediaId}>
-    <OpenButton
-      className="mt-8"
-      mediaId={mediaId}
-      openActionLabel={openActionLabel}
-    />
+    <OpenButton className="mt-8" mediaId={mediaId} />
   </MainDetailsSection>
   <DescriptionSection mediaId={mediaId} />
   <ContentSection mediaId={mediaId} />

package/src/pages/details-page/components/AudioPanel.astro

@@ -9,13 +9,14 @@ interface Props {
 }
 
 const { mediaId, className } = Astro.props
-const { tMap } = Astro.locals.i18n
+const { tContentField } = Astro.locals.i18n
 
 const item = await getMediaItem(mediaId)
 
-const content = item.data.content.map((contentItem, index) =>
-  createContentMetadata(contentItem, tMap, {
-    path: ["media-items", mediaId, "content", index],
+const content = item.data.content.map(({ url, label }) =>
+  createContentMetadata({
+    url,
+    labelText: label && tContentField(label, item),
   }),
 )
 ---

package/src/pages/details-page/components/ContentSection.astro

@@ -30,11 +30,12 @@ const item = await getMediaItem(mediaId)
 if (item.data.content.length < minimumItems) {
   return
 }
-const { t, tMap, direction } = Astro.locals.i18n
+const { t, tContentField, direction } = Astro.locals.i18n
 
-const content = item.data.content.map((contentItem, index) =>
-  createContentMetadata(contentItem, tMap, {
-    path: ["media-items", mediaId, "content", index],
+const content = item.data.content.map(({ url, label }) =>
+  createContentMetadata({
+    url,
+    labelText: label && tContentField(label, item),
   }),
 )
 const typeIcons: Record<UrlType, LucideIcon> = {

package/src/pages/details-page/components/MediaCollection.astro

@@ -26,7 +26,7 @@ const items = (await getEntries(collection.data.mediaItems)).map((item) => ({
 if (items.length < 2) {
   return
 }
-const { t, tMap } = Astro.locals.i18n
+const { t, tContentField } = Astro.locals.i18n
 ---
 
 <section class="mx-auto mt-16 max-w-screen-md px-4 md:mt-20 md:px-8">
@@ -34,11 +34,7 @@ const { t, tMap } = Astro.locals.i18n
     {t("ln.details.part-of-collection")}
   </h2>
   <h3 class="mb-6 text-lg font-bold text-gray-700 sm:mb-8">
-    {
-      tMap(collection.data.label, {
-        path: ["media-collections", collectionId, "label"],
-      })
-    }
+    {tContentField(collection.data.label, collection)}
   </h3>
   <MediaList items={items} />
 </section>

package/src/pages/details-page/components/main-details/OpenButton.astro

@@ -2,20 +2,33 @@
 import { ExternalLinkIcon } from "lucide-react"
 
 import { getMediaItem } from "../../../../content/get-media-items"
-import type { TranslationMap } from "../../../../i18n/translate-map"
+import { getMediaType } from "../../../../content/get-media-types"
 import { createContentMetadata } from "../../utils/create-content-metadata"
 
 interface Props {
   mediaId: string
-  openActionLabel: TranslationMap
   className?: string
 }
-const { mediaId, openActionLabel, className } = Astro.props
-const { tMap } = Astro.locals.i18n
+const { mediaId, className } = Astro.props
+const { tContentField, t } = Astro.locals.i18n
 const item = await getMediaItem(mediaId)
-const content = createContentMetadata(item.data.content[0], tMap, {
-  path: ["media-items", mediaId, "content", 0],
+const { url, label } = item.data.content[0]
+const content = createContentMetadata({
+  url,
+  labelText: label && tContentField(label, item),
 })
+const mediaType = await getMediaType(item.data.type.id)
+
+const getOpenActionLabel = () => {
+  const defaultLabel = t("ln.details.open")
+  if (mediaType.data.detailsPage?.layout !== "default") {
+    return defaultLabel
+  }
+  if (!mediaType.data.detailsPage.openActionLabel) {
+    return defaultLabel
+  }
+  return tContentField(mediaType.data.detailsPage.openActionLabel, mediaType)
+}
 ---
 
 <a
@@ -26,16 +39,5 @@ const content = createContentMetadata(item.data.content[0], tMap, {
   class:list={[className]}
 >
   {content.isExternal && <ExternalLinkIcon className="shrink-0" />}
-  {
-    content.canBeOpened
-      ? tMap(openActionLabel, {
-          path: [
-            "media-types",
-            item.data.type.id,
-            "detailsPage",
-            "openActionLabel",
-          ],
-        })
-      : Astro.locals.i18n.t("ln.details.download")
-  }
+  {content.canBeOpened ? getOpenActionLabel() : t("ln.details.download")}
 </a>

package/src/pages/details-page/components/more-details/Categories.astro

@@ -10,10 +10,10 @@ interface Props {
 
 const item = await getMediaItem(Astro.props.mediaId)
 
-const { t, tMap, currentLocale } = Astro.locals.i18n
+const { t, tContentField, currentLocale } = Astro.locals.i18n
 
 const categories = await Promise.all(
-  item.data.categories?.map(({ id }) => getCategory(id)) ?? [],
+  item.data.categories?.map(({ id }) => getCategory(id, tContentField)) ?? [],
 )
 ---
 
@@ -29,9 +29,7 @@ const categories = await Promise.all(
                 category: category.id,
               })}
             >
-              {tMap(category.label, {
-                path: ["categories", category.id, "label"],
-              })}
+              {category.labelText}
             </a>
           </li>
         ))}

package/src/pages/details-page/components/more-details/Languages.astro

@@ -14,12 +14,16 @@ const item = await getMediaItem(Astro.props.mediaId)
 const { mediaId } = Astro.props
 const translations = await getTranslations(mediaId)
 
-const { t, tMap, currentLocale } = Astro.locals.i18n
-const currentLanguage = resolveTranslatedLanguage(item.data.language, tMap)
+const { t, tConfigField, currentLocale } = Astro.locals.i18n
+const currentLanguage = resolveTranslatedLanguage(
+  item.data.language,
+  tConfigField,
+)
 const translationLanguages = await Promise.all(
   translations.map(async (translation) => ({
     ...translation,
-    labelText: resolveTranslatedLanguage(translation.language, tMap).labelText,
+    labelText: resolveTranslatedLanguage(translation.language, tConfigField)
+      .labelText,
   })),
 )
 ---

package/src/pages/details-page/utils/create-content-metadata.ts

@@ -1,7 +1,3 @@
-import {
-  type TranslateMapFn,
-  type TranslationMap,
-} from "../../../i18n/translate-map"
 import { isExternalUrl } from "../../../utils/urls"
 
 export type UrlType =
@@ -47,17 +43,13 @@ const KNOWN_EXTENSIONS: Record<
   docx: { type: "text" },
 } as const
 
-export function createContentMetadata(
-  {
-    url,
-    label: customLabel,
-  }: {
-    url: string
-    label?: TranslationMap
-  },
-  tMap: TranslateMapFn,
-  context: { path: (string | number)[] },
-) {
+export function createContentMetadata({
+  url,
+  labelText: customLabel,
+}: {
+  url: string
+  labelText?: string
+}) {
   const isExternal = isExternalUrl(url)
   const path = isExternal ? new URL(url).pathname : url
 
@@ -72,13 +64,7 @@ export function createContentMetadata(
     ? lastPathSegment.slice(0, -(extension.length + 1))
     : undefined
 
-  const labelText =
-    (customLabel &&
-      tMap(customLabel, {
-        path: [...context.path, "label"],
-      })) ??
-    fileName ??
-    linkName
+  const labelText = customLabel ?? fileName ?? linkName
   const type = KNOWN_EXTENSIONS[extension]?.type ?? "link"
   const canBeOpened =
     !hasExtension || !!KNOWN_EXTENSIONS[extension]?.canBeOpened

package/src/pages/search-page/api/search.ts

@@ -1,8 +1,8 @@
 import type { APIRoute } from "astro"
 import { getImage } from "astro:assets"
 
-import type { MediaItemEntry } from "../../../content/content-schema"
 import { getMediaItems } from "../../../content/get-media-items"
+import type { MediaItemEntry } from "../../../content/schema/media-item"
 import { markdownToText } from "../../../utils/markdown"
 import type { SearchItem } from "./search-response"
 

package/src/pages/search-page/components/SearchFilter.astro

@@ -2,22 +2,22 @@
 import config from "virtual:lightnet/config"
 
 import { getUsedCategories } from "../../../content/get-categories"
-import { getUsedLanguages } from "../../../content/get-languages"
+import { getContentLanguages } from "../../../content/get-languages"
 import { getUsedMediaTypes } from "../../../content/get-media-types"
 import { prepareI18nConfig } from "../../../i18n/react/prepare-i18n-config"
 import SearchFilterReact from "./SearchFilter.tsx"
 
-const { currentLocale, tMap } = Astro.locals.i18n
+const { currentLocale, tConfigField, tContentField } = Astro.locals.i18n
 
-const categories = (await getUsedCategories(currentLocale, tMap)).map(
+const categories = (await getUsedCategories(currentLocale, tContentField)).map(
   ({ id, labelText }) => ({ id, labelText }),
 )
 
-const mediaTypes = (await getUsedMediaTypes(currentLocale, tMap)).map(
+const mediaTypes = (await getUsedMediaTypes(currentLocale, tContentField)).map(
   ({ id, labelText }) => ({ id, labelText }),
 )
 
-const languages = (await getUsedLanguages(currentLocale, tMap)).map(
+const languages = (await getContentLanguages(currentLocale, tConfigField)).map(
   ({ code: id, labelText }) => ({ id, labelText }),
 )
 

package/src/pages/search-page/components/SearchList.astro

@@ -2,42 +2,45 @@
 import { getCollection } from "astro:content"
 
 import { getUsedCategories } from "../../../content/get-categories"
-import { getUsedLanguages } from "../../../content/get-languages"
-import { getMediaTypes } from "../../../content/get-media-types"
+import { getContentLanguages } from "../../../content/get-languages"
+import { getTranslatedMediaTypes } from "../../../content/get-media-types"
 import { prepareI18nConfig } from "../../../i18n/react/prepare-i18n-config"
 import SearchListReact from "./SearchList.tsx"
 
-const { currentLocale, tMap } = Astro.locals.i18n
+const { currentLocale, tContentField, tConfigField } = Astro.locals.i18n
 
 const categories: Record<string, string> = {}
-for (const { id, labelText } of await getUsedCategories(currentLocale, tMap)) {
+for (const { id, labelText } of await getUsedCategories(
+  currentLocale,
+  tContentField,
+)) {
   categories[id] = labelText
 }
 
 const mediaTypes = Object.fromEntries(
-  (await getMediaTypes()).map((type) => [
-    type.id,
-    {
-      labelText: tMap(type.data.label, {
-        path: ["media-types", type.id, "label"],
-      }),
-      icon: type.data.icon,
-      coverImageStyle: type.data.coverImageStyle,
-    },
-  ]),
+  (await getTranslatedMediaTypes(currentLocale, tContentField)).map(
+    ({ labelText, icon, coverImageStyle, id }) => [
+      id,
+      {
+        labelText,
+        icon,
+        coverImageStyle,
+      },
+    ],
+  ),
 )
 
-const contentLanguagesList = await getUsedLanguages(currentLocale, tMap)
+const contentLanguages = await getContentLanguages(currentLocale, tConfigField)
 const languages = Object.fromEntries(
-  contentLanguagesList.map((language) => [
-    language.code,
-    { direction: language.direction, labelText: language.labelText },
+  contentLanguages.map(({ code, direction, labelText }) => [
+    code,
+    { direction, labelText },
   ]),
 )
 
 const mediaItemsTotal = (await getCollection("media")).length
 
-const showLanguage = contentLanguagesList.length > 1
+const showLanguage = contentLanguages.length > 1
 
 const i18nConfig = prepareI18nConfig(Astro.locals.i18n, [
   "ln.search.no-results",

package/src/astro-integration/validators/validate-inline-translations.ts

@@ -1,51 +0,0 @@
-import { z } from "astro/zod"
-
-export const validateInlineTranslations = (
-  config: {
-    title: Record<string, string>
-    languages: { label: Record<string, string> }[]
-    mainMenu?: { label: Record<string, string> }[]
-    logo?: { alt?: Record<string, string> }
-  },
-  locales: string[],
-  defaultLocale: string,
-  ctx: z.RefinementCtx,
-) => {
-  const validateInlineTranslation = (
-    inlineTranslation: Record<string, string> | undefined,
-    path: (string | number)[],
-  ) => {
-    if (!inlineTranslation) {
-      return
-    }
-
-    if (!(defaultLocale in inlineTranslation)) {
-      ctx.addIssue({
-        code: "custom",
-        message: `Missing translation for default locale "${defaultLocale}"`,
-        path: [...path, defaultLocale],
-      })
-    }
-
-    for (const locale of Object.keys(inlineTranslation)) {
-      if (locales.includes(locale)) {
-        continue
-      }
-
-      ctx.addIssue({
-        code: "custom",
-        message: `Invalid locale "${locale}". Inline translations only support configured site locales: ${locales.join(", ")}`,
-        path: [...path, locale],
-      })
-    }
-  }
-
-  validateInlineTranslation(config.title, ["title"])
-  for (const [index, language] of config.languages.entries()) {
-    validateInlineTranslation(language.label, ["languages", index, "label"])
-  }
-  for (const [index, link] of (config.mainMenu ?? []).entries()) {
-    validateInlineTranslation(link.label, ["mainMenu", index, "label"])
-  }
-  validateInlineTranslation(config.logo?.alt, ["logo", "alt"])
-}