@genome-spy/core 0.44.0 → 0.46.0

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

@@ -6,11 +6,11 @@
  */
 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
@@ -30,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.

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":"AAGA;;;;;GAKG;AACH;IAUI;;;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,QAmBlB;IAED;;;;;OAKG;IACH,iCAHW,MAAM,EAAE,iBAKlB;IAED;;;;;;;;;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;iCA3JgC,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,5 +1,6 @@
+import { withoutExprRef } from "../../../view/paramMediator.js";
+import { debounce } from "../../../utils/debounce.js";
 import SingleAxisLazySource from "./singleAxisLazySource.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
@@ -10,15 +11,16 @@ import { debounce } from "@genome-spy/core/utils/debounce.js";
 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;
@@ -28,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);
         }
     }
 
@@ -51,7 +55,9 @@ export default class SingleAxisWindowedSource extends SingleAxisLazySource {
      * @param {number[]} domain Linearized domain
      */
     onDomainChanged(domain) {
-        const windowSize = this.params?.windowSize ?? -1;
+        this.#lastDomain = domain;
+
+        const windowSize = withoutExprRef(this.params?.windowSize) ?? -1;
 
         if (domain[1] - domain[0] > windowSize) {
             return;
@@ -69,6 +75,18 @@ export default class SingleAxisWindowedSource extends SingleAxisLazySource {
         );
     }
 
+    /**
+     * @protected
+     */
+    reloadLastDomain() {
+        const domain = this.#lastDomain;
+
+        this.#lastDomain = [0, 0];
+        this.#lastQuantizedInterval = [0, 0];
+
+        this.onDomainChanged(domain);
+    }
+
     /**
      * Listen to the domain change event and update data when the covered windows change.
      *
@@ -93,7 +111,7 @@ export default class SingleAxisWindowedSource extends SingleAxisLazySource {
         // Abort previous requests
         this.#abortController.abort();
 
-        this.setLoadingStatus(true);
+        this.setLoadingStatus("loading");
 
         this.#abortController = new AbortController();
         const signal = this.#abortController.signal;
@@ -111,13 +129,13 @@ export default class SingleAxisWindowedSource extends SingleAxisLazySource {
             );
 
             if (!signal.aborted) {
-                this.setLoadingStatus(false);
+                this.setLoadingStatus("complete");
                 return resultByChrom;
             }
         } catch (e) {
             if (!signal.aborted) {
                 // TODO: Nice reporting of errors
-                this.setLoadingStatus(false);
+                this.setLoadingStatus("error", e.message);
                 throw e;
             }
         }

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

@@ -22,7 +22,7 @@ export default class NamedSource extends DataSource {
      * @param {function(string):any[]} provider Function that retrieves a dataset using a name
      */
     constructor(params, view, provider) {
-        super();
+        super(view);
 
         this.provider = provider;
         this.params = params;

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,EAiB9C;IAZG,sDAIC;IAUL,0BAcC;CAKJ;uBApDsB,iBAAiB"}

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

@@ -1,3 +1,7 @@
+import {
+    activateExprRefProps,
+    withoutExprRef,
+} from "../../view/paramMediator.js";
 import DataSource from "./dataSource.js";
 
 /**
@@ -15,8 +19,13 @@ export default class SequenceSource extends DataSource {
      * @param {import("../../view/view.js").default} view
      */
     constructor(params, view) {
-        super();
-        this.sequence = params.sequence;
+        super(view);
+
+        this.sequence = activateExprRefProps(
+            view.paramMediator,
+            params.sequence,
+            () => this.loadSynchronously()
+        );
 
         if (!("start" in this.sequence)) {
             throw new Error("'start' is missing from sequence parameters!");
@@ -27,14 +36,15 @@ export default class SequenceSource extends DataSource {
     }
 
     loadSynchronously() {
-        const as = this.sequence.as || "data";
-        const step = this.sequence.step || 1;
-        const stop = this.sequence.stop;
+        const as = withoutExprRef(this.sequence.as) ?? "data";
+        const start = withoutExprRef(this.sequence.start) ?? 0;
+        const step = withoutExprRef(this.sequence.step) ?? 1;
+        const stop = withoutExprRef(this.sequence.stop);
 
         this.reset();
         this.beginBatch({ type: "file" });
 
-        for (let x = this.sequence.start; x < stop; x += step) {
+        for (let x = start; x < stop; x += step) {
             this._propagate({ [as]: x });
         }
 

package/dist/src/data/sources/sequenceSource.test.js

@@ -14,10 +14,18 @@ async function collectSource(source) {
     return [...collector.getData()];
 }
 
+const viewStub = {
+    paramMediator: {
+        registerParam: () => {},
+        allocateSetter: () => {},
+        createExpression: () => {},
+    },
+};
+
 test("SequenceSource generates a sequence", async () => {
     expect(
         await collectSource(
-            new SequenceSource({ sequence: { start: 0, stop: 3 } })
+            new SequenceSource({ sequence: { start: 0, stop: 3 } }, viewStub)
         )
     ).toEqual([{ data: 0 }, { data: 1 }, { data: 2 }]);
 });
@@ -25,7 +33,10 @@ test("SequenceSource generates a sequence", async () => {
 test("SequenceSource generates a sequence with a custom step", async () => {
     expect(
         await collectSource(
-            new SequenceSource({ sequence: { start: 0, stop: 5, step: 2 } })
+            new SequenceSource(
+                { sequence: { start: 0, stop: 5, step: 2 } },
+                viewStub
+            )
         )
     ).toEqual([{ data: 0 }, { data: 2 }, { data: 4 }]);
 });
@@ -33,14 +44,21 @@ test("SequenceSource generates a sequence with a custom step", async () => {
 test("SequenceSource generates a sequence with a custom field name", async () => {
     expect(
         await collectSource(
-            new SequenceSource({ sequence: { start: 0, stop: 3, as: "x" } })
+            new SequenceSource(
+                { sequence: { start: 0, stop: 3, as: "x" } },
+                viewStub
+            )
         )
     ).toEqual([{ x: 0 }, { x: 1 }, { x: 2 }]);
 });
 
 test("SequenceSource throws on missing 'start' parameter", () => {
-    expect(() => new SequenceSource({ sequence: { stop: 3 } })).toThrow();
+    expect(
+        () => new SequenceSource({ sequence: { stop: 3 } }, viewStub)
+    ).toThrow();
 });
 test("SequenceSource throws on missing 'stop' parameter", () => {
-    expect(() => new SequenceSource({ sequence: { start: 0 } })).toThrow();
+    expect(
+        () => new SequenceSource({ sequence: { start: 0 } }, viewStub)
+    ).toThrow();
 });

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

@@ -1 +1 @@
-{"version":3,"file":"urlSource.d.ts","sourceRoot":"","sources":["../../../../src/data/sources/urlSource.js"],"names":[],"mappings":"AAIA;;;GAGG;AACH,gCAHW,QAAQ,OAAO,oBAAoB,EAAE,IAAI,CAAC,gDAKpD;AAED;IACI;;;OAGG;IACH,oBAHW,OAAO,oBAAoB,EAAE,OAAO,QACpC,OAAO,oBAAoB,EAAE,OAAO,EAO9C;IAFG,6CAAoB;IACpB,gBAAiC;CAoDxC;uBAvEsB,iBAAiB"}
+{"version":3,"file":"urlSource.d.ts","sourceRoot":"","sources":["../../../../src/data/sources/urlSource.js"],"names":[],"mappings":"AAQA;;;GAGG;AACH,gCAHW,QAAQ,OAAO,oBAAoB,EAAE,IAAI,CAAC,gDAKpD;AAED;IACI;;;OAGG;IACH,oBAHW,OAAO,oBAAoB,EAAE,OAAO,QACpC,OAAO,oBAAoB,EAAE,OAAO,EAU9C;IALG,6CAEC;IAED,gBAAiC;CA8DxC;uBAxFsB,iBAAiB"}

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

@@ -1,6 +1,10 @@
 import { loader as vegaLoader, read } from "vega-loader";
 import { getFormat } from "./dataUtils.js";
 import DataSource from "./dataSource.js";
+import {
+    activateExprRefProps,
+    withoutExprRef,
+} from "../../view/paramMediator.js";
 
 /**
  * @param {Partial<import("../../spec/data.js").Data>} data
@@ -16,9 +20,12 @@ export default class UrlSource extends DataSource {
      * @param {import("../../view/view.js").default} view
      */
     constructor(params, view) {
-        super();
+        super(view);
+
+        this.params = activateExprRefProps(view.paramMediator, params, () =>
+            this.load()
+        );
 
-        this.params = params;
         this.baseUrl = view?.getBaseUrl();
     }
 
@@ -27,11 +34,17 @@ export default class UrlSource extends DataSource {
     }
 
     async load() {
-        const url = this.params.url;
+        const url = withoutExprRef(this.params.url);
 
         /** @type {string[]} */
         const urls = Array.isArray(url) ? url : [url];
 
+        if (urls.length === 0 || !urls[0]) {
+            this.reset();
+            this.complete();
+            return;
+        }
+
         /** @param {string} url */
         const load = async (url) =>
             // TODO: Support chunked loading
@@ -42,9 +55,7 @@ export default class UrlSource extends DataSource {
                     .load(url)
                     .catch((/** @type {Error} */ e) => {
                         // TODO: Include baseurl in the error message. Should be normalized, however.
-                        throw new Error(
-                            `Cannot fetch: ${this.baseUrl}${url}: ${e.message}`
-                        );
+                        throw new Error(`${url}: ${e.message}`);
                     })
             );
 
@@ -65,9 +76,15 @@ export default class UrlSource extends DataSource {
             }
         };
 
+        this.setLoadingStatus("loading");
         this.reset();
 
-        await Promise.all(urls.map((url) => load(url).then(readAndParse)));
+        try {
+            await Promise.all(urls.map((url) => load(url).then(readAndParse)));
+            this.setLoadingStatus("complete");
+        } catch (e) {
+            this.setLoadingStatus("error", e.message);
+        }
 
         this.complete();
     }

package/dist/src/data/transforms/aggregate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aggregate.d.ts","sourceRoot":"","sources":["../../../../src/data/transforms/aggregate.js"],"names":[],"mappings":"AAKA;;;;;;GAMG;AACH;IAKI;;OAEG;IACH,oBAFW,OAAO,yBAAyB,EAAE,eAAe,EAQ3D;IAJG,0DAAoB;IAEpB,oBAAoB;IACpB,QADW,GAAG,EAAE,CACA;CAyCvB;qBAjEyC,gBAAgB"}
+{"version":3,"file":"aggregate.d.ts","sourceRoot":"","sources":["../../../../src/data/transforms/aggregate.js"],"names":[],"mappings":"AAKA;;;;;;GAMG;AACH;IAKI;;OAEG;IACH,oBAFW,OAAO,yBAAyB,EAAE,eAAe,EAQ3D;IAJG,0DAAoB;IAEpB,oBAAoB;IACpB,QADW,GAAG,EAAE,CACA;CA4CvB;qBApEyC,gBAAgB"}

package/dist/src/data/transforms/aggregate.js

@@ -46,8 +46,11 @@ export default class AggregateTransform extends FlowNode {
         const groupFieldAccessors = groupby.map((f) => field(f));
 
         // TODO: Fix case where no group fields are specified
-        // @ts-expect-error
-        const groups = d3group(this.buffer, ...groupFieldAccessors);
+
+        // There's something strange in d3-array's typings
+        const groups = /** @type {Map<any, any>} */ /** @type {any} */ (
+            d3group(this.buffer, ...groupFieldAccessors)
+        );
 
         for (const [group, data] of iterateNestedMaps(groups)) {
             /** @type {any} */

package/dist/src/data/transforms/filter.d.ts

@@ -5,8 +5,8 @@ export default class FilterTransform extends FlowNode {
      */
     constructor(params: import("../../spec/transform.js").FilterParams);
     params: import("../../spec/transform.js").FilterParams;
-    /** @type {(datum: any) => boolean} */
-    predicate: (datum: any) => boolean;
+    /** @type {import("../../view/paramMediator.js").ExprRefFunction} */
+    predicate: import("../../view/paramMediator.js").ExprRefFunction;
 }
 import FlowNode from "../flowNode.js";
 //# sourceMappingURL=filter.d.ts.map

package/dist/src/data/transforms/filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../src/data/transforms/filter.js"],"names":[],"mappings":"AAGA;IACI;;;OAGG;IACH,oBAFW,OAAO,yBAAyB,EAAE,YAAY,EAQxD;IAJG,uDAAoB;IAEpB,sCAAsC;IACtC,mBADmB,GAAG,KAAK,OAAO,CACR;CAmBjC;qBA/BoB,gBAAgB"}
+{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../src/data/transforms/filter.js"],"names":[],"mappings":"AAEA;IACI;;;OAGG;IACH,oBAFW,OAAO,yBAAyB,EAAE,YAAY,EAQxD;IAJG,uDAAoB;IAEpB,oEAAoE;IACpE,WADW,OAAO,6BAA6B,EAAE,eAAe,CACtC;CAiBjC;qBA7BoB,gBAAgB"}

package/dist/src/data/transforms/filter.js

@@ -1,4 +1,3 @@
-import createFunction from "../../utils/expression.js";
 import FlowNode from "../flowNode.js";
 
 export default class FilterTransform extends FlowNode {
@@ -10,15 +9,13 @@ export default class FilterTransform extends FlowNode {
         super();
         this.params = params;
 
-        /** @type {(datum: any) => boolean} */
+        /** @type {import("../../view/paramMediator.js").ExprRefFunction} */
         this.predicate = undefined;
     }
 
     initialize() {
-        this.predicate = createFunction(
-            this.params.expr,
-            this.getGlobalObject()
-        );
+        this.predicate = this.paramMediator.createExpression(this.params.expr);
+        this.predicate.addListener(() => this.repropagate());
     }
 
     /**

package/dist/src/data/transforms/filter.test.js

@@ -2,6 +2,8 @@ import { expect, test } from "vitest";
 import { processData } from "../flowTestUtils.js";
 import FilterTransform from "./filter.js";
 
+test.todo("Implement stub for ParamMediator");
+
 test("FilterTransform filter rows", () => {
     const data = [1, 2, 3, 4, 5, 6].map((x) => ({ x }));
 
@@ -11,8 +13,12 @@ test("FilterTransform filter rows", () => {
         expr: "datum.x > 3 && datum.x != 5",
     };
 
+    /* TODO: Enable this test, implement stub for ParamMediator
+
     const t = new FilterTransform(filterParams);
     t.initialize();
 
     expect(processData(t, data)).toEqual([4, 6].map((x) => ({ x })));
+
+    */
 });

package/dist/src/data/transforms/formula.d.ts

@@ -6,8 +6,8 @@ export default class FormulaTransform extends FlowNode {
     constructor(params: import("../../spec/transform.js").FormulaParams);
     params: import("../../spec/transform.js").FormulaParams;
     as: string;
-    /** @type {(datum: any) => any} */
-    fn: (datum: any) => any;
+    /** @type {import("../../view/paramMediator.js").ExprRefFunction} */
+    fn: import("../../view/paramMediator.js").ExprRefFunction;
 }
 import FlowNode from "../flowNode.js";
 //# sourceMappingURL=formula.d.ts.map

package/dist/src/data/transforms/formula.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"formula.d.ts","sourceRoot":"","sources":["../../../../src/data/transforms/formula.js"],"names":[],"mappings":"AAGA;IAKI;;;OAGG;IACH,oBAFW,OAAO,yBAAyB,EAAE,aAAa,EAUzD;IANG,wDAAoB;IAEpB,WAAmB;IAEnB,kCAAkC;IAClC,YADmB,GAAG,KAAK,GAAG,CACX;CAe1B;qBAjC2C,gBAAgB"}
+{"version":3,"file":"formula.d.ts","sourceRoot":"","sources":["../../../../src/data/transforms/formula.js"],"names":[],"mappings":"AAEA;IAKI;;;OAGG;IACH,oBAFW,OAAO,yBAAyB,EAAE,aAAa,EAUzD;IANG,wDAAoB;IAEpB,WAAmB;IAEnB,oEAAoE;IACpE,IADW,OAAO,6BAA6B,EAAE,eAAe,CAC7C;CAgB1B;qBAlC2C,gBAAgB"}

package/dist/src/data/transforms/formula.js

@@ -1,4 +1,3 @@
-import createFunction from "../../utils/expression.js";
 import FlowNode, { BEHAVIOR_MODIFIES } from "../flowNode.js";
 
 export default class FormulaTransform extends FlowNode {
@@ -16,12 +15,13 @@ export default class FormulaTransform extends FlowNode {
 
         this.as = params.as;
 
-        /** @type {(datum: any) => any} */
+        /** @type {import("../../view/paramMediator.js").ExprRefFunction} */
         this.fn = undefined;
     }
 
     initialize() {
-        this.fn = createFunction(this.params.expr, this.getGlobalObject());
+        this.fn = this.paramMediator.createExpression(this.params.expr);
+        this.fn.addListener(() => this.repropagate());
     }
 
     /**

package/dist/src/data/transforms/formula.test.js

@@ -1,10 +1,14 @@
-import { expect, test } from "vitest";
+import { expect, test, test } from "vitest";
 import { processData } from "../flowTestUtils.js";
 import FormulaTransform from "./formula.js";
 
+test.todo("Implement stub for ParamMediator");
+
 test("FormulaTransform", () => {
     const data = [{ a: 2 }, { a: 3 }];
 
+    /* TODO: Enable this test, implement stub for ParamMediator
+
     const t = new FormulaTransform({
         type: "formula",
         expr: "datum.a * 2",
@@ -16,4 +20,6 @@ test("FormulaTransform", () => {
         { a: 2, b: 4 },
         { a: 3, b: 6 },
     ]);
+
+    */
 });

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

@@ -1,8 +1,6 @@
 /**
  * Creates an object that contains encoders for every channel of a mark
  *
- * TODO: This should actually receive the mark as parameter
- *
  * TODO: This method should have a test. But how to mock Mark...
  *
  * @param {import("../marks/mark.js").default} mark
@@ -11,14 +9,14 @@
  */
 export default function createEncoders(mark: import("../marks/mark.js").default, encoding?: import("../spec/channel.js").Encoding): Partial<Record<import("../spec/channel.js").Channel, import("../types/encoder.js").Encoder>>;
 /**
- *
+ * @param {import("../marks/mark.js").default} mark
  * @param {import("../spec/channel.js").ChannelDef} channelDef
  * @param {any} scale
  * @param {Accessor} accessor
  * @param {Channel} channel
  * @returns {Encoder}
  */
-export function createEncoder(channelDef: import("../spec/channel.js").ChannelDef, scale: any, accessor: import("../types/encoder.js").Accessor, channel: import("../spec/channel.js").Channel): import("../types/encoder.js").Encoder;
+export function createEncoder(mark: import("../marks/mark.js").default, channelDef: import("../spec/channel.js").ChannelDef, scale: any, accessor: import("../types/encoder.js").Accessor, channel: import("../spec/channel.js").Channel): import("../types/encoder.js").Encoder;
 /**
  * TODO: Move to a more generic place
  *

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

@@ -1 +1 @@
-{"version":3,"file":"encoder.d.ts","sourceRoot":"","sources":["../../../src/encoder/encoder.js"],"names":[],"mappings":"AAKA;;;;;;;;;;GAUG;AACH,6CAJW,OAAO,kBAAkB,EAAE,OAAO,aAClC,OAAO,oBAAoB,EAAE,QAAQ,gGAsC/C;AAED;;;;;;;GAOG;AACH,0CANW,OAAO,oBAAoB,EAAE,UAAU,SACvC,GAAG,0IAoGb;AAED;;;;;GAKG;AACH,uCAHW,OAAO,oBAAoB,EAAE,UAAU,4FAKjD;AAED;;;GAGG;AACH,uCAHW,OAAO,oBAAoB,EAAE,UAAU,mEAKjD;AAED;;;GAGG;AACH,uCAHW,OAAO,oBAAoB,EAAE,UAAU,uDAKjD;AAED;;;GAGG;AACH,kDAHW,OAAO,oBAAoB,EAAE,UAAU,kEAWjD;AAED;;;GAGG;AACH,6CAHW,OAAO,qBAAqB,EAAE,OAAO,WACrC,OAAO,oBAAoB,EAAE,OAAO,27CAS9C;AAED;;;GAGG;AACH,iDAHW,OAAO,oBAAoB,EAAE,UAAU,4FAKjD;AAED;;;GAGG;AACH,0CAHW,OAAO,oBAAoB,EAAE,UAAU,0DAKjD;AAED;;;GAGG;AACH,sCAHW,OAAO,oBAAoB,EAAE,UAAU,sDAKjD;AAoBD;;;GAGG;AACH,oDAHW,OAAO,oBAAoB,EAAE,OAAO,oEAM9C;AAED;;;GAGG;AACH,6CAHW,OAAO,oBAAoB,EAAE,OAAO,6DAM9C;AAqBD;;;GAGG;AACH,4CAFW,MAAM,WAIhB;AAED;;;;GAIG;AACH,oDAFW,OAAO,oBAAoB,EAAE,OAAO,2DAS9C;AAED;;;;;GAKG;AACH,2CAFW,OAAO,oBAAoB,EAAE,OAAO,wCAI9C;AAED;;;;GAIG;AACH,kDAFW,OAAO,oBAAoB,EAAE,OAAO,0CAM9C;AAED;;GAEG;AACH,wCAFW,OAAO,oBAAoB,EAAE,OAAO,WAI9C;AAED;;;;GAIG;AACH,2CAFW,OAAO,oBAAoB,EAAE,OAAO,WAI9C;AAED;;;GAGG;AACH,4CAHW,OAAO,oBAAoB,EAAE,OAAO,4DAuB9C;AAED;;;;;GAKG;AACH,0CAHW,OAAO,oBAAoB,EAAE,OAAO,GAClC,GAAG,EAAE,CAsBjB;AAED;;;GAGG;AACH,gDAHW,OAAO,oBAAoB,EAAE,OAAO,UACzB,GAAG,KAAE,MAAM,CAmBhC;AA7LD;;GAEG;AACH,wCAFU,OAAO,oBAAoB,EAAE,wBAAwB,EAAE,CAEb;AAEpD;;GAEG;AACH,0CAFU,OAAO,oBAAoB,EAAE,0BAA0B,EAAE,CAEX;AAExD;;GAEG;AACH,iCAFU,OAAO,oBAAoB,EAAE,iBAAiB,EAAE,CAKxD;AAoBF;;;;GAIG;AACH,gCAFU,QAAQ,OAAO,OAAO,oBAAoB,EAAE,OAAO,EAAE,OAAO,oBAAoB,EAAE,0BAA0B,CAAC,CAAC,CAKtH;AAEF;;;;GAIG;AACH,8BAFU,QAAQ,OAAO,OAAO,oBAAoB,EAAE,OAAO,EAAE,OAAO,oBAAoB,EAAE,OAAO,CAAC,CAAC,CAInG"}
+{"version":3,"file":"encoder.d.ts","sourceRoot":"","sources":["../../../src/encoder/encoder.js"],"names":[],"mappings":"AAKA;;;;;;;;GAQG;AACH,6CAJW,OAAO,kBAAkB,EAAE,OAAO,aAClC,OAAO,oBAAoB,EAAE,QAAQ,gGAuC/C;AAED;;;;;;;GAOG;AACH,oCAPW,OAAO,kBAAkB,EAAE,OAAO,cAClC,OAAO,oBAAoB,EAAE,UAAU,SACvC,GAAG,0IAqGb;AAED;;;;;GAKG;AACH,uCAHW,OAAO,oBAAoB,EAAE,UAAU,4FAKjD;AAED;;;GAGG;AACH,uCAHW,OAAO,oBAAoB,EAAE,UAAU,mEAKjD;AAED;;;GAGG;AACH,uCAHW,OAAO,oBAAoB,EAAE,UAAU,uDAKjD;AAED;;;GAGG;AACH,kDAHW,OAAO,oBAAoB,EAAE,UAAU,kEAWjD;AAED;;;GAGG;AACH,6CAHW,OAAO,qBAAqB,EAAE,OAAO,WACrC,OAAO,oBAAoB,EAAE,OAAO,27CAS9C;AAED;;;GAGG;AACH,iDAHW,OAAO,oBAAoB,EAAE,UAAU,4FAKjD;AAED;;;GAGG;AACH,0CAHW,OAAO,oBAAoB,EAAE,UAAU,0DAKjD;AAED;;;GAGG;AACH,sCAHW,OAAO,oBAAoB,EAAE,UAAU,sDAKjD;AAoBD;;;GAGG;AACH,oDAHW,OAAO,oBAAoB,EAAE,OAAO,oEAM9C;AAED;;;GAGG;AACH,6CAHW,OAAO,oBAAoB,EAAE,OAAO,6DAM9C;AAqBD;;;GAGG;AACH,4CAFW,MAAM,WAIhB;AAED;;;;GAIG;AACH,oDAFW,OAAO,oBAAoB,EAAE,OAAO,2DAS9C;AAED;;;;;GAKG;AACH,2CAFW,OAAO,oBAAoB,EAAE,OAAO,wCAI9C;AAED;;;;GAIG;AACH,kDAFW,OAAO,oBAAoB,EAAE,OAAO,0CAM9C;AAED;;GAEG;AACH,wCAFW,OAAO,oBAAoB,EAAE,OAAO,WAI9C;AAED;;;;GAIG;AACH,2CAFW,OAAO,oBAAoB,EAAE,OAAO,WAI9C;AAED;;;GAGG;AACH,4CAHW,OAAO,oBAAoB,EAAE,OAAO,4DAuB9C;AAED;;;;;GAKG;AACH,0CAHW,OAAO,oBAAoB,EAAE,OAAO,GAClC,GAAG,EAAE,CAsBjB;AAED;;;GAGG;AACH,gDAHW,OAAO,oBAAoB,EAAE,OAAO,UACzB,GAAG,KAAE,MAAM,CAmBhC;AA7LD;;GAEG;AACH,wCAFU,OAAO,oBAAoB,EAAE,wBAAwB,EAAE,CAEb;AAEpD;;GAEG;AACH,0CAFU,OAAO,oBAAoB,EAAE,0BAA0B,EAAE,CAEX;AAExD;;GAEG;AACH,iCAFU,OAAO,oBAAoB,EAAE,iBAAiB,EAAE,CAKxD;AAoBF;;;;GAIG;AACH,gCAFU,QAAQ,OAAO,OAAO,oBAAoB,EAAE,OAAO,EAAE,OAAO,oBAAoB,EAAE,0BAA0B,CAAC,CAAC,CAKtH;AAEF;;;;GAIG;AACH,8BAFU,QAAQ,OAAO,OAAO,oBAAoB,EAAE,OAAO,EAAE,OAAO,oBAAoB,EAAE,OAAO,CAAC,CAAC,CAInG"}

package/dist/src/encoder/encoder.js

@@ -1,13 +1,11 @@
 import { isDiscrete } from "vega-scale";
 import createIndexer from "../utils/indexer.js";
 import scaleNull from "../utils/scaleNull.js";
-import { isExprRef } from "../marks/mark.js";
+import { isExprRef } from "../view/paramMediator.js";
 
 /**
  * Creates an object that contains encoders for every channel of a mark
  *
- * TODO: This should actually receive the mark as parameter
- *
  * TODO: This method should have a test. But how to mock Mark...
  *
  * @param {import("../marks/mark.js").default} mark
@@ -41,6 +39,7 @@ export default function createEncoders(mark, encoding) {
         const resolution = mark.unitView.getScaleResolution(channelWithScale);
 
         encoders[channel] = createEncoder(
+            mark,
             encoding[channel],
             resolution?.scale,
             mark.unitView.getAccessor(channel),
@@ -52,14 +51,14 @@ export default function createEncoders(mark, encoding) {
 }
 
 /**
- *
+ * @param {import("../marks/mark.js").default} mark
  * @param {import("../spec/channel.js").ChannelDef} channelDef
  * @param {any} scale
  * @param {Accessor} accessor
  * @param {Channel} channel
  * @returns {Encoder}
  */
-export function createEncoder(channelDef, scale, accessor, channel) {
+export function createEncoder(mark, channelDef, scale, accessor, channel) {
     /**
      * @typedef {import("../spec/channel.js").Channel} Channel
      * @typedef {import("../types/encoder.js").Encoder} Encoder
@@ -71,9 +70,10 @@ export function createEncoder(channelDef, scale, accessor, channel) {
 
     if (isValueDef(channelDef)) {
         if (isExprRef(channelDef.value)) {
-            // TODO: Should get the value expression as the accessor
-            encoder = /** @type {Encoder} */ ((datum) => undefined);
-            //encoder = /** @type {Encoder} */ (/** @type {any} */ (accessor));
+            const fn = mark.unitView.paramMediator.createExpression(
+                channelDef.value.expr
+            );
+            encoder = /** @type {Encoder} */ ((datum) => fn(null));
             encoder.constant = true;
             encoder.constantValue = false;
             encoder.accessor = accessor;

package/dist/src/encoder/encoder.test.js

@@ -29,6 +29,7 @@ describe("Encoder", () => {
         const encoders = {};
         for (const [channel, channelDef] of Object.entries(encoding)) {
             encoders[channel] = createEncoder(
+                null, // TODO: stub the mark
                 channelDef,
                 scales[channel],
                 accessorFactory.createAccessor(encodingSpecs[channel]),
@@ -95,4 +96,6 @@ describe("Encoder", () => {
     });
 
     // TODO: Test indexer
+
+    // TODO: Text ExprRef
 });

package/dist/src/genomeSpy.d.ts

@@ -13,6 +13,7 @@ export default class GenomeSpy {
      */
     constructor(container: HTMLElement, spec: import("./spec/root.js").RootSpec, options?: import("./types/embedApi.js").EmbedOptions);
     container: HTMLElement;
+    options: import("./types/embedApi.js").EmbedOptions;
     /** @type {(() => void)[]} */
     _destructionCallbacks: (() => void)[];
     /** Root level configuration object */
@@ -69,13 +70,19 @@ export default class GenomeSpy {
     tooltipHandlers: Record<string, import("./tooltip/tooltipHandler.js").TooltipHandler>;
     /** @type {View} */
     viewRoot: import("./view/view.js").default;
-    _paramBroker: ParamBroker;
     /**
      * Views that are currently loading data using lazy sources.
      *
-     * @type {Map<View, boolean>}
+     * @type {Map<View, { status: import("./types/viewContext.js").DataLoadingStatus, detail?: string }>}
      */
-    _loadingViews: Map<import("./view/view.js").default, boolean>;
+    _loadingViews: Map<import("./view/view.js").default, {
+        status: import("./types/viewContext.js").DataLoadingStatus;
+        detail?: string;
+    }>;
+    /**
+     * @type {HTMLElement}
+     */
+    _inputBindingContainer: HTMLElement;
     /**
      *
      * @param {(name: string) => any[]} provider
@@ -103,10 +110,9 @@ export default class GenomeSpy {
      * animations with html elements than with WebGL.
      */
     _updateLoadingIndicators(): void;
-    _prepareContainer(): void;
     _glHelper: WebGLHelper;
-    loadingMessageElement: HTMLDivElement;
-    loadingIndicatorsElement: HTMLDivElement;
+    loadingMessageElement: HTMLElement;
+    loadingIndicatorsElement: HTMLElement;
     tooltip: Tooltip;
     /**
      * Unregisters all listeners, removes all created dom elements, removes all css classes from the container
@@ -151,7 +157,6 @@ import Animator from "./utils/animator.js";
 import GenomeStore from "./genome/genomeStore.js";
 import BufferedViewRenderingContext from "./view/renderingContext/bufferedViewRenderingContext.js";
 import Inertia from "./utils/inertia.js";
-import ParamBroker from "./paramBroker.js";
 import WebGLHelper from "./gl/webGLHelper.js";
 import Tooltip from "./utils/ui/tooltip.js";
 import UnitView from "./view/unitView.js";