@live-change/vue3-components 0.2.14 → 0.2.16

package/logic/data.js

@@ -0,0 +1,74 @@
+import { getCurrentInstance } from 'vue'
+
+export function defaultData(definition, otherSrc) {
+  if(!definition) return undefined
+  let result = definition.defaultValue || otherSrc
+  if(definition.properties) {
+    result = result || {}
+    for(let name in definition.properties) {
+      result[name] = defaultData(definition.properties[name], result?.[name])
+    }
+  } else if(definition.type == 'Array') {
+    result = result || []
+    for(let i = 0; i < result.length; i++) {
+      result[i] = defaultData(definition.of, result[i])
+    }
+  }
+  return result
+}
+
+export function validateData(definition, data, validationType = 'validation',
+                             context = undefined, propName = '', props = data) {
+  context = context || getCurrentInstance().appContext
+  //console.log("VALIDATIE DATA", definition, data, validationType, context, propName, props)
+  if(!context) throw new Error("No context")
+  const validators = context.config.globalProperties.$validators
+  const validationContext = { source: data, props, propName, definition, validators }
+  if(!definition) return undefined
+  const validations = definition[validationType]
+  //console.log("VALIDATIONS!", validations)
+  if(validations) {
+    for(const validation of validations) {
+      const validator = typeof validation == 'string'
+        ? validators[validation]({}, validationContext)
+        : validators[validation.name](validation.params, validationContext)
+      if(!validator) throw new Error(`Validator ${validation.name || validation} not found`)
+      const error = validator(data, context)
+      if(error) return error
+    }
+  }
+  if(definition.properties) {
+    const propertyErrors = {}
+    for(let name in definition.properties) {
+      const error = validateData(definition.properties[name], data?.[name], validationType, context,
+        propName ? propName + '.' + name: name, props)
+      if(error) {
+        if(error.propertyErrors) {
+          for(let internalName in error.propertyErrors) {
+            propertyErrors[name + '.' + internalName] = error.propertyErrors[internalName]
+          }
+        } else {
+          propertyErrors[name] = error
+        }
+      }
+    }
+    if(Object.keys(propertyErrors).length > 0) return { propertyErrors }
+  } else if(definition.type == 'Array') {
+    const propertyErrors = {}
+    for(let i = 0; i < data.length; i++) {
+      const error = validateData(definition.of, data[i], validationType, context,
+        propName ? propName + '.' + name : name, props)
+      const name = '' + i
+      if(error) {
+        if(error.propertyErrors) {
+          for(let internalName in error.propertyErrors) {
+            propertyErrors[name + '.' + internalName] = error.propertyErrors[internalName]
+          }
+        } else {
+          propertyErrors[name] = error
+        }
+      }
+    }
+    if(Object.keys(propertyErrors).length > 0) return { propertyErrors }
+  }
+}

package/logic/index.js

@@ -14,6 +14,9 @@ export { synchronized }
 import { synchronizedList } from "./synchronizedList.js"
 export { synchronizedList }
 
+import { defaultData, validateData } from "./data.js"
+export { defaultData, validateData }
+
 function registerLogicComponents(app) {
   app.component("loading", Loading)
   app.component("loading-zone", LoadingZone)
@@ -21,4 +24,4 @@ function registerLogicComponents(app) {
   app.component("observe", Observe)
 }
 
-export { registerLogicComponents }
+export { registerLogicComponents }

package/logic/synchronized.js

@@ -20,6 +20,8 @@ function synchronized(options) {
     timeSource = () => (new Date()).toISOString(),
     onChange = () => {},
     onSave = () => {},
+    onSaveError = (e) => { console.error("SAVE ERROR", e) },
+    resetOnError = true,
     recursive = false,
     throttle = 300,
     autoSave = true
@@ -49,8 +51,14 @@ function synchronized(options) {
       // console.log("LAST REMOTE UPDATE", ((source.value && source.value[timeField]) ?? ''))
       // console.log("SOURCE JSON", JSON.stringify(source.value))
       // console.log("SYNCHRONIZED JSON", JSON.stringify(synchronizedValue.value))
-      await update({ ...data, [timeField]: lastLocalUpdate.value, ...identifiers })
-      onSave()
+      try {
+        await update({ ...data, [timeField]: lastLocalUpdate.value, ...identifiers })
+        try { onSave() } catch(e) { console.error("ON SAVE HANDLER ERROR", e) }
+      } catch(e) {
+        if(resetOnError) synchronizedValue.value = copy(source.value)
+        console.error("SAVE ERROR", e)
+        onSaveError(e)
+      }
       return true
     }
     const throttledSave = throttle ? useThrottleFn(save, throttle) : save
@@ -83,8 +91,14 @@ function synchronized(options) {
          || ( ((local.value && local.value[timeField]) ?? '')
            <= ((source.value && source.value[timeField]) ?? ''))) return false // identical, no need to save
       const data = JSON.parse(JSON.stringify(local.value))
-      await update({ ...data, ...identifiers })
-      onSave()
+      try {
+        await update({...data, ...identifiers})
+        try { onSave() } catch(e) { console.error("ON SAVE HANDLER ERROR", e) }
+      } catch(e) {
+        if(resetOnError) synchronizedValue.value = source.value
+        console.error("SAVE ERROR", e)
+        onSaveError(e)
+      }
       return true
     }
     const throttledSave = throttle ? useThrottleFn(save, throttle) : save
@@ -105,4 +119,4 @@ function synchronized(options) {
 }
 
 export { synchronized }
-export default synchronized
+export default synchronized

package/logic/synchronizedList.js

@@ -49,13 +49,16 @@ function synchronizedList(options) {
     timeSource = () => (new Date()).toISOString(),
     onChange = () => {},
     onSave = () => {},
+    onSaveError = (e) => { console.error("SAVE ERROR", e) },
+    resetOnError = true,
     recursive = false,
     throttle = 300,
     autoSave = true,
     mapper = source => synchronized({
-        source, update: updateAction, identifiers: { ...identifiers, ...objectIdentifiers(source.value) }, timeField, timeSource,
-        recursive, throttle, autoSave, onSave, onChange
-      })
+      source, update: updateAction, identifiers: { ...identifiers, ...objectIdentifiers(source.value) },
+      timeField, timeSource,
+      recursive, throttle, autoSave, onSave, onSaveError, resetOnError, onChange
+    })
   } = options
   if(!source) throw new Error('source must be defined')
   const synchronizedList = ref([])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/vue3-components",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "description": "Live Change Framework - vue components",
   "main": "index.js",
   "scripts": {
@@ -21,10 +21,10 @@
   },
   "homepage": "https://github.com/live-change/live-change-framework-vue3",
   "dependencies": {
-    "@live-change/vue3-ssr": "^0.2.14",
+    "@live-change/vue3-ssr": "^0.2.16",
     "debug": "^4.3.4",
     "mitt": "3.0.0",
-    "vue": "^3.2.33"
+    "vue": "^3.2.37"
   },
-  "gitHead": "f50a4c0ce7348ff25bcc59ec2de24a1da18a3210"
+  "gitHead": "a11c281e5913e7bc26955bbc1676dd8153ebc486"
 }