@live-change/relations-plugin 0.9.198 → 0.9.200

package/package.json

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

package/src/changeTriggers.js

@@ -9,10 +9,10 @@ async function fireChangeTriggers(context, objectType, identifiers, object, oldD
   const { service, modelName, app } = context
   //if(!trigger) trigger = (...args) => app.trigger(...args)
   assert(trigger, "trigger is required")
-  const changeType = data ? (oldData ? 'update' : 'create') : 'delete'
-  //console.log("FIRE CHANGE TRIGGERS", { context, objectType, identifiers, object, oldData, data })
-  //console.trace()
+  const changeType = data ? (oldData ? 'update' : 'create') : 'delete'  
   const triggerParameters = { objectType, object, identifiers, data, oldData, changeType }
+  //console.log("FIRE CHANGE TRIGGERS", triggerParameters)
+  //console.trace()
   await Promise.all([
     trigger({
       type: changeType + service.name[0].toUpperCase() + service.name.slice(1) + '_' + modelName,
@@ -32,7 +32,7 @@ async function fireChangeTriggers(context, objectType, identifiers, object, oldD
 async function iterateChildren(context, propertyName, path, cb) {
   const {
     service, modelRuntime, objectType: myType, writeableProperties, modelName,
-    reverseRelationWord, app, otherPropertyNames, sameIdAsParent
+    reverseRelationWord, app, otherPropertyNames, sameIdAsParent, isAny
   } = context
   assert(modelRuntime, "modelRuntime is required")
   assert(modelRuntime().sortedIndexRangeGet, "sortedIndexRangeGet is required")
@@ -41,7 +41,8 @@ async function iterateChildren(context, propertyName, path, cb) {
   assert(path, "path is required")
   assert(cb, "cb is required")
   if(sameIdAsParent) {
-    const entity = await modelRuntime().get(path)
+    const id = Array.isArray(path) ? (path.length > 1 ? path.map(p => JSON.stringify(p)).join(':') : path[0]) : path
+    const entity = await modelRuntime().get(id)
     if(entity) await cb(entity)
   } else {
     const indexName = 'by' + propertyName[0].toUpperCase() + propertyName.slice(1)
@@ -72,7 +73,7 @@ async function triggerDeleteOnParentDeleteTriggers(
   } = context
 
   let found = false
-  await iterateChildren(context, propertyName, path, async entity => {
+  await iterateChildren(context, propertyName, path, async entity => {    
     found = true
     const identifiers = extractIdentifiers(otherPropertyNames, entity)
     await fireChangeTriggers(context, myType, identifiers, entity.id,

package/src/entityUtils.ts

@@ -65,7 +65,7 @@ export function entityAccessControl({service, modelName, modelPropertyName}, acc
 export 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
+  if(external) model.crud.read ??= viewName
   const view = service.view({
     name: viewName,
     properties: {
@@ -186,7 +186,7 @@ export function defineCreateAction(config, context) {
     modelName, writeableProperties
   } = context
   const actionName = 'create' + modelName
-  model.crud.create = actionName
+  model.crud.create ??= actionName
   const action = (service as ServiceDefinition<ServiceDefinitionSpecification>).action<ActionDefinitionSpecificationAC>({
     name: actionName,
     properties: { ...model.properties },
@@ -255,7 +255,7 @@ export function defineUpdateAction(config, context) {
     modelName, writeableProperties
   } = context
   const actionName = 'update' + modelName
-  model.crud.update = actionName
+  model.crud.update ??= actionName
   const action = new ActionDefinition({
     name: actionName,
     properties: {
@@ -328,7 +328,7 @@ export function defineDeleteAction(config, context) {
     modelName, writeableProperties
   } = context
   const actionName = 'delete' + modelName
-  model.crud.delete = actionName
+  model.crud.delete ??= actionName
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
     properties: {

package/src/pluralRelationAnyUtils.js

@@ -75,7 +75,7 @@ function defineSingleView(config, context, external = true) {
     sourceAccessControl, [modelPropertyName], [objectType]
   )
   const viewName = modelName[0].toLowerCase() + modelName.slice(1)
-  model.crud.read = viewName
+  model.crud.read ??= viewName
   service.view({
     name: viewName,
     properties: {
@@ -125,7 +125,7 @@ function defineCreateAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const actionName = 'create' + modelName
-  model.crud.create = actionName
+  model.crud.create ??= actionName
   const sourceAccessControl = config.createAccessControl || config.writeAccessControl
   const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames)
   const action = new ActionDefinition({
@@ -225,7 +225,7 @@ function defineUpdateAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const actionName = 'update' + modelName
-  model.crud.update = actionName
+  model.crud.update ??= actionName
   const sourceAccessControl = config.updateAccessControl || config.writeAccessControl
   const accessControl = cloneAndPrepareSingleAccessControl(
     sourceAccessControl, [modelPropertyName], [objectType]
@@ -313,7 +313,7 @@ function defineDeleteAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const actionName = 'delete' + modelName
-  model.crud.delete = actionName
+  model.crud.delete ??= actionName
   const sourceAccessControl = config.deleteAccessControl || config.writeAccessControl
   const accessControl = cloneAndPrepareSingleAccessControl(
     sourceAccessControl, [modelPropertyName], [objectType]

package/src/pluralRelationUtils.js

@@ -66,7 +66,7 @@ function defineSingleView(config, context, external = true) {
     validation: ['nonEmpty']
   })
   const viewName = modelName[0].toLowerCase() + modelName.slice(1)
-  model.crud.read = viewName
+  model.crud.read ??= viewName
   const sourceAccessControl = external && (config.readAccessControl || config.writeAccessControl)
   const accessControl = cloneAndPrepareAccessControl(
     sourceAccessControl, [modelPropertyName], [objectType]
@@ -120,7 +120,7 @@ function defineCreateAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const actionName = 'create' + modelName
-  model.crud.create = actionName
+  model.crud.create ??= actionName
   const sourceAccessControl = config.createAccessControl || config.writeAccessControl
   const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames, others)
   const action = new ActionDefinition({
@@ -204,7 +204,7 @@ function defineUpdateAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const actionName = 'update' + modelName
-  model.crud.update = actionName
+  model.crud.update ??= actionName
   const sourceAccessControl = config.updateAccessControl || config.writeAccessControl
   const accessControl = cloneAndPrepareAccessControl(
     sourceAccessControl, [modelPropertyName], [objectType]
@@ -290,7 +290,7 @@ function defineDeleteAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const actionName = 'delete' + modelName
-  model.crud.delete = actionName
+  model.crud.delete ??= actionName
   const sourceAccessControl = config.deleteAccessControl || config.writeAccessControl
   const accessControl = cloneAndPrepareAccessControl(
     sourceAccessControl, [modelPropertyName], [objectType]

package/src/propertyOf.ts

@@ -60,7 +60,7 @@ export default function(service, app) {
     context.reverseRelationWord = 'Owned'
     context.partialReverseRelationWord = 'Owned'
 
-    context.sameIdAsParent = true
+    context.sameIdAsParent = context.otherPropertyNames.length === 1
 
     context.identifiers = defineProperties(context.model, context.others, context.otherPropertyNames)
     context.model.identifiers = [

package/src/propertyOfAny.ts

@@ -64,7 +64,7 @@ export default function(service, app) {
     context.reverseRelationWord = 'Owned'
     context.partialReverseRelationWord = 'Owned'
 
-    context.sameIdAsParent = true
+    context.sameIdAsParent = context.otherPropertyNames.length === 1
 
     context.identifiers = defineAnyProperties(context.model, context.otherPropertyNames, config)
     context.model.identifiers = [

package/src/singularRelationAnyUtils.js

@@ -16,31 +16,37 @@ import { fireChangeTriggers } from "./changeTriggers.js"
 
 import pluralize from 'pluralize'
 
-export function createIdentifiersProperties(keys) {
+export function createIdentifiersProperties(keys, idField) {
   const identifiers = {}
   if(keys) for(const key of keys) {
     identifiers[key + 'Type'] = {
       type: String,
-      validation: ['nonEmpty']
+      validation: idField ? [{ name: 'ifEmpty', prop: idField, then: ['nonEmpty'] }] : ['nonEmpty']
     }
     identifiers[key] = {
       type: String,
-      validation: ['nonEmpty']
+      validation: idField ? [{ name: 'ifEmpty', prop: idField, then: ['nonEmpty'] }] : ['nonEmpty']
     }
   }
+  if(idField) identifiers[idField] = {
+    type: String,
+    validation: keys.map(key => ({ name: 'ifEmpty', prop: key+'Type', then: ['nonEmpty'] }))
+  }
   return identifiers
 }
 
 function defineObjectView(config, context, external = true) {
   const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
-    modelName, others, model } = context
-  const viewProperties = createIdentifiersProperties(otherPropertyNames)
+    modelName, others, model, modelPropertyName } = context
+  const viewProperties = createIdentifiersProperties(otherPropertyNames, modelPropertyName)
   const sourceAccessControl = external
     && (config.singleAccessControl || config.readAccessControl || config.writeAccessControl)
-  const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames)
+  const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, 
+    otherPropertyNames.concat(modelPropertyName), 
+    new Array(otherPropertyNames.length).fill(undefined).concat(model))
   const viewName = config.name
     || ((config.prefix ? config.prefix + modelName : modelName[0].toLowerCase() + modelName.slice(1)) + (config.suffix || ''))
-  model.crud.read = viewName
+  model.crud.read ??= viewName
   service.view({
     name: viewName,
     properties: {
@@ -54,6 +60,11 @@ function defineObjectView(config, context, external = true) {
     global: config.globalView,
     accessControl,
     daoPath(properties, { client, context }) {
+      const idProp = modelPropertyName ? properties[modelPropertyName] : null
+      if(idProp) {
+        const path = config.fields ? modelRuntime().limitedPath(idProp, config.fields) : modelRuntime().path(idProp)
+        return path
+      }
       const typeAndIdParts = extractTypeAndIdParts(otherPropertyNames, properties)
       const id = typeAndIdParts.length > 1 ? typeAndIdParts.map(p => JSON.stringify(p)).join(':') : typeAndIdParts[0]
       const path = config.fields ? modelRuntime().limitedPath(id, config.fields) : modelRuntime().path(id)
@@ -106,7 +117,6 @@ function getSetFunction( validators, validationContext, config, context) {
   return async function execute(properties, { client, service, trigger }, emit) {
     const identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
     const id = generateAnyId(otherPropertyNames, properties)
-    const entity = await modelRuntime().get(id)
     const data = extractObjectData(writeableProperties, properties,
       App.computeDefaults(model, properties, { client, service } ))
     await App.validation.validate({ ...identifiers, ...data }, validators,
@@ -126,7 +136,7 @@ function defineSetAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const actionName = 'set' + modelName
-  model.crud.create = actionName
+  model.crud.create ??= actionName
   const sourceAccessControl = config.setAccessControl || config.writeAccessControl
   const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames)
   const action = new ActionDefinition({
@@ -201,7 +211,7 @@ function defineUpdateAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const actionName = 'update' + modelName
-  model.crud.update = actionName
+  model.crud.update ??= actionName
   const sourceAccessControl = config.updateAccessControl || config.writeAccessControl
   const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames)
   const action = new ActionDefinition({
@@ -280,7 +290,7 @@ function defineSetOrUpdateAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const actionName = 'setOrUpdate' + modelName
-  model.crud.createOrUpdate = actionName
+  model.crud.createOrUpdate ??= actionName
   const sourceAccessControl = config.setOrUpdateAccessControl || config.writeAccessControl
   const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames)
   const action = new ActionDefinition({
@@ -378,7 +388,7 @@ function defineResetTrigger(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model
   } = context
   const actionName = 'reset' + modelName
-  model.crud.reset = actionName
+  model.crud.reset ??= actionName
   const triggerName = `${service.name}_${actionName}`
   service.triggers[triggerName] = [new TriggerDefinition({
     name: triggerName,
@@ -397,7 +407,7 @@ function defineDeleteAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model
   } = context
   const actionName = 'delete' + modelName
-  model.crud.delete = actionName
+  model.crud.delete ??= actionName
   const sourceAccessControl = config.resetAccessControl || config.writeAccessControl
   const accessControl = cloneAndPrepareAccessControl(
     sourceAccessControl, [modelPropertyName], [objectType]

package/src/singularRelationUtils.js

@@ -39,7 +39,7 @@ export function defineObjectView(config, context, external = true) {
   const viewProperties = createIdentifiersProperties(otherPropertyNames, others, modelPropertyName)
   const viewName = config.name
     || ((config.prefix ? config.prefix + modelName : modelName[0].toLowerCase() + modelName.slice(1)) + (config.suffix || ''))
-  model.crud.read = viewName
+  model.crud.read ??= viewName
   const sourceAccessControl = external && (config.singleAccessControl || config.readAccessControl || config.writeAccessControl)
   const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, 
     otherPropertyNames.concat(modelPropertyName), 
@@ -174,7 +174,7 @@ export function defineSetAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const actionName = 'set' + modelName
-  model.crud.create = actionName
+  model.crud.create ??= actionName
   const sourceAccessControl = config.setAccessControl || config.writeAccessControl
   const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames, others)
   const action = new ActionDefinition({
@@ -250,7 +250,7 @@ export function defineUpdateAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const actionName = 'update' + modelName
-  model.crud.update = actionName
+  model.crud.update ??= actionName
   const sourceAccessControl = config.updateAccessControl || config.writeAccessControl
   const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames, others)
   const action = new ActionDefinition({
@@ -328,7 +328,7 @@ export function defineSetOrUpdateAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const actionName = 'setOrUpdate' + modelName
-  model.crud.createOrUpdate = actionName
+  model.crud.createOrUpdate ??= actionName
   const sourceAccessControl = config.updateAccessControl || config.writeAccessControl
   const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames, others)
   const action = new ActionDefinition({
@@ -464,7 +464,7 @@ export function defineResetAction(config, context) {
     joinedOthersClassName, model, others, writeableProperties
   } = context
   const actionName = 'reset' + modelName
-  model.crud.delete = actionName
+  model.crud.delete ??= actionName
   const properties = {}
   for (let i = 0; i < others.length; i++) {
     properties[otherPropertyNames[i]] = new PropertyDefinition({

package/src/utils.ts

@@ -256,7 +256,7 @@ export function prepareAccessControl(accessControl: AccessControlSettings, names
     ac.objects = ac.objects ?? ((params) => names.map((name, index) => ({
       objectType: types[index],
       object: params[name]
-    })).filter(obj => obj.object))
+    })).filter(obj => obj.object && obj.objectType))
     ac.objParams = { names, types }
   }
 }
@@ -274,6 +274,7 @@ export function cloneAndPrepareAccessControl(accessControl: AccessControlSetting
 export function defineDeleteByOwnerEvents(config: RelationConfig, context: RelationContext) {
   const {
     service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName, otherPropertyNames,
+    sameIdAsParent
   } = context
   for(const propertyName of otherPropertyNames) {
     const eventName = modelName + 'DeleteByOwner'
@@ -287,6 +288,9 @@ export function defineDeleteByOwnerEvents(config: RelationConfig, context: Relat
       },
       async execute({owner}) {
         const runtime = modelRuntime()
+        if(sameIdAsParent) {
+          return await runtime.delete(owner)
+        } 
         const tableName = runtime.tableName
         const prefix = JSON.stringify(owner)
         const indexName = tableName + '_by' + propertyName[0].toUpperCase() + propertyName.slice(1)
@@ -349,7 +353,7 @@ export function defineGlobalRangeView(config: {
      prefix
      + pluralize(prefix ? modelName : modelPropertyName) 
      + (config.suffix || '')
-  if(external) model.crud.range = viewName
+  if(external) model.crud.range ??= viewName
   service.views[viewName] = new ViewDefinition({
     name: viewName,
     properties: {

package/src/utilsAny.ts

@@ -225,7 +225,7 @@ export function prepareAccessControl(accessControl, names, types = undefined) {
     accessControl.objects = accessControl.objects ?? ((params) => names.map((name, index) => ({
       objectType: types?.[index] ?? params[name + 'Type'],
       object: params[name]
-    })))
+    })).filter(obj => obj.object && obj.objectType))
   }
 }
 
@@ -241,7 +241,8 @@ export function cloneAndPrepareAccessControl(accessControl, names, types = undef
 
 export function defineDeleteByOwnerEvents(config, context) {
   const {
-    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName, otherPropertyNames, reverseRelationWord
+    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName, otherPropertyNames,
+    reverseRelationWord, sameIdAsParent
   } = context
   for(const propertyName of otherPropertyNames) {
     const eventName = modelName + 'DeleteByOwner'
@@ -259,6 +260,9 @@ export function defineDeleteByOwnerEvents(config, context) {
       },
       async execute({ ownerType, owner }) {
         const runtime = modelRuntime()
+        if(sameIdAsParent) {
+          return await runtime.delete(JSON.stringify(ownerType) + ':' + JSON.stringify(owner))
+        } 
         const tableName = runtime.tableName
         const prefix = JSON.stringify(ownerType) + ':' + JSON.stringify(owner)
         const indexName = tableName + '_by' + propertyName[0].toUpperCase() + propertyName.slice(1)