ggaction 0.0.21 → 0.0.23

package/src/actions/theme/reconcile.js

@@ -6,6 +6,7 @@ import {
   resolveEffectiveThemeTokens,
   setThemeStateOverrides
 } from "./state.js";
+import { isOwned } from "../../core/immutable.js";
 import { findLayer } from "../../selectors/layers.js";
 import { reconcileFollowingRegressions } from "../regression/follow.js";
 
@@ -285,6 +286,14 @@ function recolorGraphic(
   targetTokens,
   overrides
 ) {
+  if (id === `${program.compositionSpec?.id}-headers`) {
+    const headers = program.materializationConfigs.facets?.[program.compositionSpec.id]?.headers;
+    if (headers?.column?.title !== undefined || headers?.row?.title !== undefined) {
+      // Role titles and category labels have independently owned paint. Their
+      // reconciled header configs already materialized the complete collection.
+      return program;
+    }
+  }
   if (graphic.items === undefined) {
     const mapped = mapGraphicProperties(
       program,
@@ -663,18 +672,27 @@ function visitTrace(node, visitor) {
   for (const child of node.children ?? []) visitTrace(child, visitor);
 }
 
-function clearRemovedResources(overrides, node) {
+// Completed immutable action branches never acquire new removals. Retain only
+// their distinct reset prefixes so later themed edits do not rescan old facet
+// materialization traces. Prefix deletion commutes; authored overrides are still
+// applied in their original top-level action order.
+const removedResources = new WeakMap();
+
+function removedResourcePrefixes(node) {
+  const cached = removedResources.get(node);
+  if (cached !== undefined) return cached;
+  const prefixes = new Set();
   visitTrace(node, current => {
     if (current.op === "editGraphics" && current.args.remove === true &&
         typeof current.args.target === "string") {
-      clearPrefix(overrides, `g:${current.args.target}.`);
+      prefixes.add(`g:${current.args.target}.`);
     }
     if (current.op !== "editSemantic" || current.args.remove !== true ||
         typeof current.args.property !== "string") return;
     const mark = /^layer\[([^\]]+)\]$/u.exec(current.args.property);
     if (mark !== null) {
-      clearPrefix(overrides, `c:marks.${mark[1]}.`);
-      clearPrefix(overrides, `g:${mark[1]}.`);
+      prefixes.add(`c:marks.${mark[1]}.`);
+      prefixes.add(`g:${mark[1]}.`);
       return;
     }
     const axis = /^guide\.axis\.([A-Za-z0-9_-]+)$/u
@@ -682,21 +700,28 @@ function clearRemovedResources(overrides, node) {
     if (axis !== null) {
       const prefix = axis[1] === "radius" ? "radial" : axis[1];
       const graphicPrefix = ["x", "y", "theta", "radius"].includes(axis[1]) ? `${prefix}Axis` : `axis_${axis[1]}__`;
-      clearPrefix(overrides, `c:guides.axis.${axis[1]}.`);
-      clearPrefix(overrides, `g:${graphicPrefix}`);
+      prefixes.add(`c:guides.axis.${axis[1]}.`);
+      prefixes.add(`g:${graphicPrefix}`);
       return;
     }
     const grid = /^guide\.grid\.([^\.]+)$/u.exec(current.args.property);
     if (grid !== null) {
-      clearPrefix(overrides, `c:guides.grid.${grid[1]}.`);
-      clearPrefix(overrides, `g:${grid[1]}Grid`);
+      prefixes.add(`c:guides.grid.${grid[1]}.`);
+      prefixes.add(`g:${grid[1]}Grid`);
       return;
     }
     const legend = /^guide\.legend\.([^\.]+)$/u.exec(current.args.property);
     if (legend !== null) {
-      clearPrefix(overrides, `c:guides.legend.${legend[1]}.`);
+      prefixes.add(`c:guides.legend.${legend[1]}.`);
     }
   });
+  const result = [...prefixes];
+  if (isOwned(node)) removedResources.set(node, result);
+  return result;
+}
+
+function clearRemovedResources(overrides, node) {
+  for (const prefix of removedResourcePrefixes(node)) clearPrefix(overrides, prefix);
 }
 
 function clearLocalResets(overrides, program, node) {
@@ -970,6 +995,9 @@ function addFacetOverrides(overrides, program, args) {
     ["color", "fill"],
     ["fontFamily", "fontFamily"]
   ]) {
+    if (Object.hasOwn(args.title ?? {}, property)) {
+      overrides.add(`c:facets.${id}.headers.${owner}.title.${property}`);
+    }
     if (!Object.hasOwn(args, property)) continue;
     overrides.add(`c:facets.${id}.headers.${owner}.${property}`);
     overrides.add(`g:${id}-headers.${graphicProperty}`);

package/src/core/compositionState.js

@@ -1,10 +1,17 @@
-import { isPlainObject } from "./immutable.js";
+import { normalizeFacetAxes } from "./facetAxisPolicy.js";
+import { isOwned, isPlainObject } from "./immutable.js";
 import { ownProgramState } from "./programState.js";
 import {
   FACET_SCALE_CHANNELS,
-  FACET_SCALE_RESOLUTIONS
+  FACET_SCALE_RESOLUTIONS,
+  FACET_TOP_LANE_MODES,
+  DEFAULT_FACET_TOP_LANE
 } from "./vocabulary.js";
 
+// Primitive graphics/trace edits retain both immutable owners. Validate their
+// relationship once, rather than scanning every facet cell on every primitive.
+const validatedCompositions = new WeakMap();
+
 function validateFacetSpec(compositionSpec) {
   if (compositionSpec.direction !== undefined) {
     throw new Error("Facet compositionSpec does not use direction.");
@@ -37,6 +44,7 @@ function validateFacetSpec(compositionSpec) {
   }
   const grid = compositionSpec.facet.grid;
   const repeat = compositionSpec.facet.repeat;
+  if (grid !== undefined && compositionSpec.spacing === "content") throw new Error("Content flow requires a wrapped facet.");
   if (grid !== undefined && repeat !== undefined) {
     throw new Error("Facet compositionSpec cannot combine grid and repeat recipes.");
   }
@@ -198,10 +206,10 @@ function validateFacetSpec(compositionSpec) {
     );
   }
   const guides = compositionSpec.facet.guides;
+  normalizeFacetAxes(guides?.axes, "each", { stored: true });
   if (
     !isPlainObject(guides) ||
     Object.keys(guides).some(key => !["axes", "legend"].includes(key)) ||
-    !["each", "outer"].includes(guides.axes) ||
     (![false, "shared"].includes(guides.legend) && !isPlainObject(guides.legend))
   ) {
     throw new Error(
@@ -260,6 +268,7 @@ function validateLayout(compositionSpec) {
 }
 
 export function ownCompositionSpec(compositionSpec, children) {
+  if (validatedCompositions.get(compositionSpec)?.has(children)) return compositionSpec;
   const childIds = Object.keys(children);
   if (compositionSpec === undefined) {
     if (childIds.length > 0) {
@@ -272,7 +281,7 @@ export function ownCompositionSpec(compositionSpec, children) {
   }
   const allowed = [
     "id", "type", "direction", "children", "columns", "gap", "align",
-    "padding", "facet", "spacing"
+    "padding", "facet", "spacing", "topLane"
   ];
   const unknown = Object.keys(compositionSpec).find(key => !allowed.includes(key));
   if (unknown !== undefined) {
@@ -282,8 +291,13 @@ export function ownCompositionSpec(compositionSpec, children) {
     throw new TypeError("compositionSpec.id must be a non-empty string.");
   }
   const facet = compositionSpec.type === "facet";
-  if (compositionSpec.spacing !== undefined && (!facet || !["plot", "canvas"].includes(compositionSpec.spacing))) {
-    throw new Error("compositionSpec.spacing requires a facet and canvas or plot spacing.");
+  if (compositionSpec.spacing !== undefined && (!facet || !["plot", "canvas", "content"].includes(compositionSpec.spacing))) {
+    throw new Error("compositionSpec.spacing requires a facet and canvas, plot, or content spacing.");
+  }
+  if (compositionSpec.topLane !== undefined && (!facet ||
+      !FACET_TOP_LANE_MODES.includes(compositionSpec.topLane) ||
+      compositionSpec.topLane === DEFAULT_FACET_TOP_LANE || compositionSpec.spacing !== "plot")) {
+    throw new Error('compositionSpec.topLane requires a facet with plot spacing and canonical shared intent.');
   }
   if (compositionSpec.type !== undefined && !facet) {
     throw new Error(`Unknown compositionSpec type "${compositionSpec.type}".`);
@@ -301,5 +315,10 @@ export function ownCompositionSpec(compositionSpec, children) {
     throw new Error("Concat compositionSpec does not accept facet properties.");
   }
   validateLayout(compositionSpec);
-  return ownProgramState(compositionSpec);
+  const owned = ownProgramState(compositionSpec);
+  if (isOwned(children)) {
+    if (!validatedCompositions.has(owned)) validatedCompositions.set(owned, new WeakSet());
+    validatedCompositions.get(owned).add(children);
+  }
+  return owned;
 }

package/src/core/datasetReferences.js

@@ -0,0 +1,17 @@
+// Stored dataset reference paths have one owner across resource and replay policies.
+export function datasetInputReferences(dataset) {
+  const refs = dataset.source === undefined ? [] : [{ id: dataset.source, path: ["source"] }];
+  if (dataset.transform?.[0]?.type === "lookup") {
+    refs.push({ id: dataset.transform[0].lookup.data, path: ["transform", 0, "lookup", "data"] });
+  }
+  return refs;
+}
+
+export function datasetInputIds(dataset) {
+  return [...new Set(datasetInputReferences(dataset).map(ref => ref.id))];
+}
+
+export function rebindTransformDatasetInputs(transform, replacements) {
+  if (transform.type !== "lookup" || !replacements.has(transform.lookup.data)) return transform;
+  return { ...transform, lookup: { ...transform.lookup, data: replacements.get(transform.lookup.data) } };
+}

package/src/core/facetAxisPolicy.js

@@ -0,0 +1,30 @@
+import { cloneAndFreeze, isPlainObject } from "./immutable.js";
+
+export function normalizeFacetAxes(value, previous = "each", { stored = false } = {}) {
+  if (value === undefined && !stored) value = "each";
+  if (["each", "outer"].includes(value)) return value;
+  if (!isPlainObject(value) || Object.keys(value).length === 0 ||
+      Object.keys(value).some(key => !["x", "y"].includes(key)) ||
+      Object.values(value).some(mode => !["each", "outer"].includes(mode)) ||
+      stored && (!Object.hasOwn(value, "x") || !Object.hasOwn(value, "y"))) {
+    throw new Error('Facet axes must be each, outer, or a non-empty x/y policy object.');
+  }
+  return cloneAndFreeze({ x: value.x ?? facetAxisMode(previous, "x"), y: value.y ?? facetAxisMode(previous, "y") });
+}
+
+export function facetAxisMode(policy, channel) {
+  return typeof policy === "string" ? policy : policy[channel];
+}
+
+export function hasOuterFacetAxes(policy) {
+  return ["x", "y"].some(channel => facetAxisMode(policy, channel) === "outer");
+}
+
+export function validateFacetAxisPolicy(policy, family, repeat = false) {
+  if (family !== "cartesian" && (hasOuterFacetAxes(policy) || isPlainObject(policy))) {
+    throw new Error("Polar and Parallel facets do not support outer axes or per-channel axis policies.");
+  }
+  if (repeat && hasOuterFacetAxes(policy)) {
+    throw new Error("repeatCharts does not promote axes across different repeated fields.");
+  }
+}

package/src/core/immutable.js

@@ -11,6 +11,7 @@ export function isPlainObject(value) {
 
 export function freezeOwned(value) {
   if (value !== null && typeof value === "object") {
+    if (ownedValues.has(value)) return value;
     Object.freeze(value);
     ownedValues.add(value);
   }

package/src/core/resourceReferences.js

@@ -1,5 +1,6 @@
 import { freezeOwned, isPlainObject } from "./immutable.js";
 import { validateUserId } from "./identifiers.js";
+import {datasetInputReferences} from "./datasetReferences.js";
 
 export const RESOURCE_KINDS = Object.freeze([
   "data", "scale", "coordinate", "mark", "selection"
@@ -71,8 +72,8 @@ export function collectSemanticDataReferences(program) {
     append(references, reference("data", layer.data, "layer", layer.id, ["data"]));
   }
   for (const dataset of program.semanticSpec.datasets) {
-    append(references, reference(
-      "data", dataset.source, "dataset", dataset.id, ["source"]
+    for(const input of datasetInputReferences(dataset))append(references,reference(
+      "data",input.id,"dataset",dataset.id,input.path
     ));
   }
   return freezeOwned(references);
@@ -167,7 +168,8 @@ export function collectMarkConfigReferences(program) {
         (root === "errorBandBoundary" && key === "owner") ||
         (parentPath.length === 0 && key === "boxSpanOwner") ||
         (root === "raincloudPlot" && (
-          key === "ownerId" || parentPath[1] === "childIds" ||
+          key === "ownerId" ||
+          (parentPath[1] === "childIds" && config.raincloudPlot.ownedChildIds?.includes(value)) ||
           parentPath[1] === "ownedChildIds"
         ))
       ) {

package/src/core/validation.js

@@ -133,3 +133,7 @@ export function validateTextStyle(config, label) {
   validateNonEmptyString(config.fontFamily, `${label} fontFamily`);
   validateFontWeight(config.fontWeight, `${label} fontWeight`);
 }
+export function validateBoolean(value, label) {
+  if (typeof value !== "boolean") throw new TypeError(`${label} must be a boolean.`);
+  return value;
+}

package/src/core/vocabulary.js

@@ -41,7 +41,9 @@ export const ENCODING_CHANNELS = Object.freeze([
   "group",
   "pathOrder",
   "opacity",
-  "text"
+  "text",
+  "dx",
+  "dy"
 ]);
 
 const CARTESIAN_MARK_TYPES = Object.freeze([
@@ -118,7 +120,7 @@ export const POSITION_CHANNEL_DEFINITIONS = Object.freeze({
 
 export const SCALED_ENCODING_CHANNELS = Object.freeze(
   ENCODING_CHANNELS.filter(channel =>
-    !["angle", "group", "pathOrder", "text"].includes(channel)
+    !["angle", "group", "pathOrder", "text", "dx", "dy"].includes(channel)
   )
 );
 
@@ -176,6 +178,9 @@ export const FACET_SCALE_RESOLUTIONS = Object.freeze([
   "independent"
 ]);
 
+export const FACET_TOP_LANE_MODES = Object.freeze(["stacked", "shared"]);
+export const DEFAULT_FACET_TOP_LANE = "stacked";
+
 export function getPositionChannelDefinition(channel) {
   return POSITION_CHANNEL_DEFINITIONS[channel];
 }
@@ -242,3 +247,20 @@ export const LEGEND_POSITIONS = Object.freeze(["left", "right", "top", "bottom",
 export const LEGEND_BLOCK_LAYOUTS = Object.freeze(["row", "column", "wrap"]);
 
 export const AXIS_RESOURCE_CHANNELS = Object.freeze(["x", "y", "theta", "radius", "parallel"]);
+
+// Shared target policy for authoring and read-only action inspection.
+const marks = (...types) => Object.freeze(types);
+export const APPEARANCE_MARK_TYPES = Object.freeze({
+  encodeColor: marks('point', 'line', 'bar', 'area', 'arc', 'rect', 'text'),
+  encodeStroke: marks('point', 'line', 'area', 'bar', 'rect', 'arc', 'rule', 'tick'),
+  encodeOpacity: marks('point', 'rule', 'line', 'bar', 'rect'),
+  encodeStrokeWidth: marks('rule', 'line', 'rect'),
+  encodeStrokeDash: marks('line', 'rule'),
+  encodeSize: marks('point'),
+  encodeShape: marks('point'),
+  encodeAngle: marks('point', 'tick')
+});
+
+// Generated default action methods: start
+export const DEFAULT_ACTION_METHODS = /* @__PURE__ */ Object.freeze(["createCanvas","editCanvas","fitCanvas","applyTextMetrics","removeTextMetrics","applyTheme","removeTheme","createData","reviseData","removeData","removeScale","removeCoordinate","bindMarkData","filterData","createSummaryData","createBinData","createLookupData","createFlattenData","createFoldData","createComputedData","createNormalizedData","createSortedData","createCompleteData","createImputedData","createStackData","createDensityData","createRegressionData","createRegressionStatisticsData","createWindowData","createTimeUnitData","createBin2DData","editBin2DData","editDerivedData","editComputedData","editFilteredData","editLookupData","editFlattenData","editFoldData","editSummaryData","editBinData","editTimeUnitData","editWindowData","editDensityData","editStackData","editRegressionData","editRegressionStatisticsData","editIntervalData","editECDFData","editNormalizedData","editSortedData","editCompleteData","editImputedData","createIntervalData","createECDFData","createPointMark","createTickMark","createStatisticalReference","createReferenceLine","createReferenceBand","createMarkLabels","editMarkLabelSelection","editMarkLabelPlacement","removeMarkLabels","createAnnotation","createTextMark","editTextMark","layoutLabels","removeLabelLayout","editPointMark","editTickMark","jitterPoints","removeJitter","packPoints","removePointPacking","removeMark","createLineMark","editLineMark","createBarMark","editBarMark","createAreaMark","createRuleMark","editRuleMark","editAreaMark","encodeX","encodeY","encodeChannels","encodeX2","encodeColor","encodeStrokeDash","encodeStroke","encodeStrokeWidth","encodeSize","encodeShape","encodeAngle","encodeOpacity","encodeRadius","encodeTheta","encodeR","encodePointRadius","removePointRadius","encodeXOffset","encodeYOffset","encodeY2","encodeYRange","encodeXRange","encodeGroup","encodePathOrder","encodeParallelCoordinates","removePathOrder","orderCategories","removeCategoryOrder","removeEncoding","encodeText","encodeDx","encodeDy","encodeHistogram","encodeDensity","editDensity","encodeHorizon","editHorizon","encodeBarWidth","createRegression","editRegression","createErrorBar","editErrorBar","createErrorBand","editErrorBand","editErrorBandBoundary","createBoxPlot","editBoxPlot","createGradientPlot","editGradientPlot","createViolinPlot","editViolinPlot","createParallelAxes","createParallelAxis","editParallelAxis","removeParallelAxis","removeParallelAxes","createAxes","createXAxis","createYAxis","createXAxisLine","createYAxisLine","editXAxisLine","editYAxisLine","createXAxisTicks","createYAxisTicks","editXAxisTicks","editYAxisTicks","createXAxisLabels","createYAxisLabels","editXAxisLabels","editYAxisLabels","createXAxisTicksAndLabels","createYAxisTicksAndLabels","editXAxisTicksAndLabels","editYAxisTicksAndLabels","createXAxisTitle","createYAxisTitle","editXAxisTitle","editYAxisTitle","editAxes","editXAxis","editYAxis","removeXAxis","removeYAxis","createGrid","createHorizontalGrid","createVerticalGrid","editHorizontalGrid","editVerticalGrid","editGrid","removeGrid","createLegend","editLegend","editLegendBlock","editLegendLayout","editLegendLabels","editLegendTitle","editLegendSymbols","editLegendBorder","createGuides","removeLegend","createTitle","editTitle","removeTitle","createCoordinate","editCoordinate","createScale","editScale","editXScale","editYScale","editXOffsetScale","editYOffsetScale","editParallelScale","editThetaScale","editRScale","editColorScale","editStrokeScale","editSizeScale","editOpacityScale","editShapeScale","editStrokeWidthScale","editStrokeDashScale","createDerivedData","createRegressionBand","editRegressionBand","createRegressionLine","editRegressionLine","filterMarks","removeMarkFilter","selectMarks","editMarkSelection","removeMarkHighlight","removeMarkSelection","highlightMarks","editSemantic","createGraphics","editGraphics","createArcMark","editArcMark","createThetaAxis","createRadialAxis","editThetaAxis","editRadialAxis","removeThetaAxis","removeRadialAxis","createThetaAxisLine","editThetaAxisLine","createRadialAxisLine","editRadialAxisLine","createThetaAxisTicks","editThetaAxisTicks","createRadialAxisTicks","editRadialAxisTicks","createThetaAxisLabels","editThetaAxisLabels","createRadialAxisLabels","editRadialAxisLabels","createThetaAxisTitle","editThetaAxisTitle","createRadialAxisTitle","editRadialAxisTitle","createThetaGrid","createRadialGrid","editThetaGrid","editRadialGrid","editCompositionLayout","replaceCompositionChild","insertCompositionChild","removeCompositionChild","reorderCompositionChildren","facet","facetGrid","repeatCharts","editFacetSource","editFacetHeaders","editFacetScales","editFacetGuides","createScatterPlot","createTextPlot","createDotPlot","createLollipopPlot","createDumbbellPlot","editEndpointPlot","createECDFPlot","editECDFPlot","createIntervalPlot","createRegressionPlot","createLinePlot","createPolarScatterPlot","createPolarLinePlot","createRadarPlot","editRadarPlot","createRugPlot","createStripPlot","createBeeswarmPlot","createRaincloudPlot","editRaincloudPlot","createBarPlot","createHistogram","createHeatmap","createParallelCoordinates","createRectMark","editRectMark","createPiePlot","createRosePlot","createRadialBarPlot","createDensityPlot","createHorizonPlot","createAreaPlot","layoutSeries"]);
+// Generated default action methods: end

package/src/grammar/aggregate.js

@@ -297,6 +297,7 @@ export function aggregateRows(rows, field, operation) {
 
 export function formatAggregateTitle(operation, field) {
   const aggregate = validateAggregate(operation);
+  if (aggregate === "count" && field === undefined) return "count";
   nonEmptyString(field, "Aggregate field");
   if (isScalarAggregate(aggregate)) return `${aggregate}(${field})`;
   if (aggregate.op === "quantile") {

package/src/grammar/arcs.js

@@ -1 +1 @@
-import{validateOptionObject as P,validateNonNegativeFinite as j}from"../core/validation.js";import{cloneAndFreeze as R,isPlainObject as B}from"../core/immutable.js";import{mapContinuousScaleValues as y,mapOrdinalPositionValues as M,readNominalField as b,readQuantitativeField as I}from"./scales/index.js";import{interpolateNumber as S,normalizedFiniteSum as _,stableFiniteSum as q}from"./numeric.js";function k(e){if(e?.mark?.type!=="arc")throw new Error("Arc derivation requires a semantic arc mark.");const t=e.encoding?.theta;if(t===void 0||!["quantitative","nominal","ordinal"].includes(t.fieldType))throw new Error(`Arc mark "${e.id}" requires quantitative or categorical theta.`);return t}function G(e,t){if(e?.type!=="linear"||!Array.isArray(e.range)||e.range.length!==2||!e.range.every(Number.isFinite)||e.range[0]===e.range[1])throw new Error(`${t} requires a resolved linear scale.`);return e}function L(e,t){if(e?.type!=="band"||!Array.isArray(e.domain)||!Array.isArray(e.range)||e.range.length!==2||!e.range.every(Number.isFinite)||e.range[0]===e.range[1]||!Number.isFinite(e.bandwidth)||e.bandwidth<=0)throw new Error(`${t} requires a resolved band scale.`);return e}function $(e,t){return t===void 0?e.map(()=>{}):b(e,t.field)}function F(e,t,r,n){if(!Array.isArray(e))throw new TypeError(`Arc theta ${n}s require rows.`);if(typeof t!="string"||t.length===0)throw new TypeError(`Arc theta ${n} must be a non-empty string.`);const s=e.map((u,a)=>{const i=u?.[t];if(!Number.isFinite(i)||i<0)throw new TypeError(`Arc theta ${n} field "${t}" must contain non-negative finite numbers at row ${a}.`);return i});if(s.every(u=>u===0))throw new Error(`Arc mark "${r}" theta ${n}s must have a positive total.`);return R(s)}function N(e,t,r="arc"){return F(e,t,r,"weight")}function V(e,t,r="arc"){return F(e,t,r,"value")}function Q(e,t,r){const n=e.reduce((c,d)=>c+d,0),s=Number.isFinite(n)?void 0:_(e,"Arc theta values");if(n===0||s?.total<=0)throw new Error("Arc theta values must have a positive total.");const u=t[1]-t[0];let a=t[0],i=0,o=0;return e.map((c,d)=>{const h=s===void 0?c:c/s.scale,v=i+h;s!==void 0&&(o+=Math.abs(i)>=Math.abs(h)?i-v+h:h-v+i),i=v;const p=a+c/n*u,l=d===e.length-1?t[1]:s===void 0&&Number.isFinite(p)?p:S(t[0],t[1],(i+o)/(s?.total??n));if(!Number.isFinite(l)||l===a)throw new RangeError(`Arc theta ${r(d)} cannot resolve a distinct finite sector.`);const m={startTheta:a,endTheta:l};return a=l,m})}function W(e,t,r){if(!Number.isFinite(t?.availableRadius)||t.availableRadius<0)throw new RangeError(`Arc mark "${e.id}" requires a finite available radius.`);return{innerRadius:U(r,t.availableRadius),outerRadius:t.availableRadius}}function D(e,t,r,n,s){const u=t.encoding.theta,a=u.fieldType==="quantitative";if(!a&&!["count","sum"].includes(u.aggregate))throw new Error(`Arc mark "${t.id}" requires count, sum, or radial layout.`);const i=a?V(e,u.field,t.id):u.aggregate==="count"?e.map(()=>1):N(e,u.weight,t.id),o=a?e.map((g,w)=>w):b(e,u.field),c=$(e,t.encoding?.color),d=new Map(z(o,i).map(g=>[g.key,g])),h=a?o:r.domain,v=new Set(h);for(const g of d.keys())if(!v.has(g))throw new Error(`Arc theta value "${g}" is outside the scale domain.`);const p=h.filter(g=>d.get(g)?.values.some(w=>w>0)),l=g=>a?`row ${p[g]}`:`group "${String(p[g])}"`,m=p.map((g,w)=>a?i[g]:q(d.get(g).values,`Arc theta ${l(w)} aggregate`)),f=Q(m,r.range,l),A=W(t,n,s);return p.map((g,w)=>{const E=d.get(g),T=[...new Set(E.sourceIndices.map(O=>c[O]))];if(T.length>1)throw new Error(`Aggregated arc theta group "${g}" must resolve to one color value.`);return{key:a?`${String(i[g])}:${g}`:g,theta:a?i[g]:g,count:E.sourceIndices.length,aggregateValue:m[w],color:T[0],...f[w],...A,sourceIndices:E.sourceIndices}})}function x(e,t,r){const n=t.aggregate==="count"?e.map(()=>1):I(e,t.field);return z(r,n)}function z(e,t){const r=new Map;for(const[n,s]of e.entries()){const u=r.get(s)??{key:s,sourceIndices:[],values:[]};u.sourceIndices.push(n),u.values.push(t[n]),r.set(s,u)}return[...r.values()]}function H(e,t){const r=k(t),n=t.encoding?.radius;if(!["nominal","ordinal"].includes(r.fieldType)||r.aggregate!==void 0||!["count","sum"].includes(n?.aggregate)||n.fieldType!=="quantitative")throw new Error("Measured Arc requires equal-angle categorical theta and count or sum radius.");if(n.aggregate==="count"&&Object.hasOwn(n,"field"))throw new Error("Measured count radius does not accept a field.");const s=b(e,r.field),u=$(e,t.encoding?.color),a=x(e,n,s);if(a.some(o=>o.values.some(c=>c<0)))throw new RangeError("Measured Arc radius inputs must be non-negative.");const i=a.map(o=>{const c=[...new Set(o.sourceIndices.map(d=>u[d]))];if(c.length>1)throw new Error(`Measured Arc category "${o.key}" must resolve to one color value.`);return{key:o.key,theta:o.key,count:o.sourceIndices.length,radius:q(o.values,"Measured Arc radius aggregate"),color:c[0],sourceIndices:o.sourceIndices}});if(!i.some(o=>o.radius>0))throw new Error("Measured Arc radius requires at least one positive category aggregate.");return R(i)}function J(e,t,r,n){const s=H(e,t),u=M(s.map(c=>c.theta),r),a=y(s.map(c=>c.radius),n),i=(Math.sign(r.step)||1)*r.bandwidth/2,o=new Map(s.map((c,d)=>[c.theta,{...c,startTheta:u[d]-i,endTheta:u[d]+i,innerRadius:n.range[0],outerRadius:a[d]}]));return r.domain.flatMap(c=>{const d=o.get(c);return d===void 0||d.radius===0?[]:[d]})}function K(e,t,r,n){const s=t.encoding.theta,u=t.encoding?.radius;if(u?.fieldType!=="quantitative")throw new Error(`Arc mark "${t.id}" requires quantitative radius.`);const a=b(e,s.field),i=I(e,u.field),o=$(e,t.encoding?.color),c=M(a,r),d=y(i,n),h=Math.min(...n.range),p=(Math.sign(r.step)||1)*r.bandwidth/2,l=new Map(r.domain.map(f=>[f,[]]));for(let f=0;f<e.length;f+=1){if(d[f]<=h)continue;const A=l.get(a[f]);if(A===void 0)throw new Error(`Arc theta value "${a[f]}" is outside the scale domain.`);A.push({key:`${String(a[f])}:${f}`,theta:a[f],radius:i[f],color:o[f],startTheta:c[f]-p,endTheta:c[f]+p,innerRadius:h,outerRadius:d[f],sourceIndices:[f]})}const m=[];for(const f of r.domain){const A=l.get(f);A.sort((g,w)=>w.outerRadius-g.outerRadius||g.sourceIndices[0]-w.sourceIndices[0]),m.push(...A)}return m}function re(e,t,{thetaScale:r,radiusScale:n,frame:s,innerRadius:u=0}={}){if(!Array.isArray(e))throw new TypeError("Arc derivation requires rows.");const a=k(t);C(u);const i=n?.radialMapping!==void 0,o=a.fieldType==="quantitative",c=(o&&!i?G:L)(r,`Arc mark "${t.id}" theta`);let d=i?J(e,t,c,n):o||["count","sum"].includes(a.aggregate)?D(e,t,c,s,u):K(e,t,c,n);if(n!==void 0&&!i&&(o||a.aggregate!==void 0)){const h=X(e,t),v=y(h.map(l=>l.radius),n),p=new Map(h.map((l,m)=>[l.sourceIndices[0],{radius:l.radius,outerRadius:v[m]}]));d=d.map(l=>{const m=p.get(l.sourceIndices[0]);if(m===void 0||!Number.isFinite(m.outerRadius)||m.outerRadius<=l.innerRadius)throw new RangeError("Arc outer radius must exceed inner radius.");return{...l,...m}})}return R({sectors:d})}function C(e){if(B(e)){if(P(e,["unit","value"],"Arc innerRadius"),e.unit!=="px")throw new RangeError("Arc innerRadius unit must be px.");return R({unit:"px",value:j(e.value,"Arc innerRadius")})}if(!Number.isFinite(e)||e<0||e>=1)throw new RangeError("Arc innerRadius must be from 0 (inclusive) to 1 (exclusive).");return e}function U(e,t){const r=C(e);if(typeof r=="number")return r*t;if(r.value>=t)throw new RangeError("Arc pixel innerRadius must be smaller than its outer radius.");return r.value}function X(e,t){const r=t.encoding?.theta,n=t.encoding?.radius;if(r===void 0)return[];const s=r.fieldType==="quantitative";if(s?n.aggregate!==void 0:!["count","sum"].includes(r.aggregate))throw new Error("Grouped arc radius requires aggregated categorical theta.");const u=s?V(e,r.field,t.id):r.aggregate==="count"?e.map(()=>1):N(e,r.weight,t.id),a=s?e.map((i,o)=>o):b(e,r.field);return x(e,n,a).filter(i=>i.sourceIndices.some(o=>u[o]>0)).map(({sourceIndices:i,values:o})=>{if(n.aggregate===void 0&&new Set(o).size!==1)throw new Error("Arc radius requires one value per theta group or explicit aggregation.");return{sourceIndices:i,radius:n.aggregate===void 0?o[0]:q(o,"Arc radius aggregate")}})}export{re as deriveArcSectors,H as deriveMeasuredArcValues,X as deriveProportionalArcRadiusValues,C as normalizeArcInnerRadius,V as readArcThetaValues,N as readArcThetaWeights,U as resolveArcInnerRadius};
+import{validateOptionObject as P,validateNonNegativeFinite as j}from"../core/validation.js";import{cloneAndFreeze as R,isPlainObject as S}from"../core/immutable.js";import{mapContinuousScaleValues as q,mapOrdinalPositionValues as M,readNominalField as b,readQuantitativeField as I,readScaleField as B}from"./scales/index.js";import{interpolateNumber as U,normalizedFiniteSum as _,stableFiniteSum as y}from"./numeric.js";function k(e){if(e?.mark?.type!=="arc")throw new Error("Arc derivation requires a semantic arc mark.");const t=e.encoding?.theta;if(t===void 0||!["quantitative","nominal","ordinal"].includes(t.fieldType))throw new Error(`Arc mark "${e.id}" requires quantitative or categorical theta.`);return t}function G(e,t){if(e?.type!=="linear"||!Array.isArray(e.range)||e.range.length!==2||!e.range.every(Number.isFinite)||e.range[0]===e.range[1])throw new Error(`${t} requires a resolved linear scale.`);return e}function L(e,t){if(e?.type!=="band"||!Array.isArray(e.domain)||!Array.isArray(e.range)||e.range.length!==2||!e.range.every(Number.isFinite)||e.range[0]===e.range[1]||!Number.isFinite(e.bandwidth)||e.bandwidth<=0)throw new Error(`${t} requires a resolved band scale.`);return e}function E(e,t){return t===void 0?e.map(()=>{}):B(e,t.field,t.fieldType??"nominal",{temporalUnit:t.temporalUnit})}function ne(e,t){const r=E(e,t.encoding?.color),n=t.encoding?.theta;if(!(n?.aggregate!==void 0||t.encoding?.radius?.aggregate!==void 0)||n?.field===void 0)return r;const s=b(e,n.field),o=new Map;return s.forEach((i,a)=>{const u=r[a];if(o.has(i)&&!Object.is(o.get(i),u))throw new Error(`Arc category "${i}" must resolve to one color value.`);o.set(i,u)}),[...o.values()]}function F(e,t,r,n){if(!Array.isArray(e))throw new TypeError(`Arc theta ${n}s require rows.`);if(typeof t!="string"||t.length===0)throw new TypeError(`Arc theta ${n} must be a non-empty string.`);const c=e.map((s,o)=>{const i=s?.[t];if(!Number.isFinite(i)||i<0)throw new TypeError(`Arc theta ${n} field "${t}" must contain non-negative finite numbers at row ${o}.`);return i});if(c.every(s=>s===0))throw new Error(`Arc mark "${r}" theta ${n}s must have a positive total.`);return R(c)}function N(e,t,r="arc"){return F(e,t,r,"weight")}function V(e,t,r="arc"){return F(e,t,r,"value")}function Q(e,t,r){const n=e.reduce((u,d)=>u+d,0),c=Number.isFinite(n)?void 0:_(e,"Arc theta values");if(n===0||c?.total<=0)throw new Error("Arc theta values must have a positive total.");const s=t[1]-t[0];let o=t[0],i=0,a=0;return e.map((u,d)=>{const h=c===void 0?u:u/c.scale,v=i+h;c!==void 0&&(a+=Math.abs(i)>=Math.abs(h)?i-v+h:h-v+i),i=v;const m=o+u/n*s,f=d===e.length-1?t[1]:c===void 0&&Number.isFinite(m)?m:U(t[0],t[1],(i+a)/(c?.total??n));if(!Number.isFinite(f)||f===o)throw new RangeError(`Arc theta ${r(d)} cannot resolve a distinct finite sector.`);const p={startTheta:o,endTheta:f};return o=f,p})}function W(e,t,r){if(!Number.isFinite(t?.availableRadius)||t.availableRadius<0)throw new RangeError(`Arc mark "${e.id}" requires a finite available radius.`);return{innerRadius:X(r,t.availableRadius),outerRadius:t.availableRadius}}function D(e,t,r,n,c){const s=t.encoding.theta,o=s.fieldType==="quantitative";if(!o&&!["count","sum"].includes(s.aggregate))throw new Error(`Arc mark "${t.id}" requires count, sum, or radial layout.`);const i=o?V(e,s.field,t.id):s.aggregate==="count"?e.map(()=>1):N(e,s.weight,t.id),a=o?e.map((g,w)=>w):b(e,s.field),u=E(e,t.encoding?.color),d=new Map(z(a,i).map(g=>[g.key,g])),h=o?a:r.domain,v=new Set(h);for(const g of d.keys())if(!v.has(g))throw new Error(`Arc theta value "${g}" is outside the scale domain.`);const m=h.filter(g=>d.get(g)?.values.some(w=>w>0)),f=g=>o?`row ${m[g]}`:`group "${String(m[g])}"`,p=m.map((g,w)=>o?i[g]:y(d.get(g).values,`Arc theta ${f(w)} aggregate`)),l=Q(p,r.range,f),A=W(t,n,c);return m.map((g,w)=>{const $=d.get(g),T=[...new Set($.sourceIndices.map(O=>u[O]))];if(T.length>1)throw new Error(`Aggregated arc theta group "${g}" must resolve to one color value.`);return{key:o?`${String(i[g])}:${g}`:g,theta:o?i[g]:g,count:$.sourceIndices.length,aggregateValue:p[w],color:T[0],...l[w],...A,sourceIndices:$.sourceIndices}})}function x(e,t,r){const n=t.aggregate==="count"?e.map(()=>1):I(e,t.field);return z(r,n)}function z(e,t){const r=new Map;for(const[n,c]of e.entries()){const s=r.get(c)??{key:c,sourceIndices:[],values:[]};s.sourceIndices.push(n),s.values.push(t[n]),r.set(c,s)}return[...r.values()]}function H(e,t){const r=k(t),n=t.encoding?.radius;if(!["nominal","ordinal"].includes(r.fieldType)||r.aggregate!==void 0||!["count","sum"].includes(n?.aggregate)||n.fieldType!=="quantitative")throw new Error("Measured Arc requires equal-angle categorical theta and count or sum radius.");if(n.aggregate==="count"&&Object.hasOwn(n,"field"))throw new Error("Measured count radius does not accept a field.");const c=b(e,r.field),s=E(e,t.encoding?.color),o=x(e,n,c);if(o.some(a=>a.values.some(u=>u<0)))throw new RangeError("Measured Arc radius inputs must be non-negative.");const i=o.map(a=>{const u=[...new Set(a.sourceIndices.map(d=>s[d]))];if(u.length>1)throw new Error(`Measured Arc category "${a.key}" must resolve to one color value.`);return{key:a.key,theta:a.key,count:a.sourceIndices.length,radius:y(a.values,"Measured Arc radius aggregate"),color:u[0],sourceIndices:a.sourceIndices}});if(!i.some(a=>a.radius>0))throw new Error("Measured Arc radius requires at least one positive category aggregate.");return R(i)}function J(e,t,r,n){const c=H(e,t),s=M(c.map(u=>u.theta),r),o=q(c.map(u=>u.radius),n),i=(Math.sign(r.step)||1)*r.bandwidth/2,a=new Map(c.map((u,d)=>[u.theta,{...u,startTheta:s[d]-i,endTheta:s[d]+i,innerRadius:n.range[0],outerRadius:o[d]}]));return r.domain.flatMap(u=>{const d=a.get(u);return d===void 0||d.radius===0?[]:[d]})}function K(e,t,r,n){const c=t.encoding.theta,s=t.encoding?.radius;if(s?.fieldType!=="quantitative")throw new Error(`Arc mark "${t.id}" requires quantitative radius.`);const o=b(e,c.field),i=I(e,s.field),a=E(e,t.encoding?.color),u=M(o,r),d=q(i,n),h=Math.min(...n.range),m=(Math.sign(r.step)||1)*r.bandwidth/2,f=new Map(r.domain.map(l=>[l,[]]));for(let l=0;l<e.length;l+=1){if(d[l]<=h)continue;const A=f.get(o[l]);if(A===void 0)throw new Error(`Arc theta value "${o[l]}" is outside the scale domain.`);A.push({key:`${String(o[l])}:${l}`,theta:o[l],radius:i[l],color:a[l],startTheta:u[l]-m,endTheta:u[l]+m,innerRadius:h,outerRadius:d[l],sourceIndices:[l]})}const p=[];for(const l of r.domain){const A=f.get(l);A.sort((g,w)=>w.outerRadius-g.outerRadius||g.sourceIndices[0]-w.sourceIndices[0]),p.push(...A)}return p}function ie(e,t,{thetaScale:r,radiusScale:n,frame:c,innerRadius:s=0}={}){if(!Array.isArray(e))throw new TypeError("Arc derivation requires rows.");const o=k(t);C(s);const i=n?.radialMapping!==void 0,a=o.fieldType==="quantitative",u=(a&&!i?G:L)(r,`Arc mark "${t.id}" theta`);let d=i?J(e,t,u,n):a||["count","sum"].includes(o.aggregate)?D(e,t,u,c,s):K(e,t,u,n);if(n!==void 0&&!i&&(a||o.aggregate!==void 0)){const h=Y(e,t),v=q(h.map(f=>f.radius),n),m=new Map(h.map((f,p)=>[f.sourceIndices[0],{radius:f.radius,outerRadius:v[p]}]));d=d.map(f=>{const p=m.get(f.sourceIndices[0]);if(p===void 0||!Number.isFinite(p.outerRadius)||p.outerRadius<=f.innerRadius)throw new RangeError("Arc outer radius must exceed inner radius.");return{...f,...p}})}return R({sectors:d})}function C(e){if(S(e)){if(P(e,["unit","value"],"Arc innerRadius"),e.unit!=="px")throw new RangeError("Arc innerRadius unit must be px.");return R({unit:"px",value:j(e.value,"Arc innerRadius")})}if(!Number.isFinite(e)||e<0||e>=1)throw new RangeError("Arc innerRadius must be from 0 (inclusive) to 1 (exclusive).");return e}function X(e,t){const r=C(e);if(typeof r=="number")return r*t;if(r.value>=t)throw new RangeError("Arc pixel innerRadius must be smaller than its outer radius.");return r.value}function Y(e,t){const r=t.encoding?.theta,n=t.encoding?.radius;if(r===void 0)return[];const c=r.fieldType==="quantitative";if(c?n.aggregate!==void 0:!["count","sum"].includes(r.aggregate))throw new Error("Grouped arc radius requires aggregated categorical theta.");const s=c?V(e,r.field,t.id):r.aggregate==="count"?e.map(()=>1):N(e,r.weight,t.id),o=c?e.map((i,a)=>a):b(e,r.field);return x(e,n,o).filter(i=>i.sourceIndices.some(a=>s[a]>0)).map(({sourceIndices:i,values:a})=>{if(n.aggregate===void 0&&new Set(a).size!==1)throw new Error("Arc radius requires one value per theta group or explicit aggregation.");return{sourceIndices:i,radius:n.aggregate===void 0?a[0]:y(a,"Arc radius aggregate")}})}export{ie as deriveArcSectors,H as deriveMeasuredArcValues,Y as deriveProportionalArcRadiusValues,C as normalizeArcInnerRadius,ne as readArcColorValues,V as readArcThetaValues,N as readArcThetaWeights,X as resolveArcInnerRadius};

package/src/grammar/areaSeries.js

@@ -1 +1 @@
-import{cloneAndFreeze as C}from"../core/immutable.js";import{readNominalField as z,readQuantitativeField as b,readTemporalField as I}from"./scales/index.js";import{layoutSeriesPartition as B,validateColorLayout as F}from"./seriesLayout.js";import{stableOrderPathValues as L}from"./pathOrder.js";import{deriveCategoricalDensitySeries as N}from"./categoricalDensity.js";import{validatePathSeriesAppearance as P}from"./pathSeries.js";import{readAreaEndpoint as j,validateAreaEndpointPair as J}from"./areaEndpoints.js";import{validateGeneratedItemLimit as K}from"../core/validation.js";function G(n){const e=[];for(const a of n)e[a.index]=a;return e}function ne(n,e,a={}){if(e?.mark?.type!=="area")throw new Error("Area series derivation requires a semantic area mark.");const{x:p,y:d,x2:l,y2:k}=e.encoding??{},u=["quantitative","temporal","nominal","ordinal"].includes(p?.fieldType)&&d?.fieldType==="quantitative"&&k?.fieldType==="quantitative"&&l===void 0,m=["quantitative","temporal","nominal","ordinal"].includes(d?.fieldType)&&p?.fieldType==="quantitative"&&l?.fieldType==="quantitative"&&k===void 0;if(u===m)throw new Error(`Area mark "${e.id}" requires exactly one quantitative x/x2 or y/y2 range and one quantitative, temporal, or categorical independent position.`);const w=P(n,e),c=u?"vertical":"horizontal",f=u?p:d,x=["nominal","ordinal"].includes(f.fieldType),y=x?z(n,f.field):f.fieldType==="temporal"?I(n,f.field,f.temporalUnit):b(n,f.field);if(Object.hasOwn(f,"datum"))throw new Error("Area independent position requires a field.");const v=u?d:p,o=u?k:l;J(v,o);const r=e.mark.missing??"error",g=j(n,v,r),O=j(n,o,r),s=x?a[u?"xDomain":"yDomain"]??[...new Set(y)]:void 0,t=new Map(s?.map((i,h)=>[i,h]));if(x&&y.some(i=>!t.has(i)))throw new Error("Area categorical domain must contain every observed position.");const E=e.encoding?.pathOrder,$=E===void 0?void 0:b(n,E.field),D=new Map;for(let i=0;i<n.length;i+=1){const h=w.map(q=>n[i][q]),M=JSON.stringify(h),T=D.get(M)??{key:Object.fromEntries(w.map((q,V)=>[q,h[V]])),values:[]};T.values.push(u?{x:y[i],y:g[i],y2:O[i],...r==="break"?{sourceIndex:i}:{},...$===void 0?{}:{pathOrder:$[i]}}:{x:g[i],x2:O[i],...r==="break"?{sourceIndex:i}:{},y:y[i],...$===void 0?{}:{pathOrder:$[i]}}),D.set(M,T)}if(D.size===0)throw new Error(`Area mark "${e.id}" has no values.`);Q(D,{layer:e,vertical:u,primary:v,secondary:o});const A=[...D.values()].flatMap(i=>{const h=u?"x":"y",M=E===void 0?i.values.sort((T,q)=>x?t.get(T[h])-t.get(q[h]):T[h]-q[h]):L(i.values.map(({pathOrder:T,...q})=>q),i.values.map(T=>T.pathOrder),E.order);if(r==="break"){const T=[];let q=[];const V=()=>{q.length>=2&&T.push({key:i.key,sourceIndices:q.map(S=>S.sourceIndex),values:q.map(({sourceIndex:S,...U})=>U)}),q=[]};for(const S of M)(u?S.y==null||S.y2==null:S.x==null||S.x2==null)?V():q.push(S);return V(),T}if(M.length<2)throw new Error(`Area series on mark "${e.id}" requires at least two points.`);return{key:i.key,values:M}});if(A.length===0)throw new Error(`Area mark "${e.id}" has no valid segment with at least two points.`);return C({orientation:c,xValues:A.flatMap(i=>i.values.flatMap(h=>u?[h.x]:[h.x,h.x2])),yValues:A.flatMap(i=>i.values.flatMap(h=>u?[h.y,h.y2]:[h.y])),series:A})}function te(n,e,a={}){if(e?.mark?.type!=="area")throw new Error("Centered area series derivation requires an area mark.");const{x:p,y:d,x2:l,y2:k,group:u,color:m}=e.encoding??{};if(!["quantitative","temporal","nominal","ordinal"].includes(p?.fieldType)||d?.fieldType!=="quantitative"||d?.stack!=="center"||l!==void 0||k!==void 0)throw new Error(`Centered area mark "${e.id}" requires one x field and one quantitative y field without ranged endpoints.`);if(u?.fieldType!=="nominal")throw new Error(`Centered area mark "${e.id}" requires a nominal group encoding.`);if(m!==void 0&&m.fieldType!=="quantitative"&&m.field!==u.field)throw new Error(`Centered area color on mark "${e.id}" must match its group field.`);P(n,e);const w=["nominal","ordinal"].includes(p.fieldType),c=w?z(n,p.field):p.fieldType==="temporal"?I(n,p.field,p.temporalUnit):b(n,p.field),f=b(n,d.field),x=z(n,u.field),y=[],v=new Set,o=new Map;for(let s=0;s<n.length;s+=1){const t=x[s];o.has(t)||(y.push(t),o.set(t,new Map));const E=o.get(t);if(E.has(c[s]))throw new Error(`Centered area mark "${e.id}" has duplicate ${u.field}/${p.field} rows.`);E.set(c[s],f[s]),v.add(c[s])}const r=w?(a.xDomain??[...v]).filter(s=>v.has(s)):[...v].sort((s,t)=>s-t);if(r.length!==v.size)throw new Error("Area categorical domain must contain every observed position.");if(y.length===0||r.length<2)throw new Error(`Centered area mark "${e.id}" requires at least two aligned positions.`);for(const[s,t]of o)if(t.size!==r.length||r.some(E=>!t.has(E)))throw new Error(`Centered area series "${String(s)}" requires one aligned value at every x position.`);const g=y.map(()=>[]);for(const s of r){const t=y.map(A=>o.get(A).get(s)),E=B(t,"center"),$=G(E);let D=E[0]?.start??0;for(let A=0;A<y.length;A+=1){const i=$[A];g[A].push({x:s,y:t[A],lower:i?.start??D,upper:i?.end??D}),i!==void 0&&(D=i.end)}}const O=y.map((s,t)=>({key:{[u.field]:s,...m===void 0||m.fieldType==="quantitative"?{}:{[m.field]:s}},values:g[t]}));return C({mode:"y-center",orientation:"vertical",xValues:r,yValues:O.flatMap(s=>s.values.flatMap(t=>[t.lower,t.upper])),series:O})}function re(n,e,a){if(e?.mark?.type!=="area")throw new Error("Density area derivation requires a semantic area mark.");if(e.encoding?.pathOrder!==void 0)throw new Error(`Density area mark "${e.id}" does not support path order.`);if(a?.type!=="density"||!Array.isArray(a.as))throw new Error(`Area mark "${e.id}" requires density provenance.`);if(a.placement?.type==="category")return N(n,e,a);const{x:p,y:d,group:l}=e.encoding??{};if(p?.fieldType!=="quantitative"||d?.fieldType!=="quantitative")throw new Error(`Density area mark "${e.id}" requires quantitative x and y encodings.`);const[k,u]=a.as,m=p.field===k&&d.field===u?"y-density":p.field===u&&d.field===k?"x-density":void 0;if(m===void 0)throw new Error(`Density area mark "${e.id}" must encode its value and density fields.`);if(a.groupBy===void 0){if(l!==void 0)throw new Error(`Ungrouped density area mark "${e.id}" cannot encode group.`)}else if(l?.field!==a.groupBy||l.fieldType!=="nominal")throw new Error(`Density area mark "${e.id}" must group by "${a.groupBy}".`);const w=b(n,p.field),c=b(n,d.field),f=a.groupBy===void 0?n.map(()=>{}):z(n,a.groupBy),x=new Map;for(let o=0;o<n.length;o+=1){const r=f[o],g=x.get(r)??{key:a.groupBy===void 0?{}:{[a.groupBy]:r},values:[]};g.values.push({x:w[o],y:c[o]}),x.set(r,g)}if(x.size===0)throw new Error(`Density area mark "${e.id}" has no values.`);const y=m==="y-density"?"x":"y",v=[...x.values()].map(o=>{const r=o.values.sort((g,O)=>g[y]-O[y]);if(r.length<2)throw new Error(`Density area series on mark "${e.id}" requires at least two points.`);return{key:o.key,values:r}});return C({mode:m,series:v})}function ie(n,e="overlay"){if(F(e),e==="group")throw new Error('Density area series do not support "group" layout.');if(n?.mode!=="y-density"){if(e==="overlay")return n;throw new Error(`Area layout "${e}" currently requires vertical density series.`)}const a=n.series[0]?.values.length??0;if(a===0||n.series.some(d=>d.values.length!==a))throw new Error("Density area layout requires aligned non-empty samples.");const p=n.series.map(()=>[]);for(let d=0;d<a;d+=1){const l=n.series[0].values[d].x,k=n.series.map(c=>{if(c.values[d].x!==l)throw new Error("Density area layout requires one shared sample grid.");return c.values[d].y}),u=B(k,e),m=G(u);let w=e==="center"?u[0]?.start??0:0;for(let c=0;c<n.series.length;c+=1){const f=m[c];p[c].push({x:l,lower:f?.start??w,upper:f?.end??w}),f!==void 0&&["stack","fill","center"].includes(e)&&(w=f.end)}}return C({mode:n.mode,series:n.series.map((d,l)=>({key:d.key,values:p[l]}))})}function Q(n,{layer:e,vertical:a,primary:p,secondary:d}){const l=e.layout?.mode??"overlay";if(F(l),l==="overlay")return;if(l==="group"||l==="center"&&!a)throw new Error(`Area layout "${l}" is incompatible with this orientation.`);const k=Object.hasOwn(p,"datum"),u=Object.hasOwn(d,"datum");if(k===u||(k?p.datum:d.datum)!==0)throw new Error("Stacked area requires one value field and one zero datum endpoint.");const m=a?"x":"y",w=a?"y":"x",c=`${w}2`,f=k?c:w,x=[...n.values()],y=x.map(o=>{const r=new Map;for(const g of o.values){if(r.has(g[m]))throw new Error("Area layout requires unique group/position rows.");r.set(g[m],g)}return r}),v=[...new Set(x.flatMap(o=>o.values.map(r=>r[m])))].sort((o,r)=>o-r);if(K(v.length*x.length,"Area layout cell count"),y.some(o=>o.size!==v.length||v.some(r=>!o.has(r))))throw new Error("Area layout requires an aligned row for every group and position.");for(const o of v){const r=y.map(t=>t.get(o));if(r.some(t=>t[f]==null)){for(const t of r)t[w]=null,t[c]=null;continue}const g=B(r.map(t=>t[f]),l),O=new Map(g.map(t=>[t.index,t]));let s=l==="center"?g[0]?.start??0:0;r.forEach((t,E)=>{const $=O.get(E);t[w]=$?.start??(l==="diverging"?0:s),t[c]=$?.end??(l==="diverging"?0:s),$!==void 0&&l!=="diverging"&&(s=$.end)})}}export{ne as deriveAreaSeries,te as deriveCenteredAreaSeries,re as deriveDensityAreaSeries,ie as layoutDensityAreaSeries,Q as layoutRawAreaGroups};
+import{cloneAndFreeze as z}from"../core/immutable.js";import{readNominalField as B,readQuantitativeField as V,readTemporalField as P}from"./scales/index.js";import{layoutSeriesPartition as F,validateColorLayout as j}from"./seriesLayout.js";import{stableOrderPathValues as J}from"./pathOrder.js";import{deriveCategoricalDensitySeries as K}from"./categoricalDensity.js";import{validatePathSeriesAppearance as G}from"./pathSeries.js";import{readAreaEndpoint as N,validateAreaEndpointPair as Q}from"./areaEndpoints.js";import{validateGeneratedItemLimit as R}from"../core/validation.js";function U(n){const e=[];for(const a of n)e[a.index]=a;return e}function re(n,e,a={}){if(e?.mark?.type!=="area")throw new Error("Area series derivation requires a semantic area mark.");const{x:p,y:u,x2:l,y2:k}=e.encoding??{},o=["quantitative","temporal","nominal","ordinal"].includes(p?.fieldType)&&u?.fieldType==="quantitative"&&k?.fieldType==="quantitative"&&l===void 0,y=["quantitative","temporal","nominal","ordinal"].includes(u?.fieldType)&&p?.fieldType==="quantitative"&&l?.fieldType==="quantitative"&&k===void 0;if(o===y)throw new Error(`Area mark "${e.id}" requires exactly one quantitative x/x2 or y/y2 range and one quantitative, temporal, or categorical independent position.`);const v=G(n,e),c=o?"vertical":"horizontal",f=o?p:u,x=["nominal","ordinal"].includes(f.fieldType),m=x?B(n,f.field):f.fieldType==="temporal"?P(n,f.field,f.temporalUnit):V(n,f.field);if(Object.hasOwn(f,"datum"))throw new Error("Area independent position requires a field.");const w=o?u:p,i=o?k:l;Q(w,i);const r=e.mark.missing??"error",g=N(n,w,r),O=N(n,i,r),s=x?a[o?"xDomain":"yDomain"]??[...new Set(m)]:void 0,t=new Map(s?.map((d,h)=>[d,h]));if(x&&m.some(d=>!t.has(d)))throw new Error("Area categorical domain must contain every observed position.");const E=e.encoding?.pathOrder,$=E===void 0?void 0:V(n,E.field),D=new Map;for(let d=0;d<n.length;d+=1){const h=v.map(q=>n[d][q]),M=JSON.stringify(h),T=D.get(M)??{key:Object.fromEntries(v.map((q,C)=>[q,h[C]])),values:[]};T.values.push(o?{x:m[d],y:g[d],y2:O[d],...r==="break"?{sourceIndex:d}:{},...$===void 0?{}:{pathOrder:$[d]}}:{x:g[d],x2:O[d],...r==="break"?{sourceIndex:d}:{},y:m[d],...$===void 0?{}:{pathOrder:$[d]}}),D.set(M,T)}if(D.size===0)throw new Error(`Area mark "${e.id}" has no values.`);_(D,{layer:e,vertical:o,primary:w,secondary:i});const A=[...D.values()].flatMap(d=>{const h=o?"x":"y",M=E===void 0?d.values.sort((T,q)=>x?t.get(T[h])-t.get(q[h]):T[h]-q[h]):J(d.values.map(({pathOrder:T,...q})=>q),d.values.map(T=>T.pathOrder),E.order);if(r==="break"){const T=[];let q=[];const C=()=>{q.length>=2&&T.push({key:d.key,sourceIndices:q.map(S=>S.sourceIndex),values:q.map(({sourceIndex:S,...L})=>L)}),q=[]};for(const S of M)(o?S.y==null||S.y2==null:S.x==null||S.x2==null)?C():q.push(S);return C(),T}if(M.length<2)throw new Error(`Area series on mark "${e.id}" requires at least two points.`);return{key:d.key,values:M}}),b=A.length===0&&r==="break",I=[...g,...O].filter(Number.isFinite);return z({orientation:c,xValues:b?o?m:I:A.flatMap(d=>d.values.flatMap(h=>o?[h.x]:[h.x,h.x2])),yValues:b?o?I:m:A.flatMap(d=>d.values.flatMap(h=>o?[h.y,h.y2]:[h.y])),series:A})}function ie(n,e,a={}){if(e?.mark?.type!=="area")throw new Error("Centered area series derivation requires an area mark.");const{x:p,y:u,x2:l,y2:k,group:o,color:y}=e.encoding??{};if(!["quantitative","temporal","nominal","ordinal"].includes(p?.fieldType)||u?.fieldType!=="quantitative"||u?.stack!=="center"||l!==void 0||k!==void 0)throw new Error(`Centered area mark "${e.id}" requires one x field and one quantitative y field without ranged endpoints.`);if(o?.fieldType!=="nominal")throw new Error(`Centered area mark "${e.id}" requires a nominal group encoding.`);if(y!==void 0&&y.fieldType!=="quantitative"&&y.field!==o.field)throw new Error(`Centered area color on mark "${e.id}" must match its group field.`);G(n,e);const v=["nominal","ordinal"].includes(p.fieldType),c=v?B(n,p.field):p.fieldType==="temporal"?P(n,p.field,p.temporalUnit):V(n,p.field),f=V(n,u.field),x=B(n,o.field),m=[],w=new Set,i=new Map;for(let s=0;s<n.length;s+=1){const t=x[s];i.has(t)||(m.push(t),i.set(t,new Map));const E=i.get(t);if(E.has(c[s]))throw new Error(`Centered area mark "${e.id}" has duplicate ${o.field}/${p.field} rows.`);E.set(c[s],f[s]),w.add(c[s])}const r=v?(a.xDomain??[...w]).filter(s=>w.has(s)):[...w].sort((s,t)=>s-t);if(r.length!==w.size)throw new Error("Area categorical domain must contain every observed position.");if(m.length===0||r.length<2)throw new Error(`Centered area mark "${e.id}" requires at least two aligned positions.`);for(const[s,t]of i)if(t.size!==r.length||r.some(E=>!t.has(E)))throw new Error(`Centered area series "${String(s)}" requires one aligned value at every x position.`);const g=m.map(()=>[]);for(const s of r){const t=m.map(A=>i.get(A).get(s)),E=F(t,"center"),$=U(E);let D=E[0]?.start??0;for(let A=0;A<m.length;A+=1){const b=$[A];g[A].push({x:s,y:t[A],lower:b?.start??D,upper:b?.end??D}),b!==void 0&&(D=b.end)}}const O=m.map((s,t)=>({key:{[o.field]:s,...y===void 0||y.fieldType==="quantitative"?{}:{[y.field]:s}},values:g[t]}));return z({mode:"y-center",orientation:"vertical",xValues:r,yValues:O.flatMap(s=>s.values.flatMap(t=>[t.lower,t.upper])),series:O})}function oe(n,e,a){if(e?.mark?.type!=="area")throw new Error("Density area derivation requires a semantic area mark.");if(e.encoding?.pathOrder!==void 0)throw new Error(`Density area mark "${e.id}" does not support path order.`);if(a?.type!=="density"||!Array.isArray(a.as))throw new Error(`Area mark "${e.id}" requires density provenance.`);if(a.placement?.type==="category")return K(n,e,a);const{x:p,y:u,group:l}=e.encoding??{};if(p?.fieldType!=="quantitative"||u?.fieldType!=="quantitative")throw new Error(`Density area mark "${e.id}" requires quantitative x and y encodings.`);const[k,o]=a.as,y=p.field===k&&u.field===o?"y-density":p.field===o&&u.field===k?"x-density":void 0;if(y===void 0)throw new Error(`Density area mark "${e.id}" must encode its value and density fields.`);if(a.groupBy===void 0){if(l!==void 0)throw new Error(`Ungrouped density area mark "${e.id}" cannot encode group.`)}else if(l?.field!==a.groupBy||l.fieldType!=="nominal")throw new Error(`Density area mark "${e.id}" must group by "${a.groupBy}".`);const v=V(n,p.field),c=V(n,u.field),f=a.groupBy===void 0?n.map(()=>{}):B(n,a.groupBy),x=new Map;for(let i=0;i<n.length;i+=1){const r=f[i],g=x.get(r)??{key:a.groupBy===void 0?{}:{[a.groupBy]:r},values:[]};g.values.push({x:v[i],y:c[i]}),x.set(r,g)}if(x.size===0)throw new Error(`Density area mark "${e.id}" has no values.`);const m=y==="y-density"?"x":"y",w=[...x.values()].map(i=>{const r=i.values.sort((g,O)=>g[m]-O[m]);if(r.length<2)throw new Error(`Density area series on mark "${e.id}" requires at least two points.`);return{key:i.key,values:r}});return z({mode:y,series:w})}function ae(n,e="overlay"){if(j(e),e==="group")throw new Error('Density area series do not support "group" layout.');if(n?.mode!=="y-density"){if(e==="overlay")return n;throw new Error(`Area layout "${e}" currently requires vertical density series.`)}const a=n.series[0]?.values.length??0;if(a===0||n.series.some(u=>u.values.length!==a))throw new Error("Density area layout requires aligned non-empty samples.");const p=n.series.map(()=>[]);for(let u=0;u<a;u+=1){const l=n.series[0].values[u].x,k=n.series.map(c=>{if(c.values[u].x!==l)throw new Error("Density area layout requires one shared sample grid.");return c.values[u].y}),o=F(k,e),y=U(o);let v=e==="center"?o[0]?.start??0:0;for(let c=0;c<n.series.length;c+=1){const f=y[c];p[c].push({x:l,lower:f?.start??v,upper:f?.end??v}),f!==void 0&&["stack","fill","center"].includes(e)&&(v=f.end)}}return z({mode:n.mode,series:n.series.map((u,l)=>({key:u.key,values:p[l]}))})}function _(n,{layer:e,vertical:a,primary:p,secondary:u}){const l=e.layout?.mode??"overlay";if(j(l),l==="overlay")return;if(l==="group"||l==="center"&&!a)throw new Error(`Area layout "${l}" is incompatible with this orientation.`);const k=Object.hasOwn(p,"datum"),o=Object.hasOwn(u,"datum");if(k===o||(k?p.datum:u.datum)!==0)throw new Error("Stacked area requires one value field and one zero datum endpoint.");const y=a?"x":"y",v=a?"y":"x",c=`${v}2`,f=k?c:v,x=[...n.values()],m=x.map(i=>{const r=new Map;for(const g of i.values){if(r.has(g[y]))throw new Error("Area layout requires unique group/position rows.");r.set(g[y],g)}return r}),w=[...new Set(x.flatMap(i=>i.values.map(r=>r[y])))].sort((i,r)=>i-r);if(R(w.length*x.length,"Area layout cell count"),m.some(i=>i.size!==w.length||w.some(r=>!i.has(r))))throw new Error("Area layout requires an aligned row for every group and position.");for(const i of w){const r=m.map(t=>t.get(i));if(r.some(t=>t[f]==null)){for(const t of r)t[v]=null,t[c]=null;continue}const g=F(r.map(t=>t[f]),l),O=new Map(g.map(t=>[t.index,t]));let s=l==="center"?g[0]?.start??0:0;r.forEach((t,E)=>{const $=O.get(E);t[v]=$?.start??(l==="diverging"?0:s),t[c]=$?.end??(l==="diverging"?0:s),$!==void 0&&l!=="diverging"&&(s=$.end)})}}export{re as deriveAreaSeries,ie as deriveCenteredAreaSeries,oe as deriveDensityAreaSeries,ae as layoutDensityAreaSeries,_ as layoutRawAreaGroups};

package/src/grammar/axisTextPlacement.js

@@ -1 +1 @@
-import{resolveTextLines as o}from"../core/textMetrics.js";function a(e,{title:i=!1}={}){if(Object.hasOwn(e,"align")&&!["left","center","right"].includes(e.align))throw new TypeError("Axis text align must be left, center, or right.");if(i){if(Object.hasOwn(e,"baseline")&&!["top","hanging","middle","alphabetic","ideographic","bottom"].includes(e.baseline))throw new TypeError("Axis title baseline must be a supported text baseline.");for(const t of["offset","alongOffset"])if(Object.hasOwn(e,t)&&!Number.isFinite(e[t]))throw new TypeError(`Axis title ${t} must be a finite number.`)}}function f(e,i){if(!/[\r\n]/u.test(e))return;const t=i.baseline??"middle",n=o(e,{fontSize:i.fontSize,align:i.align??"center",baseline:t,...t==="middle"?{blockAlign:"middle"}:{}});if(["bottom","ideographic"].includes(t)){const s=(n.length-1)*i.fontSize*1.2;return n.map(r=>({...r,y:r.y-s}))}return n.length>1?n:void 0}export{f as axisTitleTextLines,a as validateAxisTextPlacement};
+import{resolveTextLines as l}from"../core/textMetrics.js";function a(e,{title:i=!1}={}){if(Object.hasOwn(e,"align")&&!["left","center","right"].includes(e.align))throw new TypeError("Axis text align must be left, center, or right.");if(i){if(Object.hasOwn(e,"overlap")&&!["error","allow"].includes(e.overlap))throw new TypeError("Axis title overlap must be error or allow.");if(Object.hasOwn(e,"baseline")&&!["top","hanging","middle","alphabetic","ideographic","bottom"].includes(e.baseline))throw new TypeError("Axis title baseline must be a supported text baseline.");for(const t of["offset","alongOffset"])if(Object.hasOwn(e,t)&&!Number.isFinite(e[t]))throw new TypeError(`Axis title ${t} must be a finite number.`)}}function f(e,i){if(!/[\r\n]/u.test(e))return;const t=i.baseline??"middle",n=l(e,{fontSize:i.fontSize,align:i.align??"center",baseline:t,...t==="middle"?{blockAlign:"middle"}:{}});if(["bottom","ideographic"].includes(t)){const o=(n.length-1)*i.fontSize*1.2;return n.map(r=>({...r,y:r.y-o}))}return n.length>1?n:void 0}function b(e){return e?.overlap==="allow"}export{b as axisTitleAllowsLabelOverlap,f as axisTitleTextLines,a as validateAxisTextPlacement};

package/src/grammar/bars/policy.js

@@ -32,7 +32,7 @@ export function resolveBarOrientation(layer) {
   const x = layer.encoding?.x;
   const y = layer.encoding?.y;
   if (hasNumericCenters(layer)) return layer.mark.orientation;
-  if (x?.bin !== undefined && y?.aggregate === "count") {
+  if (x?.bin !== undefined && isAggregate(y?.aggregate)) {
     return BAR_ORIENTATIONS.vertical;
   }
   if (isBarCategoryEncoding(x) && y?.fieldType === "quantitative" && layer.encoding?.y2?.fieldType === "quantitative") {
@@ -68,7 +68,7 @@ export function resolveBarGrain(layer) {
 
   if (
     x?.bin !== undefined &&
-    y?.aggregate === "count"
+    isAggregate(y?.aggregate)
   ) {
     return BAR_GRAINS.histogram;
   }

package/src/grammar/curveCommands.js

@@ -9,6 +9,7 @@ export const CURVE_INTERPOLATIONS = Object.freeze([
   "basis",
   "cardinal",
   "monotone",
+  "monotone-steffen",
   "natural"
 ]);
 
@@ -16,6 +17,7 @@ const SMOOTH_CURVES = new Set([
   "basis",
   "cardinal",
   "monotone",
+  "monotone-steffen",
   "natural"
 ]);
 
@@ -196,8 +198,38 @@ function monotoneTangents(points) {
   return tangents;
 }
 
-function buildMonotoneCommands(points) {
-  const tangents = monotoneTangents(points);
+function steffenTangents(points) {
+  const widths = points.slice(1).map((point, index) => point.x - points[index].x);
+  const direction = Math.sign(widths.find(width => width !== 0) ?? 0);
+  if (widths.some(width => width !== 0 && Math.sign(width) !== direction)) {
+    throw new Error("Steffen curve requires monotonic x values.");
+  }
+  const slopes = widths.map((width, i) =>
+    (points[i + 1].y - points[i].y) / (width || (direction < 0 ? -0 : 0)));
+  const tangents = Array(points.length);
+  for (let i = 1; i < points.length - 1; i += 1) {
+    const a = slopes[i - 1], b = slopes[i];
+    const mean = (a * widths[i] + b * widths[i - 1]) / (widths[i - 1] + widths[i]);
+    // A zero-width turn has no finite secant estimate; its Hermite limit is flat.
+    const sign = value => value < 0 ? -1 : 1;
+    const slope = (sign(a) + sign(b)) * Math.min(Math.abs(a), Math.abs(b), Math.abs(mean) / 2);
+    tangents[i] = Number.isNaN(slope) && (widths[i - 1] === 0 || widths[i] === 0) ? 0 : slope;
+  }
+  tangents[0] = widths[0] === 0 ? tangents[1] : (3 * slopes[0] - tangents[1]) / 2;
+  tangents[points.length - 1] = widths.at(-1) === 0 ? tangents.at(-2) :
+    (3 * slopes.at(-1) - tangents.at(-2)) / 2;
+  return tangents;
+}
+
+function buildSteffenCommands(points) {
+  const distinct = points.filter((point, i) => i === 0 ||
+    point.x !== points[i - 1].x || point.y !== points[i - 1].y);
+  if (distinct.length === 1) return ownCommands([{ op: "M", ...distinct[0] }]);
+  if (distinct.length === 2) return buildLinearPathCommands(distinct);
+  return buildMonotoneCommands(distinct, steffenTangents(distinct));
+}
+
+function buildMonotoneCommands(points, tangents = monotoneTangents(points)) {
   const commands = [{ op: "M", x: points[0].x, y: points[0].y }];
   for (let index = 1; index < points.length; index += 1) {
     const previous = points[index - 1];
@@ -274,6 +306,7 @@ function buildNaturalCommands(points) {
 }
 
 function buildValidatedCurvePathCommands(points, curve, tension) {
+  if (curve === "monotone-steffen") return buildSteffenCommands(points);
   if (curve === "linear" ||
       (SMOOTH_CURVES.has(curve) &&
         curve !== "monotone" &&