@wabot-dev/framework 0.2.0-beta.6 → 0.2.0-beta.8

package/dist/src/addon/auth/api-key/ApiKey.js

@@ -13,6 +13,9 @@ class ApiKey extends Entity {
     get metadata() {
         return this.data.metadata ?? {};
     }
+    get name() {
+        return this.data.name;
+    }
     setAuthInfo(authInfo) {
         this.data.authInfo = authInfo;
     }

package/dist/src/core/validation/core/validateModel.js

@@ -4,23 +4,29 @@ function validateModel(value, info) {
     }
     let propertiesErrors = {};
     let resultValue = new info.modelConstructor();
+    const properties = [];
+    const getters = [];
     for (const propertyName in info.properties) {
-        const propertyInfo = info.properties[propertyName];
-        const propertyValidators = propertyInfo.validators ?? [];
         const descriptor = Object.getOwnPropertyDescriptor(Object.getPrototypeOf(resultValue), propertyName);
-        const hasSetterOrWritable = !descriptor || descriptor.set || descriptor.writable;
-        const originalValue = value[propertyName];
-        if (propertyInfo.isOptional && originalValue == null) {
-            continue;
+        if (descriptor?.get) {
+            getters.push(propertyName);
         }
-        let currentValue = originalValue;
-        if (resultValue[propertyName] == null && propertyInfo.isOptional) {
+        if (!descriptor?.set && !descriptor?.get) {
+            properties.push(propertyName);
+        }
+    }
+    for (const propertyName of properties) {
+        const propertyInfo = info.properties[propertyName];
+        const propertyValidators = propertyInfo.validators ?? [];
+        let currentPropValue = propertyInfo.isOptional
+            ? (value[propertyName] ?? resultValue[propertyName])
+            : value[propertyName];
+        if (currentPropValue == null && propertyInfo.isOptional) {
             resultValue[propertyName] = undefined;
             continue;
         }
         for (let propertyValidatorInfo of propertyValidators) {
-            const propertyValidatorResult = propertyValidatorInfo.validator(currentValue, propertyValidatorInfo.validatorOptions);
-            currentValue = propertyValidatorResult.value;
+            const propertyValidatorResult = propertyValidatorInfo.validator(currentPropValue, propertyValidatorInfo.validatorOptions);
             if (propertyValidatorResult.error) {
                 let propertyErrors = propertiesErrors[propertyName];
                 if (!propertyErrors) {
@@ -29,9 +35,29 @@ function validateModel(value, info) {
                 }
                 propertyErrors.push(propertyValidatorResult.error.description);
             }
+            else {
+                currentPropValue = propertyValidatorResult.value;
+            }
+        }
+        resultValue[propertyName] = currentPropValue;
+    }
+    for (const propertyName of getters) {
+        const propertyInfo = info.properties[propertyName];
+        const propertyValidators = propertyInfo.validators ?? [];
+        let propValue = resultValue[propertyName];
+        if (propValue == null && propertyInfo.isOptional) {
+            continue;
         }
-        if (hasSetterOrWritable) {
-            resultValue[propertyName] = currentValue;
+        for (let propertyValidatorInfo of propertyValidators) {
+            const propertyValidatorResult = propertyValidatorInfo.validator(propValue, propertyValidatorInfo.validatorOptions);
+            if (propertyValidatorResult.error) {
+                let propertyErrors = propertiesErrors[propertyName];
+                if (!propertyErrors) {
+                    propertyErrors = [];
+                    propertiesErrors[propertyName] = propertyErrors;
+                }
+                propertyErrors.push(propertyValidatorResult.error.description);
+            }
         }
     }
     if (Object.keys(propertiesErrors).length > 0) {

package/dist/src/index.d.ts

@@ -1015,6 +1015,7 @@ declare class ApiKey<A extends IStorableData> extends Entity<IApiKeyData<A>> {
     static hashSecret(secret: string): string;
     get authInfo(): A;
     get metadata(): Record<string, string>;
+    get name(): string;
     setAuthInfo(authInfo: A): void;
     generateSecret(): string;
     isValidSecret(secret: string): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wabot-dev/framework",
-  "version": "0.2.0-beta.6",
+  "version": "0.2.0-beta.8",
   "description": "Framework for IA Chat Bots",
   "type": "module",
   "main": "dist/src/index.js",