refactor: small code simplificiations

vega · Dec 15, 2023 · 2a425fc · 2a425fc
1 parent 12788a5
commit 2a425fc
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -19,7 +19,7 @@
   "typescript.referencesCodeLens.enabled": true,
   "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "[markdown]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode",

diff --git a/src/compile/data/assemble.ts b/src/compile/data/assemble.ts
@@ -58,7 +58,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()
         };
 

diff --git a/src/compile/data/calculate.ts b/src/compile/data/calculate.ts
@@ -74,5 +74,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});
 }
diff --git a/src/compile/facet.ts b/src/compile/facet.ts
@@ -30,7 +30,7 @@ export function facetSortFieldName(
   sort: EncodingSortField<string>,
   opt?: FieldRefOption
 ) {
-  return vgField(sort, {suffix: `by_${vgField(fieldDef)}`, ...(opt ?? {})});
+  return vgField(sort, {suffix: `by_${vgField(fieldDef)}`, ...opt});
 }
 
 export class FacetModel extends ModelWithField {

diff --git a/src/compile/model.ts b/src/compile/model.ts
@@ -337,7 +337,7 @@ export abstract class Model {
         return {
           width: this.getSizeSignalRef('width'),
           height: this.getSizeSignalRef('height'),
-          ...(encodeEntry ?? {})
+          ...encodeEntry
         };
       }
     }

diff --git a/src/compile/projection/assemble.ts b/src/compile/projection/assemble.ts
@@ -32,7 +32,7 @@ export function assembleProjectionForModel(model: Model): VgProjection[] {
       {
         name,
         // translate to center by default
-        ...{translate: {signal: '[width / 2, height / 2]'}},
+        translate: {signal: '[width / 2, height / 2]'},
         // parameters, overwrite default translate if specified
         ...projection
       }

diff --git a/src/compile/projection/parse.ts b/src/compile/projection/parse.ts
@@ -25,8 +25,8 @@ function parseUnitProjection(model: UnitModel): ProjectionComponent {
     const projComp = new ProjectionComponent(
       model.projectionName(true),
       {
-        ...(replaceExprRef(model.config.projection) ?? {}),
-        ...(proj ?? {})
+        ...replaceExprRef(model.config.projection),
+        ...proj
       },
       size,
       data

diff --git a/src/compile/selection/scales.ts b/src/compile/selection/scales.ts
@@ -76,7 +76,7 @@ const scaleBindings: SelectionCompiler<'interval'> = {
     // Nested signals need only push to top-level signals with multiview displays.
     if (model.parent && !isTopLevelLayer(model)) {
       for (const proj of selCmpt.scales) {
-        const signal: any = signals.filter(s => s.name === proj.signals.data)[0];
+        const signal: any = signals.find(s => s.name === proj.signals.data);
         signal.push = 'outer';
         delete signal.value;
         delete signal.update;