@live-change/relations-plugin 0.9.163 → 0.9.165

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/relations-plugin",
-  "version": "0.9.163",
+  "version": "0.9.165",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -22,7 +22,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/framework": "^0.9.163",
+    "@live-change/framework": "^0.9.165",
     "pluralize": "^8.0.0"
   },
   "devDependencies": {
@@ -30,5 +30,5 @@
     "typedoc-plugin-markdown": "^4.6.3",
     "typedoc-plugin-rename-defaults": "^0.7.3"
   },
-  "gitHead": "c410e1dacd07daed9a5c55367abd7f19d9a575cc"
+  "gitHead": "687dab16bd0c6594544cdab70cd7eecc17bb510c"
 }

package/src/entityUtils.ts

@@ -53,11 +53,11 @@ export interface EntityContext {
 }
 
 
-export function entityAccessControl({service, modelName, modelPropertyName}, accessControl) {
+export function entityAccessControl({service, modelName, modelPropertyName}, accessControl, noObjects = false) {
   if(!accessControl) return undefined
   if(Array.isArray(accessControl)) accessControl = { roles: accessControl }
   return {
-    objects: p => [{ objectType: service.name + '_' + modelName, object: p[modelPropertyName]}],
+    objects: noObjects ? undefined : p => [{ objectType: service.name + '_' + modelName, object: p[modelPropertyName]}],
     ...accessControl
   }
 }
@@ -191,7 +191,7 @@ export function defineCreateAction(config, context) {
     name: actionName,
     properties: { ...model.properties },
     access: config.createAccess || config.writeAccess,
-    accessControl: entityAccessControl(context, config.createAccessControl || config.writeAccessControl),
+    accessControl: entityAccessControl(context, config.createAccessControl || config.writeAccessControl, true),
     skipValidation: true,
     //queuedBy: otherPropertyNames,
     waitForEvents: true,

package/src/singularRelationAnyUtils.js

@@ -339,9 +339,13 @@ function getResetFunction(config, context) {
     if (!entity) throw new Error('not_found')
     await fireChangeTriggers(context, objectType, identifiers, id,
         entity ? extractObjectData(writeableProperties, entity, {}) : null, null, trigger)
+
     emit({
-      type: eventName,
-      identifiers
+      type: eventName,      
+      identifiers: {
+        ...identifiers,
+        [modelPropertyName]: properties[modelPropertyName]
+      }
     })
     return id
   }

package/src/utilsAny.ts

@@ -220,22 +220,22 @@ export function addAccessControlAnyParents(context) {
   )
 }
 
-export function prepareAccessControl(accessControl, names) {
+export function prepareAccessControl(accessControl, names, types = undefined) {
   if(typeof accessControl == 'object') {
-    accessControl.objects = accessControl.objects ?? ((params) => names.map(name => ({
-      objectType: params[name + 'Type'],
+    accessControl.objects = accessControl.objects ?? ((params) => names.map((name, index) => ({
+      objectType: types?.[index] ?? params[name + 'Type'],
       object: params[name]
     })))
   }
 }
 
-export function cloneAndPrepareAccessControl(accessControl, names) {
+export function cloneAndPrepareAccessControl(accessControl, names, types = undefined) {
   if(!accessControl) return accessControl
   if(Array.isArray(accessControl)) {
     accessControl = { roles: accessControl}
   }
   const newAccessControl = { ...accessControl }
-  prepareAccessControl(newAccessControl, names)
+  prepareAccessControl(newAccessControl, names, types)
   return newAccessControl
 }