agentic-mermaid 0.1.1 → 0.2.0

package/src/shared/svg-a11y.ts

@@ -1,29 +0,0 @@
-/**
- * Shared SVG accessibility root attributes.
- *
- * One implementation of the contract every family renderer that threads
- * accessibility itself must follow: `role="img"` on the root,
- * `aria-labelledby` referencing the `<title id>` and `aria-describedby`
- * referencing the `<desc id>`. Renderers that do not thread accessibility get
- * the same contract from the injectAccessibility post-pass in index.ts —
- * which detects these root attributes to know when to leave output alone.
- * (Conformance-gated across all families by svg-a11y-conformance.test.ts.)
- */
-export function buildAccessibilityAttrs(
-  title: string | undefined,
-  description: string | undefined,
-  titleId: string,
-  descId: string,
-  roledescription?: string,
-): Record<string, string> {
-  const attrs: Record<string, string> = {}
-  if (roledescription) {
-    attrs['role'] = 'img'
-    attrs['aria-roledescription'] = roledescription
-  } else if (title || description) {
-    attrs['role'] = 'img'
-  }
-  if (title) attrs['aria-labelledby'] = titleId
-  if (description) attrs['aria-describedby'] = descId
-  return attrs
-}

package/src/shared/syntax-error.ts

@@ -1,17 +0,0 @@
-// A prescriptive syntax error: say WHAT is wrong AND how to fix it — the
-// expected form plus a copyable example (and, when known, the valid identifiers
-// in scope) — so a caller, especially a smaller model driving the hosted MCP,
-// can correct from the message alone instead of trial-and-error. The render-path
-// parsers throw plain Errors that `verifyMermaid` flattens into the RENDER_FAILED
-// warning's `reason` string, so the prescriptive text rides straight through to
-// the agent. Message shape mirrors the architecture edge errors:
-//   `<what> — expected <expectedForm>, e.g. <example>[ (known: a, b, c)]`
-export function syntaxError(detail: {
-  what: string
-  expectedForm: string
-  example: string
-  known?: readonly string[]
-}): Error {
-  const known = detail.known && detail.known.length > 0 ? ` (known: ${detail.known.join(', ')})` : ''
-  return new Error(`${detail.what} — expected ${detail.expectedForm}, e.g. ${detail.example}${known}`)
-}

package/src/shared/unicode-ranges.ts

