@live-change/relations-plugin 0.9.18 → 0.9.20

package/entity.js

@@ -1,6 +1,7 @@
 import {
   defineProperties, defineIndex,
-  processModelsAnnotation, extractIdParts, extractIdentifiers, extractObjectData, prepareAccessControl
+  processModelsAnnotation, extractIdParts, extractIdentifiers, extractObjectData, prepareAccessControl,
+  includeAccessRoles
 } from './utils.js'
 import { fireChangeTriggers } from "./changeTriggers.js"
 import App from '@live-change/framework'
@@ -13,6 +14,7 @@ const annotation = 'entity'
 
 function entityAccessControl({service, modelName, modelPropertyName}, accessControl) {
   if(!accessControl) return undefined
+  if(Array.isArray(accessControl)) accessControl = { roles: accessControl }
   return {
     objects: p => [{ objectType: service.name + '_' + modelName, object: p[modelPropertyName]}],
     ...accessControl
@@ -367,6 +369,10 @@ export default function(service, app) {
 
     model.identifiers = [{ name: modelPropertyName, field: 'id' }]
     model.crud = {}
+    includeAccessRoles(model, [
+      config.readAccessControl, config.writeAccessControl,
+      config.createAccessControl, config.updateAccessControl, config.deleteAccessControl
+    ])
 
     function modelRuntime() {
       return service._runtime.models[modelName]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/relations-plugin",
-  "version": "0.9.18",
+  "version": "0.9.20",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,8 +22,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/framework": "^0.9.18",
+    "@live-change/framework": "^0.9.20",
     "pluralize": "^8.0.0"
   },
-  "gitHead": "d7fd7ad0a0ea331caea9dc8385439b9c637525ed"
+  "gitHead": "6524c2dedbb137e95e9aa07eaf9503d68d7b9093"
 }

package/utils.js

@@ -229,3 +229,19 @@ export function defineParentDeleteTriggers(config, context) {
 export function defineParentCopyTriggers(config, context) {
   registerParentCopyTriggers(context, config)
 }
+
+export function includeAccessRoles(model, access) {
+  if(!access) return
+  if(!model.accessRoles) model.accessRoles = []
+  if(typeof access === 'string' && !model.accessRoles.find(role => role === access)) {
+    model.accessRoles.push(access)
+  }
+  if(Array.isArray(access)) {
+    for(const element of access) {
+      includeAccessRoles(model, element)
+    }
+  }
+  if(access.roles) {
+    includeAccessRoles(model, access.roles)
+  }
+}