@genome-spy/core 0.44.0 → 0.45.0

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.44.0",
+  "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": "87fe1d80557bb9f1c721f9ce142b437e956204f9"
+  "gitHead": "7b6de39e856c85c755b2134bf451780c8b7922bb"
 }

package/dist/src/paramBroker.d.ts

@@ -1,46 +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
- *
- * @typedef {import("./utils/expression.js").ExpressionFunction & { addListener: (listener: () => void) => void, invalidate: () => void}} ExprRefFunction
- */
-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): ExprRefFunction;
-    #private;
-}
-/**
- * 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 type ExprRefFunction = ((datum: object) => any) & import("./utils/expression.js").ExpressionProps & {
-    addListener: (listener: () => void) => void;
-    invalidate: () => void;
-};
-//# 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;;;;;;;;;;;;;GAaG;AACH;IAyBI;;;;OAIG;IACH,0BAHW,MAAM,WACI,GAAG,KAAK,IAAI,CAqBhC;IAID;;;;OAIG;IACH,uBAFW,MAAM,mBA2ChB;;CACJ;;;;;;;;;;;;;;4BAtG2F,MAAM,IAAI,KAAK,IAAI;gBAAc,MAAM,IAAI"}

package/dist/src/paramBroker.js

@@ -1,118 +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
- *
- * @typedef {import("./utils/expression.js").ExpressionFunction & { addListener: (listener: () => void) => void, invalidate: () => void}} ExprRefFunction
- */
-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 {ExprRefFunction} */
-        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}`
-                );
-            }
-        }
-
-        // Keep track of them so that they can be detached later
-        const myListeners = new Set();
-
-        /**
-         *
-         * @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);
-                myListeners.add(listener);
-            }
-        };
-
-        /**
-         * Detach listeners. This must be called if the expression is no longer used.
-         */
-        fn.invalidate = () => {
-            for (const g of fn.globals) {
-                const listeners = this.#paramListeners.get(g);
-                for (const listener of myListeners) {
-                    listeners.delete(listener);
-                }
-            }
-        };
-
-        return fn;
-    }
-}