@sap/cds-dk 9.5.0 → 9.6.1

package/lib/init/template/sample/files/app/browse/webapp/i18n/i18n_de.properties

@@ -0,0 +1,3 @@
+appTitle = Zeige Bücher
+appSubTitle = CAP Beispielanwendung
+appDescription = CAP Beispielanwendung zur Anzeige von Büchern

package/lib/init/template/sample/files/app/browse/webapp/i18n/i18n_en.properties

@@ -0,0 +1,3 @@
+appTitle = Browse Books
+appSubTitle = CAP Sample Application
+appDescription = CAP Sample Application to Browse Books

package/lib/init/template/sample/files/app/browse/webapp/manifest.json

@@ -35,7 +35,7 @@
           "semanticObject": "Books",
           "action": "display",
           "title": "{{appTitle}}",
-          "info": "{{appInfo}}",
+          "info": "{{appDescription}}",
           "subTitle": "{{appSubTitle}}",
           "icon": "sap-icon://course-book",
           "indicatorDataSource": {

package/lib/init/template/sample/files/app/common.cds

@@ -4,6 +4,7 @@
 
 using { sap.capire.bookshop as my } from '../db/schema';
 using { sap.common } from '@sap/cds/common';
+using { sap.common.Currencies } from '../db/currencies';
 
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -225,7 +226,7 @@ annotate common.Currencies with @(UI : {
 //
 //	Currencies Elements
 //
-annotate common.Currencies with {
+annotate sap.common.Currencies with {
   numcode  @title: '{i18n>NumCode}';
   minor    @title: '{i18n>MinorUnit}';
   exponent @title: '{i18n>Exponent}';

package/lib/init/template/sample/files/app/fiori-apps.html

@@ -8,23 +8,43 @@
   <title>Bookshop</title>
 
   <script>
-    window["sap-ushell-config"] = {
-      defaultRenderer: "fiori2",
-      applications: {},
-    };
+    window['sap-ushell-config'] = {
+      defaultRenderer: 'fiori2',
+      renderers: {
+        fiori2: {
+          componentData: {
+            config: {
+              enableSearch: false // suppress browser errors
+            }
+          }
+        }
+      },
+      applications: {}
+    }
+  </script>
+
+  <script
+    id="sap-ushell-bootstrap"
+    src="https://ui5.sap.com/test-resources/sap/ushell/bootstrap/sandbox.js">
+  </script>
+
+  <script
+    id="sap-ui-bootstrap"
+    src="https://ui5.sap.com/resources/sap-ui-core.js"
+    data-sap-ui-libs="sap.m,sap.ushell,sap.collaboration,sap.ui.layout"
+    data-sap-ui-compatVersion="edge"
+    data-sap-ui-theme="sap_horizon">
   </script>
 
-  <script id="sap-ushell-bootstrap" src="https://ui5.sap.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-  <script id="sap-ui-bootstrap" src="https://ui5.sap.com/resources/sap-ui-core.js"
-    data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout" data-sap-ui-compatVersion="edge"
-    data-sap-ui-theme="sap_horizon"></script>
   <script>
-    sap.ui.getCore().attachInit(() =>
-      sap.ushell.Container.createRenderer().placeAt("content")
-    );
+    sap.ui.getCore().attachInit(() => {
+      sap.ushell.Container
+        .createRenderer('fiori2', true)
+        .then(renderer => renderer.placeAt('content'))
+    })
   </script>
 </head>
 
 <body class="sapUiBody" id="content"></body>
 
-</html>
+</html>

package/lib/init/template/sample/files/app/genres/fiori-service.cds

@@ -28,6 +28,6 @@ annotate Genres with @(UI : {
 
 
 // Tree Views
-// annotate AdminService.Genres with @hierarchy; // upcomming simplification
+// annotate AdminService.Genres with @hierarchy; // upcoming simplification
 using from './tree-view';
 using from './value-help';

package/lib/init/template/sample/files/app/genres/webapp/i18n/i18n.properties

@@ -1,4 +1,3 @@
-#XTIT
-appTitle=Browse Genres
-#XTXT
-appDescription=Genres as Tree View
+appTitle = Browse Genres
+appSubTitle = CAP Sample Application
+appDescription = Genres as Tree View

package/lib/init/template/sample/files/app/genres/webapp/i18n/i18n_de.properties

@@ -1,2 +1,3 @@
-appTitle=Zeige Genres
-appDescription=Genres als Baumansicht
+appTitle = Zeige Genres
+appSubTitle = CAP Beispielanwendung
+appDescription = Genres als Baumansicht

package/lib/init/template/sample/files/app/genres/webapp/i18n/i18n_en.properties

@@ -0,0 +1,3 @@
+appTitle = Browse Genres
+appSubTitle = CAP Sample Application
+appDescription = Genres as Tree View

package/lib/init/template/sample/files/app/genres/webapp/manifest.json

@@ -25,7 +25,7 @@
             "additionalParameters": "allowed"
           },
           "title": "{{appTitle}}",
-          "subTitle": "{{appDescription}}",
+          "subTitle": "{{appSubTitle}}",
           "semanticObject": "Genres",
           "action": "display"
         }
@@ -123,4 +123,4 @@
     "registrationIds": [],
     "archeType": "transactional"
   }
-}
+}

package/lib/init/template/sample/files/db/data/sap.capire.bookshop-Genres.texts.csv

@@ -0,0 +1,43 @@
+ID,locale,name
+10aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Belletristik
+11aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Drama
+12aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Lyrik
+13aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Fantasy
+131aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Märchen
+132aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Epische Fantasy
+133aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,High Fantasy
+134aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Schauerroman
+14aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Science-Fiction
+141aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Utopien und Dystopien
+1411aaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Utopie
+1412aaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Dystopie
+14121aaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Cyberpunk
+141211aa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Steampunk
+142aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Space Opera
+143aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Zeitreise
+144aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Tech-Noir
+15aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Liebesroman
+151aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Zeitgenössischer Liebesroman
+152aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Historischer Liebesroman
+153aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Romantischer Thriller
+16aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Krimi
+161aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Kriminalroman
+1611aaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Thriller
+16111aaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Polizeikrimi
+16112aaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Justizthriller
+16113aaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Medizinthriller
+16114aaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Spionagethriller
+1612aaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Detektivroman
+1613aaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Spannung
+162aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Noir
+1621aaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Nordic Noir
+1622aaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Tart Noir
+163aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Cosy Crime
+17aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Abenteuer
+18aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Kurzgeschichte
+19aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Graphic Novel
+20aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Sachbuch
+21aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Biografie
+22aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Autobiografie
+23aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Essay
+24aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,de,Rede

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

@@ -49,11 +49,24 @@ module.exports = class SampleTemplate extends require('../../plugin') {
 
         await merge(__dirname, 'files/package.json.hbs').into('package.json', { with: { appPath }})
 
-        // manifest.json must be unique
+        // manifest.json IDs must be unique -> otherwise deployment failures on conflicts
         await Promise.all(project.appUIPaths.map(async p => {
             const manifest = await read(join(appPath, p, 'webapp/manifest.json'))
             manifest['sap.app'].id = appName + '.' + p
             await write(join(appPath, p, 'webapp/manifest.json'), manifest, { spaces: 2 })
         }))
+
+        if (project.isNodejs) { // REVISIT: align with Java samples
+            const fioriSandboxConfigPath = join(appPath, 'appconfig/fioriSandboxConfig.json')
+            const fioriSandboxConfig = await read(fioriSandboxConfigPath)
+            const sampleInbounds = { BrowseBooks: 'browse', ManageAuthors: 'admin-authors', BrowseGenres: 'genres', ManageBooks: 'admin-books' }
+            for (const [name, id] of Object.entries(sampleInbounds)) {
+                const service = fioriSandboxConfig.services?.ClientSideTargetResolution?.adapter?.config?.inbounds?.[name]
+                if (!service) continue
+                if (!service.resolutionResult) service.resolutionResult = {}
+                service.resolutionResult.additionalInformation = `SAPUI5.Component=${appName}.${id}`
+                await write(fioriSandboxConfigPath, fioriSandboxConfig, { spaces: 2 })
+            }
+        }
     }
 }

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

@@ -0,0 +1,13 @@
+{
+  "devDependencies": {
+    "@cap-js/sqlite": "^2"
+  }{{#profile}},
+  "cds": {
+    "requires": {
+      "[{{profile}}]": {
+        "db": "sqlite"
+      }
+    }
+  }
+  {{/profile}}
+}

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

@@ -12,7 +12,7 @@ module.exports = class SQLiteTemplate extends require('../../plugin') {
       const project = readProject()
       const { isNodejs, isJava, configFile } = project
       if (isNodejs) {
-        await merge(__dirname, 'files/package.json').into(configFile)
+        await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project })
       } else if (isJava) {
         await mvn.add('sqlite')
       }

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

@@ -3,6 +3,7 @@ const { exists, read } = cds.utils
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, xsuaa: xsuaaDefault, xsuaa4, mtxSidecar4 } = require('../../registries/mta')
+const KymaTemplate = require('../kyma')
 
 module.exports = class XsuaaTemplate extends require('../../plugin') {
 
@@ -33,7 +34,7 @@ module.exports = class XsuaaTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { addMultitenancy, hasMultitenancy, addMta, hasMta, addHelm, hasHelm, hasHelmUnifiedRuntime, addHelmUnifiedRuntime, isJava, srvPath } = project
+        const { addMultitenancy, hasMultitenancy, addMta, hasMta, addKyma, isJava, srvPath, hasKyma } = project
 
         const cds = require('../../../../lib')
         const xsSecurity = await (async () => {
@@ -82,7 +83,7 @@ module.exports = class XsuaaTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions, overwrites, relationships })
         }
 
-        if (addHelm || addHelmUnifiedRuntime || addMultitenancy && (hasHelm || hasHelmUnifiedRuntime)) {
+        if (addKyma || (addMultitenancy && hasKyma)) {
             const overwrites = addMultitenancy ? [{ item: 'xsuaa.parameters.tenant-mode', withValue: 'shared' }] : []
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project, overwrites })
             await merge({
@@ -92,6 +93,8 @@ module.exports = class XsuaaTemplate extends require('../../plugin') {
                     }
                 }
             }).into('chart/values.yaml')
