@thisisagile/easy 10.10.4 → 10.10.7

package/dist/services/Api.d.ts

@@ -1,12 +1,13 @@
 import { PageOptions, Uri } from '../types';
-import { RequestOptions, RequestProvider, Response } from '../http';
+import { HttpVerb, RequestOptions, RequestProvider, Response } from '../http';
 export declare class Api {
     readonly provider: RequestProvider;
     constructor(provider?: RequestProvider);
     get(uri: Uri, options?: RequestOptions | PageOptions, transform?: (r: any) => any, transformError?: (r: any) => any): Promise<Response>;
-    post: (uri: Uri, body?: unknown, options?: RequestOptions, transform?: ((r: any) => any) | undefined, transformError?: (r: any) => any) => Promise<Response>;
-    put: (uri: Uri, body?: unknown, options?: RequestOptions, transform?: ((r: any) => any) | undefined, transformError?: (r: any) => any) => Promise<Response>;
-    patch: (uri: Uri, body?: unknown, options?: RequestOptions, transform?: ((r: any) => any) | undefined, transformError?: (r: any) => any) => Promise<Response>;
-    delete: (uri: Uri, options?: RequestOptions, transform?: ((b: any) => any) | undefined, transformError?: (r: any) => any) => Promise<Response>;
+    post(uri: Uri, body?: unknown, options?: RequestOptions, transform?: (r: any) => any, transformError?: (r: any) => any): Promise<Response>;
+    put(uri: Uri, body?: unknown, options?: RequestOptions, transform?: (r: any) => any, transformError?: (r: any) => any): Promise<Response>;
+    patch(uri: Uri, body?: unknown, options?: RequestOptions, transform?: (r: any) => any, transformError?: (r: any) => any): Promise<Response>;
+    delete(uri: Uri, options?: RequestOptions, transform?: (b: any) => any, transformError?: (r: any) => any): Promise<Response>;
+    options(verb: HttpVerb, options?: RequestOptions | PageOptions): RequestOptions;
 }
 export declare const api: Api;

package/dist/services/Api.js

@@ -6,17 +6,6 @@ const AxiosProvider_1 = require("./AxiosProvider");
 class Api {
     constructor(provider = new AxiosProvider_1.AxiosProvider()) {
         this.provider = provider;
-        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 });
-        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 });
-        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,
-        });
-        this.delete = (uri, options = http_1.RequestOptions.Json, transform, transformError = (r) => r) => this.provider.execute({ uri, verb: http_1.HttpVerb.Delete, transform, transformError, options });
     }
     get(uri, options, transform, transformError = (r) => r) {
         return this.provider.execute({
@@ -24,9 +13,24 @@ class Api {
             verb: http_1.HttpVerb.Get,
             transform,
             transformError,
-            options: (options instanceof http_1.RequestOptions) ? options : http_1.RequestOptions.Json,
+            options: this.options(http_1.HttpVerb.Get, options),
         });
     }
+    post(uri, body, options = http_1.RequestOptions.Json, transform, transformError = (r) => r) {
+        return this.provider.execute({ uri, verb: http_1.HttpVerb.Post, body, transform, transformError, options: this.options(http_1.HttpVerb.Post, options) });
+    }
+    put(uri, body, options = http_1.RequestOptions.Json, transform, transformError = (r) => r) {
+        return this.provider.execute({ uri, verb: http_1.HttpVerb.Put, body, transform, transformError, options: this.options(http_1.HttpVerb.Put, options) });
+    }
+    patch(uri, body, options = http_1.RequestOptions.Json, transform, transformError = (r) => r) {
+        return this.provider.execute({ uri, verb: http_1.HttpVerb.Patch, body, transform, transformError, options: this.options(http_1.HttpVerb.Patch, options) });
+    }
+    delete(uri, options = http_1.RequestOptions.Json, transform, transformError = (r) => r) {
+        return this.provider.execute({ uri, verb: http_1.HttpVerb.Delete, transform, transformError, options: this.options(http_1.HttpVerb.Delete, options) });
+    }
+    options(verb, options) {
+        return (options instanceof http_1.RequestOptions) ? options : http_1.RequestOptions.Json;
+    }
 }
 exports.Api = Api;
 exports.api = new Api();

