@live-change/relations-plugin 0.7.34 → 0.7.36

package/changeTriggers.js

@@ -1,14 +1,14 @@
-const {extractObjectData} = require("./utils.js")
-const App = require("@live-change/framework");
+const { extractObjectData, extractIdentifiers } = require("./dataUtils.js")
+const App = require("@live-change/framework")
 const {
   TriggerDefinition
 } = App
 
 async function fireChangeTriggers(context, objectType, identifiers, object, oldData, data) {
-  const { service, modelName } = context
+  const { service, modelName, app } = context
   const changeType = data ? (oldData ? 'update' : 'create') : 'delete'
   await Promise.all([
-    service.trigger({
+    app.trigger({
       type: changeType+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
       objectType,
       object,
@@ -16,7 +16,7 @@ async function fireChangeTriggers(context, objectType, identifiers, object, oldD
       data,
       oldData
     }),
-    service.trigger({
+    app.trigger({
       type: changeType+'Object',
       objectType,
       object,
@@ -27,32 +27,48 @@ async function fireChangeTriggers(context, objectType, identifiers, object, oldD
   ])
 }
 
+async function iterateChildren(context, propertyName, path, cb) {
+  const {
+    service, modelRuntime, objectType: myType, writeableProperties, modelName,
+    reverseRelationWord, app, otherPropertyNames, sameIdAsParent
+  } = context
+  if(sameIdAsParent) {
+    const entity = await modelRuntime().get(path)
+    if(entity) await cb(entity)
+  } else {
+    const indexName = 'by' + propertyName[0].toUpperCase() + propertyName.slice(1)
+    const bucketSize = 32
+    let bucket
+    let gt = ''
+    do {
+      bucket = await modelRuntime().sortedIndexRangeGet(indexName, path, {
+        gt,
+        limit: bucketSize
+      })
+      //console.log("BUCKET", bucket)
+      if(bucket.length == 0) break
+      gt = bucket[bucket.length - 1].id
+      const copyTriggerPromises = bucket.map(entity => cb({ ...entity, id: entity.to }))
+      await Promise.all(copyTriggerPromises)
+    } while (bucket.length == bucketSize)
+  }
+}
+
+
 async function triggerDeleteOnParentDeleteTriggers(
     context, propertyName, path, objectType, object, emit) {
   const {
-    service, modelRuntime, identifiers, objectType: myType, writeableProperties, modelName,
-    reverseRelationWord
+    service, modelRuntime, objectType: myType, writeableProperties, modelName,
+    reverseRelationWord, otherPropertyNames
   } = context
-  const indexName = 'by' + propertyName[0].toUpperCase() + propertyName.slice(1)
-  const bucketSize = 32
+
   let found = false
-  let bucket
-  let gt = ''
-  do {
-    const bucket = await modelRuntime.sortedIndexRangeGet(indexName, path, {
-      gt,
-      limit: bucketSize
-    })
-    if (bucket.length > 0) found = true
-    gt = bucket[bucket.length - 1].id
-    const deleteTriggerPromises = bucket.map(entity => {
-      return (async () => {
-        await fireChangeTriggers(context, myType, identifiers, entity.to,
-            extractObjectData(writeableProperties, entity, {}), null)
-      })()
-    })
-    await Promise.all(deleteTriggerPromises)
-  } while (bucket.length == bucketSize)
+  await iterateChildren(context, propertyName, path, async entity => {
+    found = true
+    const identifiers = extractIdentifiers(otherPropertyNames, entity)
+    await fireChangeTriggers(context, myType, identifiers, entity.id,
+        extractObjectData(writeableProperties, entity, {}), null)
+  })
   if (found) {
     const eventName = propertyName + reverseRelationWord + modelName + 'DeleteByOwner'
     emit({
@@ -109,7 +125,136 @@ function registerParentDeleteTriggers(context, config) {
   }
 }
 
+async function copyObject(context, objectType, object, parentType, parent, identifiers, data, emit) {
+  const {
+    app, service, modelPropertyName, modelName, otherPropertyNames, joinedOthersPropertyName, others
+  } = context
+  const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Copied'
+  const newIdentifiers = {
+    ...identifiers
+  }
+  for(let i = 0; i < others.length; i++) {
+    const other = others[i]
+    if(other == parentType) {
+      newIdentifiers[otherPropertyNames[i]] = parent
+    }
+  }
+  console.log("COPY OBJECT", objectType, object, "TO", parentType, parent)
+  console.log("IDENTIFIERS", newIdentifiers)
+  console.log("DATA", data)
+
+  const newId = app.generateUid()
+  app.trigger({
+    type: 'copy'+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
+    objectType,
+    object: newId,
+    from: object,
+    identifiers: newIdentifiers,
+    data
+  })
+  app.trigger({
+    type: 'copyObject',
+    objectType,
+    object: newId,
+    from: object,
+    identifiers: newIdentifiers,
+    data
+  })
+  await fireChangeTriggers(context, objectType, newIdentifiers, newId, null, data)
+  emit({
+    type: eventName,
+    [modelPropertyName]: newId,
+    ['from'+modelPropertyName[0].toUpperCase() + modelPropertyName.slice(1)]: object,
+    identifiers: newIdentifiers,
+    data
+  })
+}
+
+async function triggerCopyOnParentCopyTriggers(
+    context, propertyName, path, objectType, object, from, emit) {
+  const {
+    service, modelRuntime, objectType: myType, writeableProperties, modelName,
+    reverseRelationWord, app, otherPropertyNames
+  } = context
+  await iterateChildren(context, propertyName, path, async entity => {
+    const data = extractObjectData(writeableProperties, entity, {})
+    const identifiers = extractIdentifiers(otherPropertyNames, entity)
+    const fromId = entity.id
+
+    console.log("TRIGGERED COPY", myType, fromId, "FROM", objectType, from, "TO", object)
+
+    //console.log("COPY TRIGGER", myType, fromId, objectType, object, from, identifiers, data)
+    const copyTriggerResults = await app.trigger({
+      type: 'copyOnParentCopy'+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
+      objectType: myType,
+      object: fromId,
+      parentType: objectType,
+      parent: object,
+      fromParent: from,
+      identifiers,
+      data
+    })
+    //console.log("COPY TRIGGER RESULTS", copyTriggerResults)
+    if(copyTriggerResults.length == 0) { // normal copy, without special logic
+      await copyObject(context, myType, fromId, objectType, object, identifiers, data, emit)
+    }
+  })
+}
+
+function registerParentCopyTriggers(context, config) {
+  const {
+    service, parentsTypes, otherPropertyNames, modelName
+  } = context
+  if(parentsTypes) {
+    for (const index in parentsTypes) {
+      const otherType = parentsTypes[index]
+      const propertyName = otherPropertyNames[index]
+      const triggerName = 'copy' + 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
+          },
+          from: {
+            type: String
+          }
+        },
+        async execute({ object , from }, {client, service}, emit) {
+          await triggerCopyOnParentCopyTriggers(context, propertyName, [from],
+              otherType, object, from, emit)
+        }
+      }))
+    }
+  } else {
+    const triggerName = 'copyObject'
+    if(!service.triggers[triggerName]) service.triggers[triggerName] = []
+    service.triggers[triggerName].push(new TriggerDefinition({
+      name: triggerName,
+      properties: {
+        objectType: {
+          type: String,
+        },
+        object: {
+          type: String
+        },
+        from: {
+          type: String
+        }
+      },
+      async execute({ objectType, object, from }, {client, service}, emit) {
+        for(const propertyName of otherPropertyNames) {
+          await triggerCopyOnParentCopyTriggers(context, propertyName, [objectType, from],
+              objectType, object, from, emit)
+        }
+      }
+    }))
+  }
+}
+
 module.exports = {
   fireChangeTriggers,
-  registerParentDeleteTriggers
+  registerParentDeleteTriggers,
+  registerParentCopyTriggers,
 }

package/dataUtils.js

@@ -0,0 +1,24 @@
+const App = require("@live-change/framework");
+
+function extractIdentifiers(otherPropertyNames, properties) {
+  const identifiers = {}
+  for (const propertyName of otherPropertyNames) {
+    identifiers[propertyName] = properties[propertyName]
+  }
+  return identifiers
+}
+
+function extractObjectData(writeableProperties, properties, defaults) {
+  let objectData = {}
+  for (const propertyName of writeableProperties) {
+    if (properties.hasOwnProperty(propertyName)) {
+      objectData[propertyName] = properties[propertyName]
+    }
+  }
+  return App.utils.mergeDeep({}, defaults, JSON.parse(JSON.stringify(objectData)))
+}
+
+module.exports = {
+  extractIdentifiers,
+  extractObjectData
+}

package/itemEvents.js

@@ -57,4 +57,22 @@ function defineDeletedEvent(config, context) {
   })
 }
 
-module.exports = { defineCreatedEvent, defineUpdatedEvent, defineTransferredEvent, defineDeletedEvent }
+function defineCopyEvent(config, context) {
+  const {
+    service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName, reverseRelationWord
+  } = context
+  const eventName = joinedOthersPropertyName + reverseRelationWord + modelName + 'Copied'
+  service.events[eventName] = new EventDefinition({
+    name: eventName,
+    execute(properties) {
+      const id = properties[modelPropertyName]
+      console.log("COPY CREATE", { ...properties.data, ...properties.identifiers, id })
+      return modelRuntime().create({ ...properties.data, ...properties.identifiers, id })
+    }
+  })
+}
+
+module.exports = {
+  defineCreatedEvent, defineUpdatedEvent, defineTransferredEvent, defineDeletedEvent,
+  defineCopyEvent,
+}

package/itemOf.js

@@ -1,15 +1,17 @@
 const {
   defineProperties, defineIndexes,
   processModelsAnnotation, addAccessControlParents,
-  defineDeleteByOwnerEvents, defineParentDeleteTriggers
+  defineDeleteByOwnerEvents, defineParentDeleteTriggers, defineParentCopyTriggers
 } = require('./utils.js')
 
 const {
   defineCreatedEvent, defineUpdatedEvent, defineDeletedEvent, defineTransferredEvent,
+  defineCopyEvent
 } = require('./itemEvents.js')
 
 const {
-  defineView, defineCreateAction, defineUpdateAction, defineDeleteAction, defineSortIndex
+  defineView, defineCreateAction, defineUpdateAction, defineDeleteAction, defineSortIndex,
+  defineCopyAction, defineCopyOnParentCopyTrigger
 } = require('./pluralRelationUtils.js')
 
 module.exports = function(service, app) {
@@ -38,6 +40,7 @@ module.exports = function(service, app) {
     defineTransferredEvent(config, context)
     defineDeletedEvent(config, context)
     defineDeleteByOwnerEvents(config, context)
+    defineCopyEvent(config, context)
 
     if(config.createAccess || config.writeAccess || config.createAccessControl || config.writeAccessControl) {
       defineCreateAction(config, context)
@@ -51,6 +54,18 @@ module.exports = function(service, app) {
       defineDeleteAction(config, context)
     }
 
-    if(!config.customDeleteTrigger) defineParentDeleteTriggers(config, context)
+    if(config.copyAccess || config.copyAccessControl) {
+      defineCopyAction(config, context)
+    }
+
+    if(!config.customDeleteTrigger) {
+      defineParentDeleteTriggers(config, context)
+    }
+
+    if(!config.customParentCopyTrigger) {
+      defineParentCopyTriggers(config, context)
+      //defineCopyOnParentCopyTrigger(config, context)
+    }
+
   })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/relations-plugin",
-  "version": "0.7.34",
+  "version": "0.7.36",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,8 +21,8 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "^0.7.34",
+    "@live-change/framework": "^0.7.36",
     "pluralize": "^8.0.0"
   },
-  "gitHead": "730c14caf86069665193ce157b2663358abef342"
+  "gitHead": "23f7ed337f9bb45ed698b0e72959720076b6222c"
 }

package/pluralRelationUtils.js

@@ -1,9 +1,9 @@
 const App = require("@live-change/framework")
-const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition } = App
+const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, TriggerDefinition } = App
 const { extractIdParts, extractIdentifiers, extractObjectData, prepareAccessControl } = require("./utils.js")
 
 const pluralize = require('pluralize')
-const {fireChangeTriggers} = require("./changeTriggers.js")
+const { fireChangeTriggers } = require("./changeTriggers.js")
 
 function defineView(config, context) {
   const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
@@ -177,6 +177,156 @@ function defineDeleteAction(config, context) {
   })
 }
 
