@sap/cds-dk 6.1.5 → 6.2.0

package/lib/client/push.js

@@ -1,34 +1,35 @@
+const cds = require ('../cds'), { local } = cds.utils
 const fs = require('fs');
 const { join } = require('path');
 const axios = require('axios');
 
 const { login } = require('./auth_manager');
 const BaseCommand = require('./base_command');
-const Logger = require('./helper/logging');
-const { CliError } = require('./helper/errors');
+const { CliError } = require('./helper/errors'); // REVISIT: add and use a this.error() method instead
 
 module.exports = class Push extends BaseCommand {
 
     static async run(paramValues) {
-        try {
-            const params = await login(paramValues);
-            const projectFolder = params.get('projectFolder');
-            Logger.log(`Pushing extension from project folder '${projectFolder}', for subdomain '${params.get('subdomain')}', to app URL ${params.get('appUrl')}`);
-
-            const tgz = fs.readFileSync(join(projectFolder, 'gen', 'extension.tgz'), { encoding: 'base64' });
-            const extensionName = this.getExtensionName(projectFolder);
-            return this.pushTgz(params, tgz, extensionName);
-
-        } catch (error) {
-            throw new CliError(undefined, error);
-        }
+        const params = await login(paramValues);
+        const projectFolder = params.get('projectFolder');
+        const tar = join(projectFolder, 'gen', 'extension.tgz')
+        const url = params.get('appUrl')
+        const subdomain = params.get('subdomain') // REVISIT: Why are subdomains not transparently encoded in URLs?
+        const target = { url }; if (subdomain) target.subdomain = subdomain
+        const source = { src: local(tar) }
+        console.log(`\nPushing extension from`, source, 'to', target);
+
+        const tgz = fs.readFileSync(tar, { encoding: 'base64' });
+        const extensionName = this.getExtensionName(projectFolder);
+        await this.pushTgz(params, tgz, extensionName);
+        console.log ('Activation succeeded.\n')
     }
 
     static getExtensionName(projectFolder) {
         try {
             return require(join(projectFolder, 'package.json')).name;
         } catch (error) {
-            throw new CliError(`Extension project at ${projectFolder} is missing package.json`);
+            throw new CliError(`Extension project at ${projectFolder} is missing package.json file`, error);
         }
     }
 

package/lib/client/settings_manager.js

@@ -1,36 +1,37 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
+const axios = require('axios');
 
 const requireGlobal = require('./helper/dependency_helper');
 const keytar = requireGlobal('keytar');
 
+const log = require('./helper/logging');
 const { getAppFromSuggestions, getAppName, getSubdomain } = require('./helper/cf_helper');
 const isBas = require('./helper/env_helper');
-const Logger = require('./helper/logging');
 const Question = require('./helper/question');
 const { CliError } = require('./helper/errors');
 const { httpSchema, httpsSchema, extractSubdomain, schemaRegex, localhostRegex } = require('./helper/url_helper');
-const { ParamCollection, Persistence } = require('./params');
 const { capitalize } = require('./helper/string_helper');
-const axios = require('axios');
+
+const { ParamCollection, Persistence } = require('./params');
 
 const CONFIG_SUBDIRS = {
     linux: '.config',
     darwin: path.join('Library', 'Preferences'),
     win32: 'AppData'
-}
+};
 
 const TOKEN_STORAGE_DESC = {
     plain: 'plain-text storage',
     keyring: 'keyring'
-}
+};
 
 const KEYRING_DESC = {
     linux: 'libsecret',
     darwin: 'Keychain',
     win32: 'Credential Vault'
-}
+};
 
 const MTX_FULLY_QUALIFIED = 'com.sap.cds.mtx';
 const OAUTH_PATH_OLD_MTX = '/mtx/v1/oauth/token';
