@thisisagile/easy 10.9.0 → 10.10.2

package/dist/types/PageList.d.ts

@@ -11,6 +11,6 @@ export declare type PageOptions = {
 export declare type PageList<T> = List<T> & Omit<PageOptions, 'sort'> & {
     total?: number;
 };
-export declare const toPageList: <T>(items?: T[] | undefined, options?: (PageOptions & {
+export declare const toPageList: <T>(items?: T[] | undefined, options?: (Omit<PageOptions, "sort"> & {
     total?: number | undefined;
 }) | undefined) => PageList<T>;

package/dist/types/PageList.js

@@ -2,13 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toPageList = void 0;
 const List_1 = require("./List");
-const Json_1 = require("./Json");
 const toPageList = (items, options) => {
-    const o = Json_1.json.defaults(options, { take: 250, skip: 0 });
     const list = (0, List_1.toList)(...(items ?? []));
-    list.take = o.take;
-    list.skip = o.skip;
-    list.total = o.total;
+    list.take = options?.take ?? 250;
+    list.skip = options?.skip ?? 0;
+    list.total = options?.total;
     return list;
 };
 exports.toPageList = toPageList;

package/dist/types/PageList.js.map

@@ -1 +1 @@
-{"version":3,"file":"PageList.js","sourceRoot":"","sources":["../../src/types/PageList.ts"],"names":[],"mappings":";;;AAAA,iCAAsC;AACtC,iCAA8B;AAQvB,MAAM,UAAU,GAAG,CAAK,KAAW,EAAE,OAA0C,EAAe,EAAE;IACrG,MAAM,CAAC,GAAG,WAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;IACzD,MAAM,IAAI,GAAG,IAAA,aAAM,EAAI,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAQ,CAAC;IAChD,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC;IACnB,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC;IACnB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;IACrB,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAPW,QAAA,UAAU,cAOrB"}
+{"version":3,"file":"PageList.js","sourceRoot":"","sources":["../../src/types/PageList.ts"],"names":[],"mappings":";;;AAAA,iCAAsC;AAQ/B,MAAM,UAAU,GAAG,CAAI,KAAW,EAAE,OAAwD,EAAe,EAAE;IAClH,MAAM,IAAI,GAAG,IAAA,aAAM,EAAI,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAQ,CAAC;IAChD,IAAI,CAAC,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,GAAG,CAAC;IACjC,IAAI,CAAC,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,CAAC,CAAC;IAC/B,IAAI,CAAC,KAAK,GAAG,OAAO,EAAE,KAAK,CAAC;IAC5B,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AANW,QAAA,UAAU,cAMrB"}

package/dist/utils/Retry.d.ts

@@ -0,0 +1,10 @@
+import { ErrorOrigin } from '../types';
+export declare class Retry<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 retry: <T>(subject: () => Promise<T>, times?: number | undefined, interval?: number | undefined, prevError?: ErrorOrigin | undefined) => Promise<T>;

package/dist/utils/Retry.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.retry = exports.Retry = void 0;
+const types_1 = require("../types");
+const validation_1 = require("../validation");
+const Wait_1 = require("./Wait");
+class Retry {
+    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 (0, exports.retry)(this.subject, this.times - 1, this.interval, e);
+        }));
+    }
+}
+exports.Retry = Retry;
+const retry = (subject, times, interval, prevError) => new Retry(subject, times, interval, prevError).run();
+exports.retry = retry;
+//# sourceMappingURL=Retry.js.map

package/dist/utils/Retry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Retry.js","sourceRoot":"","sources":["../../src/utils/Retry.ts"],"names":[],"mappings":";;;AAAA,oCAAkD;AAClD,8CAAqC;AACrC,iCAA8B;AAE9B,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,IAAA,aAAK,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,GAAG,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAC/D,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/dist/utils/Wait.d.ts

@@ -0,0 +1,5 @@
+export declare class Wait {
+    static wait(ms?: number): Promise<void>;
+    static seconds(s?: number): Promise<void>;
+}
+export declare const wait: (millis: number) => Promise<void>;

