@setzkasten-cms/astro-admin 1.4.2 → 1.5.0

package/src/init/astro-section-analyzer-v2.ts

@@ -11,13 +11,13 @@
  */
 
 import { parse } from '@astrojs/compiler'
-import { inferFields, type InferredSection, type InferredField } from '@setzkasten-cms/core/init'
+import { type InferredField, type InferredSection, inferFields } from '@setzkasten-cms/core/init'
 import type {
   AnalyzerResult,
+  FieldPosition,
+  InnerFieldInfo,
   RepeatedGroup,
   RepeatedGroupInstance,
-  InnerFieldInfo,
-  FieldPosition,
 } from './analyzer-types.js'
 import { enrichFieldLabels } from './field-label-enricher.js'
 
@@ -43,7 +43,11 @@ interface AstAttr {
   position?: { start: { offset: number } }
 }
 
-function walkAst(node: AstNode, callback: (node: AstNode, parent: AstNode | null) => void, parent: AstNode | null = null): void {
+function walkAst(
+  node: AstNode,
+  callback: (node: AstNode, parent: AstNode | null) => void,
+  parent: AstNode | null = null,
+): void {
   callback(node, parent)
   if (node.children) {
     for (const child of node.children) {
@@ -76,7 +80,7 @@ export async function analyzeAstroSection(
   const { frontmatter, template, templateOffset } = splitAstroFile(source)
 
   // Filter variables: skip prop values, fallbacks, and .map()-only sources
-  const variables = extractFrontmatterVariables(frontmatter).filter(name => {
+  const variables = extractFrontmatterVariables(frontmatter).filter((name) => {
     const propUsageRegex = new RegExp(`\\w+={${name}}`)
     if (propUsageRegex.test(template)) return false
     const fallbackRegex = new RegExp(`(?:\\?\\?|\\|\\|)\\s*${name}\\b`)
@@ -101,7 +105,10 @@ export async function analyzeAstroSection(
   }
 
   // Extract template fields + repeated groups (Phase 1)
-  const { fields: templateFields, repeatedGroups } = await extractTemplateFields(template, frontmatter)
+  const { fields: templateFields, repeatedGroups } = await extractTemplateFields(
+    template,
+    frontmatter,
+  )
 
   // Fix positions: extractTemplateFields already subtracts WRAPPER_OFFSET internally,
   // so positions are relative to the template string. Add templateOffset for full source.
@@ -146,17 +153,17 @@ export async function analyzeAstroSection(
       ;(field as any)._pos = usageMatch.index
     } else {
       const mapUsage = template.indexOf(`${field.key}.map(`)
-      ;(field as any)._pos = mapUsage !== -1 ? mapUsage : Infinity
+      ;(field as any)._pos = mapUsage !== -1 ? mapUsage : Number.POSITIVE_INFINITY
     }
   }
 
   // Merge all fields and sort by template position
   const existingKeys = new Set(variableFields.map((f) => f.key))
-  const allFields = [
-    ...variableFields,
-    ...templateFields.filter((f) => !existingKeys.has(f.key)),
-  ]
-  allFields.sort((a, b) => ((a as any)._pos ?? Infinity) - ((b as any)._pos ?? Infinity))
+  const allFields = [...variableFields, ...templateFields.filter((f) => !existingKeys.has(f.key))]
+  allFields.sort(
+    (a, b) =>
+      ((a as any)._pos ?? Number.POSITIVE_INFINITY) - ((b as any)._pos ?? Number.POSITIVE_INFINITY),
+  )
 
   const fields = allFields.map(({ ...field }) => {
     delete (field as any)._pos
@@ -188,7 +195,11 @@ export async function analyzeAstroSection(
 // Frontmatter utilities (unchanged from v1)
 // ---------------------------------------------------------------------------
 
-function splitAstroFile(source: string): { frontmatter: string; template: string; templateOffset: number } {
+function splitAstroFile(source: string): {
+  frontmatter: string
+  template: string
+  templateOffset: number
+} {
   if (!source.startsWith('---')) return { frontmatter: '', template: source, templateOffset: 0 }
   // Find closing --- marker (starts at beginning of a line after the opening ---)
   const endIdx = source.indexOf('\n---', 3)
@@ -210,11 +221,29 @@ function stripTemplateLiterals(source: string): string {
       i++
       let depth = 0
       while (i < source.length) {
-        if (source[i] === '\\') { i += 2; continue }
-        if (source[i] === '$' && source[i + 1] === '{') { depth++; i += 2; continue }
-        if (source[i] === '{') { depth++; i++; continue }
-        if (source[i] === '}' && depth > 0) { depth--; i++; continue }
-        if (source[i] === '`' && depth === 0) { i++; break }
+        if (source[i] === '\\') {
+          i += 2
+          continue
+        }
+        if (source[i] === '$' && source[i + 1] === '{') {
+          depth++
+          i += 2
+          continue
+        }
+        if (source[i] === '{') {
+          depth++
+          i++
+          continue
+        }
+        if (source[i] === '}' && depth > 0) {
+          depth--
+          i++
+          continue
+        }
+        if (source[i] === '`' && depth === 0) {
+          i++
+          break
+        }
         i++
       }
       result += '``' // placeholder so surrounding code stays parseable
@@ -237,7 +266,8 @@ function extractFrontmatterVariables(frontmatter: string): string[] {
     const rhs = match[2]?.trim() ?? ''
     if (isInternalVariable(name)) continue
     // Skip exported declarations (e.g. "export const prerender = true")
-    const charBefore = match.index > 0 ? stripped.slice(Math.max(0, match.index - 10), match.index) : ''
+    const charBefore =
+      match.index > 0 ? stripped.slice(Math.max(0, match.index - 10), match.index) : ''
     if (/export\s*$/.test(charBefore)) continue
     if (/\.\s*map\s*\(/.test(rhs) || /\w+\?\.\w+/.test(rhs)) continue
     if (/^\[/.test(rhs) && /^default/i.test(name)) continue
@@ -298,10 +328,26 @@ function extractFrontmatterValue(frontmatter: string, varName: string): unknown
 
 function isInternalVariable(name: string): boolean {
   const skip = new Set([
-    'Astro', 'props', 'data', 'class', 'className', 'style', 'id',
-    'slot', 'Fragment', 'Component', 'frontmatter', 'url', 'site',
-    'generator', 'redirect', 'response', 'request', 'cookies',
-    'params', 'slots',
+    'Astro',
+    'props',
+    'data',
+    'class',
+    'className',
+    'style',
+    'id',
+    'slot',
+    'Fragment',
+    'Component',
+    'frontmatter',
+    'url',
+    'site',
+    'generator',
+    'redirect',
+    'response',
+    'request',
+    'cookies',
+    'params',
+    'slots',
   ])
   return skip.has(name) || name.startsWith('_')
 }
@@ -323,7 +369,7 @@ function buildByteToCharMap(source: string): (byteOffset: number) => number {
     if (codePoint > 0xffff) charIdx++
   }
   map[byteIdx] = source.length
-  return (offset) => offset <= 0 ? 0 : offset >= map.length ? source.length : map[offset]!
+  return (offset) => (offset <= 0 ? 0 : offset >= map.length ? source.length : map[offset]!)
 }
 
 function convertAstPositions(node: AstNode, b2c: (offset: number) => number): void {
@@ -346,11 +392,11 @@ function convertAstPositions(node: AstNode, b2c: (offset: number) => number): vo
 const WRAPPER_OFFSET = 8
 
 function nodeOffset(node: AstNode): number {
-  return (node.position?.start?.offset ?? Infinity) - WRAPPER_OFFSET
+  return (node.position?.start?.offset ?? Number.POSITIVE_INFINITY) - WRAPPER_OFFSET
 }
 
 function nodeEnd(node: AstNode): number {
-  return (node.position?.end?.offset ?? Infinity) - WRAPPER_OFFSET
+  return (node.position?.end?.offset ?? Number.POSITIVE_INFINITY) - WRAPPER_OFFSET
 }
 
 function getClassValue(node: AstNode): string {
@@ -368,7 +414,7 @@ function isAriaHidden(node: AstNode): boolean {
   return attr?.value === 'true'
 }
 
-function extractTextContent(node: AstNode, stripCmsBound: boolean = false): string {
+function extractTextContent(node: AstNode, stripCmsBound = false): string {
   let text = ''
   if (node.type === 'text') {
     text += node.value ?? ''
@@ -387,8 +433,22 @@ function extractTextContent(node: AstNode, stripCmsBound: boolean = false): stri
 
 /** Tags that indicate inline formatting (bold, italic, links, code, color spans, etc.) */
 const INLINE_FORMATTING_TAGS = new Set([
-  'strong', 'b', 'em', 'i', 'mark', 'code', 'del', 'ins',
-  'sub', 'sup', 'a', 'abbr', 'cite', 'u', 's', 'small',
+  'strong',
+  'b',
+  'em',
+  'i',
+  'mark',
+  'code',
+  'del',
+  'ins',
+  'sub',
+  'sup',
+  'a',
+  'abbr',
+  'cite',
+  'u',
+  's',
+  'small',
   'span', // color/style spans inside text content
 ])
 
@@ -406,10 +466,14 @@ function hasInlineFormatting(node: AstNode): boolean {
  * Collect all class="..." attributes from an element subtree.
  * Returns them with a structural path (child index path) for cross-instance matching.
  */
-function collectClassAttrs(node: AstNode, path: string = '', source?: string): import('./analyzer-types.js').ClassAttrInfo[] {
+function collectClassAttrs(
+  node: AstNode,
+  path = '',
+  source?: string,
+): import('./analyzer-types.js').ClassAttrInfo[] {
   const result: import('./analyzer-types.js').ClassAttrInfo[] = []
   if (node.type === 'element' && node.attributes && source) {
-    const classAttr = node.attributes.find(a => a.name === 'class' && a.kind === 'quoted')
+    const classAttr = node.attributes.find((a) => a.name === 'class' && a.kind === 'quoted')
     if (classAttr && classAttr.value) {
       // The AST position points to the element start, not the attribute.
       // Find the actual `class="` within the opening tag.
@@ -494,7 +558,10 @@ function serializeNode(node: AstNode): string {
 }
 
 function camelToLabel(str: string): string {
-  return str.replace(/([A-Z])/g, ' $1').replace(/^./, (s) => s.toUpperCase()).trim()
+  return str
+    .replace(/([A-Z])/g, ' $1')
+    .replace(/^./, (s) => s.toUpperCase())
+    .trim()
 }
 
 function inferInnerFieldType(name: string): InferredField['type'] {
@@ -502,8 +569,16 @@ function inferInnerFieldType(name: string): InferredField['type'] {
   if (/icon/.test(n)) return 'icon'
   if (/image|img|photo|avatar|logo|thumbnail|src/.test(n)) return 'image'
   if (/color|colour/.test(n)) return 'color'
-  if (/count|amount|number|quantity|total|rating|score|percent|order|index|size|width|height/.test(n)) return 'number'
-  if (/^is[A-Z]/.test(name) || /^has[A-Z]/.test(name) || /enabled|disabled|visible|hidden|active|checked|selected|highlight|accent|featured/.test(n)) return 'boolean'
+  if (
+    /count|amount|number|quantity|total|rating|score|percent|order|index|size|width|height/.test(n)
+  )
+    return 'number'
+  if (
+    /^is[A-Z]/.test(name) ||
+    /^has[A-Z]/.test(name) ||
+    /enabled|disabled|visible|hidden|active|checked|selected|highlight|accent|featured/.test(n)
+  )
+    return 'boolean'
   return 'text'
 }
 
@@ -511,7 +586,11 @@ function inferInnerFieldType(name: string): InferredField['type'] {
 // Inline array extraction (unchanged from v1)
 // ---------------------------------------------------------------------------
 
-function extractInlineArrayValues(arrayContent: string, isObjectArray: boolean, isStringArray: boolean): unknown[] {
+function extractInlineArrayValues(
+  arrayContent: string,
+  isObjectArray: boolean,
+  isStringArray: boolean,
+): unknown[] {
   if (isStringArray || !isObjectArray) {
     const strings: string[] = []
     const strRegex = /['"]([^'"]+)['"]/g
@@ -528,7 +607,9 @@ function extractInlineArrayValues(arrayContent: string, isObjectArray: boolean,
       const obj = parseObjectLiteral(objStr)
       if (Object.keys(obj).length > 0) objects.push(obj)
       i = end + 1
-    } else { i++ }
+    } else {
+      i++
+    }
   }
   return objects
 }
@@ -558,7 +639,10 @@ function parseObjectLiteral(objStr: string): Record<string, unknown> {
     while (i < objStr.length && /[\s,]/.test(objStr[i]!)) i++
     if (i >= objStr.length) break
     const keyMatch = objStr.slice(i).match(/^(\w+)\s*:\s*/)
-    if (!keyMatch) { i++; continue }
+    if (!keyMatch) {
+      i++
+      continue
+    }
     const key = keyMatch[1]!
     i += keyMatch[0].length
     const ch = objStr[i]
@@ -587,11 +671,16 @@ function parseObjectLiteral(objStr: string): Record<string, unknown> {
       i = end + 1
     } else if (ch && /\d/.test(ch)) {
       const numMatch = objStr.slice(i).match(/^(\d+(?:\.\d+)?)/)
-      if (numMatch) { obj[key] = Number(numMatch[1]); i += numMatch[0].length }
+      if (numMatch) {
+        obj[key] = Number(numMatch[1])
+        i += numMatch[0].length
+      }
     } else if (objStr.slice(i, i + 4) === 'true') {
-      obj[key] = true; i += 4
+      obj[key] = true
+      i += 4
     } else if (objStr.slice(i, i + 5) === 'false') {
-      obj[key] = false; i += 5
+      obj[key] = false
+      i += 5
     } else {
       while (i < objStr.length && objStr[i] !== ',') i++
     }
@@ -608,7 +697,7 @@ interface ExtractResult {
   repeatedGroups: RepeatedGroup[]
 }
 
-async function extractTemplateFields(template: string, frontmatter: string = ''): Promise<ExtractResult> {
+async function extractTemplateFields(template: string, frontmatter = ''): Promise<ExtractResult> {
   const fields: Array<InferredField & { _pos: number }> = []
   const usedKeys = new Set<string>()
   const repeatedGroups: RepeatedGroup[] = []
@@ -632,11 +721,12 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
         if (typeof field.defaultValue === 'string' && field.defaultValue.length >= 3) {
           finalPos = template.indexOf(field.defaultValue)
         } else if (Array.isArray(field.defaultValue) && field.defaultValue.length > 0) {
-          const firstItem = typeof field.defaultValue[0] === 'string'
-            ? field.defaultValue[0]
-            : typeof field.defaultValue[0] === 'object' && field.defaultValue[0]
-              ? Object.values(field.defaultValue[0])[0]
-              : null
+          const firstItem =
+            typeof field.defaultValue[0] === 'string'
+              ? field.defaultValue[0]
+              : typeof field.defaultValue[0] === 'object' && field.defaultValue[0]
+                ? Object.values(field.defaultValue[0])[0]
+                : null
           if (typeof firstItem === 'string' && firstItem.length >= 2) {
             finalPos = template.indexOf(firstItem)
           }
@@ -648,7 +738,7 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
         const keyMatch = keyRegex.exec(template)
         if (keyMatch) finalPos = keyMatch.index
       }
-      fields.push({ ...field, _pos: finalPos === -1 ? Infinity : finalPos })
+      fields.push({ ...field, _pos: finalPos === -1 ? Number.POSITIVE_INFINITY : finalPos })
     }
   }
 
@@ -706,7 +796,9 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
       repeatedElementGroups.push({ tag, instances: siblings })
       for (const inst of siblings) {
         const start = nodeOffset(inst)
-        const end = inst.position?.end?.offset ? inst.position.end.offset - WRAPPER_OFFSET : start + 1
+        const end = inst.position?.end?.offset
+          ? inst.position.end.offset - WRAPPER_OFFSET
+          : start + 1
         repeatedElementRanges.push({ start, end })
       }
     }
@@ -716,7 +808,7 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
   // Detects only tbody rows (not thead) so column headers are excluded.
   walkAst(ast, (node) => {
     if (node.type !== 'element' || node.name !== 'tbody') return
-    const trRows = (node.children ?? []).filter(c => c.type === 'element' && c.name === 'tr')
+    const trRows = (node.children ?? []).filter((c) => c.type === 'element' && c.name === 'tr')
     if (trRows.length < 2) return
     repeatedElementGroups.push({ tag: 'tr', instances: trRows })
     for (const row of trRows) {
@@ -754,22 +846,38 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
         while ((m = itemRe.exec(arrayFallbackMatch[1]!)) !== null) {
           items.push(m[1] ?? m[2] ?? m[3] ?? '')
         }
-        const hasFormatting = items.some(s => /<[a-z]/.test(s))
-        addField({
-          key: fieldKey, type: 'array', label: camelToLabel(fieldKey), confidence: 'high',
-          defaultValue: items.length > 0 ? items : undefined,
-          options: { arrayItem: { type: 'text', ...(hasFormatting ? { formatting: true } : {}) } },
-        }, nodeOffset(node))
+        const hasFormatting = items.some((s) => /<[a-z]/.test(s))
+        addField(
+          {
+            key: fieldKey,
+            type: 'array',
+            label: camelToLabel(fieldKey),
+            confidence: 'high',
+            defaultValue: items.length > 0 ? items : undefined,
+            options: {
+              arrayItem: { type: 'text', ...(hasFormatting ? { formatting: true } : {}) },
+            },
+          },
+          nodeOffset(node),
+        )
       } else {
         // String fallback or no fallback
         const strFallback = exprCode.match(/\?\?\s*(?:`([\s\S]*?)`|'([^']*)'|"([^"]*)")/)
-        const defaultValue = strFallback ? (strFallback[1] ?? strFallback[2] ?? strFallback[3] ?? '').trim() : undefined
+        const defaultValue = strFallback
+          ? (strFallback[1] ?? strFallback[2] ?? strFallback[3] ?? '').trim()
+          : undefined
         const hasHtml = defaultValue ? /<[a-z]/.test(defaultValue) : false
-        addField({
-          key: fieldKey, type: 'text', label: camelToLabel(fieldKey), confidence: 'high',
-          ...(defaultValue ? { defaultValue } : {}),
-          ...(hasHtml ? { options: { formatting: true } } : {}),
-        }, nodeOffset(node))
+        addField(
+          {
+            key: fieldKey,
+            type: 'text',
+            label: camelToLabel(fieldKey),
+            confidence: 'high',
+            ...(defaultValue ? { defaultValue } : {}),
+            ...(hasHtml ? { options: { formatting: true } } : {}),
+          },
+          nodeOffset(node),
+        )
       }
       cmsBoundOffsets.add(nodeOffset(node))
     }
@@ -779,21 +887,31 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
     if (node.type !== 'element' && node.type !== 'component') return
     for (const attr of node.attributes ?? []) {
       if (attr.kind !== 'expression') continue
-      const cmsAttrMatch = attr.value.match(/^\s*\w+\?\.\s*(\w+)\s*\?\?\s*(?:`([\s\S]*?)`|'([^']*)'|"([^"]*)")/)
+      const cmsAttrMatch = attr.value.match(
+        /^\s*\w+\?\.\s*(\w+)\s*\?\?\s*(?:`([\s\S]*?)`|'([^']*)'|"([^"]*)")/,
+      )
       if (cmsAttrMatch) {
         const fieldKey = cmsAttrMatch[1]!
         const fallback = (cmsAttrMatch[2] ?? cmsAttrMatch[3] ?? cmsAttrMatch[4] ?? '').trim()
-        const pos = attr.position?.start?.offset ? attr.position.start.offset - WRAPPER_OFFSET : nodeOffset(node)
+        const pos = attr.position?.start?.offset
+          ? attr.position.start.offset - WRAPPER_OFFSET
+          : nodeOffset(node)
         // formatting: true when fallback contains HTML tags,
         // OR when the attribute is set:html without a fallback (content is always HTML then)
         const isSetHtml = attr.name === 'set:html'
         const fallbackHasHtml = fallback ? /<[a-z]/.test(fallback) : false
         const hasHtml = fallbackHasHtml || (isSetHtml && !fallback)
-        addField({
-          key: fieldKey, type: 'text', label: camelToLabel(fieldKey), confidence: 'high',
-          ...(fallback ? { defaultValue: fallback } : {}),
-          ...(hasHtml ? { options: { formatting: true } } : {}),
-        }, pos)
+        addField(
+          {
+            key: fieldKey,
+            type: 'text',
+            label: camelToLabel(fieldKey),
+            confidence: 'high',
+            ...(fallback ? { defaultValue: fallback } : {}),
+            ...(hasHtml ? { options: { formatting: true } } : {}),
+          },
+          pos,
+        )
         cmsBoundOffsets.add(nodeOffset(node))
       }
     }
@@ -817,14 +935,25 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
     if (!/uppercase|tracking-widest/.test(classVal)) return
     const text = extractTextContent(node, true).trim()
     if (text.length >= 2 && text.length <= 80) {
-      addField({ key: 'overline', type: 'text', label: 'Overline', confidence: 'medium', defaultValue: text }, nodeOffset(node))
+      addField(
+        {
+          key: 'overline',
+          type: 'text',
+          label: 'Overline',
+          confidence: 'medium',
+          defaultValue: text,
+        },
+        nodeOffset(node),
+      )
     }
   })
 
   // ── 2. HEADINGS (h1-h6) ───────────────────────────────────────────────
   // Start from the count of already-registered heading* keys (from Section 0)
   // so new headings get non-colliding keys (heading3, heading4, ...).
-  let headingCount = Array.from(usedKeys).filter(k => k === 'heading' || /^heading\d+$/.test(k)).length
+  let headingCount = Array.from(usedKeys).filter(
+    (k) => k === 'heading' || /^heading\d+$/.test(k),
+  ).length
   walkAst(ast, (node) => {
     if (node.type !== 'element') return
     if (!/^h[1-6]$/.test(node.name ?? '')) return
@@ -834,18 +963,26 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
       headingCount++
       const headingOpts: Record<string, unknown> = { required: true }
       if (hasInlineFormatting(node)) headingOpts.formatting = true
-      addField({
-        key: numberedKey('heading', headingCount), type: 'text',
-        label: numberedLabel('Heading', headingCount), confidence: 'high',
-        defaultValue: text, options: headingOpts,
-      }, nodeOffset(node))
+      addField(
+        {
+          key: numberedKey('heading', headingCount),
+          type: 'text',
+          label: numberedLabel('Heading', headingCount),
+          confidence: 'high',
+          defaultValue: text,
+          options: headingOpts,
+        },
+        nodeOffset(node),
+      )
     }
   })
 
   // ── 3. PARAGRAPHS / DESCRIPTION TEXT ───────────────────────────────────
   // Start from the count of already-registered description* keys (from Section 0)
   // so new description fields get non-colliding keys (description2, description3, ...).
-  let descCount = Array.from(usedKeys).filter(k => k === 'description' || /^description\d+$/.test(k)).length
+  let descCount = Array.from(usedKeys).filter(
+    (k) => k === 'description' || /^description\d+$/.test(k),
+  ).length
   walkAst(ast, (node) => {
     if (node.type !== 'element') return
     if (node.name !== 'p' && node.name !== 'div') return
@@ -853,19 +990,28 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
     const classVal = getClassValue(node)
     const serialized = serializeNode(node)
     if (/uppercase|tracking-widest/.test(classVal) && serialized.length < 250) return
-    if (/text-2xl|text-3xl|text-\[11px\]|text-\[10px\]|text-\[9px\]|text-\[8px\]/.test(classVal)) return
+    if (/text-2xl|text-3xl|text-\[11px\]|text-\[10px\]|text-\[9px\]|text-\[8px\]/.test(classVal))
+      return
     if (node.name === 'div' && (containsElement(node, 'a') || containsElement(node, 'button'))) {
       // Allow mixed-text divs (callouts with inline links) — skip only pure-element
       // containers like nav/card wrappers that have no direct text nodes.
       const hasMixedText = (node.children ?? []).some(
-        c => c.type === 'text' && (c.value ?? '').trim().length > 0,
+        (c) => c.type === 'text' && (c.value ?? '').trim().length > 0,
       )
       if (!hasMixedText) return
     }
-    if (node.name === 'div' && ['h1','h2','h3','h4','h5','h6'].some(h => containsElement(node, h))) return
+    if (
+      node.name === 'div' &&
+      ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'].some((h) => containsElement(node, h))
+    )
+      return
     if (node.name === 'div') {
-      const contentChildren = (node.children ?? []).filter(c => c.type !== 'text' || (c.value ?? '').trim().length > 0)
-      const hasOnlyElementChildren = contentChildren.length > 0 && contentChildren.every(c => c.type === 'element' || c.type === 'component')
+      const contentChildren = (node.children ?? []).filter(
+        (c) => c.type !== 'text' || (c.value ?? '').trim().length > 0,
+      )
+      const hasOnlyElementChildren =
+        contentChildren.length > 0 &&
+        contentChildren.every((c) => c.type === 'element' || c.type === 'component')
       if (hasOnlyElementChildren) return
     }
     const text = extractTextContent(node, true).replace(/\s+/g, ' ').trim()
@@ -873,11 +1019,17 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
     descCount++
     const descOpts: Record<string, unknown> = { multiline: true }
     if (hasInlineFormatting(node)) descOpts.formatting = true
-    addField({
-      key: numberedKey('description', descCount), type: 'text',
-      label: numberedLabel('Beschreibung', descCount), confidence: 'medium',
-      defaultValue: text, options: descOpts,
-    }, nodeOffset(node))
+    addField(
+      {
+        key: numberedKey('description', descCount),
+        type: 'text',
+        label: numberedLabel('Beschreibung', descCount),
+        confidence: 'medium',
+        defaultValue: text,
+        options: descOpts,
+      },
+      nodeOffset(node),
+    )
   })
 
   // ── 4. RICH TEXT (set:html) ────────────────────────────────────────────
@@ -893,11 +1045,17 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
       const strMatch = expr.match(/['"]([^'"]+)['"]/)
       const fallbackMatch = expr.match(/\?\?\s*['"]([^'"]+)['"]/)
       const value = fallbackMatch?.[1] ?? strMatch?.[1] ?? ''
-      addField({
-        key: numberedKey('richText', richCount), type: 'text',
-        label: numberedLabel('Rich Text', richCount), confidence: 'high',
-        defaultValue: value, options: { multiline: true, formatting: true },
-      }, nodeOffset(node))
+      addField(
+        {
+          key: numberedKey('richText', richCount),
+          type: 'text',
+          label: numberedLabel('Rich Text', richCount),
+          confidence: 'high',
+          defaultValue: value,
+          options: { multiline: true, formatting: true },
+        },
+        nodeOffset(node),
+      )
     }
   })
 
@@ -912,11 +1070,16 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
     const text = extractTextContent(node, true).replace(/\s+/g, ' ').trim()
     if (text.length >= 2 && text.length <= 60) {
       ctaCount++
-      addField({
-        key: numberedKey('ctaText', ctaCount), type: 'text',
-        label: numberedLabel('Button Text', ctaCount), confidence: 'medium',
-        defaultValue: text,
-      }, nodeOffset(node))
+      addField(
+        {
+          key: numberedKey('ctaText', ctaCount),
+          type: 'text',
+          label: numberedLabel('Button Text', ctaCount),
+          confidence: 'medium',
+          defaultValue: text,
+        },
+        nodeOffset(node),
+      )
     }
   })
 
@@ -940,11 +1103,16 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
     if (!href) return
     if (href.startsWith('#') || href.startsWith('javascript:')) return
     linkCount++
-    addField({
-      key: numberedKey('ctaLink', linkCount), type: 'text',
-      label: numberedLabel('Button Link', linkCount), confidence: 'medium',
-      defaultValue: href,
-    }, nodeOffset(node))
+    addField(
+      {
+        key: numberedKey('ctaLink', linkCount),
+        type: 'text',
+        label: numberedLabel('Button Link', linkCount),
+        confidence: 'medium',
+        defaultValue: href,
+      },
+      nodeOffset(node),
+    )
   })
 
   // ── 7. IMAGES ──────────────────────────────────────────────────────────
@@ -965,22 +1133,32 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
       }
       if (src) {
         imgCount++
-        addField({
-          key: numberedKey('image', imgCount), type: 'image',
-          label: numberedLabel('Bild', imgCount), confidence: 'high',
-          defaultValue: { path: src.trim(), alt: '' },
-        }, nodeOffset(node))
+        addField(
+          {
+            key: numberedKey('image', imgCount),
+            type: 'image',
+            label: numberedLabel('Bild', imgCount),
+            confidence: 'high',
+            defaultValue: { path: src.trim(), alt: '' },
+          },
+          nodeOffset(node),
+        )
       }
     }
     if (tagName === 'img' || tagName === 'Image') {
       const altAttr = getAttr(node, 'alt')
       if (altAttr && altAttr.kind === 'quoted' && altAttr.value.trim().length >= 2) {
         altCount++
-        addField({
-          key: numberedKey('imageAlt', altCount), type: 'text',
-          label: numberedLabel('Bild Alt-Text', altCount), confidence: 'medium',
-          defaultValue: altAttr.value.trim(),
-        }, nodeOffset(node))
+        addField(
+          {
+            key: numberedKey('imageAlt', altCount),
+            type: 'text',
+            label: numberedLabel('Bild Alt-Text', altCount),
+            confidence: 'medium',
+            defaultValue: altAttr.value.trim(),
+          },
+          nodeOffset(node),
+        )
       }
     }
   })
@@ -994,10 +1172,15 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
     if (svgSource.length < 100) return
     if (parentNode && (parentNode.name === 'a' || parentNode.name === 'button')) return
     iconCount++
-    addField({
-      key: numberedKey('icon', iconCount), type: 'icon',
-      label: numberedLabel('Icon', iconCount), confidence: 'low',
-    }, nodeOffset(node))
+    addField(
+      {
+        key: numberedKey('icon', iconCount),
+        type: 'icon',
+        label: numberedLabel('Icon', iconCount),
+        confidence: 'low',
+      },
+      nodeOffset(node),
+    )
   })
   let foundIconProp = false
   walkAst(ast, (node) => {
@@ -1016,14 +1199,18 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
   walkAst(ast, (node) => {
     if (node.type !== 'expression') return
     const exprCode = (node.children ?? []).map((c) => c.value ?? '').join('')
-    const inlineArrayMatch = exprCode.match(/^\s*\[([\s\S]*?)\]\s*\.map\s*\(\s*\(?\s*(\{[^}]*\}|\w+)/)
+    const inlineArrayMatch = exprCode.match(
+      /^\s*\[([\s\S]*?)\]\s*\.map\s*\(\s*\(?\s*(\{[^}]*\}|\w+)/,
+    )
     if (!inlineArrayMatch) return
     arrayCount++
     const arrayContent = inlineArrayMatch[1]!
     const callbackParam = inlineArrayMatch[2]!
     let objectKeys: string[] = []
     if (callbackParam.startsWith('{')) {
-      objectKeys = callbackParam.replace(/[{}]/g, '').split(',')
+      objectKeys = callbackParam
+        .replace(/[{}]/g, '')
+        .split(',')
         .map((p: string) => p.trim().split(':')[0]!.trim())
         .filter((p: string) => p && !p.startsWith('...'))
     } else {
@@ -1042,25 +1229,39 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
       }
     }
     const isObjectArray = objectKeys.length > 0
-    const isStringArray = /^\s*'[^']*'\s*,/.test(arrayContent) || /^\s*"[^"]*"\s*,/.test(arrayContent)
+    const isStringArray =
+      /^\s*'[^']*'\s*,/.test(arrayContent) || /^\s*"[^"]*"\s*,/.test(arrayContent)
     const arrayDefaultValue = extractInlineArrayValues(arrayContent, isObjectArray, isStringArray)
     if (isObjectArray && !isStringArray) {
       const innerFields: InferredField[] = objectKeys.map((prop: string) => ({
-        key: prop, type: inferInnerFieldType(prop), label: camelToLabel(prop), confidence: 'medium' as const,
+        key: prop,
+        type: inferInnerFieldType(prop),
+        label: camelToLabel(prop),
+        confidence: 'medium' as const,
       }))
-      addField({
-        key: numberedKey('items', arrayCount), type: 'array',
-        label: numberedLabel('Liste', arrayCount), confidence: 'high',
-        defaultValue: arrayDefaultValue,
-        options: { arrayItem: { type: 'object', fields: innerFields } },
-      }, nodeOffset(node))
+      addField(
+        {
+          key: numberedKey('items', arrayCount),
+          type: 'array',
+          label: numberedLabel('Liste', arrayCount),
+          confidence: 'high',
+          defaultValue: arrayDefaultValue,
+          options: { arrayItem: { type: 'object', fields: innerFields } },
+        },
+        nodeOffset(node),
+      )
     } else {
-      addField({
-        key: numberedKey('items', arrayCount), type: 'array',
-        label: numberedLabel('Liste', arrayCount), confidence: 'high',
-        defaultValue: arrayDefaultValue,
-        options: { arrayItem: { type: 'text' } },
-      }, nodeOffset(node))
+      addField(
+        {
+          key: numberedKey('items', arrayCount),
+          type: 'array',
+          label: numberedLabel('Liste', arrayCount),
+          confidence: 'high',
+          defaultValue: arrayDefaultValue,
+          options: { arrayItem: { type: 'text' } },
+        },
+        nodeOffset(node),
+      )
     }
   })
 
@@ -1079,7 +1280,7 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
     walkAst(node, (n) => {
       if (hasMap) return
       if (n.type === 'expression') {
-        const code = (n.children ?? []).map(c => c.value ?? '').join('')
+        const code = (n.children ?? []).map((c) => c.value ?? '').join('')
         if (/\.map\s*\(/.test(code)) hasMap = true
       }
     })
@@ -1137,12 +1338,19 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
     }
     if (listItems.length < 1) return
     staticListCount++
-    addField({
-      key: numberedKey('items', arrayCount + staticListCount), type: 'array',
-      label: numberedLabel('Liste', arrayCount + staticListCount), confidence: 'high',
-      defaultValue: listItems,
-      options: { arrayItem: { type: 'text', ...(listHasFormatting ? { formatting: true } : {}) } },
-    }, nodeOffset(node))
+    addField(
+      {
+        key: numberedKey('items', arrayCount + staticListCount),
+        type: 'array',
+        label: numberedLabel('Liste', arrayCount + staticListCount),
+        confidence: 'high',
+        defaultValue: listItems,
+        options: {
+          arrayItem: { type: 'text', ...(listHasFormatting ? { formatting: true } : {}) },
+        },
+      },
+      nodeOffset(node),
+    )
   })
 
   // ── 10. COMPONENT PROPS (content-bearing) ─────────────────────────────
@@ -1160,28 +1368,53 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
       if (attr.kind === 'quoted') {
         const propName = attr.name
         const propValue = attr.value
-        if (/^(class|className|id|style|type|role|width|height|viewBox|fill|stroke|xmlns|d|cx|cy|r|rx|ry|x|y|x1|y1|x2|y2)$/.test(propName)) continue
-        if (/^(lang|language|filename|file|format|variant|size|loading|decoding|transition|client:.*)$/.test(propName)) continue
+        if (
+          /^(class|className|id|style|type|role|width|height|viewBox|fill|stroke|xmlns|d|cx|cy|r|rx|ry|x|y|x1|y1|x2|y2)$/.test(
+            propName,
+          )
+        )
+          continue
+        if (
+          /^(lang|language|filename|file|format|variant|size|loading|decoding|transition|client:.*)$/.test(
+            propName,
+          )
+        )
+          continue
         if (/^(aria-|data-)/.test(propName)) continue
         if (propValue.length < 2) continue
         if (propValue === 'true' || propValue === 'false' || /^\d+$/.test(propValue)) continue
         if (propValue.includes('/') && !propValue.includes(' ')) continue
-        addField({
-          key: propName,
-          type: propName === 'icon' ? 'icon' : propName === 'src' ? 'image' : 'text',
-          label: camelToLabel(propName), confidence: 'medium', defaultValue: propValue,
-        }, nodeOffset(node))
+        addField(
+          {
+            key: propName,
+            type: propName === 'icon' ? 'icon' : propName === 'src' ? 'image' : 'text',
+            label: camelToLabel(propName),
+            confidence: 'medium',
+            defaultValue: propValue,
+          },
+          nodeOffset(node),
+        )
       } else if (attr.kind === 'expression') {
         const propName = attr.name
-        if (/^(class|className|id|style|type|role|lang|language|filename|file|format|variant|size|loading|decoding)$/.test(propName)) continue
+        if (
+          /^(class|className|id|style|type|role|lang|language|filename|file|format|variant|size|loading|decoding)$/.test(
+            propName,
+          )
+        )
+          continue
         if (/^\s*\w+\s*$/.test(attr.value)) continue
         const fallbackMatch = attr.value.match(/\?\?\s*['"]([^'"]+)['"]/)
         if (fallbackMatch) {
-          addField({
-            key: propName,
-            type: propName === 'icon' ? 'icon' : propName === 'src' ? 'image' : 'text',
-            label: camelToLabel(propName), confidence: 'medium', defaultValue: fallbackMatch[1]!,
-          }, nodeOffset(node))
+          addField(
+            {
+              key: propName,
+              type: propName === 'icon' ? 'icon' : propName === 'src' ? 'image' : 'text',
+              label: camelToLabel(propName),
+              confidence: 'medium',
+              defaultValue: fallbackMatch[1]!,
+            },
+            nodeOffset(node),
+          )
         }
       }
     }
@@ -1209,7 +1442,8 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
         if (/^(class|className|id|style|type|role)$/.test(name)) continue
         if (/^(aria-|data-)/.test(name)) continue
         if (attr.kind === 'quoted') {
-          allProps.add(name); item[name] = attr.value
+          allProps.add(name)
+          item[name] = attr.value
         } else if (attr.kind === 'expression') {
           allProps.add(name)
           const expr = attr.value.trim()
@@ -1224,20 +1458,45 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
       if (Object.keys(item).length > 0) instanceValues.push(item)
     }
     if (allProps.size > 0) {
-      const cardKey = compName.replace(/([A-Z])/g, (_m: string, c: string, i: number) => i === 0 ? c.toLowerCase() : '_' + c.toLowerCase()).replace(/_/g, '') + 's'
+      const cardKey =
+        compName
+          .replace(/([A-Z])/g, (_m: string, c: string, i: number) =>
+            i === 0 ? c.toLowerCase() : '_' + c.toLowerCase(),
+          )
+          .replace(/_/g, '') + 's'
       if (!usedKeys.has(cardKey)) {
         const innerFields: InferredField[] = [...allProps].map((p) => {
-          const isArray = instanceValues.some(iv => Array.isArray(iv[p]))
+          const isArray = instanceValues.some((iv) => Array.isArray(iv[p]))
           if (isArray) {
-            return { key: p, type: 'array' as const, label: camelToLabel(p), confidence: 'medium' as const, options: { arrayItem: { type: 'text' as const } } }
+            return {
+              key: p,
+              type: 'array' as const,
+              label: camelToLabel(p),
+              confidence: 'medium' as const,
+              options: { arrayItem: { type: 'text' as const } },
+            }
+          }
+          return {
+            key: p,
+            type: inferInnerFieldType(p),
+            label: camelToLabel(p),
+            confidence: 'medium' as const,
           }
-          return { key: p, type: inferInnerFieldType(p), label: camelToLabel(p), confidence: 'medium' as const }
         })
-        addField({
-          key: cardKey, type: 'array', label: `${compName} Liste`, confidence: 'medium',
-          defaultValue: instanceValues.length > 0 ? instanceValues : undefined,
-          options: { arrayItem: { type: 'object', fields: innerFields } },
-        }, nodeOffset(instances[0]!))
+        addField(
+          {
+            key: cardKey,
+            type: 'array',
+            label: `${compName} Liste`,
+            confidence: 'medium',
+            defaultValue: instanceValues.length > 0 ? instanceValues : undefined,
+            options: {
+              arrayItem: { type: 'object', fields: innerFields },
+              sourceComponent: compName,
+            },
+          },
+          nodeOffset(instances[0]!),
+        )
       }
     }
   }
@@ -1249,7 +1508,7 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
     const instanceCount = group.instances.length
 
     // Build instance bounds
-    const instanceBounds: RepeatedGroupInstance[] = group.instances.map(inst => ({
+    const instanceBounds: RepeatedGroupInstance[] = group.instances.map((inst) => ({
       start: nodeOffset(inst),
       end: nodeEnd(inst),
     }))
@@ -1267,7 +1526,7 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
 
     // Phase 1b: Use MAJORITY structure as canonical (most common tag sequence)
     // This avoids using an instance with optional elements as the template.
-    const signatures = instanceFingerprints.map(fp => fp.map(i => i.tag).join(','))
+    const signatures = instanceFingerprints.map((fp) => fp.map((i) => i.tag).join(','))
     const sigCounts = new Map<string, number>()
     for (const sig of signatures) sigCounts.set(sig, (sigCounts.get(sig) ?? 0) + 1)
     const mostCommonSig = [...sigCounts.entries()].sort((a, b) => b[1] - a[1])[0]![0]
@@ -1351,7 +1610,8 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
       // For links, also extract link text as a separate field
       if (isLink) {
         typeCounts['linkText'] = (typeCounts['linkText'] ?? 0) + 1
-        const ltKey = typeCounts['linkText'] === 1 ? 'linkText' : `linkText${typeCounts['linkText']}`
+        const ltKey =
+          typeCounts['linkText'] === 1 ? 'linkText' : `linkText${typeCounts['linkText']}`
         const ltPositions: Array<FieldPosition | null> = []
         const ltDefaults: unknown[] = []
 
@@ -1397,8 +1657,14 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
         const tag = item.tag
         const isArray = tag === '__array__'
         const isLink = tag === 'a'
-        let fieldType: 'text' | 'array' | 'link' = isArray ? 'array' : isLink ? 'link' : 'text'
-        let keyBase = /^h[1-6]$/.test(tag) ? 'heading' : isLink ? 'link' : isArray ? 'list' : 'text'
+        const fieldType: 'text' | 'array' | 'link' = isArray ? 'array' : isLink ? 'link' : 'text'
+        const keyBase = /^h[1-6]$/.test(tag)
+          ? 'heading'
+          : isLink
+            ? 'link'
+            : isArray
+              ? 'list'
+              : 'text'
         typeCounts[keyBase] = (typeCounts[keyBase] ?? 0) + 1
         const key = typeCounts[keyBase] === 1 ? keyBase : `${keyBase}${typeCounts[keyBase]}`
 
@@ -1419,12 +1685,20 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
 
         if (isLink) {
           typeCounts['linkText'] = (typeCounts['linkText'] ?? 0) + 1
-          const ltKey = typeCounts['linkText'] === 1 ? 'linkText' : `linkText${typeCounts['linkText']}`
+          const ltKey =
+            typeCounts['linkText'] === 1 ? 'linkText' : `linkText${typeCounts['linkText']}`
           const ltPositions: Array<FieldPosition | null> = new Array(instanceCount).fill(null)
           const ltDefaults: unknown[] = new Array(instanceCount).fill(null)
           ltPositions[ii] = positions[ii] ?? null
           ltDefaults[ii] = item.text || null
-          innerFields.push({ key: ltKey, type: 'text', tag: 'a', required: false, positions: ltPositions, defaultValues: ltDefaults })
+          innerFields.push({
+            key: ltKey,
+            type: 'text',
+            tag: 'a',
+            required: false,
+            positions: ltPositions,
+            defaultValues: ltDefaults,
+          })
         }
       }
     }
@@ -1451,7 +1725,7 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
     }
 
     // Build inner field definitions for the field schema
-    const innerFieldDefs: InferredField[] = innerFields.map(f => {
+    const innerFieldDefs: InferredField[] = innerFields.map((f) => {
       if (f.type === 'array') {
         return {
           key: f.key,
@@ -1463,32 +1737,36 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
       }
       return {
         key: f.key,
-        type: f.type === 'link' ? 'text' as const : 'text' as const,
+        type: f.type === 'link' ? ('text' as const) : ('text' as const),
         label: f.label ?? camelToLabel(f.key),
         confidence: 'medium' as const,
       }
     })
 
     // Add as top-level field
-    const groupLabel = group.tag === 'tr'
-      ? 'Tabellen-Zeilen'
-      : `${group.tag.charAt(0).toUpperCase() + group.tag.slice(1)} Liste`
-    addField({
-      key: fieldKey,
-      type: 'array',
-      label: groupLabel,
-      confidence: 'high',
-      defaultValue,
-      options: {
-        arrayItem: { type: 'object', fields: innerFieldDefs },
-        _repeatedTag: group.tag,
-        _instanceCount: instanceCount,
-      } as any,
-    }, instanceBounds[0]!.start)
+    const groupLabel =
+      group.tag === 'tr'
+        ? 'Tabellen-Zeilen'
+        : `${group.tag.charAt(0).toUpperCase() + group.tag.slice(1)} Liste`
+    addField(
+      {
+        key: fieldKey,
+        type: 'array',
+        label: groupLabel,
+        confidence: 'high',
+        defaultValue,
+        options: {
+          arrayItem: { type: 'object', fields: innerFieldDefs },
+          _repeatedTag: group.tag,
+          _instanceCount: instanceCount,
+        } as any,
+      },
+      instanceBounds[0]!.start,
+    )
 
     // Collect class attributes per instance (AST-based, for dynamic class detection in patcher)
     // Positions are relative to `template` here; posAdjust is applied after extractTemplateFields returns
-    const classAttrs = group.instances.map(inst => collectClassAttrs(inst, '', template))
+    const classAttrs = group.instances.map((inst) => collectClassAttrs(inst, '', template))
 
     // Store RepeatedGroup for the patcher
     repeatedGroups.push({
@@ -1510,7 +1788,7 @@ async function extractTemplateFields(template: string, frontmatter: string = '')
 // ---------------------------------------------------------------------------
 
 interface ContentItem {
-  tag: string        // h2, p, span, a, __array__
+  tag: string // h2, p, span, a, __array__
   depth: number
   node: AstNode
   text: string
@@ -1590,7 +1868,7 @@ function walkContentNodes(
       walkAst(child, (expr) => {
         if (mapSource) return
         if (expr.type !== 'expression') return
-        const code = (expr.children ?? []).map(c => c.value ?? '').join('')
+        const code = (expr.children ?? []).map((c) => c.value ?? '').join('')
         const mapMatch = code.match(/(\w+)\.map\s*\(/)
         if (mapMatch) mapSource = mapMatch[1]
       })
@@ -1633,7 +1911,13 @@ function findMatchingItem(
   allCanonical: ContentItem[],
   consumed: Set<number>,
 ): ContentItem | null {
-  const result = findMatchingItemCore(targetFp, canonicalItem, canonicalIndex, allCanonical, consumed)
+  const result = findMatchingItemCore(
+    targetFp,
+    canonicalItem,
+    canonicalIndex,
+    allCanonical,
+    consumed,
+  )
   if (result) consumed.add(result.idx)
   return result?.item ?? null
 }
@@ -1651,9 +1935,7 @@ function findMatchingItemPeek(
   // For peek, we look for the already-consumed link node (it was consumed by the link field)
   // So we search WITHOUT the consumed filter
   const tag = canonicalItem.tag
-  const candidates = targetFp
-    .map((item, idx) => ({ item, idx }))
-    .filter(c => c.item.tag === tag)
+  const candidates = targetFp.map((item, idx) => ({ item, idx })).filter((c) => c.item.tag === tag)
   if (candidates.length === 0) return null
   if (candidates.length === 1) return candidates[0]!.item
   const canonicalRelPos = canonicalIndex / Math.max(allCanonical.length - 1, 1)
@@ -1675,7 +1957,7 @@ function findMatchingItemCore(
   const tag = canonicalItem.tag
   const candidates = targetFp
     .map((item, idx) => ({ item, idx }))
-    .filter(c => c.item.tag === tag && !consumed.has(c.idx))
+    .filter((c) => c.item.tag === tag && !consumed.has(c.idx))
 
   if (candidates.length === 0) return null
   if (candidates.length === 1) return candidates[0]!