@live-change/relations-plugin 0.7.32 → 0.7.34

package/changeTriggers.js

@@ -0,0 +1,115 @@
+const {extractObjectData} = require("./utils.js")
+const App = require("@live-change/framework");
+const {
+  TriggerDefinition
+} = App
+
+async function fireChangeTriggers(context, objectType, identifiers, object, oldData, data) {
+  const { service, modelName } = context
+  const changeType = data ? (oldData ? 'update' : 'create') : 'delete'
+  await Promise.all([
+    service.trigger({
+      type: changeType+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
+      objectType,
+      object,
+      identifiers,
+      data,
+      oldData
+    }),
+    service.trigger({
+      type: changeType+'Object',
+      objectType,
+      object,
+      identifiers,
+      data,
+      oldData
+    })
+  ])
+}
+
+async function triggerDeleteOnParentDeleteTriggers(
+    context, propertyName, path, objectType, object, emit) {
+  const {
+    service, modelRuntime, identifiers, objectType: myType, writeableProperties, modelName,
+    reverseRelationWord
+  } = context
+  const indexName = 'by' + propertyName[0].toUpperCase() + propertyName.slice(1)
+  const bucketSize = 32
+  let found = false
+  let bucket
+  let gt = ''
+  do {
+    const bucket = await modelRuntime.sortedIndexRangeGet(indexName, path, {
+      gt,
+      limit: bucketSize
+    })
+    if (bucket.length > 0) found = true
+    gt = bucket[bucket.length - 1].id
+    const deleteTriggerPromises = bucket.map(entity => {
+      return (async () => {
+        await fireChangeTriggers(context, myType, identifiers, entity.to,
+            extractObjectData(writeableProperties, entity, {}), null)
+      })()
+    })
+    await Promise.all(deleteTriggerPromises)
+  } while (bucket.length == bucketSize)
+  if (found) {
+    const eventName = propertyName + reverseRelationWord + modelName + 'DeleteByOwner'
+    emit({
+      type: eventName,
+      ownerType: objectType,
+      owner: object
+    })
+  }
+}
+
+function registerParentDeleteTriggers(context, config) {
+  const {
+    service, parentsTypes, otherPropertyNames,
+  } = context
+  if(parentsTypes) {
+    for (const index in parentsTypes) {
+      const otherType = parentsTypes[index]
+      const propertyName = otherPropertyNames[index]
+      const triggerName = 'delete' + otherType[0].toUpperCase() + otherType.slice(1)
+      if (!service.triggers[triggerName]) service.triggers[triggerName] = []
+      service.triggers[triggerName].push(new TriggerDefinition({
+        name: triggerName,
+        properties: {
+          object: {
+            type: String
+          }
+        },
+        async execute({object}, {client, service}, emit) {
+          await triggerDeleteOnParentDeleteTriggers(context, propertyName, [object],
+              otherType, object, emit)
+        }
+      }))
+    }
+  } else {
+    const triggerName = 'deleteObject'
+    if(!service.triggers[triggerName]) service.triggers[triggerName] = []
+    service.triggers[triggerName].push(new TriggerDefinition({
+      name: triggerName,
+      properties: {
+        objectType: {
+          type: String,
+        },
+        object: {
+          type: String
+        }
+      },
+      async execute({ objectType, object }, {client, service}, emit) {
+        for(const propertyName of otherPropertyNames) {
+          await triggerDeleteOnParentDeleteTriggers(context, propertyName, [objectType, object],
+              objectType, object, emit)
+        }
+      }
+    }))
+  }
+}
+
+module.exports = {
+  fireChangeTriggers,
+  registerParentDeleteTriggers
+}

package/entity.js

@@ -3,6 +3,7 @@ const {
   processModelsAnnotation, extractIdParts, extractIdentifiers, extractObjectData
 } = require('./utils.js')
 const App = require("@live-change/framework")
+const {fireChangeTriggers} = require("./changeTriggers.js");
 const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition } = App
 
 const annotation = 'entity'