package/dist/utils/Wait.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.wait = exports.Wait = void 0;
+class Wait {
+    static wait(ms = 0) {
+        return new Promise(resolve => setTimeout(resolve, ms));
+    }
+    static seconds(s = 0) {
+        return this.wait(s * 1000);
+    }
+}
+exports.Wait = Wait;
+const wait = (millis) => Wait.wait(millis);
+exports.wait = wait;
+//# sourceMappingURL=Wait.js.map

package/dist/utils/Wait.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Wait.js","sourceRoot":"","sources":["../../src/utils/Wait.ts"],"names":[],"mappings":";;;AAAA,MAAa,IAAI;IACf,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC;QAChB,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC;QAClB,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAC7B,CAAC;CACF;AARD,oBAQC;AAEM,MAAM,IAAI,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAA7C,QAAA,IAAI,QAAyC"}

package/dist/utils/index.d.ts

@@ -4,7 +4,9 @@ export * from './Log';
 export * from './Mapper';
 export * from './Promise';
 export * from './Property';
+export * from './Retry';
 export * from './State';
 export * from './Sentence';
 export * from './Traverse';
 export * from './View';
+export * from './Wait';

package/dist/utils/index.js

@@ -20,8 +20,10 @@ __exportStar(require("./Log"), exports);
 __exportStar(require("./Mapper"), exports);
 __exportStar(require("./Promise"), exports);
 __exportStar(require("./Property"), exports);
+__exportStar(require("./Retry"), exports);
 __exportStar(require("./State"), exports);
 __exportStar(require("./Sentence"), exports);
 __exportStar(require("./Traverse"), exports);
 __exportStar(require("./View"), exports);
+__exportStar(require("./Wait"), exports);
 //# sourceMappingURL=index.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy",
-  "version": "10.9.0",
+  "version": "10.10.2",
   "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.9.0",
+    "@thisisagile/easy-test": "10.10.2",
     "@types/form-urlencoded": "^4.4.0",
     "@types/jsonwebtoken": "^8.5.8",
     "@types/validator": "^13.7.2"

package/src/types/PageList.ts

@@ -1,17 +1,15 @@
 import { List, toList } from './List';
-import { json } from './Json';
 
-export type Sort = { key: string, value: -1 | 1 };
+export type Sort = { key: string; value: -1 | 1 };
 
-export type PageOptions = { take?: number, skip?: number, sort?: Sort[] };
+export type PageOptions = { take?: number; skip?: number; sort?: Sort[] };
 
 export type PageList<T> = List<T> & Omit<PageOptions, 'sort'> & { total?: number };
 
-export const toPageList = <T>( items?: T[], options?: PageOptions & { total?: number }): PageList<T> => {
-  const o = json.defaults(options, { take: 250, skip: 0 });
+export const toPageList = <T>(items?: T[], options?: Omit<PageOptions, 'sort'> & { total?: number }): PageList<T> => {
   const list = toList<T>(...(items ?? [])) as any;
-  list.take = o.take;
-  list.skip = o.skip;
-  list.total = o.total;
+  list.take = options?.take ?? 250;
+  list.skip = options?.skip ?? 0;
+  list.total = options?.total;
   return list;
 };

package/src/utils/Retry.ts

@@ -0,0 +1,20 @@
+import { ErrorOrigin, Exception } from '../types';
+import { when } from '../validation';
+import { wait } from './Wait';
+
+export class Retry<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 retry(this.subject, this.times - 1, this.interval, e);
+        })
+      );
+}
+
+export const retry = <T>(subject: () => Promise<T>, times?: number, interval?: number, prevError?: ErrorOrigin): Promise<T> =>
+  new Retry<T>(subject, times, interval, prevError).run();

package/src/utils/Wait.ts

@@ -0,0 +1,11 @@
+export class Wait {
+  static wait(ms = 0): Promise<void> {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  }
+
+  static seconds(s = 0) {
+    return this.wait(s * 1000);
+  }
+}
+
+export const wait = (millis: number) => Wait.wait(millis);

package/src/utils/index.ts

@@ -4,7 +4,9 @@ export * from './Log';
 export * from './Mapper';
 export * from './Promise';
 export * from './Property';
+export * from './Retry';
 export * from './State';
 export * from './Sentence';
 export * from './Traverse';
 export * from './View';
+export * from './Wait';