@mui/codemod 6.4.3 → 6.4.6

package/node/deprecations/utils/movePropIntoSlotProps.js

@@ -9,10 +9,11 @@ var _findComponentJSX = _interopRequireDefault(require("../../util/findComponent
 var _findComponentDefaultProps = _interopRequireDefault(require("../../util/findComponentDefaultProps"));
 var _assignObject = _interopRequireDefault(require("../../util/assignObject"));
 var _appendAttribute = _interopRequireDefault(require("../../util/appendAttribute"));
-function moveJsxPropIntoSlotProps(j, element, propName, slotName) {
+function moveJsxPropIntoSlotProps(j, element, propName, slotName, slotPropName) {
   const propIndex = element.openingElement.attributes.findIndex(attr => attr.type === 'JSXAttribute' && attr.name.name === propName);
   if (propIndex !== -1) {
-    const removedValue = element.openingElement.attributes.splice(propIndex, 1)[0].value.expression;
+    const removedAttr = element.openingElement.attributes.splice(propIndex, 1)[0];
+    const removedValue = removedAttr.value.type === 'StringLiteral' ? j.literal(removedAttr.value.value) : removedAttr.value.expression;
     let hasSlotProps = false;
     element.openingElement.attributes.forEach(attr => {
       if (attr.name?.name === 'slotProps') {
@@ -20,31 +21,40 @@ function moveJsxPropIntoSlotProps(j, element, propName, slotName) {
         const slots = attr.value.expression;
         const slotIndex = slots.properties.findIndex(prop => prop?.key?.name === slotName);
         if (slotIndex === -1) {
+          // Create new slot
+          const slotValue = slotPropName ? j.objectExpression([j.objectProperty(j.identifier(slotPropName), removedValue)]) : removedValue;
           (0, _assignObject.default)(j, {
             target: attr,
             key: slotName,
-            expression: removedValue
+            expression: slotValue
           });
         } else {
-          const slotPropsSlotValue = slots.properties.splice(slotIndex, 1)[0].value;
-          (0, _assignObject.default)(j, {
-            target: attr,
-            key: slotName,
-            expression: j.objectExpression([j.spreadElement(removedValue), j.spreadElement(slotPropsSlotValue)])
-          });
+          // Add property to existing slot
+          const existingSlot = slots.properties[slotIndex].value;
+          if (slotPropName) {
+            if (existingSlot.type === 'ObjectExpression') {
+              existingSlot.properties.push(j.objectProperty(j.identifier(slotPropName), removedValue));
+            } else {
+              slots.properties[slotIndex].value = j.objectExpression([j.objectProperty(j.identifier(slotPropName), removedValue)]);
+            }
+          } else {
+            slots.properties[slotIndex].value = j.objectExpression([j.spreadElement(removedValue), j.spreadElement(existingSlot)]);
+          }
         }
       }
     });
     if (!hasSlotProps) {
+      // Create new slotProps
+      const slotValue = slotPropName ? j.objectExpression([j.objectProperty(j.identifier(slotPropName), removedValue)]) : removedValue;
       (0, _appendAttribute.default)(j, {
         target: element,
         attributeName: 'slotProps',
-        expression: j.objectExpression([j.objectProperty(j.identifier(slotName), removedValue)])
+        expression: j.objectExpression([j.objectProperty(j.identifier(slotName), slotValue)])
       });
     }
   }
 }
-function moveDefaultPropsPropIntoslotProps(j, defaultPropsPathCollection, propName, slotName) {
+function moveDefaultPropsPropIntoslotProps(j, defaultPropsPathCollection, propName, slotName, slotPropName) {
   defaultPropsPathCollection.find(j.ObjectProperty, {
     key: {
       name: propName
@@ -58,15 +68,28 @@ function moveDefaultPropsPropIntoslotProps(j, defaultPropsPathCollection, propNa
         hasSlotProps = true;
         const slotIndex = property.value.properties.findIndex(prop => prop?.key?.name === slotName);
         if (slotIndex === -1) {
-          property.value.properties.push(j.objectProperty(j.identifier(slotName), removedValue));
+          // Create new slot
+          const slotValue = slotPropName ? j.objectExpression([j.objectProperty(j.identifier(slotPropName), removedValue)]) : removedValue;
+          property.value.properties.push(j.objectProperty(j.identifier(slotName), slotValue));
         } else {
-          const slotPropsSlotValue = property.value.properties.splice(slotIndex, 1)[0].value;
-          property.value.properties.push(j.objectProperty(j.identifier(slotName), j.objectExpression([j.spreadElement(removedValue), j.spreadElement(slotPropsSlotValue)])));
+          // Add property to existing slot
+          const existingSlot = property.value.properties[slotIndex].value;
+          if (slotPropName) {
+            if (existingSlot.type === 'ObjectExpression') {
+              existingSlot.properties.push(j.objectProperty(j.identifier(slotPropName), removedValue));
+            } else {
+              property.value.properties[slotIndex].value = j.objectExpression([j.objectProperty(j.identifier(slotPropName), removedValue)]);
+            }
+          } else {
+            property.value.properties[slotIndex].value = j.objectExpression([j.spreadElement(removedValue), j.spreadElement(existingSlot)]);
+          }
         }
       }
     });
     if (!hasSlotProps) {
-      defaultProps.properties.push(j.objectProperty(j.identifier('slotProps'), j.objectExpression([j.objectProperty(j.identifier(slotName), removedValue)])));
+      // Create new slotProps
+      const slotValue = slotPropName ? j.objectExpression([j.objectProperty(j.identifier(slotPropName), removedValue)]) : removedValue;
+      defaultProps.properties.push(j.objectProperty(j.identifier('slotProps'), j.objectExpression([j.objectProperty(j.identifier(slotName), slotValue)])));
     }
     path.prune();
   });
@@ -78,26 +101,28 @@ function moveDefaultPropsPropIntoslotProps(j, defaultPropsPathCollection, propNa
  * If there are duplicated values, the values will be spread.
  *
  * @param {import('jscodeshift')} j
- * @param {{ root: import('jscodeshift').Collection; componentName: string, propName: string, slotName: string }} options
+ * @param {{ root: import('jscodeshift').Collection; componentName: string, propName: string, slotName: string, slotPropName?: string }} options
  *
  * @example <Component TransitionProps={value} /> => <Component slotProps={{ transition: value }} />
+ * @example <Component tooltipClasses={classes} /> => <Component slotProps={{ tooltip: { classes: classes } }} />
  */
 function movePropIntoSlotProps(j, options) {
   const {
     root,
     componentName,
     propName,
-    slotName
+    slotName,
+    slotPropName
   } = options;
   (0, _findComponentJSX.default)(j, {
     root,
     componentName
   }, elementPath => {
-    moveJsxPropIntoSlotProps(j, elementPath.node, propName, slotName);
+    moveJsxPropIntoSlotProps(j, elementPath.node, propName, slotName, slotPropName);
   });
   const defaultPropsPathCollection = (0, _findComponentDefaultProps.default)(j, {
     root,
     componentName
   });
-  moveDefaultPropsPropIntoslotProps(j, defaultPropsPathCollection, propName, slotName);
+  moveDefaultPropsPropIntoslotProps(j, defaultPropsPathCollection, propName, slotName, slotPropName);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/codemod",
-  "version": "6.4.3",
+  "version": "6.4.6",
   "bin": "./codemod.js",
   "private": false,
   "author": "MUI Team",