@live-change/relations-plugin 0.7.21 → 0.7.22

package/itemOf.js

@@ -20,7 +20,7 @@ module.exports = function(service, app) {
 
     context.identifiers = defineProperties(context.model, context.others, context.otherPropertyNames)
     addAccessControlParents(context)
-    defineIndexes(context.model, context.otherPropertyNames, context.others)
+    defineIndexes(context.model, context.otherPropertyNames.map(p => p[0].toLowerCase() + p.slice(1)), context.others)
 
     if(config.sortBy) {
       for(const sortFields of config.sortBy) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/relations-plugin",
-  "version": "0.7.21",
+  "version": "0.7.22",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,8 +21,8 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "^0.7.21",
+    "@live-change/framework": "^0.7.22",
     "pluralize": "8.0.0"
   },
-  "gitHead": "34a57ec8676ad6a671154b8359e82fa97052ded3"
+  "gitHead": "79e23d145f88e4dff18f1ed9a6f148cadfe49aa6"
 }

package/pluralRelationUtils.js

@@ -1,6 +1,6 @@
 const App = require("@live-change/framework")
 const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition } = App
-const { extractIdParts, extractRange, extractIdentifiers, extractObjectData, prepareAccessControl } = require("./utils.js")
+const { extractIdParts, extractIdentifiers, extractObjectData, prepareAccessControl } = require("./utils.js")
 
 const pluralize = require('pluralize')
 
@@ -10,7 +10,7 @@ function defineView(config, context) {
   const indexName = 'by'+context.joinedOthersClassName
   const viewProperties = {}
   for (let i = 0; i < others.length; i++) {
-    viewProperties[otherPropertyNames[i]] = new PropertyDefinition({
+    viewProperties[otherPropertyNames[i][0].toLowerCase() + otherPropertyNames[i].slice(1) ] = new PropertyDefinition({
       type: others[i],
       validation: ['nonEmpty']
     })
@@ -34,7 +34,7 @@ function defineView(config, context) {
     accessControl: config.readAccessControl || config.writeAccessControl,
     daoPath(properties, { client, context }) {
       const idParts = extractIdParts(otherPropertyNames, properties)
-      const range = extractRange(properties)
+      const range = App.extractRange(properties)
       const path = modelRuntime().sortedIndexRangePath(indexName, idParts, range)
       return path
     }
@@ -47,7 +47,7 @@ function defineCreateAction(config, context) {
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Created'
-  const actionName = 'set' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const actionName = 'create' + joinedOthersClassName + context.reverseRelationWord + modelName
   const accessControl = config.createAccessControl || config.writeAccessControl
   prepareAccessControl(accessControl, otherPropertyNames, others)
   service.actions[actionName] = new ActionDefinition({

package/utils.js

@@ -52,18 +52,20 @@ function defineProperties(model, types, names) {
 }
 
 function defineIndex(model, what, props) {
+  console.log("DEFINE INDEX", model.name, what, props)
   model.indexes['by' + what] = new IndexDefinition({
     property: props
   })
 }
 function defineIndexes(model, props, types) {
+  console.log("DEFINE INDEXES", model.name, props, types)
   const propCombinations = allCombinations(Object.keys(props))
   for(const propCombination of propCombinations) {
     const upperCaseProps = propCombination.map(id => {
       const prop = props[id]
       return prop[0].toUpperCase() + prop.slice(1)
     })
-    defineIndex(model, upperCaseProps.join('And'), propCombination.map(id => types[id]))
+    defineIndex(model, upperCaseProps.join('And'), props[propCombination])
   }
 }
 
@@ -113,7 +115,7 @@ function processModelsAnnotation(service, app, annotation, multiple, cb) {
         const writeableProperties = modelProperties || config.writeableProperties
         //console.log("PPP", others)
         const otherPropertyNames = what.map(other => other.name ? other.name : other)
-        const joinedOthersPropertyName = otherPropertyNames[0] +
+        const joinedOthersPropertyName = (otherPropertyNames[0][0].toLowerCase() + otherPropertyNames[0].slice(1)) +
             (others.length > 1 ? ('And' + others.slice(1).join('And')) : '')
         const joinedOthersClassName = others.join('And')