@atomiqlabs/lp-lib 17.6.0 → 17.6.1

package/src/utils/paramcoders/ParamDecoder.ts

@@ -1,4 +1,11 @@
-import {FieldTypeEnum, parseBigInt, RequestSchema, RequestSchemaResult, verifySchema} from "./SchemaVerifier";
+import {
+    FieldTypeEnum,
+    parseBigInt,
+    RequestSchema,
+    RequestSchemaResult,
+    verifySchema,
+    verifySchemaField
+} from "./SchemaVerifier";
 import {IParamReader} from "./IParamReader";
 
 
@@ -133,41 +140,7 @@ export class ParamDecoder implements IParamReader {
         const resultSchema: any = {};
         for(let fieldName in schema) {
             const val: any = await this.getParam(fieldName);
-            const type: FieldTypeEnum | RequestSchema | ((val: any) => boolean) = schema[fieldName];
-            if(typeof(type)==="function") {
-                const result = type(val);
-                if(result==null) return null;
-                resultSchema[fieldName] = result;
-                continue;
-            }
-
-            if(val==null && (type as number)>=100) {
-                resultSchema[fieldName] = null;
-                continue;
-            }
-
-            if(type===FieldTypeEnum.Any || type===FieldTypeEnum.AnyOptional) {
-                resultSchema[fieldName] = val;
-            } else if(type===FieldTypeEnum.Boolean || type===FieldTypeEnum.BooleanOptional) {
-                if(typeof(val)!=="boolean") return null;
-                resultSchema[fieldName] = val;
-            } else if(type===FieldTypeEnum.Number || type===FieldTypeEnum.NumberOptional) {
-                if(typeof(val)!=="number") return null;
-                if(isNaN(val as number)) return null;
-                resultSchema[fieldName] = val;
-            } else if(type===FieldTypeEnum.BigInt || type===FieldTypeEnum.BigIntOptional) {
-                const result = parseBigInt(val);
-                if(result==null) return null;
-                resultSchema[fieldName] = result;
-            } else if(type===FieldTypeEnum.String || type===FieldTypeEnum.StringOptional) {
-                if(typeof(val)!=="string") return null;
-                resultSchema[fieldName] = val;
-            } else {
-                //Probably another request schema
-                const result = verifySchema(val, type as RequestSchema);
-                if(result==null) return null;
-                resultSchema[fieldName] = result;
-            }
+            if(!verifySchemaField(val, schema[fieldName], fieldName, resultSchema)) return null;
         }
         return resultSchema;
     }
@@ -182,36 +155,7 @@ export class ParamDecoder implements IParamReader {
                 continue;
             }
 
-            const type: FieldTypeEnum | RequestSchema | ((val: any) => boolean) = schema[fieldName];
-            if(typeof(type)==="function") {
-                const result = type(val);
-                if(result==null) return null;
-                resultSchema[fieldName] = result;
-                continue;
-            }
-
-            if(type===FieldTypeEnum.Any || type===FieldTypeEnum.AnyOptional) {
-                resultSchema[fieldName] = val;
-            } else if(type===FieldTypeEnum.Boolean || type===FieldTypeEnum.BooleanOptional) {
-                if(typeof(val)!=="boolean") return null;
-                resultSchema[fieldName] = val;
-            } else if(type===FieldTypeEnum.Number || type===FieldTypeEnum.NumberOptional) {
-                if(typeof(val)!=="number") return null;
-                if(isNaN(val as number)) return null;
-                resultSchema[fieldName] = val;
-            } else if(type===FieldTypeEnum.BigInt || type===FieldTypeEnum.BigIntOptional) {
-                const result = parseBigInt(val);
-                if(result==null) return null;
-                resultSchema[fieldName] = result;
-            } else if(type===FieldTypeEnum.String || type===FieldTypeEnum.StringOptional) {
-                if(typeof(val)!=="string") return null;
-                resultSchema[fieldName] = val;
-            } else {
-                //Probably another request schema
-                const result = verifySchema(val, type as RequestSchema);
-                if(result==null) return null;
-                resultSchema[fieldName] = result;
-            }
+            if(!verifySchemaField(val, schema[fieldName], fieldName, resultSchema)) return null;
         }
         return resultSchema;
     }

package/src/utils/paramcoders/SchemaVerifier.ts

@@ -15,25 +15,41 @@ export enum FieldTypeEnum {
     Number=2,
     BigInt=3,
     Any=4,
+    BigIntPositive=5,
+    BigIntNotNegative=6,
+    NumberPositive=7,
+    NumberNotNegative=8,
 
     StringOptional=100,
     BooleanOptional=101,
     NumberOptional=102,
     BigIntOptional=103,
     AnyOptional=104,
+    BigIntPositiveOptional=105,
+    BigIntNotNegativeOptional=106,
+    NumberPositiveOptional=107,
+    NumberNotNegativeOptional=108,
 }
 
 export type FieldType<T extends FieldTypeEnum | RequestSchema | ((val: any) => (string | boolean | number | bigint | any))> =
     T extends FieldTypeEnum.String ? string :
     T extends FieldTypeEnum.Boolean ? boolean :
     T extends FieldTypeEnum.Number ? number :
+    T extends FieldTypeEnum.NumberPositive ? number :
+    T extends FieldTypeEnum.NumberNotNegative ? number :
     T extends FieldTypeEnum.BigInt ? bigint :
     T extends FieldTypeEnum.Any ? any :
+    T extends FieldTypeEnum.BigIntPositive ? bigint :
+    T extends FieldTypeEnum.BigIntNotNegative ? bigint :
     T extends FieldTypeEnum.StringOptional ? string :
     T extends FieldTypeEnum.BooleanOptional ? boolean :
     T extends FieldTypeEnum.NumberOptional ? number :
