validno 0.3.2 → 0.3.4

package/dist/engine/methods/handleKey.js

@@ -5,23 +5,22 @@ function validateKeyValue(params) {
     const missedCheck = [];
     const typeChecked = [];
     const rulesChecked = [];
-    if (hasMissing || !data) {
+    if (hasMissing) {
         return this.handleMissingKeyValidation({ results, key, nestedKey, data, reqs, missedCheck });
     }
-    this.validateType({ results, key, value: data[key], reqs, nestedKey, typeChecked });
-    this.validateRules({ results, nestedKey, value: data[key], reqs, data, rulesChecked });
+    const keyValue = data ? data[key] : undefined;
+    this.validateType({ results, key, value: keyValue, reqs, nestedKey, typeChecked });
+    this.validateRules({ results, nestedKey, value: keyValue, reqs, data, rulesChecked });
     return this.finishValidation({ results, nestedKey, missedCheck, typeChecked, rulesChecked });
 }
 function validateKey(input) {
-    let { results, key, nestedKey, data, reqs } = input;
+    let { results, key, nestedKey = key, data, reqs } = input;
     if (data === undefined) {
         const noDataResult = new ValidnoResult();
         noDataResult.setNoData(nestedKey);
     }
     if (!results)
         results = new ValidnoResult();
-    if (!nestedKey)
-        nestedKey = key;
     const hasMissing = _helpers.hasMissing(input);
     if (_helpers.checkNestedIsMissing(reqs, data)) {
         return this.handleMissingNestedKey(nestedKey, results);

package/dist/engine/methods/validateType.js

@@ -2,6 +2,7 @@ import { ValidationDetails, ValidationIds } from "../../constants/details.js";
 import _validations from "../../utils/validations.js";
 import _errors from "../../utils/errors.js";
 import _validateType from "../../utils/validateType.js";
+import isObjectId from "../../utils/isObjectId.js";
 const validateUnionType = (key, value, requirements, keyName = key) => {
     const typeList = Array.isArray(requirements.type)
         ? requirements.type.map((el) => String((el === null || el === void 0 ? void 0 : el.name) || el))
@@ -116,7 +117,8 @@ const handleTypeValidation = (key, value, requirements, keyName = key) => {
         default: {
             const isInstanceOf = typeof typeBySchema === 'function' && value instanceof typeBySchema;
             const isConstructorSame = typeof typeBySchema === 'function' && ((_a = value.constructor) === null || _a === void 0 ? void 0 : _a.name) === (typeBySchema === null || typeBySchema === void 0 ? void 0 : typeBySchema.name);
-            const isOK = isInstanceOf && isConstructorSame;
+            const isBothObjectId = isObjectId(value, typeBySchema);
+            const isOK = (isInstanceOf && isConstructorSame) || (isBothObjectId);
             result.push(_validateType.getResult(keyName, isOK, getDetails(isOK)));
         }
     }

package/dist/utils/isObjectId.js

@@ -0,0 +1,6 @@
+const isObjectId = (value, expectedType) => {
+    const isObjectId = typeof value === 'object' && (value === null || value === void 0 ? void 0 : value.constructor.name) === 'ObjectId';
+    const isTypeObjectId = typeof expectedType === 'function' && expectedType.name === 'ObjectId';
+    return (isObjectId && isTypeObjectId);
+};
+export default isObjectId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "validno",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "A lightweight TypeScript validation library for runtime data validation.",
   "main": "dist/index.js",
   "scripts": {
@@ -22,7 +22,8 @@
     "@types/jest": "^29.5.13",
     "@types/node": "^18.14.2",
     "eslint": "^8.14.0",
-    "jest": "^29.7.0"
+    "jest": "^29.7.0",
+    "mongodb": "^6.19.0"
   },
   "directories": {
     "test": "tests"