@sap/cds-dk 7.0.1 → 7.0.2

package/bin/add.js

@@ -1,3 +1,4 @@
+const term = require('../lib/util/term')
 
 module.exports = Object.assign(add, {
   options: ['--for', '--out', '--data:for'],
@@ -8,72 +9,68 @@ module.exports = Object.assign(add, {
 
     *cds add* <feature | comma-separated list of features>
 
-    Adds one or more features to an existing project in the current working
-    folder - Grow-as-you-go scenario.
+    Adds one or more features to an existing project - grow as you go.
 
-    The following <features> are supported so far:
+    The following features are supported so far:
 
-    *hana*          - adds configuration for SAP HANA databases
+    *hana*                  - add support for SAP HANA
 
-    *sqlite*        - adds configuration for SQLite databases
+    *sqlite*                - add support for SQLite databases
 
-    *xsuaa*         - adds configuration for authentication via XSUAA
+    *xsuaa*                 - add support for authentication via XSUAA
 
-    *multitenancy*  - adds configuration for multitenancy
+    *multitenancy*          - add support for multitenancy
 
-    *toggles*       - adds configuration for feature toggles
+    *toggles*               - add support for feature toggles
 
-    *extensibility* - adds configuration for extensibility
+    *extensibility*         - add support for extensibility
 
-    *mtx*           - adds configuration for multitenancy, feature toggles and
-                      extensibility
+    *approuter*             - add support for application routing
 
-    *approuter*     - adds configuration for the Cloud Foundry approuter
+    *file-based-messaging*  - add support for file-based messaging
 
-    *mta*           - adds an _mta.yaml_ file for MTA-based SAP Business
-                      Technology Platform deployment
+    *enterprise-messaging*  - add support for SAP Event Mesh
 
-    *cf-manifest*   - adds _manifest.yml_ and _services-manifest.yml_ files for
-                      Cloud Foundry native deployment
+    *redis-messaging*       - add support for Redis messaging
 
-                      This approach makes use of the 'Create-Service-Push
-                      Plugin' that has to be installed separately using
-                      _cf install-plugin Create-Service-Push_.
-                      _cf create-service-push_ creates the service(s) and pushes
-                      the application(s) to the SAP Business Technology
-                      Platform.
+    *kibana-logging*        - add support for Kibana formatting
 
-    *pipeline*      - adds files for CI/CD pipeline integration
+    *mta*                   - add support for MTA-based deployment
 
-    *sample*        - adds sample files including Fiori UI
+    *cf-manifest*           - add support for CF-native deployment
 
-    *tiny-sample*   - adds minimal sample files
+    *helm*                  - add support for Helm-based Kyma deployment
 
-    *data*          - adds data content for CSN model entities (as csv files)
+    *html5-repo*            - add support for the HTML5 repository
 
-    *helm*          - adds helm chart folder that contains the files needed to
-                      deploy the application using Kyma.
+    *pipeline*              - add files for CI/CD pipeline integration
 
-    *html5-repo*    - adds configuration for HTML5 Application Deployer to Helm
-                      Chart (Kyma Only).
+    *tiny-sample*           - add minimal sample files
+
+    *sample*                - add sample files including Fiori UI
+
+    *data*                  - add CSV headers for modeled entities
+
+    *typer*                 - add type generation for CDS models
+
+    *lint*                  - add support for CDS Lint
 
 
 # OPTIONS
 
     *--for* <profile>
 
-      Writes configuration data, if any, under the given profile, like
-      \`"[production]": { "db": "hana" }\`
+      Write configuration data for the given profile.
 
     *--data:for* <entity name or prefix>
 
-      Adds data content for entities matching the given pattern.  If it contains
+      Add data content for entities matching the given pattern.  If it contains
       meta characters like '^' or '*', it is treated like a regular expression,
       otherwise as a prefix.
 
     *-o* | *--out* <target folder>
 
-      Specifies output target folder (applicable to data feature only)
+      Specify output target folder (applicable to ${term.bold('data')} feature only).
 
     *--force*
 
@@ -81,11 +78,10 @@ module.exports = Object.assign(add, {
 
 # EXAMPLES
 
-    *cds add* mta,pipeline
-    *cds add* multitenancy
-    *cds add* hana,xsuaa --for production
-    *cds add* cf-manifest
+    *cds add* sample
+    *cds add* multitenancy,hana,xsuaa --for production
     *cds add* data --data:for my.namespace.MyEntity
+    *cds add* mta
     *cds add* helm
 
 

package/bin/build.js

@@ -101,6 +101,10 @@ async function build([project], options = {}) {
     const { CliError } = require('../lib/client/helper/errors')
     const { build } = require('../lib/build')
 
+    const [major] = cds.version.split('.')
+    if (Number(major) < 6) {
+        throw new CliError("This application uses @sap/cds version < 6, which is not compatible with the installed @sap/cds-dk version >= 7. Update @sap/cds to version >= 6.")
+    }
     if (options.clean === "false") {
         throw new CliError("cds build option '--clean' is deprecated - build output folders are always cleaned before build")
     }

package/bin/cds.js

@@ -54,9 +54,13 @@ const cli = { //NOSONAR
         return await task.apply(this, args)
       }
     } catch (e) {
-      process.exitCode = 1
-      if (process.argv[1].endsWith('watched'))  throw e // bin/watched.js handles errors
-      cds._log(e.messages?.length ? e.messages : e.message ?? e, { 'log-level': cds.env.log.levels.cli })
+      const { BuildError } = require('../lib/build')
+      const { CliError } = require('../lib/client/helper/errors')
+      process.exitCode ??= 1
+      if (e.messages?.length) return cds._log(e.messages, { 'log-level': cds.env.log.levels.cli })
+      else if (e instanceof CliError || e instanceof BuildError) return console.error(e.message)
+      if (cds.watched)  throw e  // bin/watched.js handles errors
+      else return console.error(e)
     }
   },
 
@@ -180,7 +184,7 @@ function _dieForUnknownCommand(cmd) {
 `
   console.error(msg)
 
-  process.exitCode = 1
+  process.exit(1)
 }
 
 function _require (id,o) {

package/bin/compile/index.js

@@ -175,7 +175,7 @@ function compile (models, options={}) {
     model = readModelFromStdin()
     src = 'stdin'
   } else { // no args, no stdin
-    throw new Error (`You must specify a model to compile.\nRun 'cds c -?' to learn more.`)
+    throw `You must specify a model to compile.\nRun 'cds c -?' to learn more.`
   }
 
   let chain = model.then (m => model=m)
@@ -189,7 +189,7 @@ function compile (models, options={}) {
   if (typeof options.to === 'string')  for (let each of options.to.split(',')) {
     chain = chain.then (next (processor ('to', _suffix=each)))
   } else if (options.to) {
-    cds.error (`Specify a model processor`)
+    throw `Specify a model processor`
   }
 
   // add processor for i18n
@@ -235,7 +235,7 @@ function compile (models, options={}) {
     let p = cds.compile[kind]
     for (let each of tail.split('.')) {
       p = p[each]
-      if (!p) throw new Error (`Unknown model processor: cds.compile.${kind}.${tail}`)
+      if (!p) throw `Unknown model processor: cds.compile.${kind}.${tail}`
     }
     return p
   }

package/bin/help.js

@@ -39,9 +39,8 @@ module.exports = exports = Object.assign (help, {formatHelp, help:`
 
 function help (topic) {
   if (Array.isArray(topic))  topic = topic[0]
-  const task = !topic ? help : this.load && this.load (this.Shortcuts[topic] || topic)
-  if (task && task.help) console.log (formatHelp (task.help))
-  else throw new Error(`Didn't find a help topic for '${ topic.name || topic }'.`)
+  const task = !topic ? help : this.load?.(this.Shortcuts[topic] || topic)
+  if (task?.help) console.log (formatHelp (task.help))
 }
 
 function formatHelp (text) {

package/lib/build/buildTaskEngine.js

@@ -30,7 +30,7 @@ class BuildTaskEngine {
         const messages = []
 
         this.logger.log(`building project [${cds.root}], clean [${this.buildOptions.clean}]`)
-        this.logger.log(`cds [${cds.version}], compiler [${cds.compiler.version()}], home [${cds.home}]\n`)
+        this.logger.log(`cds-dk [${require('../../package.json').version}], cds [${cds.version}], compiler [${cds.compiler.version()}], home [${cds.home}]\n`)
 
         if (!tasks) {
             const buildTaskFactory = new BuildTaskFactory(this.buildOptions)

package/lib/build/provider/buildTaskHandlerFeatureToggles.js

@@ -3,6 +3,7 @@ const path = require('path')
 const cds = require('../../cds')
 const { DEFAULT_CSN_FILE_NAME, OUTPUT_MODE, OUTPUT_MODE_RESULT } = require('../constants')
 const BuildTaskHandlerInternal = require('./buildTaskHandlerInternal')
+const { getI18nDefaultFolder } = require('../util')
 
 class FeatureToggleBuilder extends BuildTaskHandlerInternal {
     init() {
@@ -46,7 +47,7 @@ class FeatureToggleBuilder extends BuildTaskHandlerInternal {
     }
 
     async collectAllLanguageBundles(dictionary, paths, destBase, destFts) {
-        const i18nFolder = cds.env.i18n.folders?.[0] || 'i18n'
+        const i18nFolder = getI18nDefaultFolder()
         // create language bundle for base model
         const i18n = await this.collectLanguageBundles(dictionary.base, path.join(destBase, i18nFolder))
         if (i18n && this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {

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

@@ -3,6 +3,7 @@ const path = require('path')
 const cds = require('../../../cds')
 const BuildTaskHandlerEdmx = require('../buildTaskHandlerEdmx')
 const { OUTPUT_MODE, OUTPUT_MODE_RESULT, FILE_EXT_CDS, CONTENT_LANGUAGE_BUNDLES, CONTENT_DEFAULT_CSN, DEFAULT_CSN_FILE_NAME } = require('../../constants')
+const { getI18nDefaultFolder } = require('../../util')
 const DEFAULT_COMPILE_DEST_FOLDER = path.normalize('src/main/resources/edmx')
 
 class JavaModuleBuilder extends BuildTaskHandlerEdmx {
@@ -28,8 +29,7 @@ class JavaModuleBuilder extends BuildTaskHandlerEdmx {
 
         if (this.hasBuildOption(CONTENT_LANGUAGE_BUNDLES, true)) {
             // collect and write language bundles into single i18n.json file
-            const i18nFolder = cds.env.i18n.folders?.[0] || 'i18n'
-            const i18n = await this.collectLanguageBundles(model, path.join(this.task.dest, i18nFolder))
+            const i18n = await this.collectLanguageBundles(model, path.join(this.task.dest, getI18nDefaultFolder()))
             if (i18n && this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
                 this._result.languageBundles = i18n.bundles
             }

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

@@ -5,7 +5,7 @@ const { FOLDER_GEN, DEFAULT_CSN_FILE_NAME } = require('../../constants')
 const NodeCfModuleBuilder = require('../nodejs')
 const ResourcesTarProvider = require('../mtx/resourcesTarBuilder')
 const { WARNING, ERROR } = NodeCfModuleBuilder
-const { relativePaths, BuildError, resolveRequiredSapModels } = require('../../util')
+const { relativePaths, BuildError, resolveRequiredSapModels, getI18nDefaultFolder } = require('../../util')
 
 const DEFAULT_MAIN_FOLDER = "_main"
 
@@ -45,11 +45,10 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
     async _buildNodeApp(sidecarEnv) {
         const destSidecar = this.task.dest
         const destSidecarSrc = path.join(destSidecar, cds.env.folders.srv)
-        const i18nFolder = cds.env.i18n.folders?.[0] || 'i18n'
         const model = this._compileSidecarSync(sidecarEnv)
         await this.compileToJson(model, path.join(destSidecarSrc, DEFAULT_CSN_FILE_NAME))
 
-        await this.collectLanguageBundles(model, path.join(destSidecarSrc, i18nFolder))
+        await this.collectLanguageBundles(model, path.join(destSidecarSrc, getI18nDefaultFolder()))
         await this.copySrvContent(this.task.src, destSidecar, destSidecar)
     }
 

package/lib/build/util.js

@@ -170,6 +170,13 @@ async function copy(src, dest) {
     }
 }
 
+function getI18nDefaultFolder() {
+    // keep '_i18n' as preferred folder for compatibility reasons
+    if (cds.env.i18n.folders.includes('_i18n')) return '_i18n'
+    if (cds.env.i18n.folders.includes('i18n')) return 'i18n'
+    return cds.env.i18n.folders[0] ?? 'i18n'
+}
+
 /**
  * Return gnu-style error string for location `loc`:
  *  - 'File:Line:Col' without `loc.end`
@@ -258,6 +265,7 @@ module.exports = {
     getDefaultModelOptions,
     flatten,
     copy,
+    getI18nDefaultFolder,
     BuildMessage,
     BuildError
 }

package/lib/cds.js

@@ -3,8 +3,8 @@ const cds = _local ('@sap/cds')
 
 module.exports = Object.defineProperties (cds, {
   // for internal use in cds-dk only
-  _log: { value: _local ('../bin/util/log') },
-  _local: { value: _local },
+  _log: { value: _local ('../bin/util/log'), configurable: true },
+  _local: { value: _local, configurable: true },
 })
 
 function _local (id) {

package/lib/init/constants.js

@@ -15,6 +15,9 @@ const constants = {
         JAVA_MVN: 'java:mvn',
         JAVA_PACKAGE: 'java:package',
         NODEJS: 'nodejs',
+        SAMPLES: 'samples', // deprecated
+        TINY_SAMPLE: 'tiny-sample',
+        SAMPLE: 'sample',
         PIPELINE: 'pipeline',
         MTA: 'mta',
         CONNECTIVITY: 'connectivity',
@@ -33,11 +36,8 @@ const constants = {
         REDIS_MESSAGING: 'redis-messaging',
         APPROUTER: 'approuter',
         DESTINATION: 'destination',
-        SAMPLES: 'samples', // deprecated
-        TINY_SAMPLE: 'tiny-sample',
-        SAMPLE: 'sample',
         DATA: 'data',
-        KIBANA_LOGGING: 'kibana-logging',
+        KIBANA: 'kibana',
         LINT: 'lint',
         LINT_GLOBAL: 'lint:global',
         LINT_DEV: 'lint:dev',

package/lib/init/index.js

@@ -100,7 +100,7 @@ module.exports = class CDSGenerator {
         this._greetings(options._cmd);
 
         if (!PROJECT_FILES.find(exists)) {
-            throw new Error(`The current folder doesn't seem to contain a project. None of the following files found: ${PROJECT_FILES.join(', ')}.`);
+            throw `The current folder doesn't seem to contain a project. None of the following files found: ${PROJECT_FILES.join(', ')}.`
         }
 
         await this._process(options);
@@ -176,8 +176,6 @@ module.exports = class CDSGenerator {
     }
 
     async _createTemplate(filename) {
-        // Compat
-        if (filename === 'sample-tiny') filename = 'tiny-sample'
 
         try {
             const TemplateClass = require(`./template/${filename}`);
@@ -202,26 +200,28 @@ module.exports = class CDSGenerator {
 
     async _fillTemplateList() {
         const templates = new Map();
-        for (const option of this.options.add) {
+        for (let option of this.options.add) {
+            // Compat
+            if (option === 'sample-tiny') option = 'tiny-sample'
+            if (option === 'kibana-logging') option = 'kibana'
+
             if (!templates.has(option)) {
                 const template = await this._createTemplate(option);
-
                 if (await template.canRun()) {
                     DEBUG?.(`Adding feature '${template.name}'`);
-
                     templates.set(option, template);
                     const deps = await template.getDependencies();
                     if (deps) {
-                        deps.forEach(this.options.add.add, this.options.add)
+                        deps.forEach(this.options.add.add, this.options.add) // REVISIT: Ugly add.add
                     }
                 }
             }
         }
 
-        const cmds = Object.values(OPTIONS);
-        this.templateList = Array.from(templates.entries()).sort(([a], [b]) => {
-            return cmds.indexOf(a) - cmds.indexOf(b);
-        }).map((entry) => entry[1]);
+        const cmds = Object.values(OPTIONS)
+        this.templateList = Array.from(templates.entries())
+            .sort(([a], [b]) => cmds.indexOf(a) - cmds.indexOf(b))
+            .map((entry) => entry[1])
 
         // check debug to avoid lengthy computation when not in debug mode
         DEBUG?.(`Features: ${this.templateList.map(({name}) => name).join(', ')}`);
@@ -293,7 +293,7 @@ module.exports = class CDSGenerator {
 
     async _validateProjectName(projectName) {
         if (!projectName) {
-            throw new Error('Specify a project name.');
+            throw 'Specify a project name.'
         }
 
         // remove duplicates by using a set
@@ -302,9 +302,9 @@ module.exports = class CDSGenerator {
             case 0:
                 break;
             case 1:
-                throw new Error(`Project name ${projectName} contains an invalid character (${[...invalidChars].join(', ')}). Specify a different project name.`);
+                throw `Project name ${projectName} contains an invalid character (${[...invalidChars].join(', ')}). Specify a different project name.`
             default:
-                throw new Error(`Project name ${projectName} contains invalid characters (${[...invalidChars].join(', ')}). Specify a different project name.`);
+                throw `Project name ${projectName} contains invalid characters (${[...invalidChars].join(', ')}). Specify a different project name.`
         }
     }
 
@@ -317,7 +317,7 @@ module.exports = class CDSGenerator {
             } else {
                 message = `You seem to be trying to initialize an existing project. Use a different project name instead.`;
             }
-            throw new Error(`${message}\nDetails: File '${existingProjectFile}' exists in the project folder which indicates an existing project. Use ${term.bold('cds add')} to add more features.`);
+            throw `${message}\nDetails: File '${existingProjectFile}' exists in the project folder which indicates an existing project. Use ${term.bold('cds add')} to add more features.`
         }
     }
 }

package/lib/init/template/_merging/registry-mta.js

@@ -93,7 +93,7 @@ const enterpriseMessaging = {
     }]
 }
 
-const kibanaLogging = {
+const kibana = {
     in: 'resources',
     where: [{
         property: 'type',
@@ -278,6 +278,6 @@ module.exports = {
     requiredAppApi4,
     providedJavaApprouterApi4,
     providedJavaApprouterApi,
-    kibanaLogging,
+    kibana,
     approuterExtensibility
 }

package/lib/init/template/approuter/index.js

@@ -3,7 +3,7 @@ const { exists } = cds.utils
 const { join } = require('path')
 const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML, sort } = require('../../util/merge')
-const { XSUAA } = require('../../constants').OPTIONS
+const { XSUAA, KIBANA } = require('../../constants').OPTIONS
 const {
     srvNode4, srvJava4, mtxSidecar4, approuter, // Modules
     xsuaa, // BTP Services
@@ -23,6 +23,10 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
         return [XSUAA]
     }
 
+    getRelatedFacets() {
+        return [KIBANA]
+    }
+
     async run() {
         const { appPath = 'app' } = await readProject(this.options)
         const appPackageJSONPath = join(appPath, 'package.json')
@@ -34,7 +38,7 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
 
     async runDependentMerging(context = {}) {
         const project = await readProject(this.options)
-        const { isNodejs, isJava, isExtensible, isMultitenant, hasMta, hasHelm, srvPath } = project
+        const { isNodejs, isJava, isExtensible, isMultitenant, hasMta, hasHelm, srvPath, appPath } = project
 
         if (hasMta) {
             const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)
@@ -113,7 +117,7 @@ module.exports = class ApprouterTemplate extends require('../templateBase') {
             if (isIndependentCommand) await writeMd5File(join('chart', '.cds-add-helm-files.md5'), context.newTrackingData);
         }
 
-        const xsAppPath = join(project.appPath ?? 'app', 'xs-app.json')
+        const xsAppPath = join(appPath, 'xs-app.json')
         const additions = isExtensible ? [{ ...approuterExtensibility, at: 0 }] : []
         await mergeJSON(xsAppPath, join(__dirname, 'files', 'xs-app.json.hbs'), project, { additions })
     }

package/lib/init/template/cf-manifest/index.js

@@ -10,16 +10,16 @@ module.exports = class CfManifestTemplate extends require('../templateBase') {
 
     async canRun() {
         if (this.options.force) {
-            return true;
+            return true
         }
         if (exists(MANIFEST_FILE) || exists(SERVICES_MANIFEST_FILE)) {
-            throw new Error(`File ${MANIFEST_FILE} or ${SERVICES_MANIFEST_FILE} already exist in current folder. Use --force to overwrite.`);
+            throw `File ${MANIFEST_FILE} or ${SERVICES_MANIFEST_FILE} already exist in current folder. Use --force to overwrite.`
         }
-        return true;
+        return true
     }
 
     async run() {
         const project = await readProject()
-        await copyFiles(join(__dirname, 'files'), cds.root, project, this.options.force);
+        await copyFiles(join(__dirname, 'files'), cds.root, project, this.options.force)
     }
 }

package/lib/init/template/data/index.js

@@ -63,7 +63,7 @@ function asRegex(spec) {
         return new RegExp('^'+spec+'.*')
       }
     } catch (err) {
-      throw new Error (err.message) // user error, so cut off stack trace
+      throw err.message // user error, so cut off stack trace
     }
   }
   return /.*/

package/lib/init/template/hana/index.js

@@ -204,7 +204,7 @@ module.exports = class HanaTemplate extends require('../templateBase') {
             } catch (err) {
                 // REVISIT: This should not have to be checked and tested in a facet implementation, move to Maven util
                 if (err.code === 'ENOENT' && err.path === 'mvn') {
-                    throw new Error(`Maven executable 'mvn' not found, follow ${term.info(URLS.MAVEN_INSTALL_HELP)} and install Maven on your machine.`);
+                    throw `Maven executable 'mvn' not found, follow ${term.info(URLS.MAVEN_INSTALL_HELP)} and install Maven on your machine.`
                 }
                 throw err;
             }

package/lib/init/template/java/index.js

@@ -14,10 +14,10 @@ module.exports = class JavaTemplate extends require('../templateBase') {
 
     async canRun() {
         if (cds.cli.command === COMMAND_ADD) {
-            throw new Error(`You can't change the runtime of an existing project.`)
+            throw `You can't change the runtime of an existing project.`
         }
         if (cds.cli.options.add?.has(NODEJS)) {
-            throw new Error(`Only one runtime per project is supported. Specify either ${term.bold(JAVA)} or ${term.bold(NODEJS)}.`)
+            throw `Only one runtime per project is supported. Specify either ${term.bold(JAVA)} or ${term.bold(NODEJS)}.`
         }
         return true
     }
@@ -32,7 +32,7 @@ module.exports = class JavaTemplate extends require('../templateBase') {
             await copy(join(temp, artifactId), this.projectPath);
         } catch (err) {
             if (err.code === 'ENOENT' && err.path === 'mvn') {
-                throw new Error(`Maven executable 'mvn' not found, follow ${term.info(URLS.MAVEN_INSTALL_HELP)} and install Maven on your machine.`);
+                throw `Maven executable 'mvn' not found, follow ${term.info(URLS.MAVEN_INSTALL_HELP)} and install Maven on your machine.`
             }
             throw err;
         } finally {

package/lib/init/template/kibana/files/mta.yaml.hbs

@@ -0,0 +1,29 @@
+---
+modules:
+  - name: {{appName}}-srv
+    type: {{language}}
+    path: {{& srvPath}}
+    requires:
+      - name: {{appName}}-logging
+
+{{#isMultitenant}}
+  - name: {{appName}}-mtx
+    type: nodejs
+    path: {{#isNodejs}}gen/{{/isNodejs}}mtx/sidecar
+    requires:
+      - name: {{appName}}-logging
+{{/isMultitenant}}
+
+{{#hasApprouter}}
+  - name: {{appName}}
+    type: approuter.nodejs
+    requires:
+      - name: {{appName}}-logging
+{{/hasApprouter}}
+
+resources:
+  - name: {{appName}}-logging
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: application-logs
+      service-plan: lite

package/lib/init/template/kibana/index.js

@@ -0,0 +1,55 @@
+const { join } = require('path')
+const { readProject } = require('../../util/projectReader')
+const { mergeJSON, mergeYAML } = require('../../util/merge')
+const { srvNode4, srvJava4, mtxSidecar4, kibana, approuter } = require('../_merging/registry-mta')
+
+module.exports = class KibanaTemplate extends require('../templateBase') {
+
+    static hasFacet(env) {
+        return env.features.kibana_formatter
+    }
+
+    async canRun() {
+        const { hasMta, hasHelm, isJava } = await readProject(this.options)
+        if (hasHelm && !hasMta) throw `'cds add kibana' is not available for Kyma yet`
+        if (isJava) throw `'cds add kibana' is not available for Java yet`
+        return true
+    }
+
+    async run() {
+        const project = await readProject(this.options)
+        const { configFile } = project
+        await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
+        await this.runDependentMerging()
+    }
+
+    async runDependentMerging() {
+        const project = await readProject(this.options)
+        const { hasMta, hasApprouter, isJava, isMultitenant, srvPath } = project
+
+        if (hasMta) {
+            const srv = (isJava ? srvJava4 : srvNode4)(srvPath)
+            const additions = [srv, kibana]
+            const relationships = [{
+                insert: [kibana, 'name'],
+                into: [srv, 'requires', 'name']
+            }]
+            if (isMultitenant) {
+                const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
+                additions.push(mtxSidecar)
+                relationships.push({
+                    insert: [kibana, 'name'],
+                    into: [mtxSidecar, 'requires', 'name']
+                })
+            }
+            if (hasApprouter) {
+                additions.push(approuter)
+                relationships.push({
+                    insert: [kibana, 'name'],
+                    into: [approuter, 'requires', 'name']
+                })
+            }
+            await mergeYAML('mta.yaml', join(__dirname, 'files', 'mta.yaml.hbs'), project, { additions, relationships })
+        }
+    }
+}

package/lib/init/template/multitenancy/files/package.json.hbs

@@ -3,9 +3,6 @@
   "dependencies": {
     "@sap/cds-mtxs": "^1.9"
   },
-  {{#cap.isJava}}
-  "workspaces": [ "mtx/sidecar" ],
-  {{/cap.isJava}}
   "cds": {
   {{/isNodejs}}
     {{#isJava}}