@diagrammo/dgmo 0.25.0 → 0.25.1

package/package.json

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

package/src/advanced.ts

@@ -402,14 +402,6 @@ export {
   renderPertForExport,
   renderPertAnalysisBlock,
   measurePertAnalysisBlock,
-  highlightPertCriticalPath,
-  highlightPertSet,
-  pertLegendEntries,
-  pertLegendBlockWidth,
-  PERT_LEGEND_PILL_HEIGHT,
-  renderLegendBlock as renderPertLegendBlock,
-  resetPertCriticalPath,
-  resetPertHighlight,
 } from './pert/renderer';
 export type { PertRenderOptions } from './pert/renderer';
 export type {

package/src/completion.ts

@@ -534,6 +534,7 @@ export const COMPLETION_REGISTRY = new Map<string, DirectiveSpec>([
         description: 'Which tag group leads when several are present',
       },
       caption: { description: 'Caption line (data-source attribution)' },
+      'no-title': { description: 'Suppress the title banner' },
       'no-legend': { description: 'Suppress the legend' },
       'no-coastline': {
         description: 'Turn off coastal water-lines (on by default)',
@@ -552,6 +553,10 @@ export const COMPLETION_REGISTRY = new Map<string, DirectiveSpec>([
         description:
           'Force plain green-land reference dress (regions are auto-coloured by default)',
       },
+      'no-cluster-pois': {
+        description:
+          'Always fan out coincident POI markers instead of collapsing them into a count badge',
+      },
     }),
   ],
 ]);

package/src/d3.ts

@@ -8609,6 +8609,14 @@ export async function renderForExport(
     const { renderSequenceDiagram } = await import('./sequence/renderer');
     const seqParsed = parseSequenceDgmo(content);
     if (seqParsed.error || seqParsed.participants.length === 0) return '';
+    // Apply interactive view state from share links (read from unified viewState).
+    // Sequences key both sections and groups by source line number; `cg` is the
+    // shared string[] field, so coerce its entries back to numbers.
+    const collapsedSections = viewState?.cs ? new Set(viewState.cs) : undefined;
+    const collapsedGroups = viewState?.cg
+      ? new Set(viewState.cg.map(Number).filter((n) => Number.isFinite(n)))
+      : undefined;
+    const seqActiveTagGroup = viewState?.tag ?? options?.tagGroup;
     renderSequenceDiagram(
       container,
       seqParsed,
@@ -8617,9 +8625,11 @@ export async function renderForExport(
       undefined,
       {
         exportWidth: EXPORT_WIDTH,
-        ...(options?.tagGroup !== undefined && {
-          activeTagGroup: options.tagGroup,
+        ...(seqActiveTagGroup !== undefined && {
+          activeTagGroup: seqActiveTagGroup,
         }),
+        ...(collapsedSections !== undefined && { collapsedSections }),
+        ...(collapsedGroups !== undefined && { collapsedGroups }),
       }
     );
   } else if (parsed.type === 'wordcloud') {

package/src/editor/keywords.ts

@@ -166,6 +166,7 @@ export const DIRECTIVE_KEYWORDS = new Set([
   'no-region-labels',
   'no-poi-labels',
   'no-colorize',
+  'no-cluster-pois',
   'poi',
   'route',
   // Data charts

package/src/map/layout.ts

@@ -1027,18 +1027,22 @@ export function layoutMap(
 
   // -- Colorize: content-inferred distinct political fills (§24B) --
   // Colorize is the DEFAULT dress for any map that is NOT colouring regions by
-  // data. The ONLY two things that turn it off: (1) a data dimension exists on a
+  // data. The things that turn it off: (1) a data dimension exists on a
   // region (any `value:` or tag group) — data owns the saturation, so the basemap
-  // recedes to the gray choropleth/categorical dress; or (2) the `no-colorize`
-  // opt-out. Everything else — bare `map`, POI/route-only maps, named regions
-  // without data — gets distinct political pastels (markers/routes draw on top).
-  // Data EXISTENCE (not which dimension is *active*) is the discriminator, so a
-  // tag map viewed with `active-tag none` still keeps its neutral data dress; and
-  // the live-preview `California` → `California value: 92` edit transitions
-  // colorized → choropleth cleanly.
+  // recedes to the gray choropleth/categorical dress; (2) any region carries a
+  // direct trailing color (`Japan red`) — that's explicit authoring intent, so
+  // auto-political-tinting would only fight the hand-picked colours; or (3) the
+  // `no-colorize` opt-out. Everything else — bare `map`, POI/route-only maps,
+  // named regions without data or direct colours — gets distinct political
+  // pastels (markers/routes draw on top). Data EXISTENCE (not which dimension is
+  // *active*) is the discriminator, so a tag map viewed with `active-tag none`
+  // still keeps its neutral data dress; and the live-preview `California` →
+  // `California value: 92` edit transitions colorized → choropleth cleanly.
+  const hasDirectColor = resolved.regions.some((r) => r.color !== undefined);
   const colorizeActive =
     resolved.directives.noColorize !== true &&
     !hasRamp &&
+    !hasDirectColor &&
     resolved.tagGroups.length === 0;
   // Hue per ISO over ONE UNIFIED graph spanning every drawn topology, so no two
   // bordering regions share a hue — INCLUDING across the international seam. The
@@ -1201,9 +1205,12 @@ export function layoutMap(
   // the foreground). A POI-less choropleth needs no reserve — the land fills to
   // the top and the title simply overlays it, so neighbour land (e.g. Canada)
   // isn't cut short by a band of empty water above it.
+  // `no-title` suppresses the banner entirely — drop it from layout so the title
+  // reserves no top band and the renderer's `if (layout.title)` skips it.
+  const shownTitle = resolved.directives.noTitle ? null : resolved.title;
   const TITLE_GAP = 16;
   let topPad = FIT_PAD;
-  if (resolved.title && resolved.pois.length > 0) {
+  if (shownTitle && resolved.pois.length > 0) {
     const bannerBottom =
       (resolved.subtitle ? TITLE_Y + TITLE_FONT_SIZE : TITLE_Y) +
       TITLE_FONT_SIZE / 2;
@@ -1217,7 +1224,7 @@ export function layoutMap(
   const legendBand = mapLegendBand(legend, {
     width,
     mode: opts.legendMode ?? 'preview',
-    hasTitle: Boolean(resolved.title),
+    hasTitle: Boolean(shownTitle),
     hasSubtitle: Boolean(resolved.subtitle),
   });
   if (legendBand > topPad) topPad = legendBand;
@@ -2932,7 +2939,7 @@ export function layoutMap(
     width,
     height,
     background: water,
-    title: resolved.title,
+    title: shownTitle,
     ...(resolved.subtitle !== undefined && { subtitle: resolved.subtitle }),
     ...(resolved.caption !== undefined && { caption: resolved.caption }),
     regions,

package/src/map/parser.ts

@@ -46,8 +46,10 @@ const HUB_RE = /^(->|~>)\s+(.+)$/;
 const LEG_ARROW_RE = /^(-[^>]*?->|->|~[^>]*?~>|~>|--)\s+(.+)$/;
 const AT_RE = /(^|[\s,])at\s*:/i; // the removed `at:` coord form (§24B.9)
 
-// Final 13 (§24B.2): 6 irreducible-intent directives + 7 `no-*` cosmetic
-// opt-outs. Every cosmetic is on by default; its `no-*` flag is the only switch.
+// The 14 map-specific directives (§24B.2): 6 irreducible-intent + 8 `no-*`
+// cosmetic opt-outs (every cosmetic on by default; its `no-*` flag is the only
+// switch). Plus `no-title` — the universal banner-suppression flag (§1), wired
+// in here so the map parser recognizes it rather than mis-parsing it as a region.
 const DIRECTIVE_SET: ReadonlySet<string> = new Set([
   'region-metric',
   'poi-metric',
@@ -55,6 +57,7 @@ const DIRECTIVE_SET: ReadonlySet<string> = new Set([
   'locale',
   'active-tag',
   'caption',
+  'no-title',
   'no-legend',
   'no-coastline',
   'no-relief',
@@ -62,6 +65,7 @@ const DIRECTIVE_SET: ReadonlySet<string> = new Set([
   'no-region-labels',
   'no-poi-labels',
   'no-colorize',
+  'no-cluster-pois',
 ]);
 
 /** True when the first non-blank/non-comment line declares `map`. */
@@ -313,6 +317,9 @@ export function parseMap(content: string): ParsedMap {
         break;
       // ── Cosmetic `no-*` opt-outs: bare flags, idempotent (mirror `no-legend`,
       //    no dup warning); each defaults the feature ON when absent. ──
+      case 'no-title':
+        d.noTitle = true;
+        break;
       case 'no-legend':
         d.noLegend = true;
         break;
@@ -334,6 +341,9 @@ export function parseMap(content: string): ParsedMap {
       case 'no-colorize':
         d.noColorize = true;
         break;
+      case 'no-cluster-pois':
+        d.noClusterPois = true;
+        break;
     }
   }
 

package/src/map/renderer.ts

@@ -694,11 +694,16 @@ export function renderMap(
   // toggles only their opacity. Drawn VISIBLE so export + the no-JS default show
   // the expanded fan. An invisible hit-area circle (interactive only) owns all
   // pointer interaction so hover/click drives the spiderfy controller robustly.
+  // `no-cluster-pois` (or any export) keeps the fan permanently expanded: draw
+  // the legs/hub/members visible but emit NO hit-area + NO badge, so there is
+  // nothing for the app's spiderfy controller to collapse — the map reads the
+  // same on screen as on paper.
+  const clusterUi = !exportDims && !resolved.directives.noClusterPois;
   const gSpider = svg.append('g').attr('class', 'dgmo-map-spider');
   for (const cl of layout.clusters) {
     // Pointer hit-area — bottom of the stack so member dots still take their own
     // clicks (line-jump); clicks on the empty centre fall through to here.
-    if (!exportDims) {
+    if (clusterUi) {
       gSpider
         .append('circle')
         .attr('cx', cl.cx)
@@ -863,7 +868,7 @@ export function renderMap(
   // export keeps the expanded fan (every label visible), so no badge there. A
   // neutral dot ringed with the bare member count, emitted hidden; the app shows
   // it at rest and hides it (revealing the spider) on click. ──
-  if (!exportDims && layout.clusters.length) {
+  if (clusterUi && layout.clusters.length) {
     const gBadge = svg.append('g').attr('class', 'dgmo-map-cluster-badges');
     for (const cl of layout.clusters) {
       // Decorative: the hit-area (drawn under the dots) owns hover + click; the
@@ -889,6 +894,24 @@ export function renderMap(
         .attr('fill', 'none')
         .attr('stroke', palette.textMuted)
         .attr('stroke-width', 1);
+      // Directional colour beads: one small dot threaded on the outer ring per
+      // member, placed at the ANGLE of that member's spider leg (centroid → its
+      // expanded position) and filled with the member's own marker colour. So the
+      // collapsed badge previews WHAT is stacked here and roughly WHERE each item
+      // will fan out, before the spider opens. A bg-coloured halo keeps adjacent
+      // beads + the ring line legible.
+      const beadR = R + 2.5;
+      for (const leg of cl.legs) {
+        const a = Math.atan2(leg.y2 - cl.cy, leg.x2 - cl.cx);
+        g.append('circle')
+          .attr('class', 'dgmo-map-cluster-bead')
+          .attr('cx', cl.cx + beadR * Math.cos(a))
+          .attr('cy', cl.cy + beadR * Math.sin(a))
+          .attr('r', 1.8)
+          .attr('fill', leg.color)
+          .attr('stroke', palette.bg)
+          .attr('stroke-width', 0.5);
+      }
       // Bare count (RQ1).
       emitText(
         g,

package/src/map/types.ts

@@ -33,6 +33,9 @@ export interface MapDirectives {
   locale?: string;
   activeTag?: string;
   caption?: string;
+  /** `no-title` — suppress the title banner (the subtitle/caption, if any, still
+   *  render). Mirrors the `no-title` directive across the other chart types. */
+  noTitle?: boolean;
   /** `no-legend` — suppress the legend (default-on). */
   noLegend?: boolean;
   /** `no-coastline` — suppress the faint nautical-chart water-lines along
@@ -52,6 +55,12 @@ export interface MapDirectives {
    *  are referenced (regions are auto-coloured by default; §24B colorize). A
    *  no-op under data — the basemap is already gray there. */
   noColorize?: boolean;
+  /** `no-cluster-pois` — never collapse coincident POI markers into a count badge
+   *  (clustering/spiderfy is default-on in the interactive preview). With this set
+   *  the markers always render fanned out with their legs — the same as a static
+   *  export — so a dense map reads the same on screen as on paper. No-op for
+   *  export (already always expanded). */
+  noClusterPois?: boolean;
 }
 
 /** A region-fill: a subdivision name with an optional score and/or tag values