@celljs/web 4.1.0 → 4.2.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 +39 -1
- package/cell.yml +0 -3
- package/esm/browser/module.d.ts +1 -1
- package/esm/common/module.d.ts +1 -1
- package/esm/common/pipe/index.d.ts +1 -1
- package/esm/common/pipe/index.js +1 -1
- package/esm/common/pipe/index.js.map +1 -1
- package/esm/common/pipe/type-conversion-pipe.d.ts +12 -0
- package/esm/common/pipe/type-conversion-pipe.js +43 -0
- package/esm/common/pipe/type-conversion-pipe.js.map +1 -0
- package/esm/common/pipe/validation-errors.d.ts +11 -2
- package/esm/common/pipe/validation-errors.js +2 -0
- package/esm/common/pipe/validation-errors.js.map +1 -1
- package/esm/node/body/body-middleware.d.ts +4 -6
- package/esm/node/body/body-middleware.js +6 -16
- package/esm/node/body/body-middleware.js.map +1 -1
- package/esm/node/body/body-parser.d.ts +32 -0
- package/esm/node/body/body-parser.js +205 -0
- package/esm/node/body/body-parser.js.map +1 -0
- package/esm/node/body/body-protocol.d.ts +15 -0
- package/esm/node/body/form-util.d.ts +15 -0
- package/esm/node/body/form-util.js +120 -0
- package/esm/node/body/form-util.js.map +1 -0
- package/esm/node/body/index.d.ts +2 -0
- package/esm/node/body/index.js +2 -0
- package/esm/node/body/index.js.map +1 -1
- package/esm/node/cookies/cookies-factory.js +2 -6
- package/esm/node/cookies/cookies-factory.js.map +1 -1
- package/esm/node/cookies/cookies-protocol.d.ts +25 -2
- package/esm/node/cookies/cookies.d.ts +17 -0
- package/esm/node/cookies/cookies.js +137 -0
- package/esm/node/cookies/cookies.js.map +1 -0
- package/esm/node/cookies/index.d.ts +1 -0
- package/esm/node/cookies/index.js +1 -0
- package/esm/node/cookies/index.js.map +1 -1
- package/esm/node/cors/cors-middleware.d.ts +11 -3
- package/esm/node/cors/cors-middleware.js +108 -14
- package/esm/node/cors/cors-middleware.js.map +1 -1
- package/esm/node/cors/cors-protocol.d.ts +23 -0
- package/esm/node/error/error-handler-provider.js +3 -7
- package/esm/node/error/error-handler-provider.js.map +1 -1
- package/esm/node/health/health-middleware.js +1 -1
- package/esm/node/health/health-middleware.js.map +1 -1
- package/esm/node/http/http-protocol.d.ts +29 -5
- package/esm/node/http/http-protocol.js.map +1 -1
- package/esm/node/http/http-request.d.ts +41 -0
- package/esm/node/http/http-request.js +106 -0
- package/esm/node/http/http-request.js.map +1 -0
- package/esm/node/http/index.d.ts +1 -0
- package/esm/node/http/index.js +1 -0
- package/esm/node/http/index.js.map +1 -1
- package/esm/node/index.d.ts +1 -0
- package/esm/node/index.js +1 -0
- package/esm/node/index.js.map +1 -1
- package/esm/node/matcher/index.d.ts +1 -0
- package/esm/node/matcher/index.js +1 -0
- package/esm/node/matcher/index.js.map +1 -1
- package/esm/node/matcher/path-pattern.d.ts +23 -0
- package/esm/node/matcher/path-pattern.js +115 -0
- package/esm/node/matcher/path-pattern.js.map +1 -0
- package/esm/node/matcher/request-matcher.d.ts +2 -2
- package/esm/node/matcher/request-matcher.js +8 -9
- package/esm/node/matcher/request-matcher.js.map +1 -1
- package/esm/node/module.d.ts +1 -1
- package/esm/node/server/http-server.d.ts +13 -0
- package/esm/node/server/http-server.js +32 -0
- package/esm/node/server/http-server.js.map +1 -0
- package/esm/node/server/index.d.ts +1 -0
- package/esm/node/server/index.js +2 -0
- package/esm/node/server/index.js.map +1 -0
- package/esm/node/session/session-manager.js +1 -2
- package/esm/node/session/session-manager.js.map +1 -1
- package/esm/node/session/session-store.js +1 -2
- package/esm/node/session/session-store.js.map +1 -1
- package/esm/node/session/session.d.ts +3 -2
- package/esm/node/session/session.js +4 -10
- package/esm/node/session/session.js.map +1 -1
- package/lib/browser/module.d.ts +1 -1
- package/lib/common/module.d.ts +1 -1
- package/lib/common/pipe/index.d.ts +1 -1
- package/lib/common/pipe/index.d.ts.map +1 -1
- package/lib/common/pipe/index.js +1 -1
- package/lib/common/pipe/index.js.map +1 -1
- package/lib/common/pipe/type-conversion-pipe.d.ts +13 -0
- package/lib/common/pipe/type-conversion-pipe.d.ts.map +1 -0
- package/lib/common/pipe/type-conversion-pipe.js +46 -0
- package/lib/common/pipe/type-conversion-pipe.js.map +1 -0
- package/lib/common/pipe/type-conversion-pipe.spec.d.ts +2 -0
- package/lib/common/pipe/type-conversion-pipe.spec.d.ts.map +1 -0
- package/lib/common/pipe/type-conversion-pipe.spec.js +36 -0
- package/lib/common/pipe/type-conversion-pipe.spec.js.map +1 -0
- package/lib/common/pipe/validation-errors.d.ts +11 -2
- package/lib/common/pipe/validation-errors.d.ts.map +1 -1
- package/lib/common/pipe/validation-errors.js +2 -0
- package/lib/common/pipe/validation-errors.js.map +1 -1
- package/lib/node/body/body-middleware.d.ts +4 -6
- package/lib/node/body/body-middleware.d.ts.map +1 -1
- package/lib/node/body/body-middleware.js +4 -13
- package/lib/node/body/body-middleware.js.map +1 -1
- package/lib/node/body/body-middleware.spec.js +78 -12
- package/lib/node/body/body-middleware.spec.js.map +1 -1
- package/lib/node/body/body-parser.d.ts +33 -0
- package/lib/node/body/body-parser.d.ts.map +1 -0
- package/lib/node/body/body-parser.js +210 -0
- package/lib/node/body/body-parser.js.map +1 -0
- package/lib/node/body/body-protocol.d.ts +15 -0
- package/lib/node/body/body-protocol.d.ts.map +1 -1
- package/lib/node/body/form-util.d.ts +16 -0
- package/lib/node/body/form-util.d.ts.map +1 -0
- package/lib/node/body/form-util.js +123 -0
- package/lib/node/body/form-util.js.map +1 -0
- package/lib/node/body/form-util.spec.d.ts +2 -0
- package/lib/node/body/form-util.spec.d.ts.map +1 -0
- package/lib/node/body/form-util.spec.js +44 -0
- package/lib/node/body/form-util.spec.js.map +1 -0
- package/lib/node/body/index.d.ts +2 -0
- package/lib/node/body/index.d.ts.map +1 -1
- package/lib/node/body/index.js +2 -0
- package/lib/node/body/index.js.map +1 -1
- package/lib/node/cookies/cookies-factory.d.ts.map +1 -1
- package/lib/node/cookies/cookies-factory.js +2 -9
- package/lib/node/cookies/cookies-factory.js.map +1 -1
- package/lib/node/cookies/cookies-protocol.d.ts +25 -2
- package/lib/node/cookies/cookies-protocol.d.ts.map +1 -1
- package/lib/node/cookies/cookies.d.ts +18 -0
- package/lib/node/cookies/cookies.d.ts.map +1 -0
- package/lib/node/cookies/cookies.js +141 -0
- package/lib/node/cookies/cookies.js.map +1 -0
- package/lib/node/cookies/cookies.spec.d.ts +2 -0
- package/lib/node/cookies/cookies.spec.d.ts.map +1 -0
- package/lib/node/cookies/cookies.spec.js +73 -0
- package/lib/node/cookies/cookies.spec.js.map +1 -0
- package/lib/node/cookies/index.d.ts +1 -0
- package/lib/node/cookies/index.d.ts.map +1 -1
- package/lib/node/cookies/index.js +1 -0
- package/lib/node/cookies/index.js.map +1 -1
- package/lib/node/cors/cors-middleware.d.ts +11 -3
- package/lib/node/cors/cors-middleware.d.ts.map +1 -1
- package/lib/node/cors/cors-middleware.js +106 -15
- package/lib/node/cors/cors-middleware.js.map +1 -1
- package/lib/node/cors/cors-middleware.spec.d.ts +2 -0
- package/lib/node/cors/cors-middleware.spec.d.ts.map +1 -0
- package/lib/node/cors/cors-middleware.spec.js +56 -0
- package/lib/node/cors/cors-middleware.spec.js.map +1 -0
- package/lib/node/cors/cors-protocol.d.ts +23 -0
- package/lib/node/cors/cors-protocol.d.ts.map +1 -1
- package/lib/node/error/error-handler-provider.d.ts.map +1 -1
- package/lib/node/error/error-handler-provider.js +2 -5
- package/lib/node/error/error-handler-provider.js.map +1 -1
- package/lib/node/health/health-middleware.js +1 -1
- package/lib/node/health/health-middleware.js.map +1 -1
- package/lib/node/http/http-protocol.d.ts +29 -5
- package/lib/node/http/http-protocol.d.ts.map +1 -1
- package/lib/node/http/http-protocol.js.map +1 -1
- package/lib/node/http/http-request.d.ts +42 -0
- package/lib/node/http/http-request.d.ts.map +1 -0
- package/lib/node/http/http-request.js +110 -0
- package/lib/node/http/http-request.js.map +1 -0
- package/lib/node/http/http-request.spec.d.ts +2 -0
- package/lib/node/http/http-request.spec.d.ts.map +1 -0
- package/lib/node/http/http-request.spec.js +65 -0
- package/lib/node/http/http-request.spec.js.map +1 -0
- package/lib/node/http/index.d.ts +1 -0
- package/lib/node/http/index.d.ts.map +1 -1
- package/lib/node/http/index.js +1 -0
- package/lib/node/http/index.js.map +1 -1
- package/lib/node/index.d.ts +1 -0
- package/lib/node/index.d.ts.map +1 -1
- package/lib/node/index.js +1 -0
- package/lib/node/index.js.map +1 -1
- package/lib/node/matcher/index.d.ts +1 -0
- package/lib/node/matcher/index.d.ts.map +1 -1
- package/lib/node/matcher/index.js +1 -0
- package/lib/node/matcher/index.js.map +1 -1
- package/lib/node/matcher/path-pattern.d.ts +24 -0
- package/lib/node/matcher/path-pattern.d.ts.map +1 -0
- package/lib/node/matcher/path-pattern.js +119 -0
- package/lib/node/matcher/path-pattern.js.map +1 -0
- package/lib/node/matcher/path-pattern.spec.d.ts +2 -0
- package/lib/node/matcher/path-pattern.spec.d.ts.map +1 -0
- package/lib/node/matcher/path-pattern.spec.js +43 -0
- package/lib/node/matcher/path-pattern.spec.js.map +1 -0
- package/lib/node/matcher/request-matcher.d.ts +2 -2
- package/lib/node/matcher/request-matcher.d.ts.map +1 -1
- package/lib/node/matcher/request-matcher.js +8 -12
- package/lib/node/matcher/request-matcher.js.map +1 -1
- package/lib/node/module.d.ts +1 -1
- package/lib/node/server/http-server.d.ts +14 -0
- package/lib/node/server/http-server.d.ts.map +1 -0
- package/lib/node/server/http-server.js +35 -0
- package/lib/node/server/http-server.js.map +1 -0
- package/lib/node/server/http-server.spec.d.ts +2 -0
- package/lib/node/server/http-server.spec.d.ts.map +1 -0
- package/lib/node/server/http-server.spec.js +41 -0
- package/lib/node/server/http-server.spec.js.map +1 -0
- package/lib/node/server/index.d.ts +2 -0
- package/lib/node/server/index.d.ts.map +1 -0
- package/lib/node/server/index.js +18 -0
- package/lib/node/server/index.js.map +1 -0
- package/lib/node/session/session-manager.d.ts.map +1 -1
- package/lib/node/session/session-manager.js +1 -2
- package/lib/node/session/session-manager.js.map +1 -1
- package/lib/node/session/session-store.d.ts.map +1 -1
- package/lib/node/session/session-store.js +1 -2
- package/lib/node/session/session-store.js.map +1 -1
- package/lib/node/session/session.d.ts +3 -2
- package/lib/node/session/session.d.ts.map +1 -1
- package/lib/node/session/session.js +4 -43
- package/lib/node/session/session.js.map +1 -1
- package/lib/node/session/session.spec.js +7 -1
- package/lib/node/session/session.spec.js.map +1 -1
- package/package.json +10 -15
- package/src/common/pipe/index.ts +1 -1
- package/src/common/pipe/type-conversion-pipe.spec.ts +38 -0
- package/src/common/pipe/type-conversion-pipe.ts +36 -0
- package/src/common/pipe/validation-errors.ts +11 -2
- package/src/node/body/body-middleware.spec.ts +93 -14
- package/src/node/body/body-middleware.ts +9 -18
- package/src/node/body/body-parser.ts +216 -0
- package/src/node/body/body-protocol.ts +15 -0
- package/src/node/body/form-util.spec.ts +45 -0
- package/src/node/body/form-util.ts +132 -0
- package/src/node/body/index.ts +2 -0
- package/src/node/cookies/cookies-factory.ts +2 -6
- package/src/node/cookies/cookies-protocol.ts +28 -3
- package/src/node/cookies/cookies.spec.ts +80 -0
- package/src/node/cookies/cookies.ts +138 -0
- package/src/node/cookies/index.ts +1 -0
- package/src/node/cors/cors-middleware.spec.ts +59 -0
- package/src/node/cors/cors-middleware.ts +112 -15
- package/src/node/cors/cors-protocol.ts +25 -0
- package/src/node/error/error-handler-provider.ts +1 -2
- package/src/node/health/health-middleware.ts +1 -1
- package/src/node/http/http-protocol.ts +29 -5
- package/src/node/http/http-request.spec.ts +68 -0
- package/src/node/http/http-request.ts +132 -0
- package/src/node/http/index.ts +1 -0
- package/src/node/index.ts +1 -0
- package/src/node/matcher/index.ts +1 -0
- package/src/node/matcher/path-pattern.spec.ts +43 -0
- package/src/node/matcher/path-pattern.ts +113 -0
- package/src/node/matcher/request-matcher.ts +9 -10
- package/src/node/server/http-server.spec.ts +45 -0
- package/src/node/server/http-server.ts +35 -0
- package/src/node/server/index.ts +1 -0
- package/src/node/session/session-manager.ts +1 -2
- package/src/node/session/session-store.ts +1 -2
- package/src/node/session/session.spec.ts +8 -1
- package/src/node/session/session.ts +6 -12
- package/esm/common/pipe/pipe-transtorm.d.ts +0 -17
- package/esm/common/pipe/pipe-transtorm.js +0 -110
- package/esm/common/pipe/pipe-transtorm.js.map +0 -1
- package/lib/common/pipe/pipe-transtorm.d.ts +0 -18
- package/lib/common/pipe/pipe-transtorm.d.ts.map +0 -1
- package/lib/common/pipe/pipe-transtorm.js +0 -113
- package/lib/common/pipe/pipe-transtorm.js.map +0 -1
- package/lib/common/pipe/pipe-transtorm.spec.d.ts +0 -2
- package/lib/common/pipe/pipe-transtorm.spec.d.ts.map +0 -1
- package/lib/common/pipe/pipe-transtorm.spec.js +0 -69
- package/lib/common/pipe/pipe-transtorm.spec.js.map +0 -1
- package/src/common/pipe/pipe-transtorm.spec.ts +0 -62
- package/src/common/pipe/pipe-transtorm.ts +0 -113
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { RequestMatcher } from './matcher-protocol';
|
|
2
|
-
import
|
|
2
|
+
import { PathPattern } from './path-pattern';
|
|
3
3
|
export declare class RequestMatcherImpl implements RequestMatcher {
|
|
4
|
-
protected caches: Map<string,
|
|
4
|
+
protected caches: Map<string, PathPattern>;
|
|
5
5
|
protected readonly cacheSize: number;
|
|
6
6
|
match(pattern: any, method?: string): Promise<any>;
|
|
7
7
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-matcher.d.ts","sourceRoot":"","sources":["../../../src/node/matcher/request-matcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,OAAO,
|
|
1
|
+
{"version":3,"file":"request-matcher.d.ts","sourceRoot":"","sources":["../../../src/node/matcher/request-matcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBACa,kBAAmB,YAAW,cAAc;IACrD,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAkC;IAG5E,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE/B,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAmBvD;CAEJ"}
|
|
@@ -8,40 +8,36 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
12
|
exports.RequestMatcherImpl = void 0;
|
|
16
13
|
const matcher_protocol_1 = require("./matcher-protocol");
|
|
17
14
|
const context_1 = require("../context");
|
|
18
15
|
const core_1 = require("@celljs/core");
|
|
19
|
-
const
|
|
16
|
+
const path_pattern_1 = require("./path-pattern");
|
|
20
17
|
let RequestMatcherImpl = class RequestMatcherImpl {
|
|
21
18
|
constructor() {
|
|
22
19
|
this.caches = new Map();
|
|
23
20
|
}
|
|
24
21
|
async match(pattern, method) {
|
|
25
22
|
const request = context_1.Context.getRequest();
|
|
26
|
-
const path = request.path;
|
|
27
23
|
if (method && request.method && method.toUpperCase() !== request.method.toUpperCase()) {
|
|
28
24
|
return false;
|
|
29
25
|
}
|
|
30
26
|
pattern = pattern || '/';
|
|
31
|
-
let
|
|
27
|
+
let pathPattern;
|
|
32
28
|
if (typeof pattern === 'string') {
|
|
33
|
-
|
|
34
|
-
if (!
|
|
35
|
-
|
|
29
|
+
pathPattern = this.caches.get(pattern);
|
|
30
|
+
if (!pathPattern) {
|
|
31
|
+
pathPattern = new path_pattern_1.PathPattern(pattern);
|
|
36
32
|
if (this.caches.size < this.cacheSize) {
|
|
37
|
-
this.caches.set(pattern,
|
|
33
|
+
this.caches.set(pattern, pathPattern);
|
|
38
34
|
}
|
|
39
35
|
}
|
|
40
36
|
}
|
|
41
37
|
else {
|
|
42
|
-
|
|
38
|
+
pathPattern = new path_pattern_1.PathPattern(pattern);
|
|
43
39
|
}
|
|
44
|
-
return
|
|
40
|
+
return pathPattern.match(request.path);
|
|
45
41
|
}
|
|
46
42
|
};
|
|
47
43
|
exports.RequestMatcherImpl = RequestMatcherImpl;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-matcher.js","sourceRoot":"","sources":["../../../src/node/matcher/request-matcher.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"request-matcher.js","sourceRoot":"","sources":["../../../src/node/matcher/request-matcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAoD;AACpD,wCAAqC;AACrC,uCAAgD;AAChD,iDAA6C;AAGtC,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAAxB;QACO,WAAM,GAA6B,IAAI,GAAG,EAAuB,CAAC;IA0BhF,CAAC;IArBG,KAAK,CAAC,KAAK,CAAC,OAAY,EAAE,MAAe;QACrC,MAAM,OAAO,GAAG,iBAAO,CAAC,UAAU,EAAE,CAAC;QACrC,IAAI,MAAM,IAAI,OAAO,CAAC,MAAM,IAAI,MAAM,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;YACpF,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,GAAG,OAAO,IAAI,GAAG,CAAC;QACzB,IAAI,WAAoC,CAAC;QACzC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC9B,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACvC,IAAI,CAAC,WAAW,EAAE,CAAC;gBACf,WAAW,GAAG,IAAI,0BAAW,CAAC,OAAO,CAAC,CAAC;gBACvC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;oBACpC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;gBAC1C,CAAC;YACL,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,WAAW,GAAG,IAAI,0BAAW,CAAC,OAAO,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;CAEJ,CAAA;;AAvBsB;IADlB,IAAA,YAAK,EAAC,0BAA0B,CAAC;;qDACG;6BAJ5B,kBAAkB;IAD9B,IAAA,gBAAS,EAAC,iCAAc,CAAC;GACb,kBAAkB,CA2B9B"}
|
package/lib/node/module.d.ts
CHANGED
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { IncomingMessage, Server, ServerResponse } from 'http';
|
|
2
|
+
import type { Container } from '@celljs/core';
|
|
3
|
+
export type RequestListener = (req: IncomingMessage, res: ServerResponse) => void;
|
|
4
|
+
export declare namespace HttpServerUtil {
|
|
5
|
+
/**
|
|
6
|
+
* The Node `(req, res)` handler of the application: each request runs through the {@link Dispatcher}
|
|
7
|
+
* in its own {@link Context}. Requests of another server (a dev server, a test, a serverless proxy)
|
|
8
|
+
* get the members of {@link HttpRequest} first.
|
|
9
|
+
*/
|
|
10
|
+
function createHandler(container: Pick<Container, 'get'>): RequestListener;
|
|
11
|
+
/** A `node:http` server whose requests are {@link HttpRequest}s from the start. */
|
|
12
|
+
function createHttpServer(handler: RequestListener): Server;
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=http-server.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-server.d.ts","sourceRoot":"","sources":["../../../src/node/server/http-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,eAAe,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAC7E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAM9C,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,EAAE,cAAc,KAAK,IAAI,CAAC;AAElF,yBAAiB,cAAc,CAAC;IAE5B;;;;OAIG;IACH,SAAgB,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,GAAG,eAAe,CAYhF;IAED,mFAAmF;IACnF,SAAgB,gBAAgB,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,CAEjE;CACJ"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.HttpServerUtil = void 0;
|
|
4
|
+
const http_1 = require("http");
|
|
5
|
+
const context_1 = require("../context");
|
|
6
|
+
const dispatcher_protocol_1 = require("../dispatcher/dispatcher-protocol");
|
|
7
|
+
const http_request_1 = require("../http/http-request");
|
|
8
|
+
var HttpServerUtil;
|
|
9
|
+
(function (HttpServerUtil) {
|
|
10
|
+
/**
|
|
11
|
+
* The Node `(req, res)` handler of the application: each request runs through the {@link Dispatcher}
|
|
12
|
+
* in its own {@link Context}. Requests of another server (a dev server, a test, a serverless proxy)
|
|
13
|
+
* get the members of {@link HttpRequest} first.
|
|
14
|
+
*/
|
|
15
|
+
function createHandler(container) {
|
|
16
|
+
const dispatcher = container.get(dispatcher_protocol_1.Dispatcher);
|
|
17
|
+
return (req, res) => {
|
|
18
|
+
const ctx = new context_1.Context(http_request_1.HttpRequest.enhance(req), res);
|
|
19
|
+
context_1.Context.run(() => dispatcher.dispatch(ctx)).catch(error => {
|
|
20
|
+
console.error(error);
|
|
21
|
+
if (!res.headersSent) {
|
|
22
|
+
res.statusCode = 500;
|
|
23
|
+
}
|
|
24
|
+
res.end();
|
|
25
|
+
});
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
HttpServerUtil.createHandler = createHandler;
|
|
29
|
+
/** A `node:http` server whose requests are {@link HttpRequest}s from the start. */
|
|
30
|
+
function createHttpServer(handler) {
|
|
31
|
+
return (0, http_1.createServer)({ IncomingMessage: http_request_1.HttpRequest }, handler);
|
|
32
|
+
}
|
|
33
|
+
HttpServerUtil.createHttpServer = createHttpServer;
|
|
34
|
+
})(HttpServerUtil || (exports.HttpServerUtil = HttpServerUtil = {}));
|
|
35
|
+
//# sourceMappingURL=http-server.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-server.js","sourceRoot":"","sources":["../../../src/node/server/http-server.ts"],"names":[],"mappings":";;;AAAA,+BAA6E;AAE7E,wCAAqC;AACrC,2EAA+D;AAC/D,uDAAmD;AAKnD,IAAiB,cAAc,CAyB9B;AAzBD,WAAiB,cAAc;IAE3B;;;;OAIG;IACH,SAAgB,aAAa,CAAC,SAAiC;QAC3D,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAsB,gCAAU,CAAC,CAAC;QAClE,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAChB,MAAM,GAAG,GAAG,IAAI,iBAAO,CAAC,0BAAW,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,GAAe,CAAC,CAAC;YACnE,iBAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBACtD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACrB,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;oBACnB,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;gBACzB,CAAC;gBACD,GAAG,CAAC,GAAG,EAAE,CAAC;YACd,CAAC,CAAC,CAAC;QACP,CAAC,CAAC;IACN,CAAC;IAZe,eAAA,aAAa,gBAY5B,CAAA;IAED,mFAAmF;IACnF,SAAgB,gBAAgB,CAAC,OAAwB;QACrD,OAAO,IAAA,mBAAY,EAAC,EAAE,eAAe,EAAE,0BAAW,EAAE,EAAE,OAAO,CAAC,CAAC;IACnE,CAAC;IAFe,eAAA,gBAAgB,mBAE/B,CAAA;AACL,CAAC,EAzBgB,cAAc,aAAd,cAAc,GAAd,cAAc,QAyB9B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-server.spec.d.ts","sourceRoot":"","sources":["../../../src/node/server/http-server.spec.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const bun_test_1 = require("bun:test");
|
|
4
|
+
const chai_1 = require("chai");
|
|
5
|
+
const dispatcher_protocol_1 = require("../dispatcher/dispatcher-protocol");
|
|
6
|
+
const http_request_1 = require("../http/http-request");
|
|
7
|
+
const http_server_1 = require("./http-server");
|
|
8
|
+
let server;
|
|
9
|
+
(0, bun_test_1.afterEach)(() => server === null || server === void 0 ? void 0 : server.close());
|
|
10
|
+
async function serve(dispatch) {
|
|
11
|
+
const container = { get: (id) => (id === dispatcher_protocol_1.Dispatcher ? { dispatch } : undefined) };
|
|
12
|
+
server = http_server_1.HttpServerUtil.createHttpServer(http_server_1.HttpServerUtil.createHandler(container));
|
|
13
|
+
await new Promise(resolve => server.listen(0, '127.0.0.1', resolve));
|
|
14
|
+
return `http://127.0.0.1:${server.address().port}`;
|
|
15
|
+
}
|
|
16
|
+
(0, bun_test_1.describe)('HttpServerUtil', () => {
|
|
17
|
+
(0, bun_test_1.it)('dispatches each request with an HttpRequest', async () => {
|
|
18
|
+
const url = await serve(async (ctx) => {
|
|
19
|
+
(0, chai_1.expect)(ctx.request).to.be.instanceOf(http_request_1.HttpRequest);
|
|
20
|
+
ctx.response.setHeader('content-type', 'application/json');
|
|
21
|
+
ctx.response.end(JSON.stringify({ path: ctx.request.path, query: ctx.request.query, host: ctx.request.hostname }));
|
|
22
|
+
});
|
|
23
|
+
const res = await fetch(`${url}/users/1?tag=a&tag=b`);
|
|
24
|
+
(0, chai_1.expect)(await res.json()).to.deep.equal({ path: '/users/1', query: { tag: ['a', 'b'] }, host: '127.0.0.1' });
|
|
25
|
+
(0, chai_1.expect)(res.headers.get('x-powered-by')).to.equal(null);
|
|
26
|
+
});
|
|
27
|
+
(0, bun_test_1.it)('answers 500 when the dispatcher fails', async () => {
|
|
28
|
+
const url = await serve(async () => {
|
|
29
|
+
throw new Error('dispatcher broke');
|
|
30
|
+
});
|
|
31
|
+
const original = console.error;
|
|
32
|
+
console.error = () => undefined;
|
|
33
|
+
try {
|
|
34
|
+
(0, chai_1.expect)((await fetch(url)).status).to.equal(500);
|
|
35
|
+
}
|
|
36
|
+
finally {
|
|
37
|
+
console.error = original;
|
|
38
|
+
}
|
|
39
|
+
});
|
|
40
|
+
});
|
|
41
|
+
//# sourceMappingURL=http-server.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http-server.spec.js","sourceRoot":"","sources":["../../../src/node/server/http-server.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/node/server/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
+
};
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
__exportStar(require("./http-server"), exports);
|
|
18
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/node/server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../../src/node/session/session-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAmB,MAAM,oBAAoB,CAAC;AAI7G,qBACa,kBAAmB,YAAW,cAAc;IAGrD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAGxC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC;IAGvC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAE9C,UAAgB,YAAY,gCAG3B;IAEK,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,CAY5B;IAEK,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../../src/node/session/session-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAmB,MAAM,oBAAoB,CAAC;AAI7G,qBACa,kBAAmB,YAAW,cAAc;IAGrD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAGxC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC;IAGvC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAE9C,UAAgB,YAAY,gCAG3B;IAEK,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,CAY5B;IAEK,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAO5B;IAEK,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAU5B;CAEJ"}
|
|
@@ -36,8 +36,7 @@ let SessionManagerImpl = class SessionManagerImpl {
|
|
|
36
36
|
await this.sessionStore.remove(context_1.Context.getSession().id);
|
|
37
37
|
}
|
|
38
38
|
context_1.Context.getCookies().set(this.sessionIdKey, '', {
|
|
39
|
-
expires: session_protocol_1.COOKIE_EXP_DATE
|
|
40
|
-
maxAge: false,
|
|
39
|
+
expires: session_protocol_1.COOKIE_EXP_DATE
|
|
41
40
|
});
|
|
42
41
|
}
|
|
43
42
|
async commit() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-manager.js","sourceRoot":"","sources":["../../../src/node/session/session-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAA6G;AAC7G,uCAA2D;AAC3D,wCAAqC;AAG9B,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAcjB,KAAK,CAAC,YAAY;QACxB,MAAM,OAAO,GAAG,iBAAO,CAAC,UAAU,EAAE,CAAC;QACrC,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,GAAG;QACL,IAAI,iBAAO,CAAC,UAAU,EAAE,EAAE,CAAC;YACvB,OAAO,iBAAO,CAAC,UAAU,EAAE,CAAC;QAChC,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5C,IAAI,SAAS,EAAE,CAAC;YACZ,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACvD,IAAI,OAAO,IAAI,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;gBACvD,OAAO,OAAO,CAAC;YACnB,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,MAAM;QACR,IAAI,iBAAO,CAAC,UAAU,EAAE,EAAE,CAAC;YACvB,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,iBAAO,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;QAC5D,CAAC;QACD,iBAAO,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,EAAE;YAC5C,OAAO,EAAE,kCAAe;
|
|
1
|
+
{"version":3,"file":"session-manager.js","sourceRoot":"","sources":["../../../src/node/session/session-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAA6G;AAC7G,uCAA2D;AAC3D,wCAAqC;AAG9B,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAcjB,KAAK,CAAC,YAAY;QACxB,MAAM,OAAO,GAAG,iBAAO,CAAC,UAAU,EAAE,CAAC;QACrC,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,GAAG;QACL,IAAI,iBAAO,CAAC,UAAU,EAAE,EAAE,CAAC;YACvB,OAAO,iBAAO,CAAC,UAAU,EAAE,CAAC;QAChC,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5C,IAAI,SAAS,EAAE,CAAC;YACZ,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACvD,IAAI,OAAO,IAAI,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;gBACvD,OAAO,OAAO,CAAC;YACnB,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,MAAM;QACR,IAAI,iBAAO,CAAC,UAAU,EAAE,EAAE,CAAC;YACvB,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,iBAAO,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;QAC5D,CAAC;QACD,iBAAO,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,EAAE;YAC5C,OAAO,EAAE,kCAAe;SAC3B,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,MAAM;QACR,MAAM,OAAO,GAAG,iBAAO,CAAC,UAAU,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAG,iBAAO,CAAC,WAAW,EAAE,CAAC;QACvC,IAAI,CAAC,OAAO,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;YACnC,OAAO;QACX,CAAC;QACD,IAAI,MAAM,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC;YACxD,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACrC,iBAAO,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QACjF,CAAC;IACL,CAAC;CAEJ,CAAA;;AAnDsB;IADlB,IAAA,YAAK,EAAC,2BAA2B,CAAC;;wDACK;AAGrB;IADlB,IAAA,YAAK,EAAC,cAAc,CAAC;;0DACiB;AAGpB;IADlB,IAAA,gBAAS,EAAC,kCAAe,CAAC;;2DACyB;AAGjC;IADlB,IAAA,gBAAS,EAAC,+BAAY,CAAC;;wDACsB;6BAZrC,kBAAkB;IAD9B,IAAA,gBAAS,EAAC,iCAAc,CAAC;GACb,kBAAkB,CAsD9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../../src/node/session/session-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAmB,MAAM,oBAAoB,CAAC;AAC7F,OAAO,EAA+B,MAAM,EAAE,MAAM,cAAc,CAAC;AAQnE,qBACa,kBAAmB,YAAW,YAAY;IAEnD,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;IAGvC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC;IAGvC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAE5B,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAWlD;IAEK,GAAG,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAGzC;IAEK,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../../src/node/session/session-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAmB,MAAM,oBAAoB,CAAC;AAC7F,OAAO,EAA+B,MAAM,EAAE,MAAM,cAAc,CAAC;AAQnE,qBACa,kBAAmB,YAAW,YAAY;IAEnD,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,CAAC;IAGvC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC;IAGvC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAE5B,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAWlD;IAEK,GAAG,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAGzC;IAEK,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAItC;CAEJ"}
|
|
@@ -36,8 +36,7 @@ let CookieSessionStore = class CookieSessionStore {
|
|
|
36
36
|
}
|
|
37
37
|
async remove(id) {
|
|
38
38
|
context_1.Context.getCookies().set(this.sessionOptions.sessionKey, '', {
|
|
39
|
-
expires: session_protocol_1.COOKIE_EXP_DATE
|
|
40
|
-
maxAge: false,
|
|
39
|
+
expires: session_protocol_1.COOKIE_EXP_DATE
|
|
41
40
|
});
|
|
42
41
|
}
|
|
43
42
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../../src/node/session/session-store.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAA6F;AAC7F,uCAAmE;AACnE,wCAAqC;AACrC,yCAAsC;AACtC,yCAAyD;AAEzD,MAAM,IAAI,GAAG,IAAA,qBAAS,EAAC,gBAAY,CAAC,CAAC;AACrC,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,kBAAM,CAAC,CAAC;AAG1B,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAa3B,KAAK,CAAC,GAAG,CAAC,EAAU;QAChB,MAAM,KAAK,GAAG,iBAAO,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAC5F,IAAI,KAAK,EAAE,CAAC;YACR,IAAI,CAAC;gBACD,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;gBAChE,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;YAC5E,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC7B,CAAC;QAEL,CAAC;IACL,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAChE,iBAAO,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IACjH,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU;QACnB,iBAAO,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,EAAE,EAAE;YACzD,OAAO,EAAE,kCAAe;
|
|
1
|
+
{"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../../src/node/session/session-store.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAA6F;AAC7F,uCAAmE;AACnE,wCAAqC;AACrC,yCAAsC;AACtC,yCAAyD;AAEzD,MAAM,IAAI,GAAG,IAAA,qBAAS,EAAC,gBAAY,CAAC,CAAC;AACrC,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,kBAAM,CAAC,CAAC;AAG1B,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAa3B,KAAK,CAAC,GAAG,CAAC,EAAU;QAChB,MAAM,KAAK,GAAG,iBAAO,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAC5F,IAAI,KAAK,EAAE,CAAC;YACR,IAAI,CAAC;gBACD,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;gBAChE,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;YAC5E,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC7B,CAAC;QAEL,CAAC;IACL,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAChE,iBAAO,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IACjH,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU;QACnB,iBAAO,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,EAAE,EAAE;YACzD,OAAO,EAAE,kCAAe;SAC3B,CAAC,CAAC;IACP,CAAC;CAEJ,CAAA;;AAhCsB;IADlB,IAAA,YAAK,EAAC,cAAc,CAAC;;0DACiB;AAGpB;IADlB,IAAA,gBAAS,EAAC,kCAAe,CAAC;;2DACyB;AAGjC;IADlB,IAAA,gBAAS,EAAC,aAAM,CAAC;;kDACgB;6BAXzB,kBAAkB;IAD9B,IAAA,gBAAS,EAAC,+BAAY,CAAC;GACX,kBAAkB,CAqC9B"}
|
|
@@ -4,9 +4,10 @@ export declare class SessionImpl implements Session {
|
|
|
4
4
|
isNew: boolean;
|
|
5
5
|
expire: number;
|
|
6
6
|
maxAge: number;
|
|
7
|
-
|
|
7
|
+
/** The serialized values when the session was created or restored, to tell whether it changed. */
|
|
8
|
+
protected _snapshot: string;
|
|
8
9
|
constructor(sessionOptions: any, obj?: any);
|
|
9
|
-
protected
|
|
10
|
+
protected serialize(): string;
|
|
10
11
|
toJSON(): any;
|
|
11
12
|
get changed(): boolean;
|
|
12
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/node/session/session.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/node/session/session.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,qBAAa,WAAY,YAAW,OAAO;IACvC,QAAQ,CAAC,EAAE,SAAmB;IAC9B,KAAK,UAAQ;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,kGAAkG;IAClG,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC;IAC5B,YAAY,cAAc,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,EAWzC;IAED,SAAS,CAAC,SAAS,IAAI,MAAM,CAE5B;IAED,MAAM,IAAI,GAAG,CAQZ;IAED,IAAI,OAAO,YAEV;CAEJ"}
|
|
@@ -1,43 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
-
var ownKeys = function(o) {
|
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
-
var ar = [];
|
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
-
return ar;
|
|
24
|
-
};
|
|
25
|
-
return ownKeys(o);
|
|
26
|
-
};
|
|
27
|
-
return function (mod) {
|
|
28
|
-
if (mod && mod.__esModule) return mod;
|
|
29
|
-
var result = {};
|
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
-
__setModuleDefault(result, mod);
|
|
32
|
-
return result;
|
|
33
|
-
};
|
|
34
|
-
})();
|
|
35
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
3
|
exports.SessionImpl = void 0;
|
|
37
4
|
const uuid_1 = require("@celljs/core/lib/common/utils/uuid");
|
|
38
|
-
const zlib = __importStar(require("node:zlib"));
|
|
39
|
-
// zlib.crc32 exists from Node.js 20.15 (and in Bun); @types/node is pinned to 18 in this repository.
|
|
40
|
-
const crc32 = zlib.crc32;
|
|
41
5
|
class SessionImpl {
|
|
42
6
|
constructor(sessionOptions, obj) {
|
|
43
7
|
this.id = (0, uuid_1.generateUUUID)();
|
|
@@ -52,10 +16,10 @@ class SessionImpl {
|
|
|
52
16
|
this.expire = sessionOptions.maxAge + Date.now();
|
|
53
17
|
this.maxAge = sessionOptions.maxAge;
|
|
54
18
|
}
|
|
55
|
-
this.
|
|
19
|
+
this._snapshot = this.serialize();
|
|
56
20
|
}
|
|
57
|
-
|
|
58
|
-
return
|
|
21
|
+
serialize() {
|
|
22
|
+
return JSON.stringify(this.toJSON());
|
|
59
23
|
}
|
|
60
24
|
toJSON() {
|
|
61
25
|
const obj = {};
|
|
@@ -67,10 +31,7 @@ class SessionImpl {
|
|
|
67
31
|
return obj;
|
|
68
32
|
}
|
|
69
33
|
get changed() {
|
|
70
|
-
|
|
71
|
-
return true;
|
|
72
|
-
}
|
|
73
|
-
return false;
|
|
34
|
+
return this._snapshot !== this.serialize();
|
|
74
35
|
}
|
|
75
36
|
}
|
|
76
37
|
exports.SessionImpl = SessionImpl;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/node/session/session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/node/session/session.ts"],"names":[],"mappings":";;;AAAA,6DAAmE;AAGnE;IAOI,YAAY,cAAmB,EAAE,GAAS;QANjC,OAAE,GAAG,IAAA,oBAAa,GAAE,CAAC;QAC9B,UAAK,GAAG,IAAI,CAAC;QAMT,IAAI,GAAG,EAAE,CAAC;YACN,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBAChC,IAAY,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;YAClC,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACjD,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;QACxC,CAAC;QACD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;IACtC,CAAC;IAES,SAAS;QACf,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,MAAM;QACF,MAAM,GAAG,GAAQ,EAAE,CAAC;QACpB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,IAAI,GAAG,KAAK,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;gBACpC,GAAG,CAAC,GAAG,CAAC,GAAI,IAAY,CAAC,GAAG,CAAC,CAAC;YAClC,CAAC;QACL,CAAC;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;IAC/C,CAAC;CAEJ"}
|
|
@@ -35,7 +35,13 @@ function inContext(fn) {
|
|
|
35
35
|
session.user = 'tom';
|
|
36
36
|
const json = session.toJSON();
|
|
37
37
|
(0, chai_1.expect)(json).to.include({ user: 'tom', maxAge: 1000 });
|
|
38
|
-
(0, chai_1.expect)(Object.keys(json)).to.not.include.members(['isNew', '
|
|
38
|
+
(0, chai_1.expect)(Object.keys(json)).to.not.include.members(['isNew', '_snapshot']);
|
|
39
|
+
});
|
|
40
|
+
(0, bun_test_1.it)('notices changes inside nested values', () => {
|
|
41
|
+
const session = new session_1.SessionImpl(options, { id: 'x', user: { name: 'tom', roles: ['admin'] }, expire: 5, maxAge: 1000 });
|
|
42
|
+
(0, chai_1.expect)(session.changed).to.equal(false);
|
|
43
|
+
session.user.roles.push('dev');
|
|
44
|
+
(0, chai_1.expect)(session.changed).to.equal(true);
|
|
39
45
|
});
|
|
40
46
|
(0, bun_test_1.it)('restored from its values it is not new and unchanged', () => {
|
|
41
47
|
const session = new session_1.SessionImpl(options, { id: 'x', user: 'tom', expire: 5, maxAge: 1000 });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.spec.js","sourceRoot":"","sources":["../../../src/node/session/session.spec.ts"],"names":[],"mappings":";;AAAA,uCAAwC;AACxC,+BAA8B;AAC9B,wCAAqC;AACrC,uCAAwC;AACxC,mDAAqD;AACrD,yDAAyD;AAEzD,MAAM,OAAO,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC;AAE7D,+GAA+G;AAC/G,SAAS,SAAS,CAAC,EAAuB;IACtC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,iBAAO,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;YACnB,IAAI,CAAC;gBACD,iBAAO,CAAC,UAAU,CAAC,IAAI,iBAAO,CAAC,EAAS,EAAE,EAAS,CAAC,CAAC,CAAC;gBACtD,MAAM,EAAE,EAAE,CAAC;gBACX,OAAO,EAAE,CAAC;YACd,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,MAAM,CAAC,KAAK,CAAC,CAAC;YAClB,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED,IAAA,mBAAQ,EAAC,aAAa,EAAE,GAAG,EAAE;IACzB,IAAA,aAAE,EAAC,oCAAoC,EAAE,GAAG,EAAE;QAC1C,MAAM,OAAO,GAAG,IAAI,qBAAW,CAAC,OAAO,CAA0C,CAAC;QAClF,IAAA,aAAM,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACrC,IAAA,aAAM,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACxC,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC;QACrB,IAAA,aAAM,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,IAAA,aAAE,EAAC,wDAAwD,EAAE,GAAG,EAAE;QAC9D,MAAM,OAAO,GAAG,IAAI,qBAAW,CAAC,OAAO,CAA0C,CAAC;QAClF,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC;QACrB,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;QAC9B,IAAA,aAAM,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,IAAA,aAAM,EAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"session.spec.js","sourceRoot":"","sources":["../../../src/node/session/session.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@celljs/web",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.2.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cell-component"
|
|
@@ -14,6 +14,9 @@
|
|
|
14
14
|
"url": "https://github.com/cellbang/cell.git"
|
|
15
15
|
},
|
|
16
16
|
"license": "MIT",
|
|
17
|
+
"engines": {
|
|
18
|
+
"node": ">=18.0.0"
|
|
19
|
+
},
|
|
17
20
|
"main": "lib/common/index.js",
|
|
18
21
|
"typings": "lib/common/index.d.ts",
|
|
19
22
|
"files": [
|
|
@@ -29,20 +32,8 @@
|
|
|
29
32
|
"watch": "tsc -b -w --preserveWatchOutput"
|
|
30
33
|
},
|
|
31
34
|
"dependencies": {
|
|
32
|
-
"@celljs/core": "4.
|
|
33
|
-
"@celljs/http": "4.
|
|
34
|
-
"@types/express": "^4.17.9",
|
|
35
|
-
"body-parser": "^1.20.9",
|
|
36
|
-
"class-transformer": "^0.5.1",
|
|
37
|
-
"class-validator": "^0.14.4",
|
|
38
|
-
"cookies": "^0.8.0",
|
|
39
|
-
"cors": "^2.8.5",
|
|
40
|
-
"express": "^4.22.3",
|
|
41
|
-
"url-pattern": "^1.0.3"
|
|
42
|
-
},
|
|
43
|
-
"devDependencies": {
|
|
44
|
-
"@types/cookies": "^0.7.7",
|
|
45
|
-
"@types/cors": "^2.8.6"
|
|
35
|
+
"@celljs/core": "4.2.0",
|
|
36
|
+
"@celljs/http": "4.2.0"
|
|
46
37
|
},
|
|
47
38
|
"publishConfig": {
|
|
48
39
|
"access": "public"
|
|
@@ -117,6 +108,10 @@
|
|
|
117
108
|
"import": "./esm/node/redirect/index.js",
|
|
118
109
|
"default": "./lib/node/redirect/index.js"
|
|
119
110
|
},
|
|
111
|
+
"./lib/node/server": {
|
|
112
|
+
"import": "./esm/node/server/index.js",
|
|
113
|
+
"default": "./lib/node/server/index.js"
|
|
114
|
+
},
|
|
120
115
|
"./lib/node/session": {
|
|
121
116
|
"import": "./esm/node/session/index.js",
|
|
122
117
|
"default": "./lib/node/session/index.js"
|
package/src/common/pipe/index.ts
CHANGED
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { describe, it } from 'bun:test';
|
|
2
|
+
import { expect } from 'chai';
|
|
3
|
+
import { IncomingMessage, ServerResponse } from 'node:http';
|
|
4
|
+
import { Socket } from 'node:net';
|
|
5
|
+
import { TypeConversionPipe } from './type-conversion-pipe';
|
|
6
|
+
|
|
7
|
+
class CreateUser {
|
|
8
|
+
name: string;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
describe('TypeConversionPipe', () => {
|
|
12
|
+
const pipe = new TypeConversionPipe();
|
|
13
|
+
|
|
14
|
+
it('converts to primitive parameter types as class-transformer did', () => {
|
|
15
|
+
expect(pipe.transform('5', { argType: Number })).to.equal(5);
|
|
16
|
+
expect(pipe.transform('abc', { argType: Number })).to.be.NaN;
|
|
17
|
+
expect(pipe.transform('', { argType: Number })).to.equal(0);
|
|
18
|
+
expect(pipe.transform(['1', '2'], { argType: Number })).to.deep.equal([1, 2]);
|
|
19
|
+
expect(pipe.transform(5, { argType: String })).to.equal('5');
|
|
20
|
+
expect(pipe.transform('false', { argType: Boolean })).to.equal(true);
|
|
21
|
+
expect(pipe.transform('', { argType: Boolean })).to.equal(false);
|
|
22
|
+
expect(pipe.transform(undefined, { argType: Number })).to.equal(undefined);
|
|
23
|
+
expect(pipe.transform(null, { argType: String })).to.equal(null);
|
|
24
|
+
expect(pipe.transform('2020-01-01', { argType: Date }).toISOString()).to.equal('2020-01-01T00:00:00.000Z');
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
it('passes everything else as it is', () => {
|
|
28
|
+
const data = { name: 'Tom' };
|
|
29
|
+
expect(pipe.transform(data, { argType: CreateUser })).to.equal(data);
|
|
30
|
+
expect(pipe.transform(data, { argType: Object })).to.equal(data);
|
|
31
|
+
expect(pipe.transform(data, { argType: String })).to.equal(data);
|
|
32
|
+
expect(pipe.transform('5', {})).to.equal('5');
|
|
33
|
+
const request = new IncomingMessage(new Socket());
|
|
34
|
+
const response = new ServerResponse(request);
|
|
35
|
+
expect(pipe.transform(response, { argType: Object })).to.equal(response);
|
|
36
|
+
expect(pipe.transform(request, { argType: String })).to.equal(request);
|
|
37
|
+
});
|
|
38
|
+
});
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { Component } from '@celljs/core';
|
|
2
|
+
import { ArgumentMetadata, PipeTransform } from './pipe-protocol';
|
|
3
|
+
|
|
4
|
+
const TYPES: Function[] = [String, Number, Boolean, Date];
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Converts request data to a `String`, `Number`, `Boolean` or `Date` parameter as class-transformer did:
|
|
8
|
+
* `'5'` → `5`, `'abc'` → `NaN`, `'false'` → `true` (any non-empty string), arrays item by item;
|
|
9
|
+
* `null` and `undefined` stay. Parameters of other types get the data as it is; `@celljs/validation`
|
|
10
|
+
* turns it into instances of the parameter class and validates them.
|
|
11
|
+
*/
|
|
12
|
+
@Component(PipeTransform)
|
|
13
|
+
export class TypeConversionPipe implements PipeTransform<any> {
|
|
14
|
+
|
|
15
|
+
readonly priority = 1000;
|
|
16
|
+
|
|
17
|
+
transform(value: any, { argType }: ArgumentMetadata): any {
|
|
18
|
+
if (!argType || !TYPES.includes(argType) || (value !== null && typeof value === 'object' && !Array.isArray(value))) {
|
|
19
|
+
return value;
|
|
20
|
+
}
|
|
21
|
+
return this.convert(argType, value);
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
protected convert(type: Function, value: unknown): unknown {
|
|
25
|
+
if (value === null || value === undefined) {
|
|
26
|
+
return value;
|
|
27
|
+
}
|
|
28
|
+
if (Array.isArray(value)) {
|
|
29
|
+
return value.map(item => this.convert(type, item));
|
|
30
|
+
}
|
|
31
|
+
if (type === Date) {
|
|
32
|
+
return value instanceof Date ? value : new Date(value as string);
|
|
33
|
+
}
|
|
34
|
+
return (type as (value: unknown) => unknown)(value);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
@@ -1,9 +1,18 @@
|
|
|
1
1
|
import { CustomError } from '@celljs/core';
|
|
2
|
-
import { ValidationError } from 'class-validator';
|
|
3
2
|
|
|
3
|
+
/** What class-validator reports for one property (the part Cell reads; the rest is kept as it is). */
|
|
4
|
+
export interface ValidationError {
|
|
5
|
+
property: string;
|
|
6
|
+
value?: unknown;
|
|
7
|
+
constraints?: Record<string, string>;
|
|
8
|
+
children?: ValidationError[];
|
|
9
|
+
[key: string]: unknown;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
/** Request data that failed validation; answers 400 with the errors as JSON (unless `detailedOutputDisabled`). */
|
|
4
13
|
export class ValidationErrors extends CustomError {
|
|
5
14
|
|
|
6
|
-
constructor(errors?: ValidationError[]) {
|
|
15
|
+
constructor(readonly errors?: ValidationError[]) {
|
|
7
16
|
super(errors === undefined ? undefined : JSON.stringify(errors));
|
|
8
17
|
}
|
|
9
18
|
|