@genome-spy/core 0.66.1 → 0.68.0

package/dist/src/genomeSpy.js

@@ -5,13 +5,17 @@ import {
     createMessageBox,
 } from "./genomeSpy/containerUi.js";
 import LoadingIndicatorManager from "./genomeSpy/loadingIndicatorManager.js";
+import LoadingStatusRegistry from "./genomeSpy/loadingStatusRegistry.js";
 import { createViewHighlighter } from "./genomeSpy/viewHighlight.js";
 import KeyboardListenerManager from "./genomeSpy/keyboardListenerManager.js";
 import EventListenerRegistry from "./genomeSpy/eventListenerRegistry.js";
 import InputBindingManager from "./genomeSpy/inputBindingManager.js";
 
 import { calculateCanvasSize } from "./view/viewUtils.js";
-import { initializeViewData } from "./genomeSpy/viewDataInit.js";
+import {
+    initializeViewData,
+    initializeVisibleViewData,
+} from "./genomeSpy/viewDataInit.js";
 import UnitView from "./view/unitView.js";
 
 import WebGLHelper from "./gl/webGLHelper.js";
@@ -32,6 +36,7 @@ import {
     configureViewOpacity,
 } from "./genomeSpy/viewHierarchyConfig.js";
 import { exportCanvas } from "./genomeSpy/canvasExport.js";
+import { validateSelectorConstraints } from "./view/viewSelectors.js";
 
 /**
  * Events that are broadcasted to all views.
@@ -47,6 +52,8 @@ export default class GenomeSpy {
     #renderCoordinator;
     /** @type {LoadingIndicatorManager} */
     #loadingIndicatorManager;
+    /** @type {LoadingStatusRegistry} */
+    #loadingStatusRegistry;
     /** @type {InputBindingManager} */
     #inputBindingManager;
     /** @type {InteractionController} */
@@ -234,12 +241,8 @@ export default class GenomeSpy {
     }
 
     #prepareContainer() {
-        const {
-            canvasWrapper,
-            loadingMessageElement,
-            loadingIndicatorsElement,
-            tooltip,
-        } = createContainerUi(this.container);
+        const { canvasWrapper, loadingIndicatorsElement, tooltip } =
+            createContainerUi(this.container);
 
         this.#glHelper = new WebGLHelper(
             canvasWrapper,
@@ -250,16 +253,11 @@ export default class GenomeSpy {
             { powerPreference: this.options.powerPreference ?? "default" }
         );
 
-        // The initial loading message that is shown until the first frame is rendered
-        this.loadingMessageElement = loadingMessageElement;
-        // A container for loading indicators (for lazy data sources.)
-        // These could alternatively be included in the view hierarchy,
-        // but it's easier this way – particularly if we want to show
-        // some fancy animated spinners.
-        this.loadingIndicatorsElement = loadingIndicatorsElement;
         this.tooltip = tooltip;
+        this.#loadingStatusRegistry = new LoadingStatusRegistry();
         this.#loadingIndicatorManager = new LoadingIndicatorManager(
-            loadingIndicatorsElement
+            loadingIndicatorsElement,
+            this.#loadingStatusRegistry
         );
     }
 
