@live-change/framework 0.8.23 → 0.8.25

package/index.js

@@ -17,6 +17,7 @@ App.encodeIdentifier = utils.encodeIdentifier
 App.extractRange = utils.extractRange
 App.isomorphic = utils.isomorphic
 App.computeDefaults = utils.computeDefaults
+App.computeUpdates = utils.computeUpdates
 
 export default App
 

package/lib/App.js

@@ -92,7 +92,7 @@ class App {
 
   createServiceDefinition( definition ) {
     const sourceConfig = this.config && this.config.services && this.config.services.find
-      && this.config.services.find(c => c.name == definition.name)
+      && this.config.services.find(c => c.name === definition.name)
     const config = { ...sourceConfig, module: null }
     return new ServiceDefinition({ ...definition, config })
   }
@@ -111,7 +111,7 @@ class App {
     processUse(sourceService)
     //console.log("FOUND PROCESSORS", processors.length)
     processors = processors.filter(function(item, pos, self) {
-      return self.indexOf(item) == pos
+      return self.indexOf(item) === pos
     })
     processors = processors.map(p => {
       if(typeof p == 'function') {
@@ -262,7 +262,7 @@ class App {
       const triggers = service.triggers[data.type]
       if(!triggers) return []
       const result = await Promise.all(triggers.map(t => t.execute(data)))
-      if(!returnArray && Array.isArray(result) && result.length == 1) return result[0]
+      if(!returnArray && Array.isArray(result) && result.length === 1) return result[0]
       return result
     }
     if(!data.id) data.id = this.generateUid()
@@ -285,10 +285,10 @@ class App {
     let observer
     const promise = new Promise((resolve, reject) => {
       observer = (signal, value) => {
-        if(signal != 'set') return reject('unknownSignal')
+        if(signal !== 'set') return reject('unknownSignal')
         if(!value) return
-        if(value.state == 'done') return resolve(value.result)
-        if(value.state == 'failed') return reject(value.error)
+        if(value.state === 'done') return resolve(value.result)
+        if(value.state === 'failed') return reject(value.error)
       }
       objectObservable.observe(observer)
     }).finally(() => {
@@ -297,7 +297,7 @@ class App {
     await this.profileLog.endPromise(profileOp, promise)
 
     const result = await promise
-    if(!returnArray && Array.isArray(result) && result.length == 1) return result[0]
+    if(!returnArray && Array.isArray(result) && result.length === 1) return result[0]
     return result
   }
 
@@ -390,10 +390,10 @@ class App {
       let observer
       const promise = new Promise((resolve, reject) => {
         observer = (signal, value) => {
-          if (signal != 'set') return reject('unknownSignal')
+          if (signal !== 'set') return reject('unknownSignal')
           if (!value) return
-          if (value.state == 'done') return resolve(value.result)
-          if (value.state == 'failed') return reject(value.error)
+          if (value.state === 'done') return resolve(value.result)
+          if (value.state === 'failed') return reject(value.error)
         }
         objectObservable.observe(observer)
         if (!requestTimeout) {
@@ -478,9 +478,9 @@ class App {
         if(data.finished) {
           finishedEvents = data.finished
           if(finishedEvents.length >= events.length) {
-            const eventsNotDone = events.filter(event => data.finished.find(e => e.id == event.id))
+            const eventsNotDone = events.filter(event => data.finished.find(e => e.id === event.id))
             if(eventsNotDone.length !== 0) {
-              const eventsDone = events.filter(event => !data.finished.find(e => e.id == event.id))
+              const eventsDone = events.filter(event => !data.finished.find(e => e.id === event.id))
               console.error("waitForEvents - finished events does not match!")
               console.error("  finished events:")
               for(const event of eventsDone) {

package/lib/processors/crudGenerator.js

@@ -48,7 +48,7 @@ export default function(service, app) {
       return service._runtime.models[modelName]
     }
 
-    const defaults = utils.generateDefault(model.properties)
+    const defaults = utils.getDefaults(model.properties)
 
     if(!service.events[genName("Created")]) { // Events:
       service.event({

package/lib/runtime/Service.js

@@ -55,6 +55,11 @@ class Service {
 
     this.triggers = {}
     for(let triggerName in this.definition.triggers) {
+      if(!this.definition.triggers[triggerName].map) {
+        console.error("SERVICE", this.name,
+          "TRIGGER", triggerName, this.definition.triggers[triggerName])
+        process.exit(1)
+      }
       this.triggers[triggerName] = this.definition.triggers[triggerName]
         .map(trigger => new TriggerHandler( trigger, this ))
     }

package/lib/updaters/database.js

@@ -211,7 +211,8 @@ async function update(changes, service, app, force) {
         const table = generateTableName(change.model)
         const property = change.property
         let update = {}
-        update[change.name] = property.defaultValue ?? property.default
+        const defaultValue = property.defaultValue ?? property.default
+        if(typeof defaultValue !== 'function') update[change.name] = defaultValue // functions not supported here
         debug("CREATE PROPERTY UPDATE", update)
         await dao.request(['database', 'query'], database, `(${
             async (input, output, { table, update }) =>

package/lib/utils.js

@@ -177,17 +177,31 @@ function mergeDeep(target, ...sources) {
   return mergeDeep(target, ...sources);
 }
 
-function generateDefault(properties) {
+function getDefaults(properties) {
   let result = {}
   for(const propName in properties) {
     const property = properties[propName]
-    console.log("GENERATE DEFAULT", propName, property, property.hasOwnProperty('defaultValue'), property.hasOwnProperty('default'))
     if(property.hasOwnProperty('defaultValue')) {
       result[propName] = property.defaultValue
     } else if(property.hasOwnProperty('default')) {
       result[propName] = property.default
     } else if(property.type === Object) {
-      result[propName] = generateDefault(property.properties)
+      const defaults = getDefaults(property.properties)
+      if(Object.keys(defaults).length > 0) result[propName] = defaults
+    }
+  }
+  return result
+}
+
+function getUpdates(properties) {
+  let result = {}
+  for(const propName in properties) {
+    const property = properties[propName]
+    if(property.hasOwnProperty('updated')) {
+      result[propName] = property.updated
+    } else if(property.type === Object) {
+      const updates = getUpdates(property.properties)
+      if(Object.keys(updates).length > 0) result[propName] = updates
     }
   }
   return result
@@ -286,30 +300,39 @@ function isomorphic( v ) {
   }
 }
 
-function computeDefaults(model, properties, context) {
-  const defaults = generateDefault(model.properties)
+function computeValues(source, properties, context) {
   const result = {}
-  for(const propName in defaults) {
-    switch(typeof defaults[propName]) {
+  for(const propName in source) {
+    switch(typeof source[propName]) {
       case 'function': {
-        result[propName] = defaults[propName](properties, context)
+        result[propName] = source[propName](properties, context)
         break
       }
       case 'object': {
-        result[propName] = defaults[propName] && computeDefaults(defaults[propName], properties[propName])
+        result[propName] = source[propName] && computeValues(source[propName], properties[propName], context)
         break
       }
       default: {
-        result[propName] = defaults[propName]
+        result[propName] = source[propName]
       }
     }
   }
   return JSON.parse(JSON.stringify(result))
 }
 
+function computeDefaults(model, properties, context) {
+  const defaults = getDefaults(model.properties)
+  return computeValues(defaults, properties, context)
+}
+
+function computeUpdates(model, properties, context) {
+  const updates = getUpdates(model.properties)
+  return computeValues(updates, properties, context)
+}
+
 export {
   typeName, toJSON, setDifference, mapDifference, crudChanges,
-  getProperty, setProperty, getField, setField, isObject, mergeDeep, generateDefault,
+  getProperty, setProperty, getField, setField, isObject, mergeDeep, getDefaults,
   prefixRange, rangeProperties, fieldListToFieldsObject,
-  encodeIdentifier, extractRange, isomorphic, computeDefaults
+  encodeIdentifier, extractRange, isomorphic, computeDefaults, computeUpdates
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/framework",
-  "version": "0.8.23",
+  "version": "0.8.25",
   "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.23",
-    "@live-change/uid": "^0.8.23"
+    "@live-change/dao": "^0.8.25",
+    "@live-change/uid": "^0.8.25"
   },
-  "gitHead": "581260523149a1e596f08e878b5f4fabeaba26ea"
+  "gitHead": "1aa24b8ec3bfaa3576b72b514b2a97b061cb57fc"
 }