feat(macros): props allowed to be overridden for defineComponent

Author: zhiyuanzmj

packages/macros/src/core/define-component/index.ts

@@ -90,7 +90,21 @@ export function transformDefineComponent(
         `, {${hasRestProp ? 'inheritAttrs: false,' : ''} props: {\n${propsString}\n} }`,
       )
     } else if (argument.type === 'ObjectExpression') {
-      prependObjectExpression(argument, 'props', `{\n${propsString}\n}`, s)
+      const resolvedPropsString = `{\n${propsString}\n}`
+      const prop = prependObjectExpression(
+        argument,
+        'props',
+        resolvedPropsString,
+        s,
+      )
+      if (
+        prop &&
+        prop.type === 'ObjectProperty' &&
+        prop.value.type === 'ObjectExpression'
+      ) {
+        s.appendLeft(prop.value.start!, `{...${resolvedPropsString}, ...`)
+        s.appendRight(prop.value.end!, '}')
+      }
       if (hasRestProp) {
         prependObjectExpression(argument, 'inheritAttrs', 'false', s)
       }
@@ -109,16 +123,16 @@ function prependObjectExpression(
   value: string,
   s: MagicStringAST,
 ) {
-  if (
-    !argument.properties?.find(
-      (prop) =>
-        prop.type === 'ObjectProperty' &&
-        prop.key.type === 'Identifier' &&
-        prop.key.name === name,
-    )
-  ) {
+  const prop = argument.properties?.find(
+    (prop) =>
+      prop.type === 'ObjectProperty' &&
+      prop.key.type === 'Identifier' &&
+      prop.key.name === name,
+  )
+  if (!prop) {
     s.appendRight(argument.start! + 1, `${name}: ${value},`)
   }
+  return prop
 }
 
 function getWalkedIds(root: FunctionalNode, propsName: string) {

packages/macros/tests/__snapshots__/fixtures.spec.ts.snap

@@ -22,7 +22,7 @@ const Comp = defineComponent(
       <__MACROS_props.Comp />
     </div>
   },
-  {props: {
+  {inheritAttrs: false, name: 'Comp', props: {...{
 'bar': { required: true, type: String, default: 'bar' }, 
 'Comp': null, 
 'modelValue': null, 
@@ -33,7 +33,7 @@ const Comp = defineComponent(
         }, type: String }, 
 'onUpdate:foo': null, 
 'fooModifiers': null
-},inheritAttrs: false, name: 'Comp' },
+}, ...{ Comp: Object }} },
 )
 
 const Comp1 = defineComponent((props: { bar: 'bar'; 'onUpdate:bar': any, comp: any }) => {
@@ -120,7 +120,7 @@ const Comp = defineComponent(
       <__MACROS_props.Comp />
     </div>
   },
-  {props: {
+  {inheritAttrs: false, name: 'Comp', props: {...{
 'bar': { required: true, type: String, default: 'bar' }, 
 'Comp': null, 
 'modelValue': null, 
@@ -131,7 +131,7 @@ const Comp = defineComponent(
         }, type: String }, 
 'onUpdate:foo': null, 
 'fooModifiers': null
-},inheritAttrs: false, name: 'Comp' },
+}, ...{ Comp: Object }} },
 )
 
 const Comp1 = defineComponent((props: { bar: 'bar'; 'onUpdate:bar': any, comp: any }) => {

packages/macros/tests/fixtures/define-component.tsx

@@ -16,7 +16,7 @@ const Comp = defineComponent(
       <Comp />
     </div>
   },
-  { name: 'Comp' },
+  { name: 'Comp', props: { Comp: Object } },
 )
 
 const Comp1 = defineComponent((props: { bar: 'bar'; 'onUpdate:bar': any, comp: any }) => {