@live-change/framework 0.6.3 → 0.6.6

package/lib/processors/accessMethod.js

@@ -2,11 +2,13 @@ function getAccessMethod(access) {
   if(typeof access == 'function') {
     return access
   } else if(Array.isArray(access)) {
-    return (params, {service, client}) => {
-      for(let role of access) if(client.roles.includes('admin')) return true
+    return (params, { service, client }) => {
+      if(client.roles.includes('administrator')) return true
+      if(client.roles.includes('admin')) return true
+      for(let role of access) if(client.roles.includes(role)) return true
       return false
     }
   } else throw new Error("unknown view access definition "+access)
 }
 
-module.exports = getAccessMethod
+module.exports = getAccessMethod

package/lib/runtime/ReaderModel.js

@@ -39,10 +39,14 @@ class ReaderModel {
     })`, { tableName: this.tableName, id, fields }]
   }
 
-  rangePath(range = {}) {
-    if(typeof range != 'object') {
-      const str = range.toString()
-      return this.rangePath({ gte: str, lte: str+'\xFF\xFF\xFF\xFF' })
+  rangePath(range = {}, pathRange = null) {
+    if(typeof range != 'object' || Array.isArray(range)) {
+      const values = Array.isArray(range) ? range : [range]
+      const prefix = values.map(value => value === undefined ? '' : JSON.stringify(value)).join(':')
+      if(pathRange) {
+        return this.rangePath(utils.prefixRange(pathRange, prefix, prefix))
+      }
+      return this.rangePath({ gte: prefix+':', lte: prefix+'_\xFF\xFF\xFF\xFF' })
     }
     if(Array.isArray(range)) this.rangePath(range.join(','))
     return ['database', 'tableRange', this.service.databaseName, this.tableName, range]
@@ -101,7 +105,9 @@ class ReaderModel {
             }
           })
         }
-    })`, { indexName: this.tableName+'_'+index, tableName: this.tableName, range }]
+    })`, { indexName: this.tableName+'_'+index, tableName: this.tableName, range },
+      this.modelName+'.indexRange'
+    ]
   }
 
   sortedIndexRangePath(index, range = {}, pathRange = null) {
@@ -152,7 +158,7 @@ class ReaderModel {
             let outputState = outputStates.get(oldObj.id)
             if(outputState) {
               outputState.refs --
-              //output.debug("INDEX DELETE", oldObj.id, "REFS", outputState.refs)
+              output.debug("INDEX DELETE", oldObj.id, "REFS", outputState.refs)
               if(outputState.refs <= 0) {
                 outputState.reader.unobserve(outputState.observer)
                 outputStates.delete(oldObj.id)
@@ -162,7 +168,9 @@ class ReaderModel {
           }
         })
       }
-    })`, { indexName: this.tableName+'_'+index, tableName: this.tableName, range }]
+    })`, { indexName: this.tableName+'_'+index, tableName: this.tableName, range },
+      this.modelName+'.sortedIndexRange'
+    ]
   }
 
   indexObjectPath(index, range = {}, pathRange = null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.6.3",
+  "version": "0.6.6",
   "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.4.8",
-    "@live-change/dao-websocket": "0.4.8",
-    "@live-change/db": "0.5.9",
-    "@live-change/db-store-level": "0.5.9",
-    "@live-change/db-store-lmdb": "0.5.9",
+    "@live-change/dao": "0.5.0",
+    "@live-change/dao-websocket": "0.4.13",
+    "@live-change/db": "0.5.13",
+    "@live-change/db-store-level": "0.5.13",
+    "@live-change/db-store-lmdb": "0.5.13",
     "@live-change/sockjs": "^0.4.0-rc.1",
-    "@live-change/uid": "0.6.0",
+    "@live-change/uid": "^0.6.6",
     "cookie": "^0.4.1",
     "express": "^4.17.1",
     "os-service": "^2.2.0",
@@ -35,5 +35,5 @@
     "tape": "^5.3.2",
     "websocket": "^1.0.34"
   },
-  "gitHead": "d9fe68f41bd885b62894868679f7477529463fd4"
+  "gitHead": "d6f4e8a34d88ecf90a3bf97bb367d4c8027ce7af"
 }