@diagrammo/dgmo 0.8.5 → 0.8.6

package/src/completion.ts

@@ -273,7 +273,6 @@ export const COMPLETION_REGISTRY = new Map<string, DirectiveSpec>([
     }),
   ],
   ['c4', withGlobals()],
-  ['initiative-status', withGlobals()],
   [
     'state',
     withGlobals({
@@ -313,6 +312,14 @@ export const COMPLETION_REGISTRY = new Map<string, DirectiveSpec>([
       dependencies: { description: 'Show dependencies' },
     }),
   ],
+  [
+    'boxes-and-lines',
+    withGlobals({
+      direction: { description: 'Layout direction', values: ['LR', 'TB'] },
+      'active-tag': { description: 'Active tag group name' },
+      hide: { description: 'Hide tag:value pairs' },
+    }),
+  ],
 ]);
 
 // ============================================================
@@ -351,11 +358,11 @@ const CHART_TYPE_DESCRIPTIONS: Record<string, string> = {
   org: 'Organization chart',
   kanban: 'Kanban board',
   c4: 'C4 architecture diagram',
-  'initiative-status': 'Initiative status diagram',
   state: 'State diagram',
   sitemap: 'Sitemap diagram',
   infra: 'Infrastructure diagram',
   gantt: 'Gantt chart',
+  'boxes-and-lines': 'Boxes and lines diagram',
 };
 
 /** All chart types with descriptions, for chart type autocomplete. Excludes `multi-line` alias. */
@@ -481,28 +488,12 @@ export const PIPE_METADATA = new Map<
     },
   ],
   [
-    'initiative-status',
+    'boxes-and-lines',
     {
       node: {
-        done: { description: 'Completed' },
-        doing: { description: 'In progress' },
-        todo: { description: 'Not started' },
-        blocked: { description: 'Blocked' },
-        na: { description: 'Not applicable' },
-        wip: { description: 'Work in progress (alias for doing)' },
-        paused: { description: 'Paused (alias for blocked)' },
-        waiting: { description: 'Waiting (alias for blocked)' },
-      },
-      edge: {
-        done: { description: 'Completed' },
-        doing: { description: 'In progress' },
-        todo: { description: 'Not started' },
-        blocked: { description: 'Blocked' },
-        na: { description: 'Not applicable' },
-        wip: { description: 'Work in progress (alias for doing)' },
-        paused: { description: 'Paused (alias for blocked)' },
-        waiting: { description: 'Waiting (alias for blocked)' },
+        description: { description: 'Node description text' },
       },
+      edge: {},
     },
   ],
 ]);
@@ -935,12 +926,12 @@ function extractGanttSymbols(docText: string): DiagramSymbols {
 }
 
 // ============================================================
-// Initiative-status extractor
+// Boxes-and-lines extractor
 // ============================================================
 
-const IS_ARROW_RE = /^(\S+)\s+(?:-.*)?->\s+(\S+)/;
+const BL_ARROW_RE = /^(\S+)\s+(?:-.*)?(?:->|<->)\s+(\S+)/;
 
