@sap/cds-dk 4.5.4 → 4.6.4

package/lib/client/auth_manager.js

@@ -26,12 +26,12 @@ function getTokenUrl(params) {
     tokenUrl.search = `subdomain=${params.get('subdomain')}`;
 
     if (params.has('refreshToken')) {
-        tokenUrl.search += `&refresh_token=${params.get('refreshToken')}`;
+        tokenUrl.search += `&refresh_token=${encodeURIComponent(params.get('refreshToken'))}`;
     } else if (params.has('passcode')) {
-        tokenUrl.search += `&passcode=${params.get('passcode')}`;
+        tokenUrl.search += `&passcode=${encodeURIComponent(params.get('passcode'))}`;
     }
     if (params.has('clientid')) {
-        tokenUrl.search += `&clientid=${params.get('clientid')}&clientsecret=${params.get('clientsecret')}`;
+        tokenUrl.search += `&clientid=${encodeURIComponent(params.get('clientid'))}&clientsecret=${encodeURIComponent(params.get('clientsecret'))}`;
     }
     return tokenUrl.toString();
 }
@@ -58,7 +58,7 @@ async function retrieveTokenOrPasscodeUrl(params) {
 
         let response;
         try {
-            response = await axios(tokenUrl.toString(), { method: 'GET' });
+            response = await axios.get(tokenUrl);
         } catch (error) {
             throw new Error(`Failed to get authentication token: ${error}.\nResponse body: ${util.inspect(response && response.data)}`);
         }

package/lib/client/extend.js

@@ -104,15 +104,12 @@ module.exports = class Extend extends BaseCommand {
     }
 
     static async runExtend(params) {
-        const extendUrl = Extend.getMtxApiUrl(params.get('appUrl'), COMMAND_URL_SUFFIX);
-        const requestOptions = Object.assign({
-            method: 'GET',
-            retry: 0
-        }, params.get('reqAuth'));
+        const contentUrl = Extend.getMtxApiUrl(params.get('appUrl'), COMMAND_URL_SUFFIX);
+        const requestOptions = Object.assign({ retry: 0 }, params.get('reqAuth'));
 
         Logger.log('Retrieving files...');
 
-        const [ response ] = (await axios(extendUrl, requestOptions)).data;
+        const [ response ] = (await axios.get(contentUrl, requestOptions)).data;
 
         Logger.log('\nWriting files to: ' + params.get('projectFolder'));
 
@@ -142,11 +139,9 @@ module.exports = class Extend extends BaseCommand {
         }
 
         if (params.get('wsdl')) {
-
             Logger.log('Writing custom files');
-
             const customFileUrl = Extend.getMtxApiUrl(params.get('appUrl'), Extend.CUSTOM_FILE_URL_SUFFIX);
-            const customFiles = (await axios(customFileUrl, params)).data;
+            const customFiles = (await axios.get(customFileUrl, requestOptions)).data;
             await Extend.storeCustomFiles(params.get('projectFolder'), customFiles);
         }
     }

package/lib/client/settings_manager.js

@@ -55,7 +55,7 @@ function other(tokenStorage) {
 
 function getProjectFolder(params) {
     const relativePath = params.get('projectFolder') || params.get('directory') || (
-        params.has('subdomain') && fse.existsSync(path.resolve(params.get('subdomain')))
+        params.has('subdomain') && fse.existsSync(params.get('subdomain'))
             ? params.get('subdomain')
             : '.'
     );
@@ -138,7 +138,7 @@ class SettingsManager {
         if (params.get('clearOtherTokenStorage')) {
             // Delete token from the other storage.
             params.delete('clearOtherTokenStorage');
-            await this.deleteToken(params, other(params.get('tokenStorage')));
+            await this.deleteToken(params, true);
         }
 
         if (params.get('tokenStorage') === 'plain') {
@@ -303,15 +303,16 @@ class SettingsManager {
         }
     }
 
-    static async deleteToken(params, fromStorage) {
+    static async deleteToken(params, fromOtherStorage = false) {
         const allParams = params.clone();
         await this.loadAndMergeSettings(allParams, true);
 
         const target = `URL ${allParams.get('appUrl')}, subdomain '${allParams.get('subdomain')}'`;
-        Logger.debug(`Deleting authentication data for ${target}`);
-
+        let fromStorage = fromOtherStorage && other(params.get('tokenStorage'))
         const deleteBoth = !fromStorage && allParams.get('tokenStorage') && allParams.get('clearOtherTokenStorage');
 
+        Logger.debug(`Deleting authentication data${fromOtherStorage ? ' from other storage' : ''} for ${target}`);
+
         fromStorage = fromStorage || allParams.get('tokenStorage');
         if (!fromStorage) {
             Logger.log(`No authentication data found for ${target}`);

package/lib/import/common.js

@@ -30,6 +30,14 @@ function checkForEmptyKeys(element, oDataVersion) {
     }    
 }
 
+//to replace the alias value with original schema namespace value
+function replaceAliasValue(schemaContent, schemaNamespaceValue, aliasValue){
+    const re = RegExp(`([("/])${aliasValue}([/").])`, 'g');
+    const val = `$1${schemaNamespaceValue}$2`;
+    schemaContent = schemaContent.replace(re, val);
+    return JSON.parse(schemaContent);
+}
+
 async function _getODataVersion(edmx) {
     let oDataVersion;
     let jsonObj;
@@ -115,5 +123,6 @@ module.exports = {
     getVersion,
     getSuffix,
     supportedFormats,
-    checkForEmptyKeys
+    checkForEmptyKeys,
+    replaceAliasValue
 };

package/lib/import/importapi.js

@@ -1,5 +1,7 @@
 const edm2csn = require('.');
-
+let context={};
+context.oDataInfo = {};
+context.namespaces = [];
 /**
 * This is the import API function to generate CSN from XML/EDMX files.
 * @param {string} filepath
@@ -10,11 +12,10 @@ const edm2csn = require('.');
 * - other import options not supported
 * @returns {object} CSN
 */
-const oDataInfo={};
 module.exports = async function cds_import(filepath, options = {keepNamespace : false}) //namespace will be taken as false in case it is not mentioned
 {
         filepath = await edm2csn.isValidInputFile(filepath);
         let edmx= await edm2csn.getMetadataFromFile(filepath);
-        let csn = await edm2csn.edmx2csn(edmx, !options.keepNamespace && filepath, false, oDataInfo);
+        let csn = await edm2csn.edmx2csn(edmx, !options.keepNamespace && filepath, context);
         return csn;
 }

package/lib/import/index.js

@@ -116,23 +116,32 @@ function _convertEDMXWithMultipleSchemas(edmx, multipleSchemas, namespace) {
 			</Schema>
 		</edmx:DataServices>
 	*/
-	edmx = edmx.replace(multipleSchemas, '').replace(/<Schema Namespace="[^"]+"/, `<Schema Namespace="${namespace}"`);
+
+	// Remove the ending and beginning of the first and second schema tag
+	edmx = edmx.replace(multipleSchemas, '');
+	// Now capture the schema tag details
+	let schemaDetails = edmx.match(/(<Schema [^>]*>)/);
+	// Replace the Namespace value with the correct one
+	schemaDetails = schemaDetails[0].replace(/Namespace="[^"]+"/, `Namespace="${namespace}"`);
+	// Place the above computed schema details in the edmx content
+	edmx = edmx.replace(/(<Schema [^>]*>)/, `${schemaDetails}`);
 
 	return edmx;
 }
 
 async function edmx2csn(edmx, filename, context) {
-    const result = edmx.match(/EntityType="([^.]+)/);
+    const result = edmx.match(/EntityType="([^"]+)/);
     const multipleSchemas = /(\s*<\/Schema>\s*<Schema [^>]*>)\s*/m;
     if (!result) {
         throw new Error(messages.MISSING_ENTITIES);
     }
-    const namespace = result[1];
+    const index = result[1].lastIndexOf(".");
+	const namespace = (index > 0 ) ? result[1].substring(0, index) : result[1];
 
     if (multipleSchemas.test(edmx)) {
         edmx = _convertEDMXWithMultipleSchemas(edmx, multipleSchemas, namespace);
     }
-	let csn = await generateCSN(edmx, true, context);
+	let csn = await generateCSN(edmx, false, true, context);
 	if (filename) {
 		// Replace namespace by given filename in the csn file instead of edmx file
         const re = RegExp(`([("/])${namespace}([/").])`, 'g');
@@ -151,20 +160,33 @@ async function _generateEDMX2JSON(edmx) {
 	return JSON.parse(cjson);
 }
 
-async function generateCSN(edmx, mockServerUc, context) {
+async function generateCSN(edmx, ignorePersistenceSkip, mockServerUc, context) {
 	let csn;
 	let odataVersion;
 	let edmx2jsonModel;
+	let defaultNamespaces;
+	let namespaces = [];
+	if(context.namespaces) namespaces.push(...(context.namespaces));
 	odataVersion = await common.getVersion(edmx);
 	if (odataVersion === "V2") {
 		if(context){
 			context.oDataVersion = "V2";
 		}
+		//default namespaces to be present
+		if(!context.include_all_namespaces)
+		{
+			defaultNamespaces = ['edmx','sap','m'];
+			namespaces = namespaces.concat(defaultNamespaces);
+			namespaces = namespaces.filter((item,pos) => namespaces.indexOf(item) === pos); //removing duplicate values
+		}
+		context.namespaces = namespaces;
 		edmx2jsonModel = await _generateEDMX2JSON(edmx);
 		return new Promise(function getCsn(resolve, reject) {
 			csn = edmxv2CSN.getEdmxv2CSN(
 				edmx2jsonModel,
-				mockServerUc
+				ignorePersistenceSkip,
+				mockServerUc,
+				context
 			);
 			if (csn) {
 				resolve(csn);
@@ -177,7 +199,15 @@ async function generateCSN(edmx, mockServerUc, context) {
 		if(context){
 			context.oDataVersion = "V4";
 		}
-		return edmxv4CSN.getEdmxv4CSN(edmx, mockServerUc);
+		//default namespaces to be present
+		if(!context.include_all_namespaces)
+		{
+			defaultNamespaces = ['edmx'];
+			namespaces = namespaces.concat(defaultNamespaces);
+			namespaces = namespaces.filter((item,pos) => namespaces.indexOf(item) === pos); //removing duplicate values
+		}
+		context.namespaces = namespaces;
+		return edmxv4CSN.getEdmxv4CSN(edmx, ignorePersistenceSkip, mockServerUc, context);
 	}
 	return new Promise(function invalidFile(resolve, reject) {
 		reject(new Error(messages.INVALID_EDMX_METADATA));

package/lib/import/message.js

@@ -13,6 +13,7 @@ const messages = {
 	OUTPUT_FILE_MISMATCH: 'Specify the file extension that --as option supports.',
 	INVALID_AS_OPTION: 'For --as option, please specify one of these output file format [cds, csn, json].',
 	INCORRECT_EXTENSION: 'If --as option is not provided, then please provide either .json or .csn output file extension.',
+	INCORRECT_INPUT_NAMESPACES: 'Invalid value for --include-namespaces option. Specify namespaces as comma-separated list or "*"'
 };
 
 function getMessages() {

package/lib/import/utils/MetadataConverter.js

@@ -396,7 +396,7 @@ 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,9 +574,29 @@ class Expression {
             !(target.$Kind === 'NavigationProperty' && target.$Collection === true)) {
             target.$Nullable = true;
         }
+        const nonStdAttributes = this.getNonStdAttributes(element.attributes);
+        for (let i = 0; i < nonStdAttributes.length; i++) {
+            let attr = nonStdAttributes[i];
+            let [prefix, attrName] = attr.split(':');
+            if(attrName)
+                attrName = attrName.replace(/-/g,'.');
+            let attribute;
+            if ((custom_namespace.includes(prefix) && attrName !== undefined) || custom_namespace.includes(true))
+                attribute = "@" + prefix + "." + attrName;
+            else if (attrName === undefined)
+                attribute = "$" + prefix;
+            if (attribute !== undefined)
+                target[attribute] = element.attributes[attr];
+        }
+    }
+    getNonStdAttributes(attributes) {
+        const attributeList = [];
+        const standardArrtibutes = ['MaxLength', 'Precision', 'Scale', 'Nullable', 'DefaultValue', 
+            'Name', 'Type', 'HasStream', 'IsFlags', 'Alias', 'Namespace', 'BaseType', 'Partner', 
+            'IsComposable', 'ContainsTarget', 'IsBound', 'EntitySet', 'EntitySetPath', 'EntityType'];
+        attributeList.push(...Object.keys(attributes).filter(attribute => standardArrtibutes.indexOf(attribute) === -1));
+        return attributeList;
     }
-
-
 }
 
 class EdmPrimitiveType {
@@ -2361,7 +2381,8 @@ class OnDeleteExpression extends Expression {
 }
 
 
-MetadataConverter.createOdataV4MetadataXmlToOdataV4CsdlStrategy = () => {
+MetadataConverter.createOdataV4MetadataXmlToOdataV4CsdlStrategy = (name_space) => {
+    MetadataConverter.custom_namespace = name_space;
     return new MetadataConverter.DefaultXmlStrategy()
         .use('http://docs.oasis-open.org/odata/ns/edmx:Edmx', (element, parentExpression, context) => {
             return new EdmxRootExpression(element, null, context);

package/lib/import/utils/MetadataConverterFactory.js

@@ -1,5 +1,4 @@
 'use strict';
-
 const xmljs = require('xml-js');
 const MetadataConverterV4 = require('../utils/MetadataConverter');
 
@@ -61,7 +60,7 @@ class MetadataConverterFactory {
      *
      */
     static createEdmxV40XmlToV40Json(options = {}) {
-        const defaultStrategy = MetadataConverterV4.createOdataV4MetadataXmlToOdataV4CsdlStrategy();
+        const defaultStrategy = MetadataConverterV4.createOdataV4MetadataXmlToOdataV4CsdlStrategy(options);
 
         if (options.astFactory) {
             defaultStrategy.setASTFactory(options.astFactory);

package/lib/import/utils/MultiMap.js

@@ -67,6 +67,32 @@ var Multimap = (function () {
         return this;
     };
 
+    /**
+   * @return {Array} all the keys in the map
+   */
+    Multimap.prototype.keys = function () {
+        if (this._map)
+            return makeIterator(this._.keys());
+
+        return makeIterator(Object.keys(this._));
+    };
+
+    function makeIterator(iterator) {
+        if (Array.isArray(iterator)) {
+            var nextIndex = 0;
+
+            return {
+                next: function () {
+                    return nextIndex < iterator.length ?
+                        { value: iterator[nextIndex++], done: false } :
+                        { done: true };
+                }
+            };
+        }
+
+        return iterator;
+    }
+
     return Multimap;
 })();