@genome-spy/core 0.73.0 → 0.74.0

package/dist/src/scales/scaleInteractionController.js

@@ -15,6 +15,11 @@ import eerp from "../utils/eerp.js";
 import { shallowArrayEquals } from "../utils/arrayUtils.js";
 import { createCancelToken } from "../utils/transition.js";
 import { zoomDomainByScaleType } from "./zoomDomainUtils.js";
+import { toInternalIndexLikeInterval } from "./indexLikeDomainUtils.js";
+import {
+    hasExplicitLocusUpperBound,
+    isChromosomalLocusInterval,
+} from "../genome/genome.js";
 
 /**
  * @typedef {import("../spec/scale.js").NumericDomain} NumericDomain
@@ -177,13 +182,16 @@ export default class ScaleInteractionController {
             throw new Error("Not a zoomable scale!");
         }
 
-        const to = this.#fromComplexInterval(domain);
+        const scale = this.#getScale();
+        const to = normalizeInteractionInterval(
+            /** @type {import("../spec/scale.js").ScaleType} */ (scale.type),
+            domain,
+            this.#fromComplexInterval
+        );
 
         // TODO: Intersect the domain with zoom extent
 
         const animator = this.#getAnimator();
-
-        const scale = this.#getScale();
         const from = /** @type {number[]} */ (scale.domain());
 
         if (duration > 0 && from.length == 2) {
@@ -288,7 +296,11 @@ function resolveZoomExtent(
 ) {
     if (isZoomParams(zoom)) {
         if (isArray(zoom.extent)) {
-            return fromComplexInterval(zoom.extent);
+            return normalizeInteractionInterval(
+                scale.props.type,
+                zoom.extent,
+                fromComplexInterval
+            );
         }
     }
 
@@ -362,6 +374,33 @@ function applyZoomTransform(scale, domain, scaleFactor, scaleAnchor, pan) {
     );
 }
 
+/**
+ * Converts a user-facing interaction interval into the internal numeric domain
+ * representation used by index-like scales.
+ *
+ * @param {import("../spec/scale.js").ScaleType} type
+ * @param {ScalarDomain | ComplexDomain} interval
+ * @param {(domain: ScalarDomain | ComplexDomain) => number[]} fromComplexInterval
+ * @returns {number[]}
+ */
+function normalizeInteractionInterval(type, interval, fromComplexInterval) {
+    const numericInterval =
+        type === "locus"
+            ? fromComplexInterval(interval)
+            : /** @type {number[]} */ (interval);
+
+    // Whole-chromosome locus intervals already resolve to the intended extent.
+    if (
+        type === "locus" &&
+        isChromosomalLocusInterval(interval) &&
+        !hasExplicitLocusUpperBound(interval)
+    ) {
+        return numericInterval;
+    }
+
+    return toInternalIndexLikeInterval(type, numericInterval);
+}
+
 /**
  * @param {boolean | ZoomParams} zoom
  * @returns {zoom is ZoomParams}

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

@@ -9,13 +9,15 @@
  * @param {import("../spec/channel.js").Type} options.dataType
  * @param {Set<ScaleResolutionMember>} options.members
  * @param {boolean} options.isExplicitDomain
+ * @param {import("../spec/config.js").GenomeSpyConfig[]} options.configScopes
  * @returns {Scale}
  */
-export function resolveScalePropsBase({ channel, dataType, members, isExplicitDomain, }: {
+export function resolveScalePropsBase({ channel, dataType, members, isExplicitDomain, configScopes, }: {
     channel: Channel;
     dataType: import("../spec/channel.js").Type;
     members: Set<ScaleResolutionMember>;
     isExplicitDomain: boolean;
+    configScopes: import("../spec/config.js").GenomeSpyConfig[];
 }): Scale;
 export type Channel = import("../spec/channel.js").Channel;
 export type Scale = import("../spec/scale.js").Scale;

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

@@ -1 +1 @@
-{"version":3,"file":"scalePropsResolver.d.ts","sourceRoot":"","sources":["../../../src/scales/scalePropsResolver.js"],"names":[],"mappings":"AAOA;;;;GAIG;AAEH;;;;;;;GAOG;AACH,yFANG;IAAyB,OAAO,EAAxB,OAAO;IACoC,QAAQ,EAAnD,OAAO,oBAAoB,EAAE,IAAI;IACG,OAAO,EAA3C,GAAG,CAAC,qBAAqB,CAAC;IACT,gBAAgB,EAAjC,OAAO;CACf,GAAU,KAAK,CAiDjB;sBA5DY,OAAO,oBAAoB,EAAE,OAAO;oBACpC,OAAO,kBAAkB,EAAE,KAAK;oCAChC,OAAO,sBAAsB,EAAE,qBAAqB"}
+{"version":3,"file":"scalePropsResolver.d.ts","sourceRoot":"","sources":["../../../src/scales/scalePropsResolver.js"],"names":[],"mappings":"AAcA;;;;GAIG;AAEH;;;;;;;;GAQG;AACH,uGAPG;IAAyB,OAAO,EAAxB,OAAO;IACoC,QAAQ,EAAnD,OAAO,oBAAoB,EAAE,IAAI;IACG,OAAO,EAA3C,GAAG,CAAC,qBAAqB,CAAC;IACT,gBAAgB,EAAjC,OAAO;IACgD,YAAY,EAAnE,OAAO,mBAAmB,EAAE,eAAe,EAAE;CACrD,GAAU,KAAK,CAsHjB;sBAlIY,OAAO,oBAAoB,EAAE,OAAO;oBACpC,OAAO,kBAAkB,EAAE,KAAK;oCAChC,OAAO,sBAAsB,EAAE,qBAAqB"}

package/dist/src/scales/scalePropsResolver.js

@@ -1,9 +1,16 @@
 import { isDiscrete } from "vega-scale";
+import { isColorChannel } from "../encoder/encoder.js";
 
 import mergeObjects from "../utils/mergeObjects.js";
-import { getDefaultScaleProperties } from "../config/scaleDefaults.js";
+import {
+    getConfiguredScaleConfig,
+    getConfiguredScaleDefaults,
+    getConfiguredNamedRange,
+    isConfigRangeName,
+} from "../config/scaleConfig.js";
 import { applyLockedProperties, getDefaultScaleType } from "./scaleRules.js";
 import { INDEX, LOCUS } from "./scaleResolutionConstants.js";
+import { orderResolutionMembers } from "./resolutionMemberOrder.js";
 
 /**
  * @typedef {import("../spec/channel.js").Channel} Channel
@@ -17,6 +24,7 @@ import { INDEX, LOCUS } from "./scaleResolutionConstants.js";
  * @param {import("../spec/channel.js").Type} options.dataType
  * @param {Set<ScaleResolutionMember>} options.members
  * @param {boolean} options.isExplicitDomain
+ * @param {import("../spec/config.js").GenomeSpyConfig[]} options.configScopes
  * @returns {Scale}
  */
 export function resolveScalePropsBase({
@@ -24,8 +32,17 @@ export function resolveScalePropsBase({
     dataType,
     members,
     isExplicitDomain,
+    configScopes,
 }) {
-    const propArray = Array.from(members)
+    const markTypes = [...members]
+        .map((member) =>
+            typeof member.view.getMarkType == "function"
+                ? member.view.getMarkType()
+                : undefined
+        )
+        .filter((markType) => !!markType);
+
+    const propArray = orderResolutionMembers(members)
         .map((member) => member.channelDef.scale)
         .filter((props) => props !== undefined);
 
@@ -36,14 +53,68 @@ export function resolveScalePropsBase({
     }
 
     const props = {
-        ...getDefaultScaleProperties(channel, dataType, isExplicitDomain),
+        ...getConfiguredScaleDefaults(configScopes, {
+            channel,
+            dataType,
+            isExplicitDomain,
+            markTypes: /** @type {import("../spec/mark.js").MarkType[]} */ (
+                markTypes
+            ),
+            hasDomainMid: mergedProps.domainMid !== undefined,
+        }),
         ...mergedProps,
     };
 
     if (!props.type) {
+        // TODO: When discrete positional scale inference is revisited, plumb
+        // mark-level context into getDefaultScaleType instead of deciding only
+        // from channel + data type. The `markTypes` collection above is the
+        // natural starting point for a Vega-Lite-like band-vs-point choice,
+        // including future rect-backed marks such as "bar".
         props.type = getDefaultScaleType(channel, dataType);
     }
 
+    if (typeof props.range == "string") {
+        if (!isConfigRangeName(props.range)) {
+            throw new Error(
+                'Unknown named scale range "' +
+                    props.range +
+                    '". Supported names: shape, size, angle, heatmap, ramp, diverging.'
+            );
+        }
+
+        const resolvedNamedRange = getConfiguredNamedRange(
+            configScopes,
+            props.range
+        );
+        if (resolvedNamedRange === undefined) {
+            throw new Error(
+                'Named scale range "' +
+                    props.range +
+                    '" is not configured in config.range.'
+            );
+        }
+
+        if (
+            isColorChannel(channel) &&
+            (typeof resolvedNamedRange == "string" ||
+                (resolvedNamedRange != null &&
+                    typeof resolvedNamedRange == "object" &&
+                    !Array.isArray(resolvedNamedRange)))
+        ) {
+            props.scheme =
+                /** @type {import("../spec/scale.js").Scale["scheme"]} */ (
+                    resolvedNamedRange
+                );
+            delete props.range;
+        } else {
+            props.range =
+                /** @type {import("../spec/scale.js").Scale["range"]} */ (
+                    resolvedNamedRange
+                );
+        }
+    }
+
     // Reverse discrete y axis
     if (
         channel == "y" &&
@@ -58,9 +129,15 @@ export function resolveScalePropsBase({
         // TODO: Props should be set more intelligently
     }
 
-    // By default, index and locus scales are zoomable, others are not
-    if (!("zoom" in props) && [INDEX, LOCUS].includes(props.type)) {
-        props.zoom = true;
+    // By default, index and locus scales are zoomable, others are not.
+    // Config can override this baseline via scale.zoom.
+    if (!("zoom" in props)) {
+        const scaleConfig = getConfiguredScaleConfig(configScopes, dataType);
+        if (scaleConfig.zoom !== undefined) {
+            props.zoom = scaleConfig.zoom;
+        } else if ([INDEX, LOCUS].includes(props.type)) {
+            props.zoom = true;
+        }
     }
 
     applyLockedProperties(props, channel);

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

@@ -51,6 +51,7 @@ export default class ScaleResolution implements ScaleResolutionApi {
      * @param {ScaleResolutionListener} listener function
      */
     removeEventListener(type: import("../types/scaleResolutionApi.js").ScaleResolutionEventType, listener: import("../types/scaleResolutionApi.js").ScaleResolutionListener): void;
+    syncLinkedSelectionFromDomain(): void;
     /**
      * @param {ScaleResolutionMember} member
      * @returns {() => boolean}
@@ -63,6 +64,11 @@ export default class ScaleResolution implements ScaleResolutionApi {
      * @returns {() => void}
      */
     registerCollectorSubscriptions(collector: import("../data/collector.js").default, accessors: Iterable<import("../types/encoder.js").ScaleAccessor>): () => void;
+    /**
+     * Returns true if the domain has been defined explicitly, i.e. not extracted from the data.
+     */
+    isDomainDefinedExplicitly(): boolean;
+    isDomainInitialized(): boolean;
     /**
      * Returns locus assembly requirements without initializing the scale.
      *
@@ -79,6 +85,15 @@ export default class ScaleResolution implements ScaleResolutionApi {
         assembly: import("../spec/scale.js").Scale["assembly"] | undefined;
         needsDefaultAssembly: boolean;
     };
+    /**
+     * Returns the resolved scale type without instantiating the scale.
+     *
+     * Useful during view construction, before assembly preflight has loaded
+     * URL-backed locus genomes.
+     *
+     * @returns {import("../spec/scale.js").Scale["type"] | undefined}
+     */
+    getResolvedScaleType(): import("../spec/scale.js").Scale["type"] | undefined;
     /**
      * Reconfigures the scale: updates domain and other settings.
      *
@@ -128,6 +143,14 @@ export default class ScaleResolution implements ScaleResolutionApi {
      * @returns {NumericDomain | ComplexDomain}
      */
     getComplexDomain(): import("../spec/scale.js").NumericDomain | import("../spec/scale.js").ComplexDomain;
+    /**
+     * Returns metadata about a selection-linked domain, if present.
+     */
+    getLinkedSelectionDomainInfo(): {
+        param: string;
+        encoding: "x" | "y";
+        persist: boolean;
+    };
     /**
      * Return true if the scale is zoomable and the current domain differs from the initial domain.
      *

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

@@ -1 +1 @@
-{"version":3,"file":"scaleResolution.d.ts","sourceRoot":"","sources":["../../../src/scales/scaleResolution.js"],"names":[],"mappings":"AAgDA;;;;;;;;GAQG;AACH;;;;;;;;;;;;;;;;;;GAkBG;AACH;IAmDI;;OAEG;IACH,2DAkCC;IAjCG,8CAAsB;IACtB,0FAA0F;IAC1F,MADW,OAAO,oBAAoB,EAAE,IAAI,CAC5B;IAEhB,iEAAiE;IACjE,MADW,MAAM,CACI;IAoEzB,2BASC;IAwBD;;;;;;;OAOG;IACH,4KAEC;IAED;;;OAGG;IACH,+KAEC;IAkLD;;;OAGG;IACH,uBAHW,qBAAqB,GACnB,MAAM,OAAO,CAazB;IAED,gBAKC;IA4CD;;;;OAIG;IACH,0CAJW,OAAO,sBAAsB,EAAE,OAAO,aACtC,QAAQ,CAAC,OAAO,qBAAqB,EAAE,aAAa,CAAC,GACnD,MAAM,IAAI,CAkCtB;IA2CD;;;;;;;;;;;OAWG;IACH,0BALa;QACR,QAAQ,EAAE,OAAO,kBAAkB,EAAE,KAAK,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;QACnE,oBAAoB,EAAE,OAAO,CAAA;KAC9B,CAeH;IAmFD;;;;;OAKG;IACH,oBAYC;IAED;;;;;OAKG;IACH,0BAyBC;IA0HD;;OAEG;IACH;eApwBkC,OAAO,kBAAkB,EAAE,KAAK;MA2wBjE;IAED;;;;;;OAMG;IACH;eApxBkC,OAAO,kBAAkB,EAAE,KAAK;MAsxBjE;IAED;;;;OAIG;IACH;eA7xBkC,OAAO,kBAAkB,EAAE,KAAK;MAsyBjE;IAED,mBAEC;IAED;;;;OAIG;IACH,+DAEC;IAED;;OAEG;IACH,oBAFa,mFAA6B,CAMzC;IAED;;;;OAIG;IACH,oBAEC;IAED;;OAEG;IACH,sBAGC;IAED;;;;;;;OAOG;IACH,kBALW,MAAM,eACN,MAAM,OACN,MAAM,GACJ,OAAO,CAInB;IAED;;;;;;OAMG;IACH,eAJW,mFAA6B,aAC7B,OAAO,GAAG,MAAM,iBAK1B;IAED;;;;OAIG;IACH,qBAEC;IAED;;;;;OAKG;IACH,uBAEC;IAED;;;;;;;OAOG;IACH,wBAoBC;IAED;;;;;OAKG;IACH,uBAFW,MAAM,yDAUhB;IAED;;OAEG;IACH,iBAFW,MAAM,yDAIhB;IAED;;;OAGG;IACH,qBAHW,MAAM,+CAAmB,GACvB,MAAM,CAIlB;IAED;;;OAGG;IACH,8BAHW,kFAA4B,GAC1B,MAAM,EAAE,CAOpB;;CACJ;kCA1+B+B,CAAC,SAApB,6CAAkB;;;;UAGrB,OAAO,qBAAqB,EAAE,OAAO;aACrC,CAAC;gBACD,OAAO,oBAAoB,EAAE,mBAAmB;yBAChD,OAAO;;sBAhCV,+BAA+B;sBAA/B,+BAA+B;wBAA/B,+BAA+B;wBAA/B,+BAA+B;6BAA/B,+BAA+B"}
+{"version":3,"file":"scaleResolution.d.ts","sourceRoot":"","sources":["../../../src/scales/scaleResolution.js"],"names":[],"mappings":"AAkDA;;;;;;;;GAQG;AACH;;;;;;;;;;;;;;;;;;GAkBG;AACH;IAwDI;;OAEG;IACH,2DAkCC;IAjCG,8CAAsB;IACtB,0FAA0F;IAC1F,MADW,OAAO,oBAAoB,EAAE,IAAI,CAC5B;IAEhB,iEAAiE;IACjE,MADW,MAAM,CACI;IAoEzB,2BASC;IAwBD;;;;;;;OAOG;IACH,4KAEC;IAED;;;OAGG;IACH,+KAEC;IAiCD,sCA0CC;IA0JD;;;OAGG;IACH,uBAHW,qBAAqB,GACnB,MAAM,OAAO,CAazB;IAED,gBAKC;IAkDD;;;;OAIG;IACH,0CAJW,OAAO,sBAAsB,EAAE,OAAO,aACtC,QAAQ,CAAC,OAAO,qBAAqB,EAAE,aAAa,CAAC,GACnD,MAAM,IAAI,CAkCtB;IAED;;OAEG;IACH,qCAEC;IAED,+BAiBC;IAmDD;;;;;;;;;;;OAWG;IACH,0BALa;QACR,QAAQ,EAAE,OAAO,kBAAkB,EAAE,KAAK,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;QACnE,oBAAoB,EAAE,OAAO,CAAA;KAC9B,CAeH;IAED;;;;;;;OAOG;IACH,wBAFa,OAAO,kBAAkB,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,SAAS,CAShE;IAwFD;;;;;OAKG;IACH,oBAYC;IAED;;;;;OAKG;IACH,0BA2BC;IA+HD;;OAEG;IACH;eAj4BkC,OAAO,kBAAkB,EAAE,KAAK;MAw4BjE;IAED;;;;;;OAMG;IACH;eAj5BkC,OAAO,kBAAkB,EAAE,KAAK;MAm5BjE;IAED;;;;OAIG;IACH;eA15BkC,OAAO,kBAAkB,EAAE,KAAK;MAm6BjE;IAED,mBAEC;IAED;;;;OAIG;IACH,+DAEC;IAED;;OAEG;IACH,oBAFa,mFAA6B,CASzC;IAED;;OAEG;IACH;;;;MAqBC;IAED;;;;OAIG;IACH,oBAEC;IAED;;OAEG;IACH,sBASC;IAED;;;;;;;OAOG;IACH,kBALW,MAAM,eACN,MAAM,OACN,MAAM,GACJ,OAAO,CAInB;IAED;;;;;;OAMG;IACH,eAJW,mFAA6B,aAC7B,OAAO,GAAG,MAAM,iBAK1B;IAED;;;;OAIG;IACH,qBAEC;IAED;;;;;OAKG;IACH,uBAEC;IAED;;;;;;;OAOG;IACH,wBAoBC;IAED;;;;;OAKG;IACH,uBAFW,MAAM,yDAUhB;IAED;;OAEG;IACH,iBAFW,MAAM,yDAIhB;IAED;;;OAGG;IACH,qBAHW,MAAM,+CAAmB,GACvB,MAAM,CAIlB;IAED;;;OAGG;IACH,8BAHW,kFAA4B,GAC1B,MAAM,EAAE,CAOpB;;CACJ;kCA1oC+B,CAAC,SAApB,6CAAkB;;;;UAGrB,OAAO,qBAAqB,EAAE,OAAO;aACrC,CAAC;gBACD,OAAO,oBAAoB,EAAE,mBAAmB;yBAChD,OAAO;;sBAlCV,+BAA+B;sBAA/B,+BAA+B;wBAA/B,+BAA+B;wBAA/B,+BAA+B;6BAA/B,+BAA+B"}