@sap/cds-dk 9.0.6 → 9.1.1

package/CHANGELOG.md

@@ -6,11 +6,52 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
+## Version 9.1.1 - 2025-07-10
+
+### Added
+
+- shipping an `index.d.ts` file containing a subset of the dk types now.
+
+### Changed
+
+- `cds add http` now generates auth headers with `:` separators again, as this is the only separator supporting empty passwords with the RestClient extension in VS Code. (For use with IntelliJ, separate username and password with a blank.)
+
+### Fixed
+
+- `cds deploy --to hana --no-build` now works correctly
+- fixed bug in call from SAP Business Application Studio wizard
+
+## Version 9.1.0 - 2025-07-02
+
+### Added
+
+- `cds add test` to generate test files for CDS services [experimental]
+- `cds debug --no-devtools` allows to skip opening the developer tools.
+
+### Changed
+
+- `cds add helm` doesn't route the subscription callbacks through the app router any longer.
+- `cds lint` now uses local copy of `eslint` help content.
+- `cds add cloud-logging` will correctly add the Helm dependency to `Chart.yaml`.
+
+### Fixed
+
+- `cds add hana` for Java correctly adds the HANA dependencies to `chart/Chart.yaml`.
+- `cds add xsuaa` for Java doesn't throw an error when the `.cdsrc.json` is not existing.
+- `cds build --for fiori` stores EDMX files again relative if `dataSources.mainService.settings.localUri` in UI5's `manifest.json` is a relative path.
+- `cds add ams/ias` add the `repository` in combination with `cds add helm-unified-runtime`.
+- `cds add xsuaa` adds a wildcard prefix to the domain name to allow for multitenancy use cases.
+- `cds add portal` for Java binds the HTML5 repo runtime and portal service to the Java server instead of the MTX sidecar, to allow for CAP Java built-in dependencies resolution.
+- `cds repl --run` can now run again w/o `@cap-js/cds-test` installed.
+- `cds push` and other commands now handle request errors more robustly
+- `cds debug` now also honors the `--host` parameter when it starts `cds watch`.
+
 ## Version 9.0.6 - 2025-06-18
 
 ### Changed
 
 - `cds build` now adds an `engines.node = ">=20"` entry to the effective _package.json_ iff it is missing from the project's _package.json_ to avoid engine confusion when deploying to Cloud Foundry
+- `cds add` without any flag now shows the help (`cds add --help`) instead of throwing an error
 
 ## Version 9.0.5 - 2025-06-06
 

package/bin/add.js

