@zombie-mermaid/mermaid-parser 3.1.0 → 4.0.0

package/src/c4/types.ts

@@ -0,0 +1,136 @@
+import type { Direction, Point } from '@zombie-mermaid/core'
+
+// ============================================================================
+// C4 diagram model (C4Context / C4Container / C4Component / C4Dynamic /
+// C4Deployment). Prior art: lukilabs/beautiful-mermaid#34 and #71
+// (kristjanakkermann, devx) — see the changeset for attribution.
+// ============================================================================
+
+export type C4Variant =
+  'context' | 'container' | 'component' | 'dynamic' | 'deployment'
+
+export type C4ElementKind = 'person' | 'system' | 'container' | 'component'
+
+/** Visual variant of an element: plain box, database cylinder, or queue. */
+export type C4ElementShape = 'default' | 'db' | 'queue'
+
+export interface C4Element {
+  alias: string
+  kind: C4ElementKind
+  shape: C4ElementShape
+  /** `*_Ext` variants: outside the system being described. */
+  external: boolean
+  label: string
+  technology?: string
+  description?: string
+}
+
+export interface C4Boundary {
+  alias: string
+  label: string
+  /** Boundary type (`Boundary(a, "x", "type")`) or deployment node type. */
+  type?: string
+  description?: string
+  /** Aliases of elements declared directly inside this boundary. */
+  elementAliases: string[]
+  children: C4Boundary[]
+}
+
+/**
+ * Layout placement hint carried by `Rel_U`/`Rel_D`/`Rel_L`/`Rel_R` (and their
+ * long-form aliases): where `to` should sit relative to `from`. Plain `Rel`,
+ * `BiRel`, `RelIndex` and `Rel_Back` carry none.
+ */
+export type C4LayoutHint = 'up' | 'down' | 'left' | 'right'
+
+export interface C4Relationship {
+  from: string
+  to: string
+  label: string
+  technology?: string
+  /** `BiRel`: arrowheads at both ends. */
+  bidirectional: boolean
+  /**
+   * `Rel_Back`: the arrowhead points at `from` instead of `to`. `from`/`to`
+   * stay as declared, so layout and placement hints still follow them.
+   */
+  reversed?: boolean
+  /** `RelIndex(n, ...)` in C4Dynamic diagrams. */
+  index?: string
+  /** Placement hint from a directional `Rel_*` macro; see `C4LayoutHint`. */
+  layout?: C4LayoutHint
+}
+
+export interface C4Diagram {
+  variant: C4Variant
+  /**
+   * Top-level layout direction. Never set by the parser (C4 sources have no
+   * direction statement); only `RenderOptions.direction` sets it, via
+   * `withDirectionOverride`. Unset lays out top-to-bottom.
+   */
+  direction?: Direction
+  title?: string
+  /** Every element in declaration order, wherever it is nested. */
+  elements: C4Element[]
+  /** Top-level boundaries; elements outside any boundary are not listed. */
+  boundaries: C4Boundary[]
+  relationships: C4Relationship[]
+}
+
+// ----------------------------------------------------------------------------
+// Positioned model (SVG layout output)
+// ----------------------------------------------------------------------------
+
+export interface PositionedC4Element extends C4Element {
+  x: number
+  y: number
+  width: number
+  height: number
+  /** Name wrapped to the box width, one entry per line. */
+  nameLines: string[]
+  /** Description wrapped to the box width, one entry per line. */
+  descriptionLines: string[]
+}
+
+export interface PositionedC4Boundary {
+  alias: string
+  label: string
+  type?: string
+  description?: string
+  x: number
+  y: number
+  width: number
+  height: number
+  /** Nesting depth, 0 for a top-level boundary. */
+  depth: number
+  /** Centre line of the title, below the frame's top edge (Mermaid's layout). */
+  labelY?: number
+  /** Centre line of the `[type]` text, below the frame's top edge. */
+  typeY?: number
+  /** Centre line of the description (deployment nodes), below the top edge. */
+  descrY?: number
+}
+
+export interface PositionedC4Relationship extends C4Relationship {
+  /** The start and end of the line (a straight chord when `curve` is unset). */
+  points: Point[]
+  /** Control point of a quadratic curve from the first to the last point. */
+  curve?: Point
+  /** Centre of the label block, when the relationship has label text. */
+  labelPosition?: Point
+  /** Centre x of the `[technology]` line, which Mermaid lays out on its own. */
+  technologyX?: number
+}
+
+export interface PositionedC4Diagram {
+  variant: C4Variant
+  title?: string
+  width: number
+  height: number
+  /** Where the title baseline sits (centre x, y), when there is a title. */
+  titlePosition?: Point
+  elements: PositionedC4Element[]
+  /** Outer boundaries first, so inner ones paint on top. */
+  boundaries: PositionedC4Boundary[]
+  relationships: PositionedC4Relationship[]
+}