package/dist/services/Api.js.map

@@ -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;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"}
+{"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/dist/utils/index.d.ts

@@ -4,7 +4,6 @@ export * from './Log';
 export * from './Mapper';
 export * from './Promise';
 export * from './Property';
-export * from './Rerun';
 export * from './State';
 export * from './Sentence';
 export * from './Traverse';

package/dist/utils/index.js

@@ -20,7 +20,6 @@ __exportStar(require("./Log"), exports);
 __exportStar(require("./Mapper"), exports);
 __exportStar(require("./Promise"), exports);
 __exportStar(require("./Property"), exports);
-__exportStar(require("./Rerun"), exports);
 __exportStar(require("./State"), exports);
 __exportStar(require("./Sentence"), exports);
 __exportStar(require("./Traverse"), exports);

package/dist/utils/index.js.map

@@ -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,0CAAwB;AACxB,6CAA2B;AAC3B,6CAA2B;AAC3B,yCAAuB;AACvB,yCAAuB"}
+{"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;AACvB,yCAAuB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy",
-  "version": "10.10.4",
+  "version": "10.10.7",
   "description": "Straightforward library for building domain-driven microservice architectures",
   "author": "Sander Hoogendoorn",
   "license": "MIT",
@@ -31,7 +31,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@thisisagile/easy-test": "10.10.4",
+    "@thisisagile/easy-test": "10.10.7",
     "@types/form-urlencoded": "^4.4.0",
     "@types/jsonwebtoken": "^8.5.8",
     "@types/validator": "^13.7.2"

package/src/services/Api.ts

@@ -12,43 +12,29 @@ export class Api {
       verb: HttpVerb.Get,
       transform,
       transformError,
-      options: (options instanceof RequestOptions) ? options : RequestOptions.Json,
+      options: this.options(HttpVerb.Get, options),
     });
   }
 
-  post = (
-    uri: Uri,
-    body?: unknown,
-    options: RequestOptions = RequestOptions.Json,
-    transform?: (r: any) => any,
-    transformError = (r: any) => r,
-  ): Promise<Response> => this.provider.execute({ uri, verb: HttpVerb.Post, body, transform, transformError, options });
-
-  put = (
-    uri: Uri,
-    body?: unknown,
-    options: RequestOptions = RequestOptions.Json,
-    transform?: (r: any) => any,
-    transformError = (r: any) => r,
-  ): Promise<Response> => this.provider.execute({ uri, verb: HttpVerb.Put, body, transform, transformError, options });
-
-  patch = (
-    uri: Uri,
-    body?: unknown,
-    options: RequestOptions = RequestOptions.Json,
-    transform?: (r: any) => any,
-    transformError = (r: any) => r,
-  ): Promise<Response> => this.provider.execute({
-    uri,
-    verb: HttpVerb.Patch,
-    body,
-    transform,
-    transformError,
-    options,
-  });
-
-  delete = (uri: Uri, options: RequestOptions = RequestOptions.Json, transform?: (b: any) => any, transformError = (r: any) => r): Promise<Response> =>
-    this.provider.execute({ uri, verb: HttpVerb.Delete, transform, transformError, options });
+  post(uri: Uri, body?: unknown, options: RequestOptions = RequestOptions.Json, transform?: (r: any) => any, transformError = (r: any) => r): Promise<Response> {
+    return this.provider.execute({ uri, verb: HttpVerb.Post, body, transform, transformError, options: this.options(HttpVerb.Post, options) });
+  }
+
+  put(uri: Uri, body?: unknown, options: RequestOptions = RequestOptions.Json, transform?: (r: any) => any, transformError = (r: any) => r): Promise<Response> {
+    return this.provider.execute({ uri, verb: HttpVerb.Put, body, transform, transformError, options: this.options(HttpVerb.Put, options) });
+  }
+
+  patch(uri: Uri, body?: unknown, options: RequestOptions = RequestOptions.Json, transform?: (r: any) => any, transformError = (r: any) => r): Promise<Response> {
+    return this.provider.execute({ uri, verb: HttpVerb.Patch, body, transform, transformError, options: this.options(HttpVerb.Patch, options)});
+  }
+
+  delete(uri: Uri, options: RequestOptions = RequestOptions.Json, transform?: (b: any) => any, transformError = (r: any) => r): Promise<Response> {
+    return this.provider.execute({ uri, verb: HttpVerb.Delete, transform, transformError, options: this.options(HttpVerb.Delete, options) });
+  }
+
+  options(verb: HttpVerb, options?: RequestOptions | PageOptions): RequestOptions {
+    return (options instanceof RequestOptions) ? options : RequestOptions.Json;
+  }
 }
 
 export const api: Api = new Api();

