@genome-spy/core 0.73.0 → 0.74.0

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

@@ -1 +1 @@
-{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../../src/marks/link.js"],"names":[],"mappings":"AAYA;;GAEG;AACH;IACI;;OAEG;IACH,sBAFW,OAAO,qBAAqB,EAAE,OAAO,EAkC/C;IAPG;;;;;OAKG;IACH,yBAAiC;IAkIjC;;kBAGiC,GAAG;;;;MAEnC;CA4FR;iBA/QgB,WAAW"}
+{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../../src/marks/link.js"],"names":[],"mappings":"AAYA;;GAEG;AACH;IACI;;OAEG;IACH,sBAFW,OAAO,qBAAqB,EAAE,OAAO,EAW/C;IAPG;;;;;OAKG;IACH,yBAAiC;IAkIjC;;kBAGiC,GAAG;;;;MAEnC;CA4FR;iBAxPgB,WAAW"}

package/dist/src/marks/link.js

@@ -19,29 +19,6 @@ export default class LinkMark extends Mark {
      */
     constructor(unitView) {
         super(unitView);
-
-        this.augmentDefaultProperties({
-            x: 0.0,
-            x2: undefined,
-            y: 0.0,
-            y2: undefined,
-            size: 1.0,
-            color: "black",
-            opacity: 1.0,
-
-            segments: 101, // Performance is affected more by the fill rate, i.e. number of pixels
-            arcHeightFactor: 1.0,
-            minArcHeight: 1.5,
-            minPickingSize: 3.0,
-            clampApex: false,
-            maxChordLength: 50000,
-            arcFadingDistance: false,
-            noFadingOnPointSelection: true,
-
-            linkShape: "arc",
-            orient: "vertical",
-        });
-
         /**
          * Only available if "WebGL Draft Extensions" is enabled in chrome://flags
          * But seems to work.

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

@@ -94,6 +94,13 @@ export default class Mark<P extends import("../spec/mark.js").MarkProps = import
      * @protected
      */
     protected augmentDefaultProperties(props: Partial<P>): void;
+    getCursorSpec(): string | import("../spec/parameter.js").ExprRef;
+    getCursor(): any;
+    /**
+     * @param {() => void} listener
+     * @param {(disposer: () => void) => void} [registerDisposer]
+     */
+    watchCursor(listener: () => void, registerDisposer?: (disposer: () => void) => void): void;
     get opaque(): boolean;
     /**
      * Returns the default hit test mode for this mark.
@@ -137,7 +144,7 @@ export default class Mark<P extends import("../spec/mark.js").MarkProps = import
      */
     get encoding(): import("../spec/channel.js").Encoding;
     getContext(): import("../types/viewContext.js").default;
-    getType(): "link" | "point" | "text" | "rect" | "rule";
+    getType(): "point" | "link" | "text" | "rect" | "rule" | "tick";
     initializeData(): void;
     /**
      * Initialize encoders that encode fields of the data (or constants) to

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

@@ -58,6 +58,7 @@ import {
     isMultiPointSelection,
     isSinglePointSelection,
 } from "../selection/selection.js";
+import { getConfiguredMarkDefaults } from "../config/markConfig.js";
 
 export const SAMPLE_FACET_UNIFORM = "SAMPLE_FACET_UNIFORM";
 export const SAMPLE_FACET_TEXTURE = "SAMPLE_FACET_TEXTURE";
@@ -103,6 +104,7 @@ export default class Mark {
      */
     constructor(unitView) {
         this.unitView = unitView;
+        const mark = this;
 
         /** @type {Partial<Record<Channel, import("../types/encoder.js").Encoder>>} */
         this.encoders = undefined;
@@ -170,18 +172,32 @@ export default class Mark {
         /** @type {RangeMap<any>} keep track of facet locations within the vertex array */
         this.rangeMap = new RangeMap();
 
-        // TODO: Implement config: https://vega.github.io/vega-lite/docs/config.html
+        const configuredDefaults = getConfiguredMarkDefaults(
+            this.unitView.getConfigScopes(),
+            this.unitView.getMarkType(),
+            typeof this.unitView.spec.mark == "object"
+                ? this.unitView.spec.mark.style
+                : undefined
+        );
+
         this.defaultProperties = /** @type {P} */ ({
             get clip() {
-                // TODO: Cache once the scales have been resolved
-                // TODO: Only check channels that are used
-                // TODO: provide more fine-grained xClip and yClip props
-                return /** @type {import("../spec/channel.js").PositionalChannel[]} */ ([
-                    "x",
-                    "y",
-                ])
-                    .map((channel) => unitView.getScaleResolution(channel))
-                    .some((resolution) => resolution?.isZoomable() ?? false);
+                return getCachedOrCall(mark, "defaultClip", () => {
+                    // TODO: Only check channels that are used
+                    // TODO: provide more fine-grained xClip and yClip props
+                    for (const channel of /** @type {import("../spec/channel.js").PositionalChannel[]} */ ([
+                        "x",
+                        "y",
+                    ])) {
+                        if (
+                            unitView.getScaleResolution(channel)?.isZoomable()
+                        ) {
+                            return true;
+                        }
+                    }
+
+                    return false;
+                });
             },
             xOffset: 0,
             yOffset: 0,
@@ -192,6 +208,7 @@ export default class Mark {
              * This property is intended for internal usage.
              */
             minBufferSize: 0,
+            ...configuredDefaults,
         });
 
         /**
@@ -220,6 +237,33 @@ export default class Mark {
         );
     }
 
+    getCursorSpec() {
+        return this.properties.cursor;
+    }
+
+    getCursor() {
+        const cursor = this.getCursorSpec();
+        return isExprRef(cursor)
+            ? this.unitView.paramRuntime.evaluateAndGet(cursor.expr)
+            : cursor;
+    }
+
+    /**
+     * @param {() => void} listener
+     * @param {(disposer: () => void) => void} [registerDisposer]
+     */
+    watchCursor(listener, registerDisposer) {
+        const cursor = this.getCursorSpec();
+        if (!isExprRef(cursor)) {
+            return;
+        }
+
+        this.unitView.paramRuntime.watchExpression(cursor.expr, listener, {
+            scopeOwned: false,
+            registerDisposer,
+        });
+    }
+
     get opaque() {
         return false;
     }
@@ -380,7 +424,7 @@ export default class Mark {
             if (encoding.x) {
                 // Building the x index is rarely necessary, but it's safer to build
                 // it by default.
-                encoding.x.buildIndex ??= true;
+                encoding.x.buildIndex ??= this.properties.buildIndex ?? true;
             }
 
             return encoding;
@@ -445,7 +489,6 @@ export default class Mark {
      * @param {string[]} [extraHeaders]
      * @protected
      */
-    // eslint-disable-next-line complexity
     createAndLinkShaders(vertexShader, fragmentShader, extraHeaders = []) {
         const shaderChannels = this.getAttributes();
         const encoders = this.encoders;
@@ -473,8 +516,8 @@ export default class Mark {
         const dynamicMarkUniforms = [];
 
         const paramPredicates = Object.values(encoders)
-            .flatMap((e) => e.accessors)
-            .map((a) => a.predicate)
+            .flatMap((e) => e.branches ?? [])
+            .map((branch) => branch.predicate)
             .filter((p) => p.param);
 
         /**
@@ -787,12 +830,12 @@ export default class Mark {
                 continue;
             }
 
-            const { channelDef, accessors, scale } = encoder;
+            const { branches, channelDef, scale } = encoder;
 
             // Generate accessors, one for each condition -------------
 
-            for (let i = 0; i < accessors.length; i++) {
-                addAccessor(channel, accessors[i], i, scale);
+            for (let i = 0; i < branches.length; i++) {
+                addAccessor(channel, branches[i].accessor, i, scale);
             }
 
             // Generate scale if needed -------------------------------
@@ -863,7 +906,7 @@ export default class Mark {
 
             // Generate conditional encoder -------------------------------
 
-            scaleCode.push(generateConditionalEncoderGlsl(channel, accessors));
+            scaleCode.push(generateConditionalEncoderGlsl(channel, branches));
         }
 
         // Generate a function that checks if the datum is subject to any point selection
@@ -1196,7 +1239,6 @@ export default class Mark {
      * @param {import("../types/rendering.js").GlobalRenderingOptions} options
      * @returns {(() => void)[]}
      */
-    // eslint-disable-next-line complexity
     prepareRender(options) {
         const glHelper = this.glHelper;
         const gl = this.gl;
@@ -1339,7 +1381,6 @@ export default class Mark {
             return () => undefined;
         }
 
-        // eslint-disable-next-line consistent-this
         const self = this;
 
         /** @type {function(import("../gl/dataToVertices.js").RangeEntry):void} rangeEntry */

package/dist/src/marks/markUtils.d.ts

@@ -4,10 +4,27 @@
  * @typedef {import("../spec/channel.js").Channel} Channel
  */
 /**
+ * Expands a primary positional channel into a coverage range.
+ *
+ * Rect-like marks use this to turn a discrete position into band coverage and
+ * a quantitative position into a zero-anchored span.
+ *
+ * @param {Encoding} encoding
+ * @param {import("../spec/channel.js").PrimaryPositionalChannel} channel
+ */
+export function fixCoveragePositional(encoding: Encoding, channel: import("../spec/channel.js").PrimaryPositionalChannel): void;
+/**
+ * Rewrites explicit ranged text on zero-based half-open coordinate systems to
+ * use interval edges instead of default band centers.
+ *
+ * With only `x`, text stays centered inside one band (`band = 0.5`). When both
+ * `x` and `x2` are defined for `index`/`locus`, the pair is interpreted as
+ * half-open interval edges, e.g. `[0, 1)`, so both endpoints use `band = 0`.
+ *
  * @param {Encoding} encoding
  * @param {import("../spec/channel.js").PrimaryPositionalChannel} channel
  */
-export function fixPositional(encoding: Encoding, channel: import("../spec/channel.js").PrimaryPositionalChannel): void;
+export function fixHalfOpenRangedText(encoding: Encoding, channel: import("../spec/channel.js").PrimaryPositionalChannel): void;
 /**
  * @param {import("../spec/channel.js").Encoding} encoding
  * @param {boolean} filled

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

@@ -1 +1 @@
-{"version":3,"file":"markUtils.d.ts","sourceRoot":"","sources":["../../../src/marks/markUtils.js"],"names":[],"mappings":"AAOA;;;;GAIG;AAEH;;;GAGG;AACH,wCAHW,QAAQ,WACR,OAAO,oBAAoB,EAAE,wBAAwB,QAoD/D;AAcD;;;GAGG;AACH,oCAHW,OAAO,oBAAoB,EAAE,QAAQ,UACrC,OAAO,QAqBjB;AAED;;;GAGG;AACH,kCAHW,OAAO,oBAAoB,EAAE,QAAQ,UACrC,OAAO,QAsBjB;AAED;;;GAGG;AACH,oCAHW,OAAO,iBAAiB,EAAE,SAAS,GACjC,KAAK,IAAI,OAAO,iBAAiB,EAAE,UAAU,CAIzD;AAED;;;GAGG;AACH,mCAHW,OAAO,iBAAiB,EAAE,SAAS,GACjC,KAAK,IAAI,OAAO,iBAAiB,EAAE,SAAS,CAIxD;AAED;;;GAGG;AACH,mCAHW,OAAO,iBAAiB,EAAE,SAAS,GACjC,KAAK,IAAI,OAAO,iBAAiB,EAAE,SAAS,CAIxD;AAED;;;GAGG;AACH,mCAHW,OAAO,iBAAiB,EAAE,SAAS,GACjC,KAAK,IAAI,OAAO,iBAAiB,EAAE,SAAS,CAIxD;AAED;;;GAGG;AACH,mCAHW,OAAO,iBAAiB,EAAE,SAAS,GACjC,KAAK,IAAI,OAAO,iBAAiB,EAAE,SAAS,CAIxD;uBAjKY,OAAO,oBAAoB,EAAE,QAAQ;sBACrC,OAAO,oBAAoB,EAAE,OAAO"}
+{"version":3,"file":"markUtils.d.ts","sourceRoot":"","sources":["../../../src/marks/markUtils.js"],"names":[],"mappings":"AAOA;;;;GAIG;AAEH;;;;;;;;GAQG;AACH,gDAHW,QAAQ,WACR,OAAO,oBAAoB,EAAE,wBAAwB,QAiD/D;AAED;;;;;;;;;;GAUG;AACH,gDAHW,QAAQ,WACR,OAAO,oBAAoB,EAAE,wBAAwB,QAmC/D;AAcD;;;GAGG;AACH,oCAHW,OAAO,oBAAoB,EAAE,QAAQ,UACrC,OAAO,QAqBjB;AAED;;;GAGG;AACH,kCAHW,OAAO,oBAAoB,EAAE,QAAQ,UACrC,OAAO,QAsBjB;AAED;;;GAGG;AACH,oCAHW,OAAO,iBAAiB,EAAE,SAAS,GACjC,KAAK,IAAI,OAAO,iBAAiB,EAAE,UAAU,CAIzD;AAED;;;GAGG;AACH,mCAHW,OAAO,iBAAiB,EAAE,SAAS,GACjC,KAAK,IAAI,OAAO,iBAAiB,EAAE,SAAS,CAIxD;AAED;;;GAGG;AACH,mCAHW,OAAO,iBAAiB,EAAE,SAAS,GACjC,KAAK,IAAI,OAAO,iBAAiB,EAAE,SAAS,CAIxD;AAED;;;GAGG;AACH,mCAHW,OAAO,iBAAiB,EAAE,SAAS,GACjC,KAAK,IAAI,OAAO,iBAAiB,EAAE,SAAS,CAIxD;AAED;;;GAGG;AACH,mCAHW,OAAO,iBAAiB,EAAE,SAAS,GACjC,KAAK,IAAI,OAAO,iBAAiB,EAAE,SAAS,CAIxD;uBAjNY,OAAO,oBAAoB,EAAE,QAAQ;sBACrC,OAAO,oBAAoB,EAAE,OAAO"}

package/dist/src/marks/markUtils.js

@@ -12,10 +12,15 @@ import {
  */
 
 /**
+ * Expands a primary positional channel into a coverage range.
+ *
+ * Rect-like marks use this to turn a discrete position into band coverage and
+ * a quantitative position into a zero-anchored span.
+ *
  * @param {Encoding} encoding
  * @param {import("../spec/channel.js").PrimaryPositionalChannel} channel
  */
-export function fixPositional(encoding, channel) {
+export function fixCoveragePositional(encoding, channel) {
     const secondaryChannel = getSecondaryChannel(channel);
 
     // Must make copies because the definition may be shared with other views/marks
@@ -48,9 +53,6 @@ export function fixPositional(encoding, channel) {
                 const adjustment = (1 - (primary.band ?? 1)) / 2;
                 primary.band = 0 + adjustment;
                 secondary.band = 1 - adjustment;
-
-                // TODO: If the secondary channel duplicates the primary channel
-                // the data should be uploaded to the GPU only once.
             }
         } else if (primary.type != "quantitative") {
             const adjustment = (1 - (primary.band || 1)) / 2;
@@ -67,6 +69,52 @@ export function fixPositional(encoding, channel) {
     encoding[secondaryChannel] = secondary;
 }
 
+/**
+ * Rewrites explicit ranged text on zero-based half-open coordinate systems to
+ * use interval edges instead of default band centers.
+ *
+ * With only `x`, text stays centered inside one band (`band = 0.5`). When both
+ * `x` and `x2` are defined for `index`/`locus`, the pair is interpreted as
+ * half-open interval edges, e.g. `[0, 1)`, so both endpoints use `band = 0`.
+ *
+ * @param {Encoding} encoding
+ * @param {import("../spec/channel.js").PrimaryPositionalChannel} channel
+ */
+export function fixHalfOpenRangedText(encoding, channel) {
+    const secondaryChannel = getSecondaryChannel(channel);
+
+    const primary = encoding[channel];
+    const secondary = encoding[secondaryChannel];
+
+    if (
+        !primary ||
+        !secondary ||
+        isValueDef(primary) ||
+        isValueDef(secondary)
+    ) {
+        return;
+    }
+
+    if (
+        !isChannelDefWithScale(primary) ||
+        !isChannelDefWithScale(secondary) ||
+        !["index", "locus"].includes(primary.type)
+    ) {
+        return;
+    }
+
+    const primaryBand = /** @type {import("../spec/channel.js").BandMixins} */ (
+        primary
+    ).band;
+    const secondaryBand =
+        /** @type {import("../spec/channel.js").BandMixins} */ (secondary).band;
+
+    const band = primaryBand ?? secondaryBand ?? 0;
+
+    encoding[channel] = { ...primary, band };
+    encoding[secondaryChannel] = { ...secondary, band: secondaryBand ?? band };
+}
+
 /**
  *
  * @param {import("../spec/channel.js").ChannelDef} channelDef

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,EAiD/C;IA0EO,iDAMC;IAkET,+BAkBC;;CAgDJ;iBApRgB,WAAW"}
+{"version":3,"file":"point.d.ts","sourceRoot":"","sources":["../../../src/marks/point.js"],"names":[],"mappings":"AAoBA;;GAEG;AACH;IAGI;;OAEG;IACH,sBAFW,OAAO,qBAAqB,EAAE,OAAO,EAyB/C;IA6EO,iDAMC;IAkET,+BAkBC;;CAgDJ;iBAhQgB,WAAW"}

package/dist/src/marks/point.js

@@ -10,6 +10,7 @@ import FRAGMENT_SHADER from "./point.fragment.glsl.js";
 import COMMON_SHADER from "./point.common.glsl.js";
 
 import Mark from "./mark.js";
+import { getEncoderDataAccessor } from "../encoder/encoder.js";
 import { isExprRef } from "../paramRuntime/paramUtils.js";
 import { sampleIterable } from "../data/transforms/sample.js";
 import { fixFill, fixStroke } from "./markUtils.js";
@@ -28,30 +29,6 @@ export default class PointMark extends Mark {
      */
     constructor(unitView) {
         super(unitView);
-
-        this.augmentDefaultProperties({
-            x: 0.5,
-            y: 0.5,
-            color: "#4c78a8",
-            filled: true,
-            opacity: 1.0,
-            size: 100.0,
-            // @ts-expect-error - TODO: Should be datum instead of value. But needs fixing.
-            semanticScore: 0.0,
-            shape: "circle",
-            strokeWidth: 2.0,
-            fillGradientStrength: 0.0,
-            dx: 0,
-            dy: 0,
-            angle: 0,
-
-            sampleFacetPadding: 0.1,
-
-            semanticZoomFraction: 0.02,
-
-            minPickingSize: 2.0,
-        });
-
         // TODO: This mess should be simplified
         // TODO: createExpression should accept constant values or ExprRefs and allow
         // easy registration of requestRender listeners
@@ -142,8 +119,11 @@ export default class PointMark extends Mark {
 
         // Semantic zooming is currently solely a feature of point mark.
         // Build a sorted sample that allows for computing p-quantiles
-        const semanticScoreAccessor =
-            this.encoders["semanticScore"]?.dataAccessor?.asNumberAccessor();
+        const semanticScoreAccessor = this.encoders["semanticScore"]
+            ? getEncoderDataAccessor(
+                  this.encoders["semanticScore"]
+              )?.asNumberAccessor()
+            : undefined;
         if (semanticScoreAccessor) {
             // n chosen using Stetson-Harrison
             // TODO: Throw on missing scores

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

@@ -1 +1 @@
-{"version":3,"file":"rect.d.ts","sourceRoot":"","sources":["../../../src/marks/rect.js"],"names":[],"mappings":"AA2BA;;GAEG;AACH;IACI;;OAEG;IACH,sBAFW,OAAO,qBAAqB,EAAE,OAAO,EAkB/C;IA0ND;;;;;;;;;;OAUG;IACH,8BALW,GAAG,KACH,OAAO,oBAAoB,EAAE,MAAM,GACjC,GAAG,CAyBf;;CACJ;iBAxSgB,WAAW"}
+{"version":3,"file":"rect.d.ts","sourceRoot":"","sources":["../../../src/marks/rect.js"],"names":[],"mappings":"AA2BA;;GAEG;AACH;IACI;;OAEG;IACH,sBAFW,OAAO,qBAAqB,EAAE,OAAO,EAI/C;IA0ND;;;;;;;;;;OAUG;IACH,8BALW,GAAG,KACH,OAAO,oBAAoB,EAAE,MAAM,GACjC,GAAG,CA+Bf;;CACJ;iBAhSgB,WAAW"}

package/dist/src/marks/rect.js

@@ -5,9 +5,9 @@ import COMMON_SHADER from "./rect.common.glsl.js";
 import { RectVertexBuilder } from "../gl/dataToVertices.js";
 
 import Mark from "./mark.js";
-import { fixFill, fixPositional, fixStroke } from "./markUtils.js";
+import { fixCoveragePositional, fixFill, fixStroke } from "./markUtils.js";
 import { asArray } from "../utils/arrayUtils.js";
-import { isValueDef } from "../encoder/encoder.js";
+import { getEncoderDataAccessor, isValueDef } from "../encoder/encoder.js";
 import { getCachedOrCall } from "../utils/propertyCacher.js";
 import { isDiscrete } from "vega-scale";
 import { cssColorToArray } from "../gl/colorUtils.js";
@@ -34,20 +34,6 @@ export default class RectMark extends Mark {
      */
     constructor(unitView) {
         super(unitView);
-
-        this.augmentDefaultProperties({
-            x2: undefined,
-            y2: undefined,
-            filled: true,
-            color: "#4c78a8",
-            opacity: 1.0,
-            strokeWidth: 3,
-            cornerRadius: 0.0,
-
-            minWidth: 0.5, // Minimum width/height prevents annoying flickering when zooming
-            minHeight: 0.5,
-            minOpacity: 1.0,
-        });
     }
 
     /**
@@ -107,8 +93,8 @@ export default class RectMark extends Mark {
      */
     fixEncoding(encoding) {
         // TODO: Ensure that both the primary and secondary channel are either variables or constants (values)
-        fixPositional(encoding, "x");
-        fixPositional(encoding, "y");
+        fixCoveragePositional(encoding, "x");
+        fixCoveragePositional(encoding, "y");
 
         fixStroke(encoding, this.properties.filled);
         fixFill(encoding, this.properties.filled);
@@ -289,13 +275,19 @@ export default class RectMark extends Mark {
         const scaleType = e.x.scale.type;
 
         if (isDiscrete(scaleType)) {
-            const a = e.x.dataAccessor;
+            const a = getEncoderDataAccessor(e.x);
+            if (!a) {
+                return;
+            }
             // TODO: Binary search
             return data.find((d) => x == a(d));
         } else {
             // TODO: Handle point features on locus/index scales
-            const a = e.x.dataAccessor;
-            const a2 = e.x2.dataAccessor;
+            const a = getEncoderDataAccessor(e.x);
+            const a2 = getEncoderDataAccessor(e.x2);
+            if (!a || !a2) {
+                return;
+            }
             // TODO: Binary search
             return data.find((d) => x >= a(d) && x < a2(d));
         }

package/dist/src/marks/rule.d.ts

@@ -1,12 +1,17 @@
 /**
- * @extends {Mark<import("../spec/mark.js").RuleProps>}
+ * @extends {Mark<import("../spec/mark.js").RuleProps | import("../spec/mark.js").TickProps>}
  */
-export default class RuleMark extends Mark<import("../spec/mark.js").RuleProps> {
+export default class RuleMark extends Mark<import("../spec/mark.js").RuleProps | import("../spec/mark.js").TickProps> {
     /**
      * @param {import("../view/unitView.js").default} unitView
      */
     constructor(unitView: import("../view/unitView.js").default);
     dashTextureSize: number;
+    /**
+     * @param {import("../spec/channel.js").Encoding} encoding
+     * @returns {import("../spec/channel.js").Encoding}
+     */
+    fixTickEncoding(encoding: import("../spec/channel.js").Encoding): import("../spec/channel.js").Encoding;
     dashTexture: WebGLTexture;
 }
 import Mark from "./mark.js";

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

@@ -1 +1 @@
-{"version":3,"file":"rule.d.ts","sourceRoot":"","sources":["../../../src/marks/rule.js"],"names":[],"mappings":"AAcA;;GAEG;AACH;IACI;;OAEG;IACH,sBAFW,OAAO,qBAAqB,EAAE,OAAO,EAoB/C;IAfG,wBAAwB;IAyGxB,0BAQE;CA+FT;iBAxOgB,WAAW"}
+{"version":3,"file":"rule.d.ts","sourceRoot":"","sources":["../../../src/marks/rule.js"],"names":[],"mappings":"AAiBA;;GAEG;AACH;IACI;;OAEG;IACH,sBAFW,OAAO,qBAAqB,EAAE,OAAO,EAM/C;IADG,wBAAwB;IAyF5B;;;OAGG;IACH,0BAHW,OAAO,oBAAoB,EAAE,QAAQ,GACnC,OAAO,oBAAoB,EAAE,QAAQ,CAqBjD;IAOG,0BAQE;CA+FT;iBAzPgB,WAAW"}