Fix more TS

babel · Aug 2, 2023 · bdaa2c3 · bdaa2c3
1 parent 3311711
commit bdaa2c3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/packages/babel-helper-function-name/src/index.ts b/packages/babel-helper-function-name/src/index.ts
@@ -224,7 +224,11 @@ export default function <N extends t.FunctionExpression | t.Class>(
     node: N;
     parent?: NodePath<N>["parent"];
     scope: Scope;
-    id?: t.LVal | t.StringLiteral | t.NumericLiteral | t.BigIntLiteral;
+    id?:
+      | t.AssignmentExpression["left"]
+      | t.StringLiteral
+      | t.NumericLiteral
+      | t.BigIntLiteral;
   },
   localBinding = false,
   supportUnicodeId = false,

diff --git a/packages/babel-plugin-proposal-destructuring-private/src/util.ts b/packages/babel-plugin-proposal-destructuring-private/src/util.ts
@@ -151,7 +151,7 @@ function buildAssignmentsFromPatternList(
 }
 
 type StackItem = {
-  node: t.LVal | t.ObjectProperty | null;
+  node: t.AssignmentExpression["left"] | t.ObjectProperty | null;
   index: number;
   depth: number;
 };
@@ -169,9 +169,9 @@ type StackItem = {
  * @param visitor
  */
 export function* traversePattern(
-  root: t.LVal,
+  root: t.AssignmentExpression["left"],
   visitor: (
-    node: t.LVal | t.ObjectProperty,
+    node: t.AssignmentExpression["left"] | t.ObjectProperty,
     index: number,
     depth: number,
   ) => Generator<any, void, any>,
@@ -221,7 +221,7 @@ export function* traversePattern(
   }
 }
 
-export function hasPrivateKeys(pattern: t.LVal) {
+export function hasPrivateKeys(pattern: t.AssignmentExpression["left"]) {
   let result = false;
   traversePattern(pattern, function* (node) {
     if (isObjectProperty(node) && isPrivateName(node.key)) {

diff --git a/packages/babel-plugin-transform-destructuring/src/index.ts b/packages/babel-plugin-transform-destructuring/src/index.ts
@@ -158,7 +158,7 @@ export default declare((api, options: Options) => {
       AssignmentExpression(path, state) {
         if (!t.isPattern(path.node.left)) return;
         convertAssignmentExpression(
-          path,
+          path as NodePath<t.AssignmentExpression & { left: t.Pattern }>,
           name => state.addHelper(name),
           arrayLikeIsIterable,
           iterableIsArray,

diff --git a/packages/babel-plugin-transform-destructuring/src/util.ts b/packages/babel-plugin-transform-destructuring/src/util.ts
@@ -133,7 +133,7 @@ export class DestructuringTransformer {
     init: t.Expression,
   ) {
     let op = this.operator;
-    if (t.isMemberExpression(id)) op = "=";
+    if (t.isMemberExpression(id) || t.isOptionalMemberExpression(id)) op = "=";
 
     let node: t.ExpressionStatement | t.VariableDeclaration;
 
@@ -155,7 +155,7 @@ export class DestructuringTransformer {
       }
 
       node = t.variableDeclaration(this.kind, [
-        t.variableDeclarator(id, nodeInit),
+        t.variableDeclarator(id as t.LVal, nodeInit),
       ]);
     }
 
@@ -703,7 +703,7 @@ export function convertVariableDeclaration(
 }
 
 export function convertAssignmentExpression(
-  path: NodePath<t.AssignmentExpression>,
+  path: NodePath<t.AssignmentExpression & { left: t.Pattern }>,
   addHelper: File["addHelper"],
   arrayLikeIsIterable: boolean,
   iterableIsArray: boolean,