Improve generics

Signed-off-by: guido <[email protected]>

Author: widoz

@types/index.d.ts

@@ -1,15 +1,26 @@
-import type { OrderedSet } from 'immutable';
+import type { OrderedSet, Set } from 'immutable';
 import React from 'react';
 
 import { BaseEntityRecords, Context } from '@wordpress/core-data';
 
 export default EntitiesSearch;
 
+// TODO Try to convert it to a module.
 declare namespace EntitiesSearch {
 	type Post<C extends Context = 'view'> = BaseEntityRecords.Post<C>;
 	type PostType<C extends Context = 'view'> = BaseEntityRecords.Type<C>;
 	type Taxonomy<C extends Context = 'view'> = BaseEntityRecords.Taxonomy<C>;
 
+	interface QueryArguments<V>
+		extends Partial<
+			Readonly<{
+				exclude: Set<V>;
+				include: Set<V>;
+				fields: EntitiesSearch.SearchQueryFields;
+				[p: string]: unknown;
+			}>
+		> {}
+
 	interface SearchEntityFields
 		extends Readonly<{
 			id: number;
@@ -109,11 +120,13 @@ declare namespace EntitiesSearch {
 			entities: Omit<BaseControl<E>, 'options'>;
 			searchEntities: (
 				phrase: string,
-				kind: BaseControl<K>['value'],
-				queryArguments?: Record<string, unknown>
+				kind: CompositeEntitiesKinds<E, K>['kind']['value'],
+				queryArguments?: QueryArguments<E>
 			) => Promise<BaseControl<E>['options']>;
 			children(
-				entities: BaseControl<E>,
+				entities: CompositeEntitiesKinds<E, K>['entities'] & {
+					options: BaseControl<E>['options'];
+				},
 				kind: CompositeEntitiesKinds<E, K>['kind'],
 				search: (
 					phrase: Parameters<SearchControl<E, K>['search']>[0]

sources/client/src/api/search-entities.ts

@@ -1,21 +1,13 @@
 import EntitiesSearch from '@types';
-import { OrderedSet, Set } from 'immutable';
+import { OrderedSet } from 'immutable';
 
 import { fetch } from './fetch';
 
-// TODO Parametrize the fields.
-// TODO Write the underline search function.
-// TODO Make the `queryArguments` optional.
 export async function searchEntities<E>(
 	type: string,
 	subtype: OrderedSet<string>,
 	phrase: string,
-	queryArguments: {
-		exclude: Set<string>;
-		include: Set<string>;
-		fields?: EntitiesSearch.SearchQueryFields;
-		[p: string]: unknown;
-	}
+	queryArguments: EntitiesSearch.QueryArguments<string>
 ): Promise<OrderedSet<E>> {
 	const {
 		exclude,

sources/client/src/components/composite-entities-by-kind.tsx

@@ -8,7 +8,7 @@ import { uniqueControlOptions } from '../utils/unique-control-options';
 
 type SearchPhrase = Parameters<EntitiesSearch.SearchControl['onChange']>[0];
 type Entities<V> = EntitiesSearch.BaseControl<V>['value'];
-type Kind<V> = EntitiesSearch.BaseControl<V>['value'];
+type Kind<V> = EntitiesSearch.BaseControl<V>['value'] | V;
 type SearchEntities<P, T> = EntitiesSearch.CompositeEntitiesKinds<
 	P,
 	T
@@ -118,7 +118,7 @@ export function CompositeEntitiesByKind<E, K>(
 			});
 	};
 
-	const onChangeKind = (kind: Kind<K> | K) => {
+	const onChangeKind = (kind: Kind<K>) => {
 		const _kind =
 			kind instanceof OrderedSet ? kind : OrderedSet<K>([kind as K]);