@sap/cds-dk 10.0.7 → 10.1.0

package/bin/completion/templates/cds-tmpl.zsh

@@ -0,0 +1,74 @@
+#!/bin/zsh
+# This file was generated from bin/completion/templates/cds-tmpl.zsh by
+# 'cds completion --generate' and is written to bin/completion/scripts/cds.zsh.
+#
+# Do not edit directly — modify the template and regenerate.
+#
+# Completion strategy (fastest-first):
+#   1. Shortcuts    — single-character aliases resolved before any other logic.
+#   2. Top-level    — all known subcommands when no subcommand has been typed yet.
+#   3. Flags        — matched when the current token starts with '-'.
+#   3.5. Option values  — static values for known flags (e.g. --to sqlite).
+#   3.6. Comma values   — comma-separable list (e.g. cds add ai,hana).
+#   4. File positionals — files/dirs for subcommands that take a path argument.
+#   4.6. String positionals — fixed word list (e.g. cds help <tab>).
+#   5. Dynamic fallback — calls 'cds completion' for anything not covered above.
+#
+# Zsh uses $words (1-based token array) and $CURRENT (index of cursor token).
+# Completions are added with compadd instead of bash's COMPREPLY.
+# 'case ... esac && return' exits the function when a case arm matched.
+
+CDS_COMMAND="cds"
+
+_completeCds() {
+    local current="${words[CURRENT]}"
+    local previous="${words[CURRENT-1]}"
+    # The subcommand is always the second token (index 2 in 1-based zsh arrays).
+    local cmd="${words[2]}"
+    # Step 1: resolve single-character shortcuts to their canonical command name.
+{{SHORTCUT_CASE}}
+    # Step 2: top-level — offer all known subcommands when no subcommand has been
+    # typed yet ($words is 1-based; ≤ 2 means "cds <cursor>").
+    if [[ "${#words[@]}" -le 2 ]]; then
+        compadd -S '' -- {{COMMANDS}}
+        return
+    fi
+
+    # Step 3: flag/option completion — only triggered when the token starts with '-'.
+    # 'case ... esac && return' exits the function when a case arm matched.
+    if [[ "$current" == -* ]]; then
+        case "$cmd" in
+{{FLAG_CASES}}
+        esac && return
+    fi
+
+    # Step 3.5: option-value completion — triggered when the previous word is a known option.
+    case "$cmd" in
+{{OPTION_VALUE_CASES}}
+    esac
+
+    # Step 3.6: comma-separated option-value completion.
+    case "$cmd" in
+{{COMMA_CASES}}
+    esac
+
+    # Step 4: file-sentinel positionals — emit files and return.
+    case "$cmd" in
+{{FILE_CASES}}
+    esac
+
+    # Step 4.6: string positionals (e.g. cds help <tab>) — return after matching.
+    case "$cmd" in
+{{STRING_POSITIONAL_CASES}}
+    esac && return
+
+    # Step 5: dynamic fallback — calls 'cds completion' for subcommands whose arguments
+    # cannot be determined statically (e.g. service names, model names, unknown flags).
+    # Single-quoting $prev/$curr prevents bare word 'h' from being interpreted
+    # as the 'help' shortcut by the completion handler before it is processed.
+    # compadd -S '' suppresses the trailing space zsh normally appends after a completion.
+    compadd -S '' -- $(${CDS_COMMAND} completion --shell zsh --prev "'${words[CURRENT-1]}'" --curr "'${words[CURRENT]}'" --line "'${words[*]}'")
+}
+
+# Register the completion function for the 'cds' command.
+compdef _completeCds ${CDS_COMMAND}

package/bin/deploy/index.js

