@thisisagile/easy 10.7.2 → 10.8.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/dist/http/RequestOptions.d.ts +4 -2
- package/dist/http/RequestOptions.js +6 -1
- package/dist/http/RequestOptions.js.map +1 -1
- package/dist/services/Api.d.ts +2 -2
- package/dist/services/Api.js +17 -2
- package/dist/services/Api.js.map +1 -1
- package/dist/services/AxiosProvider.d.ts +2 -2
- package/dist/services/AxiosProvider.js +3 -3
- package/dist/services/AxiosProvider.js.map +1 -1
- package/dist/types/Json.js +2 -1
- package/dist/types/Json.js.map +1 -1
- package/package.json +2 -2
- package/src/http/RequestOptions.ts +7 -2
- package/src/services/Api.ts +23 -8
- package/src/services/AxiosProvider.ts +2 -2
- package/src/types/Json.ts +2 -1
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { Enum, Text } from '../types';
|
|
1
|
+
import { Enum, PageOptions, Text } from '../types';
|
|
2
2
|
import { ContentType } from './ContentType';
|
|
3
3
|
export declare class RequestOptions extends Enum {
|
|
4
4
|
readonly type: ContentType;
|
|
5
5
|
readonly headers: {
|
|
6
6
|
[key: string]: any;
|
|
7
7
|
};
|
|
8
|
+
pageOptions?: PageOptions | undefined;
|
|
8
9
|
static get Form(): RequestOptions;
|
|
9
10
|
static get Json(): RequestOptions;
|
|
10
11
|
static get Stream(): RequestOptions;
|
|
@@ -12,7 +13,8 @@ export declare class RequestOptions extends Enum {
|
|
|
12
13
|
static get Xml(): RequestOptions;
|
|
13
14
|
constructor(type?: ContentType, headers?: {
|
|
14
15
|
[key: string]: any;
|
|
15
|
-
});
|
|
16
|
+
}, pageOptions?: PageOptions | undefined);
|
|
17
|
+
page: (options: PageOptions) => this;
|
|
16
18
|
authorization: (auth: string) => this;
|
|
17
19
|
apiKey: (apiKey: string) => this;
|
|
18
20
|
accept: (type: ContentType) => this;
|
|
@@ -5,10 +5,15 @@ const types_1 = require("../types");
|
|
|
5
5
|
const HttpHeader_1 = require("./HttpHeader");
|
|
6
6
|
const ContentType_1 = require("./ContentType");
|
|
7
7
|
class RequestOptions extends types_1.Enum {
|
|
8
|
-
constructor(type = ContentType_1.ContentType.Json, headers = {}) {
|
|
8
|
+
constructor(type = ContentType_1.ContentType.Json, headers = {}, pageOptions) {
|
|
9
9
|
super(type.name);
|
|
10
10
|
this.type = type;
|
|
11
11
|
this.headers = headers;
|
|
12
|
+
this.pageOptions = pageOptions;
|
|
13
|
+
this.page = (options) => {
|
|
14
|
+
this.pageOptions = options;
|
|
15
|
+
return this;
|
|
16
|
+
};
|
|
12
17
|
this.authorization = (auth) => {
|
|
13
18
|
this.headers.Authorization = auth;
|
|
14
19
|
return this;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestOptions.js","sourceRoot":"","sources":["../../src/http/RequestOptions.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"RequestOptions.js","sourceRoot":"","sources":["../../src/http/RequestOptions.ts"],"names":[],"mappings":";;;AAAA,oCAA4E;AAC5E,6CAA0C;AAC1C,+CAA4C;AAE5C,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.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { Uri } from '../types';
|
|
1
|
+
import { PageOptions, Uri } from '../types';
|
|
2
2
|
import { RequestOptions, RequestProvider, Response } from '../http';
|
|
3
3
|
export declare class Api {
|
|
4
4
|
readonly provider: RequestProvider;
|
|
5
5
|
constructor(provider?: RequestProvider);
|
|
6
|
-
get
|
|
6
|
+
get(uri: Uri, options?: RequestOptions | PageOptions, transform?: (r: any) => any, transformError?: (r: any) => any): Promise<Response>;
|
|
7
7
|
post: (uri: Uri, body?: unknown, options?: RequestOptions, transform?: ((r: any) => any) | undefined, transformError?: (r: any) => any) => Promise<Response>;
|
|
8
8
|
put: (uri: Uri, body?: unknown, options?: RequestOptions, transform?: ((r: any) => any) | undefined, transformError?: (r: any) => any) => Promise<Response>;
|
|
9
9
|
patch: (uri: Uri, body?: unknown, options?: RequestOptions, transform?: ((r: any) => any) | undefined, transformError?: (r: any) => any) => Promise<Response>;
|
package/dist/services/Api.js
CHANGED
|
@@ -6,12 +6,27 @@ const AxiosProvider_1 = require("./AxiosProvider");
|
|
|
6
6
|
class Api {
|
|
7
7
|
constructor(provider = new AxiosProvider_1.AxiosProvider()) {
|
|
8
8
|
this.provider = provider;
|
|
9
|
-
this.get = (uri, options = http_1.RequestOptions.Json, transform, transformError = (r) => r) => this.provider.execute({ uri, verb: http_1.HttpVerb.Get, transform, transformError, options });
|
|
10
9
|
this.post = (uri, body, options = http_1.RequestOptions.Json, transform, transformError = (r) => r) => this.provider.execute({ uri, verb: http_1.HttpVerb.Post, body, transform, transformError, options });
|
|
11
10
|
this.put = (uri, body, options = http_1.RequestOptions.Json, transform, transformError = (r) => r) => this.provider.execute({ uri, verb: http_1.HttpVerb.Put, body, transform, transformError, options });
|
|
12
|
-
this.patch = (uri, body, options = http_1.RequestOptions.Json, transform, transformError = (r) => r) => this.provider.execute({
|
|
11
|
+
this.patch = (uri, body, options = http_1.RequestOptions.Json, transform, transformError = (r) => r) => this.provider.execute({
|
|
12
|
+
uri,
|
|
13
|
+
verb: http_1.HttpVerb.Patch,
|
|
14
|
+
body,
|
|
15
|
+
transform,
|
|
16
|
+
transformError,
|
|
17
|
+
options,
|
|
18
|
+
});
|
|
13
19
|
this.delete = (uri, options = http_1.RequestOptions.Json, transform, transformError = (r) => r) => this.provider.execute({ uri, verb: http_1.HttpVerb.Delete, transform, transformError, options });
|
|
14
20
|
}
|
|
21
|
+
get(uri, options, transform, transformError = (r) => r) {
|
|
22
|
+
return this.provider.execute({
|
|
23
|
+
uri: (options instanceof http_1.RequestOptions) ? uri.skip(options.pageOptions?.skip).take(options.pageOptions?.take) : uri.skip(options?.skip).take(options?.take),
|
|
24
|
+
verb: http_1.HttpVerb.Get,
|
|
25
|
+
transform,
|
|
26
|
+
transformError,
|
|
27
|
+
options: (options instanceof http_1.RequestOptions) ? options : http_1.RequestOptions.Json,
|
|
28
|
+
});
|
|
29
|
+
}
|
|
15
30
|
}
|
|
16
31
|
exports.Api = Api;
|
|
17
32
|
exports.api = new Api();
|
package/dist/services/Api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../src/services/Api.ts"],"names":[],"mappings":";;;AACA,kCAA8E;AAC9E,mDAAgD;AAEhD,MAAa,GAAG;IACd,YAAqB,WAA4B,IAAI,6BAAa,EAAE;QAA/C,aAAQ,GAAR,QAAQ,CAAuC;
|
|
1
|
+
{"version":3,"file":"Api.js","sourceRoot":"","sources":["../../src/services/Api.ts"],"names":[],"mappings":";;;AACA,kCAA8E;AAC9E,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,CAAC,OAAO,YAAY,qBAAc,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC;YAC5J,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,7 +1,7 @@
|
|
|
1
1
|
import { AxiosInstance } from 'axios';
|
|
2
2
|
import { Request, RequestProvider, Response } from '../http';
|
|
3
3
|
export declare class AxiosProvider implements RequestProvider {
|
|
4
|
-
readonly
|
|
5
|
-
constructor(
|
|
4
|
+
readonly ai: AxiosInstance;
|
|
5
|
+
constructor(ai?: AxiosInstance);
|
|
6
6
|
execute: ({ uri, verb, body, transform, transformError, options }: Request) => Promise<Response>;
|
|
7
7
|
}
|
|
@@ -14,9 +14,9 @@ const asResponse = (uri, verb, error) => (0, types_1.choose)(error)
|
|
|
14
14
|
.type(isRequest, r => (0, http_1.toResponse)(r.request.status, (0, types_1.toResult)(r.request.message, uri.path, uri)))
|
|
15
15
|
.else(e => (0, http_1.toResponse)(http_1.HttpStatus.InternalServerError, (0, types_1.toResult)(e.message, uri.path, uri)));
|
|
16
16
|
class AxiosProvider {
|
|
17
|
-
constructor(
|
|
18
|
-
this.
|
|
19
|
-
this.execute = ({ uri, verb, body, transform = (r) => r, transformError = (r) => r, options = http_1.RequestOptions.Json }) => this.
|
|
17
|
+
constructor(ai = axios_1.default) {
|
|
18
|
+
this.ai = ai;
|
|
19
|
+
this.execute = ({ uri, verb, body, transform = (r) => r, transformError = (r) => r, options = http_1.RequestOptions.Json }) => this.ai
|
|
20
20
|
.request({
|
|
21
21
|
url: uri.toString(),
|
|
22
22
|
method: verb.toString(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AxiosProvider.js","sourceRoot":"","sources":["../../src/services/AxiosProvider.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAgF;AAChF,kCAA6H;AAC7H,oCAA0E;AAE1E,MAAM,UAAU,GAAG,CAAC,CAAU,EAAoC,EAAE,CAAC,IAAA,iBAAS,EAAE,CAAS,EAAE,QAAQ,CAAC,CAAC;AACrG,MAAM,SAAS,GAAG,CAAC,CAAU,EAAyB,EAAE,CAAC,IAAA,iBAAS,EAAE,CAAS,EAAE,OAAO,CAAC,CAAC;AAExF,MAAM,UAAU,GAAG,CAAC,GAAQ,EAAE,IAAc,EAAE,KAAiB,EAAY,EAAE,CAC3E,IAAA,cAAM,EAAC,KAAK,CAAC;KACV,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CACpB,IAAA,iBAAU,EAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAA,mBAAY,EAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,gBAAQ,EAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CACpJ;KACA,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,IAAA,iBAAU,EAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,IAAA,gBAAQ,EAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;KAC9F,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,iBAAU,EAAC,iBAAU,CAAC,mBAAmB,EAAE,IAAA,gBAAQ,EAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;AAE/F,MAAa,aAAa;IACxB,YAAqB,
|
|
1
|
+
{"version":3,"file":"AxiosProvider.js","sourceRoot":"","sources":["../../src/services/AxiosProvider.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAgF;AAChF,kCAA6H;AAC7H,oCAA0E;AAE1E,MAAM,UAAU,GAAG,CAAC,CAAU,EAAoC,EAAE,CAAC,IAAA,iBAAS,EAAE,CAAS,EAAE,QAAQ,CAAC,CAAC;AACrG,MAAM,SAAS,GAAG,CAAC,CAAU,EAAyB,EAAE,CAAC,IAAA,iBAAS,EAAE,CAAS,EAAE,OAAO,CAAC,CAAC;AAExF,MAAM,UAAU,GAAG,CAAC,GAAQ,EAAE,IAAc,EAAE,KAAiB,EAAY,EAAE,CAC3E,IAAA,cAAM,EAAC,KAAK,CAAC;KACV,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CACpB,IAAA,iBAAU,EAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAA,mBAAY,EAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,gBAAQ,EAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CACpJ;KACA,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,IAAA,iBAAU,EAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,IAAA,gBAAQ,EAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;KAC9F,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,iBAAU,EAAC,iBAAU,CAAC,mBAAmB,EAAE,IAAA,gBAAQ,EAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;AAE/F,MAAa,aAAa;IACxB,YAAqB,KAAoB,eAAK;QAAzB,OAAE,GAAF,EAAE,CAAuB;QAE9C,YAAO,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,GAAG,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EAAE,cAAc,GAAG,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,GAAG,qBAAc,CAAC,IAAI,EAAW,EAAqB,EAAE,CACtJ,IAAI,CAAC,EAAE;aACJ,OAAO,CAAC;YACP,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;YACnB,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAY;YACjC,OAAO,EAAE,GAAG,CAAC,UAAU,IAAI,IAAA,eAAO,EAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,WAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO;YAC7H,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;SAChC,CAAC;aACD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,iBAAU,EAAC,CAAC,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;aAC7D,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAXzB,CAAC;CAYnD;AAbD,sCAaC"}
|
package/dist/types/Json.js
CHANGED
|
@@ -4,13 +4,14 @@ exports.any = exports.asJson = exports.toJson = exports.json = exports.isJson =
|
|
|
4
4
|
const IsA_1 = require("./IsA");
|
|
5
5
|
const Is_1 = require("./Is");
|
|
6
6
|
const Get_1 = require("./Get");
|
|
7
|
+
const utils_1 = require("../utils");
|
|
7
8
|
const isJson = (subject) => (0, IsA_1.isA)(subject, 'toJSON');
|
|
8
9
|
exports.isJson = isJson;
|
|
9
10
|
exports.json = {
|
|
10
11
|
parse: (subject) => JSON.parse(JSON.stringify(subject ?? {})),
|
|
11
12
|
merge: (...subjects) => exports.json.parse(subjects.map(s => (0, exports.asJson)(s, s => exports.json.parse(s))).reduce((js, j) => ({ ...js, ...j }), {})),
|
|
12
13
|
delete: (subject, key) => {
|
|
13
|
-
delete subject[key];
|
|
14
|
+
(0, utils_1.ifDefined)(subject, () => delete subject[key]);
|
|
14
15
|
return subject;
|
|
15
16
|
},
|
|
16
17
|
set: (subject, key = '', value) => (0, Is_1.isEmpty)(key) ? subject : (0, Is_1.isDefined)(value) ? { ...subject, ...{ [key]: value } } : exports.json.delete(subject, key),
|
package/dist/types/Json.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Json.js","sourceRoot":"","sources":["../../src/types/Json.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,6BAAoD;AACpD,+BAAmC;
|
|
1
|
+
{"version":3,"file":"Json.js","sourceRoot":"","sources":["../../src/types/Json.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@thisisagile/easy",
|
|
3
|
-
"version": "10.
|
|
3
|
+
"version": "10.8.0",
|
|
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.8.0",
|
|
35
35
|
"@types/form-urlencoded": "^4.4.0",
|
|
36
36
|
"@types/jsonwebtoken": "^8.5.8",
|
|
37
37
|
"@types/validator": "^13.7.2"
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ctx, Enum, isNotEmpty, Text, toUuid } from '../types';
|
|
1
|
+
import { ctx, Enum, isNotEmpty, PageOptions, Text, toUuid } from '../types';
|
|
2
2
|
import { HttpHeader } from './HttpHeader';
|
|
3
3
|
import { ContentType } from './ContentType';
|
|
4
4
|
|
|
@@ -23,12 +23,17 @@ export class RequestOptions extends Enum {
|
|
|
23
23
|
return new RequestOptions(ContentType.Xml);
|
|
24
24
|
}
|
|
25
25
|
|
|
26
|
-
constructor(readonly type: ContentType = ContentType.Json, readonly headers: { [key: string]: any } = {}) {
|
|
26
|
+
constructor(readonly type: ContentType = ContentType.Json, readonly headers: { [key: string]: any } = {}, public pageOptions?: PageOptions) {
|
|
27
27
|
super(type.name);
|
|
28
28
|
this.headers['Content-Type'] = type.id;
|
|
29
29
|
this.headers[HttpHeader.Correlation] = ctx.request.correlationId ?? toUuid();
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
+
page = (options: PageOptions): this => {
|
|
33
|
+
this.pageOptions = options;
|
|
34
|
+
return this;
|
|
35
|
+
};
|
|
36
|
+
|
|
32
37
|
authorization = (auth: string): this => {
|
|
33
38
|
this.headers.Authorization = auth;
|
|
34
39
|
return this;
|
package/src/services/Api.ts
CHANGED
|
@@ -1,19 +1,27 @@
|
|
|
1
|
-
import { Uri } from '../types';
|
|
1
|
+
import { PageOptions, Uri } from '../types';
|
|
2
2
|
import { HttpVerb, RequestOptions, RequestProvider, Response } from '../http';
|
|
3
3
|
import { AxiosProvider } from './AxiosProvider';
|
|
4
4
|
|
|
5
5
|
export class Api {
|
|
6
|
-
constructor(readonly provider: RequestProvider = new AxiosProvider()) {
|
|
6
|
+
constructor(readonly provider: RequestProvider = new AxiosProvider()) {
|
|
7
|
+
}
|
|
7
8
|
|
|
8
|
-
get
|
|
9
|
-
this.provider.execute({
|
|
9
|
+
get(uri: Uri, options?: RequestOptions | PageOptions, transform?: (r: any) => any, transformError = (r: any) => r): Promise<Response> {
|
|
10
|
+
return this.provider.execute({
|
|
11
|
+
uri: (options instanceof RequestOptions) ? uri.skip(options.pageOptions?.skip).take(options.pageOptions?.take) : uri.skip(options?.skip).take(options?.take),
|
|
12
|
+
verb: HttpVerb.Get,
|
|
13
|
+
transform,
|
|
14
|
+
transformError,
|
|
15
|
+
options: (options instanceof RequestOptions) ? options : RequestOptions.Json,
|
|
16
|
+
});
|
|
17
|
+
}
|
|
10
18
|
|
|
11
19
|
post = (
|
|
12
20
|
uri: Uri,
|
|
13
21
|
body?: unknown,
|
|
14
22
|
options: RequestOptions = RequestOptions.Json,
|
|
15
23
|
transform?: (r: any) => any,
|
|
16
|
-
transformError = (r: any) => r
|
|
24
|
+
transformError = (r: any) => r,
|
|
17
25
|
): Promise<Response> => this.provider.execute({ uri, verb: HttpVerb.Post, body, transform, transformError, options });
|
|
18
26
|
|
|
19
27
|
put = (
|
|
@@ -21,7 +29,7 @@ export class Api {
|
|
|
21
29
|
body?: unknown,
|
|
22
30
|
options: RequestOptions = RequestOptions.Json,
|
|
23
31
|
transform?: (r: any) => any,
|
|
24
|
-
transformError = (r: any) => r
|
|
32
|
+
transformError = (r: any) => r,
|
|
25
33
|
): Promise<Response> => this.provider.execute({ uri, verb: HttpVerb.Put, body, transform, transformError, options });
|
|
26
34
|
|
|
27
35
|
patch = (
|
|
@@ -29,8 +37,15 @@ export class Api {
|
|
|
29
37
|
body?: unknown,
|
|
30
38
|
options: RequestOptions = RequestOptions.Json,
|
|
31
39
|
transform?: (r: any) => any,
|
|
32
|
-
transformError = (r: any) => r
|
|
33
|
-
): Promise<Response> => this.provider.execute({
|
|
40
|
+
transformError = (r: any) => r,
|
|
41
|
+
): Promise<Response> => this.provider.execute({
|
|
42
|
+
uri,
|
|
43
|
+
verb: HttpVerb.Patch,
|
|
44
|
+
body,
|
|
45
|
+
transform,
|
|
46
|
+
transformError,
|
|
47
|
+
options,
|
|
48
|
+
});
|
|
34
49
|
|
|
35
50
|
delete = (uri: Uri, options: RequestOptions = RequestOptions.Json, transform?: (b: any) => any, transformError = (r: any) => r): Promise<Response> =>
|
|
36
51
|
this.provider.execute({ uri, verb: HttpVerb.Delete, transform, transformError, options });
|
|
@@ -14,10 +14,10 @@ const asResponse = (uri: Uri, verb: HttpVerb, error: AxiosError): Response =>
|
|
|
14
14
|
.else(e => toResponse(HttpStatus.InternalServerError, toResult(e.message, uri.path, uri)));
|
|
15
15
|
|
|
16
16
|
export class AxiosProvider implements RequestProvider {
|
|
17
|
-
constructor(readonly
|
|
17
|
+
constructor(readonly ai: AxiosInstance = axios) {}
|
|
18
18
|
|
|
19
19
|
execute = ({ uri, verb, body, transform = (r: any) => r, transformError = (r: any) => r, options = RequestOptions.Json }: Request): Promise<Response> =>
|
|
20
|
-
this.
|
|
20
|
+
this.ai
|
|
21
21
|
.request({
|
|
22
22
|
url: uri.toString(),
|
|
23
23
|
method: verb.toString() as Method,
|
package/src/types/Json.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { isA } from './IsA';
|
|
2
2
|
import { isDefined, isEmpty, isObject } from './Is';
|
|
3
3
|
import { Get, ofGet } from './Get';
|
|
4
|
+
import { ifDefined } from '../utils';
|
|
4
5
|
|
|
5
6
|
export type JsonValue = string | number | boolean | null | Json | JsonValue[];
|
|
6
7
|
export type Json = { [key: string]: JsonValue };
|
|
@@ -11,7 +12,7 @@ export const json = {
|
|
|
11
12
|
parse: <T extends Json = Json>(subject: unknown): T => JSON.parse(JSON.stringify(subject ?? {})),
|
|
12
13
|
merge: (...subjects: unknown[]): Json => json.parse(subjects.map(s => asJson(s, s => json.parse(s))).reduce((js, j) => ({ ...js, ...j }), {})),
|
|
13
14
|
delete: <T extends Json = Json>(subject: T, key: string): T => {
|
|
14
|
-
delete (subject as any)[key]
|
|
15
|
+
ifDefined(subject, () => delete (subject as any)[key])
|
|
15
16
|
return subject;
|
|
16
17
|
},
|
|
17
18
|
set: <T extends Json = Json>(subject: T, key = '', value?: unknown): T =>
|