@rowsncolumns/charts 28.1.10 → 28.1.12

package/dist/esm/utils/histogram.js

@@ -45,17 +45,58 @@ export const computePareto = (bins) => {
 const formatBinBound = (value) => {
     if (!Number.isFinite(value))
         return String(value);
+    if (value === 0)
+        return "0";
     const abs = Math.abs(value);
     if (abs >= 1000 || abs < 0.01)
         return value.toExponential(2);
     return Number.parseFloat(value.toFixed(2)).toString();
 };
+const isFinite_ = (v) => typeof v === "number" && Number.isFinite(v);
+/** True when the spec authored any Excel binning option. */
+export const hasExcelBinning = (options) => Boolean(options &&
+    (isFinite_(options.binSize) ||
+        options.intervalClosed === "l" ||
+        options.intervalClosed === "r" ||
+        isFinite_(options.overflow) ||
+        isFinite_(options.underflow)));
+/** Round up to two significant digits (31 for 30.77, 0.038 for 0.0377). */
+const ceilToTwoSignificant = (value) => {
+    if (!(value > 0))
+        return value;
+    const magnitude = 10 ** (Math.floor(Math.log10(value)) - 1);
+    return Math.ceil(value / magnitude - 1e-9) * magnitude;
+};
+/**
+ * Excel's automatic bin width: Scott's normal reference rule,
+ * 3.5 · σ / ∛n with the sample standard deviation, rounded up to two
+ * significant digits. For the 20 values 12 … 95 of #1087 (σ ≈ 23.86) that
+ * is 30.77 → 31, i.e. Excel's three bins [12, 43], (43, 74], (74, 105].
+ */
+export const excelAutoBinWidth = (numeric) => {
+    const n = numeric.length;
+    if (n < 2)
+        return 1;
+    const mean = numeric.reduce((sum, v) => sum + v, 0) / n;
+    const variance = numeric.reduce((sum, v) => sum + (v - mean) ** 2, 0) / (n - 1);
+    const sigma = Math.sqrt(variance);
+    if (!(sigma > 0))
+        return 1;
+    return ceilToTwoSignificant((3.5 * sigma) / Math.cbrt(n));
+};
 /**
- * Bin a set of numeric values into `binCount` equal-width bins.
- * When `binCount` is omitted, uses Sturges' rule: ceil(log2(n) + 1).
+ * Bin a set of numeric values into equal-width bins.
+ *
+ * Default (no Excel options): `binCount` bins over [min, max], closed on
+ * the left — or Sturges' rule, ceil(log2(n) + 1), when `binCount` is
+ * omitted. With Excel binning options (#1087): bins start at the minimum
+ * (or the underflow bound), are `binSize` wide — else (max − min) /
+ * `binCount`, else Excel's automatic width — closed on the right unless
+ * `intervalClosed` is `l`, and values beyond `overflow` / `underflow`
+ * collect in their own end bins.
  */
-export const binHistogram = (values, binCount) => {
-    const numeric = values.filter((v) => typeof v === "number" && Number.isFinite(v));
+export const binHistogram = (values, binCount, options) => {
+    const numeric = values.filter(isFinite_);
     if (numeric.length === 0) {
         return { labels: [], counts: [] };
     }
@@ -67,6 +108,9 @@ export const binHistogram = (values, binCount) => {
         if (v > max)
             max = v;
     }
+    if (hasExcelBinning(options)) {
+        return binExcel(numeric, min, max, binCount, options);
+    }
     const sturges = Math.max(1, Math.ceil(Math.log2(numeric.length) + 1));
     const bins = typeof binCount === "number" && binCount > 0
         ? Math.floor(binCount)
@@ -93,3 +137,126 @@ export const binHistogram = (values, binCount) => {
     }
     return { labels, counts };
 };
+const binExcel = (numeric, min, max, binCount, options) => {
+    const rightClosed = options.intervalClosed !== "l";
+    const underflow = isFinite_(options.underflow) ? options.underflow : null;
+    const overflow = isFinite_(options.overflow) ? options.overflow : null;
+    // The regular bins span the values between the end bins.
+    const inRange = numeric.filter((v) => (underflow === null || v >= underflow) &&
+        (overflow === null || v <= overflow));
+    const start = underflow ?? (inRange.length ? Math.min(...inRange) : min);
+    const end = overflow ?? (inRange.length ? Math.max(...inRange) : max);
+    const span = end - start;
+    let width;
+    if (isFinite_(options.binSize) && options.binSize > 0) {
+        width = options.binSize;
+    }
+    else if (typeof binCount === "number" && binCount > 0) {
+        width = span > 0 ? span / Math.floor(binCount) : 1;
+    }
+    else {
+        width = excelAutoBinWidth(inRange.length ? inRange : numeric);
+    }
+    // Enough bins to reach the last value; a right-closed layout needs one
+    // more when the span is an exact multiple (the boundary value belongs to
+    // the bin below, so the top bin stays).
+    let bins = span > 0 ? Math.ceil(span / width - 1e-9) : 1;
+    bins = Math.max(1, bins);
+    const counts = new Array(bins).fill(0);
+    const edges = Array.from({ length: bins + 1 }, (_, i) => start + width * i);
+    let under = 0;
+    let over = 0;
+    for (const v of numeric) {
+        if (underflow !== null && v < underflow) {
+            under++;
+            continue;
+        }
+        if (overflow !== null && v > overflow) {
+            over++;
+            continue;
+        }
+        let idx;
+        if (rightClosed) {
+            // (lo, hi]: a value on a boundary belongs to the bin below it; the
+            // first bin also takes its own lower bound.
+            idx = Math.ceil((v - start) / width - 1e-9) - 1;
+            if (idx < 0)
+                idx = 0;
+        }
+        else {
+            idx = Math.floor((v - start) / width + 1e-9);
+        }
+        if (idx >= bins)
+            idx = bins - 1;
+        counts[idx]++;
+    }
+    const labels = edges.slice(0, -1).map((lo, i) => {
+        const hi = edges[i + 1];
+        if (rightClosed) {
+            const opening = i === 0 ? "[" : "(";
+            return `${opening}${formatBinBound(lo)}, ${formatBinBound(hi)}]`;
+        }
+        const closing = i === bins - 1 ? "]" : ")";
+        return `[${formatBinBound(lo)}, ${formatBinBound(hi)}${closing}`;
+    });
+    if (underflow !== null) {
+        labels.unshift(`< ${formatBinBound(underflow)}`);
+        counts.unshift(under);
+    }
+    if (overflow !== null) {
+        labels.push(`> ${formatBinBound(overflow)}`);
+        counts.push(over);
+    }
+    return { labels, counts };
+};
+/**
+ * Excel's histogram "By Category" / Pareto over categories
+ * (`<cx:aggregation/>`, #1087): one column per distinct category in order
+ * of first appearance, its value the aggregate (sum by default) of the
+ * series values of that category — instead of binning the values.
+ */
+export const aggregateByCategory = (categories, values, aggregateType = "SUM") => {
+    const groups = new Map();
+    const order = [];
+    const count = Math.max(categories.length, values.length);
+    for (let i = 0; i < count; i++) {
+        const raw = categories[i];
+        const label = raw === null || raw === undefined ? "" : `${raw}`.trim();
+        if (label === "")
+            continue;
+        if (!groups.has(label)) {
+            groups.set(label, []);
+            order.push(label);
+        }
+        const v = values[i];
+        if (isFinite_(v))
+            groups.get(label).push(v);
+    }
+    const reduce = (nums) => {
+        if (nums.length === 0)
+            return 0;
+        switch (aggregateType ?? "SUM") {
+            case "COUNT":
+                return nums.length;
+            case "AVERAGE":
+                return nums.reduce((a, b) => a + b, 0) / nums.length;
+            case "MAX":
+                return Math.max(...nums);
+            case "MIN":
+                return Math.min(...nums);
+            case "MEDIAN": {
+                const sorted = [...nums].sort((a, b) => a - b);
+                const mid = Math.floor(sorted.length / 2);
+                return sorted.length % 2
+                    ? sorted[mid]
+                    : (sorted[mid - 1] + sorted[mid]) / 2;
+            }
+            default:
+                return nums.reduce((a, b) => a + b, 0);
+        }
+    };
+    return {
+        labels: order,
+        counts: order.map((label) => reduce(groups.get(label) ?? [])),
+    };
+};

package/dist/esm/utils/overrides.d.ts

@@ -8,7 +8,7 @@ export declare const applyLegendOverrides: (legend: LegendComponentOption, opts:
  * becomes the tick-label formatter.
  */
 export declare const applyAxisOverrides: (axis: any, opts: any, numberFormatPattern?: string, locale?: string) => any;
-export declare const dataLabelFormatter: (opts: any, locale?: string) => (params: any) => string;
+export declare const dataLabelFormatter: (opts: any, locale?: string, joiner?: string) => (params: any) => string;
 /**
  * The data-label options one series renders with: its own
  * `ChartData.dataLabels` when it has them (OOXML's `<c:ser><c:dLbls>`

package/dist/esm/utils/overrides.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"overrides.d.ts","sourceRoot":"","sources":["../../../utils/overrides.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAWrD,oEAAoE;AACpE,eAAO,MAAM,4BAA4B,GAAI,KAAK,GAAG,oCASpD,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,qBAAqB,EAC7B,MAAM,GAAG,KACR,qBA6CF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM,GAAG,EACT,MAAM,GAAG,EACT,sBAAsB,MAAM,EAC5B,SAAS,MAAM,QA4BhB,CAAC;AAgBF,eAAO,MAAM,kBAAkB,GAAI,MAAM,GAAG,EAAE,SAAS,MAAM,MAAM,QAAQ,GAAG,WA+C7E,CAAC;AAgCF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,GAAI,CAAC,EACvC,YAAY,CAAC,GAAG,IAAI,GAAG,SAAS,EAChC,QAAQ;IAAE,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,KACnD,CAAC,GAAG,IAAI,GAAG,SAA6C,CAAC;AAE5D,eAAO,MAAM,sBAAsB,GACjC,MAAM,GAAG,EACT,aAAa,MAAM,EACnB,SAAS,MAAM;;;iCA7F0D,GAAG;aA0G7E,CAAC"}
+{"version":3,"file":"overrides.d.ts","sourceRoot":"","sources":["../../../utils/overrides.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAWrD,oEAAoE;AACpE,eAAO,MAAM,4BAA4B,GAAI,KAAK,GAAG,oCASpD,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,qBAAqB,EAC7B,MAAM,GAAG,KACR,qBA6CF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAC7B,MAAM,GAAG,EACT,MAAM,GAAG,EACT,sBAAsB,MAAM,EAC5B,SAAS,MAAM,QA4BhB,CAAC;AAgBF,eAAO,MAAM,kBAAkB,GAC7B,MAAM,GAAG,EACT,SAAS,MAAM,EAEf,eAAa,MACT,QAAQ,GAAG,WAoDhB,CAAC;AAgCF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,GAAI,CAAC,EACvC,YAAY,CAAC,GAAG,IAAI,GAAG,SAAS,EAChC,QAAQ;IAAE,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,GAAG,SAAS,KACnD,CAAC,GAAG,IAAI,GAAG,SAA6C,CAAC;AAE5D,eAAO,MAAM,sBAAsB,GACjC,MAAM,GAAG,EACT,aAAa,MAAM,EACnB,SAAS,MAAM;;;iCAlGH,GAAG;aA+GhB,CAAC"}

package/dist/esm/utils/overrides.js

@@ -117,7 +117,9 @@ export const applyAxisOverrides = (axis, opts, numberFormatPattern, locale) => {
  * — Excel's behaviour.
  */
 const formatLabelValue = (rawValue, originalValue, pattern, locale) => formatAxisValue(pattern, originalValue ?? rawValue, locale);
-export const dataLabelFormatter = (opts, locale) => (params) => {
+export const dataLabelFormatter = (opts, locale, 
+// A treemap block stacks the parts (name, value) on their own lines.
+joiner = ": ") => (params) => {
     const parts = [];
     if (opts.showSeriesName && params.seriesName)
         parts.push(params.seriesName);
@@ -126,10 +128,15 @@ export const dataLabelFormatter = (opts, locale) => (params) => {
     if (opts.showPercent && params.percent !== undefined) {
         parts.push(`${params.percent}%`);
     }
+    // The value shows by default unless another field was asked for instead:
+    // an importer records only the flags that are ON, so `<c:showVal val="0"/>`
+    // + `<c:showBubbleSize val="1"/>` arrives as `{ showBubbleSize: true }` and
+    // must label the bubble with its size alone (#1068 / #1079).
     const showVal = opts.showValue !== false &&
         !opts.showCategoryName &&
         !opts.showPercent &&
-        !opts.showSeriesName
+        !opts.showSeriesName &&
+        !opts.showBubbleSize
         ? true
         : !!opts.showValue;
     // A scatter / bubble point's value is its [x, y, size] tuple: the label's
@@ -149,7 +156,7 @@ export const dataLabelFormatter = (opts, locale) => (params) => {
     if (opts.showBubbleSize && isPointTuple && params.value.length > 2) {
         parts.push(formatLabelValue(params.value[2], undefined, opts.numberFormatPattern, locale));
     }
-    return parts.join(": ");
+    return parts.join(joiner);
 };
 const ECHARTS_DLBL_POS = {
     center: "inside",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rowsncolumns/charts",
-  "version": "28.1.10",
+  "version": "28.1.12",
   "author": "Vinay M",
   "license": "SEE LICENSE IN LICENSE.md",
   "main": "./dist/cjs/index.js",
@@ -70,7 +70,7 @@
     "@rowsncolumns/common-types": ">=5.3.2",
     "@rowsncolumns/grid": ">=13.2.35",
     "@rowsncolumns/icons": ">=7.2.33",
-    "@rowsncolumns/spreadsheet": ">=10.4.8",
+    "@rowsncolumns/spreadsheet": ">=10.4.10",
     "@rowsncolumns/spreadsheet-state": ">=29.1.8",
     "@rowsncolumns/toolkit": ">=24.5.10",
     "@rowsncolumns/ui": ">=16.0.4",