@thisisagile/easy 8.11.0 → 8.14.0

package/dist/domain/enums/UnitOfWeight.d.ts

@@ -0,0 +1,8 @@
+import { Enum } from '../../types';
+export declare class UnitOfWeight extends Enum {
+    readonly gMultiplier: number;
+    static readonly MG: UnitOfWeight;
+    static readonly G: UnitOfWeight;
+    static readonly KG: UnitOfWeight;
+    constructor(name: string, id: string, gMultiplier: number);
+}

package/dist/domain/enums/UnitOfWeight.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnitOfWeight = void 0;
+const types_1 = require("../../types");
+class UnitOfWeight extends types_1.Enum {
+    constructor(name, id, gMultiplier) {
+        super(name, id);
+        this.gMultiplier = gMultiplier;
+    }
+}
+exports.UnitOfWeight = UnitOfWeight;
+UnitOfWeight.MG = new UnitOfWeight('MilliGram', 'mg', 0.001);
+UnitOfWeight.G = new UnitOfWeight('Gram', 'g', 1);
+UnitOfWeight.KG = new UnitOfWeight('Kilogram', 'kg', 1000);
+//# sourceMappingURL=UnitOfWeight.js.map

package/dist/domain/enums/UnitOfWeight.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UnitOfWeight.js","sourceRoot":"","sources":["../../../src/domain/enums/UnitOfWeight.ts"],"names":[],"mappings":";;;AAAA,uCAAmC;AAEnC,MAAa,YAAa,SAAQ,YAAI;IAKpC,YAAY,IAAY,EAAE,EAAU,EAAW,WAAmB;QAChE,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAD6B,gBAAW,GAAX,WAAW,CAAQ;IAElE,CAAC;;AAPH,oCAQC;AAPiB,eAAE,GAAG,IAAI,YAAY,CAAC,WAAW,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;AAChD,cAAC,GAAG,IAAI,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;AACrC,eAAE,GAAG,IAAI,YAAY,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC"}

package/dist/domain/enums/index.d.ts

@@ -3,3 +3,4 @@ export * from './Currency';
 export * from './Environment';
 export * from './Locale';
 export * from './UnitOfMeasurement';
+export * from './UnitOfWeight';

package/dist/domain/enums/index.js

@@ -15,4 +15,5 @@ __exportStar(require("./Currency"), exports);
 __exportStar(require("./Environment"), exports);
 __exportStar(require("./Locale"), exports);
 __exportStar(require("./UnitOfMeasurement"), exports);
+__exportStar(require("./UnitOfWeight"), exports);
 //# sourceMappingURL=index.js.map

package/dist/domain/enums/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/domain/enums/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA0B;AAC1B,6CAA2B;AAC3B,gDAA8B;AAC9B,2CAAyB;AACzB,sDAAoC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/domain/enums/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA0B;AAC1B,6CAA2B;AAC3B,gDAA8B;AAC9B,2CAAyB;AACzB,sDAAoC;AACpC,iDAA+B"}

package/dist/domain/structs/Address.d.ts

