@thisisagile/easy 10.10.6 → 10.10.7

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.
Files changed (5) hide show
  1. package/dist/services/Api.d.ts +2 -1
  2. package/dist/services/Api.js +8 -5
  3. package/dist/services/Api.js.map +1 -1
  4. package/package.json +2 -2
  5. package/src/services/Api.ts +9 -5
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: (options instanceof http_1.RequestOptions) ? options : http_1.RequestOptions.Json,
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,YAAY,qBAAc,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,qBAAc,CAAC,IAAI;SAC7E,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,CAAC,CAAC;IACvG,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,CAAC,CAAC;IACtG,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,EAAC,CAAC,CAAC;IACvG,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,CAAC,CAAC;IACnG,CAAC;CACF;AA7BD,kBA6BC;AAEY,QAAA,GAAG,GAAQ,IAAI,GAAG,EAAE,CAAC"}
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.10.6",
3
+ "version": "10.10.7",
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.10.6",
34
+ "@thisisagile/easy-test": "10.10.7",
35
35
  "@types/form-urlencoded": "^4.4.0",
36
36
  "@types/jsonwebtoken": "^8.5.8",
37
37
  "@types/validator": "^13.7.2"
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 instanceof RequestOptions) ? options : RequestOptions.Json,
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