@eggjs/router 4.0.0-beta.19 → 4.0.0-beta.21

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/dist/EggRouter.js CHANGED
@@ -1,208 +1,238 @@
1
+ import assert from 'node:assert';
2
+ import { encodeURIComponent as safeEncodeURIComponent } from 'utility';
3
+ import inflection from 'inflection';
4
+ import methods from 'methods';
5
+ import { isGeneratorFunction } from 'is-type-of';
1
6
  import { Router } from "./Router.js";
2
- import assert from "node:assert";
3
- import { encodeURIComponent } from "utility";
4
- import inflection from "inflection";
5
- import methods from "methods";
6
- import { isGeneratorFunction } from "is-type-of";
7
-
8
- //#region src/EggRouter.ts
7
+ import {} from "./types.js";
9
8
  const REST_MAP = {
10
- index: {
11
- suffix: "",
12
- method: "GET"
13
- },
14
- new: {
15
- namePrefix: "new_",
16
- member: true,
17
- suffix: "new",
18
- method: "GET"
19
- },
20
- create: {
21
- suffix: "",
22
- method: "POST"
23
- },
24
- show: {
25
- member: true,
26
- suffix: ":id",
27
- method: "GET"
28
- },
29
- edit: {
30
- member: true,
31
- namePrefix: "edit_",
32
- suffix: ":id/edit",
33
- method: "GET"
34
- },
35
- update: {
36
- member: true,
37
- namePrefix: "",
38
- suffix: ":id",
39
- method: ["PATCH", "PUT"]
40
- },
41
- destroy: {
42
- member: true,
43
- namePrefix: "destroy_",
44
- suffix: ":id",
45
- method: "DELETE"
46
- }
9
+ index: {
10
+ suffix: '',
11
+ method: 'GET',
12
+ },
13
+ new: {
14
+ namePrefix: 'new_',
15
+ member: true,
16
+ suffix: 'new',
17
+ method: 'GET',
18
+ },
19
+ create: {
20
+ suffix: '',
21
+ method: 'POST',
22
+ },
23
+ show: {
24
+ member: true,
25
+ suffix: ':id',
26
+ method: 'GET',
27
+ },
28
+ edit: {
29
+ member: true,
30
+ namePrefix: 'edit_',
31
+ suffix: ':id/edit',
32
+ method: 'GET',
33
+ },
34
+ update: {
35
+ member: true,
36
+ namePrefix: '',
37
+ suffix: ':id',
38
+ method: ['PATCH', 'PUT'],
39
+ },
40
+ destroy: {
41
+ member: true,
42
+ namePrefix: 'destroy_',
43
+ suffix: ':id',
44
+ method: 'DELETE',
45
+ },
47
46
  };