+function defineCopyAction(config, context) {
+  const {
+    service, app, model, modelRuntime, modelPropertyName, objectType,
+    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others,
+    identifiers
+  } = context
+  const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Copied'
+  const actionName = 'copy' + joinedOthersClassName + context.reverseRelationWord + modelName
+  const accessControl = config.copyAccessControl
+  prepareAccessControl(accessControl, otherPropertyNames, others)
+  service.actions[actionName] = new ActionDefinition({
+    name: actionName,
+    properties: {
+      [modelPropertyName]: {
+        type: model,
+        validation: ['nonEmpty']
+      },
+      ...(identifiers),
+      updates: {
+        type: 'object',
+        properties: {
+          ...(model.properties)
+        }
+      }
+    },
+    access: config.copyAccess,
+    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)
+      const identifiers = extractIdentifiers(otherPropertyNames, entity)
+      if(JSON.stringify(entityIdParts) != JSON.stringify(idParts)) {
+        throw new Error('not_authorized')
+      }
+      const srcData = extractObjectData(writeableProperties, properties, entity)
+      const updatedData = App.utils.mergeDeep(srcData, properties.updates)
+      const newId = app.generateUid()
+      const dataWithIdentifiers = { [modelPropertyName]: newId, ...identifiers, ...updatedData }
+      await App.validation.validate(dataWithIdentifiers, validators,
+          { source: action, action, service, app, client })
+      app.trigger({
+        type: 'copy'+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
+        objectType,
+        object: newId,
+        from: id,
+        identifiers,
+        data: updatedData
+      }),
+      app.trigger({
+        type: 'copyObject',
+        objectType,
+        object: newId,
+        from: id,
+        identifiers,
+        data: updatedData
+      })
+      await fireChangeTriggers(context, objectType, identifiers, newId, null, updatedData)
+      emit({
+        type: eventName,
+        [modelPropertyName]: newId,
+        ['from'+modelPropertyName[0].toUpperCase() + modelPropertyName.slice(1)]: id,
+        identifiers,
+        data: updatedData
+      })
+      return {
+        newId,
+      }
+    }
+  })
+  const action = service.actions[actionName]
+  const validators = App.validation.getValidators(action, service, action)
+}
+
+function defineCopyOnParentCopyTrigger(config, context) {
+  const {
+    service, app, model, modelRuntime, modelPropertyName, objectType,
+    otherPropertyNames, others, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName,
+  } = context
+  const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Copied'
+  const triggerName = 'copyOnParentCopy_' + service.name + '_' + modelName
+  if(!service.triggers[triggerName]) service.triggers[triggerName] = []
+  service.triggers[triggerName].push(new TriggerDefinition({
+    name: triggerName,
+    properties: {
+      objectType: {
+        type: String,
+      },
+      object: {
+        type: String,
+      },
+      parentType: {
+        type: String,
+      },
+      parent: {
+        type: String,
+      },
+      fromParent: {
+        type: String,
+      },
+      identifiers: {
+        type: Object,
+      },
+      data: {
+        type: Object,
+      }
+    },
+    async execute({ objectType, object, parentType, parent, fromParent, identifiers, data }, {client, service}, emit) {
+      const newIdentifiers = {
+        ...identifiers
+      }
+      for(let i = 0; i < others.length; i++) {
+        const other = others[i]
+        if(other == parentType) {
+          newIdentifiers[otherPropertyNames[i]] = parent
+        }
+      }
+      const newId = app.generateUid()
+      app.trigger({
+        type: 'copy'+service.name[0].toUpperCase()+service.name.slice(1)+'_'+modelName,
+        objectType,
+        object: newId,
+        from: object,
+        identifiers: newIdentifiers,
+        data
+      })
+      app.trigger({
+        type: 'copyObject',
+        objectType,
+        object: newId,
+        from: object,
+        identifiers: newIdentifiers,
+        data
+      })
+      await fireChangeTriggers(context, objectType, newIdentifiers, newId, null, data)
+      emit({
+        type: eventName,
+        [modelPropertyName]: newId,
+        ['from'+modelPropertyName[0].toUpperCase() + modelPropertyName.slice(1)]: object,
+        identifiers,
+        data
+      })
+    }
+  }))
+}
+
 function defineSortIndex(context, sortFields) {
   if(!Array.isArray(sortFields)) sortFields = [sortFields]
   console.log("DEFINE SORT INDEX", sortFields)
@@ -187,4 +337,9 @@ function defineSortIndex(context, sortFields) {
   })
 }
 
