@live-change/framework 0.9.84 → 0.9.86

package/lib/App.js

@@ -265,7 +265,7 @@ class App {
     })
     const routes = await this.dao.get(['database', 'tableRange', this.databaseName, 'triggerRoutes',
       { gte: trigger.type+'=', lte: trigger.type+'=\xFF\xFF\xFF\xFF' }])
-    console.log("TRIGGER ROUTES", trigger.type, '=>', routes)
+    console.log("TRIGGER ROUTES", trigger.type, '=>', routes.map(r => r.service).join(', '))
     let promises = []
     for(const route of routes) {
       promises.push(this.triggerService({ ...trigger, service: route.service }, { ...data }, true))

package/lib/clientSideFilters/clientSideFilter.js

@@ -8,10 +8,12 @@ export default function clientSideFilter(service, definition, app) {
     const view = service.views[viewName]
 
   }
-  for(let modelName in service.models) {
-    const view = service.views[viewName]
+  */
 
-  }*/
+  for(let modelName in definition.models) {
+    const model = definition.models[modelName]
+    if(model.indexes) delete model.indexes
+  }
 
   delete definition.events
   delete definition.triggers

package/lib/definition/ForeignModelDefinition.ts

@@ -8,7 +8,7 @@ class ForeignModelDefinition {
   }
 
   getTypeName() {
-    return this.serviceName+':'+this.name
+    return this.serviceName+'_'+this.name
   }
 
   toJSON() {

package/lib/definition/ServiceDefinition.ts

@@ -7,7 +7,7 @@ import TriggerDefinition, { TriggerDefinitionSpecification } from "./TriggerDefi
 import ViewDefinition, { ViewDefinitionSpecification } from "./ViewDefinition.js"
 import EventDefinition from "./EventDefinition.js"
 import defaultValidators from '../utils/validators.js'
-import { crudChanges } from "../utils.js"
+import { crudChanges, definitionToJSON } from "../utils.js"
 
 function createModelProxy(definition, model) {
   return new Proxy(model, {
@@ -208,7 +208,7 @@ class ServiceDefinition<T extends ServiceDefinitionSpecification> {
     for(let key in this.views) views[key] = this.views[key].toJSON()
     let triggers = {}
     for(let key in this.triggers) triggers[key] = this.triggers[key].map(t=>t.toJSON())
-    return {
+    let json = {
       ...this,
       _runtime: undefined,
       models,
@@ -220,6 +220,8 @@ class ServiceDefinition<T extends ServiceDefinitionSpecification> {
       events,
       triggers
     }
+    const fixed = definitionToJSON(json, true)
+    return fixed
   }
 
   callTrigger(trigger, data) {

package/lib/runtime/ApiServer.js

@@ -35,7 +35,6 @@ class ApiServer {
       allAuthenticators.push(...auth.filter(a => !!a))
     }
     for(const service of this.config.services) {
-      //console.log("SERIVCE AUTH", service.name, service.authenticators)
       if(service.authenticators) {
         allAuthenticators.push(...service.authenticators.filter(a => !!a))
       }

package/lib/updaters/database.js

@@ -75,8 +75,9 @@ async function update(changes, service, app, force) {
 
     if(index.function) {
       const functionCode = `(${index.function})`
-      ;(globalThis.compiledFunctions = globalThis.compiledFunctions || {})[functionCode] = index.function
-      await dao.request(['database', 'createIndex'], database, indexName, functionCode, { ...(index.parameters || {}) }, index.storage ?? {})
+      ;(globalThis.compiledFunctionsCandidates = globalThis.compiledFunctionsCandidates || {})[functionCode] = index.function
+      await dao.request(['database', 'createIndex'], database, indexName, functionCode, 
+        { ...(index.parameters || {}) }, index.storage ?? {})
     } else {
       if(!table) throw new Error("only function indexes are possible without table")
       if(index.multi) {
@@ -118,7 +119,7 @@ async function update(changes, service, app, force) {
           })
         }
         const functionCode = `(${func})`
-        ;(globalThis.compiledFunctions = globalThis.compiledFunctions || {})[functionCode] = func
+        ;(globalThis.compiledFunctionsCandidates = globalThis.compiledFunctionsCandidates || {})[functionCode] = func
         await dao.requestWithSettings(indexRequestSettings, ['database', 'createIndex'], database, indexName,
           functionCode, { properties, table, hash: index.hash }, index.storage ?? {})
       } else {
@@ -137,7 +138,7 @@ async function update(changes, service, app, force) {
             output.change(obj && mapper(obj), oldObj && mapper(oldObj)) )
         }
         const functionCode = `(${func})`
-        ;(globalThis.compiledFunctions = globalThis.compiledFunctions || {})[functionCode] = func
+        ;(globalThis.compiledFunctionsCandidates = globalThis.compiledFunctionsCandidates || {})[functionCode] = func
         await dao.requestWithSettings(indexRequestSettings, ['database', 'createIndex'], database, indexName,
           functionCode, { properties, table, hash: index.hash }, index.storage ?? {})
       }

package/lib/utils/validation.js

@@ -91,7 +91,7 @@ async function validate(props, validators, context) {
       propErrors[propName] = errors[0]
     }
   }
-  console.log("PROP ERRORS", propErrors)
+  //console.log("PROP ERRORS", propErrors)
   if(Object.keys(propErrors).length > 0) throw { properties: propErrors }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.9.84",
+  "version": "0.9.86",
   "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.84",
-    "@live-change/uid": "^0.9.84",
+    "@live-change/dao": "^0.9.86",
+    "@live-change/uid": "^0.9.86",
     "typedoc": "0.28.3",
     "typedoc-plugin-markdown": "^4.6.3",
     "typedoc-plugin-rename-defaults": "^0.7.3"
   },
-  "gitHead": "5881a5406e3a39e673034f172266409ddb306f2e"
+  "gitHead": "7b0013ef101d9033402eeec45fd1be60e151aada"
 }

package/typedoc.json

@@ -1,6 +1,6 @@
 {
   "entryPoints": ["index.ts"],
-  "out": "docs",
+  "out": "../../docs/docs/framework",
   "includeVersion": true,
   "excludePrivate": true,
   "excludeInternal": true,