package/src/utils/index.ts

@@ -4,7 +4,6 @@ export * from './Log';
 export * from './Mapper';
 export * from './Promise';
 export * from './Property';
-export * from './Rerun';
 export * from './State';
 export * from './Sentence';
 export * from './Traverse';

package/dist/utils/Rerun.d.ts

@@ -1,10 +0,0 @@
-import { ErrorOrigin } from '../types';
-export declare class Rerun<T = any> {
-    readonly subject: () => Promise<T>;
-    readonly times: number;
-    readonly interval: number;
-    readonly prevError?: ErrorOrigin | undefined;
-    constructor(subject: () => Promise<T>, times?: number, interval?: number, prevError?: ErrorOrigin | undefined);
-    run: () => Promise<T>;
-}
-export declare const rerun: <T>(subject: () => Promise<T>, times?: number | undefined, interval?: number | undefined, prevError?: ErrorOrigin | undefined) => Promise<T>;

package/dist/utils/Rerun.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.rerun = exports.Rerun = void 0;
-const types_1 = require("../types");
-const Wait_1 = require("./Wait");
-const validation_1 = require("../validation");
-class Rerun {
-    constructor(subject, times = 3, interval = 1000, prevError) {
-        this.subject = subject;
-        this.times = times;
-        this.interval = interval;
-        this.prevError = prevError;
-        this.run = () => (0, validation_1.when)(this.times)
-            .not.isTrue.reject(this.prevError ?? types_1.Exception.CouldNotExecute)
-            .then(() => this.subject().catch(async (e) => {
-            await (0, Wait_1.wait)(this.interval);
-            return new Rerun(this.subject, this.times - 1, this.interval, e).run();
-        }));
-    }
-}
-exports.Rerun = Rerun;
-const rerun = (subject, times, interval, prevError) => new Rerun(subject, times, interval, prevError).run();
-exports.rerun = rerun;
-//# sourceMappingURL=Rerun.js.map

package/dist/utils/Rerun.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Rerun.js","sourceRoot":"","sources":["../../src/utils/Rerun.ts"],"names":[],"mappings":";;;AAAA,oCAAkD;AAClD,iCAA8B;AAC9B,8CAAqC;AAErC,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,IAAI,KAAK,CAAI,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,GAAG,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;QAC5E,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"}

package/src/utils/Rerun.ts

@@ -1,20 +0,0 @@
-import { ErrorOrigin, Exception } from '../types';
-import { wait } from './Wait';
-import { when } from '../validation';
-
-export class Rerun<T = any> {
-  constructor(readonly subject: () => Promise<T>, readonly times = 3, readonly interval = 1000, readonly prevError?: ErrorOrigin) {}
-
-  run = (): Promise<T> =>
-    when(this.times)
-      .not.isTrue.reject(this.prevError ?? Exception.CouldNotExecute)
-      .then(() =>
-        this.subject().catch(async e => {
-          await wait(this.interval);
-          return new Rerun<T>(this.subject, this.times - 1, this.interval, e).run();
-        })
-      );
-}
-
-export const rerun = <T>(subject: () => Promise<T>, times?: number, interval?: number, prevError?: ErrorOrigin): Promise<T> =>
-  new Rerun<T>(subject, times, interval, prevError).run();