miolo-model 3.0.0-beta.165 → 3.0.0-beta.167

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miolo-model",
-  "version": "3.0.0-beta.165",
+  "version": "3.0.0-beta.167",
   "description": "Data models for miolo world",
   "author": "Donato Lorenzo <donato@afialapis.com>",
   "contributors": [

package/src/MioloModel.mjs

@@ -1,4 +1,5 @@
 import CacheMixin from "./CacheMixin.mjs"
+import MioloArray from "./MioloArray.mjs"
 
 export default class MioloModel extends CacheMixin() {
   constructor(data) {
@@ -25,7 +26,7 @@ export default class MioloModel extends CacheMixin() {
   get_extra_data() {
     const data = {}
     for (const [key, value] of Object.entries(this)) {
-      if (value instanceof MioloModel) {
+      if (value instanceof MioloModel || value instanceof MioloArray) {
         data[key] = value.get_data()
       } else if (Array.isArray(value) && value.every((v) => v instanceof MioloModel)) {
         data[key] = value.map((v) => v.get_data())
@@ -55,4 +56,15 @@ export default class MioloModel extends CacheMixin() {
       ...changes
     }
   }
+
+  merge(model) {
+    this.update(model.getData())
+    for (const [key, value] of Object.entries(model)) {
+      if (value instanceof MioloModel || value instanceof MioloArray) {
+        this[key] = value
+      } else if (Array.isArray(value) && value.every((v) => v instanceof MioloModel)) {
+        this[key] = value
+      }
+    }
+  }
 }

package/src/index.mjs

@@ -1,4 +1,4 @@
 import MioloArray from "./MioloArray.mjs"
 import MioloModel from "./MioloModel.mjs"
 
-export { MioloModel, MioloArray }
+export { MioloArray, MioloModel }