@sap/cds-dk 4.8.1 → 4.9.1

package/CHANGELOG.md

@@ -6,6 +6,60 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 4.9.1 - 2022-04-01
+
+### Changed
+
+- `cds init` uses latest Maven Java archetype version 1.23.0 for creating Java projects.
+- Include `@sap/cds` 5.9.1
+- Include `@sap/cds-compiler` 2.13.8
+- Include `@sap/eslint-plugin` 2.3.4
+
+## Version 4.9.0 - 2022-03-28
+
+### Added
+
+- `cds parse` as convenient shortcut to `cds compile --flavor parsed`.
+- `cds compile --to openapi` uses value of annotation `@Common.Label` on entities, actions, and functions for operation tags, diagram includes non-primitive action and function import parameters.
+- `cds add` now accepts `--for <profile>` argument to create Node,js project configuration for a given profile
+- `cds add approuter` allows for serving your application’s UI using SAP approuter.
+- `cds add kibana-logging` adds Kibana-friendly logging in a more convenient way than having to manually alter the package.json.
+
+### Changed
+
+- `cds init` does not create `VS Code` file exclusions anymore, so that `.vscode/` and `.gitignore` are visible by default, allowing easier editing of these files.
+- `cds init` reports Maven archetype version in console if called with `--add java`.
+- `cds init` uses latest Maven Java archetype version 1.22.2 for creating Java projects.
+- `cds import` modified documentation for namespace option.
+- `cds import` does not create bound function imports key parameters in CSN for OData V2.
+- `cds import` now when `--keep-namespace` option is not given validates the file name and then converts it to complier supported format as service name .
+- add new methods from `FsUtil` to typescript interface.
+
+### Fixed
+- `cds compile --to openapi` now correctly treats `null` and the empty string as function parameters.
+- `cds bind --exec` no command output (STDOUT) displayed on Windows.
+- `cds watch` now gracefully shuts down the live reload server before exiting
+- `cds import` now generates correct csn for both OData V2 and V4 EDMX files where the EntityType has a BaseType entry.
+- `cds import` now throws an error in case of missing Association Sets.
+- `cds import` bug fixed for `--force` flag. Now overwrites the correct file content.
+- `cds import` fix will no longer capture unwanted annotations in the CSN for OData V4.
+- `cds import` now support annotations for properties of type `Type Definition`
+- `cds import` fix for supporting valid datatypes in unbounded function imports for OData V4.
+- `cds import` bug fixed for missing data imports for parameters with entity type not mapped to an entity set.
+- `cds import` now supports properties with complex type for OData V4.
+- `cds import` fix will now throw error if the key property of an entity is of type `Collection` for both OData V2 and V4 edmx.
+- `cds bind --to hana` provides more comprehensive error message in case Cloud Foundry `org` or `space` are not set.
+
+## Version 4.8.2 - 2022-03-07
+
+### Fixed
+
+- `cds import` can now capture the data for any given `EntityContainer Name` for OData V4. Earlier it only worked when the name was `EntityContainer`.
+
+### Changed
+
+- `cds init` uses latest Maven Java archetype version 1.22.1 for creating Java projects.
+
 ## Version 4.8.1 - 2022-02-15
 
 ### Changed
