@opendata-ai/openchart-engine 8.1.1 → 8.2.1

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _opendata_ai_openchart_core from '@opendata-ai/openchart-core';
-import { AnimationEase, LegendLayout, ResolvedChrome, TooltipContent, A11yMetadata, ResolvedTheme, LegendEntry, CompileOptions, ChartLayout, LayerSpec, CompileTableOptions, TableLayout, ResolvedAnimationPhase, AnimationSpec, ResolvedAnimation, Point, DataRow, BarListEncoding, ThemeConfig, DarkMode, GeoMapGeo, GeoMapEncoding, LegendConfig, GeoMapPointsLayer, TileMapEncoding, TileMapPalette, MarkType, MarkDef, Encoding, ChromeText, Annotation, LabelConfig, Display, ColumnConfig, GraphSpec, GraphEncoding, GraphLayoutConfig, NodeOverride, GraphAnimationSpec, GraphInteractionConfig, SankeyEncoding, SankeyNodeAlign, SankeyLinkColor, ScaleType, EncodingChannel, FieldFormatContext, Rect, LayoutStrategy, VizSpec, Mark, BinTransform, CalculateTransform, ConditionalValueDef, FilterPredicate, TimeUnitTransform, Transform } from '@opendata-ai/openchart-core';
+import { AnimationEase, LegendLayout, ResolvedChrome, TooltipContent, A11yMetadata, ResolvedTheme, LegendEntry, CompileOptions, ChartLayout, LayerSpec, CompileTableOptions, TableLayout, ResolvedAnimationPhase, AnimationSpec, ResolvedAnimation, Point, DataRow, BarListEncoding, ThemeConfig, DarkMode, GeoMapGeo, GeoMapEncoding, LegendConfig, GeoMapPointsLayer, SankeyEncoding, SankeyNodeAlign, SankeyLinkColor, TileMapEncoding, TileMapPalette, MarkType, MarkDef, Encoding, ChromeText, Annotation, LabelConfig, Display, ColumnConfig, GraphSpec, GraphEncoding, GraphLayoutConfig, NodeOverride, GraphAnimationSpec, GraphInteractionConfig, ScaleType, EncodingChannel, FieldFormatContext, Rect, LayoutStrategy, VizSpec, Mark, BinTransform, CalculateTransform, ConditionalValueDef, FilterPredicate, TimeUnitTransform, Transform } from '@opendata-ai/openchart-core';
 export { BarListLayout, BarListSpec, ChartLayout, ChartSpec, CompileOptions, CompileTableOptions, GeoMapLayout, GeoMapSpec, GraphLayout, GraphSpec, LayerSpec, SankeyLayout, SankeySpec, TableLayout, TableSpec, TileMapLayout, TileMapSpec, VizSpec } from '@opendata-ai/openchart-core';
 import { ScaleLinear, ScaleTime, ScaleLogarithmic, ScalePower, ScaleSymLog, ScaleBand, ScalePoint, ScaleOrdinal, ScaleQuantile, ScaleQuantize, ScaleThreshold } from 'd3-scale';
 
@@ -434,6 +434,36 @@ interface NormalizedGeoMapSpec {
     points?: GeoMapPointsLayer;
 }
 