48
47
  /**
49
- * FIXME: move these patch into @eggjs/router
50
- */
51
- var EggRouter = class extends Router {
52
- app;
53
- /**
54
- * @class
55
- * @param {Object} opts - Router options.
56
- * @param {Application} app - Application object.
57
- */
58
- constructor(opts, app) {
59
- super(opts);
60
- this.app = app;
61
- }
62
- verb(method, nameOrPath, pathOrMiddleware, ...middleware) {
63
- const { path, middlewares, options } = this._formatRouteParams(nameOrPath, pathOrMiddleware, middleware);
64
- if (typeof method === "string") method = [method];
65
- this.register(path, method, middlewares, options);
66
- return this;
67
- }
68
- head(nameOrPath, pathOrMiddleware, ...middlewares) {
69
- return this.verb("head", nameOrPath, pathOrMiddleware, ...middlewares);
70
- }
71
- options(nameOrPath, pathOrMiddleware, ...middlewares) {
72
- return this.verb("options", nameOrPath, pathOrMiddleware, ...middlewares);
73
- }
74
- get(nameOrPath, pathOrMiddleware, ...middlewares) {
75
- return this.verb("get", nameOrPath, pathOrMiddleware, ...middlewares);
76
- }
77
- put(nameOrPath, pathOrMiddleware, ...middlewares) {
78
- return this.verb("put", nameOrPath, pathOrMiddleware, ...middlewares);
79
- }
80
- patch(nameOrPath, pathOrMiddleware, ...middlewares) {
81
- return this.verb("patch", nameOrPath, pathOrMiddleware, ...middlewares);
82
- }
83
- post(nameOrPath, pathOrMiddleware, ...middlewares) {
84
- return this.verb("post", nameOrPath, pathOrMiddleware, ...middlewares);
85
- }
86
- delete(nameOrPath, pathOrMiddleware, ...middlewares) {
87
- return this.verb("delete", nameOrPath, pathOrMiddleware, ...middlewares);
88
- }
89
- all(nameOrPath, pathOrMiddleware, ...middlewares) {
90
- return this.verb(methods, nameOrPath, pathOrMiddleware, ...middlewares);
91
- }
92
- register(path, methods$1, middleware, opts) {
93
- middleware = Array.isArray(middleware) ? middleware : [middleware];
94
- for (const mw of middleware) if (isGeneratorFunction(mw)) throw new TypeError(methods$1.toString() + " `" + path + "`: Please use async function instead of generator function");
95
- const middlewares = convertMiddlewares(middleware, this.app);
96
- return super.register(path, methods$1, middlewares, opts);
97
- }
98
- resources(nameOrPath, pathOrMiddleware, ...middleware) {
99
- const { path, middlewares, options } = this._formatRouteParams(nameOrPath, pathOrMiddleware, middleware);
100
- const controller = resolveController(middlewares.pop(), this.app);
101
- for (const key in REST_MAP) {
102
- const action = controller[key];
103
- if (!action) continue;
104
- const opts = REST_MAP[key];
105
- let routeName;
106
- if (opts.member) routeName = inflection.singularize(options.name ?? "");
107
- else routeName = inflection.pluralize(options.name ?? "");
108
- if (opts.namePrefix) routeName = opts.namePrefix + routeName;
109
- const prefix = path.replace(/\/$/, "");
110
- const urlPath = opts.suffix ? `${prefix}/${opts.suffix}` : prefix;
111
- const method = Array.isArray(opts.method) ? opts.method : [opts.method];
112
- this.register(urlPath, method, middlewares.concat(action), { name: routeName });
113
- }
114
- return this;
115
- }
116
- /**
117
- * @param {String} name - Router name
118
- * @param {Object} params - more parameters
119
- * @example
120
- * ```js
121
- * router.url('edit_post', { id: 1, name: 'foo', page: 2 })
122
- * => /posts/1/edit?name=foo&page=2
123
- * router.url('posts', { name: 'foo&1', page: 2 })
124
- * => /posts?name=foo%261&page=2
125
- * ```
126
- * @return {String} url by path name and query params.
127
- * @since 1.0.0
128
- */
129
- url(name, params) {
130
- const route = this.route(name);
131
- if (!route) return "";
132
- const args = params;
133
- let url = route.path;
134
- assert(!(url instanceof RegExp), `Can't get the url for regExp ${url} for by name '${name}'`);
135
- const queries = [];
136
- if (typeof args === "object" && args !== null) {
137
- const replacedParams = [];
138
- url = url.replace(/:([a-zA-Z_]\w*)/g, ($0, key) => {
139
- if (key in args) {
140
- const values = args[key];
141
- replacedParams.push(key);
142
- return encodeURIComponent(Array.isArray(values) ? String(values[0]) : String(values));
143
- }
144
- return $0;
145
- });
146
- for (const key in args) {
147
- if (replacedParams.includes(key)) continue;
148
- const values = args[key];
149
- const encodedKey = encodeURIComponent(key);
150
- if (Array.isArray(values)) for (const val of values) queries.push(`${encodedKey}=${encodeURIComponent(String(val))}`);
151
- else queries.push(`${encodedKey}=${encodeURIComponent(String(values))}`);
152
- }
153
- }
154
- if (queries.length > 0) {
155
- const queryStr = queries.join("&");
156
- if (!url.includes("?")) url = `${url}?${queryStr}`;
157
- else url = `${url}&${queryStr}`;
158
- }
159
- return url;
160
- }
161
- /**
162
- * @alias to url()
163
- */
164
- pathFor(name, params) {
165
- return this.url(name, params);
166
- }
167
- };
48
+ * FIXME: move these patch into @eggjs/router
49
+ */
50
+ export class EggRouter extends Router {
51
+ app;
52
+ /**
53
+ * @class
54
+ * @param {Object} opts - Router options.
55
+ * @param {Application} app - Application object.
56
+ */
57
+ constructor(opts, app) {
58
+ super(opts);
59
+ this.app = app;
60
+ }
61
+ verb(method, nameOrPath, pathOrMiddleware, ...middleware) {
62
+ const { path, middlewares, options } = this._formatRouteParams(nameOrPath, pathOrMiddleware, middleware);
63
+ if (typeof method === 'string') {
64
+ method = [method];
65
+ }
66
+ this.register(path, method, middlewares, options);
67
+ return this;
68
+ }
69
+ head(nameOrPath, pathOrMiddleware, ...middlewares) {
70
+ return this.verb('head', nameOrPath, pathOrMiddleware, ...middlewares);
71
+ }
72
+ options(nameOrPath, pathOrMiddleware, ...middlewares) {
73
+ return this.verb('options', nameOrPath, pathOrMiddleware, ...middlewares);
74
+ }
75
+ get(nameOrPath, pathOrMiddleware, ...middlewares) {
76
+ return this.verb('get', nameOrPath, pathOrMiddleware, ...middlewares);
77
+ }
78
+ put(nameOrPath, pathOrMiddleware, ...middlewares) {
79
+ return this.verb('put', nameOrPath, pathOrMiddleware, ...middlewares);
80
+ }
81
+ patch(nameOrPath, pathOrMiddleware, ...middlewares) {
82
+ return this.verb('patch', nameOrPath, pathOrMiddleware, ...middlewares);
83
+ }
84
+ post(nameOrPath, pathOrMiddleware, ...middlewares) {
85
+ return this.verb('post', nameOrPath, pathOrMiddleware, ...middlewares);
86
+ }
87
+ delete(nameOrPath, pathOrMiddleware, ...middlewares) {
88
+ return this.verb('delete', nameOrPath, pathOrMiddleware, ...middlewares);
89
+ }
90
+ all(nameOrPath, pathOrMiddleware, ...middlewares) {
91
+ return this.verb(methods, nameOrPath, pathOrMiddleware, ...middlewares);
92
+ }
93
+ register(path, methods, middleware, opts) {
94
+ // patch register to support bind ctx function middleware and string controller
95
+ middleware = Array.isArray(middleware) ? middleware : [middleware];
96
+ for (const mw of middleware) {
97
+ if (isGeneratorFunction(mw)) {
98
+ throw new TypeError(methods.toString() + ' `' + path + '`: Please use async function instead of generator function');
99
+ }
100
+ }
101
+ const middlewares = convertMiddlewares(middleware, this.app);
102
+ return super.register(path, methods, middlewares, opts);
103
+ }
104
+ resources(nameOrPath, pathOrMiddleware, ...middleware) {
105
+ const { path, middlewares, options } = this._formatRouteParams(nameOrPath, pathOrMiddleware, middleware);
106
+ // last argument is Controller object
107
+ const controller = resolveController(middlewares.pop(), this.app);
108
+ for (const key in REST_MAP) {
109
+ const action = controller[key];
110
+ if (!action)
111
+ continue;
112
+ const opts = REST_MAP[key];
113
+ let routeName;
114
+ if (opts.member) {
115
+ routeName = inflection.singularize(options.name ?? '');
116
+ }
117
+ else {
118
+ routeName = inflection.pluralize(options.name ?? '');
119
+ }
120
+ if (opts.namePrefix) {
121
+ routeName = opts.namePrefix + routeName;
122
+ }
123
+ const prefix = path.replace(/\/$/, '');
124
+ const urlPath = opts.suffix ? `${prefix}/${opts.suffix}` : prefix;
125
+ const method = Array.isArray(opts.method) ? opts.method : [opts.method];
126
+ this.register(urlPath, method, middlewares.concat(action), { name: routeName });
127
+ }
128
+ return this;
129
+ }
130
+ /**
131
+ * @param {String} name - Router name
132
+ * @param {Object} params - more parameters
133
+ * @example
134
+ * ```js
135
+ * router.url('edit_post', { id: 1, name: 'foo', page: 2 })
136
+ * => /posts/1/edit?name=foo&page=2
137
+ * router.url('posts', { name: 'foo&1', page: 2 })
138
+ * => /posts?name=foo%261&page=2
139
+ * ```
140
+ * @return {String} url by path name and query params.
141
+ * @since 1.0.0
142
+ */
143
+ url(name, params) {
144
+ const route = this.route(name);
145
+ if (!route)
146
+ return '';
147
+ const args = params;
148
+ let url = route.path;
149
+ assert(!(url instanceof RegExp), `Can't get the url for regExp ${url} for by name '${name}'`);
150
+ const queries = [];
151
+ if (typeof args === 'object' && args !== null) {
152
+ const replacedParams = [];
153
+ url = url.replace(/:([a-zA-Z_]\w*)/g, ($0, key) => {
154
+ if (key in args) {
155
+ const values = args[key];
156
+ replacedParams.push(key);
157
+ return safeEncodeURIComponent(Array.isArray(values) ? String(values[0]) : String(values));
158
+ }
159
+ return $0;
160
+ });
161
+ for (const key in args) {
162
+ if (replacedParams.includes(key)) {
163
+ continue;
164
+ }
165
+ const values = args[key];
166
+ const encodedKey = safeEncodeURIComponent(key);
167
+ if (Array.isArray(values)) {
168
+ for (const val of values) {
169
+ queries.push(`${encodedKey}=${safeEncodeURIComponent(String(val))}`);
170
+ }
171
+ }
172
+ else {
173
+ queries.push(`${encodedKey}=${safeEncodeURIComponent(String(values))}`);
174
+ }
175
+ }
176
+ }
177
+ if (queries.length > 0) {
178
+ const queryStr = queries.join('&');
179
+ if (!url.includes('?')) {
180
+ url = `${url}?${queryStr}`;
181
+ }
182
+ else {
183
+ url = `${url}&${queryStr}`;
184
+ }
185
+ }
186
+ return url;
187
+ }
188
+ /**
189
+ * @alias to url()
190
+ */
191
+ pathFor(name, params) {
192
+ return this.url(name, params);
193
+ }
194
+ }
168
195
  /**
169
- * resolve controller from string to function
170
- * @param {String|Function} controller input controller
171
- * @param {Application} app egg application instance
172
- */
196
+ * resolve controller from string to function
197
+ * @param {String|Function} controller input controller
198
+ * @param {Application} app egg application instance
199
+ */
173
200
  function resolveController(controller, app) {
174
- if (typeof controller === "string") {
175
- const actions = controller.split(".");
176
- let obj = app.controller;
177
- actions.forEach((key) => {
178
- obj = obj[key];
179
- if (!obj) throw new Error(`app.controller.${controller} not exists`);
180
- });
181
- controller = obj;
182
- }
183
- if (!controller) throw new Error("controller not exists");
184
- return controller;
201
+ if (typeof controller === 'string') {
202
+ // resolveController('foo.bar.Home', app)
203
+ const actions = controller.split('.');
204
+ let obj = app.controller;
205
+ actions.forEach(key => {
206
+ obj = obj[key];
207
+ if (!obj)
208
+ throw new Error(`app.controller.${controller} not exists`);
209
+ });
210
+ controller = obj;
211
+ }
212
+ // ensure controller is exists
213
+ if (!controller)
214
+ throw new Error('controller not exists');
215
+ return controller;
185
216
  }
