ggaction 0.0.18 → 0.0.20

package/src/actions/scales/consumers/common.js

@@ -1,5 +1,5 @@
 import { isSourceOwnedText } from "../../../grammar/text.js";
-import { readSeriesIdentity } from "../../../grammar/pathSeries.js";
+import { readSeriesIdentity, validatePathSeriesAppearance } from "../../../grammar/pathSeries.js";
 import { readAreaEndpoint } from "../../../grammar/areaEndpoints.js";
 import { readScaleField } from "../../../grammar/scales/index.js";
 import { findDataset } from "../../../selectors/datasets.js";
@@ -59,6 +59,12 @@ export function readConsumerFieldValues(
   if (consumer.layer.mark.type === "bar" && consumer.layer.encoding?.group !== undefined && ["xOffset", "yOffset"].includes(consumer.channel)) {
     return readSeriesIdentity(dataset.values, consumer.layer).values;
   }
+  if (consumer.layer.mark.type === "area" && consumer.channel === "color" && fieldType === "quantitative") {
+    validatePathSeriesAppearance(dataset.values, consumer.layer);
+    const identities = readSeriesIdentity(dataset.values, consumer.layer).values;
+    const values = readScaleField(dataset.values, field, fieldType);
+    return [...new Map(identities.map((identity, index) => [identity, values[index]])).values()];
+  }
   const parallel = consumer.role === "parallelDimension";
   if (!parallel && !isDirectCategoricalConsumer(consumer) &&
     fieldType !== "quantitative" && fieldType !== "temporal" &&

package/src/actions/scales/create.js

@@ -38,7 +38,7 @@ const CREATE_SCALE_OPTIONS = Object.freeze([
   "padding",
   "align",
   "palette",
-  "interpolate", "midpoint",
+  "interpolate", "whitePoint", "gamma", "midpoint",
   "radialMapping", "unknown"
 ]);
 
@@ -88,7 +88,7 @@ export const createScale = /* @__PURE__ */ action(
     const id = validateUserId(args.id, "Scale id");
     const type = validateScaleType(args.type ?? "linear");
     const colorType = isColorScaleType(type) && (
-      !["log", "sqrt", "symlog"].includes(type) || args.palette !== undefined ||
+      !["log", "pow", "sqrt", "symlog"].includes(type) || args.palette !== undefined ||
       args.interpolate !== undefined || (Array.isArray(args.range) && typeof args.range[0] === "string") ||
       args.range?.palette !== undefined
     );
@@ -171,7 +171,7 @@ export const createScale = /* @__PURE__ */ action(
 
     for (const property of [
       "emptyDomain", "nice", "zero", "clamp", "reverse", "base", "exponent", "constant",
-      "paddingInner", "paddingOuter", "padding", "align", "interpolate", "midpoint",
+      "paddingInner", "paddingOuter", "padding", "align", "interpolate", "whitePoint", "gamma", "midpoint",
       "radialMapping", "unknown"
     ]) {
       if (definition[property] === undefined) continue;

package/src/actions/scales/definitions.js

@@ -1 +1 @@
-import{prepareScaleEdit as M}from"./editPolicy.js";import{validateUserId as m}from"../../core/identifiers.js";import{isPlainObject as W}from"../../core/immutable.js";import{validateKeys as u}from"../../core/validation.js";import{validateColorRange as U,isContinuousColorScaleType as w,normalizeTransformParameters as B,validateTransformedDomain as F,validateContinuousColorInterpolation as K,validateSequentialMidpoint as Q,validateLinearScaleType as z,validateOpacityRange as H,validateOrdinalDomain as E,validateOrdinalScaleType as N,validateScaleDomain as h,validateScaleRange as _,validateShapeRange as V,validateStrokeDashRange as Y,validateStrokeWidthRange as Z,validateSequentialColorRange as G,validateDiscretizedColorDomain as J,validateDiscretizedColorRange as X,validateTimeScaleType as ee,normalizeScaleDefinition as k,SCALE_ROLES as P,validateScalePropertyForType as A,validateScaleTypeForRole as b,isDiscretePositionScaleType as te,normalizeSizeScaleDefinition as ae,withScaleUnknown as O}from"../../grammar/scales/index.js";import{validateRadialRange as ne,validateThetaRange as ie}from"../../grammar/polar.js";import{findSemanticScale as p}from"../../selectors/scales.js";import{normalizeOffsetScalePolicy as re}from"../../grammar/bars/geometry.js";import{resolveRequestedOffsetPolicy as oe}from"../../materialization/scales/policies/offset.js";import{findScaleConsumers as ce}from"./consumers/index.js";const T=["id","type","domain","range","emptyDomain"],j=[...T,"unknown"],S=["clamp","reverse"],v=["nice","zero",...S],q=["base","exponent","constant"],de=[...T,...v,...q,"paddingInner","paddingOuter","padding","align","unknown"],C=[...T,"palette","unknown"],L=[...C,"interpolate","midpoint","base","constant",...S],le=[...T,...v,"unknown"],se=[...T,...v,...q],ue=[...j,"clamp","reverse","base","exponent"];function y(i){if(!W(i))throw new TypeError("Encoding scale must be a plain object.")}function D(i,e,t){for(const a of e){if(i[a]!==void 0&&typeof i[a]!="boolean")throw new TypeError(`Scale ${a} must be a boolean.`);t!==void 0&&i[a]!==void 0&&A(t,a)}}function R(i,e,t,a){for(const n of a){const r=e[n]??t?.[n];r!==void 0&&(i[n]=r)}return i}function x(i){if(i.palette!==void 0&&i.range!==void 0)throw new Error("Color scale cannot specify both palette and range.")}function Ce(i,e,t,a,n={}){y(a),u(a,de,"scale");const r=m(a.id??e,"Scale id"),o=p(i,r),c=["ordinal","nominal"].includes(t),f=t==="temporal"?"time":c?n.discreteType??"point":"linear",d=a.type??o?.type??f;if(t==="temporal")ee(d);else if(c){if(!te(d))throw new Error(`Scale type "${d}" is not valid for discrete position.`)}else e==="theta"?z(d):b(d,P.quantitativePosition);const l={id:r,...k({type:d,previous:o,patch:{...a,...n.radialMapping===void 0?{}:{radialMapping:n.radialMapping}},defaults:{...o===void 0&&n.nice!==void 0?{nice:n.nice}:{},...o===void 0&&n.zero!==void 0&&(d!=="log"||n.zero)?{zero:n.zero}:{}},retainCoreOnTypeChange:!0,retainCompatibleOnTypeChange:!0,validateDomain:(g,s)=>c?E(s):h(s),validateRange:(g,s)=>e==="theta"?ie(s):e==="radius"?ne(s):_(s)})};return O(l,{...o,...a},e)}function De(i,e,t="color"){y(e),u(e,C,"scale"),x(e);const a=m(e.id??t,"Scale id"),n=p(i,a),r=n?.type==="ordinal"?n:void 0,o=e.palette===void 0?e.range:{palette:e.palette};return O({id:a,type:N(e.type??r?.type??"ordinal"),domain:E(e.domain??r?.domain??"auto"),range:U(o??r?.range??"auto")},{...r,...e},t)}function fe(i,e){if(i==="auto")return i;if(!Array.isArray(i)||i.length!==2)throw new TypeError("Continuous color domain must contain two values or auto.");const t=i.map(a=>e==="quantitative"?a:typeof a=="string"?Date.parse(a):a);if(!t.every(Number.isFinite)||t[0]===t[1])throw new TypeError("Continuous color domain requires two distinct valid values.");return t}function me(i,e,t,a="color"){y(t),u(t,L,"scale"),x(t);const n=m(t.id??a,"Scale id"),r=p(i,n),o=w(r?.type)?r:void 0,c=t.type??o?.type??"sequential";if(!w(c))throw new Error(`Unsupported continuous color scale type "${c}".`);D(t,S);const f=t.palette===void 0?t.range:{palette:t.palette},d={id:n,type:c,domain:fe(t.domain??o?.domain??"auto",e),range:G(f??o?.range??{palette:"viridis"}),interpolate:K(t.interpolate??o?.interpolate??"rgb")};if(c!=="sequential"&&e!=="quantitative")throw new Error(`Scale type "${c}" requires quantitative color.`);const l=Object.fromEntries(["base","constant"].flatMap(s=>{const I=t[s]??o?.[s];return I===void 0?[]:[[s,I]]}));if(c!=="sequential"){const s=B(c,l);c==="log"&&(d.base=s.base),c==="symlog"&&(d.constant=s.constant),d.domain!=="auto"&&F(c,d.domain,l)}else if(Object.keys(l).length)throw new Error("Sequential color does not support transform parameters.");const g=Q(Object.hasOwn(t,"midpoint")?t.midpoint:o?.midpoint,c,d.domain);if(g!==void 0){if(e!=="quantitative")throw new Error("Scale midpoint requires quantitative color consumers.");d.midpoint=g}return O(R(d,t,o,S),{...o,...t},a)}function Re(i,e,t,a="color"){y(t);const n=p(i,t.id??a),r=n!==void 0&&(w(n.type)||["quantize","quantile","threshold"].includes(n.type)),o=t.type??(r?n.type:"sequential");if(r&&n.type!==o){if(u(t,w(o)?L:[...C,...S],"scale"),e!=="quantitative")throw new Error("Color scale type transition requires quantitative color.");return{id:n.id,...M(i,n,a,[],t)}}if(w(o))return me(i,e,t,a);if(u(t,[...C,...S],"scale"),e!=="quantitative")throw new Error(`Scale type "${o}" requires quantitative color.`);b(o,P.discretizedColor),x(t),D(t,S,o);const c=m(t.id??a,"Scale id"),f=n?.type===o?n:void 0,d=t.palette===void 0?t.range:{palette:t.palette},l={id:c,type:o,domain:J(o,t.domain??f?.domain??"auto"),range:X(d??f?.range??{palette:"viridis"})};return O(R(l,t,f,S),{...n,...t},a)}function $(i,e,t,a){y(e),u(e,j,"scale");const n=m(e.id??t,"Scale id"),r=p(i,n);return O({id:n,type:N(e.type??r?.type??"ordinal"),domain:E(e.domain??r?.domain??"auto"),range:a(e.range??r?.range??"auto")},{...r,...e},t)}function he(i,e){return $(i,e,"strokeDash",Y)}function Pe(i,e,t,a="quantitative"){if(y(t),e==="size"){u(t,ue,"scale");const n=m(t.id??e,"Scale id"),r=p(i,n),o=["nominal","ordinal"].includes(a),c=ae({previous:r,patch:{...t,type:t.type??r?.type??(o?"ordinal":"linear")}});if(c.type==="ordinal"!==o)throw new Error("Size scale type must match its field type.");return{id:n,...c}}return $(i,t,e,V)}function be(i,e){y(e),u(e,le,"scale");const t=m(e.id??"opacity","Scale id"),a=p(i,t),n=z(e.type??a?.type??"linear");D(e,v,n);const r={id:t,type:n,domain:h(e.domain??a?.domain??"auto"),range:H(e.range??a?.range??"auto")};return O(R(r,e,a,v),{...a,...e},"opacity")}function xe(i,e){y(e),u(e,se,"scale");const t=m(e.id??"strokeWidth","Scale id"),a=p(i,t),n=e.type??a?.type??"linear";b(n,P.quantitativePosition),D(e,v,n);for(const c of q)e[c]!==void 0&&A(n,c);const r=h(e.domain??a?.domain??"auto");if(r!=="auto"&&r.some(c=>c<0))throw new RangeError("StrokeWidth scale domain cannot contain negative values.");const o={id:t,type:n,domain:r,range:Z(e.range??a?.range??"auto")};return R(o,e,a,[...v,...q])}function Ie(i,e,t="xOffset"){y(e),u(e,["id","type","domain","range","reverse","padding","paddingInner","paddingOuter","align"],"scale");const a=m(e.id??t,"Scale id"),n=p(i,a),r=e.type??n?.type??"ordinal";if(r!=="ordinal")throw new Error(`Scale type "${r}" is not valid for ${t}.`);if(Object.hasOwn(e,"range")&&e.range!=="auto")throw new Error(`${t} scale range is derived from its parent categorical slot.`);const o=ce(i,a).filter(l=>l.channel===t),c=oe({scale:n,consumers:o,markConfigs:i.markConfigs,id:a,channel:t}),f=re(e,c,t),d=Object.fromEntries(Object.entries(e).filter(([l])=>!["id","padding"].includes(l)));return{id:a,...k({type:r,previous:n,patch:{...d,...f},allowOrdinalBandParameters:!0,validateDomain:(l,g)=>E(g),validateRange:(l,g)=>_(g)})}}export{Pe as resolveAppearanceScaleDefinition,De as resolveColorScaleDefinition,Ie as resolveOffsetScaleDefinition,be as resolveOpacityScaleDefinition,Ce as resolvePositionScaleDefinition,Re as resolveQuantitativeColorScaleDefinition,me as resolveSequentialColorScaleDefinition,he as resolveStrokeDashScaleDefinition,xe as resolveStrokeWidthScaleDefinition};
+import{prepareScaleEdit as U}from"./editPolicy.js";import{validateUserId as p}from"../../core/identifiers.js";import{isPlainObject as B}from"../../core/immutable.js";import{validateKeys as f}from"../../core/validation.js";import{validateColorRange as F,isContinuousColorScaleType as E,normalizeTransformParameters as K,validateTransformedDomain as Q,validateContinuousColorInterpolation as H,normalizeColorInterpolationOptions as V,validateSequentialMidpoint as Y,validateLinearScaleType as _,validateOpacityRange as Z,validateOrdinalDomain as h,validateOrdinalScaleType as j,validateScaleDomain as P,validateScaleRange as k,validateShapeRange as G,validateStrokeDashRange as J,validateStrokeWidthRange as X,validateSequentialColorRange as ee,validateDiscretizedColorDomain as te,validateDiscretizedColorRange as ne,validateTimeScaleType as ae,normalizeScaleDefinition as A,SCALE_ROLES as R,validateScalePropertyForType as L,validateScaleTypeForRole as I,isDiscretePositionScaleType as ie,normalizeSizeScaleDefinition as re,withScaleUnknown as w}from"../../grammar/scales/index.js";import{validateRadialRange as oe,validateThetaRange as ce}from"../../grammar/polar.js";import{findSemanticScale as g}from"../../selectors/scales.js";import{normalizeOffsetScalePolicy as le}from"../../grammar/bars/geometry.js";import{resolveRequestedOffsetPolicy as de}from"../../materialization/scales/policies/offset.js";import{findScaleConsumers as se}from"./consumers/index.js";const C=["id","type","domain","range","emptyDomain"],M=[...C,"unknown"],S=["clamp","reverse"],O=["nice","zero",...S],q=["base","exponent","constant"],ue=[...C,...O,...q,"paddingInner","paddingOuter","padding","align","unknown"],D=[...C,"palette","unknown"],$=[...D,"interpolate","whitePoint","gamma","midpoint","base","exponent","constant",...S],fe=[...C,...O,"unknown"],me=[...C,...O,...q],pe=[...M,"clamp","reverse","base","exponent"];function y(i){if(!B(i))throw new TypeError("Encoding scale must be a plain object.")}function b(i,t,e){for(const n of t){if(i[n]!==void 0&&typeof i[n]!="boolean")throw new TypeError(`Scale ${n} must be a boolean.`);e!==void 0&&i[n]!==void 0&&L(e,n)}}function x(i,t,e,n){for(const a of n){const o=t[a]??e?.[a];o!==void 0&&(i[a]=o)}return i}function z(i){if(i.palette!==void 0&&i.range!==void 0)throw new Error("Color scale cannot specify both palette and range.")}function be(i,t,e,n,a={}){y(n),f(n,ue,"scale");const o=p(n.id??t,"Scale id"),r=g(i,o),c=["ordinal","nominal"].includes(e),m=e==="temporal"?"time":c?a.discreteType??"point":"linear",l=n.type??r?.type??m;if(e==="temporal")ae(l);else if(c){if(!ie(l))throw new Error(`Scale type "${l}" is not valid for discrete position.`)}else t==="theta"?_(l):I(l,R.quantitativePosition);const s={id:o,...A({type:l,previous:r,patch:{...n,...a.radialMapping===void 0?{}:{radialMapping:a.radialMapping}},defaults:{...r===void 0&&a.nice!==void 0?{nice:a.nice}:{},...r===void 0&&a.zero!==void 0&&(l!=="log"||a.zero)?{zero:a.zero}:{}},retainCoreOnTypeChange:!0,retainCompatibleOnTypeChange:!0,validateDomain:(v,u)=>c?h(u):P(u),validateRange:(v,u)=>t==="theta"?ce(u):t==="radius"?oe(u):k(u)})};return w(s,{...r,...n},t)}function xe(i,t,e="color"){y(t),f(t,D,"scale"),z(t);const n=p(t.id??e,"Scale id"),a=g(i,n),o=a?.type==="ordinal"?a:void 0,r=t.palette===void 0?t.range:{palette:t.palette};return w({id:n,type:j(t.type??o?.type??"ordinal"),domain:h(t.domain??o?.domain??"auto"),range:F(r??o?.range??"auto")},{...o,...t},e)}function ge(i,t){if(i==="auto")return i;if(!Array.isArray(i)||i.length!==2)throw new TypeError("Continuous color domain must contain two values or auto.");const e=i.map(n=>t==="quantitative"?n:typeof n=="string"?Date.parse(n):n);if(!e.every(Number.isFinite)||e[0]===e[1])throw new TypeError("Continuous color domain requires two distinct valid values.");return e}function ye(i,t,e,n="color"){y(e),f(e,$,"scale"),z(e);const a=p(e.id??n,"Scale id"),o=g(i,a),r=E(o?.type)?o:void 0,c=e.type??r?.type??"sequential";if(!E(c))throw new Error(`Unsupported continuous color scale type "${c}".`);b(e,S);const m=e.palette===void 0?e.range:{palette:e.palette},l={id:a,type:c,domain:ge(e.domain??r?.domain??"auto",t),range:ee(m??r?.range??{palette:"viridis"}),interpolate:H(e.interpolate??r?.interpolate??"rgb")},s=Object.hasOwn(e,"interpolate")&&e.interpolate!==r?.interpolate,v=Object.fromEntries(["whitePoint","gamma"].flatMap(d=>{const T=Object.hasOwn(e,d)?e[d]:s?void 0:r?.[d];return T===void 0?[]:[[d,T]]}));if(Object.assign(l,V(l.interpolate,v)),c!=="sequential"&&t!=="quantitative")throw new Error(`Scale type "${c}" requires quantitative color.`);const u=Object.fromEntries(["base","exponent","constant"].flatMap(d=>{const T=e[d]??(c===r?.type?r?.[d]:void 0);return T===void 0?[]:[[d,T]]}));if(c!=="sequential"){const d=K(c,u);c==="log"&&(l.base=d.base),c==="pow"&&(l.exponent=d.exponent),c==="symlog"&&(l.constant=d.constant),l.domain!=="auto"&&Q(c,l.domain,u)}else if(Object.keys(u).length)throw new Error("Sequential color does not support transform parameters.");const N=Y(Object.hasOwn(e,"midpoint")?e.midpoint:r?.midpoint,c,l.domain);if(N!==void 0){if(t!=="quantitative")throw new Error("Scale midpoint requires quantitative color consumers.");l.midpoint=N}return w(x(l,e,r,S),{...r,...e},n)}function Pe(i,t,e,n="color"){y(e);const a=g(i,e.id??n),o=a!==void 0&&(E(a.type)||["quantize","quantile","threshold"].includes(a.type)),r=e.type??(o?a.type:"sequential");if(o&&a.type!==r){if(f(e,E(r)?$:[...D,...S],"scale"),t!=="quantitative")throw new Error("Color scale type transition requires quantitative color.");return{id:a.id,...U(i,a,n,[],e)}}if(E(r))return ye(i,t,e,n);if(f(e,[...D,...S],"scale"),t!=="quantitative")throw new Error(`Scale type "${r}" requires quantitative color.`);I(r,R.discretizedColor),z(e),b(e,S,r);const c=p(e.id??n,"Scale id"),m=a?.type===r?a:void 0,l=e.palette===void 0?e.range:{palette:e.palette},s={id:c,type:r,domain:te(r,e.domain??m?.domain??"auto"),range:ne(l??m?.range??{palette:"viridis"})};return w(x(s,e,m,S),{...a,...e},n)}function W(i,t,e,n){y(t),f(t,M,"scale");const a=p(t.id??e,"Scale id"),o=g(i,a);return w({id:a,type:j(t.type??o?.type??"ordinal"),domain:h(t.domain??o?.domain??"auto"),range:n(t.range??o?.range??"auto")},{...o,...t},e)}function Re(i,t){return W(i,t,"strokeDash",J)}function Ie(i,t,e,n="quantitative"){if(y(e),t==="size"){f(e,pe,"scale");const a=p(e.id??t,"Scale id"),o=g(i,a),r=["nominal","ordinal"].includes(n),c=re({previous:o,patch:{...e,type:e.type??o?.type??(r?"ordinal":"linear")}});if(c.type==="ordinal"!==r)throw new Error("Size scale type must match its field type.");return{id:a,...c}}return W(i,e,t,G)}function ze(i,t){y(t),f(t,fe,"scale");const e=p(t.id??"opacity","Scale id"),n=g(i,e),a=_(t.type??n?.type??"linear");b(t,O,a);const o={id:e,type:a,domain:P(t.domain??n?.domain??"auto"),range:Z(t.range??n?.range??"auto")};return w(x(o,t,n,O),{...n,...t},"opacity")}function Ne(i,t){y(t),f(t,me,"scale");const e=p(t.id??"strokeWidth","Scale id"),n=g(i,e),a=t.type??n?.type??"linear";I(a,R.quantitativePosition),b(t,O,a);for(const c of q)t[c]!==void 0&&L(a,c);const o=P(t.domain??n?.domain??"auto");if(o!=="auto"&&o.some(c=>c<0))throw new RangeError("StrokeWidth scale domain cannot contain negative values.");const r={id:e,type:a,domain:o,range:X(t.range??n?.range??"auto")};return x(r,t,n,[...O,...q])}function _e(i,t,e="xOffset"){y(t),f(t,["id","type","domain","range","reverse","padding","paddingInner","paddingOuter","align"],"scale");const n=p(t.id??e,"Scale id"),a=g(i,n),o=t.type??a?.type??"ordinal";if(o!=="ordinal")throw new Error(`Scale type "${o}" is not valid for ${e}.`);if(Object.hasOwn(t,"range")&&t.range!=="auto")throw new Error(`${e} scale range is derived from its parent categorical slot.`);const r=se(i,n).filter(s=>s.channel===e),c=de({scale:a,consumers:r,markConfigs:i.markConfigs,id:n,channel:e}),m=le(t,c,e),l=Object.fromEntries(Object.entries(t).filter(([s])=>!["id","padding"].includes(s)));return{id:n,...A({type:o,previous:a,patch:{...l,...m},allowOrdinalBandParameters:!0,validateDomain:(s,v)=>h(v),validateRange:(s,v)=>k(v)})}}export{Ie as resolveAppearanceScaleDefinition,xe as resolveColorScaleDefinition,_e as resolveOffsetScaleDefinition,ze as resolveOpacityScaleDefinition,be as resolvePositionScaleDefinition,Pe as resolveQuantitativeColorScaleDefinition,ye as resolveSequentialColorScaleDefinition,Re as resolveStrokeDashScaleDefinition,Ne as resolveStrokeWidthScaleDefinition};

package/src/actions/scales/edit.js

@@ -28,7 +28,7 @@ import { hasExactLegendSamplingForScale } from
 const OPTIONS = Object.freeze([
   "id", "type", "domain", "range", "emptyDomain", "nice", "zero", "clamp", "reverse",
   "base", "exponent", "constant", "paddingInner", "paddingOuter", "padding",
-  "align", "interpolate", "midpoint", "unknown", "palette", "radialMapping"
+  "align", "interpolate", "whitePoint", "gamma", "midpoint", "unknown", "palette", "radialMapping"
 ]);
 const EDITABLE = Object.freeze(
   OPTIONS.filter(option => !["id", "palette"].includes(option))

package/src/actions/scales/editPolicy.js

@@ -12,6 +12,7 @@ import {
   validateDiscretizedColorDomain,
   validateDiscretizedColorRange,
   validateOrdinalDomain,
+  validateOrdinalRange,
   validateScaleDomain,
   validateScaleRange,
   validateScaleType,
@@ -66,6 +67,7 @@ function validateRangeForChannel(scale, channel, value) {
   if (channel === "strokeDash") return validateStrokeDashRange(value);
   if (channel === "size") return validateSizeRange(value);
   if (channel === "strokeWidth") return validateStrokeWidthRange(value);
+  if (channel === undefined) return validateOrdinalRange(value);
   return validateScaleRange(value);
 }
 
@@ -217,6 +219,7 @@ function normalizeDefinition(program, scale, channel, consumers, patch) {
     patch: normalizedPatch,
     retainCoreOnTypeChange: true,
     retainCompatibleOnTypeChange: true,
+    allowColorReset: true,
     allowOrdinalBandParameters: offset,
     validateDomain: (scaleType, value) =>
       isDiscretizedColorScaleType(scaleType)

package/src/actions/scales/patch.js

@@ -1,7 +1,7 @@
 const SCALE_EDIT_PROPERTIES = Object.freeze([
   "type", "domain", "range", "emptyDomain", "nice", "zero", "clamp", "reverse",
   "base", "exponent", "constant", "paddingInner", "paddingOuter",
-  "padding", "align", "interpolate", "midpoint", "unknown"
+  "padding", "align", "interpolate", "whitePoint", "gamma", "midpoint", "unknown"
 ]);
 
 function sameValue(left, right) {

package/src/actions/scales/quantitativeColor.js

@@ -7,7 +7,7 @@ const OPTIONS = Object.freeze([
   "type",
   "domain",
   "range",
-  "interpolate", "midpoint", "base", "constant",
+  "interpolate", "whitePoint", "gamma", "midpoint", "base", "exponent", "constant",
   "clamp",
   "reverse",
   "unknown"
@@ -19,7 +19,7 @@ export const setQuantitativeColorScale = /* @__PURE__ */ closedAction(
     description: "Create or update an internal quantitative color scale."
   }, OPTIONS,
   function (args = {}) {
-    if (!["sequential", "log", "sqrt", "symlog", "quantize", "quantile", "threshold"].includes(args.type)) {
+    if (!["sequential", "log", "pow", "sqrt", "symlog", "quantize", "quantile", "threshold"].includes(args.type)) {
       throw new Error(`Unsupported quantitative color scale type "${args.type}".`);
     }
     const existing = findSemanticScale(this, args.id);
@@ -30,11 +30,16 @@ export const setQuantitativeColorScale = /* @__PURE__ */ closedAction(
       return this.editScale(args);
     }
     let next = this;
+    for (const property of ["whitePoint", "gamma"]) {
+      if (existing?.[property] !== undefined && args[property] === undefined) {
+        next = next.editSemantic({ property: `scale[${args.id}].${property}`, remove: true });
+      }
+    }
     if (existing?.midpoint !== undefined && args.midpoint === undefined) {
       next = next.editSemantic({ property: `scale[${args.id}].midpoint`, remove: true });
     }
     for (const property of [
-      "type", "domain", "range", "interpolate", "midpoint", "base", "constant", "clamp", "reverse", "unknown"
+      "type", "domain", "range", "interpolate", "whitePoint", "gamma", "midpoint", "base", "exponent", "constant", "clamp", "reverse", "unknown"
     ]) {
       if (!Object.hasOwn(args, property)) continue;
       if (existing?.[property] === args[property]) continue;

package/src/actions/theme/reconcile.js

@@ -1,3 +1,4 @@
+import { synchronizeFacetLegendAppearance } from "../../materialization/facetGuides/owner.js";
 import { rematerializeTypography } from "../../materialization/typography.js";
 import { AXIS_LABEL_FONT_SIZES, AXIS_TITLE_FONT_SIZE, themeTokens } from "../../theme/defaults.js";
 import {
@@ -182,7 +183,7 @@ function componentRole(program, id, property) {
 }
 
 function graphicRole(program, id, property) {
-  const axisPart = /Axis(Labels|Titles?)$/u.exec(id);
+  const axisPart = /(?:Axis|^axis_.+__)(Labels|Titles?)$/u.exec(id);
   const scoped = axisPart === null ? undefined : axisTextRole(property, axisPart[1] === "Labels" ? "labels" : "title");
   if (scoped !== undefined) return scoped;
   if (property === "fontFamily") return "fontFamily";
@@ -200,11 +201,11 @@ function graphicRole(program, id, property) {
     }
     return layer.mark?.type === "text" ? "text" : "mark";
   }
-  if (/AxisLines?$/u.test(id) && property === "stroke") return "axis";
-  if (/AxisTicks$/u.test(id) && property === "stroke") return "mutedText";
+  if (/(?:Axis|^axis_.+__)Lines?$/u.test(id) && property === "stroke") return "axis";
+  if (/(?:Axis|^axis_.+__)Ticks$/u.test(id) && property === "stroke") return "mutedText";
   if (/^parallelAxisLabels$/u.test(id) && property === "fill") return "axis";
-  if (/AxisLabels$/u.test(id) && property === "fill") return "text";
-  if (/AxisTitles?$/u.test(id) && property === "fill") return "axisTitle";
+  if (/(?:Axis|^axis_.+__)Labels$/u.test(id) && property === "fill") return "text";
+  if (/(?:Axis|^axis_.+__)Titles?$/u.test(id) && property === "fill") return "axisTitle";
   if (/Grid(?:Lines|Circles)?$/u.test(id) && property === "stroke") return "grid";
   if (id === "chartTitle" && property === "fill") return "strongText";
   if (id === "chartSubtitle" && property === "fill") return "mutedText";
@@ -676,12 +677,13 @@ function clearRemovedResources(overrides, node) {
       clearPrefix(overrides, `g:${mark[1]}.`);
       return;
     }
-    const axis = /^guide\.axis\.(x|y|theta|radius)$/u
+    const axis = /^guide\.axis\.([A-Za-z0-9_-]+)$/u
       .exec(current.args.property);
     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:${prefix}Axis`);
+      clearPrefix(overrides, `g:${graphicPrefix}`);
       return;
     }
     const grid = /^guide\.grid\.([^\.]+)$/u.exec(current.args.property);
@@ -737,7 +739,23 @@ function clearRecreatedOverrides(overrides, op, args) {
   }
 }
 
-function addAxisOverrides(overrides, op, args) {
+function axisOverrideId(node, channel, args) {
+  if (args.target !== undefined || args.id !== undefined) return args.target ?? args.id;
+  const ids = new Set();
+  const visit = entry => {
+    if (["createGraphics", "editGraphics"].includes(entry.op)) {
+      const id = entry.args.target ?? entry.args.id;
+      const named = /^axis_(.+)__(Line|Ticks|Labels|Title)$/u.exec(id ?? "");
+      if (named !== null) ids.add(named[1]);
+      else if (new RegExp(`^${channel}Axis(?:Line|Ticks|Labels|Title)$`).test(id ?? "")) ids.add(channel);
+    }
+    entry.children?.forEach(visit);
+  };
+  if (node !== undefined) visit(node);
+  return ids.size === 1 ? [...ids][0] : channel;
+}
+
+function addAxisOverrides(overrides, op, args, node) {
   const match = /^(?:create|edit)(X|Y|Theta|Radial)Axis(Line|Ticks|Labels|Title)$/u
     .exec(op);
   if (match === null) return;
@@ -748,23 +766,25 @@ function addAxisOverrides(overrides, op, args) {
     Radial: "radius"
   }[match[1]];
   const component = match[2].toLowerCase();
+  const axisId = axisOverrideId(node, channel, args);
   const idPrefix = match[1] === "Radial" ? "radial" : channel;
   if (Object.hasOwn(args, "color")) {
-    overrides.add(`c:guides.axis.${channel}.${component}.color`);
+    overrides.add(`c:guides.axis.${axisId}.${component}.color`);
     overrides.add(
-      `g:${idPrefix}Axis${match[2]}.${component === "line" || component === "ticks" ? "stroke" : "fill"}`
+      `g:${axisId === channel ? `${idPrefix}Axis` : `axis_${axisId}__`}${match[2]}.${component === "line" || component === "ticks" ? "stroke" : "fill"}`
     );
   }
   for (const property of ["fontFamily", "fontSize"]) {
     if (["labels", "title"].includes(component) && Object.hasOwn(args, property)) {
-      overrides.add(`c:guides.axis.${channel}.${component}.${property}`);
-      overrides.add(`g:${idPrefix}Axis${match[2]}.${property}`);
+      overrides.add(`c:guides.axis.${axisId}.${component}.${property}`);
+      overrides.add(`g:${axisId === channel ? `${idPrefix}Axis` : `axis_${axisId}__`}${match[2]}.${property}`);
     }
   }
 }
 
-function addCompleteAxisOverride(overrides, name, args) {
+function addCompleteAxisOverride(overrides, name, args, node) {
   const channel = { X: "x", Y: "y", Theta: "theta", Radial: "radius" }[name];
+  const axisId = axisOverrideId(node, channel, args);
   const idPrefix = name === "Radial" ? "radial" : channel;
   const components = {
     line: args.line,
@@ -779,21 +799,21 @@ function addCompleteAxisOverride(overrides, name, args) {
   for (const [component, options] of Object.entries(components)) {
     const suffix = `${component[0].toUpperCase()}${component.slice(1)}`;
     if (Object.hasOwn(options ?? {}, "color")) {
-      overrides.add(`c:guides.axis.${channel}.${component}.color`);
+      overrides.add(`c:guides.axis.${axisId}.${component}.color`);
       overrides.add(
-        `g:${idPrefix}Axis${suffix}.${component === "line" || component === "ticks" ? "stroke" : "fill"}`
+        `g:${axisId === channel ? `${idPrefix}Axis` : `axis_${axisId}__`}${suffix}.${component === "line" || component === "ticks" ? "stroke" : "fill"}`
       );
     }
     for (const property of ["fontFamily", "fontSize"]) {
       if (["labels", "title"].includes(component) && Object.hasOwn(options ?? {}, property)) {
-        overrides.add(`c:guides.axis.${channel}.${component}.${property}`);
-        overrides.add(`g:${idPrefix}Axis${suffix}.${property}`);
+        overrides.add(`c:guides.axis.${axisId}.${component}.${property}`);
+        overrides.add(`g:${axisId === channel ? `${idPrefix}Axis` : `axis_${axisId}__`}${suffix}.${property}`);
       }
     }
   }
 }
 
-function addCompleteAxisOverrides(overrides, op, args) {
+function addCompleteAxisOverrides(overrides, op, args, node) {
   if (args.guides?.axes !== null && typeof args.guides?.axes === "object") {
     addCompleteAxisOverrides(overrides, "createAxes", args.guides.axes);
   }
@@ -801,10 +821,10 @@ function addCompleteAxisOverrides(overrides, op, args) {
     addCompleteAxisOverrides(overrides, "createAxes", args.axes);
   }
   const match = /^(?:create|edit)(X|Y|Theta|Radial)Axis$/u.exec(op);
-  if (match !== null) addCompleteAxisOverride(overrides, match[1], args);
+  if (match !== null) addCompleteAxisOverride(overrides, match[1], args, node);
   const group = /^(?:create|edit)(X|Y)AxisTicksAndLabels$/u.exec(op);
   if (group !== null) {
-    addCompleteAxisOverride(overrides, group[1], { ticksAndLabels: args });
+    addCompleteAxisOverride(overrides, group[1], { target: args.target, ticksAndLabels: args }, node);
   }
   if (op !== "createAxes") return;
   for (const [option, name] of [
@@ -814,7 +834,7 @@ function addCompleteAxisOverrides(overrides, op, args) {
     ["radius", "Radial"]
   ]) {
     if (args[option] && typeof args[option] === "object") {
-      addCompleteAxisOverride(overrides, name, args[option]);
+      for (const entry of Array.isArray(args[option]) ? args[option] : [args[option]]) addCompleteAxisOverride(overrides, name, entry);
     }
   }
 }
@@ -977,8 +997,8 @@ function explicitOverrides(program, node) {
   addErrorBarOverrides(overrides, program, node);
   addErrorBandOverrides(overrides, program, node);
   addRegressionOverrides(overrides, node);
-  addAxisOverrides(overrides, op, args);
-  addCompleteAxisOverrides(overrides, op, args);
+  addAxisOverrides(overrides, op, args, node);
+  addCompleteAxisOverrides(overrides, op, args, node);
   addGridOverrides(overrides, op, args);
   addParallelOverrides(overrides, program, op, args);
   if (["createTitle", "editTitle"].includes(op)) {
@@ -999,6 +1019,11 @@ function explicitOverrides(program, node) {
   if (op === "editLegendBlock") {
     addLegendBlockOverrides(overrides, program, args);
   }
+  const parentLegendOptions = op === "editFacetGuides" ? args.legend
+    : ["facet", "facetGrid", "repeatCharts"].includes(op) ? args.guides?.legend : undefined;
+  if (parentLegendOptions !== null && typeof parentLegendOptions === "object") {
+    addLegendOverrides(overrides, program, parentLegendOptions);
+  }
   if (op === "editFacetHeaders") {
     addFacetOverrides(overrides, program, args);
   }
@@ -1084,6 +1109,8 @@ export function reconcileProgramTheme(program, { source, metadata }) {
     next = next._withMaterializationConfig(["facets"], configs.value.facets);
   }
 
+  if (configs.changed) next = synchronizeFacetLegendAppearance(next);
+
   const facetsChanged = configs.value.facets !==
     themed.materializationConfigs.facets;
   const typographyChanged = sourceTokens.fontFamily !== targetTokens.fontFamily ||

package/src/core/compositionState.js

@@ -202,10 +202,10 @@ function validateFacetSpec(compositionSpec) {
     !isPlainObject(guides) ||
     Object.keys(guides).some(key => !["axes", "legend"].includes(key)) ||
     !["each", "outer"].includes(guides.axes) ||
-    ![false, "shared"].includes(guides.legend)
+    (![false, "shared"].includes(guides.legend) && !isPlainObject(guides.legend))
   ) {
     throw new Error(
-      'compositionSpec.facet.guides requires axes "each" or "outer" and legend false or "shared".'
+      'compositionSpec.facet.guides requires axes "each" or "outer" and legend false, "shared", or parent legend options.'
     );
   }
 }

package/src/core/graphicProperties.js

@@ -0,0 +1 @@
+function n(e,t,i){for(const[r,c]of Object.entries(i))e=e.editGraphics({target:t,property:r,value:c});return e}export{n as editGraphicProperties};

package/src/core/programState.js

@@ -44,6 +44,10 @@ export function releaseNamedResourceOwnership(program, { kind, id, dataOwner })
     materializationConfigs,
     ["calculations", "datasets", dataOwner?.current ?? id]
   ).value;
+  materializationConfigs = removeMaterializationConfig(
+    materializationConfigs,
+    ["regressionFits", dataOwner?.current ?? id]
+  ).value;
   const context = program.context.currentData === id
     ? freezeOwned({ ...program.context, currentData: undefined })
     : program.context;

package/src/core/resourceReferences.js

@@ -97,7 +97,7 @@ export function collectSemanticScaleReferences(program) {
     }
   }
   collectKnownKeys(program.semanticSpec.guides, [], (key, value, path) => {
-    if (key === "scale") {
+    if (["scale", "colorScale", "sizeScale"].includes(key)) {
       append(references, reference(
         "scale", value, "semanticGuide", "guides", path
       ));
@@ -208,7 +208,7 @@ export function collectGuideConfigReferences(program) {
       const relativePath = parentPath.length === 0
         ? path
         : path.slice(parentPath.length);
-      if (key === "scale") {
+      if (["scale", "colorScale", "sizeScale"].includes(key)) {
         append(references, reference(
           "scale", value, family, ownerId, relativePath
         ));

package/src/core/validation.js

@@ -1,5 +1,6 @@
 import { annotateError } from "./diagnostics.js";
 import { isPlainObject } from "./immutable.js";
+import { getMarkGraphicTypes } from "./vocabulary.js";
 
 export const MAX_GENERATED_ITEMS = 10_000;
 export const MAX_WORK_ITEMS = 10_000_000;
@@ -30,6 +31,14 @@ export function validateWorkLimit(value, label) {
   return validateGeneratedItemLimit(value, label, MAX_WORK_ITEMS);
 }
 
+export function validateGraphicItemLimit(value, capacity) {
+  const point = capacity.pointOwned && getMarkGraphicTypes("point").includes(capacity.graphicType);
+  const label = point ? "Point mark item count" : capacity.label;
+  const maximum = point ? 50_000 : MAX_GENERATED_ITEMS;
+  if (point) validateGeneratedItemLimit(capacity.rawCount, label, maximum);
+  return validateGeneratedItemLimit(value, label, maximum);
+}
+
 export function validateKeys(value, supported, label) {
   for (const key of Object.keys(value)) {
     if (!supported.includes(key)) {

package/src/core/vocabulary.js

@@ -220,6 +220,7 @@ export const LEGEND_CHANNELS = Object.freeze([
 ]);
 
 export const LEGEND_CONFIG_KINDS = Object.freeze([
+  "colorSize",
   "series",
   "color",
   "stroke",
@@ -239,3 +240,5 @@ export function includesVocabulary(vocabulary, value) {
 export const PLOT_LEGEND_POSITIONS = Object.freeze(["top-left", "top-right", "bottom-left", "bottom-right"]);
 export const LEGEND_POSITIONS = Object.freeze(["left", "right", "top", "bottom", ...PLOT_LEGEND_POSITIONS]);
 export const LEGEND_BLOCK_LAYOUTS = Object.freeze(["row", "column", "wrap"]);
+
+export const AXIS_RESOURCE_CHANNELS = Object.freeze(["x", "y", "theta", "radius", "parallel"]);

package/src/grammar/aggregate.js

@@ -40,7 +40,7 @@ export function isAggregate(value) {
   return isScalarAggregate(value) || isParameterizedAggregate(value);
 }
 
-export function validateAggregate(value) {
+export function validateAggregate(value, { allowBootstrap = false } = {}) {
   if (typeof value === "string") {
     if (!SCALAR_OPERATIONS.has(value)) {
       throw new Error(`Unsupported aggregate "${value}".`);
@@ -97,7 +97,8 @@ export function validateAggregate(value) {
       op: value.op,
       ...normalizeConfidenceInterval(value, {
         defaultMethod: "normal",
-        label: "Aggregate confidence interval"
+        label: "Aggregate confidence interval",
+        allowBootstrap
       })
     };
   }