slidev-theme-practicum 0.3.0 → 0.4.0

package/composables/layout-shorthands.ts

@@ -118,10 +118,64 @@ function readHeadingText(children: VNode[], label: string) {
   failMarkdownContract(label, 'ожидает один markdown heading внутри default slot.')
 }
 
+function readRichHeadingChildren(node: VNode | null | undefined): Array<string | VNode> | null {
+  if (!node || !isHeadingNode(node))
+    return null
+
+  if (typeof node.children === 'string')
+    return [node.children]
+  if (!Array.isArray(node.children))
+    return null
+
+  return node.children.filter(child => isVNode(child) || typeof child === 'string') as Array<string | VNode>
+}
+
+function readRichNodeChildren(node: VNode | null | undefined): Array<string | VNode> | null {
+  if (!node || typeof node.children === 'string')
+    return null
+
+  if (!Array.isArray(node.children))
+    return null
+
+  return node.children.filter(child => isVNode(child) || typeof child === 'string') as Array<string | VNode>
+}
+
+function readHeadingSlotContent(node: VNode | null | undefined, textFallback: string) {
+  const richChildren = readRichHeadingChildren(node) ?? readRichNodeChildren(node)
+  return richChildren ?? readRichTextWithLineBreaks(textFallback)
+}
+
+function readParagraphSlotContent(node: VNode | null | undefined, textFallback: string) {
+  const richChildren = readRichNodeChildren(node)
+  return richChildren ?? readRichTextWithLineBreaks(textFallback)
+}
+
+function readRichTextWithLineBreaks(text: string): string | Array<string | VNode> {
+  const matches = text.split(/(<br\s*\/?>)/i)
+  if (matches.length === 1)
+    return text
+
+  return matches.flatMap<string | VNode>((value): Array<string | VNode> => {
+    if (!value.trim())
+      return []
+    if (/^<br\s*\/?>$/i.test(value))
+      return [h('br')]
+    return [value]
+  })
+}
+
+function hasRichSlotContent(content: Array<string | VNode>) {
+  return content.some(item => typeof item === 'string' ? item.trim() : isVNode(item))
+}
+
 function readParagraphText(children: VNode[]) {
   const paragraph = children.find(isParagraphNode)
   if (paragraph)
-    return { node: paragraph, text: readInlineText(paragraph) }
+    return {
+      node: paragraph,
+      text: readInlineText(paragraph),
+      content: readParagraphSlotContent(paragraph, readInlineText(paragraph)),
+    }
 
   return null
 }
