@diagrammo/dgmo 0.3.2 → 0.4.0

package/docs/language-reference.md

@@ -367,10 +367,10 @@ Options: `scale` (`on`/`off`), `sort` (`time`/`group`), `swimlanes` (`on`/`off`)
 Minimal example:
 
 ```
-User -> API: login
-API -> DB: findUser
-DB -> API: <- user
-API -> User: <- token
+User -login-> API
+API -findUser-> DB
+API <-user- DB
+User <-token- API
 ```
 
 Full example:
@@ -387,23 +387,23 @@ NotifyQueue is a queue aka Notifications
 
 User -Login request-> API
 API -Find user by email-> DB
-DB -> API: <- user record
+API <-user record- DB
 note on DB:
   Indexed lookup on email column
 
-  if credentials valid
-    API -Create session-> DB
-    DB -> API: <- session token
-    API -> User: <- 200 OK + token
-    API ~session.created~> NotifyQueue
-  else
-    API -> User: <- 401 Unauthorized
+if credentials valid
+  API -Create session-> DB
+  API <-session token- DB
+  API ~session.created~> NotifyQueue
+  User <-200 OK + token- API
+else
+  User <-401 Unauthorized- API
 
 == Logout ==
 
 User -Logout-> API
 API -Delete session-> DB
-API -> User: <- 200 OK
+User <-200 OK- API
 ```
 
 **Participants**: Auto-inferred from message names. Declare explicitly for type/positioning:
@@ -412,11 +412,10 @@ API -> User: <- 200 OK
 - `Name at position 2` — manual left-to-right ordering (0-based; negative from right)
 
 **Messages**:
-- Sync: `A -> B: label` or `A -label-> B`
-- Async: `A ~> B: label` or `A ~label~> B`
-- Return: `B -> A: <- response` (on the calling line) or separate line
-- Bidirectional: `A <-> B: label` or `A <-label-> B`
-- Bidirectional async: `A <~> B: label` or `A <~label~> B`
+- Sync call: `A -label-> B` or `A -> B` (unlabeled)
+- Async call: `A ~label~> B` or `A ~> B` (unlabeled)
+- Sync return: `A <-label- B` or `A <- B` (unlabeled) — dashed arrow from B to A
+- Async return: `A <~label~ B` or `A <~ B` (unlabeled)
 
 **Blocks** (indentation-scoped):
 - `if condition` ... `else` ... (no explicit `end` needed — indentation closes blocks)
@@ -801,7 +800,7 @@ Assign to elements via pipe metadata: `Element Name | priority: High, t: Fronten
 **Common mistakes to avoid:**
 
 - `# comment` — wrong. Use `// comment`
-- `async A -> B: msg` — wrong. Use `A ~> B: msg` or `A ~msg~> B`
+- `async A -> B: msg` — wrong. Use `A ~msg~> B`
 - `parallel else` — not supported. Use separate `parallel` blocks
 - Hex colors in sections `== Foo(#ff0000) ==` — wrong. Use named colors: `== Foo(red) ==`
 - `->` inside labeled arrows `A -routes to /api-> B` — ambiguous. Rephrase the label

package/package.json

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

package/src/chart.ts

@@ -47,7 +47,7 @@ export interface ParsedChart {
 import { resolveColor } from './colors';
 import type { PaletteColors } from './palettes';
 import { makeDgmoError, formatDgmoError, suggest } from './diagnostics';
-import { collectIndentedValues } from './utils/parsing';
+import { extractColor, parseSeriesNames } from './utils/parsing';
 
 // ============================================================
 // Parser
@@ -182,37 +182,13 @@ export function parseChart(
     }
 
     if (key === 'series') {
-      // Parse series names — comma-separated on one line, or indented multi-line
-      let rawNames: string[];
-      if (value) {
-        result.series = value;
-        rawNames = value.split(',').map((s) => s.trim()).filter(Boolean);
-      } else {
-        const collected = collectIndentedValues(lines, i);
-        i = collected.newIndex;
-        rawNames = collected.values;
-        result.series = rawNames.join(', ');
-      }
-      const names: string[] = [];
-      const nameColors: (string | undefined)[] = [];
-      for (const raw of rawNames) {
-        const colorMatch = raw.match(/\(([^)]+)\)\s*$/);
-        if (colorMatch) {
-          const resolved = resolveColor(colorMatch[1].trim(), palette);
-          nameColors.push(resolved);
-          names.push(raw.substring(0, colorMatch.index!).trim());
-        } else {
-          nameColors.push(undefined);
-          names.push(raw);
-        }
+      const parsed = parseSeriesNames(value, lines, i, palette);
+      i = parsed.newIndex;
+      result.series = parsed.series;
+      if (parsed.names.length > 1) {
+        result.seriesNames = parsed.names;
       }
-      if (names.length === 1) {
-        result.series = names[0];
-      }
-      if (names.length > 1) {
-        result.seriesNames = names;
-      }
-      if (nameColors.some(Boolean)) result.seriesNameColors = nameColors;
+      if (parsed.nameColors.some(Boolean)) result.seriesNameColors = parsed.nameColors;
       continue;
     }
 
@@ -220,14 +196,7 @@ export function parseChart(
     const parts = value.split(',').map((s) => s.trim());
     const numValue = parseFloat(parts[0]);
     if (!isNaN(numValue)) {
-      let rawLabel = trimmed.substring(0, colonIndex).trim();
-      let pointColor: string | undefined;
-      const colorMatch = rawLabel.match(/\(([^)]+)\)\s*$/);
-      if (colorMatch) {
-        const resolved = resolveColor(colorMatch[1].trim(), palette);
-        pointColor = resolved;
-        rawLabel = rawLabel.substring(0, colorMatch.index!).trim();
-      }
+      const { label: rawLabel, color: pointColor } = extractColor(trimmed.substring(0, colonIndex).trim(), palette);
       const extra = parts
         .slice(1)
         .map((s) => parseFloat(s))

package/src/cli.ts

@@ -230,12 +230,12 @@ function noInput(): never {
       'chart: sequence',
       'activations: off',
       '',
-      '  Client -> API: POST /login',
-      '  API -> Auth: validate credentials',
-      '  Auth -> DB: SELECT user',
-      '  DB -> Auth: user record',
-      '  Auth -> API: JWT token',
-      '  API -> Client: 200 OK { token }',
+      'Client -POST /login-> API',
+      '  API -validate credentials-> Auth',
+      '    Auth -SELECT user-> DB',
+      '    Auth <-user record- DB',
+      '  API <-JWT token- Auth',
+      'Client <-200 OK- API',
       '',
     ].join('\n'),
     'utf-8'