@live-change/relations-plugin 0.5.26 → 0.6.1

package/combinations.js

@@ -0,0 +1,17 @@
+function combinations(x, n ,p=[]) {
+  if(x.length == 0 || n > x.length) return []
+  if(n == 1 || x.length == 1) return x.map(e=>p.concat([e]))
+  let acc = []
+  for(let i = 0; i < x.length; i++) acc.push(
+      ...combinations(x.slice(i+1), n - 1, p.concat([x[i]]))
+  )
+  return acc
+}
+
+function allCombinations(x) {
+  let acc = []
+  for(let i = 1; i<=x.length; i++) acc.push(...combinations(x,i))
+  return acc
+}
+
+module.exports = { combinations, allCombinations }

package/itemEvents.js

@@ -3,9 +3,9 @@ const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, E
 
 function defineCreatedEvent(config, context) {
   const {
-    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName
+    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName, reverseRelationWord
   } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Created'
+  const eventName = joinedOthersPropertyName + reverseRelationWord + modelName + 'Created'
   service.events[eventName] = new EventDefinition({
     name: eventName,
     execute(properties) {
@@ -17,9 +17,9 @@ function defineCreatedEvent(config, context) {
 
 function defineUpdatedEvent(config, context) {
   const {
-    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName
+    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName, reverseRelationWord
   } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Updated'
+  const eventName = joinedOthersPropertyName + reverseRelationWord + modelName + 'Updated'
   service.events[eventName] = new EventDefinition({
     name: eventName,
     execute(properties) {
@@ -31,9 +31,9 @@ function defineUpdatedEvent(config, context) {
 
 function defineTransferredEvent(config, context) {
   const {
-    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName
+    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName, reverseRelationWord
   } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Transferred'
+  const eventName = joinedOthersPropertyName + reverseRelationWord + modelName + 'Transferred'
   service.events[eventName] = new EventDefinition({
     name: eventName,
     execute(properties) {
@@ -45,9 +45,9 @@ function defineTransferredEvent(config, context) {
 
 function defineDeletedEvent(config, context) {
   const {
-    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName
+    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName, reverseRelationWord
   } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Deleted'
+  const eventName = joinedOthersPropertyName + reverseRelationWord + modelName + 'Deleted'
   service.events[eventName] = new EventDefinition({
     name: eventName,
     execute(properties) {

package/itemOf.js

@@ -17,7 +17,7 @@ module.exports = function(service, app) {
     context.relationWord = 'Item'
     context.reverseRelationWord = 'Owned'
 
-    defineProperties(context.model, context.others, context.otherPropertyNames)
+    context.identifiers = defineProperties(context.model, context.others, context.otherPropertyNames)
     defineIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
 
     if(config.sortBy) {
@@ -44,7 +44,7 @@ module.exports = function(service, app) {
       defineUpdateAction(config, context)
     }
 
-    if(config.resetAccess || config.writeAccess) {
+    if(config.deleteAccess || config.writeAccess) {
       defineDeleteAction(config, context)
     }
   })

package/itemOfAny.js

@@ -17,7 +17,7 @@ module.exports = function(service, app) {
     context.relationWord = 'Item'
     context.reverseRelationWord = 'Owned'
 
-    defineAnyProperties(context.model, context.otherPropertyNames)
+    context.identifiers = defineAnyProperties(context.model, context.otherPropertyNames)
     defineAnyIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
 
     if(config.sortBy) {
@@ -44,7 +44,7 @@ module.exports = function(service, app) {
       defineUpdateAction(config, context)
     }
 
-    if(config.resetAccess || config.writeAccess) {
+    if(config.deleteAccess || config.writeAccess) {
       defineDeleteAction(config, context)
     }
   })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/relations-plugin",
-  "version": "0.5.26",
+  "version": "0.6.1",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,8 +21,8 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "^0.5.25",
+    "@live-change/framework": "^0.6.1",
     "pluralize": "8.0.0"
   },
-  "gitHead": "84d05fde7850ebac621da35ada9c19590a728741"
+  "gitHead": "64a9e476bdeec727ff5b8bedbaef65078f1b32f2"
 }

package/pluralRelationAnyUtils.js

@@ -1,7 +1,8 @@
 const App = require("@live-change/framework")
 const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition } = App
 const { extractTypeAndIdParts, extractIdentifiersWithTypes } = require("./utilsAny.js")
-const { extractRange, extractObjectData } = require("./utils.js")
+const { extractObjectData } = require("./utils.js")
+const { extractRange } = App
 
 const pluralize = require('pluralize')
 
@@ -88,6 +89,10 @@ function defineUpdateAction(config, context) {
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
     properties: {
+      [modelPropertyName]: {
+        type: model,
+        validation: ['nonEmpty']
+      },
       ...(model.properties)
     },
     access: config.updateAccess || config.writeAccess,
@@ -96,6 +101,7 @@ function defineUpdateAction(config, context) {
     waitForEvents: true,
     async execute(properties, { client, service }, emit) {
       const id = properties[modelPropertyName]
+      if(!id) throw 'no_id'
       const entity = await modelRuntime().get(id)
       if(!entity) throw 'not_found'
       const entityTypeAndIdParts = extractTypeAndIdParts(otherPropertyNames, entity)
@@ -121,7 +127,7 @@ function defineUpdateAction(config, context) {
 
 function defineDeleteAction(config, context) {
   const {
-    service, app, model, modelRuntime, modelPropertyName,
+    service, app, model, modelRuntime, modelPropertyName, identifiers,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Deleted'
@@ -129,7 +135,11 @@ function defineDeleteAction(config, context) {
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
     properties: {
-      ...(model.properties)
+      [modelPropertyName]: {
+        type: model,
+        validation: ['nonEmpty']
+      },
+      ...identifiers
     },
     access: config.deleteAccess || config.writeAccess,
     skipValidation: true,

package/pluralRelationUtils.js

@@ -89,7 +89,7 @@ function defineUpdateAction(config, context) {
     skipValidation: true,
     //queuedBy: otherPropertyNames,
     waitForEvents: true,
-    async execute(properties, {client, service}, emit) {
+    async execute(properties, { client, service }, emit) {
       const id = properties[modelPropertyName]
       const entity = await modelRuntime().get(id)
       if(!entity) throw 'not_found'
@@ -130,7 +130,7 @@ function defineDeleteAction(config, context) {
     skipValidation: true,
     //queuedBy: otherPropertyNames,
     waitForEvents: true,
-    async execute(properties, {client, service}, emit) {
+    async execute(properties, { client, service }, emit) {
       const id = properties[modelPropertyName]
       const entity = await modelRuntime().get(id)
       if(!entity) throw new Error('not_found')

package/propertyEvents.js

@@ -3,9 +3,9 @@ const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, E
 
 function defineSetEvent(config, context, generateId) {
   const {
-    service, modelRuntime, joinedOthersPropertyName, modelName, otherPropertyNames
+    service, modelRuntime, joinedOthersPropertyName, modelName, otherPropertyNames, reverseRelationWord
   } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Set'
+  const eventName = joinedOthersPropertyName + reverseRelationWord + modelName + 'Set'
   service.events[eventName] = new EventDefinition({
     name: eventName,
     execute(properties) {
@@ -17,9 +17,9 @@ function defineSetEvent(config, context, generateId) {
 
 function defineUpdatedEvent(config, context, generateId) {
   const {
-    service, modelRuntime, joinedOthersPropertyName, modelName, otherPropertyNames
+    service, modelRuntime, joinedOthersPropertyName, modelName, otherPropertyNames, reverseRelationWord
   } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Updated'
+  const eventName = joinedOthersPropertyName + reverseRelationWord + modelName + 'Updated'
   service.events[eventName] = new EventDefinition({
     name: eventName,
     execute(properties) {
@@ -31,9 +31,9 @@ function defineUpdatedEvent(config, context, generateId) {
 
 function defineTransferredEvent(config, context, generateId) {
   const {
-    service, modelRuntime, joinedOthersPropertyName, modelName, otherPropertyNames
+    service, modelRuntime, joinedOthersPropertyName, modelName, otherPropertyNames, reverseRelationWord
   } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Transferred'
+  const eventName = joinedOthersPropertyName + reverseRelationWord + modelName + 'Transferred'
   service.events[eventName] = new EventDefinition({
     name: eventName,
     async execute(properties) {
@@ -53,9 +53,9 @@ function defineTransferredEvent(config, context, generateId) {
 
 function defineResetEvent(config, context, generateId) {
   const {
-    service, modelRuntime, joinedOthersPropertyName, modelName, otherPropertyNames
+    service, modelRuntime, joinedOthersPropertyName, modelName, otherPropertyNames, reverseRelationWord
   } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Reset'
+  const eventName = joinedOthersPropertyName + reverseRelationWord + modelName + 'Reset'
   service.events[eventName] = new EventDefinition({
     name: eventName,
     execute({ identifiers }) {

package/propertyOf.js

@@ -15,7 +15,7 @@ module.exports = function(service, app) {
     context.relationWord = 'Property'
     context.reverseRelationWord = 'Owned'
 
-    defineProperties(context.model, context.others, context.otherPropertyNames)
+    context.identifiers = defineProperties(context.model, context.others, context.otherPropertyNames)
     defineIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
 
     if(config.readAccess) {

package/propertyOfAny.js

@@ -1,5 +1,5 @@
 const {
-  defineAnyProperties, defineAnyIndex,
+  defineAnyProperties, defineAnyIndex, defineAnyIndexes,
   processModelsAnyAnnotation, generateAnyId
 } = require('./utilsAny.js')
 
@@ -8,7 +8,7 @@ const {
 } = require('./propertyEvents.js')
 
 const {
-  defineView, defineSetAction, defineUpdateAction, defineSetOrUpdateAction, defineResetAction
+  defineObjectView, defineRangeViews, defineSetAction, defineUpdateAction, defineSetOrUpdateAction, defineResetAction
 } = require('./singularRelationAnyUtils.js')
 
 module.exports = function(service, app) {
@@ -16,16 +16,18 @@ module.exports = function(service, app) {
 
     context.relationWord = 'Property'
     context.reverseRelationWord = 'Owned'
+    context.partialReverseRelationWord = 'Owned'
 
-    defineAnyProperties(context.model, context.otherPropertyNames)
-    defineAnyIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
+    context.identifiers = defineAnyProperties(context.model, context.otherPropertyNames)
+    defineAnyIndexes(context.model, context.otherPropertyNames)
 
     if(config.readAccess) {
-      defineView({ ...config, access: config.readAccess }, context)
+      defineObjectView({ ...config, access: config.readAccess }, context)
+      defineRangeViews({ ...config, access: config.readAccess }, context)
     }
     if(config.views) {
       for(const view of config.views) {
-        defineView({ ...config, ...view }, context)
+        defineObjectView({ ...config, ...view }, context)
       }
     }
 

package/relatedTo.js

@@ -17,7 +17,7 @@ module.exports = function(service, app) {
     context.relationWord = 'Friend'
     context.reverseRelationWord = 'Related'
 
-    defineProperties(context.model, context.others, context.otherPropertyNames)
+    context.identifiers = defineProperties(context.model, context.others, context.otherPropertyNames)
     defineIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
 
     if(config.sortBy) {
@@ -44,7 +44,7 @@ module.exports = function(service, app) {
       defineUpdateAction(config, context)
     }
 
-    if(config.resetAccess || config.writeAccess) {
+    if(config.deleteAccess || config.writeAccess) {
       defineDeleteAction(config, context)
     }
   })

package/relatedToAny.js

@@ -17,7 +17,7 @@ module.exports = function(service, app) {
     context.relationWord = 'Friend'
     context.reverseRelationWord = 'Related'
 
-    defineAnyProperties(context.model, context.otherPropertyNames)
+    context.identifiers = defineAnyProperties(context.model, context.otherPropertyNames)
     defineAnyIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
 
     if(config.sortBy) {
@@ -44,7 +44,7 @@ module.exports = function(service, app) {
       defineUpdateAction(config, context)
     }
 
-    if(config.resetAccess || config.writeAccess) {
+    if(config.deleteAccess || config.writeAccess) {
       defineDeleteAction(config, context)
     }
   })

package/singularRelationAnyUtils.js

@@ -2,9 +2,26 @@ const App = require("@live-change/framework")
 const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition } = App
 const { extractTypeAndIdParts, extractIdentifiersWithTypes, generateAnyId } = require("./utilsAny.js")
 const { extractObjectData } = require("./utils.js")
+const { allCombinations } = require("./combinations.js")
 
+const pluralize = require('pluralize')
 
-function defineView(config, context) {
+function createIdentifiersProperties(keys) {
+  const identifiers = {}
+  if(keys) for(const key of keys) {
+    identifiers[key] = {
+      type: String,
+      validation: ['nonEmpty']
+    }
+    identifiers[key + 'Type'] = {
+      type: String,
+      validation: ['nonEmpty']
+    }
+  }
+  return identifiers
+}
+
+function defineObjectView(config, context) {
   const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
     modelName, others, model } = context
   const viewProperties = {}
@@ -38,6 +55,37 @@ function defineView(config, context) {
   })
 }
 
+function defineRangeViews(config, context) {
+  const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
+    modelName, others, model } = context
+  const identifierCombinations = allCombinations(otherPropertyNames).slice(0, -1)
+  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 identifiers = createIdentifiersProperties(combination)
+    service.views[viewName] = new ViewDefinition({
+      name: viewName,
+      properties: {
+        ...identifiers,
+        ...App.rangeProperties,
+      },
+      access(params, context) {
+        return config.access ? config.access(params, context) : true
+      },
+      daoPath(params, { client, context }) {
+        const owner = []
+        for (const key of combination) {
+          owner.push(params[key + 'Type'], params[key])
+        }
+        return modelRuntime().sortedIndexRangePath(indexName, owner, App.extractRange(params) )
+      }
+    })
+  }
+}
+
 function defineSetAction(config, context) {
   const {
     service, app, model, defaults,
@@ -120,13 +168,13 @@ function defineSetOrUpdateAction(config, context) {
     skipValidation: true,
     queuedBy: otherPropertyNames,
     waitForEvents: true,
-    async execute(properties, {client, service}, emit) {
+    async execute(properties, { client, service }, emit) {
       const identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
       const id = generateAnyId(otherPropertyNames, properties)
       const entity = await modelRuntime().get(id)
       const data = extractObjectData(writeableProperties, properties, { ...defaults, ...entity } )
       await App.validation.validate({ ...identifiers, ...data }, validators,
-          {source: action, action, service, app, client})
+          { source: action, action, service, app, client })
       emit({
         type: eventName,
         identifiers, data
@@ -139,7 +187,7 @@ function defineSetOrUpdateAction(config, context) {
 
 function defineResetAction(config, context) {
   const {
-    service, modelRuntime, modelPropertyName,
+    service, modelRuntime, modelPropertyName, identifiers,
     otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Reset'
@@ -150,7 +198,8 @@ function defineResetAction(config, context) {
       [modelPropertyName]: {
         type: model,
         validation: ['nonEmpty']
-      }
+      },
+      ...identifiers
     },
     access: config.resetAccess || config.writeAccess,
     queuedBy: otherPropertyNames,
@@ -168,4 +217,7 @@ function defineResetAction(config, context) {
   })
 }
 
-module.exports = { defineView, defineSetAction, defineUpdateAction, defineSetOrUpdateAction, defineResetAction }
+module.exports = {
+  defineObjectView, defineRangeViews,
+  defineSetAction, defineUpdateAction, defineSetOrUpdateAction, defineResetAction
+}

package/utils.js

@@ -9,17 +9,6 @@ function extractIdParts(otherPropertyNames, properties) {
   return idParts
 }
 
-function extractRange(properties) {
-  return {
-    gt: properties.gt,
-    gte: properties.gte,
-    lt: properties.lt,
-    lte: properties.lte,
-    reverse: properties.reverse,
-    limit: properties.limit
-  }
-}
-
 function extractIdentifiers(otherPropertyNames, properties) {
   const identifiers = {}
   for (const propertyName of otherPropertyNames) {
@@ -41,16 +30,21 @@ function extractObjectData(writeableProperties, properties, defaults) {
       objectData[propertyName] = properties[propertyName]
     }
   }
-  return App.utils.mergeDeep({}, defaults, objectData)
+  return App.utils.mergeDeep({}, defaults, JSON.parse(JSON.stringify(objectData)))
 }
 
 function defineProperties(model, types, names) {
+  const identifiers = {}
   for (let i = 0; i < types.length; i++) {
-    model.properties[names[i]] = new PropertyDefinition({
+    identifiers[names[i]] = new PropertyDefinition({
       type: types[i],
       validation: ['nonEmpty']
     })
   }
+  for(const key in identifiers) {
+    model.properties[key] = identifiers[key]
+  }
+  return identifiers
 }
 
 function defineIndex(model, what, props) {
@@ -123,5 +117,5 @@ function processModelsAnnotation(service, app, annotation, multiple, cb) {
 
 module.exports = {
   extractIdParts, extractIdentifiers, extractObjectData, defineProperties, defineIndex,
-  processModelsAnnotation, extractRange, generateId
+  processModelsAnnotation, generateId
 }

package/utilsAny.js

@@ -1,5 +1,6 @@
 const App = require("@live-change/framework")
 const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition } = App
+const { allCombinations } = require("./combinations.js")
 
 function extractTypeAndIdParts(otherPropertyNames, properties) {
   const typeAndIdParts = []
@@ -27,16 +28,21 @@ function generateAnyId(otherPropertyNames, properties) {
 }
 
 function defineAnyProperties(model, names) {
+  const identifiers = {}
   for (let i = 0; i < names.length; i++) {
-    model.properties[names[i]] = new PropertyDefinition({
+    identifiers[names[i]] = new PropertyDefinition({
       type: String,
       validation: ['nonEmpty']
     })
-    model.properties[names[i]+'Type'] = new PropertyDefinition({
+    identifiers[names[i]+'Type'] = new PropertyDefinition({
       type: String,
       validation: ['nonEmpty']
     })
   }
+  for(const key in identifiers) {
+    model.properties[key] = identifiers[key]
+  }
+  return identifiers
 }
 
 function defineAnyIndex(model, what, props) {
@@ -45,6 +51,14 @@ function defineAnyIndex(model, what, props) {
   })
 }
 
+function defineAnyIndexes(model, props) {
+  const propCombinations = allCombinations(props)
+  for(const propCombination of propCombinations) {
+    const upperCaseProps = propCombination.map(prop => prop[0].toUpperCase() + prop.slice(1))
+    defineAnyIndex(model, upperCaseProps.join('And'), propCombination)
+  }
+}
+
 function processModelsAnyAnnotation(service, app, annotation, multiple, cb) {
   if (!service) throw new Error("no service")
   if (!app) throw new Error("no app")
@@ -104,6 +118,7 @@ function processModelsAnyAnnotation(service, app, annotation, multiple, cb) {
 }
 
 module.exports = {
-  extractTypeAndIdParts, extractIdentifiersWithTypes, defineAnyProperties, defineAnyIndex,
+  extractTypeAndIdParts, extractIdentifiersWithTypes, defineAnyProperties,
+  defineAnyIndex, defineAnyIndexes,
   processModelsAnyAnnotation, generateAnyId
 }