@genome-spy/core 0.43.3 → 0.45.0

package/dist/src/data/collector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collector.d.ts","sourceRoot":"","sources":["../../../src/data/collector.js"],"names":[],"mappings":"AAQA;;;;;GAKG;AACH;IAKI;;OAEG;IACH,qBAFW,OAAO,sBAAsB,EAAE,aAAa,EActD;IATG,qDAA2C;IAE3C,2CAA2C;IAC3C,WADW,QAAU,SAAS,KAAE,IAAI,CAAC,EAAE,CACpB;IAEnB,uFAAuF;IACvF,cADW,IAAI,GAAG,GAAG,GAAG,EAAE,EAAE,OAAO,eAAe,EAAE,IAAI,CAAC,CAC5B;IAKjC,cAOC;IANG,2CAA2C;IAC3C,OADW,OAAO,eAAe,EAAE,IAAI,CACxB;IA2FnB;;OAEG;IACH,WAFa,SAAS,OAAO,eAAe,EAAE,KAAK,CAAC,CAuBnD;IAED;;;OAGG;IACH,2BAFmB,OAAO,eAAe,EAAE,KAAK,KAAK,IAAI,QAUxD;IAED;;OAEG;IACH,uBAMC;IAED,qBAMC;CACJ;qBAvLyD,eAAe"}
+{"version":3,"file":"collector.d.ts","sourceRoot":"","sources":["../../../src/data/collector.js"],"names":[],"mappings":"AAQA;;;;;GAKG;AACH;IAKI;;OAEG;IACH,qBAFW,OAAO,sBAAsB,EAAE,aAAa,EActD;IATG,qDAA2C;IAE3C,2CAA2C;IAC3C,WADW,QAAU,SAAS,KAAE,IAAI,CAAC,EAAE,CACpB;IAEnB,uFAAuF;IACvF,cADW,IAAI,GAAG,GAAG,GAAG,EAAE,EAAE,OAAO,eAAe,EAAE,IAAI,CAAC,CAC5B;IAKjC,cAOC;IANG,2CAA2C;IAC3C,OADW,OAAO,eAAe,EAAE,IAAI,CACxB;IA6FnB;;OAEG;IACH,WAFa,SAAS,OAAO,eAAe,EAAE,KAAK,CAAC,CAuBnD;IAED;;;OAGG;IACH,2BAFmB,OAAO,eAAe,EAAE,KAAK,KAAK,IAAI,QAUxD;IAED;;OAEG;IACH,uBAMC;IAED,qBAMC;CACJ;qBAzLyD,eAAe"}

package/dist/src/data/collector.js

@@ -89,8 +89,10 @@ export default class Collector extends FlowNode {
             );
             const groups =
                 accessors.length > 1
-                    ? // @ts-ignore
-                      group(this._data, ...accessors)
+                    ? // There's something strange in d3-array's typings
+                      /** @type {Map<any, any>} */ /** @type {any} */ (
+                          group(this._data, ...accessors)
+                      )
                     : // D3's group is SLOW!
                       groupBy(this._data, accessors[0]);
 

package/dist/src/data/flowOptimizer.test.js

@@ -132,20 +132,29 @@ describe("removeRedundantCloneTransforms", () => {
     });
 });
 
