@feathersjs/feathers 5.0.0-pre.14 → 5.0.0-pre.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +18 -0
- package/lib/application.d.ts +11 -11
- package/lib/application.js +5 -5
- package/lib/application.js.map +1 -1
- package/lib/declarations.d.ts +51 -33
- package/lib/hooks/index.d.ts +2 -3
- package/lib/hooks/index.js +24 -12
- package/lib/hooks/index.js.map +1 -1
- package/lib/hooks/regular.d.ts +12 -0
- package/lib/hooks/regular.js +169 -0
- package/lib/hooks/regular.js.map +1 -0
- package/lib/service.js +1 -0
- package/lib/service.js.map +1 -1
- package/lib/version.d.ts +1 -1
- package/lib/version.js +1 -1
- package/package.json +6 -6
- package/src/application.ts +22 -22
- package/src/declarations.ts +52 -37
- package/src/hooks/index.ts +27 -14
- package/src/hooks/regular.ts +207 -0
- package/src/service.ts +1 -0
- package/src/version.ts +1 -1
- package/lib/hooks/legacy.d.ts +0 -7
- package/lib/hooks/legacy.js +0 -126
- package/lib/hooks/legacy.js.map +0 -1
- package/src/hooks/legacy.ts +0 -150
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,24 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [5.0.0-pre.15](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.14...v5.0.0-pre.15) (2021-11-27)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **typescript:** Overall typing improvements ([#2478](https://github.com/feathersjs/feathers/issues/2478)) ([b8eb804](https://github.com/feathersjs/feathers/commit/b8eb804158556d9651a8607e3c3fda15e0bfd110))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
### Features
|
|
15
|
+
|
|
16
|
+
* **core:** add `context.http` and move `statusCode` there ([#2496](https://github.com/feathersjs/feathers/issues/2496)) ([b701bf7](https://github.com/feathersjs/feathers/commit/b701bf77fb83048aa1dffa492b3d77dd53f7b72b))
|
|
17
|
+
* **core:** Improve legacy hooks integration ([08c8b40](https://github.com/feathersjs/feathers/commit/08c8b40999bf3889c61a4d4fad97a2c4f78bafc9))
|
|
18
|
+
* **transport-commons:** Ability to register routes with custom params ([#2482](https://github.com/feathersjs/feathers/issues/2482)) ([497990a](https://github.com/feathersjs/feathers/commit/497990ae4a980e5a52a1f0f932db12cd0e6e254a))
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
6
24
|
# [5.0.0-pre.14](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.13...v5.0.0-pre.14) (2021-10-13)
|
|
7
25
|
|
|
8
26
|
**Note:** Version bump only for package @feathersjs/feathers
|
package/lib/application.d.ts
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { EventEmitter } from './dependencies';
|
|
3
3
|
import { FeathersApplication, ServiceMixin, Service, ServiceOptions, ServiceInterface, Application, HookOptions, FeathersService, HookMap } from './declarations';
|
|
4
|
-
export declare class Feathers<
|
|
5
|
-
services:
|
|
6
|
-
settings:
|
|
7
|
-
mixins: ServiceMixin<Application<
|
|
4
|
+
export declare class Feathers<Services, Settings> extends EventEmitter implements FeathersApplication<Services, Settings> {
|
|
5
|
+
services: Services;
|
|
6
|
+
settings: Settings;
|
|
7
|
+
mixins: ServiceMixin<Application<Services, Settings>>[];
|
|
8
8
|
version: string;
|
|
9
9
|
_isSetup: boolean;
|
|
10
|
-
appHooks: HookMap<Application<
|
|
11
|
-
private
|
|
10
|
+
appHooks: HookMap<Application<Services, Settings>, any>;
|
|
11
|
+
private regularHooks;
|
|
12
12
|
constructor();
|
|
13
|
-
get<L extends keyof
|
|
14
|
-
set<L extends keyof
|
|
13
|
+
get<L extends keyof Settings & string>(name: L): Settings[L];
|
|
14
|
+
set<L extends keyof Settings & string>(name: L, value: Settings[L]): this;
|
|
15
15
|
configure(callback: (this: this, app: this) => void): this;
|
|
16
|
-
defaultService(location: string): ServiceInterface
|
|
17
|
-
service<L extends keyof
|
|
18
|
-
use<L extends keyof
|
|
16
|
+
defaultService(location: string): ServiceInterface;
|
|
17
|
+
service<L extends keyof Services & string>(location: L): FeathersService<this, keyof any extends keyof Services ? Service : Services[L]>;
|
|
18
|
+
use<L extends keyof Services & string>(path: L, service: keyof any extends keyof Services ? ServiceInterface | Application : Services[L], options?: ServiceOptions): this;
|
|
19
19
|
hooks(hookMap: HookOptions<this, any>): any;
|
|
20
20
|
setup(): Promise<this>;
|
|
21
21
|
}
|
package/lib/application.js
CHANGED
|
@@ -9,7 +9,7 @@ const dependencies_1 = require("./dependencies");
|
|
|
9
9
|
const events_1 = require("./events");
|
|
10
10
|
const index_1 = require("./hooks/index");
|
|
11
11
|
const service_1 = require("./service");
|
|
12
|
-
const
|
|
12
|
+
const regular_1 = require("./hooks/regular");
|
|
13
13
|
const debug = (0, dependencies_1.createDebug)('@feathersjs/feathers');
|
|
14
14
|
class Feathers extends dependencies_1.EventEmitter {
|
|
15
15
|
constructor() {
|
|
@@ -22,7 +22,7 @@ class Feathers extends dependencies_1.EventEmitter {
|
|
|
22
22
|
this.appHooks = {
|
|
23
23
|
[dependencies_1.HOOKS]: [events_1.eventHook]
|
|
24
24
|
};
|
|
25
|
-
this.
|
|
25
|
+
this.regularHooks = (0, regular_1.enableRegularHooks)(this);
|
|
26
26
|
}
|
|
27
27
|
get(name) {
|
|
28
28
|
return this.settings[name];
|
|
@@ -77,9 +77,9 @@ class Feathers extends dependencies_1.EventEmitter {
|
|
|
77
77
|
return this;
|
|
78
78
|
}
|
|
79
79
|
hooks(hookMap) {
|
|
80
|
-
const
|
|
81
|
-
if (
|
|
82
|
-
return this.
|
|
80
|
+
const regularMap = hookMap;
|
|
81
|
+
if (regularMap.before || regularMap.after || regularMap.error) {
|
|
82
|
+
return this.regularHooks(regularMap);
|
|
83
83
|
}
|
|
84
84
|
if (Array.isArray(hookMap)) {
|
|
85
85
|
this.appHooks[dependencies_1.HOOKS].push(...hookMap);
|
package/lib/application.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"application.js","sourceRoot":"","sources":["../src/application.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAgC;AAChC,iDAEwB;AACxB,qCAAiD;AACjD,yCAA0C;AAC1C,uCAA6E;AAa7E,
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../src/application.ts"],"names":[],"mappings":"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"}
|
package/lib/declarations.d.ts
CHANGED
|
@@ -13,8 +13,11 @@ export interface ServiceOptions {
|
|
|
13
13
|
events?: string[];
|
|
14
14
|
methods?: string[];
|
|
15
15
|
serviceEvents?: string[];
|
|
16
|
+
routeParams?: {
|
|
17
|
+
[key: string]: any;
|
|
18
|
+
};
|
|
16
19
|
}
|
|
17
|
-
export interface ServiceMethods<T, D = Partial<T>> {
|
|
20
|
+
export interface ServiceMethods<T = any, D = Partial<T>> {
|
|
18
21
|
find(params?: Params): Promise<T | T[]>;
|
|
19
22
|
get(id: Id, params?: Params): Promise<T>;
|
|
20
23
|
create(data: D, params?: Params): Promise<T>;
|
|
@@ -23,7 +26,7 @@ export interface ServiceMethods<T, D = Partial<T>> {
|
|
|
23
26
|
remove(id: NullableId, params?: Params): Promise<T | T[]>;
|
|
24
27
|
setup(app: Application, path: string): Promise<void>;
|
|
25
28
|
}
|
|
26
|
-
export interface ServiceOverloads<T, D
|
|
29
|
+
export interface ServiceOverloads<T = any, D = Partial<T>> {
|
|
27
30
|
create?(data: D[], params?: Params): Promise<T[]>;
|
|
28
31
|
update?(id: Id, data: D, params?: Params): Promise<T>;
|
|
29
32
|
update?(id: null, data: D, params?: Params): Promise<T[]>;
|
|
@@ -32,9 +35,9 @@ export interface ServiceOverloads<T, D> {
|
|
|
32
35
|
remove?(id: Id, params?: Params): Promise<T>;
|
|
33
36
|
remove?(id: null, params?: Params): Promise<T[]>;
|
|
34
37
|
}
|
|
35
|
-
export declare type Service<T, D = Partial<T>> = ServiceMethods<T, D> & ServiceOverloads<T, D>;
|
|
36
|
-
export declare type ServiceInterface<T, D = Partial<T>> = Partial<ServiceMethods<T, D>>;
|
|
37
|
-
export interface ServiceAddons<A = Application, S = Service
|
|
38
|
+
export declare type Service<T = any, D = Partial<T>> = ServiceMethods<T, D> & ServiceOverloads<T, D>;
|
|
39
|
+
export declare type ServiceInterface<T = any, D = Partial<T>> = Partial<ServiceMethods<T, D>>;
|
|
40
|
+
export interface ServiceAddons<A = Application, S = Service> extends EventEmitter {
|
|
38
41
|
id?: string;
|
|
39
42
|
hooks(options: HookOptions<A, S>): this;
|
|
40
43
|
}
|
|
@@ -46,14 +49,16 @@ export interface ServiceHookOverloads<S> {
|
|
|
46
49
|
patch(id: NullableId, data: ServiceGenericData<S>, params: Params, context: HookContext): Promise<HookContext>;
|
|
47
50
|
remove(id: NullableId, params: Params, context: HookContext): Promise<HookContext>;
|
|
48
51
|
}
|
|
49
|
-
export declare type FeathersService<A = FeathersApplication, S = Service
|
|
50
|
-
export declare type
|
|
51
|
-
[
|
|
52
|
+
export declare type FeathersService<A = FeathersApplication, S = Service> = S & ServiceAddons<A, S> & OptionalPick<ServiceHookOverloads<S>, keyof S>;
|
|
53
|
+
export declare type CustomMethods<T extends {
|
|
54
|
+
[key: string]: [any, any];
|
|
55
|
+
}> = {
|
|
56
|
+
[K in keyof T]: (data: T[K][0], params?: Params) => Promise<T[K][1]>;
|
|
52
57
|
};
|
|
53
|
-
export declare type ServiceMixin<A> = (service: FeathersService<A>, path: string, options
|
|
58
|
+
export declare type ServiceMixin<A> = (service: FeathersService<A>, path: string, options: ServiceOptions) => void;
|
|
54
59
|
export declare type ServiceGenericType<S> = S extends ServiceInterface<infer T> ? T : any;
|
|
55
60
|
export declare type ServiceGenericData<S> = S extends ServiceInterface<infer _T, infer D> ? D : any;
|
|
56
|
-
export interface FeathersApplication<
|
|
61
|
+
export interface FeathersApplication<Services = any, Settings = any> {
|
|
57
62
|
/**
|
|
58
63
|
* The Feathers application version
|
|
59
64
|
*/
|
|
@@ -61,19 +66,19 @@ export interface FeathersApplication<ServiceTypes = any, AppSettings = any> {
|
|
|
61
66
|
/**
|
|
62
67
|
* A list of callbacks that run when a new service is registered
|
|
63
68
|
*/
|
|
64
|
-
mixins: ServiceMixin<Application<
|
|
69
|
+
mixins: ServiceMixin<Application<Services, Settings>>[];
|
|
65
70
|
/**
|
|
66
71
|
* The index of all services keyed by their path.
|
|
67
72
|
*
|
|
68
73
|
* __Important:__ Services should always be retrieved via `app.service('name')`
|
|
69
74
|
* not via `app.services`.
|
|
70
75
|
*/
|
|
71
|
-
services:
|
|
76
|
+
services: Services;
|
|
72
77
|
/**
|
|
73
78
|
* The application settings that can be used via
|
|
74
79
|
* `app.get` and `app.set`
|
|
75
80
|
*/
|
|
76
|
-
settings:
|
|
81
|
+
settings: Settings;
|
|
77
82
|
/**
|
|
78
83
|
* A private-ish indicator if `app.setup()` has been called already
|
|
79
84
|
*/
|
|
@@ -81,20 +86,20 @@ export interface FeathersApplication<ServiceTypes = any, AppSettings = any> {
|
|
|
81
86
|
/**
|
|
82
87
|
* Contains all registered application level hooks.
|
|
83
88
|
*/
|
|
84
|
-
appHooks: HookMap<Application<
|
|
89
|
+
appHooks: HookMap<Application<Services, Settings>, any>;
|
|
85
90
|
/**
|
|
86
91
|
* Retrieve an application setting by name
|
|
87
92
|
*
|
|
88
93
|
* @param name The setting name
|
|
89
94
|
*/
|
|
90
|
-
get<L extends keyof
|
|
95
|
+
get<L extends keyof Settings & string>(name: L): Settings[L];
|
|
91
96
|
/**
|
|
92
97
|
* Set an application setting
|
|
93
98
|
*
|
|
94
99
|
* @param name The setting name
|
|
95
100
|
* @param value The setting value
|
|
96
101
|
*/
|
|
97
|
-
set<L extends keyof
|
|
102
|
+
set<L extends keyof Settings & string>(name: L, value: Settings[L]): this;
|
|
98
103
|
/**
|
|
99
104
|
* Runs a callback configure function with the current application instance.
|
|
100
105
|
*
|
|
@@ -108,7 +113,7 @@ export interface FeathersApplication<ServiceTypes = any, AppSettings = any> {
|
|
|
108
113
|
*
|
|
109
114
|
* @param location The path of the service
|
|
110
115
|
*/
|
|
111
|
-
defaultService(location: string): ServiceInterface
|
|
116
|
+
defaultService(location: string): ServiceInterface;
|
|
112
117
|
/**
|
|
113
118
|
* Register a new service or a sub-app. When passed another
|
|
114
119
|
* Feathers application, all its services will be re-registered
|
|
@@ -119,7 +124,7 @@ export interface FeathersApplication<ServiceTypes = any, AppSettings = any> {
|
|
|
119
124
|
* Feathers application to use a sub-app under the `path` prefix.
|
|
120
125
|
* @param options The options for this service
|
|
121
126
|
*/
|
|
122
|
-
use<L extends keyof
|
|
127
|
+
use<L extends keyof Services & string>(path: L, service: keyof any extends keyof Services ? ServiceInterface | Application : Services[L], options?: ServiceOptions): this;
|
|
123
128
|
/**
|
|
124
129
|
* Get the Feathers service instance for a path. This will
|
|
125
130
|
* be the service originally registered with Feathers functionality
|
|
@@ -127,7 +132,7 @@ export interface FeathersApplication<ServiceTypes = any, AppSettings = any> {
|
|
|
127
132
|
*
|
|
128
133
|
* @param path The name of the service.
|
|
129
134
|
*/
|
|
130
|
-
service<L extends keyof
|
|
135
|
+
service<L extends keyof Services & string>(path: L): FeathersService<this, keyof any extends keyof Services ? Service : Services[L]>;
|
|
131
136
|
setup(server?: any): Promise<this>;
|
|
132
137
|
/**
|
|
133
138
|
* Register application level hooks.
|
|
@@ -136,7 +141,7 @@ export interface FeathersApplication<ServiceTypes = any, AppSettings = any> {
|
|
|
136
141
|
*/
|
|
137
142
|
hooks(map: HookOptions<this, any>): this;
|
|
138
143
|
}
|
|
139
|
-
export interface Application<
|
|
144
|
+
export interface Application<Services = any, Settings = any> extends FeathersApplication<Services, Settings>, EventEmitter {
|
|
140
145
|
}
|
|
141
146
|
export declare type Id = number | string;
|
|
142
147
|
export declare type NullableId = Id | null;
|
|
@@ -147,13 +152,20 @@ export interface Params {
|
|
|
147
152
|
query?: Query;
|
|
148
153
|
provider?: string;
|
|
149
154
|
route?: {
|
|
150
|
-
[key: string]:
|
|
155
|
+
[key: string]: any;
|
|
151
156
|
};
|
|
152
157
|
headers?: {
|
|
153
158
|
[key: string]: any;
|
|
154
159
|
};
|
|
155
160
|
[key: string]: any;
|
|
156
161
|
}
|
|
162
|
+
export interface Http {
|
|
163
|
+
/**
|
|
164
|
+
* A writeable, optional property that allows to override the standard HTTP status
|
|
165
|
+
* code that should be returned.
|
|
166
|
+
*/
|
|
167
|
+
statusCode?: number;
|
|
168
|
+
}
|
|
157
169
|
export interface HookContext<A = Application, S = any> extends BaseHookContext<ServiceGenericType<S>> {
|
|
158
170
|
/**
|
|
159
171
|
* A read only property that contains the Feathers application object. This can be used to
|
|
@@ -224,28 +236,34 @@ export interface HookContext<A = Application, S = any> extends BaseHookContext<S
|
|
|
224
236
|
/**
|
|
225
237
|
* A writeable, optional property that allows to override the standard HTTP status
|
|
226
238
|
* code that should be returned.
|
|
239
|
+
*
|
|
240
|
+
* @deprecated Use `http.statusCode` instead.
|
|
227
241
|
*/
|
|
228
242
|
statusCode?: number;
|
|
243
|
+
/**
|
|
244
|
+
* A writeable, optional property that contains options specific to HTTP transports.
|
|
245
|
+
*/
|
|
246
|
+
http?: Http;
|
|
229
247
|
/**
|
|
230
248
|
* The event emitted by this method. Can be set to `null` to skip event emitting.
|
|
231
249
|
*/
|
|
232
250
|
event: string | null;
|
|
233
251
|
}
|
|
234
|
-
export declare type
|
|
235
|
-
export declare type Hook<A = Application, S = Service
|
|
236
|
-
declare type
|
|
237
|
-
[L in keyof S]?: SelfOrArray<
|
|
252
|
+
export declare type RegularHookFunction<A = Application, S = Service> = (this: S, context: HookContext<A, S>) => (Promise<HookContext<Application, S> | void> | HookContext<Application, S> | void);
|
|
253
|
+
export declare type Hook<A = Application, S = Service> = RegularHookFunction<A, S>;
|
|
254
|
+
declare type RegularHookMethodMap<A, S> = {
|
|
255
|
+
[L in keyof S]?: SelfOrArray<RegularHookFunction<A, S>>;
|
|
238
256
|
} & {
|
|
239
|
-
all?: SelfOrArray<
|
|
257
|
+
all?: SelfOrArray<RegularHookFunction<A, S>>;
|
|
240
258
|
};
|
|
241
|
-
declare type
|
|
242
|
-
export declare type
|
|
243
|
-
before?:
|
|
244
|
-
after?:
|
|
245
|
-
error?:
|
|
259
|
+
declare type RegularHookTypeMap<A, S> = SelfOrArray<RegularHookFunction<A, S>> | RegularHookMethodMap<A, S>;
|
|
260
|
+
export declare type RegularHookMap<A, S> = {
|
|
261
|
+
before?: RegularHookTypeMap<A, S>;
|
|
262
|
+
after?: RegularHookTypeMap<A, S>;
|
|
263
|
+
error?: RegularHookTypeMap<A, S>;
|
|
246
264
|
};
|
|
247
|
-
export declare type HookFunction<A = Application, S = Service
|
|
265
|
+
export declare type HookFunction<A = Application, S = Service> = (context: HookContext<A, S>, next: NextFunction) => Promise<void>;
|
|
248
266
|
export declare type HookMap<A, S> = {
|
|
249
267
|
[L in keyof S]?: HookFunction<A, S>[];
|
|
250
268
|
};
|
|
251
|
-
export declare type HookOptions<A, S> = HookMap<A, S> | HookFunction<A, S>[] |
|
|
269
|
+
export declare type HookOptions<A, S> = HookMap<A, S> | HookFunction<A, S>[] | RegularHookMap<A, S>;
|
package/lib/hooks/index.d.ts
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { HookContextData, HookManager, Middleware } from '../dependencies';
|
|
2
2
|
import { Service, ServiceOptions, HookContext, FeathersService, Application } from '../declarations';
|
|
3
|
-
|
|
4
|
-
export
|
|
5
|
-
export declare function createContext(service: Service<any>, method: string, data?: HookContextData): HookContext<Application<any, any>, any>;
|
|
3
|
+
export { fromBeforeHook, fromBeforeHooks, fromAfterHook, fromAfterHooks, fromErrorHook, fromErrorHooks } from './regular';
|
|
4
|
+
export declare function createContext(service: Service, method: string, data?: HookContextData): HookContext<Application<any, any>, any>;
|
|
6
5
|
export declare class FeathersHookManager<A> extends HookManager {
|
|
7
6
|
app: A;
|
|
8
7
|
method: string;
|
package/lib/hooks/index.js
CHANGED
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.hookMixin = exports.FeathersHookManager = exports.createContext = exports.fromErrorHooks = exports.
|
|
3
|
+
exports.hookMixin = exports.FeathersHookManager = exports.createContext = exports.fromErrorHooks = exports.fromErrorHook = exports.fromAfterHooks = exports.fromAfterHook = exports.fromBeforeHooks = exports.fromBeforeHook = void 0;
|
|
4
4
|
const dependencies_1 = require("../dependencies");
|
|
5
5
|
const service_1 = require("../service");
|
|
6
|
-
const
|
|
7
|
-
|
|
8
|
-
Object.defineProperty(exports, "fromBeforeHook", { enumerable: true, get: function () { return
|
|
9
|
-
Object.defineProperty(exports, "
|
|
6
|
+
const regular_1 = require("./regular");
|
|
7
|
+
var regular_2 = require("./regular");
|
|
8
|
+
Object.defineProperty(exports, "fromBeforeHook", { enumerable: true, get: function () { return regular_2.fromBeforeHook; } });
|
|
9
|
+
Object.defineProperty(exports, "fromBeforeHooks", { enumerable: true, get: function () { return regular_2.fromBeforeHooks; } });
|
|
10
|
+
Object.defineProperty(exports, "fromAfterHook", { enumerable: true, get: function () { return regular_2.fromAfterHook; } });
|
|
11
|
+
Object.defineProperty(exports, "fromAfterHooks", { enumerable: true, get: function () { return regular_2.fromAfterHooks; } });
|
|
12
|
+
Object.defineProperty(exports, "fromErrorHook", { enumerable: true, get: function () { return regular_2.fromErrorHook; } });
|
|
13
|
+
Object.defineProperty(exports, "fromErrorHooks", { enumerable: true, get: function () { return regular_2.fromErrorHooks; } });
|
|
10
14
|
function createContext(service, method, data = {}) {
|
|
11
15
|
const createContext = service[method].createContext;
|
|
12
16
|
if (typeof createContext !== 'function') {
|
|
@@ -25,10 +29,10 @@ class FeathersHookManager extends dependencies_1.HookManager {
|
|
|
25
29
|
collectMiddleware(self, args) {
|
|
26
30
|
const app = this.app;
|
|
27
31
|
const appHooks = app.appHooks[dependencies_1.HOOKS].concat(app.appHooks[this.method] || []);
|
|
28
|
-
const
|
|
32
|
+
const regularAppHooks = (0, regular_1.collectRegularHooks)(this.app, this.method);
|
|
29
33
|
const middleware = super.collectMiddleware(self, args);
|
|
30
|
-
const
|
|
31
|
-
return [...appHooks, ...
|
|
34
|
+
const regularHooks = (0, regular_1.collectRegularHooks)(self, this.method);
|
|
35
|
+
return [...appHooks, ...regularAppHooks, ...middleware, ...regularHooks];
|
|
32
36
|
}
|
|
33
37
|
initializeContext(self, args, context) {
|
|
34
38
|
const ctx = super.initializeContext(self, args, context);
|
|
@@ -46,7 +50,8 @@ function hookMixin(service, path, options) {
|
|
|
46
50
|
return service;
|
|
47
51
|
}
|
|
48
52
|
const app = this;
|
|
49
|
-
const
|
|
53
|
+
const hookMethods = (0, service_1.getHookMethods)(service, options);
|
|
54
|
+
const serviceMethodHooks = hookMethods.reduce((res, method) => {
|
|
50
55
|
const params = service_1.defaultServiceArguments[method] || ['data', 'params'];
|
|
51
56
|
res[method] = new FeathersHookManager(app, method)
|
|
52
57
|
.params(...params)
|
|
@@ -56,15 +61,22 @@ function hookMixin(service, path, options) {
|
|
|
56
61
|
method,
|
|
57
62
|
service,
|
|
58
63
|
event: null,
|
|
59
|
-
type: null
|
|
64
|
+
type: null,
|
|
65
|
+
get statusCode() {
|
|
66
|
+
var _a;
|
|
67
|
+
return (_a = this.http) === null || _a === void 0 ? void 0 : _a.statusCode;
|
|
68
|
+
},
|
|
69
|
+
set statusCode(value) {
|
|
70
|
+
(this.http || (this.http = {})).statusCode = value;
|
|
71
|
+
}
|
|
60
72
|
});
|
|
61
73
|
return res;
|
|
62
74
|
}, {});
|
|
63
|
-
const
|
|
75
|
+
const handleRegularHooks = (0, regular_1.enableRegularHooks)(service, hookMethods);
|
|
64
76
|
(0, dependencies_1.hooks)(service, serviceMethodHooks);
|
|
65
77
|
service.hooks = function (hookOptions) {
|
|
66
78
|
if (hookOptions.before || hookOptions.after || hookOptions.error) {
|
|
67
|
-
return
|
|
79
|
+
return handleRegularHooks.call(this, hookOptions);
|
|
68
80
|
}
|
|
69
81
|
if (Array.isArray(hookOptions)) {
|
|
70
82
|
return (0, dependencies_1.hooks)(this, hookOptions);
|
package/lib/hooks/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":";;;AAAA,kDAEyB;AAIzB,wCAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { HookFunction, RegularHookFunction, RegularHookMap } from '../declarations';
|
|
2
|
+
export declare function fromBeforeHook<A, S>(hook: RegularHookFunction<A, S>): HookFunction<A, S>;
|
|
3
|
+
export declare function fromAfterHook<A, S>(hook: RegularHookFunction<A, S>): HookFunction<A, S>;
|
|
4
|
+
export declare function fromErrorHook<A, S>(hook: RegularHookFunction<A, S>): HookFunction<A, S>;
|
|
5
|
+
export declare function fromBeforeHooks<A, S>(hooks: RegularHookFunction<A, S>[]): HookFunction<unknown, unknown>;
|
|
6
|
+
export declare function fromAfterHooks<A, S>(hooks: RegularHookFunction<A, S>[]): HookFunction<unknown, unknown>;
|
|
7
|
+
export declare function fromErrorHooks<A, S>(hooks: RegularHookFunction<A, S>[]): HookFunction<unknown, unknown>;
|
|
8
|
+
export declare function collectRegularHooks(target: any, method: string): any;
|
|
9
|
+
export declare function convertHookData(input: any): {
|
|
10
|
+
[method: string]: RegularHookFunction<import("../declarations").Application<any, any>, import("../declarations").Service<any, Partial<any>>>[];
|
|
11
|
+
};
|
|
12
|
+
export declare function enableRegularHooks(object: any, methods?: string[]): (this: any, input: RegularHookMap<any, any>) => any;
|
|
@@ -0,0 +1,169 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.enableRegularHooks = exports.convertHookData = exports.collectRegularHooks = exports.fromErrorHooks = exports.fromAfterHooks = exports.fromBeforeHooks = exports.fromErrorHook = exports.fromAfterHook = exports.fromBeforeHook = void 0;
|
|
4
|
+
const service_1 = require("../service");
|
|
5
|
+
const runHook = (hook, context, type) => {
|
|
6
|
+
if (type)
|
|
7
|
+
context.type = type;
|
|
8
|
+
return Promise.resolve(hook.call(context.self, context))
|
|
9
|
+
.then((res) => {
|
|
10
|
+
if (type)
|
|
11
|
+
context.type = null;
|
|
12
|
+
if (res && res !== context) {
|
|
13
|
+
Object.assign(context, res);
|
|
14
|
+
}
|
|
15
|
+
});
|
|
16
|
+
};
|
|
17
|
+
function fromBeforeHook(hook) {
|
|
18
|
+
return (context, next) => {
|
|
19
|
+
return runHook(hook, context, 'before').then(next);
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
exports.fromBeforeHook = fromBeforeHook;
|
|
23
|
+
function fromAfterHook(hook) {
|
|
24
|
+
return (context, next) => {
|
|
25
|
+
return next().then(() => runHook(hook, context, 'after'));
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
exports.fromAfterHook = fromAfterHook;
|
|
29
|
+
function fromErrorHook(hook) {
|
|
30
|
+
return (context, next) => {
|
|
31
|
+
return next().catch((error) => {
|
|
32
|
+
if (context.error !== error || context.result !== undefined) {
|
|
33
|
+
context.original = { ...context };
|
|
34
|
+
context.error = error;
|
|
35
|
+
delete context.result;
|
|
36
|
+
}
|
|
37
|
+
return runHook(hook, context, 'error').then(() => {
|
|
38
|
+
if (context.result === undefined && context.error !== undefined) {
|
|
39
|
+
throw context.error;
|
|
40
|
+
}
|
|
41
|
+
});
|
|
42
|
+
});
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
exports.fromErrorHook = fromErrorHook;
|
|
46
|
+
const RunHooks = (hooks) => (context) => {
|
|
47
|
+
return hooks.reduce((promise, hook) => {
|
|
48
|
+
return promise.then(() => runHook(hook, context));
|
|
49
|
+
}, Promise.resolve(undefined));
|
|
50
|
+
};
|
|
51
|
+
function fromBeforeHooks(hooks) {
|
|
52
|
+
return fromBeforeHook(RunHooks(hooks));
|
|
53
|
+
}
|
|
54
|
+
exports.fromBeforeHooks = fromBeforeHooks;
|
|
55
|
+
function fromAfterHooks(hooks) {
|
|
56
|
+
return fromAfterHook(RunHooks(hooks));
|
|
57
|
+
}
|
|
58
|
+
exports.fromAfterHooks = fromAfterHooks;
|
|
59
|
+
function fromErrorHooks(hooks) {
|
|
60
|
+
return fromErrorHook(RunHooks(hooks));
|
|
61
|
+
}
|
|
62
|
+
exports.fromErrorHooks = fromErrorHooks;
|
|
63
|
+
function collectRegularHooks(target, method) {
|
|
64
|
+
return target.__hooks.hooks[method] || [];
|
|
65
|
+
}
|
|
66
|
+
exports.collectRegularHooks = collectRegularHooks;
|
|
67
|
+
// Converts different hook registration formats into the
|
|
68
|
+
// same internal format
|
|
69
|
+
function convertHookData(input) {
|
|
70
|
+
const result = {};
|
|
71
|
+
if (Array.isArray(input)) {
|
|
72
|
+
result.all = input;
|
|
73
|
+
}
|
|
74
|
+
else if (typeof input !== 'object') {
|
|
75
|
+
result.all = [input];
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
for (const key of Object.keys(input)) {
|
|
79
|
+
const value = input[key];
|
|
80
|
+
result[key] = Array.isArray(value) ? value : [value];
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
return result;
|
|
84
|
+
}
|
|
85
|
+
exports.convertHookData = convertHookData;
|
|
86
|
+
const types = ['before', 'after', 'error'];
|
|
87
|
+
const isType = (value) => types.includes(value);
|
|
88
|
+
const wrappers = {
|
|
89
|
+
before: fromBeforeHooks,
|
|
90
|
+
after: fromAfterHooks,
|
|
91
|
+
error: fromErrorHooks
|
|
92
|
+
};
|
|
93
|
+
const createStore = (methods) => {
|
|
94
|
+
const store = {
|
|
95
|
+
before: {},
|
|
96
|
+
after: {},
|
|
97
|
+
error: {},
|
|
98
|
+
hooks: {}
|
|
99
|
+
};
|
|
100
|
+
for (const method of methods) {
|
|
101
|
+
store.hooks[method] = [];
|
|
102
|
+
}
|
|
103
|
+
return store;
|
|
104
|
+
};
|
|
105
|
+
const setStore = (object, store) => {
|
|
106
|
+
Object.defineProperty(object, '__hooks', {
|
|
107
|
+
configurable: true,
|
|
108
|
+
value: store,
|
|
109
|
+
writable: true
|
|
110
|
+
});
|
|
111
|
+
};
|
|
112
|
+
const getStore = (object) => object.__hooks;
|
|
113
|
+
const createMap = (input, methods) => {
|
|
114
|
+
const map = {};
|
|
115
|
+
Object.keys(input).forEach((type) => {
|
|
116
|
+
if (!isType(type)) {
|
|
117
|
+
throw new Error(`'${type}' is not a valid hook type`);
|
|
118
|
+
}
|
|
119
|
+
const data = convertHookData(input[type]);
|
|
120
|
+
Object.keys(data).forEach((method) => {
|
|
121
|
+
if (method !== 'all' && !methods.includes(method)) {
|
|
122
|
+
throw new Error(`'${method}' is not a valid hook method`);
|
|
123
|
+
}
|
|
124
|
+
});
|
|
125
|
+
map[type] = data;
|
|
126
|
+
});
|
|
127
|
+
return map;
|
|
128
|
+
};
|
|
129
|
+
const createAdapter = (type) => {
|
|
130
|
+
const hooks = [];
|
|
131
|
+
const hook = wrappers[type](hooks);
|
|
132
|
+
const adapter = Object.assign(hook, { hooks });
|
|
133
|
+
return adapter;
|
|
134
|
+
};
|
|
135
|
+
const updateStore = (store, map) => {
|
|
136
|
+
Object.keys(store.hooks).forEach((method) => {
|
|
137
|
+
let adapted = false;
|
|
138
|
+
Object.keys(map).forEach((key) => {
|
|
139
|
+
var _a;
|
|
140
|
+
const type = key;
|
|
141
|
+
const allHooks = map[type].all || [];
|
|
142
|
+
const methodHooks = map[type][method] || [];
|
|
143
|
+
if (allHooks.length || methodHooks.length) {
|
|
144
|
+
const adapter = (_a = store[type])[method] || (_a[method] = (adapted = true, createAdapter(type)));
|
|
145
|
+
adapter.hooks.push(...allHooks, ...methodHooks);
|
|
146
|
+
}
|
|
147
|
+
});
|
|
148
|
+
if (adapted) {
|
|
149
|
+
store.hooks[method] = [
|
|
150
|
+
store.error[method],
|
|
151
|
+
store.before[method],
|
|
152
|
+
store.after[method]
|
|
153
|
+
].filter(hook => hook);
|
|
154
|
+
}
|
|
155
|
+
});
|
|
156
|
+
};
|
|
157
|
+
// Add `.hooks` functionality to an object
|
|
158
|
+
function enableRegularHooks(object, methods = service_1.defaultServiceMethods) {
|
|
159
|
+
const store = createStore(methods);
|
|
160
|
+
setStore(object, store);
|
|
161
|
+
return function regularHooks(input) {
|
|
162
|
+
const store = getStore(this);
|
|
163
|
+
const map = createMap(input, methods);
|
|
164
|
+
updateStore(store, map);
|
|
165
|
+
return this;
|
|
166
|
+
};
|
|
167
|
+
}
|
|
168
|
+
exports.enableRegularHooks = enableRegularHooks;
|
|
169
|
+
//# sourceMappingURL=regular.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"regular.js","sourceRoot":"","sources":["../../src/hooks/regular.ts"],"names":[],"mappings":"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"}
|
package/lib/service.js
CHANGED
package/lib/service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
|