Skip to content

Simplify TypeScript types in wordpress/core-data #43515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamziel merged 6 commits into from
Aug 26, 2022
Merged

Simplify TypeScript types in wordpress/core-data #43515

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bfa7395
Simplify the selectors TypeScript types
adamziel Aug 23, 2022
37d8a68
simplify the TypeScript types in packages/core-data
adamziel Aug 23, 2022
6c8321d
Remove the required Context generic argument from entity selector types
adamziel Aug 24, 2022
1d59e3c
Remove UpdatableEntityRecord
adamziel Aug 24, 2022
3306bea
Update the docs for PerPackageEntityRecords
adamziel Aug 24, 2022
a49d76d
Rename EntityQuery to GetRecordsHttpQuery
adamziel Aug 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove the required Context generic argument from entity selector types
  • Loading branch information
@adamziel
adamziel committed Aug 24, 2022
commit 6c8321dd0ad1ac724eaf81fb541a3d073b315c5f
2 changes: 1 addition & 1 deletion docs/reference-guides/data/data-core.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ _Parameters_

_Returns_

- Record.
- `EntityRecord | undefined`: Record.

### getEntityRecordEdits

Expand Down
2 changes: 1 addition & 1 deletion packages/core-data/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ _Parameters_

_Returns_

- Record.
- `EntityRecord | undefined`: Record.

### getEntityRecordEdits

Expand Down
36 changes: 14 additions & 22 deletions packages/core-data/src/selectors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,15 +235,16 @@ export function getEntityConfig(
*/
export const getEntityRecord = createSelector(
<
EntityRecord extends ET.EntityRecord< Context >,
Context extends ET.Context
EntityRecord extends
| ET.EntityRecord< any >
| Partial< ET.EntityRecord< any > >
>(
state: State,
kind: string,
name: string,
key: EntityRecordKey,
query?: EntityQuery
) => {
): EntityRecord | undefined => {
const queriedState = get( state.entities.records, [
kind,
name,
Expand Down Expand Up @@ -272,7 +273,7 @@ export const getEntityRecord = createSelector(
const value = get( item, field );
set( filteredItem, field, value );
}
return filteredItem;
return filteredItem as EntityRecord;
}

return item;
Expand Down Expand Up @@ -311,10 +312,9 @@ export const getEntityRecord = createSelector(
* @return Record.
*/
export function __experimentalGetEntityRecordNoResolver<
EntityRecord extends ET.EntityRecord< Context >,
Context extends ET.Context
EntityRecord extends ET.EntityRecord< any >
>( state: State, kind: string, name: string, key: EntityRecordKey ) {
return getEntityRecord< EntityRecord, Context >( state, kind, name, key );
return getEntityRecord< EntityRecord >( state, kind, name, key );
}

/**
Expand All @@ -329,16 +329,13 @@ export function __experimentalGetEntityRecordNoResolver<
* @return Object with the entity's raw attributes.
*/
export const getRawEntityRecord = createSelector(
<
EntityRecord extends ET.EntityRecord< Context >,
Context extends ET.Context
>(
< EntityRecord extends ET.EntityRecord< any > >(
state: State,
kind: string,
name: string,
key: EntityRecordKey
): EntityRecord | undefined => {
const record = getEntityRecord< EntityRecord, Context >(
const record = getEntityRecord< EntityRecord >(
state,
kind,
name,
Expand Down Expand Up @@ -427,8 +424,9 @@ export function hasEntityRecords(
* @return Records.
*/
export const getEntityRecords = <
EntityRecord extends ET.EntityRecord< Context >,
Context extends ET.Context = 'edit'
EntityRecord extends
| ET.EntityRecord< any >
| Partial< ET.EntityRecord< any > >
>(
state: State,
kind: string,
Expand Down Expand Up @@ -662,10 +660,7 @@ export function hasEditsForEntityRecord(
* @return The entity record, merged with its edits.
*/
export const getEditedEntityRecord = createSelector(
<
EntityRecord extends ET.EntityRecord< Context >,
Context extends ET.Context
>(
< EntityRecord extends ET.EntityRecord< any > >(
state: State,
kind: string,
name: string,
Expand Down Expand Up @@ -1041,10 +1036,7 @@ export function getAutosaves(
*
* @return The autosave for the post and author.
*/
export function getAutosave<
EntityRecord extends ET.EntityRecord< Context >,
Context extends ET.Context
>(
export function getAutosave< EntityRecord extends ET.EntityRecord< any > >(
state: State,
postType: string,
postId: EntityRecordKey,
Expand Down