@live-change/relations-plugin 0.9.16 → 0.9.18

package/boundTo.js

@@ -6,7 +6,8 @@ import {
 import { defineSetEvent, defineUpdatedEvent, defineTransferredEvent, defineResetEvent } from './propertyEvents.js'
 
 import {
-  defineView,
+  defineObjectView,
+  defineRangeViews,
   defineSetAction,
   defineUpdateAction,
   defineSetOrUpdateAction,
@@ -24,16 +25,25 @@ export default function(service, app) {
 
     context.relationWord = 'Friend'
     context.reverseRelationWord = 'Bound'
+    context.partialReverseRelationWord = 'Bound'
 
     defineProperties(context.model, context.others, context.otherPropertyNames)
     defineIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
 
-    defineView({ ...config, access: config.readAccess }, context,
+    defineObjectView({ ...config, access: config.readAccess }, context,
       config.readAccess || config.readAccessControl || config.writeAccessControl
     )
+    defineRangeViews(config, context,
+      config.listAccess || config.readAccess || config.listAccessControl
+    )
+
     if(config.views) {
       for(const view of config.views) {
-        defineView({ ...config, ...view }, context, !view.internal)
+        if(view.type !== 'range') {
+          defineObjectView({ ...config, ...view }, context, !view.internal)
+        } else {
+          defineRangeViews({ ...config, ...view }, context, !view.internal)
+        }
       }
     }
 

package/boundToAny.js

@@ -6,10 +6,10 @@ import {
 import { defineSetEvent, defineUpdatedEvent, defineTransferredEvent, defineResetEvent } from './propertyEvents.js'
 
 import {
-  defineView,
+  defineObjectView, defineRangeViews,
   defineSetAction, defineUpdateAction, defineResetAction, defineSetOrUpdateAction,
   defineSetTrigger, defineUpdateTrigger, defineSetOrUpdateTrigger, defineResetTrigger
-} from './singularRelationUtils.js'
+} from './singularRelationAnyUtils.js'
 import { defineDeleteAction, defineDeleteTrigger } from './singularRelationAnyUtils.js'
 
 export default function(service, app) {
@@ -17,15 +17,25 @@ export default function(service, app) {
 
     context.relationWord = 'Friend'
     context.reverseRelationWord = 'Bound'
+    context.partialReverseRelationWord = 'Bound'
 
     defineAnyProperties(context.model, context.otherPropertyNames)
     defineAnyIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
 
-    defineView({ ...config, access: config.readAccess }, context,
-      config.readAccess || config.readAccessControl || config.writeAccessControl)
+    defineObjectView(config, context,
+      config.singleAccess || config.readAccess || config.singleAccessControl || config.readAccessControl
+    )
+    defineRangeViews(config, context,
+      config.listAccess || config.readAccess || config.listAccessControl || config.readAccessControl
+    )
+
     if(config.views) {
       for(const view of config.views) {
-        defineView({ ...config, ...view }, context, !view.internal)
+        if(view.type !== 'range') {
+          defineObjectView({ ...config, ...view }, context, !view.internal)
+        } else {
+          defineRangeViews({ ...config, ...view }, context, !view.internal)
+        }
       }
     }
 

package/package.json

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

package/propertyOf.js

@@ -7,7 +7,8 @@ import {
 import { defineSetEvent, defineUpdatedEvent, defineTransferredEvent, defineResetEvent } from './propertyEvents.js'
 
 import {
-  defineView,
+  defineObjectView,
+  defineRangeViews,
   defineSetAction,
   defineUpdateAction,
   defineSetOrUpdateAction,
@@ -25,6 +26,7 @@ export default function(service, app) {
 
     context.relationWord = 'Property'
     context.reverseRelationWord = 'Owned'
+    context.partialReverseRelationWord = 'Owned'
 
     context.sameIdAsParent = true
 
@@ -34,11 +36,19 @@ export default function(service, app) {
     addAccessControlParents(context)
     defineIndexes(context.model, context.otherPropertyNames, context.others)
 
-    defineView({ ...config }, context,
+    defineObjectView({ ...config }, context,
       config.readAccess || config.writeAccess || config.readAccessControl || config.writeAccessControl)
+    defineRangeViews(config, context,
+      config.listAccess || config.readAccess || config.listAccessControl
+    )
+
     if(config.views) {
       for(const view of config.views) {
-        defineView({ ...config, ...view }, context, !view.internal)
+        if(view.type !== 'range') {
+          defineObjectView({ ...config, ...view }, context, !view.internal)
+        } else {
+          defineRangeViews({ ...config, ...view }, context, !view.internal)
+        }
       }
     }
 

package/propertyOfAny.js

@@ -44,9 +44,14 @@ export default function(service, app) {
     defineRangeViews(config, context,
       config.listAccess || config.readAccess || config.listAccessControl || config.readAccessControl
     )
+
     if(config.views) {
       for(const view of config.views) {
-        defineObjectView({ ...config, ...view }, context, !view.internal)
+        if(view.type !== 'range') {
+          defineObjectView({ ...config, ...view }, context, !view.internal)
+        } else {
+          defineRangeViews({ ...config, ...view }, context, !view.internal)
+        }
       }
     }
 

package/singularRelationAnyUtils.js

@@ -15,14 +15,14 @@ import { fireChangeTriggers } from "./changeTriggers.js"
 
 import pluralize from 'pluralize'
 
-function createIdentifiersProperties(keys) {
+export function createIdentifiersProperties(keys) {
   const identifiers = {}
   if(keys) for(const key of keys) {
-    identifiers[key] = {
+    identifiers[key + 'Type'] = {
       type: String,
       validation: ['nonEmpty']
     }
-    identifiers[key + 'Type'] = {
+    identifiers[key] = {
       type: String,
       validation: ['nonEmpty']
     }
@@ -33,17 +33,7 @@ function createIdentifiersProperties(keys) {
 function defineObjectView(config, context, external = true) {
   const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
     modelName, others, model } = context
-  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']
-    })
-  }
+  const viewProperties = createIdentifiersProperties(otherPropertyNames)
   const sourceAccessControl = external
     && (config.singleAccessControl || config.readAccessControl || config.writeAccessControl)
   const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames)

package/singularRelationUtils.js

@@ -3,20 +3,35 @@ import {
   PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, TriggerDefinition
 } from "@live-change/framework"
 import {
-  extractIdentifiers, extractObjectData, generateId, extractIdParts, prepareAccessControl, cloneAndPrepareAccessControl
+  extractIdentifiers,
+  extractObjectData,
+  generateId,
+  extractIdParts,
+  prepareAccessControl,
+  cloneAndPrepareAccessControl,
+  defineIndex
 } from './utils.js'
 import { fireChangeTriggers } from "./changeTriggers.js"
+import { extractTypeAndIdParts } from './utilsAny.js'
+import { allCombinations } from './combinations.js'
+import pluralize from 'pluralize'
 
-function defineView(config, context, external = true) {
-  const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
-    modelName, others, model } = context
-  const viewProperties = {}
-  for (let i = 0; i < others.length; i++) {
-    viewProperties[otherPropertyNames[i]] = new PropertyDefinition({
-      type: others[i],
+export function createIdentifiersProperties(keys, types) {
+  const identifiers = {}
+  if(keys) for(let i = 0; i < keys.length; i++) {
+    const key = keys[i]
+    identifiers[key] = {
+      type: types?.[i] || String,
       validation: ['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)
   const viewName = config.name
     || ((config.prefix ? config.prefix + modelName : modelName[0].toLowerCase() + modelName.slice(1)) + (config.suffix || ''))
   model.crud.read = viewName
@@ -43,7 +58,81 @@ function defineView(config, context, external = true) {
   })
 }
 
-function getSetFunction( validators, validationContext, config, context) {
+export function defineRangeViews(config, context, external = true) {
+  const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
+    modelName, others, model } = context
+  const identifierCombinations = allCombinations(Object.keys(otherPropertyNames)).slice(0, -1)
+  const sourceAccessControl = external
+    && (config.listAccessControl || config.readAccessControl || config.writeAccessControl)
+  for(const combination of identifierCombinations) {
+    const combinationKeys = combination.map(prop => otherPropertyNames[prop])
+    const combinationTypes = combination.map(prop => others[prop])
+    const propsUpperCase = combinationKeys.map(prop => prop[0].toUpperCase() + prop.slice(1))
+    const indexName = 'by' + combinationKeys.map(prop => prop[0].toUpperCase() + prop.slice(1)).join('And')
+    const viewName = combinationKeys[0][0].toLowerCase() + combinationKeys[0].slice(1) +
+      propsUpperCase.slice(1).join('And') + context.partialReverseRelationWord + pluralize(modelName)
+    model.crud['rangeBy_'+combinationTypes.join('And')] = viewName
+    //console.log("DEFINE RANGE VIEW", viewName, combination)
+    const identifiers = createIdentifiersProperties(combinationKeys, combinationTypes)
+    const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, combinationKeys, combinationTypes)
+    service.view({
+      name: viewName,
+      properties: {
+        ...identifiers,
+        ...App.rangeProperties,
+      },
+      internal: !external,
+      access: external && (config.listAccess || config.readAccess),
+      accessControl,
+      daoPath(params, { client, context }) {
+        const owner = []
+        for (const key of combination) owner.push(params[ownerPropertyNames[key]])
+        return modelRuntime().sortedIndexRangePath(indexName, owner, App.extractRange(params) )
+      }
+    })
+  }
+  const propsByType = {}
+  for(let i = 0; i < otherPropertyNames.length; i++) {
+    const prop = otherPropertyNames[i]
+    const type = others[i]
+    if(!propsByType[type]) propsByType[type] = []
+    propsByType[type].push(prop)
+  }
+  const multiPropsTypes = Object.keys(propsByType).filter(type => propsByType[type].length > 1)
+  const typeCombinations = allCombinations(multiPropsTypes)
+  for(const typeCombination of typeCombinations) {
+    const typeNames = typeCombination.map(t => {
+      const type = t.split('_')[1]
+      return type[0].toUpperCase() + type.slice(1)
+    })
+    const parametersNames = typeCombination
+      .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 viewName = typeNames.join('And') + context.partialReverseRelationWord + pluralize(modelName)
+    model.crud['rangeBy_'+typeCombination.join('And')] = viewName
+    //console.log("DEFINE TYPE RANGE VIEW", viewName, typeCombination)
+    const identifiers = createIdentifiersProperties(parametersNames, typeCombination)
+    service.view({
+      name: viewName,
+      properties: {
+        ...identifiers,
+        ...App.rangeProperties,
+      },
+      internal: !external,
+      access: external && (config.listAccess || config.readAccess),
+      accessControl,
+      daoPath(params, { client, context }) {
+        const owner = []
+        for (const key of parametersNames) owner.push(params[key])
+        return modelRuntime().sortedIndexRangePath(indexName, owner, App.extractRange(params) )
+      }
+    })
+  }
+}
+
+export function getSetFunction( validators, validationContext, config, context) {
   const {
     service, app, model, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
@@ -66,7 +155,7 @@ function getSetFunction( validators, validationContext, config, context) {
   return execute
 }
 
-function defineSetAction(config, context) {
+export function defineSetAction(config, context) {
   const {
     service, app, model, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
@@ -92,7 +181,7 @@ function defineSetAction(config, context) {
   service.actions[actionName] = action
 }
 
-function defineSetTrigger(config, context) {
+export function defineSetTrigger(config, context) {
   const {
     service, app, model, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
@@ -114,7 +203,7 @@ function defineSetTrigger(config, context) {
   service.triggers[triggerName] = [trigger]
 }
 
-function getUpdateFunction( validators, validationContext, config, context) {
+export function getUpdateFunction( validators, validationContext, config, context) {
   const {
     service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
@@ -141,7 +230,7 @@ function getUpdateFunction( validators, validationContext, config, context) {
   }
 }
 
-function defineUpdateAction(config, context) {
+export function defineUpdateAction(config, context) {
   const {
     service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
@@ -169,7 +258,7 @@ function defineUpdateAction(config, context) {
   service.actions[actionName] = action
 }
 
-function defineUpdateTrigger(config, context) {
+export function defineUpdateTrigger(config, context) {
   const {
     service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
@@ -193,7 +282,7 @@ function defineUpdateTrigger(config, context) {
   service.triggers[triggerName] = [trigger]
 }
 
-function getSetOrUpdateFunction( validators, validationContext, config, context) {
+export function getSetOrUpdateFunction( validators, validationContext, config, context) {
   const {
     service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
@@ -218,7 +307,7 @@ function getSetOrUpdateFunction( validators, validationContext, config, context)
   }
 }
 
-function defineSetOrUpdateAction(config, context) {
+export function defineSetOrUpdateAction(config, context) {
   const {
     service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
@@ -246,7 +335,7 @@ function defineSetOrUpdateAction(config, context) {
   service.actions[actionName] = action
 }
 
-function defineSetOrUpdateTrigger(config, context) {
+export function defineSetOrUpdateTrigger(config, context) {
   const {
     service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
@@ -270,7 +359,7 @@ function defineSetOrUpdateTrigger(config, context) {
   service.triggers[triggerName] = [trigger]
 }
 
-function getResetFunction( validators, validationContext, config, context) {
+export function getResetFunction( validators, validationContext, config, context) {
   const {
     service, modelRuntime, modelPropertyName, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model, others, writeableProperties
@@ -293,14 +382,13 @@ function getResetFunction( validators, validationContext, config, context) {
   }
 }
 
-function defineDeleteAction(config, context) {
+export function defineDeleteAction(config, context) {
   const {
     service, modelRuntime, modelPropertyName, objectType, identifiers,
     otherPropertyNames, joinedOthersPropertyName, modelName,
     joinedOthersClassName, model, others, writeableProperties
   } = context
   const actionName = 'delete' + modelName
-  model.crud.delete = actionName
   const sourceAccessControl = config.resetAccessControl || config.writeAccessControl
   const accessControl = cloneAndPrepareAccessControl(
     sourceAccessControl, [modelPropertyName], [objectType]
@@ -326,7 +414,7 @@ function defineDeleteAction(config, context) {
   service.actions[actionName] = action
 }
 
-function defineDeleteTrigger(config, context) {
+export function defineDeleteTrigger(config, context) {
   const {
     service, modelRuntime, modelPropertyName, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model, others, writeableProperties
@@ -353,13 +441,14 @@ function defineDeleteTrigger(config, context) {
 }
 
 
-function defineResetAction(config, context) {
+export function defineResetAction(config, context) {
   const {
     service, modelRuntime, modelPropertyName, objectType, identifiers,
     otherPropertyNames, joinedOthersPropertyName, modelName,
     joinedOthersClassName, model, others, writeableProperties
   } = context
   const actionName = 'reset' + modelName
+  model.crud.delete = actionName
   const properties = {}
   for (let i = 0; i < others.length; i++) {
     properties[otherPropertyNames[i]] = new PropertyDefinition({
@@ -387,7 +476,7 @@ function defineResetAction(config, context) {
   service.actions[actionName] = action
 }
 
-function defineResetTrigger(config, context) {
+export function defineResetTrigger(config, context) {
   const {
     service, modelRuntime, modelPropertyName, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model,
@@ -415,11 +504,3 @@ function defineResetTrigger(config, context) {
   if(service.triggers[triggerName]) throw new Error('Trigger ' + triggerName + ' already defined')
   service.triggers[triggerName] = [trigger]
 }
-
-
-
-export {
-  defineView,
-  defineSetAction, defineUpdateAction, defineSetOrUpdateAction, defineResetAction, defineDeleteAction,
-  defineSetTrigger, defineUpdateTrigger, defineSetOrUpdateTrigger, defineDeleteTrigger, defineResetTrigger
-}

package/utils.js

@@ -41,10 +41,11 @@ export function defineProperties(model, types, names) {
   return identifiers
 }
 
-export function defineIndex(model, what, props) {
+export function defineIndex(model, what, props, multi = undefined) {
   console.log("DEFINE INDEX", model.name, what, props)
   model.indexes['by' + what] = new IndexDefinition({
-    property: props
+    property: props,
+    multi
   })
 }
 export function defineIndexes(model, props, types) {
@@ -58,6 +59,22 @@ export function defineIndexes(model, props, types) {
     const indexProps = propCombination.map(id => props[id])
     defineIndex(model, upperCaseProps.join('And'), indexProps)
   }
+  const propsByType = {}
+  for(const prop in props) {
+    const type = types[prop]
+    if(!propsByType[type]) propsByType[type] = []
+    propsByType[type].push(prop)
+  }
+  const multiPropsTypes = Object.keys(propsByType).filter(type => propsByType[type].length > 1)
+  const typeCombinations = allCombinations(multiPropsTypes)
+  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)
+  }
 }
 
 export function processModelsAnnotation(service, app, annotation, multiple, cb) {

package/utilsAny.js

@@ -41,11 +41,11 @@ function generateAnyId(otherPropertyNames, properties) {
 function defineAnyProperties(model, names) {
   const identifiers = {}
   for (let i = 0; i < names.length; i++) {
-    identifiers[names[i]] = new PropertyDefinition({
+    identifiers[names[i]+'Type'] = new PropertyDefinition({
       type: String,
       validation: ['nonEmpty']
     })
-    identifiers[names[i]+'Type'] = new PropertyDefinition({
+    identifiers[names[i]] = new PropertyDefinition({
       type: String,
       validation: ['nonEmpty']
     })
@@ -111,8 +111,18 @@ function processModelsAnyAnnotation(service, app, annotation, multiple, cb) {
 
         console.log("MODEL " + modelName + " IS " + annotation + " " + config.what)
 
-        const otherPropertyNames = (Array.isArray(config.to) ? config.to : [config.to ?? 'owner'])
-            .map(other => other.name ? other.name : other)
+        const to = (Array.isArray(config.to) ? config.to : [config.to ?? 'owner'])
+
+        const otherPropertyNames = to.map(other => other.name ? other.name : other)
+
+        const otherPossibleTypes = to.map(other => {
+          const name = other.name ? other.name : other
+          const typesConfig = config[name + 'Types'] || []
+          const otherTypes = other.types || []
+          return Array.from(new Set(
+            typesConfig.concat(otherTypes).map(t => t.getTypeName ? t.getTypeName() : t)
+          ))
+        })
 
         const writeableProperties = modelProperties || config.writeableProperties
         const others = otherPropertyNames.map(other => other.slice(0, 1).toUpperCase() + other.slice(1))
@@ -121,12 +131,15 @@ function processModelsAnyAnnotation(service, app, annotation, multiple, cb) {
         const joinedOthersClassName = others.join('And')
         const objectType = service.name + '_' + modelName
 
-        const { parentsTypes } = config
+        const parentsTypes = Array.from(new Set(
+          (config.parentsTypes || [])
+            .concat(otherPossibleTypes.filter(x => !!x).flat()
+        )))
 
         const context = {
           service, app, model, originalModelProperties, modelProperties, modelPropertyName, modelRuntime,
           otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others,
-          objectType, parentsTypes
+          objectType, parentsTypes, otherPossibleTypes
         }
 
         cb(config, context)