fix: misc typings for the experimental guideEncodeEntry

vega · Sep 13, 2020 · 70f9b78 · 70f9b78
1 parent b404b86
commit 70f9b78
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/examples/compiled/selection_heatmap.vg.json b/examples/compiled/selection_heatmap.vg.json
@@ -103,10 +103,9 @@
           "zindex": [
             {
               "test": "!(length(data(\"highlight_store\"))) || (vlSelectionTest(\"highlight_store\", datum))",
-              "selection": "highlight",
               "value": 1
             },
-            {"condition": {"selection": "highlight", "value": 1}, "value": 0}
+            {"value": 0}
           ],
           "description": {
             "signal": "\"actual: \" + (isValid(datum[\"actual\"]) ? datum[\"actual\"] : \"\"+datum[\"actual\"]) + \"; predicted: \" + (isValid(datum[\"predicted\"]) ? datum[\"predicted\"] : \"\"+datum[\"predicted\"]) + \"; count: \" + (format(datum[\"count\"], \"\"))"

diff --git a/src/compile/guide.ts b/src/compile/guide.ts
@@ -1,8 +1,7 @@
-import {SignalRef} from 'vega';
-import {ValueDef} from '../channeldef';
 import {GuideEncodingEntry} from '../guide';
 import {keys} from '../util';
-import {isSignalRef, VgEncodeChannel} from '../vega.schema';
+import {VgEncodeChannel} from '../vega.schema';
+import {signalOrValueRef} from './common';
 import {wrapCondition} from './mark/encode';
 import {UnitModel} from './unit';
 
@@ -11,7 +10,7 @@ export function guideEncodeEntry(encoding: GuideEncodingEntry, model: UnitModel)
     const valueDef = encoding[channel];
     return {
       ...encode,
-      ...wrapCondition(model, valueDef, channel, (x: ValueDef | SignalRef) => (isSignalRef(x) ? x : {value: x.value}))
+      ...wrapCondition(model, valueDef, channel, def => signalOrValueRef(def.value))
     };
   }, {});
 }
diff --git a/src/compile/mark/encode/conditional.ts b/src/compile/mark/encode/conditional.ts
@@ -1,4 +1,3 @@
-import {SignalRef} from 'vega';
 import {array} from 'vega-util';
 import {
   ChannelDef,
@@ -17,7 +16,7 @@ import {UnitModel} from '../../unit';
  * Return a mixin that includes a Vega production rule for a Vega-Lite conditional channel definition
  * or a simple mixin if channel def has no condition.
  */
-export function wrapCondition<CD extends ChannelDef | GuideEncodingConditionalValueDef | SignalRef>(
+export function wrapCondition<CD extends ChannelDef | GuideEncodingConditionalValueDef>(
   model: UnitModel,
   channelDef: CD,
   vgChannel: string,

diff --git a/src/compile/mark/encode/zindex.ts b/src/compile/mark/encode/zindex.ts
@@ -1,5 +1,6 @@
 import {isValueDef} from '../../../channeldef';
 import {isPathMark} from '../../../mark';
+import {signalOrValueRef} from '../../common';
 import {UnitModel} from '../../unit';
 import {wrapCondition} from './conditional';
 
@@ -8,7 +9,7 @@ export function zindex(model: UnitModel) {
   const order = encoding.order;
 
   if (!isPathMark(mark) && isValueDef(order)) {
-    return wrapCondition(model, order, 'zindex', cd => cd);
+    return wrapCondition(model, order, 'zindex', cd => signalOrValueRef(cd.value));
   }
   return {};
 }
diff --git a/src/guide.ts b/src/guide.ts
@@ -62,7 +62,7 @@ export interface VlOnlyGuideConfig {
 
 export type GuideEncodingConditionalValueDef = ValueDef & ConditionValueDefMixins;
 
-export type GuideEncodingEntry = Partial<Record<VgEncodeChannel, GuideEncodingConditionalValueDef | SignalRef>>;
+export type GuideEncodingEntry = Partial<Record<VgEncodeChannel, GuideEncodingConditionalValueDef>>;
 
 export const VL_ONLY_LEGEND_CONFIG: (keyof LegendConfig<any>)[] = [
   'gradientHorizontalMaxLength',

diff --git a/test/compile/axis/parse.test.ts b/test/compile/axis/parse.test.ts
@@ -324,7 +324,7 @@ describe('Axis', () => {
             axis: {
               encoding: {
                 labels: {
-                  dx: {signal: 'a'},
+                  dx: {value: {signal: 'a'}},
                   dy: {value: 2}
                 }
               }