@genome-spy/core 0.60.0 → 0.61.0

package/dist/src/tooltip/refseqGeneTooltipHandler.js

@@ -7,18 +7,31 @@ import { html } from "lit";
  * TODO: Implement tool & email parameters: https://www.ncbi.nlm.nih.gov/books/NBK25497/
  */
 
-// TODO: Replace with an LRU-cache
 const symbolSummaryCache = new Map();
 
+const defaultParams = {
+    Organism: "Homo sapiens",
+};
+
 /**
  * @type {import("./tooltipHandler.js").TooltipHandler}
  */
-export default async function refseqGeneTooltipHandler(datum, mark, params) {
+export default async function refseqGeneTooltipHandler(
+    datum,
+    mark,
+    params = {}
+) {
     const symbol = datum.symbol;
 
+    const term = {
+        ...defaultParams,
+        ...params,
+        GENE: symbol,
+    };
+
     let summary =
         symbolSummaryCache.get(symbol) ??
-        (await debouncedFetchGeneSummary(datum.symbol));
+        (await debouncedFetchGeneSummary(term));
 
     if (summary) {
         symbolSummaryCache.set(symbol, summary);
@@ -36,29 +49,43 @@ export default async function refseqGeneTooltipHandler(datum, mark, params) {
 }
 
 /**
- * @param {string} symbol
+ * @param {Record<string, string>} term
  */
-async function fetchGeneSummary(symbol) {
-    // TODO: Add more search terms to ensure that we really find genes specific to the current genome
-
-    console.log("Searching: " + symbol);
-
+async function fetchGeneSummary(term) {
     /** @type {RequestInit} */
     const opts = { mode: "cors" };
 
-    const searchResult = await fetch(
-        `https://eutils.ncbi.nlm.nih.gov/entrez/eutils/esearch.fcgi?db=gene&term=${symbol}[GENE]&sort=relevance&retmode=json`,
-        opts
-    ).then((res) => res.json());
+    const url = new URL(
+        "https://eutils.ncbi.nlm.nih.gov/entrez/eutils/esearch.fcgi"
+    );
+    url.search = new URLSearchParams({
+        db: "gene",
+        term: termToQuery(term),
+        sort: "relevance",
+        retmax: "1",
+        retmode: "json",
+    }).toString();
+
+    const searchResult = await fetch(url.toString(), opts).then((res) =>
+        res.json()
+    );
 
     // TODO: Handle failed searchs
     const id = searchResult.esearchresult.idlist[0];
 
     if (id) {
-        const summaryResult = await fetch(
-            `https://eutils.ncbi.nlm.nih.gov/entrez/eutils/esummary.fcgi?db=gene&id=${id}&retmode=json`,
-            opts
-        ).then((res) => res.json());
+        const summaryUrl = new URL(
+            "https://eutils.ncbi.nlm.nih.gov/entrez/eutils/esummary.fcgi"
+        );
+        summaryUrl.search = new URLSearchParams({
+            db: "gene",
+            id: id,
+            retmode: "json",
+        }).toString();
+
+        const summaryResult = await fetch(summaryUrl.toString(), opts).then(
+            (res) => res.json()
+        );
 
         const summary = summaryResult.result[id];
         return summary;
@@ -70,9 +97,21 @@ async function fetchGeneSummary(symbol) {
 const debounced = debounce(fetchGeneSummary, 500);
 
 /**
- *
- * @param {string} symbol
+ * @param {Record<string, string>} term
+ */
+function debouncedFetchGeneSummary(term) {
+    return debounced(term);
+}
+
+/**
+ * @param {Record<string, string>} term
  */
-function debouncedFetchGeneSummary(symbol) {
-    return debounced(symbol);
+function termToQuery(term) {
+    return (
+        Object.entries(term)
+            .filter(([_, value]) => value && value.length > 0)
+            // TODO: Escape
+            .map(([key, value]) => `("${value}"[${key}])`)
+            .join(" AND ")
+    );
 }

package/dist/src/types/encoder.d.ts

@@ -82,6 +82,10 @@ export interface Predicate extends ExprRefFunction {
  * Wraps one or more accessors, uses an optional scale to encode the data.
  */
 export interface Encoder {
+    /**
+     * Returns an encoded value for the given datum.
+     * If the encoder has a scale, the value is passed through the scale function.
+     */
     (datum: Datum): Scalar;
 
     /**

package/dist/src/types/selectionTypes.d.ts

@@ -1,5 +1,9 @@
 import { Datum } from "../data/flowNode.js";
-import { ChannelWithScale, Scalar } from "../spec/channel.js";
+import {
+    ChannelWithScale,
+    PositionalChannel,
+    Scalar,
+} from "../spec/channel.js";
 
 export interface SelectionBase {
     type: string;
@@ -8,7 +12,7 @@ export interface SelectionBase {
 export interface IntervalSelection extends SelectionBase {
     type: "interval";
 
-    intervals: Partial<Record<ChannelWithScale, number[] | null>>;
+    intervals: Partial<Record<PositionalChannel, number[] | null>>;
 }
 
 export interface ProjectedSelection extends SelectionBase {

package/dist/src/utils/binnedIndex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"binnedIndex.d.ts","sourceRoot":"","sources":["../../../src/utils/binnedIndex.js"],"names":[],"mappings":"AAKA;;;;;;GAMG;AAEH;;;;;;;;;;;GAWG;AACH,0CAFa,CAAC,QAJH,MAAM,UACN,CAAC,MAAM,EAAE,MAAM,CAAC,YAChB,CAAC,KAAK,EAAE,CAAC,KAAK,MAAM,cACpB,CAAC,KAAK,EAAE,CAAC,KAAK,MAAM;YA0ChB,CAAC,oBACD,MAAM,kBACN,MAAM;oBAsHJ,MAAM;EA+BtB;6BAhNU,MAAM,OACN,MAAM,QACN,CAAC,MAAM,EAAE,MAAM,CAAC,KACd,CAAC,MAAM,EAAE,MAAM,CAAC"}
+{"version":3,"file":"binnedIndex.d.ts","sourceRoot":"","sources":["../../../src/utils/binnedIndex.js"],"names":[],"mappings":"AAKA;;;;;;GAMG;AAEH;;;;;;;;;;;GAWG;AACH,0CAFa,CAAC,QAJH,MAAM,UACN,CAAC,MAAM,EAAE,MAAM,CAAC,YAChB,CAAC,KAAK,EAAE,CAAC,KAAK,MAAM,cACpB,CAAC,KAAK,EAAE,CAAC,KAAK,MAAM;YA0ChB,CAAC,oBACD,MAAM,kBACN,MAAM;oBAqGJ,MAAM;EA+BtB;6BA/LU,MAAM,OACN,MAAM,QACN,CAAC,MAAM,EAAE,MAAM,CAAC,KACd,CAAC,MAAM,EAAE,MAAM,CAAC"}

package/dist/src/utils/binnedIndex.js

@@ -75,10 +75,6 @@ export function createBinningRangeIndexer(
             lastIndex = startVertexIndex;
         } else {
             unordered = true;
-            // TODO: Contextual info like view path
-            console.debug(
-                "Items are not ordered properly. Disabling binned index."
-            );
             return;
         }
 
@@ -86,10 +82,6 @@ export function createBinningRangeIndexer(
 
         if (value < lastStart) {
             unordered = true;
-            // TODO: Contextual info like view path
-            console.debug(
-                "Items are not ordered properly. Disabling binned index."
-            );
             return;
         }
         lastStart = value;
@@ -133,18 +125,9 @@ export function createBinningRangeIndexer(
 
         if (start < lastStart) {
             unordered = true;
-            // TODO: Contextual info like view path
-            console.debug(
-                "Items are not ordered properly. Disabling binned index."
-            );
             return;
         } else if (end < start) {
             unordered = true;
-            // TODO: Contextual info like view path
-            console.debug(
-                "End index is less than start index. Disabling binned index. Datum: ",
-                datum
-            );
             return;
         }
         lastStart = start;

package/dist/src/utils/expression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../../../src/utils/expression.js"],"names":[],"mappings":"AAsEA;;;;;;;;;;GAUG;AACH,6CAHW,MAAM,sBACJ,kBAAkB,CAgC9B;;YAvCU,MAAM,EAAE;aACR,MAAM,EAAE;UACR,MAAM;;iCAEH,CAAC,CAAC,KAAK,CAAC,EAAE,OAAO,qBAAqB,EAAE,KAAK,KAAK,GAAG,CAAC,GAAG,eAAe"}
+{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../../../src/utils/expression.js"],"names":[],"mappings":"AAuEA;;;;;;;;;;GAUG;AACH,6CAHW,MAAM,sBACJ,kBAAkB,CAgC9B;;YAvCU,MAAM,EAAE;aACR,MAAM,EAAE;UACR,MAAM;;iCAEH,CAAC,CAAC,KAAK,CAAC,EAAE,OAAO,qBAAqB,EAAE,KAAK,KAAK,GAAG,CAAC,GAAG,eAAe"}

package/dist/src/utils/expression.js

@@ -12,7 +12,6 @@ import { format as d3format } from "d3-format";
 import smoothstep from "./smoothstep.js";
 import clamp from "./clamp.js";
 import linearstep from "./linearstep.js";
-import { selectionTest } from "../selection/selection.js";
 
 /**
  * Some bits are adapted from https://github.com/vega/vega/blob/main/packages/vega-functions/src/codegen.js
@@ -22,6 +21,9 @@ const functionContext = {
     format(/** @type {number} */ value, /** @type {string} */ format) {
         return d3format(format)(value);
     },
+    mapHasKey(/** @type {Map<any, any>} */ map, /** @type {any} */ key) {
+        return map.has(key);
+    },
     isArray,
     isBoolean,
     isDefined(/** @type {any} */ _) {
@@ -45,7 +47,6 @@ const functionContext = {
         return String(str).replace(pattern, replace);
     },
     smoothstep,
-    selectionTest,
 };
 
 /**

package/dist/src/utils/interactionEvent.d.ts

@@ -22,5 +22,6 @@ export default class InteractionEvent {
     target: import("../view/view.js").default;
     stopPropagation(): void;
     get type(): string;
+    get mouseEvent(): MouseEvent;
 }
 //# sourceMappingURL=interactionEvent.d.ts.map

package/dist/src/utils/interactionEvent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interactionEvent.d.ts","sourceRoot":"","sources":["../../../src/utils/interactionEvent.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH;IACI;;;;;OAKG;IACH,mBAJW,OAAO,yBAAyB,EAAE,OAAO,WAEzC,OAAO,EAajB;IAVG,iDAAkB;IAClB,iBAAsB;IACtB,iBAAoB;IAEpB;;;;OAIG;IACH,QAFU,OAAO,iBAAiB,EAAE,OAAO,CAEpB;IAG3B,wBAEC;IAED,mBAEC;CACJ"}
+{"version":3,"file":"interactionEvent.d.ts","sourceRoot":"","sources":["../../../src/utils/interactionEvent.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH;IACI;;;;;OAKG;IACH,mBAJW,OAAO,yBAAyB,EAAE,OAAO,WAEzC,OAAO,EAajB;IAVG,iDAAkB;IAClB,iBAAsB;IACtB,iBAAoB;IAEpB;;;;OAIG;IACH,QAFU,OAAO,iBAAiB,EAAE,OAAO,CAEpB;IAG3B,wBAEC;IAED,mBAEC;IAED,6BAMC;CACJ"}

package/dist/src/utils/interactionEvent.js

@@ -30,4 +30,12 @@ export default class InteractionEvent {
     get type() {
         return this.uiEvent.type;
     }
+
+    get mouseEvent() {
+        if (this.uiEvent instanceof MouseEvent) {
+            return this.uiEvent;
+        } else {
+            throw new Error("Not a MouseEvent!");
+        }
+    }
 }

package/dist/src/utils/mergeObjects.d.ts

@@ -3,8 +3,6 @@
  *
  * A boolean true and an object are compatible. The object survives, the boolean is overwritten.
  *
- * TODO: Support arrays. Should accept identical arrays and complain about others.
- *
  * @param  {T[]} objects Objects to merge
  * @param {string} propertyOf What are we merging? Used in warning messages
  * @param {string[]} [skip] Fields to skip. TODO: Support nested fields.

package/dist/src/utils/mergeObjects.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mergeObjects.d.ts","sourceRoot":"","sources":["../../../src/utils/mergeObjects.js"],"names":[],"mappings":"AAGA;;;;;;;;;;;;GAYG;AACH,qCAFa,CAAC,WAJF,CAAC,EAAE,cACJ,MAAM,SACN,MAAM,EAAE,GACN,CAAC,CA6Eb"}
+{"version":3,"file":"mergeObjects.d.ts","sourceRoot":"","sources":["../../../src/utils/mergeObjects.js"],"names":[],"mappings":"AAGA;;;;;;;;;;GAUG;AACH,qCAFa,CAAC,WAJF,CAAC,EAAE,cACJ,MAAM,SACN,MAAM,EAAE,GACN,CAAC,CAiFb"}

package/dist/src/utils/mergeObjects.js

@@ -6,8 +6,6 @@ import { isObject } from "vega-util";
  *
  * A boolean true and an object are compatible. The object survives, the boolean is overwritten.
  *
- * TODO: Support arrays. Should accept identical arrays and complain about others.
- *
  * @param  {T[]} objects Objects to merge
  * @param {string} propertyOf What are we merging? Used in warning messages
  * @param {string[]} [skip] Fields to skip. TODO: Support nested fields.
@@ -34,7 +32,11 @@ export default function mergeObjects(objects, propertyOf, skip) {
         a === b ||
         (isPlainObject(a) && isPlainObject(b)) ||
         (isPlainObject(a) && b === true) ||
-        (a === true && isObject(b));
+        (a === true && isObject(b)) ||
+        (Array.isArray(a) &&
+            Array.isArray(b) &&
+            a.length === b.length &&
+            a.every((v, i) => v === b[i]));
 
     /** @param {any} obj */
     const merger = (obj) => {

package/dist/src/utils/throttle.d.ts

@@ -4,5 +4,5 @@
  * @param {function} func
  * @param {number} limit
  */
-export default function throttle(func: Function, limit: number): (...args: any[]) => void;
+export default function throttle(func: Function, limit: number): () => void;
 //# sourceMappingURL=throttle.d.ts.map

package/dist/src/utils/throttle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"throttle.d.ts","sourceRoot":"","sources":["../../../src/utils/throttle.js"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,wDAFW,MAAM,4BA8BhB"}
+{"version":3,"file":"throttle.d.ts","sourceRoot":"","sources":["../../../src/utils/throttle.js"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,wDAFW,MAAM,cA8BhB"}

package/dist/src/view/gridView/gridChild.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gridChild.d.ts","sourceRoot":"","sources":["../../../../src/view/gridView/gridChild.js"],"names":[],"mappings":"AA+pBA;;;GAGG;AACH,iDAHW,OAAO,oBAAoB,EAAE,cAAc,GACzC,OAAO,oBAAoB,EAAE,QAAQ,CA8BjD;AAED;;;GAGG;AACH,uDAHW,OAAO,oBAAoB,EAAE,cAAc,GACzC,OAAO,oBAAoB,EAAE,QAAQ,CA6CjD;AA7tBD;IACI;;;;OAIG;IACH,kBAJW,OAAO,YAAY,EAAE,OAAO,gBAC5B,OAAO,qBAAqB,EAAE,OAAO,UACrC,MAAM,EAyFhB;IAtFG,oDAAgC;IAChC,mCAAgB;IAChB,eAAoB;IAEpB,uBAAuB;IACvB,YADW,QAAQ,CACQ;IAE3B,uBAAuB;IACvB,kBADW,QAAQ,CACc;IAEjC,sFAAsF;IACtF,MADW,OAAO,CAAC,MAAM,CAAC,OAAO,oBAAoB,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,CAC/D;IAEd,+FAA+F;IAC/F,WADW,OAAO,CAAC,MAAM,CAAC,OAAO,oBAAoB,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC,CAC9D;IAEnB,mFAAmF;IACnF,YADW,OAAO,CAAC,MAAM,CAAC,OAAO,gBAAgB,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC,CAC3D;IAEpB,4BAA4B;IAC5B,eADW,aAAa,CACM;IAE9B,uBAAuB;IACvB,OADW,QAAQ,CACG;IAEtB,wBAAwB;IACxB,QADW,SAAS,CACQ;IAiZhC,sEAiBC;IAED;;OAEG;IACH,4BAsKC;IAED,uBAqBC;IAED,iCAEC;;CACJ;qBA9oBoB,gBAAgB;qBANK,gBAAgB;yBADjC,oBAAoB;sBAQvB,gBAAgB;0BACZ,oBAAoB;sBAJxB,wBAAwB;oBAF1B,sBAAsB"}
+{"version":3,"file":"gridChild.d.ts","sourceRoot":"","sources":["../../../../src/view/gridView/gridChild.js"],"names":[],"mappings":"AAkqBA;;;GAGG;AACH,iDAHW,OAAO,oBAAoB,EAAE,cAAc,GACzC,OAAO,oBAAoB,EAAE,QAAQ,CA8BjD;AAED;;;GAGG;AACH,uDAHW,OAAO,oBAAoB,EAAE,cAAc,GACzC,OAAO,oBAAoB,EAAE,QAAQ,CA6CjD;AAhuBD;IACI;;;;OAIG;IACH,kBAJW,OAAO,YAAY,EAAE,OAAO,gBAC5B,OAAO,qBAAqB,EAAE,OAAO,UACrC,MAAM,EAyFhB;IAtFG,oDAAgC;IAChC,mCAAgB;IAChB,eAAoB;IAEpB,uBAAuB;IACvB,YADW,QAAQ,CACQ;IAE3B,uBAAuB;IACvB,kBADW,QAAQ,CACc;IAEjC,sFAAsF;IACtF,MADW,OAAO,CAAC,MAAM,CAAC,OAAO,oBAAoB,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,CAC/D;IAEd,+FAA+F;IAC/F,WADW,OAAO,CAAC,MAAM,CAAC,OAAO,oBAAoB,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC,CAC9D;IAEnB,mFAAmF;IACnF,YADW,OAAO,CAAC,MAAM,CAAC,OAAO,gBAAgB,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC,CAC3D;IAEpB,4BAA4B;IAC5B,eADW,aAAa,CACM;IAE9B,uBAAuB;IACvB,OADW,QAAQ,CACG;IAEtB,wBAAwB;IACxB,QADW,SAAS,CACQ;IAoZhC,sEAiBC;IAED;;OAEG;IACH,4BAsKC;IAED,uBAqBC;IAED,iCAEC;;CACJ;qBAjpBoB,gBAAgB;qBANK,gBAAgB;yBADjC,oBAAoB;sBAQvB,gBAAgB;0BACZ,oBAAoB;sBAJxB,wBAAwB;oBAF1B,sBAAsB"}

package/dist/src/view/gridView/gridChild.js

@@ -257,7 +257,7 @@ export default class GridChild {
             };
 
             view.addInteractionEventListener("mousedown", (coords, event) => {
-                if (/** @type {MouseEvent} */ (event.uiEvent).button != 0) {
+                if (event.mouseEvent.button != 0) {
                     return;
                 }
 
@@ -283,8 +283,9 @@ export default class GridChild {
                         preventNextClickPropagation = true;
                     }
 
-                    if (/** @type {MouseEvent} */ (event.uiEvent).shiftKey) {
-                        // Start brushing a new selection, clear the existing selection
+                    const startSelection = event.mouseEvent.shiftKey;
+
+                    if (startSelection) {
                         clearSelection();
                         nowBrushing = true;
                     } else if (isActiveIntervalSelection(selectionExpr())) {
@@ -309,6 +310,8 @@ export default class GridChild {
                         };
                         view.addInteractionEventListener("mouseup", listener);
                         return;
+                    } else {
+                        return;
                     }
                 }
 
@@ -317,7 +320,7 @@ export default class GridChild {
 
                 const start = event.point;
                 const viewOffset = Point.fromMouseEvent(
-                    /** @type {MouseEvent} */ (event.uiEvent)
+                    event.mouseEvent
                 ).subtract(start);
 
                 const mouseMoveListener = (/** @type {MouseEvent} */ event) => {
@@ -405,7 +408,7 @@ export default class GridChild {
             view.addInteractionEventListener(
                 "click",
                 (coords, event) => {
-                    if (/** @type {MouseEvent} */ (event.uiEvent).button == 0) {
+                    if (event.mouseEvent.button == 0) {
                         if (preventNextClickPropagation) {
                             event.stopPropagation();
                             preventNextClickPropagation = false;

package/dist/src/view/gridView/scrollbar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scrollbar.d.ts","sourceRoot":"","sources":["../../../../src/view/gridView/scrollbar.js"],"names":[],"mappings":"AAKA;;GAEG;AACH;IAeI;;;OAGG;IACH,uBAHW,OAAO,gBAAgB,EAAE,OAAO,mBAChC,eAAe,EA4FzB;IAhGD,uBAAmB;IAsCf;;;MAAoB;IAIpB;;;;MAQC;IAgDL,2BAKC;IAWD;;;;OAIG;IACH,gCAHW,SAAS,UACT,SAAS,QA8CnB;;CACJ;8BAnLY,YAAY,GAAG,UAAU;qBAHjB,gBAAgB;sBADf,wBAAwB"}
+{"version":3,"file":"scrollbar.d.ts","sourceRoot":"","sources":["../../../../src/view/gridView/scrollbar.js"],"names":[],"mappings":"AAKA;;GAEG;AACH;IAeI;;;OAGG;IACH,uBAHW,OAAO,gBAAgB,EAAE,OAAO,mBAChC,eAAe,EA2FzB;IA/FD,uBAAmB;IAsCf;;;MAAoB;IAIpB;;;;MAQC;IA+CL,2BAKC;IAWD;;;;OAIG;IACH,gCAHW,SAAS,UACT,SAAS,QA8CnB;;CACJ;8BAlLY,YAAY,GAAG,UAAU;qBAHjB,gBAAgB;sBADf,wBAAwB"}

package/dist/src/view/gridView/scrollbar.js

@@ -83,11 +83,10 @@ export default class Scrollbar extends UnitView {
                     ? mouseEvent.clientY
                     : mouseEvent.clientX;
 
-            const mouseEvent = /** @type {MouseEvent} */ (event.uiEvent);
-            mouseEvent.preventDefault();
+            event.mouseEvent.preventDefault();
 
             const initialScrollOffset = this.scrollOffset;
-            const initialOffset = getMouseOffset(mouseEvent);
+            const initialOffset = getMouseOffset(event.mouseEvent);
 
             const onMousemove = /** @param {MouseEvent} moveEvent */ (
                 moveEvent

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

@@ -1,4 +1,8 @@
 export default class SelectionRect extends LayerView {
+    /**
+     * @typedef {import("../../spec/channel.js").PrimaryPositionalChannel} PrimaryPositionalChannel
+     * @typedef {import("../../types/selectionTypes.js").IntervalSelection} IntervalSelection
+     */
     /**
      * @param {import("./gridChild.js").default} gridChild
      * @param {import("../paramMediator.js").ExprRefFunction} selectionExpr

package/dist/src/view/gridView/selectionRect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"selectionRect.d.ts","sourceRoot":"","sources":["../../../../src/view/gridView/selectionRect.js"],"names":[],"mappings":"AAEA;IACI;;;;OAIG;IACH,uBAJW,OAAO,gBAAgB,EAAE,OAAO,iBAChC,OAAO,qBAAqB,EAAE,eAAe,gBAC7C,OAAO,yBAAyB,EAAE,WAAW,EAkJvD;CACJ;sBAzJqB,iBAAiB"}
+{"version":3,"file":"selectionRect.d.ts","sourceRoot":"","sources":["../../../../src/view/gridView/selectionRect.js"],"names":[],"mappings":"AAGA;IACI;;;OAGG;IAEH;;;;OAIG;IACH,uBAJW,OAAO,gBAAgB,EAAE,OAAO,iBAChC,OAAO,qBAAqB,EAAE,eAAe,gBAC7C,OAAO,yBAAyB,EAAE,WAAW,EA0IvD;CACJ;sBAtJqB,iBAAiB"}

package/dist/src/view/gridView/selectionRect.js

@@ -1,24 +1,24 @@
+import { primaryPositionalChannels } from "../../encoder/encoder.js";
 import LayerView from "../layerView.js";
 
 export default class SelectionRect extends LayerView {
+    /**
+     * @typedef {import("../../spec/channel.js").PrimaryPositionalChannel} PrimaryPositionalChannel
+     * @typedef {import("../../types/selectionTypes.js").IntervalSelection} IntervalSelection
+     */
+
     /**
      * @param {import("./gridChild.js").default} gridChild
      * @param {import("../paramMediator.js").ExprRefFunction} selectionExpr
      * @param {import("../../spec/parameter.js").BrushConfig} [brushConfig]
      */
     constructor(gridChild, selectionExpr, brushConfig = {}) {
-        const initialSelection =
-            /** @type {import("../../types/selectionTypes.js").IntervalSelection} */ (
-                selectionExpr()
-            );
+        const initialSelection = /** @type {IntervalSelection} */ (
+            selectionExpr()
+        );
         const channels = Object.keys(initialSelection.intervals);
 
-        if (
-            /** @type {import("../../spec/channel.js").ChannelWithScale[]} */ ([
-                "x",
-                "y",
-            ]).every((c) => !channels.includes(c))
-        ) {
+        if (primaryPositionalChannels.every((c) => !channels.includes(c))) {
             throw new Error(
                 "SelectionRect requires at least one of the channels 'x' or 'y' to be present in the selection."
             );
@@ -64,9 +64,7 @@ export default class SelectionRect extends LayerView {
             },
         });
 
-        const makeExpr = (
-            /** @type {import("../../spec/channel.js").PrimaryPositionalChannel} */ channel
-        ) => {
+        const makeExpr = (/** @type {PrimaryPositionalChannel} */ channel) => {
             const resolution = gridChild.view.getScaleResolution(channel);
             return (
                 `format(datum._${channel}2 - datum._${channel}, '.3s')` +

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

@@ -1 +1 @@
-{"version":3,"file":"unitView.d.ts","sourceRoot":"","sources":["../../../src/view/unitView.js"],"names":[],"mappings":"AA2BA;;;;GAIG;AACH,wBAHU,MAAM,CAAC,OAAO,iBAAiB,EAAE,QAAQ,EAAE,cAAc,kBAAkB,EAAE,OAAO,CAAC,CAc7F;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;IAqHlC,2DAIC;IAgBD;;;;;OAKG;IAEH,iEA+FC;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;iBAjZgB,WAAW"}
+{"version":3,"file":"unitView.d.ts","sourceRoot":"","sources":["../../../src/view/unitView.js"],"names":[],"mappings":"AA4BA;;;;GAIG;AACH,wBAHU,MAAM,CAAC,OAAO,iBAAiB,EAAE,QAAQ,EAAE,cAAc,kBAAkB,EAAE,OAAO,CAAC,CAc7F;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;IAkHlC,2DAIC;IAgBD;;;;;OAKG;IAEH,iEAsHC;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;iBAragB,WAAW"}

package/dist/src/view/unitView.js

@@ -12,6 +12,7 @@ import {
     getPrimaryChannel,
     isChannelWithScale,
     isPrimaryPositionalChannel,
+    isValueDefWithCondition,
 } from "../encoder/encoder.js";
 import createDomain from "../utils/domainArray.js";
 import AxisResolution from "./axisResolution.js";
@@ -125,9 +126,6 @@ export default class UnitView extends View {
                     /** @type {any} */ _,
                     /** @type {import("../utils/interactionEvent.js").default} */ event
                 ) => {
-                    const mouseEvent = /** @type {MouseEvent} */ (
-                        event.uiEvent
-                    );
                     const datum = getHoveredDatum();
                     const id = datum ? datum[UNIQUE_ID_KEY] : none;
 
@@ -135,7 +133,7 @@ export default class UnitView extends View {
                     let selection;
 
                     if (select.toggle) {
-                        const toggle = mouseEvent.shiftKey;
+                        const toggle = event.mouseEvent.shiftKey;
 
                         if (toggle) {
                             if (datum) {
@@ -223,6 +221,7 @@ export default class UnitView extends View {
         if (!type) {
             this.resolve("scale");
             this.resolve("axis");
+            return;
         }
 
         // TODO: Complain about nonsensical configuration, e.g. shared parent has independent children.
@@ -230,12 +229,34 @@ export default class UnitView extends View {
         const encoding = this.mark.encoding;
 
         for (const [channel, channelDef] of Object.entries(encoding)) {
-            if (!isChannelDefWithScale(channelDef)) {
+            if (!channelDef) {
                 continue;
             }
 
+            /** @type {import("../spec/channel.js").ChannelDefWithScale} */
+            let channelDefWithScale;
+
+            if (isChannelDefWithScale(channelDef)) {
+                channelDefWithScale = channelDef;
+            } else {
+                if (isValueDefWithCondition(channelDef)) {
+                    const condition = channelDef.condition;
+                    if (
+                        !Array.isArray(condition) &&
+                        isChannelDefWithScale(condition)
+                    ) {
+                        // There's a single condition (maybe) with a scale
+                        channelDefWithScale = condition;
+                    } else {
+                        continue;
+                    }
+                } else {
+                    continue;
+                }
+            }
+
             const targetChannel = getPrimaryChannel(
-                channelDef.resolutionChannel ?? channel
+                channelDefWithScale.resolutionChannel ?? channel
             );
 
             if (!isChannelWithScale(targetChannel)) {
@@ -279,7 +300,7 @@ export default class UnitView extends View {
                 view.resolutions[type][targetChannel].addMember({
                     view: this,
                     channel,
-                    channelDef,
+                    channelDef: channelDefWithScale,
                 });
             } else if (type == "scale" && isChannelWithScale(channel)) {
                 if (!view.resolutions[type][targetChannel]) {
@@ -301,15 +322,15 @@ export default class UnitView extends View {
                         .some(
                             (view) => !view.options.contributesToScaleDomain
                         ) ||
-                    (isChannelDefWithScale(channelDef) &&
-                        channelDef.contributesToScaleDomain === false)
+                    (isChannelDefWithScale(channelDefWithScale) &&
+                        channelDefWithScale.contributesToScaleDomain === false)
                         ? undefined
                         : this.extractDataDomain.bind(this);
 
                 view.resolutions[type][targetChannel].addMember({
                     view: this,
                     channel,
-                    channelDef,
+                    channelDef: channelDefWithScale,
                     dataDomainSource,
                 });
             }

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

@@ -11,14 +11,16 @@ import LayerView from "./layerView.js";
 describe("Trivial creations and initializations", () => {
     test("Fails on empty spec", async () => {
         // @ts-expect-error
-        expect(create({}, View)).rejects.toThrow();
+        await expect(create({}, View)).rejects.toThrow();
     });
 
-    test("Parses a trivial spec", () => {
-        expect(create({ mark: "point" }, View)).resolves.toBeInstanceOf(
+    test("Parses a trivial spec", async () => {
+        await expect(create({ mark: "point" }, View)).resolves.toBeInstanceOf(
             UnitView
         );
-        expect(create({ layer: [] }, View)).resolves.toBeInstanceOf(LayerView);
+        await expect(create({ layer: [] }, View)).resolves.toBeInstanceOf(
+            LayerView
+        );
     });
 
     test("Parses a more comples spec", async () => {

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

@@ -16,10 +16,10 @@ test("isViewSpec", () => {
     expect(() => factory.isViewSpec({ mark: "rect", layer: [] })).toThrow();
 });
 
-test("Throws if importing is not allowed", () => {
+test("Throws if importing is not allowed", async () => {
     const factory = new ViewFactory({ allowImport: false });
 
-    expect(() =>
+    await expect(() =>
         factory.createOrImportView({ import: { url: "" } }, undefined)
     ).rejects.toThrow();
 });

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

@@ -1 +1 @@
-{"version":3,"file":"zoom.d.ts","sourceRoot":"","sources":["../../../src/view/zoom.js"],"names":[],"mappings":"AAkBA,0CAGC;AAgBD;;;;;;GAMG;AACH,yCANW,OAAO,8BAA8B,EAAE,OAAO,UAC9C,OAAO,uBAAuB,EAAE,OAAO,cACvC,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,UAC9B,OAAO,yBAAyB,EAAE,KAAK,aACvC,OAAO,sBAAsB,EAAE,OAAO,QAkJhD;;OA1LS,MAAM;OACN,MAAM;YACN,MAAM;YACN,MAAM;YACN,MAAM"}
+{"version":3,"file":"zoom.d.ts","sourceRoot":"","sources":["../../../src/view/zoom.js"],"names":[],"mappings":"AAkBA,0CAGC;AAgBD;;;;;;GAMG;AACH,yCANW,OAAO,8BAA8B,EAAE,OAAO,UAC9C,OAAO,uBAAuB,EAAE,OAAO,cACvC,CAAC,SAAS,EAAE,SAAS,KAAK,IAAI,UAC9B,OAAO,yBAAyB,EAAE,KAAK,aACvC,OAAO,sBAAsB,EAAE,OAAO,QA+IhD;;OAvLS,MAAM;OACN,MAAM;YACN,MAAM;YACN,MAAM;YACN,MAAM"}

package/dist/src/view/zoom.js

@@ -96,10 +96,7 @@ export function interactionToZoom(event, coords, handleZoom, hover, animator) {
                 zDelta: 0,
             });
         }
-    } else if (
-        event.type == "mousedown" &&
-        /** @type {MouseEvent} */ (event.uiEvent).button === 0
-    ) {
+    } else if (event.type == "mousedown" && event.mouseEvent.button === 0) {
         if (smoother) {
             smoother.stop();
         }
@@ -107,7 +104,7 @@ export function interactionToZoom(event, coords, handleZoom, hover, animator) {
         /** @type {RingBuffer<{point: Point, timestamp: number}>} */
         const eventBuffer = new RingBuffer(30);
 
-        const mouseEvent = /** @type {MouseEvent} */ (event.uiEvent);
+        const mouseEvent = event.mouseEvent;
         mouseEvent.preventDefault();
 
         let prevPoint = Point.fromMouseEvent(mouseEvent);

package/package.json

@@ -7,7 +7,7 @@
   },
   "contributors": [],
   "license": "MIT",
-  "version": "0.60.0",
+  "version": "0.61.0",
   "jsdelivr": "dist/bundle/index.js",
   "unpkg": "dist/bundle/index.js",
   "browser": "dist/bundle/index.js",
@@ -57,15 +57,15 @@
     "events": "^3.3.0",
     "flatqueue": "^2.0.3",
     "internmap": "^2.0.3",
-    "lit": "^3.1.2",
+    "lit": "^3.3.0",
     "twgl.js": "^4.19.1",
-    "vega-expression": "^5.1.0",
-    "vega-loader": "^4.5.1",
-    "vega-scale": "^7.3.1",
-    "vega-util": "^1.17.2"
+    "vega-expression": "^6.0.0",
+    "vega-loader": "^5.0.0",
+    "vega-scale": "^8.0.0",
+    "vega-util": "^2.0.0"
   },
   "devDependencies": {
     "@types/long": "^4.0.1"
   },
-  "gitHead": "82948eadeadfedcb13e669f6664e163dac3a6a92"
+  "gitHead": "f26c40a7ed59f89cac52eba84a87bb723a9ef73b"
 }