@diagrammo/dgmo 0.40.0 → 0.41.0

package/dist/index.cjs

@@ -15099,6 +15099,8 @@ function parseEventLine(content, palette) {
   let currentTagGroup = null;
   let currentEvent = null;
   let currentEra = null;
+  let eraIndent = -1;
+  let currentEventIndent = 0;
   const aliasMap = /* @__PURE__ */ new Map();
   for (let i = 0; i < lines.length; i++) {
     const line11 = lines[i];
@@ -15173,52 +15175,15 @@ function parseEventLine(content, palette) {
       });
       continue;
     }
-    if (indent > 0) {
-      if (!currentEvent) {
-        pushWarning(
-          lineNumber,
-          `Indented description "${trimmed}" has no event above it \u2014 add an event line first. (\xA728)`
-        );
-        continue;
-      }
+    if (currentEvent && indent > currentEventIndent) {
       const descLine = trimmed.startsWith("- ") ? `\u2022 ${trimmed.substring(2)}` : trimmed;
       currentEvent.description.push(descLine);
       continue;
     }
-    currentTagGroup = null;
-    if (trimmed.toLowerCase() === "no-scale") {
-      options.scale = false;
-      continue;
-    }
-    const sideMatch = trimmed.match(SIDE_RE);
-    if (sideMatch) {
-      options.side = sideMatch[1].toLowerCase();
-      continue;
-    }
-    if (trimmed.toLowerCase() === "no-box") {
-      options.noBox = true;
-      continue;
-    }
-    if (trimmed.toLowerCase() === "no-legend") {
-      options.noLegend = true;
-      continue;
-    }
-    const dirMatch = trimmed.match(DIRECTION_RE);
-    if (dirMatch) {
-      const dir = dirMatch[1].toUpperCase();
-      if (dir !== "LR") {
-        pushWarning(
-          lineNumber,
-          `event-line is horizontal-only in v1; \`direction ${dir}\` (vertical orientation) is a fast-follow.`,
-          EVENT_LINE_DIAGNOSTIC_CODES.UNSUPPORTED
-        );
-      }
-      continue;
-    }
-    if (tryParseSharedOption(trimmed, sharedOptions)) continue;
     const eraMatch = trimmed.match(ERA_RE);
     if (eraMatch) {
       contentStarted = true;
+      currentTagGroup = null;
       currentEvent = null;
       const name = eraMatch[1].trim();
       let rest = (eraMatch[2] ?? "").trim();
@@ -15242,16 +15207,52 @@ function parseEventLine(content, palette) {
       const era = { name, color, collapsed, lineNumber };
       result.eras.push(era);
       currentEra = name;
+      eraIndent = indent;
       continue;
     }
-    if (SECTION_SEAM_RE.test(trimmed)) {
-      pushWarning(
-        lineNumber,
-        "Group events with `[Name]` era brackets (\xA728.6a), not `section`.",
-        EVENT_LINE_DIAGNOSTIC_CODES.UNSUPPORTED
-      );
-      continue;
+    if (indent === 0) {
+      currentTagGroup = null;
+      if (trimmed.toLowerCase() === "no-scale") {
+        options.scale = false;
+        continue;
+      }
+      const sideMatch = trimmed.match(SIDE_RE);
+      if (sideMatch) {
+        options.side = sideMatch[1].toLowerCase();
+        continue;
+      }
+      if (trimmed.toLowerCase() === "no-box") {
+        options.noBox = true;
+        continue;
+      }
+      if (trimmed.toLowerCase() === "no-legend") {
+        options.noLegend = true;
+        continue;
+      }
+      const dirMatch = trimmed.match(DIRECTION_RE);
+      if (dirMatch) {
+        const dir = dirMatch[1].toUpperCase();
+        if (dir !== "LR") {
+          pushWarning(
+            lineNumber,
+            `event-line is horizontal-only in v1; \`direction ${dir}\` (vertical orientation) is a fast-follow.`,
+            EVENT_LINE_DIAGNOSTIC_CODES.UNSUPPORTED
+          );
+        }
+        continue;
+      }
+      if (tryParseSharedOption(trimmed, sharedOptions)) continue;
+      if (SECTION_SEAM_RE.test(trimmed)) {
+        pushWarning(
+          lineNumber,
+          "Group events with `[Name]` era brackets (\xA728.6a), not `section`.",
+          EVENT_LINE_DIAGNOSTIC_CODES.UNSUPPORTED
+        );
+        continue;
+      }
     }
+    const inEra = currentEra !== null && indent > eraIndent;
+    if (!inEra) currentEra = null;
     contentStarted = true;
     const event = parseEventHeader(
       trimmed,
@@ -15263,6 +15264,7 @@ function parseEventLine(content, palette) {
     );
     result.events.push(event);
     currentEvent = event;
+    currentEventIndent = indent;
   }
   options.noTitle = sharedOptions["no-title"] === "on";
   finalizeAutoTagColors(result.tagGroups, palette);

package/dist/index.js

@@ -15115,6 +15115,8 @@ function parseEventLine(content, palette) {
   let currentTagGroup = null;
   let currentEvent = null;
   let currentEra = null;
+  let eraIndent = -1;
+  let currentEventIndent = 0;
   const aliasMap = /* @__PURE__ */ new Map();
   for (let i = 0; i < lines.length; i++) {
     const line11 = lines[i];
@@ -15189,52 +15191,15 @@ function parseEventLine(content, palette) {
       });
       continue;
     }
-    if (indent > 0) {
-      if (!currentEvent) {
-        pushWarning(
-          lineNumber,
-          `Indented description "${trimmed}" has no event above it \u2014 add an event line first. (\xA728)`
-        );
-        continue;
-      }
+    if (currentEvent && indent > currentEventIndent) {
       const descLine = trimmed.startsWith("- ") ? `\u2022 ${trimmed.substring(2)}` : trimmed;
       currentEvent.description.push(descLine);
       continue;
     }
-    currentTagGroup = null;
-    if (trimmed.toLowerCase() === "no-scale") {
-      options.scale = false;
-      continue;
-    }
-    const sideMatch = trimmed.match(SIDE_RE);
-    if (sideMatch) {
-      options.side = sideMatch[1].toLowerCase();
-      continue;
-    }
-    if (trimmed.toLowerCase() === "no-box") {
-      options.noBox = true;
-      continue;
-    }
-    if (trimmed.toLowerCase() === "no-legend") {
-      options.noLegend = true;
-      continue;
-    }
-    const dirMatch = trimmed.match(DIRECTION_RE);
-    if (dirMatch) {
-      const dir = dirMatch[1].toUpperCase();
-      if (dir !== "LR") {
-        pushWarning(
-          lineNumber,
-          `event-line is horizontal-only in v1; \`direction ${dir}\` (vertical orientation) is a fast-follow.`,
-          EVENT_LINE_DIAGNOSTIC_CODES.UNSUPPORTED
-        );
-      }
-      continue;
-    }
-    if (tryParseSharedOption(trimmed, sharedOptions)) continue;
     const eraMatch = trimmed.match(ERA_RE);
     if (eraMatch) {
       contentStarted = true;
+      currentTagGroup = null;
       currentEvent = null;
       const name = eraMatch[1].trim();
       let rest = (eraMatch[2] ?? "").trim();
@@ -15258,16 +15223,52 @@ function parseEventLine(content, palette) {
       const era = { name, color, collapsed, lineNumber };
       result.eras.push(era);
       currentEra = name;
+      eraIndent = indent;
       continue;
     }
-    if (SECTION_SEAM_RE.test(trimmed)) {
-      pushWarning(
-        lineNumber,
-        "Group events with `[Name]` era brackets (\xA728.6a), not `section`.",
-        EVENT_LINE_DIAGNOSTIC_CODES.UNSUPPORTED
-      );
-      continue;
+    if (indent === 0) {
+      currentTagGroup = null;
+      if (trimmed.toLowerCase() === "no-scale") {
+        options.scale = false;
+        continue;
+      }
+      const sideMatch = trimmed.match(SIDE_RE);
+      if (sideMatch) {
+        options.side = sideMatch[1].toLowerCase();
+        continue;
+      }
+      if (trimmed.toLowerCase() === "no-box") {
+        options.noBox = true;
+        continue;
+      }
+      if (trimmed.toLowerCase() === "no-legend") {
+        options.noLegend = true;
+        continue;
+      }
+      const dirMatch = trimmed.match(DIRECTION_RE);
+      if (dirMatch) {
+        const dir = dirMatch[1].toUpperCase();
+        if (dir !== "LR") {
+          pushWarning(
+            lineNumber,
+            `event-line is horizontal-only in v1; \`direction ${dir}\` (vertical orientation) is a fast-follow.`,
+            EVENT_LINE_DIAGNOSTIC_CODES.UNSUPPORTED
+          );
+        }
+        continue;
+      }
+      if (tryParseSharedOption(trimmed, sharedOptions)) continue;
+      if (SECTION_SEAM_RE.test(trimmed)) {
+        pushWarning(
+          lineNumber,
+          "Group events with `[Name]` era brackets (\xA728.6a), not `section`.",
+          EVENT_LINE_DIAGNOSTIC_CODES.UNSUPPORTED
+        );
+        continue;
+      }
     }
+    const inEra = currentEra !== null && indent > eraIndent;
+    if (!inEra) currentEra = null;
     contentStarted = true;
     const event = parseEventHeader(
       trimmed,
@@ -15279,6 +15280,7 @@ function parseEventLine(content, palette) {
     );
     result.events.push(event);
     currentEvent = event;
+    currentEventIndent = indent;
   }
   options.noTitle = sharedOptions["no-title"] === "on";
   finalizeAutoTagColors(result.tagGroups, palette);

package/docs/language-reference.md

@@ -2399,6 +2399,23 @@ tag Genre as g
 - **Tag** — trailing same-line metadata (`g: Pop`), like timeline; colors the dot, leader, and card.
 - **Description** — bare indented body lines (like `pyramid`/`ring`); `- ` makes a bullet; inline markdown (`**bold**`, `*italic*`, `` `code` ``) supported.
 
+#### Eras
+
+Group a run of events into a labeled section with a `[Name]` bracket, then **indent the events beneath it** (the org / version-control nesting idiom). An event belongs to the era it is indented under; its description sits one level deeper still. An event at indent 0 sits **outside** any era.
+
+```
+[The Early Web]
+  1991 WorldWideWeb  t: Protocol
+    Tim Berners-Lee publishes the first site.
+  1993 Mosaic  t: Browser
+
+[The App Era] collapsed: true
+  2005 Ajax  t: Platform
+```
+
+- **Trailing metadata** after `]` — optional `collapsed: true` and/or a named color (`[The 1960s] collapsed: true blue`).
+- **`collapsed: true`** folds the era into a single summary card (its name + a bulleted list of member events) while a bracket stays on the spine; in the app a reader toggles it live.
+
 #### Directives
 
 - `no-scale` — space events evenly instead of by date (dates become captions).

package/gallery/fixtures/event-line.dgmo

@@ -8,19 +8,19 @@ tag Theme as t
   Standard orange
 
 [The Early Web]
-1991 WorldWideWeb  t: Protocol
-  Tim Berners-Lee publishes the first website at **CERN**.
-1993 Mosaic  t: Browser
-  The first popular *graphical* browser.
+  1991 WorldWideWeb  t: Protocol
+    Tim Berners-Lee publishes the first website at **CERN**.
+  1993 Mosaic  t: Browser
+    The first popular *graphical* browser.
 
 [The Standards Era] collapsed: true
-1995 JavaScript  t: Platform
-  Brendan Eich writes the language in ten days.
-1996 CSS  t: Standard
-  Styling splits from structure.
+  1995 JavaScript  t: Platform
+    Brendan Eich writes the language in ten days.
+  1996 CSS  t: Standard
+    Styling splits from structure.
 
 [The App Era]
-2005 Ajax  t: Platform
-  `XMLHttpRequest` updates pages without a reload.
-2014 HTML5  t: Standard
-  The living standard — video, canvas, semantics.
+  2005 Ajax  t: Platform
+    `XMLHttpRequest` updates pages without a reload.
+  2014 HTML5  t: Standard
+    The living standard — video, canvas, semantics.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diagrammo/dgmo",
-  "version": "0.40.0",
+  "version": "0.41.0",
   "description": "DGMO diagram markup language — parser, renderer, and color system",
   "license": "MIT",
   "repository": {

package/src/event-line/parser.ts

@@ -203,15 +203,17 @@ export function parseEventLine(
       continue;
     }
 
-    // ── Indented line in content phase = description body ──
-    if (indent > 0) {
-      if (!currentEvent) {
-        pushWarning(
-          lineNumber,
-          `Indented description "${trimmed}" has no event above it — add an event line first. (§28)`
-        );
-        continue;
-      }
+    // ── Content phase: indentation classifies each line. ──
+    //
+    // Eras are top-level `[Name]` section headers whose member events are
+    // INDENTED beneath them (the org §7 / version-control §29 idiom); an event
+    // at indent 0 sits OUTSIDE any era. A line indented deeper than its event
+    // is that event's description body (§28.4).
+
+    // Description body — any line indented deeper than its event. Checked
+    // before the era bracket so a bracketed prose line (`  [aside]`) under an
+    // event stays a description rather than opening a spurious era.
+    if (currentEvent && indent > currentEventIndent) {
       const descLine = trimmed.startsWith('- ')
         ? `• ${trimmed.substring(2)}`
         : trimmed;
@@ -219,47 +221,14 @@ export function parseEventLine(
       continue;
     }
 
-    // ── Indent-0 line: directive, reserved seam, or event ──
-    currentTagGroup = null;
-
-    if (trimmed.toLowerCase() === 'no-scale') {
-      options.scale = false;
-      continue;
-    }
-    const sideMatch = trimmed.match(SIDE_RE);
-    if (sideMatch) {
-      options.side = sideMatch[1]!.toLowerCase() as EventLineOptions['side'];
-      continue;
-    }
-    if (trimmed.toLowerCase() === 'no-box') {
-      options.noBox = true;
-      continue;
-    }
-    if (trimmed.toLowerCase() === 'no-legend') {
-      options.noLegend = true;
-      continue;
-    }
-    const dirMatch = trimmed.match(DIRECTION_RE);
-    if (dirMatch) {
-      const dir = dirMatch[1]!.toUpperCase();
-      if (dir !== 'LR') {
-        pushWarning(
-          lineNumber,
-          `event-line is horizontal-only in v1; \`direction ${dir}\` (vertical orientation) is a fast-follow.`,
-          EVENT_LINE_DIAGNOSTIC_CODES.UNSUPPORTED
-        );
-      }
-      continue;
-    }
-    if (tryParseSharedOption(trimmed, sharedOptions)) continue;
-
-    // ── Era run delimiter: `[Name]` opens a section that runs to the next
-    //    `[Name]` or EOF (§28.6a). NOT an indentation container — events stay at
-    //    indent 0, so flat bare-body descriptions are preserved. Optional trailing
-    //    `collapsed: true` and/or a color name tint/fold the era.
+    // ── Era run delimiter: `[Name]` (§28.6a) — a section header whose member
+    //    events are indented beneath it. Dedenting to (or past) the bracket's
+    //    own indent leaves the era. Optional trailing `collapsed: true` and/or
+    //    a color name tint/fold the era.
     const eraMatch = trimmed.match(ERA_RE);
     if (eraMatch) {
       contentStarted = true;
+      currentTagGroup = null;
       currentEvent = null;
       const name = eraMatch[1]!.trim();
       let rest = (eraMatch[2] ?? '').trim();
@@ -288,19 +257,59 @@ export function parseEventLine(
       const era: EventLineEra = { name, color, collapsed, lineNumber };
       result.eras.push(era);
       currentEra = name;
+      eraIndent = indent;
       continue;
     }
 
-    if (SECTION_SEAM_RE.test(trimmed)) {
-      pushWarning(
-        lineNumber,
-        'Group events with `[Name]` era brackets (§28.6a), not `section`.',
-        EVENT_LINE_DIAGNOSTIC_CODES.UNSUPPORTED
-      );
-      continue;
+    // ── Top-level (indent 0) directives and reserved seams. ──
+    if (indent === 0) {
+      currentTagGroup = null;
+      if (trimmed.toLowerCase() === 'no-scale') {
+        options.scale = false;
+        continue;
+      }
+      const sideMatch = trimmed.match(SIDE_RE);
+      if (sideMatch) {
+        options.side = sideMatch[1]!.toLowerCase() as EventLineOptions['side'];
+        continue;
+      }
+      if (trimmed.toLowerCase() === 'no-box') {
+        options.noBox = true;
+        continue;
+      }
+      if (trimmed.toLowerCase() === 'no-legend') {
+        options.noLegend = true;
+        continue;
+      }
+      const dirMatch = trimmed.match(DIRECTION_RE);
+      if (dirMatch) {
+        const dir = dirMatch[1]!.toUpperCase();
+        if (dir !== 'LR') {
+          pushWarning(
+            lineNumber,
+            `event-line is horizontal-only in v1; \`direction ${dir}\` (vertical orientation) is a fast-follow.`,
+            EVENT_LINE_DIAGNOSTIC_CODES.UNSUPPORTED
+          );
+        }
+        continue;
+      }
+      if (tryParseSharedOption(trimmed, sharedOptions)) continue;
+      if (SECTION_SEAM_RE.test(trimmed)) {
+        pushWarning(
+          lineNumber,
+          'Group events with `[Name]` era brackets (§28.6a), not `section`.',
+          EVENT_LINE_DIAGNOSTIC_CODES.UNSUPPORTED
+        );
+        continue;
+      }
     }
 
     // ── Event line ──
+    // An event belongs to the open era only when indented beneath that era's
+    // bracket; an indent-0 event sits outside any era and closes the run
+    // (events outside eras are fully supported — they simply have `era: null`).
+    const inEra = currentEra !== null && indent > eraIndent;
+    if (!inEra) currentEra = null;
     contentStarted = true;
     const event = parseEventHeader(
       trimmed,
@@ -312,6 +321,7 @@ export function parseEventLine(
     );
     result.events.push(event);
     currentEvent = event;
+    currentEventIndent = indent;
   }
 
   options.noTitle = sharedOptions['no-title'] === 'on';