@genome-spy/core 0.48.2 → 0.50.0

package/dist/src/genome/scaleIndex.test.d.ts

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

package/dist/src/genome/scaleIndex.test.d.ts.map

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

package/dist/src/genome/scaleLocus.test.d.ts

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

package/dist/src/genome/scaleLocus.test.d.ts.map

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

package/dist/src/genomeSpy.d.ts

@@ -18,7 +18,6 @@ export default class GenomeSpy {
     _destructionCallbacks: (() => void)[];
     /** Root level configuration object */
     spec: import("./spec/root.js").RootSpec;
-    accessorFactory: AccessorFactory;
     viewFactory: ViewFactory;
     /** @type {(function(string):object[])[]} */
     namedDataProviders: ((arg0: string) => object[])[];
@@ -83,6 +82,8 @@ export default class GenomeSpy {
      * @type {HTMLElement}
      */
     _inputBindingContainer: HTMLElement;
+    /** @type {Point} */
+    _mouseDownCoords: Point;
     /**
      *
      * @param {(name: string) => any[]} provider
@@ -151,12 +152,12 @@ export default class GenomeSpy {
  * Events that are broadcasted to all views.
  */
 export type BroadcastEventType = "dataFlowBuilt" | "dataLoaded" | "layout" | "layoutComputed";
-import AccessorFactory from "./encoder/accessor.js";
 import { ViewFactory } from "./view/viewFactory.js";
 import Animator from "./utils/animator.js";
 import GenomeStore from "./genome/genomeStore.js";
 import BufferedViewRenderingContext from "./view/renderingContext/bufferedViewRenderingContext.js";
 import Inertia from "./utils/inertia.js";
+import Point from "./view/layout/point.js";
 import WebGLHelper from "./gl/webGLHelper.js";
 import Tooltip from "./utils/ui/tooltip.js";
 import UnitView from "./view/unitView.js";

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

@@ -1 +1 @@
-{"version":3,"file":"genomeSpy.d.ts","sourceRoot":"","sources":["../../src/genomeSpy.js"],"names":[],"mappings":"AA+CA;IACI;;;;;OAKG;IAEH;;;;;OAKG;IACH,uBAJW,WAAW,qDAEX,OAAO,qBAAqB,EAAE,YAAY,EA2FpD;IAxFG,uBAA0B;IAC1B,oDAAsB;IAItB,6BAA6B;IAC7B,uBADW,CAAC,MAAM,IAAI,CAAC,EAAE,CACM;IAE/B,sCAAsC;IACtC,wCAAgB;IAEhB,iCAA4C;IAC5C,yBAAoC;IAEpC,4CAA4C;IAC5C,oBADW,QAAU,MAAM,KAAE,MAAM,EAAE,CAAC,EAAE,CACZ;IAE5B,mBAAoD;IAEpD,0BAA0B;IAC1B,aADW,WAAW,CACM;IAE5B;;;;;OAKG;IACH,qEAF0B,OAAO,CAE8B;IAE/D,2CAA2C;IAC3C,mBADW,4BAA4B,CACL;IAClC,2CAA2C;IAC3C,iBADW,4BAA4B,CACP;IAEhC,oDAAoD;IACpD,6BAAgC;IAEhC;;;OAGG;IACH,eAFU;QAAE,IAAI,EAAE,OAAO,iBAAiB,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,OAAO,oBAAoB,EAAE,KAAK,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAEpF;IAE9B,uBAA+C;IAE/C;;;OAGG;IACH,oBAFU,IAAI,MAAM,EAAE,QAAU,aAAa,KAAE,IAAI,CAAC,EAAE,CAAC,CAEpB;IAEnC;;;;;;OAMG;IACH,yCAFkC,GAAG,KAAK,IAAI,GAEd;IAEhC;;;OAGG;IACH,kDAFkC,GAAG,KAAK,IAAI,GAEL;IAEzC,oFAAoF;IACpF,iBADW,OAAO,MAAM,EAAE,OAAO,6BAA6B,EAAE,cAAc,CAAC,CAK9E;IAED,mBAAmB;IACnB,2CAAyB;IAEzB;;;;OAIG;IACH;gBAF8B,OAAO,wBAAwB,EAAE,iBAAiB;iBAAW,MAAM;OAEnE;IAE9B;;OAEG;IACH,wBAFU,WAAW,CAEkB;IA2C3C;;;OAGG;IACH,2CAFkB,MAAM,KAAK,GAAG,EAAE,QAIjC;IAED;;OAEG;IACH,+BAFW,MAAM,YAShB;IAED;;;;OAIG;IACH,sBAHW,MAAM,QACN,GAAG,EAAE,QAaf;IAED;;;;;OAKG;IACH,gBAHW,kBAAkB,YAClB,GAAG,QAQb;IAED;;;OAGG;IACH,iCAqDC;IA0DG,uBAQC;IAGD,mCAGE;IAOF,sCAEE;IAGF,iBAAyC;IAW7C;;OAEG;IACH,gBAuBC;IAED,sCA8MC;IAED;;;OAGG;IACH,UAFa,QAAQ,OAAO,CAAC,CA6B5B;IAED,4BAqJC;IA9He,iCAAoC;IAgIpD;;;OAGG;IACH,kBAHW,MAAM,KACN,MAAM,QAqEhB;IAED;;;;;;;OAOG;IACH,oDAHuB,QAAQ,MAAM,GAAG,WAAW,GAAG,OAAO,KAAK,EAAE,cAAc,CAAC,QAYlF;IAED,sBA6CC;IAED,kBAIC;IAED,iCAOC;IAED,iCASC;IAED,qFAWC;;CACJ;;;;iCAv7BY,eAAe,GAAG,YAAY,GAAG,QAAQ,GAAG,gBAAgB;4BAlC7C,uBAAuB;4BA2BP,uBAAuB;qBAZ9C,qBAAqB;wBAIlB,yBAAyB;yCARR,yDAAyD;oBAYvD,oBAAoB;wBAdvC,qBAAqB;oBAXzB,uBAAuB;qBAStB,oBAAoB"}
+{"version":3,"file":"genomeSpy.d.ts","sourceRoot":"","sources":["../../src/genomeSpy.js"],"names":[],"mappings":"AA8CA;IACI;;;;;OAKG;IAEH;;;;;OAKG;IACH,uBAJW,WAAW,qDAEX,OAAO,qBAAqB,EAAE,YAAY,EA6FpD;IA1FG,uBAA0B;IAC1B,oDAAsB;IAItB,6BAA6B;IAC7B,uBADW,CAAC,MAAM,IAAI,CAAC,EAAE,CACM;IAE/B,sCAAsC;IACtC,wCAAgB;IAEhB,yBAAoC;IAEpC,4CAA4C;IAC5C,oBADW,QAAU,MAAM,KAAE,MAAM,EAAE,CAAC,EAAE,CACZ;IAE5B,mBAAoD;IAEpD,0BAA0B;IAC1B,aADW,WAAW,CACM;IAE5B;;;;;OAKG;IACH,qEAF0B,OAAO,CAE8B;IAE/D,2CAA2C;IAC3C,mBADW,4BAA4B,CACL;IAClC,2CAA2C;IAC3C,iBADW,4BAA4B,CACP;IAEhC,oDAAoD;IACpD,6BAAgC;IAEhC;;;OAGG;IACH,eAFU;QAAE,IAAI,EAAE,OAAO,iBAAiB,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,OAAO,oBAAoB,EAAE,KAAK,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAEpF;IAE9B,uBAA+C;IAE/C;;;OAGG;IACH,oBAFU,IAAI,MAAM,EAAE,QAAU,aAAa,KAAE,IAAI,CAAC,EAAE,CAAC,CAEpB;IAEnC;;;;;;OAMG;IACH,yCAFkC,GAAG,KAAK,IAAI,GAEd;IAEhC;;;OAGG;IACH,kDAFkC,GAAG,KAAK,IAAI,GAEL;IAEzC,oFAAoF;IACpF,iBADW,OAAO,MAAM,EAAE,OAAO,6BAA6B,EAAE,cAAc,CAAC,CAK9E;IAED,mBAAmB;IACnB,2CAAyB;IAEzB;;;;OAIG;IACH;gBAF8B,OAAO,wBAAwB,EAAE,iBAAiB;iBAAW,MAAM;OAEnE;IAE9B;;OAEG;IACH,wBAFU,WAAW,CAEkB;IAEvC,oBAAoB;IACpB,kBADW,KAAK,CACiB;IA2CrC;;;OAGG;IACH,2CAFkB,MAAM,KAAK,GAAG,EAAE,QAIjC;IAED;;OAEG;IACH,+BAFW,MAAM,YAShB;IAED;;;;OAIG;IACH,sBAHW,MAAM,QACN,GAAG,EAAE,QAaf;IAED;;;;;OAKG;IACH,gBAHW,kBAAkB,YAClB,GAAG,QAQb;IAED;;;OAGG;IACH,iCAqDC;IA0DG,uBAQC;IAGD,mCAGE;IAOF,sCAEE;IAGF,iBAAyC;IAW7C;;OAEG;IACH,gBAuBC;IAED,sCA6MC;IAED;;;OAGG;IACH,UAFa,QAAQ,OAAO,CAAC,CA6B5B;IAED,4BA8JC;IAvIe,iCAAoC;IAyIpD;;;OAGG;IACH,kBAHW,MAAM,KACN,MAAM,QAqEhB;IAED;;;;;;;OAOG;IACH,oDAHuB,QAAQ,MAAM,GAAG,WAAW,GAAG,OAAO,KAAK,EAAE,cAAc,CAAC,QAYlF;IAED,sBA6CC;IAED,kBAIC;IAED,iCAOC;IAED,iCASC;IAED,qFAWC;;CACJ;;;;iCAj8BY,eAAe,GAAG,YAAY,GAAG,QAAQ,GAAG,gBAAgB;4BAP7B,uBAAuB;qBAZ9C,qBAAqB;wBAIlB,yBAAyB;yCARR,yDAAyD;oBAYvD,oBAAoB;kBAT7C,wBAAwB;wBALlB,qBAAqB;oBAVzB,uBAAuB;qBAQtB,oBAAoB"}

package/dist/src/genomeSpy.js

@@ -6,7 +6,6 @@ import SPINNER from "./img/90-ring-with-bg.svg";
 import css from "./styles/genome-spy.css.js";
 import Tooltip from "./utils/ui/tooltip.js";
 
-import AccessorFactory from "./encoder/accessor.js";
 import {
     checkForDuplicateScaleNames,
     setImplicitScaleNames,
@@ -71,7 +70,6 @@ export default class GenomeSpy {
         /** Root level configuration object */
         this.spec = spec;
 
-        this.accessorFactory = new AccessorFactory();
         this.viewFactory = new ViewFactory();
 
         /** @type {(function(string):object[])[]} */
@@ -148,6 +146,9 @@ export default class GenomeSpy {
          * @type {HTMLElement}
          */
         this._inputBindingContainer = undefined;
+
+        /** @type {Point} */
+        this._mouseDownCoords = undefined;
     }
 
     get #canvasWrapper() {
@@ -434,7 +435,6 @@ export default class GenomeSpy {
         /** @type {import("./types/viewContext.js").default} */
         const context = {
             dataFlow: new DataFlow(),
-            accessorFactory: this.accessorFactory,
             glHelper: this._glHelper,
             animator: this.animator,
             genomeStore: this.genomeStore,
@@ -785,7 +785,14 @@ export default class GenomeSpy {
                         ?.forEach((listener) => listener(e));
                 }
 
-                dispatchEvent(event);
+                if (
+                    event.type != "click" ||
+                    // Suppress click events if the mouse has been dragged
+                    this._mouseDownCoords?.subtract(Point.fromMouseEvent(event))
+                        .length < 3
+                ) {
+                    dispatchEvent(event);
+                }
             }
         };
 
@@ -799,7 +806,9 @@ export default class GenomeSpy {
             "contextmenu",
         ].forEach((type) => canvas.addEventListener(type, listener));
 
-        canvas.addEventListener("mousedown", () => {
+        canvas.addEventListener("mousedown", (/** @type {MouseEvent} */ e) => {
+            this._mouseDownCoords = Point.fromMouseEvent(e);
+
             document.addEventListener(
                 "mouseup",
                 () => this.tooltip.popEnabledState(),
@@ -972,7 +981,7 @@ export default class GenomeSpy {
         /** @type {UnitView[]} */
         const views = [];
         this.viewRoot.visit((view) => {
-            if (view instanceof UnitView && view.getAccessor("search")) {
+            if (view instanceof UnitView && view.getDataAccessor("search")) {
                 views.push(view);
             }
         });

package/dist/src/gl/dataToVertices.d.ts

@@ -11,20 +11,18 @@ export class GeometryBuilder {
      */
     /**
      * @param {object} object
-     * @param {Record<string, Encoder>} object.encoders
+     * @param {Record<import("../spec/channel.js").Channel, Encoder>} object.encoders
      * @param {string[]} [object.attributes]
      * @param {number} [object.numVertices] If the number of data items is known, a
      *      preallocated TypedArray is used
      */
     constructor({ encoders, numVertices, attributes }: {
-        encoders: Record<string, import("../types/encoder.js").Encoder>;
+        encoders: Record<import("../spec/channel.js").Channel, import("../types/encoder.js").Encoder>;
         attributes?: string[];
         numVertices?: number;
     });
-    encoders: Record<string, import("../types/encoder.js").Encoder>;
-    variableEncoders: {
-        [k: string]: import("../types/encoder.js").Encoder;
-    };
+    encoders: Record<import("../spec/channel.js").Channel, import("../types/encoder.js").Encoder>;
+    variableEncoders: Record<import("../spec/channel.js").Channel, import("../types/encoder.js").Encoder>;
     allocatedVertices: number;
     variableBuilder: ArrayBuilder;
     lastOffset: number;
@@ -59,8 +57,8 @@ export class GeometryBuilder {
      */
     addToXIndex(datum: import("../data/flowNode.js").Datum): void;
     xIndexer: {
-        (datum: any, startVertexIndex: number, endVertexIndex: number): void;
-        getIndex: () => import("../utils/binnedIndex.js").Lookup; /** @param {Encoder} encoder */
+        (datum: import("../data/flowNode.js").Datum, startVertexIndex: number, endVertexIndex: number): void;
+        getIndex: () => import("../utils/binnedIndex.js").Lookup;
     };
     toArrays(): {
         /** @type {Record<string, {data: Uint16Array | Int16Array | Uint32Array | Int32Array | Float32Array, numComponents: number, divisor?: number}>} */

package/dist/src/gl/dataToVertices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataToVertices.d.ts","sourceRoot":"","sources":["../../../src/gl/dataToVertices.js"],"names":[],"mappings":"AAgBA;;;;;GAKG;AACH;IACI;;;OAGG;IAEH;;;;;;OAMG;IACH;;qBAJW,MAAM,EAAE;sBACR,MAAM;OAgFhB;IA5EG,gEAAwB;IAGxB;;MAKC;IAQD,0BAAoC;IAEpC,8BAAoD;IAsDpD,mBAAmB;IAEnB,yFAAyF;IACzF,UADW,IAAI,GAAG,EAAE,UAAU,CAAC,CACkB;IAGrD;;;;OAIG;IACH,mBAFW,GAAG,QAcb;IAED;;OAEG;IACH,oBAFW,IAAI,GAAG,EAAE,MAAM,EAAE,CAAC,QAM5B;IAED;;;OAGG;IACH,cAHW,GAAG,QACH,MAAM,EAAE,kCAYlB;IAED;;;;OAIG;IACH,sBAJW,OAAO,qBAAqB,EAAE,IAAI,OAClC,MAAM,OACN,MAAM,QA+DhB;IAED;;;;;OAKG;IACH,mBAFW,OAAO,qBAAqB,EAAE,KAAK,QAI7C;IA/DO;;kEAcJ,+BAA+B;MAdF;IAiEjC;QAEQ,kJAAkJ;gBAAvI,OAAO,MAAM,EAAE;YAAC,IAAI,EAAE,WAAW,GAAG,UAAU,GAAG,WAAW,GAAG,UAAU,GAAG,YAAY,CAAC;YAAC,aAAa,EAAE,MAAM,CAAC;YAAC,OAAO,CAAC,EAAE,MAAM,CAAA;SAAC,CAAC;QAE9I,8BAA8B;;QAE9B,8CAA8C;;;MAIrD;CACJ;AAED;IACI;;;;;;OAMG;IACH;;oBAHW,MAAM,EAAE;mBACR,MAAM;OA+BhB;IAnBG,qBAkBW;CA8BlB;AAED;IACI;;;;;;;;;OASG;IACH;;oBANW,MAAM,EAAE;gCACR,MAAM;uBAEN,MAAM,EAAE;mBACR,MAAM;OAwBhB;IARG,uBAAgC;IAEhC,8BAA8D;IAE9D,6CAA+D;IAC/D,4CAA6D;CA6CpE;AAED;IACI;;;;;;OAMG;IACH;;oBAHW,MAAM,EAAE;mBACR,MAAM;OAShB;CACJ;AAED;IACI;;;;;OAKG;IACH;;oBAHW,MAAM,EAAE;mBACR,MAAM;OAShB;CAYJ;AAED;IACI;;;;;;;;;OASG;IACH;;oBANW,MAAM,EAAE;qBACR,OAAO,2BAA2B,EAAE,aAAa;oBACjD,OAAO,MAAM,EAAE,GAAG,CAAC;wBACnB,MAAM;sBACN,OAAO;OA8CjB;IA/BG,4DAA2B;IAC3B,2DAA0B;IAE1B,gCAA4B;IAQ5B,qCAAqC;IACrC,sBADmB,GAAG,KAAK,MAAM,CAMf;IAElB,oDAGC;IACD,qDAGC;IAED,8CAAiE;CAgJxE;;;;;;;;YA1mBS,MAAM;;;;WACN,MAAM;YACN,OAAO,yBAAyB,EAAE,MAAM;;yBAjBzB,mBAAmB"}
+{"version":3,"file":"dataToVertices.d.ts","sourceRoot":"","sources":["../../../src/gl/dataToVertices.js"],"names":[],"mappings":"AAgBA;;;;;GAKG;AACH;IACI;;;OAGG;IAEH;;;;;;OAMG;IACH;;qBAJW,MAAM,EAAE;sBACR,MAAM;OAyFhB;IArFG,8FAAwB;IAIxB,sGAQK;IAQL,0BAAoC;IAEpC,8BAAoD;IA2DpD,mBAAmB;IAEnB,yFAAyF;IACzF,UADW,IAAI,GAAG,EAAE,UAAU,CAAC,CACkB;IAGrD;;;;OAIG;IACH,mBAFW,GAAG,QAcb;IAED;;OAEG;IACH,oBAFW,IAAI,GAAG,EAAE,MAAM,EAAE,CAAC,QAM5B;IAED;;;OAGG;IACH,cAHW,GAAG,QACH,MAAM,EAAE,kCAYlB;IAED;;;;OAIG;IACH,sBAJW,OAAO,qBAAqB,EAAE,IAAI,OAClC,MAAM,OACN,MAAM,QAgEhB;IAED;;;;;OAKG;IACH,mBAFW,OAAO,qBAAqB,EAAE,KAAK,QAI7C;IAhEO;;;MAAyB;IAkEjC;QAEQ,kJAAkJ;gBAAvI,OAAO,MAAM,EAAE;YAAC,IAAI,EAAE,WAAW,GAAG,UAAU,GAAG,WAAW,GAAG,UAAU,GAAG,YAAY,CAAC;YAAC,aAAa,EAAE,MAAM,CAAC;YAAC,OAAO,CAAC,EAAE,MAAM,CAAA;SAAC,CAAC;QAE9I,8BAA8B;;QAE9B,8CAA8C;;;MAIrD;CACJ;AAED;IACI;;;;;;OAMG;IACH;;oBAHW,MAAM,EAAE;mBACR,MAAM;OA+BhB;IAnBG,qBAkBW;CA8BlB;AAED;IACI;;;;;;;;;OASG;IACH;;oBANW,MAAM,EAAE;gCACR,MAAM;uBAEN,MAAM,EAAE;mBACR,MAAM;OAwBhB;IARG,uBAAgC;IAEhC,8BAA8D;IAE9D,6CAA+D;IAC/D,4CAA6D;CA6CpE;AAED;IACI;;;;;;OAMG;IACH;;oBAHW,MAAM,EAAE;mBACR,MAAM;OAShB;CACJ;AAED;IACI;;;;;OAKG;IACH;;oBAHW,MAAM,EAAE;mBACR,MAAM;OAShB;CAYJ;AAED;IACI;;;;;;;;;OASG;IACH;;oBANW,MAAM,EAAE;qBACR,OAAO,2BAA2B,EAAE,aAAa;oBACjD,OAAO,MAAM,EAAE,GAAG,CAAC;wBACnB,MAAM;sBACN,OAAO;OA6CjB;IA9BG,4DAA2B;IAC3B,2DAA0B;IAE1B,gCAA4B;IAO5B,qCAAqC;IACrC,sBADmB,GAAG,KAAK,MAAM,CAMf;IAElB,oDAGC;IACD,qDAGC;IAED,8CAAiE;CAgJxE;;;;;;;;YAnnBS,MAAM;;;;WACN,MAAM;YACN,OAAO,yBAAyB,EAAE,MAAM;;yBAjBzB,mBAAmB"}

package/dist/src/gl/dataToVertices.js

@@ -7,12 +7,12 @@ import { createBinningRangeIndexer } from "../utils/binnedIndex.js";
 import { isValueDef } from "../encoder/encoder.js";
 import {
     dedupeEncodingFields,
-    isHighPrecisionScale,
-    isLargeGenome,
+    getAttributeAndArrayTypes,
     makeAttributeName,
     splitLargeHighPrecision,
 } from "./glslScaleGenerator.js";
-import { isContinuous, isDiscrete } from "vega-scale";
+import { isContinuous } from "vega-scale";
+import createIndexer from "../utils/indexer.js";
 
 /**
  * @typedef {object} RangeEntry Represents a location of a vertex subset
@@ -28,7 +28,7 @@ export class GeometryBuilder {
 
     /**
      * @param {object} object
-     * @param {Record<string, Encoder>} object.encoders
+     * @param {Record<import("../spec/channel.js").Channel, Encoder>} object.encoders
      * @param {string[]} [object.attributes]
      * @param {number} [object.numVertices] If the number of data items is known, a
      *      preallocated TypedArray is used
@@ -37,12 +37,16 @@ export class GeometryBuilder {
         this.encoders = encoders;
 
         // Encoders for variable channels
-        this.variableEncoders = Object.fromEntries(
-            Object.entries(encoders).filter(
-                ([channel, e]) =>
-                    attributes.includes(channel) && e && e.scale && !e.constant
-            )
-        );
+
+        this.variableEncoders =
+            /** @type {Record<import("../spec/channel.js").Channel, Encoder>} */ (
+                Object.fromEntries(
+                    Object.entries(encoders).filter(
+                        ([channel, e]) =>
+                            attributes.includes(channel) && e && !e.constant
+                    )
+                )
+            );
 
         const dedupedEncodingFields = [
             ...dedupeEncodingFields(encoders).entries(),
@@ -56,6 +60,11 @@ export class GeometryBuilder {
 
         // Create converters and updaters for all variable channels.
         for (const [channel, ce] of Object.entries(this.variableEncoders)) {
+            const accessor = ce.dataAccessor;
+            if (!accessor) {
+                continue;
+            }
+
             // Only add the first of the shared channels as all the rest are same
             // For example, if both x and x2 are using the same field, only x is
             // added to the array builder with the name "x_x2".
@@ -66,13 +75,19 @@ export class GeometryBuilder {
                 continue;
             }
 
-            const accessor = ce.accessor;
+            const numberAccessor = accessor.asNumberAccessor();
+            const scale = ce.scale;
 
-            const hp = isHighPrecisionScale(ce.scale.type);
-            const largeHp = hp && isLargeGenome(ce.scale.domain());
+            const { largeHp, arrayConstructor, discrete, numComponents } =
+                getAttributeAndArrayTypes(scale, channel);
             const largeHpArray = [0, 0];
 
-            const indexer = ce.indexer;
+            /** @type {ReturnType<typeof createIndexer>} */
+            let indexer;
+            if (scale && discrete && "domain" in scale) {
+                indexer = createIndexer();
+                indexer.addAll(scale.domain());
+            }
 
             /**
              * Discrete variables both numeric and strings must be "indexed",
@@ -84,8 +99,9 @@ export class GeometryBuilder {
             const f = indexer
                 ? (d) => indexer(accessor(d))
                 : largeHp
-                ? (d) => splitLargeHighPrecision(accessor(d), largeHpArray)
-                : accessor;
+                ? (d) =>
+                      splitLargeHighPrecision(numberAccessor(d), largeHpArray)
+                : numberAccessor;
 
             const attributeName = sharedChannels
                 ? makeAttributeName(sharedChannels)
@@ -93,16 +109,9 @@ export class GeometryBuilder {
 
             this.variableBuilder.addConverter(attributeName, {
                 f,
-                numComponents: largeHp ? 2 : 1,
+                numComponents,
                 arrayReference: largeHp ? largeHpArray : undefined,
-                targetArrayType:
-                    channel == "uniqueId"
-                        ? Uint32Array
-                        : isDiscrete(ce.scale.type)
-                        ? Uint16Array
-                        : hp
-                        ? Uint32Array
-                        : Float32Array,
+                targetArrayType: arrayConstructor,
             });
         }
 
@@ -190,9 +199,10 @@ export class GeometryBuilder {
         const xe = getContinuousEncoder(this.variableEncoders.x);
         const x2e = getContinuousEncoder(this.variableEncoders.x2);
 
-        if (xe) {
-            const xa = xe.accessor;
-            const x2a = x2e ? x2e.accessor : xa;
+        // Only index variable data
+        if (xe && !xe.constant && (!x2e || !x2e.constant)) {
+            const xa = xe.dataAccessor.asNumberAccessor();
+            const x2a = x2e ? x2e.dataAccessor.asNumberAccessor() : xa;
 
             /** @type {[number, number]} */
             const dataDomain = [xa(data[lo]), x2a(data[hi - 1])];
@@ -469,10 +479,9 @@ export class TextVertexBuilder extends GeometryBuilder {
 
         const e = encoders;
 
-        const channelDef =
-            /** @type {import("../spec/channel.js").TextDef<string>} */ (
-                e.text.channelDef
-            );
+        const channelDef = /** @type {import("../spec/channel.js").TextDef} */ (
+            e.text.channelDef
+        );
         /** @type {(value: any) => string} */
         this.numberFormat =
             !isValueDef(channelDef) &&
@@ -522,7 +531,7 @@ export class TextVertexBuilder extends GeometryBuilder {
             // alphabetic
         }
 
-        const accessor = this.encoders.text.accessor || this.encoders.text; // accessor or constant value
+        const accessor = this.encoders.text; // accessor or constant value
 
         const vertexCoord = [0, 0];
         this.updateVertexCoord(vertexCoord);

package/dist/src/gl/glslScaleGenerator.d.ts

@@ -1,41 +1,92 @@
 /// <reference types="external-typings/internmap.js" />
+/**
+ *
+ * @param {Channel} channel
+ * @param {number} conditionNumber
+ * @returns {string}
+ */
+export function makeAccessorFunctionName(channel: Channel, conditionNumber: number): string;
+/**
+ * @typedef {object} AccessorParts
+ * @prop {Channel} channel
+ * @prop {string} accessorGlsl
+ * @prop {string} accessorFunctionName
+ * @prop {string} [attributeName]
+ * @prop {string} [attributeGlsl]
+ * @prop {string} [uniformName]
+ * @prop {string} [uniformGlsl]
+ * @prop {(x: any) => any} [adjuster]
+ */
 /**
  * Generates GLSL code for a constant value.
  *
  * @param {Channel} channel
+ * @param {number} conditionNumber
  * @param {number | number[] | string | boolean} value
+ * @returns {AccessorParts}
  */
-export function generateConstantValueGlsl(channel: Channel, value: number | number[] | string | boolean): string;
+export function generateConstantValueGlsl(channel: Channel, conditionNumber: number, value: number | number[] | string | boolean): AccessorParts;
 /**
  * Generates GLSL code for a dynamic, parameter-driven values. These are mainly
  * used as dynamic mark properties that map to encoding channels.
  *
  * @param {Channel} channel
+ * @param {number} conditionNumber
+ * @returns {AccessorParts}
  */
-export function generateDynamicValueGlslAndUniform(channel: Channel): {
-    channel: import("../spec/channel.js").Channel;
-    uniformName: string;
-    uniformGlsl: string;
-    scaleGlsl: string;
-    adjuster: (x: any) => any;
-};
+export function generateDynamicValueGlslAndUniform(channel: Channel, conditionNumber: number): AccessorParts;
+/**
+ * @param {Channel} channel
+ * @param {any} scale
+ * @param {number} conditionNumber
+ * @param {Channel[]} [sharedQuantitativeChannels] Channels that share the same quantitative field
+ * @returns {AccessorParts}
+ */
+export function generateDataGlsl(channel: Channel, scale: any, conditionNumber: number, sharedQuantitativeChannels?: Channel[]): AccessorParts;
+/**
+ * @param {Channel} channel
+ * @param {any} scale
+ * @param {number} conditionNumber
+ * @returns {AccessorParts}
+ */
+export function generateDatumGlslAndUniform(channel: Channel, scale: any, conditionNumber: number): AccessorParts;
 /**
  *
  * @param {Channel} channel
- * @param {import("../view/scaleResolution.js").default} scaleResolution TODO: typing
+ * @param {any} scale
  * @param {import("../spec/channel.js").ChannelDef} channelDef
- * @param {Channel[]} [sharedQuantitativeChannels] Channels that share the same quantitative field
  */
-export function generateScaleGlsl(channel: Channel, scaleResolution: import("../view/scaleResolution.js").default, channelDef: import("../spec/channel.js").ChannelDef, sharedQuantitativeChannels?: Channel[]): {
-    attributeName: string;
-    attributeGlsl: string;
-    markUniformGlsl: string;
+export function generateScaleGlsl(channel: Channel, scale: any, channelDef: import("../spec/channel.js").ChannelDef): {
     glsl: string;
     domainUniformName: string;
     domainUniform: string;
-    rangeName: string;
+    rangeUniformName: string;
     rangeUniform: string;
 };
+/**
+ *
+ * @param {Channel} channel
+ * @param {import("../types/encoder.js").Accessor[]} accessors
+ */
+export function generateConditionalEncoderGlsl(channel: Channel, accessors: import("../types/encoder.js").Accessor[]): string;
+/**
+ * @param {Channel} channel
+ */
+export function getScaledDataTypeForChannel(channel: Channel): "float" | "vec3" | "uint";
+/**
+ *
+ * @param {import("../types/encoder.js").VegaScale} scale
+ * @param {import("../spec/channel.js").Channel} channel
+ */
+export function getAttributeAndArrayTypes(scale: import("../types/encoder.js").VegaScale, channel: import("../spec/channel.js").Channel): {
+    attributeType: string;
+    arrayConstructor: Uint32ArrayConstructor | Uint16ArrayConstructor | Float32ArrayConstructor;
+} & {
+    numComponents: number;
+    discrete: boolean;
+    hp: boolean;
+    largeHp: boolean;
+};
 /**
  * True if scale needs more than 24 bits (float32) of precision.
  *
@@ -76,14 +127,32 @@ export function dedupeEncodingFields(encoders: Partial<Record<import("../spec/ch
  * @param {import("../spec/channel.js").Channel | import("../spec/channel.js").Channel[]} channel
  */
 export function makeAttributeName(channel: import("../spec/channel.js").Channel | import("../spec/channel.js").Channel[]): string;
+/**
+ * @param {string[]} conditions
+ * @param {string[]} statements
+ * @returns {string}
+ */
+export function ifElseGlsl(conditions: string[], statements: string[]): string;
 export const ATTRIBUTE_PREFIX: "attr_";
 export const DOMAIN_PREFIX: "uDomain_";
 export const RANGE_PREFIX: "range_";
+export const ACCESSOR_FUNCTION_PREFIX: "accessor_";
 export const SCALE_FUNCTION_PREFIX: "scale_";
 export const SCALED_FUNCTION_PREFIX: "getScaled_";
 export const RANGE_TEXTURE_PREFIX: "uRangeTexture_";
+export const PARAM_PREFIX: "uParam_";
 export function getRangeForGlsl(scale: any, channel: Channel): number[];
 export type Channel = import("../spec/channel.js").Channel;
+export type AccessorParts = {
+    channel: Channel;
+    accessorGlsl: string;
+    accessorFunctionName: string;
+    attributeName?: string;
+    attributeGlsl?: string;
+    uniformName?: string;
+    uniformGlsl?: string;
+    adjuster?: (x: any) => any;
+};
 /**
  * Turns a number or number array to float or vec[234] string.
  */

package/dist/src/gl/glslScaleGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glslScaleGenerator.d.ts","sourceRoot":"","sources":["../../../src/gl/glslScaleGenerator.js"],"names":[],"mappings":";AAqDA;;;;;GAKG;AACH,mDAHW,OAAO,SACP,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,OAAO,UAoC9C;AAED;;;;;GAKG;AACH,4DAFW,OAAO;;;;;kBAIC,GAAG,KAAK,GAAG;EA0B7B;AAED;;;;;;GAMG;AAEH,2CANW,OAAO,mBACP,OAAO,4BAA4B,EAAE,OAAO,cAC5C,OAAO,oBAAoB,EAAE,UAAU,+BACvC,OAAO,EAAE;;;;;;;;;EAiTnB;AAgHD;;;;GAIG;AACH,2CAFW,MAAM,WAIhB;AAED;;;;GAIG;AACH,sCAFW,MAAM,EAAE,WAIlB;AAMD;;;GAGG;AACH,sCAHW,MAAM,QACN,MAAM,EAAE,YAYlB;AAED;;;GAGG;AACH,2CAHW,MAAM,QACN,MAAM,EAAE,YAUlB;AAYD;;GAEG;AACH,qDAFW,MAAM,EAAE,YAIlB;AAED;;GAEG;AAEH;;;;;GAKG;AACH,+CAFW,QAAQ,OAAO,OAAO,oBAAoB,EAAE,OAAO,EAAE,OAAO,qBAAqB,EAAE,OAAO,CAAC,CAAC,+DA4BtG;AAED;;GAEG;AACH,2CAFW,OAAO,oBAAoB,EAAE,OAAO,GAAG,OAAO,oBAAoB,EAAE,OAAO,EAAE,UAIvF;AAloBD,uCAAwC;AACxC,uCAAwC;AACxC,oCAAqC;AACrC,6CAA8C;AAC9C,kDAAmD;AACnD,oDAAqD;AA6oB9C,uCAJI,GAAG,WACH,OAAO,GACL,MAAM,EAAE,CAQF;sBA7oBN,OAAO,oBAAoB,EAAE,OAAO;;;;8BAubpC,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE;;;;uBAsJhD,CAAC,MAAM,EAAE,OAAO,CAAC;0BA5lBJ,WAAW"}
+{"version":3,"file":"glslScaleGenerator.d.ts","sourceRoot":"","sources":["../../../src/gl/glslScaleGenerator.js"],"names":[],"mappings":";AAqDA;;;;;GAKG;AACH,kDAJW,OAAO,mBACP,MAAM,GACJ,MAAM,CAIlB;AAED;;;;;;;;;;GAUG;AAEH;;;;;;;GAOG;AACH,mDALW,OAAO,mBACP,MAAM,SACN,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,OAAO,GAClC,aAAa,CA4CzB;AAED;;;;;;;GAOG;AACH,4DAJW,OAAO,mBACP,MAAM,GACJ,aAAa,CAkCzB;AAED;;;;;;GAMG;AACH,0CANW,OAAO,SACP,GAAG,mBACH,MAAM,+BACN,OAAO,EAAE,GACP,aAAa,CA+BzB;AACD;;;;;GAKG;AACH,qDALW,OAAO,SACP,GAAG,mBACH,MAAM,GACJ,aAAa,CAyBzB;AAED;;;;;GAKG;AAEH,2CALW,OAAO,SACP,GAAG,cACH,OAAO,oBAAoB,EAAE,UAAU;;;;;;EAwQjD;AAED;;;;GAIG;AACH,wDAHW,OAAO,aACP,OAAO,qBAAqB,EAAE,QAAQ,EAAE,UAuClD;AAmED;;GAEG;AACH,qDAFW,OAAO,6BAQjB;AA+CD;;;;GAIG;AACH,iDAHW,OAAO,qBAAqB,EAAE,SAAS,WACvC,OAAO,oBAAoB,EAAE,OAAO;mBAQjB,MAAM;sBAAoB,sBAAsB,GAAG,sBAAsB,GAAG,uBAAuB;;;;;;EAkBhI;AAED;;;;GAIG;AACH,2CAFW,MAAM,WAIhB;AAED;;;;GAIG;AACH,sCAFW,MAAM,EAAE,WAIlB;AAMD;;;GAGG;AACH,sCAHW,MAAM,QACN,MAAM,EAAE,YAYlB;AAED;;;GAGG;AACH,2CAHW,MAAM,QACN,MAAM,EAAE,YAUlB;AAYD;;GAEG;AACH,qDAFW,MAAM,EAAE,YAIlB;AAED;;GAEG;AAEH;;;;;GAKG;AACH,+CAFW,QAAQ,OAAO,OAAO,oBAAoB,EAAE,OAAO,EAAE,OAAO,qBAAqB,EAAE,OAAO,CAAC,CAAC,+DA4BtG;AAED;;GAEG;AACH,2CAFW,OAAO,oBAAoB,EAAE,OAAO,GAAG,OAAO,oBAAoB,EAAE,OAAO,EAAE,UAIvF;AAwBD;;;;GAIG;AACH,uCAJW,MAAM,EAAE,cACR,MAAM,EAAE,GACN,MAAM,CAgClB;AAr1BD,uCAAwC;AACxC,uCAAwC;AACxC,oCAAqC;AACrC,mDAAoD;AACpD,6CAA8C;AAC9C,kDAAmD;AACnD,oDAAqD;AACrD,qCAAsC;AAmyB/B,uCAJI,GAAG,WACH,OAAO,GACL,MAAM,EAAE,CAQF;sBAnyBN,OAAO,oBAAoB,EAAE,OAAO;;aA+BvC,OAAO;kBACP,MAAM;0BACN,MAAM;oBACN,MAAM;oBACN,MAAM;kBACN,MAAM;kBACN,MAAM;mBACF,GAAG,KAAK,GAAG;;;;;8BA6fZ,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE;;;;uBAgMhD,CAAC,MAAM,EAAE,OAAO,CAAC;0BApvBJ,WAAW"}