@@ -1,135 +0,0 @@
-// ============================================================================
-// Shared Unicode range tables.
-//
-// Both the ASCII renderer (src/ascii/width.ts) and the SVG text-metrics
-// module (src/text-metrics.ts) need to know which codepoints are wide
-// (CJK), which are emoji, and which are zero-width (combining marks,
-// ZWJ, variation selectors). Cross-importing between ascii/ and core
-// would violate the substrate lint (ascii should not pull core; core
-// should not pull ascii). This neutral module is the shared substrate.
-//
-// Conventions:
-//   - Ranges are inclusive [start, end] pairs of codepoints.
-//   - Helpers operate on codepoint integers, not string chars, so callers
-//     can iterate via `for ... of` (which yields codepoints, not UTF-16
-//     code units) and pass the result of `String.prototype.codePointAt`.
-// ============================================================================
-
-export type CodepointRange = readonly [number, number]
-
-// ----------------------------------------------------------------------------
-// CJK + Hangul ranges — fullwidth in terminals and 2x width in proportional
-// fonts. Sourced from Unicode East Asian Width Wide/Fullwidth ranges plus
-// CJK Unified Ideographs and related supplements.
-// ----------------------------------------------------------------------------
-export const CJK_RANGES: readonly CodepointRange[] = [
-  [0x2e80, 0x2eff], // CJK Radicals Supplement
-  [0x2f00, 0x2fdf], // Kangxi Radicals
-  [0x3000, 0x303f], // CJK Symbols and Punctuation
-  [0x3040, 0x309f], // Hiragana
-  [0x30a0, 0x30ff], // Katakana
-  [0x3100, 0x312f], // Bopomofo
-  [0x3190, 0x31ff], // Kanbun + extensions
-  [0x3200, 0x33ff], // Enclosed CJK + Compatibility
-  [0x3400, 0x4dbf], // CJK Extension A
-  [0x4e00, 0x9fff], // CJK Unified Ideographs
-  [0xf900, 0xfaff], // CJK Compatibility Ideographs
-  [0x20000, 0x2ffff], // CJK Extension B and beyond
-]
-
-// ----------------------------------------------------------------------------
-// Hangul ranges — Korean syllabic block. Separate from CJK_RANGES so callers
-// can distinguish Korean from Han characters when needed (e.g., font shaping).
-// ----------------------------------------------------------------------------
-export const HANGUL_RANGES: readonly CodepointRange[] = [
-  [0x1100, 0x115f], // Hangul Jamo (leading)
-  [0x3130, 0x318f], // Hangul Compatibility Jamo
-  [0xac00, 0xd7af], // Hangul Syllables
-]
-
-// ----------------------------------------------------------------------------
-// Fullwidth ASCII and symbol ranges — the U+FF00 block plus angle brackets
-// and a few other "halfwidth-and-fullwidth forms" that render as 2 cells.
-// ----------------------------------------------------------------------------
-export const FULLWIDTH_RANGES: readonly CodepointRange[] = [
-  [0x2329, 0x232a], // Angle brackets
-  [0xfe10, 0xfe19], // Vertical forms
-  [0xfe30, 0xfe6f], // CJK Compatibility Forms + Small Form Variants
-  [0xff00, 0xff60], // Fullwidth ASCII
-  [0xffe0, 0xffe6], // Fullwidth symbols
-]
-
-// ----------------------------------------------------------------------------
-// Emoji presentation ranges — the SMP planes where emoji live by default.
-// The Unicode regex `\p{Emoji_Presentation}|\p{Extended_Pictographic}` is a
-// more precise check for individual characters; these ranges are useful for
-// fast codepoint-integer checks and for callers that cannot afford a regex.
-// ----------------------------------------------------------------------------
-export const EMOJI_RANGES: readonly CodepointRange[] = [
-  [0x1f300, 0x1faff], // Misc Symbols & Pictographs through Symbols & Pictographs Extended-A
-]
-
-// ----------------------------------------------------------------------------
-// Combining-mark and zero-width ranges. Iterating codepoints and treating
-// these as width 0 keeps display-width math correct for accented Latin and
-// Devanagari/Arabic shaping marks.
-// ----------------------------------------------------------------------------
-export const COMBINING_RANGES: readonly CodepointRange[] = [
-  [0x0300, 0x036f], // Combining Diacritical Marks
-  [0x1ab0, 0x1aff], // Combining Diacritical Marks Extended
-  [0x1dc0, 0x1dff], // Combining Diacritical Marks Supplement
-  [0x20d0, 0x20ff], // Combining Diacritical Marks for Symbols
-  [0xfe20, 0xfe2f], // Combining Half Marks
-]
-
-// ----------------------------------------------------------------------------
-// Special zero-width codepoints. Separate from COMBINING_RANGES because they
-// have semantic meaning beyond "no advance":
-//   - U+200B  ZERO WIDTH SPACE
-//   - U+200C  ZERO WIDTH NON-JOINER
-//   - U+200D  ZERO WIDTH JOINER (binds emoji into sequences)
-//   - U+FEFF  ZERO WIDTH NO-BREAK SPACE / BOM
-// ----------------------------------------------------------------------------
-export const ZERO_WIDTH_CODEPOINTS: ReadonlySet<number> = new Set([
-  0x200b, 0x200c, 0x200d, 0xfeff,
-])
-
-// ----------------------------------------------------------------------------
-// Variation selectors — modify the preceding base codepoint:
-//   - U+FE0E  Text-presentation selector (force width 1)
-//   - U+FE0F  Emoji-presentation selector (force width 2)
-// ----------------------------------------------------------------------------
-export const VS_TEXT = 0xfe0e
-export const VS_EMOJI = 0xfe0f
-export const ZWJ = 0x200d
-
-// ----------------------------------------------------------------------------
-// Range-membership helpers.
-// ----------------------------------------------------------------------------
-
-function inRanges(cp: number, ranges: readonly CodepointRange[]): boolean {
-  for (const [lo, hi] of ranges) if (cp >= lo && cp <= hi) return true
-  return false
-}
-
-/**
- * Is the codepoint wide (CJK / Hangul / Fullwidth / Emoji)?
- *
- * Note: emoji ZWJ sequences and variation selectors are NOT handled here —
- * the caller (visualWidth) must apply them on top of this base check.
- */
-export function isWideRange(cp: number): boolean {
-  return (
-    inRanges(cp, CJK_RANGES) ||
-    inRanges(cp, HANGUL_RANGES) ||
-    inRanges(cp, FULLWIDTH_RANGES) ||
-    inRanges(cp, EMOJI_RANGES)
-  )
-}
-
-/**
- * Is the codepoint zero-width (combining mark or a special ZWS/ZWJ/BOM)?
- */
-export function isZeroWidth(cp: number): boolean {
-  return inRanges(cp, COMBINING_RANGES) || ZERO_WIDTH_CODEPOINTS.has(cp)
-}

