@genome-spy/core 0.49.0 → 0.50.1

package/dist/src/marks/point.js

@@ -17,6 +17,9 @@ import { fixFill, fixStroke } from "./markUtils.js";
 /** @type {Record<string, import("../spec/channel.js").ChannelDef>} */
 const defaultEncoding = {};
 
+/**
+ * @extends {Mark<import("../spec/mark.js").PointProps>}
+ */
 export default class PointMark extends Mark {
     #semanticZoomFraction = () => 0;
 
@@ -26,28 +29,28 @@ export default class PointMark extends Mark {
     constructor(unitView) {
         super(unitView);
 
-        Object.defineProperties(
-            this.defaultProperties,
-            Object.getOwnPropertyDescriptors({
-                x: 0.5,
-                y: 0.5,
-                color: "#4c78a8",
-                filled: true,
-                opacity: 1.0,
-                size: 100.0,
-                semanticScore: 0.0, // TODO: Should be datum instead of value. But needs fixing.
-                shape: "circle",
-                strokeWidth: 2.0,
-                fillGradientStrength: 0.0,
-                dx: 0,
-                dy: 0,
-                angle: 0,
-
-                sampleFacetPadding: 0.1,
-
-                semanticZoomFraction: 0.02,
-            })
-        );
+        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
@@ -68,9 +71,11 @@ export default class PointMark extends Mark {
         }
     }
 
+    /**
+     * @returns {import("../spec/channel.js").Channel[]}
+     */
     getAttributes() {
         return [
-            "inwardStroke",
             "uniqueId",
             "facetIndex",
             "x",
@@ -79,7 +84,6 @@ export default class PointMark extends Mark {
             "semanticScore",
             "shape",
             "strokeWidth",
-            "gradientStrength",
             "dx",
             "dy",
             "fill",
@@ -173,6 +177,7 @@ export default class PointMark extends Mark {
             "uGradientStrength",
             props.fillGradientStrength
         );
+        this.registerMarkUniformValue("uMinPickingSize", props.minPickingSize);
     }
 
     updateGraphicsData() {

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

@@ -1,2 +1,2 @@
-const shader = "out float vRadius;out float vRadiusWithPadding;out lowp vec4 vFillColor;out lowp vec4 vStrokeColor;out lowp float vShape;out lowp float vHalfStrokeWidth;out mat2 vRotationMatrix;const float CIRCLE=0.0;const float SQUARE=1.0;const float CROSS=2.0;const float DIAMOND=3.0;const float TRIANGLE_UP=4.0;const float TRIANGLE_RIGHT=5.0;const float TRIANGLE_DOWN=6.0;const float TRIANGLE_LEFT=7.0;const float TICK_UP=8.0;const float TICK_RIGHT=9.0;const float TICK_DOWN=10.0;const float TICK_LEFT=11.0;float computeSemanticThresholdFactor(){return getScaled_semanticScore()>=uSemanticThreshold ? 1.0 : 0.0;}vec2 getDxDy(){\n#if defined(dx_DEFINED) || defined(dy_DEFINED)\nreturn vec2(getScaled_dx(),getScaled_dy())/uViewportSize;\n#else\nreturn vec2(0.0,0.0);\n#endif\n}void main(void){float shapeAngle=0.0;float semanticThresholdFactor=computeSemanticThresholdFactor();if(semanticThresholdFactor<=0.0){gl_PointSize=0.0;gl_Position=vec4(100.0,0.0,0.0,0.0);return;}float size=getScaled_size();vec2 pos=vec2(getScaled_x(),getScaled_y())+getDxDy();gl_Position=unitToNdc(applySampleFacet(pos));float strokeWidth=getScaled_strokeWidth();float diameter=sqrt(size)*uScaleFactor*semanticThresholdFactor;float opacity=uViewOpacity;if(strokeWidth<=0.0||uInwardStroke){float minDiameter=1.0/uDevicePixelRatio;if(diameter<minDiameter){opacity*=pow(diameter/minDiameter,2.5);diameter=minDiameter;}}float fillOpa=getScaled_fillOpacity()*opacity;float strokeOpa=getScaled_strokeOpacity()*opacity;vShape=getScaled_shape();bool circle=vShape==0.0;if(vShape>TICK_UP&&vShape<=TICK_LEFT){shapeAngle=(vShape-TICK_UP)*90.0;vShape=TICK_UP;}else if(vShape>TRIANGLE_UP&&vShape<=TRIANGLE_LEFT){shapeAngle=(vShape-TRIANGLE_UP)*90.0;vShape=TRIANGLE_UP;}float angleInDegrees=getScaled_angle();float angle=-(shapeAngle+angleInDegrees)*PI/180.0;float sinTheta=sin(angle);float cosTheta=cos(angle);vRotationMatrix=mat2(cosTheta,sinTheta,-sinTheta,cosTheta);float roomForRotation=circle ? 1.0 : sin(mod(angle,PI/2.0)+PI/4.0)/sin(PI/4.0);float aaPadding=1.0/uDevicePixelRatio;float rotationPadding=(diameter*roomForRotation)-diameter;float strokePadding=uInwardStroke ? 0.0 : strokeWidth*(circle ? 1.0 : sqrt(3.0));float padding=rotationPadding+strokePadding+aaPadding;gl_PointSize=(diameter+padding)*uDevicePixelRatio;vRadius=diameter/2.0;vRadiusWithPadding=vRadius+padding/2.0;vHalfStrokeWidth=strokeWidth/2.0;vFillColor=vec4(getScaled_fill()*fillOpa,fillOpa);vStrokeColor=vec4(getScaled_stroke()*strokeOpa,strokeOpa);setupPicking();}";
+const shader = "out float vRadius;out float vRadiusWithPadding;out lowp vec4 vFillColor;out lowp vec4 vStrokeColor;out lowp float vShape;out lowp float vHalfStrokeWidth;out mat2 vRotationMatrix;const float CIRCLE=0.0;const float SQUARE=1.0;const float CROSS=2.0;const float DIAMOND=3.0;const float TRIANGLE_UP=4.0;const float TRIANGLE_RIGHT=5.0;const float TRIANGLE_DOWN=6.0;const float TRIANGLE_LEFT=7.0;const float TICK_UP=8.0;const float TICK_RIGHT=9.0;const float TICK_DOWN=10.0;const float TICK_LEFT=11.0;float computeSemanticThresholdFactor(){return getScaled_semanticScore()>=uSemanticThreshold ? 1.0 : 0.0;}vec2 getDxDy(){\n#if defined(dx_DEFINED) || defined(dy_DEFINED)\nreturn vec2(getScaled_dx(),getScaled_dy())/uViewportSize;\n#else\nreturn vec2(0.0,0.0);\n#endif\n}void main(void){float shapeAngle=0.0;float semanticThresholdFactor=computeSemanticThresholdFactor();if(semanticThresholdFactor<=0.0){gl_PointSize=0.0;gl_Position=vec4(100.0,0.0,0.0,0.0);return;}float size=getScaled_size();vec2 pos=vec2(getScaled_x(),getScaled_y())+getDxDy();gl_Position=unitToNdc(applySampleFacet(pos));float strokeWidth=getScaled_strokeWidth();float diameter=sqrt(size)*uScaleFactor*semanticThresholdFactor;float opacity=uViewOpacity;if(strokeWidth<=0.0||uInwardStroke){float minDiameter=1.0/uDevicePixelRatio;if(diameter<minDiameter){opacity*=pow(diameter/minDiameter,2.5);diameter=minDiameter;}}float fillOpa=getScaled_fillOpacity()*opacity;float strokeOpa=getScaled_strokeOpacity()*opacity;vShape=getScaled_shape();bool circle=vShape==0.0;if(vShape>TICK_UP&&vShape<=TICK_LEFT){shapeAngle=(vShape-TICK_UP)*90.0;vShape=TICK_UP;}else if(vShape>TRIANGLE_UP&&vShape<=TRIANGLE_LEFT){shapeAngle=(vShape-TRIANGLE_UP)*90.0;vShape=TRIANGLE_UP;}float angleInDegrees=getScaled_angle();float angle=-(shapeAngle+angleInDegrees)*PI/180.0;float sinTheta=sin(angle);float cosTheta=cos(angle);vRotationMatrix=mat2(cosTheta,sinTheta,-sinTheta,cosTheta);float roomForRotation=circle ? 1.0 : sin(mod(angle,PI/2.0)+PI/4.0)/sin(PI/4.0);float aaPadding=1.0/uDevicePixelRatio;float rotationPadding=(diameter*roomForRotation)-diameter;float strokePadding=uInwardStroke ? 0.0 : strokeWidth*(circle ? 1.0 : sqrt(3.0));float padding=rotationPadding+strokePadding+aaPadding;gl_PointSize=max((diameter+padding),uPickingEnabled ? uMinPickingSize : 0.0)*uDevicePixelRatio;vRadius=diameter/2.0;vRadiusWithPadding=vRadius+padding/2.0;vHalfStrokeWidth=strokeWidth/2.0;vFillColor=vec4(getScaled_fill()*fillOpa,fillOpa);vStrokeColor=vec4(getScaled_stroke()*strokeOpa,strokeOpa);setupPicking();}";
 export default shader;

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

@@ -1,4 +1,11 @@
-export default class RectMark extends Mark {
+/**
+ * @extends {Mark<import("../spec/mark.js").RectProps>}
+ */
+export default class RectMark extends Mark<import("../spec/mark.js").RectProps> {
+    /**
+     * @param {import("../view/unitView.js").default} unitView
+     */
+    constructor(unitView: import("../view/unitView.js").default);
     /**
      * Finds a datum that overlaps the given value on the x domain.
      * The result is unspecified if multiple data are found.

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

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

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> =