@live-change/relations-plugin 0.5.20 → 0.5.23

package/singularRelationAnyUtils.js

@@ -0,0 +1,136 @@
+const App = require("@live-change/framework")
+const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition } = App
+const { extractTypeAndIdParts, extractIdentifiersWithTypes, generateAnyId } = require("./utilsAny.js")
+const { extractObjectData } = require("./utils.js")
+
+
+function defineView(config, context) {
+  const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
+    modelName, others, model } = context
+  const viewProperties = {}
+  for (let i = 0; i < others.length; i++) {
+    viewProperties[otherPropertyNames[i]] = new PropertyDefinition({
+      type: others[i],
+      validation: ['nonEmpty']
+    })
+    viewProperties[otherPropertyNames[i] + 'Type'] = new PropertyDefinition({
+      type: 'String',
+      validation: ['nonEmpty']
+    })
+  }
+  const viewName = config.name || ((config.prefix ? (config.prefix + joinedOthersClassName) : joinedOthersPropertyName) +
+      context.reverseRelationWord + modelName + (config.suffix || ''))
+  service.views[viewName] = new ViewDefinition({
+    name: viewName,
+    properties: {
+      ...viewProperties
+    },
+    returns: {
+      type: model,
+    },
+    access: config.access,
+    daoPath(properties, { client, context }) {
+      const typeAndIdParts = extractTypeAndIdParts(otherPropertyNames, properties)
+      const id = typeAndIdParts.length > 1 ? typeAndIdParts.map(p => JSON.stringify(p)).join(':') : idParts[0]
+      const path = config.fields ? modelRuntime().limitedPath(id, config.fields) : modelRuntime().path(id)
+      return path
+    }
+  })
+}
+
+function defineSetAction(config, context) {
+  const {
+    service, app, model,  defaults,
+    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
+  } = context
+
+  const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Set'
+  const actionName = 'set' + joinedOthersClassName + context.reverseRelationWord + modelName
+  service.actions[actionName] = new ActionDefinition({
+    name: actionName,
+    properties: {
+      ...(model.properties)
+    },
+    access: config.setAccess || config.writeAccess,
+    skipValidation: true,
+    queuedBy: otherPropertyNames,
+    waitForEvents: true,
+    async execute(properties, {client, service}, emit) {
+      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,
+        identifiers, data
+      })
+    }
+  })
+  const action = service.actions[actionName]
+  const validators = App.validation.getValidators(action, service, action)
+}
+
+function defineUpdateAction(config, context) {
+  const {
+    service, app, model, modelRuntime,
+    otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
+  } = context
+  const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Updated'
+  const actionName = 'update' + joinedOthersClassName + context.reverseRelationWord + 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 identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
+      const id = generateAnyId(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 })
+      emit({
+        type: eventName,
+        identifiers, data
+      })
+    }
+  })
+  const action = service.actions[actionName]
+  const validators = App.validation.getValidators(action, service, action)
+}
+
+function defineResetAction(config, context) {
+  const {
+    service, modelRuntime, modelPropertyName,
+    otherPropertyNames, joinedOthersPropertyName, modelName, joinedOthersClassName, model
+  } = context
+  const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Reset'
+  const actionName = 'reset' + joinedOthersClassName + context.reverseRelationWord + 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 = extractIdentifiersWithTypes(otherPropertyNames, properties)
+      const id = generateAnyId(otherPropertyNames, properties)
+      const entity = await modelRuntime().get(id)
+      if (!entity) throw new Error('not_found')
+      emit({
+        type: eventName,
+        identifiers
+      })
+    }
+  })
+}
+
+module.exports = { defineView, defineSetAction, defineUpdateAction, defineResetAction }

package/singularRelationUtils.js

@@ -0,0 +1,129 @@
+const App = require("@live-change/framework")
+const { PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition } = App
+const { extractIdentifiers, extractObjectData, generateId, extractIdParts} = require("./utils.js")
+
+function defineView(config, context) {
+  const { service, modelRuntime, otherPropertyNames, joinedOthersPropertyName, joinedOthersClassName,
+    modelName, others, model } = context
+  const viewProperties = {}
+  for (let i = 0; i < others.length; i++) {
+    viewProperties[otherPropertyNames[i]] = new PropertyDefinition({
+      type: others[i],
+      validation: ['nonEmpty']
+    })
+  }
+  const viewName = config.name || ((config.prefix ? (config.prefix + joinedOthersClassName) : joinedOthersPropertyName) +
+      'Owned' + modelName + (config.suffix || ''))
+  service.views[viewName] = new ViewDefinition({
+    name: viewName,
+    properties: {
+      ...viewProperties
+    },
+    returns: {
+      type: model,
+    },
+    access: config.access,
+    daoPath(properties, { client, context }) {
+      const idParts = extractIdParts(otherPropertyNames, properties)
+      const id = idParts.length > 1 ? idParts.map(p => JSON.stringify(p)).join(':') : idParts[0]
+      const path = config.fields ? modelRuntime().limitedPath(id, config.fields) : modelRuntime().path(id)
+      return path
+    }
+  })
+}
+
+function defineSetAction(config, context) {
+  const {
+    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({
+    name: actionName,
+    properties: {
+      ...(model.properties)
+    },
+    access: config.setAccess || config.writeAccess,
+    skipValidation: true,
+    queuedBy: otherPropertyNames,
+    waitForEvents: true,
+    async execute(properties, {client, service}, emit) {
+      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,
+        identifiers, data
+      })
+    }
+  })
+  const action = service.actions[actionName]
+  const validators = App.validation.getValidators(action, service, action)
+}
+
+function defineUpdateAction(config, context) {
+  const {
+    service, app, model, modelRuntime,
+    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 identifiers = extractIdentifiers(otherPropertyNames, properties)
+      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 })
+      emit({
+        type: eventName,
+        identifiers, data
+      })
+    }
+  })
+  const action = service.actions[actionName]
+  const validators = App.validation.getValidators(action, service, action)
+}
+
+function defineResetAction(config, context) {
+  const {
+    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 id = generateId(otherPropertyNames, properties)
+      const entity = await modelRuntime().get(id)
+      if (!entity) throw new Error('not_found')
+      emit({
+        type: eventName,
+        identifiers
+      })
+    }
+  })
+}
+
+module.exports = { defineView, defineSetAction, defineUpdateAction, defineResetAction }

