@live-change/framework 0.8.114 → 0.8.116

package/lib/definition/ModelDefinition.js

@@ -1,5 +1,5 @@
 import PropertyDefinition from "./PropertyDefinition.js"
-import { crudChanges } from "../utils.js"
+import { crudChanges, definitionToJSON } from "../utils.js"
 
 class ModelDefinition {
 
@@ -44,8 +44,9 @@ class ModelDefinition {
         }
       }
     }
+    const fixed = definitionToJSON(this, true)
     return {
-      ... this,
+      ...fixed,
       properties,
       indexes
     }
@@ -62,12 +63,12 @@ class ModelDefinition {
         "Index", "index", { model: this.name, storage: this.storage }))
     if(oldModel.search && !this.search) changes.push({ operation: "searchDisabled", model: this.name })
     if(!oldModel.search && this.search) changes.push({ operation: "searchEnabled", model: this.name })
-    if(oldModel.search && this.search && JSON.stringify(oldModel.search) != JSON.stringify(this.search))
+    if(oldModel.search && this.search && JSON.stringify(oldModel.search) !== JSON.stringify(this.search))
       changes.push({ operation: "searchUpdated", model: this.name })
 
     const oldStorage = oldModel.storage || {}
     const newStorage = this.storage || {}
-    if(JSON.stringify(oldStorage) != JSON.stringify(newStorage)) {
+    if(JSON.stringify(oldStorage) !== JSON.stringify(newStorage)) {
       changes.push({ operation: "storageChanged", model: this.name, oldStorage, storage: newStorage })
       for(let indexName in this.indexes) {
         changes.push({ operation: "indexStorageChanged", index: indexName, oldStorage, storage: newStorage })

package/lib/utils.js

@@ -28,6 +28,21 @@ function toJSON(data) {
   }))
 }
 
+export function definitionToJSON(definition, ignoreRoot = false) {
+  if(!definition) return definition
+  if(!ignoreRoot) {
+    if(typeof definition.getTypeName === 'function')
+      return definition.getTypeName()
+    if(typeof definition.toJSON === 'function')
+      return definition.toJSON()
+  }
+  if(typeof definition !== 'object') return definition
+  if(Array.isArray(definition)) return definition.map(definitionToJSON)
+  return Object.fromEntries(Object.entries(definition).map(
+    ([key, value]) => [key, definitionToJSON(value)])
+  )
+}
+
 function setDifference(setA, setB) {
   var difference = new Set(setA)
   for (let elem of setB) difference.delete(elem)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.8.114",
+  "version": "0.8.116",
   "description": "Live Change Framework - ultimate solution for real time mobile/web apps",
   "main": "index.js",
   "scripts": {
@@ -22,8 +22,8 @@
   },
   "homepage": "https://github.com/live-change/live-change-stack",
   "devDependencies": {
-    "@live-change/dao": "^0.8.114",
-    "@live-change/uid": "^0.8.114"
+    "@live-change/dao": "^0.8.116",
+    "@live-change/uid": "^0.8.116"
   },
-  "gitHead": "1a5a437aae382d766c2806a11f805370ee8cc40a"
+  "gitHead": "32131af3707ec744c9d314035676d09512483799"
 }