@sap/cds-dk 9.7.2 → 9.8.1

package/lib/init/template/test/files/package.json

@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "@cap-js/cds-test": "^0"
+    "@cap-js/cds-test": ">=0.4.1"
   },
   "scripts": {
     "test": "node --test"

package/lib/init/template/typescript/files/package.json

@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "@cap-js/cds-types": "^0.15.0",
+    "@cap-js/cds-types": "^0.16.0",
     "@types/node": "^24.0.0",
     "tsx": "^4",
     "typescript": "^5"

package/lib/init/template/workzone-standard/files/mta.yaml.hbs

@@ -80,6 +80,7 @@ resources:
                 ProxyType: Internet
                 HTML5.ForwardAuthToken: true
                 HTML5.DynamicDestination: true
+                {{#hasIas}}HTML5.IASDependencyName: {{appName}}-ias-api{{/hasIas}}
     requires:
       - name: srv-api
 

package/lib/lint/eslintHelp.json

@@ -1,5 +1,5 @@
 {
-  "version": "9.39.2",
+  "version": "9.39.4",
   "help": "\n# SYNOPSIS\n\n    *cds lint* [options] file.js [file.js] [dir]\n\n    Runs environment checks and/or checks the specified models\n    based on the ESLint framework\n\n# OPTIONS\n    \n    Basic configuration:\n      --no-config-lookup               Disable look up for eslint.config.js\n      -c, --config path::String        Use this configuration instead of eslint.config.js, eslint.config.mjs, or eslint.config.cjs\n      --inspect-config                 Open the config inspector with the current configuration\n      --ext [String]                   Specify additional file extensions to lint\n      --global [String]                Define global variables\n      --parser String                  Specify the parser to be used\n      --parser-options Object          Specify parser options\n    \n    Specify Rules and Plugins:\n      --plugin [String]                Specify plugins\n      --rule Object                    Specify rules\n    \n    Fix Problems:\n      --fix                            Automatically fix problems\n      --fix-dry-run                    Automatically fix problems without saving the changes to the file system\n      --fix-type Array                 Specify the types of fixes to apply (directive, problem, suggestion, layout)\n    \n    Ignore Files:\n      --no-ignore                      Disable use of ignore files and patterns\n      --ignore-pattern [String]        Patterns of files to ignore\n    \n    Use stdin:\n      --stdin                          Lint code provided on <STDIN> - default: false\n      --stdin-filename String          Specify filename to process STDIN as\n    \n    Handle Warnings:\n      --quiet                          Report errors only - default: false\n      --max-warnings Int               Number of warnings to trigger nonzero exit code - default: -1\n    \n    Output:\n      -o, --output-file path::String   Specify file to write report to\n      -f, --format String              Use a specific output format - default: stylish\n      --color, --no-color              Force enabling/disabling of color\n    \n    Inline configuration comments:\n      --no-inline-config               Prevent comments from changing config or rules\n      --report-unused-disable-directives  Adds reported errors for unused eslint-disable and eslint-enable directives\n      --report-unused-disable-directives-severity String  Chooses severity level for reporting unused eslint-disable and eslint-enable directives - either: off, warn, error, 0, 1, or 2\n      --report-unused-inline-configs String  Adds reported errors for unused eslint inline config comments - either: off, warn, error, 0, 1, or 2\n    \n    Caching:\n      --cache                          Only check changed files - default: false\n      --cache-file path::String        Path to the cache file. Deprecated: use --cache-location - default: .eslintcache\n      --cache-location path::String    Path to the cache file or directory\n      --cache-strategy String          Strategy to use for detecting changed files in the cache - either: metadata or content - default: metadata\n    \n    Suppressing Violations:\n      --suppress-all                   Suppress all violations - default: false\n      --suppress-rule [String]         Suppress specific rules\n      --suppressions-location path::String  Specify the location of the suppressions file\n      --prune-suppressions             Prune unused suppressions - default: false\n      --pass-on-unpruned-suppressions  Ignore unused suppressions - default: false\n    \n    Miscellaneous:\n      --init                           Run config initialization wizard - default: false\n      --env-info                       Output execution environment information - default: false\n      --no-error-on-unmatched-pattern  Prevent errors when pattern is unmatched\n      --exit-on-fatal-error            Exit with exit code 2 in case of fatal error - default: false\n      --no-warn-ignored                Suppress warnings when the file list includes ignored files\n      --pass-on-no-patterns            Exit with exit code 0 in case no file patterns are passed\n      --debug                          Output debugging information\n      -h, --help                       Show help\n      -v, --version                    Output the version number\n      --print-config path::String      Print the configuration for the given file\n      --stats                          Add statistics to the lint report - default: false\n      --flag [String]                  Enable a feature flag\n      --mcp                            Start the ESLint MCP server\n      --concurrency Int|String         Number of linting threads, auto to choose automatically, off for no multithreading - default: off\n    \n",
   "options": [
     "--config",

package/lib/lint/io.js

@@ -30,7 +30,7 @@ module.exports = {
     switch (path.basename(configPath)) {
       case 'eslint.config.mjs':
         // pathToFileURL is used to convert the path to a file URL on Windows
-        try { config = (await import (pathToFileURL(configPath))).default } catch(e) { config = null }
+        try { config = (await import (pathToFileURL(configPath))).default } catch { config = null }
         break
       case 'eslint.config.js':
       case 'eslint.config.cjs':
@@ -44,9 +44,9 @@ module.exports = {
    * plugin with:
    * (1) All CDS recommended rules 'on'
    * (2) Add's custom rule example 'no-entity-moo' if requested
-   * @param {object | string} configPath - ESLint config file or path
+   * @param {object | string} configIn - ESLint config file or path
    * @param {import('console').Console} logger - logger to use
-   * @returns {object}
+   * @returns {Promise<object>} ESLint config contents (also writes to file if path provided)
    */
   async sanitizeEslintConfig(configIn, logger = console) {
     let configContents
@@ -64,8 +64,9 @@ module.exports = {
 
   /**
    * Suggest ESLint config contents to file
-   * @param {*} configContents config file contents
    * @param {import('node:fs').PathLike} configPath config file path to write to
+   * @param {boolean} force whether to overwrite existing config file or not
+   * @param {import('console').Console} logger logger to use for output
    * @returns {Promise<void>}
    */
   async writeEslintConfig(configPath, force = false, logger = console) {
@@ -142,21 +143,16 @@ export default [...cds.recommended, cdsPlugin.configs.recommended]
    * (2) 'Custom' case adds rulePaths and removes configFile
    * (3) 'Global' case adds configFile and removes rulePaths
    * @param {*} settingsPath VS Code settings file
+   * @param {*} lintFileTypes array of file types to add to eslint.validate setting
+   * @returns void
    */
-  async sanitizeVscodeSettings(settingsPath, lintFileTypes, customRuleExample = false) {
+  async sanitizeVscodeSettings(settingsPath, lintFileTypes) {
     const settings = (await this.readVscodeSettings(settingsPath)) ?? {}
-    const rulePaths = [path.join('.eslint/rules')]
 
     settings['eslint.validate'] = settings['eslint.validate']
       ? this.mergeArrays(settings['eslint.validate'], lintFileTypes)
       : lintFileTypes
 
-    if (settings['eslint.options'] && customRuleExample) {
-      settings['eslint.options'].rulePaths = rulePaths
-    } else if (customRuleExample) {
-      settings['eslint.options'] = { rulePaths: rulePaths }
-    }
-
     await write(settingsPath, settings, { spaces: 2 })
-  },
+  }
 }

package/lib/mtx/pull.js

@@ -111,7 +111,7 @@ module.exports = class Pull {
                         .find(ws => {
                             try {
                                 return require(join(this.projectFolder, ws, 'package.json')).name === this.baseModelName;
-                            } catch (e) { /* ignore */ }
+                            } catch { /* ignore */ }
                         }) ?? defaultFolder;
                 }
             } else {

package/lib/mtx/settings_manager.js

@@ -288,11 +288,17 @@ class SettingsManager {
         async function updateTokenUrl() {
             const tokenUrl = secure(params.get('tokenUrl'), 'token URL');
             const renewUrl = !logout && !params.get('skipToken')
-                && (!tokenUrl || tokenUrl.includes('//-/cds') || tokenUrl.includes(OAUTH_PATH_LEGACY) || params.get('appUrl') !== loadedSettings.get('appUrl'));
+                && (!tokenUrl || tokenUrl.includes('//-/cds') || tokenUrl.includes(OAUTH_PATH_LEGACY)
+                    || params.get('appUrl') !== loadedSettings.get('appUrl')
+                    || params.get('subdomain') !== loadedSettings.get('subdomain'));
             if (renewUrl) {
                 const tokenUrl = await getTokenUrl(params, renewUrl);
                 params.set('tokenUrl', tokenUrl);
                 DEBUG?.(`Updated token URL from '${loadedSettings.get('tokenUrl')}' (loaded) to '${tokenUrl}'`);
+                if (params.has('passcodeUrl')) {
+                    params.delete('passcodeUrl');
+                    DEBUG?.('Cleared stale passcode URL due to token URL renewal');
+                }
             }
         }
 
@@ -598,7 +604,7 @@ class SettingsManager {
         let settingsByFolder
         try {
             settingsByFolder = JSON.parse((await fs.promises.readFile(CONFIG.paths.settings)).toString());
-        } catch (err) {
+        } catch {
             DEBUG?.('Empty settings file');
             return emptyData(all);
         }
@@ -626,7 +632,7 @@ class SettingsManager {
         let allAuth;
         try {
             allAuth = JSON.parse((await fs.promises.readFile(CONFIG.paths.auth)).toString());
-        } catch (err) {
+        } catch {
             DEBUG?.(`${capitalize(TOKEN_STORAGE_DESC.plain)} contains invalid saved auth`);
             return emptyData(all);
         }
@@ -670,7 +676,7 @@ class SettingsManager {
 
         try {
             auth = JSON.parse(authString);
-        } catch (error) {
+        } catch {
             auth = {};
         }
 
@@ -693,7 +699,7 @@ class SettingsManager {
                 if (appUrl && subdomain) {
                     try {
                         (result[appUrl] ??= {})[subdomain] = JSON.parse(authString);
-                    } catch (error) {
+                    } catch {
                         throw new Error(`${capitalize(TOKEN_STORAGE_DESC.keyring)} contains invalid saved auth for URL ${appUrl} and subdomain ${subdomain}`);
                     }
                 }

package/lib/mtx/tenant_action.js

@@ -81,7 +81,7 @@ module.exports = class TenantAction {
         try {
             libPath = require.resolve(libId, { paths: [process.cwd()] });
             DEBUG?.(`Using local @sap/cds-mtxs from ${libPath}`);
-        } catch (error) {
+        } catch {
             try {
                 libPath = require.resolve(libId);
                 DEBUG?.(`Using cds-mtxs from ${libPath}`);

package/lib/mtx/util/fs.js

@@ -42,7 +42,7 @@ function _traverseFileSystem(root, sourceDir, files, filter) {
                     files.set(toUnixPath(path.relative(root, entry)), fileContent.toString('utf-8'));
                 }
             });
-    } catch(error) { /* ignored */}
+    } catch { /* ignored */}
 }
 
 /**
@@ -87,7 +87,7 @@ function grepQR(folder, extensions, regex) {
                 if (regex.test(fs.readFileSync(path.join(folder, dirent.name), { encoding: 'utf-8' }))) {
                     return true;
                 }
-            } catch (error) { /* ignore */ }
+            } catch { /* ignore */ }
         }
         if (dirent.isDirectory() && grepQR(path.join(folder, dirent.name), extensions, regex)) {
             return true;

package/lib/util/fs.js

@@ -45,7 +45,7 @@ async function readJSON(src, project) {
     try {
         return JSON.parse(file)
     } catch (error) {
-        throw new Error(error.message + '\n' + file)
+        throw new Error(`${error.message}\n${file}`, { cause: error })
     }
 }
 
@@ -82,8 +82,8 @@ const DEFAULT_CONCURRENCY = (() => {
  * @returns {Promise<string[]>} Array of matching file paths
  */
 async function find(dir, { filter, ignoreSymlinks = false } = {}) {
-    const files = /** @type {string[]} */([])
-    const queue = /** @type {string[]} */([dir])
+    const files = /** @type {import('fs').Dirent[]} */([])
+    const queue = /** @type {import('fs').Dirent[]} */([dir])
     const active = new Set()
     const visit = async (/** @type {string} */ d) => {
         let entries = /** @type {import('fs').Dirent[]} */([])

package/lib/util/git.js

@@ -46,7 +46,7 @@ class GitUtil {
     async readFileSafely(file) {
         try {
             return await fs.readFile(file, 'utf8');
-        } catch (err) {
+        } catch {
             return '';
         }
     }

package/lib/util/glob.js

@@ -50,7 +50,7 @@ async function subdirs(dir) {
   let entries;
   try {
     entries = await readdir(dir, { withFileTypes: true });
-  } catch (err) {
+  } catch {
     return [];
   }
 

package/lib/watch/hot-reload.js

@@ -0,0 +1,202 @@
+const crypto = require('crypto')
+const stream = require('stream/promises')
+const cds = require('../cds');
+const log = cds.log('cds');
+
+module.exports = async function hotReloading() {
+  const csn = await cds.compile('*');
+  const sqliteModel = cds.compile(csn).to.sql({ dialect: 'sqlite' })
+  const hash = crypto.createHash('sha256')
+  await stream.pipeline(sqliteModel, hash)
+  cds.model.$schemaHash = hash.digest('hex')
+  if (cds.env.requires.db.impl === '@cap-js/sqlite') {
+    cds.model.$schema = sqliteModel
+  }
+  process.on('message', async (msg) => {
+    if (msg.code === 'refreshModel') {
+      log.info(`Hot reloading cds model...`)
+      const csn = await cds.compile('*');
+      const sqliteModel = cds.compile(csn).to.sql({ dialect: 'sqlite' })
+      const model = cds.compile.for.nodejs(csn)
+      if (cds.env.requires.db.impl === '@cap-js/sqlite') {
+        model.$schema = sqliteModel;
+      }
+      const hash = crypto.createHash('sha256')
+      await stream.pipeline(sqliteModel, hash)
+      model.$schemaHash = hash.digest('hex')
+      if (model.$schemaHash !== cds.model.$schemaHash) {
+        if (cds.env.requires.db.impl === '@cap-js/sqlite') {
+          const db = await cds.connect.to('db');
+          const { dropTables, dropViews, newTables, newViews } = sqlDiff(model, cds.model)
+          try {
+            await db.run([...dropViews, ...dropTables].map(item => `DROP ${item.type} IF EXISTS ${item.name}`))
+            cds.debug('cli')(`dropped ${[...dropViews, ...dropTables].length} views/tables during cds watch`)
+          } catch {
+            // Restart if error happens to ensure it still works
+            process.send({ code: 'restart' })
+            return;
+          }
+
+          try {
+            await db.run([...newTables, ...newViews].map(item => item.sql))
+            cds.debug('cli')(`created new views and tables on cds watch`)
+          } catch {
+            // Restart if error happens to ensure it still works
+            process.send({ code: 'restart' })
+            return;
+          }
+          // redeploy test data
+          await redeployData(csn, db, (file, e) => newTables.some(table => table.name.toUpperCase() === e.replaceAll('.', '_').toUpperCase()))
+        } else {
+          // Restart instance when DB changes cannot be solved by redeploying
+          process.send({ code: 'restart' })
+          return;
+        }
+      }
+      if (didMockDataChange(msg.eventsAndOpts ?? [])) {
+        const db = await cds.connect.to('db');
+        await redeployData(csn, db, (file) => msg.eventsAndOpts.some(({ name: fullPath }) => fullPath.endsWith(file)), true)
+      }
+      // Assign new model to CDS
+      cds.model = model
+
+      // Check for differences in services to restart if necessary and assign model to services as well
+      const services = Object.keys(model.definitions).filter(name => model.definitions[name].kind === 'service')
+      for (const srv in cds.services) {
+        const existingSrvIdx = services.findIndex(s => s === srv);
+
+        // Restart because an existing service was removed
+        // Avoid restarts for services without a model, for example pure rest remote services
+        if (existingSrvIdx < 0 && srv !== 'db' && cds.services[srv].model && cds.services[srv].definition) {
+          process.send({ code: 'restart' })
+        } else if (existingSrvIdx >= 0) {
+          const existingSrv = model.definitions[services.splice(existingSrvIdx, 1)];
+          // Ensure server restarts if protocol changes
+          if (
+            Object.keys(existingSrv.protocols).length !== Object.keys(cds.services[srv].definition.protocols).length ||
+            Object.keys(existingSrv.protocols).some(existingProtocol => !Object.keys(cds.services[srv].definition.protocols).some(protocol => protocol === existingProtocol))
+          ) {
+            process.send({ code: 'restart' })
+            return;
+          }
+
+          // Restart if @path annotation changes
+          if (existingSrv['@path'] !== cds.services[srv].definition['@path']) {
+            process.send({ code: 'restart' })
+            return;
+          }
+        }
+        // Services somehow have their own model cache, thus override is needed
+        cds.services[srv].model = model
+      }
+      // New service was added needing restart
+      if (services.length) {
+        process.send({ code: 'restart' })
+        return;
+      }
+      // This triggers the live-reload - its important to be at the end to avoid race-conditions
+      process.send({ code: 'model-refreshed' })
+      log.info(`...cds model reloaded.`)
+    }
+  })
+}
+
+/**
+ *
+ * @param {*} csn
+ * @param {*} db
+ * @param {*} includeFileFilter Function which is invoked to toggle which files are deployed
+ */
+async function redeployData(csn, db, includeFileFilter, withUndeploy = false) {
+  const filesToDeploy = {}
+  const entitiesToUndeploy = []
+  const resources = await cds.deploy.resources(csn, { testdata: cds.env.features.test_data })
+  const resEntries = Object.entries(resources).reverse() // reversed $sources, relevant as UPSERT order
+  for (const [file, e] of resEntries) {
+    if (includeFileFilter(file, e)) {
+      let src = await cds.utils.read(file, 'utf8')
+      filesToDeploy[file] = src;
+      entitiesToUndeploy.push(e)
+    }
+  }
+  if (entitiesToUndeploy.length) {
+    try {
+      if (withUndeploy) {
+        await db.run(entitiesToUndeploy.map((entity) => DELETE.from(entity).where('1 = 1')))
+      }
+      await cds.deploy.data(db, csn, {}, filesToDeploy)
+    } catch {
+      // Full restart in case redeploy fails, that might happen with referential constraints
+      process.send({ code: 'restart' })
+      return;
+    }
+  }
+}
+
+function didMockDataChange(eventsAndOpts) {
+  for (const { name: path } of eventsAndOpts) {
+    if ((new RegExp(`test.*data.*\\.(csv|json)`)).test(path) || cds.env.roots.some(root => (new RegExp(`${root}.*data.*\\.(csv|json)`)).test(path))) {
+      return true;
+    }
+  }
+  return false;
+}
+
+const createRegex = /CREATE\s+(TABLE|VIEW)\s+([^\s(]+)/gi
+const parseSchema = (schema) => {
+  const statements = {}
+  const sql = schema.join('\n')
+  let match
+  while ((match = createRegex.exec(sql)) !== null) {
+    const type = match[1].toUpperCase()
+    const name = match[2]
+    statements[name] = { type, name }
+  }
+  return statements
+}
+function sqlDiff(model, cdsModel) {
+  const oldSchema = parseSchema(cdsModel.$schema || [])
+  const newSchema = parseSchema(model.$schema || [])
+
+  // Find changed or removed tables/views
+  const toRecreate = []
+  for (const name in oldSchema) {
+    if (!newSchema[name]) {
+      // Removed - need to drop
+      toRecreate.push({ ...oldSchema[name], action: 'drop' })
+    } else {
+      // Check if definition changed by comparing the actual SQL
+      const oldSql = (cdsModel.$schema || []).find(s => s.includes(`CREATE ${oldSchema[name].type} ${name}`))
+      const newSql = (model.$schema || []).find(s => s.includes(`CREATE ${newSchema[name].type} ${name}`))
+      if (oldSql !== newSql) {
+        toRecreate.push({ ...oldSchema[name], action: 'drop' })
+        toRecreate.push({ ...newSchema[name], action: 'create', sql: newSql })
+      }
+    }
+  }
+
+  // Find new tables/views
+  for (const name in newSchema) {
+    if (!oldSchema[name]) {
+      const newSql = (model.$schema || []).find(s => s.includes(`CREATE ${newSchema[name].type} ${name}`))
+      toRecreate.push({ ...newSchema[name], action: 'create', sql: newSql })
+    }
+  }
+
+  // Execute drops first (views before tables)
+  const drops = toRecreate.filter(t => t.action === 'drop')
+  const views = drops.filter(t => t.type === 'VIEW').reverse()
+  const tables = drops.filter(t => t.type === 'TABLE').reverse()
+
+  // Execute creates (tables before views)
+  const creates = toRecreate.filter(t => t.action === 'create')
+  const newTables = creates.filter(t => t.type === 'TABLE')
+  const newViews = creates.filter(t => t.type === 'VIEW')
+
+  return {
+    dropViews: views,
+    dropTables: tables,
+    newTables,
+    newViews
+  }
+}

package/lib/watch/livereload-server.js

@@ -1,6 +1,5 @@
 const DEBUG = /\b(y|all|cli|watch|livereload)\b/.test (process.env.DEBUG) ? ((..._) => console.debug ('[cli] -', ..._)) : undefined
 
-const axios = require('axios')
 const ws = require('ws')
 const express = require('express')
 const { URL } = require('url')
@@ -9,7 +8,7 @@ const escapedSep = sep === '\\' ? '\\\\' : sep
 
 const ext = 'css,gif,html,jpg,png,svg,ts,mjs,cjs,js,json,properties,change,variant,ctrl_variant,ctrl_variant_change,ctrl_variant_management_change'
 const watchIncludes = RegExp(`\\.(${ext.replace(/,/g,'|')})$|\\${sep}(webapp|appconfig)`)
-const watchExcludes = new RegExp(`${escapedSep}(node_modules|\\.git|dist)(${escapedSep}|$)|@cds-models${escapedSep}|@types${escapedSep}`)
+const watchExcludes = new RegExp(`${escapedSep}(node_modules|\\.git|dist)(${escapedSep}|$)|@cds-models${escapedSep}|@types${escapedSep}|${escapedSep}test${escapedSep}|${escapedSep}workflow${escapedSep}|package-lock\\.json|\\.appGenInfo\\.json|-generator-config\\.json|xs-app\\.json|\\.vscode`)
 
 module.exports = class LiveReload {
   async start(port, cwd, delay=0) {
@@ -86,6 +85,9 @@ module.exports = class LiveReload {
       // Watching for touched files...
       const watch = require('./watcher')
       const filter = f => {
+        // Approximately ensure that directories do not cause live reloads
+        const lastSegment = f.split(sep).pop()
+        if (!lastSegment.includes('.')) return false
         const isIn = !watchExcludes.test(f) && watchIncludes.test(f)
         if (!isIn)  DEBUG?. (`livereload ignored: ${relative(cwd||process.cwd(), f)}`)
         // else        DEBUG?. (`livereload NOT ignored: ${relative(cwd||process.cwd(), f)}`, watchIncludes)
@@ -146,8 +148,8 @@ async function livereloadURL(address, port) {
   if (process.env.WS_BASE_URL) {
     // on BAS, expose the livereload port as an externally accessible URL
     try {
-      const resp = await axios.get('http://localhost:3001/AppStudio/api/getHostByPort?port=' + port)
-      return resp.data.result + 'livereload.js?snipver=1&port=443'
+      const resp = await fetch('http://localhost:3001/AppStudio/api/getHostByPort?port=' + port, { method: 'GET' })
+      return (await resp.json()).result + 'livereload.js?snipver=1&port=443'
     } catch (e) {
       console.error(`Error exposing live reload port ${port}: ${e.message}`)
       return

package/lib/watch/node-watch.js

@@ -31,6 +31,7 @@ module.exports = ({ cwd = process.cwd(), script, ext, ignore=RegExp(), watched,
 
       const updated = eventsAndOpts.filter(evt => evt.type && evt.type === 'update').map(evt => evt.name)
       emitter.emit ('restart', updated)
+      env.CDS_WATCH_HOT_RELOAD = options['experimental-hot-reload']
       child = fork (script, { cwd, env, stdio:'inherit', execArgv }, (err)=>{
         if (err)  console.error (err)
       })
@@ -57,9 +58,12 @@ module.exports = ({ cwd = process.cwd(), script, ext, ignore=RegExp(), watched,
     // else  DEBUG?. (`NOT ignored: ${relative(cwd||process.cwd(), f)}`, include.test(f), include)
     return isIn
   }
-  const watcher = watch (watched,{ filter, ignore })
+  const watcher = watch (watched,{ filter, ignore, hotReload: options['experimental-hot-reload'] })
   if (DEBUG) watcher.on('close', ()=> DEBUG('⚡️', 'cds watch - file watcher closed'))
   watcher.on('change', restart)
+  watcher.on('refreshModel', _coalesceEvents(delay, (eventsAndOpts) => {
+    child.send({ code:'refreshModel', eventsAndOpts })
+  }))
   process.on('shutdown', ()=> watcher.close())
 
   // Live commands...

package/lib/watch/watched.js

@@ -3,15 +3,19 @@
 // Extracted from watch.js to avoid cds.env loaded too eagerly
 //
 
-(async()=>{
+(async () => {
 
   // run through cli in order to use its error handling
   const args = JSON.parse(process.env._args)
   const cds = require('../cds'); cds.watched = true
   const bootstrap = require('../../bin/cds')(...args)
 
-  cds.once('listening', ({server}) => {
-    process.send ({ code:'listening', port: server.address().port })
+  cds.once('listening', async ({ server }) => {
+    process.send({ code: 'listening', port: server.address().port })
+    if (process.env.CDS_WATCH_HOT_RELOAD && process.env.CDS_WATCH_HOT_RELOAD !== 'false') {
+      const hotReload = require('./hot-reload');
+      await hotReload()
+    }
   })
 
   try {

package/lib/watch/watcher.js

@@ -2,13 +2,47 @@ const fs = require('node:fs')
 const { resolve, sep } = require('node:path')
 const { EventEmitter } = require('node:events')
 
-module.exports = function watch(paths, { filter, ignore } = {}) {
+module.exports = function watch(paths, { filter, ignore, hotReload } = {}) {
   const ee = new EventEmitter()
   const roots = [...new Set((Array.isArray(paths) ? paths : [paths]).filter(Boolean).map(p => resolve(p)))]
   const ac = new AbortController() // eslint-disable-line no-undef
   let closed = false
 
   const _allow = p => !filter || (filter instanceof RegExp ? filter.test(p) : filter(p))
+  const dataFiles = hotReload && [
+    new RegExp(`test.*data.*\\.(csv|json)`),
+    new RegExp(`db.*data.*\\.(csv|json)`)
+  ]
+  const _hotReload = !hotReload ? ()=>false : fullPath => {
+    if (!hotReload || !_allow(fullPath)) return false;
+    // Hot reload all CDS files, services are 
+    if (fullPath.endsWith('.cds')) return true;
+    // .properties files are used for i18n -> hot reload i18n
+    if (fullPath.endsWith('.properties') && fullPath.includes('i18n')) return true;
+    // .json & .csv files used in data folders trigger a hot reload, e.g. delete and insert for the table
+    if (dataFiles.some(regex => regex.test(fullPath))) {
+      return true;
+    }
+    return false;
+  }
+
+  const reloadRelevantJSONfiles = hotReload ? [
+    new RegExp(`\\.cdsrc\\.json`),
+    new RegExp(`\\package\\.json`),
+    new RegExp(`\\.cdsrc-private\\.json`),
+    new RegExp(`default-env\\.json`),
+  ] : []
+  /**
+   * Helper function to in case of hot reload restrict reloads based on .json files to just
+   * .cdsrc.json, cdsrc-private.json and root package.json
+   */
+  const _narrowJSONreloads = !hotReload ? ()=> true : fullPath => {
+    if (!hotReload) return true;
+    if (reloadRelevantJSONfiles.some(regex => regex.test(fullPath))) {
+      return true;
+    }
+    return false;
+  }
 
   const useNativeRecursive = process.platform === 'darwin' || process.platform === 'win32'
   if (useNativeRecursive) {
@@ -20,7 +54,9 @@ module.exports = function watch(paths, { filter, ignore } = {}) {
           if (closed) break
           const name = event.filename?.toString?.() ?? event.filename ?? ''
           const fullPath = resolve(root, name)
-          if (_allow(fullPath)) {
+          if (_hotReload(fullPath)) {
+            ee.emit('refreshModel', fs.existsSync(fullPath) ? 'update' : 'remove', fullPath)
+          } else if (_allow(fullPath) && _narrowJSONreloads(fullPath)) {
             ee.emit('change', fs.existsSync(fullPath) ? 'update' : 'remove', fullPath)
           }
         }
@@ -84,7 +120,9 @@ module.exports = function watch(paths, { filter, ignore } = {}) {
                 if (fs.lstatSync(fullPath).isDirectory()) _enqueue(fullPath)
               } catch { /* ignore */ }
             }
-            if (_allow(fullPath)) {
+            if (_hotReload(fullPath)) {
+              ee.emit('refreshModel', fs.existsSync(fullPath) ? 'update' : 'remove', fullPath)
+            } else if (_allow(fullPath) && _narrowJSONreloads(fullPath)) {
               ee.emit('change', fs.existsSync(fullPath) ? 'update' : 'remove', fullPath)
             }
           }