@@ -65,17 +65,20 @@ ${Object.entries(conf).sort(([a], [b]) => a.localeCompare(b)).flatMap(([pluginNa
 
 # EXAMPLES
 
-    *cds add* sample
-    *cds add* multitenancy,hana,xsuaa --for production
-    *cds add* data --filter my.namespace.MyEntity
-    *cds add* mta
-    *cds add* helm
-
+  *cds add* sample
+  *cds add* multitenancy,hana,xsuaa
+  *cds add* data --filter my.namespace.MyEntity
+  *cds add* mta
+  *cds add* helm
 
 # SEE ALSO
 
   *cds init*
 
+# SUMMARY
+
+  *cds add* <feature | comma-separated list of features>
+
 `});
 
 async function handleCompletion(currentWord, previousWord, argv, util) {

package/bin/debug.js

@@ -1,5 +1,5 @@
 module.exports = Object.assign(debug, {
-  options: ['--port', '--host', '--force'],
+  options: ['--port', '--host', '--force', '--no-devtools'],
   shortcuts: ['-p', '-h', '-f'],
   flags: [/*'--vscode', '--k8s'*/],
   help: `
@@ -14,6 +14,7 @@ module.exports = Object.assign(debug, {
     If <app> is given, it's assumed to be running on the currently logged-in
     Cloud Foundry space (check with 'cf target').
     SSH access to the app is required (check with 'cf ssh-enabled').
+    Chrome DevTools are opened automatically for Node.js applications.
 
     If no <app> is given, the app in the current working directory is started
     (with 'cds watch --debug' for Node.js and 'mvn spring-boot:run' for Java).
@@ -28,6 +29,10 @@ module.exports = Object.assign(debug, {
 
       the debug port (default: '9229' for Node.js, '8000' for Java)
 
+    *--no-devtools*
+
+      don't open developer tools automatically
+
     *-f* | *--force*
 
       if necessary, automatically enable ssh for the app and restart it
@@ -36,6 +41,7 @@ module.exports = Object.assign(debug, {
 
     *cds debug*
     *cds debug* bookshop-srv --port 8001
+    *cds debug* bookshop-srv --host 0.0.0.0
 `})
 
 async function debug() {
@@ -45,7 +51,7 @@ async function debug() {
   const DEBUG = /\b(y|all|debug)\b/.test(process.env.DEBUG) ? console.debug : undefined
 
   const [appName] = cds.cli.argv
-  const { port, host = '127.0.0.1', vscode, force } = cds.cli.options
+  const { port = 9229, host = '127.0.0.1', vscode, force } = cds.cli.options
 
   const maxAttempts = 15
   let attempts = 0
@@ -60,8 +66,9 @@ async function debug() {
     }
     else {
       const script = process.argv[1] // `.../cds` or `.../cds-tsx`
-      console.log(`Starting '${cds.utils.path.basename(script)} watch --debug'`)
-      fork(script, ['watch', '--debug']).on('error', e => { throw 'Failed to start debug process:' + e.message })
+      const hostport = `${host}:${port}`
+      console.log(`Starting '${cds.utils.path.basename(script)} watch --debug ${(host != '127.0.0.1' || port != 9229) ? hostport : ''}'`)
+      fork(script, ['watch', '--debug', hostport]).on('error', e => { throw 'Failed to start debug process:' + e.message })
     }
   }
   else if (cds.cli.options.k8s) { // Kyma/Kubernetes
@@ -74,7 +81,7 @@ async function debug() {
     if (kind === 'node') {
       enableNodeDebugging(pid, appName)
       const portLocal = openTunnel(9229)
-      openDevTools(portLocal)
+      if (!cds.cli.options['no-devtools']) openDevTools(portLocal)
     }
     else if (kind === 'java') {
       const portRemote = findJavaDebugPort(pid, appName)
@@ -114,8 +121,8 @@ async function debug() {
 
   function openTunnel(portRemote) {
     const portLocal = port || portRemote
-    console.log(`\nOpening SSH tunnel on ${portRemote}:${host}:${portLocal}`)
-    spawn('cf', ['ssh', '-N', '-L', `${portRemote}:${host}:${portLocal}`, appName], { stdio: 'inherit' })
+    console.log(`\nOpening SSH tunnel on ${host}:${portRemote}:${host}:${portLocal}`)
+    spawn('cf', ['ssh', '-N', '-L', `${host}:${portRemote}:${host}:${portLocal}`, appName], { stdio: 'inherit' })
     return portLocal
   }
 

package/bin/repl.js

@@ -28,7 +28,7 @@ module.exports = Object.assign (repl, {
 
     *cds repl* --run bookshop
     *cds repl* --run .
-    *cds repl* --use cds.ql
+    *cds repl* --use ql
 
 # SEE ALSO
 
@@ -92,7 +92,14 @@ async function repl (_, options={}) {
   process.on = (event, listener) => event !== 'uncaughtException' && event !== 'unhandledRejection' && process.addListener(event, listener)
 
   async function _run (project) {
-    await cds.test (project) // await cds.exec ('--project', project, '--port', '0')
+    try {
+      if (require.resolve('@cap-js/cds-test', {paths: [cds.root, cds.home]})) {
+        await cds.test (project)
+      }
+    } catch (e) {
+      if (e.code !== 'MODULE_NOT_FOUND') throw e
+      await cds.exec ('--project', project, '--port', '0', '--in-memory?')
+    }
     _export ('entities', 'services')
   }
 

package/bin/up.js

@@ -1,6 +1,6 @@
 module.exports = Object.assign(up, {
-  options: ['--to'],
-  shortcuts: ['-2'],
+  options: ['--to', '--namespace'],
+  shortcuts: ['-2', '-n'],
   flags: [],
   help: `
 # SYNOPSIS
@@ -15,10 +15,16 @@ module.exports = Object.assign(up, {
 
     The platform to deploy to. Default is 'cf'.
 
+  *-n* | *--namespace* <name>
+
+    (Kubernetes only) Target namespace. If it does not yet exist it will be
+    created automatically via *helm --create-namespace*.
+
 # EXAMPLES
 
   *cds up*
   *cds up --to k8s*
+  *cds up --to k8s --namespace e2e-tests*
 `})
 
 const { execSync, spawn } = require('node:child_process')
@@ -95,14 +101,18 @@ async function up() {
   }
 
   if (cds.cli.options.to === 'k8s') {
+    const ns = cds.cli.options.namespace
+    const nsHelm = ns ? `--namespace ${ns} --create-namespace` : ''
+    const nsKubectl = ns ? `-n ${ns}` : ''
+
     run('npm i --package-lock')
     await runDetectingError('ctz containerize.yaml --log --push', /^\[?ERROR\]?.*/m)
-    let helmUpgrade = `helm upgrade --install ${appName} ./gen/chart --wait --wait-for-jobs`
+    let helmUpgrade = `helm upgrade --install ${appName} ./gen/chart ${nsHelm} --wait --wait-for-jobs`
     if (hasXsuaa) helmUpgrade += ' --set-file xsuaa.jsonParameters=xs-security.json'
     run(helmUpgrade)
-    run(`kubectl rollout status deployment ${appName}-srv --timeout=8m`)
-    if (hasApprouter) run(`kubectl rollout status deployment ${appName}-approuter --timeout=8m`)
-    if (exists('mtx/sidecar')) run(`kubectl rollout status deployment ${appName}-sidecar --timeout=8m`)
+    run(`kubectl rollout status deployment ${appName}-srv ${nsKubectl} --timeout=8m`)
+    if (hasApprouter) run(`kubectl rollout status deployment ${appName}-approuter ${nsKubectl} --timeout=8m`)
+    if (exists('mtx/sidecar')) run(`kubectl rollout status deployment ${appName}-sidecar ${nsKubectl} --timeout=8m`)
   } else {
     run('mbt build -t gen --mtar mta.tar')
     run('cf deploy gen/mta.tar -f')

package/index.d.ts

@@ -0,0 +1,3 @@
+export {
+    build
+} from './lib/index.js'

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

@@ -1,7 +1,6 @@
 const path = require('path')
 const cds = require('../../../cds')
 const EdmxBuildPlugin = require('../edmxBuildPlugin')
-const { URL } = require('node:url')
 const { getProperty, relativePaths } = require('../../util')
 const { OUTPUT_MODE, OUTPUT_MODE_RESULT, BUILD_TASK_FIORI, CDS_CONFIG_PATH_SEP, OUTPUT_MODE_FILESYSTEM } = require('../../constants')
 const DEBUG = cds.debug('cli|build')
@@ -9,7 +8,7 @@ const DEBUG = cds.debug('cli|build')
 /**
  * With cds 4 service metadata for the UI service binding is no longer created by default.
  * For SAP Web IDE Full-Stack compatibility a corresponding metadata.xml is still generated.
- * Though, 'fiori' build tasks can still be configured for UI5 mock server usage - see https://github.wdf.sap.corp/cap/issues/issues/8673
+ * Though, 'fiori' build tasks can still be configured for UI5 mock server usage - see cap/issues#8673
  */
 class FioriBuildPlugin extends EdmxBuildPlugin {
     init() {
@@ -159,8 +158,7 @@ class FioriBuildPlugin extends EdmxBuildPlugin {
     }
 
     _strippedUrlPath(urlString) {
-        const url = new URL(urlString, 'http://dummy.base') // need dummy base to parse relative URLs correctly
-        return url.pathname.replace(/^(\/|\\)/, '').replace(/(\/|\\)$/, '') // strip leading and trailing slash or backslash
+        return urlString.replace(/^(\/|\\)/, '').replace(/(\/|\\)$/, '') // strip leading and trailing slash or backslash
     }
 }
 

package/lib/deploy/to-hana/hana.js

@@ -29,7 +29,8 @@ const allowList = [
   '--to',
   '--tunnel-address',
   '--vcap-file',
-  '--with-mocks'
+  '--with-mocks',
+  '--no-build'
 ]
 
 module.exports = new class HanaDeployer {
@@ -110,7 +111,8 @@ Therefore, specifying the CDS model is not required when calling 'cds deploy'.`;
       }
     } else {
       // the primary database is always built and deployed
-      const dest = buildResult.dest // path.join(cds.env.build.target, cds.env.folders.db);
+      // const dest = buildResult.dest
+      const dest = path.join(cds.root, cds.env.build.target, cds.env.folders.db);
 
       if (undeployWhitelist) {
         console.log('Writing undeploy.json');
@@ -130,7 +132,9 @@ metadata:
   name: ${appName}-db
 spec:
   serviceOfferingName: hana
-  servicePlanName: hdi-shared\n`
+  servicePlanName: hdi-shared
+`
+
         const binding =
 `apiVersion: services.cloud.sap.com/v1
 kind: ServiceBinding
@@ -139,7 +143,8 @@ metadata:
 spec:
   serviceInstanceName: ${appName}-db
   secretName: ${appName}-db-secret
-\n`
+
+`
 
         try {
           cp.execSync('kubectl apply -f -', { input: instance })

package/lib/init/constants.js

@@ -5,7 +5,7 @@ module.exports = {
     COMMAND_ADD: 'add',
 
     JAVA_LTS_VERSIONS: [17, 21],
-    MAVEN_ARCHETYPE_VERSION: '4.0.2',
+    MAVEN_ARCHETYPE_VERSION: '4.1.1',
 
     OPTIONS: Object.freeze({
         COMPLETION: 'completion',
@@ -17,29 +17,30 @@ module.exports = {
         TYPER: 'typer',
         TYPESCRIPT: 'typescript',  // must run before SAMPLE, as that influences whether .js or .ts files are created
         EXTENSION: 'extension',
-        SAMPLES: 'samples', // deprecated
-        TINY_SAMPLE: 'tiny-sample',
-        SAMPLE: 'sample',
-        HANDLER: 'handler', // influenced by esm, typer and typescript
         MTA: 'mta',
         CF_MANIFEST: 'cf-manifest',
         HELM: 'helm',
         HELM_UNIFIED_RUNTIME: 'helm-unified-runtime',
         CONTAINERIZE: 'containerize',
-        MULTITENANCY: 'multitenancy',
-        TOGGLES: 'toggles',
-        EXTENSIBILITY: 'extensibility',
-        SIDE_BY_SIDE_EXTENSIBILITY: 'side-by-side-extensibility',
-        MTX: 'mtx',
+        SAMPLES: 'samples', // deprecated
+        TINY_SAMPLE: 'tiny-sample',
+        SAMPLE: 'sample',
+        HANDLER: 'handler', // influenced by esm, typer and typescript
+        TEST: 'test', // needs sample code
         XSUAA: 'xsuaa',
         IAS: 'ias',
         AMS: 'ams',
         HANA: 'hana',
         POSTGRES: 'postgres',
         SQLITE: 'sqlite',
-        H2: 'h2',
         LIQUIBASE: 'liquibase',
         REDIS: 'redis',
+        H2: 'h2',
+        MULTITENANCY: 'multitenancy',
+        TOGGLES: 'toggles',
+        EXTENSIBILITY: 'extensibility',
+        SIDE_BY_SIDE_EXTENSIBILITY: 'side-by-side-extensibility',
+        MTX: 'mtx',
         ATTACHMENTS: 'attachments',
         MALWARE_SCANNER: 'malware-scanner',
         LOCAL_MESSAGING: 'local-messaging',

package/lib/init/index.js

@@ -60,7 +60,13 @@ module.exports = class CDSGenerator {
      * @param {any} options, additional options
      */
     async add(facets) {
-        if (!facets?.length) throw 'you must specify a facet to add to the project'
+        if (!facets?.length) {
+            const cli = require('../../bin/cds');
+            const help = await cli?.load('add', () => ({ help: '' }))?.help ?? '';
+            console.log (require('../../bin/help').formatHelp(help))
+            process.exitCode=0
+            return;
+        }
 
         this._initialize(null);
         this._greetings();
@@ -88,13 +94,16 @@ module.exports = class CDSGenerator {
     async stepInit(projectName, options) { // Also used by CAP Generator
         if (options) {
             // called from CAP generator with options
+            // cds.cli is not set correctly when called from CAP generator
+            // so set defaults here
             cds.cli = {
                 command: COMMAND_INIT,
                 // keep caller independent from internal names
                 options: {
                     cwd: options.cwd,
                     add: new Set(options.add)
-                }
+                },
+                argv:[]
             }
 
             // must be called after above code to ensure cds.cli.options.add is set
@@ -151,11 +160,33 @@ module.exports = class CDSGenerator {
         for (const [i, facet] of Object.entries(sorted)) {
             if (!cds.cli.options.dry) console.log(`adding ${term.bold(facet)}`)
             const template = this.templateList[i]
-            await template.run();
-            await template.combine();
-            await template.combineSupported();
+            await template.run()
+            await template.combine()
+        }
+
+        DEBUG && console.log()
+        DEBUG && console.log('plugins active for production:')
+        const fromDk = readdirSync(join(__dirname, './template'))
+        const { registered } = require('./add')
+        const { env4 } = require('./projectReader')
+        const processPlugins = async (plugins) => {
+            const cmds = Object.values(OPTIONS)
+            const byPriority = (a, b) => cmds.indexOf(a) - cmds.indexOf(b)
+            const sorted = Array.from(plugins).sort(byPriority)
+            for (const plugin of sorted) {
+                const Plugin = registered.get(plugin) ?? require('./template/' + plugin)
+                const template = new Plugin()
+                const inProduction = Plugin.hasInProduction(env4('production')) || cds.cli.argv.includes(plugin) || cds.cli.options.add?.has(plugin)
+                DEBUG && console.log(inProduction ? '✅' : '❌', plugin)
+                if (inProduction) await template.combine()
+            }
         }
 
+        if (DEBUG) console.log(`\n   ${fromDk.length} from @sap/cds-dk:`)
+        await processPlugins(fromDk)
+        if (DEBUG) console.log(`\n   ${registered.size} from plugins:`)
+        await processPlugins(registered.keys())
+
         if (cds.env['project-nature'] === 'java') {
             console.log('updating frozen dependencies in package-lock.json…')
             await cmd.spawnCommand('npm' , ['i', '--package-lock-only'], { cwd:cds.root })

package/lib/init/merge.js

@@ -255,9 +255,12 @@ async function _mergeYAML(into, from, project, semantics = {}) {
         let node
         if (inEntry && entryMap.get(inEntry)) {
             node = entryMap.get(inEntry).node // starting from item found in nested array cache
-        } else {
+        } else if (typeof inEntry === 'string') {
             node = collectionStack[collectionStack.length - 1] // starting from root
+        } else {
+            return
         }
+
         const keys = keyPath.split('.')
         for (const key of keys.slice(0, -1)) {
             if (!node?.get(key) && typeof inEntry === 'string') return // node doesn't exist, will be added by template

package/lib/init/plugin.js

@@ -1,7 +1,3 @@
-const { join } = require('path')
-const cds = require('../cds')
-const { readdir } = cds.utils
-
 module.exports = class Plugin {
 
     /**
@@ -61,33 +57,4 @@ module.exports = class Plugin {
      * Runs the finalize operations.
      */
     async finalize() { }
-
-    /* ––––––––––––
-       Private APIs
-       –––––––––––– */
-
-    async combineSupported() {
-        const DEBUG = cds.log('cli|add')._debug
-        DEBUG && console.log()
-        DEBUG && console.log('plugins active for production:')
-        const fromDk = await readdir(join(__dirname, './template'))
-        const { registered } = require('./add')
-        const { env4 } = require('./projectReader')
-        const processPlugins = async (plugins) => {
-            for (const plugin of plugins) {
-                const Plugin = registered.get(plugin) ?? require('./template/' + plugin)
-                const template = new Plugin()
-                const inProduction = Plugin.hasInProduction(env4('production'))
-                DEBUG && console.log(inProduction ? '✅' : '❌', plugin)
-                if (inProduction) await template.combine()
-            }
-        }
-
-        if (DEBUG) console.log(`\n   ${fromDk.length} from @sap/cds-dk:`)
-        await processPlugins(fromDk)
-        if (DEBUG) console.log(`\n   ${registered.size} from plugins:`)
-        await processPlugins(registered.keys())
-
-        DEBUG && console.log()
-    }
 }

package/lib/init/projectReader.js

@@ -121,7 +121,7 @@ module.exports = new class ProjectReader {
         const _isESM        = () => pkgJson().type === 'module'
         const _isTypescript = () => !!pkgJson().dependencies?.typescript || !!pkgJson().devDependencies?.typescript
         const _hasTyper     = () => !!pkgJson().dependencies?.['@cap-js/cds-typer'] || !!pkgJson().devDependencies?.['@cap-js/cds-typer']
-        const _inProd = plugin => require(`./template/${plugin}`).hasInProduction(env)
+        const _inProd = plugin => require(`./template/${plugin}`).hasInProduction(env) || cds.cli.argv.includes(plugin) || cds.cli.options.add?.has(plugin)
         const _ui5 = () => pkgJson().sapux
         const _uiEmbedded = () => exists(join(env.folders.app, 'xs-app.json'))
         const _uiModule = () => !_uiEmbedded() && isdir(env.folders.app) && fs.readdirSync(resolve(cds.root, env.folders.app)).length > 0

package/lib/init/template/ams/files/Chart.yaml.hbs

@@ -1,4 +1,6 @@
 dependencies:
   - name: content-deployment
     alias: ams-policies-deployer
-    version: ">0.0.0"
+    version: ">0.0.0"{{#hasHelmUnifiedRuntime}}
+    repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz{{/hasHelmUnifiedRuntime}}
+

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

@@ -83,4 +83,5 @@ resources:
         tenant-mode: {{#hasMultitenancy}}shared{{/hasMultitenancy}}{{^hasMultitenancy}}dedicated{{/hasMultitenancy}}
         oauth2-configuration:
           redirect-uris:
-            - https://~{app-api/app-uri}/**
+            - https://*~{app-api/app-uri}/**
+

package/lib/init/template/cloud-logging/files/java-cdsrc.json.hbs

@@ -0,0 +1,6 @@
+{
+  "requires": {
+    {{#withTelemetry}}"telemetry": "to-cloud-logging"{{/withTelemetry}}
+    {{^withTelemetry}}"cloud-logging": true{{/withTelemetry}}
+  }
+}

package/lib/init/template/cloud-logging/files/package.json.hbs

@@ -1,4 +1,5 @@
 {
+  {{#withTelemetry}}
   "dependencies": {
     "@cap-js/telemetry": ">=0",
     "@grpc/grpc-js": "^1",
@@ -6,13 +7,19 @@
     "@opentelemetry/exporter-metrics-otlp-grpc": "<0.200",
     "@opentelemetry/host-metrics": "<0.200"
   },
+  {{/withTelemetry}}
   "cds": {
     "requires": {
+      {{^withTelemetry}}
+      "cloud-logging": true
+      {{/withTelemetry}}
+      {{#withTelemetry}}
       "[{{profile}}]": {
         "telemetry": {
           "kind": "to-cloud-logging"
         }
       }
+      {{/withTelemetry}}
     }
   }
 }

package/lib/init/template/cloud-logging/index.js

@@ -7,7 +7,7 @@ const { srv4, mtxSidecar4, approuter } = require('../../registries/mta')
 module.exports = class extends require('../../plugin') {
 
   static hasInProduction(env) {
-    return env.requires?.telemetry?.kind === 'to-cloud-logging'
+    return env.requires?.telemetry?.kind === 'to-cloud-logging' || env.requires['cloud-logging']
   }
 
   options() {
@@ -24,15 +24,14 @@ module.exports = class extends require('../../plugin') {
   }
 
   async run() {
-    const project = readProject(), { hasTelemetry, isNodejs, isJava } = project
-    if (cds.cli.options['with-telemetry'] || hasTelemetry) {
-      if (isNodejs) {
-        project.profile ??= 'production'
-        await merge(__dirname, 'files/package.json.hbs').into('package.json', { with: project })
-        await sort('package.json', 'dependencies')
-      } else if (isJava) {
-        await merge(__dirname, 'files/java-cdsrc.json').into('.cdsrc.json')
-      }
+    const project = readProject(), { isNodejs, isJava } = project
+    project.withTelemetry = cds.cli.options['with-telemetry'] || project.hasTelemetry
+    if (isNodejs) {
+      project.profile ??= 'production'
+      await merge(__dirname, 'files/package.json.hbs').into('package.json', { with: project })
+      await sort('package.json', 'dependencies')
+    } else if (isJava) {
+      await merge(__dirname, 'files/java-cdsrc.json.hbs').into('.cdsrc.json', { with: project })
     }
   }
 

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

@@ -21,4 +21,4 @@ module.exports = class ContainerizeTemplate extends require('../../plugin') {
         const project = readProject()
         await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project })
     }
-}
+}

package/lib/init/template/data/as-json.js

@@ -184,7 +184,7 @@ function dataForField(element, artifact, csn, record, data, parent, depth, refer
       if (element.key) {
         str = `${artifact.name.split('.').pop()}-${record['$id']}`
         if (element.name === 'locale' && artifact.name.endsWith('texts')) {
-          const record = randomFromReferenceData(artifact, csn, referenceData)
+          const record = asJson.randomFromReferenceData(artifact, csn, referenceData)
           if (record)  return record.locale
           return randomLanguage()
         }
@@ -273,7 +273,7 @@ function dataForField(element, artifact, csn, record, data, parent, depth, refer
       if (!target || depth > MAX_ASSOC_DEPTH)
         return
 
-      let targetRecord = randomFromReferenceData(target, csn, referenceData)
+      let targetRecord = asJson.randomFromReferenceData(target, csn, referenceData)
       if (targetRecord) {
         delete data[target.name] // indicate that existing data is used and no new data shall be created
         delete data[target.name + '.texts'] // also delete associated texts entity
@@ -318,7 +318,7 @@ function dataForField(element, artifact, csn, record, data, parent, depth, refer
   }
 }
 
-function randomFromReferenceData (entity, csn, referenceData) {
+asJson.randomFromReferenceData = function(entity, csn, referenceData) {
   const files = Object.entries(referenceData)
     .filter(([, name]) => matchesEntityOrProjection(name, entity, csn))
     .map(([file]) => file)

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

@@ -13,8 +13,9 @@ module.exports = class HanaTemplate extends require('../../plugin') {
         return 'database support for SAP HANA'
     }
 
-    static hasInProduction() {
-        return readProject().dependencies?.['@cap-js/hana']
+    static hasInProduction(env) {
+        const { dependencies, isJava } = readProject()
+        return dependencies?.['@cap-js/hana'] || isJava && env.requires?.db?.kind === 'hana'
     }
 
     async run() {

package/lib/init/template/handler/files/extension/package.json

@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "@sap/cds-oyster": "git+https://github.tools.sap/cap/cds-oyster"
+    "@sap/cds-oyster": "^0"
   },
   "cds": {
     "requires": {

package/lib/init/template/html5-repo/files/mta.yaml.hbs

@@ -4,7 +4,9 @@ parameters:
 modules:
   - name: {{appName}}-srv
     type: {{language}}
-    path: {{& srvPath}}
+    path: {{& srvPath}}{{#isJava}}
+    requires:
+      - name: {{appName}}-html5-runtime{{/isJava}}
 
   - name: {{appName}}
     type: approuter.nodejs

package/lib/init/template/html5-repo/index.js

@@ -94,7 +94,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             if (hasMultitenancy) {
                 relationships.push({
                     insert: [html5Runtime, 'name'],
-                    into: [mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar'), 'requires', 'name']
+                    into: [isJava ? srv : mtxSidecar4('gen/mtx/sidecar'), 'requires', 'name']
                 })
             }
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {