@dwtechs/antity 0.17.0 → 0.18.0

package/dist/antity.js

@@ -24,8 +24,9 @@ SOFTWARE.
 https://github.com/DWTechs/Antity.js
 */
 
-import { isBoolean, isStringOfLength, isValidNumber, isValidInteger, isValidFloat, isEven, isOdd, isPositive, isNegative, isPowerOfTwo, isAscii, isArrayOfLength, isValidPassword, isEmail, isRegex, isJson, isJWT, isSymbol, isIpAddress, isSlug, isHexadecimal, isValidDate, isValidTimestamp, isFunction, isHtmlElement, isHtmlEventAttribute, isNode, isObject, isAnsiEscapeCode, isLocale, isTimeZone, isString, isProperty, isArray, isIn, isDate, isNumber, isInteger, isNil } from '@dwtechs/checkard';
+import { isBoolean, isStringOfLength, isValidNumber, isValidInteger, isValidFloat, isEven, isOdd, isPositive, isNegative, isPowerOfTwo, isAscii, isArrayOfLength, isEmail, isRegex, isJson, isJWT, isSymbol, isIpAddress, isSlug, isHexadecimal, isValidDate, isValidTimestamp, isFunction, isHtmlElement, isHtmlEventAttribute, isNode, isObject, isAnsiEscapeCode, isLocale, isTimeZone, isString, isProperty, isArray, isIn, isDate, isNumber, isInteger, isNil } from '@dwtechs/checkard';
 import { log } from '@dwtechs/winstan';
+import { isValidPassword } from '@dwtechs/passken';
 
 const LOGS_PREFIX = "Antity: ";
 const METHODS = ["PATCH", "PUT", "POST"];
@@ -77,12 +78,12 @@ const Types = {
     password: {
         validate: (v, min, max, _typeCheck) => {
             const o = {
-                minLength: min || PWD_MIN_LENGTH,
-                maxLength: max || PWD_MAX_LENGTH,
-                lowerCase: PWD_LOWERCASE,
-                upperCase: PWD_UPPERCASE,
-                number: PWD_NUMBERS,
-                specialCharacter: PWD_SYMBOLS,
+                minLen: min || PWD_MIN_LENGTH,
+                maxLen: max || PWD_MAX_LENGTH,
+                lcase: PWD_LOWERCASE,
+                ucase: PWD_UPPERCASE,
+                num: PWD_NUMBERS,
+                sym: PWD_SYMBOLS,
             };
             return isValidPassword(v, o, true);
         }
@@ -211,12 +212,10 @@ function trim(v) {
         return v.trim();
     if (isObject(v, true)) {
         const obj = v;
-        for (const k in obj) {
-            if (Object.prototype.hasOwnProperty.call(obj, k)) {
-                const o = obj[k];
-                if (isString(o, "!0", null))
-                    obj[k] = o.trim();
-            }
+        for (const k of Object.keys(obj)) {
+            const o = obj[k];
+            if (isString(o, "!0", null))
+                obj[k] = o.trim();
         }
     }
     return v;
@@ -281,20 +280,27 @@ function validate(record, properties, method) {
     return null;
 }
 
+const STANDARD_PROP_KEYS = new Set(['key', 'type', 'min', 'max', 'isPrivate', 'requiredFor', 'isTypeChecked', 'sanitizer', 'normalizer', 'validator']);
 class Entity {
     _name;
     _privateProps;
     _properties;
+    _propsByMethod;
     constructor(name, properties) {
         this._name = name;
         this._properties = [];
         this._privateProps = [];
+        this._propsByMethod = new Map(METHODS.map(m => [m, []]));
         for (const p of properties) {
             const prop = new Property(p.key, p.type, p.min, p.max, p.isPrivate, p.requiredFor, p.isTypeChecked, p.sanitizer, p.normalizer, p.validator);
-            Object.assign(prop, p);
+            for (const k of Object.keys(p))
+                if (!STANDARD_PROP_KEYS.has(k))
+                    prop[k] = p[k];
             this._properties.push(prop);
             if (prop.isPrivate)
                 this._privateProps.push(prop.key);
+            for (const m of prop.requiredFor)
+                this._propsByMethod.get(m)?.push(prop);
         }
     }
     get name() {
@@ -315,12 +321,7 @@ class Entity {
         return this.properties.find(p => p.key === key);
     }
     getPropsByMethod(method) {
-        const props = [];
-        for (const p of this.properties) {
-            if (p.requiredFor.includes(method))
-                props.push(p);
-        }
-        return props;
+        return this._propsByMethod.get(method) ?? [];
     }
     normalizeArray = (req, _res, next) => {
         log.debug(`normalizeArray ${this.name}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dwtechs/antity",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "Open source library for easy entity management",
   "keywords": [
     "entities"
@@ -35,6 +35,7 @@
   },
   "dependencies": {
     "@dwtechs/checkard": "3.6.0",
+    "@dwtechs/passken": "0.6.1",
     "@dwtechs/sparray": "0.2.1",
     "@dwtechs/winstan": "0.7.0"
   },