@live-change/relations-plugin 0.8.24 → 0.8.25

package/boundTo.js

@@ -5,7 +5,11 @@ import {
 
 import { defineSetEvent, defineUpdatedEvent, defineTransferredEvent, defineResetEvent } from './propertyEvents.js'
 
-import { defineView, defineSetAction, defineUpdateAction, defineResetAction } from './singularRelationUtils.js'
+import {
+  defineView,
+  defineSetAction, defineUpdateAction, defineSetOrUpdateAction, defineResetAction,
+  defineSetTrigger, defineUpdateTrigger, defineSetOrUpdateTrigger, defineResetTrigger
+} from './singularRelationUtils.js'
 
 export default function(service, app) {
   processModelsAnnotation(service, app, 'boundTo', false, (config, context) => {
@@ -16,12 +20,12 @@ export default function(service, app) {
     defineProperties(context.model, context.others, context.otherPropertyNames)
     defineIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
 
-    if(config.readAccess || config.readAccessControl || config.writeAccessControl) {
-      defineView({ ...config, access: config.readAccess }, context)
-    }
+    defineView({ ...config, access: config.readAccess }, context,
+      config.readAccess || config.readAccessControl || config.writeAccessControl
+    )
     if(config.views) {
       for(const view of config.views) {
-        defineView({ ...config, ...view }, context)
+        defineView({ ...config, ...view }, context, !view.internal)
       }
     }
 
@@ -30,6 +34,11 @@ export default function(service, app) {
     defineTransferredEvent(config, context, generateId)
     defineResetEvent(config, context, generateId)
 
+    defineSetTrigger(config, context)
+    defineUpdateTrigger(config, context)
+    defineSetOrUpdateTrigger(config, context)
+    defineResetTrigger(config, context)
+
     if(config.setAccess || config.writeAccess || config.setAccessControl || config.writeAccessControl) {
       defineSetAction(config, context)
     }
@@ -38,6 +47,11 @@ export default function(service, app) {
       defineUpdateAction(config, context)
     }
 
+    if((config.setAccess && config.updateAccess) || config.writeAccess
+      || config.setOrUpdateAccessControl || config.writeAccessControl) {
+      defineSetOrUpdateAction(config, context)
+    }
+
     if(config.resetAccess || config.writeAccess || config.resetAccessControl || config.writeAccessControl) {
       defineResetAction(config, context);
     }

package/boundToAny.js

@@ -5,7 +5,11 @@ import {
 
 import { defineSetEvent, defineUpdatedEvent, defineTransferredEvent, defineResetEvent } from './propertyEvents.js'
 
-import { defineView, defineSetAction, defineUpdateAction, defineResetAction } from './singularRelationUtils.js'
+import {
+  defineView,
+  defineSetAction, defineUpdateAction, defineResetAction, defineSetOrUpdateAction,
+  defineSetTrigger, defineUpdateTrigger, defineSetOrUpdateTrigger, defineResetTrigger
+} from './singularRelationUtils.js'
 
 export default function(service, app) {
   processModelsAnyAnnotation(service, app, 'boundToAny', false, (config, context) => {
@@ -16,12 +20,11 @@ export default function(service, app) {
     defineAnyProperties(context.model, context.otherPropertyNames)
     defineAnyIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
 
-    if(config.readAccess || config.readAccessControl || config.writeAccessControl) {
-      defineView({ ...config, access: config.readAccess }, context)
-    }
+    defineView({ ...config, access: config.readAccess }, context,
+      config.readAccess || config.readAccessControl || config.writeAccessControl)
     if(config.views) {
       for(const view of config.views) {
-        defineView({ ...config, ...view }, context)
+        defineView({ ...config, ...view }, context, !view.internal)
       }
     }
 
@@ -30,6 +33,11 @@ export default function(service, app) {
     defineTransferredEvent(config, context, generateAnyId)
     defineResetEvent(config, context, generateAnyId)
 
+    defineSetTrigger(config, context)
+    defineUpdateTrigger(config, context)
+    defineSetOrUpdateTrigger(config, context)
+    defineResetTrigger(config, context)
+
     if(config.setAccess || config.writeAccess || config.setAccessControl || config.writeAccessControl) {
       defineSetAction(config, context)
     }
@@ -38,6 +46,11 @@ export default function(service, app) {
       defineUpdateAction(config, context)
     }
 
+    if((config.setAccess && config.updateAccess) || config.writeAccess
+      || config.setOrUpdateAccessControl || config.writeAccessControl) {
+      defineSetOrUpdateAction(config, context)
+    }
+
     if(config.resetAccess || config.writeAccess || config.resetAccessControl || config.writeAccessControl) {
       defineResetAction(config, context);
     }

package/entity.js

@@ -5,7 +5,7 @@ import {
 import { fireChangeTriggers } from "./changeTriggers.js"
 import App from '@live-change/framework'
 import {
-  PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition
+  PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition, TriggerDefinition
 } from "@live-change/framework"
 
 const annotation = 'entity'
@@ -18,7 +18,7 @@ function entityAccessControl({service, modelName, modelPropertyName}, accessCont
   }
 }
 
-function defineView(config, context) {
+function defineView(config, context, external) {
   const { service, modelRuntime, modelPropertyName, modelName, model } = context
   const viewName = (config.prefix || '' ) + (config.prefix ? modelName : modelPropertyName) + (config.suffix || '')
   service.views[viewName] = new ViewDefinition({
@@ -32,8 +32,9 @@ function defineView(config, context) {
     returns: {
       type: model,
     },
-    access: config.readAccess,
-    accessControl: entityAccessControl(context, config.readAccessControl || config.writeAccessControl),
+    internal: !external,
+    access: external && config.readAccess,
+    accessControl: external && entityAccessControl(context, config.readAccessControl || config.writeAccessControl),
     daoPath(properties, { client, context }) {
       const id = properties[modelPropertyName]
       const path = config.fields ? modelRuntime().limitedPath(id, config.fields) : modelRuntime().path(id)
@@ -105,56 +106,111 @@ function defineDeletedEvent(config, context) {
   })
 }
 
+function getCreateFunction( validators, validationContext, config, context) {
+  const {
+    service, app, model, modelPropertyName, modelRuntime, objectType,
+    modelName, writeableProperties
+  } = context
+  const eventName = modelName + 'Created'
+  async function execute(properties, { client, service }, emit) {
+    const id = properties[modelPropertyName] || app.generateUid()
+    const entity = await modelRuntime().get(id)
+    if(entity) throw 'exists'
+    const data = extractObjectData(writeableProperties, properties,
+      App.computeDefaults(model, properties, { client, service } ))
+
+    await App.validation.validate({ ...data }, validators,
+      validationContext)
+
+    await fireChangeTriggers(context, objectType, null, id,
+      entity ? extractObjectData(writeableProperties, entity, {}) : null, data)
+    emit({
+      type: eventName,
+      [modelPropertyName]: id,
+      data
+    })
+    return id
+  }
+  return execute
+}
 
 function defineCreateAction(config, context) {
   const {
     service, app, model, modelPropertyName, modelRuntime, objectType,
     modelName, writeableProperties
   } = context
-  const eventName = modelName + 'Created'
   const actionName = 'create' + modelName
-  service.actions[actionName] = new ActionDefinition({
+  const action = new ActionDefinition({
     name: actionName,
-    properties: {
-      ...(model.properties)
-    },
+    properties: { ...model.properties },
     access: config.createAccess || config.writeAccess,
     accessControl: entityAccessControl(context, config.createAccessControl || config.writeAccessControl),
     skipValidation: true,
     //queuedBy: otherPropertyNames,
     waitForEvents: true,
-    async execute(properties, { client, service }, emit) {
-      const id = properties[modelPropertyName] || app.generateUid()
-      const entity = await modelRuntime().get(id)
-      if(entity) throw 'exists'
-      const data = extractObjectData(writeableProperties, properties,
-        App.computeDefaults(model, properties, { client, service } ))
-
-      await App.validation.validate({ ...data }, validators,
-        { source: action, action, service, app, client })
-
-      await fireChangeTriggers(context, objectType, null, id,
-          entity ? extractObjectData(writeableProperties, entity, {}) : null, data)
-      emit({
-        type: eventName,
-        [modelPropertyName]: id,
-        data
-      })
-      return id
-    }
+    execute: () => { throw new Error("not generated yet") }
   })
-  const action = service.actions[actionName]
   const validators = App.validation.getValidators(action, service, action)
+  const validationContext = { source: action, action }
+  action.execute = getCreateFunction( validators, validationContext, config, context)
+  service.actions[actionName] = action
 }
 
-function defineUpdateAction(config, context) {
+function defineCreateTrigger(config, context) {
+  const {
+    service, app, model, modelPropertyName, modelRuntime, objectType,
+    modelName, writeableProperties
+  } = context
+  const actionName = 'create' + modelName
+  const triggerName = `${service.name}_${actionName}`
+  const trigger = new TriggerDefinition({
+    name: triggerName,
+    properties: { ...model.properties },
+    skipValidation: true,
+    waitForEvents: true,
+    execute:  () => { throw new Error("not generated yet") }
+  })
+  const validators = App.validation.getValidators(trigger, service, trigger)
+  const validationContext = { source: trigger, trigger }
+  trigger.execute = getCreateFunction( validators, validationContext, config, context)
+  service.triggers[triggerName] = [trigger]
+}
+
+function getUpdateFunction( validators, validationContext, config, context) {
   const {
     service, app, model, modelRuntime, modelPropertyName, objectType,
     modelName, writeableProperties
   } = context
   const eventName = modelName + 'Updated'
+  async function execute(properties, { client, service }, emit) {
+    const id = properties[modelPropertyName]
+    const entity = await modelRuntime().get(id)
+    if(!entity) throw 'not_found'
+    const data = App.utils.mergeDeep({},
+      extractObjectData(writeableProperties, properties, entity),
+      App.computeUpdates(model, { ...entity, ...properties }, { client, service })
+    )
+    await App.validation.validate({ ...data }, validators,
+      validationContext)
+    await fireChangeTriggers(context, null, id,
+      entity ? extractObjectData(writeableProperties, entity, {}) : null, data)
+    emit({
+      type: eventName,
+      [modelPropertyName]: id,
+      data
+    })
+  }
+  return execute
+}
+
+function defineUpdateAction(config, context) {
+  const {
+    service, app, model, modelRuntime, modelPropertyName, objectType,
+    modelName, writeableProperties
+  } = context
   const actionName = 'update' + modelName
-  service.actions[actionName] = new ActionDefinition({
+  const triggerName = `${service.name}_${actionName}`
+  const action = new ActionDefinition({
     name: actionName,
     properties: {
       ...(model.properties),
@@ -167,33 +223,66 @@ function defineUpdateAction(config, context) {
     skipValidation: true,
     //queuedBy: otherPropertyNames,
     waitForEvents: true,
-    async execute(properties, { client, service }, emit) {
-      const id = properties[modelPropertyName]
-      const entity = await modelRuntime().get(id)
-      if(!entity) throw 'not_found'
-      const data = extractObjectData(writeableProperties, properties, entity)
-      await App.validation.validate({ ...data }, validators,
-        { source: action, action, service, app, client })
-      await fireChangeTriggers(context, null, id,
-          entity ? extractObjectData(writeableProperties, entity, {}) : null, data)
-      emit({
-        type: eventName,
-        [modelPropertyName]: id,
-        data
-      })
-    }
+    execute: () => { throw new Error("not generated yet") }
   })
-  const action = service.actions[actionName]
   const validators = App.validation.getValidators(action, service, action)
+  const validationContext = { source: action, action }
+  action.execute = getUpdateFunction( validators, validationContext, config, context)
+  service.actions[actionName] = action
 }
 
-function defineDeleteAction(config, context) {
+function defineUpdateTrigger(config, context) {
+  const {
+    service, app, model, modelRuntime, modelPropertyName, objectType,
+    modelName, writeableProperties
+  } = context
+  const actionName = 'update' + modelName
+  const triggerName = `${service.name}_${actionName}`
+  const trigger = new TriggerDefinition({
+    name: triggerName,
+    properties: {
+      ...(model.properties),
+      [modelPropertyName]: {
+        type: modelPropertyName
+      }
+    },
+    skipValidation: true,
+    waitForEvents: true,
+    execute: () => { throw new Error("not generated yet") }
+  })
+  const validators = App.validation.getValidators(trigger, service, trigger)
+  const validationContext = { source: trigger, trigger }
+  trigger.execute = getUpdateFunction( validators, validationContext, config, context)
+  service.triggers[triggerName] = [trigger]
+}
+
+function getDeleteFunction(config, context) {
   const {
     service, app, model, modelRuntime, modelPropertyName, objectType,
     otherPropertyNames, modelName, writeableProperties,
   } = context
   const eventName = modelName + 'Deleted'
+  async function execute(properties, { client, service }, emit) {
+    const id = properties[modelPropertyName]
+    const entity = await modelRuntime().get(id)
+    if(!entity) throw new Error('not_found')
+    await fireChangeTriggers(context, objectType, null, id,
+      entity ? extractObjectData(writeableProperties, entity, {}) : null, null)
+    emit({
+      type: eventName,
+      [modelPropertyName]: id
+    })
+  }
+  return execute
+}
+
+function defineDeleteAction(config, context) {
+  const {
+    service, app, model, modelRuntime, modelPropertyName, objectType,
+    modelName, writeableProperties
+  } = context
   const actionName = 'delete' + modelName
+  const triggerName = `${service.name}_${actionName}`
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
     properties: {
@@ -206,20 +295,31 @@ function defineDeleteAction(config, context) {
     accessControl: entityAccessControl(context, config.deleteAccessControl || config.writeAccessControl),
     skipValidation: true,
     waitForEvents: true,
-    async execute(properties, { client, service }, emit) {
-      const id = properties[modelPropertyName]
-      const entity = await modelRuntime().get(id)
-      if(!entity) throw new Error('not_found')
-      await fireChangeTriggers(context, objectType, null, id,
-          entity ? extractObjectData(writeableProperties, entity, {}) : null, null)
-      emit({
-        type: eventName,
-        [modelPropertyName]: id
-      })
-    }
+    execute: getDeleteFunction(config, context)
   })
 }
 
+function defineDeleteTrigger(config, context) {
+  const {
+    service, app, model, modelRuntime, modelPropertyName, objectType,
+    modelName, writeableProperties
+  } = context
+  const actionName = 'delete' + modelName
+  const triggerName = `${service.name}_${actionName}`
+  service.triggers[triggerName] = [new TriggerDefinition({
+    name: actionName,
+    properties: {
+      ...(model.properties),
+      [modelPropertyName]: {
+        type: modelPropertyName
+      }
+    },
+    skipValidation: true,
+    waitForEvents: true,
+    execute: getDeleteFunction(config, context)
+  })]
+}
+
 export default function(service, app) {
   if (!service) throw new Error("no service")
   if (!app) throw new Error("no app")
@@ -253,15 +353,17 @@ export default function(service, app) {
       modelName, writeableProperties, annotation, objectType
     }
 
-    if (config.readAccess || config.readAccessControl || config.writeAccessControl) {
-      defineView(config, context)
-    }
+    defineView(config, context, config.readAccess || config.readAccessControl || config.writeAccessControl)
     /// TODO: multiple views with limited fields
 
     defineCreatedEvent(config, context)
     defineUpdatedEvent(config, context)
     defineDeletedEvent(config, context)
 
+    defineCreateTrigger(config, context)
+    defineUpdateTrigger(config, context)
+    defineDeleteTrigger(config, context)
+
     if (config.createAccess || config.writeAccess || config.createAccessControl || config.writeAccessControl) {
       defineCreateAction(config, context)
     }

package/itemOf.js

@@ -10,7 +10,10 @@ import {
 } from './itemEvents.js'
 
 import {
-  defineView, defineCreateAction, defineUpdateAction, defineDeleteAction, defineSortIndex,
+  defineView,
+  defineCreateAction, defineUpdateAction, defineDeleteAction,
+  defineCreateTrigger, defineUpdateTrigger, defineDeleteTrigger, defineCopyTrigger,
+  defineSortIndex,
   defineCopyAction, defineCopyOnParentCopyTrigger
 } from './pluralRelationUtils.js'
 
@@ -31,9 +34,8 @@ export default function(service, app) {
       }
     }
 
-    if(config.readAccess || config.readAccessControl || config.writeAccessControl) {
-      defineView(config, context)
-    }
+    defineView(config, context,
+      config.readAccess || config.readAccessControl || config.writeAccessControl)
     /// TODO: multiple views with limited fields
 
     defineCreatedEvent(config, context)
@@ -43,6 +45,11 @@ export default function(service, app) {
     defineDeleteByOwnerEvents(config, context)
     defineCopyEvent(config, context)
 
+    defineCreateTrigger(config, context)
+    defineUpdateTrigger(config, context)
+    defineDeleteTrigger(config, context)
+    defineCopyTrigger(config, context)
+
     if(config.createAccess || config.writeAccess || config.createAccessControl || config.writeAccessControl) {
       defineCreateAction(config, context)
     }

package/itemOfAny.js

@@ -9,7 +9,10 @@ import {
 } from './itemEvents.js'
 
 import {
-  defineView, defineCreateAction, defineUpdateAction, defineDeleteAction, defineSortIndex
+  defineView,
+  defineCreateAction, defineUpdateAction, defineDeleteAction,
+  defineCreateTrigger, defineUpdateTrigger, defineDeleteTrigger,
+  defineSortIndex
 } from './pluralRelationAnyUtils.js'
 
 export default function(service, app) {
@@ -28,10 +31,9 @@ export default function(service, app) {
       }
     }
 
-    if(config.readAccess || config.writeAccess || config.readAccessControl || config.writeAccessControl) {
-      defineView(config, context)
-      // TODO: multiple views with all properties combinations
-    }
+    defineView(config, context,
+      config.readAccess || config.writeAccess || config.readAccessControl || config.writeAccessControl)
+    /// TODO: multiple views with all properties combinations
     /// TODO: multiple views with limited fields
 
     defineCreatedEvent(config, context)
@@ -40,6 +42,10 @@ export default function(service, app) {
     defineDeletedEvent(config, context)
     defineDeleteByOwnerEvents(config, context, generateAnyId)
 
+    defineCreateTrigger(config, context)
+    defineUpdateTrigger(config, context)
+    defineDeleteTrigger(config, context)
+
     if(config.createAccess || config.writeAccess || config.createAccessControl || config.writeAccessControl) {
       defineCreateAction(config, context)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/relations-plugin",
-  "version": "0.8.24",
+  "version": "0.8.25",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,8 +22,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/framework": "^0.8.24",
+    "@live-change/framework": "^0.8.25",
     "pluralize": "^8.0.0"
   },
-  "gitHead": "63e942caccbcb1c9bfbd1a3ef1d097124514c5a7"
+  "gitHead": "1aa24b8ec3bfaa3576b72b514b2a97b061cb57fc"
 }