fix(deps): Updates to core v7.

package.json

@@ -25,7 +25,7 @@
     "check-coverage": true
   },
   "dependencies": {
-    "@js-entity-repos/core": "^6.0.2",
+    "@js-entity-repos/core": "^7.1.0",
     "lodash": "^4.17.4",
     "sift": "^5.0.0"
   },

src/functions/getEntities.ts

@@ -1,6 +1,9 @@
 import GetEntities from '@js-entity-repos/core/dist/signatures/GetEntities';
 import Entity from '@js-entity-repos/core/dist/types/Entity';
+import Pagination from '@js-entity-repos/core/dist/types/Pagination';
+import { forward } from '@js-entity-repos/core/dist/types/PaginationDirection';
 import Sort from '@js-entity-repos/core/dist/types/Sort';
+import { asc } from '@js-entity-repos/core/dist/types/SortOrder';
 import createCursorFromEntity from '@js-entity-repos/core/dist/utils/createCursorFromEntity';
 import createPaginationFilter from '@js-entity-repos/core/dist/utils/createPaginationFilter';
 import { first, last } from 'lodash';
@@ -9,20 +12,20 @@ import filterEntities from '../utils/filterEntities';
 import sortEntities from '../utils/sortEntities';
 
 export default <E extends Entity>(config: Config<E>): GetEntities<E> => {
-  const defaultPagination = {
+  const defaultPagination: Pagination = {
     cursor: undefined,
-    forward: true,
+    direction: forward,
     limit: config.defaultPaginationLimit,
   };
-  const defaultSort = { id: true } as Sort<E>;
+  const defaultSort = { id: asc } as Sort<E>;
   return async ({ filter = {}, sort = defaultSort, pagination = defaultPagination }) => {
     const paginationFilter = createPaginationFilter(pagination, sort);
     const fullFilter = { $and: [filter, paginationFilter] };
     const storedEntities = config.getEntities();
     const matchedEntities = filterEntities({ entities: storedEntities, filter: fullFilter });
     const sortedEntities = sortEntities({ entities: matchedEntities, sort });
-    const start = pagination.forward ? 0 : 0 - pagination.limit;
-    const end = pagination.forward ? pagination.limit : undefined;
+    const start = pagination.direction === forward ? 0 : 0 - pagination.limit;
+    const end = pagination.direction === forward ? pagination.limit : undefined;
     const entities = sortedEntities.slice(start, end);
     const nextCursor = createCursorFromEntity(last(entities), sort);
     const previousCursor = createCursorFromEntity(first(entities), sort);

src/utils/sortEntities.ts

@@ -1,5 +1,6 @@
 import Entity from '@js-entity-repos/core/dist/types/Entity';
 import Sort from '@js-entity-repos/core/dist/types/Sort';
+import SortOrder, { asc } from '@js-entity-repos/core/dist/types/SortOrder';
 import { orderBy } from 'lodash';
 
 export interface Opts<E extends Entity> {
@@ -10,8 +11,8 @@ export interface Opts<E extends Entity> {
 export default <E extends Entity>({ entities, sort }: Opts<E>) => {
   const sortKeys = Object.keys(sort);
   const sortDirections = sortKeys.map((sortKey) => {
-    const sortAscending = (sort as any)[sortKey] as boolean;
-    return sortAscending ? 'asc' : 'desc';
+    const sortOrder = (sort as any)[sortKey] as SortOrder;
+    return sortOrder === asc ? 'asc' : 'desc';
   });
   return orderBy(entities, sortKeys, sortDirections);
 };