fix(compiler-sfc): infer TSIntersectionType in defineProps (#7394)

vuejs · Mar 28, 2023 · 151a8ad · 151a8ad
1 parent 1b69d5f
commit 151a8ad
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
@@ -1643,6 +1643,7 @@ export default /*#__PURE__*/_defineComponent({
     literalUnionNumber: { type: Number, required: true },
     literalUnionMixed: { type: [String, Number, Boolean], required: true },
     intersection: { type: Object, required: true },
+    intersection2: { type: String, required: true },
     foo: { type: [Function, null], required: true }
   },
   setup(__props: any, { expose }) {

diff --git a/packages/compiler-sfc/__tests__/compileScript.spec.ts b/packages/compiler-sfc/__tests__/compileScript.spec.ts
@@ -972,6 +972,7 @@ const emit = defineEmits(['a', 'b'])
         literalUnionNumber: 1 | 2 | 3 | 4 | 5
         literalUnionMixed: 'foo' | 1 | boolean
         intersection: Test & {}
+        intersection2: 'foo' & ('foo' | 'bar')
         foo: ((item: any) => boolean) | null
       }>()
       </script>`)
@@ -1014,6 +1015,7 @@ const emit = defineEmits(['a', 'b'])
         `literalUnionMixed: { type: [String, Number, Boolean], required: true }`
       )
       expect(content).toMatch(`intersection: { type: Object, required: true }`)
+      expect(content).toMatch(`intersection2: { type: String, required: true }`)
       expect(content).toMatch(`foo: { type: [Function, null], required: true }`)
       expect(bindings).toStrictEqual({
         string: BindingTypes.PROPS,
@@ -1044,6 +1046,7 @@ const emit = defineEmits(['a', 'b'])
         literalUnionNumber: BindingTypes.PROPS,
         literalUnionMixed: BindingTypes.PROPS,
         intersection: BindingTypes.PROPS,
+        intersection2: BindingTypes.PROPS,
         foo: BindingTypes.PROPS
       })
     })

diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
@@ -2088,15 +2088,14 @@ function inferRuntimeType(
     case 'TSParenthesizedType':
       return inferRuntimeType(node.typeAnnotation, declaredTypes)
     case 'TSUnionType':
+    case 'TSIntersectionType':
       return [
         ...new Set(
           [].concat(
             ...(node.types.map(t => inferRuntimeType(t, declaredTypes)) as any)
           )
         )
       ]
-    case 'TSIntersectionType':
-      return ['Object']
 
     case 'TSSymbolKeyword':
       return ['Symbol']