lightnet 3.4.4 → 3.4.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # lightnet
 
+## 3.4.6
+
+### Patch Changes
+
+- [#271](https://github.com/LightNetDev/LightNet/pull/271) [`1ad0515`](https://github.com/LightNetDev/LightNet/commit/1ad051587cdf68c34a919f414ad2b5c15ffd273e) Thanks [@smn-cds](https://github.com/smn-cds)! - Fix markdown sanitation for search result descriptions.
+
+## 3.4.5
+
+### Patch Changes
+
+- [#266](https://github.com/LightNetDev/LightNet/pull/266) [`4aff54c`](https://github.com/LightNetDev/LightNet/commit/4aff54c7bdd9f9cef26006950cfe7222685fba6c) Thanks [@smn-cds](https://github.com/smn-cds)! - Improve build performance of details pages.
+
 ## 3.4.4
 
 ### Patch Changes

package/__e2e__/fixtures/basics/node_modules/.bin/astro

@@ -6,9 +6,9 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/runner/work/LightNet/LightNet/node_modules/.pnpm/astro@5.7.13_@types+node@22.15.21_jiti@2.4.2_lightningcss@1.29.1_rollup@4.41.0_terser@5.39.0_typescript@5.8.3_yaml@2.8.0/node_modules/astro/node_modules:/home/runner/work/LightNet/LightNet/node_modules/.pnpm/astro@5.7.13_@types+node@22.15.21_jiti@2.4.2_lightningcss@1.29.1_rollup@4.41.0_terser@5.39.0_typescript@5.8.3_yaml@2.8.0/node_modules:/home/runner/work/LightNet/LightNet/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/home/runner/work/LightNet/LightNet/node_modules/.pnpm/astro@5.8.1_@types+node@22.15.29_jiti@2.4.2_lightningcss@1.29.1_rollup@4.41.1_terser@5.39.0_typescript@5.8.3_yaml@2.8.0/node_modules/astro/node_modules:/home/runner/work/LightNet/LightNet/node_modules/.pnpm/astro@5.8.1_@types+node@22.15.29_jiti@2.4.2_lightningcss@1.29.1_rollup@4.41.1_terser@5.39.0_typescript@5.8.3_yaml@2.8.0/node_modules:/home/runner/work/LightNet/LightNet/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/home/runner/work/LightNet/LightNet/node_modules/.pnpm/astro@5.7.13_@types+node@22.15.21_jiti@2.4.2_lightningcss@1.29.1_rollup@4.41.0_terser@5.39.0_typescript@5.8.3_yaml@2.8.0/node_modules/astro/node_modules:/home/runner/work/LightNet/LightNet/node_modules/.pnpm/astro@5.7.13_@types+node@22.15.21_jiti@2.4.2_lightningcss@1.29.1_rollup@4.41.0_terser@5.39.0_typescript@5.8.3_yaml@2.8.0/node_modules:/home/runner/work/LightNet/LightNet/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/home/runner/work/LightNet/LightNet/node_modules/.pnpm/astro@5.8.1_@types+node@22.15.29_jiti@2.4.2_lightningcss@1.29.1_rollup@4.41.1_terser@5.39.0_typescript@5.8.3_yaml@2.8.0/node_modules/astro/node_modules:/home/runner/work/LightNet/LightNet/node_modules/.pnpm/astro@5.8.1_@types+node@22.15.29_jiti@2.4.2_lightningcss@1.29.1_rollup@4.41.1_terser@5.39.0_typescript@5.8.3_yaml@2.8.0/node_modules:/home/runner/work/LightNet/LightNet/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
   exec "$basedir/node"  "$basedir/../astro/astro.js" "$@"

package/__e2e__/fixtures/basics/package.json

@@ -4,11 +4,11 @@
   "version": "0.0.1",
   "private": "true",
   "dependencies": {
-    "@astrojs/react": "^4.2.7",
+    "@astrojs/react": "^4.3.0",
     "@astrojs/tailwind": "^6.0.2",
     "@lightnet/decap-admin": "^3.1.1",
-    "astro": "^5.7.13",
-    "lightnet": "^3.4.3",
+    "astro": "^5.8.1",
+    "lightnet": "^3.4.4",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "sharp": "^0.33.5",

package/__tests__/utils/markdown.spec.ts

@@ -2,6 +2,27 @@ import { expect, test } from "vitest"
 
 import { markdownToText } from "../../src/utils/markdown"
 
+test("Should remove '\\' to force new lines", () => {
+  expect(markdownToText("a\\\nb\\ \nc")).toBe("a\nb \nc")
+})
+
+test("Should remove <br> to force new lines", () => {
+  expect(markdownToText("a <br> b<br>\nc")).toBe("a b \nc")
+})
+
+test("Should remove double white space", () => {
+  expect(markdownToText("a  b")).toBe("a b")
+})
+
+test("Should remove triple white space", () => {
+  expect(markdownToText("a   b")).toBe("a b")
+})
+
+test("Should remove escape character '\\'", () => {
+  // eslint-disable-next-line no-useless-escape
+  expect(markdownToText("a \\\* \\\# b")).toBe("a * # b")
+})
+
 test("Should remove headers", () => {
   expect(markdownToText("# H1\n## H2 words#")).toBe("H1\nH2 words#")
 })

package/package.json

@@ -2,7 +2,7 @@
   "name": "lightnet",
   "type": "module",
   "license": "MIT",
-  "version": "3.4.4",
+  "version": "3.4.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/LightNetDev/lightnet",
@@ -45,16 +45,16 @@
     "@iconify-json/mdi": "^1.2.3",
     "@iconify/tailwind": "^1.2.0",
     "@tailwindcss/typography": "^0.5.16",
-    "@types/react": "^19.1.5",
+    "@types/react": "^19.1.6",
     "daisyui": "^4.12.24",
     "fuse.js": "^7.1.0",
-    "i18next": "^25.2.0",
+    "i18next": "^25.2.1",
     "marked": "^15.0.12",
     "yaml": "^2.8.0"
   },
   "devDependencies": {
     "@playwright/test": "^1.52.0",
-    "@types/node": "^22.15.21",
+    "@types/node": "^22.15.29",
     "vitest": "^3.1.4"
   },
   "scripts": {

package/src/content/compare-media-collection-items.ts

@@ -0,0 +1,24 @@
+import type { MediaItemEntry } from "./content-schema-internal"
+
+export function compareMediaCollectionItems(
+  item1: MediaItemEntry,
+  item2: MediaItemEntry,
+  collectionId: string,
+) {
+  const getIndex = (item: MediaItemEntry) =>
+    item.data.collections?.find(
+      ({ collection }) => collection.id === collectionId,
+    )?.index
+  const index1 = getIndex(item1)
+  const index2 = getIndex(item2)
+  if (index1 === index2) {
+    return item1.id.localeCompare(item2.id)
+  }
+  if (index1 === undefined && index2 !== undefined) {
+    return 1
+  }
+  if (index1 !== undefined && index2 === undefined) {
+    return -1
+  }
+  return index1! - index2!
+}

package/src/content/query-media-items.ts

@@ -1,3 +1,4 @@
+import { compareMediaCollectionItems } from "./compare-media-collection-items"
 import type { MediaItemEntry } from "./content-schema-internal"
 
 export type MediaItemQuery<TMediaItem extends MediaItemEntry> = {
@@ -59,31 +60,8 @@ export const queryMediaItems = async <TMediaItem extends MediaItemEntry>(
   }
   const { collection } = where
   if (!orderBy && collection) {
-    items.sort((a, b) => compareCollectionItems(a, b, collection))
+    items.sort((a, b) => compareMediaCollectionItems(a, b, collection))
   }
 
   return items.slice(0, limit)
 }
-
-function compareCollectionItems(
-  item1: MediaItemEntry,
-  item2: MediaItemEntry,
-  collectionId: string,
-) {
-  const getIndex = (item: MediaItemEntry) =>
-    item.data.collections?.find(
-      ({ collection }) => collection.id === collectionId,
-    )?.index
-  const index1 = getIndex(item1)
-  const index2 = getIndex(item2)
-  if (index1 === index2) {
-    return item1.id.localeCompare(item2.id)
-  }
-  if (index1 === undefined && index2 !== undefined) {
-    return 1
-  }
-  if (index1 !== undefined && index2 === undefined) {
-    return -1
-  }
-  return index1! - index2!
-}

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

@@ -1,9 +1,10 @@
 ---
 import type { GetStaticPaths } from "astro"
 import { AstroError } from "astro/errors"
+import { getCollection } from "astro:content"
 import config from "virtual:lightnet/config"
 
-import { getMediaItem, getMediaItems } from "../../content/get-media-items"
+import { getMediaItem } from "../../content/get-media-items"
 import { getMediaType } from "../../content/get-media-types"
 import { resolveLocales } from "../../i18n/resolve-locales"
 import AudioDetailsPage from "./AudioDetailsPage.astro"
@@ -11,7 +12,7 @@ import DefaultDetailsPage from "./DefaultDetailsPage.astro"
 import VideoDetailsPage from "./VideoDetailsPage.astro"
 
 export const getStaticPaths = (async () => {
-  const mediaItems = await getMediaItems()
+  const mediaItems = await getCollection("media")
   return resolveLocales(config).flatMap((locale) =>
     mediaItems.map(({ id: mediaId }) => ({ params: { mediaId, locale } })),
   )

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

@@ -3,8 +3,7 @@ import { AstroError } from "astro/errors"
 import { getEntry } from "astro:content"
 
 import MediaList from "../../../components/MediaList.astro"
-import { getMediaItems } from "../../../content/get-media-items"
-import { queryMediaItems } from "../../../content/query-media-items"
+import { getCollectionItems } from "../utils/get-collection-items"
 
 interface Props {
   collectionId: string
@@ -19,11 +18,10 @@ if (!collection) {
     `To fix the issue, add a media-collection at "src/content/media-collections/${collectionId}.json".`,
   )
 }
-const items = (
-  await queryMediaItems(getMediaItems(), {
-    where: { collection: collection.id },
-  })
-).map((item) => ({ ...item, disabled: item.id === disableItem }))
+const items = (await getCollectionItems(collection.id)).map((item) => ({
+  ...item,
+  disabled: item.id === disableItem,
+}))
 
 if (items.length < 2) {
   return

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

@@ -1,10 +1,8 @@
 ---
-import {
-  getMediaItem,
-  getMediaItems,
-} from "../../../../content/get-media-items"
+import { getMediaItem } from "../../../../content/get-media-items"
 import { resolveTranslatedLanguage } from "../../../../i18n/resolve-language"
 import { detailsPagePath } from "../../../../utils/paths"
+import { getTranslations } from "../../utils/get-translations"
 import Label from "./Label.astro"
 
 interface Props {
@@ -14,12 +12,7 @@ interface Props {
 const item = await getMediaItem(Astro.props.mediaId)
 
 const { mediaId } = Astro.props
-const translations = (await getMediaItems())
-  .filter(
-    (entry) =>
-      entry.data.commonId === item.data.commonId && entry.id !== mediaId,
-  )
-  .sort((a, b) => a.data.language.localeCompare(b.data.language))
+const translations = await getTranslations(mediaId)
 
 const { t } = Astro.locals.i18n
 ---
@@ -35,9 +28,9 @@ const { t } = Astro.locals.i18n
         <li class="flex rounded-lg border border-gray-200 px-4 py-1 text-gray-600 hover:bg-gray-200">
           <a
             href={detailsPagePath(Astro.currentLocale, translation)}
-            hreflang={translation.data.language}
+            hreflang={translation.language}
           >
-            {resolveTranslatedLanguage(translation.data.language, t).name}
+            {resolveTranslatedLanguage(translation.language, t).name}
           </a>
         </li>
       ))

package/src/pages/details-page/utils/get-collection-items.ts

@@ -0,0 +1,29 @@
+import { compareMediaCollectionItems } from "../../../content/compare-media-collection-items"
+import type { MediaItemEntry } from "../../../content/content-schema-internal"
+import { getMediaItems } from "../../../content/get-media-items"
+
+const groupItemsByCollections = async () => {
+  const items = await getMediaItems()
+  items.forEach((item) => {
+    item.data.collections?.forEach(({ collection }) => {
+      if (!itemsByCollections.has(collection.id)) {
+        itemsByCollections.set(collection.id, [])
+      }
+      itemsByCollections.get(collection.id)?.push(item)
+    })
+  })
+  itemsByCollections.forEach((entries, collectionId) =>
+    entries.sort((a, b) => compareMediaCollectionItems(a, b, collectionId)),
+  )
+}
+
+let isInitialized = false
+const itemsByCollections = new Map<string, MediaItemEntry[]>()
+
+export const getCollectionItems = async (collectionId: string) => {
+  if (!isInitialized) {
+    isInitialized = true
+    await groupItemsByCollections()
+  }
+  return itemsByCollections.get(collectionId) ?? []
+}

package/src/pages/details-page/utils/get-translations.ts

@@ -0,0 +1,34 @@
+import { getMediaItem, getMediaItems } from "../../../content/get-media-items"
+
+const groupItemsByCommonId = async () => {
+  const items = await getMediaItems()
+  items.forEach(({ id, data: { commonId, language } }) => {
+    if (!itemsByCommonId.has(commonId)) {
+      itemsByCommonId.set(commonId, [])
+    }
+    itemsByCommonId.get(commonId)?.push({ id, language })
+  })
+  itemsByCommonId.forEach((value, key) => {
+    if (value.length < 2) {
+      itemsByCommonId.delete(key)
+    }
+  })
+}
+
+let isInitialized = false
+const itemsByCommonId = new Map<string, { id: string; language: string }[]>()
+
+export const getTranslations = async (mediaId: string) => {
+  if (!isInitialized) {
+    isInitialized = true
+    await groupItemsByCommonId()
+  }
+  const item = await getMediaItem(mediaId)
+  const sameCommonId = itemsByCommonId.get(item.data.commonId)
+  if (!sameCommonId) {
+    return []
+  }
+  return sameCommonId
+    .filter(({ id }) => id !== mediaId)
+    .sort((a, b) => a.language.localeCompare(b.language))
+}

package/src/utils/markdown.ts

@@ -6,12 +6,15 @@ import { marked } from "marked"
  * @param markdown string
  * @returns plain text
  */
+
 export function markdownToText(markdown?: string) {
   if (!markdown) {
     return markdown
   }
   return (
     markdown
+      // line breaks
+      .replaceAll(/<br>/g, " ")
       //headers
       .replaceAll(/^#+ ?/gm, "")
       // lists
@@ -19,11 +22,15 @@ export function markdownToText(markdown?: string) {
       // block quotes
       .replaceAll(/^>+ ?/gm, "")
       // bold and italics
-      .replaceAll(/[*_]/g, "")
+      .replaceAll(/(?<!\\)[*_]/g, "")
       // images
       .replaceAll(/!\[(.*?)\]\(.*?\)/g, (_, imgAlt) => imgAlt)
       // links
       .replaceAll(/\[(.*?)\]\(.*?\)/g, (_, linkLabel) => linkLabel)
+      // escape character '\'
+      .replaceAll(/\\/g, "")
+      // multi white spaces
+      .replaceAll(/  +/g, " ")
   )
 }