@live-change/framework 0.8.33 → 0.8.35

package/lib/runtime/Action.js

@@ -21,7 +21,16 @@ class Action {
       service: this.service,
       client: command.client,
       command,
-      trigger: (...args) => this.service.trigger(...args) /// TODO: collet call traces
+      trigger: (trigger, data) => this.service.trigger({
+        causeType: 'action',
+        cause: command.id,
+        ...trigger
+      }, data),
+      triggerService: (trigger, data, returnArray = false) => this.service.triggerService({
+        causeType: 'action',
+        cause: command.id,
+        ...trigger
+      }, data, returnArray)
     }, emit)
 
     resultPromise = resultPromise.then(async result => {

package/lib/runtime/ReaderModel.js

@@ -88,11 +88,11 @@ class ReaderModel {
                   }
                 })
                 objectStates.set(ind.to, objectState)
-              } else if(!oldObj || oldObj.to != obj.to) {
+              } else if(!oldObj || oldObj.to !== obj.to) {
                 objectState.refs ++
               }
             }
-            if(oldObj && oldObj.to && (!obj || obj.to != oldObj.to)) {
+            if(oldObj && oldObj.to && (!obj || obj.to !== oldObj.to)) {
               let objectState = objectStates.get(oldObj.to)
               if(objectState) {
                 objectState.refs --
@@ -269,7 +269,7 @@ class ReaderModel {
         return reject(new Error('timeout'))
       }, timeout)
       const observer = (signal, value) => {
-        if(signal != 'set') {
+        if(signal !== 'set') {
           observable.unobserve(observer)
           clearTimeout(timeoutId)
           return reject(new Error(`unknown signal ${signal}`))

package/lib/runtime/Service.js

@@ -93,12 +93,20 @@ class Service {
     console.log("Service", this.definition.name, "started")
   }
 
-  async trigger(...args) {
-    return this.app.trigger(...args)
+  async trigger(trigger, data) {
+    return this.app.trigger({
+      causeType: 'service',
+      cause: this.name,
+      ...trigger
+    }, data)
   }
 
-  async triggerService(...args) {
-    return this.app.triggerService(...args)
+  async triggerService(trigger, data, returnArray = false) {
+    return this.app.triggerService({
+      causeType: 'service',
+      cause: this.name,
+      ...trigger
+    }, data, returnArray)
   }
 
 }

package/lib/runtime/TriggerHandler.js

@@ -28,7 +28,16 @@ class TriggerHandler {
       ...trig,
       action: this,
       service: this.service,
-      trigger: (...args) => this.service.trigger(...args) /// TODO: collect call traces,
+      trigger: (trigger, data) => this.service.trigger({
+        causeType: 'trigger',
+        cause: trig.id,
+        ...trigger
+      }, data),
+      triggerService: (trigger, data, returnArray = false) => this.service.triggerService({
+        causeType: 'trigger',
+        cause: trig.id,
+        ...trigger
+      }, data, returnArray)
     }, emit)
 
     resultPromise = resultPromise.then(async result => {

package/lib/updaters/database.js

@@ -62,18 +62,24 @@ async function update(changes, service, app, force) {
       if(!table) throw new Error("only function indexes are possible without table")
       if(index.multi) {
         if(Array.isArray(index.property)) throw new Error("multi indexes on multiple properties are not supported!")
-        const func = async function(input, output, { table, property }) {
-          const values = (obj) => {
+        const properties = (Array.isArray(index.property) ? index.property : [index.property]).map(p => p.split('.'))
+        const func = async function(input, output, { table, properties }) {
+          const value = (obj, property) => {
             let at = obj
             for(const p of property) at = at && at[p]
             if(at === undefined) return []
             if(Array.isArray(at)) return at.map(v => JSON.stringify(v))
             return [at]
           }
+          const keys = (obj, id) => {
+            const values = value(obj, properties[id])
+            if(id === properties.length - 1) return values
+            return values.flatMap(v => keys(obj, id + 1).map(k => v + ':' + k))
+          }
           await input.table(table).onChange((obj, oldObj) => {
             if(obj && oldObj) {
-              let pointers = obj && new Set(values(obj))
-              let oldPointers = oldObj && new Set(values(oldObj))
+              let pointers = obj && new Set(keys(obj))
+              let oldPointers = oldObj && new Set(keys(oldObj))
               for(let pointer of pointers) {
                 if(!!oldPointers.has(pointer)) output.change({ id: pointer+'_'+obj.id, to: obj.id }, null)
               }
@@ -81,16 +87,16 @@ async function update(changes, service, app, force) {
                 if(!!pointers.has(pointer)) output.change(null, { id: pointer+'_'+obj.id, to: obj.id })
               }
             } else if(obj) {
-              values(obj).forEach(v => output.change({ id: v+'_'+obj.id, to: obj.id }, null))
+              keys(obj).forEach(k => output.change({ id: k+'_'+obj.id, to: obj.id }, null))
             } else if(oldObj) {
-              values(oldObj).forEach(v => output.change(null, { id: v+'_'+oldObj.id, to: oldObj.id }))
+              keys(oldObj).forEach(k => output.change(null, { id: k+'_'+oldObj.id, to: oldObj.id }))
             }
           })
         }
         const functionCode = `(${func})`
         ;(globalThis.compiledFunctions = globalThis.compiledFunctions || {})[functionCode] = func
         await dao.requestWithSettings(indexRequestSettings, ['database', 'createIndex'], database, indexName,
-          functionCode, { property: index.property.split('.'), table }, index.storage ?? {})
+          functionCode, { properties, table }, index.storage ?? {})
       } else {
         if(!table) throw new Error("only function indexes are possible without table")
         const properties = (Array.isArray(index.property) ? index.property : [index.property]).map(p => p.split('.'))

package/lib/utils/EventsReader.js

@@ -42,12 +42,12 @@ class EventsReader {
         this.movePositionForward()
       }).catch(error => {
         console.error("EVENT PROCESSING ERROR", error, "AT EVENT", event.id,
-            " -> EVENT PROCESSING STOPPED AT", this.position)
+            " -> EVENT PROCESSING STOPPED AT", this.position,' EVENT:', JSON.stringify(event, null, 2))
         if(this.eventsObservable) this.eventsObservable.unobserve(this)
       })
     }
     this.readCount--
-    if(this.readCount == 0) this.readMore()
+    if(this.readCount === 0) this.readMore()
   }
   movePositionForward() {
     let i

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.8.33",
+  "version": "0.8.35",
   "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.33",
-    "@live-change/uid": "^0.8.33"
+    "@live-change/dao": "^0.8.35",
+    "@live-change/uid": "^0.8.35"
   },
-  "gitHead": "98ff6f9c09e5fc1f408010df6cc8038eff571276"
+  "gitHead": "90fbb746dc7270895daf17b437ca48c0b0a01c01"
 }