@@ -4,7 +4,7 @@ export declare class Address extends Struct {
     readonly street: string;
     readonly houseNumber: string;
     readonly extension: string;
-    readonly postalCode: string;
+    readonly postalCode: import("../values").PostalCode;
     readonly city: string;
     readonly country: Country;
     toString(): string;

package/dist/domain/structs/Address.js

@@ -14,13 +14,14 @@ const types_1 = require("../../types");
 const Struct_1 = require("../Struct");
 const validation_1 = require("../../validation");
 const enums_1 = require("../enums");
+const values_1 = require("../values");
 class Address extends Struct_1.Struct {
     constructor() {
         super(...arguments);
         this.street = this.state.street;
         this.houseNumber = this.state.houseNumber;
         this.extension = this.state.extension;
-        this.postalCode = this.state.postalCode;
+        this.postalCode = (0, values_1.postalCode)(this.state.postalCode, this.state.country);
         this.city = this.state.city;
         this.country = enums_1.Country.byId(this.state.country);
     }
@@ -28,7 +29,7 @@ class Address extends Struct_1.Struct {
         return (0, types_1.text)(this.street, '')
             .add(this.houseNumber, ' ')
             .add(this.extension, ' ')
-            .add(this.postalCode, ', ')
+            .add((0, types_1.isNotEmpty)(this.postalCode?.value) ? this.postalCode : undefined, ', ')
             .add(this.city, ' ')
             .add(this.country?.name, ' ')
             .toString();
@@ -43,8 +44,8 @@ __decorate([
     __metadata("design:type", String)
 ], Address.prototype, "houseNumber", void 0);
 __decorate([
-    (0, validation_1.required)(),
-    __metadata("design:type", String)
+    (0, validation_1.valid)(),
+    __metadata("design:type", Object)
 ], Address.prototype, "postalCode", void 0);
 __decorate([
     (0, validation_1.required)(),

package/dist/domain/structs/Address.js.map

@@ -1 +1 @@
-{"version":3,"file":"Address.js","sourceRoot":"","sources":["../../../src/domain/structs/Address.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAA4C;AAC5C,sCAAmC;AACnC,iDAA4C;AAC5C,oCAAmC;AAEnC,MAAa,OAAQ,SAAQ,eAAM;IAAnC;;QACuB,WAAM,GAAW,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;QACnC,gBAAW,GAAW,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;QACzD,cAAS,GAAW,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;QAC7B,eAAU,GAAW,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;QAC3C,SAAI,GAAW,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QAC/B,YAAO,GAAY,eAAO,CAAC,IAAI,CAAU,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAWpF,CAAC;IATC,QAAQ;QACN,OAAO,IAAA,YAAI,EAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;aACzB,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC;aAC1B,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC;aACxB,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC;aAC1B,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC;aACnB,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC;aAC5B,QAAQ,EAAE,CAAC;IAChB,CAAC;CACF;AAhBa;IAAX,IAAA,qBAAQ,GAAE;;uCAA6C;AAC5C;IAAX,IAAA,qBAAQ,GAAE;;4CAAuD;AAEtD;IAAX,IAAA,qBAAQ,GAAE;;2CAAqD;AACpD;IAAX,IAAA,qBAAQ,GAAE;;qCAAyC;AACxC;IAAX,IAAA,qBAAQ,GAAE;8BAAmB,eAAO;wCAA6C;AANpF,0BAiBC;AAEM,MAAM,SAAS,GAAG,CAAC,CAAW,EAAgB,EAAE;IACrD,OAAO,CAAC,IAAA,eAAO,EAAC,CAAC,CAAC,IAAI,CAAC,YAAY,OAAO,CAAC;AAC7C,CAAC,CAAC;AAFW,QAAA,SAAS,aAEpB"}
+{"version":3,"file":"Address.js","sourceRoot":"","sources":["../../../src/domain/structs/Address.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAwD;AACxD,sCAAmC;AACnC,iDAAmD;AACnD,oCAAmC;AACnC,sCAAuC;AAEvC,MAAa,OAAQ,SAAQ,eAAM;IAAnC;;QACuB,WAAM,GAAW,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;QACnC,gBAAW,GAAW,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;QACzD,cAAS,GAAW,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;QAChC,eAAU,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAChE,SAAI,GAAW,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QAC/B,YAAO,GAAY,eAAO,CAAC,IAAI,CAAU,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAWpF,CAAC;IATC,QAAQ;QACN,OAAO,IAAA,YAAI,EAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;aACzB,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC;aAC1B,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC;aACxB,GAAG,CAAC,IAAA,kBAAU,EAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC;aAC3E,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC;aACnB,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC;aAC5B,QAAQ,EAAE,CAAC;IAChB,CAAC;CACF;AAhBa;IAAX,IAAA,qBAAQ,GAAE;;uCAA6C;AAC5C;IAAX,IAAA,qBAAQ,GAAE;;4CAAuD;AAEzD;IAAR,IAAA,kBAAK,GAAE;;2CAA6E;AACzE;IAAX,IAAA,qBAAQ,GAAE;;qCAAyC;AACxC;IAAX,IAAA,qBAAQ,GAAE;8BAAmB,eAAO;wCAA6C;AANpF,0BAiBC;AAEM,MAAM,SAAS,GAAG,CAAC,CAAW,EAAgB,EAAE;IACrD,OAAO,CAAC,IAAA,eAAO,EAAC,CAAC,CAAC,IAAI,CAAC,YAAY,OAAO,CAAC;AAC7C,CAAC,CAAC;AAFW,QAAA,SAAS,aAEpB"}

package/dist/domain/structs/Weight.d.ts

@@ -0,0 +1,6 @@
+import { UnitOfWeight } from '../enums';
+import { Struct } from '../Struct';
+export declare class Weight extends Struct {
+    readonly value: number;
+    readonly UOW: UnitOfWeight;
+}

package/dist/domain/structs/Weight.js

@@ -0,0 +1,28 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Weight = void 0;
+const enums_1 = require("../enums");
+const validation_1 = require("../../validation");
+const Struct_1 = require("../Struct");
+class Weight extends Struct_1.Struct {
+    constructor() {
+        super(...arguments);
+        this.value = this.state.value;
+        this.UOW = enums_1.UnitOfWeight.byId(this.state.UOW, enums_1.UnitOfWeight.G);
+    }
+}
+__decorate([
+    (0, validation_1.required)(),
+    __metadata("design:type", Number)
+], Weight.prototype, "value", void 0);
+exports.Weight = Weight;
+//# sourceMappingURL=Weight.js.map

package/dist/domain/structs/Weight.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Weight.js","sourceRoot":"","sources":["../../../src/domain/structs/Weight.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAwC;AACxC,iDAA4C;AAC5C,sCAAmC;AAEnC,MAAa,MAAO,SAAQ,eAAM;IAAlC;;QACuB,UAAK,GAAW,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QAC7C,QAAG,GAAiB,oBAAY,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,oBAAY,CAAC,CAAC,CAAC,CAAC;IACjF,CAAC;CAAA;AAFa;IAAX,IAAA,qBAAQ,GAAE;;qCAA2C;AADxD,wBAGC"}

package/dist/domain/structs/index.d.ts

@@ -1,3 +1,4 @@
 export * from './Address';
 export * from './Dimension';
 export * from './Money';
+export * from './Weight';

package/dist/domain/structs/index.js

@@ -13,4 +13,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Address"), exports);
 __exportStar(require("./Dimension"), exports);
 __exportStar(require("./Money"), exports);
+__exportStar(require("./Weight"), exports);
 //# sourceMappingURL=index.js.map

package/dist/domain/structs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/domain/structs/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA0B;AAC1B,8CAA4B;AAC5B,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/domain/structs/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA0B;AAC1B,8CAA4B;AAC5B,0CAAwB;AACxB,2CAAyB"}

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

@@ -1,11 +1,15 @@
 import { Value } from '../../types';
 import { Moment } from 'moment';
+import 'moment/min/locales';
 export declare type DateTimeUnit = 'year' | 'years' | 'y' | 'quarter' | 'quarters' | 'Q' | 'month' | 'months' | 'M' | 'week' | 'weeks' | 'w' | 'day' | 'days' | 'd' | 'hour' | 'hours' | 'h' | 'minute' | 'minutes' | 'm' | 'second' | 'seconds' | 's' | 'millisecond' | 'milliseconds' | 'ms';
 export declare class DateTime extends Value<string | undefined> {
     constructor(value?: string | number | Date, format?: string);
     static get now(): DateTime;
     get isValid(): boolean;
     get fromNow(): string;
+    from(date?: DateTime): string;
+    from(locales?: string | string[]): string;
+    from(date?: DateTime, locales?: string | string[]): string;
     protected get utc(): Moment;
     isAfter(dt: DateTime): boolean;
     isBefore(dt: DateTime): boolean;

package/dist/domain/values/DateTime.js

@@ -7,6 +7,7 @@ exports.DateTime = void 0;
 const types_1 = require("../../types");
 const moment_1 = __importDefault(require("moment"));
 const utils_1 = require("../../utils");
+require("moment/min/locales");
 class DateTime extends types_1.Value {
     constructor(value, format) {
         super((0, types_1.tryTo)(value).is.defined().map(v => moment_1.default.utc(v, format, true).toISOString()).orElse());
@@ -25,7 +26,12 @@ class DateTime extends types_1.Value {
         return (0, types_1.isDefined)(this.value) && this.utc.isValid();
     }
     get fromNow() {
-        return this.value ? this.utc.fromNow() : '';
+        return this.from();
+    }
+    from(param, other) {
+        const date = (0, types_1.isA)(param) ? param : undefined;
+        const locales = (0, types_1.isString)(param) || (0, types_1.isArray)(param) ? param : ((0, types_1.isString)(other) || (0, types_1.isArray)(other) ? other : 'en');
+        return (0, types_1.isDefined)(date) ? this.utc.locale(locales).from(date.utc) : this.utc.locale(locales).fromNow();
     }
     get utc() {
         return moment_1.default.utc(this.value);

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

@@ -1 +1 @@
-{"version":3,"file":"DateTime.js","sourceRoot":"","sources":["../../../src/domain/values/DateTime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DateTime.js","sourceRoot":"","sources":["../../../src/domain/values/DateTime.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,8 @@
+import { Id, Value } from '../../types';
+import { Country } from '../enums';
+export declare class PostalCode extends Value {
+    readonly country: Country | Id;
+    constructor(postalCode?: unknown, country?: Country | Id);
+    get isValid(): boolean;
+}
+export declare const postalCode: (postalCode?: unknown, country?: Country | Id) => PostalCode;

package/dist/domain/values/PostalCode.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.postalCode = exports.PostalCode = void 0;
+const types_1 = require("../../types");
+const enums_1 = require("../enums");
+const validator_1 = __importDefault(require("validator"));
+class PostalCode extends types_1.Value {
+    constructor(postalCode, country = enums_1.Country.NL) {
+        super((0, types_1.text)(postalCode).replace(' ', '').toString());
+        this.country = country;
+    }
+    get isValid() {
+        return validator_1.default.isPostalCode(this.value, (this.country instanceof enums_1.Country ? this.country.id : (0, types_1.text)(this.country).upper));
+    }
+}
+exports.PostalCode = PostalCode;
+const postalCode = (postalCode, country = enums_1.Country.NL) => new PostalCode(postalCode, country);
+exports.postalCode = postalCode;
+//# sourceMappingURL=PostalCode.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"PostalCode.js","sourceRoot":"","sources":["../../../src/domain/values/PostalCode.ts"],"names":[],"mappings":";;;;;;AAAA,uCAA8C;AAC9C,oCAAmC;AACnC,0DAAkC;AAElC,MAAa,UAAW,SAAQ,aAAK;IACnC,YAAY,UAAoB,EAAW,UAAwB,eAAO,CAAC,EAAE;QAC3E,KAAK,CAAC,IAAA,YAAI,EAAC,UAAU,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QADX,YAAO,GAAP,OAAO,CAA2B;IAE7E,CAAC;IACD,IAAI,OAAO;QACT,OAAO,mBAAS,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,OAAO,YAAY,eAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAA,YAAI,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAA+B,CAAC,CAAC;IAC1J,CAAC;CACF;AAPD,gCAOC;AAEM,MAAM,UAAU,GAAG,CAAC,UAAoB,EAAE,UAAwB,eAAO,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,UAAU,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AAA/G,QAAA,UAAU,cAAqG"}

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

@@ -2,4 +2,5 @@ export * from './DateTime';
 export * from './EAN';
 export * from './Email';
 export * from './IBAN';
+export * from './PostalCode';
 export * from './Url';

package/dist/domain/values/index.js

@@ -14,5 +14,6 @@ __exportStar(require("./DateTime"), exports);
 __exportStar(require("./EAN"), exports);
 __exportStar(require("./Email"), exports);
 __exportStar(require("./IBAN"), exports);
+__exportStar(require("./PostalCode"), exports);
 __exportStar(require("./Url"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/domain/values/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA2B;AAC3B,wCAAsB;AACtB,0CAAwB;AACxB,yCAAuB;AACvB,wCAAsB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/domain/values/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA2B;AAC3B,wCAAsB;AACtB,0CAAwB;AACxB,yCAAuB;AACvB,+CAA6B;AAC7B,wCAAsB"}

package/dist/types/Enum.d.ts

@@ -14,6 +14,7 @@ export declare abstract class Enum implements Validatable {
     static byIds<T extends Enum>(ids?: Id[]): List<T>;
     static filter<E extends Enum>(p: (value: E, index: number, array: E[]) => unknown, params?: unknown): List<E>;
     equals<E extends Enum | Id>(other: E): boolean;
+    isIn<E extends Enum>(...items: E[]): boolean;
     toJSON(): JsonValue;
     toString(): string;
 }

package/dist/types/Enum.js

@@ -35,6 +35,7 @@ class Enum {
     equals(other) {
         return this.id === ((0, exports.isEnum)(other) ? other.id : other);
     }
+    isIn(...items) { return items.some(i => i.equals(this)); }
     toJSON() {
         return this.id;
     }

package/dist/types/Enum.js.map

@@ -1 +1 @@
-{"version":3,"file":"Enum.js","sourceRoot":"","sources":["../../src/types/Enum.ts"],"names":[],"mappings":";;;AAEA,+BAA6B;AAC7B,iCAA8B;AAC9B,6BAAiC;AAGjC,+BAAmC;AAEnC,MAAsB,IAAI;IACxB,YAA+B,IAAY,EAAW,KAAS,IAAI,CAAC,WAAW,EAAE,EAAW,OAAe,EAAE,CAAC,QAAQ,EAAE;QAAzF,SAAI,GAAJ,IAAI,CAAQ;QAAW,OAAE,GAAF,EAAE,CAAyB;QAAW,SAAI,GAAJ,IAAI,CAAwB;IAAG,CAAC;IAE5H,IAAI,OAAO;QACT,OAAO,IAAA,cAAS,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,GAAG;QACR,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC;aACd,MAAM,EAAK;aACX,MAAM,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,IAAA,cAAM,EAAC,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,IAAI,CAAiB,EAAM,EAAE,GAAqB;QACvD,OAAO,CACL,IAAA,WAAI,EAAC,IAAI,CAAC;aACP,MAAM,EAAK;aACX,KAAK,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,IAAA,cAAM,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,IAAA,WAAK,EAAC,GAAG,CAAC,CAClE,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAiB,GAAU;QACrC,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC;aACd,MAAM,EAAK;aACX,MAAM,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,IAAA,cAAM,EAAC,CAAC,CAAC,IAAI,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,MAAM,CAAC,MAAM,CAAiB,CAAmD,EAAE,MAAgB;QACjG,OAAO,IAAI,CAAC,GAAG,EAAK,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,CAAsB,KAAQ;QAClC,OAAO,IAAI,CAAC,EAAE,KAAK,CAAC,IAAA,cAAM,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACxD,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,EAAE,CAAC;IACjB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;IAC5B,CAAC;CACF;AA1CD,oBA0CC;AAEM,MAAM,MAAM,GAAG,CAAC,CAAW,EAAa,EAAE,CAAC,IAAA,cAAS,EAAC,CAAC,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,IAAA,UAAI,EAAO,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AAA9G,QAAA,MAAM,UAAwG"}
+{"version":3,"file":"Enum.js","sourceRoot":"","sources":["../../src/types/Enum.ts"],"names":[],"mappings":";;;AAEA,+BAA6B;AAC7B,iCAA8B;AAC9B,6BAAiC;AAGjC,+BAAmC;AAEnC,MAAsB,IAAI;IACxB,YAA+B,IAAY,EAAW,KAAS,IAAI,CAAC,WAAW,EAAE,EAAW,OAAe,EAAE,CAAC,QAAQ,EAAE;QAAzF,SAAI,GAAJ,IAAI,CAAQ;QAAW,OAAE,GAAF,EAAE,CAAyB;QAAW,SAAI,GAAJ,IAAI,CAAwB;IAAG,CAAC;IAE5H,IAAI,OAAO;QACT,OAAO,IAAA,cAAS,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,GAAG;QACR,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC;aACd,MAAM,EAAK;aACX,MAAM,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,IAAA,cAAM,EAAC,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,IAAI,CAAiB,EAAM,EAAE,GAAqB;QACvD,OAAO,CACL,IAAA,WAAI,EAAC,IAAI,CAAC;aACP,MAAM,EAAK;aACX,KAAK,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,IAAA,cAAM,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,IAAA,WAAK,EAAC,GAAG,CAAC,CAClE,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAiB,GAAU;QACrC,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC;aACd,MAAM,EAAK;aACX,MAAM,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,IAAA,cAAM,EAAC,CAAC,CAAC,IAAI,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,MAAM,CAAC,MAAM,CAAiB,CAAmD,EAAE,MAAgB;QACjG,OAAO,IAAI,CAAC,GAAG,EAAK,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,CAAsB,KAAQ;QAClC,OAAO,IAAI,CAAC,EAAE,KAAK,CAAC,IAAA,cAAM,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,CAAiB,GAAG,KAAU,IAAa,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAExF,MAAM;QACJ,OAAO,IAAI,CAAC,EAAE,CAAC;IACjB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;IAC5B,CAAC;CACF;AA5CD,oBA4CC;AAEM,MAAM,MAAM,GAAG,CAAC,CAAW,EAAa,EAAE,CAAC,IAAA,cAAS,EAAC,CAAC,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,IAAA,UAAI,EAAO,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AAA9G,QAAA,MAAM,UAAwG"}

package/package.json

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

package/src/domain/enums/UnitOfWeight.ts

@@ -0,0 +1,11 @@
+import { Enum } from '../../types';
+
+export class UnitOfWeight extends Enum {
+  static readonly MG = new UnitOfWeight('MilliGram', 'mg', 0.001);
+  static readonly G = new UnitOfWeight('Gram', 'g', 1);
+  static readonly KG = new UnitOfWeight('Kilogram', 'kg', 1000);
+
+  constructor(name: string, id: string, readonly gMultiplier: number) {
+    super(name, id);
+  }
+}

package/src/domain/enums/index.ts

@@ -3,3 +3,4 @@ export * from './Currency';
 export * from './Environment';
 export * from './Locale';
 export * from './UnitOfMeasurement';
+export * from './UnitOfWeight';

package/src/domain/structs/Address.ts

@@ -1,13 +1,14 @@
-import { isEmpty, text } from '../../types';
+import { isEmpty, isNotEmpty, text } from '../../types';
 import { Struct } from '../Struct';
-import { required } from '../../validation';
+import { required, valid } from '../../validation';
 import { Country } from '../enums';
+import { postalCode } from '../values';
 
 export class Address extends Struct {
   @required() readonly street: string = this.state.street;
   @required() readonly houseNumber: string = this.state.houseNumber;
   readonly extension: string = this.state.extension;
-  @required() readonly postalCode: string = this.state.postalCode;
+  @valid() readonly postalCode = postalCode(this.state.postalCode, this.state.country);
   @required() readonly city: string = this.state.city;
   @required() readonly country: Country = Country.byId<Country>(this.state.country);
 
@@ -15,7 +16,7 @@ export class Address extends Struct {
     return text(this.street, '')
       .add(this.houseNumber, ' ')
       .add(this.extension, ' ')
-      .add(this.postalCode, ', ')
+      .add(isNotEmpty(this.postalCode?.value) ? this.postalCode : undefined, ', ')
       .add(this.city, ' ')
       .add(this.country?.name, ' ')
       .toString();

package/src/domain/structs/Weight.ts

@@ -0,0 +1,8 @@
+import { UnitOfWeight } from '../enums';
+import { required } from '../../validation';
+import { Struct } from '../Struct';
+
+export class Weight extends Struct {
+  @required() readonly value: number = this.state.value;
+  readonly UOW: UnitOfWeight = UnitOfWeight.byId(this.state.UOW, UnitOfWeight.G);
+}

package/src/domain/structs/index.ts

@@ -1,3 +1,4 @@
 export * from './Address';
 export * from './Dimension';
 export * from './Money';
+export * from './Weight';

package/src/domain/values/DateTime.ts

@@ -1,6 +1,7 @@
-import { isDefined, tryTo, Value } from '../../types';
+import { isA, isArray, isDefined, isString, tryTo, Value } from '../../types';
 import moment, { Moment } from 'moment';
 import { ifNotEmpty } from '../../utils';
+import 'moment/min/locales';
 
 export type DateTimeUnit =
   'year' | 'years' | 'y' |
@@ -27,8 +28,20 @@ export class DateTime extends Value<string | undefined> {
     return isDefined(this.value) && this.utc.isValid();
   }
 
+  /**
+   * @deprecated Deprecated in favor for DateTime.from as that also accepts locales and another DateTime
+   */
   get fromNow(): string {
-    return this.value ? this.utc.fromNow() : '';
+    return this.from();
+  }
+
+  from(date?: DateTime): string;
+  from(locales?: string | string[]): string;
+  from(date?: DateTime, locales?: string | string[]): string;
+  from(param?: string | string[] | DateTime, other?: string | string[]): string {
+    const date: DateTime | undefined = isA<DateTime>(param) ? param : undefined;
+    const locales: string | string[] = isString(param) || isArray<string>(param) ? param : (isString(other) || isArray<string>(other) ? other : 'en');
+    return isDefined(date) ? this.utc.locale(locales).from(date.utc) : this.utc.locale(locales).fromNow();
   }
 
   protected get utc(): Moment {

package/src/domain/values/PostalCode.ts

@@ -0,0 +1,14 @@
+import { Id, text, Value } from '../../types';
+import { Country } from '../enums';
+import validator from 'validator';
+
+export class PostalCode extends Value {
+  constructor(postalCode?: unknown, readonly country: Country | Id = Country.NL) {
+    super(text(postalCode).replace(' ', '').toString());
+  }
+  get isValid(): boolean {
+    return validator.isPostalCode(this.value, (this.country instanceof Country ? this.country.id : text(this.country).upper) as validator.PostalCodeLocale);
+  }
+}
+
+export const postalCode = (postalCode?: unknown, country: Country | Id = Country.NL) => new PostalCode(postalCode, country);

package/src/domain/values/index.ts

@@ -2,4 +2,5 @@ export * from './DateTime';
 export * from './EAN';
 export * from './Email';
 export * from './IBAN';
+export * from './PostalCode';
 export * from './Url';

package/src/types/Enum.ts

@@ -42,6 +42,8 @@ export abstract class Enum implements Validatable {
     return this.id === (isEnum(other) ? other.id : other);
   }
 
+  isIn<E extends Enum>(...items: E[]): boolean { return items.some(i => i.equals(this)); }
+
   toJSON(): JsonValue {
     return this.id;
   }