package/utils.js

@@ -59,7 +59,7 @@ function defineIndex(model, what, props) {
   })
 }
 
-function processModelsAnnotation(service, app, annotation, cb) {
+function processModelsAnnotation(service, app, annotation, multiple, cb) {
   if (!service) throw new Error("no service")
   if (!app) throw new Error("no app")
 
@@ -81,30 +81,42 @@ function processModelsAnnotation(service, app, annotation, cb) {
         return service._runtime.models[modelName]
       }
 
-      if (!model.indexes) model.indexes = {}
+      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}
+      let configs
+      if(multiple) {
+        configs = Array.isArray(model[annotation]) ? model[annotation] : [ model[annotation] ]
+      } else { // only single ownership is possible, but may be owned by objects set
+        configs = [ model[annotation] ]
+      }
 
-      console.log("MODEL " + modelName + " IS "+ annotation +" " + config.what)
+      for(let config of configs) {
+        if (typeof config == 'string' || Array.isArray(config)) {
+          config = { what: config }
+        }
 
-      const others = (Array.isArray(config.what) ? config.what : [config.what])
-          .map(other => other.name ? other.name : other)
+        console.log("MODEL " + modelName + " IS " + annotation + " " + config.what)
 
-      const writeableProperties = modelProperties || config.writeableProperties
-      //console.log("PPP", others)
-      const otherPropertyNames = others.map(other => other.slice(0, 1).toLowerCase() + other.slice(1))
-      const joinedOthersPropertyName = otherPropertyNames[0] +
-          (others.length > 1 ? ('And' + others.slice(1).join('And')) : '')
-      const joinedOthersClassName = others.join('And')
+        const others = (Array.isArray(config.what) ? config.what : [config.what])
+            .map(other => other.name ? other.name : other)
 
-      const context = {
-        service, app, model, originalModelProperties, modelProperties, modelPropertyName, defaults, modelRuntime,
-        otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName,
-        others
-      }
+        const writeableProperties = modelProperties || config.writeableProperties
+        //console.log("PPP", others)
+        const otherPropertyNames = others.map(other => other.slice(0, 1).toLowerCase() + other.slice(1))
+        const joinedOthersPropertyName = otherPropertyNames[0] +
+            (others.length > 1 ? ('And' + others.slice(1).join('And')) : '')
+        const joinedOthersClassName = others.join('And')
 
-      cb(config, context)
+        const context = {
+          service, app, model, originalModelProperties, modelProperties, modelPropertyName, defaults, modelRuntime,
+          otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName,
+          others, annotation
+        }
+
+        cb(config, context)
+      }
     }
   }
 }

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']
@@ -45,7 +45,7 @@ function defineAnyIndex(model, what, props) {
   })
 }
 
-function processModelsAnyAnnotation(service, app, annotation, cb) {
+function processModelsAnyAnnotation(service, app, annotation, multiple, cb) {
   if (!service) throw new Error("no service")
   if (!app) throw new Error("no app")
 
@@ -67,28 +67,38 @@ function processModelsAnyAnnotation(service, app, annotation, cb) {
         return service._runtime.models[modelName]
       }
 
-      if (!model.indexes) model.indexes = {}
+      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}
+      let configs
+      if(multiple) {
+        configs = Array.isArray(model[annotation]) ? model[annotation] : [ model[annotation] ]
+      } else { // only single ownership is possible, but may be owned by objects set
+        configs = [ model[annotation] ]
+      }
 
-      console.log("MODEL " + modelName + " IS "+ annotation +" " + config.what)
+      for(let config of configs) {
+        if (typeof config == 'string' || Array.isArray(config)) config = {what: config}
 
-      const otherPropertyNames = (Array.isArray(config.to) ? config.to : [config.to ?? 'owner'])
-          .map(other => other.name ? other.name : other)
+        console.log("MODEL " + modelName + " IS " + annotation + " " + config.what)
 
-      const writeableProperties = modelProperties || config.writeableProperties
-      const others = otherPropertyNames.map(other => other.slice(0, 1).toLowerCase() + other.slice(1))
-      const joinedOthersPropertyName = otherPropertyNames[0] +
-          (others.length > 1 ? ('And' + others.slice(1).join('And')) : '')
-      const joinedOthersClassName = others.join('And')
+        const otherPropertyNames = (Array.isArray(config.to) ? config.to : [config.to ?? 'owner'])
+            .map(other => other.name ? other.name : other)
 
-      const context = {
-        service, app, model, originalModelProperties, modelProperties, modelPropertyName, defaults, modelRuntime,
-        otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
-      }
+        const writeableProperties = modelProperties || config.writeableProperties
+        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')
 
-      cb(config, context)
+        const context = {
+          service, app, model, originalModelProperties, modelProperties, modelPropertyName, defaults, modelRuntime,
+          otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
+        }
+
+        cb(config, context)
+      }
     }
   }
 }