@genome-spy/core 0.61.1 → 0.62.1

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/gl/arrayBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"arrayBuilder.d.ts","sourceRoot":"","sources":["../../../src/gl/arrayBuilder.js"],"names":[],"mappings":"AASA;;;;;;;;GAQG;AACH;IAKI;;;OAGG;IACH,kBAFW,MAAM,EAehB;IAZG,aAAgB;IAEhB,mJAAmJ;IACnJ;;kBADkC,WAAW,GAAG,UAAU,GAAG,WAAW,GAAG,UAAU,GAAG,YAAY;2BAAiB,MAAM;sBAAY,MAAM;;MAC7H;IAEhB,kCAAkC;IAClC,SADW,CAAC,MAAW,IAAI,CAAC,EAAE,CACb;IAEjB,qCAAqC;IACrC,cADW,CAAC,CAAS,IAAG,EAAH,GAAG,KAAE,IAAI,CAAC,EAAE,CACX;IAEtB,oBAAoB;IAGxB,kBAOC;IAED;;;;OAIG;IACH,wBAHW,MAAM,YACN,iBAAiB,QAe3B;IAED;;;;;;;OAOG;IACH,6BANW,MAAM,iBACN,MAAM,oBACN,OAAO,WAAW,GAAG,OAAO,UAAU,GAAG,OAAO,WAAW,GAAG,OAAO,UAAU,GAAG,OAAO,YAAY,mBACrG,MAAM,EAAE,GACP,CAAS,IAAe,EAAf,MAAM,GAAC,MAAM,EAAE,QAAC,CAoFpC;IAED,gBAEC;IAED;;OAEG;IACH,uBAFW,MAAM,QAIhB;IAuDD;;;OAGG;IACH,qBAFW,MAAM,QAKhB;;CACJ;;;;;;;;;OA9NS,CAAS,IAAM,EAAN,MAAM,KAAE,GAAG;;;;qBACpB,MAAM,EAAE;oBACR,MAAM;;;;sBACN,OAAO,WAAW,GAAG,OAAO,UAAU,GAAG,OAAO,WAAW,GAAG,OAAO,UAAU,GAAG,OAAO,YAAY"}
+{"version":3,"file":"arrayBuilder.d.ts","sourceRoot":"","sources":["../../../src/gl/arrayBuilder.js"],"names":[],"mappings":"AAQA;;;;;;;;GAQG;AACH;IAKI;;;OAGG;IACH,kBAFW,MAAM,EAehB;IAZG,aAAgB;IAEhB,mJAAmJ;IACnJ;;kBADkC,WAAW,GAAG,UAAU,GAAG,WAAW,GAAG,UAAU,GAAG,YAAY;2BAAiB,MAAM;sBAAY,MAAM;;MAC7H;IAEhB,kCAAkC;IAClC,SADW,CAAC,MAAW,IAAI,CAAC,EAAE,CACb;IAEjB,qCAAqC;IACrC,cADW,CAAC,CAAS,IAAG,EAAH,GAAG,KAAE,IAAI,CAAC,EAAE,CACX;IAEtB,oBAAoB;IAGxB,kBAOC;IAED;;;;OAIG;IACH,wBAHW,MAAM,YACN,iBAAiB,QAe3B;IAED;;;;;;;OAOG;IACH,6BANW,MAAM,iBACN,MAAM,oBACN,OAAO,WAAW,GAAG,OAAO,UAAU,GAAG,OAAO,WAAW,GAAG,OAAO,UAAU,GAAG,OAAO,YAAY,mBACrG,MAAM,EAAE,GACP,CAAS,IAAe,EAAf,MAAM,GAAC,MAAM,EAAE,QAAC,CAoFpC;IAED,gBAEC;IAED;;OAEG;IACH,uBAFW,MAAM,QAIhB;IAuDD;;;OAGG;IACH,qBAFW,MAAM,QAKhB;;CACJ;;;;;;;;;OA9NS,CAAS,IAAM,EAAN,MAAM,KAAE,GAAG;;;;qBACpB,MAAM,EAAE;oBACR,MAAM;;;;sBACN,OAAO,WAAW,GAAG,OAAO,UAAU,GAAG,OAAO,WAAW,GAAG,OAAO,UAAU,GAAG,OAAO,YAAY"}

