fix(associative): update arg types and generics for selectKeys()/with…

…outKeys()
thi-ng · Aug 20, 2023 · 4fa9ea1 · 4fa9ea1
1 parent f142348
commit 4fa9ea1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/packages/associative/src/select-keys.ts b/packages/associative/src/select-keys.ts
@@ -1,3 +1,4 @@
+import type { Keys } from "@thi.ng/api";
 import { empty } from "./empty.js";
 
 /**
@@ -44,13 +45,13 @@ export const selectDefinedKeysMap = <K, V>(
  * @param src - source object
  * @param ks - selected keys
  */
-export const selectKeysObj = <T extends object, K extends keyof T>(
+export const selectKeysObj = <T extends object>(
 	src: T,
-	ks: Iterable<K>
+	ks: Iterable<Keys<T>>
 ): Partial<T> => {
-	const dest: any = {};
+	const dest: Partial<T> = {};
 	for (let k of ks) {
-		src.hasOwnProperty(k) && (dest[k] = (<any>src)[<any>k]);
+		src.hasOwnProperty(k) && (dest[k] = src[k]);
 	}
 	return dest;
 };

diff --git a/packages/associative/src/without-keys.ts b/packages/associative/src/without-keys.ts
@@ -1,4 +1,4 @@
-import type { IObjectOf } from "@thi.ng/api";
+import type { Keys } from "@thi.ng/api";
 import { ensureSet } from "./checks.js";
 import { empty } from "./empty.js";
 
@@ -12,14 +12,16 @@ export const withoutKeysMap = <K, V>(src: Map<K, V>, keys: Iterable<K>) => {
 	return dest;
 };
 
-export const withoutKeysObj = <T>(
-	src: IObjectOf<T>,
-	keys: Iterable<PropertyKey>
+export const withoutKeysObj = <T extends object>(
+	src: T,
+	keys: Iterable<Keys<T>>
 ) => {
 	const ks = ensureSet(keys);
-	const dest: IObjectOf<T> = {};
+	const dest: Partial<T> = {};
 	for (let k in src) {
-		src.hasOwnProperty(k) && !ks.has(k) && (dest[k] = src[<any>k]);
+		src.hasOwnProperty(k) &&
+			!ks.has(<Keys<T>>k) &&
+			(dest[k] = src[<Keys<T>>k]);
 	}
 	return dest;
 };