@genome-spy/core 0.49.0 → 0.50.0

package/dist/src/marks/rect.js

@@ -11,6 +11,9 @@ import { isValueDef } from "../encoder/encoder.js";
 import { getCachedOrCall } from "../utils/propertyCacher.js";
 import { isDiscrete } from "vega-scale";
 
+/**
+ * @extends {Mark<import("../spec/mark.js").RectProps>}
+ */
 export default class RectMark extends Mark {
     /**
      * @param {import("../view/unitView.js").default} unitView
@@ -18,27 +21,24 @@ export default class RectMark extends Mark {
     constructor(unitView) {
         super(unitView);
 
-        Object.defineProperties(
-            this.defaultProperties,
-            Object.getOwnPropertyDescriptors({
-                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,
-
-                tessellationZoomThreshold: 10, // This works with genomes, but likely breaks with other data. TODO: Fix, TODO: log2
-                tessellationTiles: 35, // TODO: Tiles per unit (bp)
-            })
-        );
+        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,
+        });
     }
 
+    /**
+     * @returns {import("../spec/channel.js").Channel[]}
+     */
     getAttributes() {
         return [
             "uniqueId",

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

@@ -1,4 +1,11 @@
-export default class RuleMark extends Mark {
+/**
+ * @extends {Mark<import("../spec/mark.js").RuleProps>}
+ */
+export default class RuleMark extends Mark<import("../spec/mark.js").RuleProps> {
+    /**
+     * @param {import("../view/unitView.js").default} unitView
+     */
+    constructor(unitView: import("../view/unitView.js").default);
     dashTextureSize: number;
     dashTexture: WebGLTexture;
 }

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;IAOQ,wBAAwB;IA4GpB,0BAOE;CAgGb;iBAxOgB,WAAW"}
+{"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;IA4GpB,0BAOE;CAgGb;iBA3OgB,WAAW"}

package/dist/src/marks/rule.js

@@ -12,6 +12,9 @@ import COMMON_SHADER from "./rule.common.glsl.js";
 import { RuleVertexBuilder } from "../gl/dataToVertices.js";
 import { isChannelDefWithScale } from "../encoder/encoder.js";
 
+/**
+ * @extends {Mark<import("../spec/mark.js").RuleProps>}
+ */
 export default class RuleMark extends Mark {
     /**
      * @param {import("../view/unitView.js").default} unitView
@@ -21,24 +24,24 @@ export default class RuleMark extends Mark {
 
         this.dashTextureSize = 0;
 
-        Object.defineProperties(
-            this.defaultProperties,
-            Object.getOwnPropertyDescriptors({
-                x2: undefined,
-                y2: undefined,
-                size: 1,
-                color: "black",
-                opacity: 1.0,
-
-                minLength: 0.0,
-                /** @type {number[]} */
-                strokeDash: null,
-                strokeDashOffset: 0,
-                strokeCap: "butt",
-            })
-        );
+        this.augmentDefaultProperties({
+            x2: undefined,
+            y2: undefined,
+            size: 1,
+            color: "black",
+            opacity: 1.0,
+
+            minLength: 0.0,
+            /** @type {number[]} */
+            strokeDash: null,
+            strokeDashOffset: 0,
+            strokeCap: "butt",
+        });
     }
 
+    /**
+     * @returns {import("../spec/channel.js").Channel[]}
+     */
     getAttributes() {
         return [
             "uniqueId",

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

@@ -5,8 +5,17 @@
  * - Valve's SDF paper: https://doi.org/10.1145/1281500.1281665
  * - Multi-channel SDF fonts: https://github.com/Chlumsky/msdfgen
  * - Google's web fonts as SDFs: https://github.com/etiennepinchon/aframe-fonts
+ *
+ * @extends {Mark<import("../spec/mark.js").TextProps>}
  */
-export default class TextMark extends Mark {
+export default class TextMark extends Mark<import("../spec/mark.js").TextProps> {
+    /**
+     * @typedef {import("../spec/mark.js").MarkProps} MarkProps
+     */
+    /**
+     * @param {import("../view/unitView.js").default} unitView
+     */
+    constructor(unitView: import("../view/unitView.js").default);
     font: import("../fonts/bmFontManager.js").FontEntry;
 }
 import Mark from "./mark.js";

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

@@ -1 +1 @@
-{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../../../src/marks/text.js"],"names":[],"mappings":"AAgCA;;;;;;;GAOG;AACH;IAyDQ,oDAMmD;CA4M1D;iBAtSgB,WAAW"}
+{"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../../../src/marks/text.js"],"names":[],"mappings":"AAgCA;;;;;;;;;GASG;AACH;IACI;;OAEG;IACH;;OAEG;IACH,sBAFW,OAAO,qBAAqB,EAAE,OAAO,EA8D/C;IAbG,oDAMmD;CA+M1D;iBAxSgB,WAAW"}

package/dist/src/marks/text.fragment.glsl.js

@@ -1,2 +1,2 @@
-const shader = "uniform sampler2D uTexture;in vec2 vTexCoord;in float vEdgeFadeOpacity;in vec4 vColor;in float vSlope;out lowp vec4 fragColor;float median(float r,float g,float b){return max(min(r,g),min(max(r,g),b));}void main(){vec3 c=texture(uTexture,vTexCoord).rgb;float sigDist=1.0-median(c.r,c.g,c.b);float slope=uLogoLetter? 0.7/length(vec2(dFdy(sigDist),dFdx(sigDist))): vSlope;float opa=clamp((sigDist-0.5)*slope+0.5,0.0,1.0);opa*=pow(clamp(vEdgeFadeOpacity,0.0,1.0),2.2);fragColor=vColor*opa;if(uPickingEnabled){fragColor=vPickingColor;}}";
+const shader = "uniform sampler2D uTexture;in vec2 vTexCoord;in float vEdgeFadeOpacity;in vec4 vColor;in float vSlope;in float vGamma;out lowp vec4 fragColor;float median(float r,float g,float b){return max(min(r,g),min(max(r,g),b));}void main(){vec3 c=texture(uTexture,vTexCoord).rgb;float sigDist=1.0-median(c.r,c.g,c.b);float slope=uLogoLetter? 0.7/length(vec2(dFdy(sigDist),dFdx(sigDist))): vSlope;float opa=clamp((sigDist-0.5)*slope+0.5,0.0,1.0);opa*=clamp(vEdgeFadeOpacity,0.0,1.0);opa=pow(opa,vGamma);fragColor=vColor*opa;if(uPickingEnabled){fragColor=vPickingColor;}}";
 export default shader;

package/dist/src/marks/text.js

@@ -37,6 +37,8 @@ const baselines = {
  * - Valve's SDF paper: https://doi.org/10.1145/1281500.1281665
  * - Multi-channel SDF fonts: https://github.com/Chlumsky/msdfgen
  * - Google's web fonts as SDFs: https://github.com/etiennepinchon/aframe-fonts
+ *
+ * @extends {Mark<import("../spec/mark.js").TextProps>}
  */
 export default class TextMark extends Mark {
     /**
@@ -48,52 +50,49 @@ export default class TextMark extends Mark {
     constructor(unitView) {
         super(unitView);
 
-        Object.defineProperties(
-            this.defaultProperties,
-            Object.getOwnPropertyDescriptors({
-                x: 0.5,
-                y: 0.5,
-                x2: undefined,
-                y2: undefined,
-                text: "",
-                size: 11.0,
-                color: "black",
-                opacity: 1.0,
-
-                // Use the built-in default
-                font: undefined,
-                fontStyle: undefined,
-                fontWeight: undefined,
-
-                align: "center",
-                baseline: "middle",
-                dx: 0,
-                dy: 0,
-                angle: 0,
-
-                /** When only primary channel is defined with band/locus scale */
-                fitToBand: false,
-
-                squeeze: true,
-                paddingX: 0,
-                paddingY: 0,
-                flushX: true,
-                flushY: true,
-
-                /** Stretch letters so that they can be used with sequence logos etc... */
-                logoLetters: false,
-
-                viewportEdgeFadeWidthTop: 0,
-                viewportEdgeFadeWidthRight: 0,
-                viewportEdgeFadeWidthBottom: 0,
-                viewportEdgeFadeWidthLeft: 0,
-
-                viewportEdgeFadeDistanceTop: -Infinity,
-                viewportEdgeFadeDistanceRight: -Infinity,
-                viewportEdgeFadeDistanceBottom: -Infinity,
-                viewportEdgeFadeDistanceLeft: -Infinity,
-            })
-        );
+        this.augmentDefaultProperties({
+            x: 0.5,
+            y: 0.5,
+            x2: undefined,
+            y2: undefined,
+            text: "",
+            size: 11.0,
+            color: "black",
+            opacity: 1.0,
+
+            // Use the built-in default
+            font: undefined,
+            fontStyle: undefined,
+            fontWeight: undefined,
+
+            align: "center",
+            baseline: "middle",
+            dx: 0,
+            dy: 0,
+            angle: 0,
+
+            /** When only primary channel is defined with band/locus scale */
+            fitToBand: false,
+
+            squeeze: true,
+            paddingX: 0,
+            paddingY: 0,
+            flushX: true,
+            flushY: true,
+
+            /** Stretch letters so that they can be used with sequence logos etc... */
+            logoLetters: false,
+
+            viewportEdgeFadeWidthTop: 0,
+            viewportEdgeFadeWidthRight: 0,
+            viewportEdgeFadeWidthBottom: 0,
+            viewportEdgeFadeWidthLeft: 0,
+
+            viewportEdgeFadeDistanceTop: -Infinity,
+            viewportEdgeFadeDistanceRight: -Infinity,
+            viewportEdgeFadeDistanceBottom: -Infinity,
+            viewportEdgeFadeDistanceLeft: -Infinity,
+        });
 
         this.font = this.properties.font
             ? unitView.context.fontManager.getFont(
@@ -110,6 +109,9 @@ export default class TextMark extends Mark {
         ]);
     }
 
+    /**
+     * @returns {import("../spec/channel.js").Channel[]}
+     */
     getAttributes() {
         return [
             "uniqueId",

package/dist/src/marks/text.vertex.glsl.js

@@ -1,2 +1,2 @@
-const shader = "in mediump vec2 vertexCoord;in lowp vec2 textureCoord;in float width;out vec2 vTexCoord;out vec4 vColor;out float vSlope;out float vEdgeFadeOpacity;struct RangeResult{float pos;float scale;};float minValue(vec4 v){return min(min(v.x,v.y),min(v.z,v.w));}float maxValue(vec4 v){return max(max(v.x,v.y),max(v.z,v.w));}/***All measures are in[0,1]*/RangeResult positionInsideRange(float a,float b,float width,float padding,int align,bool flush){float span=b-a;float paddedWidth=width+2.0*padding;if(a>1.0||b<0.0){return RangeResult(0.0,0.0);}float extra=max(0.0,span-paddedWidth);float pos;if(align==0){float centre=a+b;if(flush){float leftOver=max(0.0,paddedWidth-centre);centre+=min(leftOver,extra);float rightOver=max(0.0,paddedWidth+centre-2.0);centre-=min(rightOver,extra);}pos=centre/2.0;}else if(align<0){float edge=a;if(flush){float over=max(0.0,-edge);edge+=min(over,extra);}pos=edge+padding;}else{float edge=b;if(flush){float over=max(0.0,edge-1.0);edge-=min(over,extra);}pos=edge-padding;}float scale=clamp((span-padding)/paddedWidth,0.0,1.0);return RangeResult(pos,scale);}vec2 calculateRotatedDimensions(float width,mat2 rotationMatrix){vec2 a=abs(rotationMatrix*vec2(width/2.0,0.5));vec2 b=abs(rotationMatrix*vec2(width/2.0,-0.5));return vec2(max(a.x,b.x),max(a.y,b.y))*2.0;}ivec2 fixAlignForAngle(ivec2 align,float angleInDegrees){float a=mod(angleInDegrees+45.0,360.0);int x=align.x;int y=-align.y;if(a<90.0){return ivec2(x,y);}else if(a<180.0){return ivec2(y,-x);}else if(a<270.0){return ivec2(-x,y);}else{return ivec2(-y,x);}}void main(void){float opacity=getScaled_opacity()*uViewOpacity;vec2 size=vec2(getScaled_size());float x=getScaled_x();float y=getScaled_y();float scale=1.0;float angleInDegrees=getScaled_angle();float angle=-angleInDegrees*PI/180.0;float sinTheta=sin(angle);float cosTheta=cos(angle);mat2 rotationMatrix=mat2(cosTheta,sinTheta,-sinTheta,cosTheta);vec2 flushSize=calculateRotatedDimensions(width,rotationMatrix);\n#if defined(x2_DEFINED) || defined(y2_DEFINED)\nivec2 align=fixAlignForAngle(uAlign,angleInDegrees);\n#else\nivec2 align=uAlign;\n#endif\n#ifdef x2_DEFINED\nfloat x2=getScaled_x2();if(uLogoLetter){size.x=(x2-x)*uViewportSize.x;x+=(x2-x)/2.0;}else{float x2=getScaled_x2();RangeResult result=positionInsideRange(min(x,x2),max(x,x2),size.x*scale*flushSize.x/uViewportSize.x,uPaddingX/uViewportSize.x,align.x,uFlushX);x=result.pos;scale*=result.scale;}\n#endif\nvec2 pos=applySampleFacet(vec2(x,y));\n#ifdef y2_DEFINED\nfloat y2=getScaled_y2();vec2 pos2=applySampleFacet(vec2(x,y2));if(uLogoLetter){size.y=(pos2.y-pos.y)*uViewportSize.y;pos.y+=(pos2.y-pos.y)/2.0;}else{RangeResult result=positionInsideRange(min(pos.y,pos2.y),max(pos.y,pos2.y),size.y*scale*flushSize.y/uViewportSize.y,uPaddingY/uViewportSize.y,align.y,uFlushY);pos.y=result.pos;scale*=result.scale;}\n#endif\nif(scale<1.0){if(uSqueeze){vec2 scaleFadeExtent=vec2(3.0,6.0)/size;if(scale<scaleFadeExtent[0]){gl_Position=vec4(0.0);return;}size*=scale;opacity*=linearstep(scaleFadeExtent[0],scaleFadeExtent[1],scale);}else if(scale<1.0){gl_Position=vec4(0.0);return;}}vec2 charPos=rotationMatrix*(vertexCoord*size+uD);vec2 unitPos=pos+charPos/uViewportSize;gl_Position=unitToNdc(unitPos);vSlope=max(1.0,min(size.x,size.y)/uSdfNumerator);vColor=vec4(getScaled_color()*opacity,opacity);vTexCoord=textureCoord;if(maxValue(uViewportEdgeFadeDistance)>-pow(10.0,10.0)){vEdgeFadeOpacity=minValue(((vec4(1.0,1.0,0.0,0.0)+vec4(-1.0,-1.0,1.0,1.0)*unitPos.yxyx)*uViewportSize.yxyx-uViewportEdgeFadeDistance)/uViewportEdgeFadeWidth);}else{vEdgeFadeOpacity=1.0;}setupPicking();}";
+const shader = "in mediump vec2 vertexCoord;in lowp vec2 textureCoord;in float width;out vec2 vTexCoord;out vec4 vColor;out float vSlope;out float vEdgeFadeOpacity;out float vGamma;struct RangeResult{float pos;float scale;};float minValue(vec4 v){return min(min(v.x,v.y),min(v.z,v.w));}float maxValue(vec4 v){return max(max(v.x,v.y),max(v.z,v.w));}/***All measures are in[0,1]*/RangeResult positionInsideRange(float a,float b,float width,float padding,int align,bool flush){float span=b-a;float paddedWidth=width+2.0*padding;if(a>1.0||b<0.0){return RangeResult(0.0,0.0);}float extra=max(0.0,span-paddedWidth);float pos;if(align==0){float centre=a+b;if(flush){float leftOver=max(0.0,paddedWidth-centre);centre+=min(leftOver,extra);float rightOver=max(0.0,paddedWidth+centre-2.0);centre-=min(rightOver,extra);}pos=centre/2.0;}else if(align<0){float edge=a;if(flush){float over=max(0.0,-edge);edge+=min(over,extra);}pos=edge+padding;}else{float edge=b;if(flush){float over=max(0.0,edge-1.0);edge-=min(over,extra);}pos=edge-padding;}float scale=clamp((span-padding)/paddedWidth,0.0,1.0);return RangeResult(pos,scale);}vec2 calculateRotatedDimensions(float width,mat2 rotationMatrix){vec2 a=abs(rotationMatrix*vec2(width/2.0,0.5));vec2 b=abs(rotationMatrix*vec2(width/2.0,-0.5));return vec2(max(a.x,b.x),max(a.y,b.y))*2.0;}ivec2 fixAlignForAngle(ivec2 align,float angleInDegrees){float a=mod(angleInDegrees+45.0,360.0);int x=align.x;int y=-align.y;if(a<90.0){return ivec2(x,y);}else if(a<180.0){return ivec2(y,-x);}else if(a<270.0){return ivec2(-x,y);}else{return ivec2(-y,x);}}void main(void){float opacity=getScaled_opacity()*uViewOpacity;vec2 size=vec2(getScaled_size());float x=getScaled_x();float y=getScaled_y();float scale=1.0;float angleInDegrees=getScaled_angle();float angle=-angleInDegrees*PI/180.0;float sinTheta=sin(angle);float cosTheta=cos(angle);mat2 rotationMatrix=mat2(cosTheta,sinTheta,-sinTheta,cosTheta);vec2 flushSize=calculateRotatedDimensions(width,rotationMatrix);\n#if defined(x2_DEFINED) || defined(y2_DEFINED)\nivec2 align=fixAlignForAngle(uAlign,angleInDegrees);\n#else\nivec2 align=uAlign;\n#endif\n#ifdef x2_DEFINED\nfloat x2=getScaled_x2();if(uLogoLetter){size.x=(x2-x)*uViewportSize.x;x+=(x2-x)/2.0;}else{float x2=getScaled_x2();RangeResult result=positionInsideRange(min(x,x2),max(x,x2),size.x*scale*flushSize.x/uViewportSize.x,uPaddingX/uViewportSize.x,align.x,uFlushX);x=result.pos;scale*=result.scale;}\n#endif\nvec2 pos=applySampleFacet(vec2(x,y));\n#ifdef y2_DEFINED\nfloat y2=getScaled_y2();vec2 pos2=applySampleFacet(vec2(x,y2));if(uLogoLetter){size.y=(pos2.y-pos.y)*uViewportSize.y;pos.y+=(pos2.y-pos.y)/2.0;}else{RangeResult result=positionInsideRange(min(pos.y,pos2.y),max(pos.y,pos2.y),size.y*scale*flushSize.y/uViewportSize.y,uPaddingY/uViewportSize.y,align.y,uFlushY);pos.y=result.pos;scale*=result.scale;}\n#endif\nif(scale<1.0){if(uSqueeze){vec2 scaleFadeExtent=vec2(3.0,6.0)/size;if(scale<scaleFadeExtent[0]){gl_Position=vec4(0.0);return;}size*=scale;opacity*=linearstep(scaleFadeExtent[0],scaleFadeExtent[1],scale);}else if(scale<1.0){gl_Position=vec4(0.0);return;}}vec2 charPos=rotationMatrix*(vertexCoord*size+uD);vec2 unitPos=pos+charPos/uViewportSize;gl_Position=unitToNdc(unitPos);vSlope=max(1.0,min(size.x,size.y)/uSdfNumerator);vec3 color=getScaled_color();vColor=vec4(color*opacity,opacity);vGamma=getGammaForColor(color);vTexCoord=textureCoord;if(maxValue(uViewportEdgeFadeDistance)>-pow(10.0,10.0)){vEdgeFadeOpacity=minValue(((vec4(1.0,1.0,0.0,0.0)+vec4(-1.0,-1.0,1.0,1.0)*unitPos.yxyx)*uViewportSize.yxyx-uViewportEdgeFadeDistance)/uViewportEdgeFadeWidth);}else{vEdgeFadeOpacity=1.0;}setupPicking();}";
 export default shader;

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

@@ -141,8 +141,19 @@ export interface ScaleMixins {
      * An alternative channel for scale resolution.
      *
      * This is mainly for internal use and allows using `color` channel to resolve `fill` and `stroke` channels under certain circumstances.
+     *
+     * @internal
      */
     resolutionChannel?: ChannelWithScale;
+
+    /**
+     * Whether the field or evaluated expr should be included in the scale's domain.
+     *
+     * **Default value:** `true`
+     *
+     * @internal
+     */
+    contributesToScaleDomain?: boolean;
 }
 
 export interface ValueDefBase<V extends Value = Scalar> {
@@ -157,6 +168,7 @@ export type ValueDef<V extends Value = Scalar> = ValueDefBase<V> & TitleMixins;
 export interface DatumDef<V extends Scalar | ExprRef = Scalar | ExprRef>
     extends Partial<TypeMixins<Type>>,
         BandMixins,
+        ScaleMixins,
         TitleMixins {
     /**
      * A constant value in data domain.
@@ -261,7 +273,8 @@ export type ValueDefWithCondition<V extends Value = Value> = Partial<
     condition?:
         | Conditional<FieldDef>
         | Conditional<DatumDef>
-        | Conditional<ValueDef<V | ExprRef>>;
+        | Conditional<ValueDef<V | ExprRef>>
+        | Conditional<ValueDef<V | ExprRef>>[];
 };
 
 export type MarkPropFieldOrDatumOrExprDef<T extends Type = Type> =

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

@@ -5,17 +5,91 @@ import { Tooltip } from "./tooltip.js";
 
 export type MarkType = "rect" | "point" | "rule" | "text" | "link";
 
+export interface MarkPropsBase {
+    type: MarkType;
+
+    // Channels.
+
+    x?: number | ExprRef;
+    y?: number | ExprRef;
+    color?: string | ExprRef;
+    opacity?: number | ExprRef;
+
+    /**
+     * If true, the mark is clipped to the UnitView's rectangle. By default, clipping
+     * is enabled for marks that have zoomable positional scales.
+     */
+    clip?: boolean | "never";
+
+    /**
+     * Offsets of the `x` and `x2` coordinates in pixels. The offset is applied
+     * after the viewport scaling and translation.
+     *
+     * **Default value:** `0`
+     */
+    xOffset?: number;
+
+    /**
+     * Offsets of the `y` and `y2` coordinates in pixels. The offset is applied
+     * after the viewport scaling and translation.
+     *
+     * **Default value:** `0`
+     */
+    yOffset?: number;
+
+    /**
+     * Minimum size for WebGL buffers (number of data items).
+     * Allows for using `bufferSubData()` to update graphics.
+     *
+     * This property is intended for internal use.
+     *
+     * @internal
+     */
+    minBufferSize?: number;
+
+    /**
+     * Tooltip handler. If `null`, no tooltip is shown.
+     */
+    tooltip?: Tooltip;
+}
+
+export interface SizeProps {
+    /**
+     * Stroke width of `"link"` and `"rule"` marks in pixels, the area of the
+     * bounding square of `"point"` mark, or the font size of `"text"` mark.
+     */
+    size?: number | ExprRef;
+}
+
 export interface FillAndStrokeProps {
-    /** The fill color */
+    /**
+     * The stroke width in pixels.
+     */
+    strokeWidth?: number | ExprRef;
+
+    /**
+     * Whether the `color` represents the `fill` color (`true`) or the `stroke` color (`false`).
+     */
+    filled?: boolean;
+
+    /**
+     * The fill color
+     */
     fill?: string | ExprRef;
 
-    /** The fill opacity. Value between [0, 1]. */
+    /**
+     * The fill opacity. Value between [0, 1].
+     */
     fillOpacity?: number | ExprRef;
 
-    /** The stroke color */
+    /**
+     * The stroke color
+     */
     stroke?: string | ExprRef;
 
-    /** The stroke opacity. Value between [0, 1]. */
+    /**
+     * The stroke opacity. Value between [0, 1].
+     */
     strokeOpacity?: number | ExprRef;
 }
 
@@ -33,6 +107,17 @@ export interface AngleProps {
     angle?: number | ExprRef;
 }
 
+export interface MinPickingSizeProps {
+    /**
+     * The minimum picking size invisibly increases the stroke width or point diameter
+     * of marks when pointing them with the mouse cursor, making it easier to select them.
+     * The valus is the minimum size in pixels.
+     *
+     * **Default value:** `3.0` for `"link"` and `2.0` for `"point"`
+     */
+    minPickingSize?: number | ExprRef;
+}
+
 /**
  * Specifies how mark should be faded at the viewport edges.
  * This is mainly used to make axis labels pretty.
@@ -49,7 +134,12 @@ export interface ViewportEdgeFadeProps {
     viewportEdgeFadeDistanceLeft?: number;
 }
 
-export interface RectProps extends SecondaryPositionProps {
+export interface RectProps
+    extends MarkPropsBase,
+        SecondaryPositionProps,
+        FillAndStrokeProps {
+    type: "rect";
+
     /**
      * Clamps the minimum size-dependent opacity. The property does not affect the
      * `opacity` channel. Valid values are between `0` and `1`.
@@ -120,7 +210,12 @@ export interface RectProps extends SecondaryPositionProps {
     cornerRadiusBottomRight?: number | ExprRef;
 }
 
-export interface RuleProps extends SecondaryPositionProps {
+export interface RuleProps
+    extends MarkPropsBase,
+        SecondaryPositionProps,
+        SizeProps {
+    type: "rule";
+
     /**
      * The minimum length of the rule in pixels. Use this property to ensure that
      * very short ranged rules remain visible even when the user zooms out.
@@ -152,9 +247,13 @@ export interface RuleProps extends SecondaryPositionProps {
 }
 
 export interface TextProps
-    extends SecondaryPositionProps,
+    extends MarkPropsBase,
+        SecondaryPositionProps,
         AngleProps,
-        ViewportEdgeFadeProps {
+        ViewportEdgeFadeProps,
+        SizeProps {
+    type: "text";
+
     /**
      * The text to display. The format of numeric data can be customized by
      * setting a [format specifier](https://github.com/d3/d3-format#locale_format)
@@ -276,7 +375,14 @@ export interface TextProps
     logoLetters?: boolean | ExprRef;
 }
 
-export interface PointProps extends AngleProps {
+export interface PointProps
+    extends MarkPropsBase,
+        FillAndStrokeProps,
+        AngleProps,
+        SizeProps,
+        MinPickingSizeProps {
+    type: "point";
+
     /**
      * One of `"circle"`, `"square"`, `"cross"`, `"diamond"`, `"triangle-up"`,
      * `"triangle-down"`, `"triangle-right"`, or `"triangle-left"`.
@@ -318,7 +424,13 @@ export interface PointProps extends AngleProps {
     geometricZoomBound?: number;
 }
 
-export interface LinkProps extends SecondaryPositionProps {
+export interface LinkProps
+    extends MarkPropsBase,
+        SecondaryPositionProps,
+        SizeProps,
+        MinPickingSizeProps {
+    type: "link";
+
     /**
      * The shape of the link path. Either `"arc"`, `"diagonal"`, `"line"`, or `"dome"`.
      *
@@ -394,77 +506,11 @@ export interface LinkProps extends SecondaryPositionProps {
      * **Default value:** `true`
      */
     noFadingOnPointSelection?: boolean | ExprRef;
-
-    /**
-     * The minimum stroke width of the links when pointing with the mouse cursor.
-     * Allows making very thin links easier to point at.
-     *
-     * **Default value:** `3.0`
-     */
-    minPickingSize?: number | ExprRef;
 }
 
-// TODO: Mark-specific configs
-export interface MarkProps
-    extends PointProps,
-        RectProps,
-        TextProps,
-        RuleProps,
-        LinkProps,
-        FillAndStrokeProps {
-    // Channels.
-    x?: number | ExprRef;
-    y?: number | ExprRef;
-    color?: string | ExprRef;
-    opacity?: number | ExprRef;
-    size?: number | ExprRef;
-
-    /**
-     * Whether the `color` represents the `fill` color (`true`) or the `stroke` color (`false`).
-     */
-    filled?: boolean;
-
-    /**
-     * If true, the mark is clipped to the UnitView's rectangle. By default, clipping
-     * is enabled for marks that have zoomable positional scales.
-     */
-    clip?: boolean | "never";
-
-    /**
-     * Offsets of the `x` and `x2` coordinates in pixels. The offset is applied
-     * after the viewport scaling and translation.
-     *
-     * **Default value:** `0`
-     */
-    xOffset?: number;
-
-    /**
-     * Offsets of the `y` and `y2` coordinates in pixels. The offset is applied
-     * after the viewport scaling and translation.
-     *
-     * **Default value:** `0`
-     */
-    yOffset?: number;
-
-    /**
-     * TODO
-     */
-    tooltip?: Tooltip;
-
-    /**
-     * The stroke width in pixels.
-     */
-    strokeWidth?: number | ExprRef;
-
-    /**
-     * Minimum size for WebGL buffers (number of data items).
-     * Allows for using `bufferSubData()` to update graphics.
-     *
-     * This property is intended for internal use.
-     */
-    minBufferSize?: number;
-}
-
-export interface MarkConfigAndType extends MarkProps {
-    type: MarkType;
-}
+export type MarkProps =
+    | RectProps
+    | TextProps
+    | RuleProps
+    | LinkProps
+    | PointProps;

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

@@ -6,12 +6,7 @@ import {
     FacetFieldDef,
     PrimaryPositionalChannel,
 } from "./channel.js";
-import {
-    FillAndStrokeProps,
-    MarkConfigAndType,
-    MarkType,
-    RectProps,
-} from "./mark.js";
+import { FillAndStrokeProps, MarkProps, MarkType, RectProps } from "./mark.js";
 import { ExprRef } from "./parameter.js";
 import { Title } from "./title.js";
 import { SampleSpec } from "./sampleView.js";
@@ -166,7 +161,7 @@ export interface ViewSpecBase extends ResolveSpec {
 
 export interface UnitSpec extends ViewSpecBase, AggregateSamplesSpec {
     view?: ViewBackground;
-    mark: MarkType | MarkConfigAndType;
+    mark: MarkType | MarkProps;
 }
 
 export interface AggregateSamplesSpec {

package/dist/src/tooltip/dataTooltipHandler.d.ts

@@ -1,2 +1,2 @@
-export default function dataTooltipHandler(datum: Record<string, any>, mark: import("../marks/mark.js").default, params?: Record<string, any>): Promise<string | HTMLElement | import("lit-html").TemplateResult>;
+export default function dataTooltipHandler(datum: Record<string, any>, mark: import("../marks/mark.js").default<import("../spec/mark.js").MarkProps>, params?: Record<string, any>): Promise<string | HTMLElement | import("lit-html").TemplateResult>;
 //# sourceMappingURL=dataTooltipHandler.d.ts.map

package/dist/src/tooltip/dataTooltipHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataTooltipHandler.d.ts","sourceRoot":"","sources":["../../../src/tooltip/dataTooltipHandler.js"],"names":[],"mappings":"AAMoC,kNAMa"}
+{"version":3,"file":"dataTooltipHandler.d.ts","sourceRoot":"","sources":["../../../src/tooltip/dataTooltipHandler.js"],"names":[],"mappings":"AAMoC,uPAMa"}

package/dist/src/tooltip/refseqGeneTooltipHandler.d.ts

@@ -1,2 +1,2 @@
-export default function refseqGeneTooltipHandler(datum: Record<string, any>, mark: import("../marks/mark.js").default, params?: Record<string, any>): Promise<string | HTMLElement | import("lit-html").TemplateResult>;
+export default function refseqGeneTooltipHandler(datum: Record<string, any>, mark: import("../marks/mark.js").default<import("../spec/mark.js").MarkProps>, params?: Record<string, any>): Promise<string | HTMLElement | import("lit-html").TemplateResult>;
 //# sourceMappingURL=refseqGeneTooltipHandler.d.ts.map

package/dist/src/tooltip/refseqGeneTooltipHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"refseqGeneTooltipHandler.d.ts","sourceRoot":"","sources":["../../../src/tooltip/refseqGeneTooltipHandler.js"],"names":[],"mappings":"AAOC,wNAQW"}
+{"version":3,"file":"refseqGeneTooltipHandler.d.ts","sourceRoot":"","sources":["../../../src/tooltip/refseqGeneTooltipHandler.js"],"names":[],"mappings":"AAOC,6PAQW"}

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

@@ -25,7 +25,7 @@ export default class AxisResolution {
      *
      * @param {AxisResolutionMember} newMember
      */
-    pushUnitView(newMember: AxisResolutionMember): void;
+    addMember(newMember: AxisResolutionMember): void;
     getAxisProps(): import("../spec/axis.js").GenomeAxis;
     getTitle(): string;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"axisResolution.d.ts","sourceRoot":"","sources":["../../../src/view/axisResolution.js"],"names":[],"mappings":"AAeA;;;;;;;GAOG;AACH;IACI;;;OAGG;IAEH;;OAEG;IACH,qBAFW,OAAO,oBAAoB,EAAE,wBAAwB,EAM/D;IAHG,+DAAsB;IACtB,wDAAwD;IACxD,SADW,oBAAoB,EAAE,CAChB;IAGrB,8DAEC;IAED;;;;;OAKG;IACH,wBAFW,oBAAoB,QAkB9B;IAED,qDAuBC;IAED,mBAyDC;CACJ;;UAlIS,OAAO,eAAe,EAAE,OAAO;aAC/B,CAAC;gBACD,OAAO,oBAAoB,EAAE,mBAAmB"}
+{"version":3,"file":"axisResolution.d.ts","sourceRoot":"","sources":["../../../src/view/axisResolution.js"],"names":[],"mappings":"AAeA;;;;;;;GAOG;AACH;IACI;;;OAGG;IAEH;;OAEG;IACH,qBAFW,OAAO,oBAAoB,EAAE,wBAAwB,EAM/D;IAHG,+DAAsB;IACtB,wDAAwD;IACxD,SADW,oBAAoB,EAAE,CAChB;IAGrB,8DAEC;IAED;;;;;OAKG;IACH,qBAFW,oBAAoB,QAkB9B;IAED,qDAuBC;IAED,mBAyDC;CACJ;;UAlIS,OAAO,eAAe,EAAE,OAAO;aAC/B,CAAC;gBACD,OAAO,oBAAoB,EAAE,mBAAmB"}