routup 0.3.2 → 0.4.0
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/README.md +6 -6
- package/dist/decorators/method/type.d.ts +1 -1
- package/dist/decorators/method/type.d.ts.map +1 -1
- package/dist/decorators/parameter/type.d.ts +2 -2
- package/dist/decorators/parameter/type.d.ts.map +1 -1
- package/dist/decorators/type.d.ts +1 -1
- package/dist/decorators/type.d.ts.map +1 -1
- package/dist/handler/type.d.ts +2 -2
- package/dist/handler/type.d.ts.map +1 -1
- package/dist/handler/utils.d.ts +2 -1
- package/dist/handler/utils.d.ts.map +1 -1
- package/dist/handler/utils.js +20 -1
- package/dist/handler/utils.js.map +1 -1
- package/dist/helpers/request/mount-path.d.ts +2 -3
- package/dist/helpers/request/mount-path.d.ts.map +1 -1
- package/dist/helpers/request/mount-path.js.map +1 -1
- package/dist/helpers/response/cache.d.ts +1 -1
- package/dist/helpers/response/cache.d.ts.map +1 -1
- package/dist/helpers/response/send-format.d.ts +1 -1
- package/dist/helpers/response/send-format.d.ts.map +1 -1
- package/dist/layer/module.d.ts.map +1 -1
- package/dist/layer/module.js +3 -3
- package/dist/layer/module.js.map +1 -1
- package/dist/path/type.d.ts +2 -2
- package/dist/path/type.d.ts.map +1 -1
- package/dist/router/module.d.ts +1 -1
- package/dist/router/module.d.ts.map +1 -1
- package/dist/router/module.js +14 -13
- package/dist/router/module.js.map +1 -1
- package/dist/router/type.d.ts +3 -3
- package/dist/router/type.d.ts.map +1 -1
- package/dist/type.d.ts +4 -3
- package/dist/type.d.ts.map +1 -1
- package/dist/utils/index.d.ts +1 -0
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +1 -0
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/promise.d.ts +2 -0
- package/dist/utils/promise.d.ts.map +1 -0
- package/dist/utils/promise.js +19 -0
- package/dist/utils/promise.js.map +1 -0
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -62,12 +62,12 @@ router.listen(3000);
|
|
|
62
62
|
According to the fact that routup is a minimalistic framework, it depends on plugins to cover some
|
|
63
63
|
typically http framework functions, which are not integrated in the main package.
|
|
64
64
|
|
|
65
|
-
| Name
|
|
66
|
-
|
|
67
|
-
| [body](https://www.npmjs.com/package/@routup/body)
|
|
68
|
-
| [cookie](https://www.npmjs.com/package/@routup/cookie)
|
|
69
|
-
| [query](https://www.npmjs.com/package/@routup/query)
|
|
70
|
-
|
|
65
|
+
| Name | Description |
|
|
66
|
+
|----------------------------------------------------------|------------------------------------------------------------------------|
|
|
67
|
+
| [body](https://www.npmjs.com/package/@routup/body) | Read and parse the request body. |
|
|
68
|
+
| [cookie](https://www.npmjs.com/package/@routup/cookie) | Read and parse request cookies and serialize cookies for the response. |
|
|
69
|
+
| [query](https://www.npmjs.com/package/@routup/query) | Read and parse the query string of the request url. |
|
|
70
|
+
| [swagger](https://www.npmjs.com/package/@routup/swagger) | Serve generated docs from URL or based on a JSON file. |
|
|
71
71
|
|
|
72
72
|
## License
|
|
73
73
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../src/decorators/method/type.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,
|
|
1
|
+
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../src/decorators/method/type.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,MAAM,MAAM,sBAAsB,GAAG;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,SAAS,EAAE,CAAC;CAC5B,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Next, Request, Response } from '../../type';
|
|
2
|
-
export
|
|
3
|
-
export
|
|
2
|
+
export type DecoratorParameterBuildFn = (req: Request, res: Response, next: Next, property?: string) => any;
|
|
3
|
+
export type DecoratorParameterOptions = {
|
|
4
4
|
index: number;
|
|
5
5
|
build: DecoratorParameterBuildFn;
|
|
6
6
|
property?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../src/decorators/parameter/type.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAErD,
|
|
1
|
+
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../src/decorators/parameter/type.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAErD,MAAM,MAAM,yBAAyB,GAAG,CACpC,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,IAAI,EACV,QAAQ,CAAC,EAAE,MAAM,KAChB,GAAG,CAAC;AAET,MAAM,MAAM,yBAAyB,GAAG;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,yBAAyB,CAAC;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ClassType } from '../type';
|
|
2
2
|
import { DecoratorMethodOptions } from './method';
|
|
3
3
|
import { DecoratorParameterOptions } from './parameter';
|
|
4
|
-
export
|
|
4
|
+
export type DecoratorMeta = {
|
|
5
5
|
url: string;
|
|
6
6
|
methods: {
|
|
7
7
|
[key: string]: DecoratorMethodOptions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/decorators/type.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAClD,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAExD,
|
|
1
|
+
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/decorators/type.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAClD,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAExD,MAAM,MAAM,aAAa,GAAG;IACxB,GAAG,EAAE,MAAM,CAAC;IAEZ,OAAO,EAAE;QACL,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAA;KACxC,CAAC;IAEF,WAAW,EAAE,SAAS,EAAE,CAAC;IAEzB,UAAU,EAAE;QACR,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,EAAE,CAAA;KAC7C,CAAA;CACJ,CAAC"}
|
package/dist/handler/type.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Next, Request, Response } from '../type';
|
|
2
|
-
export
|
|
3
|
-
export
|
|
2
|
+
export type Handler = (req: Request, res: Response, next: Next) => unknown;
|
|
3
|
+
export type ErrorHandler = (err: Error, req: Request, res: Response, next: Next) => unknown;
|
|
4
4
|
export interface HandlerInterface {
|
|
5
5
|
run(request: Request, response: Response, next: Next): Promise<void> | void;
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/handler/type.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAElD,
|
|
1
|
+
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/handler/type.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAElD,MAAM,MAAM,OAAO,GAAG,CAClB,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,IAAI,KACT,OAAO,CAAC;AAEb,MAAM,MAAM,YAAY,GAAG,CACvB,GAAG,EAAE,KAAK,EACV,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,IAAI,KACT,OAAO,CAAC;AAEb,MAAM,WAAW,gBAAgB;IAC7B,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CAC/E"}
|
package/dist/handler/utils.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import { ClassType, Next, Response } from '../type';
|
|
1
2
|
import { Handler, HandlerInterface } from './type';
|
|
2
|
-
import { ClassType } from '../type';
|
|
3
3
|
export declare function isHandlerClassInstance(input: unknown): input is HandlerInterface;
|
|
4
4
|
export declare function createHandlerForClassType(item: ClassType): Handler;
|
|
5
|
+
export declare function processHandlerExecutionOutput(res: Response, next: Next, output?: unknown): void;
|
|
5
6
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -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":"AASA,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEpD,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAEnD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAI,KAAK,IAAI,gBAAgB,CAGjF;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,SAAS,GAAI,OAAO,CAkBnE;AAED,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,OAAO,QAiBxF"}
|
package/dist/handler/utils.js
CHANGED
|
@@ -6,8 +6,10 @@
|
|
|
6
6
|
* view the LICENSE file that was distributed with this source code.
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.createHandlerForClassType = exports.isHandlerClassInstance = void 0;
|
|
9
|
+
exports.processHandlerExecutionOutput = exports.createHandlerForClassType = exports.isHandlerClassInstance = void 0;
|
|
10
10
|
const smob_1 = require("smob");
|
|
11
|
+
const helpers_1 = require("../helpers");
|
|
12
|
+
const utils_1 = require("../utils");
|
|
11
13
|
function isHandlerClassInstance(input) {
|
|
12
14
|
return (0, smob_1.isObject)(input) &&
|
|
13
15
|
typeof input.run === 'function';
|
|
@@ -34,4 +36,21 @@ function createHandlerForClassType(item) {
|
|
|
34
36
|
};
|
|
35
37
|
}
|
|
36
38
|
exports.createHandlerForClassType = createHandlerForClassType;
|
|
39
|
+
function processHandlerExecutionOutput(res, next, output) {
|
|
40
|
+
if ((0, utils_1.isPromise)(output)) {
|
|
41
|
+
output
|
|
42
|
+
.then((r) => {
|
|
43
|
+
if (typeof r !== 'undefined') {
|
|
44
|
+
(0, helpers_1.send)(res, r);
|
|
45
|
+
}
|
|
46
|
+
return r;
|
|
47
|
+
})
|
|
48
|
+
.catch(next);
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
if (typeof output !== 'undefined') {
|
|
52
|
+
(0, helpers_1.send)(res, output);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
exports.processHandlerExecutionOutput = processHandlerExecutionOutput;
|
|
37
56
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/handler/utils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+BAAgC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/handler/utils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+BAAgC;AAChC,wCAAkC;AAElC,oCAAqC;AAGrC,SAAgB,sBAAsB,CAAC,KAAc;IACjD,OAAO,IAAA,eAAQ,EAAC,KAAK,CAAC;QAClB,OAAQ,KAAa,CAAC,GAAG,KAAK,UAAU,CAAC;AACjD,CAAC;AAHD,wDAGC;AAED,SAAgB,yBAAyB,CAAC,IAAe;IACrD,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACtB,IAAI;YACA,MAAM,MAAM,GAAG,IAAK,IAAkB,EAAE,CAAC;YAEzC,IAAI,sBAAsB,CAAC,MAAM,CAAC,EAAE;gBAChC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;aAC9B;iBAAM;gBACH,0BAA0B;gBAC1B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;aAC1B;SACJ;QAAC,OAAO,CAAC,EAAE;YACR,0BAA0B;YAC1B,IAAI,CAAC,YAAY,KAAK,EAAE;gBACpB,IAAI,CAAC,CAAC,CAAC,CAAC;aACX;SACJ;IACL,CAAC,CAAC;AACN,CAAC;AAlBD,8DAkBC;AAED,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,cAAI,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,cAAI,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;KACrB;AACL,CAAC;AAjBD,sEAiBC"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { IncomingMessage } from 'http';
|
|
3
|
-
|
|
4
|
-
export declare function
|
|
5
|
-
export declare function setRequestMountPath(req: IncomingMessage, basePath: Path): void;
|
|
3
|
+
export declare function useRequestMountPath(req: IncomingMessage): string;
|
|
4
|
+
export declare function setRequestMountPath(req: IncomingMessage, basePath: string): void;
|
|
6
5
|
//# sourceMappingURL=mount-path.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mount-path.d.ts","sourceRoot":"","sources":["../../../src/helpers/request/mount-path.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"mount-path.d.ts","sourceRoot":"","sources":["../../../src/helpers/request/mount-path.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAIvC,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,eAAe,GAAI,MAAM,CAMjE;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,QAEzE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mount-path.js","sourceRoot":"","sources":["../../../src/helpers/request/mount-path.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;
|
|
1
|
+
{"version":3,"file":"mount-path.js","sourceRoot":"","sources":["../../../src/helpers/request/mount-path.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH,MAAM,kBAAkB,GAAG,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;AAEtD,SAAgB,mBAAmB,CAAC,GAAoB;IACpD,IAAI,kBAAkB,IAAI,GAAG,EAAE;QAC3B,OAAQ,GAAW,CAAC,kBAAkB,CAAC,CAAC;KAC3C;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAND,kDAMC;AAED,SAAgB,mBAAmB,CAAC,GAAoB,EAAE,QAAgB;IACrE,GAAW,CAAC,kBAAkB,CAAC,GAAG,QAAQ,CAAC;AAChD,CAAC;AAFD,kDAEC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../src/helpers/response/cache.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,
|
|
1
|
+
{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../src/helpers/response/cache.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,MAAM,MAAM,2BAA2B,GAAG;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;CAC3B,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,2BAA2B,QAkB3F"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send-format.d.ts","sourceRoot":"","sources":["../../../src/helpers/response/send-format.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,
|
|
1
|
+
{"version":3,"file":"send-format.d.ts","sourceRoot":"","sources":["../../../src/helpers/response/send-format.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,MAAM,MAAM,cAAc,GAAG;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,IAAI,CAAC;IAC1B,OAAO,EAAE,MAAM,IAAI,CAAA;CACtB,CAAC;AAEF,wBAAgB,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,QAE9D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/layer/module.ts"],"names":[],"mappings":"AAQA,OAAO,EACH,YAAY,EAAE,qBAAqB,EACtC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/layer/module.ts"],"names":[],"mappings":"AAQA,OAAO,EACH,YAAY,EAAE,qBAAqB,EACtC,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EACH,cAAc,EAAQ,IAAI,EAAE,OAAO,EAAE,QAAQ,EAChD,MAAM,SAAS,CAAC;AAEjB,qBAAa,KAAK;IACd,QAAQ,CAAC,aAAa,SAAuB;IAE7C,SAAS,CAAC,EAAE,EAAG,gBAAgB,CAAC;IAEhC,SAAS,CAAC,WAAW,EAAG,WAAW,CAAC;gBAKhC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,qBAAqB,GAAG,YAAY,EAC7C,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;IAoDR,SAAS,CAAC,IAAI,EAAE,MAAM,GAAI,OAAO;IAIjC,IAAI,CAAC,IAAI,EAAE,MAAM;CAGpB"}
|
package/dist/layer/module.js
CHANGED
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.Layer = void 0;
|
|
10
10
|
const http_1 = require("@ebec/http");
|
|
11
|
+
const handler_1 = require("../handler");
|
|
11
12
|
const helpers_1 = require("../helpers");
|
|
12
13
|
const path_1 = require("../path");
|
|
13
14
|
class Layer {
|
|
@@ -23,6 +24,7 @@ class Layer {
|
|
|
23
24
|
}
|
|
24
25
|
dispatch(req, res, meta, next, err) {
|
|
25
26
|
(0, helpers_1.setRequestParams)(req, meta.params || {});
|
|
27
|
+
(0, helpers_1.setRequestMountPath)(req, meta.mountPath || '/');
|
|
26
28
|
if (typeof err !== 'undefined') {
|
|
27
29
|
if (this.fn.length === 4) {
|
|
28
30
|
try {
|
|
@@ -46,9 +48,7 @@ class Layer {
|
|
|
46
48
|
}
|
|
47
49
|
try {
|
|
48
50
|
const output = this.fn(req, res, next);
|
|
49
|
-
|
|
50
|
-
output.catch((e) => next(e));
|
|
51
|
-
}
|
|
51
|
+
(0, handler_1.processHandlerExecutionOutput)(res, next, output);
|
|
52
52
|
}
|
|
53
53
|
catch (e) {
|
|
54
54
|
/* istanbul ignore next */
|
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,qCAAiD;AAIjD,
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/layer/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAAiD;AAIjD,wCAA2D;AAC3D,wCAAmE;AACnE,kCAAsC;AAKtC,MAAa,KAAK;IAOd,qDAAqD;IAErD,YACI,IAAU,EACV,OAA6C,EAC7C,EAAoB;QAXf,mBAAa,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAazC,IAAI,CAAC,WAAW,GAAG,IAAI,kBAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClD,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,0BAAgB,EAAC,GAAG,EAAE,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;QACzC,IAAA,6BAAmB,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,IAAI,CAAC,GAAG,CAAC,CAAC;iBACb;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,0BAAmB,EAAE,CAAC,CAAC;aACnC;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;AAlGD,sBAkGC"}
|
package/dist/path/type.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ParseOptions, TokensToRegexpOptions } from 'path-to-regexp';
|
|
2
|
-
export
|
|
3
|
-
export
|
|
2
|
+
export type PathMatcherOptions = TokensToRegexpOptions & ParseOptions;
|
|
3
|
+
export type PathMatcherExecResult = {
|
|
4
4
|
path: string;
|
|
5
5
|
params: Record<string, any>;
|
|
6
6
|
};
|
package/dist/path/type.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/path/type.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAErE,
|
|
1
|
+
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/path/type.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAErE,MAAM,MAAM,kBAAkB,GAAG,qBAAqB,GAAG,YAAY,CAAC;AAEtE,MAAM,MAAM,qBAAqB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAC9B,CAAC"}
|
package/dist/router/module.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/router/module.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,eAAe,EAAgB,MAAM,MAAM,CAAC;AAIrD,OAAO,
|
|
1
|
+
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/router/module.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,eAAe,EAAgB,MAAM,MAAM,CAAC;AAIrD,OAAO,EACH,YAAY,EAAE,OAAO,EACxB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAStC,OAAO,EAAE,KAAK,EAAmB,MAAM,UAAU,CAAC;AAClD,OAAO,EAAE,KAAK,EAAmB,MAAM,UAAU,CAAC;AAClD,OAAO,EACH,SAAS,EACT,cAAc,EACd,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,QAAQ,EACX,MAAM,SAAS,CAAC;AAIjB,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAEvC,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAI,KAAK,IAAI,MAAM,CAEjE;AAED,qBAAa,MAAM;IACf,QAAQ,CAAC,aAAa,SAAwB;IAE9C,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC;IAEjC,SAAS,CAAC,KAAK,EAAG,CAAC,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC,EAAE,CAAM;IAElD,SAAS,CAAC,WAAW,EAAG,WAAW,GAAG,SAAS,CAAC;IAEhD;;;;OAIG;IACH,SAAS,CAAC,MAAM,EAAG,OAAO,GAAG,SAAS,CAAC;gBAI3B,OAAO,CAAC,EAAE,aAAa;IAWnC,SAAS,CAAC,CAAC,SAAS,MAAM,aAAa,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC;IAuBxE,cAAc,IAAK,eAAe;IASlC,MAAM,CAAC,IAAI,EAAE,MAAM;IAOnB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAI,OAAO;IAUjC,QAAQ,CACJ,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,IAAI,CAAC,EAAE,cAAc,EACrB,IAAI,CAAC,EAAE,IAAI,GACX,IAAI;IA+HR,aAAa,CACT,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,GACb,OAAO,CAAC,IAAI,CAAC;IAejB,KAAK,CACD,IAAI,EAAE,IAAI,GACV,KAAK;IAsBT,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,GAAI,IAAI;IAOjD,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,GAAI,IAAI;IAO9C,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,GAAI,IAAI;IAO/C,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,GAAI,IAAI;IAO9C,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,GAAI,IAAI;IAShD,GAAG,CAAC,MAAM,EAAE,MAAM,GAAI,IAAI;IAE1B,GAAG,CAAC,OAAO,EAAE,OAAO,GAAI,IAAI;IAE5B,GAAG,CAAC,OAAO,EAAE,YAAY,GAAI,IAAI;IAEjC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,GAAI,IAAI;IAEtC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,GAAI,IAAI;IAExC,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,GAAI,IAAI;IAkC7C,aAAa,CAAC,KAAK,EAAE,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IA+CtD,cAAc,CAAC,KAAK,EAAE,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE;CAK5D"}
|
package/dist/router/module.js
CHANGED
|
@@ -27,7 +27,6 @@ class Router {
|
|
|
27
27
|
this['@instanceof'] = Symbol.for('Router');
|
|
28
28
|
this.stack = [];
|
|
29
29
|
options = options || {};
|
|
30
|
-
options.timeout = options.timeout || 60000;
|
|
31
30
|
options.mountPath = options.mountPath || '/';
|
|
32
31
|
this.options = options;
|
|
33
32
|
this.setOption('mountPath', this.options.mountPath);
|
|
@@ -59,7 +58,7 @@ class Router {
|
|
|
59
58
|
}
|
|
60
59
|
/* istanbul ignore next */
|
|
61
60
|
listen(port) {
|
|
62
|
-
const server = (0, http_1.createServer)(this.createListener);
|
|
61
|
+
const server = (0, http_1.createServer)(this.createListener());
|
|
63
62
|
return server.listen(port);
|
|
64
63
|
}
|
|
65
64
|
// --------------------------------------------------
|
|
@@ -73,8 +72,9 @@ class Router {
|
|
|
73
72
|
dispatch(req, res, meta, done) {
|
|
74
73
|
let index = -1;
|
|
75
74
|
meta = meta || {};
|
|
76
|
-
if (this.isRoot
|
|
77
|
-
|
|
75
|
+
if (this.isRoot &&
|
|
76
|
+
this.options.timeout) {
|
|
77
|
+
(0, utils_2.createResponseTimeout)(res, this.options.timeout, done);
|
|
78
78
|
}
|
|
79
79
|
const fn = (err) => {
|
|
80
80
|
/* istanbul ignore if */
|
|
@@ -97,6 +97,7 @@ class Router {
|
|
|
97
97
|
if (this.pathMatcher) {
|
|
98
98
|
const output = this.pathMatcher.exec(path);
|
|
99
99
|
if (typeof output !== 'undefined') {
|
|
100
|
+
meta.mountPath = (0, utils_2.cleanDoubleSlashes)(`${meta.mountPath || ''}/${output.path}`);
|
|
100
101
|
if (path === output.path) {
|
|
101
102
|
path = '/';
|
|
102
103
|
}
|
|
@@ -106,12 +107,14 @@ class Router {
|
|
|
106
107
|
meta.params = (0, smob_1.merge)(meta.params || {}, output.params);
|
|
107
108
|
}
|
|
108
109
|
}
|
|
110
|
+
if (!meta.mountPath) {
|
|
111
|
+
meta.mountPath = '/';
|
|
112
|
+
}
|
|
109
113
|
const next = (err) => {
|
|
110
114
|
if (index >= this.stack.length - 1) {
|
|
111
115
|
fn(err);
|
|
112
116
|
return;
|
|
113
117
|
}
|
|
114
|
-
(0, helpers_1.setRequestMountPath)(req, this.options.mountPath || '/');
|
|
115
118
|
let layer;
|
|
116
119
|
let match = false;
|
|
117
120
|
while (!match && index < this.stack.length) {
|
|
@@ -135,13 +138,12 @@ class Router {
|
|
|
135
138
|
fn(err);
|
|
136
139
|
return;
|
|
137
140
|
}
|
|
138
|
-
|
|
141
|
+
const layerMeta = Object.assign(Object.assign({}, meta), { path });
|
|
139
142
|
if ((0, layer_1.isLayerInstance)(layer)) {
|
|
140
143
|
const output = layer.exec(path);
|
|
141
144
|
if (output) {
|
|
142
|
-
layerMeta = {
|
|
143
|
-
|
|
144
|
-
};
|
|
145
|
+
layerMeta.params = (0, smob_1.merge)(output.params, layerMeta.params || {});
|
|
146
|
+
layerMeta.mountPath = (0, utils_2.cleanDoubleSlashes)(`${layerMeta.mountPath || ''}/${output.path}`);
|
|
145
147
|
}
|
|
146
148
|
}
|
|
147
149
|
if (err) {
|
|
@@ -209,6 +211,7 @@ class Router {
|
|
|
209
211
|
return this;
|
|
210
212
|
}
|
|
211
213
|
use(...input) {
|
|
214
|
+
/* istanbul ignore next */
|
|
212
215
|
if (input.length === 0) {
|
|
213
216
|
return this;
|
|
214
217
|
}
|
|
@@ -249,12 +252,10 @@ class Router {
|
|
|
249
252
|
const propertyKeys = Object.keys(meta.methods);
|
|
250
253
|
for (let i = 0; i < propertyKeys.length; i++) {
|
|
251
254
|
const handler = (req, res, next) => {
|
|
252
|
-
const
|
|
255
|
+
const output = controller[propertyKeys[i]].apply(controller, [
|
|
253
256
|
...(0, decorators_1.buildDecoratorMethodArguments)(req, res, next, meta.parameters[propertyKeys[i]]),
|
|
254
257
|
]);
|
|
255
|
-
|
|
256
|
-
method.catch(next);
|
|
257
|
-
}
|
|
258
|
+
(0, handler_1.processHandlerExecutionOutput)(res, next, output);
|
|
258
259
|
};
|
|
259
260
|
const method = meta.methods[propertyKeys[i]];
|
|
260
261
|
const handlers = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/router/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+BAAqD;AACrD,+BAAuC;AACvC,8CAA8D;AAC9D,+CAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/router/module.ts"],"names":[],"mappings":"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"}
|
package/dist/router/type.d.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { Path } from '../type';
|
|
2
|
-
export
|
|
2
|
+
export type RouterOptions = {
|
|
3
3
|
/**
|
|
4
|
-
* Milliseconds (ms) until request should
|
|
4
|
+
* Milliseconds (ms) until the request should be canceled.
|
|
5
5
|
*
|
|
6
6
|
* @type number
|
|
7
|
-
* @default
|
|
7
|
+
* @default undefined
|
|
8
8
|
*/
|
|
9
9
|
timeout?: number;
|
|
10
10
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/router/type.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,
|
|
1
|
+
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/router/type.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,MAAM,MAAM,aAAa,GAAG;IACxB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,IAAI,CAAA;CACnB,CAAC"}
|
package/dist/type.d.ts
CHANGED
|
@@ -4,9 +4,9 @@ export interface Response extends ServerResponse {
|
|
|
4
4
|
}
|
|
5
5
|
export interface Request extends IncomingMessage {
|
|
6
6
|
}
|
|
7
|
-
export
|
|
8
|
-
export
|
|
9
|
-
export
|
|
7
|
+
export type Next = (err?: Error) => void;
|
|
8
|
+
export type Path = string | RegExp;
|
|
9
|
+
export type DispatcherMeta = {
|
|
10
10
|
/**
|
|
11
11
|
* Params collected on path.
|
|
12
12
|
*/
|
|
@@ -15,6 +15,7 @@ export declare type DispatcherMeta = {
|
|
|
15
15
|
* Path to check for the current instance.
|
|
16
16
|
*/
|
|
17
17
|
path?: string;
|
|
18
|
+
mountPath?: string;
|
|
18
19
|
};
|
|
19
20
|
export interface ClassType extends Function {
|
|
20
21
|
new (...args: any[]): any;
|
package/dist/type.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAEvD,MAAM,WAAW,QAAS,SAAQ,cAAc;CAE/C;AAED,MAAM,WAAW,OAAQ,SAAQ,eAAe;CAE/C;AAED,
|
|
1
|
+
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../src/type.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAEvD,MAAM,WAAW,QAAS,SAAQ,cAAc;CAE/C;AAED,MAAM,WAAW,OAAQ,SAAQ,eAAe;CAE/C;AAED,MAAM,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;AAEzC,MAAM,MAAM,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC;AAInC,MAAM,MAAM,cAAc,GAAG;IACzB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,SAAS,CAAC,EAAE,MAAM,CAAA;CACrB,CAAC;AAIF,MAAM,WAAW,SAAU,SAAQ,QAAQ;IACvC,KAAI,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;CAC5B"}
|
package/dist/utils/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAOA,cAAc,eAAe,CAAC;AAC9B,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,YAAY,CAAC;AAC3B,cAAc,OAAO,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAOA,cAAc,eAAe,CAAC;AAC9B,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,OAAO,CAAC"}
|
package/dist/utils/index.js
CHANGED
|
@@ -23,6 +23,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
23
23
|
__exportStar(require("./is-instance"), exports);
|
|
24
24
|
__exportStar(require("./mime"), exports);
|
|
25
25
|
__exportStar(require("./path"), exports);
|
|
26
|
+
__exportStar(require("./promise"), exports);
|
|
26
27
|
__exportStar(require("./response"), exports);
|
|
27
28
|
__exportStar(require("./url"), exports);
|
|
28
29
|
//# sourceMappingURL=index.js.map
|
package/dist/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,gDAA8B;AAC9B,yCAAuB;AACvB,yCAAuB;AACvB,6CAA2B;AAC3B,wCAAsB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;AAEH,gDAA8B;AAC9B,yCAAuB;AACvB,yCAAuB;AACvB,4CAA0B;AAC1B,6CAA2B;AAC3B,wCAAsB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"promise.d.ts","sourceRoot":"","sources":["../../src/utils/promise.ts"],"names":[],"mappings":"AASA,wBAAgB,SAAS,CAAC,CAAC,EAAE,OAAO,GAAI,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAQ5D"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/*
|
|
3
|
+
* Copyright (c) 2022.
|
|
4
|
+
* Author Peter Placzek (tada5hi)
|
|
5
|
+
* For the full copyright and license information,
|
|
6
|
+
* view the LICENSE file that was distributed with this source code.
|
|
7
|
+
*/
|
|
8
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
exports.isPromise = void 0;
|
|
10
|
+
const smob_1 = require("smob");
|
|
11
|
+
function isPromise(p) {
|
|
12
|
+
return (0, smob_1.isObject)(p) &&
|
|
13
|
+
(p instanceof Promise ||
|
|
14
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
15
|
+
// @ts-ignore
|
|
16
|
+
typeof p.then === 'function');
|
|
17
|
+
}
|
|
18
|
+
exports.isPromise = isPromise;
|
|
19
|
+
//# sourceMappingURL=promise.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"promise.js","sourceRoot":"","sources":["../../src/utils/promise.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+BAAgC;AAEhC,SAAgB,SAAS,CAAC,CAAU;IAChC,OAAO,IAAA,eAAQ,EAAC,CAAC,CAAC;QACd,CACI,CAAC,YAAY,OAAO;YACpB,6DAA6D;YAC7D,aAAa;YACb,OAAO,CAAC,CAAC,IAAI,KAAK,UAAU,CAC/B,CAAC;AACV,CAAC;AARD,8BAQC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "routup",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.4.0",
|
|
4
4
|
"description": "Routup is a minimalistic http based routing framework.",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"typings": "dist/index.d.ts",
|
|
@@ -52,5 +52,5 @@
|
|
|
52
52
|
"path-to-regexp": "^6.2.1",
|
|
53
53
|
"smob": "^0.0.6"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "7f7b7f419f7f9267d33ef012a24da5c24f4f56b6"
|
|
56
56
|
}
|