refactor(types): revert data(vm)

fxy060608 · Aug 7, 2024 · 70bb336 · 70bb336
1 parent 3b2481f
commit 70bb336
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/packages/dts-test/defineComponent.test-d.tsx b/packages/dts-test/defineComponent.test-d.tsx
@@ -546,12 +546,11 @@ describe('with mixins', () => {
       },
     },
 
-    data(/*vm*/) {
-      // fixed by uts
-      // expectType<number>(vm.a)
-      // expectType<number>(vm.b)
-      // expectType<number>(vm.c)
-      // expectType<number>(vm.d)
+    data(vm) {
+      expectType<number>(vm.a)
+      expectType<number>(vm.b)
+      expectType<number>(vm.c)
+      expectType<number>(vm.d)
 
       // should also expose declared props on `this`
       expectType<number>(this.a)

diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts
@@ -484,16 +484,15 @@ interface LegacyOptions<
       Mixin,
       Extends
     >,
-    // fixed by xxxxxx
-    // vm: CreateComponentPublicInstance<
-    //   Props,
-    //   {},
-    //   {},
-    //   {},
-    //   MethodOptions,
-    //   Mixin,
-    //   Extends
-    // >,
+    vm: CreateComponentPublicInstance<
+      Props,
+      {},
+      {},
+      {},
+      MethodOptions,
+      Mixin,
+      Extends
+    >,
   ) => D
   computed?: C
   methods?: M
@@ -715,7 +714,7 @@ export function applyOptions(instance: ComponentInternalInstance) {
           `Plain object usage is no longer supported.`,
       )
     }
-    const data = dataOptions.call(publicThis /*, publicThis*/) // fixed by xxxxxx
+    const data = dataOptions.call(publicThis, publicThis)
     if (__DEV__ && isPromise(data)) {
       warn(
         `data() returned a Promise - note data() cannot be async; If you ` +