@live-change/framework 0.7.33 → 0.7.35

package/lib/updaters/database.js

@@ -1,5 +1,6 @@
 const utils = require("../utils.js")
 const debug = require('debug')('framework:updaters:db')
+
 async function update(changes, service, app, force) {
 
   const dao = app.dao
@@ -116,7 +117,8 @@ async function update(changes, service, app, force) {
 
   debug("DATABASE UPDATER")
 
-  for(let change of changes) {
+  for(let i = 0; i < changes.length; i++) {
+    const change = changes[i]
     debug("PROCESSING CHANGE", change)
     switch(change.operation) {
       case "createModel": {
@@ -124,9 +126,18 @@ async function update(changes, service, app, force) {
         const tableName = generateTableName(model.name)
         await dao.request(['database', 'createTable'], database, tableName, model.storage ?? {})
         debug("TABLE CREATED!", tableName)
-        for(let indexName in model.indexes) {
-          const index = model.indexes[indexName]
+        for(const [indexName, index] of Object.entries(model.indexes || {})) {
+          if(index.created) continue
+          if(index.dependsOn) {
+            const dependsOn = Array.isArray(index.dependsOn) ? index.dependsOn : [index.dependsOn]
+            for(const indexName of dependsOn) {
+              const index = model.indexes[indexName]
+              await createIndex(tableName, indexName, index)
+              index.created = true
+            }
+          }
           await createIndex(tableName, indexName, index)
+          index.created = true
         }
       } break
       case "renameModel": {

package/lib/utils/validators.js

@@ -74,9 +74,106 @@ let validators = {
         return false
       }
     }
-    return
-  }
+    return validator
+  },
 
+  switchBy: ({ prop, cases }, { getValidator }) => {
+    let validators = {}
+    for(let [value, then] of Object.entries(cases)) {
+      validators[value] = then.map(getValidator)
+    }
+    const validator = (value, context) => {
+      let selectorValue = getField(context, prop)
+      for(let v of (validators[selectorValue] || [])) {
+        const err = v(value, context)
+        if(err) return err
+      }
+    }
+    validator.isRequired = (context) => {
+      let value = getField(context, prop)
+      for(let v of validators[value]) {
+        if(v.isRequired && v.isRequired(context)) return true
+      }
+      return false
+    }
+    return validator
+  },
+
+  ifNotOneOf: ({ prop, what, then }, { getValidator }) => {
+    let validators = then.map(getValidator)
+    const validator = (value, context) => {
+      console.error("VIF NOT ONE OF", getField(context, prop), what, what.includes(getField(context, prop)))
+      if(!what.includes(getField(context, prop))) {
+        console.log("V", validators)
+        for(let v of validators) {
+          const err = v(value, context)
+          if(err) return err
+        }
+      }
+    }
+    validator.isRequired = (context) => {
+      if(!what.includes(getField(context, prop))) {
+        for(let v of validators) {
+          if(v.isRequired && v.isRequired(context)) return true
+        }
+        return false
+      }
+    }
+    return validator
+  },
+
+  ifEmpty: ({ prop, then }, { getValidator }) => {
+    let validators = then.map(getValidator)
+    const validator = (value, context) => {
+      console.log("IFEMPTY CTX", context, "FIELD", prop, "VALUE", getField(context, prop))
+      if(!getField(context, prop)) {
+        console.log("V", validators)
+        for(let v of validators) {
+          const err = v(value, context)
+          if(err) return err
+        }
+      }
+    }
+    validator.isRequired = (context) => {
+      if(!getField(context, prop)) {
+        for(let v of validators) {
+          if(v.isRequired && v.isRequired(context)) return true
+        }
+        return false
+      }
+    }
+    return validator
+  },
+
+
+  ifIncludes: ({ prop, that, then }, { getValidator }) => {
+    let validators = then.map(getValidator)
+    const validator = (value, context) => {
+      if(getField(context, prop).includes(that)) {
+        for(let v of validators) {
+          const err = v(value, context)
+          if(err) return err
+        }
+      }
+    }
+    validator.isRequired = (context) => {
+      if(getField(context, prop).includes(that)) {
+        for(let v of validators) {
+          if(v.isRequired && v.isRequired(context)) return true
+        }
+        return false
+      }
+    }
+    return validator
+  },
+
+  httpUrl: (settings) => (value) => {
+    if(!value) return false // ignore empty
+    const match = value.match(
+        /^(?:http(s)?:\/\/)[\w.-]+(?:\.[\w\.-]+)+[\w\-\._%~:/?#[\]@!\$&'\(\)\*\+,;=.]+$/
+    )
+    if(!match) return 'wrongUrl'
+  }
 }
 
 module.exports = validators

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.7.33",
+  "version": "0.7.35",
   "description": "Live Change Framework - ultimate solution for real time mobile/web apps",
   "main": "index.js",
   "scripts": {
@@ -21,13 +21,13 @@
   },
   "homepage": "https://github.com/live-change/live-change-framework",
   "devDependencies": {
-    "@live-change/dao": "0.5.21",
-    "@live-change/dao-websocket": "0.5.21",
-    "@live-change/db": "0.6.22",
-    "@live-change/db-store-level": "0.6.22",
-    "@live-change/db-store-lmdb": "0.6.22",
+    "@live-change/dao": "0.5.22",
+    "@live-change/dao-websocket": "0.5.22",
+    "@live-change/db": "0.6.23",
+    "@live-change/db-store-level": "0.6.23",
+    "@live-change/db-store-lmdb": "0.6.23",
     "@live-change/sockjs": "0.4.1",
-    "@live-change/uid": "^0.7.33",
+    "@live-change/uid": "^0.7.35",
     "cookie": "^0.4.1",
     "express": "^4.18.2",
     "os-service": "^2.2.0",
@@ -35,5 +35,5 @@
     "tape": "^5.3.2",
     "websocket": "^1.0.34"
   },
-  "gitHead": "244a5a0eccac3b8fe8f9efc0d8cca08f4e383b60"
+  "gitHead": "11313d136ef6bc6770050671a61721c2fa7586f9"
 }