From 211c1ca4c6058540fb5fb684600230c3484005c6 Mon Sep 17 00:00:00 2001
From: "Jaron (aider)" <jaron@fishhat.dev>
Date: Sat, 15 Feb 2025 12:14:07 -0600
Subject: [PATCH] refactor: Improve hydration type handling with Omit and
 preserve original properties

---
 src/services/hydrator.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/services/hydrator.ts b/src/services/hydrator.ts
index 05ea297..1e50c1b 100644
--- a/src/services/hydrator.ts
+++ b/src/services/hydrator.ts
@@ -9,8 +9,8 @@ import type { Client } from "./client";
 export type GatewayObject = Message | Channel;
 export type Hydrateable = Context | GatewayObject
 export type Hydrated<T extends Hydrateable, K extends Array<Expectation>> =
-    T extends Message ? HydratedMessage<K> & Partial<HydratedMessage<Expectation[]>> :
-    T extends Context ? HydratedContext<K> & Partial<HydratedContext<Expectation[]>> : never;
+    T extends Message ? HydratedMessage<K> & Omit<T, keyof HydratedMessage<K>> :
+    T extends Context ? HydratedContext<K> & Omit<T, keyof HydratedContext<K>> : never;
 
 /**
  * Hydrates a given data object based on the provided expectations.
@@ -70,10 +70,10 @@ export async function hydrate<T extends Hydrateable, K extends Array<Expectation
     }
 
     // Create a new object that preserves all existing properties
-    const result = { ...data };
+    const result = { ...data } as any;
     
-    // Return with both previous and new hydrated properties preserved
-    return result as Hydrated<T, K>;
+    // Ensure the result is properly typed with both old and new hydrated properties
+    return result as T & Hydrated<T, K>;
 }
 
 /**