ggaction 0.0.11 → 0.0.12

package/src/materialization/scales/policies/bar.js

@@ -1,4 +1,3 @@
-import { normalizeOffsetPadding } from "../../../grammar/bars/geometry.js";
 import {
   BAR_GRAINS,
   resolveBarChannels,
@@ -8,48 +7,6 @@ import {
   interpolateNumber,
   inverseLerp
 } from "../../../grammar/numeric.js";
-export function resolveOffsetScalePolicy({
-  consumers,
-  resolvedScales,
-  markConfigs,
-  id,
-  channel
-}) {
-  const parentChannel = channel === "xOffset" ? "x" : "y";
-  const bandwidths = consumers.map(consumer => {
-    if (parentChannel === "x" && consumer.layer.encoding?.x?.bin !== undefined) {
-      return 1;
-    }
-    const parentScaleId = consumer.layer.encoding?.[parentChannel]?.scale;
-    return resolvedScales[parentScaleId]?.bandwidth;
-  });
-  if (
-    bandwidths.some(value => !Number.isFinite(value)) ||
-    new Set(bandwidths).size !== 1
-  ) {
-    throw new Error(
-      `${channel} scale "${id}" requires one shared resolved ${parentChannel} bandwidth.`
-    );
-  }
-  const paddings = consumers.map(consumer => normalizeOffsetPadding(
-    markConfigs[consumer.layer.id]?.[channel],
-    undefined,
-    channel
-  ));
-  const signatures = new Set(
-    paddings.map(padding => JSON.stringify(padding))
-  );
-  if (signatures.size !== 1) {
-    throw new Error(
-      `${channel} scale "${id}" requires one shared padding policy.`
-    );
-  }
-  return {
-    parentBandwidth: bandwidths[0],
-    ...paddings[0]
-  };
-}
-
 export function resolveTemporalBarBand(valuesByConsumer, domain, range) {
   const temporalBars = valuesByConsumer.filter(({ consumer }) => {
     const channels = resolveBarChannels(consumer.layer);

package/src/materialization/scales/policies/offset.js

@@ -0,0 +1,54 @@
+import { normalizeOffsetPadding } from "../../../grammar/bars/geometry.js";
+
+function resolveParentSlot(consumer, resolvedScales, parentChannel) {
+  if (parentChannel === "x" && consumer.layer.encoding?.x?.bin !== undefined) {
+    return 1;
+  }
+  const parentScaleId = consumer.layer.encoding?.[parentChannel]?.scale;
+  const parentScale = resolvedScales[parentScaleId];
+  if (Number.isFinite(parentScale?.bandwidth) && parentScale.bandwidth > 0) {
+    return parentScale.bandwidth;
+  }
+  if (parentScale?.type === "point" && Number.isFinite(parentScale.step)) {
+    return Math.abs(parentScale.step);
+  }
+  return undefined;
+}
+
+export function resolveOffsetScalePolicy({
+  consumers,
+  resolvedScales,
+  markConfigs,
+  id,
+  channel
+}) {
+  const parentChannel = channel === "xOffset" ? "x" : "y";
+  const slots = consumers.map(consumer =>
+    resolveParentSlot(consumer, resolvedScales, parentChannel)
+  );
+  if (
+    slots.some(value => !Number.isFinite(value) || value <= 0) ||
+    new Set(slots).size !== 1
+  ) {
+    throw new Error(
+      `${channel} scale "${id}" requires one shared resolved ${parentChannel} categorical slot.`
+    );
+  }
+  const paddings = consumers.map(consumer => normalizeOffsetPadding(
+    markConfigs[consumer.layer.id]?.[channel],
+    undefined,
+    channel
+  ));
+  const signatures = new Set(
+    paddings.map(padding => JSON.stringify(padding))
+  );
+  if (signatures.size !== 1) {
+    throw new Error(
+      `${channel} scale "${id}" requires one shared padding policy.`
+    );
+  }
+  return {
+    parentBandwidth: slots[0],
+    ...paddings[0]
+  };
+}

package/src/materialization/scales/resolve.js

@@ -27,10 +27,8 @@ import {
   validateTimeScaleType
 } from "../../grammar/scales/index.js";
 import { resolveArcAutoPositionRange } from "./policies/arc.js";
-import {
-  resolveOffsetScalePolicy,
-  resolveTemporalBarBand
-} from "./policies/bar.js";
+import { resolveTemporalBarBand } from "./policies/bar.js";
+import { resolveOffsetScalePolicy } from "./policies/offset.js";
 import { resolveBinnedPositionDomain } from "./policies/binnedPosition.js";
 import { resolveSeriesLayoutDomain } from "./policies/series.js";
 import { OFFSET_POSITION_CHANNELS } from "../../core/vocabulary.js";

package/types/program.d.ts

@@ -1116,6 +1116,10 @@ export interface RadiusScaleOptions {
 }
 
 export interface ThetaEncodingOptions {
+  /**
+   * Arc marks interpret an aggregate-free quantitative field as per-row sector
+   * weights. Categorical arc theta retains the count and weighted-sum modes.
+   */
   field: string;
   target?: string;
   fieldType?: FieldType;
@@ -1366,6 +1370,10 @@ export type ErrorBarPositionChannel = { field?: string } & (
       fieldType: "temporal";
       scale?: NonPointTemporalPositionScaleOptions;
     }
+  | {
+      fieldType: "quantitative";
+      scale?: NonPointQuantitativePositionScaleOptions;
+    }
 );
 
 export interface ErrorBarStatisticalIntervalChannel {
@@ -1387,12 +1395,22 @@ export type ErrorBarIntervalChannel =
   | ErrorBarStatisticalIntervalChannel
   | ErrorBarExplicitIntervalChannel;
 
+export interface ErrorBarOffsetChannel {
+  field?: string;
+  fieldType?: "nominal" | "ordinal";
+  scale?: OffsetScaleOptions;
+  paddingInner?: number;
+  paddingOuter?: number;
+}
+
 export interface ErrorBarOptions {
   id?: string;
   target?: string;
   data?: string;
   x?: ErrorBarPositionChannel | ErrorBarIntervalChannel;
   y?: ErrorBarPositionChannel | ErrorBarIntervalChannel;
+  xOffset?: ErrorBarOffsetChannel;
+  yOffset?: ErrorBarOffsetChannel;
   groupBy?: string;
   coordinate?: string;
   caps?: boolean;