npm - @live-change/user-service - Versions diffs - 0.9.197 → 0.9.199 - Mend

@live-change/user-service 0.9.197 → 0.9.199

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/contactOrUserItem.js CHANGED Viewed

@@ -115,8 +115,11 @@ definition.processor(function(service, app) {
         }
       })
+      if (!model.ownerCrud) model.ownerCrud = {}
       if(config.ownerReadAccess) {
         const viewName = 'my' + pluralize(modelName)
+        model.ownerCrud.range ??= viewName
         service.views[viewName] = new ViewDefinition({
           name: viewName,
           access(params, context) {
@@ -154,6 +157,7 @@ definition.processor(function(service, app) {
           name: actionName,
           access: (params, context) => context.client.user
               && (config.ownerCreateAccess || config.ownerWriteAccess)(params,context),
+          skipValidation: true,
           properties: {
             ...originalModelProperties,
             [modelPropertyName]: {
@@ -171,15 +175,28 @@ definition.processor(function(service, app) {
               ownerType: 'user_User',
               owner: client.user,
             }
+            let newObject = {}
+            for(const propertyName of writeableProperties) {
+              if(properties.hasOwnProperty(propertyName)) {
+                newObject[propertyName] = properties[propertyName]
+              }
+            }
+            const data = App.utils.mergeDeep({},
+              App.computeDefaults(model, properties, { client, service }), newObject)
+            await App.validation.validate({ ...identifiers, ...data }, validators,
+              { source: action, action, service, app, client })
             emit({
               type: eventName,
               [modelPropertyName]: id,
               identifiers,
-              data: properties
+              data
             })
             return id
           }
         })
+        model.ownerCrud.create ??= actionName
+        const action = service.actions[actionName]
+        const validators = App.validation.getValidators(action, service, action)
       }
       if(config.ownerUpdateAccess || config.ownerWriteAccess) {
         const eventName = modelName + 'Updated'
@@ -210,8 +227,6 @@ definition.processor(function(service, app) {
                 updateObject[propertyName] = properties[propertyName]
               }
             }
-            const merged = App.utils.mergeDeep({}, entity, updateObject)
-            await App.validation.validate(merged, validators, { source: action, action, service, app, client })
             const identifiers = client.user ? {
               ownerType: 'user_User',
               owner: client.user,
@@ -219,14 +234,20 @@ definition.processor(function(service, app) {
               ownerType: 'session_Session',
               owner: client.session,
             }
+            const computedUpdates = App.computeUpdates(model, { ...entity, ...properties }, { client, service })
+            const data = App.utils.mergeDeep({}, updateObject, computedUpdates)
+            const merged = App.utils.mergeDeep({}, entity, data)
+            await App.validation.validate({ ...identifiers, ...merged, [modelPropertyName]: entity.id }, validators,
+              { source: action, action, service, app, client })
             emit({
               type: eventName,
               [modelPropertyName]: entity.id,
               identifiers,
-              data: properties
+              data
             })
           }
         })
+        model.ownerCrud.update ??= actionName
         const action = service.actions[actionName]
         const validators = App.validation.getValidators(action, service, action)
       }
@@ -265,6 +286,7 @@ definition.processor(function(service, app) {
             })
           }
         })
+        model.ownerCrud.delete ??= actionName
       }
     }
   }

package/contactOrUserProperty.js CHANGED Viewed

@@ -142,8 +142,11 @@ definition.processor(function(service, app) {
         }
       })
