@thisisagile/easy 8.12.0 → 8.13.0

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy",
-  "version": "8.12.0",
+  "version": "8.13.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.12.0",
+    "@thisisagile/easy-test": "8.13.0",
     "@types/form-urlencoded": "^4.4.0",
     "@types/jsonwebtoken": "^8.5.6",
     "@types/validator": "^13.7.0"

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/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';