@genome-spy/core 0.48.1 → 0.49.0

package/dist/src/utils/radixSort.js

@@ -0,0 +1,130 @@
+const MAX_INTEGER = 2147483647;
+const MAX_INTEGER_DIGIT = getDigits([MAX_INTEGER]);
+
+// TODO: Optimize more! Some ideas: https://travisdowns.github.io/blog/2019/05/22/sorting.html
+
+/**
+ * @param {number[]} arr An array of unsigned integers
+ */
+export default function radixSort(arr) {
+    const maxDigits = getDigits(arr);
+
+    let buffer = new Array(arr.length);
+    let bufferPtr = buffer;
+    const counts = new Array(16);
+
+    for (let digitIndex = 0; digitIndex < maxDigits; digitIndex++) {
+        counts.fill(0);
+
+        const shift = digitIndex * 4;
+        const pow = Math.pow(16, digitIndex);
+
+        /**
+         * @param {*} i number
+         */
+        // eslint-disable-next-line no-loop-func
+        const getDigit = (/** @type {number} */ i) => {
+            const value = arr[i];
+
+            // Need hacks for large numbers because JS bitwise operators only work
+            // with 32-bit integers.
+            // TODO: This could be implemented in WASM for better performance as
+            // it would be able to use 64-bit integers.
+            if (digitIndex >= MAX_INTEGER_DIGIT) {
+                if (value > MAX_INTEGER) {
+                    return Math.floor(value / pow) % 16;
+                } else {
+                    return 0;
+                }
+            } else {
+                return (value >> shift) & 0xf;
+            }
+        };
+
+        // Count occurrences of each digit
+        for (let i = 0, n = arr.length; i < n; i++) {
+            counts[getDigit(i)]++;
+        }
+
+        // Prefix sum to get starting indexes
+        for (let i = 1; i < 16; i++) {
+            counts[i] += counts[i - 1];
+        }
+
+        // Sort based on current digit
+        for (let i = arr.length - 1; i >= 0; i--) {
+            bufferPtr[--counts[getDigit(i)]] = arr[i];
+        }
+
+        // Swap buffer and arr for next iteration
+        [arr, bufferPtr] = [bufferPtr, arr];
+    }
+
+    return arr;
+}
+
+/**
+ * @param {number[]} arr An array of unsigned integers
+ */
+function getDigits(arr) {
+    let max = 0;
+    for (let i = 0, n = arr.length; i < n; i++) {
+        max = Math.max(max, arr[i]);
+    }
+    return Math.floor(Math.log2(max) / 4) + 1;
+}
+
+/**
+ * @param {number[]} arr An array of unsigned integers
+ */
+export function radixSortIntoLookupArray(arr) {
+    const maxDigits = getDigits(arr);
+    let indexes = Array.from({ length: arr.length }, (_, i) => i);
+    let buffer = new Array(arr.length);
+    const counts = new Array(16);
+
+    for (let digitIndex = 0; digitIndex < maxDigits; digitIndex++) {
+        counts.fill(0);
+
+        const shift = digitIndex * 4;
+        const pow = Math.pow(16, digitIndex);
+
+        /**
+         * @param {*} i number
+         */
+        // eslint-disable-next-line no-loop-func
+        const getDigit = (i) => {
+            const value = arr[indexes[i]]; // Use index to access array value
+
+            if (digitIndex >= MAX_INTEGER_DIGIT) {
+                if (value > MAX_INTEGER) {
+                    return Math.floor(value / pow) % 16;
+                } else {
+                    return 0;
+                }
+            } else {
+                return (value >> shift) & 0xf;
+            }
+        };
+
+        // Count occurrences of each digit
+        for (let i = 0; i < arr.length; i++) {
+            counts[getDigit(i)]++;
+        }
+
+        // Prefix sum to get starting indexes
+        for (let i = 1; i < 16; i++) {
+            counts[i] += counts[i - 1];
+        }
+
+        // Sort indexes based on current digit
+        for (let i = arr.length - 1; i >= 0; i--) {
+            buffer[--counts[getDigit(i)]] = indexes[i];
+        }
+
+        // Swap buffer and indexes for next iteration
+        [indexes, buffer] = [buffer, indexes];
+    }
+
+    return indexes; // Return the sorted index array
+}

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

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

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

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

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

