@genome-spy/core 0.48.2 → 0.49.0

package/dist/src/view/scaleResolution.d.ts

@@ -17,8 +17,12 @@ export const LOCUS: "locus";
 export const INDEX: "index";
 /**
  * @template {ChannelWithScale}[T=ChannelWithScale]
- * @typedef {{view: import("./unitView.js").default, channel: T}} ResolutionMember
  *
+ * @typedef {object} ScaleResolutionMember
+ * @prop {import("./unitView.js").default} view TODO: Get rid of the view reference
+ * @prop {T} channel
+ * @prop {import("../spec/channel.js").ChannelDefWithScale} channelDef
+ * @prop {(channel: ChannelWithScale, type: import("../spec/channel.js").Type) => DomainArray} dataDomainSource
  */
 /**
  * Resolution takes care of merging domains and scales from multiple views.
@@ -34,10 +38,10 @@ export default class ScaleResolution implements ScaleResolutionApi {
      */
     constructor(channel: import("../spec/channel.js").Channel);
     channel: import("../spec/channel.js").Channel;
-    /** @type {ResolutionMember[]} The involved views */
-    members: ResolutionMember[];
-    /** @type {string} Data type (quantitative, nominal, etc...) */
-    type: string;
+    /** @type {ScaleResolutionMember[]} The involved views */
+    members: ScaleResolutionMember[];
+    /** @type {import("../spec/channel.js").Type} Data type (quantitative, nominal, etc...) */
+    type: import("../spec/channel.js").Type;
     /** @type {string} An optional unique identifier for the scale */
     name: string;
     /**
@@ -58,10 +62,9 @@ export default class ScaleResolution implements ScaleResolutionApi {
      * Add a view to this resolution.
      * N.B. This is expected to be called in depth-first order
      *
-     * @param {UnitView} view
-     * @param {ChannelWithScale} channel
+     * @param {ScaleResolutionMember} newMember
      */
-    pushUnitView(view: import("./unitView.js").default, channel: import("../spec/channel.js").ChannelWithScale): void;
+    pushUnitView(newMember: ScaleResolutionMember): void;
     /**
      * Unions the configured domains of all participating views.
      *
@@ -157,8 +160,13 @@ export default class ScaleResolution implements ScaleResolutionApi {
     fromComplexInterval(interval: import("../spec/scale.js").ScalarDomain | import("../spec/scale.js").ComplexDomain): number[];
     #private;
 }
-export type ResolutionMember<T extends import("../spec/channel.js").ChannelWithScale = import("../spec/channel.js").ChannelWithScale> = {
+export type ScaleResolutionMember<T extends import("../spec/channel.js").ChannelWithScale = import("../spec/channel.js").ChannelWithScale> = {
+    /**
+     * TODO: Get rid of the view reference
+     */
     view: import("./unitView.js").default;
     channel: T;
+    channelDef: import("../spec/channel.js").ChannelDefWithScale;
+    dataDomainSource: (channel: import("../spec/channel.js").ChannelWithScale, type: import("../spec/channel.js").Type) => import("../utils/domainArray.js").DomainArray;
 };
 //# sourceMappingURL=scaleResolution.d.ts.map

