@live-change/relations-plugin 0.5.19 → 0.5.22

package/boundTo.js

@@ -0,0 +1,45 @@
+const {
+  defineProperties, defineIndex,
+  processModelsAnnotation, generateId
+} = require('./utils.js')
+
+const { defineSetEvent, defineUpdatedEvent, defineTransferredEvent, defineResetEvent } = require('./propertyEvents.js')
+
+const { defineView, defineSetAction, defineUpdateAction, defineResetAction } = require('./singularRelationUtils.js')
+
+module.exports = function(service, app) {
+  processModelsAnnotation(service, app, 'boundTo', false, (config, context) => {
+
+    context.relationWord = 'Friend'
+    context.reverseRelationWord = 'Bound'
+
+    defineProperties(context.model, context.others, context.otherPropertyNames)
+    defineIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
+
+    if(config.readAccess) {
+      defineView({ ...config, access: config.readAccess }, context)
+    }
+    if(config.views) {
+      for(const view of config.views) {
+        defineView({ ...config, ...view }, context)
+      }
+    }
+
+    defineSetEvent(config, context, generateId)
+    defineUpdatedEvent(config, context, generateId)
+    defineTransferredEvent(config, context, generateId)
+    defineResetEvent(config, context, generateId)
+
+    if(config.setAccess || config.writeAccess) {
+      defineSetAction(config, context)
+    }
+
+    if(config.updateAccess || config.writeAccess) {
+      defineUpdateAction(config, context)
+    }
+
+    if(config.resetAccess || config.writeAccess) {
+      defineResetAction(config, context);
+    }
+  })
+}

package/boundToAny.js

@@ -0,0 +1,46 @@
+const {
+  defineAnyProperties, defineAnyIndex,
+  processModelsAnyAnnotation, generateAnyId
+} = require('./utilsAny.js')
+
+const { defineSetEvent, defineUpdatedEvent, defineTransferredEvent, defineResetEvent } = require('./propertyEvents.js')
+
+const  { defineView, defineSetAction, defineUpdateAction, defineResetAction } = require('./singularRelationUtils.js')
+
+module.exports = function(service, app) {
+  processModelsAnyAnnotation(service, app, 'boundToAny', false, (config, context) => {
+
+    context.relationWord = 'Friend'
+    context.reverseRelationWord = 'Bound'
+
+    defineAnyProperties(context.model, context.otherPropertyNames)
+    defineAnyIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
+
+    if(config.readAccess) {
+      defineView({ ...config, access: config.readAccess }, context)
+    }
+    if(config.views) {
+      for(const view of config.views) {
+        defineView({ ...config, ...view }, context)
+      }
+    }
+
+    defineSetEvent(config, context, generateAnyId)
+    defineUpdatedEvent(config, context, generateAnyId)
+    defineTransferredEvent(config, context, generateAnyId)
+    defineResetEvent(config, context, generateAnyId)
+
+    if(config.setAccess || config.writeAccess) {
+      defineSetAction(config, context)
+    }
+
+    if(config.updateAccess || config.writeAccess) {
+      defineUpdateAction(config, context)
+    }
+
+    if(config.resetAccess || config.writeAccess) {
+      defineResetAction(config, context);
+    }
+
+  })
+}

package/index.js

@@ -4,14 +4,23 @@ const itemOf = require('./itemOf.js')
 const propertyOfAny = require('./propertyOfAny.js')
 const itemOfAny = require('./itemOfAny.js')
 
-module.exports = function(app, services) {
+const relatedTo = require('./relatedTo.js')
+const relatedToAny = require('./relatedToAny.js')
 
-  app.defaultProcessors.push(propertyOf)
-  app.defaultProcessors.push(itemOf)
+const boundTo = require('./boundTo.js')
+const boundToAny = require('./boundToAny.js')
 
-  app.defaultProcessors.push(propertyOfAny)
-  app.defaultProcessors.push(itemOfAny)
+const processors = [
+  propertyOf, itemOf,
+  propertyOfAny, itemOfAny,
+  relatedTo, relatedToAny,
+  boundTo, boundToAny
+]
 
+module.exports = function(app, services) {
+  app.defaultProcessors.push(...processors)
 }
 
-module.exports.processors = [ propertyOf, itemOf ]
+module.exports.processors = [
+    ...processors
+]

package/itemOf.js

@@ -1,169 +1,21 @@
-const App = require("@live-change/framework")
-const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition } = App
-
 const {
-  extractIdParts, extractRange, extractIdentifiers, extractObjectData, defineProperties, defineIndex,
+  defineProperties, defineIndex,
   processModelsAnnotation
 } = require('./utils.js')
 
