wip [skip ci]

Author: johnsoncodehk

packages/runtime-core/src/apiDefineComponent.ts

@@ -145,7 +145,7 @@ type InferComponentOptions<T> = T &
           >,
           ExtractMixinSetupBindings<Mixin> &
             ExtractMixinSetupBindings<Extends> &
-            SetupBindings,
+            EnsureNonVoid<SetupBindings>,
           ExtractMixinData<Mixin> &
             ExtractMixinData<Extends> &
             EnsureNonVoid<Data>,

packages/runtime-core/src/apiSetupHelpers.ts

@@ -206,7 +206,7 @@ export function defineOptions<
     {},
     ExtractMixinSetupBindings<Mixin> &
       ExtractMixinSetupBindings<Extends> &
-      RawBindings,
+      EnsureNonVoid<RawBindings>,
     ExtractMixinData<Mixin> & ExtractMixinData<Extends> & EnsureNonVoid<D>,
     ExtractMixinComputed<Mixin> & ExtractMixinComputed<Extends> & C,
     ExtractMixinMethods<Mixin> & ExtractMixinMethods<Extends> & M

packages/runtime-core/src/componentPublicInstance.ts

@@ -149,9 +149,7 @@ export type CreateComponentPublicInstanceWithMixins<
   TypeEl extends Element = any,
   Provide extends ComponentProvideOptions = ComponentProvideOptions,
   // mixin inference
-  PublicP = ExtractMixinProps<Mixin> &
-    ExtractMixinProps<Extends> &
-    EnsureNonVoid<P>,
+  PublicP = ExtractMixinProps<Mixin> & ExtractMixinProps<Extends> & P,
   PublicB = ExtractMixinSetupBindings<Mixin> &
     ExtractMixinSetupBindings<Extends> &
     EnsureNonVoid<B>,
@@ -160,11 +158,11 @@ export type CreateComponentPublicInstanceWithMixins<
     EnsureNonVoid<D>,
   PublicC extends ComputedOptions = ExtractMixinComputed<Mixin> &
     ExtractMixinComputed<Extends> &
-    EnsureNonVoid<C>,
+    C,
   PublicM extends MethodOptions = ExtractMixinMethods<Mixin> &
     ExtractMixinMethods<Extends> &
-    EnsureNonVoid<M>,
-  PublicDefaults = {} & EnsureNonVoid<Defaults>, // TODO
+    M,
+  PublicDefaults = {} & Defaults, // TODO
 > = ComponentPublicInstance<
   PublicP,
   PublicB,