style: use optional chaining to simplify code (#7920)

vega · Jan 17, 2022 · 75745a1 · 75745a1
1 parent 517cef0
commit 75745a1
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/src/axis.ts b/src/axis.ts
@@ -270,7 +270,7 @@ export type ConditionalAxisProperty<V extends Value | number[], ES extends ExprR
 export function isConditionalAxisValue<V extends Value | number[], ES extends ExprRef | SignalRef>(
   v: any
 ): v is ConditionalAxisProperty<V, ES> {
-  return v && v['condition'];
+  return v?.condition;
 }
 
 export type ConditionalAxisNumber<ES extends ExprRef | SignalRef = ExprRef | SignalRef> = ConditionalAxisProperty<

diff --git a/src/channeldef.ts b/src/channeldef.ts
@@ -660,21 +660,21 @@ export function isConditionalDef<CD extends ChannelDef<any> | GuideEncodingCondi
 export function hasConditionalFieldDef<F extends Field>(
   channelDef: Partial<ChannelDef<F>>
 ): channelDef is {condition: Conditional<TypedFieldDef<F>>} {
-  const condition = channelDef && channelDef['condition'];
+  const condition = channelDef?.['condition'];
   return !!condition && !isArray(condition) && isFieldDef(condition);
 }
 
 export function hasConditionalFieldOrDatumDef<F extends Field>(
   channelDef: ChannelDef<F>
 ): channelDef is {condition: Conditional<TypedFieldDef<F>>} {
-  const condition = channelDef && channelDef['condition'];
+  const condition = channelDef?.['condition'];
   return !!condition && !isArray(condition) && isFieldOrDatumDef(condition);
 }
 
 export function hasConditionalValueDef<F extends Field>(
   channelDef: ChannelDef<F>
 ): channelDef is ValueDef<any> & {condition: Conditional<ValueDef<any>> | Conditional<ValueDef<any>>[]} {
-  const condition = channelDef && channelDef['condition'];
+  const condition = channelDef?.['condition'];
   return !!condition && (isArray(condition) || isValueDef(condition));
 }
 
@@ -686,7 +686,7 @@ export function isFieldDef<F extends Field>(
 }
 
 export function channelDefType<F extends Field>(channelDef: ChannelDef<F>): Type | undefined {
-  return channelDef && channelDef['type'];
+  return channelDef?.['type'];
 }
 
 export function isDatumDef<F extends Field>(

diff --git a/src/expr.ts b/src/expr.ts
@@ -10,7 +10,7 @@ export interface ExprRef {
 }
 
 export function isExprRef(o: any): o is ExprRef {
-  return o && !!o['expr'];
+  return !!o?.expr;
 }
 
 export function replaceExprRef<T extends Dict<any>>(index: T) {

diff --git a/src/predicate.ts b/src/predicate.ts
@@ -73,7 +73,7 @@ export interface FieldEqualPredicate extends FieldPredicateBase {
 }
 
 export function isFieldEqualPredicate(predicate: any): predicate is FieldEqualPredicate {
-  return predicate && !!predicate.field && predicate.equal !== undefined;
+  return !!predicate?.field && predicate.equal !== undefined;
 }
 
 export interface FieldLTPredicate extends FieldPredicateBase {
@@ -84,7 +84,7 @@ export interface FieldLTPredicate extends FieldPredicateBase {
 }
 
 export function isFieldLTPredicate(predicate: any): predicate is FieldLTPredicate {
-  return predicate && !!predicate.field && predicate.lt !== undefined;
+  return !!predicate?.field && predicate.lt !== undefined;
 }
 
 export interface FieldLTEPredicate extends FieldPredicateBase {
@@ -95,7 +95,7 @@ export interface FieldLTEPredicate extends FieldPredicateBase {
 }
 
 export function isFieldLTEPredicate(predicate: any): predicate is FieldLTEPredicate {
-  return predicate && !!predicate.field && predicate.lte !== undefined;
+  return !!predicate?.field && predicate.lte !== undefined;
 }
 
 export interface FieldGTPredicate extends FieldPredicateBase {
@@ -106,7 +106,7 @@ export interface FieldGTPredicate extends FieldPredicateBase {
 }
 
 export function isFieldGTPredicate(predicate: any): predicate is FieldGTPredicate {
-  return predicate && !!predicate.field && predicate.gt !== undefined;
+  return !!predicate?.field && predicate.gt !== undefined;
 }
 
 export interface FieldGTEPredicate extends FieldPredicateBase {
@@ -117,7 +117,7 @@ export interface FieldGTEPredicate extends FieldPredicateBase {
 }
 
 export function isFieldGTEPredicate(predicate: any): predicate is FieldGTEPredicate {
-  return predicate && !!predicate.field && predicate.gte !== undefined;
+  return !!predicate?.field && predicate.gte !== undefined;
 }
 
 export interface FieldRangePredicate extends FieldPredicateBase {
@@ -158,12 +158,12 @@ export interface FieldValidPredicate extends FieldPredicateBase {
 
 export function isFieldOneOfPredicate(predicate: any): predicate is FieldOneOfPredicate {
   return (
-    predicate && !!predicate.field && (isArray(predicate.oneOf) || isArray(predicate.in)) // backward compatibility
+    !!predicate?.field && (isArray(predicate.oneOf) || isArray(predicate.in)) // backward compatibility
   );
 }
 
 export function isFieldValidPredicate(predicate: any): predicate is FieldValidPredicate {
-  return predicate && !!predicate.field && predicate.valid !== undefined;
+  return !!predicate?.field && predicate.valid !== undefined;
 }
 
 export function isFieldPredicate(

diff --git a/src/scale.ts b/src/scale.ts
@@ -487,7 +487,7 @@ export interface DomainUnionWith {
 }
 
 export function isDomainUnionWith(domain: Domain): domain is DomainUnionWith {
-  return domain && domain['unionWith'];
+  return domain?.['unionWith'];
 }
 
 export interface FieldRange {

diff --git a/src/selection.ts b/src/selection.ts
@@ -321,13 +321,13 @@ export const defaultConfig: SelectionConfig = {
 };
 
 export function isLegendBinding(bind: any): bind is LegendBinding {
-  return !!bind && (bind === 'legend' || !!bind.legend);
+  return bind === 'legend' || !!bind?.legend;
 }
 
 export function isLegendStreamBinding(bind: any): bind is LegendStreamBinding {
   return isLegendBinding(bind) && isObject(bind);
 }
 
 export function isSelectionParameter(param: any): param is SelectionParameter {
-  return !!param['select'];
+  return !!param?.['select'];
 }
diff --git a/src/sort.ts b/src/sort.ts
@@ -109,13 +109,13 @@ export type AllSortString = SortOrder | SortByChannel | SortByChannelDesc;
 export type Sort<F> = SortArray | AllSortString | EncodingSortField<F> | SortByEncoding | null;
 
 export function isSortByEncoding<F>(sort: Sort<F>): sort is SortByEncoding {
-  return !!sort && !!sort['encoding'];
+  return !!sort?.['encoding'];
 }
 
 export function isSortField<F>(sort: Sort<F>): sort is EncodingSortField<F> {
-  return !!sort && (sort['op'] === 'count' || !!sort['field']);
+  return sort && (sort['op'] === 'count' || !!sort['field']);
 }
 
 export function isSortArray<F>(sort: Sort<F>): sort is SortArray {
-  return !!sort && isArray(sort);
+  return sort && isArray(sort);
 }
diff --git a/src/vega.schema.ts b/src/vega.schema.ts
@@ -87,7 +87,7 @@ export type VgScaleDataRefWithSort = ScaleDataRef & {
 };
 
 export function isSignalRef(o: any): o is SignalRef {
-  return o && !!o['signal'];
+  return !!o?.signal;
 }
 
 // TODO: add type of value (Make it VgValueRef<V extends ValueOrGradient> {value?:V ...})