@@ -28,6 +82,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 - 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`.
+- Use `cds bind` during `cds deploy` to store connection information in file `.cdsrc-private.json`.
 
 ### Fixed
 

package/bin/activate.js

@@ -8,7 +8,7 @@ module.exports = Object.assign(activate, {
     *cds activate* [ <extension-project-directory> ]
 
     Activate an extension project.
-    Unless given as an argument, the current working directory is used as project directory.
+    By default, the current working directory is used as project directory.
     
     To facilitate running this multiple times against the same app, refer to the *cds login* command.
 
@@ -16,16 +16,17 @@ module.exports = Object.assign(activate, {
 # OPTIONS
 
     *--to* <url>
-        Specify the URL of the extension project that you want to activate.
 
-    *-s* | *--subdomain* <subdomain>
+        Specify the URL of the extensible SaaS app. By default, it's determined from project settings.
 
-        Specify the subdomain of the subaccount where you activate the extension. 
+    *-s* | *--subdomain* <tenant-subdomain>
+
+        Specify your tenant's subdomain. By default, it's determined from project settings.
 
     *-p* | *--passcode* <passcode>
 
-        Add the passcode used for authentication. 
-        Also see cds login --help or https://cap.cloud.sap/docs/guides/extensibility#save-authentication-token-for-simplified-workflow
+        Tenant-specific passcode for authentication. 
+        Also see cds login --help or https://cap.cloud.sap/docs/guides/extensibility/#save-an-authentication-token-for-a-simplified-workflow
 
     *-u* | *--username* <name>
 
@@ -37,7 +38,7 @@ module.exports = Object.assign(activate, {
 
     *--undeploy*
 
-        Undeploy a previously deployed extension.
+        Undeploy a previously deployed extension, e.g. to remove a renamed or otherwise obsolete extension.
 
     *--sync*
 

package/bin/bind.js

@@ -60,7 +60,7 @@ const { determineKinds, getRequiresNameFromKind, execAndExit, checkIsJavaProject
 
 const VCAP_LABEL_PLACEHOLDER = '<replace with service label>';
 
-async function cds_bind(args, options) {
+async function cds_bind(args, options, logger = LOG) {
     options.profile = parseProfile(options.profile);
     setProfile(options.profile);
 
@@ -92,7 +92,7 @@ async function cds_bind(args, options) {
         throw new Error(`The option '--kind' cannot be specified together with multiple targets ('--to') services. Use one service per call or omit the '--kind' option.`);
     }
 
-    const spinner = new Spinner(LOG);
+    const spinner = new Spinner(logger);
 
     let on;
     if (options.on === 'k8s' || options.on === 'kubernetes') {
@@ -105,7 +105,7 @@ async function cds_bind(args, options) {
 
     const onText = { 'cf': 'Cloud Foundry', 'k8s': 'Kubernetes' }[on];
     const resolvedServices = await spinner.run(`Retrieving data from ${onText}...`, async () => { // NOSONAR
-        return await Promise.all( targets.map( async target => {
+        return await Promise.all(targets.map(async target => {
 
             let binding;
             if (on === 'k8s') {
@@ -126,9 +126,9 @@ async function cds_bind(args, options) {
     });
 
     if (options.kind) {
-        resolvedServices.forEach( service => service.kind = options.kind );
+        resolvedServices.forEach(service => service.kind = options.kind);
     } else {
-        determineKinds(resolvedServices);
+        determineKinds(resolvedServices, LOG);
     }
 
     for (const resolvedService of resolvedServices) {
@@ -152,11 +152,11 @@ async function cds_bind(args, options) {
         const kindText = kind && `with kind ${highlight(kind)}`;
         const nameText = !isJavaProject && highlight(name);
 
-        LOG.log(['Binding', nameText, 'to', platformText(binding), bindingText(binding, highlight), kindText].filter( t => t ).join(' '));
+        logger.log(['Binding', nameText, 'to', platformText(binding), bindingText(binding, highlight), kindText].filter(t => t).join(' '));
 
         if (isJavaProject && !hasVcapLabel(binding) && !hasVcapLabel(env.requires[resolvedService.name]) && !(kind && hasVcapLabel(env.requires[kind]))) {
             resolvedService.vcap = { label: VCAP_LABEL_PLACEHOLDER };
-            LOG.log(`${info('INFO:')} Please add a "vcap.label" property to the binding for consumption in CAP Java projects`);
+            logger.log(`${info('INFO:')} Please add a "vcap.label" property to the binding for consumption in CAP Java projects`);
         }
     }
 
@@ -165,18 +165,18 @@ async function cds_bind(args, options) {
 
     await userCdsrcJsonStorageProvider.storeServices(resolvedServices, {
         ...options,
-        logger: LOG
+        logger
     });
 
-    LOG.log();
-    LOG.log(`${info('TIP:')} Run with cloud bindings: ${bold(runCmd(options, isJavaProject))}`);
+    logger.log();
+    logger.log(`${info('TIP:')} Run with cloud bindings: ${bold(runCmd(options, isJavaProject))}`);
 }
 
 async function cds_bind_exec(command) { // eslint-disable-lint
     const cds = require('@sap/cds/lib');
     const env = cds.env.for('cds', process.cwd());
     env._emulate_vcap_services();
-    await require('../lib/bind/bindingResolver').applyTo({env, output: 'info'});
+    await require('../lib/bind/bindingResolver').applyTo({ env, output: 'info' });
     execAndExit(...command);
 }
 
@@ -184,7 +184,7 @@ function hasVcapLabel(service) {
     return service && service.vcap && service.vcap.label && service.vcap.label != VCAP_LABEL_PLACEHOLDER;
 }
 
-function runCmd({profile}, isJavaProject) {
+function runCmd({ profile }, isJavaProject) {
     if (isJavaProject) {
         const p = profile === 'hybrid' ? '' : ` --profile ${profile}`;
         return `cds bind exec${p} mvn spring-boot:run`;

package/bin/build/all.js

@@ -1,5 +1,3 @@
-const _cds = require('@sap/cds/lib')
-
 module.exports = Object.assign(build, {
     options: ['--project', '--for', '--use', '--src', '--dest', '--options-model'],
     flags: ['--clean'],
@@ -34,8 +32,8 @@ module.exports = Object.assign(build, {
 
     *-o*  | *--dest* <folder>
 
-        writes output to the given folder of the project root directory.
-        default = ${_cds.env.build.target}
+        writes output to the given folder. The folder is resolved based on "<project>/<cds.env.build.target>".
+
 
     *--options-model*
 
@@ -68,7 +66,7 @@ function build([project], options = {}, /* for unit tests only: */ _env = null)
     }
 
     try {
-        return _cds.build.build(options, _env)
+        return require('@sap/cds').build.build(options, _env)
     } catch (error) {
         return Promise.reject(error.message)
     }

package/bin/build/index.js

@@ -22,7 +22,7 @@ module.exports = Object.assign(build, {
     *--use* <qualified node module name>
 
         Fully qualified name of the build task that is applied to the source folder.
-        For example, "@sap/cds/lib/build/hana" represents the fully qualified name of the "hana" build task.
+        For example, "@sap/cds/build/hana" represents the fully qualified name of the "hana" build task.
         The module folder can be defined using option "--src", a default is used otherwise.
 
     *-s* | *--src* <folder>

package/bin/cds.js

@@ -8,6 +8,7 @@ const cli = { //NOSONAR
     y: 'bind',
     m: 'import',
     c: 'compile',
+    p: 'parse',
     s: 'serve',
     w: 'watch',
     e: 'env',
@@ -130,4 +131,3 @@ else { // TODO compat to cds 3 remove after a while.
 if (!module.parent)  module.exports()
 
 /* eslint no-console:off */
-

package/bin/deploy/index.js

@@ -1,5 +1,5 @@
 module.exports = Object.assign(deploy, {
-  options: ['--to', '--tunnel-address', '--vcap-file'], flags: [ '--no-save', '--auto-undeploy', '--dry', '--with-mocks' ],
+  options: ['--to', '--tunnel-address', '--vcap-file'], flags: [ '--no-save', '--auto-undeploy', '--dry', '--with-mocks', '--bind' ],
   shortcuts: ['-2'],
   help: `
 # SYNOPSIS
