@genome-spy/core 0.61.0 → 0.62.0

package/dist/schema.json

@@ -2510,6 +2510,10 @@
     "FilterScoredLabelsParams": {
       "additionalProperties": false,
       "properties": {
+        "asMidpoint": {
+          "description": "Outputs the average of pos and pos2 as the midpoint of the element. This is useful for elements that have a width, such as transcripts. The midpoint is clamped to the visible region of the element.",
+          "type": "string"
+        },
         "channel": {
           "description": "**Default:** `\"x\"`",
           "enum": [
@@ -2520,7 +2524,7 @@
         },
         "lane": {
           "$ref": "#/definitions/Field",
-          "description": "An optional field representing element's lane, e.g., if transcripts are shown using a piled up layout."
+          "description": "An optional field representing element's lane, e.g., if transcripts are shown using a piled up layout. Each line is processed separately."
         },
         "padding": {
           "description": "Padding (in pixels) around the element.\n\n**Default:** `0`",
@@ -2528,7 +2532,11 @@
         },
         "pos": {
           "$ref": "#/definitions/Field",
-          "description": "The field representing element's position on the domain."
+          "description": "The field representing element's start position on the domain."
+        },
+        "pos2": {
+          "$ref": "#/definitions/Field",
+          "description": "The field representing element's end position on the domain. If not specified, the `pos` field is used."
         },
         "score": {
           "$ref": "#/definitions/Field",
@@ -2541,7 +2549,7 @@
         },
         "width": {
           "$ref": "#/definitions/Field",
-          "description": "The field representing element's width in pixels"
+          "description": "The field representing element's width in pixels."
         }
       },
       "required": [
@@ -4554,7 +4562,14 @@
           "$ref": "#/definitions/Field"
         },
         "fontSize": {
-          "type": "number"
+          "anyOf": [
+            {
+              "type": "number"
+            },
+            {
+              "$ref": "#/definitions/ExprRef"
+            }
+          ]
         },
         "type": {
           "const": "measureText",

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

@@ -1 +1 @@
-{"version":3,"file":"collector.d.ts","sourceRoot":"","sources":["../../../src/data/collector.js"],"names":[],"mappings":"AAUA;;;;;GAKG;AACH;IAkCI;;OAEG;IACH,qBAFW,OAAO,sBAAsB,EAAE,aAAa,EAetD;IAVG,qDAA2C;IAE3C,2CAA2C;IAC3C,WADW,CAAC,CAAS,IAAS,EAAT,SAAS,KAAE,IAAI,CAAC,EAAE,CACpB;IAGnB,yFAAyF;IACzF,cADW,GAAG,CAAC,OAAO,oBAAoB,EAAE,MAAM,EAAE,+BAAO,CACN;IAwHzD;;OAEG;IACH,WAFa,QAAQ,+BAAO,CAqB3B;IAED;;;OAGG;IACH,mBAFW,CAAC,KAAK,+BAAO,KAAK,IAAI,QAUhC;IAED;;OAEG;IACH,uBAMC;IA8CD;;;;OAIG;IACH,8BAFW,MAAM,iCA4BhB;;CACJ;qBAhTyD,eAAe"}
+{"version":3,"file":"collector.d.ts","sourceRoot":"","sources":["../../../src/data/collector.js"],"names":[],"mappings":"AAUA;;;;;GAKG;AACH;IAuCI;;OAEG;IACH,qBAFW,OAAO,sBAAsB,EAAE,aAAa,EAiBtD;IAZG,qDAA2C;IAE3C,2CAA2C;IAC3C,WADW,CAAC,CAAS,IAAS,EAAT,SAAS,KAAE,IAAI,CAAC,EAAE,CACpB;IAGnB,yFAAyF;IACzF,cADW,GAAG,CAAC,OAAO,oBAAoB,EAAE,MAAM,EAAE,+BAAO,CACN;IAgHzD;;OAEG;IACH,WAFa,QAAQ,+BAAO,CAqB3B;IAED;;;OAGG;IACH,mBAFW,CAAC,KAAK,+BAAO,KAAK,IAAI,QAUhC;IAED;;OAEG;IACH,uBAMC;IA8CD;;;;OAIG;IACH,8BAFW,MAAM,iCA4BhB;;CACJ;qBA7SyD,eAAe"}

package/dist/src/data/collector.js

@@ -40,6 +40,11 @@ export default class Collector extends FlowNode {
      */
     #facetIndices;
 
+    /**
+     * @type {(a: Datum, b: Datum) => number}
+     */
+    #comparator;
+
     get behavior() {
         return BEHAVIOR_COLLECTS;
     }
@@ -63,6 +68,8 @@ export default class Collector extends FlowNode {
         /** @type {Map<import("../spec/channel.js").Scalar[], Data>} TODO: proper type for key */
         this.facetBatches = new InternMap([], JSON.stringify);
 
+        this.#comparator = makeComparator(this.params?.sort);
+
         this.#init();
     }
 
@@ -100,18 +107,6 @@ export default class Collector extends FlowNode {
         // Free some memory
         this.#buffer = [];
 
-        const sort = this.params?.sort;
-        // Vega's "compare" function is incredibly slow (uses megamorphic field accessor)
-        // TODO: Implement a replacement for static data types
-        const comparator = sort ? compare(sort.field, sort.order) : undefined;
-
-        /** @param {any[]} data */
-        const sortData = (data) => {
-            if (comparator) {
-                data.sort(comparator);
-            }
-        };
-
         if (this.params.groupby?.length) {
             if (this.facetBatches.size > 1) {
                 throw new Error("TODO: Support faceted data!");
@@ -137,9 +132,11 @@ export default class Collector extends FlowNode {
             }
         }
 
-        for (const data of this.facetBatches.values()) {
-            // TODO: Only sort if not already sorted
-            sortData(data);
+        if (this.#comparator) {
+            for (const data of this.facetBatches.values()) {
+                // TODO: Only sort if not already sorted
+                data.sort(this.#comparator);
+            }
         }
 
         this.#buildUniqueIdIndex();
@@ -329,3 +326,31 @@ function groupBy(data, accessor) {
     }
     return groups;
 }
+
+/**
+ * Creates a comparator function based on the provided sort parameters.
+ *
+ * @param {import("../spec/transform.js").CompareParams} sort
+ * @returns {(a: Datum, b: Datum) => number}
+ */
+function makeComparator(sort) {
+    // For simple cases, create a simple comparator.
+    // For more complex cases, use Vega's compare function. However,
+    // is uses megamorphic field accessors, which makes it slow.
+    if (sort?.field) {
+        const fields = asArray(sort.field);
+        if (fields.length == 1 && !fields[0].includes(".")) {
+            const order = asArray(sort.order)[0] ?? "ascending";
+            const fieldName = JSON.stringify(fields[0]);
+            return /** @type {(a: Datum, b: Datum) => number} */ (
+                new Function(
+                    "a",
+                    "b",
+                    `return a[${fieldName}] ${order === "ascending" ? "-" : "+"} b[${fieldName}];`
+                )
+            );
+        }
+
+        return compare(sort.field, sort.order);
+    }
+}

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

@@ -9,8 +9,10 @@ export default class FilterScoredLabelsTransform extends Transform {
     /** @type {any[]} */
     _data: any[];
     channel: "x" | "y";
-    posAccessor: import("vega-util").AccessorFn<any>;
-    posBisector: import("d3-array").Bisector<any, any>;
+    startPosAccessor: import("vega-util").AccessorFn<any>;
+    endPosAccessor: import("vega-util").AccessorFn<any>;
+    startPosBisector: import("d3-array").Bisector<any, any>;
+    endPosBisector: import("d3-array").Bisector<any, any>;
     scoreAccessor: import("vega-util").AccessorFn<any>;
     widthAccessor: import("vega-util").AccessorFn<any>;
     /** @type {function(any):any} */
@@ -20,7 +22,6 @@ export default class FilterScoredLabelsTransform extends Transform {
     reservationMaps: Map<any, ReservationMap>;
     resolution: import("../../view/scaleResolution.js").default;
     schedule: () => void;
-    _scores: any[];
     _filterAndPropagate(): void;
     groups: Map<any, any>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"filterScoredLabels.d.ts","sourceRoot":"","sources":["../../../../src/data/transforms/filterScoredLabels.js"],"names":[],"mappings":"AAOA;IAKI;;;;OAIG;IACH,oBAHW,OAAO,yBAAyB,EAAE,wBAAwB,QAC1D,OAAO,oBAAoB,EAAE,OAAO,EA2C9C;IAtCG,mEAAoB;IAEpB,oBAAoB;IACpB,OADW,GAAG,EAAE,CACD;IAEf,mBAAoC;IAMpC,iDAAyC;IACzC,mDAA6C;IAC7C,mDAA6C;IAC7C,mDAA6C;IAC7C,gCAAgC;IAChC,cADW,CAAS,IAAG,EAAH,GAAG,KAAE,GAAG,CAGd;IACd,gBAAuC;IAEvC,uCAAuC;IACvC,iBADW,GAAG,CAAC,GAAG,EAAE,cAAc,CAAC,CACH;IAEhC,4DAAuD;IAIvD,qBAAuE;IAgBvE,eAAiD;IAWrD,4BAyCC;IAKG,sBAAuB;CAU9B;sBA9HqB,gBAAgB;2BAFX,+BAA+B"}
+{"version":3,"file":"filterScoredLabels.d.ts","sourceRoot":"","sources":["../../../../src/data/transforms/filterScoredLabels.js"],"names":[],"mappings":"AAOA;IAKI;;;;OAIG;IACH,oBAHW,OAAO,yBAAyB,EAAE,wBAAwB,QAC1D,OAAO,oBAAoB,EAAE,OAAO,EA6C9C;IAxCG,mEAAoB;IAEpB,oBAAoB;IACpB,OADW,GAAG,EAAE,CACD;IAEf,mBAAoC;IAMpC,sDAA8C;IAC9C,oDAAgE;IAChE,wDAAuD;IACvD,sDAAmD;IACnD,mDAA6C;IAC7C,mDAA6C;IAC7C,gCAAgC;IAChC,cADW,CAAS,IAAG,EAAH,GAAG,KAAE,GAAG,CAGd;IACd,gBAAuC;IAEvC,uCAAuC;IACvC,iBADW,GAAG,CAAC,GAAG,EAAE,cAAc,CAAC,CACH;IAEhC,4DAAuD;IAIvD,qBAAuE;IAyB3E,4BAsEC;IAKG,sBAAuB;CAU9B;sBA3JqB,gBAAgB;2BAFX,+BAA+B"}

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

@@ -1,6 +1,6 @@
 import { bisector } from "d3-array";
 import { BEHAVIOR_COLLECTS } from "../flowNode.js";
-import { topKSlice } from "../../utils/topK.js";
+import { topK } from "../../utils/topK.js";
 import ReservationMap from "../../utils/reservationMap.js";
 import { field } from "../../utils/field.js";
 import Transform from "./transform.js";
@@ -29,8 +29,10 @@ export default class FilterScoredLabelsTransform extends Transform {
             throw new Error("Invalid channel: " + this.channel);
         }
 
-        this.posAccessor = field(this.params.pos);
-        this.posBisector = bisector(this.posAccessor);
+        this.startPosAccessor = field(this.params.pos);
+        this.endPosAccessor = field(this.params.pos2 ?? this.params.pos);
+        this.startPosBisector = bisector(this.startPosAccessor);
+        this.endPosBisector = bisector(this.endPosAccessor);
         this.scoreAccessor = field(this.params.score);
         this.widthAccessor = field(this.params.width);
         /** @type {function(any):any} */
@@ -59,10 +61,8 @@ export default class FilterScoredLabelsTransform extends Transform {
     }
 
     complete() {
-        const posAccessor = this.posAccessor;
-        this._data.sort((a, b) => posAccessor(a) - posAccessor(b));
-
-        this._scores = this._data.map(this.scoreAccessor);
+        const startPosAccessor = this.startPosAccessor;
+        this._data.sort((a, b) => startPosAccessor(a) - startPosAccessor(b));
 
         for (const lane of new Set(this._data.map(this.laneAccessor))) {
             this.reservationMaps.set(lane, new ReservationMap(200));
@@ -91,25 +91,54 @@ export default class FilterScoredLabelsTransform extends Transform {
         const k = 70; // TODO: Configurable
 
         // Find the maximum of k elements from the visible domain in priority order
-        const topIndices = topKSlice(
-            this._scores,
+        const topElements = topK(
+            this._data,
             k,
-            this.posBisector.left(this._data, domain[0]),
-            this.posBisector.right(this._data, domain[1])
+            this.scoreAccessor,
+            this.endPosBisector.left(this._data, domain[0]),
+            this.startPosBisector.right(this._data, domain[1])
         );
 
         // Try to fit the elements on the available lanes and propagate if there was room
-        for (const i of topIndices) {
-            const datum = this._data[i];
-            const pos = scale(this.posAccessor(datum)) * rangeSpan;
-            const halfWidth = this.widthAccessor(datum) / 2 + this.padding;
+        for (const datum of topElements) {
+            let startPos = scale(this.startPosAccessor(datum)) * rangeSpan;
+            let endPos = scale(this.endPosAccessor(datum)) * rangeSpan;
+
+            const span = endPos - startPos;
+            const width = this.widthAccessor(datum) + this.padding * 2;
+
+            let midpoint = (startPos + endPos) / 2;
+
+            // How much extra space we have for adjusting the position so that the
+            // text stays inside the range.
+            const extra = Math.max(0.0, (span - width) / 2.0);
+            if (extra > 0.0) {
+                const leftOver = Math.max(0.0, width / 2 - midpoint);
+                midpoint += Math.min(leftOver, extra);
+
+                const rightOver = Math.max(
+                    0.0,
+                    width / 2 + midpoint - rangeSpan
+                );
+                midpoint -= Math.min(rightOver, extra);
+            }
 
             if (
                 this.reservationMaps
                     .get(this.laneAccessor(datum))
-                    .reserve(pos - halfWidth, pos + halfWidth)
+                    .reserve(midpoint - width / 2, midpoint + width / 2)
             ) {
-                this._propagate(datum);
+                if (this.params.asMidpoint) {
+                    // Clone the datum to avoid side effects
+                    const clonedDatum = Object.assign({}, datum);
+                    // @ts-ignore
+                    clonedDatum[this.params.asMidpoint] = scale.invert(
+                        midpoint / rangeSpan
+                    );
+                    this._propagate(clonedDatum);
+                } else {
+                    this._propagate(datum);
+                }
             }
         }
 

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

@@ -1,13 +1,13 @@
 /**
- * Measures text length. This is mainly intended for reading-direction arrows
- * in gene annotations.
+ * Measures text length. This is mainly intended for strand arrows in gene annotations.
  */
 export default class MeasureTextTransform extends Transform {
     /**
      *
      * @param {import("../../spec/transform.js").MeasureTextParams} params
+     * @param {import("../flowNode.js").ParamMediatorProvider} paramMediatorProvider
      */
-    constructor(params: import("../../spec/transform.js").MeasureTextParams);
+    constructor(params: import("../../spec/transform.js").MeasureTextParams, paramMediatorProvider: import("../flowNode.js").ParamMediatorProvider);
     params: import("../../spec/transform.js").MeasureTextParams;
     /**
      *

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

@@ -1 +1 @@
-{"version":3,"file":"measureText.d.ts","sourceRoot":"","sources":["../../../../src/data/transforms/measureText.js"],"names":[],"mappings":"AAMA;;;GAGG;AACH;IAKI;;;OAGG;IACH,oBAFW,OAAO,yBAAyB,EAAE,iBAAiB,EA0B7D;IArBG,4DAAoB;IAQpB;;;OAGG;IACH,gBAFW,GAAG,UAUb;CAER;sBAxCqB,gBAAgB"}
+{"version":3,"file":"measureText.d.ts","sourceRoot":"","sources":["../../../../src/data/transforms/measureText.js"],"names":[],"mappings":"AAOA;;GAEG;AACH;IAKI;;;;OAIG;IACH,oBAHW,OAAO,yBAAyB,EAAE,iBAAiB,yBACnD,OAAO,gBAAgB,EAAE,qBAAqB,EA0CxD;IArCG,4DAAoB;IAwBpB;;;OAGG;IACH,gBAFW,GAAG,UAUb;CAER;sBAzDqB,gBAAgB"}

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

@@ -3,10 +3,10 @@ import fontMetadata from "../../fonts/Lato-Regular.json" with { type: "json" };
 import getMetrics from "../../fonts/bmFontMetrics.js";
 import { field } from "../../utils/field.js";
 import Transform from "./transform.js";
+import { isExprRef } from "../../view/paramMediator.js";
 
 /**
- * Measures text length. This is mainly intended for reading-direction arrows
- * in gene annotations.
+ * Measures text length. This is mainly intended for strand arrows in gene annotations.
  */
 export default class MeasureTextTransform extends Transform {
     get behavior() {
@@ -16,8 +16,9 @@ export default class MeasureTextTransform extends Transform {
     /**
      *
      * @param {import("../../spec/transform.js").MeasureTextParams} params
+     * @param {import("../flowNode.js").ParamMediatorProvider} paramMediatorProvider
      */
-    constructor(params) {
+    constructor(params, paramMediatorProvider) {
         super(params);
 
         this.params = params;
@@ -26,7 +27,23 @@ export default class MeasureTextTransform extends Transform {
         const accessor = field(params.field);
         const as = params.as;
         // TODO: Support custom fonts.
-        const size = params.fontSize;
+
+        let size = 0;
+
+        // TODO: Refactor this into reusable code.
+        if (isExprRef(params.fontSize)) {
+            const sizeExpr =
+                paramMediatorProvider.paramMediator.createExpression(
+                    params.fontSize.expr
+                );
+            size = sizeExpr();
+            sizeExpr.addListener(() => {
+                size = sizeExpr();
+                this.repropagate();
+            });
+        } else {
+            size = params.fontSize;
+        }
 
         /**
          *

package/dist/src/marks/point.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"point.d.ts","sourceRoot":"","sources":["../../../src/marks/point.js"],"names":[],"mappings":"AAmBA;;GAEG;AACH;IAGI;;OAEG;IACH,sBAFW,OAAO,qBAAqB,EAAE,OAAO,EA6C/C;IA0EO,iDAMC;IAkET,+BAkBC;;CAgDJ;iBAhRgB,WAAW"}
+{"version":3,"file":"point.d.ts","sourceRoot":"","sources":["../../../src/marks/point.js"],"names":[],"mappings":"AAmBA;;GAEG;AACH;IAGI;;OAEG;IACH,sBAFW,OAAO,qBAAqB,EAAE,OAAO,EAmD/C;IA0EO,iDAMC;IAkET,+BAkBC;;CAgDJ;iBAtRgB,WAAW"}

package/dist/src/marks/point.js

@@ -69,6 +69,12 @@ export default class PointMark extends Mark {
                 this.#semanticZoomFraction = () => szf;
             }
         }
+
+        if ("geometricZoomBound" in this.properties) {
+            console.warn(
+                'geometricZoomBound is deprecated. Use something like the following instead: "size": { "expr": "min(0.5 * pow(zoomLevel, 2), 200)" }.'
+            );
+        }
     }
 
     /**

package/dist/src/spec/transform.d.ts

@@ -1,4 +1,5 @@
 import { PositionalChannel } from "./channel.js";
+import { ExprRef } from "./parameter.js";
 
 /**
  * The name of the field or a JavaScript expression for accessing nested properties.
@@ -425,7 +426,7 @@ export interface MeasureTextParams extends TransformParamsBase {
 
     field: Field;
 
-    fontSize: number;
+    fontSize: number | ExprRef;
 
     as: string;
 
@@ -484,18 +485,31 @@ export interface FilterScoredLabelsParams extends TransformParamsBase {
     score: Field;
 
     /**
-     * The field representing element's width in pixels
+     * The field representing element's width in pixels.
      */
     width: Field;
 
     /**
-     * The field representing element's position on the domain.
+     * The field representing element's start position on the domain.
      */
     pos: Field;
 
+    /**
+     * The field representing element's end position on the domain.
+     * If not specified, the `pos` field is used.
+     */
+    pos2?: Field;
+
+    /**
+     * Outputs the average of pos and pos2 as the midpoint of the element.
+     * This is useful for elements that have a width, such as transcripts.
+     * The midpoint is clamped to the visible region of the element.
+     */
+    asMidpoint?: string;
+
     /**
      * An optional field representing element's lane, e.g., if transcripts
-     * are shown using a piled up layout.
+     * are shown using a piled up layout. Each line is processed separately.
      */
     lane?: Field;
 

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

@@ -1,22 +1,13 @@
 /**
- * Finds the top k
- *
- * Based on ideas at https://lemire.me/blog/2017/06/21/top-speed-for-top-k-queries/
+ * Finds the top k elements in a slice of the data array, using a priority accessor.
  *
  * @param {T[]} data
  * @param {number} k
  * @param {(datum: T) => number} priorityAccessor
- * @template T
- */
-export function topK<T>(data: T[], k: number, priorityAccessor: (datum: T) => number): T[];
-/**
- * Takes an array of priorities and returns the top k indices from the
- * specified slice
- *
- * @param {number[]} priorities An array of priorities
- * @param {number} k
  * @param {number} [start] Default: 0
- * @param {number} [end] Exclusive. Default: priorities.length
+ * @param {number} [end] Exclusive. Default: data.length
+ * @template T
+ * @returns {T[]}
  */
-export function topKSlice(priorities: number[], k: number, start?: number, end?: number): number[];
+export function topK<T>(data: T[], k: number, priorityAccessor?: (datum: T) => number, start?: number, end?: number): T[];
 //# sourceMappingURL=topK.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"topK.d.ts","sourceRoot":"","sources":["../../../src/utils/topK.js"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AACH,qBAFa,CAAC,QAHH,CAAC,EAAE,KACH,MAAM,oBACN,CAAC,KAAK,EAAE,CAAC,KAAK,MAAM,OA4B9B;AAED;;;;;;;;GAQG;AACH,sCALW,MAAM,EAAE,KACR,MAAM,UACN,MAAM,QACN,MAAM,YA6BhB"}
+{"version":3,"file":"topK.d.ts","sourceRoot":"","sources":["../../../src/utils/topK.js"],"names":[],"mappings":"AAEA;;;;;;;;;;GAUG;AACH,qBAHa,CAAC,QALH,CAAC,EAAE,KACH,MAAM,qBACN,CAAC,KAAK,EAAE,CAAC,KAAK,MAAM,UACpB,MAAM,QACN,MAAM,GAEJ,CAAC,EAAE,CAiCf"}

package/dist/src/utils/topK.js

@@ -1,64 +1,34 @@
 import FlatQueue from "flatqueue";
 
 /**
- * Finds the top k
- *
- * Based on ideas at https://lemire.me/blog/2017/06/21/top-speed-for-top-k-queries/
+ * Finds the top k elements in a slice of the data array, using a priority accessor.
  *
  * @param {T[]} data
  * @param {number} k
  * @param {(datum: T) => number} priorityAccessor
- * @template T
- */
-export function topK(data, k, priorityAccessor) {
-    /** @type {FlatQueue<number>} */
-    const queue = new FlatQueue();
-
-    let i;
-    for (i = 0; i < k && i < data.length; i++) {
-        queue.push(i, priorityAccessor(data[i]));
-    }
-
-    for (; i < data.length; i++) {
-        const p = priorityAccessor(data[i]);
-        if (p >= queue.peekValue()) {
-            queue.push(i, p);
-            queue.pop();
-        }
-    }
-
-    const result = [];
-
-    let index;
-    while ((index = queue.pop()) !== undefined) {
-        result.push(data[index]);
-    }
-
-    return result.reverse();
-}
-
-/**
- * Takes an array of priorities and returns the top k indices from the
- * specified slice
- *
- * @param {number[]} priorities An array of priorities
- * @param {number} k
  * @param {number} [start] Default: 0
- * @param {number} [end] Exclusive. Default: priorities.length
+ * @param {number} [end] Exclusive. Default: data.length
+ * @template T
+ * @returns {T[]}
  */
-export function topKSlice(priorities, k, start = 0, end = priorities.length) {
+export function topK(
+    data,
+    k,
+    priorityAccessor = (x) => +x,
+    start = 0,
+    end = data.length
+) {
     /** @type {FlatQueue<number>} */
     const queue = new FlatQueue();
-
     const sliceLength = end - start;
 
     let i;
     for (i = 0; i < k && i < sliceLength; i++) {
-        queue.push(i, priorities[start + i]);
+        queue.push(i, priorityAccessor(data[start + i]));
     }
 
     for (; i < sliceLength; i++) {
-        const p = priorities[start + i];
+        const p = priorityAccessor(data[start + i]);
         if (p >= queue.peekValue()) {
             queue.push(i, p);
             queue.pop();
@@ -66,10 +36,9 @@ export function topKSlice(priorities, k, start = 0, end = priorities.length) {
     }
 
     const result = [];
-
     let index;
     while ((index = queue.pop()) !== undefined) {
-        result.push(start + index);
+        result.push(data[start + index]);
     }
 
     return result.reverse();

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

@@ -1,6 +1,5 @@
 import { expect, test } from "vitest";
-import { range } from "d3-array";
-import { topK, topKSlice } from "./topK.js";
+import { topK } from "./topK.js";
 
 test("topK returns top k numbers in priority order", () => {
     /** @param {number} x */
@@ -16,49 +15,40 @@ test("topK returns top k numbers in priority order", () => {
     expect(topK([1, 1, 1], 3, priorityAccessor)).toEqual([1, 1, 1]);
 });
 
-test("topK returns top k objects in priority order", () => {
-    /** @param {{priority: number}} d */
-    const priorityAccessor = (d) => d.priority;
+test("topK returns top k objects in priority order within a start-end range", () => {
+    const arr = [0, 9, 1, 8, 2, 7, 3, 6, 4, 5].map((x) => ({ priority: x }));
+    const priorityAccessor = (/** @type {{priority: number}} */ d) =>
+        d.priority;
 
-    expect(
-        topK(
-            [0, 9, 1, 8, 2, 7, 3, 6, 4, 5].map((x) => ({ priority: x })),
-            3,
-            priorityAccessor
-        )
-    ).toEqual([9, 8, 7].map((x) => ({ priority: x })));
-});
-
-test("topK returns top k objects in priority order with large datasets", () => {
-    /** @param {number} x */
-    const priorityAccessor = (x) => x;
+    // Range: indices 2 to 8 (1,8,2,7,3,6)
+    expect(topK(arr, 2, priorityAccessor, 2, 8)).toEqual([
+        { priority: 8 },
+        { priority: 7 },
+    ]);
 
-    const n = 10000;
-    const bigArray = range(n).map((x) => Math.floor(Math.random() * 100));
-    const sortedBigArray = bigArray.slice().sort((a, b) => b - a);
+    // Range: indices 4 to 10 (2,7,3,6,4,5)
+    expect(topK(arr, 3, priorityAccessor, 4, 10)).toEqual([
+        { priority: 7 },
+        { priority: 6 },
+        { priority: 5 },
+    ]);
 
-    for (let k = 0; k < 13000; k += 1000) {
-        expect(topK(bigArray, k, priorityAccessor)).toEqual(
-            sortedBigArray.slice(0, k)
-        );
-    }
+    // Range: indices 0 to 3 (0,9,1)
+    expect(topK(arr, 2, priorityAccessor, 0, 3)).toEqual([
+        { priority: 9 },
+        { priority: 1 },
+    ]);
 });
 
-test("topKSlice returns top k indexes in priority order", () => {
-    expect(topKSlice([0, 1, 2], 3)).toEqual([2, 1, 0]);
-    expect(topKSlice([1, 2, 3], 3)).toEqual([2, 1, 0]);
-    expect(topKSlice([0, 1, 2], 1)).toEqual([2]);
-    expect(topKSlice([0, 1, 2], 6)).toEqual([2, 1, 0]);
-    expect(topKSlice([0, 1, 2, 3, 4, 5], 3)).toEqual([5, 4, 3]);
-    expect(topKSlice([0, 9, 1, 8, 2, 7, 3, 6, 4, 5], 3)).toEqual([1, 3, 5]);
-    expect(new Set(topKSlice([1, 1, 1, 2, 2, 2], 3))).toEqual(
-        new Set([3, 4, 5])
-    );
+test("topK returns empty array if start >= end", () => {
+    const arr = [1, 2, 3, 4, 5];
+    expect(topK(arr, 3, (x) => x, 4, 4)).toEqual([]);
+    expect(topK(arr, 3, (x) => x, 5, 5)).toEqual([]);
+    expect(topK(arr, 3, (x) => x, 6, 6)).toEqual([]);
 });
 
-test("topKSlice returns top k indexes from a slice in priority order", () => {
-    expect(topKSlice([0, 1, 2, 3, 4, 5], 2, 1, 5)).toEqual([4, 3]);
-    expect(topKSlice([0, 9, 1, 8, 2, 7, 3, 6, 4, 5], 3, 1, 5)).toEqual([
-        1, 3, 4,
-    ]);
+test("topK works with negative and zero priorities in a range", () => {
+    const arr = [-10, 0, 5, -2, 3, 0, -1];
+    expect(topK(arr, 2, (x) => x, 1, 6)).toEqual([5, 3]);
+    expect(topK(arr, 3, (x) => x, 0, 4)).toEqual([5, 0, -2]);
 });

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

@@ -1 +1 @@
-{"version":3,"file":"scaleResolution.d.ts","sourceRoot":"","sources":["../../../src/view/scaleResolution.js"],"names":[],"mappings":"AA4+BA;;;;;;;;;;GAUG;AACH,6CAFW,OAAO,WAAW,EAAE,OAAO,GAAG,OAAO,WAAW,EAAE,OAAO,EAAE,QA4BrE;AAp+BD,2BAA4B,cAAc,CAAC;AAC3C,sBAAuB,SAAS,CAAC;AACjC,sBAAuB,SAAS,CAAC;AACjC,oBAAqB,OAAO,CAAC;AAC7B,oBAAqB,OAAO,CAAC;AAE7B;;;;;;;;GAQG;AACH;;;;;;;GAOG;AACH;IA4CI;;OAEG;IACH,2DASC;IARG,8CAAsB;IACtB,yDAAyD;IACzD,SADW,qBAAqB,EAAE,CACjB;IACjB,0FAA0F;IAC1F,MADW,OAAO,oBAAoB,EAAE,IAAI,CAC5B;IAEhB,iEAAiE;IACjE,MADW,MAAM,CACI;IAWzB,2BAMC;IAED;;;;;;;OAOG;IACH,4KAEC;IAED;;;OAGG;IACH,+KAEC;IAcD;;;;;OAKG;IACH,qBAFW,qBAAqB,QAqD/B;IA8MD;;;;OAIG;IACH,+DAOC;IAED;;OAEG;IACH,oBAsCC;IAED;;OAEG;IACH;eA7ZkC,OAAO,kBAAkB,EAAE,KAAK;MAqcjE;IAED,mBAEC;IAED;;OAEG;IACH,oBAFa,mFAA6B,CAOzC;IAED;;;;OAIG;IACH,oBAKC;IAED;;OAEG;IACH,sBAGC;IAUD;;;;;;;OAOG;IACH,kBALW,MAAM,eACN,MAAM,OACN,MAAM,GACJ,OAAO,CAmEnB;IAED;;;;;;OAMG;IACH,eAJW,mFAA6B,aAC7B,OAAO,GAAG,MAAM,iBA0D1B;IAED;;;;OAIG;IACH,qBAcC;IAED;;;;;OAKG;IACH,uBAOC;IAED;;;;;;;OAOG;IACH,wBAoBC;IAiED;;;OAGG;IACH,aAFa,OAAO,qBAAqB,EAAE,OAAO,CAajD;IAID;;;;;OAKG;IACH,uBAFW,MAAM,yDAUhB;IAED;;OAEG;IACH,iBAFW,MAAM,yDAKhB;IAED;;;OAGG;IACH,qBAHW,MAAM,+CAAmB,GACvB,MAAM,CAQlB;IAED;;;OAGG;IACH,8BAHW,kFAA4B,GAC1B,MAAM,EAAE,CAOpB;;CACJ;kCA91B+B,CAAC,SAApB,6CAAkB;;;;UAGrB,OAAO,eAAe,EAAE,OAAO;aAC/B,CAAC;gBACD,OAAO,oBAAoB,EAAE,mBAAmB;sBAChD,CAAC,OAAO,+CAAkB,EAAE,IAAI,EAAE,OAAO,oBAAoB,EAAE,IAAI,kDAAgB"}
+{"version":3,"file":"scaleResolution.d.ts","sourceRoot":"","sources":["../../../src/view/scaleResolution.js"],"names":[],"mappings":"AAm/BA;;;;;;;;;;GAUG;AACH,6CAFW,OAAO,WAAW,EAAE,OAAO,GAAG,OAAO,WAAW,EAAE,OAAO,EAAE,QA4BrE;AA3+BD,2BAA4B,cAAc,CAAC;AAC3C,sBAAuB,SAAS,CAAC;AACjC,sBAAuB,SAAS,CAAC;AACjC,oBAAqB,OAAO,CAAC;AAC7B,oBAAqB,OAAO,CAAC;AAE7B;;;;;;;;GAQG;AACH;;;;;;;GAOG;AACH;IA4CI;;OAEG;IACH,2DASC;IARG,8CAAsB;IACtB,yDAAyD;IACzD,SADW,qBAAqB,EAAE,CACjB;IACjB,0FAA0F;IAC1F,MADW,OAAO,oBAAoB,EAAE,IAAI,CAC5B;IAEhB,iEAAiE;IACjE,MADW,MAAM,CACI;IAWzB,2BAMC;IAED;;;;;;;OAOG;IACH,4KAEC;IAED;;;OAGG;IACH,+KAEC;IAcD;;;;;OAKG;IACH,qBAFW,qBAAqB,QAqD/B;IA8MD;;;;OAIG;IACH,+DAOC;IAED;;OAEG;IACH,oBA6CC;IAED;;OAEG;IACH;eApakC,OAAO,kBAAkB,EAAE,KAAK;MA4cjE;IAED,mBAEC;IAED;;OAEG;IACH,oBAFa,mFAA6B,CAOzC;IAED;;;;OAIG;IACH,oBAKC;IAED;;OAEG;IACH,sBAGC;IAUD;;;;;;;OAOG;IACH,kBALW,MAAM,eACN,MAAM,OACN,MAAM,GACJ,OAAO,CAmEnB;IAED;;;;;;OAMG;IACH,eAJW,mFAA6B,aAC7B,OAAO,GAAG,MAAM,iBA0D1B;IAED;;;;OAIG;IACH,qBAcC;IAED;;;;;OAKG;IACH,uBAOC;IAED;;;;;;;OAOG;IACH,wBAoBC;IAiED;;;OAGG;IACH,aAFa,OAAO,qBAAqB,EAAE,OAAO,CAajD;IAID;;;;;OAKG;IACH,uBAFW,MAAM,yDAUhB;IAED;;OAEG;IACH,iBAFW,MAAM,yDAKhB;IAED;;;OAGG;IACH,qBAHW,MAAM,+CAAmB,GACvB,MAAM,CAQlB;IAED;;;OAGG;IACH,8BAHW,kFAA4B,GAC1B,MAAM,EAAE,CAOpB;;CACJ;kCAr2B+B,CAAC,SAApB,6CAAkB;;;;UAGrB,OAAO,eAAe,EAAE,OAAO;aAC/B,CAAC;gBACD,OAAO,oBAAoB,EAAE,mBAAmB;sBAChD,CAAC,OAAO,+CAAkB,EAAE,IAAI,EAAE,OAAO,oBAAoB,EAAE,IAAI,kDAAgB"}

package/dist/src/view/scaleResolution.js

@@ -469,6 +469,13 @@ export default class ScaleResolution {
         scale.props = props;
         this.#configureRange();
 
+        if (!this.#initialDomain && isContinuous(scale.type)) {
+            const domain = scale.domain();
+            if (span(domain) > 0) {
+                this.#initialDomain = domain;
+            }
+        }
+
         if (!domainWasInitialized) {
             this.#initialDomain = scale.domain();
             this.#notifyListeners("domain");