fix(typescript): Move Paginated type back for better compatibility (#…

…2350)
feathersjs · May 13, 2021 · 2917d05 · 2917d05
1 parent b8bc362
commit 2917d05
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/packages/adapter-commons/src/index.ts b/packages/adapter-commons/src/index.ts
@@ -1,6 +1,6 @@
 import { _ } from '@feathersjs/commons';
 
-export { AdapterService, InternalServiceMethods, ServiceOptions, Paginated } from './service';
+export { AdapterService, InternalServiceMethods, ServiceOptions } from './service';
 export { filterQuery, FILTERS, OPERATORS } from './filter-query';
 export * from './sort';
 

diff --git a/packages/adapter-commons/src/service.ts b/packages/adapter-commons/src/service.ts
@@ -1,14 +1,7 @@
 import { NotImplemented, BadRequest, MethodNotAllowed } from '@feathersjs/errors';
-import { ServiceMethods, Params, Id, NullableId } from '@feathersjs/feathers';
+import { ServiceMethods, Params, Id, NullableId, Paginated } from '@feathersjs/feathers';
 import { filterQuery } from './filter-query';
 
-export interface Paginated<T> {
-  total: number;
-  limit: number;
-  skip: number;
-  data: T[];
-}
-
 const callMethod = (self: any, name: any, ...args: any[]) => {
   if (typeof self[name] !== 'function') {
     return Promise.reject(new NotImplemented(`Method ${name} not available`));

diff --git a/packages/feathers/src/declarations.ts b/packages/feathers/src/declarations.ts
@@ -7,6 +7,13 @@ type OptionalPick<T, K extends PropertyKey> = Pick<T, Extract<keyof T, K>>
 
 export type { NextFunction };
 
+export interface Paginated<T> {
+  total: number;
+  limit: number;
+  skip: number;
+  data: T[];
+}
+
 export interface ServiceOptions {
   events?: string[];
   methods?: string[];