@genome-spy/core 0.50.1 → 0.51.0

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

@@ -1 +1 @@
-{"version":3,"file":"flowOptimizer.d.ts","sourceRoot":"","sources":["../../../src/data/flowOptimizer.js"],"names":[],"mappings":"AAGA;;;GAGG;AACH,oCAHW,OAAO,eAAe,EAAE,OAAO,WAC/B,OAAO,eAAe,EAAE,OAAO,WAczC;AAED;;;;GAIG;AACH,qDAFW,OAAO,eAAe,EAAE,OAAO,iCAgCzC;AAED,kDAEC;AAED,mDAEC;AAmBD;;GAEG;AACH,sDAFW,OAAO,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,QAwB9C;AAED;;;GAGG;AACH,wCAFW,OAAO,eAAe,EAAE,OAAO,QASzC;AAED;;GAEG;AACH,2CAFW,OAAO,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,QAQ9C"}
+{"version":3,"file":"flowOptimizer.d.ts","sourceRoot":"","sources":["../../../src/data/flowOptimizer.js"],"names":[],"mappings":"AAGA;;;GAGG;AACH,oCAHW,OAAO,eAAe,EAAE,OAAO,WAC/B,OAAO,eAAe,EAAE,OAAO,WAczC;AAED;;;;GAIG;AACH,qDAFW,OAAO,eAAe,EAAE,OAAO,iCAgCzC;AAED,kDAEC;AAED,mDAEC;AAmBD;;GAEG;AACH,sDAFW,OAAO,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,QAwB9C;AAED;;;GAGG;AACH,wCAFW,OAAO,eAAe,EAAE,OAAO,QASzC;AAED;;GAEG;AACH,2CAFW,OAAO,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,QAO9C"}

package/dist/src/data/flowOptimizer.js