-function defineView(config, context) {
-  const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
-    modelName, others, model } = context
-  const indexName = 'by'+context.joinedOthersClassName
-  const viewProperties = {}
-  for (let i = 0; i < others.length; i++) {
-    viewProperties[otherPropertyNames[i]] = new PropertyDefinition({
-      type: others[i],
-      validation: ['nonEmpty']
-    })
-  }
-  const viewName = joinedOthersPropertyName + 'Owned' + modelName + 's'
-  service.views[viewName] = new ViewDefinition({
-    name: viewName,
-    properties: {
-      ...viewProperties,
-      ...App.utils.rangeProperties
-    },
-    returns: {
-      type: Array,
-      of: {
-        type: model
-      }
-    },
-    access: config.readAccess,
-    daoPath(properties, { client, context }) {
-      const idParts = extractIdParts(otherPropertyNames, properties)
-      const range = extractRange(properties)
-      const path = modelRuntime().sortedIndexRangePath(indexName, idParts, range)
-      return path
-    }
-  })
-}
-
 const {
   defineCreatedEvent, defineUpdatedEvent, defineDeletedEvent, defineTransferredEvent,
 } = require('./itemEvents.js')
-const {defineTransferEvent} = require("./itemEvents");
 
-function defineCreateAction(config, context) {
-  const {
-    service, app, model,  defaults, modelPropertyName, modelRuntime,
-    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
-  } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Created'
-  const actionName = 'set' + joinedOthersClassName + 'Owned' + modelName
-  service.actions[actionName] = new ActionDefinition({
-    name: actionName,
-    properties: {
-      ...(model.properties)
-    },
-    access: config.createAccess || config.writeAccess,
-    skipValidation: true,
-    //queuedBy: otherPropertyNames,
-    waitForEvents: true,
-    async execute(properties, { client, service }, emit) {
-      const id = properties[modelPropertyName] || app.generateUid()
-      const entity = await modelRuntime().get(id)
-      if(entity) throw 'exists'
-      const identifiers = extractIdentifiers(otherPropertyNames, properties)
-      const data = extractObjectData(writeableProperties, properties, defaults)
-      await App.validation.validate(data, validators, { source: action, action, service, app, client })
-      emit({
-        type: eventName,
-        [modelPropertyName]: id,
-        identifiers, data
-      })
-    }
-  })
-  const action = service.actions[actionName]
-  const validators = App.validation.getValidators(action, service, action)
-}
-
-function defineUpdateAction(config, context) {
-  const {
-    service, app, model, modelRuntime, modelPropertyName,
-    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
-  } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Updated'
-  const actionName = 'update' + joinedOthersClassName + 'Owned' + modelName
-  service.actions[actionName] = new ActionDefinition({
-    name: actionName,
-    properties: {
-      ...(model.properties)
-    },
-    access: config.updateAccess || config.writeAccess,
-    skipValidation: true,
-    //queuedBy: otherPropertyNames,
-    waitForEvents: true,
-    async execute(properties, {client, service}, emit) {
-      const id = properties[modelPropertyName]
-      const entity = await modelRuntime().get(id)
-      if(!entity) throw 'not_found'
-      const entityIdParts = extractIdParts(otherPropertyNames, entity)
-      const idParts = extractIdParts(otherPropertyNames, properties)
-      if(JSON.stringify(entityIdParts) != JSON.stringify(idParts)) {
-        throw 'not_authorized'
-      }
-      const identifiers = extractIdentifiers(otherPropertyNames, properties)
-      const data = extractObjectData(writeableProperties, properties, entity)
-      await App.validation.validate(data, validators, { source: action, action, service, app, client })
-      emit({
-        type: eventName,
-        [modelPropertyName]: id,
-        identifiers,
-        data
-      })
-    }
-  })
-  const action = service.actions[actionName]
-  const validators = App.validation.getValidators(action, service, action)
-}
-
-function defineDeleteAction(config, context) {
-  const {
-    service, app, model, modelRuntime, modelPropertyName,
-    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
-  } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Deleted'
-  const actionName = 'delete' + joinedOthersClassName + 'Owned' + modelName
-  service.actions[actionName] = new ActionDefinition({
-    name: actionName,
-    properties: {
-      ...(model.properties)
-    },
-    access: config.deleteAccess || config.writeAccess,
-    skipValidation: true,
-    //queuedBy: otherPropertyNames,
-    waitForEvents: true,
-    async execute(properties, {client, service}, emit) {
-      const id = properties[modelPropertyName]
-      const entity = await modelRuntime().get(id)
-      if(!entity) throw new Error('not_found')
-      const entityIdParts = extractIdParts(otherPropertyNames, entity)
-      const idParts = extractIdParts(otherPropertyNames, properties)
-      if(JSON.stringify(entityIdParts) != JSON.stringify(idParts)) {
-        throw new Error('not_authorized')
-      }
-      emit({
-        type: eventName,
-        [modelPropertyName]: id
-      })
-    }
-  })
-}
-
-function defineSortIndex(context, sortFields) {
-  if(!Array.isArray(sortFields)) sortFields = [sortFields]
-  console.log("DEFINE SORT INDEX", sortFields)
-  const sortFieldsUc = sortFields.map(fd=>fd.slice(0, 1).toUpperCase() + fd.slice(1))
-  const indexName = 'by' + context.joinedOthersClassName + sortFieldsUc.join('')
-  context.model.indexes[indexName] = new IndexDefinition({
-    property: [...context.otherPropertyNames, ...sortFields]
-  })
-}
+const {
+  defineView, defineCreateAction, defineUpdateAction, defineDeleteAction, defineSortIndex
+} = require('./pluralRelationUtils.js')
 
 module.exports = function(service, app) {
-  processModelsAnnotation(service, app, 'itemOf', (config, context) => {
+  processModelsAnnotation(service, app, 'itemOf', false, (config, context) => {
+
+    context.relationWord = 'Item'
+    context.reverseRelationWord = 'Owned'
 
     defineProperties(context.model, context.others, context.otherPropertyNames)
     defineIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
@@ -184,7 +36,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

@@ -1,177 +1,21 @@
-const App = require("@live-change/framework")
-const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition } = App
-
-const {
-  extractRange, extractObjectData
-} = require('./utils.js')
-
 const {
-  extractTypeAndIdParts, extractIdentifiersWithTypes, defineAnyProperties, defineAnyIndex,
+  defineAnyProperties, defineAnyIndex,
   processModelsAnyAnnotation
 } = require('./utilsAny.js')
 
-function defineView(config, context) {
-  const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
-    modelName, others, model } = context
-  const indexName = 'by'+context.joinedOthersClassName
-  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 viewName = joinedOthersPropertyName + 'Owned' + modelName + 's'
-  service.views[viewName] = new ViewDefinition({
-    name: viewName,
-    properties: {
-      ...viewProperties,
-      ...App.utils.rangeProperties
-    },
-    returns: {
-      type: Array,
-      of: {
-        type: model
-      }
-    },
-    access: config.readAccess,
-    daoPath(properties, { client, context }) {
-      const typeAndIdParts = extractTypeAndIdParts(otherPropertyNames, properties)
-      const range = extractRange(properties)
-      const path = modelRuntime().sortedIndexRangePath(indexName, typeAndIdParts, range)
-      return path
-    }
-  })
-}
-
 const {
   defineCreatedEvent, defineUpdatedEvent, defineDeletedEvent, defineTransferredEvent,
 } = require('./itemEvents.js')
-const {defineTransferEvent} = require("./itemEvents");
 
-function defineCreateAction(config, context) {
-  const {
-    service, app, model,  defaults, modelPropertyName, modelRuntime,
-    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
-  } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Created'
-  const actionName = 'set' + joinedOthersClassName + 'Owned' + modelName
-  service.actions[actionName] = new ActionDefinition({
-    name: actionName,
-    properties: {
-      ...(model.properties)
-    },
-    access: config.createAccess || config.writeAccess,
-    skipValidation: true,
-    //queuedBy: otherPropertyNames,
-    waitForEvents: true,
-    async execute(properties, { client, service }, emit) {
-      const id = properties[modelPropertyName] || app.generateUid()
-      const entity = await modelRuntime().get(id)
-      if(entity) throw 'exists'
-      const identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
-      const data = extractObjectData(writeableProperties, properties, defaults)
-      await App.validation.validate(data, validators, { source: action, action, service, app, client })
-      emit({
-        type: eventName,
-        [modelPropertyName]: id,
-        identifiers, data
-      })
-    }
-  })
-  const action = service.actions[actionName]
-  const validators = App.validation.getValidators(action, service, action)
-}
-
-function defineUpdateAction(config, context) {
-  const {
-    service, app, model, modelRuntime, modelPropertyName,
-    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
-  } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Updated'
-  const actionName = 'update' + joinedOthersClassName + 'Owned' + modelName
-  service.actions[actionName] = new ActionDefinition({
-    name: actionName,
-    properties: {
-      ...(model.properties)
-    },
-    access: config.updateAccess || config.writeAccess,
-    skipValidation: true,
-    //queuedBy: otherPropertyNames,
-    waitForEvents: true,
-    async execute(properties, { client, service }, emit) {
-      const id = properties[modelPropertyName]
-      const entity = await modelRuntime().get(id)
-      if(!entity) throw 'not_found'
-      const entityTypeAndIdParts = extractTypeAndIdParts(otherPropertyNames, entity)
-      const typeAndIdParts = extractTypeAndIdParts(otherPropertyNames, properties)
-      if(JSON.stringify(entityTypeAndIdParts) != JSON.stringify(typeAndIdParts)) {
-        throw 'not_authorized'
-      }
-      const identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
-      const data = extractObjectData(writeableProperties, properties, entity)
-      await App.validation.validate(data, validators, { source: action, action, service, app, client })
-      emit({
-        type: eventName,
-        [modelPropertyName]: id,
-        identifiers,
-        data
-      })
-    }
-  })
-  const action = service.actions[actionName]
-  const validators = App.validation.getValidators(action, service, action)
-}
-
-function defineDeleteAction(config, context) {
-  const {
-    service, app, model, modelRuntime, modelPropertyName,
-    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
-  } = context
-  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Deleted'
-  const actionName = 'delete' + joinedOthersClassName + 'Owned' + modelName
-  service.actions[actionName] = new ActionDefinition({
-    name: actionName,
-    properties: {
-      ...(model.properties)
-    },
-    access: config.deleteAccess || config.writeAccess,
-    skipValidation: true,
-    //queuedBy: otherPropertyNames,
-    waitForEvents: true,
-    async execute(properties, { client, service }, emit) {
-      const id = properties[modelPropertyName]
-      const entity = await modelRuntime().get(id)
-      if(!entity) throw new Error('not_found')
-      const entityTypeAndIdParts = extractTypeAndIdParts(otherPropertyNames, entity)
-      const typeAndIdParts = extractTypeAndIdParts(otherPropertyNames, properties)
-      if(JSON.stringify(entityTypeAndIdParts) != JSON.stringify(typeAndIdParts)) {
-        throw new Error('not_authorized')
-      }
-      emit({
-        type: eventName,
-        [modelPropertyName]: id
-      })
-    }
-  })
-}
-
-function defineSortIndex(context, sortFields) {
-  if(!Array.isArray(sortFields)) sortFields = [sortFields]
-  console.log("DEFINE SORT INDEX", sortFields)
-  const sortFieldsUc = sortFields.map(fd => fd.slice(0, 1).toUpperCase() + fd.slice(1))
-  const indexName = 'by' + context.joinedOthersClassName + sortFieldsUc.join('')
-  context.model.indexes[indexName] = new IndexDefinition({
-    property: [...(context.otherPropertyNames.map(prop => [prop + 'Type', prop])), ...sortFields]
-  })
-}
+const {
+  defineView, defineCreateAction, defineUpdateAction, defineDeleteAction, defineSortIndex
+} = require('./pluralRelationUtils.js')
 
 module.exports = function(service, app) {
-  processModelsAnyAnnotation(service, app, 'itemOfAny', (config, context) => {
+  processModelsAnyAnnotation(service, app, 'itemOfAny',false, (config, context) => {
+
+    context.relationWord = 'Item'
+    context.reverseRelationWord = 'Owned'
 
     defineAnyProperties(context.model, context.otherPropertyNames)
     defineAnyIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
@@ -192,7 +36,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.19",
+  "version": "0.5.22",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -8,20 +8,21 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/live-change/relations-plugin.git"
+    "url": "git+https://github.com/live-change/live-change-framework.git"
   },
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/live-change/relations-plugin/issues"
+    "url": "https://github.com/live-change/live-change-framework/issues"
   },
-  "homepage": "https://github.com/live-change/relations-plugin",
+  "homepage": "https://github.com/live-change/live-change-framework",
   "author": {
     "email": "michal@laszczewski.pl",
     "name": "Michał Łaszczewski",
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "^0.5.19"
+    "@live-change/framework": "^0.5.21",
+    "pluralize": "8.0.0"
   },
-  "gitHead": "2c25ed68487762fe4ca36208b708ac7aa7506852"
+  "gitHead": "1f71e9b116b669699994424c4cf38dd17b5109a8"
 }