@live-change/relations-plugin 0.8.110 → 0.8.112

package/entity.js

@@ -21,6 +21,7 @@ function entityAccessControl({service, modelName, modelPropertyName}, accessCont
 function defineView(config, context, external) {
   const { service, modelRuntime, modelPropertyName, modelName, model } = context
   const viewName = (config.prefix || '' ) + (config.prefix ? modelName : modelPropertyName) + (config.suffix || '')
+  if(external) model.crud.read = viewName
   service.views[viewName] = new ViewDefinition({
     name: viewName,
     properties: {
@@ -140,6 +141,7 @@ function defineCreateAction(config, context) {
     modelName, writeableProperties
   } = context
   const actionName = 'create' + modelName
+  model.crud.create = actionName
   const action = new ActionDefinition({
     name: actionName,
     properties: { ...model.properties },
@@ -209,7 +211,7 @@ function defineUpdateAction(config, context) {
     modelName, writeableProperties
   } = context
   const actionName = 'update' + modelName
-  const triggerName = `${service.name}_${actionName}`
+  model.crud.update = actionName
   const action = new ActionDefinition({
     name: actionName,
     properties: {
@@ -282,7 +284,7 @@ function defineDeleteAction(config, context) {
     modelName, writeableProperties
   } = context
   const actionName = 'delete' + modelName
-  const triggerName = `${service.name}_${actionName}`
+  model.crud.delete = actionName
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
     properties: {
@@ -336,6 +338,9 @@ export default function(service, app) {
     const modelProperties = Object.keys(model.properties)
     const modelPropertyName = modelName.slice(0, 1).toLowerCase() + modelName.slice(1)
 
+    model.identifiers = [{ [modelPropertyName]: 'id' }]
+    model.crud = {}
+
     function modelRuntime() {
       return service._runtime.models[modelName]
     }

package/itemOf.js

@@ -10,7 +10,7 @@ import {
 } from './itemEvents.js'
 
 import {
-  defineView,
+  defineSingleView, defineRangeView,
   defineCreateAction, defineUpdateAction, defineDeleteAction,
   defineCreateTrigger, defineUpdateTrigger, defineDeleteTrigger, defineCopyTrigger,
   defineSortIndex,
@@ -24,6 +24,7 @@ export default function(service, app) {
     context.reverseRelationWord = 'Owned'
 
     context.identifiers = defineProperties(context.model, context.others, context.otherPropertyNames)
+    context.model.identifiers = [...Object.keys(context.identifiers), { [context.modelPropertyName]: 'id' }]
 
     addAccessControlParents(context)
     defineIndexes(context.model, context.otherPropertyNames.map(p => p[0].toLowerCase() + p.slice(1)), context.others)
@@ -34,7 +35,9 @@ export default function(service, app) {
       }
     }
 
-    defineView(config, context,
+    defineSingleView(config, context,
+      config.readAccess || config.readAccessControl || config.writeAccessControl)
+    defineRangeView(config, context,
       config.readAccess || config.readAccessControl || config.writeAccessControl)
     /// TODO: multiple views with limited fields
 

package/itemOfAny.js

@@ -9,7 +9,7 @@ import {
 } from './itemEvents.js'
 
 import {
-  defineView,
+  defineSingleView, defineRangeView,
   defineCreateAction, defineUpdateAction, defineDeleteAction,
   defineCreateTrigger, defineUpdateTrigger, defineDeleteTrigger,
   defineSortIndex
@@ -22,6 +22,8 @@ export default function(service, app) {
     context.reverseRelationWord = 'Owned'
 
     context.identifiers = defineAnyProperties(context.model, context.otherPropertyNames)
+    context.model.identifiers = [...Object.keys(context.identifiers), { [context.modelPropertyName]: 'id' }]
+
     addAccessControlAnyParents(context)
     defineAnyIndexes(context.model, context.otherPropertyNames)
 
@@ -31,7 +33,9 @@ export default function(service, app) {
       }
     }
 
-    defineView(config, context,
+    defineSingleView(config, context,
+      config.readAccess || config.writeAccess || config.readAccessControl || config.writeAccessControl)
+    defineRangeView(config, context,
       config.readAccess || config.writeAccess || config.readAccessControl || config.writeAccessControl)
     /// TODO: multiple views with all properties combinations
     /// TODO: multiple views with limited fields

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/relations-plugin",
-  "version": "0.8.110",
+  "version": "0.8.112",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,8 +22,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/framework": "^0.8.110",
+    "@live-change/framework": "^0.8.112",
     "pluralize": "^8.0.0"
   },
-  "gitHead": "8af31d640f43b00b2874f2c70fa4d4486541adfe"
+  "gitHead": "e0d0db33777f8f9fc9f5ebe1a977cf574b837be6"
 }

package/pluralRelationAnyUtils.js

@@ -4,12 +4,12 @@ import {
   PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, TriggerDefinition
 } from "@live-change/framework"
 import { extractTypeAndIdParts, extractIdentifiersWithTypes, prepareAccessControl } from "./utilsAny.js"
-import { extractObjectData, extractIdentifiers} from "./utils.js"
+import { extractObjectData, extractIdentifiers, extractIdParts } from './utils.js'
 import { fireChangeTriggers } from "./changeTriggers.js"
 
 import pluralize from 'pluralize'
 
-function defineView(config, context, external = true) {
+function defineRangeView(config, context, external = true) {
   const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
     modelName, others, model } = context
   const indexName = 'by'+context.joinedOthersClassName
@@ -27,6 +27,7 @@ function defineView(config, context, external = true) {
   const accessControl = external && (config.readAccessControl || config.writeAccessControl)
   prepareAccessControl(accessControl, otherPropertyNames)
   const viewName = joinedOthersPropertyName + context.reverseRelationWord + pluralize(modelName)
+  model.crud.range = viewName
   service.views[viewName] = new ViewDefinition({
     name: viewName,
     properties: {
@@ -51,6 +52,54 @@ function defineView(config, context, external = true) {
   })
 }
 
+function defineSingleView(config, context, external = true) {
+  const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
+    modelName, others, model, modelPropertyName } = context
+  const indexName = 'by'+context.joinedOthersClassName
+  const viewProperties = {}
+  for (let i = 0; i < others.length; i++) {
+    viewProperties[otherPropertyNames[i]] = new PropertyDefinition({
+      type: 'String',
+      validation: ['nonEmpty']
+    })
+    viewProperties[otherPropertyNames[i] + 'Type'] = new PropertyDefinition({
+      type: 'String',
+      validation: ['nonEmpty']
+    })
+  }
+  viewProperties[modelPropertyName] = new PropertyDefinition({
+    type: model,
+    validation: ['nonEmpty']
+  })
+  const accessControl = external && (config.readAccessControl || config.writeAccessControl)
+  prepareAccessControl(accessControl, otherPropertyNames)
+  const viewName = joinedOthersPropertyName + context.reverseRelationWord + modelName
+  model.crud.read = viewName
+  service.views[viewName] = new ViewDefinition({
+    name: viewName,
+    properties: {
+      ...viewProperties,
+      ...App.utils.rangeProperties
+    },
+    returns: {
+      type: model
+    },
+    internal: !external,
+    access: external && (config.readAccess || config.writeAccess),
+    accessControl,
+    daoPath(properties, { client, context }) {
+      const idParts = extractIdParts(otherPropertyNames, properties)
+      const prefix = App.encodeIdentifier(idParts)
+      const range = {
+        gte: prefix+'_'+properties[modelPropertyName],
+        lte: prefix+'_'+properties[modelPropertyName]
+      }
+      const path = modelRuntime().indexObjectPath(indexName, idParts, range)
+      return path
+    }
+  })
+}
+
 function getCreateFunction( validators, validationContext, config, context) {
   const {
     service, app, model, modelPropertyName, modelRuntime, objectType,
@@ -82,6 +131,7 @@ function defineCreateAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const actionName = 'create' + joinedOthersClassName + context.reverseRelationWord + modelName
+  model.crud.create = actionName
   const accessControl = config.createAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames)
   const action = new ActionDefinition({
@@ -168,6 +218,7 @@ function defineUpdateAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const actionName = 'update' + joinedOthersClassName + context.reverseRelationWord + modelName
+  model.crud.update = actionName
   const accessControl = config.updateAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames)
   const action = new ActionDefinition({
@@ -250,6 +301,7 @@ function defineDeleteAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const actionName = 'delete' + joinedOthersClassName + context.reverseRelationWord + modelName
+  model.crud.delete = actionName
   const accessControl = config.deleteAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames)
   const action = new ActionDefinition({
@@ -310,7 +362,7 @@ function defineSortIndex(context, sortFields) {
 }
 
 export {
-  defineView,
+  defineSingleView, defineRangeView,
   defineCreateAction, defineUpdateAction, defineDeleteAction,
   defineCreateTrigger, defineUpdateTrigger, defineDeleteTrigger,
   defineSortIndex

package/pluralRelationUtils.js

@@ -6,7 +6,7 @@ import { extractIdParts, extractIdentifiers, extractObjectData, prepareAccessCon
 import { fireChangeTriggers } from "./changeTriggers.js"
 import pluralize from 'pluralize'
 
-function defineView(config, context, external = true) {
+function defineRangeView(config, context, external = true) {
   const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
     modelName, others, model } = context
   const indexName = 'by'+context.joinedOthersClassName
@@ -18,6 +18,7 @@ function defineView(config, context, external = true) {
     })
   }
   const viewName = joinedOthersPropertyName + context.reverseRelationWord + pluralize(modelName)
+  model.crud.range = viewName
   const accessControl = external && (config.readAccessControl || config.writeAccessControl)
   prepareAccessControl(accessControl, otherPropertyNames, others)
   service.views[viewName] = new ViewDefinition({
@@ -44,6 +45,49 @@ function defineView(config, context, external = true) {
   })
 }
 
+function defineSingleView(config, context, external = true) {
+  const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
+    modelName, others, model, modelPropertyName } = context
+  const indexName = 'by'+context.joinedOthersClassName
+  const viewProperties = {}
+  for (let i = 0; i < others.length; i++) {
+    viewProperties[otherPropertyNames[i][0].toLowerCase() + otherPropertyNames[i].slice(1) ] = new PropertyDefinition({
+      type: others[i],
+      validation: ['nonEmpty']
+    })
+  }
+  viewProperties[modelPropertyName] = new PropertyDefinition({
+    type: model,
+    validation: ['nonEmpty']
+  })
+  const viewName = joinedOthersPropertyName + context.reverseRelationWord + modelName
+  model.crud.read = viewName
+  const accessControl = external && (config.readAccessControl || config.writeAccessControl)
+  prepareAccessControl(accessControl, otherPropertyNames, others)
+  service.views[viewName] = new ViewDefinition({
+    name: viewName,
+    properties: {
+      ...viewProperties,
+    },
+    returns: {
+      type: model
+    },
+    internal: !external,
+    access: external && (config.readAccess || config.writeAccess),
+    accessControl: config.readAccessControl || config.writeAccessControl,
+    daoPath(properties, { client, context }) {
+      const idParts = extractIdParts(otherPropertyNames, properties)
+      const prefix = App.encodeIdentifier(idParts)
+      const range = {
+        gte: prefix+'_'+properties[modelPropertyName],
+        lte: prefix+'_'+properties[modelPropertyName]
+      }
+      const path = modelRuntime().indexObjectPath(indexName, idParts, range)
+      return path
+    }
+  })
+}
+
 function getCreateFunction( validators, validationContext, config, context) {
   const {
     service, app, model, modelPropertyName, modelRuntime, objectType,
@@ -75,6 +119,7 @@ function defineCreateAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const actionName = 'create' + joinedOthersClassName + context.reverseRelationWord + modelName
+  model.crud.create = actionName
   const accessControl = config.createAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames, others)
   const action = new ActionDefinition({
@@ -156,8 +201,8 @@ function defineUpdateAction(config, context) {
     service, app, model, modelRuntime, modelPropertyName, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
-  const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Updated'
   const actionName = 'update' + joinedOthersClassName + context.reverseRelationWord + modelName
+  model.crud.update = actionName
   const accessControl = config.updateAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames, others)
   const action = new ActionDefinition({
@@ -187,7 +232,6 @@ function defineUpdateTrigger(config, context) {
     service, app, model, modelRuntime, modelPropertyName, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
-  const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Updated'
   const actionName = 'update' + joinedOthersClassName + context.reverseRelationWord + modelName
   const triggerName = `${service.name}_${actionName}`
   const trigger = new TriggerDefinition({
@@ -507,7 +551,7 @@ function defineSortIndex(context, sortFields) {
 }
 
 export {
-  defineView,
+  defineRangeView, defineSingleView,
   defineCreateAction, defineUpdateAction, defineDeleteAction, defineCopyAction,
   defineCreateTrigger, defineUpdateTrigger, defineDeleteTrigger, defineCopyTrigger,
   defineCopyOnParentCopyTrigger,

package/propertyOf.js

@@ -21,6 +21,8 @@ export default function(service, app) {
     context.sameIdAsParent = true
 
     context.identifiers = defineProperties(context.model, context.others, context.otherPropertyNames)
+    context.model.identifiers = Object.keys(context.identifiers)
+
     addAccessControlParents(context)
     defineIndexes(context.model, context.otherPropertyNames, context.others)
 

package/propertyOfAny.js

@@ -24,6 +24,8 @@ export default function(service, app) {
     context.sameIdAsParent = true
 
     context.identifiers = defineAnyProperties(context.model, context.otherPropertyNames)
+    context.model.identifiers = Object.keys(context.identifiers)
+
     addAccessControlAnyParents(context)
     defineAnyIndexes(context.model, context.otherPropertyNames, false)
 

package/relatedTo.js

@@ -7,7 +7,7 @@ import {
 } from './itemEvents.js'
 
 import {
-  defineView,
+  defineSingleView, defineRangeView,
   defineCreateAction, defineUpdateAction, defineDeleteAction, defineCopyAction,
   defineCreateTrigger, defineUpdateTrigger, defineDeleteTrigger, defineCopyTrigger,
   defineSortIndex,
@@ -28,7 +28,10 @@ export default function(service, app) {
       }
     }
 
-    defineView(config, context,
+    defineSingleView(config, context,
+      config.readAccess || config.readAccessControl || config.writeAccessControl
+    )
+    defineRangeView(config, context,
       config.readAccess || config.readAccessControl || config.writeAccessControl
     )
     /// TODO: multiple views with limited fields

package/relatedToAny.js

@@ -7,7 +7,7 @@ import {
 } from './itemEvents.js'
 
 import {
-  defineView,
+  defineSingleView, defineRangeView,
   defineCreateAction, defineUpdateAction, defineDeleteAction,
   defineCreateTrigger, defineUpdateTrigger, defineDeleteTrigger,
   defineSortIndex
@@ -28,7 +28,10 @@ export default function(service, app) {
       }
     }
 
-    defineView(config, context,
+    defineSingleView(config, context,
+      config.readAccess || config.readAccessControl || config.writeAccessControl
+    )
+    defineRangeView(config, context,
       config.readAccess || config.readAccessControl || config.writeAccessControl
     )
     /// TODO: multiple views with limited fields

package/singularRelationAnyUtils.js

@@ -45,6 +45,7 @@ function defineObjectView(config, context, external = true) {
   prepareAccessControl(accessControl, otherPropertyNames)
   const viewName = config.name || ((config.prefix ? (config.prefix + joinedOthersClassName) : joinedOthersPropertyName) +
       context.reverseRelationWord + modelName + (config.suffix || ''))
+  model.crud.read = viewName
   service.views[viewName] = new ViewDefinition({
     name: viewName,
     properties: {
@@ -127,6 +128,7 @@ function defineSetAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const actionName = 'set' + joinedOthersClassName + context.reverseRelationWord + modelName
+  model.crud.create = actionName
   const accessControl = config.setAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames)
   const action = new ActionDefinition({
@@ -198,6 +200,7 @@ function defineUpdateAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const actionName = 'update' + joinedOthersClassName + context.reverseRelationWord + modelName
+  model.crud.update = actionName
   const accessControl = config.updateAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames)
   const action = new ActionDefinition({
@@ -274,6 +277,7 @@ function defineSetOrUpdateAction(config, context) {
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Updated'
   const actionName = 'setOrUpdate' + joinedOthersClassName + context.reverseRelationWord + modelName
+  model.crud.createOrUpdate = actionName
   const accessControl = config.setOrUpdateAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames)
   const action = new ActionDefinition({
@@ -343,6 +347,7 @@ function defineResetAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model
   } = context
   const actionName = 'reset' + joinedOthersClassName + context.reverseRelationWord + modelName
+  model.crud.delete = actionName
   const accessControl = config.resetAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames)
   service.actions[actionName] = new ActionDefinition({

package/singularRelationUtils.js

@@ -19,6 +19,7 @@ function defineView(config, context, external = true) {
   }
   const viewName = config.name || ((config.prefix ? (config.prefix + joinedOthersClassName) : joinedOthersPropertyName) +
       'Owned' + modelName + (config.suffix || ''))
+  model.crud.read = viewName
   const accessControl = external && (config.readAccessControl || config.writeAccessControl)
   prepareAccessControl(accessControl, otherPropertyNames, others)
   service.views[viewName] = new ViewDefinition({
@@ -70,6 +71,7 @@ function defineSetAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const actionName = 'set' + joinedOthersClassName + 'Owned' + modelName
+  model.crud.create = actionName
   const accessControl = config.setAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames, others)
   const action = new ActionDefinition({
@@ -142,6 +144,7 @@ function defineUpdateAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const actionName = 'update' + joinedOthersClassName + 'Owned' + modelName
+  model.crud.update = actionName
   const accessControl = config.updateAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames, others)
   const action = new ActionDefinition({
@@ -215,8 +218,8 @@ function defineSetOrUpdateAction(config, context) {
     service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Updated'
   const actionName = 'setOrUpdate' + joinedOthersClassName + 'Owned' + modelName
+  model.crud.createOrUpdate = actionName
   const accessControl = config.updateAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames, others)
   const action = new ActionDefinition({
@@ -286,6 +289,7 @@ function defineResetAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model, others, writeableProperties
   } = context
   const actionName = 'reset' + joinedOthersClassName + 'Owned' + modelName
+  model.crud.delete = actionName
   const accessControl = config.resetAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames, others)
   const action = new ActionDefinition({

package/utils.js

@@ -76,6 +76,9 @@ export function processModelsAnnotation(service, app, annotation, multiple, cb)
       const modelProperties = Object.keys(model.properties)
       const modelPropertyName = modelName.slice(0, 1).toLowerCase() + modelName.slice(1)
 
+      if(!model.editableProperties) model.editableProperties = modelProperties
+      model.crud = {}
+
       function modelRuntime() {
         return service._runtime.models[modelName]
       }
@@ -96,7 +99,7 @@ export function processModelsAnnotation(service, app, annotation, multiple, cb)
           config = { what: config }
         }
 
-        console.log("MODEL " + modelName + " IS " + annotation + " " + config.what)
+        console.log("MODEL " + modelName + " IS " + annotation + " " + config.what ?? '')
 
         const what = (Array.isArray(config.what) ? config.what : [config.what])
         const others = what.map(other => other.getTypeName ? other.getTypeName() : (other.name ? other.name : other))
@@ -127,17 +130,21 @@ export function addAccessControlParents(context) {
   context.model.accessControlParents = async (what) => {
     const id = what.object
     const data = await modelRuntime().get(id)
-    return context.otherPropertyNames.map(otherPropertyName => {
-      const objectType = (otherPropertyName.slice(0, 1).toUpperCase() + otherPropertyName.slice(1))
+    return context.otherPropertyNames.map((otherPropertyName, i) => {
+      const other = context.others[i]
+      const objectType = other
       const object = data[otherPropertyName]
       return { objectType, object }
     }).filter(parent => parent.object && parent.objectType)
   }
   context.model.accessControlParentsSource = context.otherPropertyNames.map(
-    otherPropertyName => ({
-      property: otherPropertyName,
-      type: (otherPropertyName.slice(0, 1).toUpperCase() + otherPropertyName.slice(1))
-    })
+    (otherPropertyName, i) => {
+      const other = context.others[i]
+      return ({
+        property: otherPropertyName,
+        type: other
+      })
+    }
   )
 }
 

package/utilsAny.js

@@ -88,6 +88,9 @@ function processModelsAnyAnnotation(service, app, annotation, multiple, cb) {
       const modelProperties = Object.keys(model.properties)
       const modelPropertyName = modelName.slice(0, 1).toLowerCase() + modelName.slice(1)
 
+      if(!model.editableProperties) model.editableProperties = modelProperties
+      model.crud = {}
+
       function modelRuntime() {
         return service._runtime.models[modelName]
       }