@diagrammo/dgmo 0.8.5 → 0.8.7

package/docs/ai-integration.md

@@ -105,4 +105,4 @@ dgmo --chart-types --json        # Machine-readable chart type list
 
 Run `dgmo --chart-types` for the full list, or see `docs/language-reference.md`.
 
-29 types: bar, line, area, multi-line, pie, doughnut, radar, polar-area, bar-stacked, scatter, sankey, chord, function, heatmap, funnel, slope, wordcloud, arc, timeline, venn, quadrant, sequence, flowchart, class, er, org, kanban, c4, initiative-status, infra.
+33 types: bar, line, area, multi-line, pie, doughnut, radar, polar-area, bar-stacked, scatter, sankey, chord, function, heatmap, funnel, slope, wordcloud, arc, timeline, venn, quadrant, sequence, flowchart, state, class, er, org, kanban, c4, sitemap, infra, gantt, boxes-and-lines.

package/docs/language-reference.md

@@ -1,40 +1,6 @@
-# DGMO Language Reference
-
-DGMO is a text-based diagram markup language. Files use the `.dgmo` extension. Render with the `dgmo` CLI, the Diagrammo desktop app, or the `@diagrammo/dgmo` npm library.
-
-## Migration Guide
-
-Syntax changes introduced in the consistency cleanup. Old forms now produce errors.
-
-| Old Syntax | New Syntax | Chart Types |
-|---|---|---|
-| `chart: TYPE` + `title: Text` | `TYPE Text` (single first line) | All |
-| `chart: TYPE` (alone) | `TYPE` | All |
-| `directive: value` | `directive value` (no colon) | All |
-| `Label: value` (ECharts data) | `Label value` | bar, line, pie, etc. |
-| `era YYYY->YYYY: Label` | `era YYYY->YYYY Label` | line, timeline, gantt |
-| `marker YYYY: Label` | `marker YYYY Label` | timeline, gantt |
-| `## Group` | `tag Group` | All |
-| `== Column ==` | `[Column]` | Kanban |
-| `person Name` | `Name is a person` | C4 |
-| `-> Target : Desc [tech]` | `-Desc-> Target \| tech: val` | C4 |
-| `A <-> B` | Two lines: `A -> B` + `B -> A` | C4 |
-| `-> Target x5` | `-> Target \| fanout: 5` | Infra |
-| `lag: 5d` / `lead: 3d` | `offset: 5d` / `offset: -3d` | Gantt |
-| `Name(color)` | Use `tag` groups | Sequence |
-| `scenario:` | (removed) | Infra |
-| `wip` | `doing` (wip still accepted) | Init-status |
-| `#ff0000` hex colors | Named colors only | All |
-| `show-sub-node-count: yes` | `show-sub-node-count` (flag) | Org |
-| `import: path` | `import path` | Org |
-| `tags: path` | `tags path` | Org |
-| `xlabel` | `x-label` | Data charts, function |
-| `ylabel` | `y-label` | Data charts, function |
-| `sizelabel` | `size-label` | Scatter/bubble |
-| `x-axis` | `x-label` | Quadrant |
-| `y-axis` | `y-label` | Quadrant |
+# DGMO Language Specification
 
----
+> **Authoritative reference** for the DGMO diagram language. This document describes what is valid syntax. If it is not in this document, it is not valid DGMO.
 
 ## Table of Contents
 
