@sap/cds-dk 4.7.1 → 4.8.1

package/CHANGELOG.md

@@ -6,6 +6,55 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 4.8.1 - 2022-02-15
+
+### Changed
+
+- `cds init` uses latest Maven Java archetype version `1.22.0` for creating Java projects.
+
+### Fixed
+
+- Bump `follow-redirects` package to 1.14.8 (CVE-2022-0536)
+- `cds bind --exec` no command output (STDOUT) displayed on Windows.
+
+## Version 4.8.0 - 2022-01-28
+
+### Added
+
+- `cds import` now reflects the entity set and entity container level annotations in the csn.
+- `cds activate --sync` allows to use the synchronous server API for extension upload.
+
+### Changed
+
+- The forked package `@mendix/sqlite3` is now used instead of `sqlite3` to overcome CVE-2021-32804.  No code changes in applications are needed, as the new package installed by `npm` with the same name `sqlite3`.
+- [beta] The templating for `cds init` and `cds add` has been rewritten from scratch. This will allow for some new, more complex commands, such as `cds add mtx` or `cds add xsuaa`.
+
+### Fixed
+
+- `cds import` now omits function imports with `put/delete` kind.
+- `cds import` has fixed the entity type to entity set mapping in OData V2.
+- `cds import` now supports collection type.
+- `cds watch` now picks a free livereload port if the standard port 35729 is already bound
+- `cds extend`, `cds activate`, `cds login`, and `cds logout` now prioritize command-line options over saved settings
+- MTX client now logs fewer characters of secrets in debug output
+- MTX client now handles incomplete error responses better
+
+## Version 4.7.3 - 2022-01-14
+
+### Changed
+
+- Bump `follow-redirects` package to 1.14.7 (CVE-2022-0155)
+
+## Version 4.7.2 - 2021-12-15
+
+### Fixed
+
+- `cds add lint` uses JSONC parser to read ESLint config files of type `.eslintrc[.js,.cjs,.json]`.
+
+### Changed
+
+- `cds init` uses latest Maven Java archetype version `1.21.0` for creating Java projects.
+
 ## Version 4.7.1 - 2021-12-06
 
 ### Fixed

package/bin/activate.js

@@ -1,5 +1,5 @@
 module.exports = Object.assign(activate, {
-    options: ['--subdomain', '--passcode', '--username', '--clientid', '--to'],
+    options: ['--subdomain', '--passcode', '--username', '--clientid', '--to', '--sync'],
     flags: ['--undeploy', '--wsdl'],
     shortcuts: ['-s', '-p', '-u', '-c'],
     help: `
@@ -39,6 +39,10 @@ module.exports = Object.assign(activate, {
 
         Undeploy a previously deployed extension.
 
+    *--sync*
+
+        Use the synchronous server API to upload extensions.
+
 `})
 
 

package/bin/add.js

