@thisisagile/easy 8.42.2 → 8.42.3

package/dist/domain/Child.js.map

@@ -1 +1 @@
-{"version":3,"file":"Child.js","sourceRoot":"","sources":["../../src/domain/Child.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAkC;AAClC,oCAAgD;AAChD,8CAAyC;AAEzC,MAAsB,KAAM,SAAQ,eAAM;IAA1C;;QACuB,OAAE,GAAO,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,IAAA,YAAI,GAAE,CAAC;QAC5C,UAAK,GAAG,CAAC,CAAU,EAAQ,EAAE,CAAC,YAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IAE/E,CAAC;CAAA;AAHa;IAAX,IAAA,qBAAQ,GAAE;;iCAA2C;AADxD,sBAIC"}
+{"version":3,"file":"Child.js","sourceRoot":"","sources":["../../src/domain/Child.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAkC;AAClC,oCAAgD;AAChD,8CAAyC;AAEzC,MAAsB,KAAM,SAAQ,eAAM;IAA1C;;QACuB,OAAE,GAAO,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,IAAA,YAAI,GAAE,CAAC;QAE5C,UAAK,GAAG,CAAC,CAAU,EAAQ,EAAE,CAAC,YAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IAC/E,CAAC;CAAA;AAHa;IAAX,IAAA,qBAAQ,GAAE;;iCAA2C;AADxD,sBAIC"}

package/dist/domain/Entity.js

@@ -20,7 +20,11 @@ class Entity extends Struct_1.Struct {
         this.id = this.state.id ?? (0, types_1.toId)();
         this.created = new Audit_1.Audit(this.state.created);
         this.lastModified = new Audit_1.Audit(this.state.lastModified);
-        this.merge = (a) => types_1.json.merge(this, a, { id: this.id, created: this.created.toJSON(), lastModified: new Audit_1.Audit().toJSON() });
+        this.merge = (a) => types_1.json.merge(this, a, {
+            id: this.id,
+            created: this.created,
+            lastModified: new Audit_1.Audit(),
+        });
     }
 }
 __decorate([

package/dist/domain/Entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"Entity.js","sourceRoot":"","sources":["../../src/domain/Entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAkC;AAClC,oCAAgD;AAChD,8CAAyC;AACzC,mCAAgC;AAEhC,MAAsB,MAAO,SAAQ,eAAM;IAA3C;;QACuB,OAAE,GAAO,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,IAAA,YAAI,GAAE,CAAC;QACjC,YAAO,GAAU,IAAI,aAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC/C,iBAAY,GAAU,IAAI,aAAK,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAEpE,UAAK,GAAG,CAAC,CAAU,EAAQ,EAAE,CACrC,YAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,YAAY,EAAE,IAAI,aAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAE7G,CAAC;CAAA;AAPa;IAAX,IAAA,qBAAQ,GAAE;;kCAA2C;AAC1C;IAAX,IAAA,qBAAQ,GAAE;8BAAmB,aAAK;uCAAiC;AACxD;IAAX,IAAA,qBAAQ,GAAE;8BAAwB,aAAK;4CAAsC;AAHhF,wBAQC"}
+{"version":3,"file":"Entity.js","sourceRoot":"","sources":["../../src/domain/Entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAkC;AAClC,oCAAgD;AAChD,8CAAyC;AACzC,mCAAgC;AAEhC,MAAsB,MAAO,SAAQ,eAAM;IAA3C;;QACuB,OAAE,GAAO,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,IAAA,YAAI,GAAE,CAAC;QACjC,YAAO,GAAU,IAAI,aAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC/C,iBAAY,GAAU,IAAI,aAAK,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAEpE,UAAK,GAAG,CAAC,CAAU,EAAQ,EAAE,CAAC,YAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE;YAC1D,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,YAAY,EAAE,IAAI,aAAK,EAAE;SAC1B,CAAC,CAAC;IACL,CAAC;CAAA;AATa;IAAX,IAAA,qBAAQ,GAAE;;kCAA2C;AAC1C;IAAX,IAAA,qBAAQ,GAAE;8BAAmB,aAAK;uCAAiC;AACxD;IAAX,IAAA,qBAAQ,GAAE;8BAAwB,aAAK;4CAAsC;AAHhF,wBAUC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy",
-  "version": "8.42.2",
+  "version": "8.42.3",
   "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.42.2",
+    "@thisisagile/easy-test": "8.42.3",
     "@types/form-urlencoded": "^4.4.0",
     "@types/jsonwebtoken": "^8.5.8",
     "@types/validator": "^13.7.1"

package/src/domain/Child.ts

@@ -4,6 +4,6 @@ import { required } from '../validation';
 
 export abstract class Child extends Struct {
   @required() readonly id: Id = this.state.id ?? toId();
+
   protected merge = (a: unknown): Json => json.merge(this, a, { id: this.id });
-  // protected merge = (a: unknown): Json => json.parse({ ...this, ...{ a as any }, id: this.id });
 }

package/src/domain/Entity.ts

@@ -8,7 +8,9 @@ export abstract class Entity extends Struct {
   @required() readonly created: Audit = new Audit(this.state.created);
   @required() readonly lastModified: Audit = new Audit(this.state.lastModified);
 
-  protected merge = (a: unknown): Json =>
-    json.merge(this, a, { id: this.id, created: this.created.toJSON(), lastModified: new Audit().toJSON() });
-
+  protected merge = (a: unknown): Json => json.merge(this, a, {
+    id: this.id,
+    created: this.created,
+    lastModified: new Audit(),
+  });
 }