@live-change/relations-plugin 0.9.14 → 0.9.16

package/boundTo.js

@@ -7,8 +7,16 @@ import { defineSetEvent, defineUpdatedEvent, defineTransferredEvent, defineReset
 
 import {
   defineView,
-  defineSetAction, defineUpdateAction, defineSetOrUpdateAction, defineResetAction,
-  defineSetTrigger, defineUpdateTrigger, defineSetOrUpdateTrigger, defineResetTrigger
+  defineSetAction,
+  defineUpdateAction,
+  defineSetOrUpdateAction,
+  defineResetAction,
+  defineSetTrigger,
+  defineUpdateTrigger,
+  defineSetOrUpdateTrigger,
+  defineResetTrigger,
+  defineDeleteAction,
+  defineDeleteTrigger
 } from './singularRelationUtils.js'
 
 export default function(service, app) {
@@ -38,6 +46,7 @@ export default function(service, app) {
     defineUpdateTrigger(config, context)
     defineSetOrUpdateTrigger(config, context)
     defineResetTrigger(config, context)
+    defineDeleteTrigger(config, context)
 
     if(config.setAccess || config.writeAccess || config.setAccessControl || config.writeAccessControl) {
       defineSetAction(config, context)
@@ -53,7 +62,8 @@ export default function(service, app) {
     }
 
     if(config.resetAccess || config.writeAccess || config.resetAccessControl || config.writeAccessControl) {
-      defineResetAction(config, context);
+      defineResetAction(config, context)
+      defineDeleteAction(config, context)
     }
   })
 }

package/boundToAny.js

@@ -10,6 +10,7 @@ import {
   defineSetAction, defineUpdateAction, defineResetAction, defineSetOrUpdateAction,
   defineSetTrigger, defineUpdateTrigger, defineSetOrUpdateTrigger, defineResetTrigger
 } from './singularRelationUtils.js'
+import { defineDeleteAction, defineDeleteTrigger } from './singularRelationAnyUtils.js'
 
 export default function(service, app) {
   processModelsAnyAnnotation(service, app, 'boundToAny', false, (config, context) => {
@@ -37,6 +38,7 @@ export default function(service, app) {
     defineUpdateTrigger(config, context)
     defineSetOrUpdateTrigger(config, context)
     defineResetTrigger(config, context)
+    defineDeleteTrigger(config, context)
 
     if(config.setAccess || config.writeAccess || config.setAccessControl || config.writeAccessControl) {
       defineSetAction(config, context)
@@ -52,7 +54,8 @@ export default function(service, app) {
     }
 
     if(config.resetAccess || config.writeAccess || config.resetAccessControl || config.writeAccessControl) {
-      defineResetAction(config, context);
+      defineResetAction(config, context)
+      defineDeleteAction(config, context)
     }
 
   })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/relations-plugin",
-  "version": "0.9.14",
+  "version": "0.9.16",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,8 +22,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/framework": "^0.9.14",
+    "@live-change/framework": "^0.9.16",
     "pluralize": "^8.0.0"
   },
-  "gitHead": "5d0f137a1a16f892868719d919f4a76584fa879f"
+  "gitHead": "226df9fa7eb682f6d7da5e4541eb320e8309facf"
 }

package/pluralRelationAnyUtils.js

@@ -3,8 +3,16 @@ const { extractRange } = App
 import {
   PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, TriggerDefinition
 } from "@live-change/framework"
-import { extractTypeAndIdParts, extractIdentifiersWithTypes, prepareAccessControl } from "./utilsAny.js"
-import { extractObjectData, extractIdentifiers, extractIdParts } from './utils.js'
+import {
+  extractTypeAndIdParts,
+  extractIdentifiersWithTypes,
+  prepareAccessControl,
+  cloneAndPrepareAccessControl
+} from './utilsAny.js'
+import {
+  extractObjectData, extractIdentifiers, extractIdParts,
+  cloneAndPrepareAccessControl as cloneAndPrepareSingleAccessControl
+} from './utils.js'
 import { fireChangeTriggers } from "./changeTriggers.js"
 
 import pluralize from 'pluralize'
@@ -24,8 +32,8 @@ function defineRangeView(config, context, external = true) {
       validation: ['nonEmpty']
     })
   }