@@ -47,6 +47,12 @@ module.exports = Object.assign(deploy, {
       creating new credentials. File must be in *default-env.json* format, with a root
       node *VCAP_SERVICES*.
 
+    *--bind* (beta feature, only in combination with *--to hana*)
+
+      Use *cds bind* to connect the created service after deployment.
+      This will no longer create default-env.json files. Instead, cds bind is used to
+      create and store connection information in file *.cdsrc-private.json*.
+
 # EXAMPLES
     cds deploy --to sqlite:db
     cds deploy --to hana:myService --auto-undeploy

package/bin/deploy/to-hana.js

@@ -1,9 +1,10 @@
-const {join} = require('path')
+const { join } = require('path');
 
 exports.deploy = (_model, _db, options) => {
   // locate deployer relative to already located sap/cds -> local cds takes precedence
-  const cdsHome = require('@sap/cds').home
-  const deployer = require(join(cdsHome, 'bin/deploy/to-hana'))
+  const cdsHome = require('@sap/cds').home;
+  const deployer = require(join(cdsHome, 'bin/deploy/to-hana'));
 
-  return deployer.deploy (_model, _db, options)
+  const bind = require('../bind');
+  return deployer.deploy(_model, _db, options, options.bind ? bind : null);
 }

package/bin/deploy/to-sqlite.js

@@ -2,7 +2,8 @@ exports.deploy = function deploy_to_sqlite (_model, _db, options) {
     const cds = require('@sap/cds/lib')
     const {to:_dbrl} = options
     const conf = cds.env.requires.db || {}
-    const model = _model || conf.model || cds.resolve('*',false)
+    const fts = cds.env.features.folders
+    const model = _model || conf.model || cds.resolve(!fts ? '*' : ['*',fts], false)
     const file = _database4 (_db, _dbrl, conf)
     const dialect = _dbrl && _dbrl.match(/^(\w+)/) && RegExp.$1
     if (dialect) options.dialect = dialect === 'sql' ? 'plain' : dialect

package/bin/extend.js

@@ -7,8 +7,8 @@ module.exports = Object.assign(extend, {
 
     *cds extend* <app-url>
 
-    Create an extension project from an app URL.
-    Obtain the URL from the SaaS application that you want to extend.
+    Create an extension project from an extensible SaaS app.
+    Obtain the app URL from the SaaS application provider.
 
     To facilitate running this multiple times against the same app, refer to the *cds login* command.
 
@@ -16,15 +16,15 @@ module.exports = Object.assign(extend, {
 
     *-d* | *--directory* <project-extension-directory>
 
-        Specify the target directory of your extension project.
+        Specify the target directory of your extension project. By default, the current working directory is used.
 
     *-s* | *--subdomain* <tenant-subdomain>
 
-        Specify the subdomain of the SaaS application you want to extend.
+        Specify your tenant's subdomain. By default, it's determined from the app URL.
 
     *-p* | *--passcode* <passcode>
 
-        The tenant-specific passcode for authentication.
+        Tenant-specific passcode for authentication.
 
     *-u* | *--username* <name>
 

package/bin/help.js

@@ -13,6 +13,7 @@ module.exports = exports = Object.assign (help, {help:`
     *y* | *bind*       [beta] bind a service to a hana instance
     *m* | *import*     add models from external sources
     *c* | *compile*    compile cds models to different outputs
+    *p* | *parse*      parses given cds models
     *s* | *serve*      run your services in local server
     *w* | *watch*      run and restart on file changes
     *r* | *repl*       read-eval-event loop

package/bin/import.js

@@ -44,11 +44,11 @@ module.exports = Object.assign(_import, {
     *-f | --force*
         Forcefully overwrites the contents in the CDS file and updates the checksum
         
-    *-ns | --include-namespaces <string_of_namespaces> or* * 
+    *-ns | --include-namespaces <string_of_namespaces> or* "\x2A"
         Imports only entities matching to the given list of namespaces.
+        For OData V2 attributes with the namespace "sap" & "m" are captured by default.
 
        
-       
 
 # EXAMPLES
 
@@ -56,7 +56,7 @@ module.exports = Object.assign(_import, {
     cds import - ~/Downloads/API_BUSINESS_PARTNER.edmx
     cds import ~/Downloads/API_BUSINESS_PARTNER.edmx --as cds
     cds import ~/Downloads/API_BUSINESS_PARTNER.edmx --include-namespaces "sap,c4c"
-    cds import ~/Downloads/API_BUSINESS_PARTNER.edmx --include-namespaces "*"
+    cds import ~/Downloads/API_BUSINESS_PARTNER.edmx --include-namespaces "\x2A"
 
 `})
 const cds = require('@sap/cds/lib')
@@ -109,37 +109,51 @@ async function _import(file, { out, dry, into, as,
 }
 
 async function _generateChecksumValidate(dest, output, force) {
-    let fileResolved = await exists(dest);
-    if (fileResolved === false) {
-        let checksum = md5(output);
-        output = "/* checksum : " + checksum + " */\n" + output;
-        return output;
+    let fileExists = await exists(dest);
+
+    // force flag disabled and cds file already exists, then throw error
+    if (!force && fileExists) {
+        throw new Error(messages.FILE_MODIFIED);
     }
-    else {
-        let existingFileContent = await read(dest, "utf-8");
-        existingFileContent = String(existingFileContent);
-        if (existingFileContent.indexOf("checksum") === -1){
-            let checksum = md5(existingFileContent);
-            output = "/* checksum : " + checksum + " */\n" + output;
-            return output;
-        }      
-        let fileChecksum = existingFileContent.substring(existingFileContent.indexOf("checksum") + 11, existingFileContent.indexOf(" */"));
-        existingFileContent = existingFileContent.substring(existingFileContent.indexOf('*/') + 3);
-        let checksum = md5(existingFileContent);
-        if (fileChecksum === checksum) {
-            output = "/* checksum : " + checksum + " */\n" + existingFileContent;
-            return output;
-        }
-        else {
-            if (force) {
-                output = "/* checksum : " + md5(output) + " */\n" + output;
-                return output;
-            }
-            else {
-                throw new Error(messages.FILE_MODIFIED);
-            }
+
+    const currentChecksum = md5(output);
+    let existingFileContent, existingFileContentWithoutChecksum;
+    let existingFileContentChecksum, existingChecksumValue;
+
+    if (fileExists) {
+        existingFileContent = await read(dest, "utf-8");
+        const checksumStartIndex = existingFileContent.indexOf(`/* checksum : `);
+        const checksumEndIndex = existingFileContent.indexOf(" */");
+
+        if (checksumStartIndex >= 0) {
+            existingFileContentWithoutChecksum = existingFileContent.substring(
+                checksumEndIndex + 4
+            );
+            existingChecksumValue = existingFileContent.substring(
+                checksumStartIndex + 14, checksumEndIndex
+            );
+            existingFileContentChecksum = md5(existingFileContentWithoutChecksum);
         }
     }
+
+    // if force flag enbabled
+    if (force) {
+        // current and existing file content are same, and the existing
+        // checksum is not modified, then return the existing file content
+        if (currentChecksum == existingFileContentChecksum && 
+            currentChecksum == existingChecksumValue) {
+            return existingFileContent;
+        }
+    } 
+    /*
+     * 1. current and existing checksum are different.
+     * 2. checksum is missing in the existing file:
+     *     a. existing and current file content are same.
+     *     b. existing and current file content are different.
+     * 3. cds file doesn't exist.
+     * 4. checksum of the existing file is modified.
+     */
+    return "/* checksum : " + currentChecksum + " */\n" + output;
 }
 
 async function _getResult(output, service, as, dest, force) {

package/bin/login.js

@@ -58,19 +58,18 @@ module.exports = Object.assign(login, {
 
     *-s* | *--subdomain* <tenant-subdomain>
 
-        The subdomain to log in to. Can also be provided by project settings.
-        Alternatively it will be determined by invoking the CF client and
-        interpreting its output by reference to the <app-url>.
+        The subdomain to log in to. By default, it's determined from project settings.
+        If no such setting is saved, the CF client is invoked to determine the respective subdomain.
 
     *-d* | *--directory* <extension-project-directory>
 
         The extension-project folder (relevant for loading and saving settings).
-        If omitted, a subdirectory named as the subdomain or the current working
-        directory will be used.
+        If omitted, either an existing subdirectory named as the subdomain or the current
+        working directory will be used.
 
     *-p* | *--passcode* <passcode>
 
-        The tenant-specific passcode for authentication.
+        Tenant-specific passcode for authentication.
 
     *-c* | *--clientid* <clientid>
 

package/bin/logout.js

@@ -33,11 +33,11 @@ module.exports = Object.assign(logout, {
 
     *-l* | *--url* <app-url>
     
-        The <app-url> to logout from. Can also be provided by project settings.
+        The <app-url> to logout from. By default, it's determined from project settings.
    
     *-s* | *--subdomain* <subdomain>
     
-        The subdomain to logout from. Can also be provided by project settings.
+        The subdomain to logout from. By default, it's determined from project settings.
 
     *--delete-settings*
     

package/bin/parse.js

@@ -0,0 +1,19 @@
+const compile = require('./compile')
+module.exports = Object.assign (
+    cds_parse, compile, {help: `
+# SYNOPSIS
+
+    *cds parse* ...
+
+    Convenient shortcut for 'cds compile --flavor parsed'.
+
+# OPTIONS
+
+    - see _cds help compile_
+
+
+`})
+
+function cds_parse (projects, options) {
+    return compile (projects,{ flavor:'parsed', ...options })
+}

package/lib/bind/bindingUtil.js

@@ -4,6 +4,8 @@ const IS_WIN = os.platform() === 'win32';
 
 const KindToRequiresNameMap = {
     xsuaa: 'uaa',
+    'xsuaa-auth': 'uaa',
+    'hana-cloud': 'db',
     hana: 'db',
     destinations: 'destinations',
     connectivity: 'connectivity',
@@ -14,6 +16,11 @@ const KindToRequiresNameMap = {
     'enterprise-messaging-shared': 'messaging'
 }
 
+const PreferredKinds = [
+    'hana-cloud',
+    'xsuaa'
+];
+
 function getRequiresNameFromKind(service, kind) {
     const requiresName = KindToRequiresNameMap[kind];
     if (!requiresName) throw new Error(`Unknown CDS service name for service "${service}". Please specify as argument for "cds bind".`)
@@ -25,64 +32,49 @@ function getRequiresNameFromKind(service, kind) {
  * information in the configuration.
  */
 function determineKinds(services) {
-        const vcapServices = {}
+    const vcapServices = {}
 
-        const getIndex = service => {
-            const { credentials } = service;
-            return credentials && credentials.binding && credentials.binding.index;
-        }
+    // Build VCAP_SERVICES
+    for (const service of services) {
+        service.kindCandidates = [ ]
 
-        // Build VCAP_SERVICES
-        for (let index = 0; index<services.length; index++) {
-            const service = services[index];
-            service.kindCandidates = [ ]
-            service.nameCandidates = [ ]
+        const { label, name, tags } = service.binding && service.binding.vcap || {};
+        if (!label) continue;
 
-            const { label, name, tags } = service.binding && service.binding.vcap || {};
-            if (!label) continue;
+        if (!vcapServices[label]) vcapServices[label] = [];
+        vcapServices[label].push({ credentials: { dummy: 'dummy' }, label, name, tags, service });
+    }
 
-            if (!vcapServices[label]) vcapServices[label] = [];
-            vcapServices[label].push({ credentials: { binding: { index } }, label, name, tags });
-        }
+// Auto configure services based on VCAP_SERVICES
 
-        // Auto configure services based on VCAP_SERVICES
-        const cds = require('@sap/cds/lib');
-        const VCAP_SERVICES = process.env.VCAP_SERVICES;
-        try {
-            process.env.VCAP_SERVICES = JSON.stringify(vcapServices);
-            const env = cds.env.for('cds', '.');
-
-            // Extract "kind" from auto configured services
-            for (const kind of Object.keys(env.requires)) {
-                const requireService = env.requires[kind];
-                const superKind = requireService.kind;
-                const index = getIndex(requireService);
-                if (!Number.isInteger(index)) continue;
-
-                const superRequireService = env.requires[superKind];
-                if (superRequireService) {
-                    const superIndex = getIndex(superRequireService);
-                    if (index === superIndex) continue;
-                }
-
-                services[index].kindCandidates.push(kind);
-            }
+    const cds = require('@sap/cds/lib');
+    const env = cds.env.for('cds', process.cwd());
 
-            // Check if one "kind" per service was found
-            for (const service of services) {
-                if (service.kindCandidates.length === 1) {
-                    service.kind = service.kindCandidates[0];
-                }
+    if (!env._find_credentials_for_required_service) {
+        throwError `Please provide a service kind or update @sap/cds version to use the kind detection.`;
+    }
 
-                delete service.kindCandidates;
-            }
-        } finally {
-            if (VCAP_SERVICES)
-                process.env.VCAP_SERVICES = VCAP_SERVICES;
-            else
-                delete process.env.VCAP_SERVICES;
+    const requires = env.requires.kinds || {};
+    for (const kind of Object.keys(requires)) {
+        const requireService = requires[kind];
+        const vcapService = env._find_credentials_for_required_service(kind, requireService, vcapServices);
+        if (!vcapService) continue;
+        if (!Object.values(requires).find( require => require !== requireService && require.kind == kind ))
+            vcapService.service.kindCandidates.push(kind);
+    }
+
+    // Check if one "kind" per service was found
+    for (const service of services) {
+        const preferredKind = service.kindCandidates.find( kind => PreferredKinds.indexOf(kind) >= 0);
+        if (preferredKind) {
+            service.kind = preferredKind;
+        } if (service.kindCandidates.length === 1) {
+            service.kind = service.kindCandidates[0];
         }
+
+        delete service.kindCandidates;
     }
+}
 
 function execAndExit(command, ...args) {
     const { spawnSync } = require('child_process');