routup 0.8.0 → 0.8.2
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/handler/index.d.ts +0 -1
- package/dist/handler/index.d.ts.map +1 -1
- package/dist/handler/index.js +0 -1
- package/dist/handler/index.js.map +1 -1
- package/dist/handler/utils.d.ts +1 -1
- package/dist/handler/utils.d.ts.map +1 -1
- package/dist/handler/utils.js +3 -3
- package/dist/handler/utils.js.map +1 -1
- package/dist/index.d.ts +1 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -2
- package/dist/index.js.map +1 -1
- package/dist/layer/index.d.ts +1 -0
- package/dist/layer/index.d.ts.map +1 -1
- package/dist/layer/index.js +1 -0
- package/dist/layer/index.js.map +1 -1
- package/dist/layer/module.d.ts +4 -3
- package/dist/layer/module.d.ts.map +1 -1
- package/dist/layer/module.js +5 -10
- package/dist/layer/module.js.map +1 -1
- package/dist/layer/type.d.ts +7 -0
- package/dist/layer/type.d.ts.map +1 -0
- package/dist/{config → layer}/type.js +1 -1
- package/dist/{handler → layer}/type.js.map +1 -1
- package/dist/path/matcher.d.ts.map +1 -1
- package/dist/path/matcher.js +1 -0
- package/dist/path/matcher.js.map +1 -1
- package/dist/route/index.d.ts +1 -0
- package/dist/route/index.d.ts.map +1 -1
- package/dist/route/index.js +1 -0
- package/dist/route/index.js.map +1 -1
- package/dist/route/module.d.ts +4 -4
- package/dist/route/module.d.ts.map +1 -1
- package/dist/route/module.js +31 -23
- package/dist/route/module.js.map +1 -1
- package/dist/route/type.d.ts +7 -0
- package/dist/route/type.d.ts.map +1 -0
- package/dist/{helpers/response/send-format.js → route/type.js} +1 -5
- package/dist/{config → route}/type.js.map +1 -1
- package/dist/router/module.d.ts +35 -8
- package/dist/router/module.d.ts.map +1 -1
- package/dist/router/module.js +45 -23
- package/dist/router/module.js.map +1 -1
- package/dist/router/type.d.ts +14 -7
- package/dist/router/type.d.ts.map +1 -1
- package/dist/router/type.js +0 -6
- package/dist/router/type.js.map +1 -1
- package/dist/type.d.ts +0 -7
- package/dist/type.d.ts.map +1 -1
- package/dist/utils/index.d.ts +0 -2
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +0 -2
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/request.d.ts +1 -1
- package/dist/utils/request.d.ts.map +1 -1
- package/package.json +8 -15
- package/dist/config/accessors.d.ts +0 -15
- package/dist/config/accessors.d.ts.map +0 -1
- package/dist/config/accessors.js +0 -32
- package/dist/config/accessors.js.map +0 -1
- package/dist/config/index.d.ts +0 -5
- package/dist/config/index.d.ts.map +0 -1
- package/dist/config/index.js +0 -27
- package/dist/config/index.js.map +0 -1
- package/dist/config/module.d.ts +0 -23
- package/dist/config/module.d.ts.map +0 -1
- package/dist/config/module.js +0 -126
- package/dist/config/module.js.map +0 -1
- package/dist/config/singleton.d.ts +0 -4
- package/dist/config/singleton.d.ts.map +0 -1
- package/dist/config/singleton.js +0 -50
- package/dist/config/singleton.js.map +0 -1
- package/dist/config/type.d.ts +0 -78
- package/dist/config/type.d.ts.map +0 -1
- package/dist/config/utils/etag.d.ts +0 -3
- package/dist/config/utils/etag.d.ts.map +0 -1
- package/dist/config/utils/etag.js +0 -43
- package/dist/config/utils/etag.js.map +0 -1
- package/dist/config/utils/index.d.ts +0 -4
- package/dist/config/utils/index.d.ts.map +0 -1
- package/dist/config/utils/index.js +0 -26
- package/dist/config/utils/index.js.map +0 -1
- package/dist/config/utils/trust-proxy.d.ts +0 -3
- package/dist/config/utils/trust-proxy.d.ts.map +0 -1
- package/dist/config/utils/trust-proxy.js +0 -31
- package/dist/config/utils/trust-proxy.js.map +0 -1
- package/dist/config/utils/validator.d.ts +0 -3
- package/dist/config/utils/validator.d.ts.map +0 -1
- package/dist/config/utils/validator.js +0 -20
- package/dist/config/utils/validator.js.map +0 -1
- package/dist/constants.d.ts +0 -30
- package/dist/constants.d.ts.map +0 -1
- package/dist/constants.js +0 -41
- package/dist/constants.js.map +0 -1
- package/dist/handler/type.d.ts +0 -4
- package/dist/handler/type.d.ts.map +0 -1
- package/dist/handler/type.js +0 -3
- package/dist/helpers/index.d.ts +0 -3
- package/dist/helpers/index.d.ts.map +0 -1
- package/dist/helpers/index.js +0 -25
- package/dist/helpers/index.js.map +0 -1
- package/dist/helpers/request/cache.d.ts +0 -3
- package/dist/helpers/request/cache.d.ts.map +0 -1
- package/dist/helpers/request/cache.js +0 -21
- package/dist/helpers/request/cache.js.map +0 -1
- package/dist/helpers/request/env.d.ts +0 -7
- package/dist/helpers/request/env.d.ts.map +0 -1
- package/dist/helpers/request/env.js +0 -57
- package/dist/helpers/request/env.js.map +0 -1
- package/dist/helpers/request/header-accept-charset.d.ts +0 -5
- package/dist/helpers/request/header-accept-charset.d.ts.map +0 -1
- package/dist/helpers/request/header-accept-charset.js +0 -26
- package/dist/helpers/request/header-accept-charset.js.map +0 -1
- package/dist/helpers/request/header-accept-encoding.d.ts +0 -4
- package/dist/helpers/request/header-accept-encoding.d.ts.map +0 -1
- package/dist/helpers/request/header-accept-encoding.js +0 -26
- package/dist/helpers/request/header-accept-encoding.js.map +0 -1
- package/dist/helpers/request/header-accept-language.d.ts +0 -4
- package/dist/helpers/request/header-accept-language.d.ts.map +0 -1
- package/dist/helpers/request/header-accept-language.js +0 -26
- package/dist/helpers/request/header-accept-language.js.map +0 -1
- package/dist/helpers/request/header-accept.d.ts +0 -4
- package/dist/helpers/request/header-accept.d.ts.map +0 -1
- package/dist/helpers/request/header-accept.js +0 -51
- package/dist/helpers/request/header-accept.js.map +0 -1
- package/dist/helpers/request/header-content-type.d.ts +0 -3
- package/dist/helpers/request/header-content-type.d.ts.map +0 -1
- package/dist/helpers/request/header-content-type.js +0 -28
- package/dist/helpers/request/header-content-type.js.map +0 -1
- package/dist/helpers/request/header.d.ts +0 -5
- package/dist/helpers/request/header.d.ts.map +0 -1
- package/dist/helpers/request/header.js +0 -18
- package/dist/helpers/request/header.js.map +0 -1
- package/dist/helpers/request/hostname.d.ts +0 -8
- package/dist/helpers/request/hostname.d.ts.map +0 -1
- package/dist/helpers/request/hostname.js +0 -46
- package/dist/helpers/request/hostname.js.map +0 -1
- package/dist/helpers/request/index.d.ts +0 -16
- package/dist/helpers/request/index.d.ts.map +0 -1
- package/dist/helpers/request/index.js +0 -38
- package/dist/helpers/request/index.js.map +0 -1
- package/dist/helpers/request/ip.d.ts +0 -8
- package/dist/helpers/request/ip.d.ts.map +0 -1
- package/dist/helpers/request/ip.js +0 -29
- package/dist/helpers/request/ip.js.map +0 -1
- package/dist/helpers/request/mount-path.d.ts +0 -5
- package/dist/helpers/request/mount-path.d.ts.map +0 -1
- package/dist/helpers/request/mount-path.js +0 -22
- package/dist/helpers/request/mount-path.js.map +0 -1
- package/dist/helpers/request/negotiator.d.ts +0 -5
- package/dist/helpers/request/negotiator.d.ts.map +0 -1
- package/dist/helpers/request/negotiator.js +0 -22
- package/dist/helpers/request/negotiator.js.map +0 -1
- package/dist/helpers/request/params.d.ts +0 -6
- package/dist/helpers/request/params.d.ts.map +0 -1
- package/dist/helpers/request/params.js +0 -35
- package/dist/helpers/request/params.js.map +0 -1
- package/dist/helpers/request/path.d.ts +0 -4
- package/dist/helpers/request/path.d.ts.map +0 -1
- package/dist/helpers/request/path.js +0 -21
- package/dist/helpers/request/path.js.map +0 -1
- package/dist/helpers/request/protocol.d.ts +0 -9
- package/dist/helpers/request/protocol.d.ts.map +0 -1
- package/dist/helpers/request/protocol.js +0 -50
- package/dist/helpers/request/protocol.js.map +0 -1
- package/dist/helpers/response/cache.d.ts +0 -8
- package/dist/helpers/response/cache.d.ts.map +0 -1
- package/dist/helpers/response/cache.js +0 -25
- package/dist/helpers/response/cache.js.map +0 -1
- package/dist/helpers/response/header-attachment.d.ts +0 -4
- package/dist/helpers/response/header-attachment.d.ts.map +0 -1
- package/dist/helpers/response/header-attachment.js +0 -29
- package/dist/helpers/response/header-attachment.js.map +0 -1
- package/dist/helpers/response/header-content-type.d.ts +0 -3
- package/dist/helpers/response/header-content-type.d.ts.map +0 -1
- package/dist/helpers/response/header-content-type.js +0 -25
- package/dist/helpers/response/header-content-type.js.map +0 -1
- package/dist/helpers/response/header.d.ts +0 -6
- package/dist/helpers/response/header.d.ts.map +0 -1
- package/dist/helpers/response/header.js +0 -51
- package/dist/helpers/response/header.js.map +0 -1
- package/dist/helpers/response/index.d.ts +0 -12
- package/dist/helpers/response/index.d.ts.map +0 -1
- package/dist/helpers/response/index.js +0 -34
- package/dist/helpers/response/index.js.map +0 -1
- package/dist/helpers/response/send-accepted.d.ts +0 -3
- package/dist/helpers/response/send-accepted.d.ts.map +0 -1
- package/dist/helpers/response/send-accepted.js +0 -17
- package/dist/helpers/response/send-accepted.js.map +0 -1
- package/dist/helpers/response/send-created.d.ts +0 -3
- package/dist/helpers/response/send-created.d.ts.map +0 -1
- package/dist/helpers/response/send-created.js +0 -17
- package/dist/helpers/response/send-created.js.map +0 -1
- package/dist/helpers/response/send-file.d.ts +0 -5
- package/dist/helpers/response/send-file.d.ts.map +0 -1
- package/dist/helpers/response/send-file.js +0 -27
- package/dist/helpers/response/send-file.js.map +0 -1
- package/dist/helpers/response/send-format.d.ts +0 -7
- package/dist/helpers/response/send-format.d.ts.map +0 -1
- package/dist/helpers/response/send-format.js.map +0 -1
- package/dist/helpers/response/send-redirect.d.ts +0 -3
- package/dist/helpers/response/send-redirect.d.ts.map +0 -1
- package/dist/helpers/response/send-redirect.js +0 -19
- package/dist/helpers/response/send-redirect.js.map +0 -1
- package/dist/helpers/response/send-stream.d.ts +0 -5
- package/dist/helpers/response/send-stream.d.ts.map +0 -1
- package/dist/helpers/response/send-stream.js +0 -33
- package/dist/helpers/response/send-stream.js.map +0 -1
- package/dist/helpers/response/send.d.ts +0 -3
- package/dist/helpers/response/send.d.ts.map +0 -1
- package/dist/helpers/response/send.js +0 -97
- package/dist/helpers/response/send.js.map +0 -1
- package/dist/utils/mime.d.ts +0 -2
- package/dist/utils/mime.d.ts.map +0 -1
- package/dist/utils/mime.js +0 -21
- package/dist/utils/mime.js.map +0 -1
- package/dist/utils/object.d.ts +0 -2
- package/dist/utils/object.d.ts.map +0 -1
- package/dist/utils/object.js +0 -16
- package/dist/utils/object.js.map +0 -1
package/dist/handler/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/handler/index.ts"],"names":[],"mappings":"AAOA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/handler/index.ts"],"names":[],"mappings":"AAOA,cAAc,SAAS,CAAC"}
|
package/dist/handler/index.js
CHANGED
|
@@ -20,6 +20,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
20
20
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
21
21
|
};
|
|
22
22
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
23
|
-
__exportStar(require("./type"), exports);
|
|
24
23
|
__exportStar(require("./utils"), exports);
|
|
25
24
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/handler/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/handler/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,0CAAwB"}
|
package/dist/handler/utils.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/handler/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/handler/utils.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAQ,MAAM,cAAc,CAAC;AAGpD,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,OAAO,QAiBxF"}
|
package/dist/handler/utils.js
CHANGED
|
@@ -7,14 +7,14 @@
|
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.processHandlerExecutionOutput = void 0;
|
|
10
|
-
const
|
|
10
|
+
const core_1 = require("@routup/core");
|
|
11
11
|
const utils_1 = require("../utils");
|
|
12
12
|
function processHandlerExecutionOutput(res, next, output) {
|
|
13
13
|
if ((0, utils_1.isPromise)(output)) {
|
|
14
14
|
output
|
|
15
15
|
.then((r) => {
|
|
16
16
|
if (typeof r !== 'undefined') {
|
|
17
|
-
(0,
|
|
17
|
+
(0, core_1.send)(res, r);
|
|
18
18
|
}
|
|
19
19
|
return r;
|
|
20
20
|
})
|
|
@@ -22,7 +22,7 @@ function processHandlerExecutionOutput(res, next, output) {
|
|
|
22
22
|
return;
|
|
23
23
|
}
|
|
24
24
|
if (typeof output !== 'undefined') {
|
|
25
|
-
(0,
|
|
25
|
+
(0, core_1.send)(res, output);
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
exports.processHandlerExecutionOutput = processHandlerExecutionOutput;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/handler/utils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/handler/utils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,uCAAoD;AACpD,oCAAqC;AAErC,SAAgB,6BAA6B,CAAC,GAAa,EAAE,IAAU,EAAE,MAAgB;IACrF,IAAI,IAAA,iBAAS,EAAC,MAAM,CAAC,EAAE;QACnB,MAAM;aACD,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YACR,IAAI,OAAO,CAAC,KAAK,WAAW,EAAE;gBAC1B,IAAA,WAAI,EAAC,GAAG,EAAE,CAAC,CAAC,CAAC;aAChB;YAED,OAAO,CAAC,CAAC;QACb,CAAC,CAAC;aACD,KAAK,CAAC,IAAI,CAAC,CAAC;QACjB,OAAO;KACV;IAED,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;QAC/B,IAAA,WAAI,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;KACrB;AACL,CAAC;AAjBD,sEAiBC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
export * from './constants';
|
|
2
1
|
export * from './handler';
|
|
3
|
-
export * from './helpers';
|
|
4
2
|
export * from './layer';
|
|
5
3
|
export * from './path';
|
|
6
4
|
export * from './route';
|
|
7
5
|
export * from './router';
|
|
8
6
|
export * from './type';
|
|
9
7
|
export * from './utils';
|
|
8
|
+
export * from '@routup/core';
|
|
10
9
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAOA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAOA,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AAExB,cAAc,cAAc,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -20,13 +20,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
20
20
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
21
21
|
};
|
|
22
22
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
23
|
-
__exportStar(require("./constants"), exports);
|
|
24
23
|
__exportStar(require("./handler"), exports);
|
|
25
|
-
__exportStar(require("./helpers"), exports);
|
|
26
24
|
__exportStar(require("./layer"), exports);
|
|
27
25
|
__exportStar(require("./path"), exports);
|
|
28
26
|
__exportStar(require("./route"), exports);
|
|
29
27
|
__exportStar(require("./router"), exports);
|
|
30
28
|
__exportStar(require("./type"), exports);
|
|
31
29
|
__exportStar(require("./utils"), exports);
|
|
30
|
+
__exportStar(require("@routup/core"), exports);
|
|
32
31
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,4CAA0B;AAC1B,0CAAwB;AACxB,yCAAuB;AACvB,0CAAwB;AACxB,2CAAyB;AACzB,yCAAuB;AACvB,0CAAwB;AAExB,+CAA6B"}
|
package/dist/layer/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/layer/index.ts"],"names":[],"mappings":"AAOA,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/layer/index.ts"],"names":[],"mappings":"AAOA,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC"}
|
package/dist/layer/index.js
CHANGED
|
@@ -21,5 +21,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
21
21
|
};
|
|
22
22
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
23
23
|
__exportStar(require("./module"), exports);
|
|
24
|
+
__exportStar(require("./type"), exports);
|
|
24
25
|
__exportStar(require("./utils"), exports);
|
|
25
26
|
//# sourceMappingURL=index.js.map
|
package/dist/layer/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/layer/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,2CAAyB;AACzB,0CAAwB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/layer/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,2CAAyB;AACzB,yCAAuB;AACvB,0CAAwB"}
|
package/dist/layer/module.d.ts
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Request, Response } from '@routup/core';
|
|
2
2
|
import { PathMatcher } from '../path';
|
|
3
|
-
import { DispatcherMeta
|
|
3
|
+
import { DispatcherMeta } from '../type';
|
|
4
|
+
import { LayerOptions } from './type';
|
|
4
5
|
export declare class Layer {
|
|
5
6
|
readonly '@instanceof': symbol;
|
|
6
7
|
protected fn: CallableFunction;
|
|
7
8
|
protected pathMatcher: PathMatcher;
|
|
8
|
-
constructor(
|
|
9
|
+
constructor(options: LayerOptions, fn: CallableFunction);
|
|
9
10
|
isError(): boolean;
|
|
10
11
|
dispatch(req: Request, res: Response, meta: DispatcherMeta, next: CallableFunction): void;
|
|
11
12
|
dispatch(req: Request, res: Response, meta: DispatcherMeta, next: CallableFunction, err: Error): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/layer/module.ts"],"names":[],"mappings":"AAQA,OAAO,
|
|
1
|
+
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/layer/module.ts"],"names":[],"mappings":"AAQA,OAAO,EACG,OAAO,EAAE,QAAQ,EAC1B,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EACH,cAAc,EACjB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,qBAAa,KAAK;IACd,QAAQ,CAAC,aAAa,SAAuB;IAE7C,SAAS,CAAC,EAAE,EAAG,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,EAAG,WAAW,CAAC;gBAKhC,OAAO,EAAE,YAAY,EACrB,EAAE,EAAE,gBAAgB;IAQxB,OAAO;IAMP,QAAQ,CACJ,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE,gBAAgB,GACtB,IAAI;IAER,QAAQ,CACJ,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE,gBAAgB,EACtB,GAAG,EAAE,KAAK,GACV,IAAI;IA6DR,SAAS,CAAC,IAAI,EAAE,MAAM,GAAI,OAAO;IAIjC,IAAI,CAAC,IAAI,EAAE,MAAM;CAGpB"}
|
package/dist/layer/module.js
CHANGED
|
@@ -8,19 +8,14 @@
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.Layer = void 0;
|
|
10
10
|
const http_1 = require("@ebec/http");
|
|
11
|
-
const
|
|
11
|
+
const core_1 = require("@routup/core");
|
|
12
12
|
const handler_1 = require("../handler");
|
|
13
|
-
const helpers_1 = require("../helpers");
|
|
14
13
|
const path_1 = require("../path");
|
|
15
14
|
class Layer {
|
|
16
15
|
// --------------------------------------------------
|
|
17
|
-
constructor(
|
|
16
|
+
constructor(options, fn) {
|
|
18
17
|
this['@instanceof'] = Symbol.for('Layer');
|
|
19
|
-
|
|
20
|
-
const config = (0, config_1.useConfig)();
|
|
21
|
-
options.sensitive = config.get('caseSensitive');
|
|
22
|
-
}
|
|
23
|
-
this.pathMatcher = new path_1.PathMatcher(path, options);
|
|
18
|
+
this.pathMatcher = new path_1.PathMatcher(options.path, options.pathMatcher);
|
|
24
19
|
this.fn = fn;
|
|
25
20
|
}
|
|
26
21
|
// --------------------------------------------------
|
|
@@ -28,8 +23,8 @@ class Layer {
|
|
|
28
23
|
return this.fn.length === 4;
|
|
29
24
|
}
|
|
30
25
|
dispatch(req, res, meta, next, err) {
|
|
31
|
-
(0,
|
|
32
|
-
(0,
|
|
26
|
+
(0, core_1.setRequestParams)(req, meta.params || {});
|
|
27
|
+
(0, core_1.setRequestMountPath)(req, meta.mountPath || '/');
|
|
33
28
|
if (typeof err !== 'undefined') {
|
|
34
29
|
if (this.fn.length === 4) {
|
|
35
30
|
try {
|
package/dist/layer/module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/layer/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA6C;
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/layer/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA6C;AAC7C,uCAEsB;AACtB,wCAA2D;AAC3D,kCAAsC;AAMtC,MAAa,KAAK;IAOd,qDAAqD;IAErD,YACI,OAAqB,EACrB,EAAoB;QAVf,mBAAa,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAYzC,IAAI,CAAC,WAAW,GAAG,IAAI,kBAAW,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACtE,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACjB,CAAC;IAED,qDAAqD;IAErD,OAAO;QACH,OAAO,IAAI,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC;IAChC,CAAC;IAmBD,QAAQ,CACJ,GAAY,EACZ,GAAa,EACb,IAAoB,EACpB,IAAU,EACV,GAAW;QAEX,IAAA,uBAAgB,EAAC,GAAG,EAAE,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;QACzC,IAAA,0BAAmB,EAAC,GAAG,EAAE,IAAI,CAAC,SAAS,IAAI,GAAG,CAAC,CAAC;QAEhD,IAAI,OAAO,GAAG,KAAK,WAAW,EAAE;YAC5B,IAAI,IAAI,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,IAAI;oBACA,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;iBAChC;gBAAC,OAAO,CAAC,EAAE;oBACR,0BAA0B;oBAC1B,0BAA0B;oBAC1B,IAAI,CAAC,YAAY,KAAK,EAAE;wBACpB,IAAI,CAAC,CAAC,CAAC,CAAC;qBACX;yBAAM;wBACH,IAAI,CAAC,IAAI,sBAAe,CAAC;4BACrB,OAAO,EAAE,0DAA0D;yBACtE,CAAC,CAAC,CAAC;qBACP;iBACJ;gBAED,OAAO;aACV;YAED,0BAA0B;YAC1B,IAAI,CAAC,GAAG,CAAC,CAAC;YACV,0BAA0B;YAC1B,OAAO;SACV;QAED,0BAA0B;QAC1B,IAAI,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE;YACpB,IAAI,EAAE,CAAC;YACP,OAAO;SACV;QAED,IAAI;YACA,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YAEvC,IAAA,uCAA6B,EAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;SACpD;QAAC,OAAO,CAAC,EAAE;YACR,0BAA0B;YAC1B,IAAI,CAAC,YAAY,KAAK,EAAE;gBACpB,IAAI,CAAC,CAAC,CAAC,CAAC;aACX;iBAAM;gBACH,IAAI,CAAC,IAAI,sBAAe,CAAC;oBACrB,OAAO,EAAE,oDAAoD;iBAChE,CAAC,CAAC,CAAC;aACP;SACJ;IACL,CAAC;IAED,qDAAqD;IAErD,SAAS,CAAC,IAAY;QAClB,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,CAAC,IAAY;QACb,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;CACJ;AA1GD,sBA0GC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/layer/type.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,MAAM,MAAM,YAAY,GAAG;IACvB,IAAI,EAAE,IAAI,CAAC;IAEX,WAAW,EAAE,kBAAkB,CAAA;CAClC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/
|
|
1
|
+
{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/layer/type.ts"],"names":[],"mappings":";AAAA;;;;;GAKG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matcher.d.ts","sourceRoot":"","sources":["../../src/path/matcher.ts"],"names":[],"mappings":"AAOA,OAAO,EACH,GAAG,EACN,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"matcher.d.ts","sourceRoot":"","sources":["../../src/path/matcher.ts"],"names":[],"mappings":"AAOA,OAAO,EACH,GAAG,EACN,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAWnE,qBAAa,WAAW;IACpB,IAAI,EAAE,IAAI,CAAC;IAEX,MAAM,EAAG,MAAM,CAAC;IAEhB,UAAU,EAAG,GAAG,EAAE,CAAM;IAExB,aAAa,EAAE,kBAAkB,CAAC;gBAEtB,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,kBAAkB;IAWpD,IAAI,CAAC,IAAI,EAAE,MAAM;IASjB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAI,qBAAqB,GAAG,SAAS;CA2CzD"}
|
package/dist/path/matcher.js
CHANGED
|
@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
9
9
|
exports.PathMatcher = void 0;
|
|
10
10
|
const path_to_regexp_1 = require("path-to-regexp");
|
|
11
11
|
function decodeParam(val) {
|
|
12
|
+
/* istanbul ignore next */
|
|
12
13
|
if (typeof val !== 'string' || val.length === 0) {
|
|
13
14
|
return val;
|
|
14
15
|
}
|
package/dist/path/matcher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matcher.js","sourceRoot":"","sources":["../../src/path/matcher.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,mDAEwB;AAIxB,SAAS,WAAW,CAAC,GAAY;IAC7B,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7C,OAAO,GAAG,CAAC;KACd;IAED,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAC;AACnC,CAAC;AAED,MAAa,WAAW;IASpB,YAAY,IAAU,EAAE,OAA4B;QAJpD,eAAU,GAAW,EAAE,CAAC;QAKpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,aAAa,GAAG,OAAO,IAAI,EAAE,CAAC;QAEnC,IAAI,IAAI,YAAY,MAAM,EAAE;YACxB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;SACtB;aAAM;YACH,IAAI,CAAC,MAAM,GAAG,IAAA,6BAAY,EAAC,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;SAC9D;IACL,CAAC;IAED,IAAI,CAAC,IAAY;QACb,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,KAAK,KAAK,CAAC;QACxE,IAAI,SAAS,EAAE;YACX,OAAO,IAAI,CAAC;SACf;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,CAAC,IAAY;QACb,IAAI,KAAK,GAA4B,IAAI,CAAC;QAE1C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,KAAK,KAAK,CAAC;QACxE,IAAI,SAAS,EAAE;YACX,OAAO;gBACH,IAAI,EAAE,GAAG;gBACT,MAAM,EAAE,EAAE;aACb,CAAC;SACL;QAED,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE/B,IAAI,CAAC,KAAK,EAAE;YACR,OAAO,SAAS,CAAC;SACpB;QAED,IAAI,IAAI,CAAC,IAAI,YAAY,MAAM,EAAE;YAC7B,OAAO;gBACH,IAAI;gBACJ,MAAM,EAAE;oBACJ,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;iBAC3B;aACJ,CAAC;SACL;QAED,MAAM,MAAM,GAA6B,EAAE,CAAC;QAE5C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACnC,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACnC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YACtB,MAAM,GAAG,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAElC,IAAI,OAAO,GAAG,KAAK,WAAW,EAAE;gBAC5B,MAAM,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;aACtB;SACJ;QAED,OAAO;YACH,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;YACd,MAAM,EAAE,MAAM;SACjB,CAAC;IACN,CAAC;CACJ;AAxED,kCAwEC"}
|
|
1
|
+
{"version":3,"file":"matcher.js","sourceRoot":"","sources":["../../src/path/matcher.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,mDAEwB;AAIxB,SAAS,WAAW,CAAC,GAAY;IAC7B,0BAA0B;IAC1B,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7C,OAAO,GAAG,CAAC;KACd;IAED,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAC;AACnC,CAAC;AAED,MAAa,WAAW;IASpB,YAAY,IAAU,EAAE,OAA4B;QAJpD,eAAU,GAAW,EAAE,CAAC;QAKpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,aAAa,GAAG,OAAO,IAAI,EAAE,CAAC;QAEnC,IAAI,IAAI,YAAY,MAAM,EAAE;YACxB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;SACtB;aAAM;YACH,IAAI,CAAC,MAAM,GAAG,IAAA,6BAAY,EAAC,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;SAC9D;IACL,CAAC;IAED,IAAI,CAAC,IAAY;QACb,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,KAAK,KAAK,CAAC;QACxE,IAAI,SAAS,EAAE;YACX,OAAO,IAAI,CAAC;SACf;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,CAAC,IAAY;QACb,IAAI,KAAK,GAA4B,IAAI,CAAC;QAE1C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,KAAK,KAAK,CAAC;QACxE,IAAI,SAAS,EAAE;YACX,OAAO;gBACH,IAAI,EAAE,GAAG;gBACT,MAAM,EAAE,EAAE;aACb,CAAC;SACL;QAED,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE/B,IAAI,CAAC,KAAK,EAAE;YACR,OAAO,SAAS,CAAC;SACpB;QAED,IAAI,IAAI,CAAC,IAAI,YAAY,MAAM,EAAE;YAC7B,OAAO;gBACH,IAAI;gBACJ,MAAM,EAAE;oBACJ,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;iBAC3B;aACJ,CAAC;SACL;QAED,MAAM,MAAM,GAA6B,EAAE,CAAC;QAE5C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACnC,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACnC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YACtB,MAAM,GAAG,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAElC,IAAI,OAAO,GAAG,KAAK,WAAW,EAAE;gBAC5B,MAAM,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;aACtB;SACJ;QAED,OAAO;YACH,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;YACd,MAAM,EAAE,MAAM;SACjB,CAAC;IACN,CAAC;CACJ;AAxED,kCAwEC"}
|
package/dist/route/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/route/index.ts"],"names":[],"mappings":"AAOA,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/route/index.ts"],"names":[],"mappings":"AAOA,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC"}
|
package/dist/route/index.js
CHANGED
|
@@ -21,5 +21,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
21
21
|
};
|
|
22
22
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
23
23
|
__exportStar(require("./module"), exports);
|
|
24
|
+
__exportStar(require("./type"), exports);
|
|
24
25
|
__exportStar(require("./utils"), exports);
|
|
25
26
|
//# sourceMappingURL=index.js.map
|
package/dist/route/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/route/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,2CAAyB;AACzB,0CAAwB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/route/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,2CAAyB;AACzB,yCAAuB;AACvB,0CAAwB"}
|
package/dist/route/module.d.ts
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import { Method } from '
|
|
2
|
-
import { Handler } from '../handler';
|
|
1
|
+
import { Handler, Method, Next, Request, Response } from '@routup/core';
|
|
3
2
|
import { Layer } from '../layer';
|
|
4
3
|
import { PathMatcher, PathMatcherOptions } from '../path';
|
|
5
|
-
import { DispatcherMeta,
|
|
4
|
+
import { DispatcherMeta, Path } from '../type';
|
|
5
|
+
import { RouteOptions } from './type';
|
|
6
6
|
export declare class Route {
|
|
7
7
|
readonly '@instanceof': symbol;
|
|
8
8
|
path: Path;
|
|
9
9
|
protected pathMatcher: PathMatcher;
|
|
10
10
|
protected pathMatcherOptions: PathMatcherOptions;
|
|
11
11
|
protected layers: Record<string, Layer[]>;
|
|
12
|
-
constructor(
|
|
12
|
+
constructor(options: RouteOptions);
|
|
13
13
|
matchPath(path: string): boolean;
|
|
14
14
|
matchMethod(method: string): boolean;
|
|
15
15
|
getMethods(): string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/route/module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/route/module.ts"],"names":[],"mappings":"AAQA,OAAO,EACH,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAC3C,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EACH,cAAc,EACd,IAAI,EACP,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,qBAAa,KAAK;IACd,QAAQ,CAAC,aAAa,SAAuB;IAEtC,IAAI,EAAG,IAAI,CAAC;IAEnB,SAAS,CAAC,WAAW,EAAG,WAAW,CAAC;IAEpC,SAAS,CAAC,kBAAkB,EAAG,kBAAkB,CAAC;IAElD,SAAS,CAAC,MAAM,EAAG,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,CAAM;gBAIpC,OAAO,EAAE,YAAY;IAajC,SAAS,CAAC,IAAI,EAAE,MAAM,GAAI,OAAO;IAIjC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAI,OAAO;IAerC,UAAU,IAAK,MAAM,EAAE;IAevB,QAAQ,CACJ,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE,IAAI,GACV,IAAI;IAiER,QAAQ,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE;IAgBpD,GAAG,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAI1B,IAAI,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAI3B,GAAG,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAI1B,KAAK,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAI5B,MAAM,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAI7B,IAAI,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAI3B,OAAO,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAM9B,OAAO,CAAC,YAAY;CAIvB"}
|
package/dist/route/module.js
CHANGED
|
@@ -8,19 +8,17 @@
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.Route = void 0;
|
|
10
10
|
const smob_1 = require("smob");
|
|
11
|
-
const
|
|
12
|
-
const constants_1 = require("../constants");
|
|
11
|
+
const core_1 = require("@routup/core");
|
|
13
12
|
const layer_1 = require("../layer");
|
|
14
13
|
const path_1 = require("../path");
|
|
15
14
|
class Route {
|
|
16
15
|
// --------------------------------------------------
|
|
17
|
-
constructor(
|
|
16
|
+
constructor(options) {
|
|
18
17
|
this['@instanceof'] = Symbol.for('Route');
|
|
19
18
|
this.layers = {};
|
|
20
|
-
this.path = path;
|
|
21
|
-
|
|
22
|
-
this.
|
|
23
|
-
this.pathMatcher = new path_1.PathMatcher(path, this.pathMatcherOptions);
|
|
19
|
+
this.path = options.path;
|
|
20
|
+
this.pathMatcherOptions = Object.assign({ end: true, strict: this.isStrictPath() }, options.pathMatcher);
|
|
21
|
+
this.pathMatcher = new path_1.PathMatcher(this.path, this.pathMatcherOptions);
|
|
24
22
|
}
|
|
25
23
|
// --------------------------------------------------
|
|
26
24
|
matchPath(path) {
|
|
@@ -28,33 +26,35 @@ class Route {
|
|
|
28
26
|
}
|
|
29
27
|
matchMethod(method) {
|
|
30
28
|
let name = method.toLowerCase();
|
|
31
|
-
if (name ===
|
|
29
|
+
if (name === core_1.Method.HEAD &&
|
|
32
30
|
!(0, smob_1.hasOwnProperty)(this.layers, name)) {
|
|
33
|
-
name =
|
|
31
|
+
name = core_1.Method.GET;
|
|
34
32
|
}
|
|
35
33
|
return Object.prototype.hasOwnProperty.call(this.layers, name);
|
|
36
34
|
}
|
|
37
35
|
// --------------------------------------------------
|
|
38
36
|
getMethods() {
|
|
39
37
|
const keys = Object.keys(this.layers);
|
|
40
|
-
if ((0, smob_1.hasOwnProperty)(this.layers,
|
|
41
|
-
!(0, smob_1.hasOwnProperty)(this.layers,
|
|
42
|
-
keys.push(
|
|
38
|
+
if ((0, smob_1.hasOwnProperty)(this.layers, core_1.Method.GET) &&
|
|
39
|
+
!(0, smob_1.hasOwnProperty)(this.layers, core_1.Method.HEAD)) {
|
|
40
|
+
keys.push(core_1.Method.HEAD);
|
|
43
41
|
}
|
|
44
42
|
return keys;
|
|
45
43
|
}
|
|
46
44
|
// --------------------------------------------------
|
|
47
45
|
dispatch(req, res, meta, done) {
|
|
46
|
+
/* istanbul ignore next */
|
|
48
47
|
if (!req.method) {
|
|
49
48
|
done();
|
|
50
49
|
return;
|
|
51
50
|
}
|
|
52
51
|
let name = req.method.toLowerCase();
|
|
53
|
-
if (name ===
|
|
52
|
+
if (name === core_1.Method.HEAD &&
|
|
54
53
|
!(0, smob_1.hasOwnProperty)(this.layers, name)) {
|
|
55
|
-
name =
|
|
54
|
+
name = core_1.Method.GET;
|
|
56
55
|
}
|
|
57
56
|
const layers = this.layers[name];
|
|
57
|
+
/* istanbul ignore next */
|
|
58
58
|
if (typeof layers === 'undefined' ||
|
|
59
59
|
layers.length === 0 ||
|
|
60
60
|
typeof meta.path === 'undefined') {
|
|
@@ -70,10 +70,15 @@ class Route {
|
|
|
70
70
|
const next = (err) => {
|
|
71
71
|
index++;
|
|
72
72
|
if (index >= layers.length) {
|
|
73
|
-
setImmediate(
|
|
73
|
+
setImmediate(done, err);
|
|
74
74
|
return;
|
|
75
75
|
}
|
|
76
76
|
const layer = layers[index];
|
|
77
|
+
if (err &&
|
|
78
|
+
!layer.isError()) {
|
|
79
|
+
next(err);
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
77
82
|
layer.dispatch(req, res, Object.assign({}, layerMeta), next);
|
|
78
83
|
};
|
|
79
84
|
next();
|
|
@@ -82,30 +87,33 @@ class Route {
|
|
|
82
87
|
register(method, ...handlers) {
|
|
83
88
|
this.layers[method] = [];
|
|
84
89
|
for (let i = 0; i < handlers.length; i++) {
|
|
85
|
-
const layer = new layer_1.Layer(
|
|
90
|
+
const layer = new layer_1.Layer({
|
|
91
|
+
path: this.path,
|
|
92
|
+
pathMatcher: this.pathMatcherOptions,
|
|
93
|
+
}, handlers[i]);
|
|
86
94
|
this.layers[method].push(layer);
|
|
87
95
|
}
|
|
88
96
|
}
|
|
89
97
|
get(...handlers) {
|
|
90
|
-
return this.register(
|
|
98
|
+
return this.register(core_1.Method.GET, ...handlers);
|
|
91
99
|
}
|
|
92
100
|
post(...handlers) {
|
|
93
|
-
return this.register(
|
|
101
|
+
return this.register(core_1.Method.POST, ...handlers);
|
|
94
102
|
}
|
|
95
103
|
put(...handlers) {
|
|
96
|
-
return this.register(
|
|
104
|
+
return this.register(core_1.Method.PUT, ...handlers);
|
|
97
105
|
}
|
|
98
106
|
patch(...handlers) {
|
|
99
|
-
return this.register(
|
|
107
|
+
return this.register(core_1.Method.PATCH, ...handlers);
|
|
100
108
|
}
|
|
101
109
|
delete(...handlers) {
|
|
102
|
-
return this.register(
|
|
110
|
+
return this.register(core_1.Method.DELETE, ...handlers);
|
|
103
111
|
}
|
|
104
112
|
head(...handlers) {
|
|
105
|
-
return this.register(
|
|
113
|
+
return this.register(core_1.Method.HEAD, ...handlers);
|
|
106
114
|
}
|
|
107
115
|
options(...handlers) {
|
|
108
|
-
return this.register(
|
|
116
|
+
return this.register(core_1.Method.OPTIONS, ...handlers);
|
|
109
117
|
}
|
|
110
118
|
// --------------------------------------------------
|
|
111
119
|
isStrictPath() {
|
package/dist/route/module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/route/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+BAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/route/module.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/route/type.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,MAAM,MAAM,YAAY,GAAG;IACvB,IAAI,EAAE,IAAI,CAAC;IAEX,WAAW,EAAE,qBAAqB,GAAG,YAAY,CAAA;CACpD,CAAC"}
|
|
@@ -6,8 +6,4 @@
|
|
|
6
6
|
* view the LICENSE file that was distributed with this source code.
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
|
|
10
|
-
function sendFormat(res, format) {
|
|
11
|
-
}
|
|
12
|
-
exports.sendFormat = sendFormat;
|
|
13
|
-
//# sourceMappingURL=send-format.js.map
|
|
9
|
+
//# sourceMappingURL=type.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/
|
|
1
|
+
{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/route/type.ts"],"names":[],"mappings":";AAAA;;;;;GAKG"}
|
package/dist/router/module.d.ts
CHANGED
|
@@ -1,26 +1,53 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { RequestListener } from 'http';
|
|
3
|
-
import { ErrorHandler, Handler } from '
|
|
4
|
-
import { PathMatcher } from '../path';
|
|
3
|
+
import { ErrorHandler, Handler, Next, Request, Response } from '@routup/core';
|
|
4
|
+
import { PathMatcher, PathMatcherOptions } from '../path';
|
|
5
5
|
import { Layer } from '../layer';
|
|
6
6
|
import { Route } from '../route';
|
|
7
|
-
import { DispatcherMeta,
|
|
7
|
+
import { DispatcherMeta, Path } from '../type';
|
|
8
8
|
import { RouterOptions } from './type';
|
|
9
9
|
export declare function isRouterInstance(input: unknown): input is Router;
|
|
10
10
|
export declare class Router {
|
|
11
11
|
readonly '@instanceof': symbol;
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
/**
|
|
13
|
+
* Array of mounted layers, routes & routers.
|
|
14
|
+
*
|
|
15
|
+
* @protected
|
|
16
|
+
*/
|
|
14
17
|
protected stack: (Router | Route | Layer)[];
|
|
18
|
+
/**
|
|
19
|
+
* Mount path of instance
|
|
20
|
+
*
|
|
21
|
+
* @protected
|
|
22
|
+
*/
|
|
23
|
+
protected path: Path | undefined;
|
|
24
|
+
/**
|
|
25
|
+
* Path matcher for the current mount path.
|
|
26
|
+
*
|
|
27
|
+
* @protected
|
|
28
|
+
*/
|
|
15
29
|
protected pathMatcher: PathMatcher | undefined;
|
|
16
30
|
/**
|
|
17
|
-
*
|
|
31
|
+
* Path matcher options.
|
|
32
|
+
*
|
|
33
|
+
* @protected
|
|
34
|
+
*/
|
|
35
|
+
protected pathMatcherOptions: PathMatcherOptions;
|
|
36
|
+
/**
|
|
37
|
+
* Is this the root instance?
|
|
18
38
|
*
|
|
19
39
|
* @protected
|
|
20
40
|
*/
|
|
21
41
|
protected isRoot: boolean | undefined;
|
|
22
|
-
|
|
23
|
-
|
|
42
|
+
/**
|
|
43
|
+
* Timeout before the router decides to abort the request.
|
|
44
|
+
*
|
|
45
|
+
* @protected
|
|
46
|
+
*/
|
|
47
|
+
protected timeout: number | undefined;
|
|
48
|
+
constructor(ctx?: RouterOptions);
|
|
49
|
+
setPathMatcherOptions(input: PathMatcherOptions): void;
|
|
50
|
+
setPath(value: Path): void;
|
|
24
51
|
createListener(): RequestListener;
|
|
25
52
|
listen(port: number): import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>;
|
|
26
53
|
matchPath(path: string): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/router/module.ts"],"names":[],"mappings":";AAWA,OAAO,EAAE,eAAe,EAAgB,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/router/module.ts"],"names":[],"mappings":"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"}
|