Support field in condition

examples/specs/brush.vl.json

@@ -12,8 +12,8 @@
     "x": {"field": "Horsepower", "type": "quantitative"},
     "y": {"field": "Miles_per_Gallon", "type": "quantitative"},
     "color": {
-      "condition": {"selection": {"not": "brush"}, "value": "grey"},
-      "field": "Cylinders", "type": "ordinal"
+      "condition": {"selection": "brush", "field": "Cylinders", "type": "ordinal"},
+      "value": "grey"
     }
   }
 }

examples/specs/interactive_splom.vl.json

@@ -31,10 +31,11 @@
         "type": "quantitative"
       },
       "color": {
-        "field": "Origin","type": "nominal",
         "condition": {
-          "selection": {"not": "brush"}, "value": "grey"
-        }
+          "selection": "brush",
+          "field": "Origin","type": "nominal"
+        },
+        "value": "grey"
       }
     }
   }

examples/specs/layered_selections.vl.json

@@ -36,8 +36,8 @@
       "x": {"field": "Horsepower", "type": "quantitative"},
       "y": {"field": "Miles_per_Gallon", "type": "quantitative"},
       "color": {
-        "condition": {"selection": {"not": "brush"}, "value": "grey"},
-        "field": "Cylinders", "type": "ordinal"
+        "condition": {"selection": "brush", "field": "Cylinders", "type": "ordinal"},
+        "value": "grey"
       },
       "size": {
         "value": 50,

examples/specs/query_widgets.vl.json

@@ -18,8 +18,8 @@
       "x": {"field": "Horsepower", "type": "quantitative"},
       "y": {"field": "Miles_per_Gallon", "type": "quantitative"},
       "color": {
-        "field": "Origin", "type": "nominal",
-        "condition": {"selection": {"not": "CylYr"}, "value": "grey"}
+        "condition": {"selection": "CylYr", "field": "Origin", "type": "nominal"},
+        "value": "grey"
       }
     }
   }, {

examples/vg-specs/brush.vg.json

@@ -344,12 +344,12 @@
                     },
                     "stroke": [
                         {
-                            "test": "!(vlInterval(\"brush_store\", \"\", datum, \"union\", \"all\"))",
-                            "value": "grey"
-                        },
-                        {
+                            "test": "vlInterval(\"brush_store\", \"\", datum, \"union\", \"all\")",
                             "scale": "color",
                             "field": "Cylinders"
+                        },
+                        {
+                            "value": "grey"
                         }
                     ],
                     "fill": {

examples/vg-specs/interactive_splom.vg.json

@@ -505,12 +505,12 @@
                             },
                             "stroke": [
                                 {
-                                    "test": "!(vlInterval(\"brush_store\", \"child_Horsepower_Horsepower_\", datum, \"union\", \"all\"))",
-                                    "value": "grey"
-                                },
-                                {
+                                    "test": "vlInterval(\"brush_store\", \"child_Horsepower_Horsepower_\", datum, \"union\", \"all\")",
                                     "scale": "color",
                                     "field": "Origin"
+                                },
+                                {
+                                    "value": "grey"
                                 }
                             ],
                             "fill": {
@@ -1063,12 +1063,12 @@
                             },
                             "stroke": [
                                 {
-                                    "test": "!(vlInterval(\"brush_store\", \"child_Horsepower_Miles_per_Gallon_\", datum, \"union\", \"all\"))",
-                                    "value": "grey"
-                                },
-                                {
+                                    "test": "vlInterval(\"brush_store\", \"child_Horsepower_Miles_per_Gallon_\", datum, \"union\", \"all\")",
                                     "scale": "color",
                                     "field": "Origin"
+                                },
+                                {
+                                    "value": "grey"
                                 }
                             ],
                             "fill": {
@@ -1622,12 +1622,12 @@
                             },
                             "stroke": [
                                 {
-                                    "test": "!(vlInterval(\"brush_store\", \"child_Acceleration_Horsepower_\", datum, \"union\", \"all\"))",
-                                    "value": "grey"
-                                },
-                                {
+                                    "test": "vlInterval(\"brush_store\", \"child_Acceleration_Horsepower_\", datum, \"union\", \"all\")",
                                     "scale": "color",
                                     "field": "Origin"
+                                },
+                                {
+                                    "value": "grey"
                                 }
                             ],
                             "fill": {
@@ -2181,12 +2181,12 @@
                             },
                             "stroke": [
                                 {
-                                    "test": "!(vlInterval(\"brush_store\", \"child_Acceleration_Miles_per_Gallon_\", datum, \"union\", \"all\"))",
-                                    "value": "grey"
-                                },
-                                {
+                                    "test": "vlInterval(\"brush_store\", \"child_Acceleration_Miles_per_Gallon_\", datum, \"union\", \"all\")",
                                     "scale": "color",
                                     "field": "Origin"
+                                },
+                                {
+                                    "value": "grey"
                                 }
                             ],
                             "fill": {

examples/vg-specs/layered_selections.vg.json

@@ -616,12 +616,12 @@
                     },
                     "fill": [
                         {
-                            "test": "!(vlInterval(\"brush_store\", \"layer_1_\", datum, \"union\", \"all\"))",
-                            "value": "grey"
-                        },
-                        {
+                            "test": "vlInterval(\"brush_store\", \"layer_1_\", datum, \"union\", \"all\")",
                             "scale": "color",
                             "field": "Cylinders"
+                        },
+                        {
+                            "value": "grey"
                         }
                     ],
                     "size": [

examples/vg-specs/query_widgets.vg.json

@@ -190,12 +190,12 @@
                     },
                     "fill": [
                         {
-                            "test": "!(vlPoint(\"CylYr_store\", \"layer_0_\", datum, \"union\", \"all\"))",
-                            "value": "grey"
-                        },
-                        {
+                            "test": "vlPoint(\"CylYr_store\", \"layer_0_\", datum, \"union\", \"all\")",
                             "scale": "color",
                             "field": "Origin"
+                        },
+                        {
+                            "value": "grey"
                         }
                     ],
                     "shape": {

src/channel.ts

@@ -55,6 +55,13 @@ export const TOOLTIP = Channel.TOOLTIP;
 export const CHANNELS = [X, Y, X2, Y2, ROW, COLUMN, SIZE, SHAPE, COLOR, ORDER, OPACITY, TEXT, DETAIL, TOOLTIP];
 const CHANNEL_INDEX = toSet(CHANNELS);
 
+export const SINGLE_DEF_CHANNELS = [X, Y, X2, Y2, ROW, COLUMN, SIZE, SHAPE, COLOR, OPACITY, TEXT, TOOLTIP];
+
+// export type SingleDefChannel = typeof SINGLE_DEF_CHANNELS[0];
+// FIXME somehow the typeof above leads to the following error when running npm run schema
+// UnknownNodeError: Unknown node "SingleDefChannel" (ts.SyntaxKind = 171) at /Users/kanitw/Documents/_code/_idl/_visrec/vega-lite/src/selection.ts(17,14)
+export type SingleDefChannel = 'x' | 'y' | 'x2' | 'y2' | 'row' | 'column' | 'size' | 'shape' | 'color' | 'opacity' | 'text' | 'tooltip';
+
 export function isChannel(str: string): str is Channel {
   return !!CHANNEL_INDEX[str];
 }

src/compile/axis/encode.ts

@@ -1,4 +1,4 @@
-import {Channel, X} from '../../channel';
+import {Channel, SpatialScaleChannel, X} from '../../channel';
 import {NOMINAL, ORDINAL, TEMPORAL} from '../../type';
 import {contains, extend, keys} from '../../util';
 import {VgAxis} from '../../vega.schema';
@@ -7,8 +7,13 @@ import {ScaleType} from '../../scale';
 import {timeFormatExpression} from '../common';
 import {UnitModel} from '../unit';
 
-export function labels(model: UnitModel, channel: Channel, labelsSpec: any, def: VgAxis) {
-  const fieldDef = model.fieldDef(channel);
+export function labels(model: UnitModel, channel: SpatialScaleChannel, labelsSpec: any, def: VgAxis) {
+  const fieldDef = model.fieldDef(channel) ||
+    (
+      channel === 'x' ? model.fieldDef('x2') :
+      channel === 'y' ? model.fieldDef('y2') :
+      undefined
+    );
   const axis = model.axis(channel);
   const config = model.config;
 

src/compile/axis/parse.ts

@@ -1,5 +1,5 @@
 import {Axis, AXIS_PROPERTIES} from '../../axis';
-import {Channel} from '../../channel';
+import {Channel, SpatialScaleChannel} from '../../channel';
 import {VgAxis} from '../../vega.schema';
 
 import * as encode from './encode';
@@ -12,7 +12,7 @@ import {AxisComponent, AxisComponentIndex} from './component';
 type AxisPart = 'domain' | 'grid' | 'labels' | 'ticks' | 'title';
 const AXIS_PARTS: AxisPart[] = ['domain', 'grid', 'labels', 'ticks', 'title'];
 
-export function parseAxisComponent(model: UnitModel, axisChannels: Channel[]): AxisComponentIndex {
+export function parseAxisComponent(model: UnitModel, axisChannels: SpatialScaleChannel[]): AxisComponentIndex {
   return axisChannels.reduce(function(axis, channel) {
     const axisComponent: AxisComponent = {axes:[], gridAxes: []};
     if (model.axis(channel)) {
@@ -58,16 +58,16 @@ function hasAxisPart(axis: VgAxis, part: AxisPart) {
 /**
  * Make an inner axis for showing grid for shared axis.
  */
-export function parseGridAxis(channel: Channel, model: UnitModel): VgAxis {
+export function parseGridAxis(channel: SpatialScaleChannel, model: UnitModel): VgAxis {
   // FIXME: support adding ticks for grid axis that are inner axes of faceted plots.
   return parseAxis(channel, model, true);
 }
 
-export function parseMainAxis(channel: Channel, model: UnitModel) {
+export function parseMainAxis(channel: SpatialScaleChannel, model: UnitModel) {
   return parseAxis(channel, model, false);
 }
 
-function parseAxis(channel: Channel, model: UnitModel, isGridAxis: boolean): VgAxis {
+function parseAxis(channel: SpatialScaleChannel, model: UnitModel, isGridAxis: boolean): VgAxis {
   const axis = model.axis(channel);
 
   const vgAxis: VgAxis = {
@@ -114,7 +114,7 @@ function parseAxis(channel: Channel, model: UnitModel, isGridAxis: boolean): VgA
   return vgAxis;
 }
 
-function getSpecifiedOrDefaultValue(property: keyof VgAxis, specifiedAxis: Axis, channel: Channel, model: UnitModel, isGridAxis: boolean) {
+function getSpecifiedOrDefaultValue(property: keyof VgAxis, specifiedAxis: Axis, channel: SpatialScaleChannel, model: UnitModel, isGridAxis: boolean) {
   const fieldDef = model.fieldDef(channel);
 
   switch (property) {

src/compile/axis/rules.ts

@@ -1,7 +1,7 @@
 import * as log from '../../log';
 
 import {Axis} from '../../axis';
-import {Channel, COLUMN, ROW, X, Y} from '../../channel';
+import {Channel, COLUMN, ROW, SpatialScaleChannel, X, Y} from '../../channel';
 import {Config} from '../../config';
 import {DateTime, dateTimeExpr, isDateTime} from '../../datetime';
 import {FieldDef, title as fieldDefTitle} from '../../fielddef';
@@ -20,7 +20,7 @@ export function format(specifiedAxis: Axis, channel: Channel, fieldDef: FieldDef
  * Default rules for whether to show a grid should be shown for a channel.
  * If `grid` is unspecified, the default value is `true` for ordinal scales that are not binned
  */
-export function gridShow(model: UnitModel, channel: Channel) {
+export function gridShow(model: UnitModel, channel: SpatialScaleChannel) {
   const grid = model.axis(channel).grid;
   if (grid !== undefined) {
     return grid;
@@ -29,12 +29,7 @@ export function gridShow(model: UnitModel, channel: Channel) {
   return !model.hasDiscreteDomain(channel) && !model.fieldDef(channel).bin;
 }
 
-export function grid(model: UnitModel, channel: Channel, isGridAxis: boolean) {
-  if (channel === ROW || channel === COLUMN) {
-    // never apply grid for ROW and COLUMN since we manually create rule-group for them
-    return false;
-  }
-
+export function grid(model: UnitModel, channel: SpatialScaleChannel, isGridAxis: boolean) {
   if (!isGridAxis) {
     return undefined;
   }

src/compile/data/bin.ts

@@ -74,7 +74,7 @@ export class BinNode extends DataFlowNode {
 
   public static makeBinFromEncoding(model: ModelWithField) {
     const bins = model.reduceFieldDef((binComponent: Dict<BinComponent>, fieldDef, channel) => {
-      const fieldDefBin = model.fieldDef(channel).bin;
+      const fieldDefBin = fieldDef.bin;
       if (fieldDefBin) {
         const bin = normalizeBin(fieldDefBin, undefined) || {};
         const key = binKey(fieldDefBin, fieldDef.field);

src/compile/data/nonpositivefilter.ts

@@ -1,3 +1,4 @@
+import {SCALE_CHANNELS} from '../../channel';
 import {ScaleType} from '../../scale';
 import {Dict, duplicate, extend, keys} from '../../util';
 import {VgFilterTransform, VgTransform} from '../../vega.schema';
@@ -18,7 +19,7 @@ export class NonPositiveFilterNode extends DataFlowNode {
   }
 
   public static make(model: UnitModel) {
-    const filter = model.channels().reduce(function(nonPositiveComponent, channel) {
+    const filter = SCALE_CHANNELS.reduce(function(nonPositiveComponent, channel) {
       const scale = model.getScaleComponent(channel);
       if (!scale || !model.field(channel)) {
         // don't set anything

src/compile/facet.ts

@@ -307,10 +307,6 @@ export class FacetModel extends ModelWithField {
     return marks;
   }
 
-  public channels() {
-    return [ROW, COLUMN];
-  }
-
   protected getMapping() {
     return this.facet;
   }

src/compile/legend/parse.ts

@@ -1,4 +1,4 @@
-import {Channel, COLOR, OPACITY, SHAPE, SIZE} from '../../channel';
+import {Channel, COLOR, NonspatialScaleChannel, OPACITY, SHAPE, SIZE} from '../../channel';
 import {Legend, LEGEND_PROPERTIES} from '../../legend';
 import {Dict, keys} from '../../util';
 import {VgLegend} from '../../vega.schema';
@@ -36,7 +36,7 @@ function getLegendDefWithScale(model: UnitModel, channel: Channel): LegendCompon
   return null;
 }
 
-export function parseLegend(model: UnitModel, channel: Channel): LegendComponent {
+export function parseLegend(model: UnitModel, channel: NonspatialScaleChannel): LegendComponent {
   const fieldDef = model.fieldDef(channel);
   const legend = model.legend(channel);
 
@@ -64,7 +64,7 @@ export function parseLegend(model: UnitModel, channel: Channel): LegendComponent
   return def;
 }
 
-function getSpecifiedOrDefaultValue(property: keyof VgLegend, specifiedLegend: Legend, channel: Channel, model: UnitModel) {
+function getSpecifiedOrDefaultValue(property: keyof VgLegend, specifiedLegend: Legend, channel: NonspatialScaleChannel, model: UnitModel) {
   const fieldDef = model.fieldDef(channel);
 
   switch (property) {

src/compile/mark/mark.ts

@@ -18,8 +18,7 @@ import {UnitModel} from '../unit';
 
 import {isArray} from 'vega-util';
 import {X, Y} from '../../channel';
-import {getFieldDef} from '../../encoding';
-import {field} from '../../fielddef';
+import {field, getFieldDef} from '../../fielddef';
 import {isSelectionDomain} from '../../scale';
 
 const markCompiler: {[type: string]: MarkCompiler} = {
@@ -131,7 +130,7 @@ function detailFields(model: UnitModel): string[] {
         });
       }
     } else {
-      const fieldDef = getFieldDef(encoding, channel);
+      const fieldDef = getFieldDef<string>(encoding[channel]);
       if (fieldDef && !fieldDef.aggregate) {
         details.push(field(fieldDef, {binSuffix: 'start'}));
       }