From 18b61c5855fc547af2e50b5bc9cf1024cab21810 Mon Sep 17 00:00:00 2001
From: Arvind Satyanarayan <arvind@users.noreply.github.com>
Date: Fri, 15 Jan 2021 09:48:09 -0500
Subject: [PATCH] feat: move selection emptiness check to predicate (#7155)

* feat: move selection emptiness check to predicate

* chore: update schema [CI]

* chore: update examples [CI]

Co-authored-by: GitHub Actions Bot <vega-actions-bot@users.noreply.github.com>
---
 build/vega-lite-schema.json                   | 210 +++++++-----------
 examples/compiled/airport_connections.vg.json |   5 +-
 examples/compiled/bar_count_minimap.vg.json   |   2 +-
 examples/compiled/brush_table.vg.json         |   4 +-
 .../compiled/concat_bar_layer_circle.vg.json  |   4 +-
 examples/compiled/concat_hover.vg.json        |   4 +-
 examples/compiled/concat_hover_filter.vg.json |   5 +-
 .../compiled/interactive_area_brush.vg.json   |   2 +-
 .../interactive_bar_select_highlight.vg.json  |   6 +-
 examples/compiled/interactive_brush.vg.json   |   2 +-
 .../compiled/interactive_concat_layer.vg.json |   4 +-
 .../interactive_dashboard_europe_pop.vg.json  |  18 +-
 .../interactive_global_development.vg.json    |  25 +--
 .../compiled/interactive_index_chart.vg.json  |   4 +-
 .../interactive_layered_crossfilter.vg.json   |   4 +-
 ...ctive_layered_crossfilter_discrete.vg.json |   4 +-
 examples/compiled/interactive_legend.vg.json  |   2 +-
 .../interactive_legend_dblclick.vg.json       |   2 +-
 .../compiled/interactive_line_hover.vg.json   |  14 +-
 .../interactive_multi_line_label.vg.json      |  10 +-
 ...teractive_multi_line_pivot_tooltip.vg.json |  10 +-
 .../interactive_multi_line_tooltip.vg.json    |   6 +-
 .../compiled/interactive_paintbrush.vg.json   |   2 +-
 .../interactive_paintbrush_color.vg.json      |   2 +-
 ...teractive_paintbrush_color_nearest.vg.json |   2 +-
 .../interactive_paintbrush_interval.vg.json   |   2 +-
 .../interactive_paintbrush_simple_all.vg.json |   2 +-
 ...interactive_paintbrush_simple_none.vg.json |   2 +-
 .../interactive_query_widgets.vg.json         |   4 +-
 .../interactive_seattle_weather.vg.json       |   8 +-
 examples/compiled/interactive_splom.vg.json   |  18 +-
 .../interactive_stocks_nearest_index.vg.json  |   2 +-
 examples/compiled/isotype_grid.vg.json        |   2 +-
 .../compiled/selection_bind_cylyr.vg.json     |   4 +-
 .../compiled/selection_bind_origin.vg.json    |   2 +-
 .../compiled/selection_brush_timeunit.vg.json |   4 +-
 .../compiled/selection_clear_brush.vg.json    |   2 +-
 .../selection_composition_and.vg.json         |   2 +-
 .../compiled/selection_composition_or.vg.json |   2 +-
 examples/compiled/selection_concat.vg.json    |   2 +-
 examples/compiled/selection_filter.vg.json    |   2 +-
 .../selection_filter_composition.vg.json      |   2 +-
 examples/compiled/selection_heatmap.vg.json   |   6 +-
 examples/compiled/selection_insert.vg.json    |   2 +-
 .../selection_layer_bar_month.vg.json         |   4 +-
 .../selection_multi_condition.vg.json         |   4 +-
 .../selection_project_binned_interval.vg.json |   2 +-
 .../selection_project_interval.vg.json        |   2 +-
 .../selection_project_interval_x.vg.json      |   2 +-
 .../selection_project_interval_x_y.vg.json    |   2 +-
 .../selection_project_interval_y.vg.json      |   2 +-
 .../compiled/selection_project_multi.vg.json  |   4 +-
 .../selection_project_multi_cylinders.vg.json |   4 +-
 ...ion_project_multi_cylinders_origin.vg.json |   6 +-
 .../selection_project_multi_origin.vg.json    |   6 +-
 .../compiled/selection_project_single.vg.json |   4 +-
 ...selection_project_single_cylinders.vg.json |   4 +-
 ...on_project_single_cylinders_origin.vg.json |   6 +-
 .../selection_project_single_origin.vg.json   |   6 +-
 .../selection_resolution_global.vg.json       |  18 +-
 .../selection_resolution_intersect.vg.json    |  18 +-
 .../selection_resolution_union.vg.json        |  18 +-
 .../compiled/selection_toggle_altKey.vg.json  |   2 +-
 .../selection_toggle_altKey_shiftKey.vg.json  |   2 +-
 .../selection_toggle_shiftKey.vg.json         |   2 +-
 .../selection_translate_brush_drag.vg.json    |   2 +-
 ...lection_translate_brush_shift-drag.vg.json |   2 +-
 .../compiled/selection_type_interval.vg.json  |   2 +-
 .../selection_type_interval_invert.png        | Bin 6941 -> 6999 bytes
 .../selection_type_interval_invert.svg        |   2 +-
 .../selection_type_interval_invert.vg.json    |   2 +-
 .../compiled/selection_type_multi.vg.json     |   2 +-
 .../compiled/selection_type_single.vg.json    |   2 +-
 .../selection_type_single_dblclick.vg.json    |   2 +-
 .../selection_type_single_mouseover.vg.json   |   2 +-
 .../selection_zoom_brush_shift-wheel.vg.json  |   2 +-
 .../selection_zoom_brush_wheel.vg.json        |   2 +-
 examples/compiled/trellis_selections.vg.json  |   4 +-
 examples/compiled/vconcat_flatten.vg.json     |   4 +-
 examples/specs/airport_connections.vl.json    |   5 +-
 examples/specs/concat_hover.vl.json           |  22 +-
 examples/specs/concat_hover_filter.vl.json    |  20 +-
 .../interactive_bar_select_highlight.vl.json  |  25 +--
 .../interactive_dashboard_europe_pop.vl.json  |  24 +-
 .../interactive_global_development.vl.json    |  24 +-
 examples/specs/interactive_line_hover.vl.json |   3 +-
 .../interactive_multi_line_label.vl.json      |  11 +-
 ...teractive_multi_line_pivot_tooltip.vl.json |   5 +-
 .../interactive_multi_line_tooltip.vl.json    |  11 +-
 .../interactive_paintbrush_simple_all.vl.json |   6 +-
 ...interactive_paintbrush_simple_none.vl.json |   6 +-
 .../airport_connections_normalized.vl.json    |   5 +-
 .../concat_hover_filter_normalized.vl.json    |  14 +-
 ...tive_global_development_normalized.vl.json |  24 +-
 .../interactive_line_hover_normalized.vl.json |   7 +-
 ...active_multi_line_label_normalized.vl.json |   7 +-
 ...ulti_line_pivot_tooltip_normalized.vl.json |   5 +-
 ...tive_multi_line_tooltip_normalized.vl.json |   8 +-
 .../specs/selection_composition_and.vl.json   |   5 +-
 .../specs/selection_composition_or.vl.json    |   5 +-
 examples/specs/selection_heatmap.vl.json      |   6 +-
 .../selection_type_interval_invert.vl.json    |   2 +-
 examples/specs/vconcat_flatten.vl.json        |   2 +-
 site/docs/encoding/condition.md               |   2 +-
 src/channeldef.ts                             |  11 +-
 src/compile/mark/encode/conditional.ts        |  23 +-
 src/compile/predicate.ts                      |   2 +-
 src/compile/selection/index.ts                |   1 -
 src/compile/selection/parse.ts                |  49 ++--
 src/predicate.ts                              |   9 +-
 src/selection.ts                              |   7 -
 test/compile/selection/parse.test.ts          |   2 +-
 test/compile/selection/predicate.test.ts      |  81 ++-----
 113 files changed, 454 insertions(+), 556 deletions(-)

diff --git a/build/vega-lite-schema.json b/build/vega-lite-schema.json
index cce8f7dbde..e454f640ea 100644
--- a/build/vega-lite-schema.json
+++ b/build/vega-lite-schema.json
@@ -6746,6 +6746,10 @@
               ],
               "description": "A flag for binning a `quantitative` field, [an object defining binning parameters](https://vega.github.io/vega-lite/docs/bin.html#params), or indicating that the data for `x` or `y` channel are binned before they are imported into Vega-Lite (`\"binned\"`).\n\n- If `true`, default [binning parameters](https://vega.github.io/vega-lite/docs/bin.html) will be applied.\n\n- If `\"binned\"`, this indicates that the data for the `x` (or `y`) channel are already binned. You can map the bin-start field to `x` (or `y`) and the bin-end field to `x2` (or `y2`). The scale and axis will be formatted similar to binning in Vega-Lite.  To adjust the axis ticks based on the bin step, you can also set the axis's [`tickMinStep`](https://vega.github.io/vega-lite/docs/axis.html#ticks) property.\n\n__Default value:__ `false`\n\n__See also:__ [`bin`](https://vega.github.io/vega-lite/docs/bin.html) documentation."
             },
+            "empty": {
+              "description": "By default, the predicate of empty selections returns true. Override this behavior, by setting this property `empty: false`.",
+              "type": "boolean"
+            },
             "field": {
               "$ref": "#/definitions/Field",
               "description": "__Required.__ A string defining the name of the field from which to pull a data value or an object defining iterated values from the [`repeat`](https://vega.github.io/vega-lite/docs/repeat.html) operator.\n\n__See also:__ [`field`](https://vega.github.io/vega-lite/docs/field.html) documentation.\n\n__Notes:__ 1)  Dots (`.`) and brackets (`[` and `]`) can be used to access nested objects (e.g., `\"field\": \"foo.bar\"` and `\"field\": \"foo['bar']\"`). If field names contain dots or brackets but are not nested, you can use `\\\\` to escape dots and brackets (e.g., `\"a\\\\.b\"` and `\"a\\\\[0\\\\]\"`). See more details about escaping in the [field documentation](https://vega.github.io/vega-lite/docs/field.html). 2) `field` is not required if `aggregate` is `count`."
@@ -6773,8 +6777,8 @@
               "description": "An object defining properties of the channel's scale, which is the function that transforms values in the data domain (numbers, dates, strings, etc) to visual values (pixels, colors, sizes) of the encoding channels.\n\nIf `null`, the scale will be [disabled and the data value will be directly encoded](https://vega.github.io/vega-lite/docs/scale.html#disable).\n\n__Default value:__ If undefined, default [scale properties](https://vega.github.io/vega-lite/docs/scale.html) are applied.\n\n__See also:__ [`scale`](https://vega.github.io/vega-lite/docs/scale.html) documentation."
             },
             "selection": {
-              "$ref": "#/definitions/SelectionComposition",
-              "description": "A [selection name](https://vega.github.io/vega-lite/docs/selection.html), or a series of [composed selections](https://vega.github.io/vega-lite/docs/selection.html#compose)."
+              "description": "Filter using a selection name.",
+              "type": "string"
             },
             "sort": {
               "$ref": "#/definitions/Sort",
@@ -6838,6 +6842,10 @@
               ],
               "description": "A constant value in data domain."
             },
+            "empty": {
+              "description": "By default, the predicate of empty selections returns true. Override this behavior, by setting this property `empty: false`.",
+              "type": "boolean"
+            },
             "legend": {
               "anyOf": [
                 {
@@ -6861,8 +6869,8 @@
               "description": "An object defining properties of the channel's scale, which is the function that transforms values in the data domain (numbers, dates, strings, etc) to visual values (pixels, colors, sizes) of the encoding channels.\n\nIf `null`, the scale will be [disabled and the data value will be directly encoded](https://vega.github.io/vega-lite/docs/scale.html#disable).\n\n__Default value:__ If undefined, default [scale properties](https://vega.github.io/vega-lite/docs/scale.html) are applied.\n\n__See also:__ [`scale`](https://vega.github.io/vega-lite/docs/scale.html) documentation."
             },
             "selection": {
-              "$ref": "#/definitions/SelectionComposition",
-              "description": "A [selection name](https://vega.github.io/vega-lite/docs/selection.html), or a series of [composed selections](https://vega.github.io/vega-lite/docs/selection.html#compose)."
+              "description": "Filter using a selection name.",
+              "type": "string"
             },
             "type": {
               "$ref": "#/definitions/Type",
@@ -6905,6 +6913,10 @@
               ],
               "description": "A flag for binning a `quantitative` field, [an object defining binning parameters](https://vega.github.io/vega-lite/docs/bin.html#params), or indicating that the data for `x` or `y` channel are binned before they are imported into Vega-Lite (`\"binned\"`).\n\n- If `true`, default [binning parameters](https://vega.github.io/vega-lite/docs/bin.html) will be applied.\n\n- If `\"binned\"`, this indicates that the data for the `x` (or `y`) channel are already binned. You can map the bin-start field to `x` (or `y`) and the bin-end field to `x2` (or `y2`). The scale and axis will be formatted similar to binning in Vega-Lite.  To adjust the axis ticks based on the bin step, you can also set the axis's [`tickMinStep`](https://vega.github.io/vega-lite/docs/axis.html#ticks) property.\n\n__Default value:__ `false`\n\n__See also:__ [`bin`](https://vega.github.io/vega-lite/docs/bin.html) documentation."
             },
+            "empty": {
+              "description": "By default, the predicate of empty selections returns true. Override this behavior, by setting this property `empty: false`.",
+              "type": "boolean"
+            },
             "field": {
               "$ref": "#/definitions/Field",
               "description": "__Required.__ A string defining the name of the field from which to pull a data value or an object defining iterated values from the [`repeat`](https://vega.github.io/vega-lite/docs/repeat.html) operator.\n\n__See also:__ [`field`](https://vega.github.io/vega-lite/docs/field.html) documentation.\n\n__Notes:__ 1)  Dots (`.`) and brackets (`[` and `]`) can be used to access nested objects (e.g., `\"field\": \"foo.bar\"` and `\"field\": \"foo['bar']\"`). If field names contain dots or brackets but are not nested, you can use `\\\\` to escape dots and brackets (e.g., `\"a\\\\.b\"` and `\"a\\\\[0\\\\]\"`). See more details about escaping in the [field documentation](https://vega.github.io/vega-lite/docs/field.html). 2) `field` is not required if `aggregate` is `count`."
@@ -6932,8 +6944,8 @@
               "description": "An object defining properties of the channel's scale, which is the function that transforms values in the data domain (numbers, dates, strings, etc) to visual values (pixels, colors, sizes) of the encoding channels.\n\nIf `null`, the scale will be [disabled and the data value will be directly encoded](https://vega.github.io/vega-lite/docs/scale.html#disable).\n\n__Default value:__ If undefined, default [scale properties](https://vega.github.io/vega-lite/docs/scale.html) are applied.\n\n__See also:__ [`scale`](https://vega.github.io/vega-lite/docs/scale.html) documentation."
             },
             "selection": {
-              "$ref": "#/definitions/SelectionComposition",
-              "description": "A [selection name](https://vega.github.io/vega-lite/docs/selection.html), or a series of [composed selections](https://vega.github.io/vega-lite/docs/selection.html#compose)."
+              "description": "Filter using a selection name.",
+              "type": "string"
             },
             "sort": {
               "$ref": "#/definitions/Sort",
@@ -6997,6 +7009,10 @@
               ],
               "description": "A constant value in data domain."
             },