@@ -125,9 +125,8 @@ export function optimizeFlowGraph(root) {
  * @param {import("./dataFlow.js").default<any>} dataFlow
  */
 export function optimizeDataFlow(dataFlow) {
+    combineIdenticalDataSources(dataFlow);
     for (const dataSource of dataFlow.dataSources) {
         optimizeFlowGraph(dataSource);
     }
-
-    combineIdenticalDataSources(dataFlow);
 }

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,wBAkCC;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;IAUxB,wBAkCC;CACJ;iCArEgC,2BAA2B"}

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

@@ -35,6 +35,13 @@ export default class AxisTickSource extends SingleAxisLazySource {
         this.params = params;
     }
 
+    async load() {
+        // Force the ticks to be recalculated. This is needed because the async
+        // initialization process and non-deterministic order of events.
+        this.ticks = null;
+        this.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.
@@ -61,7 +68,7 @@ export default class AxisTickSource extends SingleAxisLazySource {
             ? validTicks(scale, axisParams.values, count)
             : tickValues(scale, count);
 
-        if (!shallowArrayEquals(ticks, this.ticks)) {
+        if (this.ticks == null || !shallowArrayEquals(ticks, this.ticks)) {
             this.ticks = ticks;
 
             const format = tickFormat(scale, requestedCount, axisParams.format);

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":"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"}
+{"version":3,"file":"urlSource.d.ts","sourceRoot":"","sources":["../../../../src/data/sources/urlSource.js"],"names":[],"mappings":"AASA;;;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;CAiExC;uBA5FsB,iBAAiB"}

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

@@ -1,10 +1,11 @@
-import { loader as vegaLoader, read } from "vega-loader";
+import { read } from "vega-loader";
 import { getFormat } from "./dataUtils.js";
 import DataSource from "./dataSource.js";
 import {
     activateExprRefProps,
     withoutExprRef,
 } from "../../view/paramMediator.js";
+import { concatUrl } from "../../utils/url.js";
 
 /**
  * @param {Partial<import("../../spec/data.js").Data>} data
@@ -46,18 +47,21 @@ export default class UrlSource extends DataSource {
         }
 
         /** @param {string} url */
-        const load = async (url) =>
-            // TODO: Support chunked loading
-            /** @type {string} */ (
-                vegaLoader({
-                    baseURL: this.baseUrl,
-                })
-                    .load(url)
-                    .catch((/** @type {Error} */ e) => {
-                        // TODO: Include baseurl in the error message. Should be normalized, however.
-                        throw new Error(`${url}: ${e.message}`);
-                    })
-            );
+        const load = async (url) => {
+            try {
+                const fullUrl = concatUrl(this.baseUrl, url);
+                const result = await fetch(fullUrl);
+                if (!result.ok) {
+                    throw new Error(`${result.status} ${result.statusText}`);
+                }
+                // TODO: what about binary data (for arrow), etc?
+                return result.text();
+            } catch (e) {
+                throw new Error(
+                    `Could not load data: ${url}. Reason: ${e.message}`
+                );
+            }
+        };
 
         /**
          * @param {string} text

package/dist/src/genomeSpy.js

@@ -366,7 +366,7 @@ export default class GenomeSpy {
             canvasWrapper,
             () =>
                 this.viewRoot
-                    ? calculateCanvasSize(this.viewRoot.getSize())
+                    ? calculateCanvasSize(this.viewRoot)
                     : { width: undefined, height: undefined },
             this.spec.background,
             { powerPreference: this.options.powerPreference ?? "default" }

package/dist/src/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="external-typings/filetypes.js" />
-export function embed(el: string | HTMLElement, spec: string | import("./spec/root.js").RootSpec, options?: import("./types/embedApi.js").EmbedOptions): import("./types/embedApi.js").EmbedResult;
+export function embed(el: string | HTMLElement, spec: string | import("./spec/root.js").RootSpec, options?: import("./types/embedApi.js").EmbedOptions): import("./types/embedApi.js").EmbedResult; /** @type {HTMLElement} */
 /**
  * Loads the spec from the given url and sets the baseUrl if it is not
  * defined in the spec.

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.js"],"names":[],"mappings":";AAawB,mMAGnB;AAyFL;;;;;GAKG;AACH,8BAFW,MAAM,gBAmBhB;sBA5HqB,gBAAgB;qBAFjB,KAAK;iBAGT,kBAAkB;oBACf,6BAA6B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.js"],"names":[],"mappings":";AAaqB,mMAGlB,CAAC,0BAA0B;AAwF9B;;;;;GAKG;AACH,8BAFW,MAAM,gBAuBhB;sBAhIqB,gBAAgB;qBAFjB,KAAK;iBAGT,kBAAkB;oBACf,6BAA6B"}

package/dist/src/index.js

@@ -1,5 +1,4 @@
 import { isObject, isString } from "vega-util";
-import { loader as vegaLoader } from "vega-loader";
 import { html } from "lit";
 
 import GenomeSpy from "./genomeSpy.js";
@@ -113,7 +112,11 @@ export async function loadSpec(url) {
     let spec;
 
     try {
-        spec = JSON.parse(await vegaLoader().load(url));
+        const response = await fetch(url);
+        if (!response.ok) {
+            throw new Error(`${response.status} ${response.statusText}`);
+        }
+        spec = await response.json();
     } catch (e) {
         throw new Error(
             `Could not load or parse configuration: ${url}, reason: ${e.message}`

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

@@ -2,8 +2,15 @@
  * Append a relative or absolute url to a base url.
  * The base part is omitted if the append part is absolute.
  *
- * @param {function():string} baseAccessor
+ * If the base part has no trailing slash, it is assumed to be a file and
+ * only the directory part is used.
+ *
+ * @param {string | (() => string)} base
  * @param {string} append
  */
-export function appendToBaseUrl(baseAccessor: () => string, append: string): string;
+export function concatUrl(base: string | (() => string), append: string): string;
+/**
+ * @param {string} url
+ */
+export function getDirectory(url: string): string;
 //# sourceMappingURL=url.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"url.d.ts","sourceRoot":"","sources":["../../../src/utils/url.js"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,oDAHsB,MAAM,UACjB,MAAM,UAchB"}
+{"version":3,"file":"url.d.ts","sourceRoot":"","sources":["../../../src/utils/url.js"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AACH,gCAHW,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,UACvB,MAAM,UAsBhB;AAED;;GAEG;AACH,kCAFW,MAAM,UAShB"}

package/dist/src/utils/url.js

@@ -4,19 +4,42 @@ const protoRe = /^([A-Za-z]+:)?\/\//;
  * Append a relative or absolute url to a base url.
  * The base part is omitted if the append part is absolute.
  *
- * @param {function():string} baseAccessor
+ * If the base part has no trailing slash, it is assumed to be a file and
+ * only the directory part is used.
+ *
+ * @param {string | (() => string)} base
  * @param {string} append
  */
-export function appendToBaseUrl(baseAccessor, append) {
+export function concatUrl(base, append) {
     if (append && protoRe.test(append)) {
         return append;
     }
 
-    const base = baseAccessor();
+    const baseString = typeof base == "function" ? base() : base;
+    if (!baseString) {
+        return append;
+    }
+    if (!append) {
+        return baseString;
+    }
 
-    if (base && append) {
-        return base.endsWith("/") ? base + append : base + "/" + append;
+    if (/[#?]/.test(baseString)) {
+        throw new Error(
+            `Cannot append to a url with query or hash. Append: ${append}, base: ${baseString}`
+        );
     }
 
-    return base ?? append;
+    return getDirectory(baseString) + append;
+}
+
+/**
+ * @param {string} url
+ */
+export function getDirectory(url) {
+    const directory = url.replace(/[^/]*$/, "");
+    return directory === ""
+        ? undefined
+        : directory.endsWith("://")
+        ? url + "/"
+        : directory;
 }

package/dist/src/utils/url.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=url.test.d.ts.map

package/dist/src/utils/url.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"url.test.d.ts","sourceRoot":"","sources":["../../../src/utils/url.test.js"],"names":[],"mappings":""}

package/dist/src/utils/url.test.js

@@ -0,0 +1,28 @@
+import { expect, test } from "vitest";
+import { concatUrl, getDirectory } from "./url.js";
+
+test("getDirectory", () => {
+    expect(getDirectory("foo")).toBeUndefined();
+    expect(getDirectory("foo/")).toBe("foo/");
+    expect(getDirectory("foo/index")).toBe("foo/");
+    expect(getDirectory("http://example.com")).toBe("http://example.com/");
+    expect(getDirectory("http://example.com/")).toBe("http://example.com/");
+    expect(getDirectory("http://example.com/a")).toBe("http://example.com/");
+    expect(getDirectory("http://example.com/a/")).toBe("http://example.com/a/");
+});
+
+test("concatUrl", () => {
+    expect(concatUrl("http://example.com", "foo")).toEqual(
+        "http://example.com/foo"
+    );
+    expect(concatUrl(() => "http://example.com", "foo")).toEqual(
+        "http://example.com/foo"
+    );
+    expect(concatUrl("http://example.com/", "http://genomespy.app/")).toEqual(
+        "http://genomespy.app/"
+    );
+    expect(concatUrl("foo/", "bar")).toEqual("foo/bar");
+    expect(concatUrl("foo/baz", "bar")).toEqual("foo/bar");
+    expect(concatUrl(undefined, "bar")).toEqual("bar");
+    expect(concatUrl("bar", undefined)).toEqual("bar");
+});

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

@@ -1 +1 @@
-{"version":3,"file":"axisResolution.d.ts","sourceRoot":"","sources":["../../../src/view/axisResolution.js"],"names":[],"mappings":"AAeA;;;;;;;GAOG;AACH;IACI;;;OAGG;IAEH;;OAEG;IACH,qBAFW,OAAO,oBAAoB,EAAE,wBAAwB,EAM/D;IAHG,+DAAsB;IACtB,wDAAwD;IACxD,SADW,oBAAoB,EAAE,CAChB;IAGrB,8DAEC;IAED;;;;;OAKG;IACH,qBAFW,oBAAoB,QAkB9B;IAED,qDAuBC;IAED,mBAyDC;CACJ;;UAlIS,OAAO,eAAe,EAAE,OAAO;aAC/B,CAAC;gBACD,OAAO,oBAAoB,EAAE,mBAAmB"}
+{"version":3,"file":"axisResolution.d.ts","sourceRoot":"","sources":["../../../src/view/axisResolution.js"],"names":[],"mappings":"AAeA;;;;;;;GAOG;AACH;IACI;;;OAGG;IAEH;;OAEG;IACH,qBAFW,OAAO,oBAAoB,EAAE,wBAAwB,EAM/D;IAHG,+DAAsB;IACtB,wDAAwD;IACxD,SADW,oBAAoB,EAAE,CAChB;IAGrB,8DAEC;IAED;;;;;OAKG;IACH,qBAFW,oBAAoB,QAwB9B;IAED,qDAuBC;IAED,mBAyDC;CACJ;;UAxIS,OAAO,eAAe,EAAE,OAAO;aAC/B,CAAC;gBACD,OAAO,oBAAoB,EAAE,mBAAmB"}

package/dist/src/view/axisResolution.js

@@ -58,7 +58,13 @@ export default class AxisResolution {
             this.scaleResolution &&
             newScaleResolution !== this.scaleResolution
         ) {
-            throw new Error("Shared axes must have a shared scale!");
+            throw new Error(
+                `Shared axes must have a shared scale! Channel: ${
+                    this.channel
+                }, existing views: [${this.members
+                    .map((m) => m.view.getPathString())
+                    .join(", ")}], new view: ${view.getPathString()}.`
+            );
         }
 
         this.members.push(newMember);

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

@@ -12,7 +12,7 @@ import {
 import { isNumber, isString, span } from "vega-util";
 import { scaleLog } from "d3-scale";
 import { isFieldDef, getPrimaryChannel } from "../encoder/encoder.js";
-import { appendToBaseUrl } from "../utils/url.js";
+import { concatUrl } from "../utils/url.js";
 import { isDiscrete, bandSpace } from "vega-scale";
 import { peek } from "../utils/arrayUtils.js";
 import ViewError from "./viewError.js";
@@ -645,7 +645,7 @@ export default class View {
      * @returns {string}
      */
     getBaseUrl() {
-        return appendToBaseUrl(
+        return concatUrl(
             () => this.dataParent?.getBaseUrl(),
             this.spec.baseUrl
         );

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

@@ -75,13 +75,12 @@ export function findDescendantsByPath(root: View, name: string): View[];
  */
 export function findUniqueViewNames(root: View): Set<string>;
 /**
- * @param {import("./layout/flexLayout.js").FlexDimensions} viewRootSize
+ * @param {import("./view.js").default} viewRoot
  */
-export function calculateCanvasSize(viewRootSize: import("./layout/flexLayout.js").FlexDimensions): {
+export function calculateCanvasSize(viewRoot: import("./view.js").default): {
     width: number;
     height: number;
 };
-export function isCustomViewName(name: string): boolean;
 import View from "./view.js";
 import UnitView from "./unitView.js";
 //# sourceMappingURL=viewUtils.d.ts.map

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;;;GAGG;AACH,+BAFW,IAAI,6EAMd;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;;;;;GAKG;AACH,2CALW,OAAO,iBAAiB,EAAE,UAAU,WACpC,MAAM,eACN,OAAO,yBAAyB,EAAE,OAAO,GACvC,QAAQ,OAAO,iBAAiB,EAAE,QAAQ,CAAC,CA6BvD;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,kDAFW,OAAO,wBAAwB,EAAE,cAAc;;;EAczD;AAjBM,uCAFI,MAAM,WAE0D;iBA/O9B,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;;;GAGG;AACH,+BAFW,IAAI,6EAMd;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;;;;;GAKG;AACH,2CALW,OAAO,iBAAiB,EAAE,UAAU,WACpC,MAAM,eACN,OAAO,yBAAyB,EAAE,OAAO,GACvC,QAAQ,OAAO,iBAAiB,EAAE,QAAQ,CAAC,CAsCvD;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;AAED;;GAEG;AACH,8CAFW,OAAO,WAAW,EAAE,OAAO;;;EAoBrC;iBA3Q4C,WAAW;qBAFnC,eAAe"}

package/dist/src/view/viewUtils.js

@@ -1,5 +1,4 @@
 import { isObject, isString } from "vega-util";
-import { loader as vegaLoader } from "vega-loader";
 
 import UnitView from "./unitView.js";
 // eslint-disable-next-line no-unused-vars
@@ -8,6 +7,7 @@ import { buildDataFlow } from "./flowBuilder.js";
 import { optimizeDataFlow } from "../data/flowOptimizer.js";
 import { isFieldDef, primaryPositionalChannels } from "../encoder/encoder.js";
 import { rollup } from "d3-array";
+import { concatUrl, getDirectory } from "../utils/url.js";
 
 /**
  *
@@ -146,30 +146,39 @@ export function findEncodedFields(view) {
  */
 export async function loadExternalViewSpec(spec, baseUrl, viewContext) {
     const importParam = spec.import;
-    if ("url" in importParam) {
-        const loader = vegaLoader({ baseURL: baseUrl });
-        const url = importParam.url;
+    if (!("url" in importParam)) {
+        throw new Error("Not an url import: " + JSON.stringify(importParam));
+    }
 
-        const importedSpec = JSON.parse(
-            await loader.load(url).catch((/** @type {Error} */ e) => {
-                throw new Error(
-                    `Could not load imported view spec: ${url} \nReason: ${e.message}`
-                );
-            })
-        );
+    const url = concatUrl(baseUrl, importParam.url);
+
+    /** @type {import("../spec/view.js").ViewSpec} */
+    let importedSpec;
 
-        if (viewContext.isViewSpec(importedSpec)) {
-            importedSpec.baseUrl = url.match(/^[^?#]*\//)?.[0];
-            return importedSpec;
-        } else {
-            throw new Error(
-                `The imported spec "${url}" is not a view spec: ${JSON.stringify(
-                    spec
-                )}`
-            );
+    try {
+        const result = await fetch(url);
+        if (!result.ok) {
+            throw new Error(`${result.status} ${result.statusText}`);
         }
+        importedSpec = await result.json();
+    } catch (e) {
+        throw new Error(
+            `Could not load imported view spec: ${url}. Reason: ${e.message}`
+        );
+    }
+
+    if (viewContext.isViewSpec(importedSpec)) {
+        importedSpec.baseUrl = concatUrl(
+            getDirectory(importParam.url),
+            importedSpec.baseUrl
+        );
+        return importedSpec;
     } else {
-        throw new Error("Not an url import: " + JSON.stringify(importParam));
+        throw new Error(
+            `The imported spec "${url}" is not a view spec: ${JSON.stringify(
+                spec
+            )}`
+        );
     }
 }
 
@@ -240,23 +249,24 @@ export function findUniqueViewNames(root) {
 }
 
 /**
- * @param {string} name
+ * @param {import("./view.js").default} viewRoot
  */
-export const isCustomViewName = (name) => !/^(layer|concat)\d+$/.test(name);
+export function calculateCanvasSize(viewRoot) {
+    const size = viewRoot.getSize();
+    const padding = viewRoot.getPadding();
 
-/**
- * @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.
     // TODO: Enforce the minimum size (in case of both absolute and growing components).
 
-    /** @param {import("./layout/flexLayout.js").SizeDef} dim */
-    const f = (dim) => (dim.grow > 0 ? undefined : dim.px);
+    /**
+     * @param {import("./layout/flexLayout.js").SizeDef} dim
+     * @param {number} totalPad
+     */
+    const f = (dim, totalPad) => (dim.grow > 0 ? undefined : dim.px + totalPad);
     return {
-        width: f(viewRootSize.width),
-        height: f(viewRootSize.height),
+        width: f(size.width, padding.horizontalTotal),
+        height: f(size.height, padding.verticalTotal),
     };
 }

package/package.json

@@ -7,7 +7,7 @@
   },
   "contributors": [],
   "license": "MIT",
-  "version": "0.50.1",
+  "version": "0.51.0",
   "jsdelivr": "dist/bundle/index.js",
   "unpkg": "dist/bundle/index.js",
   "browser": "dist/bundle/index.js",
@@ -67,5 +67,5 @@
   "devDependencies": {
     "@types/long": "^4.0.1"
   },
-  "gitHead": "f21b0f12e961366c12c1d514017c6270246801cc"
+  "gitHead": "c2522b73298c0cc4cf38cca795b35e97c5c292d4"
 }