@genome-spy/core 0.43.3 → 0.45.0

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

@@ -335,7 +335,7 @@ describe("Domain handling", () => {
         );
 
         /** @param {import("./view.js").default} view */
-        const d = (view) => view.getScaleResolution("y").getScale().domain();
+        const d = (view) => view.getScaleResolution("y").scale.domain();
 
         expect(r(d(view))).toEqual([1, 5]);
         expect(r(d(view.children[0]))).toEqual([1, 5]);
@@ -371,7 +371,7 @@ describe("Domain handling", () => {
         );
 
         /** @param {import("./view.js").default} view */
-        const d = (view) => view.getScaleResolution("y").getScale().domain();
+        const d = (view) => view.getScaleResolution("y").scale.domain();
 
         expect(r(d(view))).toEqual([1, 5]);
         expect(r(d(view.children[0]))).toEqual([1, 5]);
@@ -403,7 +403,7 @@ describe("Domain handling", () => {
         );
 
         /** @param {import("./view.js").default} view */
-        const d = (view) => view.getScaleResolution("y").getScale().domain();
+        const d = (view) => view.getScaleResolution("y").scale.domain();
 
         // FAILS!!!!!!! TODO: FIX!!
         // expect(r(d(view))).toEqual([1, 5]);
@@ -442,7 +442,7 @@ describe("Domain handling", () => {
         );
 
         /** @param {import("./view.js").default} view */
-        const d = (view) => view.getScaleResolution("y").getScale().domain();
+        const d = (view) => view.getScaleResolution("y").scale.domain();
 
         expect(r(d(view))).toEqual([1, 5]);
         expect(r(d(view.children[0]))).toEqual([1, 5]);
@@ -469,7 +469,7 @@ describe("Domain handling", () => {
 
         const d = /** @param {import("../spec/channel.js").Channel} channel*/ (
             channel
-        ) => view.getScaleResolution(channel).getScale().domain();
+        ) => view.getScaleResolution(channel).scale.domain();
 
         expect(d("x")).toEqual([0, 3]);
         expect(d("y")).toEqual([0, 3]);
@@ -497,7 +497,7 @@ describe("Domain handling", () => {
         );
 
         const d = /** @param {Channel} channel*/ (channel) =>
-            view.getScaleResolution(channel).getScale().domain();
+            view.getScaleResolution(channel).scale.domain();
 
         expect(d("x")).toEqual([1, 4]);
         expect(d("x")).toEqual([1, 4]);
@@ -530,7 +530,7 @@ describe("Domain handling", () => {
         }
 
         const d = /** @param {Channel} channel*/ (channel) =>
-            view.getScaleResolution(channel).getScale().domain();
+            view.getScaleResolution(channel).scale.domain();
 
         expect(d("x")).toEqual([2, 3]);
         expect(d("y")).toEqual([2, 3]);

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

@@ -1 +1 @@
-{"version":3,"file":"unitView.d.ts","sourceRoot":"","sources":["../../../src/view/unitView.js"],"names":[],"mappings":"AAqBA;;;;GAIG;AACH;QAHkB,MAAM,GAAE,cAAc,kBAAkB,EAAE,OAAO;EASjE;AAEF;IACI;;;;;;;OAOG;IACH;;;;;;;;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,EAkBzC;IAbG,yCAAgB;IAIZ,iDAAiD;IACjD,MADW,OAAO,kBAAkB,EAAE,OAAO,CACnB;IAUlC;;;;OAIG;IACH,gBAJW,OAAO,4CAA4C,EAAE,OAAO,UAC5D,OAAO,uBAAuB,EAAE,OAAO,YACvC,OAAO,uBAAuB,EAAE,gBAAgB,QAY1D;IAED,kDAIC;IAED;;;;;OAKG;IACH,iEAyEC;IAED;;;OAGG;IACH,mGASC;IAkBD;;OAEG;IACH,uDAEC;IAED;;OAEG;IACH,6/CAcC;IAED;;;;;OAKG;IACH,6BAHW,OAAO,oBAAoB,EAAE,gBAAgB,iDAkBvD;IAED;;;;;;;;;;;;OAYG;IACH,gHA2CC;IAED,uBAQC;IAgBD;;;;OAIG;IACH,8BAJW,MAAM,+DAEJ,OAAO,iBAAiB,EAAE,kBAAkB,CAKxD;CACJ;0BAnVyB,oBAAoB"}
+{"version":3,"file":"unitView.d.ts","sourceRoot":"","sources":["../../../src/view/unitView.js"],"names":[],"mappings":"AAqBA;;;;GAIG;AACH;QAHkB,MAAM,GAAE,cAAc,kBAAkB,EAAE,OAAO;EASjE;AAEF;IACI;;;;;;;OAOG;IACH;;;;;;;;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,EAkBzC;IAbG,yCAAgB;IAIZ,iDAAiD;IACjD,MADW,OAAO,kBAAkB,EAAE,OAAO,CACnB;IAUlC;;;;OAIG;IACH,gBAJW,OAAO,4CAA4C,EAAE,OAAO,UAC5D,OAAO,uBAAuB,EAAE,OAAO,YACvC,OAAO,uBAAuB,EAAE,gBAAgB,QAY1D;IAED,kDAIC;IAED;;;;;OAKG;IACH,iEAgFC;IAED;;;OAGG;IACH,mGASC;IAkBD;;OAEG;IACH,uDAEC;IAED;;OAEG;IACH,6/CAcC;IAED;;;;;OAKG;IACH,6BAHW,OAAO,oBAAoB,EAAE,gBAAgB,iDAkBvD;IAED;;;;;;;;;;;;OAYG;IACH,gHA2CC;IAED,uBAQC;IAgBD;;;;OAIG;IACH,8BAJW,MAAM,+DAEJ,OAAO,iBAAiB,EAAE,kBAAkB,CAKxD;CACJ;0BA1VyB,oBAAoB"}

package/dist/src/view/unitView.js

@@ -160,9 +160,16 @@ export default class UnitView extends ContainerView {
                 );
             } else if (type == "scale" && isChannelWithScale(channel)) {
                 if (!view.resolutions[type][targetChannel]) {
-                    view.resolutions[type][targetChannel] = new ScaleResolution(
-                        targetChannel
-                    );
+                    const resolution = new ScaleResolution(targetChannel);
+                    view.resolutions[type][targetChannel] = resolution;
+
+                    resolution.addEventListener("range", (event) => {
+                        // Create if WebGLHelper is available, i.e., if not running in headless mode
+                        this.context.glHelper?.createRangeTexture(
+                            event.scaleResolution,
+                            true
+                        );
+                    });
                 }
                 view.resolutions[type][targetChannel].pushUnitView(
                     this,

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

@@ -84,6 +84,8 @@ export default class View {
      * @type {Record<import("../spec/channel.js").PrimaryPositionalChannel, boolean>}
      */
     needsAxes: Record<import("../spec/channel.js").PrimaryPositionalChannel, boolean>;
+    /** @type {ParamMediator} */
+    paramMediator: ParamMediator;
     getPadding(): Padding;
     /**
      * Returns a padding that indicates how much axes and titles extend over the plot area.
@@ -267,7 +269,7 @@ export default class View {
      * Returns `true` if this view and its children supports picking.
      */
     isPickingSupported(): boolean;
-    getTitleText(): string;
+    getTitleText(): any;
     /**
      * @param {any} key string
      * @param {function(key?):T} callable A function that produces a value to be cached
@@ -321,6 +323,7 @@ export type ViewOptions = {
      */
     contributesToScaleDomain?: boolean;
 };
+import ParamMediator from "./paramMediator.js";
 import Padding from "./layout/padding.js";
 import { FlexDimensions } from "./layout/flexLayout.js";
 //# sourceMappingURL=view.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../src/view/view.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../src/view/view.js"],"names":[],"mappings":"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"}

package/dist/src/view/view.js

@@ -16,7 +16,7 @@ import { appendToBaseUrl } from "../utils/url.js";
 import { isDiscrete, bandSpace } from "vega-scale";
 import { peek } from "../utils/arrayUtils.js";
 import ViewError from "./viewError.js";
-import { isExprRef } from "../marks/mark.js";
+import ParamMediator, { isExprRef } from "./paramMediator.js";
 
 // TODO: View classes have too many responsibilities. Come up with a way
 // to separate the concerns. However, most concerns are tightly tied to
@@ -128,6 +128,17 @@ export default class View {
          * @type {Record<import("../spec/channel.js").PrimaryPositionalChannel, boolean>}
          */
         this.needsAxes = { x: false, y: false };
+
+        /** @type {ParamMediator} */
+        this.paramMediator = new ParamMediator(
+            () => this.dataParent?.paramMediator
+        );
+
+        if (spec.params) {
+            for (const param of spec.params) {
+                this.paramMediator.registerParam(param);
+            }
+        }
     }
 
     getPadding() {
@@ -217,7 +228,7 @@ export default class View {
 
             const scale = this.getScaleResolution(
                 dimension == "width" ? "x" : "y"
-            )?.getScale();
+            )?.scale;
 
             if (scale) {
                 // Note: this and all ancestral views need to be refreshed when the domain is changed.
@@ -631,7 +642,11 @@ export default class View {
     getTitleText() {
         const title = this.spec.title;
         if (title) {
-            return isString(title) ? title : title.text;
+            return isString(title)
+                ? title
+                : isExprRef(title.text)
+                ? this.paramMediator.evaluateAndGet(title.text.expr)
+                : title.text;
         }
     }
 
@@ -706,7 +721,7 @@ function createViewOpacityFunction(view) {
         } else if (isDynamicOpacity(opacityDef)) {
             /** @type {(channel: import("../spec/channel.js").ChannelWithScale) => any} */
             const getScale = (channel) => {
-                const scale = view.getScaleResolution(channel)?.getScale();
+                const scale = view.getScaleResolution(channel)?.scale;
                 // Only works on linear scales
                 if (["linear", "index", "locus"].includes(scale?.type)) {
                     return scale;
@@ -736,9 +751,8 @@ function createViewOpacityFunction(view) {
                 return interpolate(unitsPerPixel) * parentOpacity;
             };
         } else if (isExprRef(opacityDef)) {
-            const fn = view.context.paramBroker.createExpression(
-                opacityDef.expr
-            );
+            const fn = view.paramMediator.createExpression(opacityDef.expr);
+            fn.addListener(() => view.context.animator.requestRender());
             return (parentOpacity) => fn(null) * parentOpacity;
         }
     }

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

@@ -1 +1 @@
-{"version":3,"file":"viewFactory.d.ts","sourceRoot":"","sources":["../../../src/view/viewFactory.js"],"names":[],"mappings":"AAuMA;;;;GAIG;AACH,iHAEC;AAED;;;;GAIG;AACH,mHAEC;AAED;;;;GAIG;AACH,mHAOC;AAED;;;;GAIG;AACH,yIAMC;AAED;;;;GAIG;AACH,mCAHW,MAAM,gDAKhB;AAED;;;;GAIG;AACH,uHAEC;AAED;;;;GAIG;AACH,6FAEC;AAED;;;;GAIG;AACH,qHAEC;AAED;;;;GAIG;AACH,2HAOC;AAzRD,wCAAyC;AAEzC;;;;GAIG;AAEH;;GAEG;AACH;IAiBI;;OAEG;IACH,sBAFW,kBAAkB,EAoC5B;IAjCG,2CAA2C;IAC3C,SADW,SAAS,kBAAkB,CAAC,CAKtC;IA8BL;;;OAGG;IACH,qEAlDiC,OAAO,yHAC2B,OAAO,oBAAoB,EAAE,OAAO,eAAe,OAAO,WAAW,EAAE,OAAO,gBAAgB,MAAM,KAAK,IAAI,QAmD/K;IAED;;;;;;OAMG;IACH,wHAJW,OAAO,oBAAoB,EAAE,OAAO,eACpC,OAAO,WAAW,EAAE,OAAO,gBAC3B,MAAM,QAmBhB;IAED;;;;OAIG;IACH,iGAQC;IAED;;;;;;;;;;OAUG;IACH,uKALW,OAAO,oBAAoB,EAAE,OAAO,eACpC,OAAO,WAAW,EAAE,OAAO,gBAC3B,MAAM,4DACc,IAAI,iBA4DlC;;CACJ;;kBAtLa,OAAO;eACP,OAAO;;iBAfJ,WAAW"}
+{"version":3,"file":"viewFactory.d.ts","sourceRoot":"","sources":["../../../src/view/viewFactory.js"],"names":[],"mappings":"AAoPA;;;;GAIG;AACH,iHAEC;AAED;;;;GAIG;AACH,mHAEC;AAED;;;;GAIG;AACH,mHAOC;AAED;;;;GAIG;AACH,yIAMC;AAED;;;;GAIG;AACH,mCAHW,MAAM,gDAKhB;AAED;;;;GAIG;AACH,uHAEC;AAED;;;;GAIG;AACH,6FAEC;AAED;;;;GAIG;AACH,qHAEC;AAED;;;;GAIG;AACH,2HAOC;AAtUD,wCAAyC;AAEzC;;;;GAIG;AAEH;;GAEG;AACH;IAiBI;;OAEG;IACH,sBAFW,kBAAkB,EAoC5B;IAjCG,2CAA2C;IAC3C,SADW,SAAS,kBAAkB,CAAC,CAKtC;IA8BL;;;OAGG;IACH,qEAlDiC,OAAO,yHAC2B,OAAO,oBAAoB,EAAE,OAAO,eAAe,OAAO,WAAW,EAAE,OAAO,gBAAgB,MAAM,KAAK,IAAI,QAmD/K;IAED;;;;;;OAMG;IACH,wHAJW,OAAO,oBAAoB,EAAE,OAAO,eACpC,OAAO,WAAW,EAAE,OAAO,gBAC3B,MAAM,QAmBhB;IAED;;;;OAIG;IACH,iGAQC;IAED;;;;;;;;;;OAUG;IACH,uKALW,OAAO,oBAAoB,EAAE,OAAO,eACpC,OAAO,WAAW,EAAE,OAAO,gBAC3B,MAAM,4DACc,IAAI,iBA8DlC;;CACJ;;kBAxLa,OAAO;eACP,OAAO;;iBAfJ,WAAW"}

package/dist/src/view/viewFactory.js

@@ -158,6 +158,8 @@ export class ViewFactory {
                 if (validator) {
                     validator(viewSpec);
                 }
+
+                applyParamsToImportedSpec(viewSpec, spec.import);
             } else {
                 throw new ViewError(
                     "Importing views is not allowed!",
@@ -197,6 +199,49 @@ export class ViewFactory {
     }
 }
 
+/**
+ *
+ * @param {ViewSpec} importedSpec
+ * @param {import("../spec/view.js").ImportParams} importParams
+ */
+function applyParamsToImportedSpec(importedSpec, importParams) {
+    if (importParams.name != null) {
+        importedSpec.name = importParams.name;
+    }
+
+    const params = isArray(importParams.params)
+        ? importParams.params
+        : isObject(importParams.params)
+        ? Object.entries(importParams.params).map(([name, value]) => ({
+              name,
+              value,
+          }))
+        : [];
+
+    if (!params.length) {
+        return;
+    }
+
+    importedSpec.params ??= [];
+
+    // Replace overridden parameters
+    for (const param of params) {
+        const index = importedSpec.params.findIndex(
+            (p) => p.name == param.name
+        );
+        if (index >= 0) {
+            importedSpec.params[index] = param;
+        }
+    }
+
+    // Add missing parameters
+    for (const param of params) {
+        if (!importedSpec.params.some((p) => p.name == param.name)) {
+            importedSpec.params.push(param);
+        }
+    }
+}
+
 /**
  *
  * @param {ViewSpec} spec

package/dist/src/view/viewUtils.d.ts

@@ -82,7 +82,11 @@ export function findUniqueViewNames(root: View): Set<string>;
 /**
  * @param {View} viewRoot
  */
-export function calculateCanvasSize(viewRoot: View): {
+export function calculateViewRootSize(viewRoot: View): import("./layout/flexLayout.js").FlexDimensions;
+/**
+ * @param {import("./layout/flexLayout.js").FlexDimensions} viewRootSize
+ */
+export function calculateCanvasSize(viewRootSize: import("./layout/flexLayout.js").FlexDimensions): {
     width: number;
     height: number;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"viewUtils.d.ts","sourceRoot":"","sources":["../../../src/view/viewUtils.js"],"names":[],"mappings":"AAWA;;;;GAIG;AACH,qCAHW,OAAO,oBAAoB,EAAE,UAAU,GAAG,OAAO,iBAAiB,EAAE,YAAY,yBAK1F;AAED;;;;GAIG;AACH,oCAHW,OAAO,oBAAoB,EAAE,aAAa,GAAG,OAAO,iBAAiB,EAAE,YAAY,wBAQ7F;AAED;;;;GAIG;AACH,uCAHW,MAAM,0BAKhB;AAED;;;GAGG;AACH,+BAFW,IAAI,wCAMd;AAED;;;;GAIG;AACH,wCAFW,IAAI,UASd;AAED;;GAEG;AACH,kDAFW,IAAI,QAiBd;AAED;;;;;;;GAOG;AACH,4CAFW,IAAI,QAUd;AAED;;;;GAIG;AACH,qCAJW,IAAI,iBACJ,OAAO,qBAAqB,EAAE,OAAO,CAAC,IAAI,CAAC,wDAcrD;AAED;;;GAGG;AACH,wCAFW,IAAI;UAGO,QAAQ;aAAW,OAAO,oBAAoB,EAAE,OAAO;WAAS,OAAO,oBAAoB,EAAE,KAAK;UAAQ,OAAO,oBAAoB,EAAE,IAAI;IAqBhK;AAED;;;;GAIG;AACH,2CAJW,OAAO,iBAAiB,EAAE,UAAU,WACpC,MAAM,eACN,OAAO,yBAAyB,EAAE,OAAO,gBA8BnD;AAED;;GAEG;AACH,gDAFoB,IAAI,QAAE,IAAI,EAAE,KAAE,IAAI,+BAkBrC;AAED;;;;;;GAMG;AACH,4CAJW,IAAI,QACJ,MAAM,GACJ,IAAI,EAAE,CAalB;AAED;;;GAGG;AACH,0CAFW,IAAI,eAqBd;AAOD;;GAEG;AACH,8CAFW,IAAI;;;EAgBd;AAnBM,uCAFI,MAAM,WAE0D;iBAxP9B,WAAW;qBAFnC,eAAe"}
+{"version":3,"file":"viewUtils.d.ts","sourceRoot":"","sources":["../../../src/view/viewUtils.js"],"names":[],"mappings":"AAWA;;;;GAIG;AACH,qCAHW,OAAO,oBAAoB,EAAE,UAAU,GAAG,OAAO,iBAAiB,EAAE,YAAY,yBAK1F;AAED;;;;GAIG;AACH,oCAHW,OAAO,oBAAoB,EAAE,aAAa,GAAG,OAAO,iBAAiB,EAAE,YAAY,wBAQ7F;AAED;;;;GAIG;AACH,uCAHW,MAAM,0BAKhB;AAED;;;GAGG;AACH,+BAFW,IAAI,wCAMd;AAED;;;;GAIG;AACH,wCAFW,IAAI,UASd;AAED;;GAEG;AACH,kDAFW,IAAI,QAiBd;AAED;;;;;;;GAOG;AACH,4CAFW,IAAI,QAUd;AAED;;;;GAIG;AACH,qCAJW,IAAI,iBACJ,OAAO,qBAAqB,EAAE,OAAO,CAAC,IAAI,CAAC,wDAcrD;AAED;;;GAGG;AACH,wCAFW,IAAI;UAGO,QAAQ;aAAW,OAAO,oBAAoB,EAAE,OAAO;WAAS,OAAO,oBAAoB,EAAE,KAAK;UAAQ,OAAO,oBAAoB,EAAE,IAAI;IAqBhK;AAED;;;;GAIG;AACH,2CAJW,OAAO,iBAAiB,EAAE,UAAU,WACpC,MAAM,eACN,OAAO,yBAAyB,EAAE,OAAO,gBA8BnD;AAED;;GAEG;AACH,gDAFoB,IAAI,QAAE,IAAI,EAAE,KAAE,IAAI,+BAkBrC;AAED;;;;;;GAMG;AACH,4CAJW,IAAI,QACJ,MAAM,GACJ,IAAI,EAAE,CAalB;AAED;;;GAGG;AACH,0CAFW,IAAI,eAqBd;AAOD;;GAEG;AACH,gDAFW,IAAI,mDAId;AAED;;GAEG;AACH,kDAFW,OAAO,wBAAwB,EAAE,cAAc;;;EAczD;AAxBM,uCAFI,MAAM,WAE0D;iBAxP9B,WAAW;qBAFnC,eAAe"}

package/dist/src/view/viewUtils.js

@@ -256,9 +256,14 @@ export const isCustomViewName = (name) => !/^(layer|concat)\d+$/.test(name);
 /**
  * @param {View} viewRoot
  */
-export function calculateCanvasSize(viewRoot) {
-    const size = viewRoot.getSize().addPadding(viewRoot.getOverhang());
+export function calculateViewRootSize(viewRoot) {
+    return viewRoot.getSize().addPadding(viewRoot.getOverhang());
+}
 
+/**
+ * @param {import("./layout/flexLayout.js").FlexDimensions} viewRootSize
+ */
+export function calculateCanvasSize(viewRootSize) {
     // If a dimension has an absolutely specified size (in pixels), use it for the canvas size.
     // However, if the dimension has a growing component, the canvas should be fit to the
     // container.
@@ -267,7 +272,7 @@ export function calculateCanvasSize(viewRoot) {
     /** @param {import("./layout/flexLayout.js").SizeDef} dim */
     const f = (dim) => (dim.grow > 0 ? undefined : dim.px);
     return {
-        width: f(size.width),
-        height: f(size.height),
+        width: f(viewRootSize.width),
+        height: f(viewRootSize.height),
     };
 }

package/package.json

@@ -7,7 +7,7 @@
   },
   "contributors": [],
   "license": "MIT",
-  "version": "0.43.3",
+  "version": "0.45.0",
   "jsdelivr": "dist/bundle/index.js",
   "unpkg": "dist/bundle/index.js",
   "browser": "dist/bundle/index.js",
@@ -43,27 +43,26 @@
     "@gmod/gff": "^1.3.0",
     "@gmod/indexedfasta": "^2.0.4",
     "@gmod/tabix": "^1.5.13",
-    "@types/d3-array": "^3.0.2",
-    "@types/d3-dsv": "^3.0.0",
-    "@types/d3-ease": "^3.0.0",
-    "@types/d3-format": "^3.0.1",
-    "@types/d3-interpolate": "^3.0.1",
-    "@types/d3-scale": "^4.0.2",
+    "@types/d3-array": "^3.2.1",
+    "@types/d3-dsv": "^3.0.7",
+    "@types/d3-ease": "^3.0.2",
+    "@types/d3-format": "^3.0.4",
+    "@types/d3-interpolate": "^3.0.4",
+    "@types/d3-scale": "^4.0.8",
     "buffer": "^6.0.3",
-    "d3-array": "^3.1.1",
-    "d3-color": "^3.0.1",
+    "d3-array": "^3.2.4",
+    "d3-color": "^3.1.0",
     "d3-ease": "^3.0.1",
-    "d3-format": "^3.0.1",
+    "d3-format": "^3.1.0",
     "events": "^3.3.0",
     "flatqueue": "^2.0.3",
     "internmap": "^2.0.3",
-    "lit": "^3.1.0",
-    "lit-html": "^3.0.2",
+    "lit": "^3.1.2",
     "twgl.js": "^4.19.1",
-    "vega-expression": "^5.0.0",
-    "vega-loader": "^4.4.0",
-    "vega-scale": "^7.1.1",
-    "vega-util": "^1.16.0"
+    "vega-expression": "^5.1.0",
+    "vega-loader": "^4.5.1",
+    "vega-scale": "^7.3.1",
+    "vega-util": "^1.17.2"
   },
-  "gitHead": "0c6e0418a7461b40da98896bfaf5e05732384e85"
+  "gitHead": "7b6de39e856c85c755b2134bf451780c8b7922bb"
 }

package/dist/src/paramBroker.d.ts

@@ -1,30 +0,0 @@
-/**
- * A class that manages parameters and expressions. Still a work in progress.
- *
- * TODO: Write tests for this class.
- *
- * This should eventually handle the following:
- * - Parameter registration
- * - Dependency tracking
- * - Calling observers when a parameter changes
- * - Somehow saving parameter "state" (in bookmarks)
- * - Maybe something else
- */
-export default class ParamBroker {
-    /**
-     *
-     * @param {string} paramName
-     * @returns {(value: any) => void}
-     */
-    allocateSetter(paramName: string): (value: any) => void;
-    /**
-     * Parse expr and return a function that returns the value of the parameter.
-     *
-     * @param {string} expr
-     */
-    createExpression(expr: string): ((x: object) => any) & import("./utils/expression.js").ExpressionProps & {
-        addListener: (listener: () => void) => void;
-    };
-    #private;
-}
-//# sourceMappingURL=paramBroker.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"paramBroker.d.ts","sourceRoot":"","sources":["../../src/paramBroker.js"],"names":[],"mappings":"AAGA;;;;;;;;;;;GAWG;AACH;IAyBI;;;;OAIG;IACH,0BAHW,MAAM,WACI,GAAG,KAAK,IAAI,CAqBhC;IAID;;;;OAIG;IACH,uBAFW,MAAM;gCAG6E,MAAM,IAAI,KAAK,IAAI;MA0BhH;;CACJ"}

package/dist/src/paramBroker.js

@@ -1,102 +0,0 @@
-import { isString } from "vega-util";
-import createFunction from "./utils/expression.js";
-
-/**
- * A class that manages parameters and expressions. Still a work in progress.
- *
- * TODO: Write tests for this class.
- *
- * This should eventually handle the following:
- * - Parameter registration
- * - Dependency tracking
- * - Calling observers when a parameter changes
- * - Somehow saving parameter "state" (in bookmarks)
- * - Maybe something else
- */
-export default class ParamBroker {
-    /** @type {Map<string, any>} */
-    #params;
-
-    /** @type {Set<string>} */
-    #allocatedSetters;
-
-    /** @type {Record<string, any>} */
-    #proxy;
-
-    /** @type {Map<string, Set<() => void>>} */
-    #paramListeners;
-
-    constructor() {
-        this.#params = new Map();
-        this.#allocatedSetters = new Set();
-        this.#paramListeners = new Map();
-
-        this.#proxy = new Proxy(this.#params, {
-            get(target, prop) {
-                return isString(prop) ? target.get(prop) : undefined;
-            },
-        });
-    }
-
-    /**
-     *
-     * @param {string} paramName
-     * @returns {(value: any) => void}
-     */
-    allocateSetter(paramName) {
-        if (this.#allocatedSetters.has(paramName)) {
-            throw new Error(
-                "Setter already allocated for parameter: " + paramName
-            );
-        }
-
-        this.#allocatedSetters.add(paramName);
-
-        return (value) => {
-            this.#params.set(paramName, value);
-
-            const listeners = this.#paramListeners.get(paramName);
-            if (listeners) {
-                for (const listener of listeners) {
-                    listener();
-                }
-            }
-        };
-    }
-
-    // TODO: deallocateSetter
-
-    /**
-     * Parse expr and return a function that returns the value of the parameter.
-     *
-     * @param {string} expr
-     */
-    createExpression(expr) {
-        /** @type {import("./utils/expression.js").ExpressionFunction & { addListener: (listener: () => void) => void}} */
-        const fn = /** @type {any} */ (createFunction(expr, this.#proxy));
-
-        for (const g of fn.globals) {
-            if (!this.#allocatedSetters.has(g)) {
-                throw new Error(
-                    `Unknown variable "${g}" in expression: ${expr}`
-                );
-            }
-        }
-
-        /**
-         *
-         * @param {() => void} listener
-         */
-        fn.addListener = (listener) => {
-            for (const g of fn.globals) {
-                const listeners = this.#paramListeners.get(g) ?? new Set();
-                this.#paramListeners.set(g, listeners);
-                listeners.add(listener);
-            }
-        };
-
-        // TODO: remove listener
-
-        return fn;
-    }
-}