zombie-mermaid 2.2.1 → 2.2.2

package/src/__tests__/ascii-class-reciprocal-relationships-448.test.ts

@@ -26,7 +26,7 @@
  */
 
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
 
 const MVC_SOURCE = `classDiagram
   class Model {
@@ -82,3 +82,88 @@ describe('ASCII class diagram — reciprocal relationships (issue #448)', () =>
     expect(ascii).toContain('uses')
   })
 })
+
+/**
+ * Regression test for issue #632 — a weekly form-judge audit comparing this
+ * repo's ASCII output against real mermaid.js SVG flagged the "Class:
+ * Relationship Labels" sample (samples-data.ts): `Teacher --> Course` and
+ * `Student --> Course` are two *distinct* pairs (not a reciprocal pair
+ * between the same two classes, which #448 above already covers) that both
+ * terminate at the same target, `Course`.
+ *
+ * Root cause: `pairGroups` (the #448 fix, keyed by the unordered
+ * `[from, to]` pair) only fans relationships between the exact same two
+ * classes — it never grouped these, so both anchored at Course's identical
+ * center column, collapsing their arrowheads onto the same cell. Since
+ * both relationships' single horizontal jog then also landed on the exact
+ * same row, the later-drawn label (in the separate label-drawing pass)
+ * blotted out most of the visible line, so `Student --> Course` looked
+ * like it terminated in blank space short of Course instead of reaching it.
+ *
+ * The fix (`relFromOffset`/`relToOffset` in `class-diagram.ts`) fans a
+ * relationship at whichever single end it shares with another
+ * relationship, even when the two relationships are between otherwise
+ * unrelated classes — scoped to a direct, adjacent-level convergence (see
+ * that code's comment for why a level-skipping relationship, which already
+ * needs the separate box-collision detour routing, is excluded).
+ */
+describe('ASCII class diagram — relationships converging on a shared target from different sources (issue #632)', () => {
+  const STUDENT_COURSE_SOURCE = `classDiagram
+  class Teacher {
+    +String name
+  }
+  class Student {
+    +String name
+  }
+  class Course {
+    +String title
+  }
+  Teacher --> Course : teaches
+  Student --> Course : enrolled in`
+
+  it('renders both relationship labels', () => {
+    const ascii = renderMermaidASCII(STUDENT_COURSE_SOURCE, {
+      colorMode: 'none',
+    })
+    expect(ascii).toContain('teaches')
+    expect(ascii).toContain('enrolled in')
+  })
+
+  it('draws two distinct arrowheads into Course instead of collapsing both onto one shared cell', () => {
+    const ascii = renderMermaidASCII(STUDENT_COURSE_SOURCE, {
+      colorMode: 'none',
+    })
+    // Before the fix, both relationships anchored at the exact same
+    // column, so only a single '▼' was ever drawn for both of them
+    // combined — the `Student --> Course` connector had no arrowhead of
+    // its own at all.
+    const arrowCount = (ascii.match(/▼/g) ?? []).length
+    expect(arrowCount).toBe(2)
+  })
+
+  it('gives the two relationships distinct target columns, both landing on Course', () => {
+    const ascii = renderMermaidASCII(STUDENT_COURSE_SOURCE, {
+      colorMode: 'none',
+    })
+    const lines = ascii.split('\n')
+    const arrowCols = lines.flatMap((line) =>
+      [...line].map((ch, i) => (ch === '▼' ? i : -1)).filter((i) => i >= 0),
+    )
+    expect(arrowCols).toHaveLength(2)
+    expect(arrowCols[0]).not.toBe(arrowCols[1])
+
+    // Course's box must actually span both arrow columns — otherwise
+    // they've merely moved apart without both still landing on the target.
+    const courseRow = lines.findIndex((line) => line.includes('Course'))
+    expect(courseRow).toBeGreaterThan(0)
+    const boxRow = lines[courseRow - 1]!
+    const boxLeft = boxRow.indexOf('┌')
+    const boxRight = boxRow.indexOf('┐')
+    expect(boxLeft).toBeGreaterThanOrEqual(0)
+    expect(boxRight).toBeGreaterThan(boxLeft)
+    for (const col of arrowCols) {
+      expect(col).toBeGreaterThanOrEqual(boxLeft)
+      expect(col).toBeLessThanOrEqual(boxRight)
+    }
+  })
+})

package/src/__tests__/ascii-combining-mark-width.test.ts

@@ -15,8 +15,8 @@
  * against an authority separate from the implementation under test.
  */
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
-import { displayWidth } from '../ascii/display-width.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
+import { displayWidth } from '../../packages/ascii-renderer/src/display-width.ts'
 import {
   terminalDisplayWidth,
   assertUniformDisplayWidth,

package/src/__tests__/ascii-coords-overlay.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest'
-import { addCoordsOverlay } from '../ascii/coords.ts'
-import { renderMermaidASCII } from '../ascii/index.ts'
+import { addCoordsOverlay } from '../../packages/ascii-renderer/src/coords.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
 
 describe('addCoordsOverlay', () => {
   it('prepends a two-row column ruler and a row-index gutter', () => {

package/src/__tests__/ascii-decision-lr-box-start.test.ts

@@ -13,8 +13,8 @@
  * true`), since ASCII mode skips box-start connectors entirely.
  */
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
-import { findOrphanedJunctions } from '../ascii/validate.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
+import { findOrphanedJunctions } from '../../packages/ascii-renderer/src/validate.ts'
 import { readdirSync, readFileSync } from 'node:fs'
 import { join, dirname } from 'node:path'
 import { fileURLToPath } from 'node:url'

