Merge pull request #2881 from kyletsang/fix-createslicebuilder-codemod

reduxjs · Nov 30, 2022 · 87bebec · 87bebec
2 parents b319c41 + c114399
commit 87bebec
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 27 deletions.
diff --git a/packages/rtk-codemods/transforms/createSliceBuilder/__testfixtures__/basic-ts.input.ts b/packages/rtk-codemods/transforms/createSliceBuilder/__testfixtures__/basic-ts.input.ts
@@ -2,9 +2,11 @@ const slice1 = createSlice({
   name: "a",
   initialState,
   extraReducers: {
-    [todoAdded]: (state: SliceState, action: PayloadAction<string>) => {
+    [todoAdded1a]: (state: SliceState, action: PayloadAction<string>) => {
       // stuff
     },
+    [todoAdded1b]: someFunc,
+    todoAdded1c: adapter.someFunc,
   }
 });
 

diff --git a/packages/rtk-codemods/transforms/createSliceBuilder/__testfixtures__/basic-ts.output.ts b/packages/rtk-codemods/transforms/createSliceBuilder/__testfixtures__/basic-ts.output.ts
@@ -3,9 +3,12 @@ const slice1 = createSlice({
   initialState,
 
   extraReducers: (builder) => {
-    builder.addCase(todoAdded, (state: SliceState, action: PayloadAction<string>) => {
+    builder.addCase(todoAdded1a, (state: SliceState, action: PayloadAction<string>) => {
       // stuff
     });
+
+    builder.addCase(todoAdded1b, someFunc);
+    builder.addCase(todoAdded1c, adapter.someFunc);
   }
 });
 

diff --git a/packages/rtk-codemods/transforms/createSliceBuilder/__testfixtures__/basic.input.js b/packages/rtk-codemods/transforms/createSliceBuilder/__testfixtures__/basic.input.js
@@ -17,7 +17,9 @@ const slice1 = createSlice({
     },
     todoAdded1f: (state, action) => {
       //stuff
-    }
+    },
+    [todoAdded1g]: someFunc,
+    todoAdded1h: adapter.someFunc
   }
 });
 

diff --git a/packages/rtk-codemods/transforms/createSliceBuilder/__testfixtures__/basic.output.js b/packages/rtk-codemods/transforms/createSliceBuilder/__testfixtures__/basic.output.js
@@ -24,6 +24,9 @@ const slice1 = createSlice({
     builder.addCase(todoAdded1f, (state, action) => {
       //stuff
     });
+
+    builder.addCase(todoAdded1g, someFunc);
+    builder.addCase(todoAdded1h, adapter.someFunc);
   }
 });
 

diff --git a/packages/rtk-codemods/transforms/createSliceBuilder/index.ts b/packages/rtk-codemods/transforms/createSliceBuilder/index.ts
@@ -1,9 +1,5 @@
-import { namedTypes } from 'ast-types';
-import { ExpressionKind, PatternKind } from 'ast-types/gen/kinds';
+import { ExpressionKind, SpreadElementKind } from 'ast-types/gen/kinds';
 import {
-  BlockStatement,
-  CallExpression,
-  Expression,
   ExpressionStatement,
   JSCodeshift,
   ObjectExpression,
@@ -16,48 +12,51 @@ type ObjectKey = ObjectMethod['key'] & ObjectProperty['key'];
 
 function wrapInAddCaseExpression(
   j: JSCodeshift,
-  key: ObjectKey,
-  params: PatternKind[],
-  body: BlockStatement | ExpressionKind
+  addCaseArgs: (ExpressionKind | SpreadElementKind)[]
 ) {
   const identifier = j.identifier('builder');
   return j.expressionStatement(
-    j.callExpression(j.memberExpression(identifier, j.identifier('addCase'), false), [
-      key,
-      j.arrowFunctionExpression(params, body),
-    ])
+    j.callExpression(j.memberExpression(identifier, j.identifier('addCase'), false), addCaseArgs)
   );
 }
 
 export function reducerPropsToBuilderExpression(j: JSCodeshift, defNode: ObjectExpression) {
   const caseExpressions: ExpressionStatement[] = [];
   for (let property of defNode.properties) {
-    let key: ObjectKey = null as any;
-    let params: PatternKind[] = [];
-    let body: BlockStatement | ExpressionKind = null as any;
+    let addCaseArgs: (ExpressionKind | SpreadElementKind)[] = [];
     switch (property.type) {
       case 'ObjectMethod': {
-        key = property.key;
-        params = property.params;
-        body = property.body;
+        const { key, params, body } = property;
+        if (body) {
+          addCaseArgs = [key, j.arrowFunctionExpression(params, body)];
+        }
         break;
       }
-      case 'ObjectProperty': {
+      case 'ObjectProperty': {    
+        const { key } = property;
+
         switch (property.value.type) {
           case 'ArrowFunctionExpression':
           case 'FunctionExpression': {
-            key = property.key;
-            params = property.value.params;
-            body = property.value.body;
+            const { params, body } = property.value;
+            if (body) {
+              addCaseArgs = [key, j.arrowFunctionExpression(params, body)];
+            }
+            break;
+          }
+          case 'Identifier':
+          case 'MemberExpression': {
+            const { value } = property;
+            addCaseArgs = [key, value];
             break;
           }
         }
       }
     }
-    if (!body) {
+    if (!addCaseArgs.length) {
       continue;
     }
-    caseExpressions.push(wrapInAddCaseExpression(j, key, params, body));
+    caseExpressions.push(wrapInAddCaseExpression(j, addCaseArgs));
   }
 
   return j.arrowFunctionExpression([j.identifier('builder')], j.blockStatement(caseExpressions));