-function extractInitiativeStatusSymbols(docText: string): DiagramSymbols {
+function extractBoxesAndLinesSymbols(docText: string): DiagramSymbols {
   const lines = docText.split('\n');
   const entities: string[] = [];
   let pastFirstLine = false;
@@ -968,8 +959,11 @@ function extractInitiativeStatusSymbols(docText: string): DiagramSymbols {
       inTagBlock = false;
     }
 
-    // Edge lines: Source -> Target or Source -label-> Target
-    const arrowMatch = trimmed.match(IS_ARROW_RE);
+    // Skip groups
+    if (/^\[.+?\]/.test(trimmed)) continue;
+
+    // Edge lines
+    const arrowMatch = trimmed.match(BL_ARROW_RE);
     if (arrowMatch) {
       const src = arrowMatch[1].split('|')[0].trim();
       const dst = arrowMatch[2].split('|')[0].trim();
@@ -978,14 +972,12 @@ function extractInitiativeStatusSymbols(docText: string): DiagramSymbols {
       continue;
     }
 
-    // Node lines: Label | status or just Label (at root indent)
-    if (indent === 0) {
-      const label = trimmed.split('|')[0].trim();
-      if (label && !entities.includes(label)) entities.push(label);
-    }
+    // Node lines
+    const label = trimmed.split('|')[0].split('[')[0].trim();
+    if (label && !entities.includes(label)) entities.push(label);
   }
 
-  return { kind: 'initiative-status', entities, keywords: [] };
+  return { kind: 'boxes-and-lines', entities, keywords: [] };
 }
 
 // ============================================================
@@ -1001,4 +993,4 @@ registerExtractor('state', extractStateSymbols);
 registerExtractor('sitemap', extractSitemapSymbols);
 registerExtractor('c4', extractC4Symbols);
 registerExtractor('gantt', extractGanttSymbols);
-registerExtractor('initiative-status', extractInitiativeStatusSymbols);
+registerExtractor('boxes-and-lines', extractBoxesAndLinesSymbols);

package/src/d3.ts

@@ -193,6 +193,7 @@ import {
   matchTagBlockHeading,
   validateTagValues,
   resolveTagColor,
+  stripDefaultModifier,
 } from './utils/tag-groups';
 import type { TagGroup } from './utils/tag-groups';
 import {
@@ -570,16 +571,16 @@ export function parseVisualization(
       }
     }
 
-    // Timeline tag group entries (indented under tag: heading)
+    // Timeline tag group entries (indented under tag heading)
     if (currentTimelineTagGroup && indent > 0) {
-      const trimmedEntry = line;
-      const isDefault = /\bdefault\s*$/.test(trimmedEntry);
-      const entryText = isDefault
-        ? trimmedEntry.replace(/\s+default\s*$/, '').trim()
-        : trimmedEntry;
+      const { text: entryText, isDefault } = stripDefaultModifier(line);
       const { label, color } = extractColor(entryText, palette);
       if (color) {
-        if (isDefault) currentTimelineTagGroup.defaultValue = label;
+        if (isDefault) {
+          currentTimelineTagGroup.defaultValue = label;
+        } else if (currentTimelineTagGroup.entries.length === 0) {
+          currentTimelineTagGroup.defaultValue = label;
+        }
         currentTimelineTagGroup.entries.push({
           value: label,
           color,
@@ -1014,9 +1015,9 @@ export function parseVisualization(
         continue;
       }
 
-      // Data points: Label x, y
+      // Data points: Label x, y  OR  Label x y
       const pointMatch = line.match(
-        /^(.+?)\s+([0-9]*\.?[0-9]+)\s*,\s*([0-9]*\.?[0-9]+)\s*$/
+        /^(.+?)\s+([0-9]*\.?[0-9]+)\s*[,\s]\s*([0-9]*\.?[0-9]+)\s*$/
       );
       if (pointMatch) {
         const label = pointMatch[1].trim();
@@ -5047,8 +5048,8 @@ export function renderTimeline(
           }
 
           const pillXOff = isActive ? LG_CAPSULE_PAD : 0;
-          const pillYOff = isActive ? LG_CAPSULE_PAD : 0;
-          const pillH = LG_HEIGHT - (isActive ? LG_CAPSULE_PAD * 2 : 0);
+          const pillYOff = LG_CAPSULE_PAD;
+          const pillH = LG_HEIGHT - LG_CAPSULE_PAD * 2;
 
           // Pill background
           gEl
@@ -6856,29 +6857,27 @@ export async function renderForExport(
     return finalizeSvgExport(container, theme, effectivePalette, options);
   }
 
-  if (detectedType === 'initiative-status') {
-    const { parseInitiativeStatus } =
-      await import('./initiative-status/parser');
-    const { layoutInitiativeStatus } =
-      await import('./initiative-status/layout');
-    const { renderInitiativeStatus } =
-      await import('./initiative-status/renderer');
+  if (detectedType === 'boxes-and-lines') {
+    const { parseBoxesAndLines } = await import('./boxes-and-lines/parser');
+    const { layoutBoxesAndLines } = await import('./boxes-and-lines/layout');
+    const { renderBoxesAndLinesForExport } =
+      await import('./boxes-and-lines/renderer');
 
     const effectivePalette = await resolveExportPalette(theme, palette);
-    const isParsed = parseInitiativeStatus(content);
-    if (isParsed.error || isParsed.nodes.length === 0) return '';
+    const blParsed = parseBoxesAndLines(content);
+    if (blParsed.error || blParsed.nodes.length === 0) return '';
 
-    const isLayout = layoutInitiativeStatus(isParsed);
+    const blLayout = layoutBoxesAndLines(blParsed);
     const PADDING = 20;
-    const titleOffset = isParsed.title ? 40 : 0;
-    const exportWidth = isLayout.width + PADDING * 2;
-    const exportHeight = isLayout.height + PADDING * 2 + titleOffset;
+    const titleOffset = blParsed.title ? 40 : 0;
+    const exportWidth = blLayout.width + PADDING * 2;
+    const exportHeight = blLayout.height + PADDING * 2 + titleOffset;
     const container = createExportContainer(exportWidth, exportHeight);
 
-    renderInitiativeStatus(
+    renderBoxesAndLinesForExport(
       container,
-      isParsed,
-      isLayout,
+      blParsed,
+      blLayout,
       effectivePalette,
       theme === 'dark',
       { exportDims: { width: exportWidth, height: exportHeight } }

package/src/dgmo-router.ts

@@ -13,13 +13,10 @@ import { parseVisualization } from './d3';
 import { parseOrg, looksLikeOrg } from './org/parser';
 import { parseKanban } from './kanban/parser';
 import { parseC4 } from './c4/parser';
-import {
-  looksLikeInitiativeStatus,
-  parseInitiativeStatus,
-} from './initiative-status/parser';
 import { looksLikeSitemap, parseSitemap } from './sitemap/parser';
 import { parseInfra } from './infra/parser';
 import { parseGantt } from './gantt/parser';
+import { parseBoxesAndLines } from './boxes-and-lines/parser';
 import { parseFirstLine } from './utils/parsing';
 import type { DgmoError } from './diagnostics';
 
@@ -97,7 +94,6 @@ export function parseDgmoChartType(content: string): string | null {
   if (looksLikeFlowchart(content)) return 'flowchart';
   if (looksLikeClassDiagram(content)) return 'class';
   if (looksLikeERDiagram(content)) return 'er';
-  if (looksLikeInitiativeStatus(content)) return 'initiative-status';
   if (looksLikeState(content)) return 'state';
   if (looksLikeSitemap(content)) return 'sitemap';
   if (looksLikeOrg(content)) return 'org';
@@ -147,11 +143,11 @@ const DIAGRAM_TYPES = new Set([
   'org',
   'kanban',
   'c4',
-  'initiative-status',
   'state',
   'sitemap',
   'infra',
   'gantt',
+  'boxes-and-lines',
 ]);
 const EXTENDED_CHART_TYPES = new Set([
   'scatter',
@@ -226,11 +222,11 @@ const PARSE_DISPATCH = new Map<
   ['org', (c) => parseOrg(c)],
   ['kanban', (c) => parseKanban(c)],
   ['c4', (c) => parseC4(c)],
-  ['initiative-status', (c) => parseInitiativeStatus(c)],
   ['state', (c) => parseState(c)],
   ['sitemap', (c) => parseSitemap(c)],
   ['infra', (c) => parseInfra(c)],
   ['gantt', (c) => parseGantt(c)],
+  ['boxes-and-lines', (c) => parseBoxesAndLines(c)],
 ]);
 
 /**

package/src/echarts.ts

@@ -2632,6 +2632,33 @@ function segmentLabelFormatter(parsed: ParsedChart): string {
 
 // ── Pie / Doughnut ───────────────────────────────────────────
 
+/**
+ * Compute pie label config: shrink radius and font when labels are long
+ * so nothing gets truncated or wrapped.
+ */
+function pieLabelLayout(parsed: ParsedChart): {
+  outerRadius: number;
+  fontSize: number;
+} {
+  const formatter = segmentLabelFormatter(parsed);
+  const total = parsed.data.reduce((s, d) => s + d.value, 0);
+  const maxLen = parsed.data.reduce((mx, d) => {
+    const label = formatter
+      .replace('{b}', d.label)
+      .replace('{c}', String(d.value))
+      .replace('{d}', total > 0 ? ((d.value / total) * 100).toFixed(2) : '0');
+    return Math.max(mx, label.length);
+  }, 0);
+
+  // Shrink radius and font for longer labels so they fit without truncation.
+  // The chart renders in containers of varying width (800px in-app to 1200px CLI),
+  // so we need enough margin for labels at the smallest reasonable container.
+  if (maxLen > 30) return { outerRadius: 38, fontSize: 11 };
+  if (maxLen > 24) return { outerRadius: 45, fontSize: 12 };
+  if (maxLen > 18) return { outerRadius: 55, fontSize: 13 };
+  return { outerRadius: 70, fontSize: 14 };
+}
+
 function buildPieOption(
   parsed: ParsedChart,
   textColor: string,
@@ -2655,6 +2682,8 @@ function buildPieOption(
     };
   });
 
+  const { outerRadius, fontSize } = pieLabelLayout(parsed);
+
   return {
     ...CHART_BASE,
     ...HIDE_AXES,
@@ -2666,13 +2695,16 @@ function buildPieOption(
     series: [
       {
         type: 'pie',
-        radius: isDoughnut ? ['40%', '70%'] : ['0%', '70%'],
+        radius: isDoughnut
+          ? [`${Math.round(outerRadius * 0.57)}%`, `${outerRadius}%`]
+          : ['0%', `${outerRadius}%`],
         data,
         label: {
           position: 'outside',
           formatter: segmentLabelFormatter(parsed),
           color: textColor,
           fontFamily: FONT_FAMILY,
+          fontSize,
         },
         labelLine: { show: true },
         emphasis: EMPHASIS_SELF,
@@ -2790,13 +2822,17 @@ function buildPolarAreaOption(
       {
         type: 'pie',
         roseType: 'radius',
-        radius: ['10%', '70%'],
+        radius: (() => {
+          const { outerRadius } = pieLabelLayout(parsed);
+          return [`${Math.round(outerRadius * 0.14)}%`, `${outerRadius}%`];
+        })(),
         data,
         label: {
           position: 'outside',
           formatter: segmentLabelFormatter(parsed),
           color: textColor,
           fontFamily: FONT_FAMILY,
+          fontSize: pieLabelLayout(parsed).fontSize,
         },
         labelLine: { show: true },
         emphasis: EMPHASIS_SELF,

package/src/editor/keywords.ts

@@ -8,11 +8,11 @@ export const CHART_TYPES = new Set([
   'org',
   'kanban',
   'c4',
-  'initiative-status',
   'state',
   'sitemap',
   'infra',
   'gantt',
+  'boxes-and-lines',
   // Data chart types
   'bar',
   'line',
@@ -86,6 +86,8 @@ export const DIRECTIVE_KEYWORDS = new Set([
   'import',
   'active-tag',
   'hide',
+  'mode',
+  'direction',
   // ER
   'notation',
   // Class
@@ -146,8 +148,6 @@ export const DIRECTIVE_KEYWORDS = new Set([
   // Layout
   'direction-tb',
   'direction-lr',
-  // Initiative-status
-  'contains',
   // Data chart metadata
   'title',
   'series',
@@ -172,7 +172,7 @@ export const CONTROL_KEYWORDS = new Set([
   'note',
 ]);
 
-/** Status keywords — initiative-status, kanban. */
+/** Status keywords — kanban. */
 export const STATUS_KEYWORDS = new Set([
   'na',
   'todo',
@@ -190,21 +190,6 @@ export const MODIFIER_KEYWORDS = new Set([
   'aka',
   'position',
   'default',
-  // Sequence participant types
-  'actor',
-  'service',
-  'database',
-  'queue',
-  'cache',
-  'gateway',
-  'external',
-  'networking',
-  'frontend',
-  // C4 element types
-  'system',
-  'person',
-  'container',
-  'component',
   // ER column modifiers
   'pk',
   'fk',

package/src/er/parser.ts

@@ -8,7 +8,11 @@ import {
   parseFirstLine,
   OPTION_NOCOLON_RE,
 } from '../utils/parsing';
-import { matchTagBlockHeading, validateTagValues } from '../utils/tag-groups';
+import {
+  matchTagBlockHeading,
+  validateTagValues,
+  stripDefaultModifier,
+} from '../utils/tag-groups';
 import type { TagGroup } from '../utils/tag-groups';
 import type {
   ParsedERDiagram,
@@ -273,7 +277,8 @@ export function parseERDiagram(
 
     // Tag group entries (indented under tag heading)
     if (currentTagGroup && !contentStarted && indent > 0) {
-      const { label, color } = extractColor(trimmed, palette);
+      const { text: cleanEntry, isDefault } = stripDefaultModifier(trimmed);
+      const { label, color } = extractColor(cleanEntry, palette);
       if (!color) {
         result.diagnostics.push(
           makeDgmoError(
@@ -284,8 +289,9 @@ export function parseERDiagram(
         );
         continue;
       }
-      // First entry becomes the default
-      if (currentTagGroup.entries.length === 0) {
+      if (isDefault) {
+        currentTagGroup.defaultValue = label;
+      } else if (currentTagGroup.entries.length === 0) {
         currentTagGroup.defaultValue = label;
       }
       currentTagGroup.entries.push({ value: label, color, lineNumber });

package/src/gantt/parser.ts

@@ -5,7 +5,7 @@
 import { makeDgmoError, formatDgmoError } from '../diagnostics';
 import type { DgmoError } from '../diagnostics';
 import type { TagGroup } from '../utils/tag-groups';
-import { matchTagBlockHeading } from '../utils/tag-groups';
+import { matchTagBlockHeading, stripDefaultModifier } from '../utils/tag-groups';
 import {
   measureIndent,
   extractColor,
@@ -357,9 +357,10 @@ export function parseGantt(
         // fall through to process this line normally
       } else {
         // Parse tag entry: `Value(color)` or `Value`
-        // First entry is the default (no `default` keyword needed)
+        // First entry is the default unless another is marked `default`
         if (COMMENT_RE.test(line)) continue;
-        const extracted = extractColor(line, palette);
+        const { text: cleanEntry, isDefault } = stripDefaultModifier(line);
+        const extracted = extractColor(cleanEntry, palette);
         const color =
           extracted.color ||
           seriesColors[currentTagGroup.entries.length % seriesColors.length] ||
@@ -370,7 +371,9 @@ export function parseGantt(
           color,
           lineNumber,
         });
-        if (isFirstEntry) {
+        if (isDefault) {
+          currentTagGroup.defaultValue = extracted.label;
+        } else if (isFirstEntry) {
           currentTagGroup.defaultValue = extracted.label;
         }
         continue;

package/src/gantt/renderer.ts

@@ -298,7 +298,7 @@ export function renderGantt(
     .append('g')
     .attr('transform', `translate(${leftMargin}, ${marginTop})`);
 
-  // ── Title (y=30, consistent with timeline/initiative-status) ──
+  // ── Title (y=30, consistent with timeline) ──
 
   if (title) {
     svg
@@ -1952,9 +1952,7 @@ function renderTagLegend(
       measureLegendText(group.name, LEGEND_PILL_FONT_SIZE) +
       LEGEND_PILL_PAD +
       iconReserve;
-    const pillH = isActive
-      ? LEGEND_HEIGHT - LEGEND_CAPSULE_PAD * 2
-      : LEGEND_HEIGHT;
+    const pillH = LEGEND_HEIGHT - LEGEND_CAPSULE_PAD * 2;
     const groupW = groupWidths[i];
 
     const gEl = legendRow
@@ -1979,7 +1977,7 @@ function renderTagLegend(
     }
 
     const pillXOff = isActive ? LEGEND_CAPSULE_PAD : 0;
-    const pillYOff = isActive ? LEGEND_CAPSULE_PAD : 0;
+    const pillYOff = LEGEND_CAPSULE_PAD;
 
     // Pill background
     gEl

package/src/index.ts

@@ -204,36 +204,27 @@ export {
   renderC4DeploymentForExport,
 } from './c4/renderer';
 
-export {
-  parseInitiativeStatus,
-  looksLikeInitiativeStatus,
-} from './initiative-status/parser';
+export { parseBoxesAndLines } from './boxes-and-lines/parser';
 export type {
-  ParsedInitiativeStatus,
-  ISNode,
-  ISEdge,
-  ISGroup,
-  InitiativeStatus,
-} from './initiative-status/types';
-
-export { layoutInitiativeStatus } from './initiative-status/layout';
+  ParsedBoxesAndLines,
+  BLNode,
+  BLEdge,
+  BLGroup,
+} from './boxes-and-lines/types';
+export { layoutBoxesAndLines } from './boxes-and-lines/layout';
 export type {
-  ISLayoutResult,
-  ISLayoutNode,
-  ISLayoutEdge,
-  ISLayoutGroup,
-} from './initiative-status/layout';
-
+  BLLayoutResult,
+  BLLayoutNode,
+  BLLayoutEdge,
+  BLLayoutGroup,
+} from './boxes-and-lines/layout';
 export {
-  renderInitiativeStatus,
-  renderInitiativeStatusForExport,
-} from './initiative-status/renderer';
-export type { ISRenderOptions } from './initiative-status/renderer';
-
-export { collapseInitiativeStatus } from './initiative-status/collapse';
-export type { CollapseResult } from './initiative-status/collapse';
+  renderBoxesAndLines,
+  renderBoxesAndLinesForExport,
+} from './boxes-and-lines/renderer';
 
-export { filterInitiativeStatusByTags } from './initiative-status/filter';
+export { collapseBoxesAndLines } from './boxes-and-lines/collapse';
+export type { BLCollapseResult } from './boxes-and-lines/collapse';
 
 export { parseSitemap, looksLikeSitemap } from './sitemap/parser';
 

package/src/infra/parser.ts

@@ -12,7 +12,7 @@ import {
   parseFirstLine,
   OPTION_NOCOLON_RE,
 } from '../utils/parsing';
-import { matchTagBlockHeading } from '../utils/tag-groups';
+import { matchTagBlockHeading, stripDefaultModifier } from '../utils/tag-groups';
 import type {
   ParsedInfra,
   InfraNode,
@@ -338,17 +338,19 @@ export function parseInfra(content: string): ParsedInfra {
 
     // ---- Indented lines ----
 
-    // Tag value inside tag group — first value is the default
+    // Tag value inside tag group — first value is the default unless another is marked `default`
     if (currentTagGroup && indent > 0) {
-      const tvMatch = trimmed.match(TAG_VALUE_RE);
+      const { text: cleanEntry, isDefault } = stripDefaultModifier(trimmed);
+      const tvMatch = cleanEntry.match(TAG_VALUE_RE);
       if (tvMatch) {
         const valueName = tvMatch[1].trim();
         currentTagGroup.values.push({
           name: valueName,
           color: tvMatch[2]?.trim(),
         });
-        // First value is the default
-        if (currentTagGroup.values.length === 1) {
+        if (isDefault) {
+          currentTagGroup.defaultValue = valueName;
+        } else if (currentTagGroup.values.length === 1) {
           currentTagGroup.defaultValue = valueName;
         }
         continue;

package/src/infra/renderer.ts

@@ -2069,8 +2069,8 @@ function renderLegend(
     }
 
     const pillXOff = isActive ? LEGEND_CAPSULE_PAD : 0;
-    const pillYOff = isActive ? LEGEND_CAPSULE_PAD : 0;
-    const pillH = LEGEND_HEIGHT - (isActive ? LEGEND_CAPSULE_PAD * 2 : 0);
+    const pillYOff = LEGEND_CAPSULE_PAD;
+    const pillH = LEGEND_HEIGHT - LEGEND_CAPSULE_PAD * 2;
 
     // Pill background
     gEl

package/src/kanban/parser.ts

@@ -1,7 +1,7 @@
 import type { PaletteColors } from '../palettes';
 import { makeDgmoError, formatDgmoError, suggest } from '../diagnostics';
 import { resolveColor } from '../colors';
-import { matchTagBlockHeading } from '../utils/tag-groups';
+import { matchTagBlockHeading, stripDefaultModifier } from '../utils/tag-groups';
 import {
   measureIndent,
   extractColor,
@@ -166,11 +166,12 @@ export function parseKanban(
     }
 
     // Tag group entries (indented Value(color) under tag heading)
-    // First entry is implicitly the default.
+    // First entry is the default unless another is marked `default`
     if (currentTagGroup && !contentStarted) {
       const indent = measureIndent(line);
       if (indent > 0) {
-        const { label, color } = extractColor(trimmed, palette);
+        const { text: cleanEntry, isDefault } = stripDefaultModifier(trimmed);
+        const { label, color } = extractColor(cleanEntry, palette);
         if (!color) {
           warn(
             lineNumber,
@@ -178,8 +179,9 @@ export function parseKanban(
           );
           continue;
         }
-        // First entry is the default
-        if (currentTagGroup.entries.length === 0) {
+        if (isDefault) {
+          currentTagGroup.defaultValue = label;
+        } else if (currentTagGroup.entries.length === 0) {
           currentTagGroup.defaultValue = label;
         }
         currentTagGroup.entries.push({