@sap/cds-dk 9.4.3 → 9.6.0

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, 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 () => {
@@ -53,16 +54,14 @@ module.exports = class XsuaaTemplate extends require('../../plugin') {
             additions.push(xsuaa)
             if (addMta) {
                 const srv = srv4(srvPath)
-                additions.push(srv)
                 relationships.push({
                     insert: [xsuaa, 'name'],
                     into: [srv, 'requires', 'name']
                 })
             }
-            if (addMultitenancy) {
+            if (hasMultitenancy) {
                 const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
-                additions.push(mtxSidecar)
-                overwrites.push({ item: [mtxSidecar, 'parameters.tenant-mode'], withValue: 'shared' })
+                overwrites.push({ item: [xsuaa, 'parameters.config.tenant-mode'], withValue: 'shared' })
                 relationships.push({
                     insert: [xsuaa, 'name'],
                     into: [mtxSidecar, 'requires', 'name']
@@ -84,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({
@@ -94,6 +93,8 @@ module.exports = class XsuaaTemplate extends require('../../plugin') {
                     }
                 }
             }).into('chart/values.yaml')
+            await KymaTemplate.mergeDependency('service-instance', 'xsuaa')
+
         }
     }
 }

package/lib/lint/Linter.js

@@ -65,10 +65,16 @@ async function findConfigPath (currentDir = '.') {
   let configDir = path.resolve(currentDir)
   while (configDir && configDir !== path.dirname(configDir)) {
     for (const configFile of configFiles) {
-      const configPath = path.join(configDir, configFile)
-      const config = await tryRequire(configPath)
-      if ((configFile !== 'package.json' || config?.eslintConfig) && isfile(configPath)) {
-        return configPath
+      try {
+        const configPath = path.join(configDir, configFile)
+        const config = await tryRequire(configPath)
+        if ((configFile !== 'package.json' || config?.eslintConfig) && isfile(configPath)) {
+          return configPath
+        }
+      } catch {
+        // attempting to load config files may fail for various reasons we can not easily verify by error code, for example
+        // "Cannot use import statement outside a module" in a TS context, or attempting to read .mts files without properly setting them up.
+        // We just ignore these errors and treat them as "no valid config found so far, continue searching", lest the exception flys up.
       }
     }
     configDir = path.dirname(configDir)

package/lib/lint/eslintHelp.json

@@ -1,5 +1,5 @@
 {
-  "version": "9.38.0",
+  "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/mtx/tenant_action.js

@@ -1,6 +1,7 @@
 const cds = require('../cds');
 const { ParamCollection } = require('./params');
 const AuthManager = require('./auth_manager');
+const { localhostRegex } = require('./util/urls');
 
 require('../util/axios').pruneErrors();
 const { getMessage } = require('./util/logging');
@@ -15,6 +16,9 @@ const COMMANDS = {
     unsubscribe: 'from'
 };
 
+const DEFAULT_SUBSCRIBE_USER = 'yves';
+const DEFAULT_SUBSCRIBE_PASSWORD = '';
+
 module.exports = class TenantAction {
 
     // TODO JSDoc
@@ -33,12 +37,19 @@ module.exports = class TenantAction {
     async run(paramValues, { tenant, local } = {}) {
         let params = new ParamCollection(paramValues);
         params.set('skipToken', true); // Token would have insufficient scopes for this command.
+
         if (local) {
             // Connect to locally-served MTXS
             await this.runWithServer(params, tenant);
         } else {
-            // Connect to running MTXS server
             params = await AuthManager.login(params.toEntries());
+            // subscribe: use 'yves' as default username against localhost if no username is provided
+            if (this.command === 'subscribe' && !params.has('username') && params.has('appUrl') && localhostRegex.test(params.get('appUrl'))) {
+                params.set('username', DEFAULT_SUBSCRIBE_USER);
+                params.set('password', DEFAULT_SUBSCRIBE_PASSWORD);
+                params = await AuthManager.login(params.toEntries()); // set reqAuth param
+            }
+            // Connect to running MTXS server
             await this.runClientOnly(params, tenant);
         }
         console.log(`${capitalize(this.command)} successful.`);
@@ -80,9 +91,6 @@ module.exports = class TenantAction {
         }
 
         const { cds_mtx } = require(libPath);
-        if (!cds_mtx) {
-            throw '@sap/cds-mtxs outdated. Please upgrade to @sap/cds-mtxs@>=1.7.0 and re-run this command.';
-        }
         const body = params.get('body')
         return cds_mtx(this.command, tenant, body);
     }

package/lib/util/checksum.js

@@ -0,0 +1,41 @@
+const cds = require('../../lib/cds')
+const { read, stat } = cds.utils
+const crypto = require('crypto')
+const { getFiles } = require('../build/util')
+
+/**
+ * Calculate a checksum for a directory, excluding specified patterns.
+ * @param {string} dirPath - The directory path to calculate checksum for.
+ * @param {(file: string) => boolean} [filter] - the filter function to apply to the found files
+ * @param {string} [hashFunction='sha256'] - The hash function to use (default is 'sha256').
+ * @returns {Promise<string>} - The checksum as a hex string.
+ */
+async function calcDirChecksum(dirPath, filter = [], hashFunction = 'sha256', optionalFiles = []) {
+  const hash = crypto.createHash(hashFunction)
+
+  let stats
+  try {
+    stats = await stat(dirPath)
+  } catch {
+    return hash.digest('hex')
+  }
+
+  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')
+}
+
+module.exports = { calcDirChecksum }

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/question.js

@@ -1,6 +1,14 @@
 const readline = require('node:readline')
+const { Writable } = require('node:stream')
 
-async function ask4(...args) {
+async function ask4([...args], { redacted = false } = {}) {
+  var mutableStdout = new Writable({
+    write: function (chunk, encoding, callback) {
+      if (!redacted)
+        process.stdout.write(chunk, encoding);
+      callback();
+    }
+  });
 
   // If not in interactive mode, read all input at once.
   if (!process.stdin.isTTY) {
@@ -13,19 +21,64 @@ async function ask4(...args) {
   }
 
   const answers = []
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout })
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: mutableStdout,
+    terminal: true
+  })
 
   const askQuestion = question =>
-    new Promise(resolve => rl.question(question, answer => {
-      answers.push(answer)
-      resolve()
-    }))
+    new Promise(resolve => {
+      if (redacted && process.stdin.isTTY) {
+        // Set raw mode to intercept keystrokes
+        process.stdin.setRawMode(true)
+        process.stdout.write(question)
+
+        let answer = ''
+        const onData = (char) => {
+          const byte = char.toString()
+
+          // Enter key
+          if (byte === '\n' || byte === '\r') {
+            process.stdin.setRawMode(false)
+            process.stdin.removeListener('data', onData)
+            process.stdout.write('\n')
+            answers.push(answer)
+            resolve()
+          }
+          // Backspace/Delete
+          else if (byte === '\b' || byte === '\x7f') {
+            if (answer.length > 0) {
+              answer = answer.slice(0, -1)
+              process.stdout.write('\b \b')
+            }
+          }
+          // Ctrl+C
+          else if (byte === '\x03') {
+            process.stdin.setRawMode(false)
+            process.exit()
+          }
+          // Regular character
+          else if (byte >= ' ' || byte === '\t') {
+            answer += byte
+            process.stdout.write('*')
+          }
+        }
+
+        process.stdin.on('data', onData)
+      } else {
+        rl.question(question, answer => {
+          answers.push(answer)
+          resolve()
+        })
+      }
+    })
 
   for (const question of args) {
     await askQuestion(question)
   }
   rl.close()
-  return Array.isArray(args) ? answers[0] : answers
+  return args.length == 1 ? answers[0] : answers
 }
 
 module.exports = { ask4 }