@live-change/relations-plugin 0.6.11 → 0.6.14

package/entity.js

@@ -3,16 +3,17 @@ const {
   processModelsAnnotation, extractIdParts, extractIdentifiers, extractObjectData
 } = require('./utils.js')
 const App = require("@live-change/framework")
+const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition } = App
 
 const annotation = 'entity'
 
 function defineView(config, context) {
-  const { service, modelRuntime, modelName, others, model } = context
-  const viewName = (config.prefix || '' ) + modelName + (config.suffix || '')
+  const { service, modelRuntime, modelPropertyName, modelName, others, model } = context
+  const viewName = (config.prefix || '' ) + (config.prefix ? modelName : modelPropertyName) + (config.suffix || '')
   service.views[viewName] = new ViewDefinition({
     name: viewName,
     properties: {
-      [modelName]: {
+      [modelPropertyName]: {
         type: model,
         validation: ['nonEmpty']
       }
@@ -23,7 +24,7 @@ function defineView(config, context) {
     access: config.access,
     accessControl: config.readAccessControl || config.writeAccessControl,
     daoPath(properties, { client, context }) {
-      const id = properties[modelName]
+      const id = properties[modelPropertyName]
       const path = config.fields ? modelRuntime().limitedPath(id, config.fields) : modelRuntime().path(id)
       return path
     }
@@ -204,11 +205,10 @@ module.exports = function(service, app) {
 
     const writeableProperties = modelProperties || config.writeableProperties
     //console.log("PPP", others)
-    const otherPropertyNames = others.map(other => other.slice(0, 1).toLowerCase() + other.slice(1))
 
     const context = {
       service, app, model, originalModelProperties, modelProperties, modelPropertyName, defaults, modelRuntime,
-      otherPropertyNames, modelName, writeableProperties, annotation
+      modelName, writeableProperties, annotation
     }
 
     if (config.readAccess || config.readAccessControl || config.writeAccessControl) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/relations-plugin",
-  "version": "0.6.11",
+  "version": "0.6.14",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,8 +21,8 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "^0.6.11",
+    "@live-change/framework": "^0.6.14",
     "pluralize": "8.0.0"
   },
-  "gitHead": "99d448214c2df44f42e5d25a08fa50ae79e5bdbe"
+  "gitHead": "44cec669125b2af3f0b9318cb70c5cf4647c28c6"
 }

package/pluralRelationAnyUtils.js

@@ -1,6 +1,6 @@
 const App = require("@live-change/framework")
 const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition } = App
-const { extractTypeAndIdParts, extractIdentifiersWithTypes } = require("./utilsAny.js")
+const { extractTypeAndIdParts, extractIdentifiersWithTypes, prepareAccessControl } = require("./utilsAny.js")
 const { extractObjectData } = require("./utils.js")
 const { extractRange } = App
 
@@ -22,12 +22,7 @@ function defineView(config, context) {
     })
   }
   const accessControl = config.readAccessControl || config.writeAccessControl
-  if(typeof accessControl == 'object') {
-    accessControl.objects = accessControl.objects ?? ((params) => otherPropertyNames.map(name => ({
-      objectType: params[name + 'Type'],
-      object: params[name]
-    })))
-  }
+  prepareAccessControl(accessControl, otherPropertyNames)
   const viewName = joinedOthersPropertyName + context.reverseRelationWord + pluralize(modelName)
   service.views[viewName] = new ViewDefinition({
     name: viewName,
@@ -59,13 +54,15 @@ function defineCreateAction(config, context) {
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Created'
   const actionName = 'create' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const accessControl = config.createAccessControl || config.writeAccessControl
+  prepareAccessControl(accessControl, otherPropertyNames)
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
     properties: {
       ...(model.properties)
     },
     access: config.createAccess || config.writeAccess,
-    accessControl: config.createAccessControl || config.writeAccessControl,
+    accessControl,
     skipValidation: true,
     //queuedBy: otherPropertyNames,
     waitForEvents: true,
@@ -95,6 +92,8 @@ function defineUpdateAction(config, context) {
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Updated'
   const actionName = 'update' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const accessControl = config.updateAccessControl || config.writeAccessControl
+  prepareAccessControl(accessControl, otherPropertyNames)
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
     properties: {
@@ -105,7 +104,7 @@ function defineUpdateAction(config, context) {
       ...(model.properties)
     },
     access: config.updateAccess || config.writeAccess,
-    accessControl: config.updateAccessControl || config.writeAccessControl,
+    accessControl,
     skipValidation: true,
     //queuedBy: otherPropertyNames,
     waitForEvents: true,
@@ -142,6 +141,8 @@ function defineDeleteAction(config, context) {
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Deleted'
   const actionName = 'delete' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const accessControl = config.deleteAccessControl || config.writeAccessControl
+  prepareAccessControl(accessControl, otherPropertyNames)
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
     properties: {
@@ -152,7 +153,7 @@ function defineDeleteAction(config, context) {
       ...identifiers
     },
     access: config.deleteAccess || config.writeAccess,
-    accessControl: config.deleteAccessControl || config.writeAccessControl,
+    accessControl,
     skipValidation: true,
     //queuedBy: otherPropertyNames,
     waitForEvents: true,

package/pluralRelationUtils.js

@@ -1,6 +1,6 @@
 const App = require("@live-change/framework")
 const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition } = App
-const { extractIdParts, extractRange, extractIdentifiers, extractObjectData } = require("./utils.js")
+const { extractIdParts, extractRange, extractIdentifiers, extractObjectData, prepareAccessControl } = require("./utils.js")
 
 const pluralize = require('pluralize')
 
@@ -16,6 +16,8 @@ function defineView(config, context) {
     })
   }
   const viewName = joinedOthersPropertyName + context.reverseRelationWord + pluralize(modelName)
+  const accessControl = config.readAccessControl || config.writeAccessControl
+  prepareAccessControl(accessControl, otherPropertyNames, others)
   service.views[viewName] = new ViewDefinition({
     name: viewName,
     properties: {
@@ -42,17 +44,19 @@ function defineView(config, context) {
 function defineCreateAction(config, context) {
   const {
     service, app, model,  defaults, modelPropertyName, modelRuntime,
-    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
+    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Created'
   const actionName = 'set' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const accessControl = config.createAccessControl || config.writeAccessControl
+  prepareAccessControl(accessControl, otherPropertyNames, others)
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
     properties: {
       ...(model.properties)
     },
     access: config.createAccess || config.writeAccess,
-    accessControl: config.createAccessControl || config.writeAccessControl,
+    accessControl,
     skipValidation: true,
     //queuedBy: otherPropertyNames,
     waitForEvents: true,
@@ -78,10 +82,12 @@ function defineCreateAction(config, context) {
 function defineUpdateAction(config, context) {
   const {
     service, app, model, modelRuntime, modelPropertyName,
-    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
+    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Updated'
   const actionName = 'update' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const accessControl = config.updateAccessControl || config.writeAccessControl
+  prepareAccessControl(accessControl, otherPropertyNames, others)
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
     properties: {
@@ -120,17 +126,19 @@ function defineUpdateAction(config, context) {
 function defineDeleteAction(config, context) {
   const {
     service, app, model, modelRuntime, modelPropertyName,
-    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
+    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Deleted'
   const actionName = 'delete' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const accessControl = config.deleteAccessControl || config.writeAccessControl
+  prepareAccessControl(accessControl, otherPropertyNames, others)
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
     properties: {
       ...(model.properties)
     },
     access: config.deleteAccess || config.writeAccess,
-    accessControl: config.deleteAccessControl || config.writeAccessControl,
+    accessControl,
     skipValidation: true,
     //queuedBy: otherPropertyNames,
     waitForEvents: true,

package/propertyOf.js

@@ -19,8 +19,8 @@ module.exports = function(service, app) {
     addAccessControlParents(context)
     defineIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
 
-    if(config.readAccess || config.readAccessControl || config.writeAccessControl) {
-      defineView({ ...config, access: config.readAccess }, context)
+    if(config.readAccess || config.writeAccess || config.readAccessControl || config.writeAccessControl) {
+      defineView({ ...config }, context)
     }
     if(config.views) {
       for(const view of config.views) {

package/singularRelationAnyUtils.js

@@ -1,6 +1,6 @@
 const App = require("@live-change/framework")
 const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition } = App
-const { extractTypeAndIdParts, extractIdentifiersWithTypes, generateAnyId } = require("./utilsAny.js")
+const { extractTypeAndIdParts, extractIdentifiersWithTypes, generateAnyId, prepareAccessControl } = require("./utilsAny.js")
 const { extractObjectData } = require("./utils.js")
 const { allCombinations } = require("./combinations.js")
 
@@ -36,12 +36,7 @@ function defineObjectView(config, context) {
     })
   }
   const accessControl = config.singleAccessControl || config.readAccessControl || config.writeAccessControl
-  if(typeof accessControl == 'object') {
-    accessControl.objects = accessControl.objects ?? ((params) => otherPropertyNames.map(name => ({
-      objectType: params[name + 'Type'],
-      object: params[name]
-    })))
-  }
+  prepareAccessControl(accessControl, otherPropertyNames)
   const viewName = config.name || ((config.prefix ? (config.prefix + joinedOthersClassName) : joinedOthersPropertyName) +
       context.reverseRelationWord + modelName + (config.suffix || ''))
   service.views[viewName] = new ViewDefinition({
@@ -67,6 +62,8 @@ function defineRangeViews(config, context) {
   const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
     modelName, others, model } = context
   const identifierCombinations = allCombinations(otherPropertyNames).slice(0, -1)
+  const accessControl = config.listAccessControl || config.readAccessControl || config.writeAccessControl
+  prepareAccessControl(accessControl, otherPropertyNames)
   for(const combination of identifierCombinations) {
     const propsUpperCase = combination.map(prop => prop[0].toUpperCase() + prop.slice(1))
     const indexName = 'by' + combination.map(prop => prop[0].toUpperCase() + prop.slice(1))
@@ -81,7 +78,7 @@ function defineRangeViews(config, context) {
         ...App.rangeProperties,
       },
       access: config.listAccess || config.readAccess,
-      accessControl: config.listAccessControl || config.readAccessControl || config.writeAccessControl,
+      accessControl,
       daoPath(params, { client, context }) {
         const owner = []
         for (const key of combination) {
@@ -101,13 +98,15 @@ function defineSetAction(config, context) {
 
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Set'
   const actionName = 'set' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const accessControl = config.setAccessControl || config.writeAccessControl
+  prepareAccessControl(accessControl, otherPropertyNames)
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
     properties: {
       ...(model.properties)
     },
     access: config.setAccess || config.writeAccess,
-    accessControl: config.setAccessControl || config.writeAccessControl,
+    accessControl,
     skipValidation: true,
     queuedBy: otherPropertyNames,
     waitForEvents: true,
@@ -133,13 +132,15 @@ function defineUpdateAction(config, context) {
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Updated'
   const actionName = 'update' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const accessControl = config.updateAccessControl || config.writeAccessControl
+  prepareAccessControl(accessControl, otherPropertyNames)
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
     properties: {
       ...(model.properties)
     },
     access: config.updateAccess || config.writeAccess,
-    accessControl: config.updateAccessControl || config.writeAccessControl,
+    accessControl,
     skipValidation: true,
     queuedBy: otherPropertyNames,
     waitForEvents: true,
@@ -168,13 +169,15 @@ function defineSetOrUpdateAction(config, context) {
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Updated'
   const actionName = 'setOrUpdate' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const accessControl = config.setOrUpdateAccessControl || config.writeAccessControl
+  prepareAccessControl(accessControl, otherPropertyNames)
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
     properties: {
       ...(model.properties)
     },
     access: config.updateAccess || config.writeAccess,
-    accessControl: config.setAccessControl || config.writeAccessControl,
+    accessControl,
     skipValidation: true,
     queuedBy: otherPropertyNames,
     waitForEvents: true,
@@ -202,6 +205,8 @@ function defineResetAction(config, context) {
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Reset'
   const actionName = 'reset' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const accessControl = config.resetAccessControl || config.writeAccessControl
+  prepareAccessControl(accessControl, otherPropertyNames)
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
     properties: {
@@ -212,7 +217,7 @@ function defineResetAction(config, context) {
       ...identifiers
     },
     access: config.resetAccess || config.writeAccess,
-    accessControl: config.resetAccessControl || config.writeAccessControl,
+    accessControl,
     queuedBy: otherPropertyNames,
     waitForEvents: true,
     async execute(properties, {client, service}, emit) {

package/singularRelationUtils.js

@@ -1,6 +1,8 @@
 const App = require("@live-change/framework")
 const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition } = App
-const { extractIdentifiers, extractObjectData, generateId, extractIdParts} = require("./utils.js")
+const {
+  extractIdentifiers, extractObjectData, generateId, extractIdParts, prepareAccessControl
+} = require("./utils.js")
 
 function defineView(config, context) {
   const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
@@ -14,6 +16,8 @@ function defineView(config, context) {
   }
   const viewName = config.name || ((config.prefix ? (config.prefix + joinedOthersClassName) : joinedOthersPropertyName) +
       'Owned' + modelName + (config.suffix || ''))
+  const accessControl = config.readAccessControl || config.writeAccessControl
+  prepareAccessControl(accessControl, otherPropertyNames, others)
   service.views[viewName] = new ViewDefinition({
     name: viewName,
     properties: {
@@ -22,8 +26,8 @@ function defineView(config, context) {
     returns: {
       type: model,
     },
-    access: config.readAccess,
-    accessControl: config.readAccessControl || config.writeAccessControl,
+    access: config.readAccess || config.writeAccess,
+    accessControl,
     daoPath(properties, { client, context }) {
       const idParts = extractIdParts(otherPropertyNames, properties)
       const id = idParts.length > 1 ? idParts.map(p => JSON.stringify(p)).join(':') : idParts[0]
@@ -36,17 +40,19 @@ function defineView(config, context) {
 function defineSetAction(config, context) {
   const {
     service, app, model,  defaults,
-    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
+    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Set'
   const actionName = 'set' + joinedOthersClassName + 'Owned' + modelName
+  const accessControl = config.setAccessControl || config.writeAccessControl
+  prepareAccessControl(accessControl, otherPropertyNames, others)
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
     properties: {
       ...(model.properties)
     },
     access: config.setAccess || config.writeAccess,
-    accessControl: config.setAccessControl || config.writeAccessControl,
+    accessControl,
     skipValidation: true,
     queuedBy: otherPropertyNames,
     waitForEvents: true,
@@ -68,17 +74,19 @@ function defineSetAction(config, context) {
 function defineUpdateAction(config, context) {
   const {
     service, app, model, modelRuntime,
-    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
+    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Updated'
   const actionName = 'update' + joinedOthersClassName + 'Owned' + modelName
+  const accessControl = config.updateAccessControl || config.writeAccessControl
+  prepareAccessControl(accessControl, otherPropertyNames, others)
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
     properties: {
       ...(model.properties)
     },
     access: config.updateAccess || config.writeAccess,
-    accessControl: config.updateAccessControl || config.writeAccessControl,
+    accessControl,
     skipValidation: true,
     queuedBy: otherPropertyNames,
     waitForEvents: true,
@@ -103,10 +111,12 @@ function defineUpdateAction(config, context) {
 function defineSetOrUpdateAction(config, context) {
   const {
     service, app, model, defaults, modelRuntime,
-    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
+    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Updated'
   const actionName = 'update' + joinedOthersClassName + 'Owned' + modelName
+  const accessControl = config.updateAccessControl || config.writeAccessControl
+  prepareAccessControl(accessControl, otherPropertyNames, others)
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
     properties: {
@@ -137,10 +147,12 @@ function defineSetOrUpdateAction(config, context) {
 function defineResetAction(config, context) {
   const {
     service, modelRuntime, modelPropertyName,
-    otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model
+    otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model, others
   } = context
   const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Reset'
   const actionName = 'reset' + joinedOthersClassName + 'Owned' + modelName
+  const accessControl = config.resetAccessControl || config.writeAccessControl
+  prepareAccessControl(accessControl, otherPropertyNames, others)
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
     properties: {
@@ -150,7 +162,7 @@ function defineResetAction(config, context) {
       }
     },
     access: config.resetAccess || config.writeAccess,
-    accessControl: config.resetAccessControl || config.writeAccessControl,
+    accessControl,
     queuedBy: otherPropertyNames,
     waitForEvents: true,
     async execute(properties, { client, service }, emit) {

package/utils.js

@@ -133,7 +133,16 @@ function addAccessControlParents(context) {
   )
 }
 
+function prepareAccessControl(accessControl, names, types) {
+  if(typeof accessControl == 'object') {
+    accessControl.objects = accessControl.objects ?? ((params) => names.map((name, index) => ({
+      objectType: types[index],
+      object: params[name]
+    })))
+  }
+}
+
 module.exports = {
   extractIdParts, extractIdentifiers, extractObjectData, defineProperties, defineIndex,
-  processModelsAnnotation, generateId, addAccessControlParents
+  processModelsAnnotation, generateId, addAccessControlParents, prepareAccessControl
 }

package/utilsAny.js

@@ -134,9 +134,19 @@ function addAccessControlAnyParents(context) {
   )
 }
 
+function prepareAccessControl(accessControl, names) {
+  if(typeof accessControl == 'object') {
+    accessControl.objects = accessControl.objects ?? ((params) => names.map(name => ({
+      objectType: params[name + 'Type'],
+      object: params[name]
+    })))
+  }
+}
+
 module.exports = {
   extractTypeAndIdParts, extractIdentifiersWithTypes, defineAnyProperties,
   defineAnyIndex, defineAnyIndexes,
   processModelsAnyAnnotation, generateAnyId,
-  addAccessControlAnyParents
+  addAccessControlAnyParents,
+  prepareAccessControl
 }