+const viewStub = {
+    paramMediator: {
+        registerParam: () => {},
+        allocateSetter: () => {},
+        createExpression: () => {},
+    },
+    getBaseUrl: () => "",
+};
+
 describe("Merge indentical data sources", () => {
     test("Merges correctly", () => {
         /** @type {DataFlow<string>} */
         const dataFlow = new DataFlow();
 
-        const a = new UrlSource({ url: "http://genomespy.app/" });
+        const a = new UrlSource({ url: "http://genomespy.app/" }, viewStub);
         const ac = new Collector();
         a.addChild(ac);
 
-        const b = new UrlSource({ url: "http://genomespy.app/" });
+        const b = new UrlSource({ url: "http://genomespy.app/" }, viewStub);
         const bc = new Collector();
         b.addChild(bc);
 
-        const c = new UrlSource({ url: "http://helsinki.fi/" });
+        const c = new UrlSource({ url: "http://helsinki.fi/" }, viewStub);
         const cc = new Collector();
         c.addChild(cc);
 

package/dist/src/data/sources/dataUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataUtils.d.ts","sourceRoot":"","sources":["../../../../src/data/sources/dataUtils.js"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,kCAHW,OAAO,oBAAoB,EAAE,UAAU;;;;;;;;;;;;;EAqBjD;AAED;;GAEG;AACH,wCAFW,MAAM,GAAG,MAAM,EAAE,UAU3B;AAWD;;;GAGG;AACH,4CAHW,OAAO,oBAAoB,EAAE,UAAU,4DAKjD;AAED;;;GAGG;AACH,4CAHW,OAAO,oBAAoB,EAAE,UAAU,4DAKjD;AAED;;;GAGG;AACH,6CAHW,OAAO,oBAAoB,EAAE,UAAU,6DAKjD;AAED;;;;GAIG;AACH,sCAHW,OAAO,oBAAoB,EAAE,UAAU,sDAKjD;AAxCM,+BAAgC,GAAG,QAI3B,OAAO,uBAAuB,EAAE,MAAM;;UAGtB,OAAO,gBAAgB,EAAE,KAAK,qCANR"}
+{"version":3,"file":"dataUtils.d.ts","sourceRoot":"","sources":["../../../../src/data/sources/dataUtils.js"],"names":[],"mappings":"AAGA;;;;;;GAMG;AACH,kCAHW,OAAO,oBAAoB,EAAE,UAAU;;;;;;;;;;;;;EAsBjD;AAED;;GAEG;AACH,wCAFW,MAAM,GAAG,MAAM,EAAE,UAU3B;AAWD;;;GAGG;AACH,4CAHW,OAAO,oBAAoB,EAAE,UAAU,4DAKjD;AAED;;;GAGG;AACH,4CAHW,OAAO,oBAAoB,EAAE,UAAU,4DAKjD;AAED;;;GAGG;AACH,6CAHW,OAAO,oBAAoB,EAAE,UAAU,6DAKjD;AAED;;;;GAIG;AACH,sCAHW,OAAO,oBAAoB,EAAE,UAAU,sDAKjD;AAxCM,+BAAgC,GAAG,QAI3B,OAAO,uBAAuB,EAAE,MAAM;;UAGtB,OAAO,gBAAgB,EAAE,KAAK,qCANR"}

package/dist/src/data/sources/dataUtils.js

@@ -1,3 +1,4 @@
+import { withoutExprRef } from "../../view/paramMediator.js";
 import { isInlineData } from "./inlineSource.js";
 
 /**
@@ -13,7 +14,8 @@ export function getFormat(params) {
     }
     const format = { ...params.format };
 
-    format.type ??= isUrlData(params) && extractTypeFromUrl(params.url);
+    format.type ??=
+        isUrlData(params) && extractTypeFromUrl(withoutExprRef(params.url));
     // @ts-ignore TODO: Fix typing
     format.parse ??= "auto";
 

package/dist/src/data/sources/lazy/axisTickSource.d.ts

@@ -12,7 +12,7 @@ export default class AxisTickSource extends SingleAxisLazySource {
      */
     ticks: import("../../../spec/channel.js").Scalar[];
     params: import("../../../spec/data.js").AxisTicksData;
-    onDomainChanged(): Promise<void>;
+    onDomainChanged(): void;
 }
 import SingleAxisLazySource from "./singleAxisLazySource.js";
 //# sourceMappingURL=axisTickSource.d.ts.map

package/dist/src/data/sources/lazy/axisTickSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"axisTickSource.d.ts","sourceRoot":"","sources":["../../../../../src/data/sources/lazy/axisTickSource.js"],"names":[],"mappings":"AAYA;;GAEG;AACH;IAMI;;;OAGG;IACH,oBAHW,OAAO,uBAAuB,EAAE,aAAa,QAC7C,OAAO,uBAAuB,EAAE,OAAO,EAYjD;IAnBD;;OAEG;IACH,OAFU,OAAO,0BAA0B,EAAE,MAAM,EAAE,CAE1C;IAeP,sDAAoB;IAGxB,iCAkCC;CACJ;iCA9DgC,2BAA2B"}
+{"version":3,"file":"axisTickSource.d.ts","sourceRoot":"","sources":["../../../../../src/data/sources/lazy/axisTickSource.js"],"names":[],"mappings":"AAYA;;GAEG;AACH;IAMI;;;OAGG;IACH,oBAHW,OAAO,uBAAuB,EAAE,aAAa,QAC7C,OAAO,uBAAuB,EAAE,OAAO,EAYjD;IAnBD;;OAEG;IACH,OAFU,OAAO,0BAA0B,EAAE,MAAM,EAAE,CAE1C;IAeP,sDAAoB;IAGxB,wBAkCC;CACJ;iCA9DgC,2BAA2B"}

package/dist/src/data/sources/lazy/axisTickSource.js

@@ -35,11 +35,11 @@ export default class AxisTickSource extends SingleAxisLazySource {
         this.params = params;
     }
 
-    async onDomainChanged() {
+    onDomainChanged() {
         // Note, although this function is async, it is not awaited. Data are updated
         // synchronously to ensure that the new ticks are available before the next frame is drawn.
 
-        const scale = this.scaleResolution.getScale();
+        const scale = this.scaleResolution.scale;
         const axisParams = this.params.axis;
         const axisLength = this.getAxisLength();
 

package/dist/src/data/sources/lazy/bigBedSource.d.ts

@@ -15,7 +15,7 @@ export default class BigBedSource extends SingleAxisWindowedSource {
         rest?: string;
     }) => Record<string, any>;
     params: import("../../../spec/data.js").BigBedData;
-    initializedPromise: Promise<any>;
+    #private;
 }
 import SingleAxisWindowedSource from "./singleAxisWindowedSource.js";
 //# sourceMappingURL=bigBedSource.d.ts.map

package/dist/src/data/sources/lazy/bigBedSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bigBedSource.d.ts","sourceRoot":"","sources":["../../../../../src/data/sources/lazy/bigBedSource.js"],"names":[],"mappings":"AAGA;IAUI;;;OAGG;IACH,oBAHW,OAAO,uBAAuB,EAAE,UAAU,QAC1C,OAAO,uBAAuB,EAAE,OAAO,EAsDjD;IAjED,0CAA0C;IAC1C,QADW,OAAO,WAAW,EAAE,OAAO,CAC/B;IAEP,yCAAyC;IACzC,KADW,OAAO,WAAW,EAAE,MAAM,CACjC;IAEJ,4GAA4G;IAC5G,mBADmB,MAAM,UAAU;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,MAAM,EAAE,GAAG,CAAC,CAC9F;IAkBN,mDAAgC;IAQhC,iCA+BE;CAuBT;qCA1FoC,+BAA+B"}
+{"version":3,"file":"bigBedSource.d.ts","sourceRoot":"","sources":["../../../../../src/data/sources/lazy/bigBedSource.js"],"names":[],"mappings":"AAOA;IAUI;;;OAGG;IACH,oBAHW,OAAO,uBAAuB,EAAE,UAAU,QAC1C,OAAO,uBAAuB,EAAE,OAAO,EAmCjD;IA9CD,0CAA0C;IAC1C,QADW,OAAO,WAAW,EAAE,OAAO,CAC/B;IAEP,yCAAyC;IACzC,KADW,OAAO,WAAW,EAAE,MAAM,CACjC;IAEJ,4GAA4G;IAC5G,mBADmB,MAAM,UAAU;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,MAAM,EAAE,GAAG,CAAC,CAC9F;IA8BN,mDAA6B;;CA8EpC;qCAtHoC,+BAA+B"}

package/dist/src/data/sources/lazy/bigBedSource.js

@@ -1,3 +1,7 @@
+import {
+    activateExprRefProps,
+    withoutExprRef,
+} from "../../../view/paramMediator.js";
 import addBaseUrl from "../../../utils/addBaseUrl.js";
 import SingleAxisWindowedSource from "./singleAxisWindowedSource.js";
 
@@ -25,9 +29,21 @@ export default class BigBedSource extends SingleAxisWindowedSource {
             ...params,
         };
 
-        super(view, paramsWithDefaults.channel);
+        const activatedParams = activateExprRefProps(
+            view.paramMediator,
+            paramsWithDefaults,
+            (props) => {
+                if (props.includes("url")) {
+                    this.#initialize().then(() => this.reloadLastDomain());
+                } else if (props.includes("windowSize")) {
+                    this.reloadLastDomain();
+                }
+            }
+        );
+
+        super(view, activatedParams.channel);
 
-        this.params = paramsWithDefaults;
+        this.params = activatedParams;
 
         if (!this.params.url) {
             throw new Error("No URL provided for BigBedSource");
@@ -35,7 +51,11 @@ export default class BigBedSource extends SingleAxisWindowedSource {
 
         this.setupDebouncing(this.params);
 
-        this.initializedPromise = new Promise((resolve) => {
+        this.#initialize();
+    }
+
+    #initialize() {
+        this.initializedPromise = new Promise((resolve, reject) => {
             Promise.all([
                 import("@gmod/bed"),
                 import("@gmod/bbi"),
@@ -45,28 +65,40 @@ export default class BigBedSource extends SingleAxisWindowedSource {
 
                 this.bbi = new BigBed({
                     filehandle: new RemoteFile(
-                        addBaseUrl(this.params.url, this.view.getBaseUrl())
+                        addBaseUrl(
+                            withoutExprRef(this.params.url),
+                            this.view.getBaseUrl()
+                        )
                     ),
                 });
 
-                this.bbi.getHeader().then(async (header) => {
-                    // @ts-ignore TODO: Fix
-                    this.parser = new BED({ autoSql: header.autoSql });
-                    try {
-                        const fastParser = makeFastParser(this.parser);
-                        this.parseLine = (chrom, f) =>
-                            fastParser(chrom, f.start, f.end, f.rest);
-                    } catch (e) {
-                        this.parseLine = (chrom, f) =>
-                            this.parser.parseLine(
-                                `${chrom}\t${f.start}\t${f.end}\t${f.rest}`
-                            );
-                    }
-
-                    resolve();
-                });
+                this.bbi
+                    .getHeader()
+                    .then(async (header) => {
+                        // @ts-ignore TODO: Fix
+                        this.parser = new BED({ autoSql: header.autoSql });
+                        try {
+                            const fastParser = makeFastParser(this.parser);
+                            this.parseLine = (chrom, f) =>
+                                fastParser(chrom, f.start, f.end, f.rest);
+                        } catch (e) {
+                            this.parseLine = (chrom, f) =>
+                                this.parser.parseLine(
+                                    `${chrom}\t${f.start}\t${f.end}\t${f.rest}`
+                                );
+                        }
+
+                        resolve();
+                    })
+                    .catch((e) => {
+                        // Load empty data
+                        this.load();
+                        reject(e);
+                    });
             });
         });
+
+        return this.initializedPromise;
     }
 
     /**

package/dist/src/data/sources/lazy/bigWigSource.d.ts

@@ -8,7 +8,12 @@ export default class BigWigSource extends SingleAxisWindowedSource {
      */
     constructor(params: import("../../../spec/data.js").BigWigData, view: import("../../../view/view.js").default);
     params: import("../../../spec/data.js").BigWigData;
-    initializedPromise: Promise<any>;
+    /**
+     * Listen to the domain change event and update data when the covered windows change.
+     *
+     * @param {number[]} domain Linearized domain
+     */
+    onDomainChanged(domain: number[]): Promise<void>;
     /**
      * @param {number[]} interval linearized domain
      * @param {number} reductionLevel

package/dist/src/data/sources/lazy/bigWigSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bigWigSource.d.ts","sourceRoot":"","sources":["../../../../../src/data/sources/lazy/bigWigSource.js"],"names":[],"mappings":"AAGA;;GAEG;AACH;IAOI;;;OAGG;IACH,oBAHW,OAAO,uBAAuB,EAAE,UAAU,QAC1C,OAAO,uBAAuB,EAAE,OAAO,EAiDjD;IAnCG,mDAAgC;IAQhC,iCA0BE;IA+BN;;;OAGG;IAEH,uBAJW,MAAM,EAAE,kBACR,MAAM,iBA0BhB;;CACJ;qCA1HoC,+BAA+B"}
+{"version":3,"file":"bigWigSource.d.ts","sourceRoot":"","sources":["../../../../../src/data/sources/lazy/bigWigSource.js"],"names":[],"mappings":"AAOA;;GAEG;AACH;IAOI;;;OAGG;IACH,oBAHW,OAAO,uBAAuB,EAAE,UAAU,QAC1C,OAAO,uBAAuB,EAAE,OAAO,EAmCjD;IATG,mDAA6B;IA8CjC;;;;OAIG;IACH,wBAFW,MAAM,EAAE,iBAqBlB;IAED;;;OAGG;IAEH,uBAJW,MAAM,EAAE,kBACR,MAAM,iBA2BhB;;CACJ;qCA9IoC,+BAA+B"}

package/dist/src/data/sources/lazy/bigWigSource.js

@@ -1,3 +1,7 @@
+import {
+    activateExprRefProps,
+    withoutExprRef,
+} from "../../../view/paramMediator.js";
 import addBaseUrl from "../../../utils/addBaseUrl.js";
 import SingleAxisWindowedSource from "./singleAxisWindowedSource.js";
 
@@ -25,9 +29,21 @@ export default class BigWigSource extends SingleAxisWindowedSource {
             ...params,
         };
 
-        super(view, paramsWithDefaults.channel);
+        const activatedParams = activateExprRefProps(
+            view.paramMediator,
+            paramsWithDefaults,
+            (props) => {
+                if (props.includes("url")) {
+                    this.#initialize().then(() => this.reloadLastDomain());
+                } else if (props.includes("pixelsPerBin")) {
+                    this.reloadLastDomain();
+                }
+            }
+        );
+
+        super(view, activatedParams.channel);
 
-        this.params = paramsWithDefaults;
+        this.params = activatedParams;
 
         if (!this.params.url) {
             throw new Error("No URL provided for BigWigSource");
@@ -35,6 +51,10 @@ export default class BigWigSource extends SingleAxisWindowedSource {
 
         this.setupDebouncing(this.params);
 
+        this.#initialize();
+    }
+
+    #initialize() {
         this.initializedPromise = new Promise((resolve) => {
             Promise.all([
                 import("@gmod/bbi"),
@@ -42,7 +62,10 @@ export default class BigWigSource extends SingleAxisWindowedSource {
             ]).then(([{ BigWig }, { RemoteFile }]) => {
                 this.#bbi = new BigWig({
                     filehandle: new RemoteFile(
-                        addBaseUrl(this.params.url, this.view.getBaseUrl())
+                        addBaseUrl(
+                            withoutExprRef(this.params.url),
+                            this.view.getBaseUrl()
+                        )
                     ),
                 });
 
@@ -62,6 +85,8 @@ export default class BigWigSource extends SingleAxisWindowedSource {
                 });
             });
         });
+
+        return this.initializedPromise;
     }
 
     /**
@@ -85,11 +110,9 @@ export default class BigWigSource extends SingleAxisWindowedSource {
         // Using 5000 as a default to avoid too many requests.
         const windowSize = Math.max(reductionLevel * length, 5000);
 
-        const quantizedInterval = this.quantizeInterval(domain, windowSize);
-
-        if (this.checkAndUpdateLastInterval(quantizedInterval)) {
-            this.loadInterval(quantizedInterval, reductionLevel);
-        }
+        this.callIfWindowsChanged(domain, windowSize, (quantizedInterval) =>
+            this.loadInterval(quantizedInterval, reductionLevel)
+        );
     }
 
     /**
@@ -98,7 +121,8 @@ export default class BigWigSource extends SingleAxisWindowedSource {
      */
     // @ts-expect-error
     async loadInterval(interval, reductionLevel) {
-        const scale = 1 / 2 / reductionLevel / this.params.pixelsPerBin;
+        const scale =
+            1 / 2 / reductionLevel / withoutExprRef(this.params.pixelsPerBin);
         const featureChunks = await this.discretizeAndLoad(
             interval,
             (d, signal) =>

package/dist/src/data/sources/lazy/singleAxisLazySource.d.ts

@@ -34,7 +34,7 @@ export default class SingleAxisLazySource extends DataSource {
      * @param {import("../../../spec/genome.js").ChromosomalLocus[]} complexDomain Chrom/Pos domain
      * @abstract
      */
-    onDomainChanged(domain: number[], complexDomain: import("../../../spec/genome.js").ChromosomalLocus[]): Promise<void>;
+    onDomainChanged(domain: number[], complexDomain: import("../../../spec/genome.js").ChromosomalLocus[]): void;
     /**
      * Sets the loading status of the data source. The status is shown in the UI.
      *

package/dist/src/data/sources/lazy/singleAxisLazySource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"singleAxisLazySource.d.ts","sourceRoot":"","sources":["../../../../../src/data/sources/lazy/singleAxisLazySource.js"],"names":[],"mappings":"AAIA;;GAEG;AACH;IAOI;;;OAGG;IACH,kBAHW,OAAO,uBAAuB,EAAE,OAAO,WACvC,OAAO,0BAA0B,EAAE,wBAAwB,EAiDrE;IAzDD;;;OAGG;IACH,4CAAuC;IASnC,8CAAgB;IAYhB,2EAA2E;IAC3E,SADW,OAAO,0BAA0B,EAAE,wBAAwB,CAChD;IAEtB,oEAA4D;IA+BhE;;;OAGG;IACH,wBAWC;IAED;;;;OAIG;IACH,oEAEC;IAED;;;;;;OAMG;IACH,wBAJW,MAAM,EAAE,iBACR,OAAO,yBAAyB,EAAE,gBAAgB,EAAE,iBAK9D;IAED;;;;;OAKG;IACH,mCAHW,OAAO,QAKjB;IAED;;;;;OAKG;IACH,gCAGC;IAQD;;;;;OAKG;IACH,8BAHW,OAAO,mBAAmB,EAAE,KAAK,EAAE,EAAE,QAkB/C;CACJ;uBAxJsB,kBAAkB"}
+{"version":3,"file":"singleAxisLazySource.d.ts","sourceRoot":"","sources":["../../../../../src/data/sources/lazy/singleAxisLazySource.js"],"names":[],"mappings":"AAIA;;GAEG;AACH;IAOI;;;OAGG;IACH,kBAHW,OAAO,uBAAuB,EAAE,OAAO,WACvC,OAAO,0BAA0B,EAAE,wBAAwB,EAiDrE;IAzDD;;;OAGG;IACH,4CAAuC;IASnC,8CAAgB;IAYhB,2EAA2E;IAC3E,SADW,OAAO,0BAA0B,EAAE,wBAAwB,CAChD;IAEtB,oEAA4D;IA+BhE;;;OAGG;IACH,wBAWC;IAED;;;;OAIG;IACH,oEAEC;IAED;;;;;;OAMG;IACH,wBAJW,MAAM,EAAE,iBACR,OAAO,yBAAyB,EAAE,gBAAgB,EAAE,QAK9D;IAED;;;;;OAKG;IACH,mCAHW,OAAO,QAKjB;IAED;;;;;OAKG;IACH,gCAGC;IAQD;;;;;OAKG;IACH,8BAHW,OAAO,mBAAmB,EAAE,KAAK,EAAE,EAAE,QAgB/C;CACJ;uBAtJsB,kBAAkB"}

package/dist/src/data/sources/lazy/singleAxisLazySource.js

@@ -98,7 +98,7 @@ export default class SingleAxisLazySource extends DataSource {
      * @param {import("../../../spec/genome.js").ChromosomalLocus[]} complexDomain Chrom/Pos domain
      * @abstract
      */
-    async onDomainChanged(domain, complexDomain) {
+    onDomainChanged(domain, complexDomain) {
         // Override me
     }
 
@@ -148,7 +148,5 @@ export default class SingleAxisLazySource extends DataSource {
         this.complete();
 
         reconfigureScales(this.view);
-
-        this.requestRender();
     }
 }

package/dist/src/data/sources/lazy/singleAxisWindowedSource.d.ts

@@ -1,13 +1,16 @@
 /**
+ * Divides the domain into windows and loads the data for one or two consecutive windows
+ * that cover the visible interval.
+ *
  * @abstract
  */
 export default class SingleAxisWindowedSource extends SingleAxisLazySource {
     /**
-     * @type {{windowSize?: number}}
+     * @type {{windowSize?: number | import("../../../spec/parameter.js").ExprRef}}
      * @protected
      */
     protected params: {
-        windowSize?: number;
+        windowSize?: number | import("../../../spec/parameter.js").ExprRef;
     };
     /**
      * @param {import("../../../spec/data.js").DebouncedData} debounceParams
@@ -19,7 +22,7 @@ export default class SingleAxisWindowedSource extends SingleAxisLazySource {
      *
      * @param {number[]} domain Linearized domain
      */
-    onDomainChanged(domain: number[]): Promise<void>;
+    onDomainChanged(domain: number[]): void;
     /**
      * Listen to the domain change event and update data when the covered windows change.
      *
@@ -27,6 +30,10 @@ export default class SingleAxisWindowedSource extends SingleAxisLazySource {
      * @protected
      */
     protected loadInterval(interval: number[]): Promise<void>;
+    /**
+     * @protected
+     */
+    protected reloadLastDomain(): void;
     /**
      * Splits the interval into discrete chromosomal intervals – one for each chromosome –
      * and loads the data for each of them. Handles abort signals and errors.
@@ -39,21 +46,13 @@ export default class SingleAxisWindowedSource extends SingleAxisLazySource {
      */
     protected discretizeAndLoad<T>(interval: number[], loader: (discreteInteval: import("@genome-spy/core/genome/genome.js").DiscreteChromosomeInterval, signal: AbortSignal) => Promise<T>): Promise<T[]>;
     /**
-     * Returns three consecutive windows. The idea is to immediately have some data
-     * to show to the user when they pan the view. The windows are conceptually
-     * similar to "tiles" but they are never loaded separately.
      *
-     * @param {number[]} interval
+     * @param {number[]} interval Domain
      * @param {number} windowSize
+     * @param {function(number[]):void} callback
      * @protected
      */
-    protected quantizeInterval(interval: number[], windowSize: number): number[];
-    /**
-     *
-     * @param {number[]} interval
-     * @protected
-     */
-    protected checkAndUpdateLastInterval(interval: number[]): boolean;
+    protected callIfWindowsChanged(interval: number[], windowSize: number, callback: (arg0: number[]) => void): void;
     #private;
 }
 import SingleAxisLazySource from "./singleAxisLazySource.js";

package/dist/src/data/sources/lazy/singleAxisWindowedSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"singleAxisWindowedSource.d.ts","sourceRoot":"","sources":["../../../../../src/data/sources/lazy/singleAxisWindowedSource.js"],"names":[],"mappings":"AAIA;;GAEG;AACH;IAQI;;;OAGG;IACH,kBAHU;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAC,CAGxB;IAEP;;;OAGG;IACH,0CAHW,OAAO,uBAAuB,EAAE,aAAa,QAmBvD;IAED;;;;OAIG;IACH,wBAFW,MAAM,EAAE,iBAiBlB;IAED;;;;;OAKG;IACH,iCAHW,MAAM,EAAE,iBAKlB;IAED;;;;;;;;;OASG;IACH,yCANW,MAAM,EAAE,4BACU,OAAO,mCAAmC,EAAE,0BAA0B,UAAU,WAAW,+BAqCvH;IAED;;;;;;;;OAQG;IACH,qCAJW,MAAM,EAAE,cACR,MAAM,YAWhB;IAED;;;;OAIG;IACH,+CAHW,MAAM,EAAE,WAUlB;;CACJ;iCAvJgC,2BAA2B"}
+{"version":3,"file":"singleAxisWindowedSource.d.ts","sourceRoot":"","sources":["../../../../../src/data/sources/lazy/singleAxisWindowedSource.js"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH;IAWI;;;OAGG;IACH,kBAHU;QAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,4BAA4B,EAAE,OAAO,CAAA;KAAC,CAGvE;IAEP;;;OAGG;IACH,0CAHW,OAAO,uBAAuB,EAAE,aAAa,QAqBvD;IAED;;;;OAIG;IACH,wBAFW,MAAM,EAAE,QAqBlB;IAcD;;;;;OAKG;IACH,iCAHW,MAAM,EAAE,iBAKlB;IApBD;;OAEG;IACH,mCAOC;IAYD;;;;;;;;;OASG;IACH,yCANW,MAAM,EAAE,4BACU,OAAO,mCAAmC,EAAE,0BAA0B,UAAU,WAAW,+BAqCvH;IAED;;;;;;OAMG;IACH,yCALW,MAAM,EAAE,cACR,MAAM,mBACG,MAAM,EAAE,KAAE,IAAI,QAyBjC;;CACJ;iCA3KgC,2BAA2B"}

package/dist/src/data/sources/lazy/singleAxisWindowedSource.js

@@ -1,20 +1,26 @@
+import { withoutExprRef } from "../../../view/paramMediator.js";
+import { debounce } from "../../../utils/debounce.js";
 import SingleAxisLazySource from "./singleAxisLazySource.js";
-import { shallowArrayEquals } from "../../../utils/arrayUtils.js";
-import { debounce } from "@genome-spy/core/utils/debounce.js";
 
 /**
+ * Divides the domain into windows and loads the data for one or two consecutive windows
+ * that cover the visible interval.
+ *
  * @abstract
  */
 export default class SingleAxisWindowedSource extends SingleAxisLazySource {
     #abortController = new AbortController();
 
-    /**
-     * @type {number[]}
-     */
+    /** @type {number[]} */
     #lastQuantizedInterval = [0, 0];
 
+    /** @type {number[]} */
+    #lastDomain = [0, 0];
+
+    #lastWindowSize = 0;
+
     /**
-     * @type {{windowSize?: number}}
+     * @type {{windowSize?: number | import("../../../spec/parameter.js").ExprRef}}
      * @protected
      */
     params;
@@ -24,20 +30,22 @@ export default class SingleAxisWindowedSource extends SingleAxisLazySource {
      * @protected
      */
     setupDebouncing(debounceParams) {
-        if (debounceParams.debounce > 0) {
-            if (debounceParams.debounceMode == "domain") {
-                this.onDomainChanged = debounce(
-                    this.onDomainChanged.bind(this),
-                    debounceParams.debounce,
-                    false
-                );
-            } else if (debounceParams.debounceMode == "window") {
-                this.loadInterval = debounce(
-                    this.loadInterval.bind(this),
-                    debounceParams.debounce,
-                    false
-                );
-            }
+        const wait = () => withoutExprRef(debounceParams.debounce);
+        const debounceMode = debounceParams.debounceMode;
+        if (debounceMode == "domain") {
+            this.onDomainChanged = debounce(
+                this.onDomainChanged.bind(this),
+                wait,
+                false
+            );
+        } else if (debounceMode == "window") {
+            this.loadInterval = debounce(
+                this.loadInterval.bind(this),
+                wait,
+                false
+            );
+        } else {
+            throw new Error("Invalid debounceMode: " + debounceMode);
         }
     }
 
@@ -46,21 +54,37 @@ export default class SingleAxisWindowedSource extends SingleAxisLazySource {
      *
      * @param {number[]} domain Linearized domain
      */
-    async onDomainChanged(domain) {
-        const windowSize = this.params?.windowSize ?? -1;
+    onDomainChanged(domain) {
+        this.#lastDomain = domain;
+
+        const windowSize = withoutExprRef(this.params?.windowSize) ?? -1;
 
         if (domain[1] - domain[0] > windowSize) {
             return;
         }
 
-        const quantizedInterval = this.quantizeInterval(domain, windowSize);
+        this.callIfWindowsChanged(
+            domain,
+            windowSize,
+            async (quantizedInterval) => {
+                // Possible metadata must be loaded before the first request.
+                await this.initializedPromise;
 
-        if (this.checkAndUpdateLastInterval(quantizedInterval)) {
-            // Possible metadata must be loaded before the first request.
-            await this.initializedPromise;
+                this.loadInterval(quantizedInterval);
+            }
+        );
+    }
 
-            this.loadInterval(quantizedInterval);
-        }
+    /**
+     * @protected
+     */
+    reloadLastDomain() {
+        const domain = this.#lastDomain;
+
+        this.#lastDomain = [0, 0];
+        this.#lastQuantizedInterval = [0, 0];
+
+        this.onDomainChanged(domain);
     }
 
     /**
@@ -118,35 +142,33 @@ export default class SingleAxisWindowedSource extends SingleAxisLazySource {
     }
 
     /**
-     * Returns three consecutive windows. The idea is to immediately have some data
-     * to show to the user when they pan the view. The windows are conceptually
-     * similar to "tiles" but they are never loaded separately.
      *
-     * @param {number[]} interval
+     * @param {number[]} interval Domain
      * @param {number} windowSize
+     * @param {function(number[]):void} callback
      * @protected
      */
-    quantizeInterval(interval, windowSize) {
-        return [
-            Math.max(Math.floor(interval[0] / windowSize - 1) * windowSize, 0),
+    callIfWindowsChanged(interval, windowSize, callback) {
+        // One or two consecutive windows that cover the given interval.
+        // The windows are conceptually similar to "tiles" but they are never loaded separately.
+        const quantizedInterval = [
+            Math.max(Math.floor(interval[0] / windowSize) * windowSize, 0),
             Math.min(
-                Math.ceil(interval[1] / windowSize + 1) * windowSize,
+                Math.ceil(interval[1] / windowSize) * windowSize,
                 this.genome.totalSize // Perhaps scale domain should be used here
             ),
         ];
-    }
 
-    /**
-     *
-     * @param {number[]} interval
-     * @protected
-     */
-    checkAndUpdateLastInterval(interval) {
-        if (shallowArrayEquals(this.#lastQuantizedInterval, interval)) {
-            return false;
-        }
+        const last = this.#lastQuantizedInterval;
+        if (
+            windowSize !== this.#lastWindowSize ||
+            quantizedInterval[0] < last[0] ||
+            quantizedInterval[1] > last[1]
+        ) {
+            this.#lastQuantizedInterval = quantizedInterval;
+            this.#lastWindowSize = windowSize;
 
-        this.#lastQuantizedInterval = interval;
-        return true;
+            callback(quantizedInterval);
+        }
     }
 }

package/dist/src/data/sources/sequenceSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sequenceSource.d.ts","sourceRoot":"","sources":["../../../../src/data/sources/sequenceSource.js"],"names":[],"mappings":"AAEA;;;GAGG;AACH,0CAHW,QAAQ,OAAO,oBAAoB,EAAE,IAAI,CAAC,0DAKpD;AAED;IACI;;;;OAIG;IACH,oBAHW,OAAO,oBAAoB,EAAE,iBAAiB,QAC9C,OAAO,oBAAoB,EAAE,OAAO,EAY9C;IARG,sDAA+B;IAUnC,0BAaC;CAKJ;uBA9CsB,iBAAiB"}
+{"version":3,"file":"sequenceSource.d.ts","sourceRoot":"","sources":["../../../../src/data/sources/sequenceSource.js"],"names":[],"mappings":"AAMA;;;GAGG;AACH,0CAHW,QAAQ,OAAO,oBAAoB,EAAE,IAAI,CAAC,0DAKpD;AAED;IACI;;;;OAIG;IACH,oBAHW,OAAO,oBAAoB,EAAE,iBAAiB,QAC9C,OAAO,oBAAoB,EAAE,OAAO,EAgB9C;IAZG,sDAIC;IAUL,0BAcC;CAKJ;uBAnDsB,iBAAiB"}