@@ -1,6 +1,12 @@
-const { options, flags, shortcuts } = require('../../lib/deploy/index.js');
+const { FILE } = require('../completion');
+const { options, flags, shortcuts } = require('./options');
 
 module.exports = Object.assign(deploy, {
+  staticCompletions: () => ({
+      '--to': ['sqlite', 'hana'],
+      '--on': ['cf', 'k8s'],
+      '_':   FILE('cds,json'),
+  }),
   options,
   flags,
   shortcuts,

package/bin/deploy/options.js

@@ -0,0 +1,25 @@
+module.exports = {
+  options:  /** @type{const} */([
+    '--to',
+    '--for',
+    '--out',
+    '--on',
+    '--tunnel-address',
+    '--vcap-file',
+    '--delta-from'
+  ]),
+  flags:  /** @type{const} */([
+    '--resolve-bindings',
+    '--no-save',
+    '--auto-undeploy',
+    '--dry',
+    '--xdry',
+    '--with-mocks',
+    '--store-credentials',
+    '--no-build',
+    '--model-only',
+    '--script',
+    '--with-auto-schema-evolution'
+  ]),
+  shortcuts: ['-2', '-4', '-o', '-n', '', '', '', '-b']
+}

package/{lib → bin}/deploy/to-hana/hana.js

@@ -3,18 +3,18 @@ const path = require('path');
 const cds = require('../../../lib/cds');
 const { exists, read, write, mkdirp } = cds.utils;
 
-const { build } = require('../../build');
+const { build } = require('../../../lib/build');
 
 const hdi = require('./hdiDeployUtil');
-const cfUtil = require('../../util/cf');
+const cfUtil = require('../../../lib/util/cf');
 const mtaUtil = require('./mtaUtil');
 
-const { bold, info, warn } = require('../../util/term');
+const { bold, info, warn } = require('../../../lib/util/term');
 
-const { bind, storeBindings, env: bindingEnv } = require('../../bind/shared');
-const { BUILD_TASK_HANA } = require('../../build/constants');
+const { bind, storeBindings, env: bindingEnv } = require('../../../lib/bind/shared');
+const { BUILD_TASK_HANA } = require('../../../lib/build/constants');
 
-const { options, flags } = require('../index');
+const { options, flags } = require('../options');
 const allOptions = [...options, ...flags];
 
 const DEBUG = cds.debug('cli');
@@ -147,7 +147,7 @@ Therefore, specifying the CDS model is not required when calling 'cds deploy'.`;
     let bindOptions
     let usesExistingK8sBinding = false
 
-    const { readProject } = require('../../init/projectReader')
+    const { readProject } = require('../../../lib/init/projectReader')
     const { hasKyma, hasMta } = readProject()
     const onKyma = cds.cli.options.on === 'k8s'  || (hasKyma && !hasMta && cds.cli.options.on !== 'cf')
     if (onKyma) {
@@ -260,7 +260,7 @@ spec:
       await storeBindings(services, bindOptions)
     }
 
-    const { env4 } = require('../../init/projectReader')
+    const { env4 } = require('../../../lib/init/projectReader')
     if (env4('production').requires?.db?.kind !== 'hana') {
       console.log(`use ${info('cds add hana')} to configure the project for SAP HANA.\n`);
     }

package/{lib → bin}/deploy/to-hana/hdiDeployUtil.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const { bold } = require('../../util/term');
+const { bold } = require('../../../lib/util/term');
 
 const HDI_DEPLOY_LIB = '@sap/hdi-deploy';
 

package/bin/deploy/{to-hana.js → to-hana/index.js}

@@ -1,5 +1,5 @@
 exports.deploy = (model, serviceName, options) => {
-  const hanaDeployer = require('../../lib/deploy/to-hana/hana');
+  const hanaDeployer = require('./hana');
 
   return hanaDeployer.deploy({
     ...options,

package/{lib → bin}/deploy/to-hana/mtaUtil.js

@@ -1,4 +1,4 @@
-const cds = require('../../cds')
+const cds = require('../../../lib/cds')
 
 const fs = require('fs').promises
 const {existsSync} = require('fs')

package/bin/deploy/to-sql.js

@@ -1,5 +1,3 @@
 exports.deploy = function deploy_to_sql (...args) {
-    // TODO check env.requires.db ...
     return require('./to-sqlite') .deploy (...args)
 }
-/* eslint no-console: off */

package/bin/export.js

@@ -3,7 +3,9 @@ const cds = require ('../lib/cds.js')
 const { regex4 } = require ('./util/cli.js')
 const { Minify } = require ('./minify.js')
 const mvn = require('../lib/init/mvn')
+const term = require('../lib/util/term')
 const { read, write: cdswrite, exists, mkdirp, local, path, fs } = cds.utils
+const DEBUG = cds.debug('export')
 
 class Export extends Minify {
 
@@ -30,7 +32,8 @@ class Export extends Minify {
     data: false,
     as: 'csn',
     for: 'npm',
-    force: false,
+    artifact: '',
+    mvn: '',
   }
   static shortcuts = { ...super.shortcuts,
     to:'2',
@@ -42,6 +45,22 @@ class Export extends Minify {
   parseArgs (conf) {
     if (!process.stdout.isTTY) this.options.to = '-'
     let [sources,o] = super.parseArgs (conf)
+    if (o.mvn) {
+      o.for = 'mvn'
+      o.artifact = o.mvn
+    }
+    if (o.for === 'mvn') {
+      if (!o.mvn)
+        console.warn(term.warn(`\n Option --for mvn is deprecated. Use --mvn ${o.artifact || 'groupId:artifactId'} instead.\n`))
+      const raw = o.artifact
+      if (!raw || !raw.includes(':'))
+        throw `\n Maven export requires a --mvn "groupId:artifactId" option.\n`
+      const parts = raw.split(':')
+      if (parts.length !== 2 || !parts[0] || !parts[1])
+        throw `\n Invalid Maven artifact "${raw}". Expected format: "groupId:artifactId".\n`
+      const [groupId, artifactId] = parts
+      o.artifact = { groupId, artifactId }
+    }
     if (o.from && o.from != '*') { // variant: cds-export <services> --from <models>
       if (o.services == '/all/') o.services = regex4 (sources)
       sources = o.from
@@ -108,18 +127,29 @@ class Export extends Minify {
   }
 
   async output (minified,o) {
+    const isMvnExport = o.for == 'mvn'
     if (this.options.to === '-') return super.output (minified)
     if (this.options.to.endsWith('/*')) this.options.to = this.export_to()
+    const rawModuleName = this.options.to
+    if (isMvnExport) {
+      const { groupId, artifactId } = o.artifact
+      this.options.to = path.join(this.options.to, 'src', 'main', 'resources', 'cds', groupId, artifactId)
+    }
     console.log(`\n${this.name}ing APIs to`, cds.utils.local(this.options.to), '...\n')
     const exports = []; exports.push(...this.export_models (minified))
     if (o.texts) exports.push (...this.export_texts (minified))
     if (o.data) exports.push (this.export_data (minified))
     if (o.for === 'npm') exports.push (this.export_package_json())
     await Promise.all (exports)
-    if (o.for === 'mvn') {
-      // Maven task moves files from the default behaviour to Maven specific locations,
-      // so we need to await this separately
-      await mvn.add('cds_export', { 'module-name': o.to })
+    if (isMvnExport) {
+      const pomPath = path.join(rawModuleName, 'pom.xml')
+      if (exists(pomPath)) {
+        DEBUG?.(`Skipping mvn.add: pom.xml already exists at ${local(pomPath)}`)
+      } else {
+        // Maven task modifies pom.xml and sets up the module — await separately
+        const { groupId, artifactId } = o.artifact
+        await mvn.add('cds_export', { 'to': rawModuleName, 'group-id': groupId, 'artifact-id': artifactId })
+      }
     }
     console.log()
   }

package/bin/help/export.md

@@ -12,6 +12,8 @@
    *-a | --as* <csn|cdl>
    *-4 | --for* <npm|mvn>
 
+   *--mvn* <groupId:artifactId>   Export for Maven (implies --for mvn)
+
    *-c | --cleanse* <properties>
    *-k | --keep* <kinds>
    *-x | --skip* <kinds>
@@ -36,3 +38,4 @@
    *cds export* -s cat*s --inspect=2
    *cds export* -s cat*s --as cdl
    *cds export* -s cat*s
+   *cds export* --mvn com.example:my-service --to java-module

package/bin/help.js

@@ -1,7 +1,7 @@
 const cds = require('../lib/cds')
 
 
-module.exports = exports = Object.assign (help, {formatHelp, handleCompletion, help:`
+module.exports = exports = Object.assign (help, {formatHelp, staticCompletions: () => Object.values(require('./cds').cmds ?? {}), help:`
 # USAGE
 
     *cds* <command> [<args>]
@@ -42,10 +42,6 @@ module.exports = exports = Object.assign (help, {formatHelp, handleCompletion, h
 
 `});
 
-async function handleCompletion() {
-  const cds = require('./cds');
-  return Object.values(cds.cmds);
-}
 
 async function help (topic) {
   await cds.plugins

package/bin/import.js

@@ -1,5 +1,10 @@
 module.exports = Object.assign(_import, {
     _name: 'import',
+    staticCompletions: () => ({
+        '--from': ['asyncapi', 'edmx', 'openapi'],
+        '--as':   ['cds', 'csn', 'json'],
+        '_':      { type: ':file', ext: ['json', 'xml', 'edmx'] },
+    }),
     options:   [ '--services', '--for', '--out', '--as', '--name', '--include-namespaces', '--dependencies', '--from', '--config', '--destination', '--group', '--into-namespace' ],
     shortcuts: [ '-s',            '-4',    '-o',  '-as',     '-n',                  '-ns',             '-d',undefined,       '-c',       undefined, undefined,                '-2',        '-', '-f', '-b'],
     flags: [ '--dry', '--force', '--resolve-bindings', '--no-copy', '--no-save', '--keep-namespace', '--data-product', '--edmx', '--rfc', '--odata', '--openapi', '--asyncapi', '--odata-v2-annotations' ],
@@ -26,6 +31,7 @@ module.exports = Object.assign(_import, {
     *--asyncapi*
     *--rfc*
         Imports the model from the one of the API formats OData EDMX, OpenAPI, AsyncAPI or RFC.
+        AsyncAPI requires @cap-js/asyncapi as a project dependency (currently bundled as a fallback)
 
     *--data-product*
         Tells cds import to import a data product. The source must be a valid

package/bin/init.js

@@ -1,12 +1,16 @@
 const { join } = require('path')
 const { URLS } = require('../lib/init/constants')
+const { DIR, COMMA } = require('../bin/completion')
 
 // REVISIT: necessary because module is loaded too early -> shouldn't be necessary
 const cds = require('../lib/cds')
 cds.root = join(process.cwd(), process.argv[3]?.startsWith('--') ? '.' : process.argv[3] ?? '')
 
 module.exports = Object.assign(init, {
-    handleCompletion,
+    staticCompletions: () => ({
+        '--add':          COMMA(require('../bin/completion/completionFs').readTemplates([])),
+        '--java:package': DIR(),
+    }),
     options: ['--add', '--java:mvn', '--java:package', '--lint:custom', '--lint:custom:example', '--no-db', '--base'],
     shortcuts: ['-a'],
     flags: ['--nodejs', '--java', '--force', '--verbose'],
@@ -60,29 +64,6 @@ ${require('../lib/init').help()}
 
 `})
 
-async function handleCompletion(currentWord, previousWord, argv, util) {
-    const allOptionsFlags = [
-        ...init.options ?? [],
-        ...init.flags ?? []
-    ].filter(e => !argv.includes(e));
-
-    if (currentWord?.startsWith('-')) {
-        return allOptionsFlags;
-    }
-
-    if (previousWord === '--java:package') {
-        const excludes = ['_merging'];
-        return (await util.completionFs.readdir(currentWord, { files: false }))
-            .filter(e => !excludes.includes(e));
-    }
-
-    const templates = await util.completionFs.readTemplates(argv);
-    if (previousWord === '--add' || argv.includes('--add') && previousWord.endsWith(',')) {
-        return templates;
-    }
-
-    return allOptionsFlags;
-}
 
 async function init(args) {
     console.log()

package/bin/inspect.js

@@ -4,7 +4,13 @@ cds inspect model.Req
 cds inspect model.Requisition --ids
 */
 
+const { FILE } = require('./completion');
+
 module.exports = Object.assign (inspect, {
+    staticCompletions: () => ({
+        '--kind': ['entity', 'aspect', 'type', 'service'],
+        '_':      FILE('cds,json'),
+    }),
     options: [ '--stats', '--list', '--kind' ],
   shortcuts: [ '-s', '-l', '-k' ],
   help: `

package/bin/login.js

@@ -85,30 +85,36 @@ module.exports = Object.assign(login, {
         Note: Productive secrets should not be specified on a command line,
         since this might expose them to unauthorized users on the same machine!
 
-    *-c* | *--client* <clientid>[:<clientsecret>]
+    *-c* | *--client* [<clientid>[:<clientsecret>]]
 
         Client Credentials (Client ID and optionally Client Secret) for
-        authentication. If omitted, Client Secret will be queried interactively.
-        
+        authentication. Client Credentials may instead be provided via the
+        CDS_LOGIN_CLIENT_ID and CDS_LOGIN_CLIENT_SECRET environment variables,
+        which is recommended for CI so that secrets do not appear on the
+        command line. Inline values take precedence over the environment. If
+        the Client Secret is given neither inline nor via the environment, it is
+        queried interactively.
+
         Obtain the Client Credentials from the UAA binding of MTXS.
-        
+
         Client Credentials will not be saved, only the resulting token.
         
         Note: Productive secrets should not be specified on a command line,
         since this might expose them to unauthorized users on the same machine!
 
-    *-m* | *--mtls* <clientid>[:<key>]
+    *-m* | *--mtls* [<clientid>]
+
+        Client-certificate (mTLS) authentication. The Client ID may be given
+        inline or via the CDS_LOGIN_CLIENT_ID environment variable. The client
+        certificate and its private key are read from the CDS_LOGIN_CLIENT_CERT
+        and CDS_LOGIN_CLIENT_KEY environment variables (PEM), which is
+        recommended for CI so that key material does not appear on the command
+        line. The token is then obtained directly from the authorization
+        server over mTLS.
 
-        Client Credentials (Client ID and optionally Client-Certificate Private
-        Key in Base64 encoding) for authentication. If omitted, Private Key will
-        be queried interactively (avoid newline characters when pasting it).
-        
         Obtain the Client Credentials from the UAA binding of MTXS.
-        
-        Client Credentials will not be saved, only the resulting token.
-        
-        Note: Productive secrets should not be specified on a command line,
-        since this might expose them to unauthorized users on the same machine!
+
+        Only the resulting token will be saved.
 
     *--save-refresh-token*
 
@@ -152,14 +158,14 @@ module.exports = Object.assign(login, {
 async function login ([url], options = {}) {
     const [username, password] = options.user?.split(':') ?? [];
     delete options.user;
-    if (options.client) {
-        const [clientid, clientsecret] = options.client.split(':');
+    if (options.mtls) {
+        const { clientid, certificate, key } = require('../lib/mtx/util/credentials').clientCertificate(options.mtls);
+        delete options.mtls;
+        Object.assign(options, { clientid, certificate, key });
+    } else if (options.client) {
+        const { clientid, clientsecret } = require('../lib/mtx/util/credentials').clientCredentials(options.client);
         delete options.client;
         Object.assign(options, { clientid, clientsecret });
-    } else if (options.mtls) {
-        const [clientid, key = 'ask'] = options.mtls.split(':');
-        delete options.mtls;
-        Object.assign(options, { clientid, key });
     }
     Object.assign(options, {
         url,

package/bin/pull.js

@@ -1,7 +1,7 @@
 module.exports = Object.assign(pull, {
-    options: ['--subdomain', '--passcode', '--user', '--client', '--from'],
+    options: ['--subdomain', '--passcode', '--user', '--client', '--mtls', '--from'],
     flags: [],
-    shortcuts: ['-s', '-p', '-u', '-c'],
+    shortcuts: ['-s', '-p', '-u', '-c', '-m'],
     help: `
 # SYNOPSIS
 
@@ -42,9 +42,17 @@ module.exports = Object.assign(pull, {
         Username and optionally password for authentication with Basic Auth in
         test scenarios.
 
-    *-c* | *--client* <clientid>[:<clientsecret>]
+    *-c* | *--client* [<clientid>[:<clientsecret>]]
 
-        Client ID and optionally Client Secret for authentication.
+        Client ID and optionally Client Secret for authentication. May also be
+        provided via the CDS_LOGIN_CLIENT_ID and CDS_LOGIN_CLIENT_SECRET
+        environment variables. See *cds login* for details.
+
+    *-m* | *--mtls* [<clientid>]
+
+        Client-certificate (mTLS) authentication. Client ID inline or via
+        CDS_LOGIN_CLIENT_ID; certificate and key via CDS_LOGIN_CLIENT_CERT and
+        CDS_LOGIN_CLIENT_KEY. See *cds login* for details.
 
 # SEE ALSO
 
@@ -61,8 +69,11 @@ module.exports = Object.assign(pull, {
 async function pull([url], options = {}) {
     const [username, password] = options.user?.split(':') ?? [];
     delete options.user;
-    const [clientid, clientsecret] = options.client?.split(':') ?? [];
+    const { clientid, clientsecret, certificate, key } = options.mtls
+        ? require('../lib/mtx/util/credentials').clientCertificate(options.mtls)
+        : require('../lib/mtx/util/credentials').clientCredentials(options.client);
     delete options.client;
+    delete options.mtls;
     if (options.from) url = options.from;
     delete options.from;
 
@@ -72,6 +83,8 @@ async function pull([url], options = {}) {
         username,
         password,
         clientid,
-        clientsecret
+        clientsecret,
+        certificate,
+        key
     });
 }

package/bin/push.js

@@ -1,7 +1,7 @@
 module.exports = Object.assign(push, {
-    options: ['--subdomain', '--passcode', '--user', '--client', '--to', '--async', '--sync'],
+    options: ['--subdomain', '--passcode', '--user', '--client', '--mtls', '--to', '--async', '--sync'],
     flags: [],
-    shortcuts: ['-s', '-p', '-u', '-c', '-2'],
+    shortcuts: ['-s', '-p', '-u', '-c', '-m', '-2'],
     help: `
 # SYNOPSIS
 
@@ -44,9 +44,17 @@ module.exports = Object.assign(push, {
         Username and optionally password for authentication with Basic Auth in
         test scenarios.
 
-    *-c* | *--client* <clientid>[:<clientsecret>]
+    *-c* | *--client* [<clientid>[:<clientsecret>]]
 
-        Client ID and optionally Client Secret for authentication.
+        Client ID and optionally Client Secret for authentication. May also be
+        provided via the CDS_LOGIN_CLIENT_ID and CDS_LOGIN_CLIENT_SECRET
+        environment variables. See *cds login* for details.
+
+    *-m* | *--mtls* [<clientid>]
+
+        Client-certificate (mTLS) authentication. Client ID inline or via
+        CDS_LOGIN_CLIENT_ID; certificate and key via CDS_LOGIN_CLIENT_CERT and
+        CDS_LOGIN_CLIENT_KEY. See *cds login* for details.
 
     *--async*
 
@@ -71,15 +79,20 @@ async function push([extArchive], options = {}) {
 
     const [username, password] = options.user?.split(':') ?? [];
     delete options.user;
-    const [clientid, clientsecret] = options.client?.split(':') ?? [];
+    const { clientid, clientsecret, certificate, key } = options.mtls
+        ? require('../lib/mtx/util/credentials').clientCertificate(options.mtls)
+        : require('../lib/mtx/util/credentials').clientCredentials(options.client);
     delete options.client;
+    delete options.mtls;
 
     const args = [{
         ...options,
         username,
         password,
         clientid,
-        clientsecret
+        clientsecret,
+        certificate,
+        key
     }];
     if (extArchive) {
         args.push({ extArchive });

package/bin/up.js

@@ -1,4 +1,7 @@
 module.exports = Object.assign(up, {
+  staticCompletions: () => ({
+      '--to': ['cf', 'k8s'],
+  }),
   options: ['--to', '--namespace', '--overlay'],
   shortcuts: ['-2', '-n'],
   flags: [],
@@ -117,7 +120,7 @@ const _mtaextForOverlay = overlay => {
 
 async function up() {
   const project = readProject()
-  const { apps, appName, hasApprouter, hasXsuaa, isMonorepoMicroservice, hasKyma, hasMta, k8s } = project
+  const { approuterPath, html5DeployerPath, apps, appName, hasApprouter, hasXsuaa, isMonorepoMicroservice, hasKyma, hasMta, k8s } = project
   const toKyma = cds.cli.options.to === 'k8s' || hasKyma && !hasMta, toCf = !toKyma
 
   if (cds.cli.options.overlay && toKyma) {
@@ -175,10 +178,10 @@ async function up() {
     if (!exists('chart') || !exists('containerize.yaml')) run('cds add kyma')
 
     if (project.hasHtml5Repo) {
-      const html5DeployerPath = join(cds.root, cds.env.folders.app, 'html5-deployer', 'resources')
+      const html5DeployerResources = join(cds.root, html5DeployerPath, 'resources')
 
       if (apps.length > 0) {
-        await mkdirp(html5DeployerPath)
+        await mkdirp(html5DeployerResources)
       }
 
       for (const { app, archiveName } of apps) {
@@ -199,7 +202,7 @@ async function up() {
         if (needsBuild || process.env.SKIP_CHECK == 'true') {
           DEBUG?.(dim(`build required for '${app}' – checksums`, { old: storedChecksum, new: currentChecksum }))
           run(`npm run build --prefix ${appPath}`)
-          await copy(zipPath).to(html5DeployerPath, `${app}.zip`)
+          await copy(zipPath).to(html5DeployerResources, `${app}.zip`)
           writeStoredChecksum(app, currentChecksum)
         } else {
           console.log(info(`Skipping build for UI5 app '${app}' - no changes detected (checksum: ${currentChecksum.substring(0, 8)}...)`))
@@ -209,11 +212,11 @@ async function up() {
     }
 
     if (project.hasAppFrontend) {
-      const html5DeployerPath = join(cds.root, cds.env.folders.app, 'html5-deployer', 'resources')
+      const html5DeployerResources = join(cds.root, html5DeployerPath, 'resources')
       let isRootApp = true;
 
       if (apps.length > 0) {
-        await mkdirp(html5DeployerPath)
+        await mkdirp(html5DeployerResources)
       }
 
       for (const { app } of apps) {
@@ -235,13 +238,13 @@ async function up() {
         if (needsBuild || process.env.SKIP_CHECK == 'true') {
           DEBUG?.(dim(`build required for '${app}' – checksums`, { old: storedChecksum, new: currentChecksum }))
           run(`npm run build --prefix ${appPath}`)
-          await copy(zipPath).to(html5DeployerPath, `${app}.zip`)
+          await copy(zipPath).to(html5DeployerResources, `${app}.zip`)
           writeStoredChecksum(app, currentChecksum)
         } else {
           console.log(info(`Skipping build for React app '${app}' - no changes detected (checksum: ${currentChecksum.substring(0, 8)}...)`))
         }
       }
-      
+
       // for single UI app where Vite app is directly added into app/
       const appPath = path.join(cds.root, cds.env.folders.app)
       const rootPkgJson = exists(path.join(appPath, 'package.json'))
@@ -251,7 +254,7 @@ async function up() {
         const rootZipPath = path.join(appPath, `dist/${appName}.zip`)
         if(isRootApp) {
           run(`npm run build --prefix ${appPath}`)
-          await copy(rootZipPath).to(html5DeployerPath, `${appName}.zip`)
+          await copy(rootZipPath).to(html5DeployerResources, `${appName}.zip`)
         }
       }
     }
@@ -332,10 +335,10 @@ async function up() {
       if (m.path === 'gen/srv') {
         helmArgs.push(`--set srv.annotations.deployment.deployment-checksum=${m.checksum}`)
       }
-      if (m.path === 'app/router') {
+      if (m.path === approuterPath) {
         helmArgs.push(`--set approuter.annotations.deployment.deployment-checksum=${m.checksum}`)
       }
-      if (m.path === 'app/html5-deployer') {
+      if (m.path === html5DeployerPath) {
         helmArgs.push(`--set html5-apps-deployer.annotations.job.job-checksum=${m.checksum}`)
       }
       if (m.path === 'gen/db') {

package/{lib → bin}/upgrade/constants.js

@@ -3,7 +3,7 @@
 const UPGRADE_DIR = '.cds-upgrade'
 const REPORT_FILE = 'report.md'
 const FINDINGS_FILE = 'report.yaml'
-const JAVA_LATEST = require('../init/constants').MAVEN_ARCHETYPE_VERSION
+const JAVA_LATEST = require('../../lib/init/constants').MAVEN_ARCHETYPE_VERSION
 
 // CDS dependencies to rewrite (Node.js)
 const CDS_DEPS = ['@sap/cds', '@sap/cds-dk']