@opendata-ai/openchart-engine 2.6.0 → 2.7.0

package/dist/index.js

@@ -589,8 +589,11 @@ function computeSimpleBars(data, valueField, categoryField, xScale, yScale, band
 }
 
 // src/charts/bar/labels.ts
-import { estimateTextWidth as estimateTextWidth2, resolveCollisions } from "@opendata-ai/openchart-core";
-import { format as d3Format } from "d3-format";
+import {
+  buildD3Formatter,
+  estimateTextWidth as estimateTextWidth2,
+  resolveCollisions
+} from "@opendata-ai/openchart-core";
 var LABEL_FONT_SIZE = 11;
 var LABEL_FONT_WEIGHT = 600;
 var LABEL_PADDING = 6;
@@ -599,22 +602,7 @@ function computeBarLabels(marks, _chartArea, density = "auto", labelFormat) {
   if (density === "none") return [];
   const targetMarks = density === "endpoints" && marks.length > 1 ? [marks[0], marks[marks.length - 1]] : marks;
   const candidates = [];
-  let formatter = null;
-  if (labelFormat) {
-    try {
-      formatter = d3Format(labelFormat);
-    } catch {
-      const suffixMatch = labelFormat.match(/^(.+[a-z])([^a-z]+)$/i);
-      if (suffixMatch) {
-        try {
-          const d3Fmt = d3Format(suffixMatch[1]);
-          const suffix = suffixMatch[2];
-          formatter = (v) => d3Fmt(v) + suffix;
-        } catch {
-        }
-      }
-    }
-  }
+  const formatter = buildD3Formatter(labelFormat);
   for (const mark of targetMarks) {
     const ariaLabel = mark.aria.label;
     const lastColon = ariaLabel.lastIndexOf(":");
@@ -845,24 +833,34 @@ function computeStackedColumns(data, categoryField, valueField, colorField, xSca
 }
 
 // src/charts/column/labels.ts
-import { estimateTextWidth as estimateTextWidth3, resolveCollisions as resolveCollisions2 } from "@opendata-ai/openchart-core";
+import {
+  buildD3Formatter as buildD3Formatter2,
+  estimateTextWidth as estimateTextWidth3,
+  resolveCollisions as resolveCollisions2
+} from "@opendata-ai/openchart-core";
 var LABEL_FONT_SIZE2 = 10;
 var LABEL_FONT_WEIGHT2 = 600;
 var LABEL_OFFSET_Y = 6;
-function computeColumnLabels(marks, _chartArea, density = "auto") {
+function computeColumnLabels(marks, _chartArea, density = "auto", labelFormat) {
   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 valuePart = lastColon >= 0 ? ariaLabel.slice(lastColon + 1).trim() : "";
-    if (!valuePart) continue;
+    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);
+    }
     const numericValue = parseFloat(valuePart);
     const isNegative = Number.isFinite(numericValue) && numericValue < 0;
     const textWidth = estimateTextWidth3(valuePart, LABEL_FONT_SIZE2, LABEL_FONT_WEIGHT2);
     const textHeight = LABEL_FONT_SIZE2 * 1.2;
-    const anchorX = mark.x + mark.width / 2 - textWidth / 2;
+    const anchorX = mark.x + mark.width / 2;
     const anchorY = isNegative ? mark.y + mark.height + LABEL_OFFSET_Y : mark.y - LABEL_OFFSET_Y - textHeight;
     candidates.push({
       text: valuePart,
@@ -898,7 +896,7 @@ function computeColumnLabels(marks, _chartArea, density = "auto") {
 // src/charts/column/index.ts
 var columnRenderer = (spec, scales, chartArea, strategy, _theme) => {
   const marks = computeColumnMarks(spec, scales, chartArea, strategy);
-  const labels = computeColumnLabels(marks, chartArea, spec.labels.density);
+  const labels = computeColumnLabels(marks, chartArea, spec.labels.density, spec.labels.format);
   for (let i = 0; i < marks.length && i < labels.length; i++) {
     marks[i].label = labels[i];
   }
@@ -2836,8 +2834,12 @@ function compileGraph(spec, options) {
 var DEFAULT_COLLISION_PADDING = 5;
 
 // src/layout/axes.ts
-import { abbreviateNumber as abbreviateNumber3, formatDate, formatNumber as formatNumber3 } from "@opendata-ai/openchart-core";
-import { format as d3Format2 } from "d3-format";
+import {
+  abbreviateNumber as abbreviateNumber3,
+  buildD3Formatter as buildD3Formatter3,
+  formatDate,
+  formatNumber as formatNumber3
+} from "@opendata-ai/openchart-core";
 var TICK_COUNTS = {
   full: 8,
   reduced: 5,
@@ -2898,17 +2900,8 @@ function formatTickLabel(value, resolvedScale) {
   if (resolvedScale.type === "linear" || resolvedScale.type === "log") {
     const num = value;
     if (formatStr) {
-      try {
-        return d3Format2(formatStr)(num);
-      } catch {
-        const suffixMatch = formatStr.match(/^(.+[a-z])([^a-z]+)$/i);
-        if (suffixMatch) {
-          try {
-            return d3Format2(suffixMatch[1])(num) + suffixMatch[2];
-          } catch {
-          }
-        }
-      }
+      const fmt = buildD3Formatter3(formatStr);
+      if (fmt) return fmt(num);
     }
     if (Math.abs(num) >= 1e3) return abbreviateNumber3(num);
     return formatNumber3(num);
@@ -3563,7 +3556,7 @@ function computeCategoryColors(data, column, theme, darkMode) {
 
 // src/tables/format-cells.ts
 import { formatDate as formatDate2, formatNumber as formatNumber4 } from "@opendata-ai/openchart-core";
-import { format as d3Format3 } from "d3-format";
+import { format as d3Format } from "d3-format";
 function isNumericValue(value) {
   if (typeof value === "number") return Number.isFinite(value);
   return false;
@@ -3583,7 +3576,7 @@ function formatCell(value, column) {
   }
   if (column.format && isNumericValue(value)) {
     try {
-      const formatter = d3Format3(column.format);
+      const formatter = d3Format(column.format);
       return {
         value,
         formattedValue: formatter(value),
@@ -3616,7 +3609,7 @@ function formatValueForSearch(value, column) {
   if (value == null) return "";
   if (column.format && isNumericValue(value)) {
     try {
-      return d3Format3(column.format)(value);
+      return d3Format(column.format)(value);
     } catch {
     }
   }
@@ -4090,7 +4083,7 @@ function compileTableLayout(spec, options, theme) {
 
 // src/tooltips/compute.ts
 import { formatDate as formatDate3, formatNumber as formatNumber5 } from "@opendata-ai/openchart-core";
-import { format as d3Format4 } from "d3-format";
+import { format as d3Format2 } from "d3-format";
 function formatValue(value, fieldType, format) {
   if (value == null) return "";
   if (fieldType === "temporal" || value instanceof Date) {
@@ -4099,7 +4092,7 @@ function formatValue(value, fieldType, format) {
   if (typeof value === "number") {
     if (format) {
       try {
-        return d3Format4(format)(value);
+        return d3Format2(format)(value);
       } catch {
         return formatNumber5(value);
       }