package/dist/src/view/scaleResolution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scaleResolution.d.ts","sourceRoot":"","sources":["../../../src/view/scaleResolution.js"],"names":[],"mappings":"AA86BA;;;;;;;;;;GAUG;AACH,6CAFW,OAAO,WAAW,EAAE,OAAO,GAAG,OAAO,WAAW,EAAE,OAAO,EAAE,QA4BrE;AAr6BD,0CAA2C;AAC3C,gCAAiC;AACjC,gCAAiC;AACjC,4BAA6B;AAC7B,4BAA6B;AAE7B;;;;GAIG;AACH;;;;;;;GAOG;AACH;IAyCI;;OAEG;IACH,2DASC;IARG,8CAAsB;IACtB,oDAAoD;IACpD,SADW,gBAAgB,EAAE,CACZ;IACjB,+DAA+D;IAC/D,MADW,MAAM,CACD;IAEhB,iEAAiE;IACjE,MADW,MAAM,CACI;IAWzB;;;;;;;OAOG;IACH,4KAEC;IAED;;;OAGG;IACH,+KAEC;IAcD;;;;;;OAMG;IACH,kHA0BC;IAmLD;;;;OAIG;IACH,qEAMC;IAED;;;;OAIG;IACH,+DAQC;IAED;;OAEG;IACH,oBAyCC;IAED;;OAEG;IACH;eAhXkC,OAAO,kBAAkB,EAAE,KAAK;MAuZjE;IAED,mBAEC;IAED;;OAEG;IACH,oBAFa,mFAA6B,CAOzC;IAED;;;;OAIG;IACH,oBAKC;IAED;;OAEG;IACH,sBAGC;IAUD;;;;;;;OAOG;IACH,kBALW,MAAM,eACN,MAAM,OACN,MAAM,GACJ,OAAO,CAwEnB;IAED;;;;;;OAMG;IACH,eAJW,mFAA6B,aAC7B,OAAO,GAAG,MAAM,iBAgD1B;IAED;;;;OAIG;IACH,qBAcC;IAED;;;;;OAKG;IACH,uBAOC;IA8DD;;;OAGG;IACH,aAFa,OAAO,qBAAqB,EAAE,OAAO,CAajD;IAID;;;;;OAKG;IACH,uBAFW,MAAM,yDAUhB;IAED;;OAEG;IACH,iBAFW,MAAM,yDAKhB;IAED;;;OAGG;IACH,6EAFa,MAAM,CAQlB;IAED;;;OAGG;IACH,mHAFa,MAAM,EAAE,CAOpB;;CA6BJ;wIAjyBY;IAAC,IAAI,EAAE,OAAO,eAAe,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,CAAC,CAAA;CAAC"}
+{"version":3,"file":"scaleResolution.d.ts","sourceRoot":"","sources":["../../../src/view/scaleResolution.js"],"names":[],"mappings":"AA+7BA;;;;;;;;;;GAUG;AACH,6CAFW,OAAO,WAAW,EAAE,OAAO,GAAG,OAAO,WAAW,EAAE,OAAO,EAAE,QA4BrE;AAv7BD,0CAA2C;AAC3C,gCAAiC;AACjC,gCAAiC;AACjC,4BAA6B;AAC7B,4BAA6B;AAE7B;;;;;;;;GAQG;AACH;;;;;;;GAOG;AACH;IAyCI;;OAEG;IACH,2DASC;IARG,8CAAsB;IACtB,yDAAyD;IACzD,SADW,qBAAqB,EAAE,CACjB;IACjB,0FAA0F;IAC1F,MADW,OAAO,oBAAoB,EAAE,IAAI,CAC5B;IAEhB,iEAAiE;IACjE,MADW,MAAM,CACI;IAWzB;;;;;;;OAOG;IACH,4KAEC;IAED;;;OAGG;IACH,+KAEC;IAcD;;;;;OAKG;IACH,wBAFW,qBAAqB,QA4B/B;IAuLD;;;;OAIG;IACH,qEAgBC;IAED;;;;OAIG;IACH,+DAMC;IAED;;OAEG;IACH,oBAyCC;IAED;;OAEG;IACH;eA3XkC,OAAO,kBAAkB,EAAE,KAAK;MAuajE;IAED,mBAEC;IAED;;OAEG;IACH,oBAFa,mFAA6B,CAOzC;IAED;;;;OAIG;IACH,oBAKC;IAED;;OAEG;IACH,sBAGC;IAUD;;;;;;;OAOG;IACH,kBALW,MAAM,eACN,MAAM,OACN,MAAM,GACJ,OAAO,CAwEnB;IAED;;;;;;OAMG;IACH,eAJW,mFAA6B,aAC7B,OAAO,GAAG,MAAM,iBAgD1B;IAED;;;;OAIG;IACH,qBAcC;IAED;;;;;OAKG;IACH,uBAOC;IA8DD;;;OAGG;IACH,aAFa,OAAO,qBAAqB,EAAE,OAAO,CAajD;IAID;;;;;OAKG;IACH,uBAFW,MAAM,yDAUhB;IAED;;OAEG;IACH,iBAFW,MAAM,yDAKhB;IAED;;;OAGG;IACH,6EAFa,MAAM,CAQlB;IAED;;;OAGG;IACH,mHAFa,MAAM,EAAE,CAOpB;;CA2BJ;;;;;UAjzBS,OAAO,eAAe,EAAE,OAAO;aAC/B,CAAC;gBACD,OAAO,oBAAoB,EAAE,mBAAmB;qFACd,OAAO,oBAAoB,EAAE,IAAI"}

package/dist/src/view/scaleResolution.js

