Type signatures for getEntityRecord and getEntityRecords

WordPress · May 26, 2022 · c5a97cf · c5a97cf
1 parent 0d5c143
commit c5a97cf
Show file tree

Hide file tree

Showing 4 changed files with 374 additions and 246 deletions.
diff --git a/packages/core-data/src/entity-types/index.ts b/packages/core-data/src/entity-types/index.ts
@@ -20,7 +20,6 @@ import type { Widget } from './widget';
 import type { WidgetType } from './widget-type';
 import type { WpTemplate } from './wp-template';
 import type { WpTemplatePart } from './wp-template-part';
-import type { EntityQuery, State } from '../selectors';
 import type { CoreEntities } from '../entities';
 
 export type { EntityType } from './entities';
@@ -134,9 +133,10 @@ export type KeyOf<
 	RecordOrKind extends EntityRecord | Kind,
 	N extends Name = undefined,
 	E extends EntityConfig = EntityConfigOf< RecordOrKind, N >
-> = E[ 'key' ] extends keyof E[ 'record' ]
+> = ( E[ 'key' ] extends keyof E[ 'record' ]
 	? E[ 'record' ][ E[ 'key' ] ]
-	: never;
+	: never ) &
+	( number | string );
 
 /**
  * Default context of the requested entity, sourced from PerPackageEntities.

diff --git a/packages/core-data/src/rememo.d.ts b/packages/core-data/src/rememo.d.ts