@sap/cds-dk 8.9.5 → 9.0.5

package/lib/util/glob.js

@@ -0,0 +1,77 @@
+const path = require('node:path');
+const { join } = path;
+const { existsSync } = require('node:fs');
+const { readdir } = require('node:fs').promises;
+
+/**
+ * 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.
+ */
+async function* glob(pattern, { cwd } = { cwd: process.cwd() }) {
+  if (/\{.*}/.test(pattern)) {
+    // We rely on the native Node.js glob support for brace expansion.
+    const { glob: globNative } = require('node:fs/promises');
+    if (!globNative) {
+      throw `Glob pattern '${pattern} requires native Node.js glob support to resolve, which is available in Node.js version 22, but project uses ${process.version}.`
+    }
+    return globNative(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.
+ * @returns {Promise<string[]>} - An array of relative paths that match the glob pattern.
+ */
+async function globArray(pattern, { cwd }) {
+  const regex = globToRegex(pattern);
+  return (await subdirs(cwd))
+      .map(fullPath => path.relative(cwd, fullPath))
+      .filter(relativePath => regex.test(relativePath));
+}
+
+/**
+ * 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.
+ * @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('.'));
+  return (await Promise.all(
+      children.map(async child => {
+        const childPath = join(dir, child.name);
+        const descendants = await subdirs(childPath);
+        return [childPath, ...descendants];
+      })
+  )).flat();
+}
+
+/**
+ * Converts a glob pattern to a regular expression.
+ * Supports the following wildcards: `? * ** [...] [!...]`.
+ * Patterns such as `./foo` are normalized to `foo`.
+ * @param {string} glob - The glob pattern to convert.
+ * @returns {RegExp} - The regular expression that matches the glob pattern.
+ */
+function globToRegex(glob) {
+  const regex = glob
+      .replace(/^\.\//, '')
+      .replaceAll('**', '|')
+      .replaceAll(/\[!([^\]]+)]/g, '[^$1]')
+      .replaceAll('?', '[^/]')
+      .replaceAll('*', '[^/]*')
+      .replaceAll('|', '.*');
+
+  return new RegExp(`^${regex}$`);
+}
+
+module.exports = {
+  glob
+};

package/lib/watch/livereload-server.js

@@ -1,5 +1,4 @@
-const cds = require('../cds')
-const LOG = cds.log('cli|watch|livereload'), DEBUG = cds.debug('cli|watch|livereload')
+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')
@@ -70,7 +69,7 @@ module.exports = class LiveReload {
             }
           })
         })
-        if (LOG._debug) {
+        if (DEBUG) {
           server.on('close', () => DEBUG('⚡️','cds watch - livereload closed'))
           this.wsServer.on('close', () => DEBUG('⚡️','cds watch - web socket closed'))
           this.wsServer.on('error', (e) => DEBUG(e))
@@ -92,7 +91,7 @@ module.exports = class LiveReload {
         return isIn
       }
       const watcher = watch (cwd||process.cwd(),{ recursive:true, filter, delay:0 })
-      if (LOG._debug) watcher.on('close', ()=> DEBUG('⚡️', 'cds watch - livereload file watcher closed'))
+      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)}`)
         this.markPending(files.map(f => f.name))

package/lib/watch/node-watch.js

@@ -1,5 +1,4 @@
-const cds = require ('../cds')
-const LOG = cds.log('cli|watch'), DEBUG = cds.debug('cli|watch')
+const DEBUG = /\b(y|all|cli|watch)\b/.test (process.env.DEBUG) ? ((..._) => console.debug ('[cli] -', ..._)) : undefined
 const { relative } = require('path')
 
 module.exports = ({ cwd = process.cwd(), script, ext, ignore=RegExp(), watched, env={}, delay=200, options={} })=>{
@@ -59,7 +58,7 @@ module.exports = ({ cwd = process.cwd(), script, ext, ignore=RegExp(), watched,
     return isIn
   }
   const watcher = watch (watched,{ recursive:true, filter, delay:0 })
-  if (LOG._debug) watcher.on('close', ()=> DEBUG('⚡️', 'cds watch - file watcher closed'))
+  if (DEBUG) watcher.on('close', ()=> DEBUG('⚡️', 'cds watch - file watcher closed'))
   watcher.on('change', restart)
   process.on('shutdown', ()=> watcher.close())
 
@@ -74,7 +73,7 @@ module.exports = ({ cwd = process.cwd(), script, ext, ignore=RegExp(), watched,
     else if (input === 'bye' || input.match(/^n$/i)) { _kill (child)  }
     else console.log ('?\n')
   })
-  if (LOG._debug) readline.on('close', ()=> DEBUG('⚡️', 'cds watch - readline closed'))
+  if (DEBUG) readline.on('close', ()=> DEBUG('⚡️', 'cds watch - readline closed'))
   process.on('shutdown', ()=> readline.close())
 
   emitter.restart = restart

package/lib/watch/watched.js

@@ -26,7 +26,7 @@
   }}
 
   function _no_models_found(e) { console.log (`
-    No models found in ${cds.resolve(e.model||'*',false)}.
+    No models found in ${e.locations||cds.resolve(e.model||'*',false)}.
     Waiting for some to arrive...
   `)}