-  const accessControl = external && (config.readAccessControl || config.writeAccessControl)
-  prepareAccessControl(accessControl, otherPropertyNames)
+  const sourceAccessControl = external && (config.readAccessControl || config.writeAccessControl)
+  const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames)
   const viewName = joinedOthersPropertyName + context.reverseRelationWord + pluralize(modelName)
   model.crud.range = viewName
   service.view({
@@ -55,14 +63,16 @@ function defineRangeView(config, context, external = true) {
 
 function defineSingleView(config, context, external = true) {
   const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
-    modelName, others, model, modelPropertyName } = context
+    modelName, others, model, modelPropertyName, objectType } = context
   const viewProperties = {}
   viewProperties[modelPropertyName] = new PropertyDefinition({
     type: model,
     validation: ['nonEmpty']
   })
-  const accessControl = external && (config.readAccessControl || config.writeAccessControl)
-  prepareAccessControl(accessControl, otherPropertyNames)
+  const sourceAccessControl = external && (config.readAccessControl || config.writeAccessControl)
+  const accessControl = cloneAndPrepareSingleAccessControl(
+    sourceAccessControl, [modelPropertyName], [objectType]
+  )
   const viewName = modelName[0].toLowerCase() + modelName.slice(1)
   model.crud.read = viewName
   service.view({
@@ -115,8 +125,8 @@ function defineCreateAction(config, context) {
   } = context
   const actionName = 'create' + modelName
   model.crud.create = actionName
-  const accessControl = config.createAccessControl || config.writeAccessControl
-  prepareAccessControl(accessControl, otherPropertyNames)
+  const sourceAccessControl = config.createAccessControl || config.writeAccessControl
+  const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames)
   const action = new ActionDefinition({
     name: actionName,
     properties: {
@@ -204,8 +214,10 @@ function defineUpdateAction(config, context) {
   } = context
   const actionName = 'update' + modelName
   model.crud.update = actionName
-  const accessControl = config.updateAccessControl || config.writeAccessControl
-  prepareAccessControl(accessControl, otherPropertyNames)
+  const sourceAccessControl = config.updateAccessControl || config.writeAccessControl
+  const accessControl = cloneAndPrepareSingleAccessControl(
+    sourceAccessControl, [modelPropertyName], [objectType]
+  )
   const action = new ActionDefinition({
     name: actionName,
     properties: {
@@ -289,8 +301,10 @@ function defineDeleteAction(config, context) {
   } = context
   const actionName = 'delete' + modelName
   model.crud.delete = actionName
-  const accessControl = config.deleteAccessControl || config.writeAccessControl
-  prepareAccessControl(accessControl, otherPropertyNames)
+  const sourceAccessControl = config.deleteAccessControl || config.writeAccessControl
+  const accessControl = cloneAndPrepareSingleAccessControl(
+    sourceAccessControl, [modelPropertyName], [objectType]
+  )
   const action = new ActionDefinition({
     name: actionName,
     properties: {

package/pluralRelationUtils.js

@@ -2,7 +2,13 @@ import App from '@live-change/framework'
 import {
   PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, TriggerDefinition
 } from "@live-change/framework"
-import { extractIdParts, extractIdentifiers, extractObjectData, prepareAccessControl } from "./utils.js"
+import {
+  extractIdParts,
+  extractIdentifiers,
+  extractObjectData,
+  prepareAccessControl,
+  cloneAndPrepareAccessControl
+} from './utils.js'
 import { fireChangeTriggers } from "./changeTriggers.js"
 import pluralize from 'pluralize'
 
@@ -19,8 +25,12 @@ function defineRangeView(config, context, external = true) {
   }
   const viewName = joinedOthersPropertyName + context.reverseRelationWord + pluralize(modelName)
   model.crud.range = viewName
-  const accessControl = external && (config.readAccessControl || config.writeAccessControl)
-  prepareAccessControl(accessControl, otherPropertyNames, others)
+  const sourceAccessControl = external && (config.readAccessControl || config.writeAccessControl)
+  const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames, others)
+  if(viewName === 'companyOwnedProducts') {
+    console.error("ACCESS CONTROL", viewName, accessControl, otherPropertyNames, others)
+    if(accessControl) accessControl.kutas = 1
+  }
   service.views[viewName] = new ViewDefinition({
     name: viewName,
     properties: {
@@ -36,7 +46,7 @@ function defineRangeView(config, context, external = true) {
     internal: !external,
     global: config.globalView,
     access: external && (config.readAccess || config.writeAccess),
-    accessControl: config.readAccessControl || config.writeAccessControl,
+    accessControl,
     daoPath(properties, { client, context }) {
       const idParts = extractIdParts(otherPropertyNames, properties)
       const range = App.extractRange(properties)
@@ -47,7 +57,7 @@ function defineRangeView(config, context, external = true) {
 }
 
 function defineSingleView(config, context, external = true) {
-  const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
+  const { service, modelRuntime, objectType, joinedOthersPropertyName, joinedOthersClassName,
     modelName, others, model, modelPropertyName } = context
   const viewProperties = {}
   viewProperties[modelPropertyName] = new PropertyDefinition({
@@ -56,8 +66,10 @@ function defineSingleView(config, context, external = true) {
   })
   const viewName = modelName[0].toLowerCase() + modelName.slice(1)
   model.crud.read = viewName
-  const accessControl = external && (config.readAccessControl || config.writeAccessControl)
-  prepareAccessControl(accessControl, otherPropertyNames, others)
+  const sourceAccessControl = external && (config.readAccessControl || config.writeAccessControl)
+  const accessControl = cloneAndPrepareAccessControl(
+    sourceAccessControl, [modelPropertyName], [objectType]
+  )
   service.views[viewName] = new ViewDefinition({
     name: viewName,
     properties: {
@@ -69,7 +81,7 @@ function defineSingleView(config, context, external = true) {
     internal: !external,
     global: config.globalView,
     access: external && (config.readAccess || config.writeAccess),
-    accessControl: config.readAccessControl || config.writeAccessControl,
+    accessControl,
     async daoPath(properties, { client, context }) {
       return modelRuntime().path(properties[modelPropertyName])
     }
@@ -108,8 +120,8 @@ function defineCreateAction(config, context) {
   } = context
   const actionName = 'create' + modelName
   model.crud.create = actionName
-  const accessControl = config.createAccessControl || config.writeAccessControl
-  prepareAccessControl(accessControl, otherPropertyNames, others)
+  const sourceAccessControl = config.createAccessControl || config.writeAccessControl
+  const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames, others)
   const action = new ActionDefinition({
     name: actionName,
     properties: {
@@ -191,8 +203,10 @@ function defineUpdateAction(config, context) {
   } = context
   const actionName = 'update' + modelName
   model.crud.update = actionName
-  const accessControl = config.updateAccessControl || config.writeAccessControl
-  prepareAccessControl(accessControl, otherPropertyNames, others)
+  const sourceAccessControl = config.updateAccessControl || config.writeAccessControl
+  const accessControl = cloneAndPrepareAccessControl(
+    sourceAccessControl, [modelPropertyName], [objectType]
+  )
   const action = new ActionDefinition({
     name: actionName,
     properties: {
@@ -273,8 +287,11 @@ function defineDeleteAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const actionName = 'delete' + modelName
-  const accessControl = config.deleteAccessControl || config.writeAccessControl
-  prepareAccessControl(accessControl, otherPropertyNames, others)
+  model.crud.delete = actionName
+  const sourceAccessControl = config.deleteAccessControl || config.writeAccessControl
+  const accessControl = cloneAndPrepareAccessControl(
+    sourceAccessControl, [modelPropertyName], [objectType]
+  )
   const action = new ActionDefinition({
     name: actionName,
     properties: {
@@ -387,8 +404,10 @@ function defineCopyAction(config, context) {
     identifiers
   } = context
   const actionName = 'copy' + modelName
-  const accessControl = config.copyAccessControl
-  prepareAccessControl(accessControl, otherPropertyNames, others)
+  const sourceAccessControl = config.copyAccessControl
+  const accessControl = cloneAndPrepareAccessControl(
+    sourceAccessControl, [modelPropertyName], [objectType]
+  )
   const action = new ActionDefinition({
     name: actionName,
     properties: {

package/propertyOf.js

@@ -8,8 +8,16 @@ import { defineSetEvent, defineUpdatedEvent, defineTransferredEvent, defineReset
 
 import {
   defineView,
-  defineSetAction, defineUpdateAction, defineSetOrUpdateAction, defineResetAction,
-  defineSetTrigger, defineUpdateTrigger, defineSetOrUpdateTrigger, defineResetTrigger
+  defineSetAction,
+  defineUpdateAction,
+  defineSetOrUpdateAction,
+  defineResetAction,
+  defineSetTrigger,
+  defineUpdateTrigger,
+  defineSetOrUpdateTrigger,
+  defineResetTrigger,
+  defineDeleteTrigger,
+  defineDeleteAction
 } from './singularRelationUtils.js'
 
 export default function(service, app) {
@@ -44,6 +52,7 @@ export default function(service, app) {
     defineUpdateTrigger(config, context)
     defineSetOrUpdateTrigger(config, context)
     defineResetTrigger(config, context)
+    defineDeleteTrigger(config, context)
 
     if(config.setAccess || config.writeAccess || config.setAccessControl || config.writeAccessControl) {
       defineSetAction(config, context)
@@ -59,7 +68,8 @@ export default function(service, app) {
     }
 
     if(config.resetAccess || config.writeAccess || config.resetAccessControl || config.writeAccessControl) {
-      defineResetAction(config, context);
+      defineResetAction(config, context)
+      defineDeleteAction(config, context)
     }
 
     if(!config.customDeleteTrigger) defineParentDeleteTriggers(config, context)

package/propertyOfAny.js

@@ -9,9 +9,18 @@ import {
 } from './propertyEvents.js'
 
 import {
-  defineObjectView, defineRangeViews,
-  defineSetAction, defineUpdateAction, defineSetOrUpdateAction, defineResetAction,
-  defineSetTrigger, defineUpdateTrigger, defineSetOrUpdateTrigger, defineResetTrigger
+  defineObjectView,
+  defineRangeViews,
+  defineSetAction,
+  defineUpdateAction,
+  defineSetOrUpdateAction,
+  defineResetAction,
+  defineSetTrigger,
+  defineUpdateTrigger,
+  defineSetOrUpdateTrigger,
+  defineResetTrigger,
+  defineDeleteTrigger,
+  defineDeleteAction
 } from './singularRelationAnyUtils.js'
 
 export default function(service, app) {
@@ -51,6 +60,7 @@ export default function(service, app) {
     defineUpdateTrigger(config, context)
     defineSetOrUpdateTrigger(config, context)
     defineResetTrigger(config, context)
+    defineDeleteTrigger(config, context)
 
     if(config.setAccess || config.writeAccess || config.setAccessControl || config.writeAccessControl) {
       defineSetAction(config, context)
@@ -66,7 +76,8 @@ export default function(service, app) {
     }
 
     if(config.resetAccess || config.writeAccess || config.resetAccessControl || config.writeAccessControl) {
-      defineResetAction(config, context);
+      defineResetAction(config, context)
+      defineDeleteAction(config, context)
     }
 
     if(!config.customDeleteTrigger) defineParentDeleteTrigger(config, context)

package/singularRelationAnyUtils.js

@@ -3,9 +3,13 @@ import {
   PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, TriggerDefinition
 } from '@live-change/framework'
 import {
-  extractTypeAndIdParts, extractIdentifiersWithTypes, generateAnyId, prepareAccessControl
+  extractTypeAndIdParts, extractIdentifiersWithTypes, generateAnyId,
+  prepareAccessControl, cloneAndPrepareAccessControl
 } from './utilsAny.js'
-import { extractObjectData } from "./utils.js"
+import {
+  extractObjectData,
+  cloneAndPrepareAccessControl as cloneAndPrepareSingleAccessControl
+} from './utils.js'
 import { allCombinations } from "./combinations.js"
 import { fireChangeTriggers } from "./changeTriggers.js"
 
@@ -40,9 +44,9 @@ function defineObjectView(config, context, external = true) {
       validation: ['nonEmpty']
     })
   }
-  const accessControl = external
+  const sourceAccessControl = external
     && (config.singleAccessControl || config.readAccessControl || config.writeAccessControl)
-  prepareAccessControl(accessControl, otherPropertyNames)
+  const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames)
   const viewName = config.name
     || ((config.prefix ? config.prefix + modelName : modelName[0].toLowerCase() + modelName.slice(1)) + (config.suffix || ''))
   model.crud.read = viewName
@@ -71,8 +75,9 @@ function defineRangeViews(config, context, external = true) {
   const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
     modelName, others, model } = context
   const identifierCombinations = allCombinations(otherPropertyNames).slice(0, -1)
-  const accessControl = external && (config.listAccessControl || config.readAccessControl || config.writeAccessControl)
-  prepareAccessControl(accessControl, otherPropertyNames)
+  const sourceAccessControl = external
+    && (config.listAccessControl || config.readAccessControl || config.writeAccessControl)
+  const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames)
   for(const combination of identifierCombinations) {
     const propsUpperCase = combination.map(prop => prop[0].toUpperCase() + prop.slice(1))
     const indexName = 'by' + combination.map(prop => prop[0].toUpperCase() + prop.slice(1))
@@ -130,8 +135,8 @@ function defineSetAction(config, context) {
   } = context
   const actionName = 'set' + modelName
   model.crud.create = actionName
-  const accessControl = config.setAccessControl || config.writeAccessControl
-  prepareAccessControl(accessControl, otherPropertyNames)
+  const sourceAccessControl = config.setAccessControl || config.writeAccessControl
+  const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames)
   const action = new ActionDefinition({
     name: actionName,
     properties: { ...(model.properties) },
@@ -204,8 +209,8 @@ function defineUpdateAction(config, context) {
   } = context
   const actionName = 'update' + modelName
   model.crud.update = actionName
-  const accessControl = config.updateAccessControl || config.writeAccessControl
-  prepareAccessControl(accessControl, otherPropertyNames)
+  const sourceAccessControl = config.updateAccessControl || config.writeAccessControl
+  const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames)
   const action = new ActionDefinition({
     name: actionName,
     properties: {
@@ -280,11 +285,10 @@ function defineSetOrUpdateAction(config, context) {
     service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
-  const eventName = modelName + 'Updated'
   const actionName = 'setOrUpdate' + modelName
   model.crud.createOrUpdate = actionName
-  const accessControl = config.setOrUpdateAccessControl || config.writeAccessControl
-  prepareAccessControl(accessControl, otherPropertyNames)
+  const sourceAccessControl = config.setOrUpdateAccessControl || config.writeAccessControl
+  const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames)
   const action = new ActionDefinition({
     name: actionName,
     properties: {
@@ -330,13 +334,13 @@ function defineSetOrUpdateTrigger(config, context) {
 
 function getResetFunction(config, context) {
   const {
-    service, app, model, modelRuntime, objectType,
+    service, app, model, modelRuntime, objectType, modelPropertyName,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Reset'
   return async function execute(properties, {client, service}, emit) {
     const identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
-    const id = generateAnyId(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,
@@ -354,9 +358,8 @@ function defineResetAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model
   } = context
   const actionName = 'reset' + modelName
-  model.crud.delete = actionName
-  const accessControl = config.resetAccessControl || config.writeAccessControl
-  prepareAccessControl(accessControl, otherPropertyNames)
+  const sourceAccessControl = config.resetAccessControl || config.writeAccessControl
+  const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames)
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
     properties: {
@@ -388,8 +391,56 @@ function defineResetTrigger(config, context) {
   })]
 }
 
+function defineDeleteAction(config, context) {
+  const {
+    service, modelRuntime, modelPropertyName, identifiers, objectType,
+    otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model
+  } = context
+  const actionName = 'reset' + modelName
+  model.crud.delete = actionName
+  const sourceAccessControl = config.resetAccessControl || config.writeAccessControl
+  const accessControl = cloneAndPrepareAccessControl(
+    sourceAccessControl, [modelPropertyName], [objectType]
+  )
+  service.actions[actionName] = new ActionDefinition({
+    name: actionName,
+    properties: {
+      [modelPropertyName]: {
+        type: model,
+        validation: ['nonEmpty']
+      }
+    },
+    access: config.resetAccess || config.writeAccess,
+    accessControl,
+    queuedBy: otherPropertyNames,
+    waitForEvents: true,
+    execute: getResetFunction(config, context)
+  })
+}
+
+function defineDeleteTrigger(config, context) {
+  const {
+    service, modelRuntime, modelPropertyName, identifiers, objectType,
+    otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model
+  } = context
+  const actionName = 'reset' + modelName
+  const triggerName = `${service.name}_${actionName}`
+  service.triggers[triggerName] = [new TriggerDefinition({
+    name: triggerName,
+    properties: {
+      [modelPropertyName]: {
+        type: model,
+        validation: ['nonEmpty']
+      }
+    },
+    queuedBy: otherPropertyNames,
+    waitForEvents: true,
+    execute: getResetFunction(config, context)
+  })]
+}
+
 export {
   defineObjectView, defineRangeViews,
-  defineSetAction, defineUpdateAction, defineSetOrUpdateAction, defineResetAction,
-  defineSetTrigger, defineUpdateTrigger, defineSetOrUpdateTrigger, defineResetTrigger
+  defineSetAction, defineUpdateAction, defineSetOrUpdateAction, defineResetAction, defineDeleteAction,
+  defineSetTrigger, defineUpdateTrigger, defineSetOrUpdateTrigger, defineResetTrigger, defineDeleteTrigger
 }

package/singularRelationUtils.js

@@ -3,8 +3,8 @@ import {
   PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, TriggerDefinition
 } from "@live-change/framework"
 import {
-  extractIdentifiers, extractObjectData, generateId, extractIdParts, prepareAccessControl
-} from "./utils.js"
+  extractIdentifiers, extractObjectData, generateId, extractIdParts, prepareAccessControl, cloneAndPrepareAccessControl
+} from './utils.js'
 import { fireChangeTriggers } from "./changeTriggers.js"
 
 function defineView(config, context, external = true) {
@@ -20,8 +20,8 @@ function defineView(config, context, external = true) {
   const viewName = config.name
     || ((config.prefix ? config.prefix + modelName : modelName[0].toLowerCase() + modelName.slice(1)) + (config.suffix || ''))
   model.crud.read = viewName
-  const accessControl = external && (config.readAccessControl || config.writeAccessControl)
-  prepareAccessControl(accessControl, otherPropertyNames, others)
+  const sourceAccessControl = external && (config.readAccessControl || config.writeAccessControl)
+  const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames, others)
   service.view({
     name: viewName,
     properties: {
@@ -73,8 +73,8 @@ function defineSetAction(config, context) {
   } = context
   const actionName = 'set' + modelName
   model.crud.create = actionName
-  const accessControl = config.setAccessControl || config.writeAccessControl
-  prepareAccessControl(accessControl, otherPropertyNames, others)
+  const sourceAccessControl = config.setAccessControl || config.writeAccessControl
+  const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames, others)
   const action = new ActionDefinition({
     name: actionName,
     properties: { ...(model.properties) },
@@ -148,8 +148,8 @@ function defineUpdateAction(config, context) {
   } = context
   const actionName = 'update' + modelName
   model.crud.update = actionName
-  const accessControl = config.updateAccessControl || config.writeAccessControl
-  prepareAccessControl(accessControl, otherPropertyNames, others)
+  const sourceAccessControl = config.updateAccessControl || config.writeAccessControl
+  const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames, others)
   const action = new ActionDefinition({
     name: actionName,
     properties: {
@@ -225,15 +225,15 @@ function defineSetOrUpdateAction(config, context) {
   } = context
   const actionName = 'setOrUpdate' + modelName
   model.crud.createOrUpdate = actionName
-  const accessControl = config.updateAccessControl || config.writeAccessControl
-  prepareAccessControl(accessControl, otherPropertyNames, others)
+  const sourceAccessControl = config.updateAccessControl || config.writeAccessControl
+  const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames, others)
   const action = new ActionDefinition({
     name: actionName,
     properties: {
       ...(model.properties)
     },
     access: config.updateAccess || config.writeAccess,
-    accessControl: config.updateAccessControl || config.writeAccessControl,
+    accessControl,
     skipValidation: true,
     queuedBy: otherPropertyNames,
     waitForEvents: true,
@@ -293,16 +293,18 @@ function getResetFunction( validators, validationContext, config, context) {
   }
 }
 
-function defineResetAction(config, context) {
+function defineDeleteAction(config, context) {
   const {
     service, modelRuntime, modelPropertyName, objectType, identifiers,
     otherPropertyNames, joinedOthersPropertyName, modelName,
     joinedOthersClassName, model, others, writeableProperties
   } = context
-  const actionName = 'reset' + modelName
+  const actionName = 'delete' + modelName
   model.crud.delete = actionName
-  const accessControl = config.resetAccessControl || config.writeAccessControl
-  prepareAccessControl(accessControl, otherPropertyNames, others)
+  const sourceAccessControl = config.resetAccessControl || config.writeAccessControl
+  const accessControl = cloneAndPrepareAccessControl(
+    sourceAccessControl, [modelPropertyName], [objectType]
+  )
   const action = new ActionDefinition({
     name: actionName,
     properties: {
@@ -324,12 +326,12 @@ function defineResetAction(config, context) {
   service.actions[actionName] = action
 }
 
-function defineResetTrigger(config, context) {
+function defineDeleteTrigger(config, context) {
   const {
     service, modelRuntime, modelPropertyName, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model, others, writeableProperties
   } = context
-  const actionName = 'reset' + modelName
+  const actionName = 'delete' + modelName
   const triggerName = `${service.name}_${actionName}`
   const trigger = new TriggerDefinition({
     name: triggerName,
@@ -350,8 +352,74 @@ function defineResetTrigger(config, context) {
   service.triggers[triggerName] = [trigger]
 }
 
+
+function defineResetAction(config, context) {
+  const {
+    service, modelRuntime, modelPropertyName, objectType, identifiers,
+    otherPropertyNames, joinedOthersPropertyName, modelName,
+    joinedOthersClassName, model, others, writeableProperties
+  } = context
+  const actionName = 'reset' + modelName
+  const properties = {}
+  for (let i = 0; i < others.length; i++) {
+    properties[otherPropertyNames[i]] = new PropertyDefinition({
+      type: others[i],
+      validation: ['nonEmpty']
+    })
+  }
+  const sourceAccessControl = config.resetAccessControl || config.writeAccessControl
+  const accessControl = cloneAndPrepareAccessControl(
+    sourceAccessControl, [modelPropertyName], [objectType]
+  )
+  const action = new ActionDefinition({
+    name: actionName,
+    properties,
+    access: config.resetAccess || config.writeAccess,
+    accessControl,
+    queuedBy: otherPropertyNames,
+    waitForEvents: true,
+    execute: () => { throw new Error('not generated yet') }
+  })
+  const validators = App.validation.getValidators(action, service, action)
+  const validationContext = { source: action, action }
+  action.execute = getResetFunction( validators, validationContext, config, context)
+  if(service.actions[actionName]) throw new Error('Action ' + actionName + ' already defined')
+  service.actions[actionName] = action
+}
+
+function defineResetTrigger(config, context) {
+  const {
+    service, modelRuntime, modelPropertyName, objectType,
+    otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model,
+    others, writeableProperties
+  } = context
+  const actionName = 'reset' + modelName
+  const properties = {}
+  for (let i = 0; i < others.length; i++) {
+    properties[otherPropertyNames[i]] = new PropertyDefinition({
+      type: others[i],
+      validation: ['nonEmpty']
+    })
+  }
+  const triggerName = `${service.name}_${actionName}`
+  const trigger = new TriggerDefinition({
+    name: triggerName,
+    properties,
+    queuedBy: otherPropertyNames,
+    waitForEvents: true,
+    execute: () => { throw new Error('not generated yet') }
+  })
+  const validators = App.validation.getValidators(trigger, service, trigger)
+  const validationContext = { source: trigger, trigger }
+  trigger.execute = getResetFunction( validators, validationContext, config, context)
+  if(service.triggers[triggerName]) throw new Error('Trigger ' + triggerName + ' already defined')
+  service.triggers[triggerName] = [trigger]
+}
+
+
+
 export {
   defineView,
-  defineSetAction, defineUpdateAction, defineSetOrUpdateAction, defineResetAction,
-  defineSetTrigger, defineUpdateTrigger, defineSetOrUpdateTrigger, defineResetTrigger
+  defineSetAction, defineUpdateAction, defineSetOrUpdateAction, defineResetAction, defineDeleteAction,
+  defineSetTrigger, defineUpdateTrigger, defineSetOrUpdateTrigger, defineDeleteTrigger, defineResetTrigger
 }

package/utils.js

@@ -156,9 +156,20 @@ export function prepareAccessControl(accessControl, names, types) {
       objectType: types[index],
       object: params[name]
     })))
+    accessControl.objParams = { names, types }
   }
 }
 
+export function cloneAndPrepareAccessControl(accessControl, names, types) {
+  if(!accessControl) return accessControl
+  if(Array.isArray(accessControl)) {
+    accessControl = { roles: accessControl}
+  }
+  const newAccessControl = { ...accessControl }
+  prepareAccessControl(newAccessControl, names, types)
+  return newAccessControl
+}
+
 export function defineDeleteByOwnerEvents(config, context, generateId) {
   const {
     service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName, otherPropertyNames, reverseRelationWord

package/utilsAny.js

@@ -163,6 +163,16 @@ function prepareAccessControl(accessControl, names) {
   }
 }
 
+export function cloneAndPrepareAccessControl(accessControl, names) {
+  if(!accessControl) return accessControl
+  if(Array.isArray(accessControl)) {
+    accessControl = { roles: accessControl}
+  }
+  const newAccessControl = { ...accessControl }
+  prepareAccessControl(newAccessControl, names)
+  return newAccessControl
+}
+
 function defineDeleteByOwnerEvents(config, context) {
   const {
     service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName, otherPropertyNames, reverseRelationWord