From dac4babbb17a43f22fdecfb97109aecb76ce0684 Mon Sep 17 00:00:00 2001
From: sosukesuzuki <aosukeke@gmail.com>
Date: Thu, 11 Nov 2021 18:56:29 +0900
Subject: [PATCH] fix(ast-spec): remove BinaryExpressionBase

---
 packages/ast-spec/src/base/BinaryExpressionBase.ts       | 9 ---------
 .../ast-spec/src/expression/AssignmentExpression/spec.ts | 5 +++--
 .../ast-spec/src/expression/BinaryExpression/spec.ts     | 6 ++++--
 .../ast-spec/src/expression/LogicalExpression/spec.ts    | 5 +++--
 4 files changed, 10 insertions(+), 15 deletions(-)
 delete mode 100644 packages/ast-spec/src/base/BinaryExpressionBase.ts

diff --git a/packages/ast-spec/src/base/BinaryExpressionBase.ts b/packages/ast-spec/src/base/BinaryExpressionBase.ts
deleted file mode 100644
index e5d76a7b01fe..000000000000
--- a/packages/ast-spec/src/base/BinaryExpressionBase.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { PrivateIdentifier } from '../special/PrivateIdentifier/spec';
-import type { Expression } from '../unions/Expression';
-import type { BaseNode } from './BaseNode';
-
-export interface BinaryExpressionBase extends BaseNode {
-  operator: string;
-  left: Expression | PrivateIdentifier;
-  right: Expression;
-}
diff --git a/packages/ast-spec/src/expression/AssignmentExpression/spec.ts b/packages/ast-spec/src/expression/AssignmentExpression/spec.ts
index e8b20fd46b5b..eb3c8effa991 100644
--- a/packages/ast-spec/src/expression/AssignmentExpression/spec.ts
+++ b/packages/ast-spec/src/expression/AssignmentExpression/spec.ts
@@ -1,8 +1,8 @@
 import type { AST_NODE_TYPES } from '../../ast-node-types';
-import type { BinaryExpressionBase } from '../../base/BinaryExpressionBase';
+import type { BaseNode } from '../../base/BaseNode';
 import type { Expression } from '../../unions/Expression';
 
-export interface AssignmentExpression extends BinaryExpressionBase {
+export interface AssignmentExpression extends BaseNode {
   type: AST_NODE_TYPES.AssignmentExpression;
   operator:
     | '-='
@@ -22,4 +22,5 @@ export interface AssignmentExpression extends BinaryExpressionBase {
     | '|='
     | '||=';
   left: Expression;
+  right: Expression;
 }
diff --git a/packages/ast-spec/src/expression/BinaryExpression/spec.ts b/packages/ast-spec/src/expression/BinaryExpression/spec.ts
index fc14f981b8ec..fa43c88bcf50 100644
--- a/packages/ast-spec/src/expression/BinaryExpression/spec.ts
+++ b/packages/ast-spec/src/expression/BinaryExpression/spec.ts
@@ -1,9 +1,11 @@
 import type { AST_NODE_TYPES } from '../../ast-node-types';
-import type { BinaryExpressionBase } from '../../base/BinaryExpressionBase';
+import type { BaseNode } from '../../base/BaseNode';
 import type { PrivateIdentifier } from '../../special/PrivateIdentifier/spec';
 import type { Expression } from '../../unions/Expression';
 
-export interface BinaryExpression extends BinaryExpressionBase {
+export interface BinaryExpression extends BaseNode {
   type: AST_NODE_TYPES.BinaryExpression;
+  operator: string;
   left: Expression | PrivateIdentifier;
+  right: Expression;
 }
diff --git a/packages/ast-spec/src/expression/LogicalExpression/spec.ts b/packages/ast-spec/src/expression/LogicalExpression/spec.ts
index 786ad815bf11..1eda8e3b615e 100644
--- a/packages/ast-spec/src/expression/LogicalExpression/spec.ts
+++ b/packages/ast-spec/src/expression/LogicalExpression/spec.ts
@@ -1,9 +1,10 @@
 import type { AST_NODE_TYPES } from '../../ast-node-types';
-import type { BinaryExpressionBase } from '../../base/BinaryExpressionBase';
+import type { BaseNode } from '../../base/BaseNode';
 import type { Expression } from '../../unions/Expression';
 
-export interface LogicalExpression extends BinaryExpressionBase {
+export interface LogicalExpression extends BaseNode {
   type: AST_NODE_TYPES.LogicalExpression;
   operator: '??' | '&&' | '||';
   left: Expression;
+  right: Expression;
 }