@live-change/relations-plugin 0.5.24 → 0.5.27

package/itemEvents.js

@@ -3,9 +3,9 @@ const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, E
 
 function defineCreatedEvent(config, context) {
   const {
-    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName
+    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName, reverseRelationWord
   } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Created'
+  const eventName = joinedOthersPropertyName + reverseRelationWord + modelName + 'Created'
   service.events[eventName] = new EventDefinition({
     name: eventName,
     execute(properties) {
@@ -17,9 +17,9 @@ function defineCreatedEvent(config, context) {
 
 function defineUpdatedEvent(config, context) {
   const {
-    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName
+    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName, reverseRelationWord
   } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Updated'
+  const eventName = joinedOthersPropertyName + reverseRelationWord + modelName + 'Updated'
   service.events[eventName] = new EventDefinition({
     name: eventName,
     execute(properties) {
@@ -31,9 +31,9 @@ function defineUpdatedEvent(config, context) {
 
 function defineTransferredEvent(config, context) {
   const {
-    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName
+    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName, reverseRelationWord
   } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Transferred'
+  const eventName = joinedOthersPropertyName + reverseRelationWord + modelName + 'Transferred'
   service.events[eventName] = new EventDefinition({
     name: eventName,
     execute(properties) {
@@ -45,9 +45,9 @@ function defineTransferredEvent(config, context) {
 
 function defineDeletedEvent(config, context) {
   const {
-    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName
+    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName, reverseRelationWord
   } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Deleted'
+  const eventName = joinedOthersPropertyName + reverseRelationWord + modelName + 'Deleted'
   service.events[eventName] = new EventDefinition({
     name: eventName,
     execute(properties) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/relations-plugin",
-  "version": "0.5.24",
+  "version": "0.5.27",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,8 +21,8 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "^0.5.24",
+    "@live-change/framework": "^0.5.27",
     "pluralize": "8.0.0"
   },
-  "gitHead": "2fb6050c59e88d0dd285d640e454819d30130b0b"
+  "gitHead": "8cdab8d362794c923e765193d2e786fb29587877"
 }

package/pluralRelationAnyUtils.js

@@ -65,7 +65,8 @@ function defineCreateAction(config, context) {
       if(entity) throw 'exists'
       const identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
       const data = extractObjectData(writeableProperties, properties, defaults)
-      await App.validation.validate(data, validators, { source: action, action, service, app, client })
+      await App.validation.validate({ ...identifiers, ...data }, validators,
+          { source: action, action, service, app, client })
       emit({
         type: eventName,
         [modelPropertyName]: id,
@@ -95,6 +96,7 @@ function defineUpdateAction(config, context) {
     waitForEvents: true,
     async execute(properties, { client, service }, emit) {
       const id = properties[modelPropertyName]
+      if(!id) throw 'no_id'
       const entity = await modelRuntime().get(id)
       if(!entity) throw 'not_found'
       const entityTypeAndIdParts = extractTypeAndIdParts(otherPropertyNames, entity)
@@ -104,7 +106,8 @@ function defineUpdateAction(config, context) {
       }
       const identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
       const data = extractObjectData(writeableProperties, properties, entity)
-      await App.validation.validate(data, validators, { source: action, action, service, app, client })
+      await App.validation.validate({ ...identifiers, ...data }, validators,
+          { source: action, action, service, app, client })
       emit({
         type: eventName,
         [modelPropertyName]: id,
@@ -152,11 +155,12 @@ function defineDeleteAction(config, context) {
 
 function defineSortIndex(context, sortFields) {
   if(!Array.isArray(sortFields)) sortFields = [sortFields]
-  console.log("DEFINE SORT INDEX", sortFields)
   const sortFieldsUc = sortFields.map(fd => fd.slice(0, 1).toUpperCase() + fd.slice(1))
   const indexName = 'by' + context.joinedOthersClassName + sortFieldsUc.join('')
+  const property = [...(context.otherPropertyNames.map(prop => [prop + 'Type', prop]).flat()), ...sortFields]
+  console.log("DEFINE SORT INDEX", sortFields, "NAME", indexName, "PROP", property)
   context.model.indexes[indexName] = new IndexDefinition({
-    property: [...(context.otherPropertyNames.map(prop => [prop + 'Type', prop])), ...sortFields]
+    property
   })
 }
 

package/pluralRelationUtils.js

@@ -60,7 +60,8 @@ function defineCreateAction(config, context) {
       if(entity) throw 'exists'
       const identifiers = extractIdentifiers(otherPropertyNames, properties)
       const data = extractObjectData(writeableProperties, properties, defaults)
-      await App.validation.validate(data, validators, { source: action, action, service, app, client })
+      await App.validation.validate({ ...identifiers, ...data }, validators,
+          { source: action, action, service, app, client })
       emit({
         type: eventName,
         [modelPropertyName]: id,
@@ -88,7 +89,7 @@ function defineUpdateAction(config, context) {
     skipValidation: true,
     //queuedBy: otherPropertyNames,
     waitForEvents: true,
-    async execute(properties, {client, service}, emit) {
+    async execute(properties, { client, service }, emit) {
       const id = properties[modelPropertyName]
       const entity = await modelRuntime().get(id)
       if(!entity) throw 'not_found'
@@ -99,7 +100,8 @@ function defineUpdateAction(config, context) {
       }
       const identifiers = extractIdentifiers(otherPropertyNames, properties)
       const data = extractObjectData(writeableProperties, properties, entity)
-      await App.validation.validate(data, validators, { source: action, action, service, app, client })
+      await App.validation.validate({ ...identifiers, ...data }, validators,
+          { source: action, action, service, app, client })
       emit({
         type: eventName,
         [modelPropertyName]: id,
@@ -128,7 +130,7 @@ function defineDeleteAction(config, context) {
     skipValidation: true,
     //queuedBy: otherPropertyNames,
     waitForEvents: true,
-    async execute(properties, {client, service}, emit) {
+    async execute(properties, { client, service }, emit) {
       const id = properties[modelPropertyName]
       const entity = await modelRuntime().get(id)
       if(!entity) throw new Error('not_found')

package/propertyEvents.js

@@ -3,9 +3,9 @@ const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, E
 
 function defineSetEvent(config, context, generateId) {
   const {
-    service, modelRuntime, joinedOthersPropertyName, modelName, otherPropertyNames
+    service, modelRuntime, joinedOthersPropertyName, modelName, otherPropertyNames, reverseRelationWord
   } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Set'
+  const eventName = joinedOthersPropertyName + reverseRelationWord + modelName + 'Set'
   service.events[eventName] = new EventDefinition({
     name: eventName,
     execute(properties) {
@@ -17,23 +17,23 @@ function defineSetEvent(config, context, generateId) {
 
 function defineUpdatedEvent(config, context, generateId) {
   const {
-    service, modelRuntime, joinedOthersPropertyName, modelName, otherPropertyNames
+    service, modelRuntime, joinedOthersPropertyName, modelName, otherPropertyNames, reverseRelationWord
   } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Updated'
+  const eventName = joinedOthersPropertyName + reverseRelationWord + modelName + 'Updated'
   service.events[eventName] = new EventDefinition({
     name: eventName,
     execute(properties) {
       const id = generateId(otherPropertyNames, properties.identifiers)
-      return modelRuntime().update(id, { ...properties.data, /*...properties.identifiers*/ })
+      return modelRuntime().update(id, { ...properties.data, ...properties.identifiers })
     }
   })
 }
 
 function defineTransferredEvent(config, context, generateId) {
   const {
-    service, modelRuntime, joinedOthersPropertyName, modelName, otherPropertyNames
+    service, modelRuntime, joinedOthersPropertyName, modelName, otherPropertyNames, reverseRelationWord
   } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Transferred'
+  const eventName = joinedOthersPropertyName + reverseRelationWord + modelName + 'Transferred'
   service.events[eventName] = new EventDefinition({
     name: eventName,
     async execute(properties) {
@@ -53,9 +53,9 @@ function defineTransferredEvent(config, context, generateId) {
 
 function defineResetEvent(config, context, generateId) {
   const {
-    service, modelRuntime, joinedOthersPropertyName, modelName, otherPropertyNames
+    service, modelRuntime, joinedOthersPropertyName, modelName, otherPropertyNames, reverseRelationWord
   } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Reset'
+  const eventName = joinedOthersPropertyName + reverseRelationWord + modelName + 'Reset'
   service.events[eventName] = new EventDefinition({
     name: eventName,
     execute({ identifiers }) {
@@ -65,4 +65,6 @@ function defineResetEvent(config, context, generateId) {
   })
 }
 
-module.exports = { defineSetEvent, defineUpdatedEvent, defineTransferredEvent, defineResetEvent }
+module.exports = {
+  defineSetEvent, defineUpdatedEvent, defineTransferredEvent, defineResetEvent
+}

package/propertyOf.js

@@ -5,7 +5,9 @@ const {
 
 const { defineSetEvent, defineUpdatedEvent, defineTransferredEvent, defineResetEvent } = require('./propertyEvents.js')
 
-const { defineView, defineSetAction, defineUpdateAction, defineResetAction } = require('./singularRelationUtils.js')
+const {
+  defineView, defineSetAction, defineUpdateAction, defineSetOrUpdateAction, defineResetAction
+} = require('./singularRelationUtils.js')
 
 module.exports = function(service, app) {
   processModelsAnnotation(service, app, 'propertyOf', false, (config, context) => {
@@ -38,6 +40,10 @@ module.exports = function(service, app) {
       defineUpdateAction(config, context)
     }
 
+    if((config.setAccess && config.updateAccess) || config.writeAccess) {
+      defineSetOrUpdateAction(config, context)
+    }
+
     if(config.resetAccess || config.writeAccess) {
       defineResetAction(config, context);
     }

package/propertyOfAny.js

@@ -8,7 +8,7 @@ const {
 } = require('./propertyEvents.js')
 
 const {
-  defineView, defineSetAction, defineUpdateAction, defineResetAction
+  defineView, defineSetAction, defineUpdateAction, defineSetOrUpdateAction, defineResetAction
 } = require('./singularRelationAnyUtils.js')
 
 module.exports = function(service, app) {
@@ -42,6 +42,10 @@ module.exports = function(service, app) {
       defineUpdateAction(config, context)
     }
 
+    if((config.setAccess && config.updateAccess) || config.writeAccess) {
+      defineSetOrUpdateAction(config, context)
+    }
+
     if(config.resetAccess || config.writeAccess) {
       defineResetAction(config, context);
     }

package/singularRelationAnyUtils.js

@@ -40,7 +40,7 @@ function defineView(config, context) {
 
 function defineSetAction(config, context) {
   const {
-    service, app, model,  defaults,
+    service, app, model, defaults,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
 
@@ -55,10 +55,11 @@ function defineSetAction(config, context) {
     skipValidation: true,
     queuedBy: otherPropertyNames,
     waitForEvents: true,
-    async execute(properties, {client, service}, emit) {
+    async execute(properties, { client, service }, emit) {
       const identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
       const data = extractObjectData(writeableProperties, properties, defaults)
-      await App.validation.validate(data, validators, { source: action, action, service, app, client })
+      await App.validation.validate({ ...identifiers, ...data }, validators,
+          { source: action, action, service, app, client })
       emit({
         type: eventName,
         identifiers, data
@@ -91,7 +92,41 @@ function defineUpdateAction(config, context) {
       const entity = await modelRuntime().get(id)
       if (!entity) throw new Error('not_found')
       const data = extractObjectData(writeableProperties, properties, entity)
-      await App.validation.validate(data, validators, { source: action, action, service, app, client })
+      await App.validation.validate({ ...identifiers, ...data }, validators,
+          { source: action, action, service, app, client })
+      emit({
+        type: eventName,
+        identifiers, data
+      })
+    }
+  })
+  const action = service.actions[actionName]
+  const validators = App.validation.getValidators(action, service, action)
+}
+
+function defineSetOrUpdateAction(config, context) {
+  const {
+    service, app, model, modelRuntime, defaults,
+    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
+  } = context
+  const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Updated'
+  const actionName = 'setOrUpdate' + joinedOthersClassName + context.reverseRelationWord + modelName
+  service.actions[actionName] = new ActionDefinition({
+    name: actionName,
+    properties: {
+      ...(model.properties)
+    },
+    access: config.updateAccess || config.writeAccess,
+    skipValidation: true,
+    queuedBy: otherPropertyNames,
+    waitForEvents: true,
+    async execute(properties, { client, service }, emit) {
+      const identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
+      const id = generateAnyId(otherPropertyNames, properties)
+      const entity = await modelRuntime().get(id)
+      const data = extractObjectData(writeableProperties, properties, { ...defaults, ...entity } )
+      await App.validation.validate({ ...identifiers, ...data }, validators,
+          { source: action, action, service, app, client })
       emit({
         type: eventName,
         identifiers, data
@@ -133,4 +168,4 @@ function defineResetAction(config, context) {
   })
 }
 
-module.exports = { defineView, defineSetAction, defineUpdateAction, defineResetAction }
+module.exports = { defineView, defineSetAction, defineUpdateAction, defineSetOrUpdateAction, defineResetAction }

package/singularRelationUtils.js

@@ -48,10 +48,11 @@ function defineSetAction(config, context) {
     skipValidation: true,
     queuedBy: otherPropertyNames,
     waitForEvents: true,
-    async execute(properties, {client, service}, emit) {
+    async execute(properties, { client, service }, emit) {
       const identifiers = extractIdentifiers(otherPropertyNames, properties)
       const data = extractObjectData(writeableProperties, properties, defaults)
-      await App.validation.validate(data, validators, { source: action, action, service, app, client })
+      await App.validation.validate({ ...identifiers, ...data }, validators,
+          { source: action, action, service, app, client })
       emit({
         type: eventName,
         identifiers, data
@@ -78,13 +79,47 @@ function defineUpdateAction(config, context) {
     skipValidation: true,
     queuedBy: otherPropertyNames,
     waitForEvents: true,
-    async execute(properties, {client, service}, emit) {
+    async execute(properties, { client, service }, emit) {
       const identifiers = extractIdentifiers(otherPropertyNames, properties)
       const id = generateId(otherPropertyNames, properties)
       const entity = await modelRuntime().get(id)
       if (!entity) throw new Error('not_found')
       const data = extractObjectData(writeableProperties, properties, entity)
-      await App.validation.validate(data, validators, { source: action, action, service, app, client })
+      await App.validation.validate({ ...identifiers, ...data }, validators,
+          { source: action, action, service, app, client })
+      emit({
+        type: eventName,
+        identifiers, data
+      })
+    }
+  })
+  const action = service.actions[actionName]
+  const validators = App.validation.getValidators(action, service, action)
+}
+
+function defineSetOrUpdateAction(config, context) {
+  const {
+    service, app, model, defaults, modelRuntime,
+    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
+  } = context
+  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Updated'
+  const actionName = 'update' + joinedOthersClassName + 'Owned' + modelName
+  service.actions[actionName] = new ActionDefinition({
+    name: actionName,
+    properties: {
+      ...(model.properties)
+    },
+    access: config.updateAccess || config.writeAccess,
+    skipValidation: true,
+    queuedBy: otherPropertyNames,
+    waitForEvents: true,
+    async execute(properties, { client, service }, emit) {
+      const identifiers = extractIdentifiers(otherPropertyNames, properties)
+      const id = generateId(otherPropertyNames, properties)
+      const entity = await modelRuntime().get(id)
+      const data = extractObjectData(writeableProperties, properties, { ...defaults, ...entity })
+      await App.validation.validate({ ...identifiers, ...data }, validators,
+          { source: action, action, service, app, client })
       emit({
         type: eventName,
         identifiers, data
@@ -113,7 +148,7 @@ function defineResetAction(config, context) {
     access: config.resetAccess || config.writeAccess,
     queuedBy: otherPropertyNames,
     waitForEvents: true,
-    async execute(properties, {client, service}, emit) {
+    async execute(properties, { client, service }, emit) {
       const identifiers = extractIdentifiers(otherPropertyNames, properties)
       const id = generateId(otherPropertyNames, properties)
       const entity = await modelRuntime().get(id)
@@ -126,4 +161,4 @@ function defineResetAction(config, context) {
   })
 }
 
-module.exports = { defineView, defineSetAction, defineUpdateAction, defineResetAction }
+module.exports = { defineView, defineSetAction, defineUpdateAction, defineSetOrUpdateAction, defineResetAction }

package/utils.js

@@ -35,13 +35,13 @@ function generateId(otherPropertyNames, properties) {
 }
 
 function extractObjectData(writeableProperties, properties, defaults) {
-  let updateObject = {}
+  let objectData = {}
   for (const propertyName of writeableProperties) {
     if (properties.hasOwnProperty(propertyName)) {
-      newObject[propertyName] = properties[propertyName]
+      objectData[propertyName] = properties[propertyName]
     }
   }
-  return App.utils.mergeDeep({}, defaults, updateObject)
+  return App.utils.mergeDeep({}, defaults, JSON.parse(JSON.stringify(objectData)))
 }
 
 function defineProperties(model, types, names) {