@live-change/relations-plugin 0.8.22 → 0.8.23

package/dataUtils.js

@@ -15,7 +15,10 @@ function extractObjectData(writeableProperties, properties, defaults) {
       objectData[propertyName] = properties[propertyName]
     }
   }
-  return App.utils.mergeDeep({}, defaults, JSON.parse(JSON.stringify(objectData)))
+  return App.utils.mergeDeep({},
+    defaults,
+    JSON.parse(JSON.stringify(objectData))
+  )
 }
 
 export {

package/entity.js

@@ -108,7 +108,7 @@ function defineDeletedEvent(config, context) {
 
 function defineCreateAction(config, context) {
   const {
-    service, app, model,  defaults, modelPropertyName, modelRuntime, objectType,
+    service, app, model, modelPropertyName, modelRuntime, objectType,
     modelName, writeableProperties
   } = context
   const eventName = modelName + 'Created'
@@ -127,7 +127,9 @@ function defineCreateAction(config, context) {
       const id = properties[modelPropertyName] || app.generateUid()
       const entity = await modelRuntime().get(id)
       if(entity) throw 'exists'
-      const data = extractObjectData(writeableProperties, properties, defaults)
+      const data = extractObjectData(writeableProperties, properties,
+        App.computeDefaults(model, properties, { client, service } ))
+
       await App.validation.validate({ ...data }, validators,
         { source: action, action, service, app, client })
 
@@ -233,7 +235,6 @@ export default function(service, app) {
     const originalModelProperties = { ...model.properties }
     const modelProperties = Object.keys(model.properties)
     const modelPropertyName = modelName.slice(0, 1).toLowerCase() + modelName.slice(1)
-    const defaults = App.utils.generateDefault(originalModelProperties)
 
     function modelRuntime() {
       return service._runtime.models[modelName]
@@ -248,7 +249,7 @@ export default function(service, app) {
     const objectType = service.name + '_' + modelName
 
     const context = {
-      service, app, model, originalModelProperties, modelProperties, modelPropertyName, defaults, modelRuntime,
+      service, app, model, originalModelProperties, modelProperties, modelPropertyName, modelRuntime,
       modelName, writeableProperties, annotation, objectType
     }
 

package/index.js

@@ -11,6 +11,7 @@ import relatedToAny from './relatedToAny.js'
 
 import boundTo from './boundTo.js'
 import boundToAny from './boundToAny.js'
+import saveAuthor from './saveAuthor.js'
 
 
 const processors = [
@@ -18,7 +19,8 @@ const processors = [
   propertyOf, itemOf,
   propertyOfAny, itemOfAny,
   relatedTo, relatedToAny,
-  boundTo, boundToAny
+  boundTo, boundToAny,
+  saveAuthor
 ]
 
 const plugin = function(app, services) {

package/itemOf.js

@@ -1,7 +1,7 @@
 import {
   defineProperties, defineIndexes,
   processModelsAnnotation, addAccessControlParents,
-  defineDeleteByOwnerEvents, defineParentDeleteTriggers, defineParentCopyTriggers
+  defineDeleteByOwnerEvents, defineParentDeleteTriggers, defineParentCopyTriggers, defineAuthorProperties
 } from './utils.js'
 
 import {
@@ -21,6 +21,7 @@ export default function(service, app) {
     context.reverseRelationWord = 'Owned'
 
     context.identifiers = defineProperties(context.model, context.others, context.otherPropertyNames)
+
     addAccessControlParents(context)
     defineIndexes(context.model, context.otherPropertyNames.map(p => p[0].toLowerCase() + p.slice(1)), context.others)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/relations-plugin",
-  "version": "0.8.22",
+  "version": "0.8.23",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,8 +22,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/framework": "^0.8.22",
+    "@live-change/framework": "^0.8.23",
     "pluralize": "^8.0.0"
   },
-  "gitHead": "70a56ac3dc54167a2d32ce47a00150e7a94bd04d"
+  "gitHead": "581260523149a1e596f08e878b5f4fabeaba26ea"
 }

package/pluralRelationAnyUtils.js

@@ -52,7 +52,7 @@ function defineView(config, context) {
 
 function defineCreateAction(config, context) {
   const {
-    service, app, model,  defaults, modelPropertyName, modelRuntime, objectType,
+    service, app, model, modelPropertyName, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Created'
@@ -74,7 +74,8 @@ function defineCreateAction(config, context) {
       const entity = await modelRuntime().get(id)
       if(entity) throw 'exists'
       const identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
-      const data = extractObjectData(writeableProperties, properties, defaults)
+      const data = extractObjectData(writeableProperties, properties,
+        App.computeDefaults(model, properties, { client, service } ))
       await App.validation.validate({ ...identifiers, ...data }, validators,
           { source: action, action, service, app, client })
       await fireChangeTriggers(context, objectType, identifiers, id, null, data)
@@ -120,7 +121,7 @@ function defineUpdateAction(config, context) {
       if(!entity) throw 'not_found'
       const entityTypeAndIdParts = extractTypeAndIdParts(otherPropertyNames, entity)
       const typeAndIdParts = extractTypeAndIdParts(otherPropertyNames, properties)
-      if(JSON.stringify(entityTypeAndIdParts) != JSON.stringify(typeAndIdParts)) {
+      if(JSON.stringify(entityTypeAndIdParts) !== JSON.stringify(typeAndIdParts)) {
         throw 'not_authorized'
       }
       const identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
@@ -171,7 +172,7 @@ function defineDeleteAction(config, context) {
       const entityTypeAndIdParts = extractTypeAndIdParts(otherPropertyNames, entity)
       const typeAndIdParts = extractTypeAndIdParts(otherPropertyNames, properties)
       const identifiers = extractIdentifiers(otherPropertyNames, entity)
-      if(JSON.stringify(entityTypeAndIdParts) != JSON.stringify(typeAndIdParts)) {
+      if(JSON.stringify(entityTypeAndIdParts) !== JSON.stringify(typeAndIdParts)) {
         throw new Error('not_authorized')
       }
       await fireChangeTriggers(context, objectType, identifiers, id,

package/pluralRelationUtils.js

@@ -45,7 +45,7 @@ function defineView(config, context) {
 
 function defineCreateAction(config, context) {
   const {
-    service, app, model,  defaults, modelPropertyName, modelRuntime, objectType,
+    service, app, model, modelPropertyName, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Created'
@@ -67,7 +67,8 @@ function defineCreateAction(config, context) {
       const entity = await modelRuntime().get(id)
       if(entity) throw 'exists'
       const identifiers = extractIdentifiers(otherPropertyNames, properties)
-      const data = extractObjectData(writeableProperties, properties, defaults)
+      const data = extractObjectData(writeableProperties, properties,
+        App.computeDefaults(model, properties, { client, service } ))
       await App.validation.validate({ ...identifiers, ...data }, validators,
           { source: action, action, service, app, client })
       await fireChangeTriggers(context, objectType, identifiers, id, null, data)

package/saveAuthor.js

@@ -0,0 +1,13 @@
+import { defineAuthorProperties } from './utils.js'
+
+export default function(service, app) {
+  for(let modelName in service.models) {
+    const model = service.models[modelName]
+    if(model.saveAuthor) {
+      model.properties = {
+        ...model.properties,
+        ...defineAuthorProperties()
+      }
+    }
+  }
+}

package/singularRelationAnyUtils.js

@@ -95,7 +95,7 @@ function defineRangeViews(config, context) {
 
 function defineSetAction(config, context) {
   const {
-    service, app, model, defaults, objectType,
+    service, app, model, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
 
@@ -115,7 +115,8 @@ function defineSetAction(config, context) {
     waitForEvents: true,
     async execute(properties, { client, service }, emit) {
       const identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
-      const data = extractObjectData(writeableProperties, properties, defaults)
+      const data = extractObjectData(writeableProperties, properties,
+        App.computeDefaults(model, properties, { client, service } ))
       await App.validation.validate({ ...identifiers, ...data }, validators,
           { source: action, action, service, app, client })
       await fireChangeTriggers(context, objectType, identifiers, id, null, data)
@@ -170,7 +171,7 @@ function defineUpdateAction(config, context) {
 
 function defineSetOrUpdateAction(config, context) {
   const {
-    service, app, model, modelRuntime, defaults, objectType,
+    service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName
   } = context
   const eventName = joinedOthersPropertyName + context.reverseRelationWord + modelName + 'Updated'
@@ -191,7 +192,10 @@ function defineSetOrUpdateAction(config, context) {
       const identifiers = extractIdentifiersWithTypes(otherPropertyNames, properties)
       const id = generateAnyId(otherPropertyNames, properties)
       const entity = await modelRuntime().get(id)
-      const data = extractObjectData(writeableProperties, properties, { ...defaults, ...entity } )
+      const data = extractObjectData(writeableProperties, properties, {
+        ...App.computeDefaults(model, properties, { client, service } ),
+        ...entity
+      })
       await App.validation.validate({ ...identifiers, ...data }, validators,
           { source: action, action, service, app, client })
       await fireChangeTriggers(context, objectType, identifiers, id,

package/singularRelationUtils.js

@@ -39,7 +39,7 @@ function defineView(config, context) {
 
 function defineSetAction(config, context) {
   const {
-    service, app, model, defaults, objectType,
+    service, app, model, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Set'
@@ -60,7 +60,8 @@ function defineSetAction(config, context) {
       const idParts = extractIdParts(otherPropertyNames, properties)
       const id = idParts.length > 1 ? idParts.map(p => JSON.stringify(p)).join(':') : idParts[0]
       const identifiers = extractIdentifiers(otherPropertyNames, properties)
-      const data = extractObjectData(writeableProperties, properties, defaults)
+      const data = extractObjectData(writeableProperties, properties,
+        App.computeDefaults(model, properties, { client, service } ))
       await App.validation.validate({ ...identifiers, ...data }, validators,
           { source: action, action, service, app, client })
       await fireChangeTriggers(context, objectType, identifiers, id, null, data)
@@ -116,7 +117,7 @@ function defineUpdateAction(config, context) {
 
 function defineSetOrUpdateAction(config, context) {
   const {
-    service, app, model, defaults, modelRuntime, objectType,
+    service, app, model, modelRuntime, objectType,
     otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others
   } = context
   const eventName = joinedOthersPropertyName + 'Owned' + modelName + 'Updated'
@@ -137,7 +138,10 @@ function defineSetOrUpdateAction(config, context) {
       const identifiers = extractIdentifiers(otherPropertyNames, properties)
       const id = generateId(otherPropertyNames, properties)
       const entity = await modelRuntime().get(id)
-      const data = extractObjectData(writeableProperties, properties, { ...defaults, ...entity })
+      const data = extractObjectData(writeableProperties, properties, {
+        ...App.computeDefaults(model, properties, { client, service } ),
+        ...entity
+      })
       await App.validation.validate({ ...identifiers, ...data }, validators,
           { source: action, action, service, app, client })
       await fireChangeTriggers(context, objectType, identifiers, id,

package/utils.js

@@ -8,11 +8,11 @@ import {
   PropertyDefinition, ViewDefinition, IndexDefinition, ActionDefinition, EventDefinition, TriggerDefinition
 } from "@live-change/framework"
 
-import {
+export {
   extractObjectData, extractIdentifiers
 } from './dataUtils.js'
 
-function extractIdParts(otherPropertyNames, properties) {
+export function extractIdParts(otherPropertyNames, properties) {
   const idParts = []
   for (const propertyName of otherPropertyNames) {
     idParts.push(properties[propertyName])
@@ -21,13 +21,13 @@ function extractIdParts(otherPropertyNames, properties) {
 }
 
 
-function generateId(otherPropertyNames, properties) {
+export function generateId(otherPropertyNames, properties) {
   return otherPropertyNames.length > 1
       ? otherPropertyNames.map(p => JSON.stringify(properties[p])).join(':')
       : properties[otherPropertyNames[0]]
 }
 
-function defineProperties(model, types, names) {
+export function defineProperties(model, types, names) {
   const identifiers = {}
   for (let i = 0; i < types.length; i++) {
     identifiers[names[i]] = new PropertyDefinition({
@@ -41,13 +41,28 @@ function defineProperties(model, types, names) {
   return identifiers
 }
 
-function defineIndex(model, what, props) {
+export function defineAuthorProperties() {
+  return {
+    authorType: new PropertyDefinition({
+      type: String,
+      validation: ['nonEmpty'],
+      default: (_props, context) => context.client.user ? 'user_User' : 'session_Session'
+    }),
+    author: new PropertyDefinition({
+      type: String,
+      validation: ['nonEmpty'],
+      default: (_props, context) => context.client.user ? context.client.user : context.client.session
+    })
+  }
+}
+
+export function defineIndex(model, what, props) {
   console.log("DEFINE INDEX", model.name, what, props)
   model.indexes['by' + what] = new IndexDefinition({
     property: props
   })
 }
-function defineIndexes(model, props, types) {
+export function defineIndexes(model, props, types) {
   console.log("DEFINE INDEXES", model.name, props, types)
   const propCombinations = allCombinations(Object.keys(props))
   for(const propCombination of propCombinations) {
@@ -59,7 +74,7 @@ function defineIndexes(model, props, types) {
   }
 }
 
-function processModelsAnnotation(service, app, annotation, multiple, cb) {
+export function processModelsAnnotation(service, app, annotation, multiple, cb) {
   if (!service) throw new Error("no service")
   if (!app) throw new Error("no app")
 
@@ -75,7 +90,6 @@ function processModelsAnnotation(service, app, annotation, multiple, cb) {
       const originalModelProperties = { ...model.properties }
       const modelProperties = Object.keys(model.properties)
       const modelPropertyName = modelName.slice(0, 1).toLowerCase() + modelName.slice(1)
-      const defaults = App.utils.generateDefault(originalModelProperties)
 
       function modelRuntime() {
         return service._runtime.models[modelName]
@@ -112,7 +126,7 @@ function processModelsAnnotation(service, app, annotation, multiple, cb) {
         const objectType = service.name + '_' + modelName
 
         const context = {
-          service, app, model, originalModelProperties, modelProperties, modelPropertyName, defaults, modelRuntime,
+          service, app, model, originalModelProperties, modelProperties, modelPropertyName, modelRuntime,
           otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName,
           others, annotation, objectType, parentsTypes: others
         }
@@ -123,7 +137,7 @@ function processModelsAnnotation(service, app, annotation, multiple, cb) {
   }
 }
 
-function addAccessControlParents(context) {
+export function addAccessControlParents(context) {
   const { modelRuntime } = context
   context.model.accessControlParents = async (id) => {
     const data = await modelRuntime().get(id)
@@ -141,7 +155,7 @@ function addAccessControlParents(context) {
   )
 }
 
-function prepareAccessControl(accessControl, names, types) {
+export function prepareAccessControl(accessControl, names, types) {
   if(typeof accessControl == 'object') {
     accessControl.objects = accessControl.objects ?? ((params) => names.map((name, index) => ({
       objectType: types[index],
@@ -150,7 +164,7 @@ function prepareAccessControl(accessControl, names, types) {
   }
 }
 
-function defineDeleteByOwnerEvents(config, context, generateId) {
+export function defineDeleteByOwnerEvents(config, context, generateId) {
   const {
     service, modelRuntime, joinedOthersPropertyName, modelName, modelPropertyName, otherPropertyNames, reverseRelationWord
   } = context
@@ -179,23 +193,16 @@ function defineDeleteByOwnerEvents(config, context, generateId) {
           }])
           const deletePromises = bucket.map(({to}) => runtime.delete(to))
           await Promise.all(deletePromises)
-        } while (bucket.length == bucketSize)
+        } while (bucket.length === bucketSize)
       }
     })
   }
 }
 
-function defineParentDeleteTriggers(config, context) {
+export function defineParentDeleteTriggers(config, context) {
   registerParentDeleteTriggers(context, config)
 }
 
-function defineParentCopyTriggers(config, context) {
+export function defineParentCopyTriggers(config, context) {
   registerParentCopyTriggers(context, config)
 }
-
-
-export {
-  extractIdParts, extractIdentifiers, extractObjectData, defineProperties, defineIndex, defineIndexes,
-  processModelsAnnotation, generateId, addAccessControlParents, prepareAccessControl,
-  defineDeleteByOwnerEvents, defineParentDeleteTriggers, defineParentCopyTriggers,
-}

package/utilsAny.js

@@ -87,7 +87,6 @@ function processModelsAnyAnnotation(service, app, annotation, multiple, cb) {
       const originalModelProperties = { ...model.properties }
       const modelProperties = Object.keys(model.properties)
       const modelPropertyName = modelName.slice(0, 1).toLowerCase() + modelName.slice(1)
-      const defaults = App.utils.generateDefault(originalModelProperties)
 
       function modelRuntime() {
         return service._runtime.models[modelName]
@@ -122,7 +121,7 @@ function processModelsAnyAnnotation(service, app, annotation, multiple, cb) {
         const { parentsTypes } = config
 
         const context = {
-          service, app, model, originalModelProperties, modelProperties, modelPropertyName, defaults, modelRuntime,
+          service, app, model, originalModelProperties, modelProperties, modelPropertyName, modelRuntime,
           otherPropertyNames, joinedOthersPropertyName, modelName, writeableProperties, joinedOthersClassName, others,
           objectType, parentsTypes
         }