+            await KymaTemplate.mergeDependency('service-instance', 'xsuaa')
+
         }
     }
 }

package/lib/lint/eslintHelp.json

@@ -1,5 +1,5 @@
 {
-  "version": "9.39.1",
+  "version": "9.39.2",
   "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/util/checksum.js

@@ -1,5 +1,5 @@
 const cds = require('../../lib/cds')
-const { read } = cds.utils
+const { read, stat } = cds.utils
 const crypto = require('crypto')
 const { getFiles } = require('../build/util')
 
@@ -12,18 +12,27 @@ const { getFiles } = require('../build/util')
  */
 async function calcDirChecksum(dirPath, filter = [], hashFunction = 'sha256', optionalFiles = []) {
   const hash = crypto.createHash(hashFunction)
-  const files = await getFiles(dirPath, filter)
 
-  for (const file of files.sort()) {
-    const content = await read(file, "binary")
-    hash.update(file)
-    hash.update(content)
+  let stats
+  try {
+    stats = await stat(dirPath)
+  } catch {
+    return hash.digest('hex')
   }
 
-  for (const file of optionalFiles.sort()) {
-    const content = await read(file, "binary")
-    hash.update(file)
-    hash.update(content)
+  if (stats.isFile()) {
+    hash.update(await read(dirPath, "binary"))
+    return hash.digest('hex')
+  }
+
+  const files = [...(await getFiles(dirPath, filter, [], true)), ...optionalFiles].sort()
+  for (const file of files) {
+    try {
+      hash.update(file)
+      hash.update(await read(file, "binary"))
+    } catch {
+      // ignore
+    }
   }
 
   return hash.digest('hex')

package/lib/util/fs.js

@@ -1,6 +1,8 @@
+const { parse } = require('node:path')
+
 const YAML = require('yaml')
 const { read, write } = require('../cds').utils
-const JSONC = require('./jsonc');
+const JSONC = require('./jsonc')
 
 // REVISIT: Consider merging with template util
 
@@ -59,4 +61,9 @@ module.exports = new class FsUtil {
         const json = await this.readJSON(src, project)
         await write(dst, json, { spaces: 2 })
     }
+
+    isRoot(folder) {
+        const { root, dir } = parse(folder)
+        return root === dir
+    }
 }

package/lib/util/glob.js

@@ -1,13 +1,16 @@
 const path = require('node:path');
 const { join } = path;
-const { existsSync } = require('node:fs');
 const { readdir } = require('node:fs').promises;
 
+const IGNORE_DIRS = new Set(['node_modules', '.git', '.hg', '.svn', 'dist', 'target', 'build', 'out']);
+
+
 /**
  * Returns an AsyncIterator of those (recursive) subdirectories that match the glob pattern.
- * @param pattern - The glob pattern to match against.
- * @param cwd - The current working directory to start the search from.
- * @returns {AsyncIterator<string>} - An array of relative paths that match the glob pattern.
+ * Skips common large directories (node_modules, .git, .hg, .svn, dist, target, build, out).
+ * @param {string} pattern - The glob pattern to match against.
+ * @param {string} cwd - The current working directory to start the search from.
+ * @returns An array of relative paths that match the glob pattern.
  */
 async function* glob(pattern, { cwd } = { cwd: process.cwd() }) {
   if (/\{.*}/.test(pattern)) {
@@ -18,32 +21,42 @@ async function* glob(pattern, { cwd } = { cwd: process.cwd() }) {
     }
     return globNative(pattern, { cwd });
   }
-  yield* (await globArray(pattern, { cwd }));
+  yield* (await globArray(pattern, cwd));
 }
 
 /**
  * Returns those subdirectories, recursively, that match the glob pattern.
- * @param pattern - The glob pattern to match against.
- * @param cwd - The current working directory to start the search from.
+ * Skips common large directories (node_modules, .git, .hg, .svn, dist, target, build, out).
+ * @param {string} pattern - The glob pattern to match against.
+ * @param {string} cwd - The current working directory to start the search from.
  * @returns {Promise<string[]>} - An array of relative paths that match the glob pattern.
  */
-async function globArray(pattern, { cwd }) {
+async function globArray(pattern, cwd) {
   const regex = globToRegex(pattern);
   return (await subdirs(cwd))
       .map(fullPath => path.relative(cwd, fullPath))
-      .filter(relativePath => regex.test(relativePath));
+      .filter(relativePath => regex.test(relativePath.replace(/\\/g, '/')));
 }
 
 /**
  * Recursively returns all subdirectories of a given directory.
  * Returns only non-hidden directories (those not starting with a dot).
- * @param {import('fs').PathLike} dir - The directory to search in.
+ * Skips common large directories like node_modules, .git, etc.
+ * @param {string} dir - The directory to search in.
  * @returns {Promise<String[]>} - An array of paths to subdirectories.
  */
 async function subdirs(dir) {
-  if (!existsSync(dir)) return [];
-  const children = (await readdir(dir, { withFileTypes: true }))
-      .filter(child => child.isDirectory() && !child.name.startsWith('.'));
+  let entries;
+  try {
+    entries = await readdir(dir, { withFileTypes: true });
+  } catch (err) {
+    return [];
+  }
+
+  const children = entries.filter(child =>
+      child.isDirectory() && !child.name.startsWith('.') && !IGNORE_DIRS.has(child.name)
+  );
+
   return (await Promise.all(
       children.map(async child => {
         const childPath = join(dir, child.name);

package/lib/util/term.js

@@ -34,7 +34,9 @@ const format = module.exports.format = (o, severity='Error', asInternalError=fal
     default       : return format.info (o)
   }
 }
-format.colors = process.stdout.isTTY && process.stderr.isTTY && process.env.NO_COLOR !== 'true' || (process.env.FORCE_COLOR && process.env.FORCE_COLOR !== 'false')
+const forceColor = process.env.FORCE_COLOR && process.env.FORCE_COLOR !== 'false'
+const rendersColors = process.stdout.isTTY && process.stderr.isTTY || process.env.GITHUB_ACTIONS
+format.colors = rendersColors && process.env.NO_COLOR !== 'true' || forceColor
 
 // decorate.error, .warning, .info
 // 'Error: foo'  ->  '[ERROR] foo'  (Maven-like, allows for better grepping in logs)

package/lib/watch/livereload-server.js

@@ -5,10 +5,11 @@ const ws = require('ws')
 const express = require('express')
 const { URL } = require('url')
 const { relative, sep } = require ('path')
+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 = RegExp(`@cds-models\\${sep}|@types\\${sep}`)
+const watchExcludes = new RegExp(`${escapedSep}(node_modules|\\.git|dist)(${escapedSep}|$)|@cds-models${escapedSep}|@types${escapedSep}`)
 
 module.exports = class LiveReload {
   async start(port, cwd, delay=0) {
@@ -83,14 +84,14 @@ module.exports = class LiveReload {
       })
 
       // Watching for touched files...
-      const watch = require('node-watch')
+      const watch = require('./watcher')
       const filter = f => {
         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)
         return isIn
       }
-      const watcher = watch (cwd||process.cwd(),{ recursive:true, filter, delay:0 })
+      const watcher = watch (cwd||process.cwd(),{ filter, ignore: watchExcludes })
       if (DEBUG) watcher.on('close', ()=> DEBUG('⚡️', 'cds watch - livereload file watcher closed'))
       watcher.on('change', _coalesceEvents(delay, (files) => {
         DEBUG?. (`livereload for: ${files.map(f => f.name)}`)

package/lib/watch/node-watch.js

@@ -49,7 +49,7 @@ module.exports = ({ cwd = process.cwd(), script, ext, ignore=RegExp(), watched,
   process.on('shutdown', ()=> _kill(child))
 
   // Watching for touched files...
-  const watch = require('node-watch')
+  const watch = require('./watcher')
   const include = RegExp(`\\.(${ext.replace(/,/g,'|')})$`)
   const filter = f => {
     const isIn = !ignore.test(f) && include.test(f)
@@ -57,7 +57,7 @@ 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,{ recursive:true, filter, delay:0 })
+  const watcher = watch (watched,{ filter, ignore })
   if (DEBUG) watcher.on('close', ()=> DEBUG('⚡️', 'cds watch - file watcher closed'))
   watcher.on('change', restart)
   process.on('shutdown', ()=> watcher.close())
@@ -78,12 +78,9 @@ module.exports = ({ cwd = process.cwd(), script, ext, ignore=RegExp(), watched,
 
   emitter.restart = restart
   emitter.stop    = () => _kill(child)
-  emitter.setEnv  = (name, value) => {
-    if (typeof value === "undefined") {
-      delete env[name]
-    } else {
-      env[name] // REVISIT: no value assigned ???
-    }
+  emitter.setEnv = (name, value) => {
+    if (typeof value === 'undefined') delete env[name]
+    else env[name] = value
   }
   return emitter
 }

package/lib/watch/watcher.js

@@ -0,0 +1,136 @@
+const fs = require('node:fs')
+const { resolve, sep } = require('node:path')
+const { EventEmitter } = require('node:events')
+
+module.exports = function watch(paths, { filter, ignore } = {}) {
+  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 useNativeRecursive = process.platform === 'darwin' || process.platform === 'win32'
+  if (useNativeRecursive) {
+    const _watch = async root => {
+      try {
+        if (!fs.existsSync(root)) return
+        const watcher = fs.promises.watch(root, { recursive: true, signal: ac.signal })
+        for await (const event of watcher) {
+          if (closed) break
+          const name = event.filename?.toString?.() ?? event.filename ?? ''
+          const fullPath = resolve(root, name)
+          if (_allow(fullPath)) {
+            ee.emit('change', fs.existsSync(fullPath) ? 'update' : 'remove', fullPath)
+          }
+        }
+      } catch (e) {
+        if (e.name !== 'AbortError') ee.emit('error', e)
+      }
+    }
+
+    roots.forEach(r => _watch(r).catch(e => ee.emit('error', e)))
+
+    ee.close = () => {
+      if (closed) return
+      closed = true
+      ac.abort()
+      ee.emit('close')
+    }
+
+    return ee
+  } else {
+    return _linuxCompat()
+  }
+
+  // On Linux, recursive watchers allocates OS watchers for the whole tree,
+  // so we avoid it to skip ignored dirs before allocating watchers.
+  function _linuxCompat() {
+    const watching = new Set()
+    const queued = new Set()
+    const queue = []
+    const active = new Set()
+    const max = 32
+
+    const _ignored = p => {
+      if (!ignore) return false
+      const test = ignore instanceof RegExp ? s => ignore.test(s) : ignore
+      return test(p) || test(p + sep) // allow trailing sep
+    }
+    const _enqueue = d => {
+      if (closed) return
+      const dir = resolve(d)
+      if (_ignored(dir)) return
+      if (watching.has(dir) || queued.has(dir)) return
+      queued.add(dir)
+      queue.push(dir)
+      _pump()
+    }
+    const _startWatch = dir => {
+      if (watching.has(dir)) return
+      watching.add(dir)
+      ;(async () => {
+        try {
+          if (!fs.existsSync(dir)) return
+          const watcher = fs.promises.watch(dir, { signal: ac.signal }) // non-recursive
+          for await (const event of watcher) {
+            if (closed) break
+            const name = event.filename?.toString?.() ?? event.filename ?? ''
+            const fullPath = name ? resolve(dir, name) : dir
+
+            // if a new dir appears, start watching it (unless ignored)
+            if (name && !_ignored(fullPath) && fs.existsSync(fullPath)) {
+              try {
+                if (fs.lstatSync(fullPath).isDirectory()) _enqueue(fullPath)
+              } catch { /* ignore */ }
+            }
+            if (_allow(fullPath)) {
+              ee.emit('change', fs.existsSync(fullPath) ? 'update' : 'remove', fullPath)
+            }
+          }
+        } catch (e) {
+          if (e.name !== 'AbortError' && !closed) ee.emit('error', e)
+        }
+      })().catch(e => ee.emit('error', e))
+    }
+
+    const _scan = async dir => {
+      _startWatch(dir)
+
+      let entries = []
+      try { entries = await fs.promises.readdir(dir, { withFileTypes: true }) }
+      catch { return }
+
+      for (const e of entries) {
+        if (e.isSymbolicLink?.()) continue
+        if (!e.isDirectory?.()) continue
+        const child = resolve(dir, e.name)
+        if (!_ignored(child)) _enqueue(child)
+      }
+    }
+
+    const _pump = () => {
+      while (!closed && queue.length && active.size < max) {
+        const dir = queue.shift()
+        queued.delete(dir)
+
+        const p = _scan(dir)
+          .catch(e => ee.emit('error', e))
+          .finally(() => {
+            active.delete(p)
+            _pump()
+          })
+
+        active.add(p)
+      }
+    }
+    roots.forEach(_enqueue)
+    ee.close = () => {
+      if (closed) return
+      closed = true
+      ac.abort()
+      ee.emit('close')
+    }
+    return ee
+  }
+}