@sap/cds-dk 10.1.2 → 10.2.1

package/bin/repl.js

@@ -1,14 +1,13 @@
 const { DIR } = require('./completion');
 module.exports = Object.assign (repl, {
-  options: [ '--run', '--use' ],
-  flags: [ '--ql' ],
-  shortcuts: ['-r', '-u'],
+  options: [ '--use' ],
+  flags: [ '--run', '--ql' ],
+  shortcuts: [ '-u', '-r', ],
   staticCompletions: () => ({
     '_':     DIR(),
     '--run': DIR(),
     '-r':    DIR(),
     '--use': ['xl', 'ql', 'entities', 'services'],
-    '-u':    ['xl', 'ql', 'entities', 'services'],
   }),
   help: `
 # SYNOPSIS
@@ -51,22 +50,34 @@ module.exports = Object.assign (repl, {
 
 async function repl ([project], options={}) {
 
-  const isTerminal = Boolean(process.stdin.isTTY && process.stdout.isTTY);
+  // same fallback as cds watch: if @sap/cds is not installed locally, inject
+  // cds-dk's node_modules so user code can require/import @sap/cds, sqlite, etc.
+  // Unlike watch (which forks), repl is in-process: set NODE_PATH then call
+  // _initPaths() to apply it to the live CJS resolver, and register the ESM
+  // hook directly (NODE_PATH is ignored by the ESM loader by spec).
+  const { createRequire, _initPaths } = require('node:module')
+  const requireFromProject = createRequire(process.cwd() + '/')
+  try { requireFromProject.resolve('@sap/cds') }
+  catch(e) {
+    if (e.code !== 'MODULE_NOT_FOUND') throw e
+    const { delimiter } = require('node:path')
+    process.env.NODE_PATH = [..._paths(process.cwd()), ..._paths(__dirname)].join(delimiter)
+    _initPaths()
+    require('./watch/esm-resolve-registration')
+  }
+
   const cds = require('../lib/cds')
   const { GREEN, PINK, BLUE, CYAN, YELLOW, GRAY, BOLD, RESET } = cds.utils.colors
   console.log(`${GREEN}${BOLD}Welcome to cds repl v${cds.version}${RESET}`)
+  cds.repl = true
 
   const { inspect } = require('util')
   inspect.defaultOptions.colors = true
   inspect.defaultOptions.depth = 11
 
-  Object.defineProperty (cds,'repl',{value:true})
   let context={}, repl = { context, displayPrompt(){} }
-  if ((options.run ??= project)) await _run (options.run)
   if (options.use) _export (...options.use.split(','))
-
-  if (options.ql) _ql()
-  else _js()
+  if (project) await _run (project); else cds_connect_with_bindings()
 
   process.on('uncaughtException', console.error)
   process.on('unhandledRejection', console.error)
@@ -74,6 +85,25 @@ async function repl ([project], options={}) {
   // Ugly hack to prevent "[ERR_INVALID_REPL_INPUT]: Listeners for `uncaughtException` cannot be used in the REPL" errors caused by winston when connecting to remote services
   process.on = (event, listener) => event !== 'uncaughtException' && event !== 'unhandledRejection' && process.addListener(event, listener)
 
+  const isTerminal = Boolean(process.stdin.isTTY && process.stdout.isTTY);
+  if (options.ql) _ql()
+  else _js()
+
+  // Hide internal properties inherited from EventEmitter
+  Object.defineProperties (cds, {
+    _events: { enumerable: false },
+    _eventsCount: { enumerable: false },
+    _maxListeners: { enumerable: false },
+  })
+
+  // Cover our own tracks
+  delete cds.connect
+  delete cds.extend
+  delete cds.utils
+  delete cds.env
+  delete cds.log
+  delete cds.debug
+
 
   function _js() {
     repl = require('repl').start ({
@@ -89,7 +119,7 @@ async function repl ([project], options={}) {
       }
     })
 
-    _initHistory(repl, '.cds-repl-history')
+    _initHistory(repl)
     repl.on('exit', () => options.context = repl.context)
     repl.on('exit', () => { if (!transition.started) cds.shutdown() })
 
@@ -116,11 +146,21 @@ async function repl ([project], options={}) {
     repl.displayPrompt()
   }
 
+
+  function cds_connect_with_bindings() {
+    const $super = cds.connect.to
+    cds.connect.to = async (...args) => {
+      $super.bindings ??= await cds.service.bindings
+      return $super(...args)
+    }
+    delete cds.connect
+  }
+
   async function _run (project) {
-    await require('../bin/serve') ([project], { project, port: 0, 
-      'with-bindings': true, 
+    await require('../bin/serve') ([project], { project, port: 0,
+      'with-bindings': true,
       'with-mocks': true,
-      'in-memory?': true, 
+      'in-memory?': true,
     })
     _export ('entities', 'services')
   }
@@ -168,13 +208,14 @@ async function repl ([project], options={}) {
     repl.displayPrompt()
   }
 
-  function _initHistory(repl, file) {
-    repl.history = []
-    const home = process.env.HOME || process.env.USERPROFILE
-    const history = require('path').join(home,file)
-    const fs = require('fs')
-    fs.readFile(history, 'utf-8', (e, txt) => e || Object.assign(repl.history, txt.split('\n')))
-    repl.on('exit', () => fs.writeFile(history, repl.history.join('\n'), () => {}))
+  function _initHistory(repl, filename = '.cds/repl-history') {
+    const path = require('path'), fs = require('fs'), $ = process.env
+    const file = path.resolve ($.HOME || $.USERPROFILE, filename)
+    fs.readFile (file, 'utf-8', (e,txt) => repl.history = txt?.split('\n') || [])
+    repl.on ('exit', () => {
+      fs.mkdirSync (path.dirname(file), { recursive: true })
+      fs.writeFile (file, Array.from(new Set(repl.history)).join('\n'), () => {})
+    })
   }
 
   function transition(start) {
@@ -216,7 +257,7 @@ async function repl ([project], options={}) {
       },
     })
 
-    _initHistory(repl, '.cds-repl-ql-history')
+    _initHistory(repl, '.cds/repl-history-ql')
     repl.on('exit', () => { if (!transition.started) cds.shutdown() })
 
     repl.defineCommand ('target', { action: _target,
@@ -258,15 +299,17 @@ async function repl ([project], options={}) {
   }
 
   function _target(args) {
+    const { service = cds.db } = repl.context
     if (!args) return console.info(
-`Specify a service. Available services: ${Object.keys(cds.services).join(', ')}
+`Available services: ${Object.keys(cds.services).join(', ')}
+Currently targeted service is ${service?.name ?? 'none'}
 Examples:
   .target db
   .target AdminService --roles admin`)
     const [s] = args.split(' ')
-    const service = cds.services[s]
-    if (!service) throw new Error(`No service with name ${s}. Available services: ${Object.keys(cds.services).join(', ')}`)
-    repl.context.service = service
+    const target = cds.services[s]
+    if (!target) throw new Error(`No service with name ${s}. Available services: ${Object.keys(cds.services).join(', ')}`)
+    repl.context.service = target
 
     const roles = args.match(/(-r|--roles) ([^\s]+)/)?.[2]?.split(',')
     repl.context.user = roles? {roles} : undefined
@@ -277,6 +320,19 @@ Examples:
   }
 }
 