package/src/__tests__/ascii-display-width-unit.test.ts

@@ -25,7 +25,7 @@ import {
   displayWidth,
   toDisplayCells,
   WIDE_CHAR_PLACEHOLDER,
-} from '../ascii/display-width.ts'
+} from '../../packages/ascii-renderer/src/display-width.ts'
 
 const COMBINING_ACUTE = '́'
 const COMBINING_GRAVE = '̀'

package/src/__tests__/ascii-draw-arrows-coverage.test.ts

@@ -4,7 +4,7 @@
 // ============================================================================
 
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
 
 describe('ASCII arrow drawing: no-arrow edges', () => {
   it('renders a solid no-arrow edge without an arrowhead in unicode mode', () => {

package/src/__tests__/ascii-draw-arrows-single-point-path.test.ts

@@ -16,11 +16,18 @@
  * segment was drawn.
  */
 import { describe, it, expect } from 'vitest'
-import { drawArrow } from '../ascii/draw-arrows.ts'
-import { Down } from '../ascii/types.ts'
-import { mkCanvas, mkRoleCanvas } from '../ascii/canvas.ts'
-import type { AsciiEdge, AsciiGraph, AsciiNode } from '../ascii/types.ts'
-import { createGrid } from '../ascii/grid-occupancy.ts'
+import { drawArrow } from '../../packages/ascii-renderer/src/draw-arrows.ts'
+import { Down } from '../../packages/ascii-renderer/src/types.ts'
+import {
+  mkCanvas,
+  mkRoleCanvas,
+} from '../../packages/ascii-renderer/src/canvas.ts'
+import type {
+  AsciiEdge,
+  AsciiGraph,
+  AsciiNode,
+} from '../../packages/ascii-renderer/src/types.ts'
+import { createGrid } from '../../packages/ascii-renderer/src/grid-occupancy.ts'
 
 function makeNode(name: string, x: number, y: number): AsciiNode {
   return {

package/src/__tests__/ascii-draw-bundles.test.ts

@@ -16,14 +16,14 @@
  */
 import { describe, it, expect } from 'vitest'
 import { parseMermaid } from '../parser.ts'
-import { convertToAsciiGraph } from '../ascii/converter.ts'
-import { createMapping } from '../ascii/grid.ts'
+import { convertToAsciiGraph } from '../../packages/ascii-renderer/src/converter.ts'
+import { createMapping } from '../../packages/ascii-renderer/src/grid.ts'
 import type {
   AsciiConfig,
   AsciiGraph,
   EdgeBundle,
   GridCoord,
-} from '../ascii/types.ts'
+} from '../../packages/ascii-renderer/src/types.ts'
 import {
   drawBundledEdgeSegment,
   drawBundleSharedPath,
@@ -32,8 +32,8 @@ import {
   drawBundledEdgeArrowhead,
   drawBundledEdgeArrowheadStart,
   drawJunctionCharacter,
-} from '../ascii/draw-bundles.ts'
-import { renderMermaidASCII } from '../ascii/index.ts'
+} from '../../packages/ascii-renderer/src/draw-bundles.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
 
 function buildGraph(src: string, useAscii = false): AsciiGraph {
   const config: AsciiConfig = {

package/src/__tests__/ascii-edge-bundling-rank-violation-454.test.ts

@@ -21,7 +21,7 @@
  */
 
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
 
 describe('ASCII edge bundling — refuses to bundle a rank-violating edge (issue #454)', () => {
   it('gives a fan-in edge its own arrowhead when its source shares a rank with the target', () => {

package/src/__tests__/ascii-edge-bundling-routing.test.ts

@@ -16,14 +16,18 @@
  */
 import { describe, it, expect } from 'vitest'
 import { parseMermaid } from '../parser.ts'
-import { convertToAsciiGraph } from '../ascii/converter.ts'
-import { createMapping } from '../ascii/grid.ts'
+import { convertToAsciiGraph } from '../../packages/ascii-renderer/src/converter.ts'
+import { createMapping } from '../../packages/ascii-renderer/src/grid.ts'
 import {
   calculateJunctionPoint,
   routeBundledEdges,
-} from '../ascii/edge-bundling.ts'
-import { Middle } from '../ascii/types.ts'
-import type { AsciiConfig, AsciiGraph, EdgeBundle } from '../ascii/types.ts'
+} from '../../packages/ascii-renderer/src/edge-bundling.ts'
+import { Middle } from '../../packages/ascii-renderer/src/types.ts'
+import type {
+  AsciiConfig,
+  AsciiGraph,
+  EdgeBundle,
+} from '../../packages/ascii-renderer/src/types.ts'
 
 function buildGraph(src: string, graphDirection: 'TD' | 'LR'): AsciiGraph {
   const config: AsciiConfig = {

package/src/__tests__/ascii-edge-cross-style-overlap.test.ts

@@ -18,22 +18,26 @@
  */
 import { describe, it, expect } from 'vitest'
 import { parseMermaid } from '../parser.ts'
-import { convertToAsciiGraph } from '../ascii/converter.ts'
-import { createMapping } from '../ascii/grid.ts'
+import { convertToAsciiGraph } from '../../packages/ascii-renderer/src/converter.ts'
+import { createMapping } from '../../packages/ascii-renderer/src/grid.ts'
 import {
   isOccupied,
   pathCells,
   createGrid,
   cloneGrid,
   placeBlock,
-} from '../ascii/grid-occupancy.ts'
+} from '../../packages/ascii-renderer/src/grid-occupancy.ts'
 import {
   createEdgeCellStyles,
   findStyleConflict,
   claimPathCells,
-} from '../ascii/edge-cell-styles.ts'
-import { renderMermaidASCII } from '../ascii/index.ts'
-import type { AsciiConfig, AsciiEdge, AsciiGraph } from '../ascii/types.ts'
+} from '../../packages/ascii-renderer/src/edge-cell-styles.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
+import type {
+  AsciiConfig,
+  AsciiEdge,
+  AsciiGraph,
+} from '../../packages/ascii-renderer/src/types.ts'
 
 const RETRY_LOOP_SOURCE = `graph TD
     A[Push Code] --> B{Tests Pass?}

package/src/__tests__/ascii-edge-ending-glyphs.test.ts

@@ -10,7 +10,7 @@
 // ============================================================================
 
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
 
 describe('ASCII flowchart edges: --o circle-end / --x cross-end glyphs', () => {
   it('draws a circle glyph for --o in unicode mode', () => {

package/src/__tests__/ascii-edge-label-diagonal-fallback-418.test.ts

@@ -8,8 +8,8 @@
  * column (`┆thick`) instead of sitting on its own `┃` line.
  */
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
-import { expandDiagonalSegments } from '../ascii/edge-routing.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
+import { expandDiagonalSegments } from '../../packages/ascii-renderer/src/edge-routing.ts'
 
 const ALL_EDGE_STYLES = `graph TD
   A[Source] -->|solid| B[Target 1]

package/src/__tests__/ascii-edge-routing-fixes.test.ts

@@ -5,7 +5,7 @@
  * drift. Repro diagrams are taken directly from the issue.
  */
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
 
 describe('issue #64: edge-routing crashes and layout bugs', () => {
   describe('bug 1: dense fan-in pathfinding blowup', () => {

package/src/__tests__/ascii-edge-routing-single-point-path.test.ts

@@ -15,10 +15,14 @@
  * zero-length line at that single point instead of indexing past the end.
  */
 import { describe, it, expect } from 'vitest'
-import { determineLabelLine } from '../ascii/edge-routing.ts'
-import { Down } from '../ascii/types.ts'
-import type { AsciiEdge, AsciiGraph, AsciiNode } from '../ascii/types.ts'
-import { createGrid } from '../ascii/grid-occupancy.ts'
+import { determineLabelLine } from '../../packages/ascii-renderer/src/edge-routing.ts'
+import { Down } from '../../packages/ascii-renderer/src/types.ts'
+import type {
+  AsciiEdge,
+  AsciiGraph,
+  AsciiNode,
+} from '../../packages/ascii-renderer/src/types.ts'
+import { createGrid } from '../../packages/ascii-renderer/src/grid-occupancy.ts'
 
 function makeNode(name: string, x: number, y: number): AsciiNode {
   return {

package/src/__tests__/ascii-edge-styles.test.ts

@@ -3,7 +3,7 @@
 // ============================================================================
 
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
 
 describe('ASCII edge styles', () => {
   describe('solid edges (default)', () => {

package/src/__tests__/ascii-emoji-cluster-width.test.ts

@@ -21,8 +21,8 @@
  * against an authority separate from the implementation under test.
  */
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
-import { displayWidth } from '../ascii/display-width.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
+import { displayWidth } from '../../packages/ascii-renderer/src/display-width.ts'
 import {
   terminalDisplayWidth,
   assertUniformDisplayWidth,

package/src/__tests__/ascii-er-box-occupancy.test.ts

@@ -14,7 +14,7 @@
 // ============================================================================
 
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
 import {
   findBoxRect,
   findTextRect,

package/src/__tests__/ascii-er-cardinality.test.ts

@@ -3,7 +3,7 @@
 // ============================================================================
 
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
 
 describe('ASCII ER crow-foot cardinality markers', () => {
   it('mirrors the zero-one marker orientation on the left side (regression)', () => {

package/src/__tests__/ascii-er-corner-glyphs.test.ts

@@ -28,7 +28,7 @@
 // ============================================================================
 
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
 
 describe('ASCII ER relationship routing draws a corner glyph at each turn (issue #414)', () => {
   it('draws corner glyphs at a same-row detour around an obstructing entity', () => {

package/src/__tests__/ascii-er-jog-stray-line.test.ts

@@ -26,7 +26,7 @@
 // ============================================================================
 
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
 
 /**
  * True when some row's only non-whitespace content is a doubled line/dash

package/src/__tests__/ascii-er-label-padding.test.ts

@@ -10,7 +10,7 @@
 // ============================================================================
 
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
 
 const REPRO = `erDiagram
   CUSTOMER ||--o{ ORDER : places

package/src/__tests__/ascii-er-padding.test.ts

@@ -11,7 +11,7 @@
 // ============================================================================
 
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
 
 // A single relationship with a short label — exercises the horizontal gap
 // between entities without the label itself becoming the binding constraint

package/src/__tests__/ascii-er-relationship-label-corruption-350.test.ts

@@ -24,7 +24,7 @@
 // ============================================================================
 
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
 
 /** Assert every one of `needles` appears verbatim, exactly once, in `text`. */
 function expectAllPresentOnce(text: string, needles: string[]): void {

package/src/__tests__/ascii-er-relationship-overwrite.test.ts

@@ -21,7 +21,7 @@
 // ============================================================================
 
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
 
 describe('ASCII ER relationship draws do not overwrite existing text (issue #392)', () => {
   it('does not let a later vertical relationship line cut through an earlier label', () => {

package/src/__tests__/ascii-er-stray-connectors.test.ts

@@ -7,10 +7,13 @@
 // ============================================================================
 
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
-import { chooseFreeRow, isRowFree } from '../ascii/er-diagram.ts'
-import { mkCanvas, write } from '../ascii/canvas.ts'
-import type { Canvas } from '../ascii/types.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
+import {
+  chooseFreeRow,
+  isRowFree,
+} from '../../packages/ascii-renderer/src/er-diagram.ts'
+import { mkCanvas, write } from '../../packages/ascii-renderer/src/canvas.ts'
+import type { Canvas } from '../../packages/ascii-renderer/src/types.ts'
 
 /** Mark every cell in row `y` across [xStart, xEnd] as occupied. */
 function occupyRow(canvas: Canvas, y: number, xStart: number, xEnd: number) {

package/src/__tests__/ascii-er-unrelated-stem-separation-411.test.ts

@@ -12,7 +12,7 @@
 // ============================================================================
 
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
 
 describe('ASCII ER — unrelated relationship stems stay visually separated (issue #411)', () => {
   it('keeps CUSTOMER→ADDRESS and PRODUCT→LINE_ITEM stems at least one column apart', () => {

package/src/__tests__/ascii-er-vertical-one-marker.test.ts

@@ -28,7 +28,7 @@
 // ============================================================================
 
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
 
 describe('ASCII ER vertical "one" cardinality marker (invisible-marker fix)', () => {
   it('renders a distinct tick for the upper entity\'s "one" marker, not the invisible line glyph', () => {

package/src/__tests__/ascii-grid-deep-chain.test.ts

@@ -11,10 +11,10 @@
  */
 import { describe, it, expect } from 'vitest'
 import { parseMermaid } from '../parser.ts'
-import { convertToAsciiGraph } from '../ascii/converter.ts'
-import { createMapping } from '../ascii/grid.ts'
-import { renderMermaidASCII } from '../ascii/index.ts'
-import type { AsciiConfig } from '../ascii/types.ts'
+import { convertToAsciiGraph } from '../../packages/ascii-renderer/src/converter.ts'
+import { createMapping } from '../../packages/ascii-renderer/src/grid.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
+import type { AsciiConfig } from '../../packages/ascii-renderer/src/types.ts'
 
 function longChainSource(depth: number): string {
   const lines = ['flowchart TD']

package/src/__tests__/ascii-hyperlinks.test.ts

@@ -10,7 +10,7 @@
  * can import samples-data.ts without tripping tsconfig's rootDir).
  */
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
 import {
   OSC8_CLOSE,
   OSC8_SEQUENCE,
@@ -20,13 +20,16 @@ import {
   LinkRunTracker,
   markBoxLabelLinks,
   mkLinkCanvas,
-} from '../ascii/hyperlinks.ts'
-import { colorizeLine, DEFAULT_ASCII_THEME } from '../ascii/ansi.ts'
-import { mkCanvas, write } from '../ascii/canvas.ts'
-import { addCoordsOverlay } from '../ascii/coords.ts'
+} from '../../packages/ascii-renderer/src/hyperlinks.ts'
+import {
+  colorizeLine,
+  DEFAULT_ASCII_THEME,
+} from '../../packages/ascii-renderer/src/ansi.ts'
+import { mkCanvas, write } from '../../packages/ascii-renderer/src/canvas.ts'
+import { addCoordsOverlay } from '../../packages/ascii-renderer/src/coords.ts'
 import { runRender } from '../cli/render.ts'
 import { createMockStdout, renderArgs } from './cli-test-helpers.ts'
-import type { CharRole } from '../ascii/types.ts'
+import type { CharRole } from '../../packages/ascii-renderer/src/types.ts'
 
 const OSC8_PREFIX = '\x1b]8;;'
 

package/src/__tests__/ascii-label-line-terminal-fallback.test.ts

@@ -36,10 +36,14 @@
  * some real diagram happens to hit this deep a fallback tier.
  */
 import { describe, it, expect } from 'vitest'
-import { determineLabelLine } from '../ascii/edge-routing.ts'
-import { Down, gridKey } from '../ascii/types.ts'
-import type { AsciiEdge, AsciiGraph, AsciiNode } from '../ascii/types.ts'
-import { createGrid } from '../ascii/grid-occupancy.ts'
+import { determineLabelLine } from '../../packages/ascii-renderer/src/edge-routing.ts'
+import { Down, gridKey } from '../../packages/ascii-renderer/src/types.ts'
+import type {
+  AsciiEdge,
+  AsciiGraph,
+  AsciiNode,
+} from '../../packages/ascii-renderer/src/types.ts'
+import { createGrid } from '../../packages/ascii-renderer/src/grid-occupancy.ts'
 
 function makeNode(name: string, x: number, y: number): AsciiNode {
   return {

package/src/__tests__/ascii-lane-search.test.ts

@@ -14,7 +14,7 @@
 //     originals are kept here as reference implementations and the shared
 //     function is required to agree with them on every generated input.
 import { describe, it, expect } from 'vitest'
-import { findFreeLane } from '../ascii/lane-search.ts'
+import { findFreeLane } from '../../packages/ascii-renderer/src/lane-search.ts'
 
 describe('findFreeLane', () => {
   it('returns the preferred lane when it is free', () => {

package/src/__tests__/ascii-multibox-cjk-width.test.ts

@@ -19,7 +19,7 @@
  * — see the shared helper.
  */
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
 import {
   terminalDisplayWidth,
   assertUniformDisplayWidth,

package/src/__tests__/ascii-multiline.test.ts

@@ -1,10 +1,13 @@
 import { describe, it, expect } from 'vitest'
-import { renderMermaidASCII } from '../ascii/index.ts'
-import { mkCanvas, canvasToString } from '../ascii/canvas.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
+import {
+  mkCanvas,
+  canvasToString,
+} from '../../packages/ascii-renderer/src/canvas.ts'
 import {
   drawMultilineTextCentered,
   drawMultilineTextLeft,
-} from '../ascii/multiline-utils.ts'
+} from '../../packages/ascii-renderer/src/multiline-utils.ts'
 
 describe('ASCII multi-line labels', () => {
   describe('flowchart nodes', () => {

package/src/__tests__/ascii-nested-subgraph-sibling-order-444.test.ts

@@ -35,11 +35,14 @@
  */
 import { describe, it, expect } from 'vitest'
 import { parseMermaid } from '../parser.ts'
-import { convertToAsciiGraph } from '../ascii/converter.ts'
-import { createMapping } from '../ascii/grid.ts'
-import { renderMermaidASCII } from '../ascii/index.ts'
-import type { AsciiConfig, AsciiGraph } from '../ascii/types.ts'
-import { requireGridCoord } from '../ascii/types.ts'
+import { convertToAsciiGraph } from '../../packages/ascii-renderer/src/converter.ts'
+import { createMapping } from '../../packages/ascii-renderer/src/grid.ts'
+import { renderMermaidASCII } from '@zombie-mermaid/ascii-renderer'
+import type {
+  AsciiConfig,
+  AsciiGraph,
+} from '../../packages/ascii-renderer/src/types.ts'
+import { requireGridCoord } from '../../packages/ascii-renderer/src/types.ts'
 
 function layoutFlowchart(source: string): AsciiGraph {
   const parsed = parseMermaid(source)