@live-change/framework 0.8.111 → 0.8.112

package/lib/App.js

@@ -291,9 +291,11 @@ class App {
         ['database', 'tableObject', this.databaseName, triggersTable, trigger.id],
         ReactiveDao.ObservableValue
     )
-    await this.dao.request(['database', 'update', this.databaseName, triggersTable, trigger.id, [
-      { op: 'reverseMerge', value: trigger }
-    ]])
+    await this.dao.request(['database', 'update', this.databaseName, triggersTable, trigger.id, [{
+      op: 'conditional',
+      conditions: [{ test: 'notExist', property: 'type' }],
+      operations: [{ op: 'reverseMerge', value: trigger }],
+    }]])
     let observer
     const promise = new Promise((resolve, reject) => {
       observer = (signal, value) => {
@@ -396,9 +398,11 @@ class App {
         ['database', 'tableObject', this.databaseName, commandsTable, data.id],
         ReactiveDao.ObservableValue
       )
-      await this.dao.request(['database', 'update', this.databaseName, commandsTable, data.id, [
-        {op: 'reverseMerge', value: data}
-      ]])
+      await this.dao.request(['database', 'update', this.databaseName, commandsTable, data.id, [{
+        op: 'conditional',
+        conditions: [{ test: 'notExist', property: 'type' }],
+        operations: [{ op: 'reverseMerge', value: data }],
+      }]])
       let observer
       const promise = new Promise((resolve, reject) => {
         observer = (signal, value) => {

package/lib/processors/autoValidation.js

@@ -3,15 +3,29 @@ import { getValidators, validate } from '../utils/validation.js'
 export default function(service, app) {
   for(let actionName in service.actions) {
     const action = service.actions[actionName]
-    if(action.skipValidation) continue
+    if(action.skipValidation && !action.validation) continue
     const validators = getValidators(action, service, action)
     if(Object.keys(validators).length > 0) {
       const oldExec = action.execute
       action.execute = async (...args) => {
         const context = args[1]
-        return validate(args[0], validators, { source: action, action, service, app, ...context }).then(() =>
-          oldExec.apply(action, args)
-        )
+        if(args[0]._validationOnly) {
+          if(!action.skipValidation) {
+            await validate(args[0], validators, { source: action, action, service, app, ...context })
+          }
+          if(action.validation === true) {
+            return await oldExec.apply(action, args) // validate inside execute
+          } else if(typeof action.validation === 'function') {
+            const result = await action.validation(args[0], { source: action, action, service, app, ...context })
+            if(result) throw result
+            return 'ok'
+          }
+        } else {
+          if(!action.skipValidation) {
+            await validate(args[0], validators, { source: action, action, service, app, ...context })
+          }
+          return oldExec.apply(action, args)
+        }
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.8.111",
+  "version": "0.8.112",
   "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.111",
-    "@live-change/uid": "^0.8.111"
+    "@live-change/dao": "^0.8.112",
+    "@live-change/uid": "^0.8.112"
   },
-  "gitHead": "9b96afb2fc61ab3d2a5d143924e2c56d411280b4"
+  "gitHead": "e0d0db33777f8f9fc9f5ebe1a977cf574b837be6"
 }