fix(types): add a type-only differentiator to assist Mixin's type inf…

…er (#3481)

fix #3468

packages/runtime-core/src/componentOptions.ts

@@ -424,6 +424,16 @@ interface LegacyOptions<
 
  // runtime compile only
  delimiters?: [string, string]
+
+ /**
+ * #3468
+ *
+ * type-only, used to assist Mixin's type inference,
+ * typescript will try to simplify the inferred `Mixin` type,
+ * with the `__differenciator`, typescript won't be able to combine different mixins,
+ * because the `__differenciator` will be different
+ */
+ __differentiator?: keyof D | keyof C | keyof M
 }
 
 export type OptionTypesKeys = 'P' | 'B' | 'D' | 'C' | 'M' | 'Defaults'

test-dts/defineComponent.test-d.tsx

@@ -775,6 +775,41 @@ describe('extends with mixins', () => {
  expectError(<MyComponent p2={'wrong type'} z={'z'} />)
  // @ts-expect-error
  expectError(<MyComponent mP1={3} />)
+
+ // #3468
+ const CompWithD = defineComponent({
+ data() {
+ return { foo: 1 }
+ }
+ })
+ const CompWithC = defineComponent({
+ computed: {
+ foo() {
+ return 1
+ }
+ }
+ })
+ const CompWithM = defineComponent({ methods: { foo() {} } })
+ const CompEmpty = defineComponent({})
+
+ defineComponent({
+ mixins: [CompWithD, CompEmpty],
+ mounted() {
+ expectType<number>(this.foo)
+ }
+ })
+ defineComponent({
+ mixins: [CompWithC, CompEmpty],
+ mounted() {
+ expectType<number>(this.foo)
+ }
+ })
+ defineComponent({
+ mixins: [CompWithM, CompEmpty],
+ mounted() {
+ expectType<() => void>(this.foo)
+ }
+ })
 })
 
 describe('compatibility w/ createApp', () => {