@@ -21,7 +21,6 @@ import mergeObjects from "../utils/mergeObjects.js";
 import createScale, { configureScale } from "../scale/scale.js";
 
 import {
-    getChannelDefWithScale,
     isColorChannel,
     isDiscreteChannel,
     isPositionalChannel,
@@ -32,7 +31,7 @@ import {
     isChromosomalLocus,
     isChromosomalLocusInterval,
 } from "../genome/genome.js";
-import { NominalDomain } from "../utils/domainArray.js";
+import createDomain, { NominalDomain } from "../utils/domainArray.js";
 import { easeCubicInOut } from "d3-ease";
 import { asArray, shallowArrayEquals } from "../utils/arrayUtils.js";
 import eerp from "../utils/eerp.js";
@@ -52,8 +51,12 @@ export const INDEX = "index";
 
 /**
  * @template {ChannelWithScale}[T=ChannelWithScale]
- * @typedef {{view: import("./unitView.js").default, channel: T}} ResolutionMember
  *
+ * @typedef {object} ScaleResolutionMember
+ * @prop {import("./unitView.js").default} view TODO: Get rid of the view reference
+ * @prop {T} channel
+ * @prop {import("../spec/channel.js").ChannelDefWithScale} channelDef
+ * @prop {(channel: ChannelWithScale, type: import("../spec/channel.js").Type) => DomainArray} dataDomainSource
  */
 /**
  * Resolution takes care of merging domains and scales from multiple views.
@@ -109,9 +112,9 @@ export default class ScaleResolution {
      */
     constructor(channel) {
         this.channel = channel;
-        /** @type {ResolutionMember[]} The involved views */
+        /** @type {ScaleResolutionMember[]} The involved views */
         this.members = [];
-        /** @type {string} Data type (quantitative, nominal, etc...) */
+        /** @type {import("../spec/channel.js").Type} Data type (quantitative, nominal, etc...) */
         this.type = null;
 
         /** @type {string} An optional unique identifier for the scale */
@@ -162,11 +165,10 @@ export default class ScaleResolution {
      * Add a view to this resolution.
      * N.B. This is expected to be called in depth-first order
      *
-     * @param {UnitView} view
-     * @param {ChannelWithScale} channel
+     * @param {ScaleResolutionMember} newMember
      */
-    pushUnitView(view, channel) {
-        const channelDef = getChannelDefWithScale(view, channel);
+    pushUnitView(newMember) {
+        const { channel, channelDef } = newMember;
         const type = channelDef.type;
         const name = channelDef?.scale?.name;
 
@@ -190,7 +192,7 @@ export default class ScaleResolution {
             // TODO: Use the same merging logic as in: https://github.com/vega/vega-lite/blob/master/src/scale.ts
         }
 
-        this.members.push({ view, channel });
+        this.members.push(newMember);
     }
 
     /**
@@ -227,10 +229,7 @@ export default class ScaleResolution {
      */
     #getMergedScaleProps() {
         const propArray = this.members
-            .map(
-                (member) =>
-                    getChannelDefWithScale(member.view, member.channel).scale
-            )
+            .map((member) => member.channelDef.scale)
             .filter((props) => props !== undefined);
 
         // TODO: Disabled scale: https://vega.github.io/vega-lite/docs/scale.html#disable
@@ -241,9 +240,10 @@ export default class ScaleResolution {
      * Returns the merged scale properties supplemented with inferred properties
      * and domain.
      *
+     * @param {boolean} [extractDataDomain]
      * @returns {import("../spec/scale.js").Scale}
      */
-    #getScaleProps() {
+    #getScaleProps(extractDataDomain = false) {
         const mergedProps = this.#getMergedScaleProps();
         if (mergedProps === null || mergedProps.type == "null") {
             // No scale (pass-thru)
@@ -260,7 +260,7 @@ export default class ScaleResolution {
             props.type = getDefaultScaleType(this.channel, this.type);
         }
 
-        const domain = this.#getInitialDomain();
+        const domain = this.#getInitialDomain(extractDataDomain);
 
         if (domain && domain.length > 0) {
             props.domain = domain;
@@ -360,13 +360,19 @@ export default class ScaleResolution {
         }
     }
 
-    #getInitialDomain() {
+    /**
+     *
+     * @param {boolean} extractDataDomain
+     */
+    #getInitialDomain(extractDataDomain = false) {
         // TODO: intersect the domain with zoom extent (if it's defined)
         return (
             this.getConfiguredDomain() ??
             (this.type == LOCUS
                 ? this.getGenome().getExtent()
-                : this.getDataDomain())
+                : extractDataDomain
+                ? this.getDataDomain()
+                : [])
         );
     }
 
@@ -376,11 +382,21 @@ export default class ScaleResolution {
      * @return { DomainArray }
      */
     getConfiguredDomain() {
-        return this.#reduceDomains((member) =>
-            isSecondaryChannel(member.channel)
-                ? undefined
-                : member.view.getConfiguredDomain(member.channel)
-        );
+        const domains = this.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
+                    this.fromComplexInterval(channelDef.scale.domain)
+                )
+            );
+
+        if (domains.length > 0) {
+            return domains.reduce((acc, curr) => acc.extendAll(curr));
+        }
     }
 
     /**
@@ -392,9 +408,7 @@ export default class ScaleResolution {
         // TODO: Optimize: extract domain only once if the views share the data.
         // In fact, this should be a responsibility of collectors.
         return this.#reduceDomains((member) =>
-            isSecondaryChannel(member.channel)
-                ? undefined
-                : member.view.extractDataDomain(member.channel)
+            member.dataDomainSource(member.channel, this.type)
         );
     }
 
@@ -411,7 +425,7 @@ export default class ScaleResolution {
         const domainWasInitialized = this.#isDomainInitialized();
         const previousDomain = scale.domain();
 
-        const props = this.#getScaleProps();
+        const props = this.#getScaleProps(true);
         configureScale({ ...props, range: undefined }, scale);
 
         // Annotate the scale with the new props
@@ -458,6 +472,11 @@ export default class ScaleResolution {
         // Annotate the scale with props
         scale.props = props;
 
+        if ("unknown" in scale) {
+            // Never allow implicit domain construction
+            scale.unknown(null);
+        }
+
         this.#scale = scale;
         this.#configureRange();
 
@@ -630,7 +649,7 @@ export default class ScaleResolution {
 
         // TODO: Intersect the domain with zoom extent
 
-        const animator = this.members[0]?.view.context.animator;
+        const animator = this.#viewContext.animator;
 
         const scale = this.scale;
         const from = /** @type {number[]} */ (scale.domain());
@@ -770,7 +789,7 @@ export default class ScaleResolution {
         }
 
         // TODO: Support multiple assemblies
-        const genome = this.members[0].view.context.genomeStore?.getGenome();
+        const genome = this.#viewContext.genomeStore?.getGenome();
         if (!genome) {
             throw new Error("No genome has been defined!");
         }
@@ -826,21 +845,19 @@ export default class ScaleResolution {
         return /** @type {number[]} */ (interval);
     }
 
-    #getViewPaths() {
-        return this.members.map((v) => v.view.getPathString()).join(", ");
-    }
-
     /**
      * Iterate all participanting views and reduce (union) their domains using an accessor.
      * Accessor may return the an explicitly configured domain or a domain extracted from the data.
      *
-     * @param {function(ResolutionMember):DomainArray} domainAccessor
+     * @param {function(ScaleResolutionMember):DomainArray} domainAccessor
      * @returns {DomainArray}
      */
     #reduceDomains(domainAccessor) {
         const domains = this.members
             .filter(
                 (member) =>
+                    // View is missing if ScaleResolution is used within tests
+                    !member.view ||
                     !member.view
                         .getLayoutAncestors()
                         // TODO: Should check until the resolved scale resolution

package/dist/src/view/scaleResolution.test.d.ts

@@ -0,0 +1,2 @@
+export type Channel = import("../spec/channel.js").Channel;
+//# sourceMappingURL=scaleResolution.test.d.ts.map

package/dist/src/view/scaleResolution.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scaleResolution.test.d.ts","sourceRoot":"","sources":["../../../src/view/scaleResolution.test.js"],"names":[],"mappings":"sBAWa,OAAO,oBAAoB,EAAE,OAAO"}

package/dist/src/view/scaleResolution.test.js

@@ -1,3 +1,5 @@
+// @ts-nocheck
+
 import { describe, expect, test } from "vitest";
 import { createAndInitialize } from "./testUtils.js";
 import createDomain, { toRegularArray as r } from "../utils/domainArray.js";

package/dist/src/view/testUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testUtils.d.ts","sourceRoot":"","sources":["../../../src/view/testUtils.js"],"names":[],"mappings":"AAeA;;;GAGG;AACH,2DAHW,OAAO,kBAAkB,EAAE,kBAAkB,6CAqDvD;AAGS,oEAA8C,QAAQ,2BAA4B,GAAG,EAAE,6BAA6B,OAAO,kBAAkB,EAAE,kBAAkB,cAAe;AAgBhL,iFAA8C,QAAQ,2BAA4B,GAAG,EAAE,kBAAkB,WAAW,YAAY;IAAC,MAAM,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,OAAO,CAAA;CAAC,cAAe;;;;;uBApFpL,OAAO,iBAAiB,EAAE,QAAQ;;;;;0BAClC,OAAO,yBAAyB,EAAE,OAAO"}
+{"version":3,"file":"testUtils.d.ts","sourceRoot":"","sources":["../../../src/view/testUtils.js"],"names":[],"mappings":"AAiBA;;;GAGG;AACH,2DAHW,OAAO,kBAAkB,EAAE,kBAAkB,6CAmDvD;AAGS,oEAA8C,QAAQ,2BAA4B,GAAG,EAAE,6BAA6B,OAAO,kBAAkB,EAAE,kBAAkB,cAAe;AAgBhL,iFAA8C,QAAQ,2BAA4B,GAAG,EAAE,kBAAkB,WAAW,YAAY;IAAC,MAAM,EAAE,OAAO,CAAC;IAAC,YAAY,EAAE,OAAO,CAAA;CAAC,cAAe;;;;;uBApFpL,OAAO,iBAAiB,EAAE,QAAQ;;;;;0BAClC,OAAO,yBAAyB,EAAE,OAAO"}

package/dist/src/view/testUtils.js

@@ -7,11 +7,13 @@
  */
 
 import { checkForDuplicateScaleNames, initializeData } from "./viewUtils.js";
-import AccessorFactory from "../encoder/accessor.js";
 import DataFlow from "../data/dataFlow.js";
 import { VIEW_ROOT_NAME, ViewFactory } from "./viewFactory.js";
 import GenomeStore from "../genome/genomeStore.js";
 import BmFontManager from "../fonts/bmFontManager.js";
+import { reconfigureScales } from "./scaleResolution.js";
+import UnitView from "./unitView.js";
+import ContainerView from "./containerView.js";
 
 /**
  * @param {import("./viewFactory.js").ViewFactoryOptions} [viewFactoryOptions]
@@ -35,8 +37,6 @@ export function createTestViewContext(viewFactoryOptions = {}) {
 
     // @ts-expect-error
     const c = /** @type {ViewContext} */ ({
-        accessorFactory: new AccessorFactory(),
-
         createView: function (spec, parent, defaultName) {
             throw new Error("Not implemented: createView");
         },
@@ -92,6 +92,18 @@ export async function createAndInitialize(spec, viewClass) {
     const view = await create(spec, viewClass);
 
     checkForDuplicateScaleNames(view);
+
+    if (view instanceof UnitView) {
+        view.mark.initializeEncoders();
+    } else if (view instanceof ContainerView) {
+        view.visit((v) => {
+            if (v instanceof UnitView) {
+                v.mark.initializeEncoders();
+            }
+        });
+    }
+
     await initializeData(view, view.context.dataFlow);
+    reconfigureScales(view);
     return view;
 }

package/dist/src/view/unitView.d.ts

@@ -20,12 +20,6 @@ export default class UnitView extends View {
     spec: import("../spec/view.js").UnitSpec;
     /** @type {import("../marks/mark.js").default} */
     mark: import("../marks/mark.js").default;
-    /**
-     * @param {import("./renderingContext/viewRenderingContext.js").default} context
-     * @param {import("./layout/rectangle.js").default} coords
-     * @param {import("../types/rendering.js").RenderingOptions} [options]
-     */
-    render(context: import("./renderingContext/viewRenderingContext.js").default, coords: import("./layout/rectangle.js").default, options?: import("../types/rendering.js").RenderingOptions): void;
     getMarkType(): import("../spec/mark.js").MarkType;
     /**
      * Pulls scales and axes up in the view hierarcy according to the resolution rules, using dataParents.
@@ -35,21 +29,16 @@ export default class UnitView extends View {
      */
     resolve(type?: import("../spec/view.js").ResolutionTarget): void;
     /**
+     * Returns an accessor that accesses a field or an evaluated expression,
+     * if there is one.
      *
      * @param {Channel} channel
      */
-    getAccessor(channel: import("../spec/channel.js").Channel): import("../types/encoder.js").Accessor;
+    getDataAccessor(channel: import("../spec/channel.js").Channel): import("../types/encoder.js").Accessor<import("../spec/channel.js").Scalar>;
     /**
      * Returns a collector that is associated with this view.
      */
     getCollector(): import("../data/collector.js").default;
-    /**
-     * Returns the domain of the specified channel of this domain/mark.
-     *
-     * @param {import("../spec/channel.js").ChannelWithScale} channel A primary channel
-     * @returns {DomainArray}
-     */
-    getConfiguredDomain(channel: import("../spec/channel.js").ChannelWithScale): import("../utils/domainArray.js").DomainArray;
     /**
      * Extracts the domain from the data.
      *
@@ -61,9 +50,10 @@ export default class UnitView extends View {
      * (with aggregate and extent).
      *
      * @param {Channel} channel
+     * @param {import("../spec/channel.js").Type} type
      * @returns {DomainArray}
      */
-    extractDataDomain(channel: import("../spec/channel.js").Channel): import("../utils/domainArray.js").DomainArray;
+    extractDataDomain(channel: import("../spec/channel.js").Channel, type: import("../spec/channel.js").Type): import("../utils/domainArray.js").DomainArray;
     getZoomLevel(): number;
     /**
      * @param {string} channel

package/dist/src/view/unitView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unitView.d.ts","sourceRoot":"","sources":["../../../src/view/unitView.js"],"names":[],"mappings":"AAqBA;;;;GAIG;AACH;QAHkB,MAAM,GAAE,cAAc,kBAAkB,EAAE,OAAO;EASjE;AAEF;IAcI;;;;;;;;OAQG;IACH,kBAPW,OAAO,iBAAiB,EAAE,QAAQ,WAClC,OAAO,yBAAyB,EAAE,OAAO,gBACzC,OAAO,oBAAoB,EAAE,OAAO,cACpC,OAAO,WAAW,EAAE,OAAO,QAC3B,MAAM,YACN,OAAO,WAAW,EAAE,WAAW,EA+BzC;IA1BG,yCAAgB;IAIZ,iDAAiD;IACjD,MADW,OAAO,kBAAkB,EAAE,OAAO,CACnB;IAuBlC;;;;OAIG;IACH,gBAJW,OAAO,4CAA4C,EAAE,OAAO,UAC5D,OAAO,uBAAuB,EAAE,OAAO,YACvC,OAAO,uBAAuB,EAAE,gBAAgB,QAY1D;IAED,kDAIC;IAED;;;;;OAKG;IACH,iEAgFC;IAED;;;OAGG;IACH,mGASC;IAkBD;;OAEG;IACH,uDAEC;IAqBD;;;;;OAKG;IACH,6BAHW,OAAO,oBAAoB,EAAE,gBAAgB,iDAkBvD;IAED;;;;;;;;;;;;OAYG;IACH,gHA2CC;IAED,uBAQC;IAgBD;;;;OAIG;IACH,8BAJW,MAAM,+DAEJ,OAAO,iBAAiB,EAAE,kBAAkB,CAKxD;;CACJ;iBA/VgB,WAAW"}
+{"version":3,"file":"unitView.d.ts","sourceRoot":"","sources":["../../../src/view/unitView.js"],"names":[],"mappings":"AAsBA;;;;GAIG;AACH;QAHkB,MAAM,GAAE,cAAc,kBAAkB,EAAE,OAAO;EASjE;AAEF;IAeI;;;;;;;;OAQG;IACH,kBAPW,OAAO,iBAAiB,EAAE,QAAQ,WAClC,OAAO,yBAAyB,EAAE,OAAO,gBACzC,OAAO,oBAAoB,EAAE,OAAO,cACpC,OAAO,WAAW,EAAE,OAAO,QAC3B,MAAM,YACN,OAAO,WAAW,EAAE,WAAW,EAiCzC;IA5BG,yCAAgB;IAIZ,iDAAiD;IACjD,MADW,OAAO,kBAAkB,EAAE,OAAO,CACnB;IAsFlC,kDAIC;IAED;;;;;OAKG;IACH,iEAmFC;IAED;;;;;OAKG;IACH,4IAEC;IAkBD;;OAEG;IACH,uDAEC;IAED;;;;;;;;;;;;;OAaG;IACH,uEAHW,OAAO,oBAAoB,EAAE,IAAI,iDAqB3C;IAED,uBAQC;IAgBD;;;;OAIG;IACH,8BAJW,MAAM,+DAEJ,OAAO,iBAAiB,EAAE,kBAAkB,CAKxD;;CACJ;iBA7UgB,WAAW"}

package/dist/src/view/unitView.js

@@ -6,8 +6,6 @@ import TextMark from "../marks/text.js";
 
 import ScaleResolution from "./scaleResolution.js";
 import {
-    isSecondaryChannel,
-    secondaryChannels,
     isPositionalChannel,
     isChannelDefWithScale,
     primaryPositionalChannels,
@@ -18,6 +16,9 @@ import {
 import createDomain from "../utils/domainArray.js";
 import AxisResolution from "./axisResolution.js";
 import View from "./view.js";
+import { createSinglePointSelection } from "../selection/selection.js";
+import { isString } from "vega-util";
+import { UNIQUE_ID_KEY } from "../data/transforms/identifier.js";
 
 /**
  *
@@ -37,6 +38,7 @@ export default class UnitView extends View {
      * @typedef {import("../spec/channel.js").Channel} Channel
      * @typedef {import("../utils/domainArray.js").DomainArray} DomainArray
      * @typedef {import("../spec/view.js").ResolutionTarget} ResolutionTarget
+     * @typedef {((datum: import("../data/flowNode.js").Datum) => import("../spec/channel.js").Scalar) & { fieldDef: import("../spec/channel.js").FieldDef}} FieldAccessor
      *
      */
 
@@ -84,6 +86,52 @@ export default class UnitView extends View {
         );
 
         this.needsAxes = { x: true, y: true };
+
+        this.#setupPointSelection();
+    }
+
+    #setupPointSelection() {
+        for (const [name, param] of this.paramMediator.paramConfigs) {
+            if (!("select" in param)) {
+                continue;
+            }
+
+            const select = param.select;
+            const type = isString(select) ? select : select.type;
+            if (type === "point") {
+                // Handle projection-free point selections
+
+                const none = -1;
+                let lastId = none;
+
+                const setter = this.paramMediator.getSetter(name);
+
+                const getHoveredDatum = () => {
+                    const h = this.context.getCurrentHover();
+                    return h?.mark?.unitView === this ? h.datum : null;
+                };
+
+                const on =
+                    !isString(select) && "on" in select ? select.on : "click";
+
+                this.addInteractionEventListener(
+                    ["mouseover", "pointerover"].includes(on)
+                        ? "mousemove"
+                        : "click",
+                    (rect, event) => {
+                        const datum = getHoveredDatum();
+                        const id = datum ? datum[UNIQUE_ID_KEY] : none;
+                        if (id != lastId) {
+                            lastId = id;
+                            const selection = createSinglePointSelection(
+                                getHoveredDatum()
+                            );
+                            setter(selection);
+                        }
+                    }
+                );
+            }
+        }
     }
 
     /**
@@ -172,10 +220,11 @@ export default class UnitView extends View {
                         targetChannel
                     );
                 }
-                view.resolutions[type][targetChannel].pushUnitView(
-                    this,
-                    channel
-                );
+                view.resolutions[type][targetChannel].pushUnitView({
+                    view: this,
+                    channel,
+                    channelDef,
+                });
             } else if (type == "scale" && isChannelWithScale(channel)) {
                 if (!view.resolutions[type][targetChannel]) {
                     const resolution = new ScaleResolution(targetChannel);
@@ -189,27 +238,24 @@ export default class UnitView extends View {
                         );
                     });
                 }
-                view.resolutions[type][targetChannel].pushUnitView(
-                    this,
-                    channel
-                );
+                view.resolutions[type][targetChannel].pushUnitView({
+                    view: this,
+                    channel,
+                    channelDef,
+                    dataDomainSource: this.extractDataDomain.bind(this),
+                });
             }
         }
     }
 
     /**
+     * Returns an accessor that accesses a field or an evaluated expression,
+     * if there is one.
      *
      * @param {Channel} channel
      */
-    getAccessor(channel) {
-        return this._cache("accessor/" + channel, () => {
-            const encoding = this.mark.encoding; // Mark provides encodings with defaults and possible modifications
-            if (encoding && encoding[channel]) {
-                return this.context.accessorFactory.createAccessor(
-                    encoding[channel]
-                );
-            }
-        });
+    getDataAccessor(channel) {
+        return this.mark.encoders[channel]?.dataAccessor;
     }
 
     /**
@@ -220,7 +266,7 @@ export default class UnitView extends View {
      */
     getFacetAccessor(whoIsAsking) {
         // TODO: Rewrite, call getFacetFields
-        const sampleAccessor = this.getAccessor("sample");
+        const sampleAccessor = this.getDataAccessor("sample");
         if (sampleAccessor) {
             return sampleAccessor;
         }
@@ -235,48 +281,6 @@ export default class UnitView extends View {
         return this.context.dataFlow.findCollectorByKey(this);
     }
 
-    /**
-     * @param {Channel} channel A primary channel
-     */
-    #validateDomainQuery(channel) {
-        if (isSecondaryChannel(channel)) {
-            throw new Error(
-                `getDomain(${channel}), must only be called for primary channels!`
-            );
-        }
-
-        const channelDef = this.mark.encoding[channel];
-        // TODO: Broken. Fix.
-        if (!isChannelDefWithScale(channelDef)) {
-            throw new Error("The channel has no scale, cannot get domain!");
-        }
-
-        return channelDef;
-    }
-
-    /**
-     * Returns the domain of the specified channel of this domain/mark.
-     *
-     * @param {import("../spec/channel.js").ChannelWithScale} channel A primary channel
-     * @returns {DomainArray}
-     */
-    getConfiguredDomain(channel) {
-        const channelDef = this.#validateDomainQuery(channel);
-
-        const specDomain =
-            channelDef && channelDef.scale && channelDef.scale.domain;
-        if (specDomain) {
-            const scaleResolution = this.getScaleResolution(
-                channelDef.resolutionChannel ?? channel
-            );
-            return createDomain(
-                channelDef.type ?? "nominal",
-                // Chrom/pos must be linearized first
-                scaleResolution.fromComplexInterval(specDomain)
-            );
-        }
-    }
-
     /**
      * Extracts the domain from the data.
      *
@@ -288,49 +292,25 @@ export default class UnitView extends View {
      * (with aggregate and extent).
      *
      * @param {Channel} channel
+     * @param {import("../spec/channel.js").Type} type
      * @returns {DomainArray}
      */
-    extractDataDomain(channel) {
-        const channelDef = this.#validateDomainQuery(channel);
-        const type = channelDef.type ?? "nominal"; // TODO: Should check that this is a channel without scale
-
-        /** @param {Channel} channel */
-        const extract = (channel) => {
-            /** @type {DomainArray} */
-            let domain;
-
-            const encodingSpec = this.mark.encoding[channel];
-
-            if (encodingSpec) {
-                const accessor =
-                    this.context.accessorFactory.createAccessor(encodingSpec);
-                if (accessor) {
-                    domain = createDomain(type);
-
-                    if (accessor.constant) {
-                        domain.extend(accessor({}));
-                    } else {
-                        const collector = this.getCollector();
-                        if (collector?.completed) {
-                            collector.visitData((d) =>
-                                domain.extend(accessor(d))
-                            );
-                        }
+    extractDataDomain(channel, type) {
+        /** @type {DomainArray} */
+        let domain = createDomain(type);
+
+        (this.mark.encoders[channel]?.accessors ?? [])
+            .filter((a) => a.scaleChannel)
+            .forEach((accessor) => {
+                if (accessor.constant) {
+                    domain.extend(accessor({}));
+                } else {
+                    const collector = this.getCollector();
+                    if (collector?.completed) {
+                        collector.visitData((d) => domain.extend(accessor(d)));
                     }
                 }
-            }
-            return domain;
-        };
-
-        let domain = extract(channel);
-
-        const secondaryChannel = secondaryChannels[channel];
-        if (secondaryChannel) {
-            const secondaryDomain = extract(secondaryChannel);
-            if (secondaryDomain) {
-                domain.extendAll(secondaryDomain);
-            }
-        }
+            });
 
         return domain;
     }

package/dist/src/view/view.d.ts

@@ -205,7 +205,7 @@ export default class View {
      * pass. The order is depth first, pre order.
      */
     onBeforeRender(): void;
-    render(context: ViewRenderingContext, coords: import("./layout/rectangle.js").default, options?: import("../types/rendering.js").RenderingOptions): void;
+    render(context: import("./renderingContext/viewRenderingContext.js").default, coords: import("./layout/rectangle.js").default, options?: import("../types/rendering.js").RenderingOptions): void;
     /**
      * Returns the encodings specified in this view combined with the inherited
      * encodings. However, this does not contain any defaults or inferred/adjusted/fixed