@sap/xsodata 8.3.0 → 8.3.1

package/lib/utils/typedObjects.js

@@ -1,9 +1,9 @@
 'use strict';
 
 //Includes
-var NotSupported = require('./errors/http/notSupported');
-var uriToDb = require('./../utils/typeConverters/uriToDb').uriToDb;
-var Type_Error = require('./errors/typeError');
+const NotSupported = require('./errors/http/notSupported');
+const uriToDb = require('./../utils/typeConverters/uriToDb').uriToDb;
+const XsODataTypeError = require('./errors/typeError');
 
 //Supported expression kinds
 exports.NODE_LITERAL = 1;//TODO
@@ -24,11 +24,9 @@ exports.NODE_METHOD = 23;
 exports.NODE_PARENTHESIS = 24;
 exports.NODE_MEMBER = 25;
 exports.NODE_PROPERTY = 26;
-//
 exports.NODE_SORTORDER = 27;
 exports.NODE_ORDERBY = 28;
 
-
 //Supported binary operators
 exports.OR = 0;
 exports.AND = 1;
@@ -101,7 +99,6 @@ exports.Parenthesis = Parenthesis;
 exports.Method = Method;
 exports.Member = Member;
 exports.Property = Property;
-//exports.Literal = Literal;
 
 exports.SortOrder = SortOrder;
 exports.OrderBy = OrderBy;