@@ -84,9 +85,9 @@ async function getAppUrlAndSubdomainFromSuggestions(params) {
 async function getSubdomainFromCfAndNotify(appName) {
     const subdomain = await getSubdomain(appName);
     if (subdomain) {
-        Logger.log(`Subdomain determined from CF app environment: ${subdomain}`);
+        console.log('Subdomain determined from CF app environment:', subdomain);
     } else {
-        Logger.log('Failed to determine subdomain from CF app environment');
+        console.warn('Failed to determine subdomain from CF app environment');
     }
     return subdomain;
 }
@@ -113,12 +114,11 @@ async function getTokenBaseUrl(params, renewUrl) {
             await axios.head(getBaseUrl(path).toString());
             existingPath = path;
             break;
-        } catch (e) {
-            if (e.response?.status === 404) {
+        } catch (error) {
+            if (error.response?.status === 404) {
                 continue;
-            } else {
-                throw new CliError(`Failed with root cause ${e.message}`);
             }
+            throw error;
         }
     }
     existingPath = existingPath ?? OAUTH_PATH_OLD_MTX;
@@ -129,16 +129,15 @@ function getKeyringAccountName(params) {
     return `${params.get('appUrl')}|${params.get('subdomain')}`;
 }
 
-
 function logConfigPaths() {
-    Logger.debug(`Settings are stored in ${CONFIG.paths.settings}`);
-    Logger.debug(`Authentication data is stored in ${CONFIG.paths.auth} (${TOKEN_STORAGE_DESC.plain}) or ${CONFIG.keyringDesignation} (${TOKEN_STORAGE_DESC.keyring})`);
+    log.debug(`Settings are stored in ${CONFIG.paths.settings}`);
+    log.debug(`Authentication data is stored in ${CONFIG.paths.auth} (${TOKEN_STORAGE_DESC.plain}) or ${CONFIG.keyringDesignation} (${TOKEN_STORAGE_DESC.keyring})`);
 }
 
 function notifyLoggedIn(params) {
     return params.get('renewLogin')
-           ? Logger.log.bind(Logger)
-           : Logger.debug.bind(Logger);
+           ? console.log.bind(console)
+           : log.debug;
 }
 
 function emptyData(all) {
@@ -157,14 +156,14 @@ class SettingsManager {
 
     // Call with 'projectFolder' param as a resolved path.
     static async saveSettings(params) {
-        Logger.debug(`Saving settings for project ${params.get('projectFolder')}`);
+        log.debug(`Saving settings for project ${params.get('projectFolder')}`);
 
         const paramsMap = params.toValueMap(Persistence.setting);
         if (localhostRegex.test(params.get('appUrl'))) {
-            Logger.log(`Saving username${(params.get('isEmptyPassword') ? ' and empty-password hint' : '')} with project settings.`);
+            console.log(`Saving username${(params.get('isEmptyPassword') ? ' and empty-password hint' : '')} with project settings.`);
         } else {
             // Save only against localhost for security reasons.
-            Logger.debug('Not saving username because app is not recognized to run on localhost.');
+            log.debug('Not saving username because app is not recognized to run on localhost.');
             delete paramsMap.username;
             delete paramsMap.isEmptyPassword;
         }
@@ -185,7 +184,7 @@ class SettingsManager {
         } else if (params.get('tokenStorage') === 'keyring') {
             await this._saveAuthToKeyring(params, params.toValueMap(Persistence.auth));
         } else {
-            Logger.log('Note: the authentication token is not saved by default. To save the token for later commands, please run `cds login`.');
+            console.log('Note: the authentication token is not saved by default. To save the token for later commands, please run `cds login`.');
         }
     }
 
@@ -194,7 +193,7 @@ class SettingsManager {
         params.set('projectFolder', projectFolder);
 
         const loadedSettings = await this._loadFromFile(projectFolder);
-        Logger.debug(`Loaded project settings for ${params.get('projectFolder')}: ${loadedSettings.format()}`);
+        log.debug(`Loaded project settings for ${params.get('projectFolder')}: ${loadedSettings.format()}`);
         const loadedAppUrl = loadedSettings.get('appUrl');
 
         params.mergeLower(loadedSettings);
@@ -202,7 +201,7 @@ class SettingsManager {
         await this.updateUrls(params, logout, loadedAppUrl);
         await this.checkKeytar(params, logout);
         await this.addAuth(params, logout);
-        Logger.debug(`Effective project settings: ${params.format()}`);
+        log.debug(`Effective project settings: ${params.format()}`);
     }
 
     static async updateUrls(params, logout, loadedAppUrl) {
@@ -215,15 +214,15 @@ class SettingsManager {
                     } else {
                         params.set('appUrl', httpsSchema + appUrl);
                     }
-                    Logger.debug(`Added schema to app URL: ${params.get('appUrl')}`);
+                    log.debug(`Added schema to app URL: ${params.get('appUrl')}`);
                 }
             }
             if (!logout) {
                 if (!params.has('appUrl')) {
-                    Logger.debug('App URL not given');
+                    log.debug('App URL not given');
                     await getAppUrlAndSubdomainFromSuggestions(params);
                 } else if (!params.has('subdomain') && !localhostRegex.test(params.get('appUrl'))) {
-                    Logger.debug('Subdomain not given');
+                    log.debug('Subdomain not given');
                     const appName = await getAppName(params.get('appUrl'));
                     if (appName) {
                         params.set('subdomain', await getSubdomainFromCfAndNotify(appName));
@@ -233,13 +232,13 @@ class SettingsManager {
             if (!params.has('appUrl')) {
                 throw new CliError('App URL not given. Please specify it or log in to Cloud Foundry and repeat this command.');
             }
-            if (!params.has('subdomain')) {
+            if (!params.has('subdomain') && !params.has('username')) {
                 const subdomain = extractSubdomain(params.get('appUrl'));
                 if (!subdomain) {
                     throw new CliError('Subdomain not given');
                 }
                 params.set('subdomain', subdomain);
-                Logger.log(`Subdomain determined from app URL: ${subdomain}`);
+                console.log('Subdomain determined from app URL:', subdomain);
             }
         }
         async function renewTokenUrl() {
@@ -259,7 +258,7 @@ class SettingsManager {
     static async checkKeytar(params, logout) {
         if (isBas()) {
             if (params.get('tokenStorage') === 'keyring') {
-                Logger.log(`NOTE: ${capitalize(TOKEN_STORAGE_DESC.keyring)} not supported on SAP Business Application Studio. Switching to ${TOKEN_STORAGE_DESC.plain}.`);
+                console.log('NOTE:', capitalize(TOKEN_STORAGE_DESC.keyring), 'not supported on SAP Business Application Studio. Switching to', TOKEN_STORAGE_DESC.plain, '.');
                 params.set('tokenStorage', 'plain');
             }
             return;
@@ -268,11 +267,11 @@ class SettingsManager {
             return;
         }
         if (params.get('tokenStorage') === 'keyring') {
-            throw new CliError(`${capitalize(TOKEN_STORAGE_DESC.keyring)} requested but keytar not installed. Run 'npm install -g keytar' or ` +
-                `switch to ${TOKEN_STORAGE_DESC.plain} by adding '--plain' (discouraged).`);
+            throw new CliError(capitalize(TOKEN_STORAGE_DESC.keyring) + ' requested but keytar not installed. ' +
+                'Run `npm install -g keytar` or switch to ' + TOKEN_STORAGE_DESC.plain + ' by adding `--plain` (discouraged).');
         }
         if (params.get('renewLogin') || logout) {
-            Logger.log(`Disabling ${TOKEN_STORAGE_DESC.keyring} functionality: 'keytar' module not found. Run 'npm install -g keytar' to install it.`);
+            console.log('Disabling', TOKEN_STORAGE_DESC.keyring, 'functionality: `keytar` module not found. Run `npm install -g keytar` to install it.');
         }
     }
 
@@ -289,7 +288,7 @@ class SettingsManager {
             params.set('clientsecret', await Question.askQuestion('clientsecret: ', undefined, true));
             console.log();
             if (params.get('clientsecret') === '') {
-                throw new CliError('clientsecret cannot be empty');
+                throw new CliError('Clientsecret cannot be empty');
             }
         }
         async function addPasscode() {
@@ -309,7 +308,7 @@ class SettingsManager {
             if (auth.keyring.has('tokenStorage') && auth.plain.has('tokenStorage')) {
                 // Both storage places contain data: retrieve from selected or keyring.
                 storage = storage || 'keyring';
-                Logger.debug('WARNING: authentication data found in both kinds of storage. ' +
+                log.debug('WARNING: authentication data found in both kinds of storage. ' +
                     `Using data from ${TOKEN_STORAGE_DESC[storage]}; other storage will be cleared when next saving.`);
 
                 params.merge(auth[storage]);
@@ -317,7 +316,7 @@ class SettingsManager {
 
             } else if (storage && auth[other(storage)].has('tokenStorage')) {
                 // Selected storage contains no data, but other one does: retrieve from other storage, but earmark migration to selected one.
-                Logger.debug(`Using authentication data from ${TOKEN_STORAGE_DESC[other(storage)]}; will be migrated to other storage on save.`);
+                log.debug(`Using authentication data from ${TOKEN_STORAGE_DESC[other(storage)]}; will be migrated to other storage on save.`);
 
                 params.merge(auth[other(storage)]);
                 params.set('tokenStorage', storage);
@@ -326,7 +325,7 @@ class SettingsManager {
             } else {
                 // One storage contains data, and there's no conflict with selection.
                 const storage = auth.keyring.get('tokenStorage') || auth.plain.get('tokenStorage');
-                Logger.debug(`Using authentication data from ${TOKEN_STORAGE_DESC[storage]}.`);
+                log.debug(`Using authentication data from ${TOKEN_STORAGE_DESC[storage]}.`);
 
                 params.merge(auth[storage]);
             }
@@ -359,7 +358,7 @@ class SettingsManager {
 
         setRelevantAuth(auth);
 
-        if (!params.has('token') && !params.has('passcode') && !logout) {
+        if (!params.has('token') && !params.has('passcode') && !params.has('clientsecret') && !logout) {
             await addPasscode();
         }
     }
@@ -372,11 +371,11 @@ class SettingsManager {
         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}`);
+        log.debug(`Deleting authentication data${fromOtherStorage ? ' from other storage' : ''} for ${target}`);
 
         fromStorage = fromStorage || allParams.get('tokenStorage');
         if (!fromStorage) {
-            Logger.log(`Failed to delete authentication data: none found for ${target}`);
+            console.log('Failed to delete authentication data: none found for', target);
             return;
         }
 
@@ -417,9 +416,9 @@ class SettingsManager {
                     await this.deleteToken(new ParamCollection({ appUrl, subdomain }));
                 }
             }
-            Logger.log(`Deleted settings for nonexistent project folders:${deletionFolders.map(folder => ' ' + folder)}`);
+            console.log('Deleted settings for nonexistent project folders:', deletionFolders.map(folder => ' ' + folder));
         } else {
-            Logger.log('All settings seem valid');
+            console.log('All settings seem valid');
         }
     }
 
@@ -428,19 +427,19 @@ class SettingsManager {
         if (paramValues !== null) {
             paramValuesByFolder[projectFolder] = paramValues;
             await this._saveAllSettingsToFile(paramValuesByFolder);
-            Logger.debug(`Saved project settings: ${JSON.stringify(paramValues)}`);
+            log.debug(`Saved project settings: ${JSON.stringify(paramValues)}`);
         } else {
             delete paramValuesByFolder[projectFolder];
             await this._saveAllSettingsToFile(paramValuesByFolder);
-            Logger.log('Deleted project settings');
+            console.log('Deleted project settings');
         }
     }
 
     static async _saveAllSettingsToFile(paramValuesByFolder) {
-        Logger.debug(`Saving all settings to ${CONFIG.paths.settings}`);
+        log.debug(`Saving all settings to ${CONFIG.paths.settings}`);
         await fs.promises.mkdir(path.dirname(CONFIG.paths.settings), { recursive: true })
         await fs.promises.writeFile(CONFIG.paths.settings, JSON.stringify(paramValuesByFolder, null, 2));
-        Logger.debug('Saved settings');
+        log.debug('Saved settings');
     }
 
     static async _saveAuthToFile(params, authValues) {
@@ -460,7 +459,7 @@ class SettingsManager {
             }
             await fs.promises.mkdir(path.dirname(CONFIG.paths.auth), { recursive: true })
             await fs.promises.writeFile(CONFIG.paths.auth, JSON.stringify(allAuthValues, null, 2));
-            Logger.log(`Deleted authentication data from ${location}`);
+            console.log('Deleted authentication data from', location);
         } else {
             notifyLoggedIn(params)(`No authentication data to delete from ${location}`);
         }
@@ -478,7 +477,7 @@ class SettingsManager {
             notifyLoggedIn(params)(`Saved authentication data to ${location}`);
         } else {
             await keytar.deletePassword(MTX_FULLY_QUALIFIED, getKeyringAccountName(params));
-            Logger.log(`Deleted authentication data from ${location}`);
+            console.log('Deleted authentication data from', location);
         }
     }
 
@@ -486,7 +485,7 @@ class SettingsManager {
         const all = !projectFolder;
 
         if (!fs.existsSync(CONFIG.paths.settings)) {
-            Logger.debug('Settings file not found');
+            log.debug('Settings file not found');
             return emptyData(all);
         }
 
@@ -494,7 +493,7 @@ class SettingsManager {
         try {
             settingsByFolder = JSON.parse((await fs.promises.readFile(CONFIG.paths.settings)).toString());
         } catch (err) {
-            Logger.debug('Empty settings file');
+            log.debug('Empty settings file');
             return emptyData(all);
         }
 
@@ -503,7 +502,7 @@ class SettingsManager {
         }
 
         if (!settingsByFolder[projectFolder]) {
-            Logger.debug(`No settings found for project ${projectFolder}`);
+            log.debug(`No settings found for project ${projectFolder}`);
             return new ParamCollection();
         }
 
@@ -514,7 +513,7 @@ class SettingsManager {
         const all = !appUrl;
 
         if (!fs.existsSync(CONFIG.paths.auth)) {
-            Logger.debug('Authentication-data file not found');
+            log.debug('Authentication-data file not found');
             return emptyData(all);
         }
 
@@ -522,7 +521,7 @@ class SettingsManager {
         try {
             allAuth = JSON.parse((await fs.promises.readFile(CONFIG.paths.auth)).toString());
         } catch (err) {
-            Logger.debug('Empty authentication-data file');
+            log.debug('Empty authentication-data file');
             return emptyData(all);
         }
 
@@ -531,14 +530,14 @@ class SettingsManager {
         }
 
         if (!allAuth[appUrl]) {
-            Logger.debug(`File contains no authentication data for app URL ${appUrl}`);
+            log.debug(`File contains no authentication data for app URL ${appUrl}`);
             return new ParamCollection();
         }
 
         const authForSubdomain = allAuth[appUrl][subdomain];
 
         if (!authForSubdomain) {
-            Logger.debug(`File contains no authentication data for subdomain ${subdomain} (app URL: ${appUrl})`);
+            log.debug(`File contains no authentication data for subdomain ${subdomain} (app URL: ${appUrl})`);
             return new ParamCollection();
         }
 
@@ -557,7 +556,7 @@ class SettingsManager {
         const authString = await keytar.getPassword(MTX_FULLY_QUALIFIED, getKeyringAccountName(new ParamCollection({ appUrl, subdomain })));
 
         if (!authString) {
-            Logger.debug(`${capitalize(TOKEN_STORAGE_DESC.keyring)} contains no authentication data for URL ${appUrl} and subdomain '${subdomain}'`);
+            log.debug(`${capitalize(TOKEN_STORAGE_DESC.keyring)} contains no authentication data for URL ${appUrl} and subdomain '${subdomain}'`);
             return new ParamCollection();
         }
 

package/lib/compile/openapi/csdl2openapi.js

@@ -221,7 +221,8 @@ module.exports.csdl2openapi = function (
         Object.keys(terms).forEach(vocab => {
             voc[vocab] = {};
             terms[vocab].forEach(term => {
-                voc[vocab][term] = '@' + alias['Org.OData.' + vocab + '.V1'] + '.' + term;
+                if (alias['Org.OData.' + vocab + '.V1'] != undefined)
+                    voc[vocab][term] = '@' + alias['Org.OData.' + vocab + '.V1'] + '.' + term;
             });
         });
 
@@ -1785,7 +1786,7 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
      * @param {object} type Structured type
      * @return {object} Map of Schemas Objects
      */
-     function schemasForStructuredType(schemas, qualifier, name, type, suffix) {
+    function schemasForStructuredType(schemas, qualifier, name, type, suffix) {
         const schemaName = qualifier + "." + name + suffix;
         const baseName = qualifier + "." + name;
         const isKey = keyMap(type);
@@ -1796,18 +1797,19 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
         Object.keys(properties).forEach(iName => {
             const property = properties[iName];
             if (suffix === SUFFIX.read) schemaProperties[iName] = getSchema(property);
-            if((Object.prototype.hasOwnProperty.call(property, '@Common.FieldControl')) && property['@Common.FieldControl'] === 'Mandatory')
-                { required.push(iName) }
+            if ((Object.prototype.hasOwnProperty.call(property, '@Common.FieldControl')) && property['@Common.FieldControl'] === 'Mandatory') { required.push(iName) }
             if (property.$Kind == 'NavigationProperty') {
                 if (property.$Collection && suffix === "") {
                     schemaProperties[`${iName}@${csdl.$Version === '4.0' ? 'odata.' : ''}count`] = ref('count');
                 }
-                if (suffix === SUFFIX.create)
-                    schemaProperties[iName] = getSchema(property, SUFFIX.create);
-                if (suffix === SUFFIX.update && deepUpdate)
-                    schemaProperties[iName] = getSchema(property, SUFFIX.create);
-            } else {
                 if (property[voc.Core.Permissions] != "Read" && !property[voc.Core.Computed] && property.$ContainsTarget) {
+                    if (suffix === SUFFIX.create)
+                        schemaProperties[iName] = getSchema(property, SUFFIX.create);
+                    if (suffix === SUFFIX.update && deepUpdate)
+                        schemaProperties[iName] = getSchema(property, SUFFIX.create);
+                }
+            } else {
+                if (property[voc.Core.Permissions] === "Read" || property[voc.Core.Computed]) {
                     let index = required.indexOf(iName);
                     if (index != -1) required.splice(index, 1);
                 } else {
@@ -1838,7 +1840,7 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
         if (derivedTypes[baseName]) {
             schemas[schemaName].anyOf = [];
             derivedTypes[baseName].forEach((derivedType) => {
-              schemas[schemaName].anyOf.push(ref(derivedType, suffix));
+                schemas[schemaName].anyOf.push(ref(derivedType, suffix));
             });
             if (!type.$Abstract) schemas[schemaName].anyOf.push({});
         }
@@ -2186,13 +2188,17 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
 
         if (element[voc.Validation.Maximum] != undefined) {
             if (s.$ref) s = { allOf: [s] };
-            s.anyOf[0].maximum = element[voc.Validation.Maximum];
+            if (s.anyOf) {
+                s.anyOf[0].maximum = element[voc.Validation.Maximum];
+            }
             if (element[voc.Validation.Maximum + voc.Validation.Exclusive]) s.exclusiveMaximum = true;
         }
 
         if (element[voc.Validation.Minimum] != undefined) {
             if (s.$ref) s = { allOf: [s] };
-            s.anyOf[0].minimum = element[voc.Validation.Minimum];
+            if (s.anyOf) {
+                s.anyOf[0].minimum = element[voc.Validation.Minimum];
+            }
             if (element[voc.Validation.Minimum + voc.Validation.Exclusive]) s.exclusiveMinimum = true;
         }
 

package/lib/import/message.js

@@ -13,7 +13,7 @@ const messages = {
 	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 "*"',
-	MISSING_ASSOCIATION_SETS: 'Input file provided has missing Association Sets. Please check the edmx file.',
+	MISSING_ASSOCIATION: 'Association is missing in the input file provided. Please check the edmx file.',
 	COLLECTION_IN_KEY: 'Key Property of an Entity cannot be of the type Collection.',
 	INVALID_OPENAPI_FILE: 'The OpenAPI file is not valid. Specify the correct OpenAPI file.'
 };

package/lib/import/odata/metadataconverter/MetadataConverter.js

@@ -57,7 +57,7 @@ class MetadataConverter {
     * @memberof MetadataConverter
     * @private
     */
-     _filterProperties(input, filter) {
+    _filterProperties(input, filter) {
         const target = {};
         Object
             .keys(input)
@@ -466,7 +466,7 @@ class Expression {
         */
         if (args.includes('$Scale') && (target.$Type === 'Edm.Decimal' || target.$UnderlyingType === 'Edm.Decimal')) {
             if (attribs.Scale != null) {
-                if (attribs.Scale === 'variable' || attribs.Scale === 'floating' ) {
+                if (attribs.Scale === 'variable' || attribs.Scale === 'floating') {
                     target.$Scale = attribs.Scale;
                 } else if (attribs.Scale !== '0') {
                     target.$Scale = parseInt(attribs.Scale, 10);
@@ -573,16 +573,16 @@ class Expression {
             !(target.$Kind === 'NavigationProperty' && target.$Collection === true)) {
             target.$Nullable = true;
         }
-        this.includeExternalAnnotations(element,target);
+        this.includeExternalAnnotations(element, target);
     }
-    includeExternalAnnotations(element,target){
+    includeExternalAnnotations(element, target) {
         const nonStdAttributes = this.getNonStdAttributes(element.attributes);
         for (let i = 0; i < nonStdAttributes.length; i++) {
             let attr = nonStdAttributes[i];
             let check = 0;
             let [prefix, attrName] = attr.split(':');
             if (attrName)
-                attrName = attrName.replace(/-/g,'.');
+                attrName = attrName.replace(/-/g, '.');
             let attribute;
             if ((MetadataConverter.custom_namespace.includes(prefix) || MetadataConverter.custom_namespace.includes(true)) && attrName !== undefined)
                 attribute = "@" + prefix + "." + attrName;
@@ -590,12 +590,12 @@ class Expression {
                 attribute = "$" + prefix;
             if (attribute !== undefined && attribute.startsWith('$') === false) {
                 Object.entries(target).forEach(a => {
-                    if (Object.keys(a[1]).length === 0 && typeof(a[1]) != 'boolean' ) {
+                    if (Object.keys(a[1]).length === 0 && typeof (a[1]) != 'boolean') {
                         a[1][attribute] = element.attributes[attr];
                         check = 1;
                     }
                 });
-                if (check == 0 )
+                if (check == 0)
                     target[attribute] = element.attributes[attr];
             }
         }
@@ -603,8 +603,8 @@ class Expression {
 
     getNonStdAttributes(attributes) {
         const attributeList = [];
-        const standardArrtibutes = ['MaxLength', 'Precision', 'Scale', 'Nullable', 'DefaultValue', 
-            'Name', 'Type', 'HasStream', 'IsFlags', 'Alias', 'Namespace', 'BaseType', 'Partner', 
+        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;
@@ -1677,10 +1677,10 @@ class PropertyValueExpression extends Expression {
         this.setTarget(target);
         this.buildTypeCollectionAndFacets('$Type');
 
-        if (element.attributes.Path) target[name] = {"=": element.attributes.Path};
-        if (element.attributes.PropertyPath) target[name] = {"=": element.attributes.PropertyPath};
-        if (element.attributes.EnumMember) target[name] = {"#": element.attributes.EnumMember.substring(element.attributes.EnumMember.lastIndexOf('/')+1)};
-        if (element.attributes.NavigationPropertyPath) target[name] = {"=": element.attributes.NavigationPropertyPath};
+        if (element.attributes.Path) target[name] = { "=": element.attributes.Path };
+        if (element.attributes.PropertyPath) target[name] = { "=": element.attributes.PropertyPath };
+        if (element.attributes.EnumMember) target[name] = { "#": element.attributes.EnumMember.substring(element.attributes.EnumMember.lastIndexOf('/') + 1) };
+        if (element.attributes.NavigationPropertyPath) target[name] = { "=": element.attributes.NavigationPropertyPath };
         if (element.attributes.String) target[name] = element.attributes.String;
         if (element.attributes.Bool) target[name] = element.attributes.Bool === 'true';
 
@@ -1918,10 +1918,10 @@ class SchemaExpression extends Expression {
         this.getStack().forEach((expr) => {
             if (['FunctionExpression', 'ActionExpression'].indexOf(expr.getType()) > -1) {
                 const operationName = expr.getTargetPropertyName();
-                if (target[operationName] != null) {
+                if (target[operationName] && Array.isArray(target[operationName])) {
                     const operation = expr.interpret()[operationName];
                     target[operationName].push(...operation);
-                } else {
+                } else if (!target[operationName]) {
                     Object.assign(target, expr.interpret());
                 }
             } else if (expr.getType() === 'AnnotationsExpression') {
@@ -2236,10 +2236,10 @@ class EntityContainerExpression extends Expression {
     interpret() {
         const element = this.getElement();
         const target = { $Kind: 'EntityContainer' };
-        this.includeExternalAnnotations(element,target);
+        this.includeExternalAnnotations(element, target);
         this.setTarget(target);
         super.interpret();
-        return { [element.attributes.Name]: target};
+        return { [element.attributes.Name]: target };
     }
 }
 
@@ -2254,6 +2254,12 @@ class EntitySetExpression extends Expression {
         if (this._kind === 'EntitySet') {
             target.$Collection = true;
         }
+        if (this._kind === 'Singleton') {
+            target.$Singleton = true;
+            if (element.attributes.Nullable === 'true') {
+                target.$SingletonNullable = true;
+            }
+        }
         this.setTarget(target);
         this.buildTypeCollectionAndFacets('$Type');