@sap/cds-dk 7.2.0 → 7.3.0

package/lib/build/provider/mtx-sidecar/index.js

@@ -1,18 +1,18 @@
 const path = require('path')
 const cds = require('../../../cds')
 const fs = require('fs')
-const { FOLDER_GEN, DEFAULT_CSN_FILE_NAME, MTX_SIDECAR_DB_VALIDATION } = require('../../constants')
-const NodeCfModuleBuilder = require('../nodejs')
+const { FOLDER_GEN, DEFAULT_CSN_FILE_NAME, MTX_SIDECAR_DB_VALIDATION, CONTENT_EDMX, FLAVOR_LOCALIZED_EDMX } = require('../../constants')
+const NodejsBuildPlugin = require('../nodejs')
 const ResourcesTarProvider = require('../mtx/resourcesTarBuilder')
-const { ERROR } = NodeCfModuleBuilder
+const { ERROR } = NodejsBuildPlugin
 const { relativePaths, BuildError, resolveRequiredSapModels, getI18nDefaultFolder } = require('../../util')
 
 const DEFAULT_MAIN_FOLDER = "_main"
 
-class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
+class MtxSidecarBuildPlugin extends NodejsBuildPlugin {
     get priority() {
         // should be scheduled after 'hana' build tasks are finished
-        return NodeCfModuleBuilder.PRIORITY_MIN_VALUE
+        return NodejsBuildPlugin.PRIORITY_MIN_VALUE
     }
     init() {
         super.init()
@@ -47,7 +47,6 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
         const destSidecarSrc = path.join(destSidecar, cds.env.folders.srv)
         const model = this._compileSidecarSync(sidecarEnv)
         await this.compileToJson(model, path.join(destSidecarSrc, DEFAULT_CSN_FILE_NAME))
-
         await this.collectLanguageBundles(model, path.join(destSidecarSrc, getI18nDefaultFolder()))
         await this.copySrvContent(this.task.src, destSidecar, destSidecar)
     }
@@ -76,16 +75,23 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
         const destRoot = this.task.dest
         const destMain = path.join(destRoot, main)
         const destMainSrv = path.join(destMain, cds.env.folders.srv)
-        const csn = await this.model()
-        if (!csn) {
+        const model = await this.model()
+        if (!model) {
             return
         }
-        const { dictionary, sources } = await this.compileAll(csn, destMainSrv, destMain)
+        const { dictionary, sources } = await this.compileAll(model, destMainSrv, destMain)
         await this.collectAllLanguageBundles(dictionary, sources, destMainSrv, destMain)
 
+        if (!this.hasBuildOption(CONTENT_EDMX, false)) {
+            //inferred model expected by cds.compile.to.edmx()
+            const compileOptions = { [FLAVOR_LOCALIZED_EDMX]: this.hasBuildOption(FLAVOR_LOCALIZED_EDMX, true) } // disabled by default
+            const baseModel = cds.compiler.compileSources({ 'base.json': dictionary.base }, { messages: this.messages })
+            await this.compileToEdmx(baseModel, path.join(destMainSrv, 'odata', cds.env.odata.version), compileOptions)
+        }
+
         // create resources TAR
         // resources are determined based on available database build task, SQLite as fallback
-        await new ResourcesTarProvider(this).createTar(destMain, csn)
+        await new ResourcesTarProvider(this).createTar(destMain, model)
 
         // copy package.json and .cdsrc.json from project root
         await this._copyMainConfigFiles(cds.root, destMain)
@@ -139,4 +145,4 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
         return promises
     }
 }
-module.exports = MtxSidecarModuleBuilder
+module.exports = MtxSidecarBuildPlugin

package/lib/build/provider/nodejs/index.js

@@ -1,13 +1,13 @@
 const fs = require('fs')
 const path = require('path')
 const cds = require('../../../cds')