+    T extends FieldTypeEnum.NumberPositiveOptional ? number :
+    T extends FieldTypeEnum.NumberNotNegativeOptional ? number :
     T extends FieldTypeEnum.BigIntOptional ? bigint :
     T extends FieldTypeEnum.AnyOptional ? any :
+    T extends FieldTypeEnum.BigIntPositiveOptional ? bigint :
+    T extends FieldTypeEnum.BigIntNotNegativeOptional ? bigint :
     T extends RequestSchema ? RequestSchemaResult<T> :
     T extends ((val: any) => string) ? string :
     T extends ((val: any) => boolean) ? boolean :
@@ -50,47 +66,74 @@ export type RequestSchema = {
     [fieldName: string]: FieldTypeEnum | RequestSchema | ((val: any) => any)
 }
 
+export function verifySchemaField(
+    val: any,
+    type: FieldTypeEnum | RequestSchema | ((val: any) => any),
+    fieldName: string,
+    resultSchema: any
+): boolean {
+    if(typeof(type)==="function") {
+        const result = type(val);
+        if(result==null) return false;
+        resultSchema[fieldName] = result;
+        return true;
+    }
+
+    if(val==null && (type as number)>=100) {
+        resultSchema[fieldName] = null;
+        return true;
+    }
+
+    if(type===FieldTypeEnum.Any || type===FieldTypeEnum.AnyOptional) {
+        resultSchema[fieldName] = val;
+    } else if(type===FieldTypeEnum.Boolean || type===FieldTypeEnum.BooleanOptional) {
+        if(typeof(val)!=="boolean") return false;
+        resultSchema[fieldName] = val;
+    } else if(type===FieldTypeEnum.Number || type===FieldTypeEnum.NumberOptional) {
+        if(typeof(val)!=="number") return false;
+        if(isNaN(val as number)) return false;
+        resultSchema[fieldName] = val;
+    } else if(type===FieldTypeEnum.NumberPositive || type===FieldTypeEnum.NumberPositiveOptional) {
+        if(typeof(val)!=="number") return false;
+        if(isNaN(val as number)) return false;
+        if(val<=0) return false;
+        resultSchema[fieldName] = val;
+    } else if(type===FieldTypeEnum.NumberNotNegative || type===FieldTypeEnum.NumberNotNegativeOptional) {
+        if(typeof(val)!=="number") return false;
+        if(isNaN(val as number)) return false;
+        if(val<0) return false;
+        resultSchema[fieldName] = val;
+    } else if(type===FieldTypeEnum.BigInt || type===FieldTypeEnum.BigIntOptional) {
+        const result = parseBigInt(val);
+        if(result==null) return false;
+        resultSchema[fieldName] = result;
+    } else if(type===FieldTypeEnum.BigIntPositive || type===FieldTypeEnum.BigIntPositiveOptional) {
+        const result = parseBigInt(val);
+        if(result==null) return false;
+        if(result<=0n) return false;
+        resultSchema[fieldName] = result;
+    } else if(type===FieldTypeEnum.BigIntNotNegative || type===FieldTypeEnum.BigIntNotNegativeOptional) {
+        const result = parseBigInt(val);
+        if(result==null) return false;
+        if(result<0n) return false;
+        resultSchema[fieldName] = result;
+    } else if(type===FieldTypeEnum.String || type===FieldTypeEnum.StringOptional) {
+        if(typeof(val)!=="string") return false;
+        resultSchema[fieldName] = val;
+    } else {
+        //Probably another request schema
+        const result = verifySchema(val, type as RequestSchema);
+        if(result==null) return false;
+        resultSchema[fieldName] = result;
+    }
+    return true;
+}
+
 export function verifySchema<T extends RequestSchema>(req: any, schema: T): RequestSchemaResult<T> {
     if(req==null) return null;
     const resultSchema: any = {};
     for(let fieldName in schema) {
-        const val: any = req[fieldName];
-
-        const type: FieldTypeEnum | RequestSchema | ((val: any) => boolean) = schema[fieldName];
-        if(typeof(type)==="function") {
-            const result = type(val);
-            if(result==null) return null;
-            resultSchema[fieldName] = result;
-            continue;
-        }
-
-        if(val==null && (type as number)>=100) {
-            resultSchema[fieldName] = null;
-            continue;
-        }
-
-        if(type===FieldTypeEnum.Any || type===FieldTypeEnum.AnyOptional) {
-            resultSchema[fieldName] = val;
-        } else if(type===FieldTypeEnum.Boolean || type===FieldTypeEnum.BooleanOptional) {
-            if(typeof(val)!=="boolean") return null;
-            resultSchema[fieldName] = val;
-        } else if(type===FieldTypeEnum.Number || type===FieldTypeEnum.NumberOptional) {
-            if(typeof(val)!=="number") return null;
-            if(isNaN(val as number)) return null;
-            resultSchema[fieldName] = val;
-        } else if(type===FieldTypeEnum.BigInt || type===FieldTypeEnum.BigIntOptional) {
-            const result = parseBigInt(val);
-            if(result==null) return null;
-            resultSchema[fieldName] = result;
-        } else if(type===FieldTypeEnum.String || type===FieldTypeEnum.StringOptional) {
-            if(typeof(val)!=="string") return null;
-            resultSchema[fieldName] = val;
-        } else {
-            //Probably another request schema
-            const result = verifySchema(val, type as RequestSchema);
-            if(result==null) return null;
-            resultSchema[fieldName] = result;
-        }
+        if(!verifySchemaField(req[fieldName], schema[fieldName], fieldName, resultSchema)) return null;
     }
     return resultSchema;
 }