@live-change/relations-plugin 0.6.14 → 0.7.0

package/entity.js

@@ -170,6 +170,18 @@ function defineDeleteAction(config, context) {
       const id = properties[modelPropertyName]
       const entity = await modelRuntime().get(id)
       if(!entity) throw new Error('not_found')
+      await Promise.all([
+        service.trigger({
+          type: 'delete'+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
+          objectType: service.name+'_'+modelName,
+          object: id
+        }),
+        service.trigger({
+          type: 'deleteObject',
+          objectType: service.name+'_'+modelName,
+          object: id
+        })
+      ])
       emit({
         type: eventName,
         [modelPropertyName]: id

package/itemOf.js

@@ -1,6 +1,7 @@
 const {
-  defineProperties, defineIndex,
-  processModelsAnnotation, addAccessControlParents
+  defineProperties, defineIndexes,
+  processModelsAnnotation, addAccessControlParents,
+  defineDeleteByOwnerEvents, defineParentDeleteTriggers
 } = require('./utils.js')
 
 const {
@@ -19,7 +20,7 @@ module.exports = function(service, app) {
 
     context.identifiers = defineProperties(context.model, context.others, context.otherPropertyNames)
     addAccessControlParents(context)
-    defineIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
+    defineIndexes(context.model, context.otherPropertyNames, context.others)
 
     if(config.sortBy) {
       for(const sortFields of config.sortBy) {
@@ -36,6 +37,7 @@ module.exports = function(service, app) {
     defineUpdatedEvent(config, context)
     defineTransferredEvent(config, context)
     defineDeletedEvent(config, context)
+    defineDeleteByOwnerEvents(config, context)
 
     if(config.createAccess || config.writeAccess || config.createAccessControl || config.writeAccessControl) {
       defineCreateAction(config, context)
@@ -48,5 +50,7 @@ module.exports = function(service, app) {
     if(config.deleteAccess || config.writeAccess || config.deleteAccessControl || config.writeAccessControl) {
       defineDeleteAction(config, context)
     }
+
+    if(!config.customDeleteTrigger) defineParentDeleteTriggers(config, context)
   })
 }

package/itemOfAny.js

@@ -1,6 +1,7 @@
 const {
   defineAnyProperties, defineAnyIndexes,
-  processModelsAnyAnnotation, addAccessControlAnyParents
+  processModelsAnyAnnotation, addAccessControlAnyParents, generateAnyId, defineDeleteByOwnerEvents,
+  defineParentDeleteTrigger
 } = require('./utilsAny.js')
 
 const {
@@ -37,6 +38,7 @@ module.exports = function(service, app) {
     defineUpdatedEvent(config, context)
     defineTransferredEvent(config, context)
     defineDeletedEvent(config, context)
+    defineDeleteByOwnerEvents(config, context, generateAnyId)
 
     if(config.createAccess || config.writeAccess || config.createAccessControl || config.writeAccessControl) {
       defineCreateAction(config, context)
@@ -49,5 +51,7 @@ module.exports = function(service, app) {
     if(config.deleteAccess || config.writeAccess || config.deleteAccessControl || config.writeAccessControl) {
       defineDeleteAction(config, context)
     }
+
+    if(!config.customDeleteTrigger) defineParentDeleteTrigger(config, context)
   })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/relations-plugin",
-  "version": "0.6.14",
+  "version": "0.7.0",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,8 +21,8 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "^0.6.14",
+    "@live-change/framework": "^0.7.0",
     "pluralize": "8.0.0"
   },
-  "gitHead": "44cec669125b2af3f0b9318cb70c5cf4647c28c6"
+  "gitHead": "008e06c10d65b00478c103d625c621805837264b"
 }

package/pluralRelationAnyUtils.js

@@ -166,6 +166,18 @@ function defineDeleteAction(config, context) {
       if(JSON.stringify(entityTypeAndIdParts) != JSON.stringify(typeAndIdParts)) {
         throw new Error('not_authorized')
       }
+      await Promise.all([
+        service.trigger({
+          type: 'delete'+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
+          objectType: service.name+'_'+modelName,
+          object: id
+        }),
+        service.trigger({
+          type: 'deleteObject',
+          objectType: service.name+'_'+modelName,
+          object: id
+        })
+      ])
       emit({
         type: eventName,
         [modelPropertyName]: id

package/pluralRelationUtils.js

@@ -151,6 +151,18 @@ function defineDeleteAction(config, context) {
       if(JSON.stringify(entityIdParts) != JSON.stringify(idParts)) {
         throw new Error('not_authorized')
       }
+      await Promise.all([
+        service.trigger({
+          type: 'delete'+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
+          objectType: service.name+'_'+modelName,
+          object: id
+        }),
+        service.trigger({
+          type: 'deleteObject',
+          objectType: service.name+'_'+modelName,
+          object: id
+        })
+      ])
       emit({
         type: eventName,
         [modelPropertyName]: id

package/propertyOf.js

@@ -1,6 +1,7 @@
 const {
-  defineProperties, defineIndex,
-  processModelsAnnotation, generateId, addAccessControlParents
+  defineProperties, defineIndexes,
+  processModelsAnnotation, generateId, addAccessControlParents,
+  defineDeleteByOwnerEvents, defineParentDeleteTriggers
 } = require('./utils.js')
 
 const { defineSetEvent, defineUpdatedEvent, defineTransferredEvent, defineResetEvent } = require('./propertyEvents.js')
@@ -17,7 +18,7 @@ module.exports = function(service, app) {
 
     context.identifiers = defineProperties(context.model, context.others, context.otherPropertyNames)
     addAccessControlParents(context)
-    defineIndex(context.model, context.joinedOthersClassName, context.otherPropertyNames)
+    defineIndexes(context.model, context.otherPropertyNames, context.others)
 
     if(config.readAccess || config.writeAccess || config.readAccessControl || config.writeAccessControl) {
       defineView({ ...config }, context)
@@ -32,6 +33,7 @@ module.exports = function(service, app) {
     defineUpdatedEvent(config, context, generateId)
     defineTransferredEvent(config, context, generateId)
     defineResetEvent(config, context, generateId)
+    defineDeleteByOwnerEvents(config, context)
 
     if(config.setAccess || config.writeAccess || config.setAccessControl || config.writeAccessControl) {
       defineSetAction(config, context)
@@ -49,5 +51,7 @@ module.exports = function(service, app) {
     if(config.resetAccess || config.writeAccess || config.resetAccessControl || config.writeAccessControl) {
       defineResetAction(config, context);
     }
+
+    if(!config.customDeleteTrigger) defineParentDeleteTriggers(config, context)
   })
 }

package/propertyOfAny.js

@@ -1,6 +1,7 @@
 const {
   defineAnyProperties, defineAnyIndexes,
-  processModelsAnyAnnotation, generateAnyId, addAccessControlAnyParents
+  processModelsAnyAnnotation, generateAnyId, addAccessControlAnyParents,
+  defineDeleteByOwnerEvents, defineParentDeleteTrigger
 } = require('./utilsAny.js')
 
 const {
@@ -10,6 +11,7 @@ const {
 const {
   defineObjectView, defineRangeViews, defineSetAction, defineUpdateAction, defineSetOrUpdateAction, defineResetAction
 } = require('./singularRelationAnyUtils.js')
+const {defineResetByOwner} = require("./propertyEvents");
 
 module.exports = function(service, app) {
   processModelsAnyAnnotation(service, app, 'propertyOfAny', false, (config, context) => {
@@ -38,6 +40,7 @@ module.exports = function(service, app) {
     defineUpdatedEvent(config, context, generateAnyId)
     defineTransferredEvent(config, context, generateAnyId)
     defineResetEvent(config, context, generateAnyId)
+    defineDeleteByOwnerEvents(config, context, generateAnyId)
 
     if(config.setAccess || config.writeAccess || config.setAccessControl || config.writeAccessControl) {
       defineSetAction(config, context)
@@ -56,5 +59,7 @@ module.exports = function(service, app) {
       defineResetAction(config, context);
     }
 
+    if(!config.customDeleteTrigger) defineParentDeleteTrigger(config, context)
+
   })
 }

package/singularRelationAnyUtils.js

@@ -225,6 +225,18 @@ function defineResetAction(config, context) {
       const id = generateAnyId(otherPropertyNames, properties)
       const entity = await modelRuntime().get(id)
       if (!entity) throw new Error('not_found')
+      await Promise.all([
+        service.trigger({
+          type: 'delete'+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
+          objectType: service.name+'_'+modelName,
+          object: id
+        }),
+        service.trigger({
+          type: 'deleteObject',
+          objectType: service.name+'_'+modelName,
+          object: id
+        })
+      ])
       emit({
         type: eventName,
         identifiers

package/singularRelationUtils.js

@@ -170,6 +170,18 @@ function defineResetAction(config, context) {
       const id = generateId(otherPropertyNames, properties)
       const entity = await modelRuntime().get(id)
       if (!entity) throw new Error('not_found')
+      await Promise.all([
+        service.trigger({
+          type: 'delete'+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
+          objectType: service.name+'_'+modelName,
+          object: id
+        }),
+        service.trigger({
+          type: 'deleteObject',
+          objectType: service.name+'_'+modelName,
+          object: id
+        })
+      ])
       emit({
         type: eventName,
         identifiers

package/utils.js

@@ -1,5 +1,9 @@
 const App = require("@live-change/framework")
-const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition } = App
+const app = App.app()
+const { allCombinations } = require("./combinations.js");
+const {
+  PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition, TriggerDefinition
+} = App
 
 function extractIdParts(otherPropertyNames, properties) {
   const idParts = []
@@ -52,6 +56,16 @@ function defineIndex(model, what, props) {
     property: props
   })
 }
+function defineIndexes(model, 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]))
+  }
+}
 
 function processModelsAnnotation(service, app, annotation, multiple, cb) {
   if (!service) throw new Error("no service")
@@ -93,12 +107,12 @@ function processModelsAnnotation(service, app, annotation, multiple, cb) {
 
         console.log("MODEL " + modelName + " IS " + annotation + " " + config.what)
 
-        const others = (Array.isArray(config.what) ? config.what : [config.what])
-            .map(other => other.name ? other.name : other)
+        const what = (Array.isArray(config.what) ? config.what : [config.what])
+        const others = what.map(other => other.getTypeName ? other.getTypeName() : (other.name ? other.name : other))
 
         const writeableProperties = modelProperties || config.writeableProperties
         //console.log("PPP", others)
-        const otherPropertyNames = others.map(other => other.slice(0, 1).toLowerCase() + other.slice(1))
+        const otherPropertyNames = what.map(other => other.name ? other.name : other)
         const joinedOthersPropertyName = otherPropertyNames[0] +
             (others.length > 1 ? ('And' + others.slice(1).join('And')) : '')
         const joinedOthersClassName = others.join('And')
@@ -142,7 +156,96 @@ function prepareAccessControl(accessControl, names, types) {
   }
 }
 
+function defineDeleteByOwnerEvents(config, context, generateId) {
+  const {
+    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName, otherPropertyNames, reverseRelationWord
+  } = context
+  for(const propertyName of otherPropertyNames) {
+    const eventName = propertyName + reverseRelationWord + modelName + 'DeleteByOwner'
+    service.events[eventName] = new EventDefinition({
+      name: eventName,
+      async execute({owner}) {
+        const runtime = modelRuntime()
+        const tableName = runtime.tableName
+        const prefix = JSON.stringify(owner)
+        const indexName = tableName + '_by' + propertyName[0].toUpperCase() + propertyName.slice(1)
+        const bucketSize = 128
+        let bucket
+        do {
+          bucket = await app.dao.get(['database', 'indexRange', app.databaseName, indexName, {
+            gte: prefix + ':',
+            lte: prefix + '_\xFF\xFF\xFF\xFF',
+            limit: bucketSize
+          }])
+          const deletePromises = bucket.map(({to}) => runtime.delete(to))
+          await Promise.all(deletePromises)
+        } while (bucket.length == bucketSize)
+      }
+    })
+  }
+}
+
+function defineParentDeleteTriggers(config, context) {
+  const {
+    service, modelRuntime, modelPropertyName, identifiers, others,
+    otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model,
+    reverseRelationWord
+  } = context
+  for(const index in others) {
+    const otherType = others[index]
+    const propertyName = otherPropertyNames[index]
+    const triggerName = 'delete' + otherType[0].toUpperCase() + otherType.slice(1)
+    if(!service.triggers[triggerName]) service.triggers[triggerName] = []
+    service.triggers[triggerName].push(new TriggerDefinition({
+      name: triggerName,
+      properties: {
+        object: {
+          type: String
+        }
+      },
+      async execute({ object }, {client, service}, emit) {
+        const tableName = modelRuntime().tableName
+        const prefix = JSON.stringify(object)
+        const indexName = tableName + 'by' + propertyName[0].toUpperCase() + propertyName.slice(1)
+        const bucketSize = 32
+        let found = false
+        let bucket
+        do {
+          bucket = await app.dao.get(['database', 'indexRange', app.databaseName, indexName, {
+            gte: prefix + ':',
+            lte: prefix + '_\xFF\xFF\xFF\xFF',
+            limit: bucketSize
+          }])
+          if(bucket.length > 0) found = true
+          const deleteTriggerPromises = bucket.map(({to}) => [
+            service.trigger({
+              type: 'delete'+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
+              objectType: service.name+'_'+modelName,
+              object: to
+            }),
+            service.trigger({
+              type: 'deleteObject',
+              objectType: service.name+'_'+modelName,
+              object: to
+            })
+          ]).flat()
+          await Promise.all(deleteTriggerPromises)
+        } while (bucket.length == bucketSize)
+        if(found) {
+          const eventName = propertyName + reverseRelationWord + modelName + 'DeleteByOwner'
+          emit({
+            type: eventName,
+            owner: object
+          })
+        }
+        await Promise.all(promises)
+      }
+    }))
+  }
+}
+
 module.exports = {
-  extractIdParts, extractIdentifiers, extractObjectData, defineProperties, defineIndex,
-  processModelsAnnotation, generateId, addAccessControlParents, prepareAccessControl
+  extractIdParts, extractIdentifiers, extractObjectData, defineProperties, defineIndex, defineIndexes,
+  processModelsAnnotation, generateId, addAccessControlParents, prepareAccessControl,
+  defineDeleteByOwnerEvents, defineParentDeleteTriggers
 }

package/utilsAny.js

@@ -1,5 +1,8 @@
 const App = require("@live-change/framework")
-const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition } = App
+const app = App.app()
+const {
+  PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition, TriggerDefinition
+} = App
 const { allCombinations } = require("./combinations.js")
 
 function extractTypeAndIdParts(otherPropertyNames, properties) {
@@ -143,10 +146,101 @@ function prepareAccessControl(accessControl, names) {
   }
 }
 
+function defineDeleteByOwnerEvents(config, context, generateId) {
+  const {
+    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName, otherPropertyNames, reverseRelationWord
+  } = context
+  for(const propertyName of otherPropertyNames) {
+    const eventName = propertyName + reverseRelationWord + modelName + 'DeleteByOwner'
+    service.events[eventName] = new EventDefinition({
+      name: eventName,
+      async execute({ ownerType, owner }) {
+        const runtime = modelRuntime()
+        const tableName = runtime.tableName
+        const prefix = JSON.stringify(ownerType) + ':' + JSON.stringify(owner)
+        const indexName = tableName + '_by' + propertyName[0].toUpperCase() + propertyName.slice(1)
+        const bucketSize = 128
+        let bucket
+        do {
+          bucket = await app.dao.get(['database', 'indexRange', app.databaseName, indexName, {
+            gte: prefix + ':',
+            lte: prefix + '_\xFF\xFF\xFF\xFF',
+            limit: bucketSize
+          }])
+          const deletePromises = bucket.map(({to}) => runtime.delete(to))
+          await Promise.all(deletePromises)
+        } while (bucket.length == bucketSize)
+      }
+    })
+  }
+}
+
+function defineParentDeleteTrigger(config, context) {
+  const {
+    service, modelRuntime, modelPropertyName, identifiers,
+    otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model,
+    reverseRelationWord
+  } = context
+  const triggerName = 'deleteObject'
+  if(!service.triggers[triggerName]) service.triggers[triggerName] = []
+  service.triggers[triggerName].push(new TriggerDefinition({
+    name: triggerName,
+    properties: {
+      objectType: {
+        type: String,
+      },
+      object: {
+        type: String
+      }
+    },
+    async execute({ objectType, object }, {client, service}, emit) {
+      const tableName = modelRuntime().tableName
+      const prefix = JSON.stringify(objectType) + ':' + JSON.stringify(object)
+      const promises = otherPropertyNames.map(async (propertyName) => {
+        const indexName = tableName + '_by' + propertyName[0].toUpperCase() + propertyName.slice(1)
+        const bucketSize = 32
+        let found = false
+        let bucket
+        do {
+          bucket = await app.dao.get(['database', 'indexRange', app.databaseName, indexName, {
+            gte: prefix + ':',
+            lte: prefix + '_\xFF\xFF\xFF\xFF',
+            limit: bucketSize
+          }])
+          if(bucket.length > 0) found = true
+          const deleteTriggerPromises = bucket.map(({to}) => [
+            service.trigger({
+              type: 'delete'+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
+              objectType: service.name+'_'+modelName,
+              object: to
+            }),
+            service.trigger({
+              type: 'deleteObject',
+              objectType: service.name+'_'+modelName,
+              object: to
+            })
+          ]).flat()
+          await Promise.all(deleteTriggerPromises)
+        } while (bucket.length == bucketSize)
+        if(found) {
+          const eventName = propertyName + reverseRelationWord + modelName + 'DeleteByOwner'
+          emit({
+            type: eventName,
+            ownerType: objectType,
+            owner: object
+          })
+        }
+      })
+      await Promise.all(promises)
+    }
+  }))
+}
+
 module.exports = {
   extractTypeAndIdParts, extractIdentifiersWithTypes, defineAnyProperties,
   defineAnyIndex, defineAnyIndexes,
   processModelsAnyAnnotation, generateAnyId,
   addAccessControlAnyParents,
-  prepareAccessControl
+  prepareAccessControl,
+  defineDeleteByOwnerEvents, defineParentDeleteTrigger
 }