@genome-spy/core 0.48.1 → 0.49.0

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

@@ -11,7 +11,17 @@ export function isExprRef(x: any): x is import("../spec/parameter.js").ExprRef;
  * @template T
  * @returns {T}
  */
-export function withoutExprRef<T>(x: T | import("../spec/parameter.js").ExprRef): T;
+export function withoutExprRef<T>(x: import("../spec/parameter.js").ExprRef | T): T;
+/**
+ * @param {Parameter} param
+ * @returns {param is import("../spec/parameter.js").VariableParameter}
+ */
+export function isVariableParameter(param: import("../spec/parameter.js").Parameter): param is import("../spec/parameter.js").VariableParameter;
+/**
+ * @param {Parameter} param
+ * @returns {param is import("../spec/parameter.js").SelectionParameter}
+ */
+export function isSelectionParameter(param: import("../spec/parameter.js").Parameter): param is import("../spec/parameter.js").SelectionParameter<import("../spec/parameter.js").SelectionType>;
 /**
  * Takes a record of properties that may have ExprRefs as values. Converts the
  * ExprRefs to getters and setups a listener that is called when any of the
@@ -24,6 +34,23 @@ export function withoutExprRef<T>(x: T | import("../spec/parameter.js").ExprRef)
  * @template {Record<string, any | import("../spec/parameter.js").ExprRef>} T
  */
 export function activateExprRefProps<T extends Record<string, any>>(paramMediator: ParamMediator, props: T, listener?: (props: (keyof T)[]) => void): T;
+/**
+ * Validates a parameter name. If the name is invalid, throws an error.
+ * Otherwise, returns the name.
+ *
+ * @param {string} name
+ * @returns {string} the name
+ */
+export function validateParameterName(name: string): string;
+/**
+ * Creates a function that always returns the same value.
+ * Provides functionality for creating a constant expression reference.
+ * They just do nothing.
+ *
+ * @param {any} value
+ * @returns {ExprRefFunction}
+ */
+export function makeConstantExprRef(value: any): ExprRefFunction;
 /**
  * A class that manages parameters and expressions.
  * Supports nesting and scoped parameters.
@@ -44,10 +71,10 @@ export default class ParamMediator {
      */
     protected paramListeners: Map<string, Set<() => void>>;
     /**
-     * @param {VariableParameter} param
+     * @param {Parameter} param
      * @returns {ParameterSetter}
      */
-    registerParam(param: import("../spec/parameter.js").VariableParameter): (value: any) => void;
+    registerParam(param: import("../spec/parameter.js").Parameter): (value: any) => void;
     /**
      *
      * @param {string} paramName
@@ -75,7 +102,7 @@ export default class ParamMediator {
     /**
      * Returns configs for all parameters that have been registered using `registerParam`.
      */
-    get paramConfigs(): ReadonlyMap<string, import("../spec/parameter.js").VariableParameter>;
+    get paramConfigs(): ReadonlyMap<string, import("../spec/parameter.js").Parameter>;
     /**
      *
      * @param {string} paramName
@@ -101,7 +128,7 @@ export default class ParamMediator {
  * A class that manages parameters and expressions.
  * Supports nesting and scoped parameters.
  */
