@live-change/relations-plugin 0.1.9 → 0.1.10

package/index.js

@@ -1,8 +1,10 @@
 const propertyOf = require('./propertyOf.js')
+const itemOf = require('./itemOf.js')
 
 module.exports = function(app, services) {
 
   app.defaultProcessors.push(propertyOf)
+  app.defaultProcessors.push(itemOf)
 }
 
-module.exports.processors = [ propertyOf ]
+module.exports.processors = [ propertyOf, itemOf ]

package/itemOf.js

@@ -5,6 +5,7 @@ const {
   extractIdParts, extractRange, extractIdentifiers, extractObjectData, defineProperties, defineIndex,
   processModelsAnnotation
 } = require('./utils.js')
+const {generateId} = require("./utils");
 
 function defineView(config, context) {
   const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
@@ -40,17 +41,186 @@ function defineView(config, context) {
   })
 }
 
+async function defineCreatedEvent(config, context) {
+  const {
+    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName
+  } = context
+  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Created'
+  service.events[eventName] = new EventDefinition({
+    name: eventName,
+    execute(properties) {
+      const id = properties[modelPropertyName]
+      return modelRuntime().create({ ...properties.data, ...properties.identifiers, id })
+    }
+  })
+}
+
+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)
+}
+
+async function defineUpdatedEvent(config, context) {
+  const {
+    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName
+  } = context
+  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Updated'
+  service.events[eventName] = new EventDefinition({
+    name: eventName,
+    execute(properties) {
+      const id = properties[modelPropertyName]
+      return modelRuntime().update(id, { ...properties.data, ...properties.identifiers, id })
+    }
+  })
+}
+
+async 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)
+}
+
+async function defineDeletedEvent(config, context) {
+  const {
+    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName
+  } = context
+  const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Deleted'
+  service.events[eventName] = new EventDefinition({
+    name: eventName,
+    execute(properties) {
+      const id = properties[modelPropertyName]
+      return modelRuntime().delete(id)
+    }
+  })
+}
+
+async 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]
+  })
+}
+
 module.exports = function(service, app) {
-  processModelsAnnotation(service, app, 'propertyOf', (config, context) => {
+  processModelsAnnotation(service, app, 'itemOf', (config, context) => {
 
     defineProperties(context.model, context.others, context.otherPropertyNames)
     defineIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
 
+    if(config.sortBy) {
+      for(const sortFields of config.sortBy) {
+        defineSortIndex(context, sortFields)
+      }
+    }
+
     if(config.readAccess) {
       defineView(config, context)
     }
     /// TODO: multiple views with limited fields
 
+    defineCreatedEvent(config, context)
+    defineUpdatedEvent(config, context)
+    defineDeletedEvent(config, context)
+
     if(config.setAccess || config.writeAccess) {
       defineCreateAction(config, context)
     }
@@ -60,7 +230,7 @@ module.exports = function(service, app) {
     }
 
     if(config.resetAccess || config.writeAccess) {
-      defineReleteAction(config, context);
+      defineDeleteAction(config, context)
     }
   })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/relations-plugin",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "",
   "main": "index.js",
   "scripts": {

package/propertyOf.js

@@ -114,7 +114,8 @@ async function defineUpdateAction(config, context) {
     waitForEvents: true,
     async execute(properties, {client, service}, emit) {
       const identifiers = extractIdentifiers(otherPropertyNames, properties)
-      const entity = await modelRuntime().get(identifiers.id)
+      const id = generateId(otherPropertyNames, properties)
+      const entity = await modelRuntime().get(id)
       if (!entity) throw new Error('not_found')
       const data = extractObjectData(writeableProperties, properties, entity)
       await App.validation.validate(data, validators, { source: action, action, service, app, client })
@@ -144,19 +145,26 @@ async function defineResetEvent(config, context) {
 
 async function defineResetAction(config, context) {
   const {
-    service, modelRuntime,
-    otherPropertyNames, joinedOthersPropertyName, modelName,  joinedOthersClassName
+    service, modelRuntime, modelPropertyName,
+    otherPropertyNames, joinedOthersPropertyName, modelName,  joinedOthersClassName, model
   } = context
   const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Reset'
   const actionName = 'reset' + joinedOthersClassName + 'Owned' + modelName
   service.actions[actionName] = new ActionDefinition({
     name: actionName,
+    properties: {
+      [modelPropertyName]: {
+        type: model,
+        validation: ['nonEmpty']
+      }
+    },
     access: config.resetAccess || config.writeAccess,
     queuedBy: otherPropertyNames,
     waitForEvents: true,
     async execute(properties, {client, service}, emit) {
       const identifiers = extractIdentifiers(otherPropertyNames, properties)
-      const entity = await modelRuntime().get(identifiers.id)
+      const id = generateId(otherPropertyNames, properties)
+      const entity = await modelRuntime().get(id)
       if (!entity) throw new Error('not_found')
       emit({
         type: eventName,
@@ -174,7 +182,6 @@ module.exports = function(service, app) {
     defineProperties(context.model, context.others, context.otherPropertyNames)
     defineIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
     
-    
     if(config.readAccess) {
       defineView(config, context)
     }