package/src/class/parser.ts

@@ -478,19 +478,14 @@ function parseMember(
     }
   }
 
-  // It's an attribute: [Type] name or name Type
-  // Common patterns: "String name", "+int age", "name"
-  const parts = parseGenericTypes(rest).split(/\s+/)
-  let name: string
-  let type: string | undefined
-
-  if (parts.length >= 2) {
-    // "Type name" pattern
-    type = parts[0]
-    name = parts.slice(1).join(' ')
-  } else {
-    name = parts[0] ?? rest
-  }
+  // It's an attribute. Mermaid renders attribute text verbatim (its
+  // ClassMember keeps everything after the visibility marker as one id and
+  // only splits methods into name/params/return type), so `String name`,
+  // `name Type` and `name: Type` all display as written. Splitting two
+  // tokens into Type + name guessed the order and flipped `-data Map` into
+  // `- Map: data` (#1265).
+  const name = parseGenericTypes(rest)
+  const type: string | undefined = undefined
 
   const isStatic = name.endsWith('$')
   const isAbstract = name.endsWith('*')

package/src/class/types.ts

@@ -110,6 +110,19 @@ export interface PositionedClassDiagram {
   classes: PositionedClassNode[]
   relationships: PositionedClassRelationship[]
   notes: PositionedClassNote[]
+  /** Namespace frames, drawn behind their member classes */
+  namespaces: PositionedClassNamespace[]
+}
+
+/** A `namespace Name { ... }` block's frame, in diagram coordinates */
+export interface PositionedClassNamespace {
+  name: string
+  /** Ids of the member classes the frame encloses */
+  classIds: string[]
+  x: number
+  y: number
+  width: number
+  height: number
 }
 
 export interface PositionedClassNote {

package/src/index.ts

@@ -28,6 +28,14 @@
 // creating a cycle — see `packages/core/src/direction.ts`'s header.
 // ============================================================================
 
+export * from './architecture/parser.ts'
+export * from './architecture/types.ts'
+export * from './architecture/to-graph.ts'
+
+export * from './c4/parser.ts'
+export * from './c4/types.ts'
+export * from './c4/format.ts'
+
 export * from './class/parser.ts'
 export * from './class/types.ts'
 export * from './class/format.ts'

package/src/sequence/types.ts

@@ -216,6 +216,8 @@ export interface Activation {
   topY: number
   bottomY: number
   width: number
+  /** Nesting level on this actor's lifeline: 0 for the outermost bar, 1 for a bar opened while one is already active, and so on */
+  depth: number
 }
 
 export interface PositionedBlock {

package/src/xychart/colors.ts

@@ -4,7 +4,9 @@
 // Generates monochromatic shades from the theme accent color.
 // Series 0 = accent (or blue fallback). Series 1+ are darker/lighter
 // shades of the same hue with subtle hue drift to stay in the same
-// color family (like navy ↔ cyan from blue).
+// color family (like navy ↔ cyan from blue). Hue drifts toward navy for
+// darker shades and toward cyan for lighter ones, so neighbouring series
+// do not collapse into two near-identical blues (#1244).
 //
 // Used by both the SVG and ASCII renderers.
 // ============================================================================
@@ -101,7 +103,7 @@ export function isDarkBackground(bgHex: string): boolean {
  * Get the hex color for a series index.
  * Index 0 returns the accent color as-is.
  * Index 1+ alternate between darker and lighter shades of the same hue
- * with subtle hue drift (±8-12° per tier) to stay in the same family.
+ * with subtle hue drift (-8° per tier for darker, -12° for lighter) to stay in the same family.
  *
  * When `bgColor` is provided, shade direction adapts to the background:
  *   - Light bg: odd = darker, even = lighter (default)
@@ -128,8 +130,12 @@ export function getSeriesColor(
   const dark = safeBg && isDarkBackground(safeBg) ? !oddIndex : oddIndex
   const l = dark ? Math.max(25, 48 - tier * 13) : Math.min(78, 55 + tier * 11)
 
-  // Subtle hue drift: darker shades shift slightly negative, lighter shift positive
-  const hShift = (dark ? -8 : 12) * tier
+  // Subtle hue drift: darker shades shift slightly negative (toward navy),
+  // lighter shades shift negative too (toward sky/cyan). The lighter shade
+  // used to drift positive (toward indigo), which landed series 2 within a
+  // few ΔE of series 0 (#1244); drifting the other way keeps the three first
+  // series distinct in hue as well as lightness.
+  const hShift = (dark ? -8 : -12) * tier
   const newH = (((h + hShift) % 360) + 360) % 360
 
   return hslToHex(newH, chartS, l)