使用 @param 验证接口

hydro/lib/validator.ts

@@ -8,9 +8,12 @@ const RE_ROLE = /^[_0-9A-Za-z]{1,256}$/i;
 const RE_MAIL = /^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)+$/i;
 
 // eslint-disable-next-line consistent-return
-function _validate(scheme: any, arg: any, base: string) {
+function _validate(scheme: any, arg: any, base: string): void {
     if (!(scheme instanceof Object)) return _validate({ $type: scheme }, arg, base);
-    if (scheme.$validate) scheme.$validate(arg);
+    if (scheme.$validate) {
+        const result = scheme.$validate(arg);
+        if (result === false) throw new ValidationError(base);
+    }
     if (scheme.$group) _validate(scheme.$group, arg, base);
     if (scheme.$or) {
         if (scheme.$or instanceof Array) {
@@ -38,11 +41,15 @@ function _validate(scheme: any, arg: any, base: string) {
     if (scheme.$and) for (const s of scheme.$and) _validate(s, arg, base);
     if (scheme.$type) {
         if (typeof scheme.$type === 'string') {
-            if (!typeof arg === scheme.$type) {
-                throw new ValidationError();
+            if (!scheme.$type.endsWith('?')) {
+                if (!typeof arg === scheme.$type) {
+                    throw new ValidationError(base);
+                }
+            } else if (arg && !scheme.$type.includes(typeof arg)) {
+                throw new ValidationError(base);
             }
         } else if (!(arg instanceof scheme.$type)) {
-            throw new ValidationError();
+            throw new ValidationError(base);
         }
     }
     if (scheme.$eq && scheme.$eq !== arg) throw new ValidationError(base);
@@ -54,30 +61,32 @@ function _validate(scheme: any, arg: any, base: string) {
             if (arg instanceof Object) {
                 _validate(scheme[key], arg[key], `${base}.${key}`);
             } else {
-                throw new ValidationError();
+                throw new ValidationError(base);
             }
         }
     }
 }
 
-function descriptor(scheme: any) {
-    return function desc(target: any, name: string, descriptor: any) {
-        const originalMethod = descriptor.value;
-        descriptor.value = function val(...args: any[]) {
+function descriptor(scheme: any): Function {
+    return function desc(target: any, name: string, obj: any) {
+        const originalMethod = obj.value;
+        obj.value = function func(...args: any[]) {
             _validate(scheme, args[0], '');
             return originalMethod.call(this, ...args);
         };
-        return descriptor;
+        return obj;
     };
 }
 
-export function validate(scheme: any, arg: any) {
-    if (arguments.length === 1) return descriptor(scheme);
-    return _validate(scheme, arg, '');
+export function validate(scheme: any): Function;
+export function validate(scheme: any, arg: any): void;
+export function validate(...args: any[]): any {
+    if (args.length === 1) return descriptor(args[0]);
+    return _validate(args[0], args[1], '');
 }
 
 export const isTitle = (s) => s && s.length < 64;
-export const checkTitle = (s) => { if (!isTitle(s)) throw new ValidationError('title'); else return s; };
+export const checkTitle = (s) => { if (!(s && s.length < 64)) throw new ValidationError('title'); else return s; };
 export const isUid = (s) => RE_UID.test(s);
 export const checkUid = (s) => { if (!isUid(s)) throw new ValidationError('uid'); else return s; };
 export const isUname = (s) => RE_UNAME.test(s);
@@ -85,22 +94,22 @@ export const checkUname = (s) => { if (!isUname(s)) throw new ValidationError('u
 export const isRole = (s) => RE_ROLE.test(s);
 export const checkRole = (s) => { if (!isRole(s)) throw new ValidationError('role'); else return s; };
 export const isPassword = (s) => s.length >= 5;
-export const checkPassword = (s) => { if (!isPassword(s)) throw new ValidationError('password'); else return s; };
+export const checkPassword = (s) => { if (!(s && s.length >= 5)) throw new ValidationError('password'); else return s; };
 export const isEmail = (s) => RE_MAIL.test(s);
-export const checkEmail = (s) => { if (!isEmail(s)) throw new ValidationError('mail'); else return s; };
-export const isContent = (s) => s && s.length < 65536;
-export const checkContent = (s) => { if (!isContent(s)) throw new ValidationError('content'); else return s; };
+export const checkEmail = (s) => { if (!RE_MAIL.test(s)) throw new ValidationError('mail'); else return s; };
+export const isContent = (s: any) => s && s.length < 65536;
+export const checkContent = (s) => { if (!(s && s.length < 65536)) throw new ValidationError('content'); else return s; };
 export const isName = (s) => s && s.length < 256;
 export const checkName = (s) => { if (!isName(s)) throw new ValidationError('name'); else return s; };
 export const isPid = (s) => RE_PID.test(s.toString());
 export const checkPid = (s) => { if (!RE_PID.test(s)) throw new ValidationError('pid'); else return s; };
 export const isIntro = () => true;
 export const checkIntro = (s) => { if (!isIntro()) throw new ValidationError('intro'); else return s; };
-export const isDescription = () => true;
-export const checkDescription = (s) => { if (!isDescription()) throw new ValidationError('description'); else return s; };
+export const isDescription = (s: any) => s && s.length < 65536;
+export const checkDescription = (s) => { if (!(s && s.length < 65536)) throw new ValidationError('description'); else return s; };
 
 global.Hydro.lib.validator = {
-    validate: _validate,
+    validate,
     isTitle,
     checkTitle,
     isUid,