package/src/styles.ts

@@ -1,318 +0,0 @@
-// ============================================================================
-// Font metrics — character width estimates for Inter at different sizes.
-// Used to approximate text bounding boxes without DOM measurement.
-// These are calibrated for Inter's typical glyph widths.
-//
-// NOTE: Theme/color system has moved to src/theme.ts. This file only
-// contains font metrics, spacing constants, and stroke widths.
-// ============================================================================
-
-import { measureTextWidth } from './text-metrics'
-import { styleFaceOf } from './scene/style-registry.ts'
-import type { InternalStyleFace, StyleInput } from './scene/style-registry.ts'
-import type { TextTransform } from './types.ts'
-
-/** Average character width in px at the given font size and weight (proportional font) */
-export function estimateTextWidth(text: string, fontSize: number, fontWeight: number): number {
-  // Delegate to variable-width character measurement for better accuracy
-  // with mixed character sets (Latin narrow/wide, CJK, emoji, etc.)
-  return measureTextWidth(text, fontSize, fontWeight)
-}
-
-/** Average character width in px for monospace fonts (uniform glyph width) */
-export function estimateMonoTextWidth(text: string, fontSize: number): number {
-  // Monospace fonts have uniform character width — 0.6 of fontSize matches actual
-  // glyph widths for JetBrains Mono / SF Mono / Fira Code at small sizes (11px).
-  // Previous value of 0.55 underestimated widths, causing class member labels to
-  // extend beyond their box boundaries.
-  return text.length * fontSize * 0.6
-}
-
-/** Monospace font family used for code-like text (class members, types) */
-export const MONO_FONT = "'JetBrains Mono'" as const
-
-/** Full CSS fallback chain for monospace text */
-export const MONO_FONT_STACK = `${MONO_FONT}, 'SF Mono', 'Fira Code', ui-monospace, monospace` as const
-
-/** Fixed font sizes used in the renderer (in px) */
-export const FONT_SIZES = {
-  /** Node label text */
-  nodeLabel: 13,
-  /** Edge label text */
-  edgeLabel: 11,
-  /** Subgraph header text */
-  groupHeader: 12,
-} as const
-
-/** Font weights used per element type */
-export const FONT_WEIGHTS = {
-  nodeLabel: 500,
-  edgeLabel: 400,
-  groupHeader: 600,
-} as const
-
-// ============================================================================
-// Spacing & sizing constants
-// ============================================================================
-
-/** Vertical gap between a subgraph header band and the content area below it (px).
- * Without this, nested subgraph headers sit flush against their parent's header band.
- * Increased from 8 to 12 to provide more clearance for edges routing near headers. */
-export const GROUP_HEADER_CONTENT_PAD = 12
-
-/** Padding inside node shapes */
-export const NODE_PADDING = {
-  /** Horizontal padding inside rectangles/rounded/stadium (increased from 16 for better label fit) */
-  horizontal: 20,
-  /** Vertical padding inside rectangles/rounded/stadium */
-  vertical: 10,
-  /** Extra padding for diamond shapes (they need more space due to rotation) */
-  diamondExtra: 24,
-} as const
-
-/** Stroke widths per element type (in px) */
-export const STROKE_WIDTHS = {
-  outerBox: 1,
-  innerBox: 0.75,
-  /** Edge connector stroke (increased from 0.75 for better visibility) */
-  connector: 1,
-} as const
-
-/**
- * Vertical shift applied to all text elements for font-agnostic centering.
- *
- * Instead of relying on `dominant-baseline="central"` (which each font interprets
- * differently based on its own ascent/descent metrics), we use the default alphabetic
- * baseline and shift down by 0.35em. This places the optical center of text at the
- * y coordinate, regardless of font family (Inter, JetBrains Mono, system fallbacks).
- *
- * The 0.35em value approximates the distance from alphabetic baseline to visual
- * center of Latin text. Using `em` units ensures it scales with font size.
- */
-export const TEXT_BASELINE_SHIFT = '0.35em' as const
-
-/** Arrow head dimensions — matches spec: 8px wide × ~5px tall */
-export const ARROW_HEAD = {
-  width: 8,
-  height: 5,
-} as const
-
-/** Flowchart dotted-edge stroke pattern; renderer emits stroke-dasharray="4 4". */
-export const FLOWCHART_DOTTED_DASH = {
-  dash: 4,
-  gap: 4,
-} as const
-
-// ============================================================================
-// Render style option resolution
-// ============================================================================
-
-export interface RenderStyleOptions {
-  /** A style input (name | spec | stack); built-in style faces are read here. */
-  style?: StyleInput | StyleInput[]
-  /** @internal Projected families can pass precomputed face metrics without exposing them as public style JSON. */
-  styleFace?: InternalStyleFace
-}
-
-export interface RenderStyleDefaults {
-  nodeLabelFontSize: number
-  edgeLabelFontSize: number
-  groupHeaderFontSize: number
-  nodeLabelFontWeight: number
-  edgeLabelFontWeight: number
-  groupHeaderFontWeight: number
-  nodeTextTransform?: TextTransform
-  edgeTextTransform?: TextTransform
-  nodeLetterSpacing?: number
-  edgeLetterSpacing?: number
-  groupLetterSpacing?: number
-  nodePaddingX: number
-  nodePaddingY: number
-  diamondExtraPadding?: number
-  nodeCornerRadius?: number
-  nodeLineWidth?: number
-  nodeFillColor?: string
-  nodeBorderColor?: string
-  nodeTextColor?: string
-  edgeLineWidth: number
-  edgeBendRadius?: number
-  edgeStrokeColor?: string
-  edgeTextColor?: string
-  groupFont?: string
-  groupTextTransform?: TextTransform
-  groupCornerRadius: number
-  groupBorderColor?: string
-  groupFillColor?: string
-  groupHeaderFillColor?: string
-  groupTextColor?: string
-  groupPaddingX: number
-  groupPaddingY: number
-  groupLabelPaddingX?: number
-  groupLineWidth?: number
-}
-
-export interface ResolvedRenderStyle {
-  nodeLabelFontSize: number
-  edgeLabelFontSize: number
-  groupHeaderFontSize: number
-  nodeLabelFontWeight: number
-  edgeLabelFontWeight: number
-  groupHeaderFontWeight: number
-  nodeTextTransform?: TextTransform
-  edgeTextTransform?: TextTransform
-  nodeLetterSpacing: number
-  edgeLetterSpacing: number
-  groupLetterSpacing: number
-  nodePaddingX: number
-  nodePaddingY: number
-  diamondExtraPadding: number
-  cornerRadius?: number
-  nodeLineWidth: number
-  nodeFillColor?: string
-  nodeBorderColor?: string
-  nodeTextColor?: string
-  lineWidth: number
-  edgeBendRadius: number
-  edgeStrokeColor?: string
-  edgeTextColor?: string
-  groupFont?: string
-  groupTextTransform?: TextTransform
-  groupCornerRadius: number
-  groupBorderColor?: string
-  groupFillColor?: string
-  groupHeaderFillColor?: string
-  groupTextColor?: string
-  groupPaddingX: number
-  groupPaddingY: number
-  groupLabelPaddingX: number
-  groupLineWidth: number
-}
-
-export const FLOWCHART_STYLE_DEFAULTS: RenderStyleDefaults = {
-  nodeLabelFontSize: FONT_SIZES.nodeLabel,
-  edgeLabelFontSize: FONT_SIZES.edgeLabel,
-  groupHeaderFontSize: FONT_SIZES.groupHeader,
-  nodeLabelFontWeight: FONT_WEIGHTS.nodeLabel,
-  edgeLabelFontWeight: FONT_WEIGHTS.edgeLabel,
-  groupHeaderFontWeight: FONT_WEIGHTS.groupHeader,
-  nodePaddingX: NODE_PADDING.horizontal,
-  nodePaddingY: NODE_PADDING.vertical,
-  diamondExtraPadding: NODE_PADDING.diamondExtra,
-  edgeLineWidth: STROKE_WIDTHS.connector,
-  groupCornerRadius: 0,
-  groupPaddingX: 16,
-  groupPaddingY: 16,
-  groupLabelPaddingX: 12,
-  groupLineWidth: STROKE_WIDTHS.outerBox,
-}
-
-function finiteNumber(value: number | undefined): number | undefined {
-  return typeof value === 'number' && Number.isFinite(value) ? value : undefined
-}
-
-function positiveNumber(fallback: number, ...values: Array<number | undefined>): number {
-  for (const value of values) {
-    const finite = finiteNumber(value)
-    if (finite != null && finite > 0) return finite
-  }
-  return fallback
-}
-
-function nonNegativeNumber(fallback: number, ...values: Array<number | undefined>): number
-function nonNegativeNumber(fallback: undefined, ...values: Array<number | undefined>): number | undefined
-function nonNegativeNumber(fallback: number | undefined, ...values: Array<number | undefined>): number | undefined {
-  for (const value of values) {
-    const finite = finiteNumber(value)
-    if (finite != null && finite >= 0) return finite
-  }
-  return fallback
-}
-
-function finiteString(...values: Array<string | undefined>): string | undefined {
-  for (const value of values) {
-    if (typeof value === 'string' && value.trim().length > 0) return value
-  }
-  return undefined
-}
-
-function textTransform(...values: Array<string | undefined>): TextTransform | undefined {
-  for (const value of values) {
-    const normalized = finiteString(value)?.toLowerCase()
-    if (normalized === 'uppercase' || normalized === 'lowercase' || normalized === 'capitalize') {
-      return normalized
-    }
-  }
-  return undefined
-}
-
-const INLINE_FORMAT_TAG = /(<\/?(?:b|strong|i|em|u|s|del)\s*>)/gi
-
-export function applyTextTransform(text: string, transform: TextTransform | undefined): string {
-  if (!transform) return text
-  const transformPlain = (chunk: string): string => {
-    switch (transform) {
-      case 'uppercase':
-        return chunk.toUpperCase()
-      case 'lowercase':
-        return chunk.toLowerCase()
-      case 'capitalize':
-        return chunk.replace(/\b\p{L}/gu, ch => ch.toUpperCase())
-    }
-  }
-  return text
-    .split(INLINE_FORMAT_TAG)
-    .map(part => /^<\/?(?:b|strong|i|em|u|s|del)\s*>$/i.test(part) ? part : transformPlain(part))
-    .join('')
-}
-
-export function resolveRenderStyle(
-  options: RenderStyleOptions = {},
-  defaults: RenderStyleDefaults = FLOWCHART_STYLE_DEFAULTS,
-): ResolvedRenderStyle {
-  const face = options.styleFace ?? styleFaceOf(options.style)
-  const text = face?.text
-  const node = face?.node
-  const edge = face?.edge
-  const group = face?.group
-  const explicitGroupPaddingX = nonNegativeNumber(undefined, group?.paddingX)
-  const cornerRadius = defaults.nodeCornerRadius == null
-    ? nonNegativeNumber(undefined, node?.cornerRadius)
-    : nonNegativeNumber(defaults.nodeCornerRadius, node?.cornerRadius)
-
-  return {
-    nodeLabelFontSize: positiveNumber(defaults.nodeLabelFontSize, node?.fontSize, text?.fontSize),
-    edgeLabelFontSize: positiveNumber(defaults.edgeLabelFontSize, edge?.fontSize, text?.fontSize),
-    groupHeaderFontSize: positiveNumber(defaults.groupHeaderFontSize, group?.fontSize, text?.fontSize),
-    nodeLabelFontWeight: positiveNumber(defaults.nodeLabelFontWeight, node?.fontWeight, text?.fontWeight),
-    edgeLabelFontWeight: positiveNumber(defaults.edgeLabelFontWeight, edge?.fontWeight, text?.fontWeight),
-    groupHeaderFontWeight: positiveNumber(defaults.groupHeaderFontWeight, group?.fontWeight, text?.fontWeight),
-    nodeTextTransform: textTransform(node?.textTransform, text?.textTransform, defaults.nodeTextTransform),
-    edgeTextTransform: textTransform(edge?.textTransform, text?.textTransform, defaults.edgeTextTransform),
-    nodeLetterSpacing: finiteNumber(node?.letterSpacing) ?? finiteNumber(text?.letterSpacing) ?? defaults.nodeLetterSpacing ?? 0,
-    edgeLetterSpacing: finiteNumber(edge?.letterSpacing) ?? finiteNumber(text?.letterSpacing) ?? defaults.edgeLetterSpacing ?? 0,
-    groupLetterSpacing: finiteNumber(group?.letterSpacing) ?? finiteNumber(text?.letterSpacing) ?? defaults.groupLetterSpacing ?? 0,
-    nodePaddingX: nonNegativeNumber(defaults.nodePaddingX, node?.paddingX),
-    nodePaddingY: nonNegativeNumber(defaults.nodePaddingY, node?.paddingY),
-    diamondExtraPadding: defaults.diamondExtraPadding ?? NODE_PADDING.diamondExtra,
-    cornerRadius,
-    nodeLineWidth: positiveNumber(defaults.nodeLineWidth ?? STROKE_WIDTHS.innerBox, node?.lineWidth),
-    nodeFillColor: finiteString(node?.fillColor, defaults.nodeFillColor),
-    nodeBorderColor: finiteString(node?.borderColor, defaults.nodeBorderColor),
-    nodeTextColor: finiteString(node?.textColor, text?.textColor, defaults.nodeTextColor),
-    lineWidth: positiveNumber(defaults.edgeLineWidth, edge?.lineWidth),
-    edgeBendRadius: nonNegativeNumber(defaults.edgeBendRadius ?? 0, edge?.bendRadius),
-    edgeStrokeColor: finiteString(edge?.strokeColor, defaults.edgeStrokeColor),
-    edgeTextColor: finiteString(edge?.textColor, text?.textColor, defaults.edgeTextColor),
-    groupFont: finiteString(group?.fontFamily, defaults.groupFont),
-    groupTextTransform: textTransform(group?.textTransform, text?.textTransform, defaults.groupTextTransform),
-    groupCornerRadius: nonNegativeNumber(defaults.groupCornerRadius, group?.cornerRadius),
-    groupBorderColor: finiteString(group?.borderColor, defaults.groupBorderColor),
-    groupFillColor: finiteString(group?.fillColor, defaults.groupFillColor),
-    groupHeaderFillColor: finiteString(group?.headerFillColor, defaults.groupHeaderFillColor),
-    groupTextColor: finiteString(group?.textColor, text?.textColor, defaults.groupTextColor),
-    groupPaddingX: explicitGroupPaddingX ?? defaults.groupPaddingX,
-    groupPaddingY: nonNegativeNumber(defaults.groupPaddingY, group?.paddingY),
-    groupLabelPaddingX: explicitGroupPaddingX ?? defaults.groupLabelPaddingX ?? defaults.groupPaddingX,
-    groupLineWidth: positiveNumber(defaults.groupLineWidth ?? STROKE_WIDTHS.outerBox, group?.lineWidth),
-  }
-}

package/src/svg-paths.ts

@@ -1,28 +0,0 @@
-// ============================================================================
-// SVG path helpers for partial fills inside rounded boxes.
-//
-// Use this instead of rounded <rect> elements for header bands: a full rounded
-// rect gives partial-height fills their own rounded bottom corners, which creates
-// visual seams and pill/crescent artifacts.
-// ============================================================================
-
-export function topRoundedRectPath(x: number, y: number, width: number, height: number, radius: number): string {
-  const r = clampRadius(radius, width / 2, height)
-  if (r === 0) return `M${x},${y} H${x + width} V${y + height} H${x} Z`
-
-  return [
-    `M${x + r},${y}`,
-    `H${x + width - r}`,
-    `A${r},${r} 0 0 1 ${x + width},${y + r}`,
-    `V${y + height}`,
-    `H${x}`,
-    `V${y + r}`,
-    `A${r},${r} 0 0 1 ${x + r},${y}`,
-    'Z',
-  ].join(' ')
-}
-
-
-function clampRadius(radius: number, maxX: number, maxY: number): number {
-  return Math.max(0, Math.min(radius, maxX, maxY))
-}