refactor: proper type for hasSetupState util function

vuejs · Nov 15, 2022 · 5523220 · 5523220
1 parent a091420
commit 5523220
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/mount.ts b/src/mount.ts
@@ -485,8 +485,8 @@ export function mount(
           // otherwise we run into a proxy set error
           // due to https://github.com/vuejs/core/commit/f73925d76a76ee259749b8b48cb68895f539a00f#diff-ea4d1ddabb7e22e17e80ada458eef70679af4005df2a1a6b73418fec897603ceR404
           // introduced in Vue v3.2.45
-          if (hasSetupState(this as any)) {
-            ;(this as any).$.setupState[k] = v
+          if (hasSetupState(this)) {
+            this.$.setupState[k] = v
           } else {
             ;(this as any)[k] = v
           }

diff --git a/src/utils.ts b/src/utils.ts
@@ -188,7 +188,9 @@ export function getDirectivesFromStubs(
 }
 export function hasSetupState(
   vm: ComponentPublicInstance
-): vm is ComponentPublicInstance & { setupState: Record<string, unknown> } {
+): vm is ComponentPublicInstance & {
+  $: { setupState: Record<string, unknown> }
+} {
   return (
     vm &&
     (vm.$ as unknown as { devtoolsRawSetupState: any }).devtoolsRawSetupState

diff --git a/src/vueWrapper.ts b/src/vueWrapper.ts
@@ -108,7 +108,7 @@ export class VueWrapper<
     // or for components with a setup that returns a render function (as they have an empty proxy)
     // in both cases, we return `vm` directly instead
     if (hasSetupState(vm)) {
-      this.componentVM = createVMProxy<T>(vm, (vm.$ as any).setupState)
+      this.componentVM = createVMProxy<T>(vm, vm.$.setupState)
     } else {
       this.componentVM = vm
     }