wip

Author: bitnbytesio

CHANGELOG.md

@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.6.0]
+
+### Fixed
+- [issue/71](https://github.com/bitnbytesio/node-input-validator/issues/71), [PR](https://github.com/bitnbytesio/node-input-validator/pull/82)
+- performance improvement
+
+## [4.5.1]
+
+### Fixed
+- fix vulnerable deps
+
 ## [4.3.3]
 
 ### Fixed

lib/validator.js

@@ -60,6 +60,21 @@ class Validator {
 
     // parse validations collection, this should be after all assignments
     this.parseRules(validationsRules);
+
+    // @beta feature
+    const state = {};
+    this.inputsAsPerRules = { state, data: state };
+    this.collectDeclaredInputs = false;
+  }
+
+  /**
+   * @beta
+   * added in v4.6.
+   * get inputs as per declared rules
+   * @returns
+   */
+  data() {
+    return this.inputsAsPerRules.data;
   }
 
   /**
@@ -329,6 +344,10 @@ class Validator {
       return;
     }
 
+    // get value
+    validation.value = this.parseValue(attr);
+    const isEmpty = empty.reallyEmpty(validation.value);
+
     // collection of async rules
     const rulesPromise = [];
     const rulesPromiseProps = [];
@@ -337,9 +356,6 @@ class Validator {
     for (let r = 0; r < rulesLen; r++) {
       const { rule, args } = attrRules[r];
 
-      // get value
-      validation.value = this.parseValue(attr);
-
       // return if nullable or value is null
       if (rule === 'nullable' || (validation.nullable === true && validation.value === null)) {
         continue;
@@ -350,7 +366,7 @@ class Validator {
       }
 
       // if value is really empty, skip validation
-      if (!validation.required && empty.reallyEmpty(validation.value)) {
+      if (!validation.required && isEmpty) {
         continue;
       }
 
@@ -379,7 +395,8 @@ class Validator {
         if (this.breakWhenFailed) {
           // add error
           this.addError(attr, rule, message);
-          return;
+          break;
+          // return;
         }
         this.appendError(attr, rule, message);
       }
@@ -409,6 +426,25 @@ class Validator {
         return true;
       });
     }
+    // @beta feature
+    let state = this.inputsAsPerRules.data;
+    // eslint-disable-next-line no-restricted-syntax
+    for (const key of attr.split('.')) {
+      if (typeof validation.value === 'object') {
+        // @ts-ignore
+        // eslint-disable-next-line no-multi-assign
+        state = state[key] = Array.isArray(validation.value) ? [] : {};
+        continue;
+      }
+      if (state[key]) {
+        state = state[key];
+        continue;
+      }
+      if (typeof state[key] === 'object') {
+        state[key] = validation.value;
+      }
+    }
+    // this.inputsAsPerRules.data[attr] = validation.value;
   }
 
   async postApply(rule) {

package-lock.json

@@ -51,8 +51,6 @@
   ],
   "license": "ISC",
   "devDependencies": {
-    "@types/mocha": "^5.2.7",
-    "@types/moment": "^2.13.0",
     "@types/node": "^12.19.14",
     "@types/validator": "^10.11.3",
     "eslint": "^6.8.0",
@@ -67,8 +65,8 @@
     "image-size": "^0.8.3",
     "lodash.has": "^4.5.2",
     "mime-types": "^2.1.28",
-    "moment": "^2.29.1",
+    "moment": "^2.29.4",
     "read-chunk": "^3.2.0",
-    "validator": "^13.5.2"
+    "validator": "^13.7.0"
   }
 }

package.json

@@ -0,0 +1,27 @@
+const { Validator } = require('../lib/index.js');
+
+const v = new Validator(
+  {
+    order: {
+      price: 100,
+      items: [
+        { id: 1, quantity: 2, _v: 2 },
+        { id: 2, quantity: 4, _v: 2 },
+      ],
+      _v: 1,
+    },
+    extra: 1,
+    _v: 1,
+  },
+  {
+    order: 'object',
+    'order.price': 'numeric',
+    'order.items': 'array',
+    'order.items.*.id': 'numeric',
+    'order.items.*.quantity': 'numeric',
+  },
+);
+
+v.validate().then(passed => {
+  console.log(passed, v.errors, v.data());
+});