@thisisagile/easy 8.45.0 → 8.46.3
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/Request.d.ts +1 -0
- package/dist/http/RequestOptions.d.ts +1 -0
- package/dist/http/RequestOptions.js +4 -0
- package/dist/http/RequestOptions.js.map +1 -1
- package/dist/services/Api.d.ts +5 -5
- package/dist/services/Api.js +5 -5
- package/dist/services/Api.js.map +1 -1
- package/dist/services/AxiosProvider.d.ts +1 -1
- package/dist/services/AxiosProvider.js +2 -2
- package/dist/services/AxiosProvider.js.map +1 -1
- package/dist/utils/View.d.ts +1 -1
- package/dist/utils/View.js +2 -0
- package/dist/utils/View.js.map +1 -1
- package/package.json +6 -6
- package/src/http/Request.ts +1 -0
- package/src/http/RequestOptions.ts +5 -0
- package/src/services/Api.ts +10 -10
- package/src/services/AxiosProvider.ts +2 -2
- package/src/utils/View.ts +17 -6
package/dist/http/Request.d.ts
CHANGED
|
@@ -14,6 +14,7 @@ export declare class RequestOptions extends Enum {
|
|
|
14
14
|
[key: string]: any;
|
|
15
15
|
});
|
|
16
16
|
authorization: (auth: string) => this;
|
|
17
|
+
apiKey: (apiKey: string) => this;
|
|
17
18
|
accept: (type: ContentType) => this;
|
|
18
19
|
bearer: (jwt: Text) => this;
|
|
19
20
|
basic: (username: Text, password: Text) => this;
|
|
@@ -13,6 +13,10 @@ class RequestOptions extends types_1.Enum {
|
|
|
13
13
|
this.headers.Authorization = auth;
|
|
14
14
|
return this;
|
|
15
15
|
};
|
|
16
|
+
this.apiKey = (apiKey) => {
|
|
17
|
+
this.headers.apiKey = apiKey;
|
|
18
|
+
return this;
|
|
19
|
+
};
|
|
16
20
|
this.accept = (type) => {
|
|
17
21
|
this.headers.Accept = type.id;
|
|
18
22
|
return this;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestOptions.js","sourceRoot":"","sources":["../../src/http/RequestOptions.ts"],"names":[],"mappings":";;;AAAA,oCAA+D;AAC/D,6CAA0C;AAC1C,+CAA4C;AAE5C,MAAa,cAAe,SAAQ,YAAI;IAqBtC,YAAqB,OAAoB,yBAAW,CAAC,IAAI,EAAW,UAAkC,EAAE;QACtG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QADE,SAAI,GAAJ,IAAI,CAAgC;QAAW,YAAO,GAAP,OAAO,CAA6B;QAMxG,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,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;
|
|
1
|
+
{"version":3,"file":"RequestOptions.js","sourceRoot":"","sources":["../../src/http/RequestOptions.ts"],"names":[],"mappings":";;;AAAA,oCAA+D;AAC/D,6CAA0C;AAC1C,+CAA4C;AAE5C,MAAa,cAAe,SAAQ,YAAI;IAqBtC,YAAqB,OAAoB,yBAAW,CAAC,IAAI,EAAW,UAAkC,EAAE;QACtG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QADE,SAAI,GAAJ,IAAI,CAAgC;QAAW,YAAO,GAAP,OAAO,CAA6B;QAMxG,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;QA1BA,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;CA+BF;AAlDD,wCAkDC"}
|
package/dist/services/Api.d.ts
CHANGED
|
@@ -3,10 +3,10 @@ import { RequestOptions, RequestProvider, Response } from '../http';
|
|
|
3
3
|
export declare class Api {
|
|
4
4
|
readonly provider: RequestProvider;
|
|
5
5
|
constructor(provider?: RequestProvider);
|
|
6
|
-
get: (uri: Uri, options?: RequestOptions, transform?: ((r: any) => any) | undefined) => Promise<Response>;
|
|
7
|
-
post: (uri: Uri, body?: unknown, options?: RequestOptions, transform?: ((r: any) => any) | undefined) => Promise<Response>;
|
|
8
|
-
put: (uri: Uri, body?: unknown, options?: RequestOptions, transform?: ((r: any) => any) | undefined) => Promise<Response>;
|
|
9
|
-
patch: (uri: Uri, body?: unknown, options?: RequestOptions, transform?: ((r: any) => any) | undefined) => Promise<Response>;
|
|
10
|
-
delete: (uri: Uri, options?: RequestOptions, transform?: ((b: any) => any) | undefined) => Promise<Response>;
|
|
6
|
+
get: (uri: Uri, options?: RequestOptions, transform?: ((r: any) => any) | undefined, transformError?: (r: any) => any) => Promise<Response>;
|
|
7
|
+
post: (uri: Uri, body?: unknown, options?: RequestOptions, transform?: ((r: any) => any) | undefined, transformError?: (r: any) => any) => Promise<Response>;
|
|
8
|
+
put: (uri: Uri, body?: unknown, options?: RequestOptions, transform?: ((r: any) => any) | undefined, transformError?: (r: any) => any) => Promise<Response>;
|
|
9
|
+
patch: (uri: Uri, body?: unknown, options?: RequestOptions, transform?: ((r: any) => any) | undefined, transformError?: (r: any) => any) => Promise<Response>;
|
|
10
|
+
delete: (uri: Uri, options?: RequestOptions, transform?: ((b: any) => any) | undefined, transformError?: (r: any) => any) => Promise<Response>;
|
|
11
11
|
}
|
|
12
12
|
export declare const api: Api;
|
package/dist/services/Api.js
CHANGED
|
@@ -6,11 +6,11 @@ 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) => this.provider.execute({ uri, verb: http_1.HttpVerb.Get, transform, options });
|
|
10
|
-
this.post = (uri, body, options = http_1.RequestOptions.Json, transform) => this.provider.execute({ uri, verb: http_1.HttpVerb.Post, body, transform, options });
|
|
11
|
-
this.put = (uri, body, options = http_1.RequestOptions.Json, transform) => this.provider.execute({ uri, verb: http_1.HttpVerb.Put, body, transform, options });
|
|
12
|
-
this.patch = (uri, body, options = http_1.RequestOptions.Json, transform) => this.provider.execute({ uri, verb: http_1.HttpVerb.Patch, body, transform, options });
|
|
13
|
-
this.delete = (uri, options = http_1.RequestOptions.Json, transform) => this.provider.execute({ uri, verb: http_1.HttpVerb.Delete, transform, options });
|
|
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
|
+
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
|
+
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({ uri, verb: http_1.HttpVerb.Patch, body, transform, transformError, options });
|
|
13
|
+
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
14
|
}
|
|
15
15
|
}
|
|
16
16
|
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,kCAA8E;AAC9E,mDAAgD;AAEhD,MAAa,GAAG;IACd,YAAqB,WAA4B,IAAI,6BAAa,EAAE;QAA/C,aAAQ,GAAR,QAAQ,CAAuC;QAEpE,QAAG,GAAG,CAAC,GAAQ,EAAE,UAA0B,qBAAc,CAAC,IAAI,EAAE,SAA2B,EAAqB,EAAE,
|
|
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;QAEpE,QAAG,GAAG,CAAC,GAAQ,EAAE,UAA0B,qBAAc,CAAC,IAAI,EAAE,SAA2B,EAAE,iBAAiB,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EAAqB,EAAE,CAChJ,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,eAAQ,CAAC,GAAG,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,CAAC;QAEzF,SAAI,GAAG,CAAC,GAAQ,EAAE,IAAc,EAAE,UAA0B,qBAAc,CAAC,IAAI,EAAE,SAA2B,EAAE,iBAAiB,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EAAqB,EAAE,CACjK,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;QAEhG,QAAG,GAAG,CAAC,GAAQ,EAAE,IAAc,EAAE,UAA0B,qBAAc,CAAC,IAAI,EAAE,SAA2B,EAAE,iBAAiB,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EAAqB,EAAE,CAChK,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;QAE/F,UAAK,GAAG,CAAC,GAAQ,EAAE,IAAc,EAAE,UAA0B,qBAAc,CAAC,IAAI,EAAE,SAA2B,EAAE,iBAAiB,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EAAqB,EAAE,CAClK,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,eAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,CAAC;QAEjG,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;IAfrB,CAAC;CAgBzE;AAjBD,kBAiBC;AAEY,QAAA,GAAG,GAAQ,IAAI,GAAG,EAAE,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Request, RequestProvider, Response } from '../http';
|
|
2
2
|
export declare class AxiosProvider implements RequestProvider {
|
|
3
|
-
execute: ({ uri, verb, body, transform, options }: Request) => Promise<Response>;
|
|
3
|
+
execute: ({ uri, verb, body, transform, transformError, options }: Request) => Promise<Response>;
|
|
4
4
|
}
|
|
@@ -16,7 +16,7 @@ const asResponse = (uri, verb, error) => (0, utils_1.choose)(error)
|
|
|
16
16
|
.else(e => (0, http_1.toResponse)(http_1.HttpStatus.InternalServerError, (0, types_1.toResult)(e.message, uri.path, uri)));
|
|
17
17
|
class AxiosProvider {
|
|
18
18
|
constructor() {
|
|
19
|
-
this.execute = ({ uri, verb, body, transform = (r) => r, options = http_1.RequestOptions.Json }) => axios_1.default
|
|
19
|
+
this.execute = ({ uri, verb, body, transform = (r) => r, transformError = (r) => r, options = http_1.RequestOptions.Json }) => axios_1.default
|
|
20
20
|
.request({
|
|
21
21
|
url: uri.toString(),
|
|
22
22
|
method: verb.toString(),
|
|
@@ -24,7 +24,7 @@ class AxiosProvider {
|
|
|
24
24
|
data: options.type.encode(body),
|
|
25
25
|
})
|
|
26
26
|
.then(r => (0, http_1.toResponse)(r.status, transform(r.data), r.headers))
|
|
27
|
-
.catch(e => Promise.reject(asResponse(uri, verb, e)));
|
|
27
|
+
.catch(e => Promise.reject(asResponse(uri, verb, transformError(e))));
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
30
|
exports.AxiosProvider = AxiosProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AxiosProvider.js","sourceRoot":"","sources":["../../src/services/AxiosProvider.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAiE;AACjE,kCAA6H;AAC7H,oCAAkE;AAClE,oCAAkC;AAElC,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,EAAuB,KAAK,CAAC;KAChC,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;IAA1B;QACE,YAAO,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,GAAG,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,GAAG,qBAAc,CAAC,IAAI,EAAW,EAAqB,EAAE,
|
|
1
|
+
{"version":3,"file":"AxiosProvider.js","sourceRoot":"","sources":["../../src/services/AxiosProvider.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAiE;AACjE,kCAA6H;AAC7H,oCAAkE;AAClE,oCAAkC;AAElC,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,EAAuB,KAAK,CAAC;KAChC,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;IAA1B;QACE,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,eAAK;aACF,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;IAC5E,CAAC;CAAA;AAXD,sCAWC"}
|
package/dist/utils/View.d.ts
CHANGED
package/dist/utils/View.js
CHANGED
|
@@ -11,6 +11,8 @@ const isColAndView = (v) => (0, types_1.isObject)(v) && (0, types_1.isDefined)(v
|
|
|
11
11
|
const toFunc = (a, col, f = a => a) => (0, types_1.tryTo)((0, Traverse_1.traverse)(a, col)).map(v => ((0, types_1.isArray)(v) ? () => v.map(i => f(i)) : (a) => f((0, Traverse_1.traverse)(a, col)))).value;
|
|
12
12
|
const toViewer = (key, value) => (0, Case_1.choose)(value)
|
|
13
13
|
.type(types_1.isUndefined, () => toViewer(key, () => undefined))
|
|
14
|
+
.type(types_1.isBoolean, b => toViewer(key, () => b))
|
|
15
|
+
.type(types_1.isNumber, n => toViewer(key, () => n))
|
|
14
16
|
.type(types_1.isString, s => toViewer(key, (a) => toFunc(a, s)(a)))
|
|
15
17
|
.type(isColOnly, io => toViewer(key, io.col))
|
|
16
18
|
.type(types_1.isFunction, f => toViewer(key, { in: { key, f } }))
|
package/dist/utils/View.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"View.js","sourceRoot":"","sources":["../../src/utils/View.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"View.js","sourceRoot":"","sources":["../../src/utils/View.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@thisisagile/easy",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.46.3",
|
|
4
4
|
"description": "Straightforward library for building domain-driven microservice architectures",
|
|
5
5
|
"author": "Sander Hoogendoorn",
|
|
6
6
|
"license": "MIT",
|
|
@@ -31,17 +31,17 @@
|
|
|
31
31
|
"access": "public"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
|
-
"@thisisagile/easy-test": "8.
|
|
34
|
+
"@thisisagile/easy-test": "8.46.3",
|
|
35
35
|
"@types/form-urlencoded": "^4.4.0",
|
|
36
36
|
"@types/jsonwebtoken": "^8.5.8",
|
|
37
37
|
"@types/validator": "^13.7.2"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@types/uuid": "^8.3.
|
|
41
|
-
"axios": "^0.
|
|
42
|
-
"form-urlencoded": "^6.0.
|
|
40
|
+
"@types/uuid": "^8.3.4",
|
|
41
|
+
"axios": "^0.26.1",
|
|
42
|
+
"form-urlencoded": "^6.0.6",
|
|
43
43
|
"jsonwebtoken": "^8.5.1",
|
|
44
|
-
"moment": "^2.29.
|
|
44
|
+
"moment": "^2.29.2",
|
|
45
45
|
"reflect-metadata": "^0.1.13",
|
|
46
46
|
"uuid": "^8.3.2",
|
|
47
47
|
"validator": "^13.7.0"
|
package/src/http/Request.ts
CHANGED
|
@@ -34,6 +34,11 @@ export class RequestOptions extends Enum {
|
|
|
34
34
|
return this;
|
|
35
35
|
};
|
|
36
36
|
|
|
37
|
+
apiKey = (apiKey: string): this => {
|
|
38
|
+
this.headers.apiKey = apiKey;
|
|
39
|
+
return this;
|
|
40
|
+
};
|
|
41
|
+
|
|
37
42
|
accept = (type: ContentType): this => {
|
|
38
43
|
this.headers.Accept = type.id;
|
|
39
44
|
return this;
|
package/src/services/Api.ts
CHANGED
|
@@ -5,20 +5,20 @@ import { AxiosProvider } from './AxiosProvider';
|
|
|
5
5
|
export class Api {
|
|
6
6
|
constructor(readonly provider: RequestProvider = new AxiosProvider()) {}
|
|
7
7
|
|
|
8
|
-
get = (uri: Uri, options: RequestOptions = RequestOptions.Json, transform?: (r: any) => any): Promise<Response> =>
|
|
9
|
-
this.provider.execute({ uri, verb: HttpVerb.Get, transform, options });
|
|
8
|
+
get = (uri: Uri, options: RequestOptions = RequestOptions.Json, transform?: (r: any) => any, transformError = (r: any) => r): Promise<Response> =>
|
|
9
|
+
this.provider.execute({ uri, verb: HttpVerb.Get, transform, transformError, options });
|
|
10
10
|
|
|
11
|
-
post = (uri: Uri, body?: unknown, options: RequestOptions = RequestOptions.Json, transform?: (r: any) => any): Promise<Response> =>
|
|
12
|
-
this.provider.execute({ uri, verb: HttpVerb.Post, body, transform, options });
|
|
11
|
+
post = (uri: Uri, body?: unknown, options: RequestOptions = RequestOptions.Json, transform?: (r: any) => any, transformError = (r: any) => r): Promise<Response> =>
|
|
12
|
+
this.provider.execute({ uri, verb: HttpVerb.Post, body, transform, transformError, options });
|
|
13
13
|
|
|
14
|
-
put = (uri: Uri, body?: unknown, options: RequestOptions = RequestOptions.Json, transform?: (r: any) => any): Promise<Response> =>
|
|
15
|
-
this.provider.execute({ uri, verb: HttpVerb.Put, body, transform, options });
|
|
14
|
+
put = (uri: Uri, body?: unknown, options: RequestOptions = RequestOptions.Json, transform?: (r: any) => any, transformError = (r: any) => r): Promise<Response> =>
|
|
15
|
+
this.provider.execute({ uri, verb: HttpVerb.Put, body, transform, transformError, options });
|
|
16
16
|
|
|
17
|
-
patch = (uri: Uri, body?: unknown, options: RequestOptions = RequestOptions.Json, transform?: (r: any) => any): Promise<Response> =>
|
|
18
|
-
this.provider.execute({ uri, verb: HttpVerb.Patch, body, transform, options });
|
|
17
|
+
patch = (uri: Uri, body?: unknown, options: RequestOptions = RequestOptions.Json, transform?: (r: any) => any, transformError = (r: any) => r): Promise<Response> =>
|
|
18
|
+
this.provider.execute({ uri, verb: HttpVerb.Patch, body, transform, transformError, options });
|
|
19
19
|
|
|
20
|
-
delete = (uri: Uri, options: RequestOptions = RequestOptions.Json, transform?: (b: any) => any): Promise<Response> =>
|
|
21
|
-
this.provider.execute({ uri, verb: HttpVerb.Delete, transform, options });
|
|
20
|
+
delete = (uri: Uri, options: RequestOptions = RequestOptions.Json, transform?: (b: any) => any, transformError = (r: any) => r): Promise<Response> =>
|
|
21
|
+
this.provider.execute({ uri, verb: HttpVerb.Delete, transform, transformError, options });
|
|
22
22
|
}
|
|
23
23
|
|
|
24
24
|
export const api: Api = new Api();
|
|
@@ -15,7 +15,7 @@ const asResponse = (uri: Uri, verb: HttpVerb, error: AxiosError): Response =>
|
|
|
15
15
|
.else(e => toResponse(HttpStatus.InternalServerError, toResult(e.message, uri.path, uri)));
|
|
16
16
|
|
|
17
17
|
export class AxiosProvider implements RequestProvider {
|
|
18
|
-
execute = ({ uri, verb, body, transform = (r: any) => r, options = RequestOptions.Json }: Request): Promise<Response> =>
|
|
18
|
+
execute = ({ uri, verb, body, transform = (r: any) => r, transformError = (r: any) => r, options = RequestOptions.Json }: Request): Promise<Response> =>
|
|
19
19
|
axios
|
|
20
20
|
.request({
|
|
21
21
|
url: uri.toString(),
|
|
@@ -24,5 +24,5 @@ export class AxiosProvider implements RequestProvider {
|
|
|
24
24
|
data: options.type.encode(body),
|
|
25
25
|
})
|
|
26
26
|
.then(r => toResponse(r.status, transform(r.data), r.headers))
|
|
27
|
-
.catch(e => Promise.reject(asResponse(uri, verb, e)));
|
|
27
|
+
.catch(e => Promise.reject(asResponse(uri, verb, transformError(e))));
|
|
28
28
|
}
|
package/src/utils/View.ts
CHANGED
|
@@ -1,4 +1,16 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
asJson,
|
|
3
|
+
isArray, isBoolean,
|
|
4
|
+
isDefined,
|
|
5
|
+
isFunction, isNumber,
|
|
6
|
+
isObject,
|
|
7
|
+
isString,
|
|
8
|
+
isUndefined,
|
|
9
|
+
Json,
|
|
10
|
+
json,
|
|
11
|
+
meta,
|
|
12
|
+
tryTo,
|
|
13
|
+
} from '../types';
|
|
2
14
|
import { traverse } from './Traverse';
|
|
3
15
|
import { choose } from './Case';
|
|
4
16
|
|
|
@@ -11,7 +23,7 @@ const isInOnly = (v: unknown): v is InOut => isObject(v) && !isDefined(v.col) &&
|
|
|
11
23
|
const isColAndFunction = (v: unknown): v is { col: string; in: Func } => isObject(v) && isDefined(v.col) && isFunction(v.in);
|
|
12
24
|
const isColAndView = (v: unknown): v is { col: string; in: View } => isObject(v) && isDefined(v.col) && v.in instanceof View;
|
|
13
25
|
|
|
14
|
-
type Views = { [key: string]: string | Func | InOut | undefined };
|
|
26
|
+
type Views = { [key: string]: string | Func | InOut | number | boolean | undefined };
|
|
15
27
|
type Viewer = { in: { key: string; f: Func } };
|
|
16
28
|
|
|
17
29
|
const toFunc = (a: any, col: string, f: Func = a => a): Func =>
|
|
@@ -20,6 +32,8 @@ const toFunc = (a: any, col: string, f: Func = a => a): Func =>
|
|
|
20
32
|
const toViewer = (key: string, value: unknown): Viewer =>
|
|
21
33
|
choose<Viewer>(value)
|
|
22
34
|
.type(isUndefined, () => toViewer(key, () => undefined))
|
|
35
|
+
.type(isBoolean, b => toViewer(key, () => b))
|
|
36
|
+
.type(isNumber, n => toViewer(key, () => n))
|
|
23
37
|
.type(isString, s => toViewer(key, (a: any) => toFunc(a, s)(a)))
|
|
24
38
|
.type(isColOnly, io => toViewer(key, io.col))
|
|
25
39
|
.type(isFunction, f => toViewer(key, { in: { key, f } }))
|
|
@@ -52,9 +66,6 @@ export const views = {
|
|
|
52
66
|
ignore: () => undefined,
|
|
53
67
|
keep: (a: unknown, key?: string) => traverse(a, key),
|
|
54
68
|
keepOr: (alt?: string) => (a: unknown, key?: string) => traverse(a, key) ?? alt,
|
|
55
|
-
or:
|
|
56
|
-
(key: string, alt = '') =>
|
|
57
|
-
(a: unknown) =>
|
|
58
|
-
traverse(a, key) ?? alt,
|
|
69
|
+
or: (key: string, alt = '') => (a: unknown) => traverse(a, key) ?? alt,
|
|
59
70
|
value: (value: unknown) => () => value,
|
|
60
71
|
};
|