Skip to content
This repository was archived by the owner on Jun 15, 2021. It is now read-only.

Commit 00d4953

Browse files
authored
fix(deps): Updates to core v7. (#12)
BREAKING CHANGE: Updates to [core v7](https://github.com/js-entity-repos/core/releases/tag/v7.0.0).
1 parent bdeb490 commit 00d4953

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"check-coverage": true
2626
},
2727
"dependencies": {
28-
"@js-entity-repos/core": "^6.0.2",
28+
"@js-entity-repos/core": "^7.1.0",
2929
"lodash": "^4.17.4",
3030
"sift": "^5.0.0"
3131
},

src/functions/getEntities.ts

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import GetEntities from '@js-entity-repos/core/dist/signatures/GetEntities';
22
import Entity from '@js-entity-repos/core/dist/types/Entity';
3+
import Pagination from '@js-entity-repos/core/dist/types/Pagination';
4+
import { forward } from '@js-entity-repos/core/dist/types/PaginationDirection';
35
import Sort from '@js-entity-repos/core/dist/types/Sort';
6+
import { asc } from '@js-entity-repos/core/dist/types/SortOrder';
47
import createCursorFromEntity from '@js-entity-repos/core/dist/utils/createCursorFromEntity';
58
import createPaginationFilter from '@js-entity-repos/core/dist/utils/createPaginationFilter';
69
import { first, last } from 'lodash';
@@ -9,20 +12,20 @@ import filterEntities from '../utils/filterEntities';
912
import sortEntities from '../utils/sortEntities';
1013

1114
export default <E extends Entity>(config: Config<E>): GetEntities<E> => {
12-
const defaultPagination = {
15+
const defaultPagination: Pagination = {
1316
cursor: undefined,
14-
forward: true,
17+
direction: forward,
1518
limit: config.defaultPaginationLimit,
1619
};
17-
const defaultSort = { id: true } as Sort<E>;
20+
const defaultSort = { id: asc } as Sort<E>;
1821
return async ({ filter = {}, sort = defaultSort, pagination = defaultPagination }) => {
1922
const paginationFilter = createPaginationFilter(pagination, sort);
2023
const fullFilter = { $and: [filter, paginationFilter] };
2124
const storedEntities = config.getEntities();
2225
const matchedEntities = filterEntities({ entities: storedEntities, filter: fullFilter });
2326
const sortedEntities = sortEntities({ entities: matchedEntities, sort });
24-
const start = pagination.forward ? 0 : 0 - pagination.limit;
25-
const end = pagination.forward ? pagination.limit : undefined;
27+
const start = pagination.direction === forward ? 0 : 0 - pagination.limit;
28+
const end = pagination.direction === forward ? pagination.limit : undefined;
2629
const entities = sortedEntities.slice(start, end);
2730
const nextCursor = createCursorFromEntity(last(entities), sort);
2831
const previousCursor = createCursorFromEntity(first(entities), sort);

src/utils/sortEntities.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Entity from '@js-entity-repos/core/dist/types/Entity';
22
import Sort from '@js-entity-repos/core/dist/types/Sort';
3+
import SortOrder, { asc } from '@js-entity-repos/core/dist/types/SortOrder';
34
import { orderBy } from 'lodash';
45

56
export interface Opts<E extends Entity> {
@@ -10,8 +11,8 @@ export interface Opts<E extends Entity> {
1011
export default <E extends Entity>({ entities, sort }: Opts<E>) => {
1112
const sortKeys = Object.keys(sort);
1213
const sortDirections = sortKeys.map((sortKey) => {
13-
const sortAscending = (sort as any)[sortKey] as boolean;
14-
return sortAscending ? 'asc' : 'desc';
14+
const sortOrder = (sort as any)[sortKey] as SortOrder;
15+
return sortOrder === asc ? 'asc' : 'desc';
1516
});
1617
return orderBy(entities, sortKeys, sortDirections);
1718
};

0 commit comments

Comments
 (0)