@live-change/framework 0.6.10 → 0.6.11

package/lib/definition/ServiceDefinition.js

@@ -105,7 +105,7 @@ class ServiceDefinition {
   index(definition) {
     const index = new IndexDefinition(definition)
     this.indexes[index.name] = index
-    return createIndexProxy(this, model)
+    return createIndexProxy(this, index)
   }
 
   foreignIndex(serviceName, indexName) {

package/lib/runtime/Index.js

@@ -1,4 +1,5 @@
 const ReactiveDao = require("@live-change/dao")
+const utils = require("../utils.js");
 
 class Index {
 
@@ -13,10 +14,14 @@ class Index {
     return ['database', 'indexObject', this.service.databaseName, this.dbIndexName, id]
   }
 
-  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', 'indexRange', this.service.databaseName, this.dbIndexName, range]

package/lib/updaters/database.js

@@ -39,7 +39,7 @@ async function update(changes, service, app, force) {
       indexName = generateTableName(indexName)
     }
 
-    debug("CREATE INDEX", indexName)
+    debug("CREATE INDEX", indexName, index)
 
     const options = {
       multi: index.multi || false
@@ -235,25 +235,24 @@ async function update(changes, service, app, force) {
 
   debug("CHECKING DATABASE INTEGRITY...")
   const indexes = await dao.get(['database', 'indexesList', database])
-  for(const indexName in service.indexes) {
-    const fullIndexName = generateTableName(indexName)
-    if(!indexes.includes(fullIndexName)) {
-      debug("index", fullIndexName, "not found! creating...")
-      await createIndex(null, indexName, service.index[indexName])
-    }
-  }
   for(const modelName in service.models) {
     const tableName = generateTableName(modelName)
     const model = service.models[modelName]
     for(const indexName in model.indexes) {
       const fullIndexName = tableName + '_' + indexName
       if(!indexes.includes(fullIndexName)) {
-        debug("I", indexes)
         debug("table ", modelName, " index", fullIndexName, "not found! creating...")
         await createIndex(generateTableName(modelName), indexName, model.indexes[indexName])
       }
     }
   }
+  for(const indexName in service.indexes) {
+    const fullIndexName = generateTableName(indexName)
+    if(!indexes.includes(fullIndexName)) {
+      debug("index", fullIndexName, "not found! creating...")
+      await createIndex(null, indexName, service.indexes[indexName])
+    }
+  }
 }
 
 module.exports = update

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.6.10",
+  "version": "0.6.11",
   "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.1",
-    "@live-change/dao-websocket": "0.5.1",
+    "@live-change/dao": "0.5.4",
+    "@live-change/dao-websocket": "0.5.4",
     "@live-change/db": "0.5.16",
     "@live-change/db-store-level": "0.5.16",
     "@live-change/db-store-lmdb": "0.5.16",
     "@live-change/sockjs": "0.4.1",
-    "@live-change/uid": "^0.6.10",
+    "@live-change/uid": "^0.6.11",
     "cookie": "^0.4.1",
     "express": "^4.18.1",
     "os-service": "^2.2.0",
@@ -35,5 +35,5 @@
     "tape": "^5.3.2",
     "websocket": "^1.0.34"
   },
-  "gitHead": "94daf36c87486b4241b752080c926995b27827d2"
+  "gitHead": "99d448214c2df44f42e5d25a08fa50ae79e5bdbe"
 }