From 57bdaa2220afefbde21118659c1ce2377d6b86d6 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Fri, 18 Sep 2020 12:13:47 +0800
Subject: [PATCH] fix(types): component instance inference without props
 (#2145)

---
 .../runtime-core/src/apiDefineComponent.ts    |  4 ++--
 packages/runtime-core/src/componentOptions.ts | 19 +++----------------
 test-dts/component.test-d.ts                  | 12 ++++++++++++
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts
index ef08d3c6533..9b85638c2dd 100644
--- a/packages/runtime-core/src/apiDefineComponent.ts
+++ b/packages/runtime-core/src/apiDefineComponent.ts
@@ -94,8 +94,8 @@ export function defineComponent<
   Props = {},
   RawBindings = {},
   D = {},
-  C extends ComputedOptions = ComputedOptions,
-  M extends MethodOptions = MethodOptions,
+  C extends ComputedOptions = {},
+  M extends MethodOptions = {},
   Mixin extends ComponentOptionsMixin = ComponentOptionsMixin,
   Extends extends ComponentOptionsMixin = ComponentOptionsMixin,
   E extends EmitsOptions = EmitsOptions,
diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
index 0ff710c36c6..69f1f2afd1e 100644
--- a/packages/runtime-core/src/componentOptions.ts
+++ b/packages/runtime-core/src/componentOptions.ts
@@ -166,8 +166,7 @@ export type ComponentOptionsWithoutProps<
   Mixin extends ComponentOptionsMixin = ComponentOptionsMixin,
   Extends extends ComponentOptionsMixin = ComponentOptionsMixin,
   E extends EmitsOptions = EmitsOptions,
-  EE extends string = string,
-  Defaults = {}
+  EE extends string = string
 > = ComponentOptionsBase<
   Props,
   RawBindings,
@@ -178,23 +177,11 @@ export type ComponentOptionsWithoutProps<
   Extends,
   E,
   EE,
-  Defaults
+  {}
 > & {
   props?: undefined
 } & ThisType<
-    CreateComponentPublicInstance<
-      {},
-      RawBindings,
-      D,
-      C,
-      M,
-      Mixin,
-      Extends,
-      E,
-      Readonly<Props>,
-      Defaults,
-      false
-    >
+    CreateComponentPublicInstance<{}, RawBindings, D, C, M, Mixin, Extends, E>
   >
 
 export type ComponentOptionsWithArrayProps<
diff --git a/test-dts/component.test-d.ts b/test-dts/component.test-d.ts
index 990e370518b..30b3b8e5f53 100644
--- a/test-dts/component.test-d.ts
+++ b/test-dts/component.test-d.ts
@@ -190,6 +190,12 @@ describe('object props', () => {
     expectType<ExpectedProps['ggg']>(setup.setupProps.ggg)
     expectType<ExpectedProps['ffff']>(setup.setupProps.ffff)
     expectType<ExpectedProps['validated']>(setup.setupProps.validated)
+
+    // instance
+    const instance = new MyComponent()
+    expectType<number>(instance.setupA)
+    // @ts-expect-error
+    instance.notExist
   })
 
   describe('options', () => {
@@ -356,6 +362,12 @@ describe('no props', () => {
 
     expectType<number>(rawBindings.setupA)
     expectType<number>(setup.setupA)
+
+    // instance
+    const instance = new MyComponent()
+    expectType<number>(instance.setupA)
+    // @ts-expect-error
+    instance.notExist
   })
 
   describe('options', () => {