186
217
  /**
187
- * 1. ensure controller(last argument) support string
188
- * - [url, controller]: app.get('/home', 'home');
189
- * - [name, url, controller(string)]: app.get('posts', '/posts', 'posts.list');
190
- * - [name, url, controller]: app.get('posts', '/posts', app.controller.posts.list);
191
- * - [name, url(regexp), controller]: app.get('regRouter', /\/home\/index/, 'home.index');
192
- * - [name, url, middleware, [...], controller]: `app.get(/user/:id', hasLogin, canGetUser, 'user.show');`
193
- *
194
- * 2. bind ctx to controller `this`
195
- *
196
- * @param {Array} middlewares middlewares and controller(last middleware)
197
- * @param {Application} app egg application instance
198
- */
218
+ * 1. ensure controller(last argument) support string
219
+ * - [url, controller]: app.get('/home', 'home');
220
+ * - [name, url, controller(string)]: app.get('posts', '/posts', 'posts.list');
221
+ * - [name, url, controller]: app.get('posts', '/posts', app.controller.posts.list);
222
+ * - [name, url(regexp), controller]: app.get('regRouter', /\/home\/index/, 'home.index');
223
+ * - [name, url, middleware, [...], controller]: `app.get(/user/:id', hasLogin, canGetUser, 'user.show');`
224
+ *
225
+ * 2. bind ctx to controller `this`
226
+ *
227
+ * @param {Array} middlewares middlewares and controller(last middleware)
228
+ * @param {Application} app egg application instance
229
+ */
199
230
  function convertMiddlewares(middlewares, app) {
200
- const controller = resolveController(middlewares.pop(), app);
201
- function wrappedController(ctx, next) {
202
- return controller.apply(ctx, [ctx, next]);
203
- }
204
- return [...middlewares, wrappedController];
231
+ // ensure controller is resolved
232
+ const controller = resolveController(middlewares.pop(), app);
233
+ function wrappedController(ctx, next) {
234
+ return controller.apply(ctx, [ctx, next]);
235
+ }
236
+ return [...middlewares, wrappedController];
205
237
  }
206
-
207
- //#endregion
208
- export { EggRouter };
238
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"EggRouter.js","sourceRoot":"","sources":["../src/EggRouter.ts"],"names":[],"mappings":"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"}