@sap/xsodata 8.3.0 → 8.3.1

package/lib/utils/errors/http/notSupported.js

@@ -1,6 +1,6 @@
 'use strict';
-var util = require('util');
-var HttpError = require('./../httpError');
+const util = require('util');
+const HttpError = require('./../httpError');
 
 module.exports = NotSupported;
 

package/lib/utils/errors/http/preconditionFailed.js

@@ -1,6 +1,6 @@
 'use strict';
-var util = require('util');
-var HttpError = require('./../httpError');
+const util = require('util');
+const HttpError = require('./../httpError');
 
 module.exports = PreconditionFailed;
 

package/lib/utils/errors/http/preconditionRequired.js

@@ -1,6 +1,6 @@
 'use strict';
-var util = require('util');
-var HttpError = require('./../httpError');
+const util = require('util');
+const HttpError = require('./../httpError');
 
 module.exports = PreconditionRequired;
 

package/lib/utils/errors/http/unauthorized.js

@@ -1,6 +1,6 @@
 'use strict';
-var util = require('util');
-var HttpError = require('./../httpError');
+const util = require('util');
+const HttpError = require('./../httpError');
 
 module.exports = Unauthorized;
 

package/lib/utils/errors/http/unsupportedMediaType.js

@@ -1,6 +1,6 @@
 'use strict';
-var util = require('util');
-var HttpError = require('./../httpError');
+const util = require('util');
+const HttpError = require('./../httpError');
 
 module.exports = UnsupportedMediatype;
 

package/lib/utils/errors/httpError.js

@@ -1,6 +1,6 @@
 'use strict';
-var util = require('util');
-var XsODataError = require('./xsODataError');
+const util = require('util');
+const XsODataError = require('./xsODataError');
 
 module.exports = HttpError;
 

package/lib/utils/errors/internalError.js

@@ -1,6 +1,6 @@
 'use strict';
-var util = require('util');
-var XsODataError = require('./xsODataError');
+const util = require('util');
+const XsODataError = require('./xsODataError');
 
 module.exports = InternalError;
 

package/lib/utils/errors/modelFileError.js

@@ -1,6 +1,6 @@
 'use strict';
-var util = require('util');
-var InternalError = require('./internalError');
+const util = require('util');
+const InternalError = require('./internalError');
 
 module.exports = ModelFileError;
 

package/lib/utils/errors/sqlError.js

@@ -1,6 +1,6 @@
 'use strict';
-var util = require('util');
-var InternalError = require('./internalError');
+const util = require('util');
+const InternalError = require('./internalError');
 
 module.exports = SqlError;
 

package/lib/utils/errors/testError.js

@@ -1,6 +1,6 @@
 'use strict';
-var util = require('util');
-var ApplicationError = require('./applicationError');
+const util = require('util');
+const ApplicationError = require('./applicationError');
 
 module.exports = TestError;
 

package/lib/utils/errors/typeError.js

@@ -1,8 +1,8 @@
 'use strict';
-var util = require('util');
-var InternalError = require('./internalError');
+const util = require('util');
+const InternalError = require('./internalError');
 
-module.exports = TypeError;
+module.exports = XsODataTypeError;
 
 /**
  * Error during type convertion
@@ -11,10 +11,10 @@ module.exports = TypeError;
 * @param information
 * @constructor
 */
