@thisisagile/easy 8.42.1 → 8.42.2

package/dist/domain/Child.d.ts

@@ -2,5 +2,5 @@ import { Struct } from './Struct';
 import { Id, Json } from '../types';
 export declare abstract class Child extends Struct {
     readonly id: Id;
-    protected merge: (a: Json) => Json;
+    protected merge: (a: unknown) => Json;
 }

package/dist/domain/Child.js

@@ -17,7 +17,7 @@ class Child extends Struct_1.Struct {
     constructor() {
         super(...arguments);
         this.id = this.state.id ?? (0, types_1.toId)();
-        this.merge = (a) => types_1.json.parse({ ...this, ...a, id: this.id });
+        this.merge = (a) => types_1.json.merge(this, a, { id: this.id });
     }
 }
 __decorate([

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,CAAO,EAAQ,EAAE,CAAC,YAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IAClF,CAAC;CAAA;AAFa;IAAX,IAAA,qBAAQ,GAAE;;iCAA2C;AADxD,sBAGC"}
+{"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"}

package/dist/domain/Entity.d.ts

@@ -5,5 +5,5 @@ export declare abstract class Entity extends Struct {
     readonly id: Id;
     readonly created: Audit;
     readonly lastModified: Audit;
-    protected merge: (a: Json) => Json;
+    protected merge: (a: unknown) => Json;
 }

package/dist/domain/Entity.js

@@ -20,13 +20,7 @@ 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.parse({
-            ...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.toJSON(), lastModified: new Audit_1.Audit().toJSON() });
     }
 }
 __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,CAAO,EAAQ,EAAE,CAClC,YAAI,CAAC,KAAK,CAAC;YACT,GAAG,IAAI;YACP,GAAG,CAAC;YACJ,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YAC9B,YAAY,EAAE,IAAI,aAAK,EAAE,CAAC,MAAM,EAAE;SACnC,CAAC,CAAC;IACP,CAAC;CAAA;AAZa;IAAX,IAAA,qBAAQ,GAAE;;kCAA2C;AAC1C;IAAX,IAAA,qBAAQ,GAAE;8BAAmB,aAAK;uCAAiC;AACxD;IAAX,IAAA,qBAAQ,GAAE;8BAAwB,aAAK;4CAAsC;AAHhF,wBAaC"}
+{"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"}

package/dist/domain/Struct.d.ts

@@ -6,5 +6,5 @@ export declare abstract class Struct implements Validatable {
     toJSON(): Json;
     toString(): string;
     update: (_add: Json) => Struct;
-    protected merge: (a: Json) => Json;
+    protected merge: (a: unknown) => Json;
 }

package/dist/domain/Struct.js.map

@@ -1 +1 @@
-{"version":3,"file":"Struct.js","sourceRoot":"","sources":["../../src/domain/Struct.ts"],"names":[],"mappings":";;;AAAA,oCAAmD;AACnD,8CAAyC;AAEzC,MAAsB,MAAM;IAC1B,YAA+B,QAAa,EAAE;QAAf,UAAK,GAAL,KAAK,CAAU;QAc9C,WAAM,GAAG,CAAC,IAAU,EAAU,EAAE,CAAC,IAAI,CAAC;QAE5B,UAAK,GAAG,CAAC,CAAO,EAAQ,EAAE,CAAC,YAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAhBR,CAAC;IAElD,IAAI,OAAO;QACT,OAAO,IAAA,qBAAQ,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC;IAChC,CAAC;IAED,MAAM;QACJ,OAAO,YAAI,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;IAC/B,CAAC;CAKF;AAlBD,wBAkBC"}
+{"version":3,"file":"Struct.js","sourceRoot":"","sources":["../../src/domain/Struct.ts"],"names":[],"mappings":";;;AAAA,oCAAmD;AACnD,8CAAyC;AAEzC,MAAsB,MAAM;IAC1B,YAA+B,QAAa,EAAE;QAAf,UAAK,GAAL,KAAK,CAAU;QAc9C,WAAM,GAAG,CAAC,IAAU,EAAU,EAAE,CAAC,IAAI,CAAC;QAE5B,UAAK,GAAG,CAAC,CAAU,EAAQ,EAAE,CAAC,YAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAhBX,CAAC;IAElD,IAAI,OAAO;QACT,OAAO,IAAA,qBAAQ,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC;IAChC,CAAC;IAED,MAAM;QACJ,OAAO,YAAI,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;IAC/B,CAAC;CAKF;AAlBD,wBAkBC"}

package/package.json

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

package/src/domain/Child.ts

@@ -4,5 +4,6 @@ import { required } from '../validation';
 
 export abstract class Child extends Struct {
   @required() readonly id: Id = this.state.id ?? toId();
-  protected merge = (a: Json): Json => json.parse({ ...this, ...a, id: this.id });
+  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,12 +8,7 @@ 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: Json): Json =>
-    json.parse({
-      ...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.toJSON(), lastModified: new Audit().toJSON() });
+
 }

package/src/domain/Struct.ts

@@ -18,5 +18,5 @@ export abstract class Struct implements Validatable {
 
   update = (_add: Json): Struct => this;
 
-  protected merge = (a: Json): Json => json.merge(this, a);
+  protected merge = (a: unknown): Json => json.merge(this, a);
 }