-const BuildTaskHandlerEdmx = require('../buildTaskHandlerEdmx')
+const EdmxBuildPlugin = require('../edmxBuildPlugin')
 const { BuildError } = require('../../util')
-const { OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM, ODATA_VERSION_V2, FOLDER_GEN, CONTENT_EDMX,
-    CONTENT_PACKAGELOCK_JSON, CONTENT_NPMRC, CONTENT_CDSRC_JSON, CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON } = require('../../constants')
-const { WARNING } = BuildTaskHandlerEdmx
+const { OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM, ODATA_VERSION_V2, FOLDER_GEN, CONTENT_EDMX, CONTENT_PACKAGELOCK_JSON,
+    CONTENT_NPMRC, CONTENT_CDSRC_JSON, CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON, FLAVOR_LOCALIZED_EDMX } = require('../../constants')
+const { WARNING } = EdmxBuildPlugin
 
-class NodejsModuleBuilder extends BuildTaskHandlerEdmx {
+class NodejsBuildPlugin extends EdmxBuildPlugin {
     init() {
         super.init()
         if (this.task.options.compileDest) {
@@ -28,8 +28,7 @@ class NodejsModuleBuilder extends BuildTaskHandlerEdmx {
     async build() {
         const destSrv = this.isStagingBuild() ? this.destSrv : path.resolve(this.destSrv, cds.env.folders.srv)
         const destRoot = this.isStagingBuild() ? this.task.dest : this.destSrv
-
-        if (cds.env.odata?.version === ODATA_VERSION_V2) {
+        if (cds.env.odata.version === ODATA_VERSION_V2) {
             // log warning as nodejs is only supporting odata version V4
             this.pushMessage("OData v2 is not supported by node runtime. Make sure to define OData v2 in cds configuration.", WARNING)
         }
@@ -44,15 +43,17 @@ class NodejsModuleBuilder extends BuildTaskHandlerEdmx {
         // collect and write language bundles into single i18n.json file
         await this.collectAllLanguageBundles(dictionary, sources, destSrv, destRoot)
 
-        if (this.hasBuildOption(CONTENT_EDMX, true)) {
-            const m = await cds.load(sources.base, super.options()) // REVISIT: Quick hack to get inferred model as expected by cds.compile.to.edmx()
-            await this.compileToEdmx(m, this.destSrv)
+        if (!this.hasBuildOption(CONTENT_EDMX, false)) {
+            //REVISIT: inferred model expected by cds.compile.to.edmx()
+            const compileOptions = { [FLAVOR_LOCALIZED_EDMX]: this.hasBuildOption(FLAVOR_LOCALIZED_EDMX, true) }
+            const baseModel = cds.compiler.compileSources({ 'base.json': dictionary.base }, { messages: this.messages })
+            await this.compileToEdmx(baseModel, path.join(this.destSrv, 'odata', cds.env.odata.version), compileOptions)
         }
 
         if (this.isStagingBuild() && this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM)) {
             const srcSrv = this.task.src === cds.root ? path.resolve(this.task.src, cds.env.folders.srv) : this.task.src
             await this._copyNativeContent(cds.root, srcSrv, destRoot, destSrv)
-            if (this.context.options.workspaces) {
+            if (this.context.options.ws) {
                 await this._addWorkspaceDependencies(destRoot)
             }
         }
@@ -91,7 +92,7 @@ class NodejsModuleBuilder extends BuildTaskHandlerEdmx {
                         if (!workspaceNames.has(folder) && folder.match(regex)) {
                             workspaceNames.add(folder)
                             const plugin = require(require.resolve(path.join(workspaceRoot, folder, 'package.json')))
-                            const tarFile = `${plugin.name.replace(/\//g,'-').replace(/@/, '')}-${plugin.version}.tgz`
+                            const tarFile = `${plugin.name.replace(/\//g, '-').replace(/@/, '')}-${plugin.version}.tgz`
                             if (dependencies[plugin.name] === '*') {
                                 const tarFilePath = path.join(dest, tarFile)
                                 dependencies[plugin.name] = `file:${tarFile}`
@@ -209,4 +210,4 @@ class NodejsModuleBuilder extends BuildTaskHandlerEdmx {
     }
 }
 
-module.exports = NodejsModuleBuilder
+module.exports = NodejsBuildPlugin

package/lib/client/auth_manager.js

@@ -1,5 +1,7 @@
 const axios = require('axios');
 
+require('../util/pruneAxiosErrors');
+
 const cds = require('../cds');
 const DEBUG = cds.debug('cli');
 const { SettingsManager } = require('./settings_manager');
@@ -54,16 +56,7 @@ function* reqParams(params) {
 }
 
 async function retrieveTokenOrPasscodeUrl(params) {
-    if (params.has('token')) {
-        if (params.get('renewLogin') || params.get('tokenExpirationDate') <= Date.now()) {
-            DEBUG?.((params.get('renewLogin') ? 'Renewing' : 'Refreshing expired') + ' authentication token');
-            params.delete('token');
-            params.delete('tokenExpirationDate');
-        } else {
-            return;
-        }
-    }
-    if (!params.has('passcode') && !params.has('refreshToken') && params.has('passcodeUrl')) {
+    if (params.has('token') || !params.has('refreshToken') && !params.has('passcode') && params.has('passcodeUrl')) {
         return;
     }
 
@@ -76,7 +69,7 @@ async function retrieveTokenOrPasscodeUrl(params) {
                 DEBUG?.(`Getting authentication token or passcode URL from ${method.toUpperCase()} ${(params.obfuscateQueryParams(url))}`);
                 response = await axios[method](url, data);
             } catch (error) {
-                if (error.response?.status === 404) { // may represent 405 in case of wrong method
+                if (error.status === 404) { // may represent 405 in case of wrong method
                     continue;
                 }
                 throw getMessage('Failed to get authentication token', { error });
@@ -95,7 +88,8 @@ async function retrieveTokenOrPasscodeUrl(params) {
 
     if (authData.access_token) {
         addTokenInfo(params, authData);
-    } else {
+    }
+    if (authData.passcode_url) {
         addUrlInfo(params, authData);
     }
 }

package/lib/client/base_command.js

@@ -20,7 +20,7 @@ module.exports = class BaseCommand {
     static handleHttpError(error, params, { url, command } = {}) {
         url = url ?? params.get('appUrl');
         const prefix = `Request to ${url} failed`;
-        switch (error.response?.status) {
+        switch (error.status) {
             case 401:
                 throw getMessage(`${prefix}: invalid authentication.\nRetry with valid passcode${
                     params.has('passcodeUrl') ? ` from ${params.get('passcodeUrl')}` : ''

package/lib/client/download_legacy.js

@@ -0,0 +1,48 @@
+const cds = require ('../cds')
+const { tar } = 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 DOWNLOAD_FILE_NAME = 'migrated_projects.tgz'; // TODO try to add tenant later, if possible
+
+module.exports = class Download extends BaseCommand {
+
+    static async run(paramValues) {
+        if (!tar) {
+            throw `cds pull requires @sap/cds version >= 6.2. Current version is ${cds.version}\n`;
+        }
+
+        const params = await login(paramValues);
+
+        const projectFolder = params.get('projectFolder');
+        const downloadPath = join(projectFolder, DOWNLOAD_FILE_NAME);
+
+        if (fs.existsSync(downloadPath) && !(await require('./helper/question').askBooleanQuestion(`File ${DOWNLOAD_FILE_NAME} already exists. Continue (yN)? `, false, false))) {
+            console.log('Download cancelled');
+            return;
+        }
+
+        console.log(`Downloading migrated @sap/mtx extension project(s)`);
+        const downloadedTgz = await this.getTgz(params);
+        await fs.promises.writeFile(downloadPath, downloadedTgz);
+
+        //await tar.xz(baseModelTgz).to(target); // expand if feature is requested later
+
+        console.log(`Finished.`);
+    }
+
+    static async getTgz(params) {
+        const tagRule = params.get('tagRule');
+        const downloadUrl = `${(params.get('appUrl'))}/-/cds/extensibility/getMigratedProjects`;
+        const options = { ...params.get('reqAuth'), responseType: 'arraybuffer' };
+
+        return axios.post(downloadUrl, { tagRule }, options)
+            .then(response => Buffer.from(response.data))
+            .catch(error => this.handleHttpError(error, params, { url: downloadUrl }));
+    }
+}

package/lib/client/params.js

@@ -162,6 +162,8 @@ class BasicParams {
         this.projectFolder          = new Param('projectFolder',          '');
         this.directory              = this.projectFolder.newAlias('directory');
 
+        this.tagRule                = new Param('tagRule', '');
+
         // - non-persisted, internal
         this.reqAuth                = new Param('reqAuth',                null, { obfuscate: ObfuscationLevel.full, internal: true });
         this.clearOtherTokenStorage = new Param('clearOtherTokenStorage', false, { internal: true });
@@ -222,6 +224,9 @@ class AllParams extends BasicParams {
         this["delete-settings"]     = this.deleteSettings.newAlias('delete-settings');
         this.clearInvalid           = new Param('clearInvalid',           false);
         this["clear-invalid"]       = this.clearInvalid.newAlias('clear-invalid');
+
+        // download for mxts
+        this["download-migrated-projects"]   = new Param('download-migrated-projects', false)
     }
 }
 

package/lib/client/push.js

@@ -9,6 +9,13 @@ const { getMessage } = require('./helper/logging');
 const { schemaRegex } = require('./helper/url_helper');
 const buildSystem = require('../build')
 
+const JOB_STATUS = {
+    QUEUED: 'QUEUED',
+    RUNNING: 'RUNNING',
+    FINISHED: 'FINISHED',
+    FAILED: 'FAILED'
+};
+
 module.exports = class Push extends BaseCommand {
 
     static async run(paramValues, pushOptions = {}) {
@@ -27,7 +34,11 @@ module.exports = class Push extends BaseCommand {
         const target = Object.assign({ url }, subdomain && { subdomain });
 
         console.log(`\nPushing extension '${extensionName}' from`, { src }, 'to', target);
-        await this.pushTgz(params, content, extensionName);
+        const push = await this.pushTgz(params, content, extensionName);
+        const async = !params.get('sync');
+        if (async) {
+            await this.pollUntilFinished(push.headers.location, params)
+        }
         console.log ('Activation succeeded.\n')
     }
 
@@ -61,6 +72,10 @@ module.exports = class Push extends BaseCommand {
     static async pushTgz(params, tgz, extensionName) {
         const pushUrl = `${params.get('appUrl')}/-/cds/extensibility/push`;
         const options = { ...params.get('reqAuth') };
+        const async = !params.get('sync');
+        if (async) {
+            options.headers = { prefer: 'respond-async', ...options.headers }
+        }
 
         return axios.post(pushUrl, {
             extension: tgz,
@@ -68,4 +83,29 @@ module.exports = class Push extends BaseCommand {
         }, options)
             .catch(error => this.handleHttpError(error, params, { url: pushUrl }));
     }
+
+    static async pollUntilFinished(jobUrl, params) {
+        return new Promise((resolve, reject) => {
+          const options = { ...params.get('reqAuth') };
+
+          const timeout = setTimeout(() => {
+            clearInterval(interval);
+            reject(new Error('cds push timed out after 5 minutes'));
+          }, 5 * 60 * 1000);
+
+          const interval = setInterval(async () => {
+            const { status, error } = (await axios.get(jobUrl, options)).data;
+            if (status === JOB_STATUS.FINISHED || status === JOB_STATUS.FAILED) {
+              clearInterval(interval);
+              clearTimeout(timeout);
+
+              if (status === JOB_STATUS.FINISHED) {
+                resolve();
+              } else if (status === JOB_STATUS.FAILED) {
+                reject(new Error(error));
+              }
+            }
+          }, 1000);
+        });
+    }
 }

package/lib/client/settings_manager.js

@@ -112,7 +112,7 @@ async function getTokenBaseUrl(params, renewUrl) {
             existingPath = path;
             break;
         } catch (error) {
-            if ([401, 404].includes(error.response?.status)) {
+            if ([401, 404].includes(error.status)) {
                 continue;
             }
             throw error;
@@ -344,6 +344,13 @@ class SettingsManager {
                 params.merge(auth[storage]);
             }
         }
+        function removeObsoleteToken() {
+            if (params.get('renewLogin') || params.get('tokenExpirationDate') <= Date.now()) {
+                DEBUG?.((params.get('renewLogin') ? 'Renewing' : 'Refreshing expired') + ' authentication token');
+                params.delete('token');
+                params.delete('tokenExpirationDate');
+            }
+        }
 
         if (params.has('username')) {
             if (!params.has('password') && !logout) {
@@ -381,8 +388,10 @@ class SettingsManager {
         };
 
         setRelevantAuth(auth);
-
-        if (!logout && !params.has('token') && !params.has('passcode') && !params.has('clientsecret') && !params.has('key')) {
+        if (params.has('token')) {
+            removeObsoleteToken();
+        }
+        if (!logout && !params.has('token') && !params.has('refreshToken') && !params.has('passcode') && !params.has('clientsecret') && !params.has('key')) {
             await addPasscode();
         }
     }

package/lib/env/schema.js

@@ -0,0 +1,36 @@
+const { join } = require('path')
+const { mergeJSON } = require('../init/util/merge')
+const { readJSON } = require('../util/fs')
+
+module.exports = async function overlay4(schemaName, cwd = process.cwd()) {
+
+    // need to load @sap/cds from current cwd which might
+    // differ from initial cwd to get project specific cds version
+    const cds = require(require.resolve('@sap/cds', {
+        paths: [cwd, __dirname]
+    }))
+
+    // force cds.root to be project root
+    cds.root = cwd
+
+    // load defaults, throw err if schema not found
+    let result;
+    if (typeof cds.schema?.default4 === 'function') {
+        result = await cds.schema.default4(schemaName)
+    } else if (cds.env?.schemas?.[schemaName]) {
+        // backwards compatibility
+        result = await readJSON(cds.env.schemas[schemaName])
+    } else {
+        throw new Error(`cds ${cds.version} in ${cwd} does not support schema retrieval.`)
+    }
+
+    // optional, don't throw if file not found
+    try {
+        await mergeJSON(result, join(__dirname, 'schemas', schemaName))
+        result.description = result.description + ' - overlaid'
+    } catch (err) {
+        if (err.code !== 'ENOENT') throw err
+    }
+
+    return result
+}

package/lib/env/schemas/cds-rc.json

@@ -0,0 +1,101 @@
+{
+    "title": "JSON schema for CDS-DK configuration",
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "description": "This is a JSON schema representation for CDS project configuration",
+    "type": "object",
+    "additionalProperties": true,
+    "properties": {
+        "build": {
+            "type": "object",
+            "description": "Customize CDS build settings.",
+            "additionalProperties": true,
+            "properties": {
+                "target": {
+                    "type": "string",
+                    "description": "Specify the folder which contains generated build results. Defaults to './gen'.",
+                    "format": "uri-reference"
+                },
+                "tasks": {
+                    "type": "array",
+                    "description": "Control which tasks 'cds build' will execute on your project modules. This is a typical task configuration: '\"tasks\": [{ \"for\": \"hana\"}];",
+                    "uniqueItems": true,
+                    "default": [
+                        {}
+                    ],
+                    "items": {
+                        "type": "object",
+                        "additionalProperties": true,
+                        "properties": {
+                            "dest": {
+                                "type": "string",
+                                "description": "Optional: Define the destination folder for this build task, relative to build target folder. \nFor example: Destination defined as 'custom' results in an output written to 'gen/custom'.",
+                                "format": "uri-reference"
+                            },
+                            "src": {
+                                "type": "string",
+                                "description": "Optional: Prefer defining 'cds.folders'. Use 'src' if you want it only to be valid for this specific build task, which excludes, for example, 'cds watch'.",
+                                "format": "uri-reference"
+                            },
+                            "for": {
+                                "type": "string",
+                                "description": "Define the target technology for this build task.",
+                                "minLength": 1,
+                                "enum": [
+                                    "nodejs",
+                                    "java",
+                                    "hana",
+                                    "mtx-sidecar",
+                                    "mtx-extension",
+                                    "mtx",
+                                    "fiori",
+                                    "node-cf",
+                                    "java-cf"
+                                ]
+                            },
+                            "options": {
+                                "type": "object",
+                                "description": "Optional: Set target technology specific options for this build task.",
+                                "additionalProperties": true,
+                                "properties": {
+                                    "model": {
+                                        "$ref": "#/$defs/foldersStringArray"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "deploy": {
+            "type": "object",
+            "description": "Customize 'cds deploy' settings.",
+            "additionalProperties": true,
+            "properties": {
+                "no_save": {
+                    "type": "boolean",
+                    "description": "Do / don't update configuration in package.json.",
+                    "default": true
+                }
+            }
+        }
+    },
+    "$defs": {
+        "foldersStringArray": {
+            "oneOf": [
+                {
+                    "type": "string",
+                    "format": "uri-reference"
+                },
+                {
+                    "type": "array",
+                    "uniqueItems": true,
+                    "items": {
+                        "type": "string",
+                        "format": "uri-reference"
+                    }
+                }
+            ]
+        }
+    }
+}

package/lib/import/common.js

@@ -17,7 +17,7 @@ let optionsMapping = {
 };
 
 let apiOptions = ['includeNamespaces', 'keepNamespace'];
-let commonOptions = ['no_copy', 'no_save', 'out', 'dry', 'as', 'from', 'force'];
+let commonOptions = ['no_copy', 'no_save', 'out', 'dry', 'as', 'from', 'force', 'config'];
 
 async function generateEDMX2JSON(edmx) {
     let cjson = convert.xml2json(edmx, {
@@ -148,6 +148,18 @@ async function _copyToSrvExternal(file, dst, cwd) {
     return file;
 }
 
+async function isValidJsonObject(options){
+    let config;
+    try {
+        if (options.config) {
+            config = JSON.parse(options.config);
+            return config;
+        }
+    } catch (error) {
+        throw new Error(messages.SPECIFY_CONFIG);
+    }
+} 
+
 async function preProcess(file, options, cwd) {
     let srcFilePath = await isValidInputFile(path.resolve(cwd, file));
     if (options.as && !_supportedAsFormats().includes(options.as))
@@ -266,12 +278,12 @@ async function _generateChecksumValidate(dest, output, force) {
     return "/* checksum : " + currentChecksum + " */\n" + output;
 }
 
-async function _getResult(output, as, dest, force, version) {
+async function _getResult(output, as, dest, force, kind) {
     let extension = dest.substring(dest.lastIndexOf(".") + 1);
     as = (as === "cds") ? "cdl" : as;
 
     // output filepath should simply contain .csn as extension
-    if (version === 'rest' &&  ['swagger', 'openapi3'].includes(extension)) {
+    if (kind === 'rest' &&  ['swagger', 'openapi3'].includes(extension)) {
         dest = dest.replace('.' + extension, '');
     }
 
@@ -325,19 +337,19 @@ ${using}
     console.log(message);
 }
 
-async function _updatePackageJson(dest, services, version, cwd) {
+async function _updatePackageJson(dest, services, kind, cwd, config) {
     const package_json = path.resolve(cwd, 'package.json');
     const conf = await exists(package_json) ? require(package_json) : {};
     const requires = ['cds', 'requires'].reduce((p, n) => p[n] || (p[n] = {}), conf);
-    if (version !== 'rest') {
-        version = (version === "V2") ? 'odata-v2' : 'odata';
+    if (kind !== 'rest') {
+        kind = (kind === "V2") ? 'odata-v2' : 'odata';
     }
     let package_json_updated = false;
     for (let service of services) {
         if (!requires[service]) {
             const initial_model = path.relative(cwd, dest);
             const model = isLinux() ? initial_model.replace(/\\/g, '/') : initial_model;
-            cds.env.requires[service] = requires[service] = { kind: version, model };
+            cds.env.requires[service] = requires[service] = { kind: kind, model, ...config };
             await write(package_json, JSON.stringify(conf, null, '  '));
             package_json_updated = true;
         }
@@ -349,11 +361,12 @@ async function _updatePackageJson(dest, services, version, cwd) {
 
 async function postProcess(filePath, options, csn, cwd) {
     const services = _getServiceNames(csn);
+    let config = await isValidJsonObject(options);
     if (options.out) options.out = _validateAndComputeOutputFilePath(options.out, options.as, filePath);
-    const version = options.inputFileVersion;
-    const result = await _getResult(csn, options.as, options.out || filePath.replace(/\.[^.]+$/, ''), options.force, version);
+    const kind = options.inputFileKind;
+    const result = await _getResult(csn, options.as, options.out || filePath.replace(/\.[^.]+$/, ''), options.force, kind);
     const written = options.dry || await _write(result, services, cwd);
-    const registered = options.dry || options.no_save || await _updatePackageJson(result[1].replace(/\.[^.]+$/, ''), services, version, cwd);
+    const registered = options.dry || options.no_save || await _updatePackageJson(result[1].replace(/\.[^.]+$/, ''), services, kind, cwd, config);
     if (options.dry) return console.log(result[0]);
     return Promise.all([written, registered]);
 }

package/lib/import/importapi.js

@@ -91,7 +91,7 @@ async function cds_import_from_openapi(filepath, options = {}) {
     filepath = await common.isValidInputFile(path.resolve(process.cwd(), filepath));
     const src = await common.getContentFromFile(filepath);
     let csn = openapi.openAPI2csn(src);
-    options.inputFileVersion = 'rest';
+    options.inputFileKind = 'rest';
     return csn;
 }
 
@@ -106,6 +106,6 @@ async function cds_import_from_asyncapi(filepath, options = {}) {
     filepath = await common.isValidInputFile(path.resolve(process.cwd(), filepath));
     const src = await common.getContentFromFile(filepath);
     let csn = asyncapi.asyncapi2csn(src);
-    options.inputFileVersion = 'odata';
+    options.inputFileKind = 'odata';
     return csn;
 }

package/lib/import/message.js

@@ -34,7 +34,9 @@ const messages = {
 	BINARY_MAXLENGTH: 'WARNING: MaxLength for type Edm.Binary should not exceed 5000.',
 	SCALE_GT_PRECISION: 'WARNING: Scale value should not be greater than Precision value.',
 	FIXED_PRECISION_VARIABLE_SCALE: 'WARNING: Fixed Precision with Variable or Floating Scale is not supported in CDS.',
-	NULLABLE_KEY: 'WARNING: Key element cannot be Nullable.'
+	NULLABLE_KEY: 'WARNING: Key element cannot be Nullable.',
+	COLLISION_DETECTED: `INFO: Element name collision detected. Adding suffix to affected type category.`,
+	SPECIFY_CONFIG: 'For --config option, please specify correct JSON Object.',
 };
 
 function getMessages() {