pwi-plata-type 0.1.3 → 0.1.6

package/libs/model.ts

@@ -92,7 +92,6 @@ export function _filtraModel(value: any, model: Model): any {
 
 export async function _validaModel(value: any, model: Model, name?: string): Promise<ErroValidacao[]> {
     let promises: any[] = []
-    let errors: ErroValidacao[] = []
     
     for(const campo in model.template) {
         const t = model.template[campo]
@@ -100,7 +99,7 @@ export async function _validaModel(value: any, model: Model, name?: string): Pro
         if (t.length === undefined) {
             const m = new Model(t as ModelType)
 
-            promises.push(_validaModel(value[campo], m, `${campo}.`))
+            promises.push(_validaModel(value[campo], m, `${name ?? ''}${campo}.`))
             continue
         }
 
@@ -140,15 +139,11 @@ export async function _validaModel(value: any, model: Model, name?: string): Pro
     )
 
     if ((Erros as any).errorID !== undefined) {
-        errors.push(Erros as ErroValidacao)
-
-        return errors
+        return Erros as ErroValidacao[]
     }
 
-    errors = errors.concat(Erros)
-
-    if (errors.length !== 0) {
-        return errors
+    if ((Erros as any[]).length !== 0) {
+        return Erros as ErroValidacao[]
     }
 
     promises = []
@@ -158,7 +153,7 @@ export async function _validaModel(value: any, model: Model, name?: string): Pro
     }
 
     Erros = await Promise.all(promises).then(
-        result => [].concat(...result),
+        result => [].concat(...result).filter(v => v !== null),
         err => {
             return {
                 errorID: 'BPLM0003',
@@ -169,12 +164,10 @@ export async function _validaModel(value: any, model: Model, name?: string): Pro
     )
 
     if ((Erros as any).errorID !== undefined) {
-        errors.push(Erros as ErroValidacao)
-
-        return errors
+        return Erros as ErroValidacao[]
     }
 
-    return errors.concat(Erros)
+    return Erros as ErroValidacao[]
 }
 
 export async function valida(value: any, model: Model): Promise<RetornoValicadaoModel> {
@@ -306,7 +299,7 @@ export function Int(): ModelValicacaoPrimitivo {
 
 export function isArray(tamanhoMaximo?: number): ModelValicacaoPrimitivo {
     return async (nome: string, valor: any) => {
-        if (valor === undefined) {
+        if (valor === null) {
             return {
                 error: {
                     errorID: "BPCVARR001",
@@ -354,7 +347,7 @@ export function Optional(): ModelValicacaoPrimitivo {
 
 export function Required(): ModelValicacaoPrimitivo {
     return async (nome: string, valor: any) => {
-        if (valor === undefined) {
+        if (valor === null) {
             return {
                 error: { 
                     errorID: "BPCVREQ001",
@@ -463,7 +456,7 @@ export function VarChar(size: number): ModelValicacaoPrimitivo {
             return {
                 error: {
                     errorID: "BPVVARC001",
-                    msg: `O campo ${nome} tem que menos de ${nome} caracteres` 
+                    msg: `O campo ${nome} tem que menos de ${size} caracteres` 
                 },
                 continua: false
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pwi-plata-type",
-    "version": "0.1.3",
+    "version": "0.1.6",
     "type": "module",
     "main": "index.ts",
     "bin": {