starlight-obsidian 0.12.1 → 0.14.0

package/CHANGELOG.md

@@ -1,5 +1,62 @@
 # starlight-obsidian
 
+## 0.14.0
+
+### Minor Changes
+
+- [#77](https://github.com/HiDeoo/starlight-obsidian/pull/77) [`5818330`](https://github.com/HiDeoo/starlight-obsidian/commit/5818330456dd11d03f9787f4d9b6a4e68359d02d) Thanks [@HiDeoo](https://github.com/HiDeoo)! - Adds support for Astro v7, drops support for Astro v6.
+
+  ⚠️ **BREAKING CHANGE:** The minimum supported version of Starlight is now `0.41.0`.
+
+  Please follow the [upgrade guide](https://github.com/withastro/starlight/releases/tag/%40astrojs%2Fstarlight%400.41.0) to update your project.
+
+- [#77](https://github.com/HiDeoo/starlight-obsidian/pull/77) [`5818330`](https://github.com/HiDeoo/starlight-obsidian/commit/5818330456dd11d03f9787f4d9b6a4e68359d02d) Thanks [@HiDeoo](https://github.com/HiDeoo)! - Adds support for the Sätteri Markdown processor.
+
+## 0.13.0
+
+### Minor Changes
+
+- [#74](https://github.com/HiDeoo/starlight-obsidian/pull/74) [`175ab3f`](https://github.com/HiDeoo/starlight-obsidian/commit/175ab3f553eb77ee4004d30330c05b6f416393b4) Thanks [@HiDeoo](https://github.com/HiDeoo)! - ⚠️ **BREAKING CHANGE:** The minimum supported version of Starlight is now `0.39.0`.
+
+  Please use the `@astrojs/upgrade` command to upgrade your project:
+
+  ```sh
+  npx @astrojs/upgrade
+  ```
+
+- [#74](https://github.com/HiDeoo/starlight-obsidian/pull/74) [`175ab3f`](https://github.com/HiDeoo/starlight-obsidian/commit/175ab3f553eb77ee4004d30330c05b6f416393b4) Thanks [@HiDeoo](https://github.com/HiDeoo)! - ⚠️ **BREAKING CHANGE:** Updates sidebar generation to support Starlight `0.39` autogenerated sidebar entries.
+
+  The previously exported `obsidianSidebarGroup` has been replaced by `obsidianSidebarEntries`, which now expands to the generated Obsidian sidebar entries.
+  The `sidebar.label` and `sidebar.collapsed` plugin options have been removed.
+
+  To migrate, create a [sidebar group](https://starlight.astro.build/guides/sidebar/#groups) in your Starlight configuration and place `obsidianSidebarEntries` in that group’s `items` array:
+
+  ```diff
+  -import starlightObsidian, { obsidianSidebarGroup } from 'starlight-obsidian'
+  +import starlightObsidian, { obsidianSidebarEntries } from 'starlight-obsidian'
+
+  starlight({
+    plugins: [
+      starlightObsidian({
+        vault: '../path/to/vault',
+        sidebar: {
+  -       label: 'Notes',
+  -       collapsed: true,
+          collapsedFolders: true,
+        },
+      }),
+    ],
+    sidebar: [
+  -   obsidianSidebarGroup,
+  +   {
+  +     label: 'Notes',
+  +     collapsed: true,
+  +     items: [obsidianSidebarEntries],
+  +   },
+    ],
+  })
+  ```
+
 ## 0.12.1
 
 ### Patch Changes

package/index.ts

@@ -4,11 +4,16 @@ import type { StarlightPlugin, StarlightUserConfig } from '@astrojs/starlight/ty
 import type { AstroIntegrationLogger } from 'astro'
 import { z } from 'astro/zod'
 
+import { throwPluginError } from './libs/error'
 import { starlightObsidianIntegration } from './libs/integration'
 import { getObsidianPaths, getVault } from './libs/obsidian'
 import { stripLeadingAndTrailingSlashes } from './libs/path'
-import { throwUserError } from './libs/plugin'
-import { addObsidianFiles, getSidebarFromConfig, getSidebarGroupPlaceholder, type SidebarGroup } from './libs/starlight'
+import {
+  addObsidianFiles,
+  getSidebarEntriesPlaceholder,
+  getSidebarFromConfig,
+  type SidebarAutoEntries,
+} from './libs/starlight'
 
 const starlightObsidianConfigSchema = z.object({
   /**
@@ -88,31 +93,24 @@ const starlightObsidianConfigSchema = z.object({
    */
   skipGeneration: z.boolean().default(false),
   /**
-   * The generated vault pages sidebar group configuration.
+   * The generated vault pages sidebar entries configuration.
    */
   sidebar: z
     .object({
       /**
-       * Whether the generated vault pages root sidebar group should be collapsed by default.
-       *
-       * @default false
+       * @deprecated Use the `collapsed` option of the Starlight sidebar group that contains the vault pages instead.
        */
-      collapsed: z.boolean().default(false),
+      collapsed: z.never().optional(),
       /**
        * Whether the sidebar groups of your vault nested folders should be collapsed by default.
        *
-       * Defaults to the value of the `collapsed` option.
+       * @default false
        */
-      collapsedFolders: z.boolean().optional(),
+      collapsedFolders: z.boolean().default(false),
       /**
-       * The generated vault pages sidebar group label.
-       *
-       * The value can be a string, or for multilingual sites, an object with values for each different locale.
-       * When using the object form, the keys must be BCP-47 tags (e.g. `en`, `ar`, or `zh-CN`).
-       *
-       * @default 'Notes'
+       * @deprecated Use the `label` option of the Starlight sidebar group that contains the vault pages instead.
        */
-      label: z.union([z.string(), z.record(z.string(), z.string())]).default('Notes'),
+      label: z.never().optional(),
     })
     .prefault({}),
   /**
@@ -131,19 +129,22 @@ const starlightObsidianConfigSchema = z.object({
 
 let overridesInjected = false
 
-export const obsidianSidebarGroup = getSidebarGroupPlaceholder()
+export const obsidianSidebarEntries = getSidebarEntriesPlaceholder()
 
 export default function starlightObsidianPlugin(userConfig: StarlightObsidianUserConfig): StarlightPlugin {
-  return makeStarlightObsidianPlugin(obsidianSidebarGroup)(userConfig)
+  return makeStarlightObsidianPlugin(obsidianSidebarEntries)(userConfig)
 }
 
-export function createStarlightObsidianPlugin(): [plugin: typeof starlightObsidianPlugin, sidebarGroup: SidebarGroup] {
-  const sidebarGroup = getSidebarGroupPlaceholder(Symbol(randomBytes(24).toString('base64url')))
-  return [makeStarlightObsidianPlugin(sidebarGroup), sidebarGroup]
+export function createStarlightObsidianPlugin(): [
+  plugin: typeof starlightObsidianPlugin,
+  sidebarEntries: SidebarAutoEntries,
+] {
+  const sidebarEntries = getSidebarEntriesPlaceholder(Symbol(randomBytes(24).toString('base64url')))
+  return [makeStarlightObsidianPlugin(sidebarEntries), sidebarEntries]
 }
 
 function makeStarlightObsidianPlugin(
-  sidebarGroup: SidebarGroup,
+  sidebarEntries: SidebarAutoEntries,
 ): (userConfig: StarlightObsidianUserConfig) => StarlightPlugin {
   overridesInjected = true
 
@@ -151,18 +152,30 @@ function makeStarlightObsidianPlugin(
     const parsedConfig = starlightObsidianConfigSchema.safeParse(userConfig)
 
     if (!parsedConfig.success) {
+      const isUsingRemovedSidebarGroupConfig = parsedConfig.error.issues.some((issue) => {
+        const path = issue.path.join('.')
+        return path === 'sidebar.label' || path === 'sidebar.collapsed'
+      })
+
+      if (isUsingRemovedSidebarGroupConfig) {
+        throwPluginError(
+          'The `sidebar.label` and `sidebar.collapsed` options have been removed.',
+          'Create a group in your Starlight sidebar configuration, set the `label` and `collapsed` options on that group, and add `obsidianSidebarEntries` to its `items` array.\nFor more information see https://starlight.astro.build/guides/sidebar/#groups',
+        )
+      }
+
       const isUsingDeprecatedCopyStarlightFrontmatter = parsedConfig.error.issues.some(
         (issue) => issue.path.join('.') === 'copyStarlightFrontmatter',
       )
 
       if (isUsingDeprecatedCopyStarlightFrontmatter) {
-        throwUserError(
+        throwPluginError(
           'The `copyStarlightFrontmatter` option has been deprecated in favor of the `copyFrontmatter` option.',
           'For more information see https://starlight-obsidian.vercel.app/configuration/#copyfrontmatter',
         )
       }
 
-      throwUserError(
+      throwPluginError(
         `Invalid starlight-obsidian configuration:
 
 ${z.prettifyError(parsedConfig.error)}
@@ -197,7 +210,7 @@ ${z.prettifyError(parsedConfig.error)}
               ...overrideStarlightComponent(starlightConfig.components, logger, 'PageTitle'),
             },
             customCss: [...(starlightConfig.customCss ?? []), 'starlight-obsidian/styles/common'],
-            sidebar: getSidebarFromConfig(config, starlightConfig, sidebarGroup),
+            sidebar: getSidebarFromConfig(config, starlightConfig, sidebarEntries),
           }
 
           if (config.skipGeneration) {
@@ -218,7 +231,7 @@ ${z.prettifyError(parsedConfig.error)}
             } catch (error) {
               logger.error(error instanceof Error ? error.message : String(error))
 
-              throwUserError(`Failed to generate Starlight pages from Obsidian vault at '${config.vault}'.`)
+              throwPluginError(`Failed to generate Starlight pages from Obsidian vault at '${config.vault}'.`)
             }
           }
 

package/libs/{plugin.ts → error.ts}

@@ -1,6 +1,6 @@
 import { AstroError } from 'astro/errors'
 
-export function throwUserError(message: string, hint?: string): never {
+export function throwPluginError(message: string, hint?: string): never {
   throw new AstroError(
     message,
     hint ??

package/libs/integration.ts

@@ -1,23 +1,18 @@
 import type { AstroIntegration } from 'astro'
-import rehypeKatex from 'rehype-katex'
-import remarkMath from 'remark-math'
 
 import type { StarlightObsidianConfig } from '..'
 
-import { rehypeStarlightObsidian } from './rehype'
+import { applyMarkdownPlugin } from './processor'
 import { vitePluginStarlightObsidianConfig } from './vite'
 
 export function starlightObsidianIntegration(config: StarlightObsidianConfig): AstroIntegration {
   return {
     name: 'starlight-obsidian-integration',
     hooks: {
-      'astro:config:setup': ({ updateConfig }) => {
-        updateConfig({
-          markdown: {
-            rehypePlugins: [rehypeStarlightObsidian, rehypeKatex],
+      'astro:config:setup': ({ config: astroConfig, updateConfig }) => {
+        applyMarkdownPlugin(astroConfig.markdown.processor, config)
 
-            remarkPlugins: [[remarkMath, { singleDollarTextMath: config.math.singleDollarTextMath }]],
-          },
+        updateConfig({
           vite: {
             plugins: [vitePluginStarlightObsidianConfig(config)],
           },

package/libs/markdown.ts

@@ -1,3 +1,5 @@
+import type { ElementContent } from 'hast'
+import type { Literal } from 'mdast'
 import { fromMarkdown } from 'mdast-util-from-markdown'
 import { remark } from 'remark'
 import remarkFrontmatter from 'remark-frontmatter'
@@ -7,6 +9,8 @@ import { VFile } from 'vfile'
 
 import { remarkStarlightObsidian, type TransformContext } from './remark'
 
+const blockIdentifierRegex = /(?<identifier> *\^(?<name>[\w-]+))$/
+
 let processor: ReturnType<typeof remark> | undefined
 
 export async function transformMarkdownToString(
@@ -49,9 +53,34 @@ function getVFile(filePath: string, markdown: string, context: TransformContext)
   })
 }
 
+export function isNodeWithValue(node: ElementContent | undefined): node is NodeWithValue {
+  return node !== undefined && 'value' in node
+}
+
+export function getBlockIdentifier(node: NodeWithValue): { length: number; name: string } | undefined {
+  const match = blockIdentifierRegex.exec(node.value)
+  const identifier = match?.groups?.['identifier']
+  const name = match?.groups?.['name']
+
+  if (!identifier || !name) {
+    return undefined
+  }
+
+  return { length: identifier.length, name }
+}
+
+export function getLastContentChild(children: ElementContent[]) {
+  const index = children.findLastIndex((child) => child.type !== 'text' || child.value.trim().length > 0)
+  if (index === -1) return undefined
+
+  return { child: children[index], index }
+}
+
 interface TransformResult {
   aliases: string[] | undefined
   content: string
   skip: boolean
   type: 'markdown' | 'mdx'
 }
+
+export type NodeWithValue = ElementContent & Literal

package/libs/obsidian.ts

@@ -9,9 +9,9 @@ import yaml from 'yaml'
 
 import type { StarlightObsidianConfig } from '..'
 
+import { throwPluginError } from './error'
 import { isDirectory, isFile } from './fs'
 import { getExtension, isAnchor, slashify, slugifyPath, stripExtension } from './path'
-import { throwUserError } from './plugin'
 import { isAssetFile } from './starlight'
 
 const obsidianAppConfigSchema = z.object({
@@ -48,11 +48,11 @@ export async function getVault(config: StarlightObsidianConfig): Promise<Vault>
   const vaultPath = path.resolve(config.vault)
 
   if (!(await isDirectory(vaultPath))) {
-    throwUserError(`The provided vault path is not a directory.\n> Provided path: ${vaultPath}`)
+    throwPluginError(`The provided vault path is not a directory.\n> Provided path: ${vaultPath}`)
   }
 
   if (!(await isVaultDirectory(config, vaultPath))) {
-    throwUserError(
+    throwPluginError(
       `The provided vault path is not a valid Obsidian vault directory and does not include an '.obsidian/app.json' file.\n> Provided path: ${vaultPath}`,
     )
   }

package/libs/processor.ts

@@ -0,0 +1,68 @@
+import { katex as satteriKatex } from '@nullpinter/satteri-katex'
+import type { AstroConfig } from 'astro'
+import rehypeKatex from 'rehype-katex'
+import remarkMath from 'remark-math'
+
+import type { StarlightObsidianConfig } from '..'
+
+import { throwPluginError } from './error'
+import { rehypeStarlightObsidian } from './rehype'
+import { satteriStarlightObsidian } from './satteri'
+
+export function applyMarkdownPlugin(processor: MarkdownProcessor, config: StarlightObsidianConfig) {
+  if (isSatteriProcessor(processor)) {
+    processor.options.features ??= {}
+    processor.options.features.math = {
+      ...(typeof processor.options.features.math === 'object' ? processor.options.features.math : {}),
+      singleDollarTextMath: config.math.singleDollarTextMath,
+    }
+
+    processor.options.mdastPlugins.push(satteriKatex())
+    processor.options.hastPlugins.push(satteriStarlightObsidian)
+  } else if (isUnifiedProcessor(processor)) {
+    processor.options.remarkPlugins.push([remarkMath, { singleDollarTextMath: config.math.singleDollarTextMath }])
+    processor.options.rehypePlugins.push([rehypeStarlightObsidian], [rehypeKatex])
+  } else {
+    throwPluginError("The configured 'markdown.processor' is not supported by the starlight-obsidian plugin.")
+  }
+}
+
+function isSatteriProcessor(processor: unknown): processor is SatteriMarkdownProcessor {
+  if (typeof processor !== 'object' || processor === null) return false
+  const candidate = processor as { name?: unknown; options?: { hastPlugins?: unknown; mdastPlugins?: unknown[] } }
+  return (
+    candidate.name === 'satteri' &&
+    Array.isArray(candidate.options?.hastPlugins) &&
+    Array.isArray(candidate.options.mdastPlugins)
+  )
+}
+
+function isUnifiedProcessor(processor: unknown): processor is UnifiedMarkdownProcessor {
+  if (typeof processor !== 'object' || processor === null) return false
+  const candidate = processor as { name?: unknown; options?: { rehypePlugins?: unknown; remarkPlugins?: unknown[] } }
+  return (
+    candidate.name === 'unified' &&
+    Array.isArray(candidate.options?.rehypePlugins) &&
+    Array.isArray(candidate.options.remarkPlugins)
+  )
+}
+
+type MarkdownProcessor = NonNullable<AstroConfig['markdown']['processor']>
+
+interface SatteriMarkdownProcessor {
+  name: string
+  options: { features?: SatteriFeatures; hastPlugins: unknown[]; mdastPlugins: unknown[] }
+}
+
+interface SatteriFeatures {
+  math?:
+    | boolean
+    | {
+        singleDollarTextMath?: boolean
+      }
+}
+
+interface UnifiedMarkdownProcessor {
+  name: string
+  options: { rehypePlugins: unknown[]; remarkPlugins: unknown[] }
+}

package/libs/rehype.ts

@@ -1,8 +1,7 @@
 import type { Element, ElementContent, Root } from 'hast'
-import type { Literal } from 'mdast'
 import { CONTINUE, SKIP, visit } from 'unist-util-visit'
 
-const blockIdentifierRegex = /(?<identifier> *\^(?<name>[\w-]+))$/
+import { getBlockIdentifier, getLastContentChild, isNodeWithValue } from './markdown'
 
 export function rehypeStarlightObsidian() {
   return function transformer(tree: Root) {
@@ -12,7 +11,7 @@ export function rehypeStarlightObsidian() {
       // Handle blockqoutes first as they are block which can contain paragraphs or list items and we want to hoist
       // the IDs to the blockquote element.
       if (node.tagName === 'blockquote') {
-        const lastChild = node.children.at(-1)
+        const lastChild = getLastContentChild(node.children)?.child
 
         if (
           lastChild?.type !== 'element' ||
@@ -21,15 +20,15 @@ export function rehypeStarlightObsidian() {
           return CONTINUE
         }
 
-        const lastGrandChild = lastChild.children.at(-1)
+        const lastGrandChild = getLastContentChild(lastChild.children)?.child
 
         if (lastChild.tagName === 'p') {
           return transformBlockIdentifier(node, lastGrandChild)
         } else if (lastGrandChild?.type === 'element' && lastGrandChild.tagName === 'li') {
-          return transformBlockIdentifier(node, lastGrandChild.children.at(-1))
+          return transformBlockIdentifier(node, getLastContentChild(lastGrandChild.children)?.child)
         }
       } else if (node.tagName === 'p' || node.tagName === 'li') {
-        return transformBlockIdentifier(node, node.children.at(-1))
+        return transformBlockIdentifier(node, getLastContentChild(node.children)?.child)
       }
 
       return CONTINUE
@@ -42,7 +41,7 @@ function transformBlockIdentifier(reference: Element, node: ElementContent | und
     return CONTINUE
   }
 
-  const identifier = getBlockIdentifer(node)
+  const identifier = getBlockIdentifier(node)
 
   if (!identifier) {
     return CONTINUE
@@ -53,21 +52,3 @@ function transformBlockIdentifier(reference: Element, node: ElementContent | und
 
   return SKIP
 }
-
-function isNodeWithValue(node: ElementContent | undefined): node is NodeWithValue {
-  return node !== undefined && 'value' in node
-}
-
-function getBlockIdentifer(node: NodeWithValue): { length: number; name: string } | undefined {
-  const match = blockIdentifierRegex.exec(node.value)
-  const identifier = match?.groups?.['identifier']
-  const name = match?.groups?.['name']
-
-  if (!identifier || !name) {
-    return undefined
-  }
-
-  return { length: identifier.length, name }
-}
-
-type NodeWithValue = ElementContent & Literal

package/libs/satteri.ts

@@ -0,0 +1,86 @@
+import type { Element, ElementContent, Parents } from 'hast'
+import { defineHastPlugin, type HastPluginDefinition, type HastVisitorContext } from 'satteri'
+
+import { getBlockIdentifier, getLastContentChild, isNodeWithValue } from './markdown'
+
+export function satteriStarlightObsidian(): HastPluginDefinition {
+  return defineHastPlugin({
+    name: 'starlight-obsidian',
+    element: {
+      filter: ['blockquote', 'p', 'li'],
+      visit(node, ctx) {
+        if (node.tagName === 'blockquote') {
+          const lastChild = getLastContentChild(node.children)?.child
+
+          if (
+            lastChild?.type !== 'element' ||
+            !(lastChild.tagName === 'p' || lastChild.tagName === 'ul' || lastChild.tagName === 'ol')
+          ) {
+            return
+          }
+
+          const lastGrandChild = getLastContentChild(lastChild.children)?.child
+
+          if (lastChild.tagName === 'p') {
+            transformBlockIdentifier(node, lastGrandChild, ctx)
+          } else if (lastGrandChild?.type === 'element' && lastGrandChild.tagName === 'li') {
+            transformBlockIdentifier(node, getLastContentChild(lastGrandChild.children)?.child, ctx)
+          }
+        } else if (node.tagName === 'p' || node.tagName === 'li') {
+          if (isInsideBlockquoteWithIdentifier(node, ctx)) return
+
+          transformBlockIdentifier(node, getLastContentChild(node.children)?.child, ctx)
+        }
+      },
+    },
+  })
+}
+
+function transformBlockIdentifier(reference: Element, node: ElementContent | undefined, ctx: HastVisitorContext) {
+  if (!isNodeWithValue(node)) return
+
+  const identifier = getBlockIdentifier(node)
+  if (!identifier) return
+
+  ctx.setProperty(node, 'value', node.value.slice(0, identifier.length * -1))
+  ctx.setProperty(reference, 'id', `block-${identifier.name}`)
+}
+
+function isInsideBlockquoteWithIdentifier(node: Element, ctx: HastVisitorContext) {
+  let parent: Parents | undefined = ctx.parent(node)
+
+  while (parent !== undefined) {
+    if (parent.type === 'element' && parent.tagName === 'blockquote') {
+      return blockquoteHasIdentifier(parent)
+    }
+
+    parent = ctx.parent(parent)
+  }
+
+  return false
+}
+
+function blockquoteHasIdentifier(blockquote: Element) {
+  const lastChild = getLastContentChild(blockquote.children)?.child
+
+  if (
+    lastChild?.type !== 'element' ||
+    !(lastChild.tagName === 'p' || lastChild.tagName === 'ul' || lastChild.tagName === 'ol')
+  ) {
+    return false
+  }
+
+  const lastGrandChild = getLastContentChild(lastChild.children)?.child
+
+  if (lastChild.tagName === 'p') {
+    return isNodeWithValue(lastGrandChild) && getBlockIdentifier(lastGrandChild) !== undefined
+  }
+
+  if (lastGrandChild?.type !== 'element' || lastGrandChild.tagName !== 'li') {
+    return false
+  }
+
+  const lastListItemChild = getLastContentChild(lastGrandChild.children)?.child
+
+  return isNodeWithValue(lastListItemChild) && getBlockIdentifier(lastListItemChild) !== undefined
+}

package/libs/starlight.ts

@@ -15,7 +15,7 @@ const assetsPath = 'src/assets'
 const docsPath = 'src/content/docs'
 const publicPath = 'public'
 
-const starlightObsidianSidebarGroupLabel = Symbol('StarlightObsidianSidebarGroupLabel')
+const starlightObsidianSidebarEntriesDirectory = Symbol('StarlightObsidianSidebarEntriesDirectory')
 
 const obsidianToStarlightCalloutTypeMap: Record<string, string> = {
   note: 'note',
@@ -66,65 +66,40 @@ const starlightFrontmatterKeys = [
   'sidebar',
 ]
 
-export function getSidebarGroupPlaceholder(label = starlightObsidianSidebarGroupLabel): SidebarManualGroup {
-  return {
-    items: [],
-    label: label.toString(),
-  }
+export function getSidebarEntriesPlaceholder(directory = starlightObsidianSidebarEntriesDirectory): SidebarAutoEntries {
+  return { autogenerate: { directory: directory.toString() } }
 }
 
 export function getSidebarFromConfig(
   config: StarlightObsidianConfig,
   starlightConfig: HookParameters<'config:setup'>['config'],
-  sidebarGroupPlaceholder: SidebarGroup,
+  sidebarEntriesPlaceholder: SidebarAutoEntries,
 ): StarlightUserConfig['sidebar'] {
   if (!starlightConfig.sidebar || starlightConfig.sidebar.length === 0) {
     return starlightConfig.sidebar
   }
 
-  function replaceSidebarGroupPlaceholder(group: SidebarManualGroup): SidebarItem {
-    if (group.label === sidebarGroupPlaceholder.label) {
-      const defaultLocaleConfig = starlightConfig.locales?.[starlightConfig.defaultLocale ?? 'root']
-      const label =
-        typeof config.sidebar.label === 'string'
-          ? config.sidebar.label
-          : config.sidebar.label[defaultLocaleConfig?.lang ?? 'en']
-
-      if (!label || label.length === 0) {
-        throw new Error('The generated vault pages sidebar group label must have a key for the default language.')
-      }
-
-      const group: SidebarGroup = {
+  function replaceSidebarEntriesPlaceholder(item: SidebarItem): SidebarItem {
+    if (isObsidianSidebarEntriesPlaceholder(item, sidebarEntriesPlaceholder)) {
+      return {
         autogenerate: {
-          collapsed: config.sidebar.collapsedFolders ?? config.sidebar.collapsed,
           directory: config.output,
+          collapsed: config.sidebar.collapsedFolders,
         },
-        collapsed: config.sidebar.collapsed,
-        label,
-      }
-
-      if (typeof config.sidebar.label !== 'string') {
-        group['translations'] = config.sidebar.label
       }
-
-      return group
     }
 
-    if (isSidebarGroup(group)) {
+    if (isSidebarGroup(item)) {
       return {
-        ...group,
-        items: group.items.map((item) => {
-          return isSidebarGroup(item) ? replaceSidebarGroupPlaceholder(item) : item
-        }),
+        ...item,
+        items: item.items.map(replaceSidebarEntriesPlaceholder),
       }
     }
 
-    return group
+    return item
   }
 
-  return starlightConfig.sidebar.map((item) => {
-    return isSidebarGroup(item) ? replaceSidebarGroupPlaceholder(item) : item
-  })
+  return starlightConfig.sidebar.map(replaceSidebarEntriesPlaceholder)
 }
 
 export async function addObsidianFiles(
@@ -297,20 +272,27 @@ function throwVaultFileError(error: unknown, vaultFile: VaultFile): never {
   throw new Error(`${vaultFile.path} — ${error instanceof Error ? error.message : String(error)}`, { cause: error })
 }
 
-function isSidebarGroup(item: SidebarItem): item is SidebarManualGroup {
+function isSidebarGroup(item: SidebarItem): item is SidebarGroup {
   return typeof item === 'object' && 'items' in item
 }
 
+function isObsidianSidebarEntriesPlaceholder(
+  item: SidebarItem,
+  placeholder: SidebarAutoEntries,
+): item is SidebarAutoEntries {
+  return (
+    typeof item === 'object' &&
+    'autogenerate' in item &&
+    item.autogenerate.directory === placeholder.autogenerate.directory
+  )
+}
+
 interface OutputPaths {
   asset: string
   content: string
   file: string
 }
 
-interface SidebarManualGroup {
-  items: SidebarManualGroup[]
-  label: string
-}
-
 type SidebarItem = NonNullable<StarlightUserConfig['sidebar']>[number]
-export type SidebarGroup = Exclude<SidebarItem, string>
+type SidebarGroup = Extract<SidebarItem, { items: unknown[] }>
+export type SidebarAutoEntries = Extract<SidebarItem, { autogenerate: unknown }>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starlight-obsidian",
-  "version": "0.12.1",
+  "version": "0.14.0",
   "license": "MIT",
   "description": "Starlight plugin to publish Obsidian vaults.",
   "author": "HiDeoo <github@hideoo.dev> (https://hideoo.dev)",
@@ -19,6 +19,7 @@
   "dependencies": {
     "@astro-community/astro-embed-twitter": "^0.5.11",
     "@astro-community/astro-embed-youtube": "^0.5.10",
+    "@nullpinter/satteri-katex": "^0.1.2",
     "decode-uri-component": "^0.4.1",
     "github-slugger": "^2.0.0",
     "globby": "^16.1.1",
@@ -35,6 +36,7 @@
     "remark-frontmatter": "^5.0.0",
     "remark-gfm": "^4.0.1",
     "remark-math": "^6.0.0",
+    "satteri": "^0.9.3",
     "unist-util-visit": "^5.1.0",
     "vfile": "^6.0.3",
     "yaml": "^2.8.2"
@@ -48,7 +50,7 @@
     "vitest": "^4.0.18"
   },
   "peerDependencies": {
-    "@astrojs/starlight": ">=0.34.0"
+    "@astrojs/starlight": ">=0.41.0"
   },
   "engines": {
     "node": ">=22.12.0"