@opendata-ai/openchart-engine 8.6.0 → 8.6.2

package/dist/index.d.ts

@@ -1021,6 +1021,10 @@ declare function legendGap(width: number): number;
  * - If `as` is a string: adds `as` with the bin start value.
  * - If `as` is [start, end]: adds both bin start and bin end fields.
  *
+ * When `params.scaleType` is `'log'`, bins are log-spaced (equal width in log
+ * space). This is auto-detected by the histogram mark when the x scale is
+ * logarithmic.
+ *
  * @param data - Input rows.
  * @param transform - Bin transform definition.
  * @returns New rows with binned field(s) added.

package/dist/index.js

@@ -6544,8 +6544,15 @@ function expandEncodingSugar(spec, inheritedData) {
       const resolvedType = ch.type ?? (specData && specData.length > 0 ? inferFieldType(specData, field) : void 0);
       const emitInterval = channel === "x" && resolvedType === "quantitative" && markType === "bar";
       const endField = `${outputField}_end`;
+      const chScale = ch.scale;
+      let binDef;
+      if (chScale?.type === "log") {
+        binDef = ch.bin === true ? { scaleType: "log" } : { ...ch.bin, scaleType: "log" };
+      } else {
+        binDef = ch.bin === true ? true : ch.bin;
+      }
       const binTransform = {
-        bin: ch.bin === true ? true : ch.bin,
+        bin: binDef,
         field,
         as: emitInterval ? [outputField, endField] : outputField
       };
@@ -6914,7 +6921,14 @@ function expandHistogramMark(spec) {
   const encoding = { ...spec.encoding ?? {} };
   const x = { ...encoding.x ?? {} };
   if (x.bin == null) {
-    x.bin = { maxbins: typeof binCount === "number" ? binCount : HISTOGRAM_DEFAULT_MAXBINS };
+    const binParams = {
+      maxbins: typeof binCount === "number" ? binCount : HISTOGRAM_DEFAULT_MAXBINS
+    };
+    const xScale = x.scale;
+    if (xScale?.type === "log") {
+      binParams.scaleType = "log";
+    }
+    x.bin = binParams;
   }
   x.type = x.type ?? "quantitative";
   encoding.x = x;
@@ -14124,11 +14138,11 @@ function compileGeoMap(spec, options) {
   }
   const droppedFeatures = [];
   const formatter = buildD3Formatter2(mapSpec.encoding?.color?.format ?? mapSpec.valueFormat) ?? formatNumber4;
-  const neutralFill = isDarkMode ? theme.colors.neutral[800] : theme.colors.neutral[100];
+  const neutralFill = theme.colors.neutral[100];
   const noDataPattern = {
     type: "diagonal",
     base: neutralFill,
-    line: isDarkMode ? theme.colors.neutral[600] : theme.colors.neutral[300]
+    line: theme.colors.neutral[300]
   };
   let featureMarks;
   let continuousLegend = null;
@@ -19082,6 +19096,19 @@ function computeStep(extent3, maxbins, nice) {
   }
   return step;
 }
+function computeLogBinEdges(extent3, maxbins) {
+  const lo = Math.max(extent3[0], Number.MIN_VALUE);
+  const hi = Math.max(extent3[1], lo);
+  const logMin = Math.log10(lo);
+  const logMax = Math.log10(hi);
+  const logSpan = logMax - logMin;
+  if (logSpan === 0) return [lo, lo * 10];
+  const edges = [];
+  for (let i = 0; i <= maxbins; i++) {
+    edges.push(10 ** (logMin + i / maxbins * logSpan));
+  }
+  return edges;
+}
 function runBin(data, transform) {
   const params = transform.bin === true ? {} : transform.bin;
   const maxbins = params.maxbins ?? 10;
@@ -19094,14 +19121,38 @@ function runBin(data, transform) {
     for (const row of data) {
       const v = Number(row[field]);
       if (Number.isFinite(v)) {
+        if (params.scaleType === "log" && v <= 0) continue;
         if (v < min4) min4 = v;
         if (v > max4) max4 = v;
       }
     }
     extent3 = [min4 === Infinity ? 0 : min4, max4 === -Infinity ? 0 : max4];
   }
-  const step = params.step ?? computeStep(extent3, maxbins, nice);
   const [startAs, endAs] = Array.isArray(transform.as) ? transform.as : [transform.as, void 0];
+  if (params.scaleType === "log") {
+    const edges = computeLogBinEdges(extent3, maxbins);
+    return data.map((row) => {
+      const v = Number(row[field]);
+      const newRow = { ...row };
+      if (!Number.isFinite(v) || v <= 0) {
+        newRow[startAs] = null;
+        if (endAs) newRow[endAs] = null;
+      } else {
+        let lo = 0;
+        let hi = edges.length - 2;
+        while (lo < hi) {
+          const mid = lo + hi + 1 >> 1;
+          if (edges[mid] <= v) lo = mid;
+          else hi = mid - 1;
+        }
+        const idx = Math.min(lo, edges.length - 2);
+        newRow[startAs] = edges[idx];
+        if (endAs) newRow[endAs] = edges[idx + 1];
+      }
+      return newRow;
+    });
+  }
+  const step = params.step ?? computeStep(extent3, maxbins, nice);
   return data.map((row) => {
     const v = Number(row[field]);
     const newRow = { ...row };