feat:重构校验器

Author: pedro

lib/extend.ts

@@ -2,8 +2,7 @@ import Application from "koa";
 import { HttpException } from "./exception";
 import consola from "consola";
 import { toLine, unsets } from "./util";
-import { JsonMixin } from "./mixin";
-import { get, remove, findIndex, isArray, isObject, isMap, set } from "lodash";
+import { get, set } from "lodash";
 
 /**
  * 将返回的结果json序列化
@@ -18,83 +17,18 @@ export const json = (app: Application) => {
     unsets(obj, hide);
     let data = Object.create(null);
     if (obj instanceof HttpException) {
-      transform1(obj, data);
+      transform(obj, data);
       set(data, "url", this.request.url);
       this.status = obj.code;
     } else {
-      // data = jsonUnmarshal(obj);
-      // data = transform2(obj);
       data = obj;
     }
     this.body = JSON.stringify(data);
   };
 };
 
-function jsonUnmarshal(obj: any) {
-  let data = Object.create(null);
-  if (isObject(obj)) {
-    if (obj instanceof JsonMixin) {
-      transform1(obj, data);
-    } else if (isMap(obj)) {
-      obj.forEach((v, k) => {
-        if (isObject(v)) {
-          data[toLine(k)] = jsonUnmarshal(v);
-        } else {
-          data[toLine(k)] = v;
-        }
-      });
-    } else if (isArray(obj)) {
-      obj.forEach(v => {
-        if (isObject(v)) {
-          v = jsonUnmarshal(v);
-        }
-      });
-    } else {
-      Object.keys(obj).forEach(key => {
-        if (isObject(obj[key])) {
-          data[toLine(key)] = jsonUnmarshal(obj[key]);
-        } else {
-          data[toLine(key)] = obj[key];
-        }
-      });
-    }
-  } else {
-    data = obj;
-  }
-  return data;
-}
-
-function transform2(obj: any) {
-  let data;
-  if (isArray(obj)) {
-    data = [];
-    obj.forEach((it, index) => {
-      data[index] = transform2(it);
-    });
-  } else {
-    data = Object.create(null);
-    const fields: string[] = Object.keys(obj);
-    fields.forEach(field => {
-      data[toLine(field)] = get(obj, field);
-    });
-  }
-  return data;
-}
-
-function transform1(obj: any, data: any) {
-  const fields: string[] = get(obj, "fields", []);
-  fields.forEach(field => {
-    data[toLine(field)] = get(obj, field);
-  });
-}
-
-function transform(obj: any, hide: Array<any>, data: any) {
+function transform(obj: any, data: any) {
   const fields: string[] = get(obj, "fields", []);
-  if (isArray(hide) && hide.length > 0) {
-    remove(fields, item => {
-      return findIndex(hide, item as any) !== -1;
-    });
-  }
   fields.forEach(field => {
     data[toLine(field)] = get(obj, field);
   });

lib/lin-validator.ts

@@ -31,16 +31,16 @@ export class LinValidator {
 
   async validate(ctx: Context, alias?: {}) {
     this.alias = alias;
-    const params = Object.assign(
-      {},
-      ctx.request.body,
-      ctx.request.query,
-      ctx.params,
-      ctx.request.header
-    );
-    for (const it of Object.keys(params)) {
-      set(this.data, it, get(params, it));
-    }
+    this.data = {
+      body: ctx.request.body,
+      query: ctx.request.query,
+      path: ctx.params,
+      header: ctx.request.header
+    };
+    this.parsed = {
+      ...this.data,
+      default: {}
+    };
     if (!(await this.checkRules())) {
       let obj = {};
       if (this.errors.length === 1) {
@@ -106,7 +106,9 @@ export class LinValidator {
       const value = this[key];
       let defaultVal;
       // 如果没有传入这个参数，检查这个校验链中是否有 isOptional 如果有通过，否则抛异常
-      if (extendedValidator.isEmpty(this.data[key])) {
+      // 去data下找key，二级目录查找 dataKey 为一级目录的路径
+      const [dataKey, dataVal] = this.findInData(key);
+      if (dataVal === void 0) {
         let msg: string | undefined;
         if (isArray(value)) {
           for (const it of value) {
@@ -132,7 +134,7 @@ export class LinValidator {
         if (!optional) {
           this.errors.push({ key, message: msg || `${key}不可为空` });
         } else {
-          this.data[key] = defaultVal;
+          this.parsed["default"][key] = defaultVal;
         }
       } else {
         if (isArray(value)) {
@@ -142,17 +144,17 @@ export class LinValidator {
             if (!stoppedFlag && !it.optional) {
               let valid: boolean;
               if (isAsyncFunction(it.validate)) {
-                valid = await it.validate(this.data[key]);
+                valid = await it.validate(this.data[dataKey][key]);
               } else {
-                valid = it.validate(this.data[key]);
+                valid = it.validate(this.data[dataKey][key]);
               }
               if (!valid) {
                 errs.push(it.message);
                 // 如果当前key已有错误，则置stoppedFlag为true，后续会直接跳过校验
                 stoppedFlag = true;
               }
             }
-            it.parsedValue && (this.parsed[key] = it.parsedValue);
+            it.parsedValue && (this.parsed[dataKey][key] = it.parsedValue);
           }
           if (errs.length !== 0) {
             this.errors.push({ key, message: errs });
@@ -162,17 +164,17 @@ export class LinValidator {
           if (!stoppedFlag && !value.optional) {
             let valid: boolean;
             if (isAsyncFunction(value.validate)) {
-              valid = await value.validate(this.data[key]);
+              valid = await value.validate(this.data[dataKey][key]);
             } else {
-              valid = value.validate(this.data[key]);
+              valid = value.validate(this.data[dataKey][key]);
             }
             if (!valid) {
               errs.push(value.message);
               // 如果当前key已有错误，则置stoppedFlag为true，后续会直接跳过校验
               stoppedFlag = true;
             }
           }
-          value.parsedValue && (this.parsed[key] = value.parsedValue);
+          value.parsedValue && (this.parsed[dataKey][key] = value.parsedValue);
           if (errs.length !== 0) {
             this.errors.push({ key, message: errs });
           }
@@ -227,12 +229,25 @@ export class LinValidator {
       if (key) {
         return key;
       } else {
-        return get(this.data, path, defaultVal && defaultVal);
+        const index = path.lastIndexOf(".");
+        const suffix = path.substring(index + 1, path.length);
+        return get(this.parsed["default"], suffix, defaultVal && defaultVal);
       }
     } else {
       return get(this.data, path, defaultVal && defaultVal);
     }
   }
+
+  private findInData(key: string) {
+    const keys = Object.keys(this.data);
+    for (const k of keys) {
+      const val = get(this.data[k], key);
+      if (val !== void 0) {
+        return [k, val];
+      }
+    }
+    return [];
+  }
 }
 
 export class Rule {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lin-mizar",
-  "version": "0.0.1-alpha.1",
+  "version": "0.0.1-alpha.2",
   "description": "The core library of Lin CMS",
   "main": "lin/index.js",
   "scripts": {