@live-change/relations-plugin 0.9.86 → 0.9.88

package/package.json

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

package/src/pluralRelationAnyUtils.js

@@ -204,6 +204,7 @@ function getUpdateFunction( validators, validationContext, config, context) {
       identifiers,
       data
     })
+    return id
   }
 }
 
@@ -291,6 +292,7 @@ function getDeleteFunction(config, context) {
       type: eventName,
       [modelPropertyName]: id
     })
+    return id
   }
 }
 

package/src/pluralRelationUtils.js

@@ -193,6 +193,7 @@ function getUpdateFunction( validators, validationContext, config, context) {
       identifiers,
       data
     })
+    return id
   }
 }
 
@@ -278,6 +279,7 @@ function getDeleteFunction( validators, validationContext, config, context) {
       type: eventName,
       [modelPropertyName]: id
     })
+    return id
   }
 }
 

package/src/singularRelationAnyUtils.js

@@ -190,6 +190,7 @@ function getUpdateFunction( validators, validationContext, config, context) {
       type: eventName,
       identifiers, data
     })
+    return id
   }
 }
 
@@ -268,6 +269,7 @@ function getSetOrUpdateFunction( validators, validationContext, config, context)
       type: eventName,
       identifiers, data
     })
+    return id
   }
 }
 
@@ -340,6 +342,7 @@ function getResetFunction(config, context) {
       type: eventName,
       identifiers
     })
+    return id
   }
 }
 

package/src/singularRelationUtils.js

@@ -16,27 +16,33 @@ import { extractTypeAndIdParts } from './utilsAny.js'
 import { allCombinations } from './combinations.js'
 import pluralize from 'pluralize'
 
-export function createIdentifiersProperties(keys, types) {
+export function createIdentifiersProperties(keys, types, idField) {
   const identifiers = {}
   if(keys) for(let i = 0; i < keys.length; i++) {
     const key = keys[i]
     identifiers[key] = {
       type: types?.[i] || 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, then: ['nonEmpty'] }))
+  }
   return identifiers
 }
 
 export function defineObjectView(config, context, external = true) {
   const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
-    modelName, others, model } = context
-  const viewProperties = createIdentifiersProperties(otherPropertyNames, others)
+    modelName, others, model, modelPropertyName } = context
+  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
   const sourceAccessControl = external && (config.readAccessControl || config.writeAccessControl)
-  const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames, others)
+  const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, 
+    otherPropertyNames.concat(modelPropertyName), 
+    others.concat(model))
   service.view({
     name: viewName,
     properties: {
@@ -50,8 +56,12 @@ export function defineObjectView(config, context, external = true) {
     access: external && (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]
+      const idProp = modelPropertyName ? properties[modelPropertyName] : null
+      if(idProp) {
+        const path = config.fields ? modelRuntime().limitedPath(idProp, config.fields) : modelRuntime().path(idProp)
+        return path
+      }
+      const id = idProp ? idProp : idParts.length > 1 ? idParts.map(p => JSON.stringify(p)).join(':') : idParts[0]
       const path = config.fields ? modelRuntime().limitedPath(id, config.fields) : modelRuntime().path(id)
       return path
     }
@@ -86,7 +96,7 @@ export function defineRangeViews(config, context, external = true) {
       accessControl,
       daoPath(params, { client, context }) {
         const owner = []
-        for (const key of combination) owner.push(params[ownerPropertyNames[key]])
+        for (const key of combination) owner.push(params[otherPropertyNames[key]])
         return modelRuntime().sortedIndexRangePath(indexName, owner, App.extractRange(params) )
       }
     })
@@ -109,7 +119,7 @@ export function defineRangeViews(config, context, external = true) {
       .map(t => t.split('_').pop())
       .map(t => t[0].toLowerCase() + t.slice(1))
     const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, parametersNames, typeCombination)
-    const indexName = 'by'+typeNames.join('And')
+    const indexName = 'ownedBy'+typeNames.join('And')
     const viewName = typeNames.join('And') + context.partialReverseRelationWord + pluralize(modelName)
     model.crud['rangeBy_'+typeCombination.join('And')] = viewName
     //console.log("DEFINE TYPE RANGE VIEW", viewName, typeCombination)
@@ -151,6 +161,7 @@ export function getSetFunction( validators, validationContext, config, context)
       type: eventName,
       identifiers, data
     })
+    return id
   }
   return execute
 }
@@ -227,6 +238,7 @@ export function getUpdateFunction( validators, validationContext, config, contex
       type: eventName,
       identifiers, data
     })
+    return id
   }
 }
 
@@ -304,6 +316,7 @@ export function getSetOrUpdateFunction( validators, validationContext, config, c
       type: eventName,
       identifiers, data
     })
+    return id
   }
 }
 
@@ -379,6 +392,7 @@ export function getResetFunction( validators, validationContext, config, context
         [modelPropertyName]: id
       }
     })
+    return id
   }
 }
 

package/src/types.ts

@@ -4,7 +4,7 @@ import {
   ActionDefinitionSpecification, 
   TriggerDefinitionSpecification,
   ModelDefinitionSpecification
-} from "@live-change/framework"
+} from "@live-change/\framework"
 
 export type PreparedAccessControlSettings = {
   roles: string | string[]

package/src/utils.ts

@@ -50,13 +50,14 @@ export function defineProperties(model: ModelDefinitionSpecificationWithAccessCo
 }
 
 export function defineIndex(model: ModelDefinitionSpecificationWithAccessControl,
-                            what: string, props: string[], multi = undefined) {
+                            what: string, props: string[], multi = undefined, prefix = 'by') {
   console.log("DEFINE INDEX", model.name, what, props)
-  model.indexes['by' + what] = {
+  model.indexes[prefix + what] = {
     property: props,
     multi
   }
 }
+
 export function defineIndexes(model: ModelDefinitionSpecificationWithAccessControl,
                               props: Record<string, any>, types: string[]) {
   console.log("DEFINE INDEXES!", model.name, props, types)
@@ -77,13 +78,15 @@ export function defineIndexes(model: ModelDefinitionSpecificationWithAccessContr
   }
   const multiPropsTypes = Object.keys(propsByType).filter(type => propsByType[type].length > 1)
   const typeCombinations = allCombinations(multiPropsTypes)
+  //console.log("TYPE COMBINATIONS", typeCombinations)
   for(const typeCombination of typeCombinations) {
     const typeNames = typeCombination.map(t => {
       const type = t.split('_')[1]
       return type[0].toUpperCase() + type.slice(1)
     })
-    const typeProps = typeCombination.map(type => propsByType[type])
-    defineIndex(model, typeNames.join('And'), typeProps, true)
+    const typeProps = typeCombination.map(type => propsByType[type].map(prop => props[prop]))
+    // console.log("DEFINE TYPE INDEX", typeNames.join('And'), typeProps, props)
+    defineIndex(model, typeNames.join('And'), typeProps, true, 'ownedBy')
   }
 }
 
@@ -227,7 +230,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))
     ac.objParams = { names, types }
   }
 }