@sap/xsodata 8.2.1 → 8.3.1

package/lib/uri/checks/checkAllowedMethod.js

@@ -1,12 +1,12 @@
 'use strict';
-var Http403_Forbidden = require('../../utils/errors/http/forbidden');
+const Http403_Forbidden = require('../../utils/errors/http/forbidden');
 
 module.exports = function checkAllowedMethods(){
 
-    var verbs = Array.prototype.slice.apply(arguments);
+    const verbs = Array.prototype.slice.apply(arguments);
 
     return function(context, callback){
-        var verbAllowed = verbs.some(function(verb){
+        const verbAllowed = verbs.some(function(verb){
             return context.request.method.toLowerCase() === verb;
         });
 

package/lib/uri/checks/checkAllowedMethodForBatch.js

@@ -1,8 +1,8 @@
 'use strict';
-var Http405_MethodNotAllowed = require('../../utils/errors/http/methodNotAllowed');
+const Http405_MethodNotAllowed = require('../../utils/errors/http/methodNotAllowed');
 
 module.exports = function checkAllowedMethodForBatch(context, callback) {
-    var method = context.request.method.toLowerCase();
+    const method = context.request.method.toLowerCase();
 
     if (method !== 'post'){
         return callback(new Http405_MethodNotAllowed('The URI is not valid for non POST operation. OData batch requests must use POST.'), context);

package/lib/uri/checks/checkAllowedMethodsForResourcePath.js

@@ -1,11 +1,11 @@
 'use strict';
-var Http405_MethodNotAllowed = require('../../utils/errors/http/methodNotAllowed'),
+const Http405_MethodNotAllowed = require('../../utils/errors/http/methodNotAllowed'),
     Http501_MethodNotSupported = require('../../utils/errors/http/notSupported');
 
 module.exports = function checkAllowdMethodsForResourePath(context, callback) {
 
-    var method = context.request.method.toLowerCase();
-    var dbLast = context.oData.dbSegmentLast;
+    const method = context.request.method.toLowerCase();
+    const dbLast = context.oData.dbSegmentLast;
 
     if (context.batchContext) {
         if (!context.batchContext.inChangeSet) {

package/lib/uri/checks/checkFilterOnAggregatedColumn.js

@@ -1,11 +1,11 @@
 'use strict';
 
-var Http400_BadRequest= require('../../utils/errors/http/badRequest');
+const Http400_BadRequest= require('../../utils/errors/http/badRequest');
 
 module.exports = function checkFilterOnAggregatedColumn(context, callback) {
 
-    var aggs = context.oData.dbSegmentLast.entityType.getAggregates();
-    var filter = context.oData.systemQueryParameters.filter;
+    const aggs = context.oData.dbSegmentLast.entityType.getAggregates();
+    const filter = context.oData.systemQueryParameters.filter;
 
     if (aggs.length === 0 || !filter){
         return callback(null, context);
@@ -20,12 +20,12 @@ module.exports = function checkFilterOnAggregatedColumn(context, callback) {
 };
 
 function createError() {
-    var errorMessage = '$filter is not allowed for aggregated columns.';
+    const errorMessage = '$filter is not allowed for aggregated columns.';
     return new Http400_BadRequest(errorMessage);
 }
 
 function check(aggs, type){
-    var violation = aggs.some(function(agg){
+    let violation = aggs.some(function(agg){
         return agg.column === type.property;
     });
 

package/lib/uri/checks/checkFilterOrderByOnGenKeyColumn.js

@@ -1,16 +1,16 @@
 'use strict';
 
-var Http400_BadRequest= require('../../utils/errors/http/badRequest');
+const Http400_BadRequest= require('../../utils/errors/http/badRequest');
 
 module.exports = function checkFilterOrderByOnGenKeyColumn(context, callback) {
-    var genKey;
+    let genKey;
 
     if(context.oData.dbSegmentLast.entityType.hasGeneratedKey()){
         genKey = context.oData.dbSegmentLast.entityType.keys.generatedKey;
     }
 
-    var filter = context.oData.systemQueryParameters.filter;
-    var orderBy = context.oData.systemQueryParameters.orderby;
+    const filter = context.oData.systemQueryParameters.filter;
+    const orderBy = context.oData.systemQueryParameters.orderby;
 
     if (!genKey || (!filter && !orderBy)){
         return callback(null, context);
@@ -29,12 +29,12 @@ module.exports = function checkFilterOrderByOnGenKeyColumn(context, callback) {
 };
 
 function createError(sqo) {
-    var errorMessage = '$' + sqo + ' is not allowed for generated key columns.';
+    const errorMessage = '$' + sqo + ' is not allowed for generated key columns.';
     return new Http400_BadRequest(errorMessage);
 }
 
 function check(genKey, type){
-    var violation = genKey === type.property;
+    let violation = genKey === type.property;
 
     if (!violation){
         violation = type.getChildren().some(check.bind(null, genKey));

package/lib/uri/checks/checkGenKeyRestrictions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Http501_NotSupported= require('../../utils/errors/http/notSupported');
+const Http501_NotSupported= require('../../utils/errors/http/notSupported');
 
 module.exports = function checkGenKeyRestrictions(context, callback) {
 
@@ -20,7 +20,7 @@ module.exports = function checkGenKeyRestrictions(context, callback) {
 };
 
 function createError() {
-    var errorMessage = 'GET, PUT/MERGE, DELETE are not allowed for entity requests, ' +
+    const errorMessage = 'GET, PUT/MERGE, DELETE are not allowed for entity requests, ' +
         'where generated local key is defined on the corresponding entity set. ' +
         'In addition POST requests to the entity set are also not allowed.';
     return new Http501_NotSupported(errorMessage);

package/lib/uri/checks/checkModificationForbidden.js

@@ -1,14 +1,14 @@
 'use strict';
-var Http403_Forbidden = require('../../utils/errors/http/forbidden');
+const Http403_Forbidden = require('../../utils/errors/http/forbidden');
 
 module.exports = function checkModificationForbidden(context, callback){
-    var methodModificationMap = {
+    const methodModificationMap = {
         'put': 'update',
         'post' : 'create',
         'delete' : 'delete'
     };
 
-    var modification = methodModificationMap[context.request.method.toLowerCase()];
+    const modification = methodModificationMap[context.request.method.toLowerCase()];
 
     if (context.oData.dbSegmentLast.entityType.modifications[modification] === 'forbidden'){
         return callback(new Http403_Forbidden('Modification forbidden.'), context);

package/lib/uri/checks/checkPostPutDeleteChecks.js

@@ -1,8 +1,8 @@
 'use strict';
-var methodNotAllowed = require('../../utils/errors/http/methodNotAllowed');
+const methodNotAllowed = require('../../utils/errors/http/methodNotAllowed');
 
 module.exports = function (context, callback) {
-    var method = context.request.method.toLowerCase();
+    const method = context.request.method.toLowerCase();
 
     if (method === 'post') {
         checkPost(context, callback);
@@ -21,7 +21,7 @@ function createNowAllowed(mess, context) {
 
 
 function checkPost(context, callback) {
-    var dbLast = context.oData.dbSegmentLast;
+    const dbLast = context.oData.dbSegmentLast;
     if ((dbLast.previousDBSegment && !context.oData.dbSegment.isLinks) || dbLast.nextDBSegment) {
         return callback(createNowAllowed('POST only allowed on direct entitySets', context), context);
     }
@@ -29,7 +29,7 @@ function checkPost(context, callback) {
 }
 
 function checkPut(context, callback) {
-    var dbLast = context.oData.dbSegmentLast;
+    const dbLast = context.oData.dbSegmentLast;
     if ((dbLast.previousDBSegment && !context.oData.dbSegment.isLinks) || dbLast.nextDBSegment) {
         return callback(createNowAllowed('PUT only allowed on direct entitySets', context), context);
     }
@@ -37,7 +37,7 @@ function checkPut(context, callback) {
 
 }
 function checkDelete(context, callback) {
-    var dbLast = context.oData.dbSegmentLast;
+    const dbLast = context.oData.dbSegmentLast;
     if ((dbLast.previousDBSegment && !context.oData.dbSegment.isLinks) || dbLast.nextDBSegment) {
         return callback(createNowAllowed('DELETE only allowed on direct entitySets', context), context);
     }

package/lib/uri/checks/checkSystemQueryOptions.js

@@ -1,9 +1,9 @@
 'use strict';
-var Http404 = require('../../utils/errors/http/badRequest');
-var Http501 = require('../../utils/errors/http/notImplemented');
-var uriType = require('../uriType');
+const Http404 = require('../../utils/errors/http/badRequest');
+const Http501 = require('../../utils/errors/http/notImplemented');
+const uriType = require('../uriType');
 
-var sqoMap = {};
+const sqoMap = {};
 sqoMap[uriType.URI0] = {
 	expand: false,
 	filter: false,
@@ -185,13 +185,13 @@ sqoMap[uriType.UNKNOWN_URI] = {
 };
 
 module.exports = function checkSystemQueryOptions(context, callback) {
-    var sysQueryParams = context.oData.systemQueryParameters;
+    const sysQueryParams = context.oData.systemQueryParameters;
 
-    var odataUriType = uriType.determineUriType(context);
+    const odataUriType = uriType.determineUriType(context);
 	setUriType(context, odataUriType);
     context.logger.debug('check system query options', 'uri type identified: URI' + odataUriType);
 
-    var containsSkipToken = Object.keys(sysQueryParams).some(function(sqo){
+    const containsSkipToken = Object.keys(sysQueryParams).some(function(sqo){
         return sqo === 'skiptoken';
     });
 
@@ -200,13 +200,13 @@ module.exports = function checkSystemQueryOptions(context, callback) {
         return callback(new Http501('$skiptoken not supported'), context);
     }
 
-    var notAllowedSqos = Object.keys(sysQueryParams).some(function(sqo){
+    const notAllowedSqos = Object.keys(sysQueryParams).some(function(sqo){
         return !sqoMap[odataUriType][sqo];
     });
 
     if (notAllowedSqos){
         context.logger.debug('check system query options', 'violation found');
-        var message = createErrorMessage(sqoMap[odataUriType]);
+        const message = createErrorMessage(sqoMap[odataUriType]);
         return callback(new Http404(message), context);
     }
 
@@ -214,7 +214,7 @@ module.exports = function checkSystemQueryOptions(context, callback) {
 
     function createErrorMessage(sqoMap){
 
-        var allowedSqos = Object.keys(sqoMap).filter(function(sqo){
+        const allowedSqos = Object.keys(sqoMap).filter(function(sqo){
             return sqoMap[sqo];
         }).map(function (sqo){
             return '$' + sqo;

package/lib/uri/checks.js

@@ -1,22 +1,22 @@
 'use strict';
 
-var oDataUriParser = require('./oDataUriParser');
-var resourceKind = oDataUriParser.URI_KIND_Resource;
-var metaDataKind = oDataUriParser.URI_KIND_MetaData;
-var serviceKind = oDataUriParser.URI_KIND_Service;
-var batchKind = oDataUriParser.URI_KIND_Batch;
+const oDataUriParser = require('./oDataUriParser');
+const resourceKind = oDataUriParser.URI_KIND_Resource;
+const metaDataKind = oDataUriParser.URI_KIND_MetaData;
+const serviceKind = oDataUriParser.URI_KIND_Service;
+const batchKind = oDataUriParser.URI_KIND_Batch;
 
-var checkModificationForbidden = require('./checks/checkModificationForbidden');
-var checkAllowedVerbs = require('./checks/checkAllowedMethod');
-var checkGenKeyRestrictions = require('./checks/checkGenKeyRestrictions');
-var checkAllowedMethodsForResourcePath = require('./checks/checkAllowedMethodsForResourcePath');
-var checkAllowedMethodForBatch = require('./checks/checkAllowedMethodForBatch');
-var checkPostPutDeleteChecks = require('./checks/checkPostPutDeleteChecks');
-var checkSystemQueryOptions = require('./checks/checkSystemQueryOptions');
-var checkFilterOnAggregatedColumn = require('./checks/checkFilterOnAggregatedColumn');
-var checkFilterOrderByOnGenKeyColumn = require('./checks/checkFilterOrderByOnGenKeyColumn');
+const checkModificationForbidden = require('./checks/checkModificationForbidden');
+const checkAllowedVerbs = require('./checks/checkAllowedMethod');
+const checkGenKeyRestrictions = require('./checks/checkGenKeyRestrictions');
+const checkAllowedMethodsForResourcePath = require('./checks/checkAllowedMethodsForResourcePath');
+const checkAllowedMethodForBatch = require('./checks/checkAllowedMethodForBatch');
+const checkPostPutDeleteChecks = require('./checks/checkPostPutDeleteChecks');
+const checkSystemQueryOptions = require('./checks/checkSystemQueryOptions');
+const checkFilterOnAggregatedColumn = require('./checks/checkFilterOnAggregatedColumn');
+const checkFilterOrderByOnGenKeyColumn = require('./checks/checkFilterOrderByOnGenKeyColumn');
 
-var checks = module.exports = {};
+const checks = module.exports = {};
 
 checks[resourceKind] = [
     checkAllowedMethodsForResourcePath,

package/lib/uri/expandSelectTreeBuilder.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var InternalError = require('./../utils/errors/internalError');
+const InternalError = require('./../utils/errors/internalError');
 
 function NavExp() {
     this.showAllProperties = true;              //default show property, and navprop as link
@@ -17,7 +17,7 @@ function NavExp() {
 }
 
 NavExp.prototype.toPureJsonObject = function () {
-    var ret = {
+    const ret = {
         showAllProperties: this.showAllProperties,
         expandAllAvailExpands: this.expandAllAvailExpands,
         isStar: this.isStar,
@@ -26,7 +26,7 @@ NavExp.prototype.toPureJsonObject = function () {
         availableExpands: {}
     };
 
-    for (var exp in this.availableExpands) {
+    for (const exp in this.availableExpands) {
         if (this.availableExpands.hasOwnProperty(exp)) {
             ret.availableExpands[exp] = this.availableExpands[exp].toPureJsonObject();
         }
@@ -44,7 +44,7 @@ NavExp.prototype.addNav = function (name, nav) {
 };
 
 NavExp.prototype.applySelect = function (select) {
-    var part = select.shift();
+    const part = select.shift();
 
     if (part === '*') {
         this.isStar = true;
@@ -52,7 +52,7 @@ NavExp.prototype.applySelect = function (select) {
     } else {
         this.showAllProperties = false;
         this.expandAllAvailExpands = false;
-        var nav = this.availableExpands[part];
+        const nav = this.availableExpands[part];
 
         if (nav) {
 
@@ -82,24 +82,20 @@ NavExp.prototype.applySelect = function (select) {
 
 
 function processSelects(selects, tree) {
-    for (var i = 0; i < selects.length; i++) {
-        var select = selects[i];
+    for (const select of selects) {
         tree.applySelect(select);
     }
 }
 
 function createExpandTree(expandClauses) {
-    var tree = new NavExp();
+    const tree = new NavExp();
     if (expandClauses) {
 
-        for (var i = 0; i < expandClauses.length; i++) {
-            var expandClause = expandClauses[i];
-            var root = tree;
+        for (const expandClause of expandClauses) {
+            let root = tree;
 
-            for (var ii = 0; ii < expandClause.length; ii++) {
-                var expandItem = expandClause[ii];
-
-                var nav = root.getNav(expandItem);
+            for (const expandItem of expandClause) {
+                const nav = root.getNav(expandItem);
                 if (nav !== undefined) {
                     root = nav;
                 } else {
@@ -112,7 +108,7 @@ function createExpandTree(expandClauses) {
 }
 
 function processExpandSelectTree(expands, selects) {
-    var tree = createExpandTree(expands);
+    const tree = createExpandTree(expands);
     if (selects) {
         processSelects(selects, tree);
     }

package/lib/uri/oDataUriParser.js

@@ -7,14 +7,14 @@
  */
 
 //Includes
-var oDataSegmentParser = require('../parsers/jison_segment_parser');
-var queryParameterParser = require('./queryParameterParser');
-var resourcePathParser = require('./resourcePathParser');
-var uriSegmentTypes = require('./uriSegmentTypes');
-var BadRequest = require('./../utils/errors/http/badRequest');
-var Measurement = require('./../utils/measurement');
-var typedObjects = require("./../utils/typedObjects");
-var BadRequestError = require("./../utils/errors/http/badRequest");
+const oDataSegmentParser = require('../parsers/jison_segment_parser');
+const queryParameterParser = require('./queryParameterParser');
+const resourcePathParser = require('./resourcePathParser');
+const uriSegmentTypes = require('./uriSegmentTypes');
+const BadRequest = require('./../utils/errors/http/badRequest');
+const Measurement = require('./../utils/measurement');
+const typedObjects = require("./../utils/typedObjects");
+const BadRequestError = require("./../utils/errors/http/badRequest");
 
 // Values of the constants below correspond to the OData URI types
 exports.URI_KIND_Service = 0;
@@ -26,13 +26,13 @@ exports.URI_KIND_Resource = 4;
 const UNKNOWN_POSITION = -1;
 
 function parseODataSegments(segments) {
-    var segmentsParsed = [];
+    const segmentsParsed = [];
     if (segments.decoded.length === 0) {
         segmentsParsed.push(new uriSegmentTypes.ServiceSegment(''));
     } else {
-        for (var i = 0; i < segments.decoded.length; i++) {
+        for (const segment of segments.decoded) {
             try {
-                var tmp = oDataSegmentParser.parse(segments.decoded[i]);
+                const tmp = oDataSegmentParser.parse(segment);
                 segmentsParsed.push(tmp);
             } catch (err) {
                 let position = (err.hash && err.hash.loc && err.hash.loc.last_column && Number.isInteger(err.hash.loc.last_column)) ? err.hash.loc.last_column : UNKNOWN_POSITION;
@@ -71,11 +71,11 @@ function parseQueryParameter(name, value) {
 }
 
 function parseSystemQueryParameters(queries) {
-    var queryParameter = {};
-    for (var prop in queries) {
+    const queryParameter = {};
+    for (const prop in queries) {
         if (Object.prototype.hasOwnProperty.call(queries, prop)) {
-            if (prop.substr(0, 1) === '$') {
-                var name = prop.substr(1);
+            if (prop.startsWith('$')) {
+                const name = prop.substring(1);
                 queryParameter[name] = parseQueryParameter(prop, queries[prop]);
             }
         }
@@ -85,7 +85,7 @@ function parseSystemQueryParameters(queries) {
 
 exports.parseODataUri = function (context, asyncDone) {
     context.logger.silly('uri', 'parse OData uri');
-    var oData = {};
+    const oData = {};
 
     try {
         context.logger.silly('uri', 'parse OData segments');
@@ -103,7 +103,7 @@ exports.parseODataUri = function (context, asyncDone) {
         return asyncDone(err,context);
     }
 
-    var segment = oData.segments[0];
+    const segment = oData.segments[0];
 
     if (segment instanceof uriSegmentTypes.ServiceSegment) {
         oData.kind = exports.URI_KIND_Service;
@@ -131,7 +131,7 @@ exports.parseODataUri = function (context, asyncDone) {
  * @param context {Object} The xsodata context
  */
 exports.validateQueryParameters = function (queryParameters, context) {
-    var query = context.uriTree.rawUrlParts.query;
+    const query = context.uriTree.rawUrlParts.query;
 
     if (queryParameters.filter || (query && query['$filter'])) {
         exports.validate$filterExpression(queryParameters, context);
@@ -145,8 +145,8 @@ exports.validateQueryParameters = function (queryParameters, context) {
  * @param context {Object} The xsodata context
  */
 exports.validate$filterExpression = function (queryParameters, context) {
-    var filter = queryParameters.filter;
-    var query = context.uriTree.rawUrlParts.query;
+    const filter = queryParameters.filter;
+    const query = context.uriTree.rawUrlParts.query;
 
     // Invalid $filter expression --> $filter=Id
     if (filter && (filter instanceof typedObjects.Property) === true) {

package/lib/uri/queryParameterParser.js

@@ -1,12 +1,12 @@
 'use strict';
 
 //Includes
-var filter_parser = require('../parsers/jison_filter_parser');
-var orderBy_parser = require('../parsers/jison_orderby_parser');
+const filter_parser = require('../parsers/jison_filter_parser');
+const orderBy_parser = require('../parsers/jison_orderby_parser');
 
-var BadRequest = require('./../utils/errors/http/badRequest');
-var NotSupported = require('./../utils/errors/http/notSupported');
-var UnsupportedMediatype = require('./../utils/errors/http/unsupportedMediaType');
+const BadRequest = require('./../utils/errors/http/badRequest');
+const NotSupported = require('./../utils/errors/http/notSupported');
+const UnsupportedMediatype = require('./../utils/errors/http/unsupportedMediaType');
 
 //API
 exports.parseExpand = parseExpand;
@@ -21,18 +21,16 @@ exports.parseInlineCount = parseInlineCount;
 exports.parseSkipToken = parseSkipToken;
 
 //Code
-var onlyIntRegexObj = /^\d+$/;
+const onlyIntRegexObj = /^\d+$/;
 
 function parseTop(top) {
     if (!onlyIntRegexObj.test(top)) {
         throw new BadRequest('Invalid value for system query $top.');
     }
 
-    var ret = parseInt(top);
+    const ret = parseInt(top);
 
-    if (ret > 2147483647) {
-        throw new BadRequest('Invalid value for system query $top.');
-    } else if (ret < 0) {
+    if (ret > 2147483647 || ret < 0) {
         throw new BadRequest('Invalid value for system query $top.');
     }
     return ret;
@@ -44,11 +42,9 @@ function parseSkip(skip) {
         throw new BadRequest('Invalid value for system query $skip.');
     }
 
-    var ret = parseInt(skip);
+    const ret = parseInt(skip);
 
-    if (ret > 2147483647) {
-        throw new BadRequest('Invalid value for system query $skip.');
-    } else if (ret < 0) {
+    if (ret > 2147483647 || ret < 0) {
         throw new BadRequest('Invalid value for system query $skip.');
     }
     return ret;
@@ -69,18 +65,16 @@ function parseInlineCount(inlineCount) {
 
 
 function parseSelect(select) {
-    var selectclauses = [];
+    const selectclauses = [];
     if (!select) {
         return selectclauses;
     }
-    var rawSelectClauses = select.split(',');
-    for (var i = 0; i < rawSelectClauses.length; i++) {
-        var rawSelectClause = rawSelectClauses[i];
-        var rawSelectItems = rawSelectClause.split('/');
-
-        var selectItems = [];
-        for (var ii = 0; ii < rawSelectItems.length; ii++) {
-            var rawSelectItem = rawSelectItems[ii];
+    const rawSelectClauses = select.split(',');
+    for (const rawSelectClause of rawSelectClauses) {
+        const rawSelectItems = rawSelectClause.split('/');
+
+        const selectItems = [];
+        for (const rawSelectItem of rawSelectItems) {
             selectItems.push(rawSelectItem);
         }
         selectclauses.push(selectItems);
@@ -89,19 +83,17 @@ function parseSelect(select) {
 }
 
 function parseExpand(expand) {
-    var expandclauses = [];
+    const expandclauses = [];
     if (!expand) {
         return expandclauses;
     }
 
-    var rawExpandClauses = expand.split(',');
-    for (var i = 0; i < rawExpandClauses.length; i++) {
-        var rawExpandClause = rawExpandClauses[i];
-        var rawExpandItems = rawExpandClause.split('/');
+    const rawExpandClauses = expand.split(',');
+    for (const rawExpandClause of rawExpandClauses) {
+        const rawExpandItems = rawExpandClause.split('/');
 
-        var expandList = [];
-        for (var ii = 0; ii < rawExpandItems.length; ii++) {
-            var rawExpandItem = rawExpandItems[ii];
+        const expandList = [];
+        for (const rawExpandItem of rawExpandItems) {
             expandList.push(rawExpandItem);
         }
         expandclauses.push(expandList);
@@ -111,7 +103,7 @@ function parseExpand(expand) {
 
 function parseFilter(filter, done) {
 
-    var ast,
+    let ast,
         error;
 
     try {
@@ -135,7 +127,7 @@ function parseOrderBy(orderBy, done) {
 
     if (done !== undefined) {
 
-        var ast;
+        let ast;
         try {
             ast = orderBy_parser.parse(orderBy);
         } catch (ex) {