8000 fix(typescript): Move Paginated type back for better compatibility by daffl · Pull Request #2350 · feathersjs/feathers · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

< 8000 /form>
Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/adapter-commons/src/index.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
9 changes: 1 addition & 8 deletions packages/adapter-commons/src/service.ts
Original file line number Diff line number Diff line change
@@ -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`));
Expand Down
7 changes: 7 additions & 0 deletions packages/feathers/src/declarations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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[];
Expand Down
0