@diagrammo/dgmo 0.8.22 → 0.8.25

package/src/d3.ts

@@ -21,7 +21,8 @@ export type VisualizationType =
   | 'quadrant'
   | 'sequence'
   | 'tech-radar'
-  | 'cycle';
+  | 'cycle'
+  | 'pyramid';
 
 interface D3DataItem {
   label: string;
@@ -1505,8 +1506,15 @@ export function parseVisualization(
           result.diagnostics.push(makeDgmoError(line, msg, 'warning')),
         suggest
       );
-      validateTagGroupNames(result.timelineTagGroups, (line, msg) =>
-        result.diagnostics.push(makeDgmoError(line, msg, 'warning'))
+      validateTagGroupNames(
+        result.timelineTagGroups,
+        (line, msg) =>
+          result.diagnostics.push(makeDgmoError(line, msg, 'warning')),
+        (line, msg) => {
+          const diag = makeDgmoError(line, msg);
+          result.diagnostics.push(diag);
+          if (!result.error) result.error = formatDgmoError(diag);
+        }
       );
       for (const group of result.timelineTagGroups) {
         if (!group.defaultValue) continue;
@@ -7120,6 +7128,25 @@ export async function renderForExport(
     return finalizeSvgExport(container, theme, effectivePalette);
   }
 
+  if (detectedType === 'pyramid') {
+    const { parsePyramid } = await import('./pyramid/parser');
+    const { renderPyramidForExport } = await import('./pyramid/renderer');
+
+    const effectivePalette = await resolveExportPalette(theme, palette);
+    const pyramidParsed = parsePyramid(content);
+    if (pyramidParsed.error || pyramidParsed.layers.length === 0) return '';
+
+    const container = createExportContainer(EXPORT_WIDTH, EXPORT_HEIGHT);
+    renderPyramidForExport(
+      container,
+      pyramidParsed,
+      effectivePalette,
+      theme === 'dark',
+      { width: EXPORT_WIDTH, height: EXPORT_HEIGHT }
+    );
+    return finalizeSvgExport(container, theme, effectivePalette);
+  }
+
   const parsed = parseVisualization(content, palette);
   // Allow sequence diagrams through even if parseVisualization errors —
   // sequence is parsed by its own dedicated parser (parseSequenceDgmo)

package/src/dgmo-router.ts

@@ -22,9 +22,11 @@ import { parseWireframe } from './wireframe/parser';
 import { parseTechRadar } from './tech-radar/parser';
 import { parseCycle } from './cycle/parser';
 import { parseJourneyMap } from './journey-map/parser';
+import { parsePyramid } from './pyramid/parser';
 import { parseFirstLine } from './utils/parsing';
 import { makeDgmoError, suggest } from './diagnostics';
 import type { DgmoError } from './diagnostics';
+import { chartTypes } from './chart-types';
 
 // ============================================================
 // Content-based chart type inference helpers
@@ -142,6 +144,7 @@ const VISUALIZATION_TYPES = new Set([
   'quadrant',
   'tech-radar',
   'cycle',
+  'pyramid',
 ]);
 const DIAGRAM_TYPES = new Set([
   'sequence',
@@ -190,77 +193,107 @@ export function isExtendedChartType(chartType: string): boolean {
   return EXTENDED_CHART_TYPES.has(chartType.toLowerCase());
 }
 
-/** Standard chart types parsed by parseChart (then rendered via ECharts). Internal use. */
-const STANDARD_CHART_TYPES = new Set([
-  'bar',
-  'line',
-  'multi-line',
-  'area',
-  'pie',
-  'doughnut',
-  'radar',
-  'polar-area',
-  'bar-stacked',
-]);
-
 /**
- * Returns all supported chart type identifiers.
- * Useful for CLI enumeration and autocomplete.
+ * Returns all supported chart type identifiers in canonical (tier) order,
+ * derived from `chartTypes`. Consumers that need alphabetical order should
+ * call `.sort()` explicitly.
  */
 export function getAllChartTypes(): string[] {
-  return [...DATA_CHART_TYPES, ...VISUALIZATION_TYPES, ...DIAGRAM_TYPES];
+  return chartTypes.map((c) => c.id);
 }
 
-// ECharts-native types parsed by parseExtendedChart
-const ECHART_TYPES = new Set([
-  'scatter',
-  'sankey',
-  'chord',
-  'function',
-  'heatmap',
-  'funnel',
-]);
+/**
+ * Canonical descriptions for every supported chart type. Derived from
+ * `chartTypes` so there is exactly one place to update when adding a new
+ * type. Consumed by the CLI `--chart-types` flag, the editor autocomplete
+ * popup, and the MCP `list_chart_types` tool.
+ */
+export const CHART_TYPE_DESCRIPTIONS: Record<string, string> =
+  Object.fromEntries(chartTypes.map((c) => [c.id, c.description]));
 
-/** Map chart type strings to their parse function (content → { diagnostics }). */
-const PARSE_DISPATCH = new Map<
-  string,
-  (content: string) => { diagnostics: DgmoError[] }
->([
-  ['sequence', (c) => parseSequenceDgmo(c)],
-  ['flowchart', (c) => parseFlowchart(c)],
-  ['class', (c) => parseClassDiagram(c)],
-  ['er', (c) => parseERDiagram(c)],
-  ['org', (c) => parseOrg(c)],
-  ['kanban', (c) => parseKanban(c)],
-  ['c4', (c) => parseC4(c)],
-  ['state', (c) => parseState(c)],
-  ['sitemap', (c) => parseSitemap(c)],
-  ['infra', (c) => parseInfra(c)],
-  ['gantt', (c) => parseGantt(c)],
-  ['boxes-and-lines', (c) => parseBoxesAndLines(c)],
-  ['mindmap', (c) => parseMindmap(c)],
-  ['wireframe', (c) => parseWireframe(c)],
-  ['tech-radar', (c) => parseTechRadar(c)],
-  ['cycle', (c) => parseCycle(c)],
-  ['journey-map', (c) => parseJourneyMap(c)],
-]);
+// ============================================================
+// Parser registry — single source of truth for id → parser
+// ============================================================
+
+type ParseResult = { diagnostics: DgmoError[] };
+type ParseFn = (content: string) => ParseResult;
 
 /**
- * Parse DGMO content and return diagnostics without rendering.
- * Useful for the CLI and editor to surface all errors before attempting render.
+ * Maps every chart-type id to the parser that handles it. Adding a new
+ * chart type means:
+ *   1. Add an entry here.
+ *   2. Add an entry to `chartTypes` in `chart-types.ts`.
+ *
+ * The `chart-types.test.ts` cross-check asserts both sets are identical;
+ * forgetting either side trips the test.
  */
+export const chartTypeParsers: ReadonlyArray<readonly [string, ParseFn]> = [
+  // Structured diagrams (direct parsers)
+  ['sequence', parseSequenceDgmo],
+  ['flowchart', parseFlowchart],
+  ['class', parseClassDiagram],
+  ['er', parseERDiagram],
+  ['state', parseState],
+  ['org', parseOrg],
+  ['kanban', parseKanban],
+  ['c4', parseC4],
+  ['sitemap', parseSitemap],
+  ['infra', parseInfra],
+  ['gantt', parseGantt],
+  ['boxes-and-lines', parseBoxesAndLines],
+  ['mindmap', parseMindmap],
+  ['wireframe', parseWireframe],
+  ['tech-radar', parseTechRadar],
+  ['cycle', parseCycle],
+  ['journey-map', parseJourneyMap],
+  ['pyramid', parsePyramid],
+
+  // Standard ECharts charts (parseChart)
+  ['bar', parseChart],
+  ['line', parseChart],
+  ['multi-line', parseChart],
+  ['area', parseChart],
+  ['pie', parseChart],
+  ['doughnut', parseChart],
+  ['radar', parseChart],
+  ['polar-area', parseChart],
+  ['bar-stacked', parseChart],
+
+  // Extended ECharts charts (parseExtendedChart)
+  ['scatter', parseExtendedChart],
+  ['sankey', parseExtendedChart],
+  ['chord', parseExtendedChart],
+  ['function', parseExtendedChart],
+  ['heatmap', parseExtendedChart],
+  ['funnel', parseExtendedChart],
+
+  // D3 visualizations (parseVisualization)
+  ['slope', parseVisualization],
+  ['wordcloud', parseVisualization],
+  ['arc', parseVisualization],
+  ['timeline', parseVisualization],
+  ['venn', parseVisualization],
+  ['quadrant', parseVisualization],
+];
+
+/** Ids in the same order as `chartTypeParsers`; used for cross-checks. */
+export const knownChartTypeIds: readonly string[] = chartTypeParsers.map(
+  ([id]) => id
+);
+
+const PARSER_BY_ID: Map<string, ParseFn> = new Map(chartTypeParsers);
+
 /** All known chart type names for colon-pattern detection. */
-const ALL_KNOWN_TYPES = new Set([
-  ...DATA_CHART_TYPES,
-  ...VISUALIZATION_TYPES,
-  ...DIAGRAM_TYPES,
-]);
+const ALL_KNOWN_TYPES: ReadonlySet<string> = new Set(knownChartTypeIds);
 
 /**
  * Parse DGMO content and return diagnostics without rendering.
  * Useful for the CLI and editor to surface all errors before attempting render.
  */
-export function parseDgmo(content: string): { diagnostics: DgmoError[] } {
+export function parseDgmo(content: string): {
+  diagnostics: DgmoError[];
+  chartType: string | null;
+} {
   const chartType = parseDgmoChartType(content);
 
   if (!chartType) {
@@ -268,38 +301,30 @@ export function parseDgmo(content: string): { diagnostics: DgmoError[] } {
     const colonDiag = detectColonChartType(content);
     if (colonDiag) {
       const fallback = parseVisualization(content).diagnostics;
-      return { diagnostics: [colonDiag, ...fallback] };
+      return { diagnostics: [colonDiag, ...fallback], chartType: null };
     }
 
     // No chart type detected — try visualization parser as fallback
-    return { diagnostics: parseVisualization(content).diagnostics };
-  }
-
-  const directParser = PARSE_DISPATCH.get(chartType);
-  if (directParser) {
-    const result = directParser(content);
     return {
-      diagnostics: [...result.diagnostics, ...detectEmptyContent(content)],
+      diagnostics: parseVisualization(content).diagnostics,
+      chartType: null,
     };
   }
 
-  if (STANDARD_CHART_TYPES.has(chartType)) {
-    const result = parseChart(content);
-    return {
-      diagnostics: [...result.diagnostics, ...detectEmptyContent(content)],
-    };
-  }
-  if (ECHART_TYPES.has(chartType)) {
-    const result = parseExtendedChart(content);
+  const parser = PARSER_BY_ID.get(chartType);
+  if (parser) {
+    const result = parser(content);
     return {
       diagnostics: [...result.diagnostics, ...detectEmptyContent(content)],
+      chartType,
     };
   }
 
-  // Visualization types (slope, wordcloud, arc, timeline, venn, quadrant)
+  // Unknown id (defensive): fall through to visualization parser.
   const result = parseVisualization(content);
   return {
     diagnostics: [...result.diagnostics, ...detectEmptyContent(content)],
+    chartType,
   };
 }
 

package/src/echarts.ts

@@ -1913,7 +1913,7 @@ function buildFunnelOption(
     bottom: 20,
     width: '60%',
     sort: 'descending' as const,
-    gap: 2,
+    gap: 0,
     minSize: '8%',
   };
 

package/src/editor/keywords.ts

@@ -17,6 +17,7 @@ export const CHART_TYPES = new Set([
   'tech-radar',
   'mindmap',
   'journey-map',
+  'pyramid',
   // Data chart types
   'bar',
   'line',
@@ -139,8 +140,6 @@ export const DIRECTIVE_KEYWORDS = new Set([
   // Sequence
   'activations',
   'no-activations',
-  'collapse-notes',
-  'no-collapse-notes',
   // Data charts
   'stacked',
   'no-label-name',
@@ -158,6 +157,8 @@ export const DIRECTIVE_KEYWORDS = new Set([
   // Layout
   'direction-tb',
   'direction-lr',
+  // Pyramid
+  'inverted',
   // Data chart metadata
   'title',
   'series',

package/src/fonts.ts

@@ -1,2 +1,3 @@
-export const FONT_FAMILY = 'Inter, system-ui, Avenir, Helvetica, Arial, sans-serif';
-export const DEFAULT_FONT_NAME = 'Helvetica';
+export const FONT_FAMILY =
+  'Inter, system-ui, Avenir, Helvetica, Arial, sans-serif';
+export const DEFAULT_FONT_NAME = 'Inter';

package/src/gantt/parser.ts

@@ -926,7 +926,11 @@ export function parseGantt(
     result.options.sort = 'default';
   }
 
-  validateTagGroupNames(result.tagGroups, warn);
+  validateTagGroupNames(result.tagGroups, warn, (line, msg) => {
+    const diag = makeDgmoError(line, msg);
+    diagnostics.push(diag);
+    if (!result.error) result.error = formatDgmoError(diag);
+  });
 
   // ── Sprint mode detection ──────────────────────────────
   const hasSprintOption =

package/src/index.ts

@@ -23,6 +23,28 @@ export type { ParseInArrowLabelResult } from './utils/arrows';
 
 export { render } from './render';
 
+// ============================================================
+// Chart-type registry (single source of truth)
+// ============================================================
+
+export { chartTypes } from './chart-types';
+export type { ChartTypeMeta } from './chart-types';
+
+export {
+  normalize as normalizeChartTypePrompt,
+  matchesContiguously,
+  scoreChartType,
+  confidence as chartTypeConfidence,
+  suggestChartTypes,
+  MIN_PRIMARY_SCORE,
+  AMBIGUITY_THRESHOLD,
+} from './chart-type-scoring';
+export type {
+  ChartTypeScore,
+  Confidence as ChartTypeConfidence,
+  SuggestionResult as ChartTypeSuggestionResult,
+} from './chart-type-scoring';
+
 // ============================================================
 // Router
 // ============================================================
@@ -32,6 +54,10 @@ export {
   parseDgmo,
   getRenderCategory,
   isExtendedChartType,
+  getAllChartTypes,
+  CHART_TYPE_DESCRIPTIONS,
+  chartTypeParsers,
+  knownChartTypeIds,
 } from './dgmo-router';
 export type { RenderCategory } from './dgmo-router';
 
@@ -63,6 +89,7 @@ export type {
 
 export {
   parseSequenceDgmo,
+  parseSequenceDgmo as parseSequenceDiagram,
   looksLikeSequence,
   isSequenceBlock,
   isSequenceNote,
@@ -331,8 +358,12 @@ export type {
   ResolvedGroup,
 } from './gantt/types';
 
-export { collapseOrgTree } from './org/collapse';
-export type { CollapsedOrgResult } from './org/collapse';
+export { collapseOrgTree, focusOrgTree } from './org/collapse';
+export type {
+  CollapsedOrgResult,
+  FocusOrgResult,
+  AncestorInfo,
+} from './org/collapse';
 
 export { parseMindmap } from './mindmap/parser';
 export type {
@@ -407,6 +438,10 @@ export type {
 } from './journey-map/types';
 export type { JourneyMapInteractiveOptions } from './journey-map/renderer';
 
+export { parsePyramid } from './pyramid/parser';
+export { renderPyramid, renderPyramidForExport } from './pyramid/renderer';
+export type { ParsedPyramid, PyramidLayer } from './pyramid/types';
+
 export { resolveOrgImports } from './org/resolver';
 export type {
   ReadFileFn,
@@ -485,7 +520,6 @@ export {
   applyGroupOrdering,
   groupMessagesBySection,
   buildNoteMessageMap,
-  collectNoteLineNumbers,
 } from './sequence/renderer';
 export type {
   RenderStep,

package/src/infra/parser.ts

@@ -113,8 +113,8 @@ function extractPipeMetadata(rest: string): {
   const tags: Record<string, string> = {};
   let clean = rest;
   let match: RegExpExecArray | null;
-  const re = new RegExp(PIPE_META_RE.source, 'g');
-  while ((match = re.exec(rest)) !== null) {
+  PIPE_META_RE.lastIndex = 0;
+  while ((match = PIPE_META_RE.exec(rest)) !== null) {
     tags[match[1].trim()] = match[2].trim();
     clean = clean.replace(match[0], '');
   }
@@ -765,7 +765,7 @@ export function parseInfra(content: string): ParsedInfra {
     }
   }
 
-  validateTagGroupNames(result.tagGroups, warn);
+  validateTagGroupNames(result.tagGroups, warn, setError);
 
   return result;
 }

package/src/internal.ts

@@ -0,0 +1,20 @@
+// ============================================================
+// @diagrammo/dgmo/internal — internal helpers for app consumers.
+// Not part of the public API; may change between versions.
+// ============================================================
+
+export { parseDataRowValues } from './chart';
+export {
+  computeCardArchive,
+  computeCardMove,
+  isArchiveColumn,
+} from './kanban/mutations';
+export {
+  applyGroupOrdering,
+  applyPositionOverrides,
+  buildNoteMessageMap,
+  buildRenderSequence,
+  computeActivations,
+  groupMessagesBySection,
+} from './sequence/renderer';
+export { orderArcNodes } from './d3';

package/src/journey-map/layout.ts

@@ -121,14 +121,18 @@ export function layoutJourneyMap(
     ? parsed.phases.flatMap((p) => p.steps)
     : parsed.steps;
 
-  // Compute step card heights based on content (matches kanban card sizing)
+  // Compute step card heights based on content (matches kanban card sizing).
+  // Char-width constants MUST match the renderer's wrapText() in renderer.ts
+  // (`fontSize * 0.6`) and the title wrap (`TITLE_CHAR_WIDTH`) — otherwise the
+  // layout reserves too little vertical space and rendered text overflows.
   const annoIconIndent = ANNO_ICON_SIZE + ANNO_ICON_GAP;
   const annoTextW = STEP_CARD_WIDTH - CARD_PADDING_X * 2 - annoIconIndent;
   const descTextWidth = STEP_CARD_WIDTH - CARD_PADDING_X * 2;
-  const charWidth = 4.8; // average char width at FONT_SIZE_META (10px)
+  const FONT_SIZE_META = 10;
+  const charWidth = FONT_SIZE_META * 0.6; // matches renderer wrapText()
 
   const titleTextWidth = STEP_CARD_WIDTH - CARD_PADDING_X * 2;
-  const titleCharWidth = 6.5; // average char width at FONT_SIZE_STEP (12px)
+  const titleCharWidth = 6.5; // matches renderer TITLE_CHAR_WIDTH (FONT_SIZE_STEP 12px)
   const TITLE_LINE_HEIGHT = 16;
 
   const stepHeights = allSteps.map((step) => {

package/src/journey-map/parser.ts

@@ -408,7 +408,11 @@ export function parseJourneyMap(
     return fail(1, 'No phases or steps found');
   }
 
-  validateTagGroupNames(result.tagGroups, warn);
+  validateTagGroupNames(result.tagGroups, warn, (line, msg) => {
+    const diag = makeDgmoError(line, msg);
+    result.diagnostics.push(diag);
+    if (!result.error) result.error = formatDgmoError(diag);
+  });
 
   return result;
 }