Skip to content
Snippets Groups Projects

Fix wrong var used

Open therealwolf requested to merge therealwolf42-master-patch-06799 into master
1 file
+ 31
31
Compare changes
  • Side-by-side
  • Inline
@@ -22,7 +22,7 @@ var MAX_SAFE_INT = 9007199254740991;
var MIN_SAFE_INT =-9007199254740991;
/**
Most validations are skipped and the value returned unchanged when an empty string, null, or undefined is encountered (except "required").
Most validations are skipped and the value returned unchanged when an empty string, null, or undefined is encountered (except "required").
Validations support a string format for dealing with large numbers.
*/
@@ -31,21 +31,21 @@ module.exports = _my = {
is_empty: is_empty=function(value){
return value === null || value === undefined;
},
required(value, field_name=""){
if (is_empty(value) ){
throw new Error(`value required ${field_name} ${value}`);
}
return value;
},
require_long(value, field_name=""){
if (!Long.isLong(value)) {
throw new Error(`Long value required ${field_name} ${value}`);
}
return value;
},
string(value){
if (is_empty(value) ){ return value; }
if (typeof value !== "string") {
@@ -53,7 +53,7 @@ module.exports = _my = {
}
return value;
},
number(value){
if (is_empty(value) ){ return value; }
if (typeof value !== "number") {
@@ -61,7 +61,7 @@ module.exports = _my = {
}
return value;
},
whole_number(value, field_name=""){
if (is_empty(value) ){ return value; }
if (/\./.test(value) ){
@@ -69,7 +69,7 @@ module.exports = _my = {
}
return value;
},
unsigned(value, field_name=""){
if (is_empty(value) ){ return value; }
if (/-/.test(value) ){
@@ -77,12 +77,12 @@ module.exports = _my = {
}
return value;
},
is_digits: is_digits=function(value){
if (typeof value === "numeric") { return true; }
return /^[0-9]+$/.test(value);
},
to_number: to_number=function(value, field_name=""){
if (is_empty(value) ){ return value; }
_my.no_overflow53(value, field_name);
@@ -95,18 +95,18 @@ module.exports = _my = {
})();
return int_value;
},
to_long(value, field_name=""){
if (is_empty(value) ){ return value; }
if (Long.isLong(value) ){ return value; }
_my.no_overflow64(value, field_name);
if (typeof value === "number") {
value = ""+value;
}
return Long.fromString(value);
},
to_string(value, field_name=""){
if (is_empty(value) ){ return value; }
if (typeof value === "string") { return value; }
@@ -119,7 +119,7 @@ module.exports = _my = {
}
throw `unsupported type ${field_name}: (${typeof value}) ${value}`;
},
require_test(regex, value, field_name=""){
if (is_empty(value) ){ return value; }
if (!regex.test(value)) {
@@ -127,7 +127,7 @@ module.exports = _my = {
}
return value;
},
require_match: require_match=function(regex, value, field_name=""){
if (is_empty(value) ){ return value; }
var match = value.match(regex);
@@ -136,7 +136,7 @@ module.exports = _my = {
}
return match;
},
// require_object_id: require_object_id=function(value, field_name){
// return require_match(
// /^([0-9]+)\.([0-9]+)\.([0-9]+)$/,
@@ -144,7 +144,7 @@ module.exports = _my = {
// field_name
// );
// },
// Does not support over 53 bits
require_range(min,max,value, field_name=""){
if (is_empty(value) ){ return value; }
@@ -154,7 +154,7 @@ module.exports = _my = {
}
return value;
},
require_object_type: require_object_type=function(
reserved_spaces = 1, type, value,
field_name=""
@@ -170,53 +170,53 @@ module.exports = _my = {
}
return value;
},
get_instance: get_instance=function(reserve_spaces, type, value, field_name){
if (is_empty(value) ){ return value; }
require_object_type(reserve_spaces, type, value, field_name);
return to_number(value.split('.')[2]);
},
require_relative_type: require_relative_type=function(type, value, field_name){
require_object_type(0, type, value, field_name);
return value;
},
get_relative_instance: get_relative_instance=function(type, value, field_name){
if (is_empty(value) ){ return value; }
require_object_type(0, type, value, field_name);
return to_number(value.split('.')[2]);
},
require_protocol_type: require_protocol_type=function(type, value, field_name){
require_object_type(1, type, value, field_name);
return value;
},
get_protocol_instance: get_protocol_instance=function(type, value, field_name){
if (is_empty(value) ){ return value; }
require_object_type(1, type, value, field_name);
return to_number(value.split('.')[2]);
},
get_protocol_type: get_protocol_type=function(value, field_name){
if (is_empty(value) ){ return value; }
require_object_id(value, field_name);
var values = value.split('.');
return to_number(values[1]);
},
get_protocol_type_name(value, field_name){
if (is_empty(value) ){ return value; }
var type_id = get_protocol_type(value, field_name);
return (Object.keys(chain_types.object_type))[type_id];
},
require_implementation_type: require_implementation_type=function(type, value, field_name){
require_object_type(2, type, value, field_name);
return value;
},
get_implementation_instance: get_implementation_instance=function(type, value, field_name){
if (is_empty(value) ){ return value; }
require_object_type(2, type, value, field_name);
@@ -233,7 +233,7 @@ module.exports = _my = {
}
if (typeof value === "string") {
var int = parseInt(value);
if (value > MAX_SAFE_INT || value < MIN_SAFE_INT) {
if (int > MAX_SAFE_INT || int < MIN_SAFE_INT) {
throw new Error(`overflow ${field_name} ${value}`);
}
return;
@@ -245,18 +245,18 @@ module.exports = _my = {
}
throw `unsupported type ${field_name}: (${typeof value}) ${value}`;
},
// signed / unsigned whole numbers only
no_overflow64(value, field_name=""){
// https://github.com/dcodeIO/Long.js/issues/20
if (Long.isLong(value) ){ return; }
// BigInteger#isBigInteger https://github.com/cryptocoinjs/bigi/issues/20
if (value.t !== undefined && value.s !== undefined) {
_my.no_overflow64(value.toString(), field_name);
return;
}
if (typeof value === "string") {
// remove leading zeros, will cause a false positive
value = value.replace(/^0+/,'');
@@ -281,7 +281,7 @@ module.exports = _my = {
}
return;
}
throw `unsupported type ${field_name}: (${typeof value}) ${value}`;
}
};
Loading