miolo-model 3.0.0-beta.173 → 3.0.0-beta.174

package/package.json

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

package/src/MioloArray.mjs

@@ -34,7 +34,7 @@ export default class MioloArray extends CacheMixin(Array) {
   }
 
   getData() {
-    return this.get_data()
+    return [...this].map((i) => i.getData())
   }
 
   find_index_by_field(field, value) {

package/src/MioloModel.mjs

@@ -37,7 +37,15 @@ export default class MioloModel extends CacheMixin() {
   }
 
   getExtraData() {
-    return this.get_extra_data()
+    const data = {}
+    for (const [key, value] of Object.entries(this)) {
+      if (value instanceof MioloModel || value instanceof MioloArray) {
+        data[key] = value.getData()
+      } else if (Array.isArray(value) && value.every((v) => v instanceof MioloModel)) {
+        data[key] = value.map((v) => v.getData())
+      }
+    }
+    return data
   }
 
   get_data() {
@@ -49,7 +57,11 @@ export default class MioloModel extends CacheMixin() {
   }
 
   getData() {
-    return this.get_data()
+    const extra = this.getExtraData() || {}
+    return {
+      ...this.data,
+      ...extra
+    }
   }
 
   update(changes) {