@@ -172,7 +169,7 @@ function Nil() {
  *     Secondtime, value: 11:12:13
  */
 Nil.prototype.toSqlHana = function toSqlHana() {
-    throw new Type_Error('Nil can not converted to HANA sql syntax');
+    throw new XsODataTypeError('Nil can not converted to HANA sql syntax');
 };
 
 Nil.prototype.getChildren = function () {
@@ -240,7 +237,7 @@ function ONumber(number/*intPart, floatPart, exp, postFix*/) {
     this.uriNumber = number;
     this.preNumber = undefined;
 
-    let type = number.substr(number.length - 1).toUpperCase();
+    let type = number.slice(number.length - 1).toUpperCase();
     if (type === 'F' ||
         type === 'f' ||
         type === 'D' ||
@@ -273,7 +270,6 @@ function ONumber(number/*intPart, floatPart, exp, postFix*/) {
     this.e = exponent[1] || null;
 
     this.preNumber = '';
-    //this.preNumber += sign;
     if (this.i) {
         this.preNumber += this.i;
     } else {
@@ -316,7 +312,7 @@ ONumber.prototype.toSqlHana = function toSqlHana(context, parameter) {
     } else if (this.type === 'L') {
         dbValue = input;
     } else {
-        throw new Type_Error(this.type);
+        throw new XsODataTypeError(this.type);
     }
     parameter.push(dbValue);
 
@@ -334,7 +330,6 @@ ONumber.prototype.getChildren = function () {
 function EdmString(value) {
     this.kind = exports.NODE_LITERAL_STRING;
     this.string = value;
-    //this.string = value.substring(1,value.length-1).replace(reg2to1Quote,'\'');
 }
 
 /** Conversion to HANA db type NString
@@ -351,8 +346,6 @@ EdmString.prototype.getChildren = function () {
     return [];
 };
 
-//var reg2to1Quote = new RegExp('\'\'','g');
-
 /** Edm.Binary representation
  * @class Binary
  * Tested via test_filter_parser.js
@@ -370,7 +363,6 @@ Binary.prototype.toSqlHana = function toSqlHana(context, parameter) {
     let value = uriToDb['Edm.Binary'](this.value, 'VARBINARY');
 
     parameter.push(value);
-    //parameter.push('x\'' + this.value + '\'');
     return '?';
 };
 
@@ -511,15 +503,6 @@ function complexBinaryWithNull(first, op, second, context, parameter) {
         //only properties are used
         if (op === exports.EQ) {
             //equals
-            //out << "(";
-            //serializeExpr(f, out);
-            //out << "=";
-            //serializeExpr(s, out);
-            //out << " or (";
-            //serializeExpr(f, out);
-            //out << " is null and ";
-            //serializeExpr(s, out);
-            //out << " is null))";
             sql += '(' + left + ' = ' + right +
                 ' or (' + left + ' is null and ' + right + ' is null))';
             parameter.push.apply(parameter, pLeft);
@@ -528,23 +511,6 @@ function complexBinaryWithNull(first, op, second, context, parameter) {
             parameter.push.apply(parameter, pRight);
         } else {
             //not equals
-            //out << "((";
-            //serializeExpr(f, out);
-            //out << "!=";
-            //serializeExpr(s, out);
-            //out << " and not (";
-            //serializeExpr(f, out);
-            //out << " is null and ";
-            //serializeExpr(s, out);
-            //out << " is null)) or (";
-            //serializeExpr(f, out);
-            //out << " is null and ";
-            //serializeExpr(s, out);
-            //out << " is not null) or (";
-            //serializeExpr(f, out);
-            //out << " is not null and ";
-            //serializeExpr(s, out);
-            //out << " is null))";
             sql +=
                 '((' + left + ' != ' + right +
                 ' and not (' + left + ' is null and ' + right + ' is null))' +
@@ -567,15 +533,6 @@ function complexBinaryWithNull(first, op, second, context, parameter) {
             if (_null) {
                 //TODO add feature
                 throw new NotSupported("Comparing operand type '<Collection>' with null not supported.", 406);
-                //out << (type == Expr::EQ ? " not exists (select 1 from " : " exists (select 1 from");
-                //serializeSegment(ast::cast<const ast::Member>(f)->lastSegment(), out);
-                //out << ")";
-
-                //if (op === exports.EQ) {
-                //    sql += '( not exists (select 1 from ' + '...' + ')';
-                //} else {
-                //    sql += 'exists (select 1 from ' + '...' + ')';
-                //}
             } else {
                 if (op === exports.EQ) {
                     throw new Error("Operator 'eq' incompatible with operand types '<Collection>' and non '<Collection>'.");
@@ -586,36 +543,20 @@ function complexBinaryWithNull(first, op, second, context, parameter) {
         } else {
             if (op === exports.EQ) {
                 if (_null) {
-                    //serializeExpr(f, out);
-                    //out << ( " is ");
-                    //serializeExpr(s, out);
                     sql += '(' + left + ' is ' + right + ')';
                     parameter.push.apply(parameter, pLeft);
                     parameter.push.apply(parameter, pRight);
                 } else {
-                    //serializeExpr(f, out);
-                    //out << ( " = ");
-                    //serializeExpr(s, out);
                     sql += '(' + left + ' = ' + right + ')';
                     parameter.push.apply(parameter, pLeft);
                     parameter.push.apply(parameter, pRight);
                 }
             } else if (op === exports.NE) {
                 if (_null) {
-                    //serializeExpr(f, out);
-                    //out << ( " is not ");
-                    //serializeExpr(s, out);
                     sql += '(' + left + ' is not ' + right + ')';
                     parameter.push.apply(parameter, pLeft);
                     parameter.push.apply(parameter, pRight);
                 } else {
-                    //out << "(";
-                    //serializeExpr(f, out);
-                    //out << "!=";
-                    //serializeExpr(s, out);
-                    //out << " or ";
-                    //serializeExpr(f, out);
-                    //out << " is null)";
                     sql += '(' + left + ' != ' + right + ' or ' + left + ' is null)';
                     parameter.push.apply(parameter, pLeft);
                     parameter.push.apply(parameter, pRight);
@@ -705,14 +646,6 @@ BinaryOperator.prototype.toSqlHana = function toSqlHana(context, parameter) {
     let sql = '';
     switch (this.op) {
         case exports.EQ :
-            if (this.strict || context.oDataNullSupport !== true) {
-                sql += '(' + left + exports.binarySqlMapping[this.op] + right + ')';
-                parameter.push.apply(parameter, pLeft);
-                parameter.push.apply(parameter, pRight);
-                break;
-            }
-            sql += complexBinaryWithNull(this.left, this.op, this.right, context, parameter);
-            break;
         case exports.NE : //special case
             if (this.strict || context.oDataNullSupport !== true) {
                 sql += '(' + left + exports.binarySqlMapping[this.op] + right + ')';
@@ -724,7 +657,6 @@ BinaryOperator.prototype.toSqlHana = function toSqlHana(context, parameter) {
             break;
         case exports.OR :
         case exports.AND :
-
         case exports.GE :
         case exports.LE :
         case exports.GT :
@@ -785,9 +717,9 @@ function Method(method, parameter) {
 }
 
 Method.prototype.setAlias = function (alias) {
-    for (let i = 0; i < this.parameter.length; i++) {
-        if (this.parameter[i].setAlias) {
-            this.parameter[i].setAlias(alias);
+    for (const param of this.parameter) {
+        if (param.setAlias) {
+            param.setAlias(alias);
         }
     }
 };
@@ -1134,8 +1066,8 @@ OrderBy.prototype.applyConverter = function (convert) {
 };
 
 OrderBy.prototype.setAlias = function (alias) {
-    for (let i = 0; i < this.orders.length; i++) {
-        this.orders[i].setAlias(alias);
+    for (const order of this.orders) {
+        order.setAlias(alias);
     }
 };
 

package/lib/utils/utils.js

@@ -1,9 +1,9 @@
 'use strict';
 
-var InternalError = require('./../utils/errors/internalError');
-var XsODataError = require('./../utils/errors/xsODataError');
-var Measurement = require('./measurement');
-var uriType = require('../uri/uriType');
+const InternalError = require('./../utils/errors/internalError');
+const XsODataError = require('./../utils/errors/xsODataError');
+const Measurement = require('./measurement');
+const uriType = require('../uri/uriType');
 
 /**
  * Checks weather a schema is allowed to be used directly in the xsodata file. E.g. for cross schema access
@@ -22,10 +22,10 @@ exports.injectContext = function (context) {
 };
 
 exports.try = function (fn /* and more args */) {
-    var args = Array.prototype.slice.call(arguments, 1);
+    const args = Array.prototype.slice.call(arguments, 1);
 
     return function (context, asyncDone) {
-        var args1 = Array.prototype.slice.call(arguments);
+        const args1 = Array.prototype.slice.call(arguments);
 
         try {
             return fn.apply(null, args.concat(args1));
@@ -40,8 +40,8 @@ exports.try = function (fn /* and more args */) {
 };
 
 exports.tryAndMeasure = function (/* fn, and more args , name */) {
-    var args = Array.prototype.slice.call(arguments, 0, arguments.length - 1);
-    var name = arguments[arguments.length - 1];
+    const args = Array.prototype.slice.call(arguments, 0, arguments.length - 1);
+    const name = arguments[arguments.length - 1];
 
     return Measurement.measureAsync(exports.try.apply(null, args), name);
 };
@@ -66,8 +66,8 @@ exports.ensureSlashEnding = function (path) {
 };
 
 exports.getObjectPropertiesAsList = function (object) {
-    var list = [];
-    for (var property in object) {
+    const list = [];
+    for (const property in object) {
         if (object.hasOwnProperty(property)) {
             list.push(object[property]);
         }
@@ -135,13 +135,13 @@ exports.iterateObject = function iterateObject(context, callback, options) {
 
     // Loop over object keys and find properties which could be prefixed
     // with namespaces
-    for (var key in context) {
+    for (const key in context) {
 
         if (context.hasOwnProperty(key)) {
 
             options.$currentKeyPath.push(key);
 
-            var callbackResult = true;
+            let callbackResult = true;
 
             // If any filter function is provided we use that filter to call
             // the callback only on filter(...) === true properties
@@ -163,7 +163,7 @@ exports.iterateObject = function iterateObject(context, callback, options) {
                 // Check property object value. If it's an object we will
                 // iterate through all nested objects recursive
 
-                var value = context[key];
+                const value = context[key];
 
                 /*jshint eqnull:true */
                 if (value != null) {
@@ -192,7 +192,7 @@ exports.hasProperties = function hasProperties(obj) {
         return false;
     }
 
-    for (var key in obj) {
+    for (const key in obj) {
         if (obj.hasOwnProperty(key)) {
             return true;
         }
@@ -247,8 +247,8 @@ exports.getRandomInt = function getRandomInt(min, max) {
 };
 
 // requests, for which ETag property/header must be generated
-var requestsWithETagHeader = { GET: {}, POST: {}, PUT: {} },
-    requestsWithETagProperty;
+const requestsWithETagHeader = { GET: {}, POST: {}, PUT: {} };
+let requestsWithETagProperty;
 
 requestsWithETagHeader.GET[uriType.URI2] = true;
 requestsWithETagHeader.GET[uriType.URI5A] = true;
@@ -284,7 +284,7 @@ exports.isETagHeaderRequired = function isETagHeaderRequired(context, dbSegment)
 };
 
 function isETagRequiredForRequest(context, dbSegment, requestsWithETag) {
-    var urisWithETag;
+    let urisWithETag;
 
     if (!dbSegment.entityType.hasConcurrentProperties()) {
         return false;
@@ -316,13 +316,12 @@ exports.compareDBVersion = (a, b, fixedTo) => {
         A[i] = Number.parseInt(A[i]);
         B[i] = Number.parseInt(B[i]);
     }
-    if (a === b) {
-        return exports.VERSION_A_COVERS_VERSION_B;
-    } else if ((fixedTo <= 0) && (A[0] > B[0]) ||
+    if (a === b || 
+        ((fixedTo <= 0) && (A[0] > B[0]) ||
         (fixedTo <= 1) && (A[0] === B[0] && A[1] > B[1]) ||
         (fixedTo <= 2) && (A[0] === B[0] && A[1] === B[1] && A[2] > B[2]) ||
         (fixedTo <= 3) && (A[0] === B[0] && A[1] === B[1] && A[2] === B[2] && A[3] > B[3]) ||
-        (fixedTo <= 4) && (A[0] === B[0] && A[1] === B[1] && A[2] === B[2] && A[3] === B[3] && A[4] > B[4])) {
+        (fixedTo <= 4) && (A[0] === B[0] && A[1] === B[1] && A[2] === B[2] && A[3] === B[3] && A[4] > B[4]))) {
         return exports.VERSION_A_COVERS_VERSION_B;
     }
     return exports.VERSIONS_DIFFERENT;
@@ -330,8 +329,6 @@ exports.compareDBVersion = (a, b, fixedTo) => {
 
 exports.VERSION_A_COVERS_VERSION_B = 1;
 exports.VERSIONS_DIFFERENT = -1;
-
-
 exports.NO_FIX_PART = 0;
 exports.SAME_1ST_HANA_REL = 1;
 exports.SAME_2ND = 2;

package/lib/xsodata.js

@@ -1,57 +1,47 @@
 'use strict';
 
-var async = require('async');
+const async = require('async');
 
 //contexts
-var NetworkContext = require('./utils/networkContext');
-var RequestContext = require('./utils/requestContext');
+const NetworkContext = require('./utils/networkContext');
+const RequestContext = require('./utils/requestContext');
 
 //processing steps
-var db = require('./db/connect');
-var uriParser = require('./http/uriParser');
-var xsodataFileReader = require('./model/xsodataReader');
-var metadataDbReader = require('./model/metadataReader');
-var oDataUriParser = require('./uri/oDataUriParser');
-var uriChecks = require('./uri/checks');
-var applyUriChecks = require('./uri/applyChecks');
-var oDataProcessor = require('./processor/processor');
-var errorProcessor = require('./processor/errorProcessor');
-var ConditionalHttpHandler = require('./http/conditionalHttpHandler');
-var httpRequestValidator = require('./http/validator/httpRequestValidator');
-var authorizationProcessor = require('./processor/authorizationProcessor');
-var tableCleanup = require('./utils/tableCleanup');
-var packageJson = require('../package.json');
+const db = require('./db/connect');
+const uriParser = require('./http/uriParser');
+const xsodataFileReader = require('./model/xsodataReader');
+const metadataDbReader = require('./model/metadataReader');
+const oDataUriParser = require('./uri/oDataUriParser');
+const uriChecks = require('./uri/checks');
+const applyUriChecks = require('./uri/applyChecks');
+const oDataProcessor = require('./processor/processor');
+const errorProcessor = require('./processor/errorProcessor');
+const ConditionalHttpHandler = require('./http/conditionalHttpHandler');
+const httpRequestValidator = require('./http/validator/httpRequestValidator');
+const authorizationProcessor = require('./processor/authorizationProcessor');
+const tableCleanup = require('./utils/tableCleanup');
+const packageJson = require('../package.json');
 
 //Tools
-var Logger = require('./utils/logger');
-var configuration = require('./configuration');
-var handlerConfiguration = require('./handlerConfiguration');
-var JsonSerializer = require('./serializer/jsonSerializer').JsonSerializer;
+const Logger = require('./utils/logger');
+const configuration = require('./configuration');
+const handlerConfiguration = require('./handlerConfiguration');
+const JsonSerializer = require('./serializer/jsonSerializer').JsonSerializer;
 
-var simpleRequest = require('./http/simpleHttpRequest');
-var simpleResponse = require('./http/simpleHttpResponse');
-var utils = require('./utils/utils');
+const simpleRequest = require('./http/simpleHttpRequest');
+const simpleResponse = require('./http/simpleHttpResponse');
+const utils = require('./utils/utils');
 
-var debugView = require('./utils/debugView');
-var Measurement = require('./utils/measurement');
+const debugView = require('./utils/debugView');
+const Measurement = require('./utils/measurement');
 
 //Errors
-var HttpErrorDebugInfo = require('./utils/errors/debugInfo');
-var InternalError = require('./utils/errors/internalError');
-
-// segmentation fault check
-// var SegfaultHandler = require('segfault-handler');
-// SegfaultHandler.registerHandler('crash.log');
-// SegfaultHandler.causeSegfault();
+const HttpErrorDebugInfo = require('./utils/errors/debugInfo');
+const InternalError = require('./utils/errors/internalError');
 
 global.execCounter = 0;
 global.dropCounter = 0;
 
-// process.on('exit', () => {
-//     console.log(`global.execCounter: ${global.execCounter}`);
-//     console.log(`global.dropCounter: ${global.dropCounter}`);
-// });
-
 exports.testExits = {
     afterConnectDb: 1,
     afterPrepareUri: 2,
@@ -84,7 +74,7 @@ exports.ODataHandler.prototype.register = function (step, callBack) {
 
 function checkRegisteredSteps(step, err, context, asyncDone) {
     try {
-        var done = function (err1) {
+        const done = function (err1) {
             if (err1) {
                 context.logger.debug('xsodata', 'Developer exit "' + step + '" returned with error:');
                 context.logger.debug('xsodata', err1.message);
@@ -122,7 +112,7 @@ function checkRegisteredSteps(step, err, context, asyncDone) {
  * @returns { Array }
  */
 exports.ODataHandler.prototype.createRequestChain = function (context) {
-    var ret;
+    let ret;
     if (Measurement.isActive()) {
         ret = [
             utils.injectContext(context),
@@ -216,9 +206,9 @@ exports.ODataHandler.prototype.createRequestChain = function (context) {
  * @param applicationDone Callback call after request is processed. Signature ( err : Object, context : Object )
  */
 exports.ODataHandler.prototype.processRequest = function(request, response, requestOptions, applicationDone) {
-    var networkContext;
-    var context;
-    var baseMeasurement;
+    let networkContext;
+    let context;
+    let baseMeasurement;
 
     try {
         networkContext = new NetworkContext(this.handlerConfiguration, requestOptions);
@@ -290,7 +280,7 @@ exports.ODataHandler.prototype.processRequest = function(request, response, requ
         );
 
     } catch (exception) {
-        var err = new InternalError('InternalError', context, exception);
+        const err = new InternalError('InternalError', context, exception);
         tableCleanup.assertCleanTempTables(context, function (error, context) {
             return this.saveExit(error || err, context, applicationDone);
         }.bind(this));
@@ -306,7 +296,7 @@ exports.ODataHandler.prototype.saveExit = function (err, context, applicationDon
         if (err) {
             if (err instanceof HttpErrorDebugInfo) {
                 //render debug info to response
-                var serializer = new JsonSerializer(context, 65536, 200);
+                const serializer = new JsonSerializer(context, 65536, 200);
                 serializer.write(err.message);
                 serializer.flush();
             } else {
@@ -343,8 +333,8 @@ exports.ODataHandler.prototype.finish = function (err, context, applicationDone)
     context.logger.silly('xsodata', 'finish');
 
     return checkRegisteredSteps(exports.testExits.beforeSendHandler, err, context, function (err, context) {
-        var rTo = context.httpResponse;
-        var rFrom = context.response;
+        const rTo = context.httpResponse;
+        const rFrom = context.response;
 
         if (context.debugView && context.isAuthorized === true) {
             debugView.writeDebugInfo(context, rFrom, rTo);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/xsodata",
-  "version": "8.3.0",
+  "version": "8.3.1",
   "description": "Expose data from a HANA database as OData V2 service with help of .xsodata files.",
   "main": "index.js",
   "license": "SEE LICENSE IN developer-license-3.1.txt",
@@ -41,12 +41,10 @@
   ],
   "files": [
     "index.js",
-    "npm-shrinkwrap.json",
     "CHANGELOG.md",
     "documentation",
     "developer-license-3.1.txt",
-    "lib",
-    ".npmignore"
+    "lib"
   ],
   "dependencies": {
     "@sap/xsenv": "5.6.1",
@@ -55,7 +53,7 @@
     "big.js": "7.0.1",
     "body-parser": "1.20.4",
     "hdb": "0.19.12",
-    "lodash": "4.17.21",
+    "lodash": "4.17.23",
     "negotiator": "1.0.0",
     "rwlock": "5.0.0",
     "xml-writer": "1.7.0"

package/.npmignore

@@ -1,40 +0,0 @@
-#---
-#---ingnore all directories starting with an underscore
-#---
-**/_*/
-
-#---
-#---ingnore and folders/files ending with ...
-#---
-**.priv.json
-
-
-#---
-#---ingnore the folders ...
-#---
-
-.idea/
-*.iml
-.jobinfo/
-internal/
-node_modules/
-test/
-test_apps/
-.cfignore
-.opensourcy.config.txt
-.editorconfig
-.gitattributes
-.gitignore
-.jshintignore
-.jshintrc
-.npmignore
-.travis.yml
-.xmake.cfg
-manifest.yml
-npm-debug.log
-default-services.json
-
-
-
-
-