@live-change/db 0.9.156 → 0.9.158

package/lib/Database.js

@@ -266,7 +266,8 @@ class Database {
       try {
         await index.startIndex()
       } catch(error) {
-        console.error("INDEX", name, "ERROR", error, "CODE:\n", code)
+        if(config.sourceName) console.error("INDEX", name, "ERROR", error)
+          else console.error("INDEX", name, "ERROR", error, "CODE:\n", code)
         console.error("DELETINGww INDEX", name)
         delete this.config.indexes[name]
         this.indexesListObservable.remove(name)

package/lib/Index.js

@@ -6,7 +6,7 @@ import queryGet from './queryGet.js'
 import profileLog from './profileLog.js'
 import nextTick from 'next-tick'
 import { ChangeStream } from './ChangeStream.js'
-import { rangeIntersection } from './utils.js'
+import { unitRange,rangeIntersection } from './utils.js'
 
 
 import Debug from 'debug'
@@ -97,6 +97,7 @@ class RangeReader extends ChangeStream {
   async count(range = {}) {
     return await (await this.tableReader.table).countGet(rangeIntersection(this.range, range))
   }
+  dispose() {}
 }
 
 class TableReader extends ChangeStream {
@@ -151,6 +152,13 @@ class TableReader extends ChangeStream {
   }
   async onChange(cb) {
     this.callbacks.push(cb)
+    return {
+      dispose() {
+        const callbackIndex = this.callbacks.indexOf(cb)
+        if(callbackIndex === -1) throw new Error('Observer double dispose')
+        this.callbacks.splice(callbackIndex, 1)
+      }
+    }
   }
   async change(obj, oldObj, id, timestamp) {
     if(!(obj || oldObj)) return
@@ -181,7 +189,6 @@ class TableReader extends ChangeStream {
       this.rangeReaders.set(key, reader)
     }
     return reader
-    return new RangeReader(this, range)
   }
   async objectGet(id) {
     return await (await this.table).objectGet(id)
@@ -537,7 +544,8 @@ class Index extends Table {
       /// TODO: script available routines
     })
     debug("COMPILE INDEX CODE", this.code)
-    const queryFunction = this.scriptContext.getOrCreateFunction(this.code,
+    const config = this.configObservable.getValue()
+    const queryFunction = this.scriptContext.getOrCreateFunction(this.code, config?.sourceName ??
       `userCode:${this.database.name}/indexes/${this.name}`)
     if(typeof queryFunction != 'function') {
       console.error("INDEX CODE", this.code)

package/lib/ScriptContext.js

@@ -113,6 +113,7 @@ class ScriptContext {
     const queryFunction = this.run(code, filename)
     if(typeof queryFunction != 'function') {
       console.error("compiled query function is not a function!", cleanCode)
+      console.trace('compiled function trace', code)
       process.exit(21)
     }
     globalThis.compiledFunctions[cleanCode] = queryFunction

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/db",
-  "version": "0.9.156",
+  "version": "0.9.158",
   "description": "Database with observable data for live queries",
   "main": "index.js",
   "scripts": {
@@ -22,8 +22,8 @@
   "type": "module",
   "homepage": "https://github.com/live-change/live-change-stack",
   "devDependencies": {
-    "@live-change/db-store-level": "^0.9.156",
-    "@live-change/db-store-lmdb": "^0.9.156",
+    "@live-change/db-store-level": "^0.9.158",
+    "@live-change/db-store-lmdb": "^0.9.158",
     "minimist": ">=1.2.3",
     "next-tick": "^1.1.0",
     "rimraf": "^5.0.5",
@@ -32,10 +32,10 @@
     "websocket-extensions": ">=0.1.4"
   },
   "dependencies": {
-    "@live-change/dao": "^0.9.156",
-    "@live-change/serialization": "^0.9.156",
+    "@live-change/dao": "^0.9.158",
+    "@live-change/serialization": "^0.9.158",
     "get-random-values": "^1.2.2",
     "node-interval-tree": "^1.3.3"
   },
-  "gitHead": "3042fdd1df2a3b696fb7f161304eb23d71b70ad5"
+  "gitHead": "bd30de9030c65b93fbb26b6879f574d5f93baea3"
 }