@live-change/relations-plugin 0.8.31 → 0.8.33

package/changeTriggers.js

@@ -8,7 +8,8 @@ async function fireChangeTriggers(context, objectType, identifiers, object, oldD
   const changeType = data ? (oldData ? 'update' : 'create') : 'delete'
   await Promise.all([
     app.trigger({
-      type: changeType+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
+      type: changeType + service.name[0].toUpperCase() + service.name.slice(1) + '_' + modelName,
+    }, {
       objectType,
       object,
       identifiers,
@@ -16,7 +17,8 @@ async function fireChangeTriggers(context, objectType, identifiers, object, oldD
       oldData
     }),
     app.trigger({
-      type: changeType+'Object',
+      type: changeType + 'Object',
+    }, {
       objectType,
       object,
       identifiers,
@@ -146,7 +148,8 @@ async function copyObject(context, objectType, object, parentType, parent, ident
 
   const newId = app.generateUid()
   app.trigger({
-    type: 'copy'+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
+    type: 'copy' + service.name[0].toUpperCase() + service.name.slice(1) + '_' + modelName,
+  }, {
     objectType,
     object: newId,
     from: object,
@@ -155,6 +158,7 @@ async function copyObject(context, objectType, object, parentType, parent, ident
   })
   app.trigger({
     type: 'copyObject',
+  }, {
     objectType,
     object: newId,
     from: object,
@@ -187,6 +191,7 @@ async function triggerCopyOnParentCopyTriggers(
     //console.log("COPY TRIGGER", myType, fromId, objectType, object, from, identifiers, data)
     const copyTriggerResults = await app.trigger({
       type: 'copyOnParentCopy'+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
+    }, {
       objectType: myType,
       object: fromId,
       parentType: objectType,

package/itemOf.js

@@ -1,7 +1,7 @@
 import {
   defineProperties, defineIndexes,
   processModelsAnnotation, addAccessControlParents,
-  defineDeleteByOwnerEvents, defineParentDeleteTriggers, defineParentCopyTriggers, defineAuthorProperties
+  defineDeleteByOwnerEvents, defineParentDeleteTriggers, defineParentCopyTriggers
 } from './utils.js'
 
 import {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/relations-plugin",
-  "version": "0.8.31",
+  "version": "0.8.33",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,8 +22,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/framework": "^0.8.31",
+    "@live-change/framework": "^0.8.33",
     "pluralize": "^8.0.0"
   },
-  "gitHead": "9ab10c6f2854dd5472cc6becb128951db16218e3"
+  "gitHead": "98ff6f9c09e5fc1f408010df6cc8038eff571276"
 }

package/pluralRelationAnyUtils.js

@@ -134,11 +134,13 @@ function getUpdateFunction( validators, validationContext, config, context) {
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Updated'
   return async function execute(properties, { client, service }, emit) {
     const id = properties[modelPropertyName]
-    if(!id) throw 'no_id'
+    if(!id) throw new Error('no_id')
     const entity = await modelRuntime().get(id)
     if(!entity) throw 'not_found'
     const entityTypeAndIdParts = extractTypeAndIdParts(otherPropertyNames, entity)
     const typeAndIdParts = extractTypeAndIdParts(otherPropertyNames, properties)
+    console.log("UPDATE MATCH", entityTypeAndIdParts, '===', typeAndIdParts,
+      '=>', JSON.stringify(entityTypeAndIdParts) === JSON.stringify(typeAndIdParts))
     if(JSON.stringify(entityTypeAndIdParts) !== JSON.stringify(typeAndIdParts)) {
       throw 'not_authorized'
     }
@@ -147,7 +149,7 @@ function getUpdateFunction( validators, validationContext, config, context) {
       extractObjectData(writeableProperties, properties, entity),
       App.computeUpdates(model, { ...entity, ...properties }, { client, service })
     )
-    await App.validation.validate({ ...identifiers, ...data }, validators,
+    await App.validation.validate({ ...identifiers, ...data, [modelPropertyName]: id }, validators,
       validationContext)
     await fireChangeTriggers(context, objectType, identifiers, id,
       extractObjectData(writeableProperties, entity, {}), data)
@@ -158,7 +160,6 @@ function getUpdateFunction( validators, validationContext, config, context) {
       data
     })
   }
-
 }
 
 function defineUpdateAction(config, context) {

package/pluralRelationUtils.js

@@ -319,6 +319,7 @@ function getCopyFunction( validators, validationContext, config, context) {
       validationContext)
     app.trigger({
       type: 'copy'+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
+    }, {
       objectType,
       object: newId,
       from: id,
@@ -327,6 +328,7 @@ function getCopyFunction( validators, validationContext, config, context) {
     }),
       app.trigger({
         type: 'copyObject',
+      }, {
         objectType,
         object: newId,
         from: id,
@@ -466,6 +468,7 @@ function defineCopyOnParentCopyTrigger(config, context) {
       const newId = app.generateUid()
       app.trigger({
         type: 'copy'+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
+      }, {
         objectType,
         object: newId,
         from: object,
@@ -474,6 +477,7 @@ function defineCopyOnParentCopyTrigger(config, context) {
       })
       app.trigger({
         type: 'copyObject',
+      }, {
         objectType,
         object: newId,
         from: object,

package/saveAuthor.js

@@ -1,4 +1,36 @@
-import { defineAuthorProperties } from './utils.js'
+import {
+  PropertyDefinition
+} from "@live-change/framework"
+
+export function defineAuthorProperties() {
+  return {
+    authorType: new PropertyDefinition({
+      type: String,
+      validation: ['nonEmpty'],
+      default: (_props, context) => context.client.user ? 'user_User' : 'session_Session'
+    }),
+    author: new PropertyDefinition({
+      type: String,
+      validation: ['nonEmpty'],
+      default: (_props, context) => context.client.user ? context.client.user : context.client.session
+    })
+  }
+}
+
+export function defineUpdaterProperties() {
+  return {
+    updaterType: new PropertyDefinition({
+      type: String,
+      validation: ['nonEmpty'],
+      default: (_props, context) => context.client.user ? 'user_User' : 'session_Session'
+    }),
+    updater: new PropertyDefinition({
+      type: String,
+      validation: ['nonEmpty'],
+      default: (_props, context) => context.client.user ? context.client.user : context.client.session
+    })
+  }
+}
 
 export default function(service, app) {
   for(let modelName in service.models) {
@@ -9,5 +41,11 @@ export default function(service, app) {
         ...defineAuthorProperties()
       }
     }
+    if(model.saveUpdater) {
+      model.properties = {
+        ...model.properties,
+        ...defineUpdaterProperties()
+      }
+    }
   }
 }

package/utils.js

@@ -41,21 +41,6 @@ export function defineProperties(model, types, names) {
   return identifiers
 }
 
-export function defineAuthorProperties() {
-  return {
-    authorType: new PropertyDefinition({
-      type: String,
-      validation: ['nonEmpty'],
-      default: (_props, context) => context.client.user ? 'user_User' : 'session_Session'
-    }),
-    author: new PropertyDefinition({
-      type: String,
-      validation: ['nonEmpty'],
-      default: (_props, context) => context.client.user ? context.client.user : context.client.session
-    })
-  }
-}
-
 export function defineIndex(model, what, props) {
   console.log("DEFINE INDEX", model.name, what, props)
   model.indexes['by' + what] = new IndexDefinition({