Merge branch 'master' into djbarnwal-db/legendInteractive

Author: domoritz

site/Gemfile.lock

@@ -206,7 +206,7 @@ GEM
       jekyll-seo-tag (~> 2.1)
     minitest (5.12.2)
     multipart-post (2.1.1)
-    nokogiri (1.10.4)
+    nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
     octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)

src/channeldef.ts

@@ -588,7 +588,7 @@ export function vgField(
         const {bin, aggregate, timeUnit} = fieldDef;
         if (isBinning(bin)) {
           fn = binToString(bin);
-          suffix = (opt.binSuffix || '') + (opt.suffix || '');
+          suffix = (opt.binSuffix ?? '') + (opt.suffix ?? '');
         } else if (aggregate) {
           if (isArgmaxDef(aggregate)) {
             argAccessor = `.${field}`;
@@ -601,7 +601,7 @@ export function vgField(
           }
         } else if (timeUnit) {
           fn = String(timeUnit);
-          suffix = ((!contains(['range', 'mid'], opt.binSuffix) && opt.binSuffix) || '') + (opt.suffix || '');
+          suffix = ((!contains(['range', 'mid'], opt.binSuffix) && opt.binSuffix) || '') + (opt.suffix ?? '');
         }
       }
     }
@@ -717,14 +717,14 @@ export function title(
   config: Config,
   {allowDisabling, includeDefault = true}: {allowDisabling: boolean; includeDefault?: boolean}
 ) {
-  const guide = getGuide(fieldDef) || {};
+  const guide = getGuide(fieldDef) ?? {};
   const guideTitle = guide.title;
   const def = includeDefault ? defaultTitle(fieldDef, config) : undefined;
 
   if (allowDisabling) {
     return getFirstDefined(guideTitle, fieldDef.title, def);
   } else {
-    return guideTitle || fieldDef.title || def;
+    return guideTitle ?? fieldDef.title ?? def;
   }
 }
 
@@ -747,7 +747,7 @@ export function format(fieldDef: TypedFieldDef<string>) {
   if (isTextFieldDef(fieldDef) && fieldDef.format) {
     return fieldDef.format;
   } else {
-    const guide = getGuide(fieldDef) || {};
+    const guide = getGuide(fieldDef) ?? {};
     return guide.format;
   }
 }

src/compile/axis/assemble.ts

@@ -27,9 +27,9 @@ function setAxisEncode(
   vgProp: VgEncodeChannel,
   vgRef: VgValueRef | readonly VgValueRef[]
 ) {
-  axis.encode = axis.encode || {};
-  axis.encode[part] = axis.encode[part] || {};
-  axis.encode[part].update = axis.encode[part].update || {};
+  axis.encode = axis.encode ?? {};
+  axis.encode[part] = axis.encode[part] ?? {};
+  axis.encode[part].update = axis.encode[part].update ?? {};
   // TODO: remove as any after https://github.com/prisma/nexus-prisma/issues/291
   (axis.encode[part].update[vgProp] as any) = vgRef;
 }

src/compile/axis/encode.ts

