@live-change/framework 0.9.162 → 0.9.164

package/index.ts

@@ -12,6 +12,7 @@ import PropertyDefinition from './lib/definition/PropertyDefinition.js'
 import ServiceDefinition from './lib/definition/ServiceDefinition.js'
 import TriggerDefinition from './lib/definition/TriggerDefinition.js'
 import ViewDefinition from './lib/definition/ViewDefinition.js'
+import QueryDefinition from './lib/definition/QueryDefinition.js'
 
 export {
   ActionDefinition,
@@ -23,7 +24,8 @@ export {
   PropertyDefinition,
   ServiceDefinition,
   TriggerDefinition,
-  ViewDefinition
+  ViewDefinition,
+  QueryDefinition
 }
 
 // Export all types from definition files
@@ -38,4 +40,5 @@ export type { ClientContext, ContextBase, ViewContext, ActionContext } from './l
 export type { ServiceDefinitionSpecification } from './lib/definition/ServiceDefinition.js'
 export type { AccessSpecification, AccessFunction } from './lib/processors/accessMethod.js'
 export type { EventDefinitionSpecification as EventDefinitionSpecificationAC } from './lib/definition/EventDefinition.js'
-export type * from './lib/definition/types.js'
+export type { QueryDefinitionSpecification } from './lib/definition/QueryDefinition.js'
+export type * from './lib/definition/types.js'

package/lib/App.js

@@ -19,6 +19,7 @@ import fetchView from "./processors/fetchView.js"
 import accessControl from "./processors/accessControl.js"
 import autoValidation from "./processors/autoValidation.js"
 import indexCode from "./processors/indexCode.js"
+import queryExtensions from "./processors/queryExtensions.js"
 
 import databaseUpdater from "./updaters/database.js"
 
@@ -53,11 +54,12 @@ class App {
 
     this.defaultProcessors = [
       indexListProcessor,
+      queryExtensions,
       daoPathView,
-      fetchView,
+      fetchView,      
       accessControl,
       autoValidation,
-      indexCode
+      indexCode      
     ]
     this.defaultUpdaters = [
       databaseUpdater

package/lib/definition/QueryDefinition.ts

@@ -13,9 +13,10 @@ export interface QueryDefinitionSpecification {
   update: boolean,
 
   validation?: (parameters: QueryParameters, context: ContextBase) => Promise<any>
-  waitForEvents?: boolean,
   timeout?: number,
-  requestTimeout?: number
+  requestTimeout?: number,
+
+  config?: Record<string, any>
 }
 
 class QueryDefinition<T extends QueryDefinitionSpecification> {

package/lib/definition/ViewDefinition.ts

@@ -12,7 +12,7 @@ export interface ViewDefinitionSpecificationBase {
   global?: boolean,
   access?: AccessSpecification,
   skipValidation?: boolean,
-  validation? : (parameters: Record<string, any>, context: ViewContext) => Promise<any>
+  validation? : (parameters: Record<string, any>, context: ViewContext) => Promise<any>  
 }
 
 export interface ViewDefinitionSpecificationObservable extends ViewDefinitionSpecificationBase {

package/lib/processors/queryExtensions.js

@@ -0,0 +1,65 @@
+
+import * as utils from "../utils.js"
+
+export default function(module, app) {
+  for(let queryName in module.queries) {
+    const query = module.queries[queryName]
+    if(query.view) {
+      if(query.update) throw new Error("Only non-update queries can have views")
+      module.view({
+        name: query.view?.name || queryName,
+        properties: query.properties,
+        returns: query.returns,
+        ...query.view,
+        daoPath: (properties, { client }) => {
+          const runtime = module._runtime.queries[queryName]
+          return runtime.daoPath(properties)
+        }
+      })
+    }
+    if(query.trigger) {
+      if(query.update) throw new Error("Only non-update queries can have triggers")
+      module.trigger({
+        name: query.trigger?.name || queryName,
+        properties: query.properties,
+        returns: query.returns,
+        ...query.trigger,
+        execute: (properties, { client, service, trigger }, emit) => {          
+          emit({
+            type: query.event?.name || queryName,
+            properties
+          })
+        }
+      })
+    }
+    if(query.action) {
+      if(query.update) throw new Error("Only non-update queries can have actions")
+      module.action({
+        name: query.action?.name || queryName,
+        properties: query.properties,
+        returns: query.returns,
+        ...query.action,
+        execute: (properties, { client, service, action }, emit) => {
+          emit({
+            type: query.event?.name || queryName,
+            properties
+          })
+        }
+      })
+    }
+    if(query.event || query.trigger || query.action) {
+      if(!query.update) throw new Error("Only update queries can have events")
+      module.event({
+        name: query.event?.name || queryName,
+        properties: query.properties,
+        returns: query.returns,
+        ...query.event,
+        execute: (properties) => {
+          const runtime = module._runtime.queries[queryName]
+          return runtime.run(properties)
+        }
+      })
+    }
+  }
+}
+

package/lib/runtime/Query.js

@@ -11,19 +11,10 @@ class Query {
     this.codeString = typeof definition.code === 'function' ? `(${definition.code.toString()})` : definition.code
   }
 
-  async run(parameters, context) {
+  async run(parameters) {
     if(!this.definition.update) throw new Error("Only update queries can be run")
     
     if(!parameters) parameters = {}
-    if(!context) context = {
-      client: {
-        session: null,
-        user: null,
-        ip: null,
-        roles: []
-      },
-      service: this.service,
-    }
     
     let preparedParams = await prepareParameters(parameters, this.definition.properties, this.service)        
 
@@ -37,47 +28,31 @@ class Query {
     return resultPromise
   }
 
-  get(parameters, context) {
-    if(this.definition.update) throw new Error("Only non-update queries can be get")
+  daoPath(parameters) {
+    if(this.definition.update) throw new Error("Only non-update queries can be get or observed")
     
     if(!parameters) parameters = {}
-    if(!context) context = {
-      client: {
-        session: null,
-        user: null,
-        ip: null,
-        roles: []
-      },
-      service: this.service,
-    }
 
-    const resultPromise = this.service.app.dao.get([
+    return [
       'database', this.definition.isObjectQuery ? 'runQueryObject' : 'runQuery', 
       this.service.app.databaseName, 'queries', this.queryKey, parameters
-    ])
+    ]
+  }
+
+  get(parameters) {
+    if(this.definition.update) throw new Error("Only non-update queries can be get")
+    
+    const resultPromise = this.service.app.dao.get(this.daoPath(parameters))
     resultPromise.catch(error => {
       console.error(`Query ${this.definition.name} error `, error.stack || error)
     })
     return resultPromise
   }
 
-  observable(parameters, context) {
-    if(this.definition.update) throw new Error("Only non-update queries can be observable")
-    if(!parameters) parameters = {}
-    if(!context) context = {
-      client: {
-        session: null,
-        user: null,
-        ip: null,
-        roles: []
-      },
-      service: this.service,
-    }
+  observable(parameters) {
+    if(this.definition.update) throw new Error("Only non-update queries can be observed")
 
-    const resultPromise = this.service.app.dao.observable([
-      'database', this.definition.isObjectQuery ? 'runQueryObject' : 'runQuery', 
-      this.service.app.databaseName, 'queries', this.queryKey, parameters
-    ])
+    const resultPromise = this.service.app.dao.observable(this.daoPath(parameters))
     resultPromise.catch(error => {
       console.error(`Query ${this.definition.name} error `, error.stack || error)
     })

package/lib/runtime/Service.js

@@ -6,6 +6,7 @@ import Action from "./Action.js"
 import EventHandler from "./EventHandler.js"
 import TriggerHandler from "./TriggerHandler.js"
 import ExecutionQueue from "../utils/ExecutionQueue.js"
+import Query from "./Query.js"
 
 class Service {
 

package/lib/updaters/database.js

@@ -180,7 +180,7 @@ async function update(changes, service, app, force) {
             }).join(':')+'_'+(hash ? sha1(obj.id, 'base64') : obj.id),
             to: obj.id
           })
-          await input.table(table).onChange((obj, oldObj) =>
+          await input.table(table).onChange((obj, oldObj) =>            
             output.change(obj && mapper(obj), oldObj && mapper(oldObj)) )
         }
         const functionCode = `(${func})`
@@ -334,12 +334,13 @@ async function update(changes, service, app, force) {
         const queryKey = service.name + '.' + query.name
         await dao.requestWithSettings(updaterRequestSettings, ['database', 'put'], database, 'queries', {
           id: queryKey,
-          code: typeof query.code === 'function' ? `(${query.code.toString()})` : query.code,
+          code: `(${query.code.toString()})`,
           sourceName: query.sourceName,
           update: query.update,
           timeout: query.timeout,          
           properties: query.properties,
-          returns: query.returns                    
+          returns: query.returns,
+          ...query.config                  
         })
         debug("QUERY CREATED!", query.name)
       } break;
@@ -350,7 +351,7 @@ async function update(changes, service, app, force) {
         const oldQuery = await dao.get(['database', 'get', database, 'queries', oldQueryKey])
         await dao.requestWithSettings(updaterRequestSettings, ['database', 'put'], database, 'queries', {
           id: queryKey,
-          code: typeof oldQuery.code === 'function' ? `(${oldQuery.code.toString()})` : oldQuery.code,
+          code: `(${oldQuery.code.toString()})`,
           sourceName: oldQuery.sourceName,
           update: oldQuery.update, 
           timeout: oldQuery.timeout,          

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.9.162",
+  "version": "0.9.164",
   "description": "Live Change Framework - ultimate solution for real time mobile/web apps",
   "main": "index.js",
   "scripts": {
@@ -22,11 +22,11 @@
   },
   "homepage": "https://github.com/live-change/live-change-stack",
   "devDependencies": {
-    "@live-change/dao": "^0.9.162",
-    "@live-change/uid": "^0.9.162",
+    "@live-change/dao": "^0.9.164",
+    "@live-change/uid": "^0.9.164",
     "typedoc": "0.28.3",
     "typedoc-plugin-markdown": "^4.6.3",
     "typedoc-plugin-rename-defaults": "^0.7.3"
   },
-  "gitHead": "59cd1485ca6d76bd87a6634a92d6e661e5803d5e"
+  "gitHead": "38f9fb8b01a9527d8f6036e174edd1fa41443301"
 }