@thisisagile/easy 7.5.0 → 7.5.5

package/dist/domain/values/DateTime.d.ts

@@ -1,12 +1,15 @@
 import { Value } from '../../types';
 import { Moment } from 'moment';
 export declare class DateTime extends Value<string | undefined> {
-    constructor(value: string | number | Date);
+    constructor(value?: string | number | Date);
+    protected get utc(): Moment;
     static get now(): DateTime;
     get isValid(): boolean;
     get fromNow(): string;
-    protected get moment(): Moment;
     isAfter(dt: DateTime): boolean;
+    isBefore(dt: DateTime): boolean;
+    add: (n: number) => DateTime;
+    subtract: (n: number) => DateTime;
     toString(): string;
     toLocale(locales?: string | string[], options?: Intl.DateTimeFormatOptions): string;
     toDate(): Date | undefined;

package/dist/domain/values/DateTime.js

@@ -10,21 +10,26 @@ const utils_1 = require("../../utils");
 class DateTime extends types_1.Value {
     constructor(value) {
         super(utils_1.ifDefined(value, moment_1.default.utc(value, true).toISOString()));
+        this.add = (n) => new DateTime(this.utc.add(n, 'days').toISOString());
+        this.subtract = (n) => new DateTime(this.utc.subtract(n, 'days').toISOString());
+    }
+    get utc() {
+        return moment_1.default.utc(this.value);
     }
     static get now() {
         return new DateTime(moment_1.default.utc().toISOString());
     }
     get isValid() {
-        return types_1.isDefined(this.value) && this.moment.isValid();
+        return types_1.isDefined(this.value) && this.utc.isValid();
     }
     get fromNow() {
-        return this.value ? this.moment.fromNow() : '';
-    }
-    get moment() {
-        return moment_1.default.utc(this.value, true);
+        return this.value ? this.utc.fromNow() : '';
     }
     isAfter(dt) {
-        return this.moment.isAfter(dt.moment);
+        return this.utc.isAfter(moment_1.default.utc(dt.value));
+    }
+    isBefore(dt) {
+        return this.utc.isBefore(moment_1.default.utc(dt.value));
     }
     toString() {
         return this.value ?? '';
@@ -33,7 +38,7 @@ class DateTime extends types_1.Value {
         return this.toDate()?.toLocaleDateString(locales, options) ?? '';
     }
     toDate() {
-        return this.isValid ? this.moment.toDate() : undefined;
+        return this.isValid ? this.utc.toDate() : undefined;
     }
 }
 exports.DateTime = DateTime;

package/dist/domain/values/DateTime.js.map

@@ -1 +1 @@
-{"version":3,"file":"DateTime.js","sourceRoot":"","sources":["../../../src/domain/values/DateTime.ts"],"names":[],"mappings":";;;;;;AAAA,uCAA+C;AAC/C,oDAAwC;AACxC,uCAAwC;AAExC,MAAa,QAAS,SAAQ,aAAyB;IACrD,YAAY,KAA6B;QACvC,KAAK,CAAC,iBAAS,CAAC,KAAK,EAAE,gBAAM,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,KAAK,GAAG;QACZ,OAAO,IAAI,QAAQ,CAAC,gBAAM,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,OAAO;QACT,OAAO,iBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IACxD,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACjD,CAAC;IAED,IAAc,MAAM;QAClB,OAAO,gBAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,CAAC,EAAY;QAClB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;IAC1B,CAAC;IAED,QAAQ,CAAC,UAA6B,OAAO,EAAE,UAAsC,EAAE;QACrF,OAAO,IAAI,CAAC,MAAM,EAAE,EAAE,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;IACnE,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACzD,CAAC;CACF;AApCD,4BAoCC"}
+{"version":3,"file":"DateTime.js","sourceRoot":"","sources":["../../../src/domain/values/DateTime.ts"],"names":[],"mappings":";;;;;;AAAA,uCAA+C;AAC/C,oDAAwC;AACxC,uCAAwC;AAExC,MAAa,QAAS,SAAQ,aAAyB;IACrD,YAAY,KAA8B;QACxC,KAAK,CAAC,iBAAS,CAAC,KAAK,EAAE,gBAAM,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QA2BjE,QAAG,GAAG,CAAC,CAAS,EAAY,EAAE,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAEnF,aAAQ,GAAG,CAAC,CAAS,EAAY,EAAE,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IA5B7F,CAAC;IAED,IAAc,GAAG;QACf,OAAO,gBAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,KAAK,GAAG;QACZ,OAAO,IAAI,QAAQ,CAAC,gBAAM,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,OAAO;QACT,OAAO,iBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACrD,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9C,CAAC;IAED,OAAO,CAAC,EAAY;QAClB,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAM,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,QAAQ,CAAC,EAAY;QACnB,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,gBAAM,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACjD,CAAC;IAMD,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;IAC1B,CAAC;IAED,QAAQ,CAAC,UAA6B,OAAO,EAAE,UAAsC,EAAE;QACrF,OAAO,IAAI,CAAC,MAAM,EAAE,EAAE,kBAAkB,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;IACnE,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACtD,CAAC;CACF;AA5CD,4BA4CC"}

package/dist/utils/Promise.d.ts

@@ -1,3 +1,4 @@
 import { ErrorOrigin } from '../types';
 export declare const resolve: <S = unknown>(subject: S | PromiseLike<S>) => Promise<S>;
 export declare const reject: <S = never>(e: ErrorOrigin) => Promise<S>;
+export declare const tuple: <T>(...values: (T | PromiseLike<T>)[]) => Promise<T[]>;

package/dist/utils/Promise.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reject = exports.resolve = void 0;
+exports.tuple = exports.reject = exports.resolve = void 0;
+const types_1 = require("../types");
 const resolve = (subject) => Promise.resolve(subject);
 exports.resolve = resolve;
 const reject = (e) => Promise.reject(e);
 exports.reject = reject;
+const tuple = (...values) => Promise.all(types_1.toArray(values));
+exports.tuple = tuple;
 //# sourceMappingURL=Promise.js.map

package/dist/utils/Promise.js.map

@@ -1 +1 @@
-{"version":3,"file":"Promise.js","sourceRoot":"","sources":["../../src/utils/Promise.ts"],"names":[],"mappings":";;;AAEO,MAAM,OAAO,GAAG,CAAc,OAA2B,EAAc,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AAA7F,QAAA,OAAO,WAAsF;AACnG,MAAM,MAAM,GAAG,CAAY,CAAc,EAAc,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAAtE,QAAA,MAAM,UAAgE"}
+{"version":3,"file":"Promise.js","sourceRoot":"","sources":["../../src/utils/Promise.ts"],"names":[],"mappings":";;;AAAA,oCAAgD;AAEzC,MAAM,OAAO,GAAG,CAAc,OAA2B,EAAc,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AAA7F,QAAA,OAAO,WAAsF;AACnG,MAAM,MAAM,GAAG,CAAY,CAAc,EAAc,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAAtE,QAAA,MAAM,UAAgE;AAC5E,MAAM,KAAK,GAAG,CAAI,GAAG,MAA8B,EAAgB,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,eAAO,CAAC,MAAM,CAAC,CAAC,CAAC;AAA7F,QAAA,KAAK,SAAwF"}

package/package.json

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

package/src/domain/values/DateTime.ts

@@ -3,30 +3,38 @@ import moment, { Moment } from 'moment';
 import { ifDefined } from '../../utils';
 
 export class DateTime extends Value<string | undefined> {
-  constructor(value: string | number | Date) {
+  constructor(value?: string | number | Date) {
     super(ifDefined(value, moment.utc(value, true).toISOString()));
   }
 
+  protected get utc(): Moment {
+    return moment.utc(this.value);
+  }
+
   static get now(): DateTime {
     return new DateTime(moment.utc().toISOString());
   }
 
   get isValid(): boolean {
-    return isDefined(this.value) && this.moment.isValid();
+    return isDefined(this.value) && this.utc.isValid();
   }
 
   get fromNow(): string {
-    return this.value ? this.moment.fromNow() : '';
+    return this.value ? this.utc.fromNow() : '';
   }
 
-  protected get moment(): Moment {
-    return moment.utc(this.value, true);
+  isAfter(dt: DateTime): boolean {
+    return this.utc.isAfter(moment.utc(dt.value));
   }
 
-  isAfter(dt: DateTime): boolean {
-    return this.moment.isAfter(dt.moment);
+  isBefore(dt: DateTime): boolean {
+    return this.utc.isBefore(moment.utc(dt.value));
   }
 
+  add = (n: number): DateTime => new DateTime(this.utc.add(n, 'days').toISOString());
+
+  subtract = (n: number): DateTime => new DateTime(this.utc.subtract(n, 'days').toISOString());
+
   toString(): string {
     return this.value ?? '';
   }
@@ -36,6 +44,6 @@ export class DateTime extends Value<string | undefined> {
   }
 
   toDate(): Date | undefined {
-    return this.isValid ? this.moment.toDate() : undefined;
+    return this.isValid ? this.utc.toDate() : undefined;
   }
 }

package/src/utils/Promise.ts

@@ -1,4 +1,6 @@
-import { ErrorOrigin } from '../types';
+import { ErrorOrigin, toArray } from '../types';
 
 export const resolve = <S = unknown>(subject: S | PromiseLike<S>): Promise<S> => Promise.resolve(subject);
 export const reject = <S = never>(e: ErrorOrigin): Promise<S> => Promise.reject(e);
+export const tuple = <T>(...values: (T | PromiseLike<T>)[]): Promise<T[]> => Promise.all(toArray(values));
+