@@ -0,0 +1,51 @@
+import { expect, test } from "vitest";
+import radixSort, { radixSortIntoLookupArray } from "./radixSort.js";
+
+/**
+ * Checks that numbers in an array are in ascending order.
+
+ * @param {number[]} arr An array of unsigned integers
+ */
+function isSorted(arr) {
+    for (let i = 1; i < arr.length; i++) {
+        if (arr[i - 1] > arr[i]) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+/**
+ * Generates a random array of unsigned integers.
+ *
+ * @param {number} length
+ */
+function generateArray(length) {
+    const arr = new Array(length);
+
+    for (let i = 0; i < length; i++) {
+        arr[i] = Math.floor(Math.random() * 10_000_000_000);
+    }
+
+    return arr;
+}
+
+test("Radix Sort correctly sorts numbers", () => {
+    expect(isSorted(radixSort([1, 2, 3]))).toBeTruthy();
+    expect(isSorted(radixSort([3, 2, 1]))).toBeTruthy();
+    expect(isSorted(radixSort([123, 1234567, 12, 1, 1234]))).toBeTruthy();
+    expect(isSorted(radixSort(generateArray(1_000_000)))).toBeTruthy();
+});
+
+test("Lookup", () => {
+    expect(radixSortIntoLookupArray([1, 2, 3])).toEqual([0, 1, 2]);
+    expect(radixSortIntoLookupArray([3, 2, 1])).toEqual([2, 1, 0]);
+    expect(radixSortIntoLookupArray([10000, 100, 1000, 10, 1])).toEqual([
+        4, 3, 1, 2, 0,
+    ]);
+
+    const arr = generateArray(1_000_000);
+    const lookup = radixSortIntoLookupArray(arr);
+    expect(isSorted(arr.map((_, i) => arr[lookup[i]]))).toBeTruthy();
+});

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -3,8 +3,10 @@ import { nodesToTrees, visitTree } from "./trees.js";
 import { describe } from "vitest";
 
 describe("NodesToTrees", () => {
+    const NULL = /** @type {any} */ (null);
+
     test("NodesToTrees converts an array of nodes to a tree", () => {
-        const a = { parent: null };
+        const a = { parent: NULL };
         const b = { parent: a };
         const c = { parent: a };
         const d = { parent: b };
@@ -41,10 +43,10 @@ describe("NodesToTrees", () => {
     });
 
     test("NodesToTrees converts two disjoint node arrays to two trees", () => {
-        const a = { parent: null };
+        const a = { parent: NULL };
         const b = { parent: a };
 
-        const c = { parent: null };
+        const c = { parent: NULL };
         const d = { parent: c };
 
         const nodes = [a, b, c, d];
@@ -84,6 +86,7 @@ describe("VisitTree", () => {
                     children: [
                         {
                             id: "d",
+                            /** @type {any[]} */
                             children: [],
                         },
                         {
@@ -99,7 +102,9 @@ describe("VisitTree", () => {
             ],
         };
 
+        /** @type {any[]} */
         const visitedPre = [];
+        /** @type {any[]} */
         const visitedPost = [];
 
         visitTree(tree, {

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

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

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

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

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

@@ -1,24 +1,37 @@
+/**
+ * @template {import("../spec/channel.js").PositionalChannel}[T=PositionalChannel]
+ *
+ * @typedef {object} AxisResolutionMember
+ * @prop {import("./unitView.js").default} view
+ * @prop {T} channel
+ * @prop {import("../spec/channel.js").ChannelDefWithScale} channelDef
+ */
 export default class AxisResolution {
     /**
-     * @typedef { import("./unitView.js").default} UnitView
+     * @typedef {import("./unitView.js").default} UnitView
+     * @typedef {import("../spec/channel.js").PositionalChannel} PositionalChannel
      */
     /**
      * @param {import("../spec/channel.js").PrimaryPositionalChannel} channel
      */
     constructor(channel: import("../spec/channel.js").PrimaryPositionalChannel);
     channel: import("../spec/channel.js").PrimaryPositionalChannel;
-    /** @type {import("./scaleResolution.js").ResolutionMember<import("../spec/channel.js").PositionalChannel>[]} The involved views */
-    members: import("./scaleResolution.js").ResolutionMember<import("../spec/channel.js").PositionalChannel>[];
+    /** @type {AxisResolutionMember[]} The involved views */
+    members: AxisResolutionMember[];
     get scaleResolution(): import("./scaleResolution.js").default;
     /**
      * N.B. This is expected to be called in depth-first order, AFTER the
      * scales have been resolved.
      *
-     * @param {UnitView} view
-     * @param {import("../spec/channel.js").PositionalChannel} channel TODO: Do something for this
+     * @param {AxisResolutionMember} newMember
      */
-    pushUnitView(view: import("./unitView.js").default, channel: import("../spec/channel.js").PositionalChannel): void;
+    pushUnitView(newMember: AxisResolutionMember): void;
     getAxisProps(): import("../spec/axis.js").GenomeAxis;
     getTitle(): string;
 }
+export type AxisResolutionMember<T extends import("../spec/channel.js").PositionalChannel = import("../spec/channel.js").PositionalChannel> = {
+    view: import("./unitView.js").default;
+    channel: T;
+    channelDef: import("../spec/channel.js").ChannelDefWithScale;
+};
 //# sourceMappingURL=axisResolution.d.ts.map

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;IACI;;OAEG;IAEH;;OAEG;IACH,qBAFW,OAAO,oBAAoB,EAAE,wBAAwB,EAM/D;IAHG,+DAAsB;IACtB,mIAAmI;IACnI,SADW,OAAO,sBAAsB,EAAE,gBAAgB,CAAC,OAAO,oBAAoB,EAAE,iBAAiB,CAAC,EAAE,CAC3F;IAGrB,8DAEC;IAED;;;;;;OAMG;IACH,6DAFW,OAAO,oBAAoB,EAAE,iBAAiB,QAiBxD;IAED,qDAuBC;IAED,mBAyDC;CACJ"}
+{"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,wBAFW,oBAAoB,QAkB9B;IAED,qDAuBC;IAED,mBAyDC;CACJ;;UAlIS,OAAO,eAAe,EAAE,OAAO;aAC/B,CAAC;gBACD,OAAO,oBAAoB,EAAE,mBAAmB"}

package/dist/src/view/axisResolution.js

@@ -13,9 +13,18 @@ import coalesce from "../utils/coalesce.js";
 import mergeObjects from "../utils/mergeObjects.js";
 import { getCachedOrCall } from "../utils/propertyCacher.js";
 
+/**
+ * @template {import("../spec/channel.js").PositionalChannel}[T=PositionalChannel]
+ *
+ * @typedef {object} AxisResolutionMember
+ * @prop {import("./unitView.js").default} view
+ * @prop {T} channel
+ * @prop {import("../spec/channel.js").ChannelDefWithScale} channelDef
+ */
 export default class AxisResolution {
     /**
-     * @typedef { import("./unitView.js").default} UnitView
+     * @typedef {import("./unitView.js").default} UnitView
+     * @typedef {import("../spec/channel.js").PositionalChannel} PositionalChannel
      */
 
     /**
@@ -23,7 +32,7 @@ export default class AxisResolution {
      */
     constructor(channel) {
         this.channel = channel;
-        /** @type {import("./scaleResolution.js").ResolutionMember<import("../spec/channel.js").PositionalChannel>[]} The involved views */
+        /** @type {AxisResolutionMember[]} The involved views */
         this.members = [];
     }
 
@@ -35,10 +44,10 @@ export default class AxisResolution {
      * N.B. This is expected to be called in depth-first order, AFTER the
      * scales have been resolved.
      *
-     * @param {UnitView} view
-     * @param {import("../spec/channel.js").PositionalChannel} channel TODO: Do something for this
+     * @param {AxisResolutionMember} newMember
      */
-    pushUnitView(view, channel) {
+    pushUnitView(newMember) {
+        const { view } = newMember;
         const newScaleResolution = view.getScaleResolution(this.channel);
 
         if (!newScaleResolution) {
@@ -52,7 +61,7 @@ export default class AxisResolution {
             throw new Error("Shared axes must have a shared scale!");
         }
 
-        this.members.push({ view, channel });
+        this.members.push(newMember);
     }
 
     getAxisProps() {
@@ -81,7 +90,7 @@ export default class AxisResolution {
     }
 
     getTitle() {
-        /** @param {import("./scaleResolution.js").ResolutionMember} member} */
+        /** @param {AxisResolutionMember} member} */
         const computeTitle = (member) => {
             const channelDef = getChannelDefWithScale(
                 member.view,

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

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

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

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

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

@@ -35,19 +35,17 @@ const spec = {
 };
 
 describe("Axes resolve properly", () => {
-    const sharedSpec = {
-        ...spec,
-        resolve: { scale: { y: "shared" }, axis: { y: "shared" } },
-    };
-
     test("Independent axes are independent", async () => {
-        const independentSpec = {
-            ...spec,
-            resolve: { scale: { y: "shared" }, axis: { y: "independent" } },
-        };
+        const view = await createAndInitialize(
+            {
+                ...spec,
+                resolve: { scale: { y: "shared" }, axis: { y: "independent" } },
+            },
+            View
+        );
 
-        const view = await createAndInitialize(independentSpec, View);
         const [r0, r1] = [0, 1].map((i) =>
+            // @ts-ignore
             view.children[i].getAxisResolution("y")
         );
 
@@ -57,7 +55,14 @@ describe("Axes resolve properly", () => {
     });
 
     test("Shared axes have joined titles", async () => {
-        const view = await createAndInitialize(sharedSpec, View);
+        const view = await createAndInitialize(
+            {
+                ...spec,
+                resolve: { scale: { y: "shared" }, axis: { y: "shared" } },
+            },
+            View
+        );
+        // @ts-ignore
         expect(view.children[0].getAxisResolution("y").getTitle()).toEqual(
             "a, b"
         );

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

@@ -45,7 +45,7 @@ export default class FacetView extends ContainerView {
      *
      * @param {"row" | "column"} channel
      */
-    getAccessor(channel: "row" | "column"): import("../types/encoder.js").Accessor;
+    getAccessor(channel: "row" | "column"): any;
     updateFacets(): void;
     updateLabels(): void;
     getFacetGroups(): any[];

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

@@ -1 +1 @@
-{"version":3,"file":"facetView.d.ts","sourceRoot":"","sources":["../../../src/view/facetView.js"],"names":[],"mappings":"AAmDA;;;;;;;;;;;;;;GAcG;AACH;IACI;;;;;;;OAOG;IACH;;;;;;OAMG;IACH,6CAHW,aAAa,QACb,MAAM,EA8BhB;IAzBG,UAAgB;IAEhB,WAEC;IAED;;;;OAIG;IACH,aAFU,OAAO,YAAY,EAAE,QAAQ,CAAC,CAYvC;IAED,oDAAoD;IACpD,kBADY,OAAO,YAAY,EAAE,cAAc,CAAC,CACa;IA2BjE,sBAIC;IAED;;;OAGG;IACH,qBAFW,KAAK,GAAG,QAAQ,0CAwB1B;IAED,qBAyCC;IAED,qBASC;IA6BD,wBAgBC;IAOD;;;;OAIG;IACH,gBAJW,OAAO,4CAA4C,EAAE,OAAO,UAC5D,OAAO,uBAAuB,EAAE,OAAO,uBA4LjD;IA3KO,wBAA0B;CA4KrC;2BA/bY,QAAQ,GAAG,KAAK;;;;;;aA4CnB,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE;;;0BA1Df,oBAAoB;qBACzB,eAAe"}
+{"version":3,"file":"facetView.d.ts","sourceRoot":"","sources":["../../../src/view/facetView.js"],"names":[],"mappings":"AAmDA;;;;;;;;;;;;;;GAcG;AACH;IACI;;;;;;;OAOG;IACH;;;;;;OAMG;IACH,6CAHW,aAAa,QACb,MAAM,EA8BhB;IAzBG,UAAgB;IAEhB,WAEC;IAED;;;;OAIG;IACH,aAFU,OAAO,YAAY,EAAE,QAAQ,CAAC,CAYvC;IAED,oDAAoD;IACpD,kBADY,OAAO,YAAY,EAAE,cAAc,CAAC,CACa;IA2BjE,sBAIC;IAED;;;OAGG;IACH,qBAFW,KAAK,GAAG,QAAQ,OAwB1B;IAED,qBAyCC;IAED,qBASC;IA6BD,wBAgBC;IAOD;;;;OAIG;IACH,gBAJW,OAAO,4CAA4C,EAAE,OAAO,UAC5D,OAAO,uBAAuB,EAAE,OAAO,uBA4LjD;IA3KO,wBAA0B;CA4KrC;2BA/bY,QAAQ,GAAG,KAAK;;;;;;aA4CnB,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE;;;0BA1Df,oBAAoB;qBACzB,eAAe"}

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

@@ -13,7 +13,7 @@ export function buildDataFlow(root: import("./view.js").default, existingFlow?:
  */
 export function linearizeLocusAccess(view: import("./view.js").default): {
     transforms: import("../data/flowNode.js").default[];
-    rewrittenEncoding: import("../spec/channel.js").Encoding<string>;
+    rewrittenEncoding: import("../spec/channel.js").Encoding;
     /**
      * Should be called after the whole flow has been created in order to
      * not disrupt inheritance of encodings

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

@@ -1 +1 @@
-{"version":3,"file":"flowBuilder.d.ts","sourceRoot":"","sources":["../../../src/view/flowBuilder.js"],"names":[],"mappings":"AAwBA;;;;GAIG;AACH,8JAkKC;AAED;;;;;;GAMG;AACH;;;IAgGc;;;OAGG;;EAYhB;AAgCD;;;;;;GAMG;AACH;;;0BAqB0B,QAAQ,SAAS,OAAO,qBAAqB,EAAE,KAAK,CAAC,CAAC;EAkB/E;qBA/XoB,qBAAqB;sBANpB,sBAAsB"}
+{"version":3,"file":"flowBuilder.d.ts","sourceRoot":"","sources":["../../../src/view/flowBuilder.js"],"names":[],"mappings":"AAwBA;;;;GAIG;AACH,8JA+LC;AAED;;;;;;GAMG;AACH;;;IAgGc;;;OAGG;;EAYhB;AAgCD;;;;;;GAMG;AACH;;;0BAqB0B,QAAQ,SAAS,OAAO,qBAAqB,EAAE,KAAK,CAAC,CAAC;EAkB/E;qBA5ZoB,qBAAqB;sBANpB,sBAAsB"}

package/dist/src/view/flowBuilder.js

@@ -35,6 +35,8 @@ export function buildDataFlow(root, existingFlow) {
 
     /** @type {FlowNode[]} "Current nodes" on the path from view root to the current view */
     const nodeStack = [];
+    /** @type {{view: View, nodeStackDepth: number}[]} */
+    const viewStack = [];
 
     /** @type {FlowNode} */
     let currentNode;
@@ -59,6 +61,7 @@ export function buildDataFlow(root, existingFlow) {
         }
         currentNode.addChild(node);
         currentNode = node;
+        nodeStack.push(node);
         return node;
     }
 
@@ -108,10 +111,16 @@ export function buildDataFlow(root, existingFlow) {
         }
     }
 
+    function isInBranchWithIdentifier() {
+        return (
+            nodeStack.findLastIndex(
+                (node) => node instanceof IdentifierTransform
+            ) > nodeStack.findLastIndex((node) => node instanceof DataSource)
+        );
+    }
+
     /** @param {View} view */
     const processView = (view) => {
-        nodeStack.push(currentNode);
-
         if (view.spec.data) {
             const dataSource = isNamedData(view.spec.data)
                 ? new NamedSource(
@@ -122,6 +131,7 @@ export function buildDataFlow(root, existingFlow) {
                 : createDataSource(view.spec.data, view);
 
             currentNode = dataSource;
+            nodeStack.push(dataSource);
             dataFlow.addDataSource(dataSource, view);
         }
 
@@ -148,13 +158,24 @@ export function buildDataFlow(root, existingFlow) {
                 }
             }
 
-            if (view.mark.isPickingParticipant()) {
+            if (
+                view.mark.isPickingParticipant() &&
+                !isInBranchWithIdentifier()
+            ) {
+                // TODO: If two branches receive the same data, they should have
+                // a shared identifier transform. However, unique ids cannot be
+                // assigned right after the data source, because some transforms,
+                // (e.g, RegexFold) may generate new tuples.
+                //
                 appendTransform(new CloneTransform());
                 appendTransform(
                     new IdentifierTransform({ type: "identifier" })
                 );
             }
 
+            // TODO: Handle cases where the spec contains terminal collector nodes
+            // (with custom sort configuration, for example). Now a new collector
+            // is always appended to the end of the current branch.
             const collector = new Collector({
                 type: "collect",
                 groupby: view.getFacetFields(),
@@ -178,10 +199,18 @@ export function buildDataFlow(root, existingFlow) {
 
     for (const dataTree of dataTrees) {
         visitTree(dataTree, {
-            preOrder: (node) => processView(node.ref),
+            preOrder: (node) => {
+                viewStack.push({
+                    view: node.ref,
+                    nodeStackDepth: nodeStack.length,
+                });
+                processView(node.ref);
+            },
             // eslint-disable-next-line no-loop-func
             postOrder: () => {
-                currentNode = nodeStack.pop();
+                const { nodeStackDepth } = viewStack.pop();
+                nodeStack.length = nodeStackDepth;
+                currentNode = nodeStack.at(-1);
             },
         });
     }

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

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

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

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

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

@@ -66,12 +66,6 @@ export default class GridView extends ContainerView {
      * @protected
      */
     protected createAxes(): Promise<void[]>;
-    /**
-     * @param {import("./renderingContext/viewRenderingContext.js").default} context
-     * @param {import("./layout/rectangle.js").default} coords
-     * @param {import("../types/rendering.js").RenderingOptions} [options]
-     */
-    render(context: import("./renderingContext/viewRenderingContext.js").default, coords: import("./layout/rectangle.js").default, options?: import("../types/rendering.js").RenderingOptions): void;
     #private;
 }
 export class GridChild {

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

@@ -1 +1 @@
-{"version":3,"file":"gridView.d.ts","sourceRoot":"","sources":["../../../src/view/gridView.js"],"names":[],"mappings":"AAswBA;;;GAGG;AACH,iDAHW,OAAO,iBAAiB,EAAE,cAAc,GACtC,OAAO,iBAAiB,EAAE,QAAQ,CAwB9C;AAED;;;GAGG;AACH,uDAHW,OAAO,iBAAiB,EAAE,cAAc,GACtC,OAAO,iBAAiB,EAAE,QAAQ,CA6C9C;AA2BD;;GAEG;AACH,8EAUC;AAED;;;;;GAKG;AACH,4CAJW,OAAO,uBAAuB,EAAE,OAAO,UACvC,OAAO,iBAAiB,EAAE,UAAU,YACpC,QAAQ,aAmBlB;AA53BD;;;;;;;;;;;;;;;GAeG;AACH;IA6BI;;;;;;;;;OASG;IACH,kBARW,OAAO,iBAAiB,EAAE,aAAa,WACvC,OAAO,yBAAyB,EAAE,OAAO,gBACzC,aAAa,iDAEb,MAAM,WACN,MAAM,YACN,OAAO,WAAW,EAAE,WAAW,EAoBzC;IARG,8CAAgB;IAOhB,uBAA0B;IAG9B;;OAEG;IACH,qDAIC;IAeD;;OAEG;IACH,wDAKC;IAqBD;;OAEG;IACH,8CAEC;IAED,yBAEC;IAED;;OAEG;IACH,wCAmCC;IA2OD;;;;OAIG;IAEH,gBALW,OAAO,4CAA4C,EAAE,OAAO,UAC5D,OAAO,uBAAuB,EAAE,OAAO,YACvC,OAAO,uBAAuB,EAAE,gBAAgB,QA6O1D;;CAoGJ;AAgJD;IACI;;;;OAIG;IACH,6DAHW,aAAa,UACb,MAAM,EAoFhB;IAjFG,4BAAgC;IAChC,kCAAgB;IAChB,eAAoB;IAEpB,uBAAuB;IACvB,YADW,QAAQ,CACQ;IAE3B,uBAAuB;IACvB,kBADW,QAAQ,CACc;IAEjC,mFAAmF;IACnF,MADW,QAAQ,OAAO,OAAO,iBAAiB,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,CAC5D;IAEd,4FAA4F;IAC5F,WADW,QAAQ,OAAO,OAAO,iBAAiB,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC,CAC3D;IAEnB,0DAA0D;IAC1D,kEAAoB;IAEpB,uBAAuB;IACvB,OADW,QAAQ,CACG;IAEtB,wBAAwB;IACxB,QADW,SAAS,CACQ;IA4DhC,uEAcC;IAED;;OAEG;IACH,4BAkKC;IAED,uBAqBC;IAED,iCAEC;CACJ;qBAlrC0D,eAAe;sBAFpD,uBAAuB;0BAGnB,oBAAoB;qBAGzB,eAAe;yBALX,mBAAmB;AAqrC5C;IAeI;;;OAGG;IACH,uBAHW,SAAS,8CA6FnB;IAhGD,uBAAmB;IAsCf;;;MAAoB;IAIpB;;;;MAQC;IAgDL,2BAKC;IAWD;;;;OAIG;IACH,gCAHW,SAAS,UACT,SAAS,QA8CnB;;CACJ;oBAx2CmB,qBAAqB"}
+{"version":3,"file":"gridView.d.ts","sourceRoot":"","sources":["../../../src/view/gridView.js"],"names":[],"mappings":"AAswBA;;;GAGG;AACH,iDAHW,OAAO,iBAAiB,EAAE,cAAc,GACtC,OAAO,iBAAiB,EAAE,QAAQ,CAwB9C;AAED;;;GAGG;AACH,uDAHW,OAAO,iBAAiB,EAAE,cAAc,GACtC,OAAO,iBAAiB,EAAE,QAAQ,CA6C9C;AA2BD;;GAEG;AACH,8EAUC;AAED;;;;;GAKG;AACH,4CAJW,OAAO,uBAAuB,EAAE,OAAO,UACvC,OAAO,iBAAiB,EAAE,UAAU,YACpC,QAAQ,aAmBlB;AA53BD;;;;;;;;;;;;;;;GAeG;AACH;IA6BI;;;;;;;;;OASG;IACH,kBARW,OAAO,iBAAiB,EAAE,aAAa,WACvC,OAAO,yBAAyB,EAAE,OAAO,gBACzC,aAAa,iDAEb,MAAM,WACN,MAAM,YACN,OAAO,WAAW,EAAE,WAAW,EAoBzC;IARG,8CAAgB;IAOhB,uBAA0B;IAG9B;;OAEG;IACH,qDAIC;IAeD;;OAEG;IACH,wDAKC;IAqBD;;OAEG;IACH,8CAEC;IAED,yBAEC;IAED;;OAEG;IACH,wCAmCC;;CA+jBJ;AAgJD;IACI;;;;OAIG;IACH,6DAHW,aAAa,UACb,MAAM,EAoFhB;IAjFG,4BAAgC;IAChC,kCAAgB;IAChB,eAAoB;IAEpB,uBAAuB;IACvB,YADW,QAAQ,CACQ;IAE3B,uBAAuB;IACvB,kBADW,QAAQ,CACc;IAEjC,mFAAmF;IACnF,MADW,QAAQ,OAAO,OAAO,iBAAiB,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,CAC5D;IAEd,4FAA4F;IAC5F,WADW,QAAQ,OAAO,OAAO,iBAAiB,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC,CAC3D;IAEnB,0DAA0D;IAC1D,kEAAoB;IAEpB,uBAAuB;IACvB,OADW,QAAQ,CACG;IAEtB,wBAAwB;IACxB,QADW,SAAS,CACQ;IA4DhC,uEAcC;IAED;;OAEG;IACH,4BAkKC;IAED,uBAqBC;IAED,iCAEC;CACJ;qBAlrC0D,eAAe;sBAFpD,uBAAuB;0BAGnB,oBAAoB;qBAGzB,eAAe;yBALX,mBAAmB;AAqrC5C;IAeI;;;OAGG;IACH,uBAHW,SAAS,8CA6FnB;IAhGD,uBAAmB;IAsCf;;;MAAoB;IAIpB;;;;MAQC;IAgDL,2BAKC;IAWD;;;;OAIG;IACH,gCAHW,SAAS,UACT,SAAS,QA8CnB;;CACJ;oBAx2CmB,qBAAqB"}

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

@@ -11,12 +11,6 @@ export default class LayerView extends ContainerView {
     constructor(spec: import("../spec/view.js").LayerSpec, context: import("../types/viewContext.js").default, layoutParent: ContainerView, dataParent: import("./view.js").default, name: string, options?: import("./view.js").ViewOptions);
     spec: import("../spec/view.js").LayerSpec;
     get children(): (import("./unitView.js").default | LayerView)[];
-    /**
-     * @param {import("./renderingContext/viewRenderingContext.js").default} context
-     * @param {import("./layout/rectangle.js").default} coords
-     * @param {import("../types/rendering.js").RenderingOptions} [options]
-     */
-    render(context: import("./renderingContext/viewRenderingContext.js").default, coords: import("./layout/rectangle.js").default, options?: import("../types/rendering.js").RenderingOptions): void;
     #private;
 }
 import ContainerView from "./containerView.js";

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

@@ -1 +1 @@
-{"version":3,"file":"layerView.d.ts","sourceRoot":"","sources":["../../../src/view/layerView.js"],"names":[],"mappings":"AAIA;IAQI;;;;;;;;OAQG;IACH,kBAPW,OAAO,iBAAiB,EAAE,SAAS,WACnC,OAAO,yBAAyB,EAAE,OAAO,gBACzC,aAAa,cACb,OAAO,WAAW,EAAE,OAAO,QAC3B,MAAM,YACN,OAAO,WAAW,EAAE,WAAW,EAQzC;IAHG,0CAAgB;IAoCpB,gEAEC;IAWD;;;;OAIG;IACH,gBAJW,OAAO,4CAA4C,EAAE,OAAO,UAC5D,OAAO,uBAAuB,EAAE,OAAO,YACvC,OAAO,uBAAuB,EAAE,gBAAgB,QAgB1D;;CAeJ;0BA1GyB,oBAAoB"}
+{"version":3,"file":"layerView.d.ts","sourceRoot":"","sources":["../../../src/view/layerView.js"],"names":[],"mappings":"AAIA;IAQI;;;;;;;;OAQG;IACH,kBAPW,OAAO,iBAAiB,EAAE,SAAS,WACnC,OAAO,yBAAyB,EAAE,OAAO,gBACzC,aAAa,cACb,OAAO,WAAW,EAAE,OAAO,QAC3B,MAAM,YACN,OAAO,WAAW,EAAE,WAAW,EAQzC;IAHG,0CAAgB;IAoCpB,gEAEC;;CA6CJ;0BA1GyB,oBAAoB"}

package/dist/src/view/layout/flexLayout.test.d.ts

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

package/dist/src/view/layout/flexLayout.test.d.ts.map

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

package/dist/src/view/layout/grid.test.d.ts

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

package/dist/src/view/layout/grid.test.d.ts.map

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

package/dist/src/view/layout/rectangle.test.d.ts

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

package/dist/src/view/layout/rectangle.test.d.ts.map

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