@genome-spy/core 0.65.0 → 0.66.1

package/dist/src/gl/glslScaleGenerator.d.ts

@@ -71,7 +71,7 @@ export function generateConditionalEncoderGlsl(channel: Channel, accessors: impo
 /**
  * @param {Channel} channel
  */
-export function getScaledDataTypeForChannel(channel: Channel): "vec3" | "uint" | "float";
+export function getScaledDataTypeForChannel(channel: Channel): "float" | "vec3" | "uint";
 /**
  *
  * @param {import("../types/encoder.js").VegaScale} scale

package/dist/src/gl/webGLHelper.d.ts

@@ -104,10 +104,10 @@ export default class WebGLHelper {
      *
      * TODO: This may be too specific to be included in WebGLHelper. Find a better place.
      *
-     * @param {import("../view/scaleResolution.js").default} resolution
+     * @param {import("../scales/scaleResolution.js").default} resolution
      * @param {boolean} update Update the texture if it exists already.
      */
-    createRangeTexture(resolution: import("../view/scaleResolution.js").default, update?: boolean): void;
+    createRangeTexture(resolution: import("../scales/scaleResolution.js").default, update?: boolean): void;
     /**
      * @param {import("../types/selectionTypes.js").MultiPointSelection} selection
      */

package/dist/src/gl/webGLHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webGLHelper.d.ts","sourceRoot":"","sources":["../../../src/gl/webGLHelper.js"],"names":[],"mappings":"AAwZA;;;;GAIG;AACH,kCAJW,sBAAsB,gBACtB,WAAW,kBACX,WAAW;;;;;;EA8CrB;AAED;;;;;GAKG;AACH,0CALW,qBAAqB,WACrB,IAAI,CAAC,OAAO,SAAS,EAAE,cAAc,EAAE,KAAK,CAAC,OAC7C,MAAM,EAAE,GAAG,eAAe,YAC1B,YAAY,gBAYtB;AAED;;;;;;GAMG;AACH,qCALW,sBAAsB,mBACtB,OAAO,SAAS,EAAE,eAAe,KACjC,MAAM,KACN,MAAM,2BAWhB;AAED;;;;;GAKG;AACH,yCAJW,sBAAsB,mBACtB,OAAO,SAAS,EAAE,eAAe,SACjC,MAAM,UA4BhB;AAjfD;IACI;;;;;;;OAOG;IACH,uBANW,WAAW,eACX,MAAM;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,2BAGrC,sBAAsB,EAsFhC;IAnFG,wBAA2B;IAC3B;;;MAKO;IAEP,uCAAuC;IACvC,cADW,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CACN;IAE7B,6EAA6E;IAC7E,eADW,OAAO,CAAC,OAAO,qBAAqB,EAAE,SAAS,EAAE,YAAY,CAAC,CACvC;IAElC;;OAEG;IACH,mBAFU,OAAO,CAAC,OAAO,4BAA4B,EAAE,mBAAmB,EAAE,YAAY,CAAC,CAEnD;IA8CtC,0BAAoB;IACpB,2BAAY;IAGZ,oDAAoD;IACpD,2BADW,OAAO,SAAS,EAAE,iBAAiB,EAAE,CAQ/C;IACD,sDAGC;IAML,uBAGC;IAFG;;;MAAmC;IAIvC;;;;;OAKG;IACH,oBAHW,MAAM,QACN,MAAM,GAAG,MAAM,EAAE,eA2B3B;IAED,iBAcC;IAED,iBAEC;IAED;;;;OAIG;IACH,oCAFW;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;;;MAS3C;IAED;;;OAGG;IACH;;;MAuBC;IAED;;;;;;;;;OASG;IACH,+BAHW,OAAO,4BAA4B,EAAE,OAAO,WAC5C,OAAO,QA0GjB;IAED;;OAEG;IACH,kCAFW,OAAO,4BAA4B,EAAE,mBAAmB,0BA+BlE;CACJ"}
+{"version":3,"file":"webGLHelper.d.ts","sourceRoot":"","sources":["../../../src/gl/webGLHelper.js"],"names":[],"mappings":"AAwZA;;;;GAIG;AACH,kCAJW,sBAAsB,gBACtB,WAAW,kBACX,WAAW;;;;;;EA8CrB;AAED;;;;;GAKG;AACH,0CALW,qBAAqB,WACrB,IAAI,CAAC,OAAO,SAAS,EAAE,cAAc,EAAE,KAAK,CAAC,OAC7C,MAAM,EAAE,GAAG,eAAe,YAC1B,YAAY,gBAYtB;AAED;;;;;;GAMG;AACH,qCALW,sBAAsB,mBACtB,OAAO,SAAS,EAAE,eAAe,KACjC,MAAM,KACN,MAAM,2BAWhB;AAED;;;;;GAKG;AACH,yCAJW,sBAAsB,mBACtB,OAAO,SAAS,EAAE,eAAe,SACjC,MAAM,UA4BhB;AAjfD;IACI;;;;;;;OAOG;IACH,uBANW,WAAW,eACX,MAAM;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,2BAGrC,sBAAsB,EAsFhC;IAnFG,wBAA2B;IAC3B;;;MAKO;IAEP,uCAAuC;IACvC,cADW,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CACN;IAE7B,6EAA6E;IAC7E,eADW,OAAO,CAAC,OAAO,qBAAqB,EAAE,SAAS,EAAE,YAAY,CAAC,CACvC;IAElC;;OAEG;IACH,mBAFU,OAAO,CAAC,OAAO,4BAA4B,EAAE,mBAAmB,EAAE,YAAY,CAAC,CAEnD;IA8CtC,0BAAoB;IACpB,2BAAY;IAGZ,oDAAoD;IACpD,2BADW,OAAO,SAAS,EAAE,iBAAiB,EAAE,CAQ/C;IACD,sDAGC;IAML,uBAGC;IAFG;;;MAAmC;IAIvC;;;;;OAKG;IACH,oBAHW,MAAM,QACN,MAAM,GAAG,MAAM,EAAE,eA2B3B;IAED,iBAcC;IAED,iBAEC;IAED;;;;OAIG;IACH,oCAFW;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;;;MAS3C;IAED;;;OAGG;IACH;;;MAuBC;IAED;;;;;;;;;OASG;IACH,+BAHW,OAAO,8BAA8B,EAAE,OAAO,WAC9C,OAAO,QA0GjB;IAED;;OAEG;IACH,kCAFW,OAAO,4BAA4B,EAAE,mBAAmB,0BA+BlE;CACJ"}

package/dist/src/gl/webGLHelper.js

@@ -231,11 +231,11 @@ export default class WebGLHelper {
      *
      * TODO: This may be too specific to be included in WebGLHelper. Find a better place.
      *
-     * @param {import("../view/scaleResolution.js").default} resolution
+     * @param {import("../scales/scaleResolution.js").default} resolution
      * @param {boolean} update Update the texture if it exists already.
      */
     createRangeTexture(resolution, update = false) {
-        const existingTexture = this.rangeTextures.get(resolution.scale);
+        const existingTexture = this.rangeTextures.get(resolution.getScale());
         if (!update && existingTexture) {
             return;
         }
@@ -263,7 +263,7 @@ export default class WebGLHelper {
         const channel = resolution.channel;
 
         if (isColorChannel(channel)) {
-            const scale = resolution.scale;
+            const scale = resolution.getScale();
             const props = scale.props;
 
             const range = /** @type {any[]} */ (scale.range());
@@ -317,7 +317,7 @@ export default class WebGLHelper {
 
             this.rangeTextures.set(scale, texture);
         } else {
-            const scale = resolution.scale;
+            const scale = resolution.getScale();
 
             if (scale.type === "ordinal" || isDiscretizing(scale.type)) {
                 /** @type {function(any):number} Handle "shape" etc */

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.js"],"names":[],"mappings":";AAyGA;;;;;GAKG;AACH,8BAFW,MAAM,gBAuBhB;sBAjIqB,gBAAgB;qBAFjB,KAAK;iBAGT,kBAAkB;oBACf,6BAA6B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.js"],"names":[],"mappings":";AA+FA;;;;;GAKG;AACH,8BAFW,MAAM,gBAuBhB;sBAvHqB,gBAAgB;qBAFjB,KAAK;iBAGT,kBAAkB;oBACf,6BAA6B"}

package/dist/src/index.js

@@ -66,21 +66,11 @@ export async function embed(el, spec, options = {}) {
         },
 
         addEventListener(type, listener) {
-            const listenersByType = genomeSpy._eventListeners;
-
-            let listeners = listenersByType.get(type);
-            if (!listeners) {
-                listeners = new Set();
-                listenersByType.set(type, listeners);
-            }
-
-            listeners.add(listener);
+            genomeSpy.addEventListener(type, listener);
         },
 
         removeEventListener(type, listener) {
-            const listenersByType = genomeSpy._eventListeners;
-
-            listenersByType.get(type)?.delete(listener);
+            genomeSpy.removeEventListener(type, listener);
         },
 
         getScaleResolutionByName(name) {

package/dist/src/marks/mark.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mark.d.ts","sourceRoot":"","sources":["../../../src/marks/mark.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"mark.d.ts","sourceRoot":"","sources":["../../../src/marks/mark.js"],"names":[],"mappings":"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"}

package/dist/src/marks/mark.js

@@ -602,7 +602,9 @@ export default class Mark {
 
                         // TODO: High precision scales
                         const { attributeType } = getAttributeAndArrayTypes(
-                            this.unitView.getScaleResolution(channel).scale,
+                            this.unitView
+                                .getScaleResolution(channel)
+                                .getScale(),
                             channel
                         );
 
@@ -1353,7 +1355,7 @@ export default class Mark {
         /** @type {function(import("../gl/dataToVertices.js").RangeEntry):void} rangeEntry */
         let drawWithRangeEntry;
 
-        const scale = this.unitView.getScaleResolution("x")?.scale;
+        const scale = this.unitView.getScaleResolution("x")?.getScale();
         const continuous = scale && isContinuous(scale.type);
         const domainStartOffset = ["index", "locus"].includes(scale?.type)
             ? -1

package/dist/src/{view → scales}/axisResolution.d.ts

@@ -2,40 +2,33 @@
  * @template {import("../spec/channel.js").PositionalChannel}[T=PositionalChannel]
  *
  * @typedef {object} AxisResolutionMember
- * @prop {import("./unitView.js").default} view
+ * @prop {import("../view/unitView.js").default} view
  * @prop {T} channel
  * @prop {import("../spec/channel.js").ChannelDefWithScale} channelDef
  */
 export default class AxisResolution {
-    /**
-     * @typedef {import("./unitView.js").default} UnitView
-     * @typedef {import("../spec/channel.js").PositionalChannel} PositionalChannel
-     */
     /**
      * @param {import("../spec/channel.js").PrimaryPositionalChannel} channel
      */
     constructor(channel: import("../spec/channel.js").PrimaryPositionalChannel);
     channel: import("../spec/channel.js").PrimaryPositionalChannel;
-    /** @type {AxisResolutionMember[]} The involved views */
-    members: AxisResolutionMember[];
-    get scaleResolution(): import("./scaleResolution.js").default;
+    get scaleResolution(): any;
     /**
-     * N.B. This is expected to be called in depth-first order, AFTER the
-     * scales have been resolved.
-     *
-     * @param {AxisResolutionMember} newMember
+     * @param {AxisResolutionMember} member
+     * @returns {() => boolean}
      */
-    addMember(newMember: AxisResolutionMember): void;
+    registerMember(member: AxisResolutionMember): () => boolean;
     /**
-     * @param {UnitView} view
+     * @param {AxisResolutionMember} member
      * @returns {boolean}
      */
-    removeMembersByView(view: import("./unitView.js").default): boolean;
+    removeMember(member: AxisResolutionMember): boolean;
     getAxisProps(): import("../spec/axis.js").GenomeAxis;
     getTitle(): string;
+    #private;
 }
 export type AxisResolutionMember<T extends import("../spec/channel.js").PositionalChannel = import("../spec/channel.js").PositionalChannel> = {
-    view: import("./unitView.js").default;
+    view: import("../view/unitView.js").default;
     channel: T;
     channelDef: import("../spec/channel.js").ChannelDefWithScale;
 };

package/dist/src/scales/axisResolution.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"axisResolution.d.ts","sourceRoot":"","sources":["../../../src/scales/axisResolution.js"],"names":[],"mappings":"AAcA;;;;;;;GAOG;AACH;IASI;;OAEG;IACH,qBAFW,OAAO,oBAAoB,EAAE,wBAAwB,EAI/D;IADG,+DAAsB;IAG1B,2BAGC;IAiCD;;;OAGG;IACH,uBAHW,oBAAoB,GAClB,MAAM,OAAO,CAQzB;IAED;;;OAGG;IACH,qBAHW,oBAAoB,GAClB,OAAO,CAQnB;IAED,qDAuBC;IAED,mBAyDC;;CACJ;iCAtK6D,CAAC,SAAlD,OAAQ,oBAAoB,EAAE,iBAAkB;UAGnD,OAAO,qBAAqB,EAAE,OAAO;aACrC,CAAC;gBACD,OAAO,oBAAoB,EAAE,mBAAmB"}

package/dist/src/{view → scales}/axisResolution.js

@@ -7,7 +7,6 @@ import {
     isSecondaryChannel,
     isValueDef,
 } from "../encoder/encoder.js";
-import { peek } from "../utils/arrayUtils.js";
 import coalesce from "../utils/coalesce.js";
 
 import mergeObjects from "../utils/mergeObjects.js";
@@ -17,27 +16,29 @@ import { getCachedOrCall, invalidate } from "../utils/propertyCacher.js";
  * @template {import("../spec/channel.js").PositionalChannel}[T=PositionalChannel]
  *
  * @typedef {object} AxisResolutionMember
- * @prop {import("./unitView.js").default} view
+ * @prop {import("../view/unitView.js").default} view
  * @prop {T} channel
  * @prop {import("../spec/channel.js").ChannelDefWithScale} channelDef
  */
 export default class AxisResolution {
     /**
-     * @typedef {import("./unitView.js").default} UnitView
+     * @typedef {import("../view/unitView.js").default} UnitView
      * @typedef {import("../spec/channel.js").PositionalChannel} PositionalChannel
      */
 
+    /** @type {Set<AxisResolutionMember>} The involved views */
+    #members = new Set();
+
     /**
      * @param {import("../spec/channel.js").PrimaryPositionalChannel} channel
      */
     constructor(channel) {
         this.channel = channel;
-        /** @type {AxisResolutionMember[]} The involved views */
-        this.members = [];
     }
 
     get scaleResolution() {
-        return peek(this.members)?.view.getScaleResolution(this.channel);
+        const first = this.#members.values().next().value;
+        return first?.view.getScaleResolution(this.channel);
     }
 
     /**
@@ -46,7 +47,7 @@ export default class AxisResolution {
      *
      * @param {AxisResolutionMember} newMember
      */
-    addMember(newMember) {
+    #addMember(newMember) {
         const { view } = newMember;
         const newScaleResolution = view.getScaleResolution(this.channel);
 
@@ -61,33 +62,43 @@ export default class AxisResolution {
             throw new Error(
                 `Shared axes must have a shared scale! Channel: ${
                     this.channel
-                }, existing views: [${this.members
+                }, existing views: [${Array.from(this.#members)
                     .map((m) => m.view.getPathString())
                     .join(", ")}], new view: ${view.getPathString()}.`
             );
         }
 
-        this.members.push(newMember);
+        this.#members.add(newMember);
         invalidate(this, "axisProps");
     }
 
     /**
-     * @param {UnitView} view
+     * @param {AxisResolutionMember} member
+     * @returns {() => boolean}
+     */
+    registerMember(member) {
+        this.#addMember(member);
+        return () => {
+            const removed = this.removeMember(member);
+            return removed && this.#members.size === 0;
+        };
+    }
+
+    /**
+     * @param {AxisResolutionMember} member
      * @returns {boolean}
      */
-    removeMembersByView(view) {
-        const before = this.members.length;
-        this.members = this.members.filter((member) => member.view !== view);
-        if (this.members.length !== before) {
+    removeMember(member) {
+        const removed = this.#members.delete(member);
+        if (removed) {
             invalidate(this, "axisProps");
-            return true;
         }
-        return false;
+        return removed;
     }
 
     getAxisProps() {
         return getCachedOrCall(this, "axisProps", () => {
-            const propArray = this.members.map((member) => {
+            const propArray = Array.from(this.#members).map((member) => {
                 const channelDef = member.view.mark.encoding[member.channel];
                 return "axis" in channelDef && channelDef.axis;
             });
@@ -138,7 +149,7 @@ export default class AxisResolution {
             };
         };
 
-        const titles = this.members.map(computeTitle);
+        const titles = Array.from(this.#members).map(computeTitle);
 
         // Skip implicit secondary channel titles if the primary channel has an explicit title
         const filteredTitles = titles.filter((title) => {

package/dist/src/scales/axisResolution.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"axisResolution.test.d.ts","sourceRoot":"","sources":["../../../src/scales/axisResolution.test.js"],"names":[],"mappings":""}

package/dist/src/scales/scaleDomainAggregator.d.ts

@@ -0,0 +1,57 @@
+/**
+ * @typedef {import("../utils/domainArray.js").DomainArray} DomainArray
+ * @typedef {import("../spec/scale.js").ComplexDomain} ComplexDomain
+ * @typedef {import("../spec/scale.js").ScalarDomain} ScalarDomain
+ * @typedef {import("./scaleResolution.js").ScaleResolutionMember} ScaleResolutionMember
+ */
+export default class ScaleDomainAggregator {
+    /**
+     * @param {object} options
+     * @param {() => Set<ScaleResolutionMember>} options.getMembers
+     * @param {() => import("../spec/channel.js").Type} options.getType
+     * @param {() => number[]} options.getLocusExtent
+     * @param {(interval: ScalarDomain | ComplexDomain) => number[]} options.fromComplexInterval
+     */
+    constructor({ getMembers, getType, getLocusExtent, fromComplexInterval }: {
+        getMembers: () => Set<ScaleResolutionMember>;
+        getType: () => import("../spec/channel.js").Type;
+        getLocusExtent: () => number[];
+        fromComplexInterval: (interval: ScalarDomain | ComplexDomain) => number[];
+    });
+    /**
+     * @returns {any[]}
+     */
+    get initialDomainSnapshot(): any[];
+    hasConfiguredDomain(): boolean;
+    /**
+     * Returns the configured domain or a data-derived/default domain.
+     *
+     * @param {boolean} [extractDataDomain]
+     * @returns {any[]}
+     */
+    getConfiguredOrDefaultDomain(extractDataDomain?: boolean): any[];
+    /**
+     * Unions the configured domains of all participating views.
+     *
+     * @return {DomainArray}
+     */
+    getConfiguredDomain(): DomainArray;
+    /**
+     * Extracts and unions the data domains of all participating views.
+     *
+     * @return {DomainArray}
+     */
+    getDataDomain(): DomainArray;
+    /**
+     * @param {import("../types/encoder.js").VegaScale} scale
+     * @param {boolean} domainWasInitialized
+     * @returns {boolean} true if listeners should be notified immediately
+     */
+    captureInitialDomain(scale: import("../types/encoder.js").VegaScale, domainWasInitialized: boolean): boolean;
+    #private;
+}
+export type DomainArray = import("../utils/domainArray.js").DomainArray;
+export type ComplexDomain = import("../spec/scale.js").ComplexDomain;
+export type ScalarDomain = import("../spec/scale.js").ScalarDomain;
+export type ScaleResolutionMember = import("./scaleResolution.js").ScaleResolutionMember;
+//# sourceMappingURL=scaleDomainAggregator.d.ts.map

package/dist/src/scales/scaleDomainAggregator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scaleDomainAggregator.d.ts","sourceRoot":"","sources":["../../../src/scales/scaleDomainAggregator.js"],"names":[],"mappings":"AAMA;;;;;GAKG;AAEH;IAgBI;;;;;;OAMG;IACH,0EALG;QAAkD,UAAU,EAApD,MAAM,GAAG,CAAC,qBAAqB,CAAC;QACiB,OAAO,EAAxD,MAAM,OAAO,oBAAoB,EAAE,IAAI;QACf,cAAc,EAAtC,MAAM,MAAM,EAAE;QACgD,mBAAmB,EAAjF,CAAC,QAAQ,EAAE,YAAY,GAAG,aAAa,KAAK,MAAM,EAAE;KAC9D,EAMA;IAED;;OAEG;IACH,6BAFa,GAAG,EAAE,CAIjB;IAED,+BAEC;IAED;;;;;OAKG;IACH,iDAHW,OAAO,GACL,GAAG,EAAE,CAYjB;IAED;;;;OAIG;IACH,uBAFY,WAAW,CAOtB;IAED;;;;OAIG;IACH,iBAFY,WAAW,CAItB;IAED;;;;OAIG;IACH,4BAJW,OAAO,qBAAqB,EAAE,SAAS,wBACvC,OAAO,GACL,OAAO,CAgBnB;;CACJ;0BA1GY,OAAO,yBAAyB,EAAE,WAAW;4BAC7C,OAAO,kBAAkB,EAAE,aAAa;2BACxC,OAAO,kBAAkB,EAAE,YAAY;oCACvC,OAAO,sBAAsB,EAAE,qBAAqB"}

package/dist/src/scales/scaleDomainAggregator.js

@@ -0,0 +1,162 @@
+import { span } from "vega-util";
+import { isContinuous } from "vega-scale";
+
+import { LOCUS } from "./scaleResolutionConstants.js";
+import createDomain from "../utils/domainArray.js";
+
+/**
+ * @typedef {import("../utils/domainArray.js").DomainArray} DomainArray
+ * @typedef {import("../spec/scale.js").ComplexDomain} ComplexDomain
+ * @typedef {import("../spec/scale.js").ScalarDomain} ScalarDomain
+ * @typedef {import("./scaleResolution.js").ScaleResolutionMember} ScaleResolutionMember
+ */
+
+export default class ScaleDomainAggregator {
+    /** @type {Set<ScaleResolutionMember>} */
+    #members;
+
+    /** @type {() => import("../spec/channel.js").Type} */
+    #getType;
+
+    /** @type {() => number[]} */
+    #getLocusExtent;
+
+    /** @type {(interval: ScalarDomain | ComplexDomain) => number[]} */
+    #fromComplexInterval;
+
+    /** @type {any[]} */
+    #initialDomain;
+
+    /**
+     * @param {object} options
+     * @param {() => Set<ScaleResolutionMember>} options.getMembers
+     * @param {() => import("../spec/channel.js").Type} options.getType
+     * @param {() => number[]} options.getLocusExtent
+     * @param {(interval: ScalarDomain | ComplexDomain) => number[]} options.fromComplexInterval
+     */
+    constructor({ getMembers, getType, getLocusExtent, fromComplexInterval }) {
+        this.#members = getMembers();
+        this.#getType = getType;
+        this.#getLocusExtent = getLocusExtent;
+        this.#fromComplexInterval = fromComplexInterval;
+    }
+
+    /**
+     * @returns {any[]}
+     */
+    get initialDomainSnapshot() {
+        return this.#initialDomain;
+    }
+
+    hasConfiguredDomain() {
+        return !!this.getConfiguredDomain();
+    }
+
+    /**
+     * Returns the configured domain or a data-derived/default domain.
+     *
+     * @param {boolean} [extractDataDomain]
+     * @returns {any[]}
+     */
+    getConfiguredOrDefaultDomain(extractDataDomain = false) {
+        // TODO: intersect the domain with zoom extent (if it's defined)
+        return (
+            this.getConfiguredDomain() ??
+            resolveDefaultDomain(
+                this.#getType(),
+                this.#getLocusExtent,
+                extractDataDomain ? this.getDataDomain() : undefined
+            )
+        );
+    }
+
+    /**
+     * Unions the configured domains of all participating views.
+     *
+     * @return {DomainArray}
+     */
+    getConfiguredDomain() {
+        return resolveConfiguredDomain(
+            this.#members,
+            this.#fromComplexInterval
+        );
+    }
+
+    /**
+     * Extracts and unions the data domains of all participating views.
+     *
+     * @return {DomainArray}
+     */
+    getDataDomain() {
+        return resolveDataDomain(this.#members, this.#getType);
+    }
+
+    /**
+     * @param {import("../types/encoder.js").VegaScale} scale
+     * @param {boolean} domainWasInitialized
+     * @returns {boolean} true if listeners should be notified immediately
+     */
+    captureInitialDomain(scale, domainWasInitialized) {
+        if (!this.#initialDomain && isContinuous(scale.type)) {
+            const domain = scale.domain();
+            if (span(domain) > 0) {
+                this.#initialDomain = domain;
+            }
+        }
+
+        if (!domainWasInitialized) {
+            this.#initialDomain = scale.domain();
+            return true;
+        }
+
+        return false;
+    }
+}
+
+/**
+ * @param {Set<ScaleResolutionMember>} members
+ * @param {(interval: ScalarDomain | ComplexDomain) => number[]} fromComplexInterval
+ * @returns {DomainArray | undefined}
+ */
+function resolveConfiguredDomain(members, fromComplexInterval) {
+    const domains = Array.from(members)
+        .map((member) => member.channelDef)
+        .filter((channelDef) => channelDef.scale?.domain)
+        .map((channelDef) =>
+            // TODO: Handle ExprRefs and Param in domain
+            createDomain(
+                channelDef.type,
+                // Chrom/pos must be linearized first
+                fromComplexInterval(channelDef.scale.domain)
+            )
+        );
+
+    if (domains.length > 0) {
+        return domains.reduce((acc, curr) => acc.extendAll(curr));
+    }
+}
+
+/**
+ * @param {Set<ScaleResolutionMember>} members
+ * @param {() => import("../spec/channel.js").Type} getType
+ * @returns {DomainArray}
+ */
+function resolveDataDomain(members, getType) {
+    return Array.from(members)
+        .map((member) => member.dataDomainSource?.(member.channel, getType()))
+        .filter((domain) => !!domain)
+        .reduce((acc, curr) => acc.extendAll(curr));
+}
+
+/**
+ * @param {import("../spec/channel.js").Type} type
+ * @param {() => number[]} getLocusExtent
+ * @param {DomainArray | undefined} dataDomain
+ * @returns {any[]}
+ */
+function resolveDefaultDomain(type, getLocusExtent, dataDomain) {
+    if (type == LOCUS) {
+        return getLocusExtent();
+    }
+    return dataDomain ?? [];
+}

package/dist/src/scales/scaleDomainAggregator.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=scaleDomainAggregator.test.d.ts.map

package/dist/src/scales/scaleDomainAggregator.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scaleDomainAggregator.test.d.ts","sourceRoot":"","sources":["../../../src/scales/scaleDomainAggregator.test.js"],"names":[],"mappings":""}

package/dist/src/scales/scaleInstanceManager.d.ts

@@ -0,0 +1,40 @@
+export default class ScaleInstanceManager {
+    /**
+     * @param {object} options
+     * @param {() => import("../view/paramMediator.js").default} options.getParamMediator
+     * @param {() => void} options.onRangeChange
+     * @param {() => void} [options.onDomainChange]
+     * @param {() => import("../genome/genomeStore.js").default | undefined} [options.getGenomeStore]
+     */
+    constructor({ getParamMediator, onRangeChange, onDomainChange, getGenomeStore, }: {
+        getParamMediator: () => import("../view/paramMediator.js").default;
+        onRangeChange: () => void;
+        onDomainChange?: () => void;
+        getGenomeStore?: () => import("../genome/genomeStore.js").default | undefined;
+    });
+    get scale(): import("../types/encoder.js").VegaScale & {
+        props: import("../spec/scale.js").Scale;
+    };
+    /**
+     * @returns {import("../genome/genome.js").default}
+     */
+    getLocusGenome(): import("../genome/genome.js").default;
+    /**
+     * @param {import("../spec/scale.js").Scale} props
+     * @returns {ScaleWithProps}
+     */
+    createScale(props: import("../spec/scale.js").Scale): import("../types/encoder.js").VegaScale & {
+        props: import("../spec/scale.js").Scale;
+    };
+    /**
+     * @param {import("../spec/scale.js").Scale} props
+     */
+    reconfigureScale(props: import("../spec/scale.js").Scale): void;
+    /**
+     * @param {() => void} callback
+     * @returns {void}
+     */
+    withDomainNotificationsSuppressed(callback: () => void): void;
+    #private;
+}
+//# sourceMappingURL=scaleInstanceManager.d.ts.map

package/dist/src/scales/scaleInstanceManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scaleInstanceManager.d.ts","sourceRoot":"","sources":["../../../src/scales/scaleInstanceManager.js"],"names":[],"mappings":"AAMA;IA0BI;;;;;;OAMG;IACH,kFALG;QAAkE,gBAAgB,EAA1E,MAAM,OAAO,0BAA0B,EAAE,OAAO;QAC5B,aAAa,EAAjC,MAAM,IAAI;QACW,cAAc,GAAnC,MAAM,IAAI;QAC6D,cAAc,GAArF,MAAM,OAAO,0BAA0B,EAAE,OAAO,GAAG,SAAS;KAA0B,EAYhG;IAED;eA1CkC,OAAO,kBAAkB,EAAE,KAAK;MA4CjE;IAED;;OAEG;IACH,kBAFa,OAAO,qBAAqB,EAAE,OAAO,CASjD;IAED;;;OAGG;IACH,mBAHW,OAAO,kBAAkB,EAAE,KAAK;eA3DT,OAAO,kBAAkB,EAAE,KAAK;MAgFjE;IAoBD;;OAEG;IACH,wBAFW,OAAO,kBAAkB,EAAE,KAAK,QAc1C;IAED;;;OAGG;IACH,4CAHW,MAAM,IAAI,GACR,IAAI,CAShB;;CA6EJ"}