@@ -36,8 +36,8 @@ module.exports = Object.assign(add, {
 
     *-4* | *--for* <entity name or prefix>
 
-      Filters entity names with the given string. If it contains meta characters like ^ or *
-      it is treated like a regular expression, otherwise as a prefix.
+      Filters entity names with the given string.  If it contains meta characters like
+      '^' or '*', it is treated like a regular expression, otherwise as a prefix.
 
     *-o* | *--out* <target folder>
 

package/lib/bind/bindingUtil.js

@@ -1,3 +1,7 @@
+
+const os = require('os');
+const IS_WIN = os.platform() === 'win32';
+
 const KindToRequiresNameMap = {
     xsuaa: 'uaa',
     hana: 'db',
@@ -82,7 +86,8 @@ function determineKinds(services) {
 
 function execAndExit(command, ...args) {
     const { spawnSync } = require('child_process');
-    const result = spawnSync(command, args, { stdio: 'inherit', shell: false });
+    // use shell with Windows only; without output is not visible and some commands cannot be run
+    const result = spawnSync(command, args, { stdio: 'inherit', shell: IS_WIN });
     process.exit(result.status);
 }
 

package/lib/client/activate.js

@@ -8,6 +8,7 @@ const { collectFileContent, collectFiles, toUnixPath } = require('./helper/fs_he
 const Logger = require('./helper/logging');
 
 const COMMAND_URL_SUFFIX = 'asyncActivate';
+const COMMAND_URL_SUFFIX_SYNC = 'activate';
 const UPDATE_CUSTOM_FILE_URL_SUFFIX = 'updateCustomTenantContent';
 
 const I18N_WHITELIST = ['.properties', '.csv'];
@@ -36,6 +37,7 @@ async function checkFinished(jobId, statusUrl, params, finisher) {
 module.exports = class Activate extends BaseCommand {
 
     static get COMMAND_URL_SUFFIX() { return COMMAND_URL_SUFFIX; }
+    static get COMMAND_URL_SUFFIX_SYNC() { return COMMAND_URL_SUFFIX_SYNC; }
     static get UPDATE_CUSTOM_FILE_URL_SUFFIX() { return UPDATE_CUSTOM_FILE_URL_SUFFIX; }
 
     static async run(injection, paramValues) {
@@ -46,7 +48,8 @@ module.exports = class Activate extends BaseCommand {
                 Logger.log('Activating extension with parameters ' + JSON.stringify({
                     appUrl: params.get('appUrl'),
                     projectFolder: params.get('projectFolder'),
-                    undeploy: params.get('undeploy')
+                    undeploy: params.get('undeploy'),
+                    sync: params.get('sync')
                 }));
             } else {
                 Logger.log(`Activating extension located at ${params.get('projectFolder')} to URL ${params.get('appUrl')}`);
@@ -155,6 +158,7 @@ module.exports = class Activate extends BaseCommand {
 
     static async runActivate(cds, params) {
         let activationUrl;
+        const isSync = params.get('sync');
 
         return Activate.collectExtensionFiles(cds, params.get('projectFolder'))
         .then(allFiles => {
@@ -164,7 +168,8 @@ module.exports = class Activate extends BaseCommand {
 
             Logger.log('Activating extension...');
 
-            activationUrl = Activate.getMtxApiUrl(params.get('appUrl'), COMMAND_URL_SUFFIX);
+            const urlSuffix = isSync ? Activate.COMMAND_URL_SUFFIX_SYNC : Activate.COMMAND_URL_SUFFIX;
+            activationUrl = Activate.getMtxApiUrl(params.get('appUrl'), urlSuffix);
             const requestOptions = Object.assign({
                 headers: {}
             }, params.get('reqAuth'));
@@ -176,7 +181,7 @@ module.exports = class Activate extends BaseCommand {
             }, requestOptions);
         })
         .then(response => {
-            if (response === null) {
+            if (isSync || response === null) {
                 return;
             }
 

package/lib/client/base_command.js

@@ -19,7 +19,7 @@ module.exports = class BaseCommand {
             throw error;
         }
 
-        switch (error.response.status) {
+        switch (error.response && error.response.status) {
             case 401:
                 Logger.error('Request failed: authorization might have expired. Please retry with valid passcode' +
                     (params.has('passcodeUrl') ? ` from ${params.get('passcodeUrl')}` : ''), error);
@@ -52,4 +52,8 @@ module.exports = class BaseCommand {
     static getMtxApiUrl(url, action) {
         return BaseCommand.concatUrls(url, MTX_URL_PATH_PREFIX, action);
     }
+
+    static getMtxApiUrlSync(url, action) {
+        return BaseCommand.concatUrls(url, MTX_URL_PATH_PREFIX, action);
+    }
 }

package/lib/client/helper/cf_helper.js

@@ -154,12 +154,13 @@ async function getSubdomain(appName) {
                 }
             }
 
+            Logger.debug(`Subdomain determined from CF app environment: ${value}`);
             return resolve(value);
         });
     });
 
     function errorResult(message) {
-        Logger.debug(message);
+        Logger.debug(`Failed to get subdomain: ${message}`);
         return undefined;
     }
 }
@@ -174,8 +175,10 @@ async function getAppName(appUrl) {
     const app = apps.find(app => equalIgnoringTls(app.url, appUrl));
     if (!app) {
         Logger.debug(`Failed to find app with URL ${appUrl}.  Running apps: ${apps.map(app => app.name)}`);
+        return;
     }
-    return app && app.name;
+    Logger.debug(`App name determined from CF: ${app.name}`);
+    return app.name;
 }
 
 module.exports = {

package/lib/client/params.js

@@ -20,7 +20,7 @@ const ObfuscationLevel = Object.freeze({
     full: 1,
     partial: 2  // Allows a few start and end characters displayed in DEBUG output; only use with string-type params
 });
-const DISCLOSURE_LENGTH = 3;
+const DISCLOSURE_LENGTH = 2;
 
 /**
  * Parameters hold a name and a value and can only be set to compatible values.
@@ -205,6 +205,7 @@ class AllParams extends BasicParams {
         // `activate` PARAMS
         this.undeploy               = new Param('undeploy',               false);
         this.wsdl                   = new Param('wsdl',                   false);
+        this.sync                   = new Param('sync',                   false);
 
         // `logout` PARAMS
         this.deleteSettings         = new Param('deleteSettings',         false);
@@ -331,7 +332,7 @@ class ParamCollection {
     }
 
     /**
-     * Add all params contained in another collection to this.
+     * Add all params contained in another collection to this, replacing existing params.
      * @param params the other `ParamCollection`
      */
     merge(params) {
@@ -341,6 +342,19 @@ class ParamCollection {
         }
     }
 
+    /**
+     * Add all params contained in another collection to this, not replacing existing params.
+     * @param params the other `ParamCollection`
+     */
+    mergeLower(params) {
+        this.checkFrozen();
+        for (const param of params) {
+            if (!this.has(param.name)) {
+                this.set(param.name, param.val);
+            }
+        }
+    }
+
     /**
      * Iterate through all contained param objects.
      */

package/lib/client/settings_manager.js

@@ -71,13 +71,18 @@ async function getAppUrlAndSubdomainFromSuggestions(params) {
     params.set('appUrl', app.url);
 
     if (!params.has('subdomain')) {
-        params.set('subdomain', await getSubdomain(app.name));
-        if (params.has('subdomain')) {
-            Logger.log(`Subdomain determined from CF app environment: ${params.get('subdomain')}`);
-        } else {
-            Logger.log('Failed to determine subdomain from CF app environment');
-        }
+        params.set('subdomain', await getSubdomainFromCfAndNotify(app.name));
+    }
+}
+
+async function getSubdomainFromCfAndNotify(appName) {
+    const subdomain = await getSubdomain(appName);
+    if (subdomain) {
+        Logger.log(`Subdomain determined from CF app environment: ${subdomain}`);
+    } else {
+        Logger.log('Failed to determine subdomain from CF app environment');
     }
+    return subdomain;
 }
 
 function getTokenBaseUrl(params, renewUrl) {
@@ -156,7 +161,7 @@ class SettingsManager {
         const loadedSettings = await this._loadFromFile(projectFolder);
         Logger.debug(`Loaded project settings: ${loadedSettings.format()}`);
 
-        params.merge(loadedSettings);
+        params.mergeLower(loadedSettings);
 
         await this.updateUrls(params, logout);
         await this.checkKeytar(params, logout);
@@ -172,12 +177,13 @@ class SettingsManager {
             }
             if (!logout) {
                 if (!params.has('appUrl')) {
+                    Logger.debug('App URL not given');
                     await getAppUrlAndSubdomainFromSuggestions(params);
                 } else if (!params.has('subdomain')) {
                     Logger.debug('Subdomain not given');
                     const appName = await getAppName(params.get('appUrl'));
                     if (appName) {
-                        params.set('subdomain', await getSubdomain(appName));
+                        params.set('subdomain', await getSubdomainFromCfAndNotify(appName));
                     }
                 }
             }
@@ -189,6 +195,7 @@ class SettingsManager {
                 if (!params.has('subdomain')) {
                     throw new Error('Subdomain not given');
                 }
+                Logger.log(`Subdomain determined from app URL: ${params.get('subdomain')}`);
             }
         }
         function renewTokenUrl() {

package/lib/compile/openapi/csdl2openapi.js

@@ -1,7 +1,5 @@
 /**
  * Converts OData CSDL JSON to OpenAPI 3.0.2
- *
- * Latest version: https://github.wdf.sap.corp/d037427/odata-openapi/blob/master/lib/csdl2openapi.js
 */
 
 var pluralize = require('pluralize')
@@ -776,7 +774,7 @@ module.exports.csdl2openapi = function (
 
     /**
      * Unpack EnumMember value if it uses CSDL JSON CS01 style, like CAP does
-     * @param {string or object} path Qualified name of referenced type 
+     * @param {string or object} path Qualified name of referenced type
      * @return {object} Reference Object
      */
     function enumMember(member) {
@@ -788,7 +786,7 @@ module.exports.csdl2openapi = function (
 
     /**
      * Unpack NavigationPropertyPath value if it uses CSDL JSON CS01 style, like CAP does
-     * @param {string or object} path Qualified name of referenced type 
+     * @param {string or object} path Qualified name of referenced type
      * @return {object} Reference Object
      */
     function navigationPropertyPath(path) {
@@ -800,7 +798,7 @@ module.exports.csdl2openapi = function (
 
     /**
      * Unpack PropertyPath value if it uses CSDL JSON CS01 style, like CAP does
-     * @param {string or object} path Qualified name of referenced type 
+     * @param {string or object} path Qualified name of referenced type
      * @return {object} Reference Object
      */
     function propertyPath(path) {
@@ -2147,7 +2145,7 @@ module.exports.csdl2openapi = function (
 
     /**
      * Augment OpenAPI document with Security Requirements Object
-     * @param {object} openapi OpenAPI document to augment 
+     * @param {object} openapi OpenAPI document to augment
      * @param {object} entityContainer Entity Container object
      */
     function security(openapi, entityContainer) {
@@ -2162,7 +2160,7 @@ module.exports.csdl2openapi = function (
 
     /**
      * a qualified name consists of a namespace or alias, a dot, and a simple name
-     * @param {string} qualifiedName 
+     * @param {string} qualifiedName
      * @return {string} namespace-qualified name
      */
     function namespaceQualifiedName(qualifiedName) {
@@ -2172,7 +2170,7 @@ module.exports.csdl2openapi = function (
 
     /**
      * a qualified name consists of a namespace or alias, a dot, and a simple name
-     * @param {string} qualifiedName 
+     * @param {string} qualifiedName
      * @return {object} with components qualifier and name
      */
     function nameParts(qualifiedName) {

package/lib/compile/to-xsuaa.js

@@ -107,8 +107,6 @@ module.exports = function compile_to_xsuaa (model, options) {
 
 function mergeConfig(base, generated) {
   const result = base
-  result.xsappname = base.xsappname || appName()
-  result['tenant-mode'] = base['tenant-mode'] || 'dedicated'
 
   const mergeByName = (type) => {
     if (!generated[type]) return
@@ -140,15 +138,3 @@ function getBaseModel(options = {}) {
   }
   return options.base || {}
 }
-
-function appName() {
-  const cwd = cds.root || process.cwd()
-  let name
-  try {
-    name = require(path.resolve(cwd,'package.json')).name
-  } catch (err) { // no package.json
-    name = path.basename(cwd)
-  }
-  // remove any @foo/ from @foo/bar, truncate to max length
-  return name.split('/').pop().substring(0, 100)
-}

package/lib/import/utils/MetadataConverter.js

@@ -396,7 +396,6 @@ class Expression {
         const target = this.getTarget();
         const element = this.getElement();
         const attribs = element.attributes;
-        let custom_namespace = MetadataConverter.custom_namespace;
         if (attribs == null) return;
         let realType = attribs.Type || attribs.EntityType || attribs.UnderlyingType;
         const propertyName = attribs.UnderlyingType == null ? '$Type' : '$UnderlyingType';
@@ -574,6 +573,9 @@ class Expression {
             !(target.$Kind === 'NavigationProperty' && target.$Collection === true)) {
             target.$Nullable = true;
         }
+        this.includeExternalAnnotations(element,target);
+    }
+    includeExternalAnnotations(element,target){
         const nonStdAttributes = this.getNonStdAttributes(element.attributes);
         for (let i = 0; i < nonStdAttributes.length; i++) {
             let attr = nonStdAttributes[i];
@@ -581,7 +583,7 @@ class Expression {
             if(attrName)
                 attrName = attrName.replace(/-/g,'.');
             let attribute;
-            if ((custom_namespace.includes(prefix) && attrName !== undefined) || custom_namespace.includes(true))
+            if ((MetadataConverter.custom_namespace.includes(prefix) && attrName !== undefined) || MetadataConverter.custom_namespace.includes(true))
                 attribute = "@" + prefix + "." + attrName;
             else if (attrName === undefined)
                 attribute = "$" + prefix;
@@ -2221,10 +2223,10 @@ class EntityContainerExpression extends Expression {
     interpret() {
         const element = this.getElement();
         const target = { $Kind: 'EntityContainer' };
+        this.includeExternalAnnotations(element,target);
         this.setTarget(target);
         super.interpret();
-
-        return { [element.attributes.Name]: target };
+        return { [element.attributes.Name]: target};
     }
 }
 

package/lib/import/v2parser.js

@@ -9,6 +9,7 @@ let allEntities = [];
 let allEntitiesMC = [];
 let allEntitySetMap = {};
 let allEntitySetMapMC = {};
+let allEntitySetNamespaces = {};
 let allFunctionImports = [];
 let allFunctionImportsMap = {};
 let allAssociations = {};
@@ -248,6 +249,9 @@ function _extractEntityFromEntitySet(entitySet) {
 				allEntitySetMapMC[entitySet[key].EntityType] = [];
 			allEntitySetMapMC[entitySet[key].EntityType].push(entitySet[key].Name);
 			entityName = _extractEntityFromNamespace(entitySet[key].EntityType);
+			let namespaces = namespaceAttributeFilter(entitySet[key]);
+			if(namespaces.length)
+				allEntitySetNamespaces[entitySet[key].Name] = namespaces;
 			allEntities.push(entityName);
 			allEntitiesMC.push(entitySet[key].Name);
 		}
@@ -414,9 +418,16 @@ function _getServiceEntityProperty(
 	displayFormat,
 	isKey,
 	documentation,
-	isCollection,
 	allowedNamespaceAttributes = -1
 ) {
+	let isCollection = -1;
+	//preprocessing of datatype in case it is a collection
+	if(dataType.substring(0,10) === 'Collection')
+	{
+		dataType = dataType.substring(11,dataType.length-1);
+		isCollection = 1;
+	}
+
 	let cdsDataType = null;
 	let hasInvalidPrecision = false;
 	let propertyJson='';
@@ -452,7 +463,7 @@ function _getServiceEntityProperty(
 
 	//Possibility of entity type or entity set as the data type
 	if (!cdsDataType && allEntitySetMapMC[dataType]) {
-		cdsDataType = serviceNamespace + "." + allEntitySetMapMC[dataType];
+		cdsDataType = serviceNamespace + "." + allEntitySetMapMC[dataType][0];
 	} else if(!cdsDataType && allEntitySetMap[_extractEntityFromNamespace(dataType)]) {
 		cdsDataType = dataType;
 	}
@@ -553,7 +564,6 @@ function _getServiceComplexType(complexTypeKey, complexType) {
 						complexTypeProperty["sap:display-format"],
 						false,
 						complexTypeProperty.doc,
-						-1,
 						complexTypePropertyNamespace
 					);
 				complexTypeCSN = complexTypeCSN + complexProperty;
@@ -583,7 +593,6 @@ function _getServiceComplexType(complexTypeKey, complexType) {
 					complexTypeProperty["sap:display-format"],
 					false,
 					complexTypeProperty.doc,
-					-1,
 					complexTypePropertyNamespace
 				);
 		}
@@ -630,28 +639,20 @@ function _parseParameter(parameter)
 {
 	let csn = "";
 	let doc;
-	let isCollection = -1;
 	if(parameter.Documentation)
 		doc = _parseDocumentationTag(parameter.Documentation);
 
 	let namespaceAttributes = namespaceAttributeFilter(parameter._attributes);
 	const parameterNamespaceAttributes = namespaceAttributes.length ? namespaceAttributes : -1;
 
-	let type = parameter["_attributes"].Type;
-	if(type.substring(0,10) === 'Collection')
-	{
-		type = type.substring(11,type.length-1);
-		isCollection = 1;
-	}
 	csn = csn + _getServiceEntityProperty(parameter["_attributes"].Name,
-				type,
+				parameter["_attributes"].Type,
 				parameter["_attributes"].MaxLength,
 				parameter["_attributes"].Precision,
 				parameter["_attributes"].Scale,
 				parameter["_attributes"]["sap:display-format"],
 				false,
 				doc,
-				isCollection,
 				parameterNamespaceAttributes);
 	return csn;
 }
@@ -693,6 +694,10 @@ function _getFunctionImport(functionImport,isBounded) {
 	} else if(functionImport[1] === "POST")
 	{
 		csn = csn + "action";
+	} else {
+		let message = functionImport[0].substring(functionImport[0].lastIndexOf(".") + 1) + " has kind " + functionImport[1] + " which is not supported.";
+		console.log(warn(message));
+		return "";
 	}
 	csn = csn + '"';
 	if(functionImport[3] !== -1)
@@ -711,19 +716,13 @@ function _getFunctionImport(functionImport,isBounded) {
 	}
 	if(functionImport[2] !== -1)
 	{
-		let isCollection = -1;
-		if(functionImport[2].substring(0,10) === 'Collection')
-		{
-			functionImport[2] = functionImport[2].substring(11,functionImport[2].length-1);
-			isCollection = 1;
-		}
-		let returnCsn = _getServiceEntityProperty(noValue,functionImport[2],noValue,noValue,noValue,noValue,noValue,noValue,isCollection);
+		let returnCsn = _getServiceEntityProperty(noValue,functionImport[2],noValue,noValue,noValue,noValue,noValue,noValue);
 		if(returnCsn != "")
 		{
 			csn = csn + ", \n";
 			csn = csn + '"returns": { \n';
 			//return type
-			csn = csn + _getServiceEntityProperty(noValue,functionImport[2],noValue,noValue,noValue,noValue,noValue,noValue,isCollection);
+			csn = csn + returnCsn;
 			csn = csn + '\n }';
 		}
 	}
@@ -737,21 +736,25 @@ function _getFunctionImport(functionImport,isBounded) {
 }
 
 function _getAllFunctionImports(functionImports,isBounded) {
-	let functionImportCSN = "";
+	let functionImportsCSN = "";
 	let i;
+	let functionImportCSN = "";
 	for(i=0; i<functionImports.length;i++)
 	{
-		functionImportCSN = 
-			functionImportCSN +
-			_getFunctionImport(functionImports[i],isBounded);
-		if(i!== functionImports.length - 1) {
-			functionImportCSN = functionImportCSN + ",\n";
+		functionImportCSN = _getFunctionImport(functionImports[i],isBounded);
+		functionImportsCSN = functionImportsCSN + functionImportCSN;
+		if(i!== functionImports.length - 1 && functionImportCSN !== "" ) {
+			functionImportsCSN = functionImportsCSN + ",\n";
 		} else {
-			functionImportCSN = functionImportCSN + "\n";
+			functionImportsCSN = functionImportsCSN + "\n";
 		}
 	}
 
-	return functionImportCSN;
+	//if last function import is omitted, remove the extra characters
+	if (functionImportsCSN && (functionImportsCSN.endsWith(",\n") || functionImportsCSN.endsWith(",\n\n"))) {
+		functionImportsCSN= functionImportsCSN.substring(0, functionImportsCSN.lastIndexOf(",\n")) + "\n";
+	}
+	return functionImportsCSN;
 }
 
 function _getEntityName(entity) {
@@ -893,7 +896,6 @@ function _generateCSNEntityKeys(entityKeysList, entityPropertiesMap) {
 				propAttributes[4],
 				true,
 				propAttributes[5],
-				-1,
 				propAttributes[6]
 			);
 		csnEntity = csnEntity + keyCsn;
@@ -935,7 +937,6 @@ function _generateCSNEntityProperties(entityKeysList, entityPropertiesMap) {
 					propAttributes[4],
 					false,
 					propAttributes[5],
-					-1,
 					propAttributes[6]
 				);
 			csnEntity = csnEntity + propertyString;
@@ -1306,6 +1307,8 @@ function _constructServiceEntity(
 	mockServerUc,
 	documentation
 ) {
+	let filteredNamespaces = {};
+	let namespaces = [];
 	let serviceEntityName = serviceNamespaceParam + "." + entityName;
 	let csnEntity = '"' + serviceEntityName + '": {\n';
 	let csnKeys;
@@ -1322,10 +1325,29 @@ function _constructServiceEntity(
 		csnEntity = csnEntity + '"abstract": true,\n';
 	}
 
-	if(entityAttributes.allowedNamespaceAttributes.length)
-	{
-		csnEntity += _generateNamespaceAttributes(entityAttributes.allowedNamespaceAttributes, false);
+	/* Merging the namespace list from entity set and entity type
+	And in case of same label, entity set's value will have precedence */
+	if(allEntitySetNamespaces[entityName]){
+		allEntitySetNamespaces[entityName].forEach((item) => {
+			filteredNamespaces[Object.keys(item)[0]] = Object.values(item)[0];
+		});
 	}
+	if(entityAttributes.allowedNamespaceAttributes.length){
+		entityAttributes.allowedNamespaceAttributes.forEach((item) => {
+			if(!filteredNamespaces[Object.keys(item)[0]]){
+				filteredNamespaces[Object.keys(item)[0]] = Object.values(item)[0];
+			}
+		});
+	}
+	Object.keys(filteredNamespaces).forEach((item) => {
+		let obj = {};
+		obj[item] = filteredNamespaces[item];
+		namespaces.push(obj)
+	});
+
+	if(namespaces)
+		csnEntity += _generateNamespaceAttributes(namespaces, false);
+	
 	// if documentation exists for the entity
 	if (documentation) {
 		csnEntity = csnEntity + `"doc": "${documentation}",` + '\n';
@@ -1563,13 +1585,15 @@ function _generateEDMXJSON2CSN(
 
 	if (mockServerUc) {
 		let def  = '"' + serviceNamespaceParam + '": {"kind": "service"' + ',\n' + '"@cds.external": true';
-		
 		let serviceDoc = jsonObj["edmx:Edmx"]["edmx:DataServices"]["Schema"].EntityContainer.Documentation;
+		let namespaceAttributes = namespaceAttributeFilter(jsonObj["edmx:Edmx"]["edmx:DataServices"]["Schema"].EntityContainer["_attributes"]);
 		// if documentation exists for service
 		if (serviceDoc) {
 			let doc = _parseDocumentationTag(serviceDoc);
 			if (doc) def += ',\n' + `"doc": "${doc}"`;
 		}
+		if(namespaceAttributes.length)
+			def += _generateNamespaceAttributes(namespaceAttributes,true);
 		def += "}";
 		definitions.push(def);
 	}