@@ -130,7 +184,7 @@ function hText(
   context: LayoutShorthandContext,
   as: string,
   size: ThemeTextSizeInput,
-  content: string,
+  content: string | VNode | Array<string | VNode>,
   options: {
     muted?: boolean
     maxSize?: boolean
@@ -172,10 +226,12 @@ function hText(
   if (options.typography)
     textProps['data-typography'] = options.typography
 
+  const slotChildren = Array.isArray(content) ? content : [content]
+
   return h(context.components.Text, {
     ...textProps,
   }, {
-    default: withCtx(() => [content]),
+    default: withCtx(() => slotChildren),
   })
 }
 
@@ -251,15 +307,26 @@ function readListItemText(li: VNode) {
   return normalizeInlineText(parts.join(' '))
 }
 
-function readListItems(list: VNode, label: string) {
-  if (!Array.isArray(list.children))
-    failMarkdownContract(label, 'ожидает list items с текстом.')
+function readListItemSlotContent(li: VNode): Array<string | VNode> {
+  if (typeof li.children === 'string') {
+    const text = li.children
+    return text.trim() ? [text] : []
+  }
 
-  return list.children
-    .filter(isVNode)
-    .filter(node => node.type === 'li')
-    .map(readListItemText)
-    .filter(Boolean)
+  if (!Array.isArray(li.children))
+    return []
+
+  return li.children.flatMap<string | VNode>((child): Array<string | VNode> => {
+    if (!isVNode(child)) {
+      const text = String(child)
+      return text.trim() ? [text] : []
+    }
+
+    if (child.type === 'ul' || child.type === 'ol')
+      return []
+
+    return [cloneVNode(child)]
+  })
 }
 
 function readListItemNodes(list: VNode, label: string) {
@@ -296,7 +363,7 @@ function readListItemContent(li: VNode): VNode[] {
   if (!Array.isArray(li.children))
     return []
 
-  return li.children.flatMap((child) => {
+  return li.children.flatMap<VNode>((child): VNode[] => {
     if (!isVNode(child)) {
       const text = String(child).trim()
       return text ? [h('p', text)] : []
@@ -306,7 +373,10 @@ function readListItemContent(li: VNode): VNode[] {
   })
 }
 
-type NestedListItem = { value: string, label: string }
+type NestedListItem = {
+  value: Array<string | VNode>
+  label: Array<string | VNode>
+}
 
 function readNestedListItems(list: VNode, label: string): NestedListItem[] {
   if (!Array.isArray(list.children))
@@ -317,46 +387,38 @@ function readNestedListItems(list: VNode, label: string): NestedListItem[] {
     .filter(node => node.type === 'li')
     .map((li) => {
       if (!Array.isArray(li.children)) {
-        const text = typeof li.children === 'string' ? normalizeInlineText(li.children) : ''
-        return { value: text, label: '' }
+        const text = typeof li.children === 'string' ? li.children : ''
+        const value = text.trim() ? [text] : []
+        return { value, label: [] }
       }
 
-      const valueParts: string[] = []
       let nestedList: VNode | undefined
-
-      for (const child of li.children) {
+      const value = li.children.flatMap<string | VNode>((child): Array<string | VNode> => {
         if (!isVNode(child)) {
-          const text = String(child ?? '').trim()
-          if (text)
-            valueParts.push(text)
-          continue
+          const text = String(child)
+          return text.trim() ? [text] : []
         }
 
         if (child.type === 'ul' || child.type === 'ol') {
           nestedList = child
-          continue
+          return []
         }
 
-        const text = readInlineText(child).trim()
-        if (text)
-          valueParts.push(text)
-      }
-
-      const value = normalizeInlineText(valueParts.join(' '))
+        return [cloneVNode(child)]
+      })
 
-      let label = ''
-      if (nestedList && Array.isArray(nestedList.children)) {
-        const firstNestedLi = nestedList.children
+      const nestedLabel = nestedList && Array.isArray(nestedList.children)
+        ? nestedList.children
           .filter(isVNode)
           .find(node => node.type === 'li')
+        : null
 
-        if (firstNestedLi)
-          label = readListItemText(firstNestedLi)
+      return {
+        value,
+        label: nestedLabel ? readListItemSlotContent(nestedLabel) : [],
       }
-
-      return { value, label }
     })
-    .filter(item => item.value)
+    .filter(item => hasRichSlotContent(item.value))
 }
 
 const FACTS_VARIANT_COUNTS: Record<string, number> = {
@@ -540,6 +602,7 @@ function buildQuoteChildren(children: VNode[], context: LayoutShorthandContext)
 
 function buildCenteredChildren(children: VNode[], context: LayoutShorthandContext) {
   const title = readHeadingText(children, 'message:centered')
+  const titleContent = readHeadingSlotContent(title.node, title.text)
 
   ensureOnlySupportedChildren('message:centered', children, node =>
     node === title.node
@@ -548,7 +611,7 @@ function buildCenteredChildren(children: VNode[], context: LayoutShorthandContex
 
   return [
     hSlot(context, 'primary', 'slide-message-centered-primary', { centered: true }, [
-      hText(context, 'h1', '7-12', title.text, { align: 'middle' }),
+      hText(context, 'h1', '7-12', titleContent, { align: 'middle' }),
     ]),
   ]
 }
@@ -556,6 +619,7 @@ function buildCenteredChildren(children: VNode[], context: LayoutShorthandContex
 function buildClosingChildren(children: VNode[], context: LayoutShorthandContext) {
   const title = readHeadingText(children, 'message:closing')
   const paragraph = readParagraphText(children)
+  const titleContent = readHeadingSlotContent(title.node, title.text)
 
   ensureOnlySupportedChildren('message:closing', children, node =>
     node === title.node
@@ -565,9 +629,9 @@ function buildClosingChildren(children: VNode[], context: LayoutShorthandContext
 
   return [
     hSlot(context, 'primary', 'slide-message-closing-primary', { centered: true }, [
-      hText(context, 'h1', '7', title.text, { align: 'middle' }),
+      hText(context, 'h1', '7', titleContent, { align: 'middle' }),
       ...(paragraph
-        ? [hText(context, 'p', '3', paragraph.text, { muted: true })]
+        ? [hText(context, 'p', '3', paragraph.content, { muted: true })]
         : []),
     ]),
   ]
@@ -575,8 +639,9 @@ function buildClosingChildren(children: VNode[], context: LayoutShorthandContext
 
 function buildDefinitionChildren(children: VNode[], context: LayoutShorthandContext) {
   const title = readHeadingText(children, 'explainer:definition')
+  const titleContent = readHeadingSlotContent(title.node, title.text)
   const paragraph = readParagraphText(children)
-  const body = context.readFrontmatterText('body') || paragraph?.text || ''
+  const body = context.readFrontmatterText('body') || paragraph?.content || ''
   const label = context.readFrontmatterText('label')
 
   if (!body)
@@ -591,7 +656,7 @@ function buildDefinitionChildren(children: VNode[], context: LayoutShorthandCont
   return [
     hSlot(context, 'primary', 'slide-explainer-definition-primary', {}, [
       ...(label ? [hText(context, 'div', '3', label, { muted: true, className: 'Slide-DefinitionLabel' })] : []),
-      hText(context, 'h1', '6', title.text, { priority: 1 }),
+      hText(context, 'h1', '6', titleContent, { priority: 1 }),
       hText(context, 'div', '6', body, { muted: true, priority: 1 }),
     ]),
   ]
@@ -608,6 +673,7 @@ function buildTitleRichSideChildren(
   options: { muted?: boolean } = {},
 ) {
   const title = readHeadingText(children, contract)
+  const titleContent = readHeadingSlotContent(title.node, title.text)
   const bodyNodes = children.filter(node =>
     node !== title.node
     && !isBlankTextNode(node),
@@ -627,7 +693,7 @@ function buildTitleRichSideChildren(
 
   return [
     hSlot(context, 'primary', `slide-explainer-${slotPrefix}-primary`, {}, [
-      hText(context, 'h1', '6', title.text),
+      hText(context, 'h1', '6', titleContent),
     ]),
     hSlot(context, 'secondary', `slide-explainer-${slotPrefix}-secondary`, {}, [
       h('div', { class: bodyClass }, bodyNodes.map(node => cloneVNode(node))),
@@ -646,6 +712,7 @@ function buildTitleSupportsChildren(
     return buildTitleRichSideChildren(children, context, 'explainer:title-supports', { muted: true })
 
   const title = readHeadingText(children, 'explainer:title-supports')
+  const titleContent = readHeadingSlotContent(title.node, title.text)
   const list = children.find(isListNode)
   const muted = options.muted ?? true
   const supportSize = options.supportSize ?? '4'
@@ -678,7 +745,7 @@ function buildTitleSupportsChildren(
 
   return [
     hSlot(context, 'primary', 'slide-explainer-title-supports-bottom-primary', {}, [
-      hText(context, 'h1', '6', title.text),
+      hText(context, 'h1', '6', titleContent),
     ]),
     ...items.map((item, index) =>
       hSlot(context, 'support', `slide-explainer-title-supports-bottom-support-${index + 1}`, {}, [
@@ -702,12 +769,21 @@ function buildTitleBodyChildren(children: VNode[], context: LayoutShorthandConte
 
 function buildPointsChildren(children: VNode[], context: LayoutShorthandContext) {
   const title = readHeadingText(children, 'collection:points')
+  const titleContent = readHeadingSlotContent(title.node, title.text)
   const list = children.find(isListNode)
 
   if (!list)
     failMarkdownContract('collection:points', 'ожидает markdown list с тремя пунктами.')
 
-  const items = readListItems(list, 'collection:points')
+  const listItems = readListItemNodes(list, 'collection:points')
+    .map(node => ({
+      text: readListItemText(node),
+      content: readListItemSlotContent(node),
+    }))
+  const items = listItems
+    .filter(item => item.text)
+    .map(item => item.content)
+
   if (items.length !== 3)
     failMarkdownContract('collection:points', 'ожидает ровно три пункта для arrangement: trio.')
 
@@ -721,7 +797,7 @@ function buildPointsChildren(children: VNode[], context: LayoutShorthandContext)
     hSlot(context, 'primary', 'slide-collection-points-primary', {
       ...(context.frontmatterDecor ? { decor: context.frontmatterDecor } : {}),
     }, [
-      hText(context, 'h1', '7', title.text, { className: 'Slide-PointsTitle' }),
+      hText(context, 'h1', '7', titleContent, { className: 'Slide-PointsTitle' }),
     ]),
     ...items.map((item, index) =>
       hSlot(context, 'support', `slide-collection-points-support-${index + 1}`, {}, [
@@ -778,6 +854,7 @@ function buildComparisonSideChildren(
 
 function buildComparisonChildren(children: VNode[], context: LayoutShorthandContext) {
   const title = readHeadingText(children, 'collection:comparison')
+  const titleContent = readHeadingSlotContent(title.node, title.text)
   const comparison = context.readFrontmatterObject('comparison')
 
   if (!comparison)
@@ -796,7 +873,7 @@ function buildComparisonChildren(children: VNode[], context: LayoutShorthandCont
 
   return [
     hSlot(context, 'primary', `slide-collection-${context.variant}-primary`, {}, [
-      hText(context, 'h1', '6', title.text),
+      hText(context, 'h1', '6', titleContent),
     ]),
     buildComparisonSideChildren(context, from, 0),
     buildComparisonSideChildren(context, to, 1),
@@ -826,12 +903,13 @@ type StepItem = {
 function normalizeStepItems(context: LayoutShorthandContext): StepItem[] {
   const items = context.readFrontmatterArray('items')
   const isStaggered = context.variant === 'steps-staggered'
+  const minItems = isStaggered ? 2 : 3
 
-  if (items.length < 3 || items.length > 6)
-    failMarkdownContract('collection:steps', 'ожидает от 3 до 6 элементов во frontmatter items.')
-
-  if (isStaggered && items.length !== 5)
-    failMarkdownContract('collection:steps', 'arrangement: staggered ожидает ровно 5 элементов.')
+  if (items.length < minItems || items.length > 6) {
+    const range = isStaggered ? 'от 2 до 6' : 'от 3 до 6'
+    const prefix = isStaggered ? 'arrangement: staggered ' : ''
+    failMarkdownContract('collection:steps', `${prefix}ожидает ${range} элементов во frontmatter items.`)
+  }
 
   const normalized = items.map((item, index) => {
     if (typeof item !== 'object' || item === null || Array.isArray(item))
@@ -859,6 +937,7 @@ function normalizeStepItems(context: LayoutShorthandContext): StepItem[] {
 
 function buildStepsChildren(children: VNode[], context: LayoutShorthandContext) {
   const title = readHeadingText(children, 'collection:steps')
+  const titleContent = readHeadingSlotContent(title.node, title.text)
   const items = normalizeStepItems(context)
   const arrangement = context.variant === 'steps-staggered' ? 'staggered' : 'linear'
 
@@ -869,7 +948,7 @@ function buildStepsChildren(children: VNode[], context: LayoutShorthandContext)
 
   return [
     hSlot(context, 'primary', `slide-collection-${context.variant}-primary`, {}, [
-      hText(context, 'h1', '6', title.text),
+      hText(context, 'h1', '6', titleContent),
     ]),
     hSlot(context, 'support', `slide-collection-${context.variant}-support`, {}, [
       h(context.components.StepsGrid, {
@@ -907,8 +986,9 @@ function normalizeTimelineItems(context: LayoutShorthandContext) {
 
 function buildTimelineChildren(children: VNode[], context: LayoutShorthandContext) {
   const title = readHeadingText(children, 'collection:timeline')
+  const titleContent = readHeadingSlotContent(title.node, title.text)
   const paragraph = readParagraphText(children)
-  const body = context.readFrontmatterText('body') || paragraph?.text || ''
+  const body = context.readFrontmatterText('body') || paragraph?.content || ''
 
   ensureOnlySupportedChildren('collection:timeline', children, node =>
     node === title.node
@@ -918,7 +998,7 @@ function buildTimelineChildren(children: VNode[], context: LayoutShorthandContex
 
   return [
     hSlot(context, 'primary', 'slide-collection-timeline-primary', {}, [
-      hText(context, 'h1', '6', title.text),
+      hText(context, 'h1', '6', titleContent),
     ]),
     ...(body
       ? [
@@ -991,7 +1071,7 @@ function normalizeMetricItemsFromList(list: VNode) {
     failMarkdownContract('collection:metrics', 'ожидает минимум три пункта в markdown-списке.')
 
   return entries.map((entry, index) => {
-    if (!entry.label)
+    if (!hasRichSlotContent(entry.label))
       failMarkdownContract('collection:metrics', `ожидает вложенный пункт с подписью у metric[${index}].`)
 
     return {
@@ -1023,6 +1103,7 @@ function normalizeMediaItems(context: LayoutShorthandContext) {
 function buildMetricsChildren(children: VNode[], context: LayoutShorthandContext) {
   if (context.variant === 'metrics-dashboard') {
     const title = readHeadingText(children, 'collection:metrics')
+    const titleContent = readHeadingSlotContent(title.node, title.text)
     const metrics = normalizeDashboardMetrics(context)
     const fitGroup = 'collection-metrics-dashboard'
 
@@ -1033,7 +1114,7 @@ function buildMetricsChildren(children: VNode[], context: LayoutShorthandContext
 
     return [
       hSlot(context, 'primary', 'slide-collection-metrics-dashboard-primary', {}, [
-        hText(context, 'h1', '6', title.text),
+        hText(context, 'h1', '6', titleContent),
       ]),
       ...metrics.map((metric, index) =>
         hSlot(context, 'support', `slide-collection-metrics-dashboard-support-${index + 1}`, {
@@ -1156,7 +1237,7 @@ function buildFactsChildren(children: VNode[], context: LayoutShorthandContext)
   }
 
   facts.forEach((fact, index) => {
-    if (!fact.label) {
+    if (!hasRichSlotContent(fact.label)) {
       failMarkdownContract(
         'collection:facts',
         `ожидает вложенный пункт с подписью у facts[${index}].`,
@@ -1175,8 +1256,6 @@ function buildFactsChildren(children: VNode[], context: LayoutShorthandContext)
   const factFitGroup = shouldCoordinateFactSizes ? `collection-${context.variant}-facts` : ''
   const supportFactFitGroup = isFeatured ? `collection-${context.variant}-support-facts` : factFitGroup
   const headingText = readInlineText(heading)
-  const descriptionText = description ? readInlineText(description) : ''
-  const footnoteText = footnote ? readInlineText(footnote) : ''
   const rowFactSize: ThemeTextSizeInput = isQuartet ? '5-8' : isDuo ? '5-10' : '5-9'
   const stackedFactSize: ThemeTextSizeInput = '5-9'
   const stackedLabelSize: ThemeTextSizeInput = '3-5'
@@ -1185,24 +1264,30 @@ function buildFactsChildren(children: VNode[], context: LayoutShorthandContext)
   const supportFactSize: ThemeTextSizeInput = isFeatured ? '5-7' : isStacked ? stackedFactSize : rowFactSize
   const featuredLabelSize: ThemeTextSizeInput = isFeatured ? '4-6' : isStacked ? stackedLabelSize : rowLabelSize
   const supportLabelSize: ThemeTextSizeInput = isFeatured ? '2-4' : isStacked ? stackedLabelSize : rowLabelSize
+  const headingContent = readHeadingSlotContent(heading, headingText)
+  const descriptionContent = description ? readParagraphSlotContent(description, readInlineText(description)) : ''
+  const footnoteContent = footnote ? readParagraphSlotContent(footnote, readInlineText(footnote)) : ''
+  const hasFootnote = Array.isArray(footnoteContent)
+    ? footnoteContent.length > 0
+    : Boolean(footnoteContent)
 
   const primaryChildren: VNode[] = [
-    hText(context, 'h2', isFeatured ? '5-7' : '6-8', headingText, { priority: 1 }),
+    hText(context, 'h2', isFeatured ? '5-7' : '6-8', headingContent, { priority: 1 }),
   ]
 
-  if (descriptionText)
-    primaryChildren.push(hText(context, 'p', isStacked ? '4-5' : '3-4', descriptionText, { priority: 2, muted: true }))
+  if (descriptionContent)
+    primaryChildren.push(hText(context, 'p', isStacked ? '4-5' : '3-4', descriptionContent, { priority: 2, muted: true }))
 
-  if (footnoteText && factFitGroup)
-    primaryChildren.push(hText(context, 'div', '2-3', footnoteText, { priority: 3, muted: true }))
+  if (hasFootnote && factFitGroup)
+    primaryChildren.push(hText(context, 'div', '2-3', footnoteContent, { priority: 3, muted: true }))
 
   const featuredChildren: VNode[] = [
     hText(context, 'div', featuredFactSize, featured.value, { priority: 1 }),
     hText(context, 'div', featuredLabelSize, featured.label, { priority: 2, muted: true }),
   ]
 
-  if (footnoteText && !factFitGroup)
-    featuredChildren.push(hText(context, 'div', '2-3', footnoteText, { priority: 3, muted: true }))
+  if (hasFootnote && !factFitGroup)
+    featuredChildren.push(hText(context, 'div', '2-3', footnoteContent, { priority: 3, muted: true }))
 
   if (isNumberedQuartet) {
     return [

package/composables/text-fit-runtime.ts

@@ -190,8 +190,8 @@ function readBounds(input: ElementFitInput) {
   return bounds
 }
 
-function readFitObserverElements(element: HTMLElement) {
-  const elements: HTMLElement[] = [element]
+function readFitObserverElements(element: HTMLElement, observeOwnSize: boolean) {
+  const elements: HTMLElement[] = observeOwnSize ? [element] : []
   let parent = element.parentElement
 
   while (parent && elements.length < 8) {
@@ -496,6 +496,7 @@ function createTextFitCleanupOwner(isDisposed: () => boolean) {
 type TextFitLifecycleOwnerInput = {
   adapter: TextFitAdapter
   fit: () => void | Promise<void>
+  observeOwnSize?: boolean
   onDispose: () => void
   target: Ref<HTMLElement | null>
   watchTarget?: boolean
@@ -504,6 +505,7 @@ type TextFitLifecycleOwnerInput = {
 function createTextFitLifecycleOwner({
   adapter,
   fit,
+  observeOwnSize = true,
   onDispose,
   target,
   watchTarget = false,
@@ -532,7 +534,7 @@ function createTextFitLifecycleOwner({
       if (!element)
         return null
 
-      return adapter.observe(readFitObserverElements(element), scheduleFit)
+      return adapter.observe(readFitObserverElements(element, observeOwnSize), scheduleFit)
     })
   }
 
@@ -734,6 +736,7 @@ export function createTextFitRuntime(adapter: TextFitAdapter = createBrowserText
       const { scheduleFit } = createTextFitLifecycleOwner({
         adapter,
         fit: fitNow,
+        observeOwnSize: false,
         onDispose: () => {
           runId += 1
         },
@@ -876,6 +879,7 @@ export function createTextFitRuntime(adapter: TextFitAdapter = createBrowserText
       const { scheduleFit } = createTextFitLifecycleOwner({
         adapter,
         fit: fitNow,
+        observeOwnSize: false,
         onDispose: () => {
           runId += 1
           unregisterSharedItem()

package/composables/theme-foundation.ts

@@ -13,6 +13,7 @@ export type ResolvedThemeMode = {
   text: string
   muted: string
   contrast: boolean
+  foreground: 'light' | 'dark'
 }
 
 export type ResolvedSlideTheme = ResolvedThemeMode
@@ -112,6 +113,7 @@ export function resolveThemeMode(options: ResolveThemeModeOptions = {}): Resolve
       text: 'var(--theme-color-dark-0)',
       muted: 'var(--theme-color-dark-2)',
       contrast: false,
+      foreground: 'dark',
     }
   }
 
@@ -123,6 +125,7 @@ export function resolveThemeMode(options: ResolveThemeModeOptions = {}): Resolve
       text: 'var(--theme-color-light-0)',
       muted: 'var(--theme-text-muted-on-contrast)',
       contrast: true,
+      foreground: 'light',
     }
   }
 
@@ -130,9 +133,10 @@ export function resolveThemeMode(options: ResolveThemeModeOptions = {}): Resolve
     mode,
     tone,
     background: `var(--theme-color-${tone}-0)`,
-    text: 'var(--theme-color-light-0)',
-    muted: 'var(--theme-text-muted-on-contrast)',
+    text: 'var(--theme-text-on-color)',
+    muted: 'var(--theme-text-muted-on-color)',
     contrast: true,
+    foreground: 'light',
   }
 }
 
@@ -176,7 +180,7 @@ export function themeVars(
       '--theme-text-muted': slideTheme.muted,
       '--theme-inline-code-text': slideTheme.text,
       '--theme-text-on-dark': 'var(--theme-color-light-0)',
-      '--theme-link': slideTheme.contrast ? 'var(--theme-color-light-0)' : 'var(--theme-current-color)',
+      '--theme-link': slideTheme.foreground === 'light' ? 'var(--theme-color-light-0)' : slideTheme.mode === 'color' ? 'var(--theme-text-on-color)' : 'var(--theme-current-color)',
       '--theme-current-color': `var(--theme-color-${slideTheme.tone}-0)`,
     }
   }

package/composables/typography-guard.cjs

@@ -0,0 +1,59 @@
+/**
+ * @typedef {{ text: string, size?: string, color?: string, slot: string, keyNumber: boolean, muted?: boolean }} TypographyText
+ * @typedef {{ code: string, message: string, hint?: string }} TypographyIssue
+ */
+
+/** @param {TypographyText[]} texts */
+function describeSizes(texts) {
+  return [...new Set(texts.map(text => `${text.size}: «${text.text}»`))].join(', ')
+}
+
+/**
+ * Общая политика для объявленных токенов и вычисленных значений браузера.
+ * Отсутствующее значение означает «неизвестно», а не значение по умолчанию.
+ * @param {TypographyText[]} texts
+ * @returns {TypographyIssue[]}
+ */
+function inspectTypography(texts) {
+  /** @type {TypographyIssue[]} */
+  const issues = []
+  const regular = texts.filter(text => !text.keyNumber && text.size !== undefined)
+  const numbers = texts.filter(text => text.keyNumber && text.size !== undefined)
+  if (new Set(regular.map(text => text.size)).size > 2) {
+    issues.push({
+      code: 'text-sizes',
+      message: `Больше двух размеров обычного текста: ${describeSizes(regular)}.`,
+      hint: 'Объедините подписи с основным поясняющим текстом по размеру или измените композицию. Заголовок тоже входит в подсчёт.',
+    })
+  }
+  if (new Set(numbers.map(text => text.size)).size > 1) {
+    issues.push({
+      code: 'number-sizes',
+      message: `Ключевые числа имеют разные размеры: ${describeSizes(numbers)}.`,
+      hint: 'Все Text as="data" на слайде должны иметь один размер, в том числе после автоматического подбора.',
+    })
+  }
+
+  for (const slot of new Set(texts.map(text => text.slot))) {
+    const contents = texts.filter(text => text.slot === slot)
+    const colored = contents.filter(text => text.color !== undefined)
+    if (new Set(colored.map(text => text.color)).size > 1) {
+      issues.push({
+        code: 'slot-colors',
+        message: `${slot}: разные цвета текста: ${colored.map(text => `${text.color}: «${text.text}»`).join(', ')}.`,
+        hint: 'Выберите один основной цвет для всего текста внутри Slot.',
+      })
+    }
+    const muted = contents.filter(text => text.muted)
+    if (muted.length) {
+      issues.push({
+        code: 'muted-text',
+        message: `${slot}: приглушённый текст: ${muted.map(text => `«${text.text}»`).join(', ')}.`,
+        hint: 'Удалите muted и токены text-muted, используйте основной цвет поверхности.',
+      })
+    }
+  }
+  return issues
+}
+
+module.exports = { inspectTypography }

package/composables/validate-deck-layouts.cjs

@@ -5,6 +5,7 @@ const { createCommentVNode, createTextVNode, createVNode } = require('vue')
 const { registerTypeScript } = require('./typescript-require.cjs')
 const { extractDeckLiveStructure } = require('./deck-slot-markup.cjs')
 const { markdownToVnodes } = require('./markdown-to-vnodes.cjs')
+const { validateDeclaredTypography } = require('./validate-deck-typography.cjs')
 
 /** @typedef {import('@slidev/types').SourceSlideInfo} SourceSlideInfo */
 /** @typedef {import('./layout-recipes').ThemeLayout} ThemeLayout */
@@ -138,9 +139,10 @@ function slideRef(slide, index) {
 
 /**
  * @param {string} deckPath
+ * @param {{ typographyGuard?: boolean }} [options]
  * @returns {Promise<DeckValidationIssue[]>}
  */
-async function validateDeckLayouts(deckPath) {
+async function validateDeckLayouts(deckPath, options = {}) {
   const absolutePath = isAbsolute(deckPath) ? deckPath : resolve(deckPath)
   const source = readFileSync(absolutePath, 'utf8')
   const deck = parseSync(source, absolutePath)
@@ -158,6 +160,21 @@ async function validateDeckLayouts(deckPath) {
     const layout = String(slide.frontmatter?.layout ?? '').trim()
     const ref = slideRef(slide, index)
 
+    if (options.typographyGuard) {
+      if (slide.frontmatter?.src) {
+        issues.push({ ...ref, message: 'Статическая проверка типографики пока не раскрывает включения src. Соберите слайды в один Markdown-файл перед проверкой.' })
+        continue
+      }
+      try {
+        const structure = extractDeckLiveStructure(slide.content ?? '')
+        issues.push(...validateDeclaredTypography(structure.children).map(issue => ({ ...ref, ...issue })))
+      }
+      catch (error) {
+        issues.push({ ...ref, message: error instanceof Error ? error.message : String(error) })
+        continue
+      }
+    }
+
     if (index > 0 && Object.prototype.hasOwnProperty.call(slide.frontmatter ?? {}, 'title')) {
       issues.push({
         ...ref,