@thisisagile/easy 10.8.0 → 10.10.1
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/http/RequestOptions.d.ts +1 -0
- package/dist/http/RequestOptions.js +3 -1
- package/dist/http/RequestOptions.js.map +1 -1
- package/dist/services/Api.js +1 -1
- package/dist/services/Api.js.map +1 -1
- package/dist/services/RouteGateway.d.ts +4 -4
- package/dist/services/RouteGateway.js +5 -5
- package/dist/services/RouteGateway.js.map +1 -1
- package/dist/utils/Retry.d.ts +10 -0
- package/dist/utils/Retry.js +24 -0
- package/dist/utils/Retry.js.map +1 -0
- package/dist/utils/Wait.d.ts +5 -0
- package/dist/utils/Wait.js +15 -0
- package/dist/utils/Wait.js.map +1 -0
- package/dist/utils/index.d.ts +2 -0
- package/dist/utils/index.js +2 -0
- package/dist/utils/index.js.map +1 -1
- package/package.json +2 -2
- package/src/http/RequestOptions.ts +2 -0
- package/src/services/Api.ts +2 -2
- package/src/services/RouteGateway.ts +10 -8
- package/src/utils/Retry.ts +20 -0
- package/src/utils/Wait.ts +11 -0
- package/src/utils/index.ts +2 -0
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Enum, PageOptions, Text } from '../types';
|
|
2
2
|
import { ContentType } from './ContentType';
|
|
3
|
+
export declare const toPageOptions: (options?: RequestOptions | PageOptions | undefined) => PageOptions | undefined;
|
|
3
4
|
export declare class RequestOptions extends Enum {
|
|
4
5
|
readonly type: ContentType;
|
|
5
6
|
readonly headers: {
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.RequestOptions = void 0;
|
|
3
|
+
exports.RequestOptions = exports.toPageOptions = void 0;
|
|
4
4
|
const types_1 = require("../types");
|
|
5
5
|
const HttpHeader_1 = require("./HttpHeader");
|
|
6
6
|
const ContentType_1 = require("./ContentType");
|
|
7
|
+
const toPageOptions = (options) => options instanceof RequestOptions ? options.pageOptions : options;
|
|
8
|
+
exports.toPageOptions = toPageOptions;
|
|
7
9
|
class RequestOptions extends types_1.Enum {
|
|
8
10
|
constructor(type = ContentType_1.ContentType.Json, headers = {}, pageOptions) {
|
|
9
11
|
super(type.name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestOptions.js","sourceRoot":"","sources":["../../src/http/RequestOptions.ts"],"names":[],"mappings":";;;AAAA,oCAA4E;AAC5E,6CAA0C;AAC1C,+CAA4C;
|
|
1
|
+
{"version":3,"file":"RequestOptions.js","sourceRoot":"","sources":["../../src/http/RequestOptions.ts"],"names":[],"mappings":";;;AAAA,oCAA4E;AAC5E,6CAA0C;AAC1C,+CAA4C;AAErC,MAAM,aAAa,GAAG,CAAC,OAAsC,EAA2B,EAAE,CAAC,OAAO,YAAY,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC;AAAvJ,QAAA,aAAa,iBAA0I;AAEpK,MAAa,cAAe,SAAQ,YAAI;IAqBtC,YAAqB,OAAoB,yBAAW,CAAC,IAAI,EAAW,UAAkC,EAAE,EAAS,WAAyB;QACxI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QADE,SAAI,GAAJ,IAAI,CAAgC;QAAW,YAAO,GAAP,OAAO,CAA6B;QAAS,gBAAW,GAAX,WAAW,CAAc;QAM1I,SAAI,GAAG,CAAC,OAAoB,EAAQ,EAAE;YACpC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC;YAC3B,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,kBAAa,GAAG,CAAC,IAAY,EAAQ,EAAE;YACrC,IAAI,CAAC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;YAClC,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,WAAM,GAAG,CAAC,MAAc,EAAQ,EAAE;YAChC,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;YAC7B,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,WAAM,GAAG,CAAC,IAAiB,EAAQ,EAAE;YACnC,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;YAC9B,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QAEF,WAAM,GAAG,CAAC,GAAS,EAAQ,EAAE;YAC3B,OAAO,IAAA,kBAAU,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACtE,CAAC,CAAC;QAEF,UAAK,GAAG,CAAC,QAAc,EAAE,QAAc,EAAQ,EAAE;YAC/C,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,IAAI,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACpF,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,SAAS,EAAE,CAAC,CAAC;QAClD,CAAC,CAAC;QA/BA,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;QACvC,IAAI,CAAC,OAAO,CAAC,uBAAU,CAAC,WAAW,CAAC,GAAG,WAAG,CAAC,OAAO,CAAC,aAAa,IAAI,IAAA,cAAM,GAAE,CAAC;IAC/E,CAAC;IAxBD,MAAM,KAAK,IAAI;QACb,OAAO,IAAI,cAAc,CAAC,yBAAW,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,KAAK,IAAI;QACb,OAAO,IAAI,cAAc,CAAC,yBAAW,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,KAAK,MAAM;QACf,OAAO,IAAI,cAAc,CAAC,yBAAW,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,KAAK,IAAI;QACb,OAAO,IAAI,cAAc,CAAC,yBAAW,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,KAAK,GAAG;QACZ,OAAO,IAAI,cAAc,CAAC,yBAAW,CAAC,GAAG,CAAC,CAAC;IAC7C,CAAC;CAoCF;AAvDD,wCAuDC"}
|
package/dist/services/Api.js
CHANGED
|
@@ -20,7 +20,7 @@ class Api {
|
|
|
20
20
|
}
|
|
21
21
|
get(uri, options, transform, transformError = (r) => r) {
|
|
22
22
|
return this.provider.execute({
|
|
23
|
-
uri: (
|
|
23
|
+
uri: uri.skip((0, http_1.toPageOptions)(options)?.skip).take((0, http_1.toPageOptions)(options)?.take),
|
|
24
24
|
verb: http_1.HttpVerb.Get,
|
|
25
25
|
transform,
|
|
26
26
|
transformError,
|
package/dist/services/Api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../src/services/Api.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../src/services/Api.ts"],"names":[],"mappings":";;;AACA,kCAA6F;AAC7F,mDAAgD;AAEhD,MAAa,GAAG;IACd,YAAqB,WAA4B,IAAI,6BAAa,EAAE;QAA/C,aAAQ,GAAR,QAAQ,CAAuC;QAapE,SAAI,GAAG,CACL,GAAQ,EACR,IAAc,EACd,UAA0B,qBAAc,CAAC,IAAI,EAC7C,SAA2B,EAC3B,iBAAiB,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EACX,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,eAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,CAAC;QAEtH,QAAG,GAAG,CACJ,GAAQ,EACR,IAAc,EACd,UAA0B,qBAAc,CAAC,IAAI,EAC7C,SAA2B,EAC3B,iBAAiB,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EACX,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,eAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,CAAC;QAErH,UAAK,GAAG,CACN,GAAQ,EACR,IAAc,EACd,UAA0B,qBAAc,CAAC,IAAI,EAC7C,SAA2B,EAC3B,iBAAiB,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EACX,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC5C,GAAG;YACH,IAAI,EAAE,eAAQ,CAAC,KAAK;YACpB,IAAI;YACJ,SAAS;YACT,cAAc;YACd,OAAO;SACR,CAAC,CAAC;QAEH,WAAM,GAAG,CAAC,GAAQ,EAAE,UAA0B,qBAAc,CAAC,IAAI,EAAE,SAA2B,EAAE,iBAAiB,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EAAqB,EAAE,CACnJ,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,eAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,CAAC;IA5C5F,CAAC;IAED,GAAG,CAAC,GAAQ,EAAE,OAAsC,EAAE,SAA2B,EAAE,iBAAiB,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;QAC/G,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC3B,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,IAAA,oBAAa,EAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,IAAA,oBAAa,EAAC,OAAO,CAAC,EAAE,IAAI,CAAC;YAC9E,IAAI,EAAE,eAAQ,CAAC,GAAG;YAClB,SAAS;YACT,cAAc;YACd,OAAO,EAAE,CAAC,OAAO,YAAY,qBAAc,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,qBAAc,CAAC,IAAI;SAC7E,CAAC,CAAC;IACL,CAAC;CAmCF;AA/CD,kBA+CC;AAEY,QAAA,GAAG,GAAQ,IAAI,GAAG,EAAE,CAAC"}
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import { Api } from './Api';
|
|
2
|
-
import { Func, Gateway, Id, Json, JsonValue, PageList, Uri } from '../types';
|
|
2
|
+
import { Func, Gateway, Id, Json, JsonValue, PageList, PageOptions, Uri } from '../types';
|
|
3
3
|
import { RequestOptions } from '../http';
|
|
4
4
|
export declare class RouteGateway extends Gateway {
|
|
5
5
|
readonly route: Func<Uri>;
|
|
6
6
|
readonly routeId: Func<Uri>;
|
|
7
7
|
readonly api: Api;
|
|
8
8
|
constructor(route: Func<Uri>, routeId: Func<Uri>, api?: Api);
|
|
9
|
-
get(uri: Uri, options?: RequestOptions): Promise<PageList<Json>>;
|
|
9
|
+
get(uri: Uri, options?: RequestOptions | PageOptions): Promise<PageList<Json>>;
|
|
10
10
|
getOne(uri: Uri, options?: RequestOptions): Promise<Json | undefined>;
|
|
11
|
-
all(): Promise<PageList<Json>>;
|
|
11
|
+
all(options?: PageOptions): Promise<PageList<Json>>;
|
|
12
12
|
byId(id: Id): Promise<Json | undefined>;
|
|
13
|
-
search(q: JsonValue): Promise<PageList<Json>>;
|
|
13
|
+
search(q: JsonValue, options?: PageOptions): Promise<PageList<Json>>;
|
|
14
14
|
exists(id: Id): Promise<boolean>;
|
|
15
15
|
add(item: Json): Promise<Json>;
|
|
16
16
|
update(item: Json): Promise<Json>;
|
|
@@ -12,19 +12,19 @@ class RouteGateway extends types_1.Gateway {
|
|
|
12
12
|
this.api = api;
|
|
13
13
|
}
|
|
14
14
|
get(uri, options) {
|
|
15
|
-
return this.api.get(uri, options).then(r => (0, types_1.toPageList)(r.body.data?.items, { total: r.body.data?.totalItems }));
|
|
15
|
+
return this.api.get(uri, options).then(r => (0, types_1.toPageList)(r.body.data?.items, (0, http_1.toPageOptions)(options) && { total: r.body.data?.totalItems }));
|
|
16
16
|
}
|
|
17
17
|
getOne(uri, options) {
|
|
18
18
|
return this.get(uri, options).then(r => r.first());
|
|
19
19
|
}
|
|
20
|
-
all() {
|
|
21
|
-
return this.get(this.route());
|
|
20
|
+
all(options) {
|
|
21
|
+
return this.get(this.route(), options);
|
|
22
22
|
}
|
|
23
23
|
byId(id) {
|
|
24
24
|
return this.getOne(this.routeId().id(id));
|
|
25
25
|
}
|
|
26
|
-
search(q) {
|
|
27
|
-
return this.get(this.route().query(q));
|
|
26
|
+
search(q, options) {
|
|
27
|
+
return this.get(this.route().query(q), options);
|
|
28
28
|
}
|
|
29
29
|
exists(id) {
|
|
30
30
|
return this.get(this.routeId().id(id))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouteGateway.js","sourceRoot":"","sources":["../../src/services/RouteGateway.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"RouteGateway.js","sourceRoot":"","sources":["../../src/services/RouteGateway.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { ErrorOrigin } from '../types';
|
|
2
|
+
export declare class Retry<T = any> {
|
|
3
|
+
readonly subject: () => Promise<T>;
|
|
4
|
+
readonly times: number;
|
|
5
|
+
readonly interval: number;
|
|
6
|
+
readonly prevError?: ErrorOrigin | undefined;
|
|
7
|
+
constructor(subject: () => Promise<T>, times?: number, interval?: number, prevError?: ErrorOrigin | undefined);
|
|
8
|
+
run: () => Promise<T>;
|
|
9
|
+
}
|
|
10
|
+
export declare const retry: <T>(subject: () => Promise<T>, times?: number | undefined, interval?: number | undefined, prevError?: ErrorOrigin | undefined) => Promise<T>;
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.retry = exports.Retry = void 0;
|
|
4
|
+
const types_1 = require("../types");
|
|
5
|
+
const validation_1 = require("../validation");
|
|
6
|
+
const Wait_1 = require("./Wait");
|
|
7
|
+
class Retry {
|
|
8
|
+
constructor(subject, times = 3, interval = 1000, prevError) {
|
|
9
|
+
this.subject = subject;
|
|
10
|
+
this.times = times;
|
|
11
|
+
this.interval = interval;
|
|
12
|
+
this.prevError = prevError;
|
|
13
|
+
this.run = () => (0, validation_1.when)(this.times)
|
|
14
|
+
.not.isTrue.reject(this.prevError ?? types_1.Exception.CouldNotExecute)
|
|
15
|
+
.then(() => this.subject().catch(async (e) => {
|
|
16
|
+
await (0, Wait_1.wait)(this.interval);
|
|
17
|
+
return (0, exports.retry)(this.subject, this.times - 1, this.interval, e);
|
|
18
|
+
}));
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
exports.Retry = Retry;
|
|
22
|
+
const retry = (subject, times, interval, prevError) => new Retry(subject, times, interval, prevError).run();
|
|
23
|
+
exports.retry = retry;
|
|
24
|
+
//# sourceMappingURL=Retry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Retry.js","sourceRoot":"","sources":["../../src/utils/Retry.ts"],"names":[],"mappings":";;;AAAA,oCAAkD;AAClD,8CAAqC;AACrC,iCAA8B;AAE9B,MAAa,KAAK;IAChB,YAAqB,OAAyB,EAAW,QAAQ,CAAC,EAAW,WAAW,IAAI,EAAW,SAAuB;QAAzG,YAAO,GAAP,OAAO,CAAkB;QAAW,UAAK,GAAL,KAAK,CAAI;QAAW,aAAQ,GAAR,QAAQ,CAAO;QAAW,cAAS,GAAT,SAAS,CAAc;QAE9H,QAAG,GAAG,GAAe,EAAE,CACrB,IAAA,iBAAI,EAAC,IAAI,CAAC,KAAK,CAAC;aACb,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,IAAI,iBAAS,CAAC,eAAe,CAAC;aAC9D,IAAI,CAAC,GAAG,EAAE,CACT,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,KAAK,EAAC,CAAC,EAAC,EAAE;YAC7B,MAAM,IAAA,WAAI,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC1B,OAAO,IAAA,aAAK,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,GAAG,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAC/D,CAAC,CAAC,CACH,CAAC;IAV2H,CAAC;CAWnI;AAZD,sBAYC;AAEM,MAAM,KAAK,GAAG,CAAI,OAAyB,EAAE,KAAc,EAAE,QAAiB,EAAE,SAAuB,EAAc,EAAE,CAC5H,IAAI,KAAK,CAAI,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,GAAG,EAAE,CAAC;AAD7C,QAAA,KAAK,SACwC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.wait = exports.Wait = void 0;
|
|
4
|
+
class Wait {
|
|
5
|
+
static wait(ms = 0) {
|
|
6
|
+
return new Promise(resolve => setTimeout(resolve, ms));
|
|
7
|
+
}
|
|
8
|
+
static seconds(s = 0) {
|
|
9
|
+
return this.wait(s * 1000);
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
exports.Wait = Wait;
|
|
13
|
+
const wait = (millis) => Wait.wait(millis);
|
|
14
|
+
exports.wait = wait;
|
|
15
|
+
//# sourceMappingURL=Wait.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Wait.js","sourceRoot":"","sources":["../../src/utils/Wait.ts"],"names":[],"mappings":";;;AAAA,MAAa,IAAI;IACf,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC;QAChB,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC;QAClB,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAC7B,CAAC;CACF;AARD,oBAQC;AAEM,MAAM,IAAI,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAA7C,QAAA,IAAI,QAAyC"}
|
package/dist/utils/index.d.ts
CHANGED
|
@@ -4,7 +4,9 @@ export * from './Log';
|
|
|
4
4
|
export * from './Mapper';
|
|
5
5
|
export * from './Promise';
|
|
6
6
|
export * from './Property';
|
|
7
|
+
export * from './Retry';
|
|
7
8
|
export * from './State';
|
|
8
9
|
export * from './Sentence';
|
|
9
10
|
export * from './Traverse';
|
|
10
11
|
export * from './View';
|
|
12
|
+
export * from './Wait';
|
package/dist/utils/index.js
CHANGED
|
@@ -20,8 +20,10 @@ __exportStar(require("./Log"), exports);
|
|
|
20
20
|
__exportStar(require("./Mapper"), exports);
|
|
21
21
|
__exportStar(require("./Promise"), exports);
|
|
22
22
|
__exportStar(require("./Property"), exports);
|
|
23
|
+
__exportStar(require("./Retry"), exports);
|
|
23
24
|
__exportStar(require("./State"), exports);
|
|
24
25
|
__exportStar(require("./Sentence"), exports);
|
|
25
26
|
__exportStar(require("./Traverse"), exports);
|
|
26
27
|
__exportStar(require("./View"), exports);
|
|
28
|
+
__exportStar(require("./Wait"), exports);
|
|
27
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,4CAA0B;AAC1B,uCAAqB;AACrB,wCAAsB;AACtB,2CAAyB;AACzB,4CAA0B;AAC1B,6CAA2B;AAC3B,0CAAwB;AACxB,6CAA2B;AAC3B,6CAA2B;AAC3B,yCAAuB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,uCAAqB;AACrB,wCAAsB;AACtB,2CAAyB;AACzB,4CAA0B;AAC1B,6CAA2B;AAC3B,0CAAwB;AACxB,0CAAwB;AACxB,6CAA2B;AAC3B,6CAA2B;AAC3B,yCAAuB;AACvB,yCAAuB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@thisisagile/easy",
|
|
3
|
-
"version": "10.
|
|
3
|
+
"version": "10.10.1",
|
|
4
4
|
"description": "Straightforward library for building domain-driven microservice architectures",
|
|
5
5
|
"author": "Sander Hoogendoorn",
|
|
6
6
|
"license": "MIT",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"access": "public"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
|
-
"@thisisagile/easy-test": "10.
|
|
34
|
+
"@thisisagile/easy-test": "10.10.1",
|
|
35
35
|
"@types/form-urlencoded": "^4.4.0",
|
|
36
36
|
"@types/jsonwebtoken": "^8.5.8",
|
|
37
37
|
"@types/validator": "^13.7.2"
|
|
@@ -2,6 +2,8 @@ import { ctx, Enum, isNotEmpty, PageOptions, Text, toUuid } from '../types';
|
|
|
2
2
|
import { HttpHeader } from './HttpHeader';
|
|
3
3
|
import { ContentType } from './ContentType';
|
|
4
4
|
|
|
5
|
+
export const toPageOptions = (options?: RequestOptions | PageOptions): PageOptions | undefined => options instanceof RequestOptions ? options.pageOptions : options;
|
|
6
|
+
|
|
5
7
|
export class RequestOptions extends Enum {
|
|
6
8
|
static get Form(): RequestOptions {
|
|
7
9
|
return new RequestOptions(ContentType.Form);
|
package/src/services/Api.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { PageOptions, Uri } from '../types';
|
|
2
|
-
import { HttpVerb, RequestOptions, RequestProvider, Response } from '../http';
|
|
2
|
+
import { HttpVerb, RequestOptions, RequestProvider, Response, toPageOptions } from '../http';
|
|
3
3
|
import { AxiosProvider } from './AxiosProvider';
|
|
4
4
|
|
|
5
5
|
export class Api {
|
|
@@ -8,7 +8,7 @@ export class Api {
|
|
|
8
8
|
|
|
9
9
|
get(uri: Uri, options?: RequestOptions | PageOptions, transform?: (r: any) => any, transformError = (r: any) => r): Promise<Response> {
|
|
10
10
|
return this.provider.execute({
|
|
11
|
-
uri:
|
|
11
|
+
uri: uri.skip(toPageOptions(options)?.skip).take(toPageOptions(options)?.take),
|
|
12
12
|
verb: HttpVerb.Get,
|
|
13
13
|
transform,
|
|
14
14
|
transformError,
|
|
@@ -1,30 +1,32 @@
|
|
|
1
1
|
import { Api } from './Api';
|
|
2
|
-
import { Func, Gateway, Id, Json, JsonValue, PageList, toPageList, Uri } from '../types';
|
|
3
|
-
import { HttpStatus, RequestOptions } from '../http';
|
|
2
|
+
import { Func, Gateway, Id, Json, JsonValue, PageList, PageOptions, toPageList, Uri } from '../types';
|
|
3
|
+
import { HttpStatus, RequestOptions, toPageOptions } from '../http';
|
|
4
4
|
|
|
5
5
|
export class RouteGateway extends Gateway {
|
|
6
6
|
constructor(readonly route: Func<Uri>, readonly routeId: Func<Uri>, readonly api: Api = new Api()) {
|
|
7
7
|
super();
|
|
8
8
|
}
|
|
9
9
|
|
|
10
|
-
get(uri: Uri, options?: RequestOptions): Promise<PageList<Json>> {
|
|
11
|
-
return this.api.get(uri, options).then(r => toPageList<Json>(r.body.data?.items,
|
|
10
|
+
get(uri: Uri, options?: RequestOptions | PageOptions): Promise<PageList<Json>> {
|
|
11
|
+
return this.api.get(uri, options).then(r => toPageList<Json>(r.body.data?.items,
|
|
12
|
+
toPageOptions(options) && { total: r.body.data?.totalItems },
|
|
13
|
+
));
|
|
12
14
|
}
|
|
13
15
|
|
|
14
16
|
getOne(uri: Uri, options?: RequestOptions): Promise<Json | undefined> {
|
|
15
17
|
return this.get(uri, options).then(r => r.first());
|
|
16
18
|
}
|
|
17
19
|
|
|
18
|
-
all(): Promise<PageList<Json>> {
|
|
19
|
-
return this.get(this.route());
|
|
20
|
+
all(options?: PageOptions): Promise<PageList<Json>> {
|
|
21
|
+
return this.get(this.route(), options);
|
|
20
22
|
}
|
|
21
23
|
|
|
22
24
|
byId(id: Id): Promise<Json | undefined> {
|
|
23
25
|
return this.getOne(this.routeId().id(id));
|
|
24
26
|
}
|
|
25
27
|
|
|
26
|
-
search(q: JsonValue): Promise<PageList<Json>> {
|
|
27
|
-
return this.get(this.route().query(q));
|
|
28
|
+
search(q: JsonValue, options?: PageOptions): Promise<PageList<Json>> {
|
|
29
|
+
return this.get(this.route().query(q), options);
|
|
28
30
|
}
|
|
29
31
|
|
|
30
32
|
exists(id: Id): Promise<boolean> {
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { ErrorOrigin, Exception } from '../types';
|
|
2
|
+
import { when } from '../validation';
|
|
3
|
+
import { wait } from './Wait';
|
|
4
|
+
|
|
5
|
+
export class Retry<T = any> {
|
|
6
|
+
constructor(readonly subject: () => Promise<T>, readonly times = 3, readonly interval = 1000, readonly prevError?: ErrorOrigin) {}
|
|
7
|
+
|
|
8
|
+
run = (): Promise<T> =>
|
|
9
|
+
when(this.times)
|
|
10
|
+
.not.isTrue.reject(this.prevError ?? Exception.CouldNotExecute)
|
|
11
|
+
.then(() =>
|
|
12
|
+
this.subject().catch(async e => {
|
|
13
|
+
await wait(this.interval);
|
|
14
|
+
return retry(this.subject, this.times - 1, this.interval, e);
|
|
15
|
+
})
|
|
16
|
+
);
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
export const retry = <T>(subject: () => Promise<T>, times?: number, interval?: number, prevError?: ErrorOrigin): Promise<T> =>
|
|
20
|
+
new Retry<T>(subject, times, interval, prevError).run();
|
package/src/utils/index.ts
CHANGED
|
@@ -4,7 +4,9 @@ export * from './Log';
|
|
|
4
4
|
export * from './Mapper';
|
|
5
5
|
export * from './Promise';
|
|
6
6
|
export * from './Property';
|
|
7
|
+
export * from './Retry';
|
|
7
8
|
export * from './State';
|
|
8
9
|
export * from './Sentence';
|
|
9
10
|
export * from './Traverse';
|
|
10
11
|
export * from './View';
|
|
12
|
+
export * from './Wait';
|