refactor ♻️: omitkeys and pickkeys functions.

- Refactor the omitKeys function to use a generic type to represent the keys to omit. - Refactor the pickKeys function to return the correct type.
zayne-labs · Oct 9, 2024 · 9e42bec · 9e42bec
1 parent 347b442
commit 9e42bec
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/.changeset/big-spies-turn.md b/.changeset/big-spies-turn.md
@@ -0,0 +1,8 @@
+---
+"@zayne-labs/toolkit": patch
+---
+
+refactor ♻️: omitkeys and pickkeys functions.
+
+-  Refactor the omitKeys function to use a generic type to represent the keys to omit.
+-  Refactor the pickKeys function to return the correct type.
diff --git a/src/core/omitKeys.ts b/src/core/omitKeys.ts
@@ -1,5 +1,7 @@
 import type { AnyObject } from "@/type-helpers";
 
+type OmitKeys<TKeys extends keyof TObject, TObject extends AnyObject> = Omit<TObject, TKeys>;
+
 export const omitKeys = <TObject extends AnyObject, const TOmitArray extends Array<keyof TObject>>(
 	initialObject: TObject,
 	keysToOmit: TOmitArray
@@ -14,7 +16,7 @@ export const omitKeys = <TObject extends AnyObject, const TOmitArray extends Arr
 		}
 	}
 
-	return updatedObject as Omit<TObject, TOmitArray[number]>;
+	return updatedObject as OmitKeys<TOmitArray[number], TObject>;
 };
 
 export const omitKeysWithReduce = <
@@ -34,7 +36,7 @@ export const omitKeysWithReduce = <
 		return accumulator;
 	}, {});
 
-	return updatedObject as Omit<TObject, TOmitArray[number]>;
+	return updatedObject as OmitKeys<TOmitArray[number], TObject>;
 };
 
 export const omitKeysWithFilter = <
@@ -52,5 +54,5 @@ export const omitKeysWithFilter = <
 
 	const updatedObject = Object.fromEntries(arrayFromFilteredObject);
 
-	return updatedObject as Omit<TObject, TOmitArray[number]>;
+	return updatedObject as OmitKeys<TOmitArray[number], TObject>;
 };
diff --git a/src/core/pickKeys.ts b/src/core/pickKeys.ts
@@ -1,5 +1,7 @@
 import type { AnyObject } from "@/type-helpers";
 
+type PickKeys<TKeys extends keyof TObject, TObject extends AnyObject> = Pick<TObject, TKeys>;
+
 export const pickKeys = <TObject extends AnyObject, const TPickArray extends Array<keyof TObject>>(
 	initialObject: TObject,
 	keysToPick: TPickArray
@@ -14,7 +16,7 @@ export const pickKeys = <TObject extends AnyObject, const TPickArray extends Arr
 		}
 	}
 
-	return updatedObject as Pick<TObject, TPickArray[number]>;
+	return updatedObject as PickKeys<TPickArray[number], TObject>;
 };
 
 export const pickKeysWithReduce = <
@@ -34,7 +36,7 @@ export const pickKeysWithReduce = <
 		return accumulator;
 	}, {});
 
-	return updatedObject as Pick<TObject, TPickArray[number]>;
+	return updatedObject as PickKeys<TPickArray[number], TObject>;
 };
 
 export const pickKeysWithFilter = <
@@ -50,5 +52,5 @@ export const pickKeysWithFilter = <
 
 	const updatedObject = Object.fromEntries(arrayFromFilteredObject);
 
-	return updatedObject as Pick<TObject, TPickArray[number]>;
+	return updatedObject as PickKeys<TPickArray[number], TObject>;
 };