@genome-spy/core 0.73.0 → 0.75.0

package/dist/src/paramRuntime/viewParamRuntime.js

@@ -61,16 +61,22 @@ export default class ViewParamRuntime {
     /** @type {() => ViewParamRuntime} */
     #parentFinder;
 
+    /** @type {(channel: string) => import("../scales/scaleResolution.js").default | undefined} */
+    #scaleResolutionResolver;
+
     #disposed = false;
 
     /**
      * @param {() => ViewParamRuntime} [parentFinder]
-     *      An optional function that returns the parent runtime.
-     *      N.B. The function must always return the same runtime for the same parent,
-     *      i.e., the changing the structure of the hierarchy is NOT supported.
+     * @param {(channel: import("../spec/channel.js").ChannelWithScale) => import("../scales/scaleResolution.js").default | undefined} [scaleResolutionResolver]
+     *      Optional resolver for scale channels in this runtime's view scope.
+     *      N.B. The function must always return the same resolution for the
+     *      same channel in the same view hierarchy.
      */
-    constructor(parentFinder) {
+    constructor(parentFinder, scaleResolutionResolver) {
         this.#parentFinder = parentFinder ?? (() => undefined);
+        this.#scaleResolutionResolver =
+            scaleResolutionResolver ?? (() => undefined);
 
         const parent = this.#parentFinder();
         if (parent) {
@@ -149,7 +155,10 @@ export default class ViewParamRuntime {
             const ref = this.#runtime.registerDerived(
                 this.#scopeId,
                 name,
-                param.expr
+                param.expr,
+                {
+                    resolveScaleResolution: this.#scaleResolutionResolver,
+                }
             );
             this.#localRefs.set(name, ref);
             setter = () => {
@@ -295,6 +304,41 @@ export default class ViewParamRuntime {
         );
     }
 
+    /**
+     * Returns true if this runtime scope owns a local binding for the parameter.
+     *
+     * @param {string} paramName
+     * @returns {boolean}
+     */
+    hasLocalParam(paramName) {
+        validateParameterName(paramName);
+        return this.#localRefs.has(paramName);
+    }
+
+    /**
+     * Returns true if this runtime scope or any ancestor scope contains a
+     * parameter registered through `registerParam`.
+     *
+     * Auto-allocated setters such as layout width/height are intentionally
+     * ignored so that only explicit parameter configs shadow descendant
+     * auto-size params.
+     *
+     * @param {string} paramName
+     * @returns {boolean}
+     */
+    hasConfiguredParamInScopeChain(paramName) {
+        validateParameterName(paramName);
+
+        if (this.#paramConfigs.has(paramName)) {
+            return true;
+        }
+
+        return (
+            this.#parentFinder()?.hasConfiguredParamInScopeChain(paramName) ??
+            false
+        );
+    }
+
     /**
      *
      * @param {string} paramName
@@ -317,7 +361,9 @@ export default class ViewParamRuntime {
      * @param {string} expr
      */
     createExpression(expr) {
-        return this.#runtime.createExpression(this.#scopeId, expr);
+        return this.#runtime.createExpression(this.#scopeId, expr, {
+            resolveScaleResolution: this.#scaleResolutionResolver,
+        });
     }
 
     /**

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"scale.d.ts","sourceRoot":"","sources":["../../../src/scale/scale.js"],"names":[],"mappings":"AAiIA,sEAuBC;AAED;;;;;GAKG;AACH,uCAJW,OAAO,kBAAkB,EAAE,KAAK,UAChC,GAAC,GACC,OAAO,uBAAuB,EAAE,SAAS,CA0BrD;AA4CD;;;;;EAuGC"}

package/dist/src/scale/scale.js

@@ -112,6 +112,7 @@ var SKIP = toSet([
     "domainMax",
     "domainRaw",
     "domainImplicit",
+    "domainTransition",
     "nice",
     "zero",
     "bins",
@@ -158,7 +159,18 @@ export function configureScale(_, scale, logger) {
  * @returns {import("../encoder/encoder.js").VegaScale}
  */
 export default function createScale(_, logger) {
-    const key = scaleKey(_);
+    // Seed continuous scales with a placeholder domain before key selection so
+    // scheme-backed scales choose the interpolating family.
+    const scaleProps =
+        !_.domain && isContinuous(_.type)
+            ? {
+                  ..._,
+                  // [0, 0] indicates an uninitialized domain.
+                  domain: [0, 0],
+              }
+            : _;
+
+    const key = scaleKey(scaleProps);
     const scale = getScale(key);
 
     if (!scale) {
@@ -167,12 +179,7 @@ export default function createScale(_, logger) {
 
     const scaleInstance = scale();
 
-    if (!_.domain && isContinuous(scaleInstance.type)) {
-        // [0, 0] indicates an uninitialized domain.
-        _.domain = [0, 0];
-    }
-
-    configureScale(_, scaleInstance, logger);
+    configureScale(scaleProps, scaleInstance, logger);
 
     return scaleInstance;
 }

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,mBAmEC;;CACJ;iCAhL6D,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":"AAeA;;;;;;;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,qDA0BC;IAED,mBAmEC;;CACJ;iCAnL6D,CAAC,SAAlD,OAAQ,oBAAoB,EAAE,iBAAkB;UAGnD,OAAO,qBAAqB,EAAE,OAAO;aACrC,CAAC;gBACD,OAAO,oBAAoB,EAAE,mBAAmB"}

package/dist/src/scales/axisResolution.js

@@ -11,6 +11,7 @@ import coalesce from "../utils/coalesce.js";
 
 import mergeObjects from "../utils/mergeObjects.js";
 import { getCachedOrCall, invalidate } from "../utils/propertyCacher.js";
+import { orderResolutionMembers } from "./resolutionMemberOrder.js";
 
 /**
  * @template {import("../spec/channel.js").PositionalChannel}[T=PositionalChannel]
@@ -98,10 +99,13 @@ export default class AxisResolution {
 
     getAxisProps() {
         return getCachedOrCall(this, "axisProps", () => {
-            const propArray = Array.from(this.#members).map((member) => {
-                const channelDef = member.view.mark.encoding[member.channel];
-                return "axis" in channelDef && channelDef.axis;
-            });
+            const propArray = orderResolutionMembers(this.#members).map(
+                (member) => {
+                    const channelDef =
+                        member.view.mark.encoding[member.channel];
+                    return "axis" in channelDef && channelDef.axis;
+                }
+            );
 
             if (
                 propArray.length > 0 &&
@@ -152,7 +156,7 @@ export default class AxisResolution {
             };
         };
 
-        const titles = Array.from(this.#members).map(computeTitle);
+        const titles = orderResolutionMembers(this.#members).map(computeTitle);
         const explicitAxisTitle = titles
             .map((title) => title.axisTitle)
             .find((title) => title !== undefined);

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

@@ -8,39 +8,74 @@ export function isSelectionDomainRef(domain: any): domain is SelectionDomainRef;
  * @typedef {import("../spec/scale.js").ComplexDomain} ComplexDomain
  * @typedef {import("../spec/scale.js").ScalarDomain} ScalarDomain
  * @typedef {import("../spec/scale.js").SelectionDomainRef} SelectionDomainRef
+ * @typedef {import("../spec/parameter.js").ExprRef} ExprRef
  * @typedef {import("./scaleResolution.js").ScaleResolutionMember} ScaleResolutionMember
+ * @typedef {() => Set<ScaleResolutionMember>} ScaleMembersGetter
+ * @typedef {(interval: ScalarDomain | ComplexDomain) => number[]} FromComplexInterval
+ * @typedef {(assembly: import("../spec/scale.js").Scale["assembly"] | undefined) => number[]} GetLocusExtent
  * @typedef {{
+ *   domains: DomainArray[],
+ *   selectionRef: SelectionDomainLinkInfo | undefined,
+ *   selectionRuntime: any,
+ *   selectionDescription: string | undefined,
+ *   hasLiteralDomain: boolean,
+ * }} ConfiguredDomainResolutionState
+ * @typedef {{
+ *   kind: "literal",
+ *   domain: DomainArray,
+ * } | {
+ *   kind: "selection",
+ *   domain: DomainArray | undefined,
+ *   description: string,
  *   param: string,
  *   encoding: "x" | "y",
- *   sync: "auto" | "oneWay" | "twoWay",
+ *   hasInitial: boolean,
+ *   runtime: any,
+ * }} ConfiguredDomainMemberResolution
+ * @typedef {{
+ *   param: string,
+ *   encoding: "x" | "y",
+ *   hasInitial: boolean,
+ *   runtime: any,
  * }} SelectionDomainLinkInfo
  */
 export default class DomainPlanner {
     /**
      * @param {object} options
-     * @param {() => Set<ScaleResolutionMember>} options.getMembers
-     * @param {() => Set<ScaleResolutionMember>} [options.getDataMembers]
+     * @param {ScaleMembersGetter} options.getActiveMembers Active shared-scale members used for configured domain planning.
+     * @param {ScaleMembersGetter} [options.getAllMembers] All members, including inactive ones, used for conflict validation.
+     * @param {ScaleMembersGetter} [options.getDataMembers] Members used for data-domain extraction; defaults to `getActiveMembers`.
      * @param {() => import("../spec/channel.js").Type} options.getType
-     * @param {(assembly: import("../spec/scale.js").Scale["assembly"] | undefined) => number[]} options.getLocusExtent
-     * @param {(interval: ScalarDomain | ComplexDomain) => number[]} options.fromComplexInterval
+     * @param {GetLocusExtent} options.getLocusExtent
+     * @param {FromComplexInterval} options.fromComplexInterval
      */
-    constructor({ getMembers, getDataMembers, getType, getLocusExtent, fromComplexInterval, }: {
-        getMembers: () => Set<ScaleResolutionMember>;
-        getDataMembers?: () => Set<ScaleResolutionMember>;
+    constructor({ getActiveMembers, getAllMembers, getDataMembers, getType, getLocusExtent, fromComplexInterval, }: {
+        getActiveMembers: ScaleMembersGetter;
+        getAllMembers?: ScaleMembersGetter;
+        getDataMembers?: ScaleMembersGetter;
         getType: () => import("../spec/channel.js").Type;
-        getLocusExtent: (assembly: import("../spec/scale.js").Scale["assembly"] | undefined) => number[];
-        fromComplexInterval: (interval: ScalarDomain | ComplexDomain) => number[];
+        getLocusExtent: GetLocusExtent;
+        fromComplexInterval: FromComplexInterval;
     });
     /**
      * @returns {any[]}
      */
     get initialDomainSnapshot(): any[];
-    hasConfiguredDomain(): boolean;
+    /**
+     * @param {{ includeSelectionInitial?: boolean }} [options]
+     */
+    hasConfiguredDomain(options?: {
+        includeSelectionInitial?: boolean;
+    }): boolean;
     hasSelectionConfiguredDomain(): boolean;
     /**
      * @returns {SelectionDomainLinkInfo | undefined}
      */
-    getSelectionConfiguredDomainInfo(): SelectionDomainLinkInfo | undefined;
+    getSelectionConfiguredDomainBindingInfo(): SelectionDomainLinkInfo | undefined;
+    getSelectionConfiguredDomainInfo(): {
+        param: string;
+        encoding: "x" | "y";
+    };
     invalidateConfiguredDomain(): void;
     /**
      * Returns the default domain without considering configured domains.
@@ -55,15 +90,21 @@ export default class DomainPlanner {
      *
      * @param {boolean} [extractDataDomain]
      * @param {import("../spec/scale.js").Scale["assembly"]} [locusAssembly]
+     * @param {{ includeSelectionInitial?: boolean }} [options]
      * @returns {any[]}
      */
-    getConfiguredOrDefaultDomain(extractDataDomain?: boolean, locusAssembly?: import("../spec/scale.js").Scale["assembly"]): any[];
+    getConfiguredOrDefaultDomain(extractDataDomain?: boolean, locusAssembly?: import("../spec/scale.js").Scale["assembly"], options?: {
+        includeSelectionInitial?: boolean;
+    }): any[];
     /**
      * Unions the configured domains of all participating views.
      *
+     * @param {{ includeSelectionInitial?: boolean }} [options]
      * @return {DomainArray}
      */
-    getConfiguredDomain(): DomainArray;
+    getConfiguredDomain(options?: {
+        includeSelectionInitial?: boolean;
+    }): DomainArray;
     /**
      * Extracts and unions the data domains of all participating views.
      *
@@ -73,19 +114,44 @@ export default class DomainPlanner {
     /**
      * @param {import("../types/encoder.js").VegaScale} scale
      * @param {boolean} domainWasInitialized
+     * @param {any[]} [snapshotDomain]
      * @returns {boolean} true if listeners should be notified immediately
      */
-    captureInitialDomain(scale: import("../types/encoder.js").VegaScale, domainWasInitialized: boolean): boolean;
+    captureInitialDomain(scale: import("../types/encoder.js").VegaScale, domainWasInitialized: boolean, snapshotDomain?: any[]): 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 SelectionDomainRef = import("../spec/scale.js").SelectionDomainRef;
+export type ExprRef = import("../spec/parameter.js").ExprRef;
 export type ScaleResolutionMember = import("./scaleResolution.js").ScaleResolutionMember;
+export type ScaleMembersGetter = () => Set<ScaleResolutionMember>;
+export type FromComplexInterval = (interval: ScalarDomain | ComplexDomain) => number[];
+export type GetLocusExtent = (assembly: import("../spec/scale.js").Scale["assembly"] | undefined) => number[];
+export type ConfiguredDomainResolutionState = {
+    domains: DomainArray[];
+    selectionRef: SelectionDomainLinkInfo | undefined;
+    selectionRuntime: any;
+    selectionDescription: string | undefined;
+    hasLiteralDomain: boolean;
+};
+export type ConfiguredDomainMemberResolution = {
+    kind: "literal";
+    domain: DomainArray;
+} | {
+    kind: "selection";
+    domain: DomainArray | undefined;
+    description: string;
+    param: string;
+    encoding: "x" | "y";
+    hasInitial: boolean;
+    runtime: any;
+};
 export type SelectionDomainLinkInfo = {
     param: string;
     encoding: "x" | "y";
-    sync: "auto" | "oneWay" | "twoWay";
+    hasInitial: boolean;
+    runtime: any;
 };
 //# sourceMappingURL=domainPlanner.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"domainPlanner.d.ts","sourceRoot":"","sources":["../../../src/scales/domainPlanner.js"],"names":[],"mappings":"AA8ZA;;;GAGG;AACH,6CAHW,GAAG,GACD,MAAM,IAAI,kBAAkB,CASxC;AAhaD;;;;;;;;;;;GAWG;AAEH;IA8BI;;;;;;;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;QACmD,cAAc,EAAxG,CAAC,QAAQ,EAAE,OAAO,kBAAkB,EAAE,KAAK,CAAC,UAAU,CAAC,GAAG,SAAS,KAAK,MAAM,EAAE;QAClB,mBAAmB,EAAjF,CAAC,QAAQ,EAAE,YAAY,GAAG,aAAa,KAAK,MAAM,EAAE;KAC9D,EAaA;IAED;;OAEG;IACH,6BAFa,GAAG,EAAE,CAIjB;IAED,+BAEC;IAED,wCAGC;IAED;;OAEG;IACH,oCAFa,uBAAuB,GAAG,SAAS,CAK/C;IAED,mCAEC;IAED;;;;;;OAMG;IACH,qCAJW,OAAO,kBACP,OAAO,kBAAkB,EAAE,KAAK,CAAC,UAAU,CAAC,GAC1C,GAAG,EAAE,CASjB;IAED;;;;;;OAMG;IACH,iDAJW,OAAO,kBACP,OAAO,kBAAkB,EAAE,KAAK,CAAC,UAAU,CAAC,GAC1C,GAAG,EAAE,CAQjB;IAED;;;;OAIG;IACH,uBAFY,WAAW,CAetB;IAED;;;;OAIG;IACH,iBAFY,WAAW,GAAG,SAAS,CAQlC;IAED;;;;OAIG;IACH,4BAJW,OAAO,qBAAqB,EAAE,SAAS,wBACvC,OAAO,GACL,OAAO,CAgBnB;;CAkCJ;0BAjNY,OAAO,yBAAyB,EAAE,WAAW;4BAC7C,OAAO,kBAAkB,EAAE,aAAa;2BACxC,OAAO,kBAAkB,EAAE,YAAY;iCACvC,OAAO,kBAAkB,EAAE,kBAAkB;oCAC7C,OAAO,sBAAsB,EAAE,qBAAqB;sCACpD;IACR,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,GAAG,GAAG,GAAG,CAAC;IACpB,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAC;CACpC"}
+{"version":3,"file":"domainPlanner.d.ts","sourceRoot":"","sources":["../../../src/scales/domainPlanner.js"],"names":[],"mappings":"AAooBA;;;GAGG;AACH,6CAHW,GAAG,GACD,MAAM,IAAI,kBAAkB,CASxC;AAhnBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AAEH;IAiCI;;;;;;;;OAQG;IACH,gHAPG;QAAoC,gBAAgB,EAA5C,kBAAkB;QACW,aAAa,GAA1C,kBAAkB;QACW,cAAc,GAA3C,kBAAkB;QAC+B,OAAO,EAAxD,MAAM,OAAO,oBAAoB,EAAE,IAAI;QACf,cAAc,EAAtC,cAAc;QACe,mBAAmB,EAAhD,mBAAmB;KAC7B,EAeA;IAED;;OAEG;IACH,6BAFa,GAAG,EAAE,CAIjB;IAED;;OAEG;IACH,8BAFW;QAAE,uBAAuB,CAAC,EAAE,OAAO,CAAA;KAAE,WAI/C;IAED,wCAGC;IAED;;OAEG;IACH,2CAFa,uBAAuB,GAAG,SAAS,CAS/C;IAED;;;MAUC;IAED,mCAIC;IAED;;;;;;OAMG;IACH,qCAJW,OAAO,kBACP,OAAO,kBAAkB,EAAE,KAAK,CAAC,UAAU,CAAC,GAC1C,GAAG,EAAE,CAYjB;IAED;;;;;;;OAOG;IACH,iDALW,OAAO,kBACP,OAAO,kBAAkB,EAAE,KAAK,CAAC,UAAU,CAAC,YAC5C;QAAE,uBAAuB,CAAC,EAAE,OAAO,CAAA;KAAE,GACnC,GAAG,EAAE,CAYjB;IAED;;;;;OAKG;IACH,8BAHW;QAAE,uBAAuB,CAAC,EAAE,OAAO,CAAA;KAAE,GACpC,WAAW,CA8BtB;IAED;;;;OAIG;IACH,iBAFY,WAAW,GAAG,SAAS,CAQlC;IAED;;;;;OAKG;IACH,4BALW,OAAO,qBAAqB,EAAE,SAAS,wBACvC,OAAO,mBACP,GAAG,EAAE,GACH,OAAO,CAgBnB;;CAkCJ;0BA7RY,OAAO,yBAAyB,EAAE,WAAW;4BAC7C,OAAO,kBAAkB,EAAE,aAAa;2BACxC,OAAO,kBAAkB,EAAE,YAAY;iCACvC,OAAO,kBAAkB,EAAE,kBAAkB;sBAC7C,OAAO,sBAAsB,EAAE,OAAO;oCACtC,OAAO,sBAAsB,EAAE,qBAAqB;iCACpD,MAAM,GAAG,CAAC,qBAAqB,CAAC;kCAChC,CAAC,QAAQ,EAAE,YAAY,GAAG,aAAa,KAAK,MAAM,EAAE;6BACpD,CAAC,QAAQ,EAAE,OAAO,kBAAkB,EAAE,KAAK,CAAC,UAAU,CAAC,GAAG,SAAS,KAAK,MAAM,EAAE;8CAChF;IACR,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,YAAY,EAAE,uBAAuB,GAAG,SAAS,CAAC;IAClD,gBAAgB,EAAE,GAAG,CAAC;IACtB,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,gBAAgB,EAAE,OAAO,CAAC;CAC3B;+CACS;IACR,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,WAAW,CAAC;CACrB,GAAG;IACF,IAAI,EAAE,WAAW,CAAC;IAClB,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,GAAG,GAAG,GAAG,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,GAAG,CAAC;CACd;sCACS;IACR,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,GAAG,GAAG,GAAG,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,GAAG,CAAC;CACd"}