@@ -16,7 +17,7 @@ function entityAccessControl({service, modelName, modelPropertyName}, accessCont
 }
 
 function defineView(config, context) {
-  const { service, modelRuntime, modelPropertyName, modelName, others, model } = context
+  const { service, modelRuntime, modelPropertyName, modelName, model } = context
   const viewName = (config.prefix || '' ) + (config.prefix ? modelName : modelPropertyName) + (config.suffix || '')
   service.views[viewName] = new ViewDefinition({
     name: viewName,
@@ -84,7 +85,7 @@ function defineDeletedEvent(config, context) {
 
 function defineCreateAction(config, context) {
   const {
-    service, app, model,  defaults, modelPropertyName, modelRuntime,
+    service, app, model,  defaults, modelPropertyName, modelRuntime, objectType,
     modelName, writeableProperties
   } = context
   const eventName = modelName + 'Created'
@@ -106,6 +107,9 @@ function defineCreateAction(config, context) {
       const data = extractObjectData(writeableProperties, properties, defaults)
       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,
@@ -120,7 +124,7 @@ function defineCreateAction(config, context) {
 
 function defineUpdateAction(config, context) {
   const {
-    service, app, model, modelRuntime, modelPropertyName,
+    service, app, model, modelRuntime, modelPropertyName, objectType,
     modelName, writeableProperties
   } = context
   const eventName = modelName + 'Updated'
@@ -145,6 +149,8 @@ function defineUpdateAction(config, context) {
       const data = extractObjectData(writeableProperties, properties, entity)
       await App.validation.validate({ ...identifiers, ...data }, validators,
         { source: action, action, service, app, client })
+      await fireChangeTriggers(context, null, id,
+          entity ? extractObjectData(writeableProperties, entity, {}) : null, data)
       emit({
         type: eventName,
         [modelPropertyName]: id,
@@ -158,8 +164,8 @@ function defineUpdateAction(config, context) {
 
 function defineDeleteAction(config, context) {
   const {
-    service, app, model, modelRuntime, modelPropertyName,
-    otherPropertyNames, modelName,
+    service, app, model, modelRuntime, modelPropertyName, objectType,
+    otherPropertyNames, modelName, writeableProperties,
   } = context
   const eventName = modelName + 'Deleted'
   const actionName = 'delete' + modelName
@@ -179,18 +185,8 @@ function defineDeleteAction(config, context) {
       const id = properties[modelPropertyName]
       const entity = await modelRuntime().get(id)
       if(!entity) throw new Error('not_found')
-      await Promise.all([
-        service.trigger({
-          type: 'delete'+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
-          objectType: service.name+'_'+modelName,
-          object: id
-        }),
-        service.trigger({
-          type: 'deleteObject',
-          objectType: service.name+'_'+modelName,
-          object: id
-        })
-      ])
+      await fireChangeTriggers(context, objectType, null, id,
+          entity ? extractObjectData(writeableProperties, entity, {}) : null, null)
       emit({
         type: eventName,
         [modelPropertyName]: id
@@ -226,10 +222,11 @@ module.exports = function(service, app) {
 
     const writeableProperties = modelProperties || config.writeableProperties
     //console.log("PPP", others)
+    const objectType = service.name + '_' + modelName
 
     const context = {
       service, app, model, originalModelProperties, modelProperties, modelPropertyName, defaults, modelRuntime,
-      modelName, writeableProperties, annotation
+      modelName, writeableProperties, annotation, objectType
     }
 
     if (config.readAccess || config.readAccessControl || config.writeAccessControl) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/relations-plugin",
-  "version": "0.7.32",
+  "version": "0.7.34",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,8 +21,8 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "^0.7.32",
+    "@live-change/framework": "^0.7.34",
     "pluralize": "^8.0.0"
   },
-  "gitHead": "e2f78f57b5d456851eb2dea56b25ac9133a3c909"
+  "gitHead": "730c14caf86069665193ce157b2663358abef342"
 }

package/pluralRelationAnyUtils.js

@@ -1,9 +1,11 @@
 const App = require("@live-change/framework")
 const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition } = App
 const { extractTypeAndIdParts, extractIdentifiersWithTypes, prepareAccessControl } = require("./utilsAny.js")
-const { extractObjectData } = require("./utils.js")
+const { extractObjectData, extractIdentifiers} = require("./utils.js")
 const { extractRange } = App
 
+const { fireChangeTriggers } = require("./changeTriggers.js")
+
 const pluralize = require('pluralize')
 
 function defineView(config, context) {
@@ -49,7 +51,7 @@ function defineView(config, context) {
 
 function defineCreateAction(config, context) {
   const {
-    service, app, model,  defaults, modelPropertyName, modelRuntime,
+    service, app, model,  defaults, modelPropertyName, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Created'
@@ -74,6 +76,7 @@ function defineCreateAction(config, context) {
       const data = extractObjectData(writeableProperties, properties, defaults)
       await App.validation.validate({ ...identifiers, ...data }, validators,
           { source: action, action, service, app, client })
+      await fireChangeTriggers(context, objectType, identifiers, id, null, data)
       emit({
         type: eventName,
         [modelPropertyName]: id,
@@ -88,7 +91,7 @@ function defineCreateAction(config, context) {
 
 function defineUpdateAction(config, context) {
   const {
-    service, app, model, modelRuntime, modelPropertyName,
+    service, app, model, modelRuntime, modelPropertyName, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Updated'
@@ -123,6 +126,8 @@ function defineUpdateAction(config, context) {
       const data = extractObjectData(writeableProperties, properties, entity)
       await App.validation.validate({ ...identifiers, ...data }, validators,
           { source: action, action, service, app, client })
+      await fireChangeTriggers(context, objectType, identifiers, id,
+          extractObjectData(writeableProperties, entity, {}), data)
       emit({
         type: eventName,
         [modelPropertyName]: id,
@@ -137,7 +142,7 @@ function defineUpdateAction(config, context) {
 
 function defineDeleteAction(config, context) {
   const {
-    service, app, model, modelRuntime, modelPropertyName, identifiers,
+    service, app, model, modelRuntime, modelPropertyName, identifiers, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Deleted'
@@ -164,21 +169,12 @@ function defineDeleteAction(config, context) {
       if(!entity) throw new Error('not_found')
       const entityTypeAndIdParts = extractTypeAndIdParts(otherPropertyNames, entity)
       const typeAndIdParts = extractTypeAndIdParts(otherPropertyNames, properties)
+      const identifiers = extractIdentifiers(otherPropertyNames, entity)
       if(JSON.stringify(entityTypeAndIdParts) != JSON.stringify(typeAndIdParts)) {
         throw new Error('not_authorized')
       }
-      await Promise.all([
-        service.trigger({
-          type: 'delete'+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
-          objectType: service.name+'_'+modelName,
-          object: id
-        }),
-        service.trigger({
-          type: 'deleteObject',
-          objectType: service.name+'_'+modelName,
-          object: id
-        })
-      ])
+      await fireChangeTriggers(context, objectType, identifiers, id,
+          extractObjectData(writeableProperties, entity, {}), null)
       emit({
         type: eventName,
         [modelPropertyName]: id

package/pluralRelationUtils.js

@@ -3,6 +3,7 @@ const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition }
 const { extractIdParts, extractIdentifiers, extractObjectData, prepareAccessControl } = require("./utils.js")
 
 const pluralize = require('pluralize')
+const {fireChangeTriggers} = require("./changeTriggers.js")
 
 function defineView(config, context) {
   const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
@@ -43,7 +44,7 @@ function defineView(config, context) {
 
 function defineCreateAction(config, context) {
   const {
-    service, app, model,  defaults, modelPropertyName, modelRuntime,
+    service, app, model,  defaults, modelPropertyName, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Created'
@@ -68,6 +69,7 @@ function defineCreateAction(config, context) {
       const data = extractObjectData(writeableProperties, properties, defaults)
       await App.validation.validate({ ...identifiers, ...data }, validators,
           { source: action, action, service, app, client })
+      await fireChangeTriggers(context, objectType, identifiers, id, null, data)
       emit({
         type: eventName,
         [modelPropertyName]: id,
@@ -82,7 +84,7 @@ function defineCreateAction(config, context) {
 
 function defineUpdateAction(config, context) {
   const {
-    service, app, model, modelRuntime, modelPropertyName,
+    service, app, model, modelRuntime, modelPropertyName, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Updated'
@@ -92,6 +94,10 @@ function defineUpdateAction(config, context) {
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
     properties: {
+      [modelPropertyName]: {
+        type: model,
+        validation: ['nonEmpty']
+      },
       ...(model.properties)
     },
     access: config.updateAccess || config.writeAccess,
@@ -100,6 +106,7 @@ function defineUpdateAction(config, context) {
     //queuedBy: otherPropertyNames,
     waitForEvents: true,
     async execute(properties, { client, service }, emit) {
+      console.log("UPDATE", actionName, properties)
       const id = properties[modelPropertyName]
       const entity = await modelRuntime().get(id)
       if(!entity) throw 'not_found'
@@ -110,8 +117,11 @@ function defineUpdateAction(config, context) {
       }
       const identifiers = extractIdentifiers(otherPropertyNames, properties)
       const data = extractObjectData(writeableProperties, properties, entity)
-      await App.validation.validate({ ...identifiers, ...data }, validators,
+      const dataWithIdentifiers = { [modelPropertyName]: id, ...identifiers, ...data }
+      await App.validation.validate(dataWithIdentifiers, validators,
           { source: action, action, service, app, client })
+      await fireChangeTriggers(context, objectType, identifiers, id,
+          extractObjectData(writeableProperties, entity, {}), data)
       emit({
         type: eventName,
         [modelPropertyName]: id,
@@ -126,7 +136,7 @@ function defineUpdateAction(config, context) {
 
 function defineDeleteAction(config, context) {
   const {
-    service, app, model, modelRuntime, modelPropertyName,
+    service, app, model, modelRuntime, modelPropertyName, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Deleted'
@@ -136,6 +146,10 @@ function defineDeleteAction(config, context) {
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
     properties: {
+      [modelPropertyName]: {
+        type: model,
+        validation: ['nonEmpty']
+      },
       ...(model.properties)
     },
     access: config.deleteAccess || config.writeAccess,
@@ -149,21 +163,12 @@ function defineDeleteAction(config, context) {
       if(!entity) throw new Error('not_found')
       const entityIdParts = extractIdParts(otherPropertyNames, entity)
       const idParts = extractIdParts(otherPropertyNames, properties)
+      const identifiers = extractIdentifiers(otherPropertyNames, entity)
       if(JSON.stringify(entityIdParts) != JSON.stringify(idParts)) {
         throw new Error('not_authorized')
       }
-      await Promise.all([
-        service.trigger({
-          type: 'delete'+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
-          objectType: service.name+'_'+modelName,
-          object: id
-        }),
-        service.trigger({
-          type: 'deleteObject',
-          objectType: service.name+'_'+modelName,
-          object: id
-        })
-      ])
+      await fireChangeTriggers(context, objectType, identifiers, id,
+          extractObjectData(writeableProperties, entity, {}), null)
       emit({
         type: eventName,
         [modelPropertyName]: id

package/singularRelationAnyUtils.js

@@ -5,6 +5,7 @@ const { extractObjectData } = require("./utils.js")
 const { allCombinations } = require("./combinations.js")
 
 const pluralize = require('pluralize')
+const {fireChangeTriggers} = require("./changeTriggers.js");
 
 function createIdentifiersProperties(keys) {
   const identifiers = {}
@@ -92,7 +93,7 @@ function defineRangeViews(config, context) {
 
 function defineSetAction(config, context) {
   const {
-    service, app, model, defaults,
+    service, app, model, defaults, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
 
@@ -115,6 +116,7 @@ function defineSetAction(config, context) {
       const data = extractObjectData(writeableProperties, properties, defaults)
       await App.validation.validate({ ...identifiers, ...data }, validators,
           { source: action, action, service, app, client })
+      await fireChangeTriggers(context, objectType, identifiers, id, null, data)
       emit({
         type: eventName,
         identifiers, data
@@ -127,7 +129,7 @@ function defineSetAction(config, context) {
 
 function defineUpdateAction(config, context) {
   const {
-    service, app, model, modelRuntime,
+    service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Updated'
@@ -152,6 +154,8 @@ function defineUpdateAction(config, context) {
       const data = extractObjectData(writeableProperties, properties, entity)
       await App.validation.validate({ ...identifiers, ...data }, validators,
           { source: action, action, service, app, client })
+      await fireChangeTriggers(context, objectType, identifiers, id,
+          entity ? extractObjectData(writeableProperties, entity, {}) : null, data)
       emit({
         type: eventName,
         identifiers, data
@@ -164,7 +168,7 @@ function defineUpdateAction(config, context) {
 
 function defineSetOrUpdateAction(config, context) {
   const {
-    service, app, model, modelRuntime, defaults,
+    service, app, model, modelRuntime, defaults, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Updated'
@@ -188,6 +192,8 @@ function defineSetOrUpdateAction(config, context) {
       const data = extractObjectData(writeableProperties, properties, { ...defaults, ...entity } )
       await App.validation.validate({ ...identifiers, ...data }, validators,
           { source: action, action, service, app, client })
+      await fireChangeTriggers(context, objectType, identifiers, id,
+          entity ? extractObjectData(writeableProperties, entity, {}) : null, data)
       emit({
         type: eventName,
         identifiers, data
@@ -200,7 +206,7 @@ function defineSetOrUpdateAction(config, context) {
 
 function defineResetAction(config, context) {
   const {
-    service, modelRuntime, modelPropertyName, identifiers,
+    service, modelRuntime, modelPropertyName, identifiers, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Reset'
@@ -225,18 +231,8 @@ function defineResetAction(config, context) {
       const id = generateAnyId(otherPropertyNames, properties)
       const entity = await modelRuntime().get(id)
       if (!entity) throw new Error('not_found')
-      await Promise.all([
-        service.trigger({
-          type: 'delete'+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
-          objectType: service.name+'_'+modelName,
-          object: id
-        }),
-        service.trigger({
-          type: 'deleteObject',
-          objectType: service.name+'_'+modelName,
-          object: id
-        })
-      ])
+      await fireChangeTriggers(context, objectType, identifiers, id,
+          entity ? extractObjectData(writeableProperties, entity, {}) : null, null)
       emit({
         type: eventName,
         identifiers

package/singularRelationUtils.js

@@ -3,6 +3,7 @@ const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition }
 const {
   extractIdentifiers, extractObjectData, generateId, extractIdParts, prepareAccessControl
 } = require("./utils.js")
+const {fireChangeTriggers} = require("./changeTriggers.js");
 
 function defineView(config, context) {
   const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
@@ -39,7 +40,7 @@ function defineView(config, context) {
 
 function defineSetAction(config, context) {
   const {
-    service, app, model,  defaults,
+    service, app, model, defaults, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Set'
@@ -57,10 +58,13 @@ function defineSetAction(config, context) {
     queuedBy: otherPropertyNames,
     waitForEvents: true,
     async execute(properties, { client, service }, emit) {
+      const idParts = extractIdParts(otherPropertyNames, properties)
+      const id = idParts.length > 1 ? idParts.map(p => JSON.stringify(p)).join(':') : idParts[0]
       const identifiers = extractIdentifiers(otherPropertyNames, properties)
       const data = extractObjectData(writeableProperties, properties, defaults)
       await App.validation.validate({ ...identifiers, ...data }, validators,
           { source: action, action, service, app, client })
+      await fireChangeTriggers(context, objectType, identifiers, id, null, data)
       emit({
         type: eventName,
         identifiers, data
@@ -73,7 +77,7 @@ function defineSetAction(config, context) {
 
 function defineUpdateAction(config, context) {
   const {
-    service, app, model, modelRuntime,
+    service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Updated'
@@ -98,6 +102,9 @@ function defineUpdateAction(config, context) {
       const data = extractObjectData(writeableProperties, properties, entity)
       await App.validation.validate({ ...identifiers, ...data }, validators,
           { source: action, action, service, app, client })
+      const oldData = extractObjectData(writeableProperties, entity, {})
+      await fireChangeTriggers(context, objectType, identifiers, id,
+          entity ? extractObjectData(writeableProperties, entity, {}) : null, data)
       emit({
         type: eventName,
         identifiers, data
@@ -110,7 +117,7 @@ function defineUpdateAction(config, context) {
 
 function defineSetOrUpdateAction(config, context) {
   const {
-    service, app, model, defaults, modelRuntime,
+    service, app, model, defaults, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Updated'
@@ -134,6 +141,8 @@ function defineSetOrUpdateAction(config, context) {
       const data = extractObjectData(writeableProperties, properties, { ...defaults, ...entity })
       await App.validation.validate({ ...identifiers, ...data }, validators,
           { source: action, action, service, app, client })
+      await fireChangeTriggers(context, objectType, identifiers, id,
+          entity ? extractObjectData(writeableProperties, entity, {}) : null, data)
       emit({
         type: eventName,
         identifiers, data
@@ -146,8 +155,8 @@ function defineSetOrUpdateAction(config, context) {
 
 function defineResetAction(config, context) {
   const {
-    service, modelRuntime, modelPropertyName,
-    otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model, others
+    service, modelRuntime, modelPropertyName, objectType,
+    otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model, others, writeableProperties
   } = context
   const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Reset'
   const actionName = 'reset' + joinedOthersClassName + 'Owned' + modelName
@@ -170,18 +179,8 @@ function defineResetAction(config, context) {
       const id = generateId(otherPropertyNames, properties)
       const entity = await modelRuntime().get(id)
       if (!entity) throw new Error('not_found')
-      await Promise.all([
-        service.trigger({
-          type: 'delete'+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
-          objectType: service.name+'_'+modelName,
-          object: id
-        }),
-        service.trigger({
-          type: 'deleteObject',
-          objectType: service.name+'_'+modelName,
-          object: id
-        })
-      ])
+      await fireChangeTriggers(context, objectType, identifiers, id,
+          entity ? extractObjectData(writeableProperties, entity, {}) : null, null)
       emit({
         type: eventName,
         identifiers

package/utils.js

@@ -1,6 +1,7 @@
 const App = require("@live-change/framework")
 const app = App.app()
-const { allCombinations } = require("./combinations.js");
+const { allCombinations } = require("./combinations.js")
+const { fireChangeTriggers, registerParentDeleteTriggers } = require("./changeTriggers.js")
 const {
   PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition, TriggerDefinition
 } = App
@@ -113,16 +114,18 @@ function processModelsAnnotation(service, app, annotation, multiple, cb) {
         const others = what.map(other => other.getTypeName ? other.getTypeName() : (other.name ? other.name : other))
 
         const writeableProperties = modelProperties || config.writeableProperties
-        //console.log("PPP", others)
-        const otherPropertyNames = what.map(other => other.name ? other.name : other)
-        const joinedOthersPropertyName = (otherPropertyNames[0][0].toLowerCase() + otherPropertyNames[0].slice(1)) +
-            (others.length > 1 ? ('And' + others.slice(1).join('And')) : '')
-        const joinedOthersClassName = others.join('And')
+        const otherNames = what.map(other => other.name ? other.name : other)
+        const otherPropertyNames = otherNames.map(name => name[0].toLowerCase() + name.slice(1))
+
+        const joinedOthersPropertyName = (otherNames[0][0].toLowerCase() + otherNames[0].slice(1)) +
+            (otherNames.length > 1 ? ('And' + otherNames.slice(1).join('And')) : '')
+        const joinedOthersClassName = otherNames.join('And')
+        const objectType = service.name + '_' + modelName
 
         const context = {
           service, app, model, originalModelProperties, modelProperties, modelPropertyName, defaults, modelRuntime,
           otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName,
-          others, annotation
+          others, annotation, objectType, parentsType: others
         }
 
         cb(config, context)
@@ -188,62 +191,7 @@ function defineDeleteByOwnerEvents(config, context, generateId) {
 }
 
 function defineParentDeleteTriggers(config, context) {
-  const {
-    service, modelRuntime, modelPropertyName, identifiers, others,
-    otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model,
-    reverseRelationWord
-  } = context
-  for(const index in others) {
-    const otherType = others[index]
-    const propertyName = otherPropertyNames[index]
-    const triggerName = 'delete' + otherType[0].toUpperCase() + otherType.slice(1)
-    if(!service.triggers[triggerName]) service.triggers[triggerName] = []
-    service.triggers[triggerName].push(new TriggerDefinition({
-      name: triggerName,
-      properties: {
-        object: {
-          type: String
-        }
-      },
-      async execute({ object }, {client, service}, emit) {
-        const tableName = modelRuntime().tableName
-        const prefix = JSON.stringify(object)
-        const indexName = tableName + 'by' + propertyName[0].toUpperCase() + propertyName.slice(1)
-        const bucketSize = 32
-        let found = false
-        let bucket
-        do {
-          bucket = await app.dao.get(['database', 'indexRange', app.databaseName, indexName, {
-            gte: prefix + ':',
-            lte: prefix + '_\xFF\xFF\xFF\xFF',
-            limit: bucketSize
-          }])
-          if(bucket.length > 0) found = true
-          const deleteTriggerPromises = bucket.map(({to}) => [
-            service.trigger({
-              type: 'delete'+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
-              objectType: service.name+'_'+modelName,
-              object: to
-            }),
-            service.trigger({
-              type: 'deleteObject',
-              objectType: service.name+'_'+modelName,
-              object: to
-            })
-          ]).flat()
-          await Promise.all(deleteTriggerPromises)
-        } while (bucket.length == bucketSize)
-        if(found) {
-          const eventName = propertyName + reverseRelationWord + modelName + 'DeleteByOwner'
-          emit({
-            type: eventName,
-            owner: object
-          })
-        }
-        await Promise.all(promises)
-      }
-    }))
-  }
+  registerParentDeleteTriggers(context, config)
 }
 
 module.exports = {

package/utilsAny.js

@@ -4,6 +4,8 @@ const {
   PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition, TriggerDefinition
 } = App
 const { allCombinations } = require("./combinations.js")
+const {fireChangeTriggers, registerParentDeleteTriggers} = require("./changeTriggers");
+const {extractObjectData} = require("./utils.js");
 
 function extractTypeAndIdParts(otherPropertyNames, properties) {
   const typeAndIdParts = []
@@ -115,10 +117,14 @@ function processModelsAnyAnnotation(service, app, annotation, multiple, cb) {
         const joinedOthersPropertyName = otherPropertyNames[0] +
             (others.length > 1 ? ('And' + others.slice(1).join('And')) : '')
         const joinedOthersClassName = others.join('And')
+        const objectType = service.name + '_' + modelName
+
+        const { parentsTypes } = config
 
         const context = {
           service, app, model, originalModelProperties, modelProperties, modelPropertyName, defaults, modelRuntime,
-          otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
+          otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others,
+          objectType, parentsTypes
         }
 
         cb(config, context)
@@ -183,64 +189,7 @@ function defineDeleteByOwnerEvents(config, context, generateId) {
 }
 
 function defineParentDeleteTrigger(config, context) {
-  const {
-    service, modelRuntime, modelPropertyName, identifiers,
-    otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model,
-    reverseRelationWord
-  } = context
-  const triggerName = 'deleteObject'
-  if(!service.triggers[triggerName]) service.triggers[triggerName] = []
-  service.triggers[triggerName].push(new TriggerDefinition({
-    name: triggerName,
-    properties: {
-      objectType: {
-        type: String,
-      },
-      object: {
-        type: String
-      }
-    },
-    async execute({ objectType, object }, {client, service}, emit) {
-      const tableName = modelRuntime().tableName
-      const prefix = JSON.stringify(objectType) + ':' + JSON.stringify(object)
-      const promises = otherPropertyNames.map(async (propertyName) => {
-        const indexName = tableName + '_by' + propertyName[0].toUpperCase() + propertyName.slice(1)
-        const bucketSize = 32
-        let found = false
-        let bucket
-        do {
-          bucket = await app.dao.get(['database', 'indexRange', app.databaseName, indexName, {
-            gte: prefix + ':',
-            lte: prefix + '_\xFF\xFF\xFF\xFF',
-            limit: bucketSize
-          }])
-          if(bucket.length > 0) found = true
-          const deleteTriggerPromises = bucket.map(({to}) => [
-            service.trigger({
-              type: 'delete'+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
-              objectType: service.name+'_'+modelName,
-              object: to
-            }),
-            service.trigger({
-              type: 'deleteObject',
-              objectType: service.name+'_'+modelName,
-              object: to
-            })
-          ]).flat()
-          await Promise.all(deleteTriggerPromises)
-        } while (bucket.length == bucketSize)
-        if(found) {
-          const eventName = propertyName + reverseRelationWord + modelName + 'DeleteByOwner'
-          emit({
-            type: eventName,
-            ownerType: objectType,
-            owner: object
-          })
-        }
-      })
-      await Promise.all(promises)
-    }
-  }))
+  registerParentDeleteTriggers(context, config)
 }
 
 module.exports = {