@sap/xsodata 8.3.0 → 8.3.1

package/lib/serializer/atomXmlToJsonSerializer.js

@@ -8,9 +8,9 @@
  *
  * Usage:
  *
- * var xmlStringData = getXmlStringSomeHow().toString('urf-8');
+ * const xmlStringData = getXmlStringSomeHow().toString('urf-8');
  *
- * var atomSerializer = new AtomXmlToJsonSerializer(xmlStringData, null,  {
+ * const atomSerializer = new AtomXmlToJsonSerializer(xmlStringData, null,  {
  *  logger:logger
  * });
  *
@@ -21,13 +21,13 @@
  *
  */
 
-var lodash = require('lodash');
-var utils = require('./../utils/utils');
-var XmlSerializer = require('./xmlToJsonSerializer');
-var inherits = require('util').inherits;
-var typeConverter = require('./../utils/typeConverter');
+const lodash = require('lodash');
+const utils = require('./../utils/utils');
+const XmlSerializer = require('./xmlToJsonSerializer');
+const inherits = require('util').inherits;
+const typeConverter = require('./../utils/typeConverter');
 
-var NAMESPACES = {
+const NAMESPACES = {
     m: "http://schemas.microsoft.com/ado/2007/08/dataservices/metadata",
     d: "http://schemas.microsoft.com/ado/2007/08/dataservices"
 };
@@ -124,7 +124,7 @@ AtomXmlToJsonSerializer.prototype.toJson = AtomXmlToJsonSerializer.prototype.toO
  */
 function normalize(context, asyncDone) {
 
-    var result = {
+    const result = {
         document: context.result.document,
         namespaces: context.result.namespaces
     };
@@ -144,15 +144,15 @@ function toOdataJson(typeModelContext) {
 
     return function (context, asyncDone) {
 
-        var doc = context.document;
-        var ns = context.namespaces;
+        const doc = context.document;
+        const ns = context.namespaces;
 
-        var nsMetadataPrefix = getNamespacePrefix(NAMESPACES.m, ns);
-        var nsDataservicePrefix = getNamespacePrefix(NAMESPACES.d, ns);
-        var propertiesKey = nsMetadataPrefix + ":properties";
+        const nsMetadataPrefix = getNamespacePrefix(NAMESPACES.m, ns);
+        const nsDataservicePrefix = getNamespacePrefix(NAMESPACES.d, ns);
+        const propertiesKey = nsMetadataPrefix + ":properties";
 
-        var entries = findEntries(doc);
-        var entryProperties = findEntryProperties(entries, propertiesKey);
+        const entries = findEntries(doc);
+        const entryProperties = findEntryProperties(entries, propertiesKey);
 
         context.result = entryProperties
             .map(function (item) {
@@ -182,7 +182,7 @@ function mapDataValueTypeToEdmType(key, value, typeModelContext) {
         return value;
     }
 
-    var modelTypeInfo = typeModelContext[key];
+    const modelTypeInfo = typeModelContext[key];
     return typeConverter.serializeXmlValueToODataJsonValue(value, modelTypeInfo);
 }
 
@@ -202,9 +202,9 @@ function mapDataValueTypeToEdmType(key, value, typeModelContext) {
  */
 function buildOdataJson(entry, nsDataservicePrefix, nsMetadataPrefix, typeModelContext) {
 
-    var target = {};
+    const target = {};
 
-    var propertiesRegEx = new RegExp(nsMetadataPrefix + ":properties\.", "g"),
+    const propertiesRegEx = new RegExp(nsMetadataPrefix + ":properties\.", "g"),
         dataServiceRegEx = new RegExp(nsDataservicePrefix + ":", "g"),
         childrenRegEx = new RegExp("\\$children\\.", "g"),
         valueRegEx = new RegExp("\\.\\$value$", "g");
@@ -214,10 +214,10 @@ function buildOdataJson(entry, nsDataservicePrefix, nsMetadataPrefix, typeModelC
         // keypath is an array containing the current recursive properties path
         // i.e. key looks like --> m:properties.$children.d:EmployeeId.$value
 
-        key = keyPath.join('.');
-        var value = obj.$value;
+        const k = keyPath.join('.');
+        let value = obj.$value;
 
-        var targetKey = key
+        const targetKey = k
             .replace(propertiesRegEx, "")
             .replace(dataServiceRegEx, "")
             .replace(childrenRegEx, "")
@@ -260,7 +260,7 @@ function buildOdataJson(entry, nsDataservicePrefix, nsMetadataPrefix, typeModelC
  */
 function findEntryProperties(entries, propertiesKey) {
 
-    var properties = [];
+    const properties = [];
 
     utils.iterateObject(entries, function validation(key, obj) {
         properties.push(obj);
@@ -359,7 +359,7 @@ function findEntries(result) {
  */
 function getNamespacePrefix(namespaceDef, namespaces) {
 
-    var search = null;
+    let search = null;
 
     lodash.forOwn(namespaces, function (value, key) {
         if (namespaceDef === value) {
@@ -384,14 +384,14 @@ function getNamespacePrefix(namespaceDef, namespaces) {
  */
 function validateNamespace(context, asyncDone) {
 
-    var target = context.document;
-    var namespaces = context.namespaces;
+    const target = context.document;
+    const namespaces = context.namespaces;
 
     // Iterate over all object properties and corresponding
     // object child property values properties recursive
     utils.iterateObject(target, function validation(key /* , obj */) {
 
-        var isValid = isNamespacedValue(key, namespaces);
+        const isValid = isNamespacedValue(key, namespaces);
 
         if (isValid !== true) {
             throw new Error("No valid namespace for key \"" + key + "\" available");
@@ -434,7 +434,7 @@ function validateNamespace(context, asyncDone) {
  */
 function isNamespacedValue(value, namespaces, nextFn) {
 
-    var split = value.split(":");
+    const split = value.split(":");
 
     if (split.length !== 2) {
 
@@ -442,9 +442,9 @@ function isNamespacedValue(value, namespaces, nextFn) {
 
     } else {
 
-        var prefix = split[0];
+        const prefix = split[0];
 
-        var namespace = namespaces[prefix];
+        const namespace = namespaces[prefix];
 
         if (nextFn && lodash.isFunction(nextFn)) {
             return nextFn(prefix, namespace, namespaces);
@@ -471,19 +471,7 @@ function isNamespacedValue(value, namespaces, nextFn) {
  * @returns {boolean} - true if special string was found, else false
  */
 function isExceptionalNamespaceProperty(value) {
-
     /*jshint eqnull:true */
-    if (value == null || !lodash.isString(value)) {
-        return true;
-    }
-
-    if (value.indexOf("xml:base") !== -1) {
-        return true;
-    }
-
-    if (value.indexOf("xmlns") !== -1) {
-        return true;
-    }
-
-    return false;
+    return (value == null || !lodash.isString(value)) ||
+        value.indexOf("xml:base") !== -1 || value.indexOf("xmlns") !== -1;
 }

package/lib/serializer/content.js

@@ -1,18 +1,18 @@
 'use strict';
 //SAPINFO atom response format not supported yet
-var utils = require('./../utils/utils');
+const utils = require('./../utils/utils');
 
-var XMLWriter = require('xml-writer');
+const XMLWriter = require('xml-writer');
 
-var XMLSerializer = function XMLSerializer(context, bufferSize) {
-    var self = this;
+const XMLSerializer = function XMLSerializer(context, bufferSize) {
+    const self = this;
 
     this.context = context;
 
     self.response = context.response;
     self.bufferSize = bufferSize;
     self.buffer = '';
-    var writer = function writer(string) {
+    const writer = function writer(string) {
         self.buffer += string;
         if (self.buffer.length > bufferSize) {
             self.response.write(self.buffer);

package/lib/serializer/json.js

@@ -22,12 +22,12 @@ JsonBuilder.prototype.createConverterArray = function (dbSeg) {
 };
 
 JsonBuilder.prototype.serializeEntity = function (dbSegment) {
-    var entity = this._serializeEntity(dbSegment);
+    const entity = this._serializeEntity(dbSegment);
     return toODataJson(this._context, entity);
 };
 
 JsonBuilder.prototype._serializeEntity = function (dbSeg) {
-    var rows = dbSeg.getRowsWithGenKey();
+    const rows = dbSeg.getRowsWithGenKey();
     if (rows.length === 0) {
         if (dbSeg.entityType._entityType.parameters && dbSeg.entityType._entityType.parameters.viaKey === true) {
             throw new NotFound('Entity with provided input parameter and key not found.');
@@ -37,7 +37,7 @@ JsonBuilder.prototype._serializeEntity = function (dbSeg) {
 
     }
 
-    var converter = this.createConverterArray(dbSeg);
+    const converter = this.createConverterArray(dbSeg);
     return this.serializeRow(this._context, dbSeg, rows[0], converter);
 };
 
@@ -45,10 +45,10 @@ JsonBuilder.prototype.serializeProperty = function (dbSeg) {
     if (dbSeg.getRowsWithGenKey().length > 1) {
         throw new InternalError('Too many rows for serializing a property.');
     }
-    var property = dbSeg.singleProperty;
-    var converter;
+    const property = dbSeg.singleProperty;
+    let converter;
 
-    var result = {};
+    const result = {};
     converter = dbSeg.entityType.converterMapToJsonPayload[property];
     result[property] = converter(dbSeg.getRowsWithGenKey()[0][property]);
 
@@ -56,8 +56,8 @@ JsonBuilder.prototype.serializeProperty = function (dbSeg) {
 };
 
 JsonBuilder.prototype.serializeFeed = function (dbSegment, inlineCount) {
-    var results = this._serializeFeed(dbSegment, inlineCount);
-    var feed = {
+    const results = this._serializeFeed(dbSegment, inlineCount);
+    const feed = {
         "__count": inlineCount,
         "results": results
     };
@@ -65,25 +65,25 @@ JsonBuilder.prototype.serializeFeed = function (dbSegment, inlineCount) {
 };
 
 JsonBuilder.prototype._serializeFeed = function (dbSeg) {
-    var rows = dbSeg.getRowsWithGenKey();
-    var results = [];
-    var converter = this.createConverterArray(dbSeg);
-    for (var i = 0; i < rows.length; i++) {
-        var line = this.serializeRow(this._context, dbSeg, rows[i], converter);
+    const rows = dbSeg.getRowsWithGenKey();
+    const results = [];
+    const converter = this.createConverterArray(dbSeg);
+    for (const row of rows) {
+        const line = this.serializeRow(this._context, dbSeg, row, converter);
         results.push(line);
     }
     return results;
 };
 
 JsonBuilder.prototype.serializeNavMany = function (context, dbSeg, parent1row) {
-    var rows = dbSeg.getRowsWithGenKey();
-    var results = [];
+    const rows = dbSeg.getRowsWithGenKey();
+    const results = [];
 
 
-    var row = rows[dbSeg.sql.readPosition];
-    var converter = this.createConverterArray(dbSeg);
+    let row = rows[dbSeg.sql.readPosition];
+    const converter = this.createConverterArray(dbSeg);
     while (row && (row['0row'] === parent1row)) {
-        var line = this.serializeRow(context, dbSeg, row, converter);
+        const line = this.serializeRow(context, dbSeg, row, converter);
         results.push(line);
         //next
         dbSeg.sql.readPosition++;
@@ -94,13 +94,13 @@ JsonBuilder.prototype.serializeNavMany = function (context, dbSeg, parent1row) {
 };
 
 JsonBuilder.prototype.serializeNavOne = function (context, dbSeg, parent1row) {
-    var rows = dbSeg.getRowsWithGenKey();
-    var results = [];
+    const rows = dbSeg.getRowsWithGenKey();
+    const results = [];
 
-    var row = rows[dbSeg.sql.readPosition];
-    var converter = this.createConverterArray(dbSeg);
+    let row = rows[dbSeg.sql.readPosition];
+    const converter = this.createConverterArray(dbSeg);
     while (row && (row['0row'] === parent1row)) {
-        var line = this.serializeRow(context, dbSeg, row, converter);
+        const line = this.serializeRow(context, dbSeg, row, converter);
         results.push(line);
         //next
         dbSeg.sql.readPosition++;
@@ -116,8 +116,8 @@ JsonBuilder.prototype.serializeNavOne = function (context, dbSeg, parent1row) {
 };
 
 JsonBuilder.prototype.createAbsUrl = function (dbSeg, row) {
-    var ret = this._baseUrl + dbSeg.entityType.name;
-    var keysProperties = dbSeg.getKeysProperties();
+    let ret = this._baseUrl + dbSeg.entityType.name;
+    const keysProperties = dbSeg.getKeysProperties();
 
     ret += '(';
 
@@ -155,7 +155,6 @@ JsonBuilder.prototype.createAbsUrl = function (dbSeg, row) {
         } else {
             value = typeConverter.serializeDbValueToUriLiteral(row[keyProperty.COLUMN_NAME], keyProperty);
         }
-
         if (array.length === 1) {
             return value;
         }
@@ -165,8 +164,8 @@ JsonBuilder.prototype.createAbsUrl = function (dbSeg, row) {
 };
 
 JsonBuilder.prototype.serializeRow = function (context, dbSeg, row, converter) {
-    var ret = {};
-    var url = this.createAbsUrl(dbSeg, row);
+    const ret = {};
+    const url = this.createAbsUrl(dbSeg, row);
 
     if (context.oData.dbSegment.isLinks) {
         ret.uri = url;
@@ -202,9 +201,8 @@ JsonBuilder.prototype.serializeRow = function (context, dbSeg, row, converter) {
         }
     }
 
-    for (let i = 0; i < dbSeg._SelectedNavigations.length; i++) {
-        var sn = dbSeg._SelectedNavigations[i];
-        var navDbSeg = dbSeg.getRelevantNavigationSegments()[sn];
+    for (const sn of dbSeg._SelectedNavigations) {
+        const navDbSeg = dbSeg.getRelevantNavigationSegments()[sn];
         if (navDbSeg && navDbSeg.isExpand) {
             ret[sn] = this.serializeDbSeg(context, navDbSeg, row['1row']);
         } else {
@@ -216,7 +214,7 @@ JsonBuilder.prototype.serializeRow = function (context, dbSeg, row, converter) {
 };
 
 JsonBuilder.prototype.serializeDbSeg = function (context, dbSeg, parent1row) {
-    var d;
+    let d;
     if (dbSeg.kind === dbs.DBS_Entity) {
         if (dbSeg.isCollection) {
             d = { results: this._serializeFeed(context, dbSeg) };
@@ -235,7 +233,7 @@ JsonBuilder.prototype.serializeDbSeg = function (context, dbSeg, parent1row) {
 };
 
 function toODataJson(context, object) {
-    var response = { d: object };
+    const response = { d: object };
     if (context.mode === configuration.modes.development) {
         return JSON.stringify(response, null, 4);
     } else {

package/lib/serializer/jsonSerializer.js

@@ -1,11 +1,11 @@
 'use strict';
 
-var configuration = require('./../configuration');
+const configuration = require('./../configuration');
 
 exports.JsonSerializer = JsonSerializer;
 
 function JsonSerializer(context, bufferSize, code) {
-    var self = this;
+    const self = this;
 
     self.context = context;
     self.request = context.request;
@@ -14,12 +14,12 @@ function JsonSerializer(context, bufferSize, code) {
     self.buffer = '';
     code = code || 200;
 
-    var header = {
+    const header = {
         'Content-Type': context.payloadType + ';charset=utf-8'
     };
 
     if (context.gModel) {
-        var cacheControl = context.gModel.getSetting('content', 'cache-control');
+        const cacheControl = context.gModel.getSetting('content', 'cache-control');
         if (cacheControl) {
             header['cache-control'] = cacheControl;
         }

package/lib/serializer/metadataSerializer.js

@@ -1,18 +1,18 @@
 'use strict';
 
-var dbutils = require('./../utils/typeConverter');
-var typConv = require('./../utils/typeConverter');
-var XMLWriter = require('xml-writer');
-var contentTypeTools = require('./../utils/checkContentType');
-var associationsUtil = require('./../utils/associations');
-var Measurement = require('./../utils/measurement');
+const dbutils = require('./../utils/typeConverter');
+const typConv = require('./../utils/typeConverter');
+const XMLWriter = require('xml-writer');
+const contentTypeTools = require('./../utils/checkContentType');
+const associationsUtil = require('./../utils/associations');
+const Measurement = require('./../utils/measurement');
 
 function writeNavProperty(xw, navigation, associations, entityType, areAnnotationsEnabled) {
 
     xw.startElement('NavigationProperty');
     xw.writeAttribute('Name', navigation.name);
-    var assocName = navigation.association;
-    var association = associations[assocName];
+    const assocName = navigation.association;
+    const association = associations[assocName];
     //
     xw.writeAttribute('Relationship', xw._ns + '.' + association.name + 'Type');
 
@@ -34,7 +34,7 @@ function writeProperty(xw, propertyName, col, entityType, areAnnotationsEnabled)
 		xw.writeAttribute('ConcurrencyMode', 'Fixed');
 	} 
 
-    var oOataType = dbutils.dbTypeNameToODataTypeID(col.DATA_TYPE_NAME);
+    const oOataType = dbutils.dbTypeNameToODataTypeID(col.DATA_TYPE_NAME);
     xw.writeAttribute('Type', typConv.oDataTypeIDs[oOataType]);
     if (col.IS_NULLABLE !== 'TRUE') {
         xw.writeAttribute('Nullable', 'false');
@@ -55,10 +55,10 @@ function writeProperty(xw, propertyName, col, entityType, areAnnotationsEnabled)
 }
 function writeAssociationTypes(xw, associations) {
     // Associations
-    for (var assocName in associations) {
+    for (const assocName in associations) {
 
         if (associations.hasOwnProperty(assocName)) {
-            var assoc = associations[assocName];
+            const assoc = associations[assocName];
             xw.startElement('Association');
             xw.writeAttribute('Name', assocName + 'Type');
 
@@ -101,12 +101,12 @@ function writeAssociationTypes(xw, associations) {
 
 
 function writeEntityTypes(xw, entityTypes, associations, areAnnotationsEnabled) {
-    var i, ii, j;
+    let i, ii, j;
 
     /**
      * @type {EntityType}
      * */
-    var entityType = null;
+    let entityType = null;
 
     for (i = 0; i < entityTypes.length; i++) {
         entityType = entityTypes[i];
@@ -125,14 +125,14 @@ function writeEntityTypes(xw, entityTypes, associations, areAnnotationsEnabled)
         entityType.getKeysOrGenKey().forEach(writeKey);
         xw.endElement();
 
-        var props = entityType.getPropertiesWithGenKey();
+        const props = entityType.getPropertiesWithGenKey();
         for (j = 0; j < props.length; j++) {
             writeProp(props[j], entityType);
         }
 
         //nav properties
         for (ii = 0; ii < entityType.navProperties.length; ii++) {
-            var navigation = entityType.navProperties[ii];
+            const navigation = entityType.navProperties[ii];
             writeNavProperty(xw, navigation, associations, entityType, areAnnotationsEnabled);
         }
         xw.endElement();
@@ -150,8 +150,7 @@ function writeEntityTypes(xw, entityTypes, associations, areAnnotationsEnabled)
 }
 
 function writeEntitySets(xw, entityTypes, areAnnotationsEnabled) {
-    for (var i = 0; i < entityTypes.length; i++) {
-        var entityType = entityTypes[i];
+    for (const entityType of entityTypes) {
         xw.startElement('EntitySet');
         xw.writeAttribute('Name', entityType.name);
         xw.writeAttribute('EntityType', xw._ns + '.' + entityType.name + 'Type');
@@ -165,25 +164,23 @@ function writeEntitySets(xw, entityTypes, areAnnotationsEnabled) {
 }
 
 function writeAssociations(xw, associations, areAnnotationsEnabled) {
-    for (var i = 0; i < associations.length; i++) {
-
-        var assocication = associations[i];
+    for (const association of associations) {
         xw.startElement('AssociationSet');
-        xw.writeAttribute('Name', assocication.name);
-        xw.writeAttribute('Association', xw._ns + '.' + assocication.name + 'Type');
+        xw.writeAttribute('Name', association.name);
+        xw.writeAttribute('Association', xw._ns + '.' + association.name + 'Type');
 
 	    if (areAnnotationsEnabled) {
-		    writeAnnotationAttributes(assocication.getAssociationSetAnnotations(), xw);
+		    writeAnnotationAttributes(association.getAssociationSetAnnotations(), xw);
 	    }
 
         xw.startElement('End');
-        xw.writeAttribute('Role', assocication.principal.type + 'Principal');
-        xw.writeAttribute('EntitySet', assocication.principal.type);
+        xw.writeAttribute('Role', association.principal.type + 'Principal');
+        xw.writeAttribute('EntitySet', association.principal.type);
         xw.endElement();
 
         xw.startElement('End');
-        xw.writeAttribute('Role', assocication.dependent.type + 'Dependent');
-        xw.writeAttribute('EntitySet', assocication.dependent.type);
+        xw.writeAttribute('Role', association.dependent.type + 'Dependent');
+        xw.writeAttribute('EntitySet', association.dependent.type);
         xw.endElement();
 
         xw.endElement();//AssociationSet
@@ -192,29 +189,29 @@ function writeAssociations(xw, associations, areAnnotationsEnabled) {
 }
 
 exports.process = function (context, asyncDone) {
-	var response = context.response,
+	const response = context.response,
 		format = context.oData.systemQueryParameters.format,
 		areAnnotationsEnabled = context.gModel.areAnnotationsEnabled();
 
 	context.logger.silly('metadataprocessor', 'process');
     context.payloadType = Measurement.measureSync(contentTypeTools.checkServiceMetadata, context.request, format, 'contentTypeTools.checkServiceMetadata');
 
-    var header = {
+    const header = {
         'Content-Type': context.payloadType + ';charset=utf-8'
     };
 
-    var cacheControl = context.gModel.getSetting('metadata','cache-control');
+    const cacheControl = context.gModel.getSetting('metadata','cache-control');
     if (cacheControl) {
         header['cache-control'] = cacheControl;
     }
 
     response.writeHead(200, header);
 
-    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
 
     //xsodata.scenario
     xw._ns = context.gModel.getNamespace();
@@ -238,8 +235,8 @@ exports.process = function (context, asyncDone) {
     xw.writeAttribute('xmlns:m', 'http://schemas.microsoft.com/ado/2007/08/dataservices/metadata');
     xw.writeAttribute('xmlns', 'http://schemas.microsoft.com/ado/2008/09/edm');
 
-    var entityTypes = context.gModel.getEntityTypes();
-    var associations = context.gModel.getAssociationsMap();
+    const entityTypes = context.gModel.getEntityTypes();
+    const associations = context.gModel.getAssociationsMap();
     Measurement.measureSync(writeEntityTypes, xw, entityTypes, associations, areAnnotationsEnabled, 'writeEntityTypes');
     Measurement.measureSync(writeAssociationTypes, xw, associations, 'writeAssociationTypes');
 
@@ -267,7 +264,7 @@ exports._writeAnnotationAttributes = writeAnnotationAttributes;
  * @param {Object} xmlWriter - XMLWriter instance, which is used for the metadata serialization
  */
 function writeAnnotationAttributes(annotations, xmlWriter) {
-	var annotation;
+	let annotation;
 
 	if (!annotations) {
 		return;