-module.exports = { defineView, defineCreateAction, defineUpdateAction, defineDeleteAction, defineSortIndex }
+module.exports = {
+  defineView,
+  defineCreateAction, defineUpdateAction, defineDeleteAction, defineCopyAction,
+  defineCopyOnParentCopyTrigger,
+  defineSortIndex,
+}

package/propertyOf.js

@@ -16,6 +16,8 @@ module.exports = function(service, app) {
     context.relationWord = 'Property'
     context.reverseRelationWord = 'Owned'
 
+    context.sameIdAsParent = true
+
     context.identifiers = defineProperties(context.model, context.others, context.otherPropertyNames)
     addAccessControlParents(context)
     defineIndexes(context.model, context.otherPropertyNames, context.others)

package/propertyOfAny.js

@@ -20,6 +20,8 @@ module.exports = function(service, app) {
     context.reverseRelationWord = 'Owned'
     context.partialReverseRelationWord = 'Owned'
 
+    context.sameIdAsParent = true
+
     context.identifiers = defineAnyProperties(context.model, context.otherPropertyNames)
     addAccessControlAnyParents(context)
     defineAnyIndexes(context.model, context.otherPropertyNames, false)

package/utils.js

@@ -1,11 +1,17 @@
 const App = require("@live-change/framework")
 const app = App.app()
 const { allCombinations } = require("./combinations.js")
-const { fireChangeTriggers, registerParentDeleteTriggers } = require("./changeTriggers.js")
+const {
+  fireChangeTriggers, registerParentDeleteTriggers, registerParentCopyTriggers
+} = require("./changeTriggers.js")
 const {
   PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition, TriggerDefinition
 } = App
 
+const {
+  extractObjectData, extractIdentifiers
+} = require('./dataUtils.js')
+
 function extractIdParts(otherPropertyNames, properties) {
   const idParts = []
   for (const propertyName of otherPropertyNames) {
@@ -14,13 +20,6 @@ function extractIdParts(otherPropertyNames, properties) {
   return idParts
 }
 
-function extractIdentifiers(otherPropertyNames, properties) {
-  const identifiers = {}
-  for (const propertyName of otherPropertyNames) {
-    identifiers[propertyName] = properties[propertyName]
-  }
-  return identifiers
-}
 
 function generateId(otherPropertyNames, properties) {
   return otherPropertyNames.length > 1
@@ -28,16 +27,6 @@ function generateId(otherPropertyNames, properties) {
       : properties[otherPropertyNames[0]]
 }
 
-function extractObjectData(writeableProperties, properties, defaults) {
-  let objectData = {}
-  for (const propertyName of writeableProperties) {
-    if (properties.hasOwnProperty(propertyName)) {
-      objectData[propertyName] = properties[propertyName]
-    }
-  }
-  return App.utils.mergeDeep({}, defaults, JSON.parse(JSON.stringify(objectData)))
-}
-
 function defineProperties(model, types, names) {
   const identifiers = {}
   for (let i = 0; i < types.length; i++) {
@@ -125,7 +114,7 @@ function processModelsAnnotation(service, app, annotation, multiple, cb) {
         const context = {
           service, app, model, originalModelProperties, modelProperties, modelPropertyName, defaults, modelRuntime,
           otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName,
-          others, annotation, objectType, parentsType: others
+          others, annotation, objectType, parentsTypes: others
         }
 
         cb(config, context)
@@ -194,8 +183,13 @@ function defineParentDeleteTriggers(config, context) {
   registerParentDeleteTriggers(context, config)
 }
 
+function defineParentCopyTriggers(config, context) {
+  registerParentCopyTriggers(context, config)
+}
+
+
 module.exports = {
   extractIdParts, extractIdentifiers, extractObjectData, defineProperties, defineIndex, defineIndexes,
   processModelsAnnotation, generateId, addAccessControlParents, prepareAccessControl,
-  defineDeleteByOwnerEvents, defineParentDeleteTriggers
+  defineDeleteByOwnerEvents, defineParentDeleteTriggers, defineParentCopyTriggers,
 }

package/utilsAny.js

@@ -4,8 +4,8 @@ const {
   PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition, TriggerDefinition
 } = App
 const { allCombinations } = require("./combinations.js")
-const {fireChangeTriggers, registerParentDeleteTriggers} = require("./changeTriggers");
-const {extractObjectData} = require("./utils.js");
+const { fireChangeTriggers, registerParentDeleteTriggers } = require("./changeTriggers")
+const { extractObjectData } = require("./dataUtils.js")
 
 function extractTypeAndIdParts(otherPropertyNames, properties) {
   const typeAndIdParts = []