Comparing version 0.1.3 to 0.1.4
@@ -399,8 +399,8 @@ 'use strict'; | ||
if (response.status == 0 || response.status >= 400) { | ||
onError({ response: response }); | ||
// se a resposta é de token expirado, tenta renovar o token | ||
if (!renewFailure && self.renew && self.tokenExpired(response)) { | ||
doRenew(null, response); | ||
} else { | ||
// se a resposta é de token expirado, tenta renovar o token | ||
if (!renewFailure && self.renew && self.tokenExpired(response)) { | ||
doRenew(null, response); | ||
if (response.status == 0 || response.status >= 400) { | ||
onError({ response: response }); | ||
} else { | ||
@@ -407,0 +407,0 @@ _onResponse(null, response, false, xhr); |
{ | ||
"name": "fln-rest", | ||
"version": "0.1.3", | ||
"version": "0.1.4", | ||
"description": "REST for client and server application", | ||
@@ -5,0 +5,0 @@ "scripts": { |
@@ -28,2 +28,8 @@ // @ts-check | ||
return typeof(value) == 'string' | ||
}, | ||
Null(value){ | ||
return value === null | ||
}, | ||
Undefined(value){ | ||
return value === undefined | ||
} | ||
@@ -62,4 +68,4 @@ } | ||
function parseItem(key, path, item){ | ||
let pdef, def, min, i, t, s, a, k, v | ||
let required = key == '...' ? false : key.substring(key.length - 1) != '?' | ||
let def, min, i, t, s, a, k, v | ||
let required = item == '<Undefined>' ? false : (key == '...' ? false : key.substring(key.length - 1) != '?') | ||
@@ -148,3 +154,3 @@ path = path.replace('?', '') | ||
} else if (p[0]=='nullable'){ | ||
def.nullable = parseValue(p[1]) | ||
def.nullable = p[1] === undefined ? true : parseValue(p[1]) | ||
@@ -231,3 +237,3 @@ } else if (p[0] != '...') { | ||
path = obj.path | ||
value = getDataValue(path, data) | ||
value = getDataValue(path, data, def.type) | ||
@@ -331,3 +337,3 @@ error = validateItem(path, def, value) | ||
function getDataValue(path, data){ | ||
function getDataValue(path, data, type = null){ | ||
let i, k | ||
@@ -337,2 +343,10 @@ let res = data | ||
if (type == 'Null') { | ||
return null | ||
} | ||
if (type == 'Undefined') { | ||
return undefined | ||
} | ||
for (i = 1; i < arr.length; i++){ | ||
@@ -343,5 +357,5 @@ k = arr[i] | ||
return res | ||
return type == 'Date' ? (res || null) : res | ||
} | ||
module.exports = JSV |
@@ -6,3 +6,3 @@ // @ts-check | ||
module.exports = (dir, callback) => { | ||
function modulesLoader(dir, callback){ | ||
let modules = {} | ||
@@ -29,2 +29,8 @@ | ||
return modules | ||
} | ||
module.exports = (dir, ...args) => { | ||
modulesLoader(dir, (fn) => { | ||
fn.apply(null, args) | ||
}) | ||
} |
@@ -45,5 +45,5 @@ // @ts-check | ||
loader(dir, ...args){ | ||
modulesLoader(dir, (fn) => { | ||
fn.apply(null, [define].concat(args)) | ||
}) | ||
let arr = [dir, define].concat(args) | ||
modulesLoader.apply(null, arr) | ||
} | ||
@@ -50,0 +50,0 @@ } |
@@ -82,3 +82,4 @@ // @ts-check | ||
// valida os dados enviados de acordo com o esquema definido | ||
error = schemaValidator.validate(json) | ||
error = schemaValidator ? schemaValidator.validate(json) : true | ||
if (error !== true){ | ||
@@ -85,0 +86,0 @@ e = options.$err_params[error.path] |
59963
1617