@@ -7,7 +7,7 @@ import {UnitModel} from '../unit';
 
 export function labels(model: UnitModel, channel: PositionScaleChannel, specifiedLabelsSpec: any) {
   const fieldDef =
-    model.fieldDef(channel) ||
+    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

@@ -69,7 +69,7 @@ export function parseLayerAxes(model: LayerModel) {
 
       if (resolve.axis[channel] === 'independent') {
         // If axes are independent, concat the axisComponent array.
-        axes[channel] = (axes[channel] || []).concat(child.component.axes[channel]);
+        axes[channel] = (axes[channel] ?? []).concat(child.component.axes[channel]);
 
         // Automatically adjust orient
         for (const axisComponent of child.component.axes[channel]) {
@@ -250,14 +250,14 @@ function parseAxis(channel: PositionScaleChannel, model: UnitModel): AxisCompone
   });
 
   // 2) Add guide encode definition groups
-  const axisEncoding = axis.encoding || {};
+  const axisEncoding = axis.encoding ?? {};
   const axisEncode = AXIS_PARTS.reduce((e: VgAxisEncode, part) => {
     if (!axisComponent.hasAxisPart(part)) {
       // No need to create encode for a disabled part.
       return e;
     }
 
-    const axisEncodingPart = guideEncodeEntry(axisEncoding[part] || {}, model);
+    const axisEncodingPart = guideEncodeEntry(axisEncoding[part] ?? {}, model);
 
     const value = part === 'labels' ? encode.labels(model, channel, axisEncodingPart) : axisEncodingPart;
 

src/compile/common.ts

@@ -36,7 +36,7 @@ export function applyMarkConfig(e: VgEncodeEntry, model: UnitModel, propsList: (
 }
 
 export function getStyles(mark: MarkDef): string[] {
-  return [].concat(mark.type, mark.style || []);
+  return [].concat(mark.type, mark.style ?? []);
 }
 
 export function getMarkPropOrConfig<P extends keyof MarkConfig>(channel: P, mark: MarkDef, config: Config) {
@@ -142,7 +142,7 @@ function formatExpr(field: string, format: string) {
 }
 
 export function numberFormatExpr(field: string, specifiedFormat: string, config: Config) {
-  return formatExpr(field, specifiedFormat || config.numberFormat);
+  return formatExpr(field, specifiedFormat ?? config.numberFormat);
 }
 
 export function binFormatExpression(startField: string, endField: string, format: string, config: Config) {
@@ -167,7 +167,7 @@ export function timeFormatExpression(
 ): string {
   if (!timeUnit || format) {
     // If there is not time unit, or if user explicitly specify format for axis/legend/text.
-    format = format || rawTimeFormat; // only use provided timeFormat if there is no timeUnit.
+    format = format ?? rawTimeFormat; // only use provided timeFormat if there is no timeUnit.
 
     if (format || alwaysReturn) {
       return `${isUTCScale ? 'utc' : 'time'}Format(${field}, '${format}')`;
@@ -189,7 +189,7 @@ export function sortParams(
   return array(orderDef).reduce(
     (s, orderChannelDef) => {
       s.field.push(vgField(orderChannelDef, fieldRefOption));
-      s.order.push(orderChannelDef.sort || 'ascending');
+      s.order.push(orderChannelDef.sort ?? 'ascending');
       return s;
     },
     {field: [], order: []}

src/compile/data/aggregate.ts

@@ -48,7 +48,7 @@ function mergeMeasures(parentMeasures: Measures, childMeasures: Measures) {
     for (const op of keys(ops)) {
       if (field in parentMeasures) {
         // add operator to existing measure field
-        parentMeasures[field][op] = new Set([...(parentMeasures[field][op] || []), ...ops[op]]);
+        parentMeasures[field][op] = new Set([...(parentMeasures[field][op] ?? []), ...ops[op]]);
       } else {
         parentMeasures[field] = {[op]: ops[op]};
       }
@@ -93,22 +93,22 @@ export class AggregateNode extends DataFlowNode {
       const {aggregate, field} = fieldDef;
       if (aggregate) {
         if (aggregate === 'count') {
-          meas['*'] = meas['*'] || {};
+          meas['*'] = meas['*'] ?? {};
           meas['*']['count'] = new Set([vgField(fieldDef, {forAs: true})]);
         } else {
           if (isArgminDef(aggregate) || isArgmaxDef(aggregate)) {
             const op = isArgminDef(aggregate) ? 'argmin' : 'argmax';
             const argField = aggregate[op];
-            meas[argField] = meas[argField] || {};
+            meas[argField] = meas[argField] ?? {};
             meas[argField][op] = new Set([vgField({op, field: argField}, {forAs: true})]);
           } else {
-            meas[field] = meas[field] || {};
+            meas[field] = meas[field] ?? {};
             meas[field][aggregate] = new Set([vgField(fieldDef, {forAs: true})]);
           }
 
           // For scale channel with domain === 'unaggregated', add min/max so we can use their union as unaggregated domain
           if (isScaleChannel(channel) && model.scaleDomain(channel) === 'unaggregated') {
-            meas[field] = meas[field] || {};
+            meas[field] = meas[field] ?? {};
             meas[field]['min'] = new Set([vgField({field, aggregate: 'min'}, {forAs: true})]);
             meas[field]['max'] = new Set([vgField({field, aggregate: 'max'}, {forAs: true})]);
           }
@@ -133,16 +133,16 @@ export class AggregateNode extends DataFlowNode {
       const {op, field, as} = s;
       if (op) {
         if (op === 'count') {
-          meas['*'] = meas['*'] || {};
+          meas['*'] = meas['*'] ?? {};
           meas['*']['count'] = new Set([as ? as : vgField(s, {forAs: true})]);
         } else {
-          meas[field] = meas[field] || {};
+          meas[field] = meas[field] ?? {};
           meas[field][op] = new Set([as ? as : vgField(s, {forAs: true})]);
         }
       }
     }
 
-    for (const s of t.groupby || []) {
+    for (const s of t.groupby ?? []) {
       dims.add(s);
     }
 

src/compile/data/assemble.ts

@@ -57,7 +57,7 @@ function makeWalkTree(data: VgData[]) {
       if (node.parent instanceof SourceNode && !dataSource.source) {
         // If node's parent is a root source and the data source does not refer to another data source, use normal format parse
         dataSource.format = {
-          ...(dataSource.format || {}),
+          ...(dataSource.format ?? {}),
           parse: node.assembleFormatParse()
         };
 
@@ -245,14 +245,14 @@ export function assembleRootData(dataComponent: DataComponent, datasets: Dict<In
   // move sources without transforms (the ones that are potentially used in lookups) to the beginning
   let whereTo = 0;
   for (const [i, d] of data.entries()) {
-    if ((d.transform || []).length === 0 && !d.source) {
+    if ((d.transform ?? []).length === 0 && !d.source) {
       data.splice(whereTo++, 0, data.splice(i, 1)[0]);
     }
   }
 
   // now fix the from references in lookup transforms
   for (const d of data) {
-    for (const t of d.transform || []) {
+    for (const t of d.transform ?? []) {
       if (t.type === 'lookup') {
         t.from = dataComponent.outputNodes[t.from].getSource();
       }

src/compile/data/bin.ts

@@ -15,7 +15,7 @@ function rangeFormula(model: ModelWithField, fieldDef: TypedFieldDef<string>, ch
   if (binRequiresRange(fieldDef, channel)) {
     // read format from axis or legend, if there is no format then use config.numberFormat
 
-    const guide = isUnitModel(model) ? model.axis(channel) || model.legend(channel) || {} : {};
+    const guide = isUnitModel(model) ? model.axis(channel) ?? model.legend(channel) ?? {} : {};
 
     const startField = vgField(fieldDef, {expr: 'datum'});
     const endField = vgField(fieldDef, {expr: 'datum', binSuffix: 'end'});
@@ -40,7 +40,7 @@ function getSignalsFromModel(model: Model, key: string) {
 }
 
 export function getBinSignalName(model: Model, field: string, bin: boolean | BinParams) {
-  const normalizedBin = normalizeBin(bin, undefined) || {};
+  const normalizedBin = normalizeBin(bin, undefined) ?? {};
   const key = binKey(normalizedBin, field);
   return model.getName(`${key}_bins`);
 }

src/compile/data/calculate.ts

@@ -71,5 +71,5 @@ export class CalculateNode extends DataFlowNode {
 }
 
 export function sortArrayIndexField(fieldDef: TypedFieldDef<string>, channel: SingleDefChannel, opt?: FieldRefOption) {
-  return vgField(fieldDef, {prefix: channel, suffix: 'sort_index', ...(opt || {})});
+  return vgField(fieldDef, {prefix: channel, suffix: 'sort_index', ...(opt ?? {})});
 }