@sap/xsodata 8.3.0 → 8.3.1

package/lib/serializer/serializer.js

@@ -1,20 +1,20 @@
 'use strict';
-var jsonBuilder = require('./../serializer/json');
-var contentTypeTools = require('./../utils/checkContentType');
-var InternalError = require('./../utils/errors/internalError');
-var AtomSerializer = require('./../serializer/atomSerializer');
-var NotImplemented = require('./../utils/errors/http/notImplemented');
-var odataUriType = require('../uri/uriType');
+const jsonBuilder = require('./../serializer/json');
+const contentTypeTools = require('./../utils/checkContentType');
+const InternalError = require('./../utils/errors/internalError');
+const AtomSerializer = require('./../serializer/atomSerializer');
+const NotImplemented = require('./../utils/errors/http/notImplemented');
+const odataUriType = require('../uri/uriType');
 
 // Name of the URL parameter, which indicates that the service response should be in Atom format.
 // This is a temporary solution, which is used until the OData content type negotiation is not implemented.
-var CUSTOM_FORMAT_PARAMETER = "format";
+const CUSTOM_FORMAT_PARAMETER = "format";
 
 // Value of the custom 'format' parameter, which indicates that the service response should be in Atom format.
-var CUSTOM_ATOM_FORMAT_NAME = "atomXml";
+const CUSTOM_ATOM_FORMAT_NAME = "atomXml";
 
 exports.serializeNoContent = function (context, asyncDone) {
-    var responseHeaders = {};
+    const responseHeaders = {};
 
 	addETagHeader(context, responseHeaders);
 	context.response.writeHead(204, responseHeaders);
@@ -25,13 +25,13 @@ exports.serializeNoContent = function (context, asyncDone) {
 //Code
 exports.serializeData = function (context, asyncDone) {
     try {
-        var uriType = odataUriType.determineUriType(context);
-        var requestedType = getRequestedType(context);
-        var responseContentType = getResponseContentType(requestedType, context, uriType);
-        var serializer = getSerializer(requestedType, context);
+        const uriType = odataUriType.determineUriType(context);
+        const requestedType = getRequestedType(context);
+        const responseContentType = getResponseContentType(requestedType, context, uriType);
+        const serializer = getSerializer(requestedType, context);
 
-        var responseBody = createResponseBody(context, uriType, serializer);
-        var responseHeaders = createResponseHeaders(context, responseContentType);
+        const responseBody = createResponseBody(context, uriType, serializer);
+        const responseHeaders = createResponseHeaders(context, responseContentType);
 
         writeResponse(context, responseBody, responseHeaders);
         return asyncDone(null, context);
@@ -41,11 +41,11 @@ exports.serializeData = function (context, asyncDone) {
 };
 
 function createResponseHeaders(context, responseContentType) {
-    var headers = {
+    const headers = {
         "Content-Type": responseContentType
     };
 
-    var cacheControl = getCacheControlHeader(context);
+    const cacheControl = getCacheControlHeader(context);
     if (cacheControl) {
         headers["cache-control"] = cacheControl;
     }
@@ -56,7 +56,7 @@ function createResponseHeaders(context, responseContentType) {
 }
 
 function addETagHeader(context, headers) {
-	var dbSegment = context.oData.dbSegmentLast;
+	const dbSegment = context.oData.dbSegmentLast;
 
 	if (dbSegment.etagHeader) {
 		headers.ETag = 'W/"' + dbSegment.etagHeader + '"';
@@ -76,9 +76,9 @@ function writeResponse(context, responseBody, responseHeaders) {
 
 function getInlineCount(context) {
     if (context.oData.systemQueryParameters.inlinecount === true) {
-        var dbSegment = context.oData.dbSegmentLast;
-        var rows = dbSegment.getRowsWithGenKey();
-        var count = rows[0] && rows[0]['0count'] || dbSegment.sql.countRows[0] && dbSegment.sql.countRows[0]['c'];
+        const dbSegment = context.oData.dbSegmentLast;
+        const rows = dbSegment.getRowsWithGenKey();
+        const count = rows[0] && rows[0]['0count'] || dbSegment.sql.countRows[0] && dbSegment.sql.countRows[0]['c'];
         return String(count);
     }
 }
@@ -89,7 +89,7 @@ function getInlineCount(context) {
  * @returns HTTP response body containing the serialized data.
  */
 function createResponseBody(context, uriType, serializer) {
-    var dbSegment = context.oData.dbSegmentLast;
+    const dbSegment = context.oData.dbSegmentLast;
     switch (uriType) {
         case odataUriType.URI1:
         case odataUriType.URI6B:
@@ -122,7 +122,7 @@ function getSerializer(contentType, context) {
 }
 
 function getRequestedType(context) {
-    var customFormat = getCustomFormat(context);
+    const customFormat = getCustomFormat(context);
     if (customFormat && customFormat === CUSTOM_ATOM_FORMAT_NAME) {
         return CUSTOM_ATOM_FORMAT_NAME;
     }
@@ -131,9 +131,10 @@ function getRequestedType(context) {
 }
 
 function getResponseContentType(requestedType, context, uriType) {
-    var contentType;
+    let contentType;
     switch (uriType) {
         case odataUriType.URI1:
+        case odataUriType.URI7B:
         case odataUriType.URI6B:
             // custom 'format' parameter takes precedence over the $format option and the Accept header.
             if (requestedType === CUSTOM_ATOM_FORMAT_NAME) {
@@ -143,6 +144,7 @@ function getResponseContentType(requestedType, context, uriType) {
             }
             break;
         case odataUriType.URI2:
+        case odataUriType.URI7A:
         case odataUriType.URI6A:
             // custom 'format' parameter takes precedence over the $format option and the Accept header.
             if (requestedType === CUSTOM_ATOM_FORMAT_NAME) {
@@ -157,22 +159,6 @@ function getResponseContentType(requestedType, context, uriType) {
         case odataUriType.URI5B:
             contentType = contentTypeTools.checkValue(context.request, requestedType);
             break;
-        case odataUriType.URI7A:
-            // custom 'format' parameter takes precedence over the $format option and the Accept header.
-            if (requestedType === CUSTOM_ATOM_FORMAT_NAME) {
-                contentType = contentTypeTools.cTypes.ctAtomEntry;
-            } else {
-                contentType = contentTypeTools.checkEntry(context.request, requestedType);
-            }
-            break;
-        case odataUriType.URI7B:
-            // custom 'format' parameter takes precedence over the $format option and the Accept header.
-            if (requestedType === CUSTOM_ATOM_FORMAT_NAME) {
-                contentType = contentTypeTools.cTypes.ctAtomFeed;
-            } else {
-                contentType = contentTypeTools.checkFeed(context.request, requestedType);
-            }
-            break;
         case odataUriType.URI15:
         case odataUriType.URI16:
             contentType = contentTypeTools.checkCount(context.request, requestedType);
@@ -188,7 +174,7 @@ function getResponseContentType(requestedType, context, uriType) {
  * Returns value of the custom 'format' URL parameter.
  */
 function getCustomFormat(context) {
-    var queryParameters = context.uriTree.queryParameters;
+    const queryParameters = context.uriTree.queryParameters;
     if (queryParameters) {
         return queryParameters[CUSTOM_FORMAT_PARAMETER];
     }
@@ -198,8 +184,8 @@ function serializePropertyValue(dbSeg) {
     if (dbSeg.sql.rows.length > 1) {
         throw new InternalError('To many rows for serializing a property');
     }
-    var property = dbSeg.singleProperty;
-    var converter;
+    const property = dbSeg.singleProperty;
+    let converter;
 
     converter = dbSeg.entityType.__metadata.converterMapToXMLPayload[property];
     return converter(dbSeg.sql.rows[0][property]);

package/lib/serializer/serviceSerializer.js

@@ -1,20 +1,20 @@
 'use strict';
 
-var XMLWriter = require('xml-writer');
-var jsonSerializer = require('./../serializer/jsonSerializer');
-var types = require('./../utils/checkContentType');
-var contentTypeTools = require('./../utils/checkContentType');
-var NotAcceptable = require('./../utils/errors/http/notAcceptable');
+const XMLWriter = require('xml-writer');
+const jsonSerializer = require('./../serializer/jsonSerializer');
+const types = require('./../utils/checkContentType');
+const contentTypeTools = require('./../utils/checkContentType');
+const NotAcceptable = require('./../utils/errors/http/notAcceptable');
 
-var Measurement = require('./../utils/measurement');
+const Measurement = require('./../utils/measurement');
 
 
 function writeXML(request, response, context) {
-    var writer = function writer(string) {
+    const writer = function writer(string) {
         response.write(string);
     };
 
-    var xw = new XMLWriter(true, writer);//change to false for unformatted output
+    const xw = new XMLWriter(true, writer);//change to false for unformatted output
     xw.startDocument('1.0', 'utf-8', true);
     xw.startElement('service');
 
@@ -28,10 +28,10 @@ function writeXML(request, response, context) {
     xw.text('Default');
     xw.endElement();
 
-    var entityTypes = context.gModel.getEntityTypes();
-    for (var name in entityTypes) {
+    const entityTypes = context.gModel.getEntityTypes();
+    for (const name in entityTypes) {
         if (entityTypes.hasOwnProperty(name)) {
-            var entityType = entityTypes[name];
+            const entityType = entityTypes[name];
             xw.startElement('collection');
             xw.writeAttribute('href', entityType.name);
             xw.startElement('atom:title');
@@ -46,14 +46,14 @@ function writeXML(request, response, context) {
 }
 
 function writeJSON(request, response, context) {
-    var serializer = new jsonSerializer.JsonSerializer(context, 65536);
+    const serializer = new jsonSerializer.JsonSerializer(context, 65536);
 
-    var entityTypes = context.gModel.getEntityTypes();
-    var d = {'EntitySets': []};
+    const entityTypes = context.gModel.getEntityTypes();
+    const d = {'EntitySets': []};
 
-    for (var name in entityTypes) {
+    for (const name in entityTypes) {
         if (entityTypes.hasOwnProperty(name)) {
-            var entityType = entityTypes[name];
+            const entityType = entityTypes[name];
             d.EntitySets.push(entityType.name);
         }
     }
@@ -63,14 +63,9 @@ function writeJSON(request, response, context) {
 }
 
 exports.process = function (context, asyncDone) {
-    var method = context.request.method;
+    const method = context.request.method;
 
-    switch (method) {
-        case "HEAD":
-            return processHEAD(context, asyncDone);
-        default:
-            return processGET(context, asyncDone);
-    }
+    return method === "HEAD" ? processHEAD(context, asyncDone) : processGET(context, asyncDone);
 };
 
 function processHEAD(context, asyncDone) {
@@ -81,7 +76,7 @@ function processHEAD(context, asyncDone) {
 
 
 function processGET(context, asyncDone) {
-    var request, response, format;
+    let request, response, format;
     context.logger.silly('serviceprocessor', 'process');
 
     request = context.request;

package/lib/serializer/value.js

@@ -3,7 +3,7 @@
 exports.ValueSerializer = ValueSerializer;
 
 function ValueSerializer(context, bufferSize) {
-    var self = this;
+    const self = this;
 
 
 
@@ -13,7 +13,6 @@ function ValueSerializer(context, bufferSize) {
     self.bufferSize = bufferSize;
     self.buffer = '';
 
-    //self.response.writeHead(200, {'Content-Type': 'text/plain;charset=utf-8'});
     self.response.writeHead(200,  {'Content-Type': context.payloadType + ';charset=utf-8'});
 }
 

package/lib/serializer/xmlToJsonSerializer.js

@@ -7,9 +7,9 @@
  *
  * Usage:
  *
- * var xmlStringData = getXmlStringSomeHow().toString('utf-8');
+ * const xmlStringData = getXmlStringSomeHow().toString('utf-8');
  *
- * var serializer = new XmlToJsonSerializer(xmlStringData, {
+ * const serializer = new XmlToJsonSerializer(xmlStringData, {
  *  logger:logger
  * });
  *
@@ -21,10 +21,10 @@
  */
 
 
-var lodash = require('lodash');
-var async = require('async');
-var utils = require('./../utils/utils');
-var parser = require('./../parsers/xml2JsonParser');
+const lodash = require('lodash');
+const async = require('async');
+const utils = require('./../utils/utils');
+const parser = require('./../parsers/xml2JsonParser');
 
 module.exports = XmlToJsonSerializer;
 
@@ -112,12 +112,12 @@ XmlToJsonSerializer.prototype.after = function after(fn) {
  */
 XmlToJsonSerializer.prototype.serialize = function serialize(done) {
 
-    var source = this._input;
-    var before = this._middlewares.before;
-    var after = this._middlewares.after;
-    var context = buildInnerContext(source);
+    const source = this._input;
+    const before = this._middlewares.before;
+    const after = this._middlewares.after;
+    const context = buildInnerContext(source);
 
-    var tasks = [utils.injectContext(context)]
+    const tasks = [utils.injectContext(context)]
         .concat(before)
         .concat([utils.try(parseContextSource)])
         .concat(after);
@@ -156,7 +156,7 @@ function buildInnerContext(source) {
  */
 function parseContextSource(context, asyncDone) {
 
-    var source = context.source;
+    const source = context.source;
 
     try {
         context.result = parser.parse(source);
@@ -220,8 +220,8 @@ function map(sourcePath, targetPath, options) {
 
     return  function _mapFn(context, asyncDone) {
 
-        var source = context.result;
-        var target = context.result;
+        let source = context.result;
+        let target = context.result;
 
         // Source object can be provided from outside
         if (options && typeof options.source === "function") {
@@ -240,7 +240,7 @@ function map(sourcePath, targetPath, options) {
             projectProperty(source, sourcePath, targetPath, target);
         }
 
-        if (options && typeof options.overwrite === true) {
+        if (options && typeof options.overwrite === "boolean" && options.overwrite === true) {
             context.result = target;
         }
 
@@ -265,7 +265,7 @@ function map(sourcePath, targetPath, options) {
  */
 XmlToJsonSerializer.prototype.mapBefore = function mapBefore(sourcePath, targetPath, options) {
 
-    var mapFn = map(sourcePath, targetPath, options);
+    const mapFn = map(sourcePath, targetPath, options);
     return this.before(mapFn);
 
 };
@@ -286,7 +286,7 @@ XmlToJsonSerializer.prototype.mapBefore = function mapBefore(sourcePath, targetP
  */
 XmlToJsonSerializer.prototype.mapAfter = function mapAfter(sourcePath, targetPath, options) {
 
-    var mapFn = map(sourcePath, targetPath, options);
+    const mapFn = map(sourcePath, targetPath, options);
     return this.after(mapFn);
 
 };
@@ -302,7 +302,7 @@ XmlToJsonSerializer.prototype.mapAfter = function mapAfter(sourcePath, targetPat
  */
 function projectProperty(source, sourcePath, targetPath, target) {
 
-    var sourceValue = lodash.get(source, sourcePath);
+    const sourceValue = lodash.get(source, sourcePath);
     lodash.set(target, targetPath, sourceValue);
 
 }

package/lib/sql/createDeleteLinksStatements.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var linksSQL = require ('./createLinksSQLStatements_1_n');
-var sql = require('./sqlStatement');
+const linksSQL = require ('./createLinksSQLStatements_1_n');
+const sql = require('./sqlStatement');
 
 
 exports.createDeleteLinksStatementsCreateTmpTables = function (context, asyncDone) {
@@ -16,7 +16,7 @@ exports.createDeleteLinksStatementsInsert = function (context, asyncDone) {
 /******************** MxN relationships ***********************/
 
 exports.createDeleteLinksMNStatementsCreateTmpTables = function (context, asyncDone) {
-    var dbSegLast = context.oData.dbSegmentLast,
+    const dbSegLast = context.oData.dbSegmentLast,
 	    sqlContext = linksSQL.createMNSQLContext(context, dbSegLast);
 
     context.sql = sqlContext;
@@ -44,7 +44,7 @@ function createMNDeleteStatementContainerCreateTmpTables(sqlContext) {
 }
 
 function createMNDeleteStatementContainerInsert(sqlContext) {
-    var dbSeg = sqlContext.dbSegLast;
+    const dbSeg = sqlContext.dbSegLast;
 
     linksSQL.createMNStatementContainerInsert(sqlContext);
 
@@ -52,19 +52,19 @@ function createMNDeleteStatementContainerInsert(sqlContext) {
     dbSeg.sql.stmContainer.insertTmp = masterMNTableInsertToDel(sqlContext, dbSeg.sql.rId);
 
     //create insert statement for master table
-    dbSeg.sql.stmContainer.delete = masterMNTableDelete(sqlContext, dbSeg.sql.rId);
+    dbSeg.sql.stmContainer.delete = masterMNTableDelete(sqlContext);
 }
 
 function masterMNTableInsertToDel(sqlContext, rId) {
     sqlContext.context.logger.debug('createDeleteLinksStatements', 'masterMNTableInsertToDel');
-    var dbSeg = sqlContext.dbSegLast;
+    const dbSeg = sqlContext.dbSegLast;
 
-    var subSelect = new sql.Select();
+    const subSelect = new sql.Select();
     subSelect.addSelects(dbSeg.getSelectFragmentsForOverProperties(''));
     subSelect.setFrom( {table: dbSeg.getOver().object} );
     subSelect.addWhereKeyValuePairs(dbSeg.getOverPropertiesWithValues());
 
-    var stm = new sql.Insert();
+    const stm = new sql.Insert();
     stm.setTableName({table: rId});
     stm.setSubSelect(subSelect);
 
@@ -73,9 +73,9 @@ function masterMNTableInsertToDel(sqlContext, rId) {
 
 function masterMNTableDelete(sqlContext) {
     sqlContext.context.logger.debug('createDeleteLinksStatements', 'masterMNTableDelete');
-    var dbSeg = sqlContext.dbSegLast;
+    const dbSeg = sqlContext.dbSegLast;
 
-    var deleteStmt = new sql.Delete();
+    const deleteStmt = new sql.Delete();
     deleteStmt.setFrom( {table: dbSeg.getOver().object} );
 
     deleteStmt.addWhereKeyValuePairs(dbSeg.getOverPropertiesWithValues());

package/lib/sql/createDeleteStatements.js

@@ -1,10 +1,10 @@
 'use strict';
 
-var sql = require('./sqlStatement');
-var sqlTools = require('./sqlTools');
+const sql = require('./sqlStatement');
+const sqlTools = require('./sqlTools');
 
 exports.createDeleteStatementsForCreateTmpTables = function (context, asyncDone) {
-    var dbSegLast = context.oData.dbSegmentLast;
+    const dbSegLast = context.oData.dbSegmentLast;
 
     context.logger.silly('createDeleteStatements', 'createDeleteStatementsForCreateTmpTables');
 
@@ -39,7 +39,7 @@ exports.createDeleteStatementsForDelete = function (context, asyncDone) {
  * @param sqlContext
  */
 function startDeleteMasterDbSegForCreate(sqlContext) {
-    var dbSeg = sqlContext.dbSegLast,
+    const dbSeg = sqlContext.dbSegLast,
         stmtContainer = dbSeg.sql.stmContainer;
 
     sqlContext.context.sql.container = stmtContainer;
@@ -62,7 +62,7 @@ function startDeleteMasterDbSegForCreate(sqlContext) {
  * @param sqlContext
  */
 function startDeleteMasterDbSegForDelete(sqlContext) {
-    var dbSeg = sqlContext.dbSegLast,
+    const dbSeg = sqlContext.dbSegLast,
         stmtContainer = dbSeg.sql.stmContainer;
 
     sqlContext.context.sql.container = stmtContainer;
@@ -93,8 +93,8 @@ function startDeleteMasterDbSegForDelete(sqlContext) {
 
 function masterTableCreate(sqlContext, rId) {
     sqlContext.context.logger.debug('createPostStatements', 'masterTableCreate (ordered selects)');
-    var dbSeg = sqlContext.dbSegLast;
-    var stmCreate = new sql.Create();
+    const dbSeg = sqlContext.dbSegLast;
+    const stmCreate = new sql.Create();
     stmCreate.setModifiers(['local', 'temporary', dbSeg.entityType.tableStoreType]);
     stmCreate.setTableName(rId);
 
@@ -109,9 +109,9 @@ function masterTableCreate(sqlContext, rId) {
 
 function masterTableInsertToDel(sqlContext, rIdOld) {
     sqlContext.context.logger.debug('createDeleteStatements', 'masterTableInsertToDel (ordered selects)');
-    var dbSeg = sqlContext.dbSegLast;
+    const dbSeg = sqlContext.dbSegLast;
 
-    var subSelect = new sql.Select();
+    const subSelect = new sql.Select();
 
     if (dbSeg.entityType.kind === 3 && dbSeg.entityType._entityType.parameters && dbSeg.entityType._entityType.parameters.viaKey === true) {
         subSelect.addSelects(dbSeg.getPropertiesForSelect());
@@ -127,7 +127,7 @@ function masterTableInsertToDel(sqlContext, rIdOld) {
         subSelect.addWhereKeyValuePairs(dbSeg.getQKeyWithValuesDB());
     }
 
-    var stm = new sql.Insert();
+    const stm = new sql.Insert();
     stm.setTableName({ table: rIdOld });
     stm.setSubSelect(subSelect);
 
@@ -142,9 +142,9 @@ function masterTableInsertToDel(sqlContext, rIdOld) {
  */
 function masterTableDelete(sqlContext) {
     sqlContext.context.logger.debug('createDeleteStatements', 'masterTableDelete');
-    var dbSeg = sqlContext.dbSegLast;
+    const dbSeg = sqlContext.dbSegLast;
 
-    var delete1 = new sql.Delete();
+    const delete1 = new sql.Delete();
     delete1.setFrom(dbSeg.getAliasedTableName());
     delete1.addWhereKeyValuePairs(dbSeg.getQKeyWithValues());