@opendata-ai/openchart-engine 6.13.0 → 6.15.0

package/dist/index.js

@@ -968,11 +968,17 @@ function computeSimpleBars(data, valueField, categoryField, xScale, yScale, band
 
 // src/charts/bar/labels.ts
 import {
+  abbreviateNumber as abbreviateNumber2,
   buildD3Formatter,
   estimateTextWidth as estimateTextWidth2,
+  formatNumber as formatNumber2,
   getRepresentativeColor,
   resolveCollisions
 } from "@opendata-ai/openchart-core";
+function formatBarValue2(value2) {
+  if (Math.abs(value2) >= 1e3) return abbreviateNumber2(value2);
+  return formatNumber2(value2);
+}
 var SUFFIX_MULTIPLIERS = {
   K: 1e3,
   M: 1e6,
@@ -998,21 +1004,30 @@ var LABEL_FONT_SIZE = 11;
 var LABEL_FONT_WEIGHT = 600;
 var LABEL_PADDING = 6;
 var MIN_WIDTH_FOR_INSIDE_LABEL = 40;
-function computeBarLabels(marks, _chartArea, density = "auto", labelFormat, labelPrefix) {
+function computeBarLabels(marks, _chartArea, density = "auto", labelFormat, labelPrefix, valueField) {
   if (density === "none") return [];
   const targetMarks = density === "endpoints" && marks.length > 1 ? [marks[0], marks[marks.length - 1]] : marks;
   const candidates = [];
   const fitsInSegment = [];
   const formatter = buildD3Formatter(labelFormat);
   for (const mark of targetMarks) {
-    const ariaLabel = mark.aria.label;
-    const lastColon = ariaLabel.lastIndexOf(":");
-    const rawValue = lastColon >= 0 ? ariaLabel.slice(lastColon + 1).trim() : "";
-    if (!rawValue) continue;
-    let valuePart = rawValue;
-    if (formatter) {
-      const num = parseDisplayNumber(rawValue);
-      if (!Number.isNaN(num)) valuePart = formatter(num);
+    let valuePart;
+    const rawNum = valueField != null ? Number(mark.data[valueField]) : NaN;
+    if (formatter && Number.isFinite(rawNum)) {
+      valuePart = formatter(rawNum);
+    } else if (Number.isFinite(rawNum)) {
+      valuePart = formatBarValue2(rawNum);
+    } else {
+      const ariaLabel = mark.aria.label;
+      const lastColon = ariaLabel.lastIndexOf(":");
+      const rawValue = lastColon >= 0 ? ariaLabel.slice(lastColon + 1).trim() : "";
+      if (!rawValue) continue;
+      if (formatter) {
+        const num = parseDisplayNumber(rawValue);
+        valuePart = !Number.isNaN(num) ? formatter(num) : rawValue;
+      } else {
+        valuePart = rawValue;
+      }
     }
     if (labelPrefix) valuePart = labelPrefix + valuePart;
     const textWidth = estimateTextWidth2(valuePart, LABEL_FONT_SIZE, LABEL_FONT_WEIGHT);
@@ -1097,12 +1112,14 @@ function computeBarLabels(marks, _chartArea, density = "auto", labelFormat, labe
 // src/charts/bar/index.ts
 var barRenderer = (spec, scales, chartArea, strategy, _theme) => {
   const marks = computeBarMarks(spec, scales, chartArea, strategy);
+  const valueField = spec.encoding?.x && "field" in spec.encoding.x ? spec.encoding.x.field : void 0;
   const labels = computeBarLabels(
     marks,
     chartArea,
     spec.labels.density,
     spec.labels.format,
-    spec.labels.prefix
+    spec.labels.prefix,
+    valueField
   );
   for (let i = 0; i < marks.length && i < labels.length; i++) {
     marks[i].label = labels[i];
@@ -1111,11 +1128,11 @@ var barRenderer = (spec, scales, chartArea, strategy, _theme) => {
 };
 
 // src/charts/column/compute.ts
-import { abbreviateNumber as abbreviateNumber2, formatNumber as formatNumber2, isGradientDef as isGradientDef2 } from "@opendata-ai/openchart-core";
+import { abbreviateNumber as abbreviateNumber3, formatNumber as formatNumber3, isGradientDef as isGradientDef2 } from "@opendata-ai/openchart-core";
 var MIN_COLUMN_HEIGHT = 1;
 function formatColumnValue(value2) {
-  if (Math.abs(value2) >= 1e3) return abbreviateNumber2(value2);
-  return formatNumber2(value2);
+  if (Math.abs(value2) >= 1e3) return abbreviateNumber3(value2);
+  return formatNumber3(value2);
 }
 function computeColumnMarks(spec, scales, _chartArea, _strategy) {
   const encoding = spec.encoding;
@@ -1359,28 +1376,43 @@ function computeStackedColumns(data, categoryField, valueField, colorField, xSca
 
 // src/charts/column/labels.ts
 import {
+  abbreviateNumber as abbreviateNumber4,
   buildD3Formatter as buildD3Formatter2,
   estimateTextWidth as estimateTextWidth3,
+  formatNumber as formatNumber4,
   getRepresentativeColor as getRepresentativeColor2,
   resolveCollisions as resolveCollisions2
 } from "@opendata-ai/openchart-core";
+function formatColumnValue2(value2) {
+  if (Math.abs(value2) >= 1e3) return abbreviateNumber4(value2);
+  return formatNumber4(value2);
+}
 var LABEL_FONT_SIZE2 = 10;
 var LABEL_FONT_WEIGHT2 = 600;
 var LABEL_OFFSET_Y = 6;
-function computeColumnLabels(marks, _chartArea, density = "auto", labelFormat, labelPrefix) {
+function computeColumnLabels(marks, _chartArea, density = "auto", labelFormat, labelPrefix, valueField) {
   if (density === "none") return [];
   const targetMarks = density === "endpoints" && marks.length > 1 ? [marks[0], marks[marks.length - 1]] : marks;
   const formatter = buildD3Formatter2(labelFormat);
   const candidates = [];
   for (const mark of targetMarks) {
-    const ariaLabel = mark.aria.label;
-    const lastColon = ariaLabel.lastIndexOf(":");
-    const rawValue = lastColon >= 0 ? ariaLabel.slice(lastColon + 1).trim() : "";
-    if (!rawValue) continue;
-    let valuePart = rawValue;
-    if (formatter) {
-      const num = Number(rawValue.replace(/[^0-9.-]/g, ""));
-      if (!Number.isNaN(num)) valuePart = formatter(num);
+    let valuePart;
+    const rawNum = valueField != null ? Number(mark.data[valueField]) : NaN;
+    if (formatter && Number.isFinite(rawNum)) {
+      valuePart = formatter(rawNum);
+    } else if (Number.isFinite(rawNum)) {
+      valuePart = formatColumnValue2(rawNum);
+    } else {
+      const ariaLabel = mark.aria.label;
+      const lastColon = ariaLabel.lastIndexOf(":");
+      const rawValue = lastColon >= 0 ? ariaLabel.slice(lastColon + 1).trim() : "";
+      if (!rawValue) continue;
+      if (formatter) {
+        const num = Number(rawValue.replace(/[^0-9.-]/g, ""));
+        valuePart = !Number.isNaN(num) ? formatter(num) : rawValue;
+      } else {
+        valuePart = rawValue;
+      }
     }
     if (labelPrefix) valuePart = labelPrefix + valuePart;
     const numericValue = parseFloat(valuePart);
@@ -1423,12 +1455,14 @@ function computeColumnLabels(marks, _chartArea, density = "auto", labelFormat, l
 // src/charts/column/index.ts
 var columnRenderer = (spec, scales, chartArea, strategy, _theme) => {
   const marks = computeColumnMarks(spec, scales, chartArea, strategy);
+  const valueField = spec.encoding?.y && "field" in spec.encoding.y ? spec.encoding.y.field : void 0;
   const labels = computeColumnLabels(
     marks,
     chartArea,
     spec.labels.density,
     spec.labels.format,
-    spec.labels.prefix
+    spec.labels.prefix,
+    valueField
   );
   for (let i = 0; i < marks.length && i < labels.length; i++) {
     marks[i].label = labels[i];
@@ -1586,22 +1620,42 @@ function computeLollipopMarks(data, valueField, categoryField, xScale, yScale, b
 
 // src/charts/dot/labels.ts
 import {
+  abbreviateNumber as abbreviateNumber5,
+  buildD3Formatter as buildD3Formatter3,
   estimateTextWidth as estimateTextWidth4,
+  formatNumber as formatNumber5,
   getRepresentativeColor as getRepresentativeColor3,
   resolveCollisions as resolveCollisions3
 } from "@opendata-ai/openchart-core";
+function formatDotValue(value2) {
+  if (Math.abs(value2) >= 1e3) return abbreviateNumber5(value2);
+  return formatNumber5(value2);
+}
 var LABEL_FONT_SIZE3 = 11;
 var LABEL_FONT_WEIGHT3 = 600;
 var LABEL_OFFSET_X = 10;
-function computeDotLabels(marks, _chartArea, density = "auto", labelPrefix) {
+function computeDotLabels(marks, _chartArea, density = "auto", labelPrefix, labelFormat, valueField) {
   if (density === "none") return [];
   const targetMarks = density === "endpoints" && marks.length > 1 ? [marks[0], marks[marks.length - 1]] : marks;
+  const formatter = buildD3Formatter3(labelFormat);
   const candidates = [];
   for (const mark of targetMarks) {
-    const ariaLabel = mark.aria.label;
-    const lastColon = ariaLabel.lastIndexOf(":");
-    let valuePart = lastColon >= 0 ? ariaLabel.slice(lastColon + 1).trim() : "";
-    if (!valuePart) continue;
+    let valuePart;
+    const rawNum = valueField != null ? Number(mark.data[valueField]) : NaN;
+    if (formatter && Number.isFinite(rawNum)) {
+      valuePart = formatter(rawNum);
+    } else if (Number.isFinite(rawNum)) {
+      valuePart = formatDotValue(rawNum);
+    } else {
+      const ariaLabel = mark.aria.label;
+      const lastColon = ariaLabel.lastIndexOf(":");
+      valuePart = lastColon >= 0 ? ariaLabel.slice(lastColon + 1).trim() : "";
+      if (!valuePart) continue;
+      if (formatter) {
+        const num = Number(valuePart.replace(/[^0-9.-]/g, ""));
+        if (!Number.isNaN(num)) valuePart = formatter(num);
+      }
+    }
     if (labelPrefix) valuePart = labelPrefix + valuePart;
     const textWidth = estimateTextWidth4(valuePart, LABEL_FONT_SIZE3, LABEL_FONT_WEIGHT3);
     const textHeight = LABEL_FONT_SIZE3 * 1.2;
@@ -1640,7 +1694,15 @@ function computeDotLabels(marks, _chartArea, density = "auto", labelPrefix) {
 var dotRenderer = (spec, scales, chartArea, strategy, _theme) => {
   const marks = computeDotMarks(spec, scales, chartArea, strategy);
   const pointMarks = marks.filter((m) => m.type === "point");
-  const labels = computeDotLabels(pointMarks, chartArea, spec.labels.density, spec.labels.prefix);
+  const valueField = spec.encoding?.x && "field" in spec.encoding.x ? spec.encoding.x.field : void 0;
+  const labels = computeDotLabels(
+    pointMarks,
+    chartArea,
+    spec.labels.density,
+    spec.labels.prefix,
+    spec.labels.format,
+    valueField
+  );
   let labelIdx = 0;
   for (const mark of marks) {
     if (mark.type === "point" && labelIdx < labels.length) {
@@ -1651,6 +1713,9 @@ var dotRenderer = (spec, scales, chartArea, strategy, _theme) => {
   return marks;
 };
 
+// src/charts/line/index.ts
+import { getRepresentativeColor as getRepresentativeColor6 } from "@opendata-ai/openchart-core";
+
 // src/charts/line/area.ts
 import { getRepresentativeColor as getRepresentativeColor4 } from "@opendata-ai/openchart-core";
 
@@ -2597,7 +2662,7 @@ function computeSingleArea(spec, scales, _chartArea) {
   const marks = [];
   for (const [seriesKey, rows] of groups) {
     const color2 = getColor(scales, seriesKey);
-    const sortedRows = sortByField(rows, xChannel.field);
+    const sortedRows = xChannel.type === "nominal" || xChannel.type === "ordinal" ? rows : sortByField(rows, xChannel.field);
     const validPoints = [];
     for (const row of sortedRows) {
       const xVal = scaleValue(scales.x.scale, scales.x.type, row[xChannel.field]);
@@ -2646,7 +2711,7 @@ function computeStackedArea(spec, scales, chartArea) {
   if (!xChannel || !yChannel || !scales.x || !scales.y || !colorField) {
     return computeSingleArea(spec, scales, chartArea);
   }
-  const sortedData = sortByField(spec.data, xChannel.field);
+  const sortedData = xChannel.type === "nominal" || xChannel.type === "ordinal" ? spec.data : sortByField(spec.data, xChannel.field);
   const seriesKeys = /* @__PURE__ */ new Set();
   const xValueSet = /* @__PURE__ */ new Set();
   const rowsByXSeries = /* @__PURE__ */ new Map();
@@ -2763,7 +2828,7 @@ function computeLineMarks(spec, scales, _chartArea, _strategy) {
   for (const [seriesKey, rows] of groups) {
     const color2 = isSequentialColor ? getSequentialColor(scales, _getMidValue(rows, sequentialColorField)) : getColor(scales, seriesKey);
     const strokeColor = getRepresentativeColor5(color2);
-    const sortedRows = sortByField(rows, xChannel.field);
+    const sortedRows = xChannel.type === "nominal" || xChannel.type === "ordinal" ? rows : sortByField(rows, xChannel.field);
     const pointsWithData = [];
     const segments = [];
     let currentSegment = [];
@@ -2951,9 +3016,24 @@ var lineRenderer = (spec, scales, chartArea, strategy, _theme) => {
 };
 var areaRenderer = (spec, scales, chartArea, strategy, _theme) => {
   const areas = computeAreaMarks(spec, scales, chartArea);
-  const lines = computeLineMarks(spec, scales, chartArea, strategy);
+  const encoding = spec.encoding;
+  const hasColor = !!(encoding.color && "field" in encoding.color);
+  const lines = hasColor ? linesFromAreas(areas) : computeLineMarks(spec, scales, chartArea, strategy);
   return [...areas, ...lines];
 };
+function linesFromAreas(areas) {
+  return areas.map((a) => ({
+    type: "line",
+    points: a.topPoints,
+    path: a.topPath,
+    stroke: getRepresentativeColor6(a.fill),
+    strokeWidth: a.strokeWidth ?? 1,
+    seriesKey: a.seriesKey,
+    data: a.data,
+    dataPoints: a.dataPoints,
+    aria: { label: `${a.seriesKey ?? "Series"}: line with ${a.topPoints.length} data points` }
+  }));
+}
 
 // src/charts/pie/compute.ts
 import { isConditionalDef, isGradientDef as isGradientDef3 } from "@opendata-ai/openchart-core";
@@ -3329,7 +3409,7 @@ function clearRenderers() {
 }
 
 // src/charts/rule/index.ts
-import { getRepresentativeColor as getRepresentativeColor6 } from "@opendata-ai/openchart-core";
+import { getRepresentativeColor as getRepresentativeColor7 } from "@opendata-ai/openchart-core";
 function computeRuleMarks(spec, scales, chartArea) {
   const encoding = spec.encoding;
   const xChannel = encoding.x;
@@ -3372,7 +3452,7 @@ function computeRuleMarks(spec, scales, chartArea) {
       const y2Val = scaleValue(scales.y.scale, scales.y.type, row[y2Channel.field]);
       if (y2Val != null) y2 = y2Val;
     }
-    const color2 = getRepresentativeColor6(
+    const color2 = getRepresentativeColor7(
       colorField ? getColor(scales, String(row[colorField] ?? "__default__")) : getColor(scales, "__default__")
     );
     const strokeDashEncoding = encoding.strokeDash && "field" in encoding.strokeDash ? encoding.strokeDash : void 0;
@@ -6181,7 +6261,7 @@ var scatterRenderer = (spec, scales, chartArea, strategy, _theme) => {
 };
 
 // src/charts/text/index.ts
-import { getRepresentativeColor as getRepresentativeColor7 } from "@opendata-ai/openchart-core";
+import { getRepresentativeColor as getRepresentativeColor8 } from "@opendata-ai/openchart-core";
 function computeTextMarks(spec, scales) {
   const encoding = spec.encoding;
   const xChannel = encoding.x;
@@ -6207,7 +6287,7 @@ function computeTextMarks(spec, scales) {
     }
     const text = String(row[textChannel.field] ?? "");
     if (!text) continue;
-    const color2 = getRepresentativeColor7(
+    const color2 = getRepresentativeColor8(
       colorField ? getColor(scales, String(row[colorField] ?? "__default__")) : getColor(scales, "__default__")
     );
     const fontSize = sizeEncoding ? Math.max(8, Math.min(48, Number(row[sizeEncoding.field]) || 12)) : 12;
@@ -6234,7 +6314,7 @@ var textRenderer = (spec, scales, _chartArea, _strategy, _theme) => {
 };
 
 // src/charts/tick/index.ts
-import { getRepresentativeColor as getRepresentativeColor8 } from "@opendata-ai/openchart-core";
+import { getRepresentativeColor as getRepresentativeColor9 } from "@opendata-ai/openchart-core";
 var DEFAULT_TICK_LENGTH = 18;
 function computeTickMarks(spec, scales, _chartArea) {
   const encoding = spec.encoding;
@@ -6250,7 +6330,7 @@ function computeTickMarks(spec, scales, _chartArea) {
     const xVal = scaleValue(scales.x.scale, scales.x.type, row[xChannel.field]);
     const yVal = scaleValue(scales.y.scale, scales.y.type, row[yChannel.field]);
     if (xVal == null || yVal == null) continue;
-    const color2 = getRepresentativeColor8(
+    const color2 = getRepresentativeColor9(
       colorField ? getColor(scales, String(row[colorField] ?? "__default__")) : getColor(scales, "__default__")
     );
     const aria = {
@@ -7681,16 +7761,16 @@ var DEFAULT_COLLISION_PADDING = 5;
 
 // src/layout/axes.ts
 import {
-  abbreviateNumber as abbreviateNumber3,
-  buildD3Formatter as buildD3Formatter3,
+  abbreviateNumber as abbreviateNumber6,
+  buildD3Formatter as buildD3Formatter4,
   buildTemporalFormatter,
   estimateTextWidth as estimateTextWidth7,
   formatDate,
-  formatNumber as formatNumber3
+  formatNumber as formatNumber6
 } from "@opendata-ai/openchart-core";
 var TICK_COUNTS = {
-  full: 8,
-  reduced: 5,
+  full: 10,
+  reduced: 7,
   minimal: 3
 };
 var HEIGHT_MINIMAL_THRESHOLD = 120;
@@ -7803,11 +7883,11 @@ function formatTickLabel(value2, resolvedScale) {
   if (NUMERIC_SCALE_TYPES.has(resolvedScale.type)) {
     const num = value2;
     if (formatStr) {
-      const fmt = buildD3Formatter3(formatStr);
+      const fmt = buildD3Formatter4(formatStr);
       if (fmt) return fmt(num);
     }
-    if (Math.abs(num) >= 1e3) return abbreviateNumber3(num);
-    return formatNumber3(num);
+    if (Math.abs(num) >= 1e3) return abbreviateNumber6(num);
+    return formatNumber6(num);
   }
   return String(value2);
 }
@@ -8218,7 +8298,7 @@ function uniqueStrings(values) {
   return result;
 }
 function applyCategoricalSort(values, sort) {
-  if (sort === null) return values;
+  if (!sort) return values;
   const sorted = [...values].sort((a, b) => a.localeCompare(b, void 0, { numeric: true }));
   if (sort === "descending") sorted.reverse();
   return sorted;
@@ -8236,7 +8316,7 @@ function buildTimeScale(channel, data, rangeStart, rangeEnd) {
   const values = parseDates(fieldValues(data, channel.field));
   const domain = channel.scale?.domain ? [new Date(channel.scale.domain[0]), new Date(channel.scale.domain[1])] : extent(values);
   const scale = time().domain(domain).range([rangeStart, rangeEnd]);
-  if (channel.scale?.nice !== false) {
+  if (!channel.scale?.domain && channel.scale?.nice === true) {
     scale.nice();
   }
   applyContinuousConfig(scale, channel);
@@ -8246,7 +8326,7 @@ function buildUtcScale(channel, data, rangeStart, rangeEnd) {
   const values = parseDates(fieldValues(data, channel.field));
   const domain = channel.scale?.domain ? [new Date(channel.scale.domain[0]), new Date(channel.scale.domain[1])] : extent(values);
   const scale = utcTime().domain(domain).range([rangeStart, rangeEnd]);
-  if (channel.scale?.nice !== false) {
+  if (!channel.scale?.domain && channel.scale?.nice === true) {
     scale.nice();
   }
   applyContinuousConfig(scale, channel);
@@ -8269,7 +8349,7 @@ function buildLinearScale(channel, data, rangeStart, rangeEnd) {
     }
   }
   const scale = linear2().domain([domainMin, domainMax]).range([rangeStart, rangeEnd]);
-  if (channel.scale?.nice !== false) {
+  if (!channel.scale?.domain && channel.scale?.nice !== false) {
     scale.nice();
   }
   applyContinuousConfig(scale, channel);
@@ -8283,7 +8363,7 @@ function buildLogScale(channel, data, rangeStart, rangeEnd) {
   if (channel.scale?.base !== void 0) {
     scale.base(channel.scale.base);
   }
-  if (channel.scale?.nice !== false) {
+  if (!channel.scale?.domain && channel.scale?.nice !== false) {
     scale.nice();
   }
   applyContinuousConfig(scale, channel);
@@ -8307,7 +8387,7 @@ function buildPowScale(channel, data, rangeStart, rangeEnd) {
   if (channel.scale?.exponent !== void 0) {
     scale.exponent(channel.scale.exponent);
   }
-  if (channel.scale?.nice !== false) {
+  if (!channel.scale?.domain && channel.scale?.nice !== false) {
     scale.nice();
   }
   applyContinuousConfig(scale, channel);
@@ -8328,7 +8408,7 @@ function buildSqrtScale(channel, data, rangeStart, rangeEnd) {
     }
   }
   const scale = sqrt2().domain([domainMin, domainMax]).range([rangeStart, rangeEnd]);
-  if (channel.scale?.nice !== false) {
+  if (!channel.scale?.domain && channel.scale?.nice !== false) {
     scale.nice();
   }
   applyContinuousConfig(scale, channel);
@@ -8352,7 +8432,7 @@ function buildSymlogScale(channel, data, rangeStart, rangeEnd) {
   if (channel.scale?.constant !== void 0) {
     scale.constant(channel.scale.constant);
   }
-  if (channel.scale?.nice !== false) {
+  if (!channel.scale?.domain && channel.scale?.nice !== false) {
     scale.nice();
   }
   applyContinuousConfig(scale, channel);
@@ -8738,7 +8818,7 @@ function computeLegend(spec, strategy, theme, chartArea, watermark = true) {
       1,
       Math.floor((maxLegendHeight - LEGEND_PADDING * 2) / (entryHeight + 4))
     );
-    const maxEntries = spec.legend?.symbolLimit != null ? Math.min(Math.max(1, spec.legend.symbolLimit), maxFromSpace) : maxFromSpace;
+    const maxEntries = spec.legend?.symbolLimit != null ? Math.max(1, spec.legend.symbolLimit) : maxFromSpace;
     if (entries.length > maxEntries) {
       entries = truncateEntries(entries, maxEntries);
     }
@@ -8813,10 +8893,10 @@ function computeLegend(spec, strategy, theme, chartArea, watermark = true) {
 // src/sankey/compile-sankey.ts
 import {
   adaptTheme as adaptTheme2,
-  buildD3Formatter as buildD3Formatter4,
+  buildD3Formatter as buildD3Formatter5,
   computeChrome as computeChrome3,
   estimateTextWidth as estimateTextWidth10,
-  formatNumber as formatNumber4,
+  formatNumber as formatNumber7,
   resolveTheme as resolveTheme2
 } from "@opendata-ai/openchart-core";
 
@@ -9670,10 +9750,10 @@ function buildSankeyLegend(nodeColorMap, colorField, data, sourceField, targetFi
 }
 function formatFlowValue(value2, valueFormat) {
   if (valueFormat) {
-    const fmt = buildD3Formatter4(valueFormat);
+    const fmt = buildD3Formatter5(valueFormat);
     if (fmt) return fmt(value2);
   }
-  return formatNumber4(value2);
+  return formatNumber7(value2);
 }
 function buildTooltipDescriptors(nodes, links, valueFormat) {
   const descriptors = /* @__PURE__ */ new Map();
@@ -9850,7 +9930,7 @@ function computeCategoryColors(data, column, theme, darkMode) {
 }
 
 // src/tables/format-cells.ts
-import { buildD3Formatter as buildD3Formatter5, formatDate as formatDate2, formatNumber as formatNumber5 } from "@opendata-ai/openchart-core";
+import { buildD3Formatter as buildD3Formatter6, formatDate as formatDate2, formatNumber as formatNumber8 } from "@opendata-ai/openchart-core";
 function isNumericValue(value2) {
   if (typeof value2 === "number") return Number.isFinite(value2);
   return false;
@@ -9869,7 +9949,7 @@ function formatCell(value2, column) {
     };
   }
   if (column.format && isNumericValue(value2)) {
-    const formatter = buildD3Formatter5(column.format);
+    const formatter = buildD3Formatter6(column.format);
     if (formatter) {
       return {
         value: value2,
@@ -9881,7 +9961,7 @@ function formatCell(value2, column) {
   if (isNumericValue(value2)) {
     return {
       value: value2,
-      formattedValue: formatNumber5(value2),
+      formattedValue: formatNumber8(value2),
       style
     };
   }
@@ -9901,13 +9981,13 @@ function formatCell(value2, column) {
 function formatValueForSearch(value2, column) {
   if (value2 == null) return "";
   if (column.format && isNumericValue(value2)) {
-    const formatter = buildD3Formatter5(column.format);
+    const formatter = buildD3Formatter6(column.format);
     if (formatter) {
       return formatter(value2);
     }
   }
   if (isNumericValue(value2)) {
-    return formatNumber5(value2);
+    return formatNumber8(value2);
   }
   return String(value2);
 }
@@ -10382,8 +10462,8 @@ function compileTableLayout(spec, options, theme) {
 import {
   buildTemporalFormatter as buildTemporalFormatter2,
   formatDate as formatDate3,
-  formatNumber as formatNumber6,
-  getRepresentativeColor as getRepresentativeColor9
+  formatNumber as formatNumber9,
+  getRepresentativeColor as getRepresentativeColor10
 } from "@opendata-ai/openchart-core";
 function formatValue(value2, fieldType, format2) {
   if (value2 == null) return "";
@@ -10397,10 +10477,10 @@ function formatValue(value2, fieldType, format2) {
       try {
         return format(format2)(value2);
       } catch {
-        return formatNumber6(value2);
+        return formatNumber9(value2);
       }
     }
-    return formatNumber6(value2);
+    return formatNumber9(value2);
   }
   return String(value2);
 }
@@ -10422,11 +10502,22 @@ function buildFields(row, encoding, color2) {
     return buildExplicitTooltipFields(row, channels);
   }
   const fields = [];
+  if (encoding.color && "field" in encoding.color) {
+    fields.push({
+      label: resolveLabel(encoding.color),
+      value: formatValue(
+        row[encoding.color.field],
+        encoding.color.type,
+        resolveFormat(encoding.color)
+      ),
+      color: color2
+    });
+  }
   if (encoding.y) {
     fields.push({
       label: resolveLabel(encoding.y),
       value: formatValue(row[encoding.y.field], encoding.y.type, resolveFormat(encoding.y)),
-      color: color2
+      color: encoding.color ? void 0 : color2
     });
   }
   if (encoding.x) {
@@ -10460,6 +10551,16 @@ function getTooltipTitle(row, encoding) {
   if (encoding.y?.type === "nominal" || encoding.y?.type === "ordinal") {
     return String(row[encoding.y.field] ?? "");
   }
+  if (encoding.x?.type === "quantitative" && encoding.y?.type === "quantitative") {
+    const encodedFields = new Set(
+      [encoding.x, encoding.y, encoding.color, encoding.size, encoding.detail].filter((ch) => !!ch && "field" in ch).map((ch) => ch.field)
+    );
+    for (const [key, value2] of Object.entries(row)) {
+      if (!encodedFields.has(key) && typeof value2 === "string") {
+        return value2;
+      }
+    }
+  }
   if (encoding.color && "field" in encoding.color) {
     return String(row[encoding.color.field] ?? "");
   }
@@ -10478,12 +10579,12 @@ function tooltipsForLine(mark, encoding, _markIndex) {
 }
 function tooltipsForPoint(mark, encoding, markIndex) {
   const title = getTooltipTitle(mark.data, encoding);
-  const fields = buildFields(mark.data, encoding, getRepresentativeColor9(mark.fill));
+  const fields = buildFields(mark.data, encoding, getRepresentativeColor10(mark.fill));
   return [[`point-${markIndex}`, { title, fields }]];
 }
 function tooltipsForRect(mark, encoding, markIndex) {
   const title = getTooltipTitle(mark.data, encoding);
-  const fields = buildFields(mark.data, encoding, getRepresentativeColor9(mark.fill));
+  const fields = buildFields(mark.data, encoding, getRepresentativeColor10(mark.fill));
   return [[`rect-${markIndex}`, { title, fields }]];
 }
 function tooltipsForArc(mark, encoding, markIndex) {
@@ -10496,14 +10597,14 @@ function tooltipsForArc(mark, encoding, markIndex) {
       fields.push({
         label: categoryName,
         value: formatValue(row[encoding.y.field], encoding.y.type, resolveFormat(encoding.y)),
-        color: getRepresentativeColor9(mark.fill)
+        color: getRepresentativeColor10(mark.fill)
       });
     }
   } else if (encoding.y) {
     fields.push({
       label: resolveLabel(encoding.y),
       value: formatValue(row[encoding.y.field], encoding.y.type, resolveFormat(encoding.y)),
-      color: getRepresentativeColor9(mark.fill)
+      color: getRepresentativeColor10(mark.fill)
     });
   }
   const title = colorEnc ? String(row[colorEnc.field] ?? "") : void 0;
@@ -10514,7 +10615,7 @@ function tooltipsForArea(mark, encoding, _markIndex) {
     for (const dp of mark.dataPoints) {
       dp.tooltip = {
         title: getTooltipTitle(dp.datum, encoding),
-        fields: buildFields(dp.datum, encoding, getRepresentativeColor9(mark.fill))
+        fields: buildFields(dp.datum, encoding, getRepresentativeColor10(mark.fill))
       };
     }
   }
@@ -11125,7 +11226,8 @@ function compileChart(spec, options) {
       height: options.height
     },
     animation: resolvedAnimation,
-    watermark
+    watermark,
+    measureText: options.measureText
   };
 }
 function compileLayer(spec, options) {