feat: improve types

yannbcf · Jun 19, 2023 · 1196a23 · 1196a23
1 parent 4887495
commit 1196a23
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@yannbcf/altv-rpc",
-    "version": "0.4.3",
+    "version": "0.4.4",
     "type": "module",
     "author": "YannBcf",
     "main": "./dist/index.js",

diff --git a/src/events/client.ts b/src/events/client.ts
@@ -46,9 +46,9 @@ export type AltClientEvent = {
     entityHitEntity: { damager: alt.Entity; target: alt.Entity; weaponHash: number };
 };
 
-export type ClientEvent = AltClientEvent & {
-    removeEvent: () => void;
-};
+export type ClientEvent = {
+    [K in keyof AltClientEvent]: AltClientEvent[K] & { removeEvent: () => void }
+}
 
 export function getAltClientEventKeys(): (keyof alt.IClientEvent)[] {
     const events = [

diff --git a/src/events/server.ts b/src/events/server.ts
@@ -51,9 +51,9 @@ export type AltServerEvent = {
     metaChange: { target: alt.BaseObject; key: string; value: AllowedAny; oldValue: AllowedAny };
 };
 
-export type ServerEvent = AltServerEvent & {
-    removeEvent: () => void;
-};
+export type ServerEvent = {
+    [K in keyof AltServerEvent]: AltServerEvent[K] & { removeEvent: () => void }
+}
 
 export function getAltServerEventKeys(): (keyof alt.IServerEvent)[] {
     const events = [