+      if (!model.ownerCrud) model.ownerCrud = {}
       if(config.ownerReadAccess) { // single item view
         const viewName = 'my' + modelName
+        model.ownerCrud.read ??= viewName
         const identifiers = createIdentifiersProperties(extendedWith)
         service.views[viewName] = new ViewDefinition({
           name: viewName,
@@ -241,7 +244,6 @@ definition.processor(function(service, app) {
             }
             const data = App.utils.mergeDeep({},
               App.computeDefaults(model, properties, { client, service } ), newObject)
-            await App.validation.validate(data, validators, { source: action, action, service, app, client })
             const identifiers = {
               contactOrUserType: 'user_User',
               contactOrUser: client.user,
@@ -250,6 +252,8 @@ definition.processor(function(service, app) {
               identifiers[key+'Type'] = properties[key+'Type']
               identifiers[key]=properties[key]
             }
+            await App.validation.validate({ ...identifiers, ...data }, validators,
+              { source: action, action, service, app, client })
             emit({
               type: eventName,
               identifiers,
@@ -257,6 +261,7 @@ definition.processor(function(service, app) {
             })
           }
         })
+        model.ownerCrud.create ??= actionName
         const action = service.actions[actionName]
         const validators = App.validation.getValidators(action, service, action)
       }
@@ -288,8 +293,6 @@ definition.processor(function(service, app) {
                 updateObject[propertyName] = properties[propertyName]
               }
             }
-            const merged = App.utils.mergeDeep({}, entity, updateObject)
-            await App.validation.validate(merged, validators, { source: action, action, service, app, client })
             const identifiers = {
               contactOrUserType: 'user_User',
               contactOrUser: client.user,
@@ -298,13 +301,19 @@ definition.processor(function(service, app) {
               identifiers[key+'Type'] = properties[key+'Type']
               identifiers[key]=properties[key]
             }
+            const computedUpdates = App.computeUpdates(model, { ...entity, ...properties }, { client, service })
+            const data = App.utils.mergeDeep({}, updateObject, computedUpdates)
+            const merged = App.utils.mergeDeep({}, entity, data)
+            await App.validation.validate({ ...identifiers, ...merged }, validators,
+              { source: action, action, service, app, client })
             emit({
               type: eventName,
               identifiers,
-              data: properties || {}
+              data
             })
           }
         })
+        model.ownerCrud.update ??= actionName
         const action = service.actions[actionName]
         const validators = App.validation.getValidators(action, service, action)
       }
@@ -342,6 +351,7 @@ definition.processor(function(service, app) {
             })
           }
         })
+        model.ownerCrud.reset ??= actionName
       }
     }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/user-service",
-  "version": "0.9.197",
+  "version": "0.9.199",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,9 +22,9 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/framework": "^0.9.197",
-    "@live-change/relations-plugin": "^0.9.197",
+    "@live-change/framework": "^0.9.199",
+    "@live-change/relations-plugin": "^0.9.199",
     "pluralize": "^8.0.0"
   },
-  "gitHead": "8231c2ed8bc3beed2c732aa5727174417f19082b"
+  "gitHead": "1900043a10cf9ad49b9cc33a539fb973706de962"
 }

package/sessionOrUserItem.js CHANGED Viewed

@@ -37,6 +37,8 @@ definition.processor(function(service, app) {
         sessionOrUserTypes: ['session_Session', 'user_User']
       }
+      if (!model.ownerCrud) model.ownerCrud = {}
       service.trigger({
         name: 'signedIn',
         properties: {
@@ -147,6 +149,7 @@ definition.processor(function(service, app) {
       if(config.ownerReadAccess) {
         const viewName = 'my' + pluralize(modelName)
+        model.ownerCrud.range ??= viewName
         service.views[viewName] = new ViewDefinition({
           name: viewName,
           access(params, context) {
@@ -179,6 +182,7 @@ definition.processor(function(service, app) {
       if(config.ownerReadAccess) {
         const viewName = 'my' + modelName
+        model.ownerCrud.read ??= viewName
         const propertyName = modelName[0].toLowerCase() + modelName.slice(1)
         service.views[viewName] = new ViewDefinition({
           name: viewName,
@@ -210,6 +214,7 @@ definition.processor(function(service, app) {
         const actionName = 'createMy' + modelName
         service.actions[actionName] = new ActionDefinition({
           name: actionName,
+          skipValidation: true,
           access: config.ownerCreateAccess || config.ownerWriteAccess,
           properties: {
             ...originalModelProperties,
@@ -225,21 +230,34 @@ definition.processor(function(service, app) {
             const entity = await modelRuntime().get(id)
             if(entity) throw app.logicError("exists")
             const identifiers = client.user ? {
-                  sessionOrUserType: 'user_User',
-                  sessionOrUser: client.user,
-                } : {
-                  sessionOrUserType: 'session_Session',
-                  sessionOrUser: client.session,
-                }
+              sessionOrUserType: 'user_User',
+              sessionOrUser: client.user,
+            } : {
+              sessionOrUserType: 'session_Session',
+              sessionOrUser: client.session,
+            }
+            let newObject = {}
+            for(const propertyName of writeableProperties) {
+              if(properties.hasOwnProperty(propertyName)) {
+                newObject[propertyName] = properties[propertyName]
+              }
+            }
+            const data = App.utils.mergeDeep({},
+              App.computeDefaults(model, properties, { client, service }), newObject)
+            await App.validation.validate({ ...identifiers, ...data }, validators,
+              { source: action, action, service, app, client })
             emit({
               type: eventName,
               [modelPropertyName]: id,
               identifiers,
-              data: properties
+              data
             })
             return id
           }
         })
+        model.ownerCrud.create ??= actionName
+        const action = service.actions[actionName]
+        const validators = App.validation.getValidators(action, service, action)
       }
       if(config.ownerUpdateAccess || config.ownerWriteAccess) {
         const eventName = modelName + 'Updated'
@@ -272,10 +290,6 @@ definition.processor(function(service, app) {
                 updateObject[propertyName] = properties[propertyName]
               }
             }
-            const merged = App.utils.mergeDeep({ [modelPropertyName]: properties[modelPropertyName] },
-              entity, updateObject)
-            await App.validation.validate(merged, validators, { source: action, action, service, app, client })
             const identifiers = client.user ? {
               sessionOrUserType: 'user_User',
               sessionOrUser: client.user,
@@ -283,14 +297,21 @@ definition.processor(function(service, app) {
               sessionOrUserType: 'session_Session',
               sessionOrUser: client.session,
             }
+            const computedUpdates = App.computeUpdates(model, { ...entity, ...properties }, { client, service })
+            const data = App.utils.mergeDeep({}, updateObject, computedUpdates)
+            const merged = App.utils.mergeDeep({ [modelPropertyName]: properties[modelPropertyName] },
+              entity, data)
+            await App.validation.validate({ ...identifiers, ...merged, [modelPropertyName]: entity.id }, validators,
+              { source: action, action, service, app, client })
             emit({
               type: eventName,
               [modelPropertyName]: entity.id,
               identifiers,
-              data: properties
+              data
             })
           }
         })
+        model.ownerCrud.update ??= actionName
         const action = service.actions[actionName]
         const validators = App.validation.getValidators(action, service, action)
       }
@@ -331,6 +352,7 @@ definition.processor(function(service, app) {
             })
           }
         })
+        model.ownerCrud.delete ??= actionName
       }
     }
   }

package/sessionOrUserProperty.js CHANGED Viewed

@@ -157,10 +157,13 @@ definition.processor(function(service, app) {
       })
 */
+      if (!model.ownerCrud) model.ownerCrud = {}
       const extendedIdentifiersProperties = createIdentifiersProperties(extendedWith)
       if(config.ownerReadAccess) { // single item view
         const viewName = 'my' + modelName
+        model.ownerCrud.read ??= viewName
         service.views[viewName] = new ViewDefinition({
           name: viewName,
           properties: {
@@ -187,6 +190,7 @@ definition.processor(function(service, app) {
           const indexName = 'by' + (['SessionOrUser', ...combination])
             .map(prop => prop[0].toUpperCase() + prop.slice(1))
           const viewName = 'my' + propsUpperCase.join('And') + pluralize(modelName)
+          model.ownerCrud.range ??= viewName
           const identifiers = createIdentifiersProperties(combination)
           service.views[viewName] = new ViewDefinition({
             name: viewName,
@@ -275,6 +279,7 @@ definition.processor(function(service, app) {
             })
           }
         })
+        model.ownerCrud.create ??= actionName
         const action = service.actions[actionName]
         const validators = App.validation.getValidators(action, service, action)
       }
@@ -304,8 +309,6 @@ definition.processor(function(service, app) {
                 updateObject[propertyName] = properties[propertyName]
               }
             }
-            const merged = App.utils.mergeDeep({}, entity, updateObject)
-            await App.validation.validate(merged, validators, { source: action, action, service, app, client })
             const identifiers = client.user ? {
               sessionOrUserType: 'user_User',
               sessionOrUser: client.user,
@@ -317,13 +320,19 @@ definition.processor(function(service, app) {
               identifiers[key+'Type'] = properties[key+'Type']
               identifiers[key]=properties[key]
             }
+            const computedUpdates = App.computeUpdates(model, { ...entity, ...properties }, { client, service })
+            const data = App.utils.mergeDeep({}, updateObject, computedUpdates)
+            const merged = App.utils.mergeDeep({}, entity, data)
+            await App.validation.validate({ ...identifiers, ...merged }, validators,
+              { source: action, action, service, app, client })
             emit({
               type: eventName,
               identifiers,
-              data: properties || {}
+              data
             })
           }
         })
+        model.ownerCrud.update ??= actionName
         const action = service.actions[actionName]
         const validators = App.validation.getValidators(action, service, action)
       }
@@ -376,18 +385,21 @@ definition.processor(function(service, app) {
                 data
               })
             } else {
-              const merged = App.utils.mergeDeep({}, entity, updateObject)
+              const computedUpdates = App.computeUpdates(model, { ...entity, ...properties }, { client, service })
+              const data = App.utils.mergeDeep({}, updateObject, computedUpdates)
+              const merged = App.utils.mergeDeep({}, entity, data)
               //console.log('V', { ...identifiers, ...merged}, validators)
               await App.validation.validate({ ...identifiers, ...merged}, validators,
                   { source: action, action, service, app, client })
               emit({
                 type: updatedEventName,
                 identifiers,
-                data: updateObject || {}
+                data
               })
             }
           }
         })
+        model.ownerCrud.createOrUpdate ??= actionName
         const action = service.actions[actionName]
         const validators = App.validation.getValidators(action, service, action)
       }
@@ -426,6 +438,7 @@ definition.processor(function(service, app) {
             })
           }
         })
+        model.ownerCrud.reset ??= actionName
       }
     }

package/userItem.js CHANGED Viewed

@@ -30,10 +30,13 @@ definition.processor(function(service, app) {
         ...config
       }
+      if (!model.ownerCrud) model.ownerCrud = {}
       /// TODO: delete on userDeleted trigger
       if(config.userReadAccess) {
         const viewName = 'myUser' + pluralize(modelName)
+        model.ownerCrud.range ??= viewName
         service.views[viewName] = new ViewDefinition({
           name: viewName,
           access(params, context) {
@@ -66,6 +69,7 @@ definition.processor(function(service, app) {
       if(config.userReadAccess) {
         const viewName = 'myUser' + modelName
+        model.ownerCrud.read ??= viewName
         service.views[viewName] = new ViewDefinition({
           name: viewName,
           async access(params, context) {
@@ -88,6 +92,7 @@ definition.processor(function(service, app) {
         const actionName = 'createMyUser' + modelName
         service.actions[actionName] = new ActionDefinition({
           name: actionName,
+          skipValidation: true,
           access: config.userCreateAccess || config.userWriteAccess,
           properties: {
             ...originalModelProperties,
@@ -102,17 +107,30 @@ definition.processor(function(service, app) {
             const id = properties[modelPropertyName] || app.generateUid()
             const entity = await modelRuntime().get(id)
             if(entity) throw app.logicError("exists")
+            let newObject = {}
+            for(const propertyName of writeableProperties) {
+              if(properties.hasOwnProperty(propertyName)) {
+                newObject[propertyName] = properties[propertyName]
+              }
+            }
+            const data = App.utils.mergeDeep({},
+              App.computeDefaults(model, properties, { client, service }), newObject)
+            await App.validation.validate(data, validators,
+              { source: action, action, service, app, client })
             emit({
               type: eventName,
               [modelPropertyName]: id,
               identifiers: {
                 user: client.user,
               },
-              data: properties
+              data
             })
             return id
           }
         })
+        model.ownerCrud.create ??= actionName
+        const action = service.actions[actionName]
+        const validators = App.validation.getValidators(action, service, action)
       }
       if(config.userUpdateAccess || config.userWriteAccess) {
         const eventName = modelName + 'Updated'
@@ -140,18 +158,21 @@ definition.processor(function(service, app) {
                 updateObject[propertyName] = properties[propertyName]
               }
             }
-            const merged = App.utils.mergeDeep({}, entity, updateObject)
-            await App.validation.validate(merged, validators, { source: action, action, service, app, client })
+            const computedUpdates = App.computeUpdates(model, { ...entity, ...properties }, { client, service })
+            const data = App.utils.mergeDeep({}, updateObject, computedUpdates)
+            const merged = App.utils.mergeDeep({}, entity, data)
+            await App.validation.validate({ ...merged, [modelPropertyName]: entity.id }, validators, { source: action, action, service, app, client })
             emit({
               type: eventName,
               [modelPropertyName]: entity.id,
               identifiers: {
                 user: client.user,
               },
-              data: properties
+              data
             })
           }
         })
+        model.ownerCrud.update ??= actionName
         const action = service.actions[actionName]
         const validators = App.validation.getValidators(action, service, action)
       }
@@ -182,6 +203,7 @@ definition.processor(function(service, app) {
             })
           }
         })
+        model.ownerCrud.delete ??= actionName
       }
     }
   }

package/userProperty.js CHANGED Viewed

@@ -30,10 +30,13 @@ definition.processor(function(service, app) {
         ...config
       }
+      if (!model.ownerCrud) model.ownerCrud = {}
       /// TODO: delete on userDeleted trigger
       if(config.userReadAccess) {
         const viewName = 'myUser' + modelName
+        model.ownerCrud.read ??= viewName
         service.views[viewName] = new ViewDefinition({
           name: viewName,
           access(params, context) {
@@ -95,6 +98,7 @@ definition.processor(function(service, app) {
             })
           }
         })
+        model.ownerCrud.create ??= actionName
         const action = service.actions[actionName]
         const validators = App.validation.getValidators(action, service, action)
       }
@@ -120,17 +124,21 @@ definition.processor(function(service, app) {
                 updateObject[propertyName] = properties[propertyName]
               }
             }
-            const merged = App.utils.mergeDeep({}, entity, updateObject)
-            await App.validation.validate(merged, validators, { source: action, action, service, app, client })
+            const computedUpdates = App.computeUpdates(model, { ...entity, ...properties }, { client, service })
+            const data = App.utils.mergeDeep({}, updateObject, computedUpdates)
+            const merged = App.utils.mergeDeep({}, entity, data)
+            await App.validation.validate({ user: client.user, ...merged }, validators,
+              { source: action, action, service, app, client })
             emit({
               type: eventName,
               identifiers: {
                 user: client.user
               },
-              data: properties || {}
+              data
             })
           }
         })
+        model.ownerCrud.update ??= actionName
         const action = service.actions[actionName]
         const validators = App.validation.getValidators(action, service, action)
       }
@@ -154,6 +162,7 @@ definition.processor(function(service, app) {
             })
           }
         })
+        model.ownerCrud.reset ??= actionName
       }
     }