-function TypeError(message, context, information) {
+function XsODataTypeError(message, context, information) {
     InternalError.call(this, message, context);
     this.message = message;
     this.information = information;
 }
 
-util.inherits(TypeError, InternalError);
+util.inherits(XsODataTypeError, InternalError);

package/lib/utils/errors/xsODataError.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var util = require('util');
+const util = require('util');
 
 module.exports = XsODataError;
 

package/lib/utils/logger.js

@@ -55,18 +55,16 @@ let XSODATA_LOG_SQL_DATA = process.env.XSODATA_LOG_SQL_DATA || 0;
 let XSODATA_LOG_SQL_DATA_VALUE_SIZE = process.env.XSODATA_LOG_SQL_DATA_VALUE_SIZE || 20;
 let XSODATA_LOG_SQL_DATA_ARRAY_SIZE = process.env.XSODATA_LOG_SQL_DATA_ARRAY_SIZE || 30;
 
-
-//XSODATA_LOG_LEVEL = 0;
-//XSODATA_LOG_REQUEST_TIME = 1;
-//XSODATA_FORCE_LOG_LONG_REQUEST = 1;
-//XSODATA_LOG_SQL_COMMAND = 0;
-//XSODATA_LOG_SQL_TIME = 0;
-//XSODATA_FORCE_LOG_LONG_SQL = 2;
-//XSODATA_LOG_SQL_PARAMETERS = 0;
-//XSODATA_LOG_SQL_DATA = 0;
-
-
-var logLevels = {
+//XSODATA_LOG_LEVEL = 0
+//XSODATA_LOG_REQUEST_TIME = 1
+//XSODATA_FORCE_LOG_LONG_REQUEST = 1
+//XSODATA_LOG_SQL_COMMAND = 0
+//XSODATA_LOG_SQL_TIME = 0
+//XSODATA_FORCE_LOG_LONG_SQL = 2
+//XSODATA_LOG_SQL_PARAMETERS = 0
+//XSODATA_LOG_SQL_DATA = 0
+
+const logLevels = {
     "error": 0,
     "warn": 1,
     "info": 2,
@@ -84,7 +82,7 @@ function printSqlData(array) {
         }
 
         if (typeof value === 'string' && value.length > XSODATA_LOG_SQL_DATA_VALUE_SIZE) {
-            ret += value.substr(0, XSODATA_LOG_SQL_DATA_VALUE_SIZE) + '.LEN:' + value.length;
+            ret += value.substring(0, XSODATA_LOG_SQL_DATA_VALUE_SIZE) + '.LEN:' + value.length;
             continue;
         }
         if (Array.isArray(value) && value.length > XSODATA_LOG_SQL_DATA_ARRAY_SIZE) {
@@ -116,7 +114,7 @@ function printSqlParameters(array) {
             }
 
             if (typeof value === 'string' && value.length > XSODATA_LOG_SQL_PARAM_VALUE_SIZE) {
-                ret += value.substr(0, XSODATA_LOG_SQL_PARAM_VALUE_SIZE) + '<' + value.length + '>';
+                ret += value.substring(0, XSODATA_LOG_SQL_PARAM_VALUE_SIZE) + '<' + value.length + '>';
                 continue;
             }
             if (Array.isArray(value) && value.length > XSODATA_LOG_SQL_PARAM_ARRAY_SIZE) {
@@ -136,8 +134,8 @@ function printSqlParameters(array) {
 }
 
 //Code
-var EmptyLogger = function () {
-};
+class EmptyLogger {
+}
 
 EmptyLogger.prototype.cloneWithContext = function () {
     return new EmptyLogger();
@@ -160,8 +158,6 @@ function Logger(logger, context) {
     this.logger = logger || new EmptyLogger();
     this.context = context || { callId: 0, uniqueNetworkRequestID: 0, uniqueRequestID: 0 };
     this.info('Logger', 'Logger created for request');
-    //this.XSODATA_LOG_SQL_TIME = XSODATA_LOG_SQL_TIME;
-    //this.XSODATA_LOG_REQUEST_TIME = XSODATA_LOG_REQUEST_TIME;
 }
 
 Logger.prototype.cloneWithContext = function (context) {
@@ -257,14 +253,14 @@ Logger.prototype.getStartTimeSql = function () {
     return null;
 };
 
-Logger.prototype.logSqlTime = function (text, startTime, sql) {
-    const padZeroMS = (value) => {
-        while (value.length < 6) {
-            value = '0' + value;
-        }
-        return value;
-    };
+const padZeroMS = (value) => {
+    while (value.length < 6) {
+        value = '0' + value;
+    }
+    return value;
+};
 
+Logger.prototype.logSqlTime = function (text, startTime, sql) {
     if (startTime) {
         const hrtime = process.hrtime(startTime);
         const ms = padZeroMS('' + Math.round(hrtime[1] / 1000));
@@ -288,13 +284,6 @@ Logger.prototype.getStartTimeRequest = function () {
 
 
 Logger.prototype.logRequestTime = function (text, startTime, url) {
-    const padZeroMS = (value) => {
-        while (value.length < 6) {
-            value = '0' + value;
-        }
-        return value;
-    };
-
     if (startTime) {
         const hrtime = process.hrtime(startTime);
         const ms = padZeroMS('' + Math.round(hrtime[1] / 1000));

package/lib/utils/measurement.js

@@ -44,7 +44,7 @@ Measurement.prototype.counterStop = function () {
 };
 
 Measurement.prototype.newChild = function (name) {
-    var child = new Measurement(name);
+    const child = new Measurement(name);
     this.children.push(child);
 
     return child;
@@ -81,7 +81,7 @@ Measurement.getRunningMeasurement = function () {
 };
 
 Measurement.removeFromStack = function (measure) {
-    var index = -1;
+    let index = -1;
     // search for the given measurement, based on "name"
     Measurement.stack.forEach(function (value, i) {
         if (value.name === measure.name) {
@@ -100,8 +100,8 @@ Measurement.measureAsync = function (fn, name) {
         return function (contextOuter, asyncDone) {
             // get the parent measurement, within which the current measurement will run (as a child)
             // e.g. ODataHandler.processRequest is the parent of all waterfall's functions (e.g. db.connect)
-            var parent = Measurement.getRunningMeasurement();
-            var child = parent.newChild(name);
+            const parent = Measurement.getRunningMeasurement();
+            const child = parent.newChild(name);
             child.counterStart();
             fn(contextOuter, function (err, context) {
                 child.counterStop();
@@ -118,14 +118,14 @@ Measurement.measureAsync = function (fn, name) {
 };
 
 Measurement.measureSync = function (fn /** args .., name*/) {
-    var args = Array.prototype.slice.call(arguments, 1, arguments.length - 1);
-    var res;
+    const args = Array.prototype.slice.call(arguments, 1, arguments.length - 1);
+    let res;
 
     if (Measurement.isActive()) {
-        var name = arguments[arguments.length - 1];
+        const name = arguments[arguments.length - 1];
         // <-
-        var parent = Measurement.getRunningMeasurement();
-        var child = parent.newChild(name);
+        const parent = Measurement.getRunningMeasurement();
+        const child = parent.newChild(name);
         child.counterStart();
         // =
         res = fn.apply(null, args);
@@ -140,14 +140,15 @@ Measurement.measureSync = function (fn /** args .., name*/) {
 
 // when the function to be called has a callback
 Measurement.measureWithCB = function (fn /** args, .., cb, name */) {
-    var args = Array.prototype.slice.call(arguments, 1, arguments.length - 2),
+    let args = Array.prototype.slice.call(arguments, 1, arguments.length - 2),
         cb = arguments[arguments.length - 2];
     args = args.concat(wrapCB);
+    let child;
 
     if (Measurement.isActive()) {
-        var name = arguments[arguments.length - 1];
-        var parent = Measurement.getRunningMeasurement();
-        var child = parent.newChild(name);
+        const name = arguments[arguments.length - 1];
+        const parent = Measurement.getRunningMeasurement();
+        child = parent.newChild(name);
         child.counterStart();
     }
     return fn.apply(null, args); // the counter implicitly stops

package/lib/utils/requestContext.js

@@ -1,6 +1,6 @@
 'use strict';
-var configuration = require('./../configuration');
-var Logger = require('./../utils/logger');
+const configuration = require('./../configuration');
+const Logger = require('./../utils/logger');
 
 /**
  * Contains the context for a http request-response cycle

package/lib/utils/stateMaschine.js

@@ -1,8 +1,8 @@
 "use strict";
 
 /* jshint ignore:start */
-var EventEmitter = require("events").EventEmitter;
-var utils = require("util");
+const EventEmitter = require("events").EventEmitter;
+const utils = require("util");
 
 module.exports = StateMaschine;
 
@@ -38,7 +38,7 @@ function handleError(error) {
  *@param {string} stateName Name of state to set
  */
 function setCurrentState(stateName) {
-    var state = this._context.states[stateName];
+    const state = this._context.states[stateName];
 
     if (!state) {
         throw new Error("State '" + stateName + "' does not exist");
@@ -143,8 +143,8 @@ StateMaschine.prototype.setFinal = function setFinal() {
  */
 StateMaschine.prototype.next = function next(stateName, arg1) {
 
-    var resetCurrentState = false;
-    var currentStateTemp = this._currentState;
+    let resetCurrentState = false;
+    const currentStateTemp = this._currentState;
     
     this._arg1 = arg1;
 
@@ -177,7 +177,7 @@ StateMaschine.prototype.next = function next(stateName, arg1) {
     } catch (error) {
 
         if (resetCurrentState === true) {
-            var lastState = this.getHistory().pop();
+            const lastState = this.getHistory().pop();
             setCurrentState.call(this, lastState.name);
         }
 

package/lib/utils/tableCleanup.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var connect = require('../db/connect');
-var statementProcessor = require('./../sql/statementProcessor');
+const connect = require('../db/connect');
+const statementProcessor = require('./../sql/statementProcessor');
 
 /**
  * Assert existing temp table statements. If there are still existing temp table
@@ -11,7 +11,7 @@ var statementProcessor = require('./../sql/statementProcessor');
  * @param {Next} next The callback to be called when finish processing
  */
 exports.assertCleanTempTables = function assertCleanTempTables(context, next) {
-    var statements, statementStr;
+    let statements, statementStr;
 
     context.logger.info('xsodata', 'assertCleanTempTables');
 

package/lib/utils/typeConverter.js

@@ -1,13 +1,13 @@
 'use strict';
 
 //Include
-var dbToJson = require('./typeConverters/dbToJson').dbToJson;
-var dbToXml = require('./typeConverters/dbToXml').dbToXml;
-var dbToUri = require('./typeConverters/dbToUri').dbToUri;
-var jsonToDb = require('./typeConverters/jsonToDb').jsonToDb;
-var uriToDb = require('./typeConverters/uriToDb').uriToDb;
-var xmlValueToOdataJson = require('./typeConverters/xmlValueToJson').xmlValueToODataJson;
-var Type_Error = require("./errors/typeError");
+const dbToJson = require('./typeConverters/dbToJson').dbToJson;
+const dbToXml = require('./typeConverters/dbToXml').dbToXml;
+const dbToUri = require('./typeConverters/dbToUri').dbToUri;
+const jsonToDb = require('./typeConverters/jsonToDb').jsonToDb;
+const uriToDb = require('./typeConverters/uriToDb').uriToDb;
+const xmlValueToOdataJson = require('./typeConverters/xmlValueToJson').xmlValueToODataJson;
+const XsODataTypeError = require("./errors/typeError");
 
 exports.converterFunctions = {
     dbNameToUri: dbToUri,
@@ -19,7 +19,7 @@ exports.converterFunctions = {
 };
 
 exports.serializeDbValueToUriLiteral = function (value, propertyInfo) {
-    var dbTypeName = propertyInfo.DATA_TYPE_NAME;
+    const dbTypeName = propertyInfo.DATA_TYPE_NAME;
     return exports.converterFunctions.dbNameToUri[dbTypeName](value);
 };
 
@@ -30,22 +30,22 @@ exports.serializeDbValueToUriLiteral = function (value, propertyInfo) {
  * value like the and MUST HAVE .DATA_TYPE_NAME field which contains the
  * db field declaration like "NVARCHAR"
  *
- * @throws {Type_Error} Throws Type_Error on invalid value
+ * @throws {XsODataTypeError} Throws XsODataTypeError on invalid value
  * @param value {String | Number} Value to convert
  * @param propertyInfo {Object} Metadata object describing value parameter
  * @returns {string|number|boolean} Corresponding DbJson value
  */
 exports.serializeXmlValueToODataJsonValue = function (value, propertyInfo) {
 
-    var dbTypeName = propertyInfo.DATA_TYPE_NAME;
-    var edmTypeName = dbTypeNameToODataTypeName[dbTypeName];
+    const dbTypeName = propertyInfo.DATA_TYPE_NAME;
+    const edmTypeName = dbTypeNameToODataTypeName[dbTypeName];
 
     /*jshint eqnull:true */
     if(edmTypeName == null){
-        throw new Type_Error("Can not find edm type for db type name " + dbTypeName, propertyInfo);
+        throw new XsODataTypeError("Can not find edm type for db type name " + dbTypeName, propertyInfo);
     }
 
-    var convert = exports.converterFunctions.xmlValueToODataJson[edmTypeName];
+    const convert = exports.converterFunctions.xmlValueToODataJson[edmTypeName];
     if(typeof convert !== 'function'){
         throw new Error("Converter function for "+edmTypeName+"(dbTypeName: "+dbTypeName+") could not be found!");
     }
@@ -69,7 +69,7 @@ exports.oDataTypeIDs = [ //order is important
     'Edm.Guid'      // 11
 ];
 
-var conversionODataTypeNameToODataTypeID = {
+const conversionODataTypeNameToODataTypeID = {
     'Edm.Time': 0,
     'Edm.DateTime': 1,
     'Edm.Byte': 2,
@@ -85,7 +85,7 @@ var conversionODataTypeNameToODataTypeID = {
 };
 
 
-var dbTypeNameToODataTypeName = {
+const dbTypeNameToODataTypeName = {
     'DATE': 'Edm.DateTime',
     'DAYDATE': 'Edm.DateTime',
     'TIME': 'Edm.Time',
@@ -119,16 +119,16 @@ exports.dbTypeNameToODataTypeName = dbTypeNameToODataTypeName;
 
 
 function oDataTypeNameToODataTypeID(oDataTypeName) {
-    var tmp = conversionODataTypeNameToODataTypeID[oDataTypeName];
+    const tmp = conversionODataTypeNameToODataTypeID[oDataTypeName];
     if (tmp !== undefined) {
         return tmp;
     }
-    throw new Type_Error('invalid ODataType name: ' + oDataTypeName);
+    throw new XsODataTypeError('invalid ODataType name: ' + oDataTypeName);
 }
 
 
-var _to_ID = oDataTypeNameToODataTypeID;
-var conversionDbTypeNameToODataTypeID = {
+const _to_ID = oDataTypeNameToODataTypeID;
+const conversionDbTypeNameToODataTypeID = {
     'DATE': _to_ID('Edm.DateTime'),
     'DAYDATE': _to_ID('Edm.DateTime'), // new
     'TIME': _to_ID('Edm.Time'),
@@ -160,12 +160,12 @@ var conversionDbTypeNameToODataTypeID = {
 
 function dbTypeNameToODataTypeID(dbTypeName) { //TYPE_ID seem is not unique
 
-    var tmp = conversionDbTypeNameToODataTypeID[dbTypeName];
+    const tmp = conversionDbTypeNameToODataTypeID[dbTypeName];
 
     if (tmp !== undefined) {
         return tmp;
     }
-    throw new Type_Error('invalid dbTypeName name: ' + dbTypeName);
+    throw new XsODataTypeError('invalid dbTypeName name: ' + dbTypeName);
 }
 
 exports.dbTypeNameToODataTypeID = dbTypeNameToODataTypeID;