+            "empty": {
+              "description": "By default, the predicate of empty selections returns true. Override this behavior, by setting this property `empty: false`.",
+              "type": "boolean"
+            },
             "legend": {
               "anyOf": [
                 {
@@ -7020,8 +7036,8 @@
               "description": "An object defining properties of the channel's scale, which is the function that transforms values in the data domain (numbers, dates, strings, etc) to visual values (pixels, colors, sizes) of the encoding channels.\n\nIf `null`, the scale will be [disabled and the data value will be directly encoded](https://vega.github.io/vega-lite/docs/scale.html#disable).\n\n__Default value:__ If undefined, default [scale properties](https://vega.github.io/vega-lite/docs/scale.html) are applied.\n\n__See also:__ [`scale`](https://vega.github.io/vega-lite/docs/scale.html) documentation."
             },
             "selection": {
-              "$ref": "#/definitions/SelectionComposition",
-              "description": "A [selection name](https://vega.github.io/vega-lite/docs/selection.html), or a series of [composed selections](https://vega.github.io/vega-lite/docs/selection.html#compose)."
+              "description": "Filter using a selection name.",
+              "type": "string"
             },
             "type": {
               "$ref": "#/definitions/Type",
@@ -7066,6 +7082,10 @@
           ],
           "description": "A flag for binning a `quantitative` field, [an object defining binning parameters](https://vega.github.io/vega-lite/docs/bin.html#params), or indicating that the data for `x` or `y` channel are binned before they are imported into Vega-Lite (`\"binned\"`).\n\n- If `true`, default [binning parameters](https://vega.github.io/vega-lite/docs/bin.html) will be applied.\n\n- If `\"binned\"`, this indicates that the data for the `x` (or `y`) channel are already binned. You can map the bin-start field to `x` (or `y`) and the bin-end field to `x2` (or `y2`). The scale and axis will be formatted similar to binning in Vega-Lite.  To adjust the axis ticks based on the bin step, you can also set the axis's [`tickMinStep`](https://vega.github.io/vega-lite/docs/axis.html#ticks) property.\n\n__Default value:__ `false`\n\n__See also:__ [`bin`](https://vega.github.io/vega-lite/docs/bin.html) documentation."
         },
+        "empty": {
+          "description": "By default, the predicate of empty selections returns true. Override this behavior, by setting this property `empty: false`.",
+          "type": "boolean"
+        },
         "field": {
           "$ref": "#/definitions/Field",
           "description": "__Required.__ A string defining the name of the field from which to pull a data value or an object defining iterated values from the [`repeat`](https://vega.github.io/vega-lite/docs/repeat.html) operator.\n\n__See also:__ [`field`](https://vega.github.io/vega-lite/docs/field.html) documentation.\n\n__Notes:__ 1)  Dots (`.`) and brackets (`[` and `]`) can be used to access nested objects (e.g., `\"field\": \"foo.bar\"` and `\"field\": \"foo['bar']\"`). If field names contain dots or brackets but are not nested, you can use `\\\\` to escape dots and brackets (e.g., `\"a\\\\.b\"` and `\"a\\\\[0\\\\]\"`). See more details about escaping in the [field documentation](https://vega.github.io/vega-lite/docs/field.html). 2) `field` is not required if `aggregate` is `count`."
@@ -7086,8 +7106,8 @@
           "type": "string"
         },
         "selection": {
-          "$ref": "#/definitions/SelectionComposition",
-          "description": "A [selection name](https://vega.github.io/vega-lite/docs/selection.html), or a series of [composed selections](https://vega.github.io/vega-lite/docs/selection.html#compose)."
+          "description": "Filter using a selection name.",
+          "type": "string"
         },
         "timeUnit": {
           "anyOf": [
@@ -7124,9 +7144,13 @@
     "ConditionalSelection<ValueDef<(Gradient|string|null|ExprRef)>>": {
       "additionalProperties": false,
       "properties": {
+        "empty": {
+          "description": "By default, the predicate of empty selections returns true. Override this behavior, by setting this property `empty: false`.",
+          "type": "boolean"
+        },
         "selection": {
-          "$ref": "#/definitions/SelectionComposition",
-          "description": "A [selection name](https://vega.github.io/vega-lite/docs/selection.html), or a series of [composed selections](https://vega.github.io/vega-lite/docs/selection.html#compose)."
+          "description": "Filter using a selection name.",
+          "type": "string"
         },
         "value": {
           "anyOf": [
@@ -7155,9 +7179,13 @@
     "ConditionalSelection<ValueDef<(Text|ExprRef)>>": {
       "additionalProperties": false,
       "properties": {
+        "empty": {
+          "description": "By default, the predicate of empty selections returns true. Override this behavior, by setting this property `empty: false`.",
+          "type": "boolean"
+        },
         "selection": {
-          "$ref": "#/definitions/SelectionComposition",
-          "description": "A [selection name](https://vega.github.io/vega-lite/docs/selection.html), or a series of [composed selections](https://vega.github.io/vega-lite/docs/selection.html#compose)."
+          "description": "Filter using a selection name.",
+          "type": "string"
         },
         "value": {
           "anyOf": [
@@ -7180,9 +7208,13 @@
     "ConditionalSelection<ValueDef<(number[]|ExprRef)>>": {
       "additionalProperties": false,
       "properties": {
+        "empty": {
+          "description": "By default, the predicate of empty selections returns true. Override this behavior, by setting this property `empty: false`.",
+          "type": "boolean"
+        },
         "selection": {
-          "$ref": "#/definitions/SelectionComposition",
-          "description": "A [selection name](https://vega.github.io/vega-lite/docs/selection.html), or a series of [composed selections](https://vega.github.io/vega-lite/docs/selection.html#compose)."
+          "description": "Filter using a selection name.",
+          "type": "string"
         },
         "value": {
           "anyOf": [
@@ -7208,9 +7240,13 @@
     "ConditionalSelection<ValueDef<(number|ExprRef)>>": {
       "additionalProperties": false,
       "properties": {
+        "empty": {
+          "description": "By default, the predicate of empty selections returns true. Override this behavior, by setting this property `empty: false`.",
+          "type": "boolean"
+        },
         "selection": {
-          "$ref": "#/definitions/SelectionComposition",
-          "description": "A [selection name](https://vega.github.io/vega-lite/docs/selection.html), or a series of [composed selections](https://vega.github.io/vega-lite/docs/selection.html#compose)."
+          "description": "Filter using a selection name.",
+          "type": "string"
         },
         "value": {
           "anyOf": [
@@ -7233,9 +7269,13 @@
     "ConditionalSelection<ValueDef<(string|ExprRef)>>": {
       "additionalProperties": false,
       "properties": {
+        "empty": {
+          "description": "By default, the predicate of empty selections returns true. Override this behavior, by setting this property `empty: false`.",
+          "type": "boolean"
+        },
         "selection": {
-          "$ref": "#/definitions/SelectionComposition",
-          "description": "A [selection name](https://vega.github.io/vega-lite/docs/selection.html), or a series of [composed selections](https://vega.github.io/vega-lite/docs/selection.html#compose)."
+          "description": "Filter using a selection name.",
+          "type": "string"
         },
         "value": {
           "anyOf": [
@@ -7258,9 +7298,13 @@
     "ConditionalSelection<ValueDef<(string|null|ExprRef)>>": {
       "additionalProperties": false,
       "properties": {
+        "empty": {
+          "description": "By default, the predicate of empty selections returns true. Override this behavior, by setting this property `empty: false`.",
+          "type": "boolean"
+        },
         "selection": {
-          "$ref": "#/definitions/SelectionComposition",
-          "description": "A [selection name](https://vega.github.io/vega-lite/docs/selection.html), or a series of [composed selections](https://vega.github.io/vega-lite/docs/selection.html#compose)."
+          "description": "Filter using a selection name.",
+          "type": "string"
         },
         "value": {
           "anyOf": [
@@ -7286,9 +7330,13 @@
     "ConditionalSelection<ValueDef<number>>": {
       "additionalProperties": false,
       "properties": {
+        "empty": {
+          "description": "By default, the predicate of empty selections returns true. Override this behavior, by setting this property `empty: false`.",
+          "type": "boolean"
+        },
         "selection": {
-          "$ref": "#/definitions/SelectionComposition",
-          "description": "A [selection name](https://vega.github.io/vega-lite/docs/selection.html), or a series of [composed selections](https://vega.github.io/vega-lite/docs/selection.html#compose)."
+          "description": "Filter using a selection name.",
+          "type": "string"
         },
         "value": {
           "description": "A constant value in visual domain (e.g., `\"red\"` / `\"#0099ff\"` / [gradient definition](https://vega.github.io/vega-lite/docs/types.html#gradient) for color, values between `0` to `1` for opacity).",
@@ -11862,14 +11910,6 @@
           ],
           "description": "Clears the selection, emptying it of all values. Can be a [Event Stream](https://vega.github.io/vega/docs/event-streams/) or `false` to disable.\n\n__Default value:__ `dblclick`.\n\n__See also:__ [`clear`](https://vega.github.io/vega-lite/docs/clear.html) documentation."
         },
-        "empty": {
-          "description": "By default, `all` data values are considered to lie within an empty selection. When set to `none`, empty selections contain no data values.",
-          "enum": [
-            "all",
-            "none"
-          ],
-          "type": "string"
-        },
         "encodings": {
           "description": "An array of encoding channels. The corresponding data field values must match for a data tuple to fall within the selection.\n\n__See also:__ [`encodings`](https://vega.github.io/vega-lite/docs/project.html) documentation.",
           "items": {
@@ -14982,21 +15022,6 @@
       ],
       "type": "object"
     },
-    "SelectionAnd": {
-      "additionalProperties": false,
-      "properties": {
-        "and": {
-          "items": {
-            "$ref": "#/definitions/SelectionComposition"
-          },
-          "type": "array"
-        }
-      },
-      "required": [
-        "and"
-      ],
-      "type": "object"
-    },
     "PredicateComposition": {
       "anyOf": [
         {
@@ -15013,22 +15038,6 @@
         }
       ]
     },
-    "SelectionComposition": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/SelectionNot"
-        },
-        {
-          "$ref": "#/definitions/SelectionAnd"
-        },
-        {
-          "$ref": "#/definitions/SelectionOr"
-        },
-        {
-          "type": "string"
-        }
-      ]
-    },
     "LogicalNot<Predicate>": {
       "additionalProperties": false,
       "properties": {
@@ -15041,18 +15050,6 @@
       ],
       "type": "object"
     },
-    "SelectionNot": {
-      "additionalProperties": false,
-      "properties": {
-        "not": {
-          "$ref": "#/definitions/SelectionComposition"
-        }
-      },
-      "required": [
-        "not"
-      ],
-      "type": "object"
-    },
     "LogicalOr<Predicate>": {
       "additionalProperties": false,
       "properties": {
@@ -15068,21 +15065,6 @@
       ],
       "type": "object"
     },
-    "SelectionOr": {
-      "additionalProperties": false,
-      "properties": {
-        "or": {
-          "items": {
-            "$ref": "#/definitions/SelectionComposition"
-          },
-          "type": "array"
-        }
-      },
-      "required": [
-        "or"
-      ],
-      "type": "object"
-    },
     "LookupData": {
       "additionalProperties": false,
       "properties": {
@@ -19595,14 +19577,6 @@
           ],
           "description": "Clears the selection, emptying it of all values. Can be a [Event Stream](https://vega.github.io/vega/docs/event-streams/) or `false` to disable.\n\n__Default value:__ `dblclick`.\n\n__See also:__ [`clear`](https://vega.github.io/vega-lite/docs/clear.html) documentation."
         },
-        "empty": {
-          "description": "By default, `all` data values are considered to lie within an empty selection. When set to `none`, empty selections contain no data values.",
-          "enum": [
-            "all",
-            "none"
-          ],
-          "type": "string"
-        },
         "encodings": {
           "description": "An array of encoding channels. The corresponding data field values must match for a data tuple to fall within the selection.\n\n__See also:__ [`encodings`](https://vega.github.io/vega-lite/docs/project.html) documentation.",
           "items": {
@@ -22377,14 +22351,6 @@
                   ],
                   "description": "Clears the selection, emptying it of all values. Can be a [Event Stream](https://vega.github.io/vega/docs/event-streams/) or `false` to disable.\n\n__Default value:__ `dblclick`.\n\n__See also:__ [`clear`](https://vega.github.io/vega-lite/docs/clear.html) documentation."
                 },
-                "empty": {
-                  "description": "By default, `all` data values are considered to lie within an empty selection. When set to `none`, empty selections contain no data values.",
-                  "enum": [
-                    "all",
-                    "none"
-                  ],
-                  "type": "string"
-                },
                 "encodings": {
                   "description": "An array of encoding channels. The corresponding data field values must match for a data tuple to fall within the selection.\n\n__See also:__ [`encodings`](https://vega.github.io/vega-lite/docs/project.html) documentation.",
                   "items": {
@@ -22451,14 +22417,6 @@
                   ],
                   "description": "Clears the selection, emptying it of all values. Can be a [Event Stream](https://vega.github.io/vega/docs/event-streams/) or `false` to disable.\n\n__Default value:__ `dblclick`.\n\n__See also:__ [`clear`](https://vega.github.io/vega-lite/docs/clear.html) documentation."
                 },
-                "empty": {
-                  "description": "By default, `all` data values are considered to lie within an empty selection. When set to `none`, empty selections contain no data values.",
-                  "enum": [
-                    "all",
-                    "none"
-                  ],
-                  "type": "string"
-                },
                 "encodings": {
                   "description": "An array of encoding channels. The corresponding data field values must match for a data tuple to fall within the selection.\n\n__See also:__ [`encodings`](https://vega.github.io/vega-lite/docs/project.html) documentation.",
                   "items": {
@@ -22612,9 +22570,13 @@
     "SelectionPredicate": {
       "additionalProperties": false,
       "properties": {
+        "empty": {
+          "description": "By default, the predicate of empty selections returns true. Override this behavior, by setting this property `empty: false`.",
+          "type": "boolean"
+        },
         "selection": {
-          "$ref": "#/definitions/SelectionComposition",
-          "description": "Filter using a selection name or a logical composition of selection names."
+          "description": "Filter using a selection name.",
+          "type": "string"
         }
       },
       "required": [
@@ -29834,14 +29796,6 @@
                   ],
                   "description": "Clears the selection, emptying it of all values. Can be a [Event Stream](https://vega.github.io/vega/docs/event-streams/) or `false` to disable.\n\n__Default value:__ `dblclick`.\n\n__See also:__ [`clear`](https://vega.github.io/vega-lite/docs/clear.html) documentation."
                 },
-                "empty": {
-                  "description": "By default, `all` data values are considered to lie within an empty selection. When set to `none`, empty selections contain no data values.",
-                  "enum": [
-                    "all",
-                    "none"
-                  ],
-                  "type": "string"
-                },
                 "encodings": {
                   "description": "An array of encoding channels. The corresponding data field values must match for a data tuple to fall within the selection.\n\n__See also:__ [`encodings`](https://vega.github.io/vega-lite/docs/project.html) documentation.",
                   "items": {
@@ -29908,14 +29862,6 @@
                   ],
                   "description": "Clears the selection, emptying it of all values. Can be a [Event Stream](https://vega.github.io/vega/docs/event-streams/) or `false` to disable.\n\n__Default value:__ `dblclick`.\n\n__See also:__ [`clear`](https://vega.github.io/vega-lite/docs/clear.html) documentation."
                 },
-                "empty": {
-                  "description": "By default, `all` data values are considered to lie within an empty selection. When set to `none`, empty selections contain no data values.",
-                  "enum": [
-                    "all",
-                    "none"
-                  ],
-                  "type": "string"
-                },
                 "encodings": {
                   "description": "An array of encoding channels. The corresponding data field values must match for a data tuple to fall within the selection.\n\n__See also:__ [`encodings`](https://vega.github.io/vega-lite/docs/project.html) documentation.",
                   "items": {
diff --git a/examples/compiled/airport_connections.vg.json b/examples/compiled/airport_connections.vg.json
index c207a93a4b..5556a08675 100644
--- a/examples/compiled/airport_connections.vg.json
+++ b/examples/compiled/airport_connections.vg.json
@@ -23,7 +23,10 @@
       "name": "data_0",
       "source": "source_1",
       "transform": [
-        {"type": "filter", "expr": "(vlSelectionTest(\"org_store\", datum))"},
+        {
+          "type": "filter",
+          "expr": "length(data(\"org_store\")) && vlSelectionTest(\"org_store\", datum)"
+        },
         {
           "type": "lookup",
           "from": "source_2",
diff --git a/examples/compiled/bar_count_minimap.vg.json b/examples/compiled/bar_count_minimap.vg.json
index 2b87f41758..a5fd5cf334 100644
--- a/examples/compiled/bar_count_minimap.vg.json
+++ b/examples/compiled/bar_count_minimap.vg.json
@@ -11,7 +11,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
+          "expr": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)"
         }
       ]
     },
diff --git a/examples/compiled/brush_table.vg.json b/examples/compiled/brush_table.vg.json
index 9148852ca6..0d4c1b8797 100644
--- a/examples/compiled/brush_table.vg.json
+++ b/examples/compiled/brush_table.vg.json
@@ -36,7 +36,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
+          "expr": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)"
         },
         {
           "type": "window",
@@ -377,7 +377,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
                   "scale": "color",
                   "field": "Cylinders"
                 },
diff --git a/examples/compiled/concat_bar_layer_circle.vg.json b/examples/compiled/concat_bar_layer_circle.vg.json
index 359217a9f6..13d86385e5 100644
--- a/examples/compiled/concat_bar_layer_circle.vg.json
+++ b/examples/compiled/concat_bar_layer_circle.vg.json
@@ -54,7 +54,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))"
+          "expr": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)"
         },
         {
           "type": "aggregate",
@@ -329,7 +329,7 @@
             "update": {
               "fill": [
                 {
-                  "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+                  "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
                   "value": "steelblue"
                 },
                 {"value": "grey"}
diff --git a/examples/compiled/concat_hover.vg.json b/examples/compiled/concat_hover.vg.json
index 9eac41dd64..cc80790be5 100644
--- a/examples/compiled/concat_hover.vg.json
+++ b/examples/compiled/concat_hover.vg.json
@@ -115,7 +115,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "(vlSelectionTest(\"hover_store\", datum))",
+                  "test": "length(data(\"hover_store\")) && vlSelectionTest(\"hover_store\", datum)",
                   "scale": "color",
                   "field": "Cylinders"
                 },
@@ -247,7 +247,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "(vlSelectionTest(\"hover_store\", datum))",
+                  "test": "length(data(\"hover_store\")) && vlSelectionTest(\"hover_store\", datum)",
                   "scale": "color",
                   "field": "Cylinders"
                 },
diff --git a/examples/compiled/concat_hover_filter.vg.json b/examples/compiled/concat_hover_filter.vg.json
index 00eaaf9ce9..a3991765ab 100644
--- a/examples/compiled/concat_hover_filter.vg.json
+++ b/examples/compiled/concat_hover_filter.vg.json
@@ -26,7 +26,10 @@
       "name": "data_1",
       "source": "source_0",
       "transform": [
-        {"type": "filter", "expr": "(vlSelectionTest(\"hover_store\", datum))"}
+        {
+          "type": "filter",
+          "expr": "length(data(\"hover_store\")) && vlSelectionTest(\"hover_store\", datum)"
+        }
       ]
     },
     {
diff --git a/examples/compiled/interactive_area_brush.vg.json b/examples/compiled/interactive_area_brush.vg.json
index 59f490ff4d..49c36df21f 100644
--- a/examples/compiled/interactive_area_brush.vg.json
+++ b/examples/compiled/interactive_area_brush.vg.json
@@ -26,7 +26,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
+          "expr": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)"
         },
         {
           "type": "aggregate",
diff --git a/examples/compiled/interactive_bar_select_highlight.vg.json b/examples/compiled/interactive_bar_select_highlight.vg.json
index d975f1b37b..148d09a634 100644
--- a/examples/compiled/interactive_bar_select_highlight.vg.json
+++ b/examples/compiled/interactive_bar_select_highlight.vg.json
@@ -140,18 +140,18 @@
           "cursor": {"value": "pointer"},
           "fillOpacity": [
             {
-              "test": "!(length(data(\"select_store\"))) || (vlSelectionTest(\"select_store\", datum))",
+              "test": "!length(data(\"select_store\")) || vlSelectionTest(\"select_store\", datum)",
               "value": 1
             },
             {"value": 0.3}
           ],
           "strokeWidth": [
             {
-              "test": "(!(length(data(\"select_store\"))) || (vlSelectionTest(\"select_store\", datum))) && (length(data(\"select_store\")))",
+              "test": "length(data(\"select_store\")) && vlSelectionTest(\"select_store\", datum)",
               "value": 2
             },
             {
-              "test": "(vlSelectionTest(\"highlight_store\", datum))",
+              "test": "length(data(\"highlight_store\")) && vlSelectionTest(\"highlight_store\", datum)",
               "value": 1
             },
             {"value": 0}
diff --git a/examples/compiled/interactive_brush.vg.json b/examples/compiled/interactive_brush.vg.json
index b80a4cec5d..14ada8c39e 100644
--- a/examples/compiled/interactive_brush.vg.json
+++ b/examples/compiled/interactive_brush.vg.json
@@ -321,7 +321,7 @@
           "fill": {"value": "transparent"},
           "stroke": [
             {
-              "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+              "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
               "scale": "color",
               "field": "Cylinders"
             },
diff --git a/examples/compiled/interactive_concat_layer.vg.json b/examples/compiled/interactive_concat_layer.vg.json
index c8cae629cc..22ecd986c2 100644
--- a/examples/compiled/interactive_concat_layer.vg.json
+++ b/examples/compiled/interactive_concat_layer.vg.json
@@ -54,7 +54,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))"
+          "expr": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)"
         },
         {
           "type": "aggregate",
@@ -343,7 +343,7 @@
             "update": {
               "fill": [
                 {
-                  "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+                  "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
                   "value": "steelblue"
                 },
                 {"value": "grey"}
diff --git a/examples/compiled/interactive_dashboard_europe_pop.vg.json b/examples/compiled/interactive_dashboard_europe_pop.vg.json
index 51080d5680..0dd4ae7931 100644
--- a/examples/compiled/interactive_dashboard_europe_pop.vg.json
+++ b/examples/compiled/interactive_dashboard_europe_pop.vg.json
@@ -586,10 +586,10 @@
             "update": {
               "fill": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (!(vlSelectionTest(\"brush_store\", datum)))",
-                  "value": "steelblue"
+                  "test": "length(data(\"brush_store\")) && vlSelectionTest(\"brush_store\", datum)",
+                  "value": "goldenrod"
                 },
-                {"value": "goldenrod"}
+                {"value": "steelblue"}
               ],
               "ariaRoleDescription": {"value": "bar"},
               "description": {
@@ -907,10 +907,10 @@
             "update": {
               "fill": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (!(vlSelectionTest(\"brush_store\", datum)))",
-                  "value": "steelblue"
+                  "test": "length(data(\"brush_store\")) && vlSelectionTest(\"brush_store\", datum)",
+                  "value": "goldenrod"
                 },
-                {"value": "goldenrod"}
+                {"value": "steelblue"}
               ],
               "ariaRoleDescription": {"value": "bar"},
               "description": {
@@ -1307,10 +1307,10 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (!(vlSelectionTest(\"brush_store\", datum)))",
-                  "value": "steelblue"
+                  "test": "length(data(\"brush_store\")) && vlSelectionTest(\"brush_store\", datum)",
+                  "value": "goldenrod"
                 },
-                {"value": "goldenrod"}
+                {"value": "steelblue"}
               ],
               "ariaRoleDescription": {"value": "point"},
               "description": {
diff --git a/examples/compiled/interactive_global_development.vg.json b/examples/compiled/interactive_global_development.vg.json
index 2c84ab64ae..9b1dca2dee 100644
--- a/examples/compiled/interactive_global_development.vg.json
+++ b/examples/compiled/interactive_global_development.vg.json
@@ -42,7 +42,7 @@
         {"type": "filter", "expr": "datum[\"country\"]===\"Afghanistan\""},
         {
           "type": "filter",
-          "expr": "!(length(data(\"year_store\"))) || (vlSelectionTest(\"year_store\", datum))"
+          "expr": "!length(data(\"year_store\")) || vlSelectionTest(\"year_store\", datum)"
         }
       ]
     },
@@ -65,7 +65,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"year_store\"))) || (vlSelectionTest(\"year_store\", datum))"
+          "expr": "!length(data(\"year_store\")) || vlSelectionTest(\"year_store\", datum)"
         },
         {
           "type": "filter",
@@ -79,7 +79,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "(!(length(data(\"year_store\"))) || (vlSelectionTest(\"year_store\", datum))) && (((vlSelectionTest(\"clicked_store\", datum))) || ((vlSelectionTest(\"hovered_store\", datum))))"
+          "expr": "(!length(data(\"year_store\")) || vlSelectionTest(\"year_store\", datum)) && ((length(data(\"clicked_store\")) && vlSelectionTest(\"clicked_store\", datum)) || (length(data(\"hovered_store\")) && vlSelectionTest(\"hovered_store\", datum)))"
         },
         {
           "type": "filter",
@@ -93,11 +93,11 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "(vlSelectionTest(\"hovered_store\", datum))"
+          "expr": "length(data(\"hovered_store\")) && vlSelectionTest(\"hovered_store\", datum)"
         },
         {
           "type": "filter",
-          "expr": "!(!(length(data(\"year_store\"))) || (vlSelectionTest(\"year_store\", datum)))"
+          "expr": "!(!length(data(\"year_store\")) || vlSelectionTest(\"year_store\", datum))"
         },
         {
           "type": "filter",
@@ -166,23 +166,12 @@
       "name": "hovered_tuple_fields",
       "value": [{"type": "E", "field": "country"}]
     },
-    {
-      "name": "hovered_toggle",
-      "value": false,
-      "on": [
-        {
-          "events": [{"source": "scope", "type": "mouseover"}],
-          "update": "event.shiftKey"
-        },
-        {"events": [{"source": "view", "type": "dblclick"}], "update": "false"}
-      ]
-    },
     {
       "name": "hovered_modify",
       "on": [
         {
           "events": {"signal": "hovered_tuple"},
-          "update": "modify(\"hovered_store\", hovered_toggle ? null : hovered_tuple, hovered_toggle ? null : true, hovered_toggle ? hovered_tuple : null)"
+          "update": "modify(\"hovered_store\", hovered_tuple, true)"
         }
       ]
     },
@@ -277,7 +266,7 @@
               "stroke": {"value": "lightgray"},
               "opacity": [
                 {
-                  "test": "((vlSelectionTest(\"hovered_store\", datum))) || ((vlSelectionTest(\"clicked_store\", datum)))",
+                  "test": "(length(data(\"hovered_store\")) && vlSelectionTest(\"hovered_store\", datum)) || (length(data(\"clicked_store\")) && vlSelectionTest(\"clicked_store\", datum))",
                   "value": 0.8
                 },
                 {"value": 0}
diff --git a/examples/compiled/interactive_index_chart.vg.json b/examples/compiled/interactive_index_chart.vg.json
index dd2b7b19fb..94b5914f0d 100644
--- a/examples/compiled/interactive_index_chart.vg.json
+++ b/examples/compiled/interactive_index_chart.vg.json
@@ -37,7 +37,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"index_store\"))) || (vlSelectionTest(\"index_store\", datum))"
+          "expr": "!length(data(\"index_store\")) || vlSelectionTest(\"index_store\", datum)"
         }
       ]
     },
@@ -65,7 +65,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"index_store\"))) || (vlSelectionTest(\"index_store\", datum))"
+          "expr": "!length(data(\"index_store\")) || vlSelectionTest(\"index_store\", datum)"
         }
       ]
     },
diff --git a/examples/compiled/interactive_layered_crossfilter.vg.json b/examples/compiled/interactive_layered_crossfilter.vg.json
index 90d75ca2ec..b2d5350c4e 100644
--- a/examples/compiled/interactive_layered_crossfilter.vg.json
+++ b/examples/compiled/interactive_layered_crossfilter.vg.json
@@ -69,7 +69,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
+          "expr": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)"
         },
         {
           "type": "aggregate",
@@ -107,7 +107,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
+          "expr": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)"
         }
       ]
     },
diff --git a/examples/compiled/interactive_layered_crossfilter_discrete.vg.json b/examples/compiled/interactive_layered_crossfilter_discrete.vg.json
index 409e8ae751..4ce170285d 100644
--- a/examples/compiled/interactive_layered_crossfilter_discrete.vg.json
+++ b/examples/compiled/interactive_layered_crossfilter_discrete.vg.json
@@ -69,7 +69,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
+          "expr": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)"
         },
         {
           "type": "aggregate",
@@ -107,7 +107,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
+          "expr": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)"
         }
       ]
     },
diff --git a/examples/compiled/interactive_legend.vg.json b/examples/compiled/interactive_legend.vg.json
index e3b7645408..5e1c0ccd2e 100644
--- a/examples/compiled/interactive_legend.vg.json
+++ b/examples/compiled/interactive_legend.vg.json
@@ -147,7 +147,7 @@
               "fill": {"scale": "color", "field": "series"},
               "opacity": [
                 {
-                  "test": "!(length(data(\"industry_store\"))) || (vlSelectionTest(\"industry_store\", datum))",
+                  "test": "!length(data(\"industry_store\")) || vlSelectionTest(\"industry_store\", datum)",
                   "value": 1
                 },
                 {"value": 0.2}
diff --git a/examples/compiled/interactive_legend_dblclick.vg.json b/examples/compiled/interactive_legend_dblclick.vg.json
index 6b66c471a1..f76010964b 100644
--- a/examples/compiled/interactive_legend_dblclick.vg.json
+++ b/examples/compiled/interactive_legend_dblclick.vg.json
@@ -147,7 +147,7 @@
               "fill": {"scale": "color", "field": "series"},
               "opacity": [
                 {
-                  "test": "!(length(data(\"industry_store\"))) || (vlSelectionTest(\"industry_store\", datum))",
+                  "test": "!length(data(\"industry_store\")) || vlSelectionTest(\"industry_store\", datum)",
                   "value": 1
                 },
                 {"value": 0.2}
diff --git a/examples/compiled/interactive_line_hover.vg.json b/examples/compiled/interactive_line_hover.vg.json
index 93af4d1b44..3639c09689 100644
--- a/examples/compiled/interactive_line_hover.vg.json
+++ b/examples/compiled/interactive_line_hover.vg.json
@@ -117,7 +117,7 @@
               "strokeWidth": {"value": 8},
               "opacity": [
                 {
-                  "test": "!(length(data(\"hover_store\"))) || (vlSelectionTest(\"hover_store\", datum))",
+                  "test": "!length(data(\"hover_store\")) || vlSelectionTest(\"hover_store\", datum)",
                   "value": 1
                 },
                 {"value": 0.2}
@@ -163,7 +163,7 @@
             "update": {
               "stroke": [
                 {
-                  "test": "!(length(data(\"hover_store\"))) || (vlSelectionTest(\"hover_store\", datum))",
+                  "test": "!length(data(\"hover_store\")) || vlSelectionTest(\"hover_store\", datum)",
                   "scale": "color",
                   "field": "symbol"
                 },
@@ -171,7 +171,7 @@
               ],
               "opacity": [
                 {
-                  "test": "!(length(data(\"hover_store\"))) || (vlSelectionTest(\"hover_store\", datum))",
+                  "test": "!length(data(\"hover_store\")) || vlSelectionTest(\"hover_store\", datum)",
                   "value": 1
                 },
                 {"value": 0.2}
@@ -199,7 +199,7 @@
         "update": {
           "fill": [
             {
-              "test": "!(length(data(\"hover_store\"))) || (vlSelectionTest(\"hover_store\", datum))",
+              "test": "!length(data(\"hover_store\")) || vlSelectionTest(\"hover_store\", datum)",
               "scale": "color",
               "field": "symbol"
             },
@@ -207,7 +207,7 @@
           ],
           "opacity": [
             {
-              "test": "!(length(data(\"hover_store\"))) || (vlSelectionTest(\"hover_store\", datum))",
+              "test": "!length(data(\"hover_store\")) || vlSelectionTest(\"hover_store\", datum)",
               "value": 1
             },
             {"value": 0.2}
@@ -234,7 +234,7 @@
           "dx": {"value": 4},
           "fill": [
             {
-              "test": "!(length(data(\"hover_store\"))) || (vlSelectionTest(\"hover_store\", datum))",
+              "test": "!length(data(\"hover_store\")) || vlSelectionTest(\"hover_store\", datum)",
               "scale": "color",
               "field": "symbol"
             },
@@ -242,7 +242,7 @@
           ],
           "opacity": [
             {
-              "test": "!(length(data(\"hover_store\"))) || (vlSelectionTest(\"hover_store\", datum))",
+              "test": "!length(data(\"hover_store\")) || vlSelectionTest(\"hover_store\", datum)",
               "value": 1
             },
             {"value": 0.2}
diff --git a/examples/compiled/interactive_multi_line_label.vg.json b/examples/compiled/interactive_multi_line_label.vg.json
index 79df0b3ec5..3e5f7bea26 100644
--- a/examples/compiled/interactive_multi_line_label.vg.json
+++ b/examples/compiled/interactive_multi_line_label.vg.json
@@ -26,7 +26,10 @@
       "name": "data_1",
       "source": "source_0",
       "transform": [
-        {"type": "filter", "expr": "(vlSelectionTest(\"label_store\", datum))"}
+        {
+          "type": "filter",
+          "expr": "length(data(\"label_store\")) && vlSelectionTest(\"label_store\", datum)"
+        }
       ]
     },
     {
@@ -167,7 +170,10 @@
       "encode": {
         "update": {
           "opacity": [
-            {"test": "(vlSelectionTest(\"label_store\", datum))", "value": 1},
+            {
+              "test": "length(data(\"label_store\")) && vlSelectionTest(\"label_store\", datum)",
+              "value": 1
+            },
             {"value": 0}
           ],
           "fill": {"value": "transparent"},
diff --git a/examples/compiled/interactive_multi_line_pivot_tooltip.vg.json b/examples/compiled/interactive_multi_line_pivot_tooltip.vg.json
index e48da176f0..a46e52142c 100644
--- a/examples/compiled/interactive_multi_line_pivot_tooltip.vg.json
+++ b/examples/compiled/interactive_multi_line_pivot_tooltip.vg.json
@@ -33,7 +33,10 @@
       "name": "data_1",
       "source": "source_0",
       "transform": [
-        {"type": "filter", "expr": "(vlSelectionTest(\"hover_store\", datum))"},
+        {
+          "type": "filter",
+          "expr": "length(data(\"hover_store\")) && vlSelectionTest(\"hover_store\", datum)"
+        },
         {
           "type": "filter",
           "expr": "(isDate(datum[\"date\"]) || (isValid(datum[\"date\"]) && isFinite(+datum[\"date\"]))) && isValid(datum[\"price\"]) && isFinite(+datum[\"price\"])"
@@ -169,7 +172,10 @@
         "update": {
           "stroke": {"value": "black"},
           "opacity": [
-            {"test": "(vlSelectionTest(\"hover_store\", datum))", "value": 0.3},
+            {
+              "test": "length(data(\"hover_store\")) && vlSelectionTest(\"hover_store\", datum)",
+              "value": 0.3
+            },
             {"value": 0}
           ],
           "tooltip": {
diff --git a/examples/compiled/interactive_multi_line_tooltip.vg.json b/examples/compiled/interactive_multi_line_tooltip.vg.json
index 1c4696ffd2..9ae455cc63 100644
--- a/examples/compiled/interactive_multi_line_tooltip.vg.json
+++ b/examples/compiled/interactive_multi_line_tooltip.vg.json
@@ -139,10 +139,10 @@
         "update": {
           "stroke": [
             {
-              "test": "(!(vlSelectionTest(\"hover_store\", datum)))",
-              "value": "transparent"
+              "test": "length(data(\"hover_store\")) && vlSelectionTest(\"hover_store\", datum)",
+              "value": "black"
             },
-            {"value": "black"}
+            {"value": "transparent"}
           ],
           "tooltip": {
             "signal": "{\"date (year-month-date)\": timeFormat(datum[\"yearmonthdate_date\"], timeUnitSpecifier([\"year\",\"month\",\"date\"], {\"year-month\":\"%b %Y \",\"year-month-date\":\"%b %d, %Y \"})), \"temp_max\": format(datum[\"temp_max\"], \"\"), \"temp_min\": format(datum[\"temp_min\"], \"\")}"
diff --git a/examples/compiled/interactive_paintbrush.vg.json b/examples/compiled/interactive_paintbrush.vg.json
index be0a6d3d92..d66ffbba69 100644
--- a/examples/compiled/interactive_paintbrush.vg.json
+++ b/examples/compiled/interactive_paintbrush.vg.json
@@ -93,7 +93,7 @@
           "y": {"scale": "y", "field": "Miles_per_Gallon"},
           "size": [
             {
-              "test": "!(length(data(\"paintbrush_store\"))) || (vlSelectionTest(\"paintbrush_store\", datum))",
+              "test": "!length(data(\"paintbrush_store\")) || vlSelectionTest(\"paintbrush_store\", datum)",
               "value": 300
             },
             {"value": 50}
diff --git a/examples/compiled/interactive_paintbrush_color.vg.json b/examples/compiled/interactive_paintbrush_color.vg.json
index a1f4525418..913a4f1e07 100644
--- a/examples/compiled/interactive_paintbrush_color.vg.json
+++ b/examples/compiled/interactive_paintbrush_color.vg.json
@@ -81,7 +81,7 @@
           "opacity": {"value": 0.7},
           "fill": [
             {
-              "test": "!(length(data(\"paintbrush_store\"))) || (vlSelectionTest(\"paintbrush_store\", datum))",
+              "test": "!length(data(\"paintbrush_store\")) || vlSelectionTest(\"paintbrush_store\", datum)",
               "scale": "color",
               "field": "Cylinders"
             },
diff --git a/examples/compiled/interactive_paintbrush_color_nearest.vg.json b/examples/compiled/interactive_paintbrush_color_nearest.vg.json
index 5e6b88f43f..db0b103e36 100644
--- a/examples/compiled/interactive_paintbrush_color_nearest.vg.json
+++ b/examples/compiled/interactive_paintbrush_color_nearest.vg.json
@@ -85,7 +85,7 @@
           "opacity": {"value": 0.7},
           "fill": [
             {
-              "test": "!(length(data(\"paintbrush_store\"))) || (vlSelectionTest(\"paintbrush_store\", datum))",
+              "test": "!length(data(\"paintbrush_store\")) || vlSelectionTest(\"paintbrush_store\", datum)",
               "scale": "color",
               "field": "Cylinders"
             },
diff --git a/examples/compiled/interactive_paintbrush_interval.vg.json b/examples/compiled/interactive_paintbrush_interval.vg.json
index 27050b3ce1..a7bc7dbf2a 100644
--- a/examples/compiled/interactive_paintbrush_interval.vg.json
+++ b/examples/compiled/interactive_paintbrush_interval.vg.json
@@ -319,7 +319,7 @@
           "y": {"scale": "y", "field": "Miles_per_Gallon"},
           "size": [
             {
-              "test": "!(length(data(\"paintbrush_store\"))) || (vlSelectionTest(\"paintbrush_store\", datum))",
+              "test": "!length(data(\"paintbrush_store\")) || vlSelectionTest(\"paintbrush_store\", datum)",
               "value": 300
             },
             {"value": 50}
diff --git a/examples/compiled/interactive_paintbrush_simple_all.vg.json b/examples/compiled/interactive_paintbrush_simple_all.vg.json
index fbd68192db..a38ef16bf3 100644
--- a/examples/compiled/interactive_paintbrush_simple_all.vg.json
+++ b/examples/compiled/interactive_paintbrush_simple_all.vg.json
@@ -88,7 +88,7 @@
           "y": {"scale": "y", "field": "Miles_per_Gallon"},
           "size": [
             {
-              "test": "!(length(data(\"paintbrush_store\"))) || (vlSelectionTest(\"paintbrush_store\", datum))",
+              "test": "!length(data(\"paintbrush_store\")) || vlSelectionTest(\"paintbrush_store\", datum)",
               "value": 300
             },
             {"value": 50}
diff --git a/examples/compiled/interactive_paintbrush_simple_none.vg.json b/examples/compiled/interactive_paintbrush_simple_none.vg.json
index 4a8099562f..3c5ea19186 100644
--- a/examples/compiled/interactive_paintbrush_simple_none.vg.json
+++ b/examples/compiled/interactive_paintbrush_simple_none.vg.json
@@ -88,7 +88,7 @@
           "y": {"scale": "y", "field": "Miles_per_Gallon"},
           "size": [
             {
-              "test": "(vlSelectionTest(\"paintbrush_store\", datum))",
+              "test": "length(data(\"paintbrush_store\")) && vlSelectionTest(\"paintbrush_store\", datum)",
               "value": 300
             },
             {"value": 50}
diff --git a/examples/compiled/interactive_query_widgets.vg.json b/examples/compiled/interactive_query_widgets.vg.json
index e6eff5c385..545c77863f 100644
--- a/examples/compiled/interactive_query_widgets.vg.json
+++ b/examples/compiled/interactive_query_widgets.vg.json
@@ -44,7 +44,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"CylYr_store\"))) || (vlSelectionTest(\"CylYr_store\", datum))"
+          "expr": "!length(data(\"CylYr_store\")) || vlSelectionTest(\"CylYr_store\", datum)"
         },
         {
           "type": "filter",
@@ -108,7 +108,7 @@
           "opacity": {"value": 0.7},
           "fill": [
             {
-              "test": "!(length(data(\"CylYr_store\"))) || (vlSelectionTest(\"CylYr_store\", datum))",
+              "test": "!length(data(\"CylYr_store\")) || vlSelectionTest(\"CylYr_store\", datum)",
               "scale": "color",
               "field": "Origin"
             },
diff --git a/examples/compiled/interactive_seattle_weather.vg.json b/examples/compiled/interactive_seattle_weather.vg.json
index e40d62c8b2..2c14505cbb 100644
--- a/examples/compiled/interactive_seattle_weather.vg.json
+++ b/examples/compiled/interactive_seattle_weather.vg.json
@@ -24,7 +24,7 @@
         },
         {
           "type": "filter",
-          "expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
+          "expr": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)"
         },
         {
           "type": "aggregate",
@@ -41,7 +41,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"click_store\"))) || (vlSelectionTest(\"click_store\", datum))"
+          "expr": "!length(data(\"click_store\")) || vlSelectionTest(\"click_store\", datum)"
         },
         {
           "field": "date",
@@ -311,7 +311,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
                   "scale": "color",
                   "field": "weather"
                 },
@@ -485,7 +485,7 @@
             "update": {
               "fill": [
                 {
-                  "test": "!(length(data(\"click_store\"))) || (vlSelectionTest(\"click_store\", datum))",
+                  "test": "!length(data(\"click_store\")) || vlSelectionTest(\"click_store\", datum)",
                   "scale": "color",
                   "field": "weather"
                 },
diff --git a/examples/compiled/interactive_splom.vg.json b/examples/compiled/interactive_splom.vg.json
index ea2565fae9..977b8fa8e7 100644
--- a/examples/compiled/interactive_splom.vg.json
+++ b/examples/compiled/interactive_splom.vg.json
@@ -539,7 +539,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"union\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"union\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -1047,7 +1047,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"union\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"union\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -1467,7 +1467,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"union\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"union\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -1976,7 +1976,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"union\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"union\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -2398,7 +2398,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"union\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"union\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -2903,7 +2903,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"union\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"union\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -3327,7 +3327,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"union\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"union\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -3836,7 +3836,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"union\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"union\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -4348,7 +4348,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"union\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"union\")",
                   "scale": "color",
                   "field": "Origin"
                 },
diff --git a/examples/compiled/interactive_stocks_nearest_index.vg.json b/examples/compiled/interactive_stocks_nearest_index.vg.json
index e6ac527703..d2e215a442 100644
--- a/examples/compiled/interactive_stocks_nearest_index.vg.json
+++ b/examples/compiled/interactive_stocks_nearest_index.vg.json
@@ -28,7 +28,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "(index.date) && (!(length(data(\"index_store\"))) || (vlSelectionTest(\"index_store\", datum)))"
+          "expr": "(index.date) && (!length(data(\"index_store\")) || vlSelectionTest(\"index_store\", datum))"
         },
         {
           "type": "filter",
diff --git a/examples/compiled/isotype_grid.vg.json b/examples/compiled/isotype_grid.vg.json
index d55f788ff9..cfd0b76d02 100644
--- a/examples/compiled/isotype_grid.vg.json
+++ b/examples/compiled/isotype_grid.vg.json
@@ -404,7 +404,7 @@
           "opacity": {"value": 0.7},
           "fill": [
             {
-              "test": "!(length(data(\"highlight_store\"))) || (vlSelectionTest(\"highlight_store\", datum))",
+              "test": "!length(data(\"highlight_store\")) || vlSelectionTest(\"highlight_store\", datum)",
               "value": "rgb(194,81,64)"
             },
             {"value": "rgb(167,165,156)"}
diff --git a/examples/compiled/selection_bind_cylyr.vg.json b/examples/compiled/selection_bind_cylyr.vg.json
index c5c5b0bd4e..c4ef29ebb6 100644
--- a/examples/compiled/selection_bind_cylyr.vg.json
+++ b/examples/compiled/selection_bind_cylyr.vg.json
@@ -75,7 +75,7 @@
           "opacity": {"value": 0.7},
           "fill": [
             {
-              "test": "!(length(data(\"CylYr_store\"))) || (vlSelectionTest(\"CylYr_store\", datum))",
+              "test": "!length(data(\"CylYr_store\")) || vlSelectionTest(\"CylYr_store\", datum)",
               "scale": "color",
               "field": "Origin"
             },
@@ -89,7 +89,7 @@
           "y": {"scale": "y", "field": "Miles_per_Gallon"},
           "size": [
             {
-              "test": "!(length(data(\"CylYr_store\"))) || (vlSelectionTest(\"CylYr_store\", datum))",
+              "test": "!length(data(\"CylYr_store\")) || vlSelectionTest(\"CylYr_store\", datum)",
               "value": 100
             },
             {"value": 50}
diff --git a/examples/compiled/selection_bind_origin.vg.json b/examples/compiled/selection_bind_origin.vg.json
index 4bc3e045ef..8b6c71f01f 100644
--- a/examples/compiled/selection_bind_origin.vg.json
+++ b/examples/compiled/selection_bind_origin.vg.json
@@ -64,7 +64,7 @@
           "fill": {"value": "transparent"},
           "stroke": [
             {
-              "test": "!(length(data(\"org_store\"))) || (vlSelectionTest(\"org_store\", datum))",
+              "test": "!length(data(\"org_store\")) || vlSelectionTest(\"org_store\", datum)",
               "scale": "color",
               "field": "Cylinders"
             },
diff --git a/examples/compiled/selection_brush_timeunit.vg.json b/examples/compiled/selection_brush_timeunit.vg.json
index be5f7c6b25..f18b6c35b9 100644
--- a/examples/compiled/selection_brush_timeunit.vg.json
+++ b/examples/compiled/selection_brush_timeunit.vg.json
@@ -34,7 +34,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
+          "expr": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)"
         },
         {
           "field": "date",
@@ -305,7 +305,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
                   "value": "goldenrod"
                 },
                 {"value": "steelblue"}
diff --git a/examples/compiled/selection_clear_brush.vg.json b/examples/compiled/selection_clear_brush.vg.json
index ca4334a350..b42df697ed 100644
--- a/examples/compiled/selection_clear_brush.vg.json
+++ b/examples/compiled/selection_clear_brush.vg.json
@@ -314,7 +314,7 @@
           "fill": {"value": "transparent"},
           "stroke": [
             {
-              "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+              "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
               "scale": "color",
               "field": "Cylinders"
             },
diff --git a/examples/compiled/selection_composition_and.vg.json b/examples/compiled/selection_composition_and.vg.json
index b548fb415a..21ffb0e8c4 100644
--- a/examples/compiled/selection_composition_and.vg.json
+++ b/examples/compiled/selection_composition_and.vg.json
@@ -575,7 +575,7 @@
         "update": {
           "fill": [
             {
-              "test": "!(length(data(\"alex_store\")) || length(data(\"morgan_store\"))) || ((vlSelectionTest(\"alex_store\", datum)) && (vlSelectionTest(\"morgan_store\", datum)))",
+              "test": "(!length(data(\"alex_store\")) || vlSelectionTest(\"alex_store\", datum)) && (!length(data(\"morgan_store\")) || vlSelectionTest(\"morgan_store\", datum))",
               "scale": "color",
               "field": "__count"
             },
diff --git a/examples/compiled/selection_composition_or.vg.json b/examples/compiled/selection_composition_or.vg.json
index 0cd0e1c478..df9aeacf15 100644
--- a/examples/compiled/selection_composition_or.vg.json
+++ b/examples/compiled/selection_composition_or.vg.json
@@ -575,7 +575,7 @@
         "update": {
           "fill": [
             {
-              "test": "!(length(data(\"alex_store\")) || length(data(\"morgan_store\"))) || ((vlSelectionTest(\"alex_store\", datum)) || (vlSelectionTest(\"morgan_store\", datum)))",
+              "test": "(!length(data(\"alex_store\")) || vlSelectionTest(\"alex_store\", datum)) || (!length(data(\"morgan_store\")) || vlSelectionTest(\"morgan_store\", datum))",
               "scale": "color",
               "field": "__count"
             },
diff --git a/examples/compiled/selection_concat.vg.json b/examples/compiled/selection_concat.vg.json
index 90ed73fe31..3201351e9b 100644
--- a/examples/compiled/selection_concat.vg.json
+++ b/examples/compiled/selection_concat.vg.json
@@ -584,7 +584,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
                   "value": "steelblue"
                 },
                 {"value": "red"}
diff --git a/examples/compiled/selection_filter.vg.json b/examples/compiled/selection_filter.vg.json
index 72e865a58e..2e804fae2b 100644
--- a/examples/compiled/selection_filter.vg.json
+++ b/examples/compiled/selection_filter.vg.json
@@ -22,7 +22,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
+          "expr": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)"
         },
         {
           "type": "filter",
diff --git a/examples/compiled/selection_filter_composition.vg.json b/examples/compiled/selection_filter_composition.vg.json
index a29a824e81..35910995b7 100644
--- a/examples/compiled/selection_filter_composition.vg.json
+++ b/examples/compiled/selection_filter_composition.vg.json
@@ -22,7 +22,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "(datum.Weight_in_lbs > 3000) && (!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum)))"
+          "expr": "(datum.Weight_in_lbs > 3000) && (!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum))"
         },
         {
           "type": "filter",
diff --git a/examples/compiled/selection_heatmap.vg.json b/examples/compiled/selection_heatmap.vg.json
index 7efbaf87ce..03f1a9feb1 100644
--- a/examples/compiled/selection_heatmap.vg.json
+++ b/examples/compiled/selection_heatmap.vg.json
@@ -99,21 +99,21 @@
           "fill": {"scale": "fill", "field": "count"},
           "stroke": [
             {
-              "test": "(!(length(data(\"highlight_store\"))) || (vlSelectionTest(\"highlight_store\", datum))) && (length(data(\"highlight_store\")))",
+              "test": "length(data(\"highlight_store\")) && vlSelectionTest(\"highlight_store\", datum)",
               "value": "black"
             },
             {"value": null}
           ],
           "opacity": [
             {
-              "test": "!(length(data(\"highlight_store\"))) || (vlSelectionTest(\"highlight_store\", datum))",
+              "test": "!length(data(\"highlight_store\")) || vlSelectionTest(\"highlight_store\", datum)",
               "value": 1
             },
             {"value": 0.5}
           ],
           "zindex": [
             {
-              "test": "!(length(data(\"highlight_store\"))) || (vlSelectionTest(\"highlight_store\", datum))",
+              "test": "!length(data(\"highlight_store\")) || vlSelectionTest(\"highlight_store\", datum)",
               "value": 1
             },
             {"value": 0}
diff --git a/examples/compiled/selection_insert.vg.json b/examples/compiled/selection_insert.vg.json
index 63e6283bc4..a8ab7d3ec1 100644
--- a/examples/compiled/selection_insert.vg.json
+++ b/examples/compiled/selection_insert.vg.json
@@ -69,7 +69,7 @@
           "opacity": {"value": 0.7},
           "fill": [
             {
-              "test": "!(length(data(\"paintbrush_store\"))) || (vlSelectionTest(\"paintbrush_store\", datum))",
+              "test": "!length(data(\"paintbrush_store\")) || vlSelectionTest(\"paintbrush_store\", datum)",
               "scale": "color",
               "field": "Cylinders"
             },
diff --git a/examples/compiled/selection_layer_bar_month.vg.json b/examples/compiled/selection_layer_bar_month.vg.json
index 054cd6feb3..5e6abd859c 100644
--- a/examples/compiled/selection_layer_bar_month.vg.json
+++ b/examples/compiled/selection_layer_bar_month.vg.json
@@ -25,7 +25,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
+          "expr": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)"
         },
         {
           "type": "aggregate",
@@ -283,7 +283,7 @@
           "fill": {"value": "#4c78a8"},
           "opacity": [
             {
-              "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+              "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
               "value": 1
             },
             {"value": 0.7}
diff --git a/examples/compiled/selection_multi_condition.vg.json b/examples/compiled/selection_multi_condition.vg.json
index 100be47fe9..1428dc4661 100644
--- a/examples/compiled/selection_multi_condition.vg.json
+++ b/examples/compiled/selection_multi_condition.vg.json
@@ -351,11 +351,11 @@
           "fill": {"value": "transparent"},
           "stroke": [
             {
-              "test": "!(length(data(\"hoverbrush_store\"))) || (vlSelectionTest(\"hoverbrush_store\", datum))",
+              "test": "!length(data(\"hoverbrush_store\")) || vlSelectionTest(\"hoverbrush_store\", datum)",
               "value": "teal"
             },
             {
-              "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+              "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
               "value": "skyblue"
             },
             {"value": "grey"}
diff --git a/examples/compiled/selection_project_binned_interval.vg.json b/examples/compiled/selection_project_binned_interval.vg.json
index debbef9160..0dac11e87c 100644
--- a/examples/compiled/selection_project_binned_interval.vg.json
+++ b/examples/compiled/selection_project_binned_interval.vg.json
@@ -36,7 +36,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
+          "expr": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)"
         },
         {
           "type": "aggregate",
diff --git a/examples/compiled/selection_project_interval.vg.json b/examples/compiled/selection_project_interval.vg.json
index 6b8e1ecc7f..b8b69a7333 100644
--- a/examples/compiled/selection_project_interval.vg.json
+++ b/examples/compiled/selection_project_interval.vg.json
@@ -298,7 +298,7 @@
         "update": {
           "fill": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "scale": "color",
               "field": "__count"
             },
diff --git a/examples/compiled/selection_project_interval_x.vg.json b/examples/compiled/selection_project_interval_x.vg.json
index be22630490..a6c7b0a79e 100644
--- a/examples/compiled/selection_project_interval_x.vg.json
+++ b/examples/compiled/selection_project_interval_x.vg.json
@@ -241,7 +241,7 @@
         "update": {
           "fill": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "scale": "color",
               "field": "__count"
             },
diff --git a/examples/compiled/selection_project_interval_x_y.vg.json b/examples/compiled/selection_project_interval_x_y.vg.json
index 6b8e1ecc7f..b8b69a7333 100644
--- a/examples/compiled/selection_project_interval_x_y.vg.json
+++ b/examples/compiled/selection_project_interval_x_y.vg.json
@@ -298,7 +298,7 @@
         "update": {
           "fill": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "scale": "color",
               "field": "__count"
             },
diff --git a/examples/compiled/selection_project_interval_y.vg.json b/examples/compiled/selection_project_interval_y.vg.json
index 3d8bd25ad2..7b2f1c4eb3 100644
--- a/examples/compiled/selection_project_interval_y.vg.json
+++ b/examples/compiled/selection_project_interval_y.vg.json
@@ -241,7 +241,7 @@
         "update": {
           "fill": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "scale": "color",
               "field": "__count"
             },
diff --git a/examples/compiled/selection_project_multi.vg.json b/examples/compiled/selection_project_multi.vg.json
index 51fa364eb6..6510ed917c 100644
--- a/examples/compiled/selection_project_multi.vg.json
+++ b/examples/compiled/selection_project_multi.vg.json
@@ -78,7 +78,7 @@
           "fill": {"value": "transparent"},
           "stroke": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "scale": "color",
               "field": "Cylinders"
             },
@@ -92,7 +92,7 @@
           "y": {"scale": "y", "field": "Miles_per_Gallon"},
           "size": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "value": 200
             },
             {"value": 50}
diff --git a/examples/compiled/selection_project_multi_cylinders.vg.json b/examples/compiled/selection_project_multi_cylinders.vg.json
index 4541263159..67e9703503 100644
--- a/examples/compiled/selection_project_multi_cylinders.vg.json
+++ b/examples/compiled/selection_project_multi_cylinders.vg.json
@@ -80,7 +80,7 @@
           "fill": {"value": "transparent"},
           "stroke": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "scale": "color",
               "field": "Cylinders"
             },
@@ -94,7 +94,7 @@
           "y": {"scale": "y", "field": "Miles_per_Gallon"},
           "size": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "value": 200
             },
             {"value": 50}
diff --git a/examples/compiled/selection_project_multi_cylinders_origin.vg.json b/examples/compiled/selection_project_multi_cylinders_origin.vg.json
index deb2c1d39d..87c82d1174 100644
--- a/examples/compiled/selection_project_multi_cylinders_origin.vg.json
+++ b/examples/compiled/selection_project_multi_cylinders_origin.vg.json
@@ -83,7 +83,7 @@
           "fill": {"value": "transparent"},
           "stroke": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "scale": "color",
               "field": "Cylinders"
             },
@@ -97,14 +97,14 @@
           "y": {"scale": "y", "field": "Miles_per_Gallon"},
           "size": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "value": 200
             },
             {"value": 50}
           ],
           "shape": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "scale": "shape",
               "field": "Origin"
             },
diff --git a/examples/compiled/selection_project_multi_origin.vg.json b/examples/compiled/selection_project_multi_origin.vg.json
index 6ed38eaef1..979e2de262 100644
--- a/examples/compiled/selection_project_multi_origin.vg.json
+++ b/examples/compiled/selection_project_multi_origin.vg.json
@@ -77,7 +77,7 @@
           "fill": {"value": "transparent"},
           "stroke": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "scale": "color",
               "field": "Cylinders"
             },
@@ -91,14 +91,14 @@
           "y": {"scale": "y", "field": "Miles_per_Gallon"},
           "size": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "value": 200
             },
             {"value": 50}
           ],
           "shape": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "scale": "shape",
               "field": "Origin"
             },
diff --git a/examples/compiled/selection_project_single.vg.json b/examples/compiled/selection_project_single.vg.json
index 51fa364eb6..6510ed917c 100644
--- a/examples/compiled/selection_project_single.vg.json
+++ b/examples/compiled/selection_project_single.vg.json
@@ -78,7 +78,7 @@
           "fill": {"value": "transparent"},
           "stroke": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "scale": "color",
               "field": "Cylinders"
             },
@@ -92,7 +92,7 @@
           "y": {"scale": "y", "field": "Miles_per_Gallon"},
           "size": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "value": 200
             },
             {"value": 50}
diff --git a/examples/compiled/selection_project_single_cylinders.vg.json b/examples/compiled/selection_project_single_cylinders.vg.json
index 4541263159..67e9703503 100644
--- a/examples/compiled/selection_project_single_cylinders.vg.json
+++ b/examples/compiled/selection_project_single_cylinders.vg.json
@@ -80,7 +80,7 @@
           "fill": {"value": "transparent"},
           "stroke": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "scale": "color",
               "field": "Cylinders"
             },
@@ -94,7 +94,7 @@
           "y": {"scale": "y", "field": "Miles_per_Gallon"},
           "size": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "value": 200
             },
             {"value": 50}
diff --git a/examples/compiled/selection_project_single_cylinders_origin.vg.json b/examples/compiled/selection_project_single_cylinders_origin.vg.json
index deb2c1d39d..87c82d1174 100644
--- a/examples/compiled/selection_project_single_cylinders_origin.vg.json
+++ b/examples/compiled/selection_project_single_cylinders_origin.vg.json
@@ -83,7 +83,7 @@
           "fill": {"value": "transparent"},
           "stroke": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "scale": "color",
               "field": "Cylinders"
             },
@@ -97,14 +97,14 @@
           "y": {"scale": "y", "field": "Miles_per_Gallon"},
           "size": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "value": 200
             },
             {"value": 50}
           ],
           "shape": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "scale": "shape",
               "field": "Origin"
             },
diff --git a/examples/compiled/selection_project_single_origin.vg.json b/examples/compiled/selection_project_single_origin.vg.json
index 6ed38eaef1..979e2de262 100644
--- a/examples/compiled/selection_project_single_origin.vg.json
+++ b/examples/compiled/selection_project_single_origin.vg.json
@@ -77,7 +77,7 @@
           "fill": {"value": "transparent"},
           "stroke": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "scale": "color",
               "field": "Cylinders"
             },
@@ -91,14 +91,14 @@
           "y": {"scale": "y", "field": "Miles_per_Gallon"},
           "size": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "value": 200
             },
             {"value": 50}
           ],
           "shape": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "scale": "shape",
               "field": "Origin"
             },
diff --git a/examples/compiled/selection_resolution_global.vg.json b/examples/compiled/selection_resolution_global.vg.json
index 8055a64e17..ca0a20cd5c 100644
--- a/examples/compiled/selection_resolution_global.vg.json
+++ b/examples/compiled/selection_resolution_global.vg.json
@@ -380,7 +380,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -792,7 +792,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -1139,7 +1139,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -1550,7 +1550,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -1899,7 +1899,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -2308,7 +2308,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -2659,7 +2659,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -3070,7 +3070,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -3484,7 +3484,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
                   "scale": "color",
                   "field": "Origin"
                 },
diff --git a/examples/compiled/selection_resolution_intersect.vg.json b/examples/compiled/selection_resolution_intersect.vg.json
index a2b48599e8..be6ea11495 100644
--- a/examples/compiled/selection_resolution_intersect.vg.json
+++ b/examples/compiled/selection_resolution_intersect.vg.json
@@ -356,7 +356,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"intersect\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"intersect\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -720,7 +720,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"intersect\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"intersect\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -1019,7 +1019,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"intersect\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"intersect\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -1382,7 +1382,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"intersect\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"intersect\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -1683,7 +1683,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"intersect\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"intersect\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -2044,7 +2044,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"intersect\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"intersect\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -2347,7 +2347,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"intersect\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"intersect\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -2710,7 +2710,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"intersect\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"intersect\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -3076,7 +3076,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"intersect\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"intersect\")",
                   "scale": "color",
                   "field": "Origin"
                 },
diff --git a/examples/compiled/selection_resolution_union.vg.json b/examples/compiled/selection_resolution_union.vg.json
index 7c7e1e152f..4e64c836da 100644
--- a/examples/compiled/selection_resolution_union.vg.json
+++ b/examples/compiled/selection_resolution_union.vg.json
@@ -356,7 +356,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"union\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"union\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -720,7 +720,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"union\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"union\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -1019,7 +1019,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"union\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"union\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -1382,7 +1382,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"union\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"union\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -1683,7 +1683,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"union\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"union\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -2044,7 +2044,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"union\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"union\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -2347,7 +2347,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"union\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"union\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -2710,7 +2710,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"union\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"union\")",
                   "scale": "color",
                   "field": "Origin"
                 },
@@ -3076,7 +3076,7 @@
               "fill": {"value": "transparent"},
               "stroke": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"union\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"union\")",
                   "scale": "color",
                   "field": "Origin"
                 },
diff --git a/examples/compiled/selection_toggle_altKey.vg.json b/examples/compiled/selection_toggle_altKey.vg.json
index 4d8f3d0b1c..362b0a21d9 100644
--- a/examples/compiled/selection_toggle_altKey.vg.json
+++ b/examples/compiled/selection_toggle_altKey.vg.json
@@ -80,7 +80,7 @@
           "opacity": {"value": 0.7},
           "fill": [
             {
-              "test": "!(length(data(\"paintbrush_store\"))) || (vlSelectionTest(\"paintbrush_store\", datum))",
+              "test": "!length(data(\"paintbrush_store\")) || vlSelectionTest(\"paintbrush_store\", datum)",
               "scale": "color",
               "field": "Cylinders"
             },
diff --git a/examples/compiled/selection_toggle_altKey_shiftKey.vg.json b/examples/compiled/selection_toggle_altKey_shiftKey.vg.json
index 37b1550f52..580346ab5f 100644
--- a/examples/compiled/selection_toggle_altKey_shiftKey.vg.json
+++ b/examples/compiled/selection_toggle_altKey_shiftKey.vg.json
@@ -80,7 +80,7 @@
           "opacity": {"value": 0.7},
           "fill": [
             {
-              "test": "!(length(data(\"paintbrush_store\"))) || (vlSelectionTest(\"paintbrush_store\", datum))",
+              "test": "!length(data(\"paintbrush_store\")) || vlSelectionTest(\"paintbrush_store\", datum)",
               "scale": "color",
               "field": "Cylinders"
             },
diff --git a/examples/compiled/selection_toggle_shiftKey.vg.json b/examples/compiled/selection_toggle_shiftKey.vg.json
index 53055ea9b8..74e6934c78 100644
--- a/examples/compiled/selection_toggle_shiftKey.vg.json
+++ b/examples/compiled/selection_toggle_shiftKey.vg.json
@@ -80,7 +80,7 @@
           "opacity": {"value": 0.7},
           "fill": [
             {
-              "test": "!(length(data(\"paintbrush_store\"))) || (vlSelectionTest(\"paintbrush_store\", datum))",
+              "test": "!length(data(\"paintbrush_store\")) || vlSelectionTest(\"paintbrush_store\", datum)",
               "scale": "color",
               "field": "Cylinders"
             },
diff --git a/examples/compiled/selection_translate_brush_drag.vg.json b/examples/compiled/selection_translate_brush_drag.vg.json
index 4fefb62dbe..cf1c0b06a1 100644
--- a/examples/compiled/selection_translate_brush_drag.vg.json
+++ b/examples/compiled/selection_translate_brush_drag.vg.json
@@ -305,7 +305,7 @@
           "opacity": {"value": 0.7},
           "fill": [
             {
-              "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+              "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
               "scale": "color",
               "field": "Origin"
             },
diff --git a/examples/compiled/selection_translate_brush_shift-drag.vg.json b/examples/compiled/selection_translate_brush_shift-drag.vg.json
index 7d444eb51b..5fb8290cbf 100644
--- a/examples/compiled/selection_translate_brush_shift-drag.vg.json
+++ b/examples/compiled/selection_translate_brush_shift-drag.vg.json
@@ -311,7 +311,7 @@
           "opacity": {"value": 0.7},
           "fill": [
             {
-              "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+              "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
               "scale": "color",
               "field": "Origin"
             },
diff --git a/examples/compiled/selection_type_interval.vg.json b/examples/compiled/selection_type_interval.vg.json
index 6b8e1ecc7f..b8b69a7333 100644
--- a/examples/compiled/selection_type_interval.vg.json
+++ b/examples/compiled/selection_type_interval.vg.json
@@ -298,7 +298,7 @@
         "update": {
           "fill": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "scale": "color",
               "field": "__count"
             },
diff --git a/examples/compiled/selection_type_interval_invert.png b/examples/compiled/selection_type_interval_invert.png
index 237e89d763af9c94367aa23d865adc20ecd431b2..408bd0cf3b9018751aa3fa8bda22742c2ebd6d75 100644
GIT binary patch
literal 6999
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
GzyASu6Zq2r

literal 6941
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

diff --git a/examples/compiled/selection_type_interval_invert.svg b/examples/compiled/selection_type_interval_invert.svg
index b4904c5049..e274294820 100644
--- a/examples/compiled/selection_type_interval_invert.svg
+++ b/examples/compiled/selection_type_interval_invert.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" class="marks" width="292" height="98" viewBox="0 0 292 98"><rect width="292" height="98" fill="white"/><g fill="none" stroke-miterlimit="10" transform="translate(61,5)"><g class="mark-group role-frame root" role="graphics-object" aria-roledescription="group mark container"><g transform="translate(0,0)"><path class="background" aria-hidden="true" d="M0.5,0.5h100v60h-100Z" stroke="#ddd"/><g><g class="mark-rect role-mark pts_brush_bg" clip-path="url(#clip1)" role="graphics-symbol" aria-roledescription="rect mark container"><path d="M0,0h0v0h0Z" fill="#333" fill-opacity="0.125"/></g><g class="mark-rect role-mark marks" role="graphics-object" aria-roledescription="rect mark container"><path aria-label="Origin: USA; Cylinders: 8; Count of Records: 108" role="graphics-symbol" aria-roledescription="rect mark" d="M80,40h20v20h-20Z" fill="grey"/><path aria-label="Origin: Europe; Cylinders: 4; Count of Records: 66" role="graphics-symbol" aria-roledescription="rect mark" d="M20,0h20v20h-20Z" fill="grey"/><path aria-label="Origin: Japan; Cylinders: 4; Count of Records: 69" role="graphics-symbol" aria-roledescription="rect mark" d="M20,20h20v20h-20Z" fill="grey"/><path aria-label="Origin: USA; Cylinders: 6; Count of Records: 74" role="graphics-symbol" aria-roledescription="rect mark" d="M60,40h20v20h-20Z" fill="grey"/><path aria-label="Origin: USA; Cylinders: 4; Count of Records: 72" role="graphics-symbol" aria-roledescription="rect mark" d="M20,40h20v20h-20Z" fill="grey"/><path aria-label="Origin: Japan; Cylinders: 3; Count of Records: 4" role="graphics-symbol" aria-roledescription="rect mark" d="M0,20h20v20h-20Z" fill="grey"/><path aria-label="Origin: Japan; Cylinders: 6; Count of Records: 6" role="graphics-symbol" aria-roledescription="rect mark" d="M60,20h20v20h-20Z" fill="grey"/><path aria-label="Origin: Europe; Cylinders: 6; Count of Records: 4" role="graphics-symbol" aria-roledescription="rect mark" d="M60,0h20v20h-20Z" fill="grey"/><path aria-label="Origin: Europe; Cylinders: 5; Count of Records: 3" role="graphics-symbol" aria-roledescription="rect mark" d="M40,0h20v20h-20Z" fill="grey"/></g><g class="mark-rect role-mark pts_brush" clip-path="url(#clip2)" role="graphics-symbol" aria-roledescription="rect mark container"><path d="M0,0h0v0h0Z"/></g><g class="mark-group role-legend" role="graphics-symbol" aria-roledescription="legend" aria-label="Gradient legend titled 'Count of Records' for fill color with values from 3 to 108"><g transform="translate(118,0)"><path class="background" aria-hidden="true" d="M0,0h108v80h-108Z" pointer-events="none"/><g><g class="mark-group role-legend-entry"><g transform="translate(0,16)"><path class="background" aria-hidden="true" d="M0,0h0v0h0Z" pointer-events="none"/><g><g class="mark-rect role-legend-gradient" pointer-events="none"><path d="M0,0h16v64h-16Z" fill="url(#gradient_0)" stroke="#ddd" stroke-width="0" opacity="1"/></g><g class="mark-text role-legend-label" pointer-events="none"><text text-anchor="start" transform="translate(18,62)" font-family="sans-serif" font-size="10px" fill="#000" opacity="1">3</text><text text-anchor="start" transform="translate(18,8)" font-family="sans-serif" font-size="10px" fill="#000" opacity="1">108</text></g></g><path class="foreground" aria-hidden="true" d="" pointer-events="none" display="none"/></g></g><g class="mark-text role-legend-title" pointer-events="none"><text text-anchor="start" transform="translate(0,9)" font-family="sans-serif" font-size="11px" font-weight="bold" fill="#000" opacity="1">Count of Records</text></g></g><path class="foreground" aria-hidden="true" d="" pointer-events="none" display="none"/></g></g><g class="mark-group role-axis" role="graphics-symbol" aria-roledescription="axis" aria-label="X-axis titled 'Cylinders' for a discrete scale with 5 values: 3, 4, 5, 6, 8"><g transform="translate(0.5,60.5)"><path class="background" aria-hidden="true" d="M0,0h0v0h0Z" pointer-events="none"/><g><g class="mark-rule role-axis-tick" pointer-events="none"><line transform="translate(10,0)" x2="0" y2="5" stroke="#888" stroke-width="1" opacity="1"/><line transform="translate(30,0)" x2="0" y2="5" stroke="#888" stroke-width="1" opacity="1"/><line transform="translate(50,0)" x2="0" y2="5" stroke="#888" stroke-width="1" opacity="1"/><line transform="translate(70,0)" x2="0" y2="5" stroke="#888" stroke-width="1" opacity="1"/><line transform="translate(90,0)" x2="0" y2="5" stroke="#888" stroke-width="1" opacity="1"/></g><g class="mark-text role-axis-label" pointer-events="none"><text text-anchor="end" transform="translate(9.5,7) rotate(270) translate(0,3)" font-family="sans-serif" font-size="10px" fill="#000" opacity="1">3</text><text text-anchor="end" transform="translate(29.5,7) rotate(270) translate(0,3)" font-family="sans-serif" font-size="10px" fill="#000" opacity="1">4</text><text text-anchor="end" transform="translate(49.5,7) rotate(270) translate(0,3)" font-family="sans-serif" font-size="10px" fill="#000" opacity="1">5</text><text text-anchor="end" transform="translate(69.5,7) rotate(270) translate(0,3)" font-family="sans-serif" font-size="10px" fill="#000" opacity="1">6</text><text text-anchor="end" transform="translate(89.5,7) rotate(270) translate(0,3)" font-family="sans-serif" font-size="10px" fill="#000" opacity="1">8</text></g><g class="mark-rule role-axis-domain" pointer-events="none"><line transform="translate(0,0)" x2="100" y2="0" stroke="#888" stroke-width="1" opacity="1"/></g><g class="mark-text role-axis-title" pointer-events="none"><text text-anchor="middle" transform="translate(50,26)" font-family="sans-serif" font-size="11px" font-weight="bold" fill="#000" opacity="1">Cylinders</text></g></g><path class="foreground" aria-hidden="true" d="" pointer-events="none" display="none"/></g></g><g class="mark-group role-axis" role="graphics-symbol" aria-roledescription="axis" aria-label="Y-axis titled 'Origin' for a discrete scale with 3 values: Europe, Japan, USA"><g transform="translate(0.5,0.5)"><path class="background" aria-hidden="true" d="M0,0h0v0h0Z" pointer-events="none"/><g><g class="mark-rule role-axis-tick" pointer-events="none"><line transform="translate(0,10)" x2="-5" y2="0" stroke="#888" stroke-width="1" opacity="1"/><line transform="translate(0,30)" x2="-5" y2="0" stroke="#888" stroke-width="1" opacity="1"/><line transform="translate(0,50)" x2="-5" y2="0" stroke="#888" stroke-width="1" opacity="1"/></g><g class="mark-text role-axis-label" pointer-events="none"><text text-anchor="end" transform="translate(-7,12.5)" font-family="sans-serif" font-size="10px" fill="#000" opacity="1">Europe</text><text text-anchor="end" transform="translate(-7,32.5)" font-family="sans-serif" font-size="10px" fill="#000" opacity="1">Japan</text><text text-anchor="end" transform="translate(-7,52.5)" font-family="sans-serif" font-size="10px" fill="#000" opacity="1">USA</text></g><g class="mark-rule role-axis-domain" pointer-events="none"><line transform="translate(0,0)" x2="0" y2="60" stroke="#888" stroke-width="1" opacity="1"/></g><g class="mark-text role-axis-title" pointer-events="none"><text text-anchor="middle" transform="translate(-45,30) rotate(-90) translate(0,-2)" font-family="sans-serif" font-size="11px" font-weight="bold" fill="#000" opacity="1">Origin</text></g></g><path class="foreground" aria-hidden="true" d="" pointer-events="none" display="none"/></g></g></g><path class="foreground" aria-hidden="true" d="" display="none"/></g></g></g><defs><linearGradient id="gradient_0" x1="0" x2="0" y1="1" y2="0"><stop offset="0" stop-color="rgb(239, 249, 189)"/><stop offset="0.01904761904761905" stop-color="rgb(235, 247, 187)"/><stop offset="0.06666666666666667" stop-color="rgb(226, 244, 183)"/><stop offset="0.11428571428571428" stop-color="rgb(215, 239, 180)"/><stop offset="0.1619047619047619" stop-color="rgb(200, 234, 181)"/><stop offset="0.20952380952380953" stop-color="rgb(185, 227, 181)"/><stop offset="0.2571428571428571" stop-color="rgb(166, 220, 183)"/><stop offset="0.3047619047619048" stop-color="rgb(146, 212, 185)"/><stop offset="0.3523809523809524" stop-color="rgb(125, 205, 188)"/><stop offset="0.4" stop-color="rgb(105, 197, 190)"/><stop offset="0.44761904761904764" stop-color="rgb(88, 189, 192)"/><stop offset="0.49523809523809526" stop-color="rgb(71, 181, 194)"/><stop offset="0.5428571428571428" stop-color="rgb(58, 171, 193)"/><stop offset="0.5904761904761905" stop-color="rgb(46, 160, 192)"/><stop offset="0.638095238095238" stop-color="rgb(40, 147, 189)"/><stop offset="0.6857142857142857" stop-color="rgb(35, 134, 185)"/><stop offset="0.7333333333333333" stop-color="rgb(33, 120, 179)"/><stop offset="0.780952380952381" stop-color="rgb(33, 105, 173)"/><stop offset="0.8285714285714286" stop-color="rgb(34, 91, 166)"/><stop offset="0.8761904761904762" stop-color="rgb(35, 78, 159)"/><stop offset="0.9238095238095239" stop-color="rgb(33, 66, 151)"/><stop offset="0.9714285714285714" stop-color="rgb(30, 55, 140)"/><stop offset="1" stop-color="rgb(28, 49, 133)"/></linearGradient><clipPath id="clip1"><rect x="0" y="0" width="100" height="60"/></clipPath><clipPath id="clip2"><rect x="0" y="0" width="100" height="60"/></clipPath></defs></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" class="marks" width="292" height="98" viewBox="0 0 292 98"><rect width="292" height="98" fill="white"/><g fill="none" stroke-miterlimit="10" transform="translate(61,5)"><g class="mark-group role-frame root" role="graphics-object" aria-roledescription="group mark container"><g transform="translate(0,0)"><path class="background" aria-hidden="true" d="M0.5,0.5h100v60h-100Z" stroke="#ddd"/><g><g class="mark-rect role-mark pts_brush_bg" clip-path="url(#clip1)" role="graphics-symbol" aria-roledescription="rect mark container"><path d="M0,0h0v0h0Z" fill="#333" fill-opacity="0.125"/></g><g class="mark-rect role-mark marks" role="graphics-object" aria-roledescription="rect mark container"><path aria-label="Origin: USA; Cylinders: 8; Count of Records: 108" role="graphics-symbol" aria-roledescription="rect mark" d="M80,40h20v20h-20Z" fill="rgb(28, 49, 133)"/><path aria-label="Origin: Europe; Cylinders: 4; Count of Records: 66" role="graphics-symbol" aria-roledescription="rect mark" d="M20,0h20v20h-20Z" fill="rgb(44, 158, 192)"/><path aria-label="Origin: Japan; Cylinders: 4; Count of Records: 69" role="graphics-symbol" aria-roledescription="rect mark" d="M20,20h20v20h-20Z" fill="rgb(41, 150, 190)"/><path aria-label="Origin: USA; Cylinders: 6; Count of Records: 74" role="graphics-symbol" aria-roledescription="rect mark" d="M60,40h20v20h-20Z" fill="rgb(36, 137, 186)"/><path aria-label="Origin: USA; Cylinders: 4; Count of Records: 72" role="graphics-symbol" aria-roledescription="rect mark" d="M20,40h20v20h-20Z" fill="rgb(38, 142, 187)"/><path aria-label="Origin: Japan; Cylinders: 3; Count of Records: 4" role="graphics-symbol" aria-roledescription="rect mark" d="M0,20h20v20h-20Z" fill="rgb(237, 248, 188)"/><path aria-label="Origin: Japan; Cylinders: 6; Count of Records: 6" role="graphics-symbol" aria-roledescription="rect mark" d="M60,20h20v20h-20Z" fill="rgb(233, 247, 186)"/><path aria-label="Origin: Europe; Cylinders: 6; Count of Records: 4" role="graphics-symbol" aria-roledescription="rect mark" d="M60,0h20v20h-20Z" fill="rgb(237, 248, 188)"/><path aria-label="Origin: Europe; Cylinders: 5; Count of Records: 3" role="graphics-symbol" aria-roledescription="rect mark" d="M40,0h20v20h-20Z" fill="rgb(239, 249, 189)"/></g><g class="mark-rect role-mark pts_brush" clip-path="url(#clip2)" role="graphics-symbol" aria-roledescription="rect mark container"><path d="M0,0h0v0h0Z"/></g><g class="mark-group role-legend" role="graphics-symbol" aria-roledescription="legend" aria-label="Gradient legend titled 'Count of Records' for fill color with values from 3 to 108"><g transform="translate(118,0)"><path class="background" aria-hidden="true" d="M0,0h108v80h-108Z" pointer-events="none"/><g><g class="mark-group role-legend-entry"><g transform="translate(0,16)"><path class="background" aria-hidden="true" d="M0,0h0v0h0Z" pointer-events="none"/><g><g class="mark-rect role-legend-gradient" pointer-events="none"><path d="M0,0h16v64h-16Z" fill="url(#gradient_0)" stroke="#ddd" stroke-width="0" opacity="1"/></g><g class="mark-text role-legend-label" pointer-events="none"><text text-anchor="start" transform="translate(18,62)" font-family="sans-serif" font-size="10px" fill="#000" opacity="1">3</text><text text-anchor="start" transform="translate(18,8)" font-family="sans-serif" font-size="10px" fill="#000" opacity="1">108</text></g></g><path class="foreground" aria-hidden="true" d="" pointer-events="none" display="none"/></g></g><g class="mark-text role-legend-title" pointer-events="none"><text text-anchor="start" transform="translate(0,9)" font-family="sans-serif" font-size="11px" font-weight="bold" fill="#000" opacity="1">Count of Records</text></g></g><path class="foreground" aria-hidden="true" d="" pointer-events="none" display="none"/></g></g><g class="mark-group role-axis" role="graphics-symbol" aria-roledescription="axis" aria-label="X-axis titled 'Cylinders' for a discrete scale with 5 values: 3, 4, 5, 6, 8"><g transform="translate(0.5,60.5)"><path class="background" aria-hidden="true" d="M0,0h0v0h0Z" pointer-events="none"/><g><g class="mark-rule role-axis-tick" pointer-events="none"><line transform="translate(10,0)" x2="0" y2="5" stroke="#888" stroke-width="1" opacity="1"/><line transform="translate(30,0)" x2="0" y2="5" stroke="#888" stroke-width="1" opacity="1"/><line transform="translate(50,0)" x2="0" y2="5" stroke="#888" stroke-width="1" opacity="1"/><line transform="translate(70,0)" x2="0" y2="5" stroke="#888" stroke-width="1" opacity="1"/><line transform="translate(90,0)" x2="0" y2="5" stroke="#888" stroke-width="1" opacity="1"/></g><g class="mark-text role-axis-label" pointer-events="none"><text text-anchor="end" transform="translate(9.5,7) rotate(270) translate(0,3)" font-family="sans-serif" font-size="10px" fill="#000" opacity="1">3</text><text text-anchor="end" transform="translate(29.5,7) rotate(270) translate(0,3)" font-family="sans-serif" font-size="10px" fill="#000" opacity="1">4</text><text text-anchor="end" transform="translate(49.5,7) rotate(270) translate(0,3)" font-family="sans-serif" font-size="10px" fill="#000" opacity="1">5</text><text text-anchor="end" transform="translate(69.5,7) rotate(270) translate(0,3)" font-family="sans-serif" font-size="10px" fill="#000" opacity="1">6</text><text text-anchor="end" transform="translate(89.5,7) rotate(270) translate(0,3)" font-family="sans-serif" font-size="10px" fill="#000" opacity="1">8</text></g><g class="mark-rule role-axis-domain" pointer-events="none"><line transform="translate(0,0)" x2="100" y2="0" stroke="#888" stroke-width="1" opacity="1"/></g><g class="mark-text role-axis-title" pointer-events="none"><text text-anchor="middle" transform="translate(50,26)" font-family="sans-serif" font-size="11px" font-weight="bold" fill="#000" opacity="1">Cylinders</text></g></g><path class="foreground" aria-hidden="true" d="" pointer-events="none" display="none"/></g></g><g class="mark-group role-axis" role="graphics-symbol" aria-roledescription="axis" aria-label="Y-axis titled 'Origin' for a discrete scale with 3 values: Europe, Japan, USA"><g transform="translate(0.5,0.5)"><path class="background" aria-hidden="true" d="M0,0h0v0h0Z" pointer-events="none"/><g><g class="mark-rule role-axis-tick" pointer-events="none"><line transform="translate(0,10)" x2="-5" y2="0" stroke="#888" stroke-width="1" opacity="1"/><line transform="translate(0,30)" x2="-5" y2="0" stroke="#888" stroke-width="1" opacity="1"/><line transform="translate(0,50)" x2="-5" y2="0" stroke="#888" stroke-width="1" opacity="1"/></g><g class="mark-text role-axis-label" pointer-events="none"><text text-anchor="end" transform="translate(-7,12.5)" font-family="sans-serif" font-size="10px" fill="#000" opacity="1">Europe</text><text text-anchor="end" transform="translate(-7,32.5)" font-family="sans-serif" font-size="10px" fill="#000" opacity="1">Japan</text><text text-anchor="end" transform="translate(-7,52.5)" font-family="sans-serif" font-size="10px" fill="#000" opacity="1">USA</text></g><g class="mark-rule role-axis-domain" pointer-events="none"><line transform="translate(0,0)" x2="0" y2="60" stroke="#888" stroke-width="1" opacity="1"/></g><g class="mark-text role-axis-title" pointer-events="none"><text text-anchor="middle" transform="translate(-45,30) rotate(-90) translate(0,-2)" font-family="sans-serif" font-size="11px" font-weight="bold" fill="#000" opacity="1">Origin</text></g></g><path class="foreground" aria-hidden="true" d="" pointer-events="none" display="none"/></g></g></g><path class="foreground" aria-hidden="true" d="" display="none"/></g></g></g><defs><linearGradient id="gradient_0" x1="0" x2="0" y1="1" y2="0"><stop offset="0" stop-color="rgb(239, 249, 189)"/><stop offset="0.01904761904761905" stop-color="rgb(235, 247, 187)"/><stop offset="0.06666666666666667" stop-color="rgb(226, 244, 183)"/><stop offset="0.11428571428571428" stop-color="rgb(215, 239, 180)"/><stop offset="0.1619047619047619" stop-color="rgb(200, 234, 181)"/><stop offset="0.20952380952380953" stop-color="rgb(185, 227, 181)"/><stop offset="0.2571428571428571" stop-color="rgb(166, 220, 183)"/><stop offset="0.3047619047619048" stop-color="rgb(146, 212, 185)"/><stop offset="0.3523809523809524" stop-color="rgb(125, 205, 188)"/><stop offset="0.4" stop-color="rgb(105, 197, 190)"/><stop offset="0.44761904761904764" stop-color="rgb(88, 189, 192)"/><stop offset="0.49523809523809526" stop-color="rgb(71, 181, 194)"/><stop offset="0.5428571428571428" stop-color="rgb(58, 171, 193)"/><stop offset="0.5904761904761905" stop-color="rgb(46, 160, 192)"/><stop offset="0.638095238095238" stop-color="rgb(40, 147, 189)"/><stop offset="0.6857142857142857" stop-color="rgb(35, 134, 185)"/><stop offset="0.7333333333333333" stop-color="rgb(33, 120, 179)"/><stop offset="0.780952380952381" stop-color="rgb(33, 105, 173)"/><stop offset="0.8285714285714286" stop-color="rgb(34, 91, 166)"/><stop offset="0.8761904761904762" stop-color="rgb(35, 78, 159)"/><stop offset="0.9238095238095239" stop-color="rgb(33, 66, 151)"/><stop offset="0.9714285714285714" stop-color="rgb(30, 55, 140)"/><stop offset="1" stop-color="rgb(28, 49, 133)"/></linearGradient><clipPath id="clip1"><rect x="0" y="0" width="100" height="60"/></clipPath><clipPath id="clip2"><rect x="0" y="0" width="100" height="60"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/examples/compiled/selection_type_interval_invert.vg.json b/examples/compiled/selection_type_interval_invert.vg.json
index 91d2226703..8233581046 100644
--- a/examples/compiled/selection_type_interval_invert.vg.json
+++ b/examples/compiled/selection_type_interval_invert.vg.json
@@ -298,7 +298,7 @@
         "update": {
           "fill": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (!(vlSelectionTest(\"pts_store\", datum)))",
+              "test": "!(!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum))",
               "value": "grey"
             },
             {"scale": "color", "field": "__count"}
diff --git a/examples/compiled/selection_type_multi.vg.json b/examples/compiled/selection_type_multi.vg.json
index 474b207a90..b708485bfc 100644
--- a/examples/compiled/selection_type_multi.vg.json
+++ b/examples/compiled/selection_type_multi.vg.json
@@ -85,7 +85,7 @@
         "update": {
           "fill": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "scale": "color",
               "field": "__count"
             },
diff --git a/examples/compiled/selection_type_single.vg.json b/examples/compiled/selection_type_single.vg.json
index 474b207a90..b708485bfc 100644
--- a/examples/compiled/selection_type_single.vg.json
+++ b/examples/compiled/selection_type_single.vg.json
@@ -85,7 +85,7 @@
         "update": {
           "fill": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "scale": "color",
               "field": "__count"
             },
diff --git a/examples/compiled/selection_type_single_dblclick.vg.json b/examples/compiled/selection_type_single_dblclick.vg.json
index 20783be444..3af3267c2f 100644
--- a/examples/compiled/selection_type_single_dblclick.vg.json
+++ b/examples/compiled/selection_type_single_dblclick.vg.json
@@ -85,7 +85,7 @@
         "update": {
           "fill": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "scale": "color",
               "field": "__count"
             },
diff --git a/examples/compiled/selection_type_single_mouseover.vg.json b/examples/compiled/selection_type_single_mouseover.vg.json
index 4f2ac8e435..074bf81eac 100644
--- a/examples/compiled/selection_type_single_mouseover.vg.json
+++ b/examples/compiled/selection_type_single_mouseover.vg.json
@@ -85,7 +85,7 @@
         "update": {
           "fill": [
             {
-              "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+              "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
               "scale": "color",
               "field": "__count"
             },
diff --git a/examples/compiled/selection_zoom_brush_shift-wheel.vg.json b/examples/compiled/selection_zoom_brush_shift-wheel.vg.json
index de85a398ad..bb15ab02fe 100644
--- a/examples/compiled/selection_zoom_brush_shift-wheel.vg.json
+++ b/examples/compiled/selection_zoom_brush_shift-wheel.vg.json
@@ -307,7 +307,7 @@
           "opacity": {"value": 0.7},
           "fill": [
             {
-              "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+              "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
               "scale": "color",
               "field": "Origin"
             },
diff --git a/examples/compiled/selection_zoom_brush_wheel.vg.json b/examples/compiled/selection_zoom_brush_wheel.vg.json
index 4fefb62dbe..cf1c0b06a1 100644
--- a/examples/compiled/selection_zoom_brush_wheel.vg.json
+++ b/examples/compiled/selection_zoom_brush_wheel.vg.json
@@ -305,7 +305,7 @@
           "opacity": {"value": 0.7},
           "fill": [
             {
-              "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
+              "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum)",
               "scale": "color",
               "field": "Origin"
             },
diff --git a/examples/compiled/trellis_selections.vg.json b/examples/compiled/trellis_selections.vg.json
index 085a2effff..c3150da132 100644
--- a/examples/compiled/trellis_selections.vg.json
+++ b/examples/compiled/trellis_selections.vg.json
@@ -485,7 +485,7 @@
               "opacity": {"value": 1},
               "fill": [
                 {
-                  "test": "!(length(data(\"xenc_store\"))) || (vlSelectionTest(\"xenc_store\", datum))",
+                  "test": "!length(data(\"xenc_store\")) || vlSelectionTest(\"xenc_store\", datum)",
                   "value": "red"
                 },
                 {"value": "steelblue"}
@@ -510,7 +510,7 @@
               ],
               "size": [
                 {
-                  "test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum, \"intersect\"))",
+                  "test": "!length(data(\"brush_store\")) || vlSelectionTest(\"brush_store\", datum, \"intersect\")",
                   "value": 250
                 },
                 {"value": 100}
diff --git a/examples/compiled/vconcat_flatten.vg.json b/examples/compiled/vconcat_flatten.vg.json
index 1a2b6c4dfa..550666178a 100644
--- a/examples/compiled/vconcat_flatten.vg.json
+++ b/examples/compiled/vconcat_flatten.vg.json
@@ -69,7 +69,7 @@
       "transform": [
         {
           "type": "filter",
-          "expr": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))"
+          "expr": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)"
         }
       ]
     }
@@ -153,7 +153,7 @@
               "opacity": {"value": 0.7},
               "fill": [
                 {
-                  "test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
+                  "test": "!length(data(\"pts_store\")) || vlSelectionTest(\"pts_store\", datum)",
                   "value": "steelblue"
                 },
                 {"value": "grey"}
diff --git a/examples/specs/airport_connections.vl.json b/examples/specs/airport_connections.vl.json
index c746c66850..acda8c3217 100644
--- a/examples/specs/airport_connections.vl.json
+++ b/examples/specs/airport_connections.vl.json
@@ -18,7 +18,7 @@
       "mark": {"type": "rule", "color": "#000", "opacity": 0.35},
       "data": {"url": "data/flights-airport.csv"},
       "transform": [
-        {"filter": {"selection": "org"}},
+        {"filter": {"selection": "org", "empty": false}},
         {
           "lookup": "origin",
           "from": {
@@ -65,8 +65,7 @@
           "type": "point",
           "on": "mouseover",
           "nearest": true,
-          "fields": ["origin"],
-          "empty": "none"
+          "fields": ["origin"]
         }
       }],
       "encoding": {
diff --git a/examples/specs/concat_hover.vl.json b/examples/specs/concat_hover.vl.json
index da048a1f7a..01dad7c0c3 100644
--- a/examples/specs/concat_hover.vl.json
+++ b/examples/specs/concat_hover.vl.json
@@ -5,36 +5,34 @@
   "hconcat": [{
     "params": [{
       "name": "hover",
-      "select": {
-        "type": "point",
-        "on": "mouseover",
-        "empty": "none"
-      }
+      "select": {"type": "point", "on": "mouseover"}
     }],
     "mark": "point",
     "encoding": {
       "x": {"field": "Horsepower", "type": "quantitative"},
       "y": {"field": "Miles_per_Gallon", "type": "quantitative"},
       "color": {
-        "condition": {"selection": "hover", "field": "Cylinders", "type": "ordinal"},
+        "condition": {
+          "selection": "hover", "empty": false,
+          "field": "Cylinders", "type": "ordinal"
+        },
         "value": "grey"
       }
     }
   },{
     "params": [{
       "name": "hover",
-      "select": {
-        "type": "point",
-        "on": "mouseover",
-        "empty": "none"
-      }
+      "select": {"type": "point", "on": "mouseover"}
     }],
     "mark": "point",
     "encoding": {
       "x": {"field": "Horsepower", "type": "quantitative"},
       "y": {"field": "Acceleration", "type": "quantitative"},
       "color": {
-        "condition": {"selection": "hover", "field": "Cylinders", "type": "ordinal"},
+        "condition": {
+          "selection": "hover", "empty": false,
+          "field": "Cylinders", "type": "ordinal"
+        },
         "value": "grey"
       }
     }
diff --git a/examples/specs/concat_hover_filter.vl.json b/examples/specs/concat_hover_filter.vl.json
index 9a1f477a3e..35ebd6a6fe 100644
--- a/examples/specs/concat_hover_filter.vl.json
+++ b/examples/specs/concat_hover_filter.vl.json
@@ -11,17 +11,15 @@
       {
         "params": [{
           "name": "hover",
-          "select": {
-            "type": "point",
-            "on": "mouseover",
-            "empty": "none"
-          }
+          "select": {"type": "point", "on": "mouseover"}
         }],
         "mark": "point"
       },
       {
         "mark": {"type": "point", "color": "goldenrod"},
-        "transform": [{"filter": {"selection": "hover"}}]
+        "transform": [
+          {"filter": {"selection": "hover", "empty": false}}
+        ]
       }
     ]
   }, {
@@ -34,17 +32,15 @@
 
         "params": [{
           "name": "hover",
-          "select": {
-            "type": "point",
-            "on": "mouseover",
-            "empty": "none"
-          }
+          "select": {"type": "point", "on": "mouseover"}
         }],
         "mark": "point"
       },
       {
         "mark": {"type": "point", "color": "goldenrod"},
-        "transform": [{"filter": {"selection": "hover"}}]
+        "transform": [
+          {"filter": {"selection": "hover", "empty": false}}
+        ]
       }
     ]
   }]
diff --git a/examples/specs/interactive_bar_select_highlight.vl.json b/examples/specs/interactive_bar_select_highlight.vl.json
index e11059b288..203fc7a94c 100644
--- a/examples/specs/interactive_bar_select_highlight.vl.json
+++ b/examples/specs/interactive_bar_select_highlight.vl.json
@@ -11,16 +11,9 @@
   "params": [
     {
       "name": "highlight",
-      "select": {
-        "type": "point",
-        "empty": "none",
-        "on": "mouseover"
-      }
+      "select": {"type": "point", "on": "mouseover"}
     },
-    {
-      "name": "select",
-      "select": {"type": "point"}
-    }
+    {"name": "select", "select": "point"}
   ],
   "mark": {
     "type": "bar",
@@ -38,15 +31,15 @@
     "strokeWidth": {
       "condition": [
         {
-          "test": {
-            "and": [
-              {"selection": "select"},
-              "length(data(\"select_store\"))"
-            ]
-          },
+          "selection": "select",
+          "empty": false,
           "value": 2
         },
-        {"selection": "highlight", "value": 1}
+        {
+          "selection": "highlight",
+          "empty": false,
+          "value": 1
+        }
       ],
       "value": 0
     }
diff --git a/examples/specs/interactive_dashboard_europe_pop.vl.json b/examples/specs/interactive_dashboard_europe_pop.vl.json
index 7ac4e71b24..e5da019b4c 100644
--- a/examples/specs/interactive_dashboard_europe_pop.vl.json
+++ b/examples/specs/interactive_dashboard_europe_pop.vl.json
@@ -323,8 +323,12 @@
           "type": "quantitative"
         },
         "color": {
-          "condition": {"selection": {"not": "brush"}, "value": "steelblue"},
-          "value": "goldenrod"
+          "condition": {
+            "selection": "brush",
+            "empty": false,
+            "value": "goldenrod"
+          },
+          "value": "steelblue"
         }
       }
     },
@@ -346,8 +350,12 @@
           "type": "quantitative"
         },
         "color": {
-          "condition": {"selection": {"not": "brush"}, "value": "steelblue"},
-          "value": "goldenrod"
+          "condition": {
+            "selection": "brush",
+            "empty": false,
+            "value": "goldenrod"
+          },
+          "value": "steelblue"
         }
       }
     },
@@ -368,8 +376,12 @@
           "scale": {"zero": false}
         },
         "color": {
-          "condition": {"selection": {"not": "brush"}, "value": "steelblue"},
-          "value": "goldenrod"
+          "condition": {
+            "selection": "brush",
+            "empty": false,
+            "value": "goldenrod"
+          },
+          "value": "steelblue"
         }
       }
     }
diff --git a/examples/specs/interactive_global_development.vl.json b/examples/specs/interactive_global_development.vl.json
index 2075bcfc5b..e6c38b92f9 100644
--- a/examples/specs/interactive_global_development.vl.json
+++ b/examples/specs/interactive_global_development.vl.json
@@ -66,9 +66,10 @@
             "order": {"field": "year"},
             "opacity": {
               "condition": {
-                "test": {
-                  "or": [{"selection": "hovered"}, {"selection": "clicked"}]
-                },
+                "test": {"or": [
+                  {"selection": "hovered", "empty": false},
+                  {"selection": "clicked", "empty": false}
+                ]},
                 "value": 0.8
               },
               "value": 0
@@ -95,17 +96,13 @@
               "select": {
                 "type": "point",
                 "fields": ["country"],
-                "on": "mouseover",
-                "empty": "none"
+                "toggle": false,
+                "on": "mouseover"
               }
             },
             {
               "name": "clicked",
-              "select": {
-                "type": "point",
-                "fields": ["country"],
-                "empty": "none"
-              }
+              "select": {"type": "point", "fields": ["country"]}
             }
           ],
           "transform": [{"filter": {"selection": "year"}}],
@@ -118,7 +115,10 @@
               "filter": {
                 "and": [
                   {"selection": "year"},
-                  {"or": [{"selection": "clicked"}, {"selection": "hovered"}]}
+                  {"or": [
+                    {"selection": "clicked", "empty": false},
+                    {"selection": "hovered", "empty": false}
+                  ]}
                 ]
               }
             }
@@ -136,7 +136,7 @@
         },
         {
           "transform": [
-            {"filter": {"selection": "hovered"}},
+            {"filter": {"selection": "hovered", "empty": false}},
             {"filter": {"not": {"selection": "year"}}}
           ],
           "layer": [
diff --git a/examples/specs/interactive_line_hover.vl.json b/examples/specs/interactive_line_hover.vl.json
index 4bc36c3c22..e1d698e351 100644
--- a/examples/specs/interactive_line_hover.vl.json
+++ b/examples/specs/interactive_line_hover.vl.json
@@ -31,8 +31,7 @@
       "select": {
         "type": "point",
         "fields": ["symbol"],
-        "on": "mouseover",
-        "empty": "all"
+        "on": "mouseover"
       }
     }],
     "mark": {"type": "line", "strokeWidth": 8, "stroke": "transparent"}
diff --git a/examples/specs/interactive_multi_line_label.vl.json b/examples/specs/interactive_multi_line_label.vl.json
index 7128e82f5e..0cfddcd7f3 100644
--- a/examples/specs/interactive_multi_line_label.vl.json
+++ b/examples/specs/interactive_multi_line_label.vl.json
@@ -21,14 +21,17 @@
               "type": "point",
               "encodings": ["x"],
               "nearest": true,
-              "on": "mouseover",
-              "empty": "none"
+              "on": "mouseover"
             }
           }],
           "mark": "point",
           "encoding": {
             "opacity": {
-              "condition": {"selection": "label", "value": 1},
+              "condition": {
+                "selection": "label",
+                "empty": false,
+                "value": 1
+              },
               "value": 0
             }
           }
@@ -36,7 +39,7 @@
       ]
     },
     {
-      "transform": [{"filter": {"selection": "label"}}],
+      "transform": [{"filter": {"selection": "label", "empty": false}}],
       "layer": [
         {
           "mark": {"type": "rule", "color": "gray"},
diff --git a/examples/specs/interactive_multi_line_pivot_tooltip.vl.json b/examples/specs/interactive_multi_line_pivot_tooltip.vl.json
index 65ca6fb5b0..1d8ed57496 100644
--- a/examples/specs/interactive_multi_line_pivot_tooltip.vl.json
+++ b/examples/specs/interactive_multi_line_pivot_tooltip.vl.json
@@ -12,7 +12,7 @@
       },
       "layer": [
         {"mark": "line"},
-        {"transform": [{"filter": {"selection": "hover"}}], "mark": "point"}
+        {"transform": [{"filter": {"selection": "hover", "empty": false}}], "mark": "point"}
       ]
     },
     {
@@ -20,7 +20,7 @@
       "mark": "rule",
       "encoding": {
         "opacity": {
-          "condition": {"value": 0.3, "selection": "hover"},
+          "condition": {"value": 0.3, "selection": "hover", "empty": false},
           "value": 0
         },
         "tooltip": [
@@ -38,7 +38,6 @@
           "fields": ["date"],
           "nearest": true,
           "on": "mouseover",
-          "empty": "none",
           "clear": "mouseout"
         }
       }]
diff --git a/examples/specs/interactive_multi_line_tooltip.vl.json b/examples/specs/interactive_multi_line_tooltip.vl.json
index 812506b9cc..314d831c9b 100644
--- a/examples/specs/interactive_multi_line_tooltip.vl.json
+++ b/examples/specs/interactive_multi_line_tooltip.vl.json
@@ -23,13 +23,16 @@
     "mark": "rule",
     "params": [{
       "name": "hover",
-      "select": {"type": "point", "on": "mouseover", "empty": "none"}
+      "select": {"type": "point", "on": "mouseover"}
     }],
     "encoding": {
       "color": {
-        "condition":{
-          "selection": {"not": "hover"}, "value": "transparent"
-        }
+        "condition": {
+          "selection": "hover",
+          "empty": false,
+          "value": "black"
+        },
+        "value": "transparent"
       }
     }
   }],
diff --git a/examples/specs/interactive_paintbrush_simple_all.vl.json b/examples/specs/interactive_paintbrush_simple_all.vl.json
index 8bbfa51326..863e8b1996 100644
--- a/examples/specs/interactive_paintbrush_simple_all.vl.json
+++ b/examples/specs/interactive_paintbrush_simple_all.vl.json
@@ -3,7 +3,7 @@
   "data": {"url": "data/cars.json"},
   "params": [{
     "name": "paintbrush",
-    "select": {"type": "point", "on": "mouseover", "empty": "all"}
+    "select": {"type": "point", "on": "mouseover"}
   }],
   "mark": "point",
   "encoding": {
@@ -11,7 +11,9 @@
     "y": {"field": "Miles_per_Gallon", "type": "quantitative"},
     "size": {
       "condition": {
-        "selection": "paintbrush", "value": 300
+        "selection": "paintbrush",
+        "empty": true,
+        "value": 300
       },
       "value": 50
     }
diff --git a/examples/specs/interactive_paintbrush_simple_none.vl.json b/examples/specs/interactive_paintbrush_simple_none.vl.json
index 81844d186c..4058d8d625 100644
--- a/examples/specs/interactive_paintbrush_simple_none.vl.json
+++ b/examples/specs/interactive_paintbrush_simple_none.vl.json
@@ -3,7 +3,7 @@
   "data": {"url": "data/cars.json"},
   "params": [{
     "name": "paintbrush",
-    "select": {"type": "point", "on": "mouseover", "empty": "none"}
+    "select": {"type": "point", "on": "mouseover"}
   }],
   "mark": "point",
   "encoding": {
@@ -11,7 +11,9 @@
     "y": {"field": "Miles_per_Gallon", "type": "quantitative"},
     "size": {
       "condition": {
-        "selection": "paintbrush", "value": 300
+        "selection": "paintbrush",
+        "empty": false,
+        "value": 300
       },
       "value": 50
     }
diff --git a/examples/specs/normalized/airport_connections_normalized.vl.json b/examples/specs/normalized/airport_connections_normalized.vl.json
index 27b5a51b41..735cd34c2c 100644
--- a/examples/specs/normalized/airport_connections_normalized.vl.json
+++ b/examples/specs/normalized/airport_connections_normalized.vl.json
@@ -19,7 +19,7 @@
       "mark": {"type": "rule", "color": "#000", "opacity": 0.35},
       "data": {"url": "data/flights-airport.csv"},
       "transform": [
-        {"filter": {"selection": "org"}},
+        {"filter": {"selection": "org", "empty": false}},
         {
           "lookup": "origin",
           "from": {
@@ -68,8 +68,7 @@
             "type": "point",
             "on": "mouseover",
             "nearest": true,
-            "fields": ["origin"],
-            "empty": "none"
+            "fields": ["origin"]
           }
         }
       ],
diff --git a/examples/specs/normalized/concat_hover_filter_normalized.vl.json b/examples/specs/normalized/concat_hover_filter_normalized.vl.json
index 31de068baa..743efe2070 100644
--- a/examples/specs/normalized/concat_hover_filter_normalized.vl.json
+++ b/examples/specs/normalized/concat_hover_filter_normalized.vl.json
@@ -7,10 +7,7 @@
       "layer": [
         {
           "params": [
-            {
-              "name": "hover",
-              "select": {"type": "point", "on": "mouseover", "empty": "none"}
-            }
+            {"name": "hover", "select": {"type": "point", "on": "mouseover"}}
           ],
           "mark": "point",
           "encoding": {
@@ -20,7 +17,7 @@
         },
         {
           "mark": {"type": "point", "color": "goldenrod"},
-          "transform": [{"filter": {"selection": "hover"}}],
+          "transform": [{"filter": {"selection": "hover", "empty": false}}],
           "encoding": {
             "x": {"field": "Horsepower", "type": "quantitative"},
             "y": {"field": "Miles_per_Gallon", "type": "quantitative"}
@@ -32,10 +29,7 @@
       "layer": [
         {
           "params": [
-            {
-              "name": "hover",
-              "select": {"type": "point", "on": "mouseover", "empty": "none"}
-            }
+            {"name": "hover", "select": {"type": "point", "on": "mouseover"}}
           ],
           "mark": "point",
           "encoding": {
@@ -45,7 +39,7 @@
         },
         {
           "mark": {"type": "point", "color": "goldenrod"},
-          "transform": [{"filter": {"selection": "hover"}}],
+          "transform": [{"filter": {"selection": "hover", "empty": false}}],
           "encoding": {
             "x": {"field": "Horsepower", "type": "quantitative"},
             "y": {"field": "Acceleration", "type": "quantitative"}
diff --git a/examples/specs/normalized/interactive_global_development_normalized.vl.json b/examples/specs/normalized/interactive_global_development_normalized.vl.json
index a53ce92ce2..ab0903f7af 100644
--- a/examples/specs/normalized/interactive_global_development_normalized.vl.json
+++ b/examples/specs/normalized/interactive_global_development_normalized.vl.json
@@ -65,7 +65,10 @@
             "opacity": {
               "condition": {
                 "test": {
-                  "or": [{"selection": "hovered"}, {"selection": "clicked"}]
+                  "or": [
+                    {"selection": "hovered", "empty": false},
+                    {"selection": "clicked", "empty": false}
+                  ]
                 },
                 "value": 0.8
               },
@@ -92,17 +95,13 @@
               "select": {
                 "type": "point",
                 "fields": ["country"],
-                "on": "mouseover",
-                "empty": "none"
+                "toggle": false,
+                "on": "mouseover"
               }
             },
             {
               "name": "clicked",
-              "select": {
-                "type": "point",
-                "fields": ["country"],
-                "empty": "none"
-              }
+              "select": {"type": "point", "fields": ["country"]}
             }
           ],
           "transform": [{"filter": {"selection": "year"}}],
@@ -129,7 +128,12 @@
               "filter": {
                 "and": [
                   {"selection": "year"},
-                  {"or": [{"selection": "clicked"}, {"selection": "hovered"}]}
+                  {
+                    "or": [
+                      {"selection": "clicked", "empty": false},
+                      {"selection": "hovered", "empty": false}
+                    ]
+                  }
                 ]
               }
             }
@@ -159,7 +163,7 @@
         },
         {
           "transform": [
-            {"filter": {"selection": "hovered"}},
+            {"filter": {"selection": "hovered", "empty": false}},
             {"filter": {"not": {"selection": "year"}}}
           ],
           "layer": [
diff --git a/examples/specs/normalized/interactive_line_hover_normalized.vl.json b/examples/specs/normalized/interactive_line_hover_normalized.vl.json
index 7b7f0ed7b7..96ac2235fa 100644
--- a/examples/specs/normalized/interactive_line_hover_normalized.vl.json
+++ b/examples/specs/normalized/interactive_line_hover_normalized.vl.json
@@ -10,12 +10,7 @@
         {
           "name": "hover",
           "value": [{"symbol": "AAPL"}],
-          "select": {
-            "type": "point",
-            "fields": ["symbol"],
-            "on": "mouseover",
-            "empty": "all"
-          }
+          "select": {"type": "point", "fields": ["symbol"], "on": "mouseover"}
         }
       ],
       "mark": {"type": "line", "strokeWidth": 8, "stroke": "transparent"},
diff --git a/examples/specs/normalized/interactive_multi_line_label_normalized.vl.json b/examples/specs/normalized/interactive_multi_line_label_normalized.vl.json
index 9f059e5ada..17d8a6b311 100644
--- a/examples/specs/normalized/interactive_multi_line_label_normalized.vl.json
+++ b/examples/specs/normalized/interactive_multi_line_label_normalized.vl.json
@@ -22,8 +22,7 @@
                 "type": "point",
                 "encodings": ["x"],
                 "nearest": true,
-                "on": "mouseover",
-                "empty": "none"
+                "on": "mouseover"
               }
             }
           ],
@@ -33,7 +32,7 @@
             "y": {"field": "price", "type": "quantitative"},
             "color": {"field": "symbol", "type": "nominal"},
             "opacity": {
-              "condition": {"selection": "label", "value": 1},
+              "condition": {"selection": "label", "empty": false, "value": 1},
               "value": 0
             }
           }
@@ -41,7 +40,7 @@
       ]
     },
     {
-      "transform": [{"filter": {"selection": "label"}}],
+      "transform": [{"filter": {"selection": "label", "empty": false}}],
       "layer": [
         {
           "mark": {"type": "rule", "color": "gray"},
diff --git a/examples/specs/normalized/interactive_multi_line_pivot_tooltip_normalized.vl.json b/examples/specs/normalized/interactive_multi_line_pivot_tooltip_normalized.vl.json
index 6cbd54cb7e..aafb639051 100644
--- a/examples/specs/normalized/interactive_multi_line_pivot_tooltip_normalized.vl.json
+++ b/examples/specs/normalized/interactive_multi_line_pivot_tooltip_normalized.vl.json
@@ -15,7 +15,7 @@
           }
         },
         {
-          "transform": [{"filter": {"selection": "hover"}}],
+          "transform": [{"filter": {"selection": "hover", "empty": false}}],
           "mark": "point",
           "encoding": {
             "x": {"field": "date", "type": "temporal"},
@@ -31,7 +31,7 @@
       "encoding": {
         "x": {"field": "date", "type": "temporal"},
         "opacity": {
-          "condition": {"value": 0.3, "selection": "hover"},
+          "condition": {"value": 0.3, "selection": "hover", "empty": false},
           "value": 0
         },
         "tooltip": [
@@ -50,7 +50,6 @@
             "fields": ["date"],
             "nearest": true,
             "on": "mouseover",
-            "empty": "none",
             "clear": "mouseout"
           }
         }
diff --git a/examples/specs/normalized/interactive_multi_line_tooltip_normalized.vl.json b/examples/specs/normalized/interactive_multi_line_tooltip_normalized.vl.json
index ca66d378ad..a7b5df69ce 100644
--- a/examples/specs/normalized/interactive_multi_line_tooltip_normalized.vl.json
+++ b/examples/specs/normalized/interactive_multi_line_tooltip_normalized.vl.json
@@ -29,10 +29,7 @@
     {
       "mark": "rule",
       "params": [
-        {
-          "name": "hover",
-          "select": {"type": "point", "on": "mouseover", "empty": "none"}
-        }
+        {"name": "hover", "select": {"type": "point", "on": "mouseover"}}
       ],
       "encoding": {
         "x": {"timeUnit": "yearmonthdate", "field": "date"},
@@ -42,7 +39,8 @@
           {"field": "temp_min", "type": "quantitative"}
         ],
         "color": {
-          "condition": {"selection": {"not": "hover"}, "value": "transparent"}
+          "condition": {"selection": "hover", "empty": false, "value": "black"},
+          "value": "transparent"
         }
       }
     }
diff --git a/examples/specs/selection_composition_and.vl.json b/examples/specs/selection_composition_and.vl.json
index 769529973c..d28586ee3e 100644
--- a/examples/specs/selection_composition_and.vl.json
+++ b/examples/specs/selection_composition_and.vl.json
@@ -26,7 +26,10 @@
     "x": {"field": "Cylinders", "type": "ordinal"},
     "color": {
       "condition": {
-        "selection": {"and": ["alex", "morgan"]},
+        "test": {"and": [
+          {"selection": "alex"},
+          {"selection": "morgan"}
+        ]},
         "aggregate": "count"
       },
       "value": "grey"
diff --git a/examples/specs/selection_composition_or.vl.json b/examples/specs/selection_composition_or.vl.json
index cd7fec5e2b..4e3dc28f89 100644
--- a/examples/specs/selection_composition_or.vl.json
+++ b/examples/specs/selection_composition_or.vl.json
@@ -26,7 +26,10 @@
     "x": {"field": "Cylinders", "type": "ordinal"},
     "color": {
       "condition": {
-        "selection": {"or": ["alex", "morgan"]},
+        "test": {"or": [
+          {"selection": "alex"},
+          {"selection": "morgan"}
+        ]},
         "aggregate": "count"
       },
       "value": "grey"
diff --git a/examples/specs/selection_heatmap.vl.json b/examples/specs/selection_heatmap.vl.json
index 6e6889bcea..cdfbf69017 100644
--- a/examples/specs/selection_heatmap.vl.json
+++ b/examples/specs/selection_heatmap.vl.json
@@ -29,7 +29,11 @@
       "type": "quantitative"
     },
     "stroke": {
-      "condition": {"test": {"and": [{"selection": "highlight"}, "length(data(\"highlight_store\"))"]}, "value": "black"},
+      "condition": {
+        "selection": "highlight",
+        "empty": false,
+        "value": "black"
+      },
       "value": null
     },
     "opacity": {
diff --git a/examples/specs/selection_type_interval_invert.vl.json b/examples/specs/selection_type_interval_invert.vl.json
index bb11745487..3c0f97ec24 100644
--- a/examples/specs/selection_type_interval_invert.vl.json
+++ b/examples/specs/selection_type_interval_invert.vl.json
@@ -8,7 +8,7 @@
     "x": {"field": "Cylinders"},
     "color": {
       "condition": {
-        "selection": {"not": "pts"},
+        "test": {"not": {"selection": "pts"}},
         "value": "grey"
       },
       "aggregate": "count"
diff --git a/examples/specs/vconcat_flatten.vl.json b/examples/specs/vconcat_flatten.vl.json
index 12eb09c2be..32845d37b6 100644
--- a/examples/specs/vconcat_flatten.vl.json
+++ b/examples/specs/vconcat_flatten.vl.json
@@ -32,7 +32,7 @@
       "mark": "circle",
       "params": [{
         "name": "pts",
-        "select": {"type": "point", "fields": ["id"], "empty": "all"}
+        "select": {"type": "point", "fields": ["id"]}
       }],
       "encoding": {
         "x": {"field": "ra", "type": "quantitative", "scale": {"zero": false}},
diff --git a/site/docs/encoding/condition.md b/site/docs/encoding/condition.md
index d668308b8d..59f1cd8fa8 100644
--- a/site/docs/encoding/condition.md
+++ b/site/docs/encoding/condition.md
@@ -127,7 +127,7 @@ For example, in the visualization below, a conditional value definition causes m
 
 <div class="vl-example" data-name="interactive_paintbrush_interval"></div>
 
-A field mapping can also be specified as the else (outer) branch. For example, below, we invert our original example: a conditional value definition sets the `rect` marks to grey when they do _not_ lie within the selection, and a regular field mapping is used otherwise. Notice, all marks are initially colored grey. This is because empty selections are treated as containing all data values.
+A field mapping can also be specified as the else (outer) branch. For example, below, we invert our original example: a conditional value definition sets the `rect` marks to grey when they do _not_ lie within the selection, and a regular field mapping is used otherwise. Notice, no marks are initially colored grey. This is because empty selections are treated as containing all data values.
 
 <div class="vl-example" data-name="selection_type_interval_invert"></div>
 
diff --git a/src/channeldef.ts b/src/channeldef.ts
index e8b7ee15d7..7b28f68e1c 100644
--- a/src/channeldef.ts
+++ b/src/channeldef.ts
@@ -57,7 +57,7 @@ import {Legend} from './legend';
 import * as log from './log';
 import {LogicalComposition} from './logical';
 import {isRectBasedMark, Mark, MarkDef} from './mark';
-import {Predicate} from './predicate';
+import {Predicate, SelectionPredicate} from './predicate';
 import {Scale, SCALE_CATEGORY_INDEX} from './scale';
 import {isSortByChannel, Sort, SortOrder} from './sort';
 import {isFacetFieldDef} from './spec/facet';
@@ -146,12 +146,9 @@ export type ConditionalPredicate<CD extends FieldDef<any> | DatumDef | ValueDef<
   test: LogicalComposition<Predicate>;
 } & CD;
 
-export type ConditionalSelection<CD extends FieldDef<any> | DatumDef | ValueDef<any> | ExprRef | SignalRef> = {
-  /**
-   * A [selection name](https://vega.github.io/vega-lite/docs/selection.html), or a series of [composed selections](https://vega.github.io/vega-lite/docs/selection.html#compose).
-   */
-  selection: LogicalComposition<string>;
-} & CD;
+export type ConditionalSelection<
+  CD extends FieldDef<any> | DatumDef | ValueDef<any> | ExprRef | SignalRef
+> = SelectionPredicate & CD;
 
 export function isConditionalSelection<T>(c: Conditional<T>): c is ConditionalSelection<T> {
   return c['selection'];
diff --git a/src/compile/mark/encode/conditional.ts b/src/compile/mark/encode/conditional.ts
index aba8fc42cd..660875af18 100644
--- a/src/compile/mark/encode/conditional.ts
+++ b/src/compile/mark/encode/conditional.ts
@@ -1,11 +1,5 @@
 import {array} from 'vega-util';
-import {
-  ChannelDef,
-  ConditionalPredicate,
-  ConditionalSelection,
-  isConditionalDef,
-  isConditionalSelection
-} from '../../../channeldef';
+import {ChannelDef, ConditionalPredicate, isConditionalDef, isConditionalSelection} from '../../../channeldef';
 import {GuideEncodingConditionalValueDef} from '../../../guide';
 import {VgEncodeEntry, VgValueRef} from '../../../vega.schema';
 import {expression} from '../../predicate';
@@ -28,13 +22,14 @@ export function wrapCondition<CD extends ChannelDef | GuideEncodingConditionalVa
     const conditions = array(condition);
     const vgConditions = conditions.map(c => {
       const conditionValueRef = refFn(c);
-      const test = isConditionalSelection<any>(c)
-        ? parseSelectionPredicate(model, (c as ConditionalSelection<any>).selection) // FIXME: remove casting once TS is no longer dumb about it
-        : expression(model, (c as ConditionalPredicate<any>).test); // FIXME: remove casting once TS is no longer dumb about it
-      return {
-        test,
-        ...conditionValueRef
-      };
+      if (isConditionalSelection<any>(c)) {
+        const {selection, empty} = c;
+        const test = parseSelectionPredicate(model, {selection, empty});
+        return {test, ...conditionValueRef};
+      } else {
+        const test = expression(model, (c as ConditionalPredicate<any>).test); // FIXME: remove casting once TS is no longer dumb about it
+        return {test, ...conditionValueRef};
+      }
     });
     return {
       [vgChannel]: [...vgConditions, ...(valueRef !== undefined ? [valueRef] : [])]
diff --git a/src/compile/predicate.ts b/src/compile/predicate.ts
index cd84a269ea..75335af3bd 100644
--- a/src/compile/predicate.ts
+++ b/src/compile/predicate.ts
@@ -15,7 +15,7 @@ export function expression(model: Model, filterOp: LogicalComposition<Predicate>
     if (isString(predicate)) {
       return predicate;
     } else if (isSelectionPredicate(predicate)) {
-      return parseSelectionPredicate(model, predicate.selection, node);
+      return parseSelectionPredicate(model, predicate, node);
     } else {
       // Filter Object
       return fieldFilterExpression(predicate);
diff --git a/src/compile/selection/index.ts b/src/compile/selection/index.ts
index 68c023d902..84944eaae5 100644
--- a/src/compile/selection/index.ts
+++ b/src/compile/selection/index.ts
@@ -44,7 +44,6 @@ export interface SelectionComponent<T extends SelectionType = SelectionType> {
   materialized: OutputNode;
   bind?: 'scales' | Binding | Dict<Binding> | LegendBinding;
   resolve: SelectionResolution;
-  empty: 'all' | 'none';
   mark?: BrushConfig;
 
   // Transforms
diff --git a/src/compile/selection/parse.ts b/src/compile/selection/parse.ts
index a7f4f29ed6..db5f44df65 100644
--- a/src/compile/selection/parse.ts
+++ b/src/compile/selection/parse.ts
@@ -2,14 +2,14 @@ import {selector as parseSelector} from 'vega-event-selector';
 import {array, isObject, isString, stringValue} from 'vega-util';
 import {selectionCompilers, SelectionComponent, STORE} from '.';
 import {warn} from '../../log';
-import {LogicalComposition} from '../../logical';
 import {BaseSelectionConfig, SelectionDef, SelectionExtent} from '../../selection';
-import {Dict, duplicate, entries, logicalExpr, replacePathInField, varName} from '../../util';
+import {Dict, duplicate, entries, replacePathInField, varName} from '../../util';
 import {DataFlowNode, OutputNode} from '../data/dataflow';
 import {FilterNode} from '../data/filter';
 import {Model} from '../model';
 import {UnitModel} from '../unit';
 import {DataSourceType} from '../../data';
+import {SelectionPredicate} from '../../predicate';
 
 export function parseUnitSelection(model: UnitModel, selDefs: SelectionDef[]) {
   const selCmpts: Dict<SelectionComponent<any /* this has to be "any" so typing won't fail in test files*/>> = {};
@@ -59,39 +59,30 @@ export function parseUnitSelection(model: UnitModel, selDefs: SelectionDef[]) {
 
 export function parseSelectionPredicate(
   model: Model,
-  selections: LogicalComposition<string>,
+  pred: SelectionPredicate,
   dfnode?: DataFlowNode,
   datum = 'datum'
 ): string {
-  const stores: string[] = [];
-  function expr(name: string): string {
-    const vname = varName(name);
-    const selCmpt = model.getSelectionComponent(vname, name);
-    const store = stringValue(vname + STORE);
-
-    if (selCmpt.project.timeUnit) {
-      const child = dfnode ?? model.component.data.raw;
-      const tunode = selCmpt.project.timeUnit.clone();
-      if (child.parent) {
-        tunode.insertAsParentOf(child);
-      } else {
-        child.parent = tunode;
-      }
-    }
-
-    if (selCmpt.empty !== 'none') {
-      stores.push(store);
+  const name = isString(pred) ? pred : pred.selection;
+  const vname = varName(name);
+  const selCmpt = model.getSelectionComponent(vname, name);
+  const store = stringValue(vname + STORE);
+
+  if (selCmpt.project.timeUnit) {
+    const child = dfnode ?? model.component.data.raw;
+    const tunode = selCmpt.project.timeUnit.clone();
+    if (child.parent) {
+      tunode.insertAsParentOf(child);
+    } else {
+      child.parent = tunode;
     }
-
-    return (
-      `vlSelectionTest(${store}, ${datum}` + (selCmpt.resolve === 'global' ? ')' : `, ${stringValue(selCmpt.resolve)})`)
-    );
   }
 
-  const predicateStr = logicalExpr(selections, expr);
-  return (
-    (stores.length ? '!(' + stores.map(s => `length(data(${s}))`).join(' || ') + ') || ' : '') + `(${predicateStr})`
-  );
+  const test =
+    `vlSelectionTest(${store}, ${datum}` + (selCmpt.resolve === 'global' ? ')' : `, ${stringValue(selCmpt.resolve)})`);
+  const length = `length(data(${store}))`;
+
+  return pred.empty === false ? `${length} && ${test}` : `!${length} || ${test}`;
 }
 
 export function parseSelectionExtent(selCmpt: SelectionComponent, extent: SelectionExtent) {
diff --git a/src/predicate.ts b/src/predicate.ts
index 7055d431b4..988805f791 100644
--- a/src/predicate.ts
+++ b/src/predicate.ts
@@ -35,9 +35,14 @@ export type FieldPredicate =
 
 export interface SelectionPredicate {
   /**
-   * Filter using a selection name or a logical composition of selection names.
+   * Filter using a selection name.
    */
-  selection: LogicalComposition<string>;
+  selection: string;
+  /**
+   * By default, the predicate of empty selections returns true.
+   * Override this behavior, by setting this property `empty: false`.
+   */
+  empty?: boolean;
 }
 
 export function isSelectionPredicate(predicate: LogicalComposition<Predicate>): predicate is SelectionPredicate {
diff --git a/src/selection.ts b/src/selection.ts
index a21376fe02..c508a54727 100644
--- a/src/selection.ts
+++ b/src/selection.ts
@@ -62,12 +62,6 @@ export interface BaseSelectionConfig {
    * __See also:__ [`fields`](https://vega.github.io/vega-lite/docs/project.html) documentation.
    */
   fields?: FieldName[];
-
-  /**
-   * By default, `all` data values are considered to lie within an empty selection.
-   * When set to `none`, empty selections contain no data values.
-   */
-  empty?: 'all' | 'none';
 }
 
 export interface PointSelectionConfig extends BaseSelectionConfig {
@@ -277,7 +271,6 @@ export const defaultConfig: SelectionConfig = {
     fields: [SELECTION_ID],
     toggle: 'event.shiftKey',
     resolve: 'global',
-    empty: 'all',
     clear: 'dblclick'
   },
   interval: {
diff --git a/test/compile/selection/parse.test.ts b/test/compile/selection/parse.test.ts
index 5e61ee6160..2faee16c04 100644
--- a/test/compile/selection/parse.test.ts
+++ b/test/compile/selection/parse.test.ts
@@ -347,7 +347,7 @@ describe('Selection', () => {
           transform: [
             {
               type: 'filter',
-              expr: '!(length(data("index_store"))) || (vlSelectionTest("index_store", datum))'
+              expr: '!length(data("index_store")) || vlSelectionTest("index_store", datum)'
             }
           ]
         },
diff --git a/test/compile/selection/predicate.test.ts b/test/compile/selection/predicate.test.ts
index ec8e1ccd4b..6189e288de 100644
--- a/test/compile/selection/predicate.test.ts
+++ b/test/compile/selection/predicate.test.ts
@@ -21,7 +21,8 @@ describe('Selection Predicate', () => {
         field: 'Acceleration',
         type: 'quantitative',
         condition: {
-          selection: {or: ['one', {and: ['two', {not: 'thr-ee'}]}]},
+          selection: 'one',
+          empty: false,
           value: 0.5
         }
       }
@@ -33,50 +34,34 @@ describe('Selection Predicate', () => {
   model.component.selection = parseUnitSelection(model, [
     {name: 'one', select: 'point'},
     {name: 'two', select: {type: 'point', resolve: 'union'}},
-    {name: 'thr-ee', select: {type: 'interval', resolve: 'intersect'}},
-    {name: 'four', select: {type: 'point', empty: 'none'}}
+    {name: 'thr-ee', select: {type: 'interval', resolve: 'intersect'}}
   ]);
 
   it('generates the predicate expression', () => {
-    expect(predicate(model, 'one')).toBe('!(length(data("one_store"))) || (vlSelectionTest("one_store", datum))');
-
-    expect(predicate(model, 'four')).toBe('(vlSelectionTest("four_store", datum))');
-
-    expect(predicate(model, {not: 'one'})).toEqual(
-      '!(length(data("one_store"))) || (!(vlSelectionTest("one_store", datum)))'
+    // Different resolutions
+    expect(predicate(model, {selection: 'one'})).toBe(
+      '!length(data("one_store")) || vlSelectionTest("one_store", datum)'
     );
-
-    expect(predicate(model, {not: {and: ['one', 'two']}})).toEqual(
-      '!(length(data("one_store")) || length(data("two_store"))) || ' +
-        '(!((vlSelectionTest("one_store", datum)) && ' +
-        '(vlSelectionTest("two_store", datum, "union"))))'
+    expect(predicate(model, {selection: 'two'})).toBe(
+      '!length(data("two_store")) || vlSelectionTest("two_store", datum, "union")'
     );
-
-    expect(predicate(model, {not: {and: ['one', 'four']}})).toEqual(
-      '!(length(data("one_store"))) || ' +
-        '(!((vlSelectionTest("one_store", datum)) && ' +
-        '(vlSelectionTest("four_store", datum))))'
+    expect(predicate(model, {selection: 'thr-ee'})).toBe(
+      '!length(data("thr_ee_store")) || vlSelectionTest("thr_ee_store", datum, "intersect")'
     );
 
-    expect(predicate(model, {and: ['one', 'two', {not: 'thr-ee'}]})).toEqual(
-      '!(length(data("one_store")) || length(data("two_store")) || length(data("thr_ee_store"))) || ' +
-        '((vlSelectionTest("one_store", datum)) && ' +
-        '(vlSelectionTest("two_store", datum, "union")) && ' +
-        '(!(vlSelectionTest("thr_ee_store", datum, "intersect"))))'
+    // Different emptiness
+    expect(predicate(model, {selection: 'one', empty: true})).toBe(
+      '!length(data("one_store")) || vlSelectionTest("one_store", datum)'
     );
-
-    expect(predicate(model, {or: ['one', {and: ['two', {not: 'thr-ee'}]}]})).toEqual(
-      '!(length(data("one_store")) || length(data("two_store")) || length(data("thr_ee_store"))) || ' +
-        '((vlSelectionTest("one_store", datum)) || ' +
-        '((vlSelectionTest("two_store", datum, "union")) && ' +
-        '(!(vlSelectionTest("thr_ee_store", datum, "intersect")))))'
+    expect(predicate(model, {selection: 'one', empty: false})).toBe(
+      'length(data("one_store")) && vlSelectionTest("one_store", datum)'
     );
   });
 
   it('generates Vega production rules', () => {
     expect(nonPosition('color', model, {vgChannel: 'fill'})).toEqual({
       fill: [
-        {test: '!(length(data("one_store"))) || (vlSelectionTest("one_store", datum))', value: 'grey'},
+        {test: '!length(data("one_store")) || vlSelectionTest("one_store", datum)', value: 'grey'},
         {scale: 'color', field: 'Cylinders'}
       ]
     });
@@ -84,11 +69,7 @@ describe('Selection Predicate', () => {
     expect(nonPosition('opacity', model)).toEqual({
       opacity: [
         {
-          test:
-            '!(length(data("one_store")) || length(data("two_store")) || length(data("thr_ee_store"))) || ' +
-            '((vlSelectionTest("one_store", datum)) || ' +
-            '((vlSelectionTest("two_store", datum, "union")) && ' +
-            '(!(vlSelectionTest("thr_ee_store", datum, "intersect")))))',
+          test: 'length(data("one_store")) && vlSelectionTest("one_store", datum)',
           value: 0.5
         },
         {scale: 'opacity', field: 'Acceleration'}
@@ -98,35 +79,15 @@ describe('Selection Predicate', () => {
 
   it('generates a selection filter', () => {
     expect(expression(model, {selection: 'one'})).toEqual(
-      '!(length(data("one_store"))) || (vlSelectionTest("one_store", datum))'
-    );
-
-    expect(expression(model, {selection: {not: 'one'}})).toEqual(
-      '!(length(data("one_store"))) || (!(vlSelectionTest("one_store", datum)))'
-    );
-
-    expect(expression(model, {selection: {not: {and: ['one', 'two']}}})).toEqual(
-      '!(length(data("one_store")) || length(data("two_store"))) || ' +
-        '(!((vlSelectionTest("one_store", datum)) && ' +
-        '(vlSelectionTest("two_store", datum, "union"))))'
-    );
-
-    expect(expression(model, {selection: {and: ['one', 'two', {not: 'thr-ee'}]}})).toEqual(
-      '!(length(data("one_store")) || length(data("two_store")) || length(data("thr_ee_store"))) || ' +
-        '((vlSelectionTest("one_store", datum)) && ' +
-        '(vlSelectionTest("two_store", datum, "union")) && ' +
-        '(!(vlSelectionTest("thr_ee_store", datum, "intersect"))))'
+      '!length(data("one_store")) || vlSelectionTest("one_store", datum)'
     );
 
-    expect(expression(model, {selection: {or: ['one', {and: ['two', {not: 'thr-ee'}]}]}})).toEqual(
-      '!(length(data("one_store")) || length(data("two_store")) || length(data("thr_ee_store"))) || ' +
-        '((vlSelectionTest("one_store", datum)) || ' +
-        '((vlSelectionTest("two_store", datum, "union")) && ' +
-        '(!(vlSelectionTest("thr_ee_store", datum, "intersect")))))'
+    expect(expression(model, {not: {selection: 'one', empty: false}})).toEqual(
+      '!(length(data("one_store")) && vlSelectionTest("one_store", datum))'
     );
   });
 
   it('throws an error for unknown selections', () => {
-    expect(() => predicate(model, 'helloworld')).toThrow();
+    expect(() => predicate(model, {selection: 'helloworld'})).toThrow();
   });
 });