package/dist/src/gl/arrayBuilder.js

@@ -1,5 +1,4 @@
 import { isNumber } from "vega-util";
-import { ATTRIBUTE_PREFIX } from "./glslScaleGenerator.js";
 
 /** Unrolling appears to give a 20% performance boost on Chrome but compiling the
  * dynamically generated code takes time and is thus not great for small dynamic data.
@@ -56,7 +55,7 @@ export default class ArrayBuilder {
      */
     addConverter(attribute, metadata) {
         const updater = this.createUpdater(
-            ATTRIBUTE_PREFIX + attribute,
+            attribute,
             metadata.numComponents || 1,
             metadata.targetArrayType ?? Float32Array,
             metadata.arrayReference

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,mDALG;QAAsE,QAAQ,EAAtE,MAAM,CAAC,OAAO,oBAAoB,EAAE,OAAO,wCAAU;QACnC,UAAU,GAA5B,MAAM,EAAE;QACQ,WAAW,GAA3B,MAAM;KAEhB,EAuFA;IArFG,8FAAwB;IAIxB,sGAQK;IAQL,0BAAoC;IAEpC,8BAAoD;IA2DpD,mBAAmB;IAEnB,yFAAyF;IACzF,UADW,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CACkB;IAGrD;;;;OAIG;IACH,mBAFW,GAAG,QAcb;IAED;;OAEG;IACH,oBAFW,GAAG,CAAC,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,MAAM,CAAC,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,gDAJG;QAAwC,QAAQ,EAAxC,MAAM,CAAC,MAAM,wCAAU;QACN,UAAU,EAA3B,MAAM,EAAE;QACQ,QAAQ,GAAxB,MAAM;KAChB,EA8BA;IAnBG,qBAkBW;CA8BlB;AAED;IACI;;;;;;;;;OASG;IACH,sFAPG;QAAwC,QAAQ,EAAxC,MAAM,CAAC,MAAM,wCAAU;QACN,UAAU,EAA3B,MAAM,EAAE;QACQ,qBAAqB,GAArC,MAAM;QAEY,YAAY,GAA9B,MAAM,EAAE;QACQ,QAAQ,GAAxB,MAAM;KAChB,EAuBA;IARG,uBAAgC;IAEhC,8BAA8D;IAE9D,6CAA+D;IAC/D,4CAA6D;CA6CpE;AAED;IACI;;;;;;OAMG;IACH,gDAJG;QAAwC,QAAQ,EAAxC,MAAM,CAAC,MAAM,wCAAU;QACN,UAAU,EAA3B,MAAM,EAAE;QACQ,QAAQ,GAAxB,MAAM;KAChB,EAQA;CACJ;AAED;IACI;;;;;OAKG;IACH,gDAJG;QAAwC,QAAQ,EAAxC,MAAM,CAAC,MAAM,wCAAU;QACN,UAAU,EAA3B,MAAM,EAAE;QACQ,QAAQ,GAAxB,MAAM;KAChB,EAQA;CAYJ;AAED;IACI;;;;;;;;;OASG;IACH,+EAPG;QAAwC,QAAQ,EAAxC,MAAM,CAAC,MAAM,wCAAU;QACN,UAAU,EAA3B,MAAM,EAAE;QACkD,WAAW,EAArE,OAAO,2BAA2B,EAAE,aAAa;QACrB,UAAU,EAAtC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;QACH,aAAa,GAA7B,MAAM;QACW,WAAW,GAA5B,OAAO;KAAsB,EA6CvC;IA9BG,4DAA2B;IAC3B,2DAA0B;IAE1B,gCAA4B;IAO5B,qCAAqC;IACrC,cADW,CAAC,KAAK,EAAE,GAAG,KAAK,MAAM,CAMf;IAElB,oDAGC;IACD,qDAGC;IAED,8CAAiE;CAgJxE;;;;;;;;YAnnBS,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,mDALG;QAAsE,QAAQ,EAAtE,MAAM,CAAC,OAAO,oBAAoB,EAAE,OAAO,wCAAU;QACnC,UAAU,GAA5B,MAAM,EAAE;QACQ,WAAW,GAA3B,MAAM;KAEhB,EAqFA;IAnFG,8FAAwB;IAIxB,sGAQK;IAQL,0BAAoC;IAEpC,8BAAoD;IAyDpD,mBAAmB;IAEnB,yFAAyF;IACzF,UADW,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CACkB;IAGrD;;;;OAIG;IACH,mBAFW,GAAG,QAcb;IAED;;OAEG;IACH,oBAFW,GAAG,CAAC,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,MAAM,CAAC,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,gDAJG;QAAwC,QAAQ,EAAxC,MAAM,CAAC,MAAM,wCAAU;QACN,UAAU,EAA3B,MAAM,EAAE;QACQ,QAAQ,GAAxB,MAAM;KAChB,EA8BA;IAnBG,qBAkBW;CA8BlB;AAED;IACI;;;;;;;;;OASG;IACH,sFAPG;QAAwC,QAAQ,EAAxC,MAAM,CAAC,MAAM,wCAAU;QACN,UAAU,EAA3B,MAAM,EAAE;QACQ,qBAAqB,GAArC,MAAM;QAEY,YAAY,GAA9B,MAAM,EAAE;QACQ,QAAQ,GAAxB,MAAM;KAChB,EAuBA;IARG,uBAAgC;IAEhC,8BAA8D;IAE9D,6CAA+D;IAC/D,4CAA6D;CA6CpE;AAED;IACI;;;;;;OAMG;IACH,gDAJG;QAAwC,QAAQ,EAAxC,MAAM,CAAC,MAAM,wCAAU;QACN,UAAU,EAA3B,MAAM,EAAE;QACQ,QAAQ,GAAxB,MAAM;KAChB,EAQA;CACJ;AAED;IACI;;;;;OAKG;IACH,gDAJG;QAAwC,QAAQ,EAAxC,MAAM,CAAC,MAAM,wCAAU;QACN,UAAU,EAA3B,MAAM,EAAE;QACQ,QAAQ,GAAxB,MAAM;KAChB,EAQA;CAYJ;AAED;IACI;;;;;;;;;OASG;IACH,+EAPG;QAAwC,QAAQ,EAAxC,MAAM,CAAC,MAAM,wCAAU;QACN,UAAU,EAA3B,MAAM,EAAE;QACkD,WAAW,EAArE,OAAO,2BAA2B,EAAE,aAAa;QACrB,UAAU,EAAtC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;QACH,aAAa,GAA7B,MAAM;QACW,WAAW,GAA5B,OAAO;KAAsB,EA6CvC;IA9BG,4DAA2B;IAC3B,2DAA0B;IAE1B,gCAA4B;IAO5B,qCAAqC;IACrC,cADW,CAAC,KAAK,EAAE,GAAG,KAAK,MAAM,CAMf;IAElB,oDAGC;IACD,qDAGC;IAED,8CAAiE;CAgJxE;;;;;;;;YAjnBS,MAAM;;;;WACN,MAAM;YACN,OAAO,yBAAyB,EAAE,MAAM;;yBAjBzB,mBAAmB"}

package/dist/src/gl/dataToVertices.js

@@ -103,9 +103,7 @@ export class GeometryBuilder {
                         splitLargeHighPrecision(numberAccessor(d), largeHpArray)
                   : numberAccessor;
 
-            const attributeName = sharedChannels
-                ? makeAttributeName(sharedChannels)
-                : channel;
+            const attributeName = makeAttributeName(sharedChannels ?? channel);
 
             this.variableBuilder.addConverter(attributeName, {
                 f,

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

@@ -1 +1 @@
-{"version":3,"file":"glslScaleGenerator.d.ts","sourceRoot":"","sources":["../../../src/gl/glslScaleGenerator.js"],"names":[],"mappings":"AAsDA;;;;;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,UA+BlD;AAmED;;GAEG;AACH,qDAFW,OAAO,6BAQjB;AAuCD;;;;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,6BAIhB;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,OAAO,CAAC,MAAM,CAAC,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;AAt0BD,+BAAgC,OAAO,CAAC;AACxC,4BAA6B,UAAU,CAAC;AACxC,2BAA4B,QAAQ,CAAC;AACrC,uCAAwC,WAAW,CAAC;AACpD,oCAAqC,QAAQ,CAAC;AAC9C,qCAAsC,YAAY,CAAC;AACnD,mCAAoC,gBAAgB,CAAC;AACrD,2BAA4B,SAAS,CAAC;AACtC,uCAAwC,iBAAiB,CAAC;AAmxBnD,uCAJI,GAAG,WACH,OAAO,GACL,MAAM,EAAE,CAQA;sBAnxBR,OAAO,oBAAoB,EAAE,OAAO;;aA+BvC,OAAO;kBACP,MAAM;0BACN,MAAM;oBACN,MAAM;oBACN,MAAM;kBACN,MAAM;kBACN,MAAM;eACN,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG;;;;;8BAqfZ,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE;;;;uBAwLhD,CAAC,MAAM,EAAE,OAAO,CAAC;0BAtuBJ,WAAW"}
+{"version":3,"file":"glslScaleGenerator.d.ts","sourceRoot":"","sources":["../../../src/gl/glslScaleGenerator.js"],"names":[],"mappings":"AAsDA;;;;;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,CA8BzB;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,UA+BlD;AAmED;;GAEG;AACH,qDAFW,OAAO,6BAQjB;AAuCD;;;;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,6BAIhB;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,OAAO,CAAC,MAAM,CAAC,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;AAr0BD,+BAAgC,OAAO,CAAC;AACxC,4BAA6B,UAAU,CAAC;AACxC,2BAA4B,QAAQ,CAAC;AACrC,uCAAwC,WAAW,CAAC;AACpD,oCAAqC,QAAQ,CAAC;AAC9C,qCAAsC,YAAY,CAAC;AACnD,mCAAoC,gBAAgB,CAAC;AACrD,2BAA4B,SAAS,CAAC;AACtC,uCAAwC,iBAAiB,CAAC;AAkxBnD,uCAJI,GAAG,WACH,OAAO,GACL,MAAM,EAAE,CAQA;sBAlxBR,OAAO,oBAAoB,EAAE,OAAO;;aA+BvC,OAAO;kBACP,MAAM;0BACN,MAAM;oBACN,MAAM;oBACN,MAAM;kBACN,MAAM;kBACN,MAAM;eACN,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG;;;;;8BAofZ,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE;;;;uBAwLhD,CAAC,MAAM,EAAE,OAAO,CAAC;0BAruBJ,WAAW"}

package/dist/src/gl/glslScaleGenerator.js

@@ -182,8 +182,7 @@ export function generateDataGlsl(
     sharedQuantitativeChannels = [channel]
 ) {
     const { attributeType } = getAttributeAndArrayTypes(scale, channel);
-    const attributeName =
-        ATTRIBUTE_PREFIX + makeAttributeName(sharedQuantitativeChannels);
+    const attributeName = makeAttributeName(sharedQuantitativeChannels);
 
     const attributeGlsl = `in highp ${attributeType} ${attributeName};`;
 
@@ -215,7 +214,7 @@ export function generateDatumGlslAndUniform(channel, scale, conditionNumber) {
     const { attributeType } = getAttributeAndArrayTypes(scale, channel);
 
     // TODO: Use uniform prefix
-    const uniformName = ATTRIBUTE_PREFIX + makeAttributeName(channel);
+    const uniformName = makeAttributeName(channel);
     const uniformGlsl = `    uniform highp ${attributeType} ${uniformName};`;
 
     const accessorFunctionName = makeAccessorFunctionName(
@@ -797,7 +796,7 @@ export function dedupeEncodingFields(encoders) {
  * @param {import("../spec/channel.js").Channel | import("../spec/channel.js").Channel[]} channel
  */
 export function makeAttributeName(channel) {
-    return asArray(channel).join("_");
+    return ATTRIBUTE_PREFIX + asArray(channel).toSorted().join("_");
 }
 
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"mark.d.ts","sourceRoot":"","sources":["../../../src/marks/mark.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"mark.d.ts","sourceRoot":"","sources":["../../../src/marks/mark.js"],"names":[],"mappings":"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"}

package/dist/src/marks/mark.js

@@ -34,8 +34,8 @@ import {
     generateDatumGlslAndUniform,
     generateConditionalEncoderGlsl,
     PARAM_PREFIX,
-    ATTRIBUTE_PREFIX,
     SELECTION_CHECKER_PREFIX,
+    makeAttributeName,
 } from "../gl/glslScaleGenerator.js";
 import GLSL_COMMON from "../gl/includes/common.glsl.js";
 import GLSL_SCALES from "../gl/includes/scales.glsl.js";
@@ -493,7 +493,7 @@ export default class Mark {
                 );
             }
 
-            const uniqueIdAttr = ATTRIBUTE_PREFIX + "uniqueId";
+            const uniqueIdAttr = makeAttributeName("uniqueId");
 
             if (isSinglePointSelection(selection)) {
                 // Register a mark uniform for each param. The uniform will have
@@ -611,20 +611,30 @@ export default class Mark {
                                 { expr: param },
                                 (
                                     /** @type {import("../types/selectionTypes.js").IntervalSelection} */ selection
-                                ) =>
-                                    selection.intervals[channel] ?? [
-                                        Infinity,
-                                        -Infinity,
-                                    ]
+                                ) => selection.intervals[channel] ?? [1, 0]
                             );
                         });
 
-                        const c = ATTRIBUTE_PREFIX + channel;
+                        const getAttributeName = (
+                            /** @type {Channel} */ channel
+                        ) => {
+                            for (const [
+                                k,
+                                channels,
+                            ] of dedupedEncodingFields.entries()) {
+                                if (k[1] && channels.includes(channel)) {
+                                    return makeAttributeName(channels);
+                                }
+                            }
+                            return makeAttributeName(channel);
+                        };
+
+                        const c = getAttributeName(channel);
                         const u = uniformName + "[0]";
                         const u2 = uniformName + "[1]";
                         const secondaryChannel = getSecondaryChannel(channel);
                         if (this.encoding[secondaryChannel]) {
-                            const c2 = ATTRIBUTE_PREFIX + secondaryChannel;
+                            const c2 = getAttributeName(secondaryChannel);
                             const mode = this.defaultHitTestMode;
                             if (mode == "endpoints") {
                                 testSnippets.push(
@@ -737,7 +747,7 @@ export default class Mark {
                     );
                 });
             } else if (isFieldDef(channelDef)) {
-                const fields = dedupedEncodingFields.get([
+                const dedupedChannels = dedupedEncodingFields.get([
                     channelDef.field,
                     true,
                 ]);
@@ -745,7 +755,9 @@ export default class Mark {
                     channel,
                     scale,
                     conditionNumber,
-                    fields?.includes(channel) ? fields : undefined
+                    dedupedChannels?.includes(channel)
+                        ? dedupedChannels
+                        : undefined
                 );
                 attributeCode.add(attributeGlsl);
                 scaleCode.push(accessorGlsl);

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"}