From 9d5e3d2c2cac0af46afdfeab00715dd744213de7 Mon Sep 17 00:00:00 2001
From: Nandor Kraszlan <nandor.kraszlan@gmail.com>
Date: Fri, 12 Feb 2021 08:08:48 +0000
Subject: [PATCH] Added PR fixes

---
 src/emit.ts                             | 22 +++++++++++++---------
 src/vueWrapper.ts                       |  9 ++++++---
 tests/emit.spec.ts                      |  4 +++-
 tests/features/async-components.spec.ts |  2 --
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/emit.ts b/src/emit.ts
index df2239cfc..bd8797be0 100644
--- a/src/emit.ts
+++ b/src/emit.ts
@@ -1,27 +1,31 @@
-import { setDevtoolsHook, devtools, ComponentPublicInstance } from 'vue'
-import { ComponentInternalInstance } from '@vue/runtime-core'
+import {
+  setDevtoolsHook,
+  devtools,
+  ComponentPublicInstance,
+  ComponentInternalInstance
+} from 'vue'
+
+export type Events<T = unknown> = Record<number, Record<string, T[]>>
 
 const enum DevtoolsHooks {
   COMPONENT_EMIT = 'component:emit'
 }
 
-let componentEvents: Record<string, unknown[]>
-let events: Record<string, typeof componentEvents>
+let events: Events
 
 export function emitted<T = unknown>(
   vm: ComponentPublicInstance,
   eventName?: string
-): undefined | T[] | Record<string, T[]> {
+): undefined | Events<T>[number][string] | Events<T>[number] {
   const cid = vm.$.uid
 
-  const vmEvents = (events as Record<string, Record<string, T[]>>)[cid] || {}
+  const vmEvents: Events<T>[number] = (events as Events<T>)[cid] || {}
   if (eventName) {
-    return vmEvents ? (vmEvents as Record<string, T[]>)[eventName] : undefined
+    return vmEvents ? vmEvents[eventName] : undefined
   }
 
-  return vmEvents as Record<string, T[]>
+  return vmEvents
 }
-type Events = { [id: number]: Record<string, any> }
 
 export const attachEmitListener = () => {
   events = {}
diff --git a/src/vueWrapper.ts b/src/vueWrapper.ts
index 23b3f91f4..445f90274 100644
--- a/src/vueWrapper.ts
+++ b/src/vueWrapper.ts
@@ -13,6 +13,7 @@ import { TriggerOptions } from './createDomEvent'
 import { find, matches } from './utils/find'
 import { mergeDeep, textContent } from './utils'
 import { emitted } from './emit'
+import type { Events } from './emit'
 
 export class VueWrapper<T extends ComponentPublicInstance> {
   private componentVM: T
@@ -74,11 +75,13 @@ export class VueWrapper<T extends ComponentPublicInstance> {
     return true
   }
 
-  emitted<T = unknown>(): Record<string, T[]>
-  emitted<T = unknown>(eventName?: string): undefined | T[]
+  emitted<T = unknown>(): Events<T>[number]
   emitted<T = unknown>(
     eventName?: string
-  ): undefined | T[] | Record<string, T[]> {
+  ): undefined | Events<T>[number][string]
+  emitted<T = unknown>(
+    eventName?: string
+  ): undefined | Events<T>[number][string] | Events<T>[number] {
     return emitted(this.vm, eventName)
   }
 
diff --git a/tests/emit.spec.ts b/tests/emit.spec.ts
index 893f9e625..9f168c6cc 100644
--- a/tests/emit.spec.ts
+++ b/tests/emit.spec.ts
@@ -93,7 +93,9 @@ describe('emitted', () => {
       name: 'Parent',
       setup(props, { emit }) {
         return () =>
-          h(Child, { onHello: (...events: any[]) => emit('parent', ...events) })
+          h(Child, {
+            onHello: (...events: unknown[]) => emit('parent', ...events)
+          })
       }
     })
     const wrapper = mount(Parent)
diff --git a/tests/features/async-components.spec.ts b/tests/features/async-components.spec.ts
index 010beab4d..fe35e43a7 100644
--- a/tests/features/async-components.spec.ts
+++ b/tests/features/async-components.spec.ts
@@ -1,7 +1,5 @@
 import { defineAsyncComponent, defineComponent, h, AppConfig } from 'vue'
-
 import { mount, flushPromises } from '../../src'
-import { ComponentPublicInstance } from '@vue/runtime-core'
 
 const config: AppConfig = {
   optionMergeStrategies: {},