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

package/package.json

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

package/src/MioloArray.mjs

@@ -33,7 +33,9 @@ export default class MioloArray extends CacheMixin(Array) {
     return [...this].map((i) => i.get_data())
   }
 
-  getData = this.get_data
+  getData() {
+    return [...this].map((i) => i.getData())
+  }
 
   find_index_by_field(field, value) {
     if (this.length >= 0) {
@@ -48,7 +50,9 @@ export default class MioloArray extends CacheMixin(Array) {
     return -1
   }
 
-  findIndexByField = this.find_index_by_field
+  findIndexByField(field, value) {
+    return this.find_index_by_field(field, value)
+  }
 
   find_by_field(field, value) {
     if (this.length >= 0) {
@@ -63,13 +67,17 @@ export default class MioloArray extends CacheMixin(Array) {
     return undefined
   }
 
-  findByField = this.find_by_field
+  findByField(field, value) {
+    return this.find_by_field(field, value)
+  }
 
   find_by_id(id) {
     return this.find_by_field("id", id)
   }
 
-  findById = this.find_by_id
+  findById(id) {
+    return this.find_by_id(id)
+  }
 
   remove_by_field(field, value) {
     const fidx = this.find_index_by_field(field, value)
@@ -78,7 +86,9 @@ export default class MioloArray extends CacheMixin(Array) {
     }
   }
 
-  removeByField = this.remove_by_field
+  removeByField(field, value) {
+    return this.remove_by_field(field, value)
+  }
 
   push(data) {
     const item =

package/src/MioloModel.mjs

@@ -36,7 +36,17 @@ export default class MioloModel extends CacheMixin() {
     return data
   }
 
-  getExtraData = this.get_extra_data
+  getExtraData() {
+    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() {
     const extra = this.get_extra_data() || {}
@@ -46,7 +56,13 @@ export default class MioloModel extends CacheMixin() {
     }
   }
 
-  getData = this.get_data
+  getData() {
+    const extra = this.getExtraData() || {}
+    return {
+      ...this.data,
+      ...extra
+    }
+  }
 
   update(changes) {
     if (this.data === undefined) {