@live-change/relations-plugin 0.9.42 → 0.9.44

package/changeTriggers.js

@@ -3,23 +3,24 @@ import {
   TriggerDefinition
 } from "@live-change/framework"
 
-async function fireChangeTriggers(context, objectType, identifiers, object, oldData, data) {
+async function fireChangeTriggers(context, objectType, identifiers, object, oldData, data,
+     trigger = (...args) => app.trigger(...args)) {
   const { service, modelName, app } = context
   const changeType = data ? (oldData ? 'update' : 'create') : 'delete'
   //console.log("FIRE CHANGE TRIGGERS", { context, objectType, identifiers, object, oldData, data })
   //console.trace()
   const triggerParameters = { objectType, object, identifiers, data, oldData, changeType }
   await Promise.all([
-    app.trigger({
+    trigger({
       type: changeType + service.name[0].toUpperCase() + service.name.slice(1) + '_' + modelName,
     }, triggerParameters),
-    app.trigger({
+    trigger({
       type: changeType + 'Object',
     }, triggerParameters),
-    app.trigger({
+    trigger({
       type: 'change' + service.name[0].toUpperCase() + service.name.slice(1) + '_' + modelName,
     }, triggerParameters),
-    app.trigger({
+    trigger({
       type: 'changeObject',
     }, triggerParameters)
   ])

package/entity.js

@@ -142,7 +142,7 @@ function getCreateFunction( validators, validationContext, config, context) {
     modelName, writeableProperties
   } = context
   const eventName = modelName + 'Created'
-  async function execute(properties, { client, service }, emit) {
+  async function execute(properties, { client, service, trigger }, emit) {
     const id = properties[modelPropertyName] || app.generateUid()
     const entity = await modelRuntime().get(id)
     if(entity) throw 'exists'
@@ -153,7 +153,7 @@ function getCreateFunction( validators, validationContext, config, context) {
       validationContext)
 
     await fireChangeTriggers(context, objectType, null, id,
-      entity ? extractObjectData(writeableProperties, entity, {}) : null, data)
+      entity ? extractObjectData(writeableProperties, entity, {}) : null, data, trigger)
     emit({
       type: eventName,
       [modelPropertyName]: id,
@@ -213,7 +213,7 @@ function getUpdateFunction( validators, validationContext, config, context) {
     modelName, writeableProperties
   } = context
   const eventName = modelName + 'Updated'
-  async function execute(properties, { client, service }, emit) {
+  async function execute(properties, { client, service, trigger }, emit) {
     const id = properties[modelPropertyName]
     const entity = await modelRuntime().get(id)
     if(!entity) throw 'not_found'
@@ -224,7 +224,7 @@ function getUpdateFunction( validators, validationContext, config, context) {
     await App.validation.validate({ ...data }, validators,
       validationContext)
     await fireChangeTriggers(context, objectType, null, id,
-      entity ? extractObjectData(writeableProperties, entity, {}) : null, data)
+      entity ? extractObjectData(writeableProperties, entity, {}) : null, data, trigger)
     emit({
       type: eventName,
       [modelPropertyName]: id,
@@ -293,12 +293,12 @@ function getDeleteFunction(config, context) {
     otherPropertyNames, modelName, writeableProperties,
   } = context
   const eventName = modelName + 'Deleted'
-  async function execute(properties, { client, service }, emit) {
+  async function execute(properties, { client, service, trigger }, 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)
+      entity ? extractObjectData(writeableProperties, entity, {}) : null, null, trigger)
     emit({
       type: eventName,
       [modelPropertyName]: id

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/relations-plugin",
-  "version": "0.9.42",
+  "version": "0.9.44",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,8 +22,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/framework": "^0.9.42",
+    "@live-change/framework": "^0.9.44",
     "pluralize": "^8.0.0"
   },
-  "gitHead": "6571e1434eed33df905a7708aad783e9339968f1"
+  "gitHead": "6e9cf980b2ac6e4e7d78955cbf97ae1c2963bcab"
 }

package/pluralRelationAnyUtils.js

@@ -99,7 +99,7 @@ function getCreateFunction( validators, validationContext, config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const eventName = modelName + 'Created'
-  return async function execute(properties, { client, service }, emit) {
+  return async function execute(properties, { client, service, trigger }, emit) {
     const id = properties[modelPropertyName] || app.generateUid()
     const entity = await modelRuntime().get(id)
     if(entity) throw 'exists'
@@ -108,7 +108,7 @@ function getCreateFunction( validators, validationContext, config, context) {
       App.computeDefaults(model, properties, { client, service } ))
     await App.validation.validate({ ...identifiers, ...data }, validators,
       validationContext)
-    await fireChangeTriggers(context, objectType, identifiers, id, null, data)
+    await fireChangeTriggers(context, objectType, identifiers, id, null, data, trigger)
     emit({
       type: eventName,
       [modelPropertyName]: id,
@@ -177,7 +177,7 @@ function getUpdateFunction( validators, validationContext, config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const eventName = modelName + 'Updated'
-  return async function execute(properties, { client, service }, emit) {
+  return async function execute(properties, { client, service, trigger }, emit) {
     const id = properties[modelPropertyName]
     if(!id) throw new Error('no_id')
     const entity = await modelRuntime().get(id)
@@ -197,7 +197,7 @@ function getUpdateFunction( validators, validationContext, config, context) {
     await App.validation.validate({ ...identifiers, ...data, [modelPropertyName]: id }, validators,
       validationContext)
     await fireChangeTriggers(context, objectType, identifiers, id,
-      extractObjectData(writeableProperties, entity, {}), data)
+      extractObjectData(writeableProperties, entity, {}), data, trigger)
     emit({
       type: eventName,
       [modelPropertyName]: id,
@@ -276,7 +276,7 @@ function getDeleteFunction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const eventName = modelName + 'Deleted'
-  return async function execute(properties, { client, service }, emit) {
+  return async function execute(properties, { client, service, trigger }, emit) {
     const id = properties[modelPropertyName]
     const entity = await modelRuntime().get(id)
     if(!entity) throw 'not_found'
@@ -286,7 +286,7 @@ function getDeleteFunction(config, context) {
       throw 'not_authorized'
     }
     await fireChangeTriggers(context, objectType, extractIdentifiers(otherPropertyNames, entity), id,
-      extractObjectData(writeableProperties, entity, {}), null)
+      extractObjectData(writeableProperties, entity, {}), null, trigger)
     emit({
       type: eventName,
       [modelPropertyName]: id

package/pluralRelationUtils.js

@@ -94,7 +94,7 @@ function getCreateFunction( validators, validationContext, config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = modelName + 'Created'
-  return async function execute(properties, { client, service }, emit) {
+  return async function execute(properties, { client, service, trigger }, emit) {
     const id = properties[modelPropertyName] || app.generateUid()
     const entity = await modelRuntime().get(id)
     if(entity) throw 'exists'
@@ -103,7 +103,7 @@ function getCreateFunction( validators, validationContext, config, context) {
       App.computeDefaults(model, properties, { client, service } ))
     await App.validation.validate({ ...identifiers, ...data }, validators,
       validationContext)
-    await fireChangeTriggers(context, objectType, identifiers, id, null, data)
+    await fireChangeTriggers(context, objectType, identifiers, id, null, data, trigger)
     emit({
       type: eventName,
       [modelPropertyName]: id,
@@ -169,7 +169,7 @@ function getUpdateFunction( validators, validationContext, config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = modelName + 'Updated'
-  return async function execute(properties, { client, service }, emit) {
+  return async function execute(properties, { client, service, trigger }, emit) {
     const id = properties[modelPropertyName]
     const entity = await modelRuntime().get(id)
     if(!entity) throw 'not_found'
@@ -186,7 +186,7 @@ function getUpdateFunction( validators, validationContext, config, context) {
     await App.validation.validate({ ...identifiers, ...data, [modelPropertyName]: id }, validators,
       validationContext)
     await fireChangeTriggers(context, objectType, identifiers, id,
-      extractObjectData(writeableProperties, entity, {}), data)
+      extractObjectData(writeableProperties, entity, {}), data, trigger)
     emit({
       type: eventName,
       [modelPropertyName]: id,
@@ -262,7 +262,7 @@ function getDeleteFunction( validators, validationContext, config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = modelName + 'Deleted'
-  return async function execute(properties, { client, service }, emit) {
+  return async function execute(properties, { client, service, trigger }, emit) {
     const id = properties[modelPropertyName]
     const entity = await modelRuntime().get(id)
     if(!entity) throw 'not_found'
@@ -273,7 +273,7 @@ function getDeleteFunction( validators, validationContext, config, context) {
     }
     const identifiers = extractIdentifiers(otherPropertyNames, entity)
     await fireChangeTriggers(context, objectType, identifiers, id,
-      extractObjectData(writeableProperties, entity, {}), null)
+      extractObjectData(writeableProperties, entity, {}), null, trigger)
     emit({
       type: eventName,
       [modelPropertyName]: id
@@ -348,7 +348,7 @@ function getCopyFunction( validators, validationContext, config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = modelName + 'Copied'
-  return async function execute(properties, { client, service }, emit) {
+  return async function execute(properties, { client, service, trigger }, emit) {
     const id = properties[modelPropertyName]
     const entity = await modelRuntime().get(id)
     if(!entity) throw new Error('not_found')
@@ -382,7 +382,7 @@ function getCopyFunction( validators, validationContext, config, context) {
         identifiers,
         data: updatedData
       })
-    await fireChangeTriggers(context, objectType, identifiers, newId, null, updatedData)
+    await fireChangeTriggers(context, objectType, identifiers, newId, null, updatedData, trigger)
     emit({
       type: eventName,
       [modelPropertyName]: newId,
@@ -502,7 +502,8 @@ function defineCopyOnParentCopyTrigger(config, context) {
         type: Object,
       }
     },
-    async execute({ objectType, object, parentType, parent, fromParent, identifiers, data }, {client, service}, emit) {
+    async execute({ objectType, object, parentType, parent, fromParent, identifiers, data },
+       { client, service, trigger }, emit) {
       const newIdentifiers = {
         ...identifiers
       }
@@ -531,7 +532,7 @@ function defineCopyOnParentCopyTrigger(config, context) {
         identifiers: newIdentifiers,
         data
       })
-      await fireChangeTriggers(context, objectType, newIdentifiers, newId, null, data)
+      await fireChangeTriggers(context, objectType, newIdentifiers, newId, null, data, trigger)
       emit({
         type: eventName,
         [modelPropertyName]: newId,

package/singularRelationAnyUtils.js

@@ -101,7 +101,7 @@ function getSetFunction( validators, validationContext, config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const eventName = modelName + 'Set'
-  return async function execute(properties, { client, service }, emit) {
+  return async function execute(properties, { client, service, trigger }, emit) {
     const identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
     const id = generateAnyId(otherPropertyNames, properties)
     const entity = await modelRuntime().get(id)
@@ -109,7 +109,7 @@ function getSetFunction( validators, validationContext, config, context) {
       App.computeDefaults(model, properties, { client, service } ))
     await App.validation.validate({ ...identifiers, ...data }, validators,
       validationContext)
-    await fireChangeTriggers(context, objectType, identifiers, id, null, data)
+    await fireChangeTriggers(context, objectType, identifiers, id, null, data, trigger)
     emit({
       type: eventName,
       identifiers, data
@@ -172,7 +172,7 @@ function getUpdateFunction( validators, validationContext, config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const eventName = modelName + 'Updated'
-  return async function execute(properties, {client, service}, emit) {
+  return async function execute(properties, { client, service, trigger }, emit) {
     const identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
     const id = generateAnyId(otherPropertyNames, properties)
     const entity = await modelRuntime().get(id)
@@ -184,7 +184,7 @@ function getUpdateFunction( validators, validationContext, config, context) {
     await App.validation.validate({ ...identifiers, ...data }, validators,
       validationContext)
     await fireChangeTriggers(context, objectType, identifiers, id,
-      entity ? extractObjectData(writeableProperties, entity, {}) : null, data)
+      entity ? extractObjectData(writeableProperties, entity, {}) : null, data, trigger)
     emit({
       type: eventName,
       identifiers, data
@@ -250,7 +250,7 @@ function getSetOrUpdateFunction( validators, validationContext, config, context)
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const eventName = modelName + 'Updated'
-  return async function execute(properties, { client, service }, emit) {
+  return async function execute(properties, { client, service, trigger }, emit) {
     const identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
     const id = generateAnyId(otherPropertyNames, properties)
     const entity = await modelRuntime().get(id)
@@ -262,7 +262,7 @@ function getSetOrUpdateFunction( validators, validationContext, config, context)
     await App.validation.validate({ ...identifiers, ...data }, validators,
       validationContext)
     await fireChangeTriggers(context, objectType, identifiers, id,
-      entity ? extractObjectData(writeableProperties, entity, {}) : null, data)
+      entity ? extractObjectData(writeableProperties, entity, {}) : null, data, trigger)
     emit({
       type: eventName,
       identifiers, data
@@ -328,13 +328,13 @@ function getResetFunction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const eventName = modelName + 'Reset'
-  return async function execute(properties, {client, service}, emit) {
+  return async function execute(properties, { client, service, trigger }, emit) {
     const identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
     const id = properties[modelPropertyName] ?? generateAnyId(otherPropertyNames, properties)
     const entity = await modelRuntime().get(id)
     if (!entity) throw new Error('not_found')
     await fireChangeTriggers(context, objectType, identifiers, id,
-        entity ? extractObjectData(writeableProperties, entity, {}) : null, null)
+        entity ? extractObjectData(writeableProperties, entity, {}) : null, null, trigger)
     emit({
       type: eventName,
       identifiers

package/singularRelationUtils.js

@@ -143,10 +143,10 @@ export function getSetFunction( validators, validationContext, config, context)
     const id = idParts.length > 1 ? idParts.map(p => JSON.stringify(p)).join(':') : idParts[0]
     const identifiers = extractIdentifiers(otherPropertyNames, properties)
     const data = extractObjectData(writeableProperties, properties,
-      App.computeDefaults(model, properties, { client, service } ))
+      App.computeDefaults(model, properties, { client, service, trigger } ))
     await App.validation.validate({ ...identifiers, ...data }, validators,
       validationContext)
-    await fireChangeTriggers(context, objectType, identifiers, id, null, data)
+    await fireChangeTriggers(context, objectType, identifiers, id, null, data, trigger)
     emit({
       type: eventName,
       identifiers, data
@@ -209,7 +209,7 @@ export function getUpdateFunction( validators, validationContext, config, contex
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = modelName + 'Updated'
-  return async function execute(properties, { client, service }, emit) {
+  return async function execute(properties, { client, service, trigger }, emit) {
     const identifiers = extractIdentifiers(otherPropertyNames, properties)
     const id = generateId(otherPropertyNames, properties)
     const entity = await modelRuntime().get(id)
@@ -222,7 +222,7 @@ export function getUpdateFunction( validators, validationContext, config, contex
       validationContext)
     const oldData = extractObjectData(writeableProperties, entity, {})
     await fireChangeTriggers(context, objectType, identifiers, id,
-      entity ? extractObjectData(writeableProperties, entity, {}) : null, data)
+      entity ? extractObjectData(writeableProperties, entity, {}) : null, data, trigger)
     emit({
       type: eventName,
       identifiers, data
@@ -288,7 +288,7 @@ export function getSetOrUpdateFunction( validators, validationContext, config, c
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = modelName + 'Updated'
-  return async function execute(properties, { client, service }, emit) {
+  return async function execute(properties, { client, service, trigger }, emit) {
     const identifiers = extractIdentifiers(otherPropertyNames, properties)
     const id = generateId(otherPropertyNames, properties)
     const entity = await modelRuntime().get(id)
@@ -299,7 +299,7 @@ export function getSetOrUpdateFunction( validators, validationContext, config, c
     )
     await App.validation.validate({ ...identifiers, ...data },  validators, { ...validationContext, service, app, client })
     await fireChangeTriggers(context, objectType, identifiers, id,
-      entity ? extractObjectData(writeableProperties, entity, {}) : null, data)
+      entity ? extractObjectData(writeableProperties, entity, {}) : null, data, trigger)
     emit({
       type: eventName,
       identifiers, data
@@ -365,13 +365,13 @@ export function getResetFunction( validators, validationContext, config, context
     otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model, others, writeableProperties
   } = context
   const eventName = modelName + 'Reset'
-  return async function execute(properties, { client, service }, emit) {
+  return async function execute(properties, { client, service, trigger }, emit) {
     const identifiers = extractIdentifiers(otherPropertyNames, properties)
     const id = properties[modelPropertyName] ?? generateId(otherPropertyNames, properties)
     const entity = await modelRuntime().get(id)
     if (!entity) throw new Error('not_found')
     await fireChangeTriggers(context, objectType, identifiers, id,
-        entity ? extractObjectData(writeableProperties, entity, {}) : null, null)
+        entity ? extractObjectData(writeableProperties, entity, {}) : null, null, trigger)
     emit({
       type: eventName,
       identifiers: {

package/utils.js

@@ -2,7 +2,7 @@ import App from "@live-change/framework"
 const app = App.app()
 import { allCombinations } from "./combinations.js"
 import {
-  fireChangeTriggers, registerParentDeleteTriggers, registerParentCopyTriggers
+  registerParentDeleteTriggers, registerParentCopyTriggers
 } from "./changeTriggers.js"
 import {
   PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition, TriggerDefinition

package/utilsAny.js

@@ -4,7 +4,7 @@ import {
   PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition, TriggerDefinition
 } from "@live-change/framework"
 import { allCombinations } from "./combinations.js"
-import { fireChangeTriggers, registerParentDeleteTriggers } from "./changeTriggers.js"
+import { registerParentDeleteTriggers } from "./changeTriggers.js"
 
 
 export function extractTypeAndIdParts(otherPropertyNames, properties) {