@@ -48,9 +14,9 @@ Syntax changes introduced in the consistency cleanup. Old forms now produce erro
 8. [Entity-Relationship Diagrams](#8-entity-relationship-diagrams)
 9. [Class Diagrams](#9-class-diagrams)
 10. [Kanban Boards](#10-kanban-boards)
-11. [Initiative-Status Diagrams](#11-initiative-status-diagrams)
-12. [Sitemap Diagrams](#12-sitemap-diagrams)
-13. [Gantt Charts](#13-gantt-charts)
+11. [Sitemap Diagrams](#11-sitemap-diagrams)
+12. [Gantt Charts](#12-gantt-charts)
+13. [Boxes and Lines Diagrams](#13-boxes-and-lines-diagrams)
 14. [Timeline Diagrams](#14-timeline-diagrams)
 15. [Data Charts](#15-data-charts)
 16. [Visualizations](#16-visualizations)
@@ -95,7 +61,7 @@ tag GroupName [alias X]
 - First entry is default unless another is marked `default`
 - Must appear before diagram content
 
-**Diagram types that support tags**: sequence, infra, org, c4, er, kanban, gantt, initiative-status, sitemap, timeline
+**Diagram types that support tags**: sequence, infra, org, c4, er, kanban, gantt, sitemap, timeline, boxes-and-lines
 
 ### 1.4 Pipe Metadata
 
@@ -637,7 +603,7 @@ abstract Vessel
 interface Serializable
 Ship extends Vessel
 Galleon implements Serializable
-ShipType enum
+enum ShipType
 ```
 
 ### 9.3 Members (Indented, Colon for Types)
@@ -660,7 +626,7 @@ Visibility: `+` public, `-` private, `#` protected
 
 **Enum values:**
 ```
-ShipType enum
+enum ShipType
   Galleon
   Sloop
 ```
@@ -724,72 +690,15 @@ kanban [Title]
 
 ---
 
-## 11. Initiative-Status Diagrams
+## 11. Sitemap Diagrams
 
 ### 11.1 Declaration
 
-```
-initiative-status [Title]
-```
-
-### 11.2 Nodes
-
-```
-NodeLabel | status, key: value
-NodeLabel | done, t: Team1
-```
-
-Status values and equivalences:
-
-| User writes | Canonical | Display |
-|------------|-----------|---------|
-| `done` | `done` | Done |
-| `doing` | `doing` | In Progress |
-| `wip` | `doing` | In Progress |
-| `blocked` | `blocked` | Blocked |
-| `paused` | `blocked` | Blocked |
-| `waiting` | `blocked` | Blocked |
-| `todo` | `todo` | To Do |
-| `na` | `na` | N/A |
-| (omitted) | `na` | N/A |
-
-### 11.3 Edges
-
-```
-Source -> Target
-Source -label-> Target
-Source -> Target | status
-```
-
-Indented shorthand (source from preceding node):
-```
-Captain | t: Bridge
-  -issueOrders-> CrewApp | na
-```
-
-### 11.4 Groups
-
-```
-[Group Name]
-  indented nodes...
-```
-
-### 11.5 Options
-
-- `active-tag GroupName`
-- `hide phase:Planning, phase:Review` (colon syntax for tag:value)
-
----
-
-## 12. Sitemap Diagrams
-
-### 12.1 Declaration
-
 ```
 sitemap [Title]
 ```
 
-### 12.2 Pages (Indentation = Hierarchy)
+### 11.2 Pages (Indentation = Hierarchy)
 
 ```
 Home
@@ -799,7 +708,7 @@ Home
   Blog
 ```
 
-### 12.3 Arrows
+### 11.3 Arrows
 
 ```
 Home
@@ -807,28 +716,28 @@ Home
   -login-> Login
 ```
 
-### 12.4 Containers
+### 11.4 Containers
 
 ```
 [Marketing]
   Pricing | Auth: Public
 ```
 
-### 12.5 Options
+### 11.5 Options
 
 - `direction-tb` (boolean; default is LR)
 
 ---
 
-## 13. Gantt Charts
+## 12. Gantt Charts
 
-### 13.1 Declaration
+### 12.1 Declaration
 
 ```
 gantt [Title]
 ```
 
-### 13.2 Options (Space-Separated, NO Colon)
+### 12.2 Options (Space-Separated, NO Colon)
 
 ```
 start 2026-03-15
@@ -839,7 +748,7 @@ no-dependencies
 sort tag:Team
 ```
 
-### 13.3 Holidays
+### 12.3 Holidays
 
 ```
 holiday
@@ -847,7 +756,7 @@ holiday
   2024-05-27 -> 2024-05-29 Memorial Weekend
 ```
 
-### 13.4 Workweek
+### 12.4 Workweek
 
 ```
 workweek mon-fri
@@ -856,7 +765,7 @@ workweek sun-thu
 
 Top-level directive (not nested under `holiday`).
 
-### 13.5 Eras
+### 12.5 Eras
 
 **Flat form:**
 ```
@@ -870,7 +779,7 @@ era
   2026-06-01 -> 2026-06-05 Sprint Review (blue)
 ```
 
-### 13.6 Markers
+### 12.6 Markers
 
 **Flat form:**
 ```
@@ -884,7 +793,7 @@ marker
   2026-06-15 Release (green)
 ```
 
-### 13.7 Groups (Swimlanes)
+### 12.7 Groups (Swimlanes)
 
 ```
 [Backend] | t: Engineering
@@ -892,7 +801,7 @@ marker
 
 Bracket syntax only.
 
-### 13.8 Tasks
+### 12.8 Tasks
 
 ```
 20bd Database Schema | p: Foundation, 100%
@@ -905,7 +814,7 @@ Duration units: `min`, `h`, `d`, `bd` (business days), `w`, `m`, `q`, `y`
 Uncertain: `10bd?` (trailing `?`)
 Progress: `| 80%` in pipe metadata
 
-### 13.9 Dependencies (Indented Under Tasks)
+### 12.9 Dependencies (Indented Under Tasks)
 
 ```
 10bd API Integration
@@ -913,7 +822,7 @@ Progress: `| 80%` in pipe metadata
   -> Launch Day | offset: 10bd
 ```
 
-### 13.10 Parallel Block
+### 12.10 Parallel Block
 
 ```
 parallel
@@ -925,6 +834,89 @@ parallel
 
 ---
 
+## 13. Boxes and Lines Diagrams
+
+### 13.1 Declaration
+
+```
+boxes-and-lines [Title]
+```
+
+Requires explicit first line — no heuristic detection. Default direction is left-to-right.
+
+### 13.2 Nodes
+
+```
+NodeLabel
+NodeLabel | key: value, key2: value2
+NodeLabel | description: Some text here
+```
+
+Nodes are created explicitly or implicitly (when referenced in edges). All nodes render as uniform rounded rectangles.
+
+The `description` key is extracted as a dedicated field and not stored in metadata.
+
+### 13.3 Edges
+
+```
+Source -> Target
+Source -> Target | key: value
+Source -label-> Target
+Source <-> Target
+Source <-label-> Target
+```
+
+Indented shorthand (source from preceding node):
+```
+API | description: Main gateway
+  -routes-> UserService
+  -routes-> ProductService
+```
+
+Pipe metadata on edges:
+```
+A -reads-> DB | frequency: High
+```
+
+### 13.4 Groups
+
+```
+[Group Name]
+  indented nodes...
+
+[Group Name] | key: value
+  indented nodes...
+```
+
+Nested groups (max depth 2):
+```
+[AWS]
+  [us-east-1]
+    API
+    DB
+```
+
+Group metadata cascades to children (node metadata overrides). Nodes already declared above can be referenced inside groups to assign membership.
+
+### 13.5 Group-to-Group Edges
+
+```
+[Region A] -> [Region B]
+[Region A] <-> [Region B]
+[Region A] -VPN-> [Region B]
+```
+
+### 13.6 Directives
+
+- `direction TB` — top-to-bottom layout (default: `LR`)
+
+### 13.7 Options
+
+- `active-tag GroupName` — set active tag group for coloring
+- `hide team:Backend, team:Frontend` — hide nodes with matching tag values (colon syntax for tag:value)
+
+---
+
 ## 14. Timeline Diagrams
 
 ### 14.1 Declaration
@@ -1223,14 +1215,13 @@ top-left Train (yellow)
 bottom-left Maroon (red)
 bottom-right Watch Closely (purple)
 
-Quartermaster 0.9, 0.95
-Navigator 0.85, 0.8
+Quartermaster 0.9 0.95
+Navigator 0.85 0.8
 ```
 
-- Axis labels: `x-label Low, High` — space-separated
+- Axis labels: `x-label Low, High` — comma-separated
 - Position labels: `top-right Label` — space-separated
-- Data points: `Label x, y` — space-separated, comma between coordinates
-- Thousands commas supported in values
+- Data points: `Label x y` or `Label x, y` — comma or space between coordinates
 
 ---
 
@@ -1246,7 +1237,7 @@ Navigator 0.85, 0.8
 | Class field types | class | `+ name: string` |
 | Class method returns | class | `+ sail(): void` |
 | Function expressions | function | `f(x): x^2 + 1` |
-| Hide tag values | initiative-status | `hide phase:Planning` |
+| Hide tag values | boxes-and-lines | `hide phase:Planning` |
 
 ### Colons OPTIONAL
 

package/gallery/fixtures/boxes-and-lines.dgmo

@@ -0,0 +1,64 @@
+boxes-and-lines E-Commerce Platform
+
+tag Team t Backend(blue), Frontend(green), Platform(purple)
+tag Priority p High(red), Medium(orange), Low(gray)
+
+active-tag Team
+hide priority:Low
+
+direction LR
+
+// --- Services ---
+API Gateway | t: Backend, description: Main entry point for all requests
+  -routes-> UserService
+  -routes-> ProductService
+  -routes-> OrderService
+
+UserService | t: Backend, description: Handles auth and profiles
+  -reads-> UserDB
+  -checks-> SessionCache
+
+ProductService | t: Frontend, description: Product catalog and search
+  -queries-> ProductDB
+  -invalidates-> ProductCache
+
+OrderService | t: Backend, description: Order processing pipeline
+  -writes-> OrderDB
+  -publishes-> OrderQueue
+
+// --- Data Stores ---
+UserDB | t: Platform
+ProductDB | t: Platform
+OrderDB | t: Platform
+SessionCache | t: Platform
+ProductCache | t: Platform
+OrderQueue | t: Platform
+
+// --- External ---
+PaymentGateway | t: Backend, description: Stripe integration
+OrderService -charges-> PaymentGateway
+
+// --- Consumer ---
+WebApp | t: Frontend
+WebApp -> API Gateway
+
+Admin | t: Backend
+Admin -> API Gateway
+
+// --- Groups ---
+[AWS us-east-1]
+  [Compute]
+    API Gateway
+    UserService
+    ProductService
+    OrderService
+  [Data]
+    UserDB
+    ProductDB
+    OrderDB
+
+// --- Group edge ---
+OrderQueue -> PaymentGateway
+
+// --- Bidirectional ---
+SessionCache <-syncs-> ProductCache | p: Medium

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diagrammo/dgmo",
-  "version": "0.8.5",
+  "version": "0.8.7",
   "description": "DGMO diagram markup language — parser, renderer, and color system",
   "license": "MIT",
   "type": "module",

package/src/boxes-and-lines/collapse.ts

@@ -0,0 +1,78 @@
+// ============================================================
+// Boxes and Lines — Collapse/Expand Transform
+// ============================================================
+
+import type { ParsedBoxesAndLines, BLGroup } from './types';
+
+export interface BLCollapseResult {
+  parsed: ParsedBoxesAndLines;
+  collapsedChildCounts: Map<string, number>;
+  originalGroups: BLGroup[];
+}
+
+/**
+ * Pure transform: returns a new ParsedBoxesAndLines with collapsed groups
+ * removed from the diagram content.
+ *
+ * - Children of collapsed groups removed from nodes
+ * - Edges redirected: endpoints in collapsed groups → group ID
+ * - Internal edges (both in same collapsed group) dropped
+ * - Duplicate edges (same source, target, label) deduplicated
+ * - Collapsed groups removed from groups[] (layout handles as nodes)
+ */
+export function collapseBoxesAndLines(
+  parsed: ParsedBoxesAndLines,
+  collapsedGroups: Set<string>
+): BLCollapseResult {
+  const originalGroups = parsed.groups;
+
+  if (collapsedGroups.size === 0) {
+    return { parsed, collapsedChildCounts: new Map(), originalGroups };
+  }
+
+  // Build group lookup by label
+  const groupByLabel = new Map<string, BLGroup>();
+  for (const group of parsed.groups) {
+    groupByLabel.set(group.label, group);
+  }
+
+  // Build node → collapsed group lookup
+  const nodeToGroup = new Map<string, string>();
+  const collapsedChildCounts = new Map<string, number>();
+
+  for (const groupLabel of collapsedGroups) {
+    const group = groupByLabel.get(groupLabel);
+    if (!group) continue;
+    const groupId = `__group_${groupLabel}`;
+
+    for (const child of group.children) {
+      nodeToGroup.set(child, groupId);
+    }
+    collapsedChildCounts.set(groupLabel, group.children.length);
+  }
+
+  // Filter nodes: remove children of collapsed groups
+  const nodes = parsed.nodes.filter((n) => !nodeToGroup.has(n.label));
+
+  // Remap and deduplicate edges
+  const edgeKeys = new Set<string>();
+  const edges: typeof parsed.edges = [];
+  for (const edge of parsed.edges) {
+    const src = nodeToGroup.get(edge.source) ?? edge.source;
+    const tgt = nodeToGroup.get(edge.target) ?? edge.target;
+    if (src === tgt) continue;
+    const key = `${src}|${tgt}|${edge.label ?? ''}`;
+    if (edgeKeys.has(key)) continue;
+    edgeKeys.add(key);
+    edges.push({ ...edge, source: src, target: tgt });
+  }
+
+  // Keep only groups that are not collapsed
+  const groups = parsed.groups.filter((g) => !collapsedGroups.has(g.label));
+
+  return {
+    parsed: { ...parsed, nodes, edges, groups },
+    collapsedChildCounts,
+    originalGroups,
+  };
+}