@live-change/relations-plugin 0.8.148 → 0.9.0

package/itemEvents.js

@@ -6,7 +6,7 @@ function defineCreatedEvent(config, context) {
   const {
     service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName, reverseRelationWord
   } = context
-  const eventName = joinedOthersPropertyName + reverseRelationWord + modelName + 'Created'
+  const eventName = modelName + 'Created'
   service.events[eventName] = new EventDefinition({
     name: eventName,
     properties: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/relations-plugin",
-  "version": "0.8.148",
+  "version": "0.9.0",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,8 +22,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/framework": "^0.8.148",
+    "@live-change/framework": "^0.9.0",
     "pluralize": "^8.0.0"
   },
-  "gitHead": "34032c9007403b19096a1ecbaf5f99231a65ae92"
+  "gitHead": "b82513f5b400afcc4b8cc3ae1f9dfe4ac3a2a6eb"
 }

package/pluralRelationAnyUtils.js

@@ -28,7 +28,7 @@ function defineRangeView(config, context, external = true) {
   prepareAccessControl(accessControl, otherPropertyNames)
   const viewName = joinedOthersPropertyName + context.reverseRelationWord + pluralize(modelName)
   model.crud.range = viewName
-  service.views[viewName] = new ViewDefinition({
+  service.view({
     name: viewName,
     properties: {
       ...viewProperties,
@@ -41,6 +41,7 @@ function defineRangeView(config, context, external = true) {
       }
     },
     internal: !external,
+    global: config.globalView,
     access: external && (config.readAccess || config.writeAccess),
     accessControl,
     daoPath(properties, { client, context }) {
@@ -55,27 +56,16 @@ function defineRangeView(config, context, external = true) {
 function defineSingleView(config, context, external = true) {
   const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
     modelName, others, model, modelPropertyName } = context
-  const indexName = 'by'+context.joinedOthersClassName
   const viewProperties = {}
-  for (let i = 0; i < others.length; i++) {
-    viewProperties[otherPropertyNames[i]] = new PropertyDefinition({
-      type: 'String',
-      validation: ['nonEmpty']
-    })
-    viewProperties[otherPropertyNames[i] + 'Type'] = new PropertyDefinition({
-      type: 'String',
-      validation: ['nonEmpty']
-    })
-  }
   viewProperties[modelPropertyName] = new PropertyDefinition({
     type: model,
     validation: ['nonEmpty']
   })
   const accessControl = external && (config.readAccessControl || config.writeAccessControl)
   prepareAccessControl(accessControl, otherPropertyNames)
-  const viewName = joinedOthersPropertyName + context.reverseRelationWord + modelName
+  const viewName = modelName[0].toLowerCase() + modelName.slice(1)
   model.crud.read = viewName
-  service.views[viewName] = new ViewDefinition({
+  service.view({
     name: viewName,
     properties: {
       ...viewProperties
@@ -84,17 +74,11 @@ function defineSingleView(config, context, external = true) {
       type: model
     },
     internal: !external,
+    global: config.globalView,
     access: external && (config.readAccess || config.writeAccess),
     accessControl,
     async daoPath(properties, { client, context }) {
-      const idParts = extractTypeAndIdParts(otherPropertyNames, properties)
-      const prefix = App.encodeIdentifier(idParts)
-      const range = {
-        gte: prefix+'_'+properties[modelPropertyName],
-        lte: prefix+'_'+properties[modelPropertyName]
-      }
-      const path = modelRuntime().indexObjectPath(indexName, idParts, range)
-      return path
+      return modelRuntime().path(properties[modelPropertyName])
     }
   })
 }
@@ -104,7 +88,7 @@ function getCreateFunction( validators, validationContext, config, context) {
     service, app, model, modelPropertyName, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
-  const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Created'
+  const eventName = modelName + 'Created'
   return async function execute(properties, { client, service }, emit) {
     const id = properties[modelPropertyName] || app.generateUid()
     const entity = await modelRuntime().get(id)
@@ -129,7 +113,7 @@ function defineCreateAction(config, context) {
     service, app, model, modelPropertyName, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
-  const actionName = 'create' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const actionName = 'create' + modelName
   model.crud.create = actionName
   const accessControl = config.createAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames)
@@ -148,6 +132,7 @@ function defineCreateAction(config, context) {
   const validators = App.validation.getValidators(action, service, action)
   const validationContext = { source: action, action }
   action.execute = getCreateFunction( validators, validationContext, config, context)
+  if(service.actions[actionName]) throw new Error('Action ' + actionName + ' already defined')
   service.actions[actionName] = action
 }
 
@@ -156,7 +141,7 @@ function defineCreateTrigger(config, context) {
     service, app, model, modelPropertyName, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
-  const actionName = 'create' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const actionName = 'create' + modelName
   const triggerName = `${service.name}_${actionName}`
   const trigger = new TriggerDefinition({
     name: triggerName,
@@ -172,6 +157,7 @@ function defineCreateTrigger(config, context) {
   const validators = App.validation.getValidators(trigger, service, trigger)
   const validationContext = { source: trigger, trigger }
   trigger.execute = getCreateFunction( validators, validationContext, config, context)
+  if(service.triggers[triggerName]) throw new Error('Trigger ' + triggerName + ' already defined')
   service.triggers[triggerName] = [trigger]
 }
 
@@ -180,7 +166,7 @@ function getUpdateFunction( validators, validationContext, config, context) {
     service, app, model, modelPropertyName, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
-  const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Updated'
+  const eventName = modelName + 'Updated'
   return async function execute(properties, { client, service }, emit) {
     const id = properties[modelPropertyName]
     if(!id) throw new Error('no_id')
@@ -216,7 +202,7 @@ function defineUpdateAction(config, context) {
     service, app, model, modelRuntime, modelPropertyName, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
-  const actionName = 'update' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const actionName = 'update' + modelName
   model.crud.update = actionName
   const accessControl = config.updateAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames)
@@ -239,6 +225,7 @@ function defineUpdateAction(config, context) {
   const validators = App.validation.getValidators(action, service, action)
   const validationContext = { source: action, action }
   action.execute = getUpdateFunction( validators, validationContext, config, context)
+  if(service.actions[actionName]) throw new Error('Action ' + actionName + ' already defined')
   service.actions[actionName] = action
 }
 
@@ -247,7 +234,7 @@ function defineUpdateTrigger(config, context) {
     service, app, model, modelRuntime, modelPropertyName, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
-  const actionName = 'update' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const actionName = 'update' + modelName
   const triggerName = `${service.name}_${actionName}`
   const trigger = new TriggerDefinition({
     name: triggerName,
@@ -267,6 +254,7 @@ function defineUpdateTrigger(config, context) {
   const validators = App.validation.getValidators(trigger, service, trigger)
   const validationContext = { source: trigger, trigger }
   trigger.execute = getUpdateFunction( validators, validationContext, config, context)
+  if(service.triggers[triggerName]) throw new Error('Trigger ' + triggerName + ' already defined')
   service.triggers[triggerName] = [trigger]
 }
 
@@ -275,7 +263,7 @@ function getDeleteFunction(config, context) {
     service, app, model, modelPropertyName, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
-  const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Deleted'
+  const eventName = modelName + 'Deleted'
   return async function execute(properties, { client, service }, emit) {
     const id = properties[modelPropertyName]
     const entity = await modelRuntime().get(id)
@@ -299,7 +287,7 @@ function defineDeleteAction(config, context) {
     service, app, model, modelRuntime, modelPropertyName, identifiers, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
-  const actionName = 'delete' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const actionName = 'delete' + modelName
   model.crud.delete = actionName
   const accessControl = config.deleteAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames)
@@ -320,6 +308,7 @@ function defineDeleteAction(config, context) {
     execute: () => { throw new Error('not generated yet') }
   })
   action.execute = getDeleteFunction(config, context)
+  if(service.actions[actionName]) throw new Error('Action ' + actionName + ' already defined')
   service.actions[actionName] = action
 }
 
@@ -328,7 +317,7 @@ function defineDeleteTrigger(config, context) {
     service, app, model, modelRuntime, modelPropertyName, identifiers, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
-  const actionName = 'delete' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const actionName = 'delete' + modelName
   const triggerName = `${service.name}_${actionName}`
   const trigger = new TriggerDefinition({
     name: triggerName,
@@ -346,6 +335,7 @@ function defineDeleteTrigger(config, context) {
     execute: () => { throw new Error('not generated yet') }
   })
   trigger.execute = getDeleteFunction(config, context)
+  if(service.triggers[triggerName]) throw new Error('Trigger ' + triggerName + ' already defined')
   service.triggers[triggerName] = [trigger]
 }
 

package/pluralRelationUtils.js

@@ -34,6 +34,7 @@ function defineRangeView(config, context, external = true) {
       }
     },
     internal: !external,
+    global: config.globalView,
     access: external && (config.readAccess || config.writeAccess),
     accessControl: config.readAccessControl || config.writeAccessControl,
     daoPath(properties, { client, context }) {
@@ -48,19 +49,12 @@ function defineRangeView(config, context, external = true) {
 function defineSingleView(config, context, external = true) {
   const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
     modelName, others, model, modelPropertyName } = context
-  const indexName = 'by'+context.joinedOthersClassName
   const viewProperties = {}
-  for (let i = 0; i < others.length; i++) {
-    viewProperties[otherPropertyNames[i][0].toLowerCase() + otherPropertyNames[i].slice(1) ] = new PropertyDefinition({
-      type: others[i],
-      validation: ['nonEmpty']
-    })
-  }
   viewProperties[modelPropertyName] = new PropertyDefinition({
     type: model,
     validation: ['nonEmpty']
   })
-  const viewName = joinedOthersPropertyName + context.reverseRelationWord + modelName
+  const viewName = modelName[0].toLowerCase() + modelName.slice(1)
   model.crud.read = viewName
   const accessControl = external && (config.readAccessControl || config.writeAccessControl)
   prepareAccessControl(accessControl, otherPropertyNames, others)
@@ -73,17 +67,11 @@ function defineSingleView(config, context, external = true) {
       type: model
     },
     internal: !external,
+    global: config.globalView,
     access: external && (config.readAccess || config.writeAccess),
     accessControl: config.readAccessControl || config.writeAccessControl,
-    daoPath(properties, { client, context }) {
-      const idParts = extractIdParts(otherPropertyNames, properties)
-      const prefix = App.encodeIdentifier(idParts)
-      const range = {
-        gte: prefix+'_'+properties[modelPropertyName],
-        lte: prefix+'_'+properties[modelPropertyName]
-      }
-      const path = modelRuntime().indexObjectPath(indexName, idParts, range)
-      return path
+    async daoPath(properties, { client, context }) {
+      return modelRuntime().path(properties[modelPropertyName])
     }
   })
 }
@@ -93,7 +81,7 @@ function getCreateFunction( validators, validationContext, config, context) {
     service, app, model, modelPropertyName, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
-  const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Created'
+  const eventName = modelName + 'Created'
   return async function execute(properties, { client, service }, emit) {
     const id = properties[modelPropertyName] || app.generateUid()
     const entity = await modelRuntime().get(id)
@@ -118,7 +106,7 @@ function defineCreateAction(config, context) {
     service, app, model, modelPropertyName, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
-  const actionName = 'create' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const actionName = 'create' + modelName
   model.crud.create = actionName
   const accessControl = config.createAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames, others)
@@ -145,7 +133,7 @@ function defineCreateTrigger(config, context) {
     service, app, model, modelPropertyName, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
-  const actionName = 'create' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const actionName = 'create' + modelName
   const triggerName = `${service.name}_${actionName}`
   const trigger = new TriggerDefinition({
     name: triggerName,
@@ -201,7 +189,7 @@ function defineUpdateAction(config, context) {
     service, app, model, modelRuntime, modelPropertyName, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
-  const actionName = 'update' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const actionName = 'update' + modelName
   model.crud.update = actionName
   const accessControl = config.updateAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames, others)
@@ -232,7 +220,7 @@ function defineUpdateTrigger(config, context) {
     service, app, model, modelRuntime, modelPropertyName, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
-  const actionName = 'update' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const actionName = 'update' + modelName
   const triggerName = `${service.name}_${actionName}`
   const trigger = new TriggerDefinition({
     name: triggerName,
@@ -259,7 +247,7 @@ function getDeleteFunction( validators, validationContext, config, context) {
     service, app, model, modelPropertyName, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
-  const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Deleted'
+  const eventName = modelName + 'Deleted'
   return async function execute(properties, { client, service }, emit) {
     const id = properties[modelPropertyName]
     const entity = await modelRuntime().get(id)
@@ -285,7 +273,7 @@ function defineDeleteAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Deleted'
-  const actionName = 'delete' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const actionName = 'delete' + modelName
   const accessControl = config.deleteAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames, others)
   const action = new ActionDefinition({
@@ -316,8 +304,8 @@ function defineDeleteTrigger(config, context) {
     service, app, model, modelPropertyName, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
-  const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Deleted'
-  const actionName = 'delete' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const eventName = modelName + 'Deleted'
+  const actionName = 'delete' + modelName
   const triggerName = `${service.name}_${actionName}`
   const trigger = new TriggerDefinition({
     name: triggerName,
@@ -400,8 +388,8 @@ function defineCopyAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others,
     identifiers
   } = context
-  const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Copied'
-  const actionName = 'copy' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const eventName = modelName + 'Copied'
+  const actionName = 'copy' + modelName
   const accessControl = config.copyAccessControl
   prepareAccessControl(accessControl, otherPropertyNames, others)
   const action = new ActionDefinition({
@@ -471,7 +459,7 @@ function defineCopyOnParentCopyTrigger(config, context) {
     service, app, model, modelRuntime, modelPropertyName, objectType,
     otherPropertyNames, others, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName,
   } = context
-  const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Copied'
+  const eventName = modelName + 'Copied'
   const triggerName = 'copyOnParentCopy_' + service.name + '_' + modelName
   if(!service.triggers[triggerName]) service.triggers[triggerName] = []
   service.triggers[triggerName].push(new TriggerDefinition({

package/propertyEvents.js

@@ -6,7 +6,7 @@ function defineSetEvent(config, context, generateId) {
   const {
     service, modelRuntime, joinedOthersPropertyName, modelName, otherPropertyNames, reverseRelationWord
   } = context
-  const eventName = joinedOthersPropertyName + reverseRelationWord + modelName + 'Set'
+  const eventName = modelName + 'Set'
   service.events[eventName] = new EventDefinition({
     name: eventName,
     properties: {
@@ -28,7 +28,7 @@ function defineUpdatedEvent(config, context, generateId) {
   const {
     service, modelRuntime, joinedOthersPropertyName, modelName, otherPropertyNames, reverseRelationWord
   } = context
-  const eventName = joinedOthersPropertyName + reverseRelationWord + modelName + 'Updated'
+  const eventName = modelName + 'Updated'
   service.events[eventName] = new EventDefinition({
     name: eventName,
     properties: {
@@ -50,7 +50,7 @@ function defineTransferredEvent(config, context, generateId) {
   const {
     service, modelRuntime, joinedOthersPropertyName, modelName, otherPropertyNames, reverseRelationWord
   } = context
-  const eventName = joinedOthersPropertyName + reverseRelationWord + modelName + 'Transferred'
+  const eventName = modelName + 'Transferred'
   service.events[eventName] = new EventDefinition({
     name: eventName,
     properties: {
@@ -80,7 +80,7 @@ function defineResetEvent(config, context, generateId) {
   const {
     service, modelRuntime, joinedOthersPropertyName, modelName, otherPropertyNames, reverseRelationWord
   } = context
-  const eventName = joinedOthersPropertyName + reverseRelationWord + modelName + 'Reset'
+  const eventName = modelName + 'Reset'
   service.events[eventName] = new EventDefinition({
     name: eventName,
     properties: {

package/singularRelationAnyUtils.js

@@ -43,10 +43,10 @@ function defineObjectView(config, context, external = true) {
   const accessControl = external
     && (config.singleAccessControl || config.readAccessControl || config.writeAccessControl)
   prepareAccessControl(accessControl, otherPropertyNames)
-  const viewName = config.name || ((config.prefix ? (config.prefix + joinedOthersClassName) : joinedOthersPropertyName) +
-      context.reverseRelationWord + modelName + (config.suffix || ''))
+  const viewName = config.name
+    || ((config.prefix ? config.prefix + modelName : modelName[0].toLowerCase() + modelName.slice(1)) + (config.suffix || ''))
   model.crud.read = viewName
-  service.views[viewName] = new ViewDefinition({
+  service.view({
     name: viewName,
     properties: {
       ...viewProperties
@@ -56,6 +56,7 @@ function defineObjectView(config, context, external = true) {
     },
     internal: !external,
     access: external && (config.singleAccess || config.readAccess),
+    global: config.globalView,
     accessControl,
     daoPath(properties, { client, context }) {
       const typeAndIdParts = extractTypeAndIdParts(otherPropertyNames, properties)
@@ -79,7 +80,7 @@ function defineRangeViews(config, context, external = true) {
         propsUpperCase.slice(1).join('And') + context.partialReverseRelationWord + pluralize(modelName)
     console.log("DEFINE RANGE VIEW", viewName, combination)
     const identifiers = createIdentifiersProperties(combination)
-    service.views[viewName] = new ViewDefinition({
+    service.view({
       name: viewName,
       properties: {
         ...identifiers,
@@ -104,7 +105,7 @@ function getSetFunction( validators, validationContext, config, context) {
     service, app, model, objectType, modelRuntime,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
-  const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Set'
+  const eventName = modelName + 'Set'
   return async function execute(properties, { client, service }, emit) {
     const identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
     const id = generateAnyId(otherPropertyNames, properties)
@@ -127,7 +128,7 @@ function defineSetAction(config, context) {
     service, app, model, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
-  const actionName = 'set' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const actionName = 'set' + modelName
   model.crud.create = actionName
   const accessControl = config.setAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames)
@@ -144,6 +145,7 @@ function defineSetAction(config, context) {
   const validators = App.validation.getValidators(action, service, action)
   const validationContext = { source: action, action }
   action.execute = getSetFunction( validators, validationContext, config, context)
+  if(service.actions[actionName]) throw new Error('Action ' + actionName + ' already defined')
   service.actions[actionName] = action
 }
 
@@ -152,7 +154,7 @@ function defineSetTrigger(config, context) {
     service, app, model, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
-  const actionName = 'set' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const actionName = 'set' + modelName
   const triggerName = `${service.name}_${actionName}`
   const trigger = new TriggerDefinition({
     name: triggerName,
@@ -165,6 +167,7 @@ function defineSetTrigger(config, context) {
   const validators = App.validation.getValidators(trigger, service, trigger)
   const validationContext = { source: trigger, trigger }
   trigger.execute = getSetFunction( validators, validationContext, config, context)
+  if(service.triggers[triggerName]) throw new Error('Trigger ' + triggerName + ' already defined')
   service.triggers[triggerName] = [trigger]
 }
 
@@ -173,7 +176,7 @@ function getUpdateFunction( validators, validationContext, config, context) {
     service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
-  const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Updated'
+  const eventName = modelName + 'Updated'
   return async function execute(properties, {client, service}, emit) {
     const identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
     const id = generateAnyId(otherPropertyNames, properties)
@@ -199,7 +202,7 @@ function defineUpdateAction(config, context) {
     service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
-  const actionName = 'update' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const actionName = 'update' + modelName
   model.crud.update = actionName
   const accessControl = config.updateAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames)
@@ -218,6 +221,7 @@ function defineUpdateAction(config, context) {
   const validators = App.validation.getValidators(action, service, action)
   const validationContext = { source: action, action }
   action.execute = getUpdateFunction( validators, validationContext, config, context)
+  if(service.actions[actionName]) throw new Error('Action ' + actionName + ' already defined')
   service.actions[actionName] = action
 }
 
@@ -226,7 +230,7 @@ function defineUpdateTrigger(config, context) {
     service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
-  const actionName = 'update' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const actionName = 'update' + modelName
   const triggerName = `${service.name}_${actionName}`
   const trigger = new TriggerDefinition({
     name: triggerName,
@@ -241,6 +245,7 @@ function defineUpdateTrigger(config, context) {
   const validators = App.validation.getValidators(trigger, service, trigger)
   const validationContext = { source: trigger, trigger }
   trigger.execute = getUpdateFunction( validators, validationContext, config, context)
+  if(service.triggers[triggerName]) throw new Error('Trigger ' + triggerName + ' already defined')
   service.triggers[triggerName] = [trigger]
 }
 
@@ -249,7 +254,7 @@ function getSetOrUpdateFunction( validators, validationContext, config, context)
     service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
-  const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Updated'
+  const eventName = modelName + 'Updated'
   return async function execute(properties, { client, service }, emit) {
     const identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
     const id = generateAnyId(otherPropertyNames, properties)
@@ -275,8 +280,8 @@ function defineSetOrUpdateAction(config, context) {
     service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
-  const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Updated'
-  const actionName = 'setOrUpdate' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const eventName = modelName + 'Updated'
+  const actionName = 'setOrUpdate' + modelName
   model.crud.createOrUpdate = actionName
   const accessControl = config.setOrUpdateAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames)
@@ -295,6 +300,7 @@ function defineSetOrUpdateAction(config, context) {
   const validators = App.validation.getValidators(action, service, action)
   const validationContext = { source: action, action }
   action.execute = getSetOrUpdateFunction( validators, validationContext, config, context)
+  if(service.actions[actionName]) throw new Error('Action ' + actionName + ' already defined')
   service.actions[actionName] = action
 }
 
@@ -303,7 +309,7 @@ function defineSetOrUpdateTrigger(config, context) {
     service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
-  const actionName = 'setOrUpdate' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const actionName = 'setOrUpdate' + modelName
   const triggerName = `${service.name}_${actionName}`
   const trigger = new TriggerDefinition({
     name: triggerName,
@@ -318,6 +324,7 @@ function defineSetOrUpdateTrigger(config, context) {
   const validators = App.validation.getValidators(trigger, service, trigger)
   const validationContext = { source: trigger, trigger }
   trigger.execute = getSetOrUpdateFunction( validators, validationContext, config, context)
+  if(service.triggers[triggerName]) throw new Error('Trigger ' + triggerName + ' already defined')
   service.triggers[triggerName] = [trigger]
 }
 
@@ -346,7 +353,7 @@ function defineResetAction(config, context) {
     service, modelRuntime, modelPropertyName, identifiers, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model
   } = context
-  const actionName = 'reset' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const actionName = 'reset' + modelName
   model.crud.delete = actionName
   const accessControl = config.resetAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames)
@@ -368,7 +375,7 @@ function defineResetTrigger(config, context) {
     service, modelRuntime, modelPropertyName, identifiers, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model
   } = context
-  const actionName = 'reset' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const actionName = 'reset' + modelName
   const triggerName = `${service.name}_${actionName}`
   service.triggers[triggerName] = [new TriggerDefinition({
     name: triggerName,

package/singularRelationUtils.js

@@ -17,12 +17,12 @@ function defineView(config, context, external = true) {
       validation: ['nonEmpty']
     })
   }
-  const viewName = config.name || ((config.prefix ? (config.prefix + joinedOthersClassName) : joinedOthersPropertyName) +
-      'Owned' + modelName + (config.suffix || ''))
+  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)
-  service.views[viewName] = new ViewDefinition({
+  service.view({
     name: viewName,
     properties: {
       ...viewProperties
@@ -31,6 +31,7 @@ function defineView(config, context, external = true) {
       type: model,
     },
     internal: !external,
+    global: config.globalView,
     access: external && (config.readAccess || config.writeAccess),
     accessControl,
     daoPath(properties, { client, context }) {
@@ -47,7 +48,7 @@ function getSetFunction( validators, validationContext, config, context) {
     service, app, model, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Set'
+  const eventName = modelName + 'Set'
   async function execute(properties, { client, service }, emit) {
     const idParts = extractIdParts(otherPropertyNames, properties)
     const id = idParts.length > 1 ? idParts.map(p => JSON.stringify(p)).join(':') : idParts[0]
@@ -70,7 +71,7 @@ function defineSetAction(config, context) {
     service, app, model, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
-  const actionName = 'set' + joinedOthersClassName + 'Owned' + modelName
+  const actionName = 'set' + modelName
   model.crud.create = actionName
   const accessControl = config.setAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames, others)
@@ -87,6 +88,7 @@ function defineSetAction(config, context) {
   const validators = App.validation.getValidators(action, service, action)
   const validationContext = { source: action, action }
   action.execute = getSetFunction( validators, validationContext, config, context)
+  if(service.actions[actionName]) throw new Error('Action ' + actionName + ' already defined')
   service.actions[actionName] = action
 }
 
@@ -95,7 +97,7 @@ function defineSetTrigger(config, context) {
     service, app, model, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
-  const actionName = 'set' + joinedOthersClassName + 'Owned' + modelName
+  const actionName = 'set' + modelName
   const triggerName = `${service.name}_${actionName}`
   const trigger = new TriggerDefinition({
     name: triggerName,
@@ -108,6 +110,7 @@ function defineSetTrigger(config, context) {
   const validators = App.validation.getValidators(trigger, service, trigger)
   const validationContext = { source: trigger, trigger }
   trigger.execute = getSetFunction( validators, validationContext, config, context)
+  if(service.triggers[triggerName]) throw new Error('Trigger ' + triggerName + ' already defined')
   service.triggers[triggerName] = [trigger]
 }
 
@@ -116,7 +119,7 @@ function getUpdateFunction( validators, validationContext, config, context) {
     service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Updated'
+  const eventName = modelName + 'Updated'
   return async function execute(properties, { client, service }, emit) {
     const identifiers = extractIdentifiers(otherPropertyNames, properties)
     const id = generateId(otherPropertyNames, properties)
@@ -143,7 +146,7 @@ function defineUpdateAction(config, context) {
     service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
-  const actionName = 'update' + joinedOthersClassName + 'Owned' + modelName
+  const actionName = 'update' + modelName
   model.crud.update = actionName
   const accessControl = config.updateAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames, others)
@@ -162,6 +165,7 @@ function defineUpdateAction(config, context) {
   const validators = App.validation.getValidators(action, service, action)
   const validationContext = { source: action, action }
   action.execute = getUpdateFunction( validators, validationContext, config, context)
+  if(service.actions[actionName]) throw new Error('Action ' + actionName + ' already defined')
   service.actions[actionName] = action
 }
 
@@ -170,7 +174,7 @@ function defineUpdateTrigger(config, context) {
     service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
-  const actionName = 'update' + joinedOthersClassName + 'Owned' + modelName
+  const actionName = 'update' + modelName
   const triggerName = `${service.name}_${actionName}`
   const trigger = new TriggerDefinition({
     name: triggerName,
@@ -185,6 +189,7 @@ function defineUpdateTrigger(config, context) {
   const validators = App.validation.getValidators(trigger, service, trigger)
   const validationContext = { source: trigger, trigger }
   trigger.execute = getUpdateFunction( validators, validationContext, config, context)
+  if(service.triggers[triggerName]) throw new Error('Trigger ' + triggerName + ' already defined')
   service.triggers[triggerName] = [trigger]
 }
 
@@ -193,7 +198,7 @@ function getSetOrUpdateFunction( validators, validationContext, config, context)
     service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Updated'
+  const eventName = modelName + 'Updated'
   return async function execute(properties, { client, service }, emit) {
     const identifiers = extractIdentifiers(otherPropertyNames, properties)
     const id = generateId(otherPropertyNames, properties)
@@ -218,7 +223,7 @@ function defineSetOrUpdateAction(config, context) {
     service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
-  const actionName = 'setOrUpdate' + joinedOthersClassName + 'Owned' + modelName
+  const actionName = 'setOrUpdate' + modelName
   model.crud.createOrUpdate = actionName
   const accessControl = config.updateAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames, others)
@@ -237,6 +242,7 @@ function defineSetOrUpdateAction(config, context) {
   const validators = App.validation.getValidators(action, service, action)
   const validationContext = { source: action, action }
   action.execute = getSetOrUpdateFunction( validators, validationContext, config, context)
+  if(service.actions[actionName]) throw new Error('Action ' + actionName + ' already defined')
   service.actions[actionName] = action
 }
 
@@ -245,7 +251,7 @@ function defineSetOrUpdateTrigger(config, context) {
     service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
-  const actionName = 'setOrUpdate' + joinedOthersClassName + 'Owned' + modelName
+  const actionName = 'setOrUpdate' + modelName
   const triggerName = `${service.name}_${actionName}`
   const trigger = new TriggerDefinition({
     name: triggerName,
@@ -260,6 +266,7 @@ function defineSetOrUpdateTrigger(config, context) {
   const validators = App.validation.getValidators(trigger, service, trigger)
   const validationContext = { source: trigger, trigger }
   trigger.execute = getSetOrUpdateFunction( validators, validationContext, config, context)
+  if(service.triggers[triggerName]) throw new Error('Trigger ' + triggerName + ' already defined')
   service.triggers[triggerName] = [trigger]
 }
 
@@ -268,7 +275,7 @@ function getResetFunction( validators, validationContext, config, context) {
     service, modelRuntime, modelPropertyName, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model, others, writeableProperties
   } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Reset'
+  const eventName = modelName + 'Reset'
   return async function execute(properties, { client, service }, emit) {
     const identifiers = extractIdentifiers(otherPropertyNames, properties)
     const id = generateId(otherPropertyNames, properties)
@@ -288,7 +295,7 @@ function defineResetAction(config, context) {
     service, modelRuntime, modelPropertyName, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model, others, writeableProperties
   } = context
-  const actionName = 'reset' + joinedOthersClassName + 'Owned' + modelName
+  const actionName = 'reset' + modelName
   model.crud.delete = actionName
   const accessControl = config.resetAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames, others)
@@ -309,6 +316,7 @@ function defineResetAction(config, context) {
   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
 }
 
@@ -317,7 +325,7 @@ function defineResetTrigger(config, context) {
     service, modelRuntime, modelPropertyName, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model, others, writeableProperties
   } = context
-  const actionName = 'reset' + joinedOthersClassName + 'Owned' + modelName
+  const actionName = 'reset' + modelName
   const triggerName = `${service.name}_${actionName}`
   const trigger = new TriggerDefinition({
     name: triggerName,
@@ -334,6 +342,7 @@ function defineResetTrigger(config, context) {
   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]
 }