@@ -282,6 +280,8 @@ export default class GenomeSpy {
 
         this.#inputBindingManager.remove();
 
+        this.#loadingIndicatorManager.destroy();
+
         while (this.container.firstChild) {
             this.container.firstChild.remove();
         }
@@ -308,8 +308,11 @@ export default class GenomeSpy {
     }
 
     #createViewContext() {
+        const dataFlow = new DataFlow();
+        dataFlow.loadingStatusRegistry = this.#loadingStatusRegistry;
+
         return createViewContext({
-            dataFlow: new DataFlow(),
+            dataFlow,
             glHelper: this.#glHelper,
             animator: this.animator,
             genomeStore: this.genomeStore,
@@ -318,12 +321,6 @@ export default class GenomeSpy {
             getNamedDataFromProvider: this.getNamedDataFromProvider.bind(this),
             getCurrentHover: () =>
                 this.#interactionController.getCurrentHover(),
-            setDataLoadingStatus: (view, status, detail) =>
-                this.#loadingIndicatorManager.setDataLoadingStatus(
-                    view,
-                    status,
-                    detail
-                ),
             addKeyboardListener: (type, listener) => {
                 // TODO: Listeners should be called only when the mouse pointer is inside the
                 // container or the app covers the full document.
@@ -375,6 +372,8 @@ export default class GenomeSpy {
             VIEW_ROOT_NAME
         );
 
+        this.#loadingStatusRegistry.set(this.viewRoot, "loading");
+
         this.#canvasWrapper.style.flexGrow =
             this.viewRoot.getSize().height.grow > 0 ? "1" : "0";
 
@@ -382,6 +381,7 @@ export default class GenomeSpy {
 
         configureViewHierarchy(this.viewRoot);
         configureViewOpacity(this.viewRoot);
+        this.#logSelectorConstraintWarnings();
 
         // We should now have a complete view hierarchy. Let's update the canvas size
         // and ensure that the loading message is visible.
@@ -402,6 +402,17 @@ export default class GenomeSpy {
         this.#setupDpr();
     }
 
+    #logSelectorConstraintWarnings() {
+        const issues = validateSelectorConstraints(this.viewRoot);
+        if (!issues.length) {
+            return;
+        }
+
+        for (const issue of issues) {
+            console.warn("Selector constraints warning:", issue.message);
+        }
+    }
+
     /**
      * @param {import("./types/viewContext.js").default} context
      */
@@ -432,6 +443,7 @@ export default class GenomeSpy {
      * @returns {Promise<boolean>} true if the launch was successful
      */
     async launch() {
+        let launched = false;
         try {
             this.#prepareContainer();
 
@@ -442,6 +454,7 @@ export default class GenomeSpy {
             this.computeLayout();
             this.animator.requestRender();
 
+            launched = true;
             return true;
         } catch (reason) {
             const message = `${
@@ -453,16 +466,42 @@ export default class GenomeSpy {
                 createMessageBox(this.container, message);
             }
 
+            if (this.viewRoot) {
+                this.#loadingStatusRegistry.set(
+                    this.viewRoot,
+                    "error",
+                    message
+                );
+            }
+
             return false;
         } finally {
             this.#canvasWrapper.classList.remove("loading");
-            // Transition listener doesn't appear to work on observablehq
-            window.setTimeout(() => {
-                this.loadingMessageElement.style.display = "none";
-            }, 2000);
+            if (launched && this.viewRoot) {
+                this.#loadingStatusRegistry.set(this.viewRoot, "complete");
+            }
         }
     }
 
+    async initializeVisibleViewData() {
+        if (!this.viewRoot) {
+            return;
+        }
+
+        await initializeVisibleViewData(
+            this.viewRoot,
+            this.viewRoot.context.dataFlow,
+            this.viewRoot.context.fontManager
+        );
+
+        // Visibility toggles can change sizes; ensure layout is recomputed even
+        // when callers don't explicitly request it.
+        this.viewRoot._invalidateCacheByPrefix("size", "progeny");
+        this.#glHelper.invalidateSize();
+        this.computeLayout();
+        this.animator.requestRender();
+    }
+
     registerMouseEvents() {
         this.#interactionController.registerMouseEvents();
     }
@@ -530,7 +569,10 @@ export default class GenomeSpy {
         /** @type {UnitView[]} */
         const views = [];
         this.viewRoot.visit((view) => {
-            if (view instanceof UnitView && view.getDataAccessor("search")) {
+            if (
+                view instanceof UnitView &&
+                view.getSearchAccessors().length > 0
+            ) {
                 views.push(view);
             }
         });

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

@@ -1 +1 @@
-{"version":3,"file":"dataToVertices.d.ts","sourceRoot":"","sources":["../../../src/gl/dataToVertices.js"],"names":[],"mappings":"AAgBA;;;;;GAKG;AACH;IACI;;;OAGG;IAEH;;;;;;OAMG;IACH,mDALG;QAAsE,QAAQ,EAAtE,MAAM,CAAC,OAAO,oBAAoB,EAAE,OAAO,wCAAU;QACnC,UAAU,GAA5B,MAAM,EAAE;QACQ,WAAW,GAA3B,MAAM;KAEhB,EAqFA;IAnFG,8FAAwB;IAIxB,sGAQK;IAQL,0BAAoC;IAEpC,8BAAoD;IAyDpD,mBAAmB;IAEnB,yFAAyF;IACzF,UADW,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CACkB;IAGrD;;;;OAIG;IACH,mBAFW,GAAG,QAcb;IAED;;OAEG;IACH,oBAFW,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,QAM5B;IAED;;;OAGG;IACH,cAHW,GAAG,QACH,MAAM,EAAE,kCAYlB;IAED;;;;OAIG;IACH,sBAJW,OAAO,qBAAqB,EAAE,IAAI,OAClC,MAAM,OACN,MAAM,QAgEhB;IAED;;;;;OAKG;IACH,mBAFW,OAAO,qBAAqB,EAAE,KAAK,QAI7C;IAhEO;;;MAAyB;IAkEjC;QAEQ,kJAAkJ;gBAAvI,MAAM,CAAC,MAAM,EAAE;YAAC,IAAI,EAAE,WAAW,GAAG,UAAU,GAAG,WAAW,GAAG,UAAU,GAAG,YAAY,CAAC;YAAC,aAAa,EAAE,MAAM,CAAC;YAAC,OAAO,CAAC,EAAE,MAAM,CAAA;SAAC,CAAC;QAE9I,8BAA8B;;QAE9B,8CAA8C;;;MAIrD;CACJ;AAED;IACI;;;;;;OAMG;IACH,gDAJG;QAAwC,QAAQ,EAAxC,MAAM,CAAC,MAAM,wCAAU;QACN,UAAU,EAA3B,MAAM,EAAE;QACQ,QAAQ,GAAxB,MAAM;KAChB,EA8BA;IAnBG,qBAkBW;CA8BlB;AAED;IACI;;;;;;;;;OASG;IACH,sFAPG;QAAwC,QAAQ,EAAxC,MAAM,CAAC,MAAM,wCAAU;QACN,UAAU,EAA3B,MAAM,EAAE;QACQ,qBAAqB,GAArC,MAAM;QAEY,YAAY,GAA9B,MAAM,EAAE;QACQ,QAAQ,GAAxB,MAAM;KAChB,EAuBA;IARG,uBAAgC;IAEhC,8BAA8D;IAE9D,6CAA+D;IAC/D,4CAA6D;CA6CpE;AAED;IACI;;;;;;OAMG;IACH,gDAJG;QAAwC,QAAQ,EAAxC,MAAM,CAAC,MAAM,wCAAU;QACN,UAAU,EAA3B,MAAM,EAAE;QACQ,QAAQ,GAAxB,MAAM;KAChB,EAQA;CACJ;AAED;IACI;;;;;OAKG;IACH,gDAJG;QAAwC,QAAQ,EAAxC,MAAM,CAAC,MAAM,wCAAU;QACN,UAAU,EAA3B,MAAM,EAAE;QACQ,QAAQ,GAAxB,MAAM;KAChB,EAQA;CAYJ;AAED;IACI;;;;;;;;;OASG;IACH,+EAPG;QAAwC,QAAQ,EAAxC,MAAM,CAAC,MAAM,wCAAU;QACN,UAAU,EAA3B,MAAM,EAAE;QACkD,WAAW,EAArE,OAAO,2BAA2B,EAAE,aAAa;QACrB,UAAU,EAAtC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;QACH,aAAa,GAA7B,MAAM;QACW,WAAW,GAA5B,OAAO;KAAsB,EA6CvC;IA9BG,4DAA2B;IAC3B,2DAA0B;IAE1B,gCAA4B;IAO5B,qCAAqC;IACrC,cADW,CAAC,KAAK,EAAE,GAAG,KAAK,MAAM,CAMf;IAElB,oDAGC;IACD,qDAGC;IAED,8CAAiE;CAgJxE;;;;;;;;YAjnBS,MAAM;;;;WACN,MAAM;YACN,OAAO,yBAAyB,EAAE,MAAM;;yBAjBzB,mBAAmB"}
+{"version":3,"file":"dataToVertices.d.ts","sourceRoot":"","sources":["../../../src/gl/dataToVertices.js"],"names":[],"mappings":"AAgBA;;;;;GAKG;AACH;IACI;;;OAGG;IAEH;;;;;;OAMG;IACH,mDALG;QAAsE,QAAQ,EAAtE,MAAM,CAAC,OAAO,oBAAoB,EAAE,OAAO,wCAAU;QACnC,UAAU,GAA5B,MAAM,EAAE;QACQ,WAAW,GAA3B,MAAM;KAEhB,EAiGA;IA/FG,8FAAwB;IAIxB,sGAQK;IAQL,0BAAoC;IAEpC,8BAAoD;IAqEpD,mBAAmB;IAEnB,yFAAyF;IACzF,UADW,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CACkB;IAGrD;;;;OAIG;IACH,mBAFW,GAAG,QAcb;IAED;;OAEG;IACH,oBAFW,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,QAM5B;IAED;;;OAGG;IACH,cAHW,GAAG,QACH,MAAM,EAAE,kCAYlB;IAED;;;;OAIG;IACH,sBAJW,OAAO,qBAAqB,EAAE,IAAI,OAClC,MAAM,OACN,MAAM,QAgEhB;IAED;;;;;OAKG;IACH,mBAFW,OAAO,qBAAqB,EAAE,KAAK,QAI7C;IAhEO;;;MAAyB;IAkEjC;QAEQ,kJAAkJ;gBAAvI,MAAM,CAAC,MAAM,EAAE;YAAC,IAAI,EAAE,WAAW,GAAG,UAAU,GAAG,WAAW,GAAG,UAAU,GAAG,YAAY,CAAC;YAAC,aAAa,EAAE,MAAM,CAAC;YAAC,OAAO,CAAC,EAAE,MAAM,CAAA;SAAC,CAAC;QAE9I,8BAA8B;;QAE9B,8CAA8C;;;MAIrD;CACJ;AAED;IACI;;;;;;OAMG;IACH,gDAJG;QAAwC,QAAQ,EAAxC,MAAM,CAAC,MAAM,wCAAU;QACN,UAAU,EAA3B,MAAM,EAAE;QACQ,QAAQ,GAAxB,MAAM;KAChB,EA8BA;IAnBG,qBAkBW;CA8BlB;AAED;IACI;;;;;;;;;OASG;IACH,sFAPG;QAAwC,QAAQ,EAAxC,MAAM,CAAC,MAAM,wCAAU;QACN,UAAU,EAA3B,MAAM,EAAE;QACQ,qBAAqB,GAArC,MAAM;QAEY,YAAY,GAA9B,MAAM,EAAE;QACQ,QAAQ,GAAxB,MAAM;KAChB,EAuBA;IARG,uBAAgC;IAEhC,8BAA8D;IAE9D,6CAA+D;IAC/D,4CAA6D;CA6CpE;AAED;IACI;;;;;;OAMG;IACH,gDAJG;QAAwC,QAAQ,EAAxC,MAAM,CAAC,MAAM,wCAAU;QACN,UAAU,EAA3B,MAAM,EAAE;QACQ,QAAQ,GAAxB,MAAM;KAChB,EAQA;CACJ;AAED;IACI;;;;;OAKG;IACH,gDAJG;QAAwC,QAAQ,EAAxC,MAAM,CAAC,MAAM,wCAAU;QACN,UAAU,EAA3B,MAAM,EAAE;QACQ,QAAQ,GAAxB,MAAM;KAChB,EAQA;CAYJ;AAED;IACI;;;;;;;;;OASG;IACH,+EAPG;QAAwC,QAAQ,EAAxC,MAAM,CAAC,MAAM,wCAAU;QACN,UAAU,EAA3B,MAAM,EAAE;QACkD,WAAW,EAArE,OAAO,2BAA2B,EAAE,aAAa;QACrB,UAAU,EAAtC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;QACH,aAAa,GAA7B,MAAM;QACW,WAAW,GAA5B,OAAO;KAAsB,EA6CvC;IA9BG,4DAA2B;IAC3B,2DAA0B;IAE1B,gCAA4B;IAO5B,qCAAqC;IACrC,cADW,CAAC,KAAK,EAAE,GAAG,KAAK,MAAM,CAMf;IAElB,oDAGC;IACD,qDAGC;IAED,8CAAiE;CAgJxE;;;;;;;;YA7nBS,MAAM;;;;WACN,MAAM;YACN,OAAO,yBAAyB,EAAE,MAAM;;yBAjBzB,mBAAmB"}

package/dist/src/gl/dataToVertices.js

@@ -82,11 +82,23 @@ export class GeometryBuilder {
                 getAttributeAndArrayTypes(scale, channel);
             const largeHpArray = [0, 0];
 
-            /** @type {ReturnType<typeof createIndexer>} */
+            /** @type {ReturnType<typeof createIndexer> | undefined} */
             let indexer;
-            if (scale && discrete && "domain" in scale) {
-                indexer = createIndexer();
-                indexer.addAll(scale.domain());
+            if (scale && discrete) {
+                if (
+                    "props" in scale &&
+                    /** @type {any} */ (scale.props).domainIndexer
+                ) {
+                    // domainIndexer is a runtime-only extension, not in VegaScale typings.
+                    indexer = /** @type {any} */ (scale.props).domainIndexer;
+                } else if ("domain" in scale) {
+                    indexer = createIndexer();
+                    indexer.addAll(scale.domain());
+                } else {
+                    throw new Error(
+                        "Missing domain indexer for discrete scale."
+                    );
+                }
             }
 
             /**

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

@@ -940,6 +940,17 @@ export default class Mark {
      * initiated. The idea is to allow for parallel background compilation.
      */
     finalizeGraphicsInitialization() {
+        // Allow duplicate finalization calls when multiple init paths overlap.
+        if (this.programInfo) {
+            return;
+        }
+
+        if (!this.programStatus) {
+            throw new Error(
+                "No program status found! " + this.unitView.getPathString()
+            );
+        }
+
         const error = this.programStatus.getProgramErrors();
         if (error) {
             if (error.detail) {
@@ -1290,21 +1301,17 @@ export default class Mark {
         const locationSetter = this.programInfo.uniformSetters.uSampleFacet;
 
         if (opts && locationSetter) {
-            const pos = opts.locSize ? opts.locSize.location : 0.0;
-            const height = opts.locSize ? opts.locSize.size : 1.0;
+            const scale = opts.pixelToUnit;
+            const pos = opts.locSize.location * scale;
+            const height = opts.locSize.size * scale;
 
             if (pos > 1.0 || pos + height < 0.0) {
                 // Not visible
                 return false;
             }
 
-            const targetPos = opts.targetLocSize
-                ? opts.targetLocSize.location
-                : pos;
-            const targetHeight = opts.targetLocSize
-                ? opts.targetLocSize.size
-                : height;
-
+            // No target locSize in the current API. Keep a consistent shader path
+            // by repeating the current position/height.
             // Use WebGL directly, because twgl uses gl.uniform4fv, which has an
             // inferior performance. Based on profiling, this optimization gives
             // a significant performance boost.
@@ -1313,8 +1320,8 @@ export default class Mark {
                 locationSetter.location, // TODO: Make a twgl pull request to fix typing
                 pos,
                 height,
-                targetPos,
-                targetHeight
+                pos,
+                height
             );
         }
 

package/dist/src/marks/markUtils.js

@@ -38,7 +38,7 @@ export function fixPositional(encoding, channel) {
         if (!secondary) {
             if (primary.type == "quantitative") {
                 // Bar plot, anchor the other end to zero
-                secondary = { datum: 0, contributesToScaleDomain: false };
+                secondary = { datum: 0, domainInert: true };
             } else {
                 secondary = { ...primary };
 

package/dist/src/scale/scale.d.ts

@@ -6,5 +6,10 @@ export function configureScale(_: any, scale: any, logger: any): void;
  * @returns {import("../encoder/encoder.js").VegaScale}
  */
 export default function createScale(_: import("../spec/scale.js").Scale, logger: any): import("../encoder/encoder.js").VegaScale;
-export function configureDomain(scale: any, _: any, logger: any): any;
+export function configureDomain(scale: any, _: any, logger: any): {
+    domain: any;
+    count: any;
+    ordinalUnknown: any;
+    applyOrdinalUnknown: boolean;
+};
 //# sourceMappingURL=scale.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"scale.d.ts","sourceRoot":"","sources":["../../../src/scale/scale.js"],"names":[],"mappings":"AAoHA,sEAmBC;AAED;;;;;GAKG;AACH,uCAJW,OAAO,kBAAkB,EAAE,KAAK,UAChC,GAAC,GACC,OAAO,uBAAuB,EAAE,SAAS,CAoBrD;AAgCD,sEAuEC"}
+{"version":3,"file":"scale.d.ts","sourceRoot":"","sources":["../../../src/scale/scale.js"],"names":[],"mappings":"AAgIA,sEAuBC;AAED;;;;;GAKG;AACH,uCAJW,OAAO,kBAAkB,EAAE,KAAK,UAChC,GAAC,GACC,OAAO,uBAAuB,EAAE,SAAS,CAoBrD;AA4CD;;;;;EAuGC"}

package/dist/src/scale/scale.js

@@ -11,8 +11,20 @@
 /* eslint-disable */
 // @ts-nocheck
 
-// This file is a mess
-// TODO: Fix types, etc.
+/*
+ * Rewrite rationale (non-perf):
+ * - This module mixes spec-level policy, vega-scale helpers, and D3 scale
+ *   mutability. The combination works but is clunky to maintain and hard to
+ *   integrate with higher-level orchestration like ScaleResolution.
+ * - Side-effectful configuration and implicit defaults make the data flow
+ *   difficult to reason about and to test in isolation.
+ *
+ * Why not rewrite yet:
+ * - Behavior is subtle and well-tested; a rewrite is risky without a clear
+ *   contract for the pure inputs/outputs and their callers.
+ * - It depends on D3 scale semantics (copy, unknown, interpolate, etc.), so any
+ *   refactor must preserve those semantics explicitly.
+ */
 
 import { tickCount } from "./ticks.js";
 import {
@@ -128,11 +140,15 @@ export function configureScale(_, scale, logger) {
         }
     }
 
-    configureRange(
-        scale,
-        _,
-        configureBins(scale, _, configureDomain(scale, _, logger))
-    );
+    const domainConfig = configureDomain(scale, _, logger);
+    if (domainConfig.domain) {
+        scale.domain(domainConfig.domain);
+    }
+    if (domainConfig.applyOrdinalUnknown) {
+        scale.unknown(domainConfig.ordinalUnknown);
+    }
+
+    configureRange(scale, _, configureBins(scale, _, domainConfig.count));
 }
 
 /**
@@ -191,24 +207,62 @@ function isContinuousColor(_) {
     );
 }
 
+function copyScaleForDomain(scale) {
+    if (!scale.copy) {
+        return scale;
+    }
+
+    const copy = scale.copy();
+    if (copy.type == null && scale.type != null) {
+        copy.type = scale.type;
+    }
+    return copy;
+}
+
 export function configureDomain(scale, _, logger) {
     if (!scale.domain) {
-        return 0;
+        return {
+            domain: null,
+            count: 0,
+            ordinalUnknown: undefined,
+            applyOrdinalUnknown: false,
+        };
     }
 
     logger = ensureLogger(logger);
 
+    const workingScale = copyScaleForDomain(scale);
+
     // check raw domain, if provided use that and exit early
-    var raw = rawDomain(scale, _.domainRaw, logger);
-    if (raw > -1) return raw;
+    var raw = rawDomain(workingScale, _.domainRaw, logger);
+    if (raw > -1) {
+        return {
+            domain: workingScale.domain(),
+            count: raw,
+            ordinalUnknown:
+                workingScale.type === Ordinal
+                    ? _.domainImplicit
+                        ? scaleImplicit
+                        : undefined
+                    : undefined,
+            applyOrdinalUnknown: false,
+        };
+    }
 
     var domain = _.domain,
-        type = scale.type,
-        zero = _.zero || (_.zero === undefined && includeZero(scale)),
+        type = workingScale.type,
+        zero = _.zero || (_.zero === undefined && includeZero(workingScale)),
         n,
         mid;
 
-    if (!domain) return 0;
+    if (!domain) {
+        return {
+            domain: null,
+            count: 0,
+            ordinalUnknown: undefined,
+            applyOrdinalUnknown: false,
+        };
+    }
 
     // adjust continuous domain for minimum pixel padding
     if (includePad(type) && _.padding && domain[0] !== peek(domain)) {
@@ -247,21 +301,27 @@ export function configureDomain(scale, _, logger) {
     }
 
     // set the scale domain
-    scale.domain(domainCheck(type, domain, logger));
-
-    // if ordinal scale domain is defined, prevent implicit
-    // domain construction as side-effect of scale lookup
-    if (type === Ordinal) {
-        scale.unknown(_.domainImplicit ? scaleImplicit : undefined);
-    }
+    workingScale.domain(domainCheck(type, domain, logger));
 
     // perform 'nice' adjustment as requested
-    if (_.nice && scale.nice) {
-        scale.nice((_.nice !== true && tickCount(scale, _.nice)) || null);
+    if (_.nice && workingScale.nice) {
+        workingScale.nice(
+            (_.nice !== true && tickCount(workingScale, _.nice)) || null
+        );
     }
 
     // return the cardinality of the domain
-    return domain.length;
+    return {
+        domain: workingScale.domain(),
+        count: domain.length,
+        ordinalUnknown:
+            type === Ordinal
+                ? _.domainImplicit
+                    ? scaleImplicit
+                    : undefined
+                : undefined,
+        applyOrdinalUnknown: type === Ordinal,
+    };
 }
 
 function rawDomain(scale, raw, logger) {

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

@@ -1 +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"}
+{"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,mBAmEC;;CACJ;iCAhL6D,CAAC,SAAlD,OAAQ,oBAAoB,EAAE,iBAAkB;UAGnD,OAAO,qBAAqB,EAAE,OAAO;aACrC,CAAC;gBACD,OAAO,oBAAoB,EAAE,mBAAmB"}

package/dist/src/scales/axisResolution.js

@@ -137,6 +137,9 @@ export default class AxisResolution {
 
             return {
                 member,
+                axisTitle:
+                    // TODO: Proper type guard
+                    "axis" in channelDef ? channelDef.axis?.title : undefined,
                 explicitTitle: coalesce(
                     // TODO: Proper type guard
                     "axis" in channelDef ? channelDef.axis?.title : undefined,
@@ -150,6 +153,13 @@ export default class AxisResolution {
         };
 
         const titles = Array.from(this.#members).map(computeTitle);
+        const explicitAxisTitle = titles
+            .map((title) => title.axisTitle)
+            .find((title) => title !== undefined);
+
+        if (explicitAxisTitle !== undefined) {
+            return explicitAxisTitle;
+        }
 
         // Skip implicit secondary channel titles if the primary channel has an explicit title
         const filteredTitles = titles.filter((title) => {

package/dist/src/scales/{scaleDomainAggregator.d.ts → domainPlanner.d.ts}

@@ -4,16 +4,18 @@
  * @typedef {import("../spec/scale.js").ScalarDomain} ScalarDomain
  * @typedef {import("./scaleResolution.js").ScaleResolutionMember} ScaleResolutionMember
  */
-export default class ScaleDomainAggregator {
+export default class DomainPlanner {
     /**
      * @param {object} options
      * @param {() => Set<ScaleResolutionMember>} options.getMembers
+     * @param {() => Set<ScaleResolutionMember>} [options.getDataMembers]
      * @param {() => import("../spec/channel.js").Type} options.getType
      * @param {() => number[]} options.getLocusExtent
      * @param {(interval: ScalarDomain | ComplexDomain) => number[]} options.fromComplexInterval
      */
-    constructor({ getMembers, getType, getLocusExtent, fromComplexInterval }: {
+    constructor({ getMembers, getDataMembers, getType, getLocusExtent, fromComplexInterval, }: {
         getMembers: () => Set<ScaleResolutionMember>;
+        getDataMembers?: () => Set<ScaleResolutionMember>;
         getType: () => import("../spec/channel.js").Type;
         getLocusExtent: () => number[];
         fromComplexInterval: (interval: ScalarDomain | ComplexDomain) => number[];
@@ -23,6 +25,7 @@ export default class ScaleDomainAggregator {
      */
     get initialDomainSnapshot(): any[];
     hasConfiguredDomain(): boolean;
+    invalidateConfiguredDomain(): void;
     /**
      * Returns the configured domain or a data-derived/default domain.
      *
@@ -39,9 +42,9 @@ export default class ScaleDomainAggregator {
     /**
      * Extracts and unions the data domains of all participating views.
      *
-     * @return {DomainArray}
+     * @return {DomainArray | undefined}
      */
-    getDataDomain(): DomainArray;
+    getDataDomain(): DomainArray | undefined;
     /**
      * @param {import("../types/encoder.js").VegaScale} scale
      * @param {boolean} domainWasInitialized
@@ -54,4 +57,4 @@ 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
+//# sourceMappingURL=domainPlanner.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"domainPlanner.d.ts","sourceRoot":"","sources":["../../../src/scales/domainPlanner.js"],"names":[],"mappings":"AAOA;;;;;GAKG;AAEH;IA2BI;;;;;;;OAOG;IACH,2FANG;QAAkD,UAAU,EAApD,MAAM,GAAG,CAAC,qBAAqB,CAAC;QACW,cAAc,GAAzD,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,EAaA;IAED;;OAEG;IACH,6BAFa,GAAG,EAAE,CAIjB;IAED,+BAEC;IAED,mCAEC;IAED;;;;;OAKG;IACH,iDAHW,OAAO,GACL,GAAG,EAAE,CAYjB;IAED;;;;OAIG;IACH,uBAFY,WAAW,CActB;IAED;;;;OAIG;IACH,iBAFY,WAAW,GAAG,SAAS,CAQlC;IAED;;;;OAIG;IACH,4BAJW,OAAO,qBAAqB,EAAE,SAAS,wBACvC,OAAO,GACL,OAAO,CAgBnB;;CAkCJ;0BA7KY,OAAO,yBAAyB,EAAE,WAAW;4BAC7C,OAAO,kBAAkB,EAAE,aAAa;2BACxC,OAAO,kBAAkB,EAAE,YAAY;oCACvC,OAAO,sBAAsB,EAAE,qBAAqB"}