@sap/xsodata 8.2.1 → 8.3.1

package/lib/utils/typeConverters/jsonToDb.js

@@ -1,22 +1,20 @@
 'use strict';
 
-var jsonToDb = exports.jsonToDb = {};
-var Type_Error = require('./../errors/typeError');
-var converterTool = require('./converterTools');
+const jsonToDb = exports.jsonToDb = {};
+const XsODataTypeError = require('./../errors/typeError');
+const converterTool = require('./converterTools');
 
 jsonToDb['Edm.DateTime'] = function jsonToDbEdmDateTime(jsonValue, dbDataType) {
     if (jsonValue === null) {
         return null;
     }
-    var date;
+    let date;
     if (dbDataType === 'DATE' || dbDataType === 'DAYDATE') {
         /* in    "/Date(-6847804800000)/"       */
         /* out   "1753-01-01"                   */
         /* in    "/Date(253402214400000)/"      */
         /* out   "9999-12-31"                   */
-        //if ( jsonValue.substr(0,5) !== 'Date(') {
-        //    throw new Type_Error('Type SECONDDATE must start with "Date("');
-        //}
+        
         date = new Date(parseInt(jsonValue.substring(6, jsonValue.length - 2)));
         return date.toISOString().substring(0, 10);
 
@@ -25,9 +23,7 @@ jsonToDb['Edm.DateTime'] = function jsonToDbEdmDateTime(jsonValue, dbDataType) {
         /* out   "1753-01-01T00:00:00"          */
         /* in    "/Date(253402263296000)/"      */
         /* out   "9999-12-31T13:34:56"          */
-        //if ( jsonValue.substr(0,5) !== 'Date(') {
-        //    throw new Type_Error('Type SECONDDATE must start with "Date("');
-        //}
+        
         date = new Date(parseInt(jsonValue.substring(6, jsonValue.length - 2)));
         return date.toISOString().substring(0, 19);
 
@@ -36,15 +32,13 @@ jsonToDb['Edm.DateTime'] = function jsonToDbEdmDateTime(jsonValue, dbDataType) {
         /* out  "1753-01-01T00:00:00"           */
         /* in   "/Date(253402300799999)/"       */
         /* out  "9999-12-31T23:59:59.999"       */
-        // if ( jsonValue.substr(0,5) !== 'Date(') {
-        //    throw new Type_Error('Type SECONDDATE must start with "Date("');
-        //}
+        
         date = new Date(parseInt(jsonValue.substring(6, jsonValue.length - 2)));
         return date.toISOString().substring(0, 23);
     } else if (dbDataType === 'LONGDATE') {
-        throw new Type_Error('db type LONGDATE is not supported');
+        throw new XsODataTypeError('db type LONGDATE is not supported');
     } else {
-        throw new Type_Error('db type must be DATE, SECONDDATE or TIMESTAMP');
+        throw new XsODataTypeError('db type must be DATE, SECONDDATE or TIMESTAMP');
     }
 };
 
@@ -55,14 +49,13 @@ jsonToDb['Edm.Time'] = function jsonToDbEdmTime(jsonValue, dbDataType, YMDmustZe
     /* out    "23:59:59"                        */
     /*--->'Edm.Time'                    */
     if (dbDataType !== 'TIME' && dbDataType !== 'SECONDTIME') {
-        throw new Type_Error('db type must be compatible to TIME');
+        throw new XsODataTypeError('db type must be compatible to TIME');
     }
 
     if (jsonValue === null) {
         return null;
     }
 
-    //old reged var match = /PT([0-9]+)H([0-9]+)M([0-9]+)S/i.exec(jsonValue);
     return converterTool.checkEdmTime(jsonValue, dbDataType,false,
         dbDataType === 'TIME' && YMDmustZero, // YMDmustZero
         false,// no fractions
@@ -71,7 +64,7 @@ jsonToDb['Edm.Time'] = function jsonToDbEdmTime(jsonValue, dbDataType, YMDmustZe
 
 jsonToDb['Edm.Byte'] = function jsonToDbEdmByte(jsonValue, dbDataType) {
     if (dbDataType !== 'TINYINT') {
-        throw new Type_Error('db type must be TINYINT');
+        throw new XsODataTypeError('db type must be TINYINT');
     }
     /* in       0                               */
     /* out      0                               */
@@ -82,7 +75,7 @@ jsonToDb['Edm.Byte'] = function jsonToDbEdmByte(jsonValue, dbDataType) {
 
 jsonToDb['Edm.Int16'] = function jsonToDbEdmInt16(jsonValue, dbDataType) {
     if (dbDataType !== 'SMALLINT') {
-        throw new Type_Error('db type must be SMALLINT');
+        throw new XsODataTypeError('db type must be SMALLINT');
     }
     /* in     -32767                        */
     /* out    -32767                        */
@@ -93,7 +86,7 @@ jsonToDb['Edm.Int16'] = function jsonToDbEdmInt16(jsonValue, dbDataType) {
 
 jsonToDb['Edm.Int32'] = function jsonToDbEdmInt32(jsonValue, dbDataType) {
     if (dbDataType !== 'INTEGER') {
-        throw new Type_Error('db type must be INTEGER');
+        throw new XsODataTypeError('db type must be INTEGER');
     }
     /* in    -2147483648                    */
     /* out   -2147483648                    */
@@ -104,7 +97,7 @@ jsonToDb['Edm.Int32'] = function jsonToDbEdmInt32(jsonValue, dbDataType) {
 
 jsonToDb['Edm.Int64'] = function jsonToDbEdmInt64(jsonValue, dbDataType) {
     if (dbDataType !== 'BIGINT') {
-        throw new Type_Error('db type must be BIGINT');
+        throw new XsODataTypeError('db type must be BIGINT');
     }
     /* in   "-9223372036854775808"          */
     /* out  "-9223372036854775808"          */
@@ -127,7 +120,7 @@ jsonToDb['Edm.Decimal'] = function jsonToDbEdmDecimal(jsonValue, dbDataType) {
         /* out   "1234567890.012345678901234567890123"      */
         return jsonValue;
     } else {
-        throw new Type_Error("db type must be SMALLDECIMAL or DECIMAL");
+        throw new XsODataTypeError("db type must be SMALLDECIMAL or DECIMAL");
     }
 };
 
@@ -148,7 +141,7 @@ jsonToDb['Edm.Single'] = function jsonToDbEdmSingle(jsonValue, dbDataType) {
         /* out    3.402823466e+38                 */
         return parseFloat(jsonValue);
     } else {
-        throw new Type_Error("db type must be REAL or DECIMAL");
+        throw new XsODataTypeError("db type must be REAL or DECIMAL");
     }
 };
 
@@ -163,7 +156,7 @@ jsonToDb['Edm.Double'] = function jsonToDbEdmDouble(jsonValue, dbDataType) {
         /* out     1.7976931348623157e+308      */
         return parseFloat(jsonValue);
     } else {
-        throw new Type_Error("db type must be DOUBLE");
+        throw new XsODataTypeError("db type must be DOUBLE");
     }
 
 };
@@ -194,7 +187,7 @@ jsonToDb['Edm.String'] = function jsonToDbEdmString(jsonValue, dbDataType) {
         /* out buffer                           */
         return Buffer.from(jsonValue, 'utf8');
     } else {
-        throw new Type_Error('db type must be VARCHAR, NVARCHAR, ALPHANUM, SHORTTEXT, CHAR, NCHAR, CLOB, NCLOB');
+        throw new XsODataTypeError('db type must be VARCHAR, NVARCHAR, ALPHANUM, SHORTTEXT, CHAR, NCHAR, CLOB, NCLOB');
     }
 };
 
@@ -207,7 +200,7 @@ jsonToDb['Edm.Binary'] = function jsonToDbEdmBinary(jsonValue, dbDataType) {
         /* out buffer                           */
         return Buffer.from(jsonValue, 'base64');
     } else if (dbDataType === 'BINARY') {
-        throw new Type_Error("db type BINARY is not supported");
+        throw new XsODataTypeError("db type BINARY is not supported");
     } else if (dbDataType === 'VARBINARY') {
         /* in   iVBONA=="                       */
         /* out buffer                           */
@@ -217,5 +210,5 @@ jsonToDb['Edm.Binary'] = function jsonToDbEdmBinary(jsonValue, dbDataType) {
 };
 
 jsonToDb['Edm.Guid'] = function jsonToDbEdmGuiD(/*jsonValue, dbDataType*/) {
-    throw new Type_Error('edm type Edm.Guid is not supported');
+    throw new XsODataTypeError('edm type Edm.Guid is not supported');
 };

package/lib/utils/typeConverters/uriToDb.js

@@ -1,9 +1,9 @@
 'use strict';
 
 
-var uriToDb = exports.uriToDb = {};
-var Type_Error = require('./../errors/typeError');
-var converterTool = require('./converterTools');
+const uriToDb = exports.uriToDb = {};
+const XsODataTypeError = require('./../errors/typeError');
+const converterTool = require('./converterTools');
 
 
 function padZero(string, len) {
@@ -34,27 +34,26 @@ uriToDb['Edm.DateTime'] = function uriToDbEdmDateTime(value, dbDataType) {
     //    /* out  "9999-12-31T23:59:59.999"       */
     //}
     //else if (dbDataType === 'LONGDATE') {
-    ///    throw new Type_Error('db type LONGDATE is not supported');
+    ///    throw new XsODataTypeError('db type LONGDATE is not supported');
     //} else {
-    //    throw new Type_Error('db type must be DATE, SECONDDATE or TIMESTAMP');
+    //    throw new XsODataTypeError('db type must be DATE, SECONDDATE or TIMESTAMP');
     //}
-    var raw = value.substring(9, value.length - 1);
-    var datetime = raw.split('T');
-    var dateParts = datetime[0].split('-');
+    const raw = value.substring(9, value.length - 1);
+    const datetime = raw.split('T');
+    const dateParts = datetime[0].split('-');
     dateParts[0] = padZero(dateParts[0], 4);
     dateParts[1] = padZero(dateParts[1], 2);
     dateParts[2] = padZero(dateParts[2], 2);
 
-    var timeParts = datetime[1].split(':');
+    const timeParts = datetime[1].split(':');
     timeParts[0] = (timeParts[0]) ? padZero(timeParts[0], 2) : '00';
     timeParts[1] = (timeParts[1]) ? padZero(timeParts[1], 2) : '00';
     if (timeParts.length > 2) {
-        var x = timeParts[2].split('.');
+        const x = timeParts[2].split('.');
         timeParts[2] = padZero(x[0], 2);
         if (x[1]) {
             if (x[1].length > 7) {
-                throw new Type_Error('To many fractional seconds in ' + value);
-                //timeParts[3] = x[1].substr(0, 7);
+                throw new XsODataTypeError('To many fractional seconds in ' + value);
             } else {
                 timeParts[3] = x[1];
             }
@@ -72,12 +71,10 @@ uriToDb['Edm.DateTime'] = function uriToDbEdmDateTime(value, dbDataType) {
             (timeParts[3] ? '.' + timeParts[3] : '');
 
     }
-    throw new Type_Error('db type must be DATE, SECONDDATE or TIMESTAMP');
+    throw new XsODataTypeError('db type must be DATE, SECONDDATE or TIMESTAMP');
 
 };
 
-// old
-// var timeRegexObj = /^time'PT(?:(\d{1,2})H)?(?:(\d{1,2})M)?(?:(\d{1,2})(?:\.(\d*))?S)?'$/;
 uriToDb['Edm.Time'] = function uriToDbEdmTime(value, dbDataType, yMDmustZero = true) {
     /* in      "time'PT0H0M0S'"                                 */
     /* out    "00:00:00"                        */
@@ -86,7 +83,7 @@ uriToDb['Edm.Time'] = function uriToDbEdmTime(value, dbDataType, yMDmustZero = t
 
     /*--->'Edm.Time'                    */
     if (dbDataType !== 'TIME' && dbDataType !== 'SECONDTIME') {
-        throw new Type_Error('db type must be TIME');
+        throw new XsODataTypeError('db type must be TIME');
     }
 
     return converterTool.checkEdmTime(value, dbDataType,true,
@@ -97,7 +94,7 @@ uriToDb['Edm.Time'] = function uriToDbEdmTime(value, dbDataType, yMDmustZero = t
 
 uriToDb['Edm.Byte'] = function uriToDbEdmByte(value, dbDataType) {
     if (dbDataType !== 'TINYINT') {
-        throw new Type_Error('db type must be TINYINT');
+        throw new XsODataTypeError('db type must be TINYINT');
     }
     /* in      "0"                                 */
     /* out      0                               */
@@ -108,7 +105,7 @@ uriToDb['Edm.Byte'] = function uriToDbEdmByte(value, dbDataType) {
 
 uriToDb['Edm.Int16'] = function uriToDbEdmInt16(value, dbDataType) {
     if (dbDataType !== 'SMALLINT') {
-        throw new Type_Error('db type must be SMALLINT');
+        throw new XsODataTypeError('db type must be SMALLINT');
     }
     /* in       "-32767"                              */
     /* out    -32767                        */
@@ -119,7 +116,7 @@ uriToDb['Edm.Int16'] = function uriToDbEdmInt16(value, dbDataType) {
 
 uriToDb['Edm.Int32'] = function uriToDbEdmInt32(value, dbDataType) {
     if (dbDataType !== 'INTEGER') {
-        throw new Type_Error('db type must be INTEGER');
+        throw new XsODataTypeError('db type must be INTEGER');
     }
     /* in   "-2147483648"                                 */
     /* out   -2147483648                    */
@@ -135,67 +132,39 @@ uriToDb['Edm.Int64'] = function uriToDbEdmInt64(value, dbDataType) {
     /* out  "9223372036854775807"           */
 
     if (dbDataType !== 'BIGINT') {
-        throw new Type_Error('db type must be BIGINT');
+        throw new XsODataTypeError('db type must be BIGINT');
     }
 
-    var last = value.substr(value.length - 1).toUpperCase();
+    const last = value.substr(value.length - 1).toUpperCase();
     if (last !== 'L') {
-        throw new Type_Error('uri type indicator must be (l|L)');
+        throw new XsODataTypeError('uri type indicator must be (l|L)');
     }
     return value.substring(0, value.length - 1);
 };
 
 uriToDb['Edm.Decimal'] = function uriToDbEdmDecimal(value, dbDataType) {
-    var last;
-    if (dbDataType === 'SMALLDECIMAL') {
-        /* in   "-1.4e-45m"                                */
-        /* out   "-1.4e-45"                     */
-        /* in      "1.4e-45m"                              */
-        /* out   "1.4e-45"     */
+    let last;
+    if (dbDataType === 'SMALLDECIMAL' || dbDataType === 'DECIMAL') {
         last = value.substr(value.length - 1).toUpperCase();
         if (last !== 'M') {
-            throw new Type_Error('uri type indicator must be (m|M)');
-        }
-        return value.substring(0, value.length - 1);
-    } else if (dbDataType === 'DECIMAL') {
-        /* in    "1234567890.012345678901234567890123m"                                                 */
-        /* out   "1234567890.012345678901234567890123"      */
-        /* in   "1234567890.012345678901234567890123m"                                                */
-        /* out   "1234567890.012345678901234567890123"      */
-        last = value.substr(value.length - 1).toUpperCase();
-        if (last !== 'M') {
-            throw new Type_Error('uri type indicator must be (m|M)');
+            throw new XsODataTypeError('uri type indicator must be (m|M)');
         }
         return value.substring(0, value.length - 1);
     } else {
-        throw new Type_Error("db type must be SMALLDECIMAL or DECIMAL");
+        throw new XsODataTypeError("db type must be SMALLDECIMAL or DECIMAL");
     }
 };
 
 uriToDb['Edm.Single'] = function uriToDbEdmSingle(value, dbDataType) {
-    var last;
-    if (dbDataType === 'REAL') {
-        /* in      "-3.40282346e+38f"                             */
-        /* out      -3.4028234663852886e+38     */
-        /* in      "3.40282346e+38f"                             */
-        /* out       3.3028234797236365e+38     */
-        last = value.substr(value.length - 1).toUpperCase();
-        if (last !== 'F') {
-            throw new Type_Error('uri type indicator must be (f|F)');
-        }
-        return value.substring(0, value.length - 1);
-    } else if (dbDataType === 'FLOAT') {
-        /* in    "-3.4028234e+38d"                                */
-        /* out   -3.4028234e+38                 */
-        /* in     "3.402823466e+38d"                              */
-        /* out    3.402823466e+38                 */
+    let last;
+    if (dbDataType === 'REAL' || dbDataType === 'FLOAT') {
         last = value.substr(value.length - 1).toUpperCase();
         if (last !== 'F') {
-            throw new Type_Error('uri type indicator must be (f|F)');
+            throw new XsODataTypeError('uri type indicator must be (f|F)');
         }
         return value.substring(0, value.length - 1);
     } else {
-        throw new Type_Error("db type must be REAL or DECIMAL");
+        throw new XsODataTypeError("db type must be REAL or DECIMAL");
     }
 };
 
@@ -205,18 +174,18 @@ uriToDb['Edm.Double'] = function uriToDbEdmDouble(value, dbDataType) {
         /* out    -1.7976931348623157e+308      */
         /* in      "1.7976931348623158e+308d"                             */
         /* out     1.7976931348623157e+308      */
-        var last = value.substr(value.length - 1).toUpperCase();
+        const last = value.substr(value.length - 1).toUpperCase();
         if (last !== 'F') {
-            throw new Type_Error('uri type indicator must be (d|D)');
+            throw new XsODataTypeError('uri type indicator must be (d|D)');
         }
         return value.substring(0, value.length - 1);
     } else {
-        throw new Type_Error("db type must be DOUBLE");
+        throw new XsODataTypeError("db type must be DOUBLE");
     }
 };
 
 uriToDb['_Generic.Number'] = function uriToDbEdmString(number) {
-    var type = number.substr(number.length - 1).toUpperCase();
+    let type = number.substr(number.length - 1).toUpperCase();
     if (type === 'F' ||
         type === 'f' ||
         type === 'D' ||
@@ -230,14 +199,14 @@ uriToDb['_Generic.Number'] = function uriToDbEdmString(number) {
         type = '';
     }
 
-    var sign = number.substring(0, 1);
+    let sign = number.substring(0, 1);
     if ((sign === '+') || (sign === '-')) {
         number = number.substring(1);
     } else {
         sign = '';
     }
 
-    var exponent;
+    let exponent;
     if (number.indexOf('E') !== -1) {
         exponent = number.split('E');
     } else if (number.indexOf('e') !== -1) {
@@ -246,13 +215,13 @@ uriToDb['_Generic.Number'] = function uriToDbEdmString(number) {
         exponent = [number];
     }
 
-    var intFloat = exponent[0].split('.');
-    var i = intFloat[0] || null;
-    var f = intFloat[1] || null;
-    var e = exponent[1] || null;
+    const intFloat = exponent[0].split('.');
+    const i = intFloat[0] || null;
+    const f = intFloat[1] || null;
+    const e = exponent[1] || null;
 
 
-    var ret = '';
+    let ret = '';
     ret += sign;
     if (i) {
         ret += i;
@@ -280,13 +249,13 @@ uriToDb['_Generic.Number'] = function uriToDbEdmString(number) {
     } else if (type === 'L') {
         return (ret);
     } else {
-        throw new Type_Error('edm type Edm.Guid is not supported');
+        throw new XsODataTypeError('edm type Edm.Guid is not supported');
     }
 };
 
 
 function deDoubleQuote(valueString) {
-    var s1 = valueString.substr(1, valueString.length - 2).replace(/''/g, "'");
+    const s1 = valueString.substr(1, valueString.length - 2).replace(/''/g, "'");
     return s1;
 }
 
@@ -315,40 +284,24 @@ uriToDb['Edm.String'] = function uriToDbEdmString(jsonValue, dbDataType) {
         /* out buffer                           */
         return Buffer.from(jsonValue, 'utf8');
     } else {
-        throw new Type_Error('db type must be VARCHAR, NVARCHAR, ALPHANUM, SHORTTEXT, CHAR, NCHAR, CLOB, NCLOB');
+        throw new XsODataTypeError('db type must be VARCHAR, NVARCHAR, ALPHANUM, SHORTTEXT, CHAR, NCHAR, CLOB, NCLOB');
     }
 };
 
 uriToDb['Edm.Binary'] = function uriToDbEdmBinary(value, dbDataType) {
-    var tmp;
-    if (dbDataType === 'BLOB') {
-        /* in  "x'1234ABCD'"                    */
-        /* out buffer                           */
-
+    let tmp;
+    if (dbDataType === 'BLOB' || dbDataType === 'VARBINARY') {
         if (value[0] === 'X') {
             tmp = value.substring(2, value.length - 1);
         } else {
             tmp = value.substring(7, value.length - 1);
         }
-        //return 'x\'' + tmp + '\'';
         return Buffer.from(tmp, 'hex');
     } else if (dbDataType === 'BINARY') {
-        throw new Type_Error("db type BINARY is not supported");
-    } else if (dbDataType === 'VARBINARY') {
-
-        /* in  "x'1234ABCD'"                    */
-        /* out buffer                           */
-        if (value[0] === 'X') {
-            tmp = value.substring(2, value.length - 1);
-        } else {
-            tmp = value.substring(7, value.length - 1);
-        }
-        //return 'x\'' + tmp + '\'';
-        return Buffer.from(tmp, 'hex');
+        throw new XsODataTypeError("db type BINARY is not supported");
     }
-
 };
 
 uriToDb['Edm.Guid'] = function uriToDbEdmGuiD(/*jsonValue, dbDataType*/) {
-    throw new Type_Error('edm type Edm.Guid is not supported');
+    throw new XsODataTypeError('edm type Edm.Guid is not supported');
 };

package/lib/utils/typeConverters/xmlValueToJson.js

@@ -1,9 +1,9 @@
 'use strict';
 
 
-var xmlValueToODataJson = exports.xmlValueToODataJson = {};
-var Type_Error = require('./../errors/typeError');
-var dateTimeParser = require('./../../parsers/dateTimeParser');
+const xmlValueToODataJson = exports.xmlValueToODataJson = {};
+const XsODataTypeError = require('./../errors/typeError');
+const dateTimeParser = require('./../../parsers/dateTimeParser');
 
 /**
  *
@@ -30,11 +30,7 @@ xmlValueToODataJson['Edm.Boolean'] = function xmlEdmBooleanToODataJson(jsonValue
      * out: true / false
      */
 
-    if (jsonValue === 'true' || jsonValue === true || jsonValue === '1' || jsonValue === 1) {
-        return true;
-    } else {
-        return false;
-    }
+    return jsonValue === 'true' || jsonValue === true || jsonValue === '1' || jsonValue === 1;
 };
 
 /**
@@ -66,13 +62,13 @@ xmlValueToODataJson['Edm.DateTime'] = function xmlEdmDateTimeToODataJson(jsonVal
      * out: /Date(<millis since 1970-01-01T00:00:00.0000000>)/
      */
     try {
-        var result = dateTimeParser.parse(jsonValue);
-        var month = result.month-1;
-        var date = new Date(Date.UTC(result.year, month, result.day, result.hour, result.minute, result.second, result.millisecond));
+        const result = dateTimeParser.parse(jsonValue);
+        const month = result.month-1;
+        const date = new Date(Date.UTC(result.year, month, result.day, result.hour, result.minute, result.second, result.millisecond));
         return "/Date(" + date.getTime() + ")/";
     }
     catch (err) {
-        throw new Type_Error('Provided Edm.DateTime property is not valid');
+        throw new XsODataTypeError('Provided Edm.DateTime property is not valid');
     }
 
 };
@@ -147,7 +143,7 @@ xmlValueToODataJson['Edm.String'] = noop;
  * @param jsonValue
  * @returns {*}
  */
-xmlValueToODataJson['Edm.Byte'] = function xmlEdmDecimalToDbJson(jsonValue){
+xmlValueToODataJson['Edm.Byte'] = function xmlEdmByteToDbJson(jsonValue){
     return parseInt(jsonValue);
 };