+function _paths(dir) {
+  const { resolve, sep } = require('node:path')
+  const fs = require('node:fs')
+  const parts = resolve(dir).split(sep)
+  const n = parts.length
+  const nm = sep + 'node_modules'
+  // resolve all node_modules in ancestor directories
+  return parts.map((_,i,a) => a
+    .slice(0, n-i)
+    .join(sep) + nm
+  ).filter(p => fs.existsSync(p))
+}
+
 function createHighlighter(cds, colors) {
   const { compiler } = cds
 

package/bin/run.js

@@ -3,13 +3,12 @@ const serve = require ('./serve')
 module.exports = Object.assign (
     cds_run, serve, {
     staticCompletions: () => ({
-        '_':       DIR(),
-        '--from':  DIR(),
-        '-f':      DIR(),
-        '--with':  DIR(),
-        '-w':      DIR(),
-        '--to':    ['odata', 'fiori', 'rest'],
-        '-2':      ['odata', 'fiori', 'rest'],
+        '_':         DIR(),
+        '--from':    DIR(),
+        '-f':        DIR(),
+        '--with':    DIR(),
+        '--to':      ['odata', 'fiori', 'rest'],
+        '--service': ['all'],
     }),
     help: `
 # SYNOPSIS

package/bin/serve.js

@@ -3,13 +3,12 @@ const { DIR } = require('./completion');
 const serve = require(_local('@sap/cds/bin/serve'))
 module.exports = Object.assign(serve, {
   staticCompletions: () => ({
-    '_':      DIR(),
-    '--from': DIR(),
-    '-f':     DIR(),
-    '--with': DIR(),
-    '-w':     DIR(),
-    '--to':   ['odata', 'fiori', 'rest'],
-    '-2':     ['odata', 'fiori', 'rest'],
+    '_':         DIR(),
+    '--from':    DIR(),
+    '-f':        DIR(),
+    '--with':    DIR(),
+    '--to':      ['odata', 'fiori', 'rest'],
+    '--service': ['all'],
   }),
 })
 

package/bin/up.js

@@ -2,7 +2,7 @@ const { FILE } = require('./completion');
 
 module.exports = Object.assign(up, {
   staticCompletions: () => ({
-      '--to':      ['cf', 'k8s'],
+      '--to':      ['cf', 'k8s', 'kyma'],
       '--overlay': FILE('mtaext')
   }),
   options: ['--to', '--namespace', '--overlay'],
@@ -17,7 +17,7 @@ module.exports = Object.assign(up, {
 
 # OPTIONS
 
-  *-2* | *--to* cf|k8s
+  *-2* | *--to* cf|k8s|kyma
 
     The platform to deploy to.
 
@@ -124,7 +124,7 @@ const _mtaextForOverlay = overlay => {
 async function up() {
   const project = readProject()
   const { approuterPath, html5DeployerPath, apps, appName, hasApprouter, hasXsuaa, isMonorepoMicroservice, hasKyma, hasMta, k8s } = project
-  const toKyma = cds.cli.options.to === 'k8s' || hasKyma && !hasMta, toCf = !toKyma
+  const toKyma = ['k8s', 'kyma'].includes(cds.cli.options.to) || hasKyma && !hasMta, toCf = !toKyma
 
   if (cds.cli.options.overlay && toKyma) {
     console.log(warn(`Ignoring --overlay ${cds.cli.options.overlay} (Cloud Foundry only)`))
@@ -149,9 +149,14 @@ async function up() {
     }
   }
 
+  const packageJson = exists('package.json') ? await read('package.json') : {}
+  const workspaces = Array.isArray(packageJson.workspaces) ? packageJson.workspaces : packageJson.workspaces?.packages ?? []
+  const appFolder = cds.env.folders.app.replace(/\/$/, '')
   for (const { app } of apps) {
     const appPath = path.join(cds.root, cds.env.folders.app, app)
-    if (exists(path.join(appPath, 'package.json'))) {
+    const workspacePath = path.join(appFolder, app).replace(/\\/g, '/')
+    const isWorkspace = workspaces.includes(`${appFolder}/*`) || workspaces.includes(workspacePath)
+    if (!isWorkspace && exists(path.join(appPath, 'package.json'))) {
       if (!exists(path.join(appPath, 'package-lock.json'))) {
         run(`npm i --prefix ${appPath}`)
       } else if (process.env.CI) {
@@ -214,7 +219,7 @@ async function up() {
 
     }
 
-    if (project.hasAppFrontend) {
+    if (project.hasAppFrontend || project.hasHtml5Repo) {
       const html5DeployerResources = join(cds.root, html5DeployerPath, 'resources')
       let isRootApp = true;
 

package/bin/upgrade/steps/install.js

@@ -25,7 +25,7 @@ function runCommand(cmd, args, cwd) {
   });
 }
 
-// Which package.json directories does a root `npm install` NOT cover?
+// Which package.json directories does a root `npm upgrade` NOT cover?
 // A tracked package.json is covered by root install iff (a) it lives inside
 // cds.root and (b) the root package.json's `workspaces` array reaches it via
 // collectWorkspacePackageJsons. Anything else (e.g. mtx/sidecar outside the
@@ -50,11 +50,11 @@ async function extraInstallDirs(ctx, cds) {
 }
 
 async function runNpmInstalls(ctx, cds) {
-  const rootCode = await runCommand('npm', ['install'], cds.root);
+  const rootCode = await runCommand('npm', ['upgrade'], cds.root);
   if (rootCode !== 0) return rootCode;
   const extras = await extraInstallDirs(ctx, cds);
   for (const dir of extras) {
-    const code = await runCommand('npm', ['install'], dir);
+    const code = await runCommand('npm', ['upgrade'], dir);
     if (code !== 0) return code;
   }
   return 0;
@@ -71,7 +71,7 @@ async function runInstall(ctx, cds) {
 
   if (ctx.project.isNode && nodeWorkPending) {
     let accept = false, asked = true;
-    try { accept = await askYesNo('Delete lock files and run `npm install` now?'); }
+    try { accept = await askYesNo('Delete lock files and run `npm upgrade` now?'); }
     catch (e) {
       if (e instanceof NonTTYError) asked = false;
       else throw e;
@@ -81,11 +81,11 @@ async function runInstall(ctx, cds) {
       const code = await runNpmInstalls(ctx, cds);
       nodeRan = true;
       if (code !== 0) {
-        console.log(error('✗ npm install failed. Please resolve and re-run.'));
+        console.log(error('✗ npm upgrade failed. Please resolve and re-run.'));
         aborted = true;
       }
     } else if (asked) {
-      console.log('To finish, delete lock files and run: npm install');
+      console.log('To finish, delete lock files and run: npm upgrade');
     }
   }
 

package/bin/version.js

@@ -84,7 +84,7 @@ async function node_versions(o) {
   // Call npm root and npm ls in parallel...
   const [ [npm_version], [npm_exec], [npm_root_g],[npm_root_l], lines ] = await Promise.all ([
     $`npm --version`,
-    process.platform === 'win32' ? $`where npm.cmd` : $`which npm`,
+    process.platform === 'win32' ? $`where npm.cmd` : $`command -v npm`,
     $`npm root --global`,
     $`npm root --local`,
     $`npm ls -lp ${

package/bin/watch/index.js

@@ -106,6 +106,7 @@ const ignoreDefaults = [
   /@types/,
   /@cds-models/,
   new RegExp(`app${escapedSep}.+?${escapedSep}webapp`),
+  new RegExp(`app${escapedSep}.+?${escapedSep}src${escapedSep}`),
   new RegExp(`app${escapedSep}.+?${escapedSep}.*\\.json`),
   new RegExp(`app${escapedSep}.+?${escapedSep}dist${escapedSep}`),
   new RegExp(`app${escapedSep}.+?${escapedSep}target${escapedSep}`),

package/bin/watch/vite-watch.js

@@ -35,15 +35,21 @@ async function findViteApps() {
 }
 
 async function loadCreateServer(fromPath) {
+  let vitePath
   try {
-      const vitePath = require.resolve('vite', { paths: [fromPath] })
-      return (await import(pathToFileURL(vitePath).href)).createServer
-    } catch(e) {
+    vitePath = require.resolve('vite', { paths: [fromPath] })
+  } catch (e) {
+    if (e.code !== 'MODULE_NOT_FOUND') throw e
+    const globalRoot = require('node:child_process').execSync('npm root -g', { cwd: require('node:os').tmpdir() }).toString().trim()
+    try {
+      vitePath = require.resolve('vite', { paths: [globalRoot] })
+    } catch (e) {
       if (e.code !== 'MODULE_NOT_FOUND') throw e
-      /* try next path */
+      const relative = path.relative(cds.root, fromPath)
+      throw `[cds] - Found Vite app in ${relative}, but package "vite" is not installed. Run ${BOLD}npm install -g vite${RESET} to install it.`
+    }
   }
-  const relative = path.relative(cds.root, fromPath)
-  throw `[cds] - Found Vite app in ${relative}, but package "vite" is not installed. Run ${BOLD}npm install vite --prefix ${relative}${RESET} to install it.`
+  return (await import(pathToFileURL(vitePath).href)).createServer
 }
 
 function collectServicePrefixes() {

package/lib/bind/shared.js

@@ -39,7 +39,7 @@ const PreferredKinds = {
 
 async function bind(options = {}) {
     const { hasKyma, hasMta } = readProject()
-    const onKyma = cds.cli.options.on === 'k8s'  || (hasKyma && !hasMta && cds.cli.options.on !== 'cf')
+    const onKyma = ['k8s', 'kyma'].includes(cds.cli.options.on) || (hasKyma && !hasMta && cds.cli.options.on !== 'cf')
     options.on = onKyma ? 'k8s' : 'cf'
 
     let on

package/lib/build/index.js

@@ -183,19 +183,23 @@ async function applyCommonTaskDefaults(tasks) {
 
 async function filterTasksForCli(tasks, runner) {
     const options = runner.options
-    let resultTasks = tasks.filter(task => {
-        return (!options.for || options.for === task.for)
+    const buildTaskTypes = options.for && [...new Set(options.for.split(',').map(value => value.trim()).filter(Boolean))]
+    let resultTasks = tasks.filter(task => (!buildTaskTypes || buildTaskTypes.includes(task.for))
             && (!options.src || options.src === task.src)
-    })
-    if (resultTasks.length === 0) {
-        if (options.for) {
-            const task = getTask({ for: options.for }, runner.plugins)
+    )
+    if (buildTaskTypes) {
+        const missingTaskTypes = buildTaskTypes.filter(type => !resultTasks.some(task => task.for === type))
+        for (const type of missingTaskTypes) {
+            const task = getTask({ for: type }, runner.plugins)
             if (options.src) task.src = options.src
             resultTasks.push(task)
+        }
+        if (missingTaskTypes.length) {
             applyCliOptions(resultTasks, options)
             await applyTaskDefaults(resultTasks, runner)
         }
-    } else if (resultTasks.length <= tasks.length) {
+    }
+    if (resultTasks.length > 0 && resultTasks.length <= tasks.length) {
         tasks.length = 0
         resultTasks.forEach(task => tasks.push(task))
         resultTasks = tasks

package/lib/build/plugins/featureToggles.js

@@ -9,7 +9,7 @@ module.exports = class FeatureTogglesBuildPlugin extends require('./internal') {
         const sources = filterFeaturePaths(csn, this.task.options.model || this.task.src)
         const dictionary = { base: null, features: null }
 
-        if (sources.features) {
+        if (Object.keys(sources.features).length) {
             // create base model as the given CSN is containing all features
             dictionary.base = await cds.load(sources.base, this.options())
         } else {
@@ -20,7 +20,7 @@ module.exports = class FeatureTogglesBuildPlugin extends require('./internal') {
         const csnStr = await this.compileToJson(dictionary.base, path.join(destBase, DEFAULT_CSN_FILE_NAME))
         const csnModel = JSON.parse(csnStr)
         csnModel.meta = csn.meta
-        if (sources.features) {
+        if (Object.keys(sources.features).length) {
             dictionary.features = await this._compileFeatures(sources.features, destBase, destFts, dictionary.base)
         }
         return { dictionary, sources }

package/lib/build/plugins/hana/index.js

@@ -357,7 +357,7 @@ module.exports = class HanaBuildPlugin extends require('../internal') {
         const wsMigrationTables = new Set()
         if (journalEntities.length) {
             for (const entity of journalEntities) {
-                if (entity['$location']?.file && wsPaths.some(wsPath => path.resolve(cds.root, entity['$location'].file).startsWith(wsPath))) {
+                if (entity['$location']?.file && wsPaths.some(wsPath => path.resolve(cds.root, entity['$location'].file).startsWith(wsPath + path.sep))) {
                     wsMigrationTables.add(getMigrationTableName(entity, model))
                 }
             }

package/lib/build/plugins/helm/files/subcharts/web-application/Chart.yaml

@@ -5,4 +5,4 @@ name: web-application
 sources:
 - https://github.tools.sap/unified-runtime/web-application
 type: application
-version: 2.1.0
+version: 2.6.0

package/lib/build/plugins/helm/files/subcharts/web-application/templates/_helpers.tpl

@@ -3,8 +3,12 @@
 {{/*
 */}}
 {{- define "web-application.internal.bindingName" -}}
+{{- if and .params .params.serviceBindingNameOverride }}
+{{- tpl .params.serviceBindingNameOverride .root }}
+{{- else }}
 {{- printf "%s-%s" (include "web-application.fullname" .root ) .name }}
 {{- end }}
+{{- end }}
 
 {{/*
 Create chart name and version as used by the chart label.
@@ -98,6 +102,9 @@ Service Binding secret volumes
 - name: {{ $name }}
   secret:
     secretName: {{ tpl $secretName $ }}
+    {{- if $params.optional }}
+    optional: {{ $params.optional }}
+    {{- end }}
 {{- end }}
 {{- end }}
 

package/lib/build/plugins/helm/files/subcharts/web-application/templates/api-rule.yaml

@@ -21,6 +21,7 @@ spec:
   service:
     name: {{ include "web-application.fullname" . }}
     port: {{ .Values.port }}
+  timeout: {{ .Values.expose.timeout }}
   rules:
     {{- tpl (toYaml .Values.expose.rules) $ | nindent 4 }}
   {{- if .Values.expose.corsPolicy }}

package/lib/build/plugins/helm/files/subcharts/web-application/templates/service-binding.yaml

@@ -7,15 +7,15 @@
 apiVersion: services.cloud.sap.com/v1
 kind: ServiceBinding
 metadata:
-  name: {{ include "web-application.internal.bindingName" (dict "root" $ "name" $name) }}
+  name: {{ include "web-application.internal.bindingName" (dict "root" $ "name" $name "params" $mergedParams) }}
   labels: {{- include "web-application.labels" $ | nindent 4 }}
 spec:
-  serviceInstanceName: {{include "web-application.internal.serviceInstanceName" (dict "binding" $mergedParams "root" $) }}
+  serviceInstanceName: {{ include "web-application.internal.serviceInstanceName" (dict "binding" $mergedParams "root" $) }}
   {{- if $mergedParams.secretKey }}
   secretKey: {{ $mergedParams.secretKey }}
   {{- end }}
   {{- if $mergedParams.serviceInstanceNamespace }}
-  serviceInstanceNamespace: {{ $mergedParams.serviceInstanceNamespace }}
+  serviceInstanceNamespace: {{ tpl $mergedParams.serviceInstanceNamespace $ }}
   {{- end }}
   {{- if $mergedParams.externalName }}
   externalName: {{ $mergedParams.externalName }}
@@ -24,7 +24,7 @@ spec:
   secretName: {{ tpl $mergedParams.secretName $ }}
   {{- end }}
   {{- if $mergedParams.parameters }}
-  parameters: {{ $mergedParams.parameters | toYaml | nindent 4 }}
+  parameters: {{ tpl ($mergedParams.parameters | toYaml) $ | nindent 4 }}
   {{- end }}
   {{- if $mergedParams.parametersFrom }}
   parametersFrom: {{ tpl ($mergedParams.parametersFrom | toYaml) $ | nindent 4 }}

package/lib/build/plugins/helm/files/subcharts/web-application/values.schema.json

@@ -595,6 +595,10 @@
                     "$id": "#/properties/expose/properties/gateway",
                     "type": "string"
                 },
+                "timeout": {
+                    "$id": "#/properties/expose/properties/timeout",
+                    "type": "integer"
+                },
                 "APIRule": {
                     "$id": "#/properties/expose/properties/APIRule",
                     "type": "object",
@@ -789,6 +793,9 @@
                             "properties": {
                                 "fromSecret": {
                                     "type": "string"
+                                },
+                                "optional": {
+                                    "type": "boolean"
                                 }
                             }
                         },
@@ -805,6 +812,9 @@
                                 "serviceInstanceNamespace": {
                                     "type": "string"
                                 },
+                                "serviceBindingNameOverride": {
+                                    "type": "string"
+                                },
                                 "externalName": {
                                     "type": "string"
                                 },
@@ -848,6 +858,9 @@
                                 },
                                 "credentialsRotationPolicy": {
                                     "type": "object"
+                                },
+                                "optional": {
+                                    "type": "boolean"
                                 }
                             },
                             "dependencies": {

package/lib/build/plugins/helm/files/subcharts/web-application/values.yaml

@@ -14,7 +14,7 @@ global:
     _internal:
       web-application:
         versions:
-          2.1.0: true
+          2.6.0: true
 ## Will be used instead of the `.Chart.Name`, e.g. when generating the Deployment name.
 # nameOverride: name
 
@@ -58,6 +58,7 @@ additionalVolumes: []
 # - name: my-volume
 #   secret:
 #     secretName: my-secret
+#     optional: true # make the volume optional
 #   volumeMount:
 #     mountPath: /etc/mysecret
 #     readOnly: true
@@ -171,6 +172,9 @@ expose:
   enabled: true
   # Use this istio gateway for incoming traffic.
   gateway: kyma-system/kyma-gateway
+  # Specifies the timeout for HTTP requests in seconds for all rules
+  # https://kyma-project.io/external-content/api-gateway/docs/user/custom-resources/apirule/04-10-apirule-custom-resource.html#timeout
+  timeout: 180
   ## Custom Istio Gateway to use with the VirtualService created using the TENANT_HOST_PATTERN.
   ## If your TENANT_HOST_PATTERN uses top level domain for the tenants (like tenant-name.<provider>.<cluster-domain>), you need to create custom Certificate and Gateway since the default Kyma Gateway will not work.
   # tenantGateway: tenants-gateway.my-ns.svc.cluster.local
@@ -268,9 +272,11 @@ bindings:
 #       enabled: false
 #   hana:
 #     serviceInstanceName: hana-manual
+#     serviceBindingNameOverride: hana-manual-binding # override the default generated name
 #     secretTemplate: -> see https://github.com/SAP/sap-btp-service-operator?tab=readme-ov-file#custom-formats
 #   portal:
 #     fromSecret: manual-secret # user-provided-service
+#     optional: true # make the binding optional
 
 ## Annotations to add to objects
 annotations:

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

@@ -25,10 +25,14 @@ module.exports = class JavaBuildPlugin extends require('../edmx') {
     async build() {
         const compileDest = this.task.options.compileDest
         const { src, dest } = this.task
-        const model = await this.model()
+        let model = await this.model()
         if (!model) {
             return
         }
+        const minify = cds.env.build?.minify
+        if (minify) {
+            model = cds.minify(model, minify === true ? undefined : minify)
+        }
         await this._compileForJava(model, compileDest)
 
         if (!this.hasBuildOption(CONTENT_EDMX, false)) {

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

@@ -48,11 +48,15 @@ module.exports = class NodejsBuildPlugin extends require('../edmx') {
             this.pushMessage("OData v2 is not supported by node runtime. Make sure to define OData v2 in cds configuration.", SEVERITY_WARNING)
         }
         // by default model contains all features
-        const model = await this.model()
+        let model = await this.model()
         if (!model && !this.context.options[OPTION_WS_PACK]) {
             return
         }
         if (model) {
+            const minify = cds.env.build?.minify
+            if (minify) {
+                model = cds.minify(model, minify === true ? undefined : minify)
+            }
             const { dictionary, sources } = await this.compileAll(model, destSrv, destRoot)
             // collect and write language bundles into single i18n.json file
             // await this.collectAllLanguageBundles(dictionary, sources, destRoot, destRoot)

package/lib/build/util.js

@@ -241,11 +241,10 @@ function findWorkspaceRoot(currentPath, depth = 0) {
 }
 
 /**
- * This JavaScript function filterFeaturePaths is used to filter and categorize file paths
- * from a given model into two categories: base and features.
- * @param {*} model - represents a data model. It's expected to have a $sources property which is an array of file paths.
- * @param {*} modelPaths - an array of file paths.
- * @returns
+ * Filters and categorizes file paths from a given model into base and feature paths.
+ * @param {import('@sap/cds').csn.CSN & { $sources: string[] }} model
+ * @param {string | string[]} modelPaths
+ * @returns {{ base: string[], features: Record<string, string[]> }}
  */
 function filterFeaturePaths(model, modelPaths) {
     const ftsName = path.dirname(cds.env.features.folders || 'fts/*')