@live-change/relations-plugin 0.5.20 → 0.5.21

package/index.js

@@ -14,4 +14,4 @@ module.exports = function(app, services) {
 
 }
 
-module.exports.processors = [ propertyOf, itemOf ]
+module.exports.processors = [ propertyOf, itemOf, propertyOfAny, itemOfAny ]

package/itemOf.js

@@ -6,6 +6,8 @@ const {
   processModelsAnnotation
 } = require('./utils.js')
 
+const pluralize = require('pluralize')
+
 function defineView(config, context) {
   const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
     modelName, others, model } = context
@@ -17,7 +19,7 @@ function defineView(config, context) {
       validation: ['nonEmpty']
     })
   }
-  const viewName = joinedOthersPropertyName + 'Owned' + modelName + 's'
+  const viewName = joinedOthersPropertyName + 'Owned' + pluralize(modelName)
   service.views[viewName] = new ViewDefinition({
     name: viewName,
     properties: {
@@ -184,7 +186,7 @@ module.exports = function(service, app) {
     defineTransferredEvent(config, context)
     defineDeletedEvent(config, context)
 
-    if(config.setAccess || config.writeAccess) {
+    if(config.createAccess || config.writeAccess) {
       defineCreateAction(config, context)
     }
 

package/itemOfAny.js

@@ -10,6 +10,8 @@ const {
   processModelsAnyAnnotation
 } = require('./utilsAny.js')
 
+const pluralize = require('pluralize')
+
 function defineView(config, context) {
   const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
     modelName, others, model } = context
@@ -25,7 +27,7 @@ function defineView(config, context) {
       validation: ['nonEmpty']
     })
   }
-  const viewName = joinedOthersPropertyName + 'Owned' + modelName + 's'
+  const viewName = joinedOthersPropertyName + 'Owned' + pluralize(modelName)
   service.views[viewName] = new ViewDefinition({
     name: viewName,
     properties: {
@@ -172,6 +174,7 @@ function defineSortIndex(context, sortFields) {
 
 module.exports = function(service, app) {
   processModelsAnyAnnotation(service, app, 'itemOfAny', (config, context) => {
+    console.log("ITEM OF ANY", config)
 
     defineAnyProperties(context.model, context.otherPropertyNames)
     defineAnyIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
@@ -192,7 +195,7 @@ module.exports = function(service, app) {
     defineTransferredEvent(config, context)
     defineDeletedEvent(config, context)
 
-    if(config.setAccess || config.writeAccess) {
+    if(config.createAccess || config.writeAccess) {
       defineCreateAction(config, context)
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/relations-plugin",
-  "version": "0.5.20",
+  "version": "0.5.21",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,7 +21,8 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "^0.5.20"
+    "@live-change/framework": "^0.5.21",
+    "pluralize": "8.0.0"
   },
-  "gitHead": "d37be156c4f76af3ead4ad0aae3f80281191bf57"
+  "gitHead": "00708b95082fc8c701e5ca32b9063c88a2c02a34"
 }

package/propertyOfAny.js

@@ -52,6 +52,7 @@ function defineSetAction(config, context) {
     service, app, model,  defaults,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
+
   const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Set'
   const actionName = 'set' + joinedOthersClassName + 'Owned' + modelName
   service.actions[actionName] = new ActionDefinition({
@@ -144,7 +145,7 @@ function defineResetAction(config, context) {
 
 
 module.exports = function(service, app) {
-  processModelsAnyAnnotation(service, app, 'propertyOf', (config, context) => {
+  processModelsAnyAnnotation(service, app, 'propertyOfAny', (config, context) => {
 
     defineAnyProperties(context.model, context.otherPropertyNames)
     defineAnyIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)

package/utilsAny.js

@@ -27,7 +27,7 @@ function generateAnyId(otherPropertyNames, properties) {
 }
 
 function defineAnyProperties(model, names) {
-  for (let i = 0; i < types.length; i++) {
+  for (let i = 0; i < names.length; i++) {
     model.properties[names[i]] = new PropertyDefinition({
       type: String,
       validation: ['nonEmpty']
@@ -70,15 +70,15 @@ function processModelsAnyAnnotation(service, app, annotation, cb) {
       if (!model.indexes) model.indexes = {}
 
       let config = model[annotation] // only single ownership is possible, but may be owned by objects set
-      if (typeof config == 'string' || Array.isArray(config)) config = {what: config}
+      if (typeof config == 'string' || Array.isArray(config)) config = { what: config }
 
       console.log("MODEL " + modelName + " IS "+ annotation +" " + config.what)
 
-      const otherPropertyNames = (Array.isArray(config.to) ? config.to : [config.to ?? 'owner'])
+      const otherPropertyNames = (Array.isArray(config.to) ? config.to : [ config.to ?? 'owner' ])
           .map(other => other.name ? other.name : other)
 
       const writeableProperties = modelProperties || config.writeableProperties
-      const others = otherPropertyNames.map(other => other.slice(0, 1).toLowerCase() + other.slice(1))
+      const others = otherPropertyNames.map(other => other.slice(0, 1).toUpperCase() + other.slice(1))
       const joinedOthersPropertyName = otherPropertyNames[0] +
           (others.length > 1 ? ('And' + others.slice(1).join('And')) : '')
       const joinedOthersClassName = others.join('And')