@thisisagile/easy-test 13.6.10 → 13.6.12
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.js.map +1 -1
- package/dist/utils/Utils.d.ts +1 -1
- package/dist/utils/Utils.js.map +1 -1
- package/package.json +2 -2
- package/src/utils/Req.ts +21 -22
- package/src/utils/Utils.ts +5 -5
package/dist/utils/Req.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Req.js","sourceRoot":"","sources":["../../src/utils/Req.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"Req.js","sourceRoot":"","sources":["../../src/utils/Req.ts"],"names":[],"mappings":";;;AAAA,mCAA8C;AAG9C,MAAa,GAAG;IAId,YAAqB,QAAa,EAAE;QAAf,UAAK,GAAL,KAAK,CAAU;QAH3B,SAAI,GAAG,IAAA,iBAAS,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,gBAAQ,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5E,SAAI,GAAG,IAAA,iBAAS,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,gBAAQ,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAwBrF,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;IAtB1E,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;IAED,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/dist/utils/Utils.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ArrayLike } from
|
|
1
|
+
import { ArrayLike } from '@thisisagile/easy';
|
|
2
2
|
export declare const isDefined: <T = unknown>(o?: T | undefined) => boolean;
|
|
3
3
|
export declare const isNumber: (o?: unknown) => o is number;
|
|
4
4
|
export declare const isFunction: (o?: unknown) => o is (...params: unknown[]) => unknown;
|
package/dist/utils/Utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../src/utils/Utils.ts"],"names":[],"mappings":";;;AAEO,MAAM,SAAS,GAAG,CAAc,CAAK,EAAW,EAAE,CAAC,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,CAAC;AAA3E,QAAA,SAAS,aAAkE;AAEjF,MAAM,QAAQ,GAAG,CAAC,CAAW,EAAe,EAAE,CAAC,IAAA,iBAAS,EAAC,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAAnG,QAAA,QAAQ,YAA2F;AACzG,MAAM,UAAU,GAAG,CAAC,CAAW,EAA0C,EAAE,CAAC,IAAA,iBAAS,EAAC,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,UAAU,CAAC;AAA9G,QAAA,UAAU,cAAoG;AAEpH,MAAM,GAAG,GAAG,CAAI,CAAW,EAAE,GAAG,UAAuB,EAAU,EAAE,CAAC,IAAA,iBAAS,EAAC,CAAC,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,iBAAS,EAAE,CAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAA5H,QAAA,GAAG,OAAyH;AAC5H,QAAA,IAAI,GAAG,WAAG,CAAC;AAEjB,MAAM,OAAO,GAAG,CAAU,CAAW,EAAiB,EAAE,CAAC,IAAA,iBAAS,EAAC,CAAC,CAAC,IAAI,CAAC,YAAY,KAAK,CAAC;AAAtF,QAAA,OAAO,WAA+E;AAC5F,MAAM,QAAQ,GAAG,CAAC,CAAW,EAAgC,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,UAAU,CAAC,IAAI,CAAC,IAAA,eAAO,EAAC,CAAC,CAAC,CAAC;AAAzI,QAAA,QAAQ,YAAiI;AAE/I,MAAM,MAAM,GAAG,CAAC,CAAW,EAAO,EAAE,CAAC,CAAE,CAAS,EAAE,MAAM,CAAC,CAAC,CAAE,CAAS,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAA,gBAAQ,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AAAxG,QAAA,MAAM,UAAkG;AAC9G,MAAM,QAAQ,GAAG,CAAC,CAAW,EAAU,EAAE,CAAE,CAAS,EAAE,QAAQ,EAAE,CAAC;AAA3D,QAAA,QAAQ,YAAmD;AAEjE,MAAM,QAAQ,GAAG,CAAC,GAAY,EAAE,GAA6B,EAAU,EAAE;
|
|
1
|
+
{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../src/utils/Utils.ts"],"names":[],"mappings":";;;AAEO,MAAM,SAAS,GAAG,CAAc,CAAK,EAAW,EAAE,CAAC,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,CAAC;AAA3E,QAAA,SAAS,aAAkE;AAEjF,MAAM,QAAQ,GAAG,CAAC,CAAW,EAAe,EAAE,CAAC,IAAA,iBAAS,EAAC,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAAnG,QAAA,QAAQ,YAA2F;AACzG,MAAM,UAAU,GAAG,CAAC,CAAW,EAA0C,EAAE,CAAC,IAAA,iBAAS,EAAC,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,UAAU,CAAC;AAA9G,QAAA,UAAU,cAAoG;AAEpH,MAAM,GAAG,GAAG,CAAI,CAAW,EAAE,GAAG,UAAuB,EAAU,EAAE,CAAC,IAAA,iBAAS,EAAC,CAAC,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,iBAAS,EAAE,CAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAA5H,QAAA,GAAG,OAAyH;AAC5H,QAAA,IAAI,GAAG,WAAG,CAAC;AAEjB,MAAM,OAAO,GAAG,CAAU,CAAW,EAAiB,EAAE,CAAC,IAAA,iBAAS,EAAC,CAAC,CAAC,IAAI,CAAC,YAAY,KAAK,CAAC;AAAtF,QAAA,OAAO,WAA+E;AAC5F,MAAM,QAAQ,GAAG,CAAC,CAAW,EAAgC,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,UAAU,CAAC,IAAI,CAAC,IAAA,eAAO,EAAC,CAAC,CAAC,CAAC;AAAzI,QAAA,QAAQ,YAAiI;AAE/I,MAAM,MAAM,GAAG,CAAC,CAAW,EAAO,EAAE,CAAC,CAAE,CAAS,EAAE,MAAM,CAAC,CAAC,CAAE,CAAS,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAA,gBAAQ,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AAAxG,QAAA,MAAM,UAAkG;AAC9G,MAAM,QAAQ,GAAG,CAAC,CAAW,EAAU,EAAE,CAAE,CAAS,EAAE,QAAQ,EAAE,CAAC;AAA3D,QAAA,QAAQ,YAAmD;AAEjE,MAAM,QAAQ,GAAG,CAAC,GAAY,EAAE,GAA6B,EAAU,EAAE;IAC9E,MAAM,CAAC,GAAG,QAAQ,CAAC,IAAA,gBAAQ,EAAC,GAAG,CAAC,CAAC,CAAC;IAClC,OAAO,IAAA,gBAAQ,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,kBAAU,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAA,gBAAQ,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AAC/E,CAAC,CAAC;AAHW,QAAA,QAAQ,YAGnB;AAEK,MAAM,OAAO,GAAG,CAAI,GAAG,KAAmB,EAAO,EAAE,CACxD,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAE,KAAa,CAAC,CAAC,CAAC,IAAA,eAAO,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAS,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAD9F,QAAA,OAAO,WACuF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@thisisagile/easy-test",
|
|
3
|
-
"version": "13.6.
|
|
3
|
+
"version": "13.6.12",
|
|
4
4
|
"description": "Straightforward library for testing microservices built with @thisisagile/easy",
|
|
5
5
|
"author": "Sander Hoogendoorn",
|
|
6
6
|
"license": "MIT",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
"dependencies": {
|
|
39
39
|
"@jest/expect-utils": "^29.5.0",
|
|
40
40
|
"@types/jest": "^29.5.1",
|
|
41
|
-
"@types/node": "^18.
|
|
41
|
+
"@types/node": "^18.16.16",
|
|
42
42
|
"expect": "^29.5.0",
|
|
43
43
|
"jest": "^29.5.0",
|
|
44
44
|
"jest-junit": "^15.0.0",
|
package/src/utils/Req.ts
CHANGED
|
@@ -1,32 +1,31 @@
|
|
|
1
|
-
import {asNumber, isDefined} from './Utils';
|
|
2
|
-
import {Id, Json, JsonValue, Text} from './Types';
|
|
1
|
+
import { asNumber, isDefined } from './Utils';
|
|
2
|
+
import { Id, Json, JsonValue, Text } from './Types';
|
|
3
3
|
|
|
4
4
|
export class Req {
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
readonly skip = isDefined(this.query?.skip) ? asNumber(this.query?.skip) : undefined;
|
|
6
|
+
readonly take = isDefined(this.query?.take) ? asNumber(this.query?.take) : undefined;
|
|
7
7
|
|
|
8
|
-
|
|
9
|
-
}
|
|
8
|
+
constructor(readonly state: any = {}) {}
|
|
10
9
|
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
10
|
+
get id(): Id {
|
|
11
|
+
return this.state.id ?? this.path.id;
|
|
12
|
+
}
|
|
14
13
|
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
14
|
+
get q(): JsonValue {
|
|
15
|
+
return this.state.q ?? this.query.q;
|
|
16
|
+
}
|
|
18
17
|
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
18
|
+
get path(): Json {
|
|
19
|
+
return this.state?.path ?? {};
|
|
20
|
+
}
|
|
22
21
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
22
|
+
get query(): Json {
|
|
23
|
+
return this.state?.query ?? {};
|
|
24
|
+
}
|
|
26
25
|
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
26
|
+
get body(): unknown {
|
|
27
|
+
return this.state.body;
|
|
28
|
+
}
|
|
30
29
|
|
|
31
|
-
|
|
30
|
+
get = (key: Text): any => this?.state[key.toString()] ?? this.path[key.toString()] ?? this.query[key.toString()];
|
|
32
31
|
}
|
package/src/utils/Utils.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {ArrayLike} from
|
|
1
|
+
import { ArrayLike } from '@thisisagile/easy';
|
|
2
2
|
|
|
3
3
|
export const isDefined = <T = unknown>(o?: T): boolean => o !== undefined && o !== null;
|
|
4
4
|
|
|
@@ -15,9 +15,9 @@ export const asJson = (a?: unknown): any => ((a as any)?.toJSON ? (a as any).toJ
|
|
|
15
15
|
export const asString = (a?: unknown): string => (a as any)?.toString();
|
|
16
16
|
|
|
17
17
|
export const asNumber = (num: unknown, alt?: number | (() => number)): number => {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
}
|
|
18
|
+
const n = parseInt(asString(num));
|
|
19
|
+
return isNumber(n) ? n : isFunction(alt) ? alt() : isNumber(alt) ? alt : NaN;
|
|
20
|
+
};
|
|
21
21
|
|
|
22
22
|
export const toArray = <T>(...items: ArrayLike<T>): T[] =>
|
|
23
|
-
|
|
23
|
+
items.length > 1 ? (items as T[]) : isArray(items[0]) ? items[0] : isDefined(items[0]) ? [items[0]] : [];
|