-export type ExprRefFunction = ((datum?: object) => any) & import("../utils/expression.js").ExpressionProps & {
+export type ExprRefFunction = ((datum?: import("../data/flowNode.js").Datum) => any) & import("../utils/expression.js").ExpressionProps & {
     addListener: (listener: () => void) => void;
     invalidate: () => void;
     identifier: () => string;

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

@@ -1 +1 @@
-{"version":3,"file":"paramMediator.d.ts","sourceRoot":"","sources":["../../../src/view/paramMediator.js"],"names":[],"mappings":"AAuQA;;;GAGG;AACH,6BAHW,GAAG,+CAKb;AAED;;;;;;;GAOG;AACH,oFASC;AAED;;;;;;;;;;GAUG;AACH,mFANW,aAAa,+CAEW,IAAI,KAwCtC;AA9UD;;;;;GAKG;AACH;IA2BI;;;;;OAKG;IACH,2BALW,MAAM,aAAa,EAU7B;IA7BD;;;OAGG;IACH,0BAHU,IAAI,MAAM,EAAE,IAAI,MAAM,IAAI,CAAC,CAAC,CAGvB;IA2Bf;;;OAGG;IACH,gFAzCqB,GAAG,KAAK,IAAI,CAkEhC;IAED;;;;;;;OAOG;IACH,6BANW,MAAM,6BAEN,OAAO,iBACS,IAAI,CA8B9B;IAED;;;OAGG;IACH,qBAFW,MAAM,WA/Fc,GAAG,KAAK,IAAI,CAuG1C;IAED;;;OAGG;IACH,oBAFW,MAAM,OAIhB;IAED;;;OAGG;IACH,qBAFW,MAAM,OAKhB;IAED;;OAEG;IACH,0FAIC;IAED;;;;;OAKG;IACH,0CAJW,MAAM,GACJ,aAAa,CASzB;IAID;;;;OAIG;IACH,uBAFW,MAAM,mBA4EhB;IAED;;;;OAIG;IACH,qBAFW,MAAM,OAKhB;;CACJ;;;;;;4BA9P4F,MAAM,IAAI,KAAK,IAAI;gBAAc,MAAM,IAAI;gBAAc,MAAM,MAAM"}
+{"version":3,"file":"paramMediator.d.ts","sourceRoot":"","sources":["../../../src/view/paramMediator.js"],"names":[],"mappings":"AA2SA;;;GAGG;AACH,6BAHW,GAAG,+CAKb;AAED;;;;;;;GAOG;AACH,oFASC;AAED;;;GAGG;AACH,gJAEC;AAED;;;GAGG;AACH,gMAEC;AAED;;;;;;;;;;GAUG;AACH,mFANW,aAAa,+CAEW,IAAI,KAwCtC;AAED;;;;;;GAMG;AACH,4CAHW,MAAM,GACJ,MAAM,CAUlB;AAED;;;;;;;GAOG;AACH,2CAHW,GAAG,GACD,eAAe,CAW3B;AAraD;;;;;GAKG;AACH;IA2BI;;;;;OAKG;IACH,2BALW,MAAM,aAAa,EAU7B;IA7BD;;;OAGG;IACH,0BAHU,IAAI,MAAM,EAAE,IAAI,MAAM,IAAI,CAAC,CAAC,CAGvB;IA2Bf;;;OAGG;IACH,wEAzCqB,GAAG,KAAK,IAAI,CAmGhC;IAED;;;;;;;OAOG;IACH,6BANW,MAAM,6BAEN,OAAO,iBACS,IAAI,CAgC9B;IAED;;;OAGG;IACH,qBAFW,MAAM,WAlIc,GAAG,KAAK,IAAI,CA0I1C;IAED;;;OAGG;IACH,oBAFW,MAAM,OAIhB;IAED;;;OAGG;IACH,qBAFW,MAAM,OAKhB;IAED;;OAEG;IACH,kFAIC;IAED;;;;;OAKG;IACH,0CAJW,MAAM,GACJ,aAAa,CASzB;IAID;;;;OAIG;IACH,uBAFW,MAAM,mBA4EhB;IAED;;;;OAIG;IACH,qBAFW,MAAM,OAKhB;;CACJ;;;;;;4BAjS4F,MAAM,IAAI,KAAK,IAAI;gBAAc,MAAM,IAAI;gBAAc,MAAM,MAAM"}

package/dist/src/view/paramMediator.js

@@ -1,5 +1,6 @@
 import { isString } from "vega-util";
 import createFunction from "../utils/expression.js";
+import { createSinglePointSelection } from "../selection/selection.js";
 
 /**
  * A class that manages parameters and expressions.
@@ -9,7 +10,7 @@ import createFunction from "../utils/expression.js";
  */
 export default class ParamMediator {
     /**
-     * @typedef {import("../spec/parameter.js").VariableParameter} VariableParameter
+     * @typedef {import("../spec/parameter.js").Parameter} Parameter
      * @typedef {(value: any) => void} ParameterSetter
      */
 
@@ -28,7 +29,7 @@ export default class ParamMediator {
     /** @type {Map<string, ExprRefFunction>} */
     #expressions = new Map();
 
-    /** @type {Map<string, VariableParameter>} */
+    /** @type {Map<string, Parameter>} */
     #paramConfigs = new Map();
 
     /** @type {() => ParamMediator} */
@@ -48,32 +49,65 @@ export default class ParamMediator {
     }
 
     /**
-     * @param {VariableParameter} param
+     * @param {Parameter} param
      * @returns {ParameterSetter}
      */
     registerParam(param) {
+        const name = param.name;
+
         if ("value" in param && "expr" in param) {
             throw new Error(
-                "Parameter must not have both value and expr: " + param.name
+                `The parameter "${name}" must not have both value and expr properties!`
             );
         }
 
         /** @type {ParameterSetter} */
         let setter;
 
-        if ("value" in param) {
-            setter = this.allocateSetter(param.name, param.value);
+        if (param.push == "outer") {
+            const outerMediator = this.findMediatorForParam(name);
+            if (!outerMediator) {
+                throw new Error(
+                    `Parameter "${name}" not found in outer scope!`
+                );
+            }
+
+            const outerProps = outerMediator.paramConfigs.get(name);
+            if ("expr" in outerProps || "select" in outerProps) {
+                throw new Error(
+                    `The outer parameter "${name}" must not have expr or select properties!`
+                );
+            }
+            setter = outerMediator.getSetter(name);
+            // The following will become a bit fragile if the view hierarchy is going to
+            // support mutation (i.e. adding/removing children) in future.
+            this.#allocatedSetters.set(name, setter);
+        } else if ("value" in param) {
+            setter = this.allocateSetter(name, param.value);
         } else if ("expr" in param) {
             const expr = this.createExpression(param.expr);
             // TODO: getSetter(param) should return a setter that throws if
             // modifying the value is attempted.
-            const realSetter = this.allocateSetter(param.name, expr(null));
+            const realSetter = this.allocateSetter(name, expr(null));
             expr.addListener(() => realSetter(expr(null)));
             // NOP
             setter = (_) => undefined;
+        } else {
+            setter = this.allocateSetter(name, null);
         }
 
-        this.#paramConfigs.set(param.name, param);
+        if ("select" in param) {
+            const type = isString(param.select)
+                ? param.select
+                : param.select.type;
+
+            // Set initial value so that production rules in shaders can be generated, etc.
+            if (type == "point") {
+                setter(createSinglePointSelection(null));
+            }
+        }
+
+        this.#paramConfigs.set(name, param);
 
         return setter;
     }
@@ -87,6 +121,8 @@ export default class ParamMediator {
      * @template T
      */
     allocateSetter(paramName, initialValue, passive = false) {
+        validateParameterName(paramName);
+
         if (this.#allocatedSetters.has(paramName)) {
             throw new Error(
                 "Setter already allocated for parameter: " + paramName
@@ -148,7 +184,7 @@ export default class ParamMediator {
      * Returns configs for all parameters that have been registered using `registerParam`.
      */
     get paramConfigs() {
-        return /** @type {ReadonlyMap<string, VariableParameter>} */ (
+        return /** @type {ReadonlyMap<string, Parameter>} */ (
             this.#paramConfigs
         );
     }
@@ -288,6 +324,22 @@ export function withoutExprRef(x) {
     return /** @type {T} */ (x);
 }
 
+/**
+ * @param {Parameter} param
+ * @returns {param is import("../spec/parameter.js").VariableParameter}
+ */
+export function isVariableParameter(param) {
+    return ("expr" in param || "bind" in param) && !("select" in param);
+}
+
+/**
+ * @param {Parameter} param
+ * @returns {param is import("../spec/parameter.js").SelectionParameter}
+ */
+export function isSelectionParameter(param) {
+    return !("expr" in param || "bind" in param) && "select" in param;
+}
+
 /**
  * Takes a record of properties that may have ExprRefs as values. Converts the
  * ExprRefs to getters and setups a listener that is called when any of the
@@ -336,3 +388,39 @@ export function activateExprRefProps(paramMediator, props, listener) {
 
     return /** @type {T} */ (activatedProps);
 }
+
+/**
+ * Validates a parameter name. If the name is invalid, throws an error.
+ * Otherwise, returns the name.
+ *
+ * @param {string} name
+ * @returns {string} the name
+ */
+export function validateParameterName(name) {
+    if (!/^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(name)) {
+        throw new Error(
+            `Invalid parameter name: ${name}. Must be a valid JavaScript identifier.`
+        );
+    }
+
+    return name;
+}
+
+/**
+ * Creates a function that always returns the same value.
+ * Provides functionality for creating a constant expression reference.
+ * They just do nothing.
+ *
+ * @param {any} value
+ * @returns {ExprRefFunction}
+ */
+export function makeConstantExprRef(value) {
+    return Object.assign(() => value, {
+        addListener: () => undefined,
+        invalidate: () => undefined,
+        identifier: () => "constant",
+        fields: [],
+        globals: [],
+        code: JSON.stringify(value),
+    });
+}

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

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

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

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

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

@@ -173,6 +173,22 @@ describe("Nested ParamMediators", () => {
         childSetter(20);
         expect(result).toBe(30);
     });
+
+    test("Pushing to outer parameter", () => {
+        const parent = new ParamMediator();
+        const child = new ParamMediator(() => parent);
+
+        parent.registerParam({ name: "foo", value: 1 });
+        const childSetter = child.registerParam({ name: "foo", push: "outer" });
+
+        expect(parent.findValue("foo")).toBe(1);
+        expect(child.findValue("foo")).toBe(1);
+
+        childSetter(2);
+
+        expect(parent.findValue("foo")).toBe(2);
+        expect(child.findValue("foo")).toBe(2);
+    });
 });
 
 test("activateExprRefProps", async () => {
@@ -181,7 +197,7 @@ test("activateExprRefProps", async () => {
     const fooSetter = pm.registerParam({ name: "foo", value: 7 });
     const barSetter = pm.registerParam({ name: "bar", value: 11 });
 
-    /** @type {Record<string, any | import("../spec/parameter.js").ExprRef} */
+    /** @type {Record<string, any | import("../spec/parameter.js").ExprRef>} */
     const props = {
         a: 42,
         b: { expr: "foo" },

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;
 }