@thisisagile/easy 10.10.6 → 10.11.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 +1 -0
- package/dist/http/RequestOptions.js +3 -1
- package/dist/http/RequestOptions.js.map +1 -1
- package/dist/services/Api.d.ts +2 -1
- package/dist/services/Api.js +8 -5
- package/dist/services/Api.js.map +1 -1
- package/package.json +2 -2
- package/src/http/RequestOptions.ts +3 -1
- package/src/services/Api.ts +9 -5
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.RequestOptions = exports.toPageOptions = void 0;
|
|
3
|
+
exports.isRequestOptions = 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");
|
|
@@ -55,4 +55,6 @@ class RequestOptions extends types_1.Enum {
|
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
57
|
exports.RequestOptions = RequestOptions;
|
|
58
|
+
const isRequestOptions = (o) => (0, types_1.isDefined)(o) && o instanceof RequestOptions;
|
|
59
|
+
exports.isRequestOptions = isRequestOptions;
|
|
58
60
|
//# sourceMappingURL=RequestOptions.js.map
|
|
@@ -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,oCAAuF;AACvF,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;AAEM,MAAM,gBAAgB,GAAG,CAAC,CAAW,EAAuB,EAAE,CAAC,IAAA,iBAAS,EAAC,CAAC,CAAC,IAAI,CAAC,YAAY,cAAc,CAAC;AAArG,QAAA,gBAAgB,oBAAqF"}
|
package/dist/services/Api.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { PageOptions, Uri } from '../types';
|
|
2
|
-
import { RequestOptions, RequestProvider, Response } from '../http';
|
|
2
|
+
import { HttpVerb, RequestOptions, RequestProvider, Response } from '../http';
|
|
3
3
|
export declare class Api {
|
|
4
4
|
readonly provider: RequestProvider;
|
|
5
5
|
constructor(provider?: RequestProvider);
|
|
@@ -8,5 +8,6 @@ export declare class Api {
|
|
|
8
8
|
put(uri: Uri, body?: unknown, options?: RequestOptions, transform?: (r: any) => any, transformError?: (r: any) => any): Promise<Response>;
|
|
9
9
|
patch(uri: Uri, body?: unknown, options?: RequestOptions, transform?: (r: any) => any, transformError?: (r: any) => any): Promise<Response>;
|
|
10
10
|
delete(uri: Uri, options?: RequestOptions, transform?: (b: any) => any, transformError?: (r: any) => any): Promise<Response>;
|
|
11
|
+
options(verb: HttpVerb, options?: RequestOptions | PageOptions): RequestOptions;
|
|
11
12
|
}
|
|
12
13
|
export declare const api: Api;
|
package/dist/services/Api.js
CHANGED
|
@@ -13,20 +13,23 @@ class Api {
|
|
|
13
13
|
verb: http_1.HttpVerb.Get,
|
|
14
14
|
transform,
|
|
15
15
|
transformError,
|
|
16
|
-
options:
|
|
16
|
+
options: this.options(http_1.HttpVerb.Get, options),
|
|
17
17
|
});
|
|
18
18
|
}
|
|
19
19
|
post(uri, body, options = http_1.RequestOptions.Json, transform, transformError = (r) => r) {
|
|
20
|
-
return this.provider.execute({ uri, verb: http_1.HttpVerb.Post, body, transform, transformError, options });
|
|
20
|
+
return this.provider.execute({ uri, verb: http_1.HttpVerb.Post, body, transform, transformError, options: this.options(http_1.HttpVerb.Post, options) });
|
|
21
21
|
}
|
|
22
22
|
put(uri, body, options = http_1.RequestOptions.Json, transform, transformError = (r) => r) {
|
|
23
|
-
return this.provider.execute({ uri, verb: http_1.HttpVerb.Put, body, transform, transformError, options });
|
|
23
|
+
return this.provider.execute({ uri, verb: http_1.HttpVerb.Put, body, transform, transformError, options: this.options(http_1.HttpVerb.Put, options) });
|
|
24
24
|
}
|
|
25
25
|
patch(uri, body, options = http_1.RequestOptions.Json, transform, transformError = (r) => r) {
|
|
26
|
-
return this.provider.execute({ uri, verb: http_1.HttpVerb.Patch, body, transform, transformError, options });
|
|
26
|
+
return this.provider.execute({ uri, verb: http_1.HttpVerb.Patch, body, transform, transformError, options: this.options(http_1.HttpVerb.Patch, options) });
|
|
27
27
|
}
|
|
28
28
|
delete(uri, options = http_1.RequestOptions.Json, transform, transformError = (r) => r) {
|
|
29
|
-
return this.provider.execute({ uri, verb: http_1.HttpVerb.Delete, transform, transformError, options });
|
|
29
|
+
return this.provider.execute({ uri, verb: http_1.HttpVerb.Delete, transform, transformError, options: this.options(http_1.HttpVerb.Delete, options) });
|
|
30
|
+
}
|
|
31
|
+
options(verb, options) {
|
|
32
|
+
return (options instanceof http_1.RequestOptions) ? options : http_1.RequestOptions.Json;
|
|
30
33
|
}
|
|
31
34
|
}
|
|
32
35
|
exports.Api = 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,kCAA6F;AAC7F,mDAAgD;AAEhD,MAAa,GAAG;IACd,YAAqB,WAA4B,IAAI,6BAAa,EAAE;QAA/C,aAAQ,GAAR,QAAQ,CAAuC;IACpE,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,
|
|
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;IACpE,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,IAAI,CAAC,OAAO,CAAC,eAAQ,CAAC,GAAG,EAAE,OAAO,CAAC;SAC7C,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,GAAQ,EAAE,IAAc,EAAE,UAA0B,qBAAc,CAAC,IAAI,EAAE,SAA2B,EAAE,iBAAiB,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;QACvI,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,eAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,eAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IAC7I,CAAC;IAED,GAAG,CAAC,GAAQ,EAAE,IAAc,EAAE,UAA0B,qBAAc,CAAC,IAAI,EAAE,SAA2B,EAAE,iBAAiB,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;QACtI,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,eAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,eAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IAC3I,CAAC;IAED,KAAK,CAAC,GAAQ,EAAE,IAAc,EAAE,UAA0B,qBAAc,CAAC,IAAI,EAAE,SAA2B,EAAE,iBAAiB,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;QACxI,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,eAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,eAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,EAAC,CAAC,CAAC;IAC9I,CAAC;IAED,MAAM,CAAC,GAAQ,EAAE,UAA0B,qBAAc,CAAC,IAAI,EAAE,SAA2B,EAAE,iBAAiB,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;QACzH,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,eAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,eAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IAC3I,CAAC;IAED,OAAO,CAAC,IAAc,EAAE,OAAsC;QAC5D,OAAO,CAAC,OAAO,YAAY,qBAAc,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,qBAAc,CAAC,IAAI,CAAC;IAC7E,CAAC;CACF;AAjCD,kBAiCC;AAEY,QAAA,GAAG,GAAQ,IAAI,GAAG,EAAE,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@thisisagile/easy",
|
|
3
|
-
"version": "10.
|
|
3
|
+
"version": "10.11.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.11.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, PageOptions, Text, toUuid } from '../types';
|
|
1
|
+
import { ctx, Enum, isDefined, isNotEmpty, PageOptions, Text, toUuid } from '../types';
|
|
2
2
|
import { HttpHeader } from './HttpHeader';
|
|
3
3
|
import { ContentType } from './ContentType';
|
|
4
4
|
|
|
@@ -60,3 +60,5 @@ export class RequestOptions extends Enum {
|
|
|
60
60
|
return this.authorization(`Basic ${basicAuth}`);
|
|
61
61
|
};
|
|
62
62
|
}
|
|
63
|
+
|
|
64
|
+
export const isRequestOptions = (o?: unknown): o is RequestOptions => isDefined(o) && o instanceof RequestOptions;
|
package/src/services/Api.ts
CHANGED
|
@@ -12,24 +12,28 @@ export class Api {
|
|
|
12
12
|
verb: HttpVerb.Get,
|
|
13
13
|
transform,
|
|
14
14
|
transformError,
|
|
15
|
-
options: (options
|
|
15
|
+
options: this.options(HttpVerb.Get, options),
|
|
16
16
|
});
|
|
17
17
|
}
|
|
18
18
|
|
|
19
19
|
post(uri: Uri, body?: unknown, options: RequestOptions = RequestOptions.Json, transform?: (r: any) => any, transformError = (r: any) => r): Promise<Response> {
|
|
20
|
-
return this.provider.execute({ uri, verb: HttpVerb.Post, body, transform, transformError, options });
|
|
20
|
+
return this.provider.execute({ uri, verb: HttpVerb.Post, body, transform, transformError, options: this.options(HttpVerb.Post, options) });
|
|
21
21
|
}
|
|
22
22
|
|
|
23
23
|
put(uri: Uri, body?: unknown, options: RequestOptions = RequestOptions.Json, transform?: (r: any) => any, transformError = (r: any) => r): Promise<Response> {
|
|
24
|
-
return this.provider.execute({ uri, verb: HttpVerb.Put, body, transform, transformError, options });
|
|
24
|
+
return this.provider.execute({ uri, verb: HttpVerb.Put, body, transform, transformError, options: this.options(HttpVerb.Put, options) });
|
|
25
25
|
}
|
|
26
26
|
|
|
27
27
|
patch(uri: Uri, body?: unknown, options: RequestOptions = RequestOptions.Json, transform?: (r: any) => any, transformError = (r: any) => r): Promise<Response> {
|
|
28
|
-
return this.provider.execute({ uri, verb: HttpVerb.Patch, body, transform, transformError, options});
|
|
28
|
+
return this.provider.execute({ uri, verb: HttpVerb.Patch, body, transform, transformError, options: this.options(HttpVerb.Patch, options)});
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
delete(uri: Uri, options: RequestOptions = RequestOptions.Json, transform?: (b: any) => any, transformError = (r: any) => r): Promise<Response> {
|
|
32
|
-
return this.provider.execute({ uri, verb: HttpVerb.Delete, transform, transformError, options });
|
|
32
|
+
return this.provider.execute({ uri, verb: HttpVerb.Delete, transform, transformError, options: this.options(HttpVerb.Delete, options) });
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
options(verb: HttpVerb, options?: RequestOptions | PageOptions): RequestOptions {
|
|
36
|
+
return (options instanceof RequestOptions) ? options : RequestOptions.Json;
|
|
33
37
|
}
|
|
34
38
|
}
|
|
35
39
|
|