@live-change/relations-plugin 0.9.61 → 0.9.62

package/boundToAny.js

@@ -19,7 +19,7 @@ export default function(service, app) {
     context.reverseRelationWord = 'Bound'
     context.partialReverseRelationWord = 'Bound'
 
-    defineAnyProperties(context.model, context.otherPropertyNames)
+    context.identifiers = defineAnyProperties(context.model, context.otherPropertyNames, config)
     defineAnyIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
     defineAnyTypeIndexes(config, context, context.otherPropertyNames.length === 1)
 

package/entity.js

@@ -1,7 +1,7 @@
 import {
   defineProperties, defineIndex,
   processModelsAnnotation, extractIdParts, extractIdentifiers, extractObjectData, prepareAccessControl,
-  includeAccessRoles
+  includeAccessRoles, defineGlobalRangeView
 } from './utils.js'
 import { fireChangeTriggers } from "./changeTriggers.js"
 import App from '@live-change/framework'
@@ -47,31 +47,6 @@ function defineView(config, context, external) {
   })
 }
 
-function defineRangeView(config, context, external = true) {
-  const { service, modelRuntime, modelPropertyName, modelName, model } = context
-  const viewName = (config.prefix || '' ) + pluralize(config.prefix ? modelName : modelPropertyName) + (config.suffix || '')
-  if(external) model.crud.range = viewName
-  service.views[viewName] = new ViewDefinition({
-    name: viewName,
-    properties: {
-      ...App.utils.rangeProperties
-    },
-    returns: {
-      type: Array,
-      of: {
-        type: model
-      }
-    },
-    internal: !external,
-    global: config.globalView,
-    access: external && config.readAllAccess,
-    daoPath(properties, { client, context }) {
-      const range = App.extractRange(properties)
-      const path = modelRuntime().rangePath(range)
-      return path
-    }
-  })
-}
 
 function defineCreatedEvent(config, context) {
   const {
@@ -392,7 +367,7 @@ export default function(service, app) {
     }
 
     defineView(config, context, config.readAccess || config.readAccessControl || config.writeAccessControl)
-    defineRangeView(config, context, config.readAllAccess)
+    defineGlobalRangeView(config, context, config.readAllAccess)
     /// TODO: multiple views with limited fields
 
     defineCreatedEvent(config, context)

package/itemOf.js

@@ -1,7 +1,8 @@
 import {
   defineProperties, defineIndexes,
   processModelsAnnotation, addAccessControlParents,
-  defineDeleteByOwnerEvents, defineParentDeleteTriggers, defineParentCopyTriggers
+  defineDeleteByOwnerEvents, defineParentDeleteTriggers, defineParentCopyTriggers,
+   defineGlobalRangeView
 } from './utils.js'
 
 import {
@@ -41,6 +42,8 @@ export default function(service, app) {
       config.readAccess || config.readAccessControl || config.writeAccessControl)
     /// TODO: multiple views with limited fields
 
+    defineGlobalRangeView(config, context, config.readAllAccess)
+
     defineCreatedEvent(config, context)
     defineUpdatedEvent(config, context)
     defineTransferredEvent(config, context)

package/itemOfAny.js

@@ -1,3 +1,5 @@
+import { defineGlobalRangeView } from './utils.js'
+
 import {
   defineAnyProperties, defineAnyIndexes,
   processModelsAnyAnnotation, addAccessControlAnyParents, generateAnyId, defineDeleteByOwnerEvents,
@@ -21,7 +23,7 @@ export default function(service, app) {
     context.relationWord = 'Item'
     context.reverseRelationWord = 'Owned'
 
-    context.identifiers = defineAnyProperties(context.model, context.otherPropertyNames)
+    context.identifiers = defineAnyProperties(context.model, context.otherPropertyNames, config)
     context.model.identifiers = [...Object.keys(context.identifiers), { name: context.modelPropertyName, field: 'id' }]
 
     addAccessControlAnyParents(context)
@@ -41,6 +43,8 @@ export default function(service, app) {
     /// TODO: multiple views with all properties combinations
     /// TODO: multiple views with limited fields
 
+    defineGlobalRangeView(config, context, config.readAllAccess)
+
     defineCreatedEvent(config, context)
     defineUpdatedEvent(config, context)
     defineTransferredEvent(config, context)

package/package.json

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

package/pluralRelationAnyUtils.js

@@ -35,7 +35,7 @@ function defineRangeView(config, context, external = true) {
   const sourceAccessControl = external && (config.readAccessControl || config.writeAccessControl)
   const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames)
   const viewName = joinedOthersPropertyName + context.reverseRelationWord + pluralize(modelName)
-  model.crud.range = viewName
+  model.crud['rangeBy' + joinedOthersClassName] = viewName
   service.view({
     name: viewName,
     properties: {

package/pluralRelationUtils.js

@@ -24,7 +24,7 @@ function defineRangeView(config, context, external = true) {
     })
   }
   const viewName = joinedOthersPropertyName + context.reverseRelationWord + pluralize(modelName)
-  model.crud.range = viewName
+  model.crud['rangeBy' + joinedOthersPropertyName[0].toUpperCase() + joinedOthersPropertyName.slice(1)] = viewName
   const sourceAccessControl = external && (config.readAccessControl || config.writeAccessControl)
   const accessControl = cloneAndPrepareAccessControl(sourceAccessControl, otherPropertyNames, others)
   if(viewName === 'companyOwnedProducts') {

package/propertyOf.js

@@ -1,7 +1,8 @@
 import {
   defineProperties, defineIndexes,
   processModelsAnnotation, generateId, addAccessControlParents,
-  defineDeleteByOwnerEvents, defineParentDeleteTriggers
+  defineDeleteByOwnerEvents, defineParentDeleteTriggers,
+  defineGlobalRangeView
 } from './utils.js'
 
 import { defineSetEvent, defineUpdatedEvent, defineTransferredEvent, defineResetEvent } from './propertyEvents.js'
@@ -52,6 +53,9 @@ export default function(service, app) {
       }
     }
 
+    defineGlobalRangeView(config, context, config.readAllAccess)
+
+
     defineSetEvent(config, context, generateId)
     defineUpdatedEvent(config, context, generateId)
     defineTransferredEvent(config, context, generateId)

package/propertyOfAny.js

@@ -1,3 +1,5 @@
+import { defineGlobalRangeView } from './utils.js'
+
 import {
   defineAnyProperties, defineAnyIndexes,
   processModelsAnyAnnotation, generateAnyId, addAccessControlAnyParents,
@@ -32,7 +34,7 @@ export default function(service, app) {
 
     context.sameIdAsParent = true
 
-    context.identifiers = defineAnyProperties(context.model, context.otherPropertyNames)
+    context.identifiers = defineAnyProperties(context.model, context.otherPropertyNames, config)
     context.model.identifiers = Object.keys(context.identifiers)
 
     addAccessControlAnyParents(context)
@@ -42,6 +44,7 @@ export default function(service, app) {
     defineObjectView(config, context,
       config.singleAccess || config.readAccess || config.singleAccessControl || config.readAccessControl
     )
+
     defineRangeViews(config, context,
       config.listAccess || config.readAccess || config.listAccessControl || config.readAccessControl
     )
@@ -56,6 +59,8 @@ export default function(service, app) {
       }
     }
 
+    defineGlobalRangeView(config, context, config.readAllAccess)
+
     defineSetEvent(config, context, generateAnyId)
     defineUpdatedEvent(config, context, generateAnyId)
     defineTransferredEvent(config, context, generateAnyId)

package/relatedToAny.js

@@ -19,7 +19,7 @@ export default function(service, app) {
     context.relationWord = 'Friend'
     context.reverseRelationWord = 'Related'
 
-    context.identifiers = defineAnyProperties(context.model, context.otherPropertyNames)
+    context.identifiers = defineAnyProperties(context.model, context.otherPropertyNames, config)
     defineAnyIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
     defineAnyTypeIndexes(config, context, false)
 

package/singularRelationAnyUtils.js

@@ -71,10 +71,11 @@ function defineRangeViews(config, context, external = true) {
   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))
-    const viewName = combination[0][0].toLowerCase() + combination[0].slice(1) +
-        propsUpperCase.slice(1).join('And') + context.partialReverseRelationWord + pluralize(modelName)
-    console.log("DEFINE RANGE VIEW", viewName, combination)
+    const joinedCombinationName = combination[0][0].toLowerCase() + combination[0].slice(1) +
+        propsUpperCase.slice(1).join('And')        
+    const viewName = joinedCombinationName + context.partialReverseRelationWord + pluralize(modelName)   
     const identifiers = createIdentifiersProperties(combination)
+    model.crud['rangeBy' + joinedOthersClassName[0].toUpperCase() + joinedOthersClassName.slice(1)] = viewName
     service.view({
       name: viewName,
       properties: {

package/utils.js

@@ -12,6 +12,8 @@ export {
   extractObjectData, extractIdentifiers
 } from './dataUtils.js'
 
+import pluralize from 'pluralize'
+
 export function extractIdParts(otherPropertyNames, properties) {
   const idParts = []
   for (const propertyName of otherPropertyNames) {
@@ -146,7 +148,7 @@ export function processModelsAnnotation(service, app, annotation, multiple, cb)
 
 export function addAccessControlParents(context) {
   const { modelRuntime } = context
-  context.model.accessControlParents = async (what) => {
+  context.model.accessControlParents = context.model.accessControlParents ?? (async (what) => {
     const id = what.object
     const data = await modelRuntime().get(id)
     return context.otherPropertyNames.map((otherPropertyName, i) => {
@@ -155,8 +157,8 @@ export function addAccessControlParents(context) {
       const object = data[otherPropertyName]
       return { objectType, object }
     }).filter(parent => parent.object && parent.objectType)
-  }
-  context.model.accessControlParentsSource = context.otherPropertyNames.map(
+  })
+  context.model.accessControlParentsSource = context.model.accessControlParentsSource ?? context.otherPropertyNames.map(
     (otherPropertyName, i) => {
       const other = context.others[i]
       return ({
@@ -244,4 +246,30 @@ export function includeAccessRoles(model, access) {
   if(access.roles) {
     includeAccessRoles(model, access.roles)
   }
+}
+
+export function defineGlobalRangeView(config, context, external = true) {
+  const { service, modelRuntime, modelPropertyName, modelName, model } = context
+  const viewName = (config.prefix || '' ) + pluralize(config.prefix ? modelName : modelPropertyName) + (config.suffix || '')
+  if(external) model.crud.range = viewName
+  service.views[viewName] = new ViewDefinition({
+    name: viewName,
+    properties: {
+      ...App.utils.rangeProperties
+    },
+    returns: {
+      type: Array,
+      of: {
+        type: model
+      }
+    },
+    internal: !external,
+    global: config.globalView,
+    access: external && config.readAllAccess,
+    daoPath(properties, { client, context }) {
+      const range = App.extractRange(properties)
+      const path = modelRuntime().rangePath(range)
+      return path
+    }
+  })
 }

package/utilsAny.js

@@ -39,15 +39,19 @@ export function generateAnyId(otherPropertyNames, properties) {
       .map(p => JSON.stringify(properties[p])).join(':')
 }
 
-export function defineAnyProperties(model, names) {
+export function defineAnyProperties(model, names, config) {
   const identifiers = {}
   for (let i = 0; i < names.length; i++) {
+    const possibleTypes = config[names[i]+'Types']
+    const possibleTypesNames = possibleTypes && possibleTypes.map(t => t.getTypeName ? t.getTypeName() : t)
     identifiers[names[i]+'Type'] = new PropertyDefinition({
-      type: String,
-      validation: ['nonEmpty']
+      type: 'type',
+      validation: ['nonEmpty'],
+      enum: possibleTypesNames
     })
     identifiers[names[i]] = new PropertyDefinition({
-      type: String,
+      types: possibleTypesNames,
+      type: 'any',
       validation: ['nonEmpty']
     })
   }
@@ -152,7 +156,7 @@ export function processModelsAnyAnnotation(service, app, annotation, multiple, c
 
 export function addAccessControlAnyParents(context) {
   const { modelRuntime } = context
-  context.model.accessControlParents = async (what) => {
+  context.model.accessControlParents = context.model.accessControlParents ?? (async (what) => {
     const id = what.object
     console.log("PROPERTY OF ANY ACCESS CONTROL PARENTS", context.model.name, '/', id)
     const data = await modelRuntime().get(id)
@@ -161,8 +165,8 @@ export function addAccessControlAnyParents(context) {
       const object = data[otherPropertyName]
       return { objectType, object }
     }).filter(parent => parent.object && parent.objectType)
-  }
-  context.model.accessControlParentsSource = context.otherPropertyNames.map(
+  })
+  context.model.accessControlParentsSource = context.model.accessControlParentsSource ?? context.otherPropertyNames.map(
     (otherPropertyName, index) => ({
       property: otherPropertyName,
       possibleTypes: context.otherPossibleTypes[index]