validno 0.1.2 → 0.1.3

package/dist/Schema.js

@@ -1,5 +1,4 @@
 import validate from "./validate.js";
-import validateKey from "./validateKey.js";
 export const defaultSchemaKeys = [
     "required",
     "type",
@@ -10,10 +9,7 @@ export class Schema {
     constructor(inputSchema) {
         this.schema = inputSchema;
     }
-    validate(data) {
-        return validate.call(this, this, data);
-    }
-    validateKey(key, data) {
-        return validateKey.call(this, this, data, key);
+    validate(data, keys) {
+        return validate.call(this, this, data, keys);
     }
 }

package/dist/app.js

@@ -10,13 +10,20 @@ const schema = new Schema({
         rules: {
             min: 3
         }
-    }
+    },
+    val3: {
+        type: String,
+        required: true,
+    },
 });
 const testObj = {
     val: 'string',
-    val2: 1
+    val2: 1,
+    val3: 'ss'
 };
-const res = schema.validate(testObj);
-const res2 = schema.validateKey('val2', testObj);
+const resAll = schema.validate(testObj);
+const res = schema.validate(testObj, ['val', 'val2']);
+const res2 = schema.validate(testObj, 'val2');
+console.log(resAll);
 console.log(res);
 console.log(res2);

package/dist/validate.js

@@ -101,11 +101,17 @@ export const handleReqKey = (key, data, reqs, deepKey = key) => {
     results.byKeys[deepKey] = (missedCheck.length + typeChecked.length + rulesChecked.length) === 0;
     return results;
 };
-const validate = (schema, data) => {
+const isCheckNeeded = (key, hasLimits, onlyKeys) => {
+    return !hasLimits || (key === onlyKeys || Array.isArray(onlyKeys) && (onlyKeys === null || onlyKeys === void 0 ? void 0 : onlyKeys.includes(key)));
+};
+const validate = (schema, data, onlyKeys) => {
     let results = getResultDefaults();
+    const areKeysLimited = (Array.isArray(onlyKeys) && onlyKeys.length > 0) || (typeof onlyKeys === 'string' && onlyKeys.length > 0);
     for (const [key, reqs] of Object.entries(schema.schema)) {
-        const keyResult = handleReqKey(key, data, reqs);
-        results = mergeResults(results, keyResult);
+        if (isCheckNeeded(key, areKeysLimited, onlyKeys)) {
+            const keyResult = handleReqKey(key, data, reqs);
+            results = mergeResults(results, keyResult);
+        }
     }
     if (results.failed.length)
         results.ok = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "validno",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/Schema.ts

@@ -1,5 +1,4 @@
 import validate from "./validate.js"
-import validateKey from "./validateKey.js"
 
 export type TSchemaItem = {
     required: boolean,
@@ -35,11 +34,7 @@ export class Schema {
         this.schema = inputSchema
     }
 
-    validate(data: any) {
-        return validate.call(this, this, data)
-    }
-
-    validateKey(key: string, data: any) {
-        return validateKey.call(this, this, data, key)
+    validate(data: any, keys?: string | string[]) {
+        return validate.call(this, this, data, keys)
     }
 }

package/src/app.ts

@@ -44,16 +44,23 @@ const schema = new Schema({
     rules: {
       min: 3
     }
-  }
+  },
+  val3: {
+    type: String,
+    required: true,
+  },
 })
 
 const testObj = {
   val: 'string',
-  val2: 1
+  val2: 1,
+  val3: 'ss'
 }
 
-const res = schema.validate(testObj)
-const res2 = schema.validateKey('val2', testObj)
+const resAll = schema.validate(testObj)
+const res = schema.validate(testObj, ['val', 'val2'])
+const res2 = schema.validate(testObj, 'val2')
 
+console.log(resAll)
 console.log(res)
 console.log(res2)

package/src/validate.ts

@@ -154,14 +154,21 @@ export const handleReqKey = (key: string, data: any, reqs: TSchemaInput, deepKey
   return results
 }
 
-const validate = (schema: Schema, data: any): TResult => {
+const isCheckNeeded = (key: string, hasLimits: boolean, onlyKeys?: string | string[]) => {
+  return !hasLimits || (key === onlyKeys || Array.isArray(onlyKeys) && onlyKeys?.includes(key))
+}
+
+const validate = (schema: Schema, data: any, onlyKeys?: string | string[]): TResult => {
     let results: TResult = getResultDefaults()
-  
+    const areKeysLimited = (Array.isArray(onlyKeys) && onlyKeys.length > 0) || (typeof onlyKeys === 'string' && onlyKeys.length > 0)
+
     for (const [key, reqs] of Object.entries(schema.schema)) {
-      // @ts-ignore
-      const keyResult = handleReqKey(key, data, reqs)
+      if (isCheckNeeded(key, areKeysLimited, onlyKeys)) {
+        // @ts-ignore
+        const keyResult = handleReqKey(key, data, reqs)
 
-      results = mergeResults(results, keyResult)
+        results = mergeResults(results, keyResult)
+      }
     }
   
     if (results.failed.length) results.ok = false

package/src/validateKey.ts

@@ -1,21 +0,0 @@
-import { Schema } from "./Schema.js";
-import { getResultDefaults, handleReqKey, mergeResults, TResult } from "./validate.js";
-
-const validateKey = (schema: Schema, data: any, key: string): TResult => {
-    if (key in schema.schema === false) {
-      throw new Error(`Ключ ${key} отсутствует в схеме`)
-    }
-
-    let results: TResult = getResultDefaults()
-    //@ts-ignore
-    const keyResult = handleReqKey(key, data, schema.schema[key])
-
-    results = mergeResults(results, keyResult)
-
-    if (results.failed.length) results.ok = false
-    else results.ok = true
-    
-    return results;
-};
-
-export default validateKey;