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

@live-change/user-service 0.9.197 → 0.9.198

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

@@ -154,6 +154,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 +172,27 @@ 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
           }
         })
+        const action = service.actions[actionName]
+        const validators = App.validation.getValidators(action, service, action)
       }
       if(config.ownerUpdateAccess || config.ownerWriteAccess) {
         const eventName = modelName + 'Updated'
@@ -210,8 +223,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,11 +230,16 @@ 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 }, validators,
+              { source: action, action, service, app, client })
             emit({
               type: eventName,
               [modelPropertyName]: entity.id,
               identifiers,
-              data: properties
+              data
             })
           }
         })

package/contactOrUserProperty.js CHANGED Viewed

@@ -241,7 +241,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 +249,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,
@@ -288,8 +289,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,10 +297,15 @@ 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
             })
           }
         })

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/user-service",
-  "version": "0.9.197",
+  "version": "0.9.198",
   "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.198",
+    "@live-change/relations-plugin": "^0.9.198",
     "pluralize": "^8.0.0"
   },
-  "gitHead": "8231c2ed8bc3beed2c732aa5727174417f19082b"
+  "gitHead": "7e485dcbaa2af7fb17052a40238210dc8bdf0c09"
 }

package/sessionOrUserItem.js CHANGED Viewed

@@ -210,6 +210,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 +226,33 @@ 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
           }
         })
+        const action = service.actions[actionName]
+        const validators = App.validation.getValidators(action, service, action)
       }
       if(config.ownerUpdateAccess || config.ownerWriteAccess) {
         const eventName = modelName + 'Updated'
@@ -272,10 +285,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,11 +292,17 @@ 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 }, validators,
+              { source: action, action, service, app, client })
             emit({
               type: eventName,
               [modelPropertyName]: entity.id,
               identifiers,
-              data: properties
+              data
             })
           }
         })

package/sessionOrUserProperty.js CHANGED Viewed

@@ -304,8 +304,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,10 +315,15 @@ 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
             })
           }
         })
@@ -376,14 +379,16 @@ 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
               })
             }
           }

package/userItem.js CHANGED Viewed

@@ -88,6 +88,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 +103,29 @@ 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
           }
         })
+        const action = service.actions[actionName]
+        const validators = App.validation.getValidators(action, service, action)
       }
       if(config.userUpdateAccess || config.userWriteAccess) {
         const eventName = modelName + 'Updated'
@@ -140,7 +153,9 @@ definition.processor(function(service, app) {
                 updateObject[propertyName] = properties[propertyName]
               }
             }
-            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)
             await App.validation.validate(merged, validators, { source: action, action, service, app, client })
             emit({
               type: eventName,
@@ -148,7 +163,7 @@ definition.processor(function(service, app) {
               identifiers: {
                 user: client.user,
               },
-              data: properties
+              data
             })
           }
         })

package/userProperty.js CHANGED Viewed

@@ -120,14 +120,17 @@ 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
             })
           }
         })