+/**
+ * Internal normalized sankey spec type used by the compilation pipeline.
+ *
+ * This mirrors NormalizedChartSpec/NormalizedGraphSpec: all optional fields
+ * have been filled with sensible defaults. It's an engine implementation
+ * detail, not a public contract.
+ */
+
+/** A SankeySpec with all optional fields filled with defaults. */
+interface NormalizedSankeySpec {
+    type: 'sankey';
+    data: Record<string, unknown>[];
+    encoding: SankeyEncoding;
+    nodeWidth: number;
+    nodePadding: number;
+    nodeAlign: SankeyNodeAlign;
+    iterations: number;
+    linkStyle: SankeyLinkColor;
+    nodeLabelAlign: 'auto' | 'left' | 'right';
+    nodeSort?: string[];
+    chrome: NormalizedChrome;
+    legend?: LegendConfig;
+    theme: ThemeConfig;
+    darkMode: DarkMode;
+    watermark: boolean;
+    animation?: AnimationSpec;
+    valueFormat?: string;
+    linkOpacity?: number;
+}
+
 /**
  * Internal normalized tilemap spec type used by the compilation pipeline.
  *
@@ -635,36 +665,6 @@ interface CompileResult {
     warnings: string[];
 }
 
-/**
- * Internal normalized sankey spec type used by the compilation pipeline.
- *
- * This mirrors NormalizedChartSpec/NormalizedGraphSpec: all optional fields
- * have been filled with sensible defaults. It's an engine implementation
- * detail, not a public contract.
- */
-
-/** A SankeySpec with all optional fields filled with defaults. */
-interface NormalizedSankeySpec {
-    type: 'sankey';
-    data: Record<string, unknown>[];
-    encoding: SankeyEncoding;
-    nodeWidth: number;
-    nodePadding: number;
-    nodeAlign: SankeyNodeAlign;
-    iterations: number;
-    linkStyle: SankeyLinkColor;
-    nodeLabelAlign: 'auto' | 'left' | 'right';
-    nodeSort?: string[];
-    chrome: NormalizedChrome;
-    legend?: LegendConfig;
-    theme: ThemeConfig;
-    darkMode: DarkMode;
-    watermark: boolean;
-    animation?: AnimationSpec;
-    valueFormat?: string;
-    linkOpacity?: number;
-}
-
 /** Continuous D3 scales (linear, time, log, pow, sqrt, symlog) that support .ticks() and .nice(). */
 type D3ContinuousScale = ScaleLinear<number, number> | ScaleTime<number, number> | ScaleLogarithmic<number, number> | ScalePower<number, number> | ScaleSymLog<number, number>;
 /** Discretizing D3 scales (quantile, quantize, threshold). */
@@ -701,6 +701,27 @@ interface ResolvedScales {
     defaultColor?: string | _opendata_ai_openchart_core.GradientDef;
 }
 
+/**
+ * Pie / donut chart mark computation.
+ *
+ * Uses d3.pie() for angle calculation and d3.arc() for SVG path
+ * generation. Supports sorting by value (largest first), small-slice
+ * grouping into "Other", and donut variant with inner radius.
+ */
+
+/**
+ * Rebuild the SVG path for an arc from its resolved geometry. Used by the
+ * vanilla transition driver to interpolate arc marks per frame; must stay in
+ * lockstep with the `arcGenerator` below or the tween's final frame won't
+ * match the rendered mark.
+ */
+declare function buildArcPath(geom: {
+    innerRadius: number;
+    outerRadius: number;
+    startAngle: number;
+    endAngle: number;
+}): string;
+
 /** Default font size for annotation labels. */
 declare const DEFAULT_ANNOTATION_FONT_SIZE = 13;
 /** Default line height multiplier for annotation text. */
@@ -1084,4 +1105,4 @@ declare function runTimeUnit(data: DataRow[], transform: TimeUnitTransform): Dat
  */
 declare function runTransforms(data: DataRow[], transforms: Transform[]): DataRow[];
 
-export { ARROWHEAD_LENGTH, AUTO_CANVAS_THRESHOLD, type AnnotationContext, type AnnotationMeasureTextFn, type ArrowheadPoints, BOLD_SPAN_FONT_WEIGHT, type ChartRenderer, type CompileResult, type CompiledGraphEdge, type CompiledGraphNode, DEFAULT_ANNOTATION_FONT_SIZE, DEFAULT_LINE_HEIGHT, ENTER_DEFAULTS, EXIT_DEFAULTS, type GraphCompilation, type NormalizedBarListSpec, type NormalizedChartSpec, type NormalizedChrome, type NormalizedGeoMapSpec, type NormalizedGraphSpec, type NormalizedSankeySpec, type NormalizedSpec, type NormalizedTableSpec, type NormalizedTileMapSpec, type ObstacleKind, type PlacementObstacle, type RichSpan, type SimulationConfig, UPDATE_DEFAULTS, type ValidationError, type ValidationErrorCode, type ValidationResult, buildAreaPath, buildEdgeTooltip, buildLinePath, clampStaggerDelay, clearRenderers, compile, compileBarList, compileChart, compileGeoMap, compileGraph, compileLayer, compileSankey, compileTable, compileTileMap, computeArrowheadPoints, dedupeKeys, evaluatePredicate, facetMinHeight, getChartRenderer, heuristicMeasure, isConditionalValueDef, legendGap, normalizeSpec, parseAnnotationSpans, registerChartRenderer, resolveAnimation, resolveConditionalValue, runBin, runCalculate, runFilter, runTimeUnit, runTransforms, serializeKeyValue, validateSpec };
+export { ARROWHEAD_LENGTH, AUTO_CANVAS_THRESHOLD, type AnnotationContext, type AnnotationMeasureTextFn, type ArrowheadPoints, BOLD_SPAN_FONT_WEIGHT, type ChartRenderer, type CompileResult, type CompiledGraphEdge, type CompiledGraphNode, DEFAULT_ANNOTATION_FONT_SIZE, DEFAULT_LINE_HEIGHT, ENTER_DEFAULTS, EXIT_DEFAULTS, type GraphCompilation, type NormalizedBarListSpec, type NormalizedChartSpec, type NormalizedChrome, type NormalizedGeoMapSpec, type NormalizedGraphSpec, type NormalizedSankeySpec, type NormalizedSpec, type NormalizedTableSpec, type NormalizedTileMapSpec, type ObstacleKind, type PlacementObstacle, type RichSpan, type SimulationConfig, UPDATE_DEFAULTS, type ValidationError, type ValidationErrorCode, type ValidationResult, buildArcPath, buildAreaPath, buildEdgeTooltip, buildLinePath, clampStaggerDelay, clearRenderers, compile, compileBarList, compileChart, compileGeoMap, compileGraph, compileLayer, compileSankey, compileTable, compileTileMap, computeArrowheadPoints, dedupeKeys, evaluatePredicate, facetMinHeight, getChartRenderer, heuristicMeasure, isConditionalValueDef, legendGap, normalizeSpec, parseAnnotationSpans, registerChartRenderer, resolveAnimation, resolveConditionalValue, runBin, runCalculate, runFilter, runTimeUnit, runTransforms, serializeKeyValue, validateSpec };

package/dist/index.js

@@ -8356,6 +8356,16 @@ var parliamentRenderer = (spec, scales, chartArea, strategy, theme) => {
 // src/charts/pie/compute.ts
 import { formatPercent as formatPercent2, isConditionalDef, isGradientDef as isGradientDef4 } from "@opendata-ai/openchart-core";
 var SMALL_SLICE_THRESHOLD = 0.03;
+var PIE_PAD_ANGLE = 0.01;
+function buildArcPath(geom) {
+  return arc_default()({
+    innerRadius: geom.innerRadius,
+    outerRadius: geom.outerRadius,
+    startAngle: geom.startAngle,
+    endAngle: geom.endAngle,
+    padAngle: PIE_PAD_ANGLE
+  }) ?? "";
+}
 var DEFAULT_PALETTE = [
   "#1b7fa3",
   "#c44e52",
@@ -8454,7 +8464,7 @@ function computePieMarks(spec, scales, chartArea, _strategy, isDonut = false) {
   if (slices.length === 0) return [];
   slices.sort((a, b) => b.value - a.value);
   slices = groupSmallSlices(slices, SMALL_SLICE_THRESHOLD);
-  const pieGenerator = pie_default().value((d) => d.value).sort(null).padAngle(0.01).startAngle(startAngle).endAngle(endAngle);
+  const pieGenerator = pie_default().value((d) => d.value).sort(null).padAngle(PIE_PAD_ANGLE).startAngle(startAngle).endAngle(endAngle);
   const arcs = pieGenerator(slices);
   const sweepBounds = computeSweepBounds(startAngle, endAngle);
   const sweepWidth = sweepBounds.maxX - sweepBounds.minX;
@@ -12640,6 +12650,15 @@ function compileBarList(spec, options) {
   const maxLabelPct = isNarrow ? 0.35 : 0.4;
   const labelWidth = Math.max(50, Math.min(maxCombinedWidth, fullArea.width * maxLabelPct));
   const barAreaWidth = fullArea.width - labelWidth - labelBarGap - barValueGap - valueWidth;
+  const ellipsize = (text, fullWidth, budget, fontSize, fontWeight) => {
+    const seedLen = Math.min(text.length, Math.ceil(text.length * budget / fullWidth) + 2);
+    let t = text.slice(0, seedLen);
+    while (t.length > 1 && measureText(`${t.trimEnd()}\u2026`, fontSize, fontWeight).width > budget) {
+      t = t.slice(0, -1);
+    }
+    const out = `${t.trimEnd()}\u2026`;
+    return { text: out, width: measureText(out, fontSize, fontWeight).width };
+  };
   const labelColor = theme.colors.text;
   const subtitleColor = options.darkMode ? "rgba(255,255,255,0.5)" : "rgba(0,0,0,0.45)";
   const valueColor = options.darkMode ? "rgba(255,255,255,0.6)" : "rgba(0,0,0,0.55)";
@@ -12654,6 +12673,17 @@ function compileBarList(spec, options) {
     const rowY = fullArea.y + i * rowHeight;
     const centerY = rowY + rowContentHeight / 2;
     const labelX = fullArea.x;
+    let displayLabel = labelText;
+    let displayLabelW = perRowLabelWidths.get(i) ?? 0;
+    if (displayLabelW > labelWidth) {
+      ({ text: displayLabel, width: displayLabelW } = ellipsize(
+        labelText,
+        displayLabelW,
+        labelWidth,
+        LABEL_FONT_SIZE7,
+        LABEL_FONT_WEIGHT7
+      ));
+    }
     const labelStyle = {
       fontFamily: theme.fonts.family,
       fontSize: LABEL_FONT_SIZE7,
@@ -12663,21 +12693,39 @@ function compileBarList(spec, options) {
     };
     let subtitle;
     if (subtitleField && row[subtitleField] != null) {
-      const subtitleText = String(row[subtitleField]);
-      const subtitleX = labelX + (perRowLabelWidths.get(i) ?? 0) + 6;
-      subtitle = {
-        text: subtitleText,
-        x: subtitleX,
-        y: centerY,
-        style: {
-          fontFamily: theme.fonts.family,
-          fontSize: SUBTITLE_FONT_SIZE,
-          fontWeight: SUBTITLE_FONT_WEIGHT2,
-          fill: subtitleColor,
-          lineHeight: 1.4
-        },
-        visible: true
-      };
+      let subtitleText = String(row[subtitleField]);
+      const subtitleBudget = labelWidth - displayLabelW - 6;
+      const subtitleW = measureText(subtitleText, SUBTITLE_FONT_SIZE, SUBTITLE_FONT_WEIGHT2).width;
+      if (subtitleW > subtitleBudget) {
+        const minW = measureText("W\u2026", SUBTITLE_FONT_SIZE, SUBTITLE_FONT_WEIGHT2).width;
+        if (subtitleBudget < minW) {
+          subtitleText = "";
+        } else {
+          ({ text: subtitleText } = ellipsize(
+            subtitleText,
+            subtitleW,
+            subtitleBudget,
+            SUBTITLE_FONT_SIZE,
+            SUBTITLE_FONT_WEIGHT2
+          ));
+        }
+      }
+      if (subtitleText) {
+        const subtitleX = labelX + displayLabelW + 6;
+        subtitle = {
+          text: subtitleText,
+          x: subtitleX,
+          y: centerY,
+          style: {
+            fontFamily: theme.fonts.family,
+            fontSize: SUBTITLE_FONT_SIZE,
+            fontWeight: SUBTITLE_FONT_WEIGHT2,
+            fill: subtitleColor,
+            lineHeight: 1.4
+          },
+          visible: true
+        };
+      }
     }
     const trackX = fullArea.x + labelWidth + labelBarGap;
     const trackY = centerY - barHeight / 2;
@@ -12698,7 +12746,7 @@ function compileBarList(spec, options) {
       y: rowY,
       height: rowHeight,
       label: {
-        text: labelText,
+        text: displayLabel,
         x: labelX,
         y: centerY,
         style: labelStyle,
@@ -24324,6 +24372,7 @@ export {
   ENTER_DEFAULTS,
   EXIT_DEFAULTS,
   UPDATE_DEFAULTS,
+  buildArcPath,
   buildAreaPath,
   buildEdgeTooltip,
   buildLinePath,