@dwtechs/antity 0.16.0 → 0.18.0

package/README.md

@@ -136,7 +136,10 @@ type Type =
   "htmlElement" |
   "htmlEventAttribute" |
   "node" |
-  "object";
+  "object" |
+  "ansiEscapeCode" |
+  "locale" |
+  "timeZone";
             
 type Method = "PATCH" | "PUT" | "POST";
 

package/dist/antity.d.ts

@@ -55,7 +55,10 @@ type Type =
   "htmlElement" |
   "htmlEventAttribute" |
   "node" |
-  "object";
+  "object" |
+  "ansiEscapeCode" |
+  "locale" |
+  "timeZone";
 
 declare class Entity {
   private _name;

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, 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"];
@@ -48,7 +49,7 @@ const Types = {
         validate: (v, min, max, typeCheck) => isValidNumber(v, min || undefined, max || undefined, typeCheck || undefined, true)
     },
     integer: {
-        validate: (v, min, max, typeCheck) => isValidInteger(v, min !== null && min !== void 0 ? min : undefined, max !== null && max !== void 0 ? max : undefined, typeCheck || undefined, true)
+        validate: (v, min, max, typeCheck) => isValidInteger(v, min ?? undefined, max ?? undefined, typeCheck || undefined, true)
     },
     float: {
         validate: (v, min, max, typeCheck) => isValidFloat(v, min || undefined, max || undefined, typeCheck || undefined, true)
@@ -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);
         }
@@ -131,10 +132,29 @@ const Types = {
     },
     object: {
         validate: (v, _min, _max, _typeCheck) => isObject(v, true)
+    },
+    ansiEscapeCode: {
+        validate: (v, _min, _max, _typeCheck) => isAnsiEscapeCode(v, true)
+    },
+    locale: {
+        validate: (v, _min, _max, typeCheck) => isLocale(v, typeCheck || undefined, true)
+    },
+    timeZone: {
+        validate: (v, _min, _max, _typeCheck) => isTimeZone(v, true)
     }
 };
 
 class Property {
+    key;
+    type;
+    min;
+    max;
+    isPrivate;
+    requiredFor;
+    isTypeChecked;
+    sanitizer;
+    normalizer;
+    validator;
     constructor(key, type, min, max, isPrivate, requiredFor, isTypeChecked, sanitizer, normalizer, validator) {
         try {
             isString(key, "!0", null, true);
@@ -180,8 +200,8 @@ function sanitize(v, cb) {
     if (cb)
         return cb(v);
     if (isArray(v, null, null)) {
-        for (let d of v) {
-            d = trim(d);
+        for (let i = 0; i < v.length; i++) {
+            v[i] = trim(v[i]);
         }
         return v;
     }
@@ -191,12 +211,11 @@ function trim(v) {
     if (isString(v, "!0"))
         return v.trim();
     if (isObject(v, true)) {
-        for (const k in v) {
-            if (Object.prototype.hasOwnProperty.call(v, k)) {
-                let o = v[k];
-                if (isString(o, "!0", null))
-                    o = o.trim();
-            }
+        const obj = v;
+        for (const k of Object.keys(obj)) {
+            const o = obj[k];
+            if (isString(o, "!0", null))
+                obj[k] = o.trim();
         }
     }
     return v;
@@ -208,7 +227,7 @@ function normalize(record, properties) {
         if (v) {
             log.debug(`sanitize ${key}: ${type} = ${v}`);
             v = sanitize(v, sanitizer);
-            if (isFunction(normalizer)) {
+            if (normalizer) {
                 log.debug(`normalize ${key}: ${type} = ${v}`);
                 v = normalizer(v);
             }
@@ -247,7 +266,7 @@ function require(v, key, type) {
 function validate(record, properties, method) {
     for (const { key, type, min, max, requiredFor, isTypeChecked, validator } of properties) {
         const v = record[key];
-        if (isIn(requiredFor, method)) {
+        if (requiredFor.includes(method)) {
             const rq = require(v, key, type);
             if (rq)
                 return rq;
@@ -261,71 +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.normalizeArray = (req, _res, next) => {
-            var _a;
-            log.debug(`normalizeArray ${this.name}`);
-            const rows = (_a = req.body) === null || _a === void 0 ? void 0 : _a.rows;
-            if (!isArray(rows, ">", 0))
-                return next({ statusCode: 400, message: `${LOGS_PREFIX}Normalize: no rows found in request body` });
-            for (const r of rows) {
-                normalize(r, this._properties);
-            }
-            next();
-        };
-        this.normalizeOne = (req, _res, next) => {
-            log.debug(`normalizeOne ${this.name}`);
-            const r = req.body;
-            if (!isObject(r, true))
-                return next({ statusCode: 400, message: `${LOGS_PREFIX}Normalize: no data found in request body` });
-            normalize(r, this._properties);
-            next();
-        };
-        this.validateArray = (req, _res, next) => {
-            var _a;
-            log.debug(`validateArray ${this.name}`);
-            const rows = (_a = req.body) === null || _a === void 0 ? void 0 : _a.rows;
-            const method = req.method;
-            if (!isArray(rows, ">", 0))
-                return next({ statusCode: 400, message: `${LOGS_PREFIX}Validate: no rows found in request body` });
-            if (!isIn(METHODS, method))
-                return next({
-                    statusCode: 400,
-                    message: `${LOGS_PREFIX}Invalid REST method. Received: ${method}. Must be one of: ${METHODS.toString()}`
-                });
-            for (const r of rows) {
-                const error = validate(r, this._properties, method);
-                if (error)
-                    return next(error);
-            }
-            next();
-        };
-        this.validateOne = (req, _res, next) => {
-            log.debug(`validateOne ${this.name}`);
-            const record = req.body;
-            const method = req.method;
-            if (!isObject(record, true))
-                return next({ statusCode: 400, message: `${LOGS_PREFIX}Validate: no data found in request body` });
-            if (!isIn(METHODS, method))
-                return next({
-                    statusCode: 400,
-                    message: `${LOGS_PREFIX}Invalid REST method. Received: ${method}. Must be one of: ${METHODS.toString()}`
-                });
-            const error = validate(record, this._properties, method);
-            if (error)
-                return next(error);
-            next();
-        };
         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() {
@@ -346,13 +321,70 @@ class Entity {
         return this.properties.find(p => p.key === key);
     }
     getPropsByMethod(method) {
-        const props = [];
-        for (const p of this.properties) {
-            if (isIn(p.requiredFor, method, 0))
-                props.push(p);
-        }
-        return props;
+        return this._propsByMethod.get(method) ?? [];
     }
+    normalizeArray = (req, _res, next) => {
+        log.debug(`normalizeArray ${this.name}`);
+        const rows = req.body?.rows;
+        if (!isArray(rows, ">", 0)) {
+            next({ statusCode: 400, message: `${LOGS_PREFIX}Normalize: no rows found in request body` });
+            return;
+        }
+        for (const r of rows) {
+            normalize(r, this._properties);
+        }
+        next();
+    };
+    normalizeOne = (req, _res, next) => {
+        log.debug(`normalizeOne ${this.name}`);
+        const r = req.body;
+        if (!isObject(r, true)) {
+            next({ statusCode: 400, message: `${LOGS_PREFIX}Normalize: no data found in request body` });
+            return;
+        }
+        normalize(r, this._properties);
+        next();
+    };
+    validateArray = (req, _res, next) => {
+        log.debug(`validateArray ${this.name}`);
+        const rows = req.body?.rows;
+        const method = req.method;
+        if (!isArray(rows, ">", 0)) {
+            next({ statusCode: 400, message: `${LOGS_PREFIX}Validate: no rows found in request body` });
+            return;
+        }
+        if (!METHODS.includes(method)) {
+            next({ statusCode: 400, message: `${LOGS_PREFIX}Invalid REST method. Received: ${method}. Must be one of: ${METHODS.toString()}` });
+            return;
+        }
+        for (const r of rows) {
+            const error = validate(r, this._properties, method);
+            if (error) {
+                next(error);
+                return;
+            }
+        }
+        next();
+    };
+    validateOne = (req, _res, next) => {
+        log.debug(`validateOne ${this.name}`);
+        const record = req.body;
+        const method = req.method;
+        if (!isObject(record, true)) {
+            next({ statusCode: 400, message: `${LOGS_PREFIX}Validate: no data found in request body` });
+            return;
+        }
+        if (!METHODS.includes(method)) {
+            next({ statusCode: 400, message: `${LOGS_PREFIX}Invalid REST method. Received: ${method}. Must be one of: ${METHODS.toString()}` });
+            return;
+        }
+        const error = validate(record, this._properties, method);
+        if (error) {
+            next(error);
+            return;
+        }
+        next();
+    };
 }
 
 export { Entity };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dwtechs/antity",
-  "version": "0.16.0",
+  "version": "0.18.0",
   "description": "Open source library for easy entity management",
   "keywords": [
     "entities"
@@ -13,8 +13,7 @@
     "url": "https://github.com/DWTechs/Antity.js"
   },
   "bugs": {
-    "url": "https://github.com/DWTechs/Antity.js/issues",
-    "email": ""
+    "url": "https://github.com/DWTechs/Antity.js/issues"
   },
   "license": "MIT",
   "author": {
@@ -22,36 +21,34 @@
     "email": "http://www.lcluber.com/contact",
     "url": "http://www.lcluber.com"
   },
-  "contributors": [],
   "scripts": {
-    "start": "",
     "prebuild": "npm install",
     "build": "node ./scripts/clear && tsc && npm run rollup && node ./scripts/copy && npm run test",
-    "rollup:mjs": "rollup --config rollup.config.mjs",
-    "rollup:cjs": "rollup --config rollup.config.cjs.mjs",
-    "rollup": "npm run rollup:mjs",
-    "test": "jest --coverage --config jest.config.js"
+    "rollup": "rollup --config rollup.config.mjs",
+    "test": "jest --coverage"
   },
   "files": [
     "dist/"
   ],
+    "engines": {
+    "node": ">= 22"
+  },
   "dependencies": {
-    "@dwtechs/checkard": "3.5.1",
-    "@dwtechs/winstan": "0.4.0",
-    "@dwtechs/sparray": "0.2.1"
+    "@dwtechs/checkard": "3.6.0",
+    "@dwtechs/passken": "0.6.1",
+    "@dwtechs/sparray": "0.2.1",
+    "@dwtechs/winstan": "0.7.0"
   },
   "devDependencies": {
     "@babel/core": "7.26.0",
     "@babel/preset-env": "7.26.0",
-    "@rollup/plugin-commonjs": "28.0.1",
-    "@rollup/plugin-node-resolve": "15.3.0",
+    "@types/express": "5.0.6",
     "@types/jest": "29.5.14",
-    "@types/node": "22.10.1",
-    "@types/express": "5.0.0",
+    "@types/node": "25.6.0",
     "babel-jest": "29.7.0",
     "core-js": "3.33.0",
     "jest": "29.7.0",
     "rollup": "4.24.0",
-    "typescript": "5.8.3"
+    "typescript": "6.0.3"
   }
 }