@thisisagile/easy-test 10.11.5 → 10.11.6
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/utils/Req.d.ts +2 -2
- package/dist/utils/Req.js +2 -2
- package/dist/utils/Req.js.map +1 -1
- package/package.json +1 -1
- package/src/utils/Req.ts +4 -5
package/dist/utils/Req.d.ts
CHANGED
|
@@ -4,8 +4,8 @@ export declare class Req {
|
|
|
4
4
|
constructor(state?: any);
|
|
5
5
|
get id(): Id;
|
|
6
6
|
get q(): JsonValue;
|
|
7
|
-
readonly skip: number;
|
|
8
|
-
readonly take: number;
|
|
7
|
+
readonly skip: number | undefined;
|
|
8
|
+
readonly take: number | undefined;
|
|
9
9
|
get path(): Json;
|
|
10
10
|
get query(): Json;
|
|
11
11
|
get body(): unknown;
|
package/dist/utils/Req.js
CHANGED
|
@@ -5,8 +5,8 @@ const easy_1 = require("@thisisagile/easy");
|
|
|
5
5
|
class Req {
|
|
6
6
|
constructor(state = {}) {
|
|
7
7
|
this.state = state;
|
|
8
|
-
this.skip = (0, easy_1.asNumber)(this.
|
|
9
|
-
this.take = (0, easy_1.asNumber)(this.
|
|
8
|
+
this.skip = (0, easy_1.ifDefined)(this.query?.skip, (0, easy_1.asNumber)(this.query?.skip));
|
|
9
|
+
this.take = (0, easy_1.ifDefined)(this.query?.take, (0, easy_1.asNumber)(this.query?.take));
|
|
10
10
|
this.get = (key) => this?.state[key.toString()] ?? this.path[key.toString()] ?? this.query[key.toString()];
|
|
11
11
|
}
|
|
12
12
|
get id() {
|
package/dist/utils/Req.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Req.js","sourceRoot":"","sources":["../../src/utils/Req.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"Req.js","sourceRoot":"","sources":["../../src/utils/Req.ts"],"names":[],"mappings":";;;AACA,4CAAwD;AAExD,MAAa,GAAG;IACd,YAAqB,QAAa,EAAE;QAAf,UAAK,GAAL,KAAK,CAAU;QAU3B,SAAI,GAAG,IAAA,gBAAS,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAA,eAAQ,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;QAC/D,SAAI,GAAG,IAAA,gBAAS,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAA,eAAQ,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;QAcxE,QAAG,GAAG,CAAC,GAAS,EAAO,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IAzB1E,CAAC;IAExC,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IACvC,CAAC;IAED,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACtC,CAAC;IAKD,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC;IAChC,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC;IACjC,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IACzB,CAAC;CAGF;AA3BD,kBA2BC"}
|
package/package.json
CHANGED
package/src/utils/Req.ts
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { Id, Json, JsonValue, Text } from './Types';
|
|
2
|
-
import { asNumber } from '@thisisagile/easy';
|
|
2
|
+
import { asNumber, ifDefined } from '@thisisagile/easy';
|
|
3
3
|
|
|
4
4
|
export class Req {
|
|
5
|
-
constructor(readonly state: any = {}) {
|
|
6
|
-
}
|
|
5
|
+
constructor(readonly state: any = {}) {}
|
|
7
6
|
|
|
8
7
|
get id(): Id {
|
|
9
8
|
return this.state.id ?? this.path.id;
|
|
@@ -13,8 +12,8 @@ export class Req {
|
|
|
13
12
|
return this.state.q ?? this.query.q;
|
|
14
13
|
}
|
|
15
14
|
|
|
16
|
-
readonly skip = asNumber(this.
|
|
17
|
-
readonly take = asNumber(this.
|
|
15
|
+
readonly skip = ifDefined(this.query?.skip, asNumber(this.query?.skip));
|
|
16
|
+
readonly take = ifDefined(this.query?.take, asNumber(this.query?.take));
|
|
18
17
|
|
|
19
18
|
get path(): Json {
|
|
20
19
|
return this.state?.path ?? {};
|