@sap/cds-dk 7.9.6 → 8.0.3

package/lib/mtx/tenant_action.js

@@ -23,7 +23,7 @@ module.exports = class TenantAction {
      */
     constructor(command) {
         if (!(command in COMMANDS)) {
-            throw new Error(`invalid command: ${command}`);
+            throw `invalid command: ${command}`;
         }
         this.command = command;
         this.gerund = command.replace(/e$/, 'ing');

package/lib/mtx/util/cf.js

@@ -9,7 +9,7 @@ const { schemaRegex } = require('./urls');
 const DEBUG = cds.debug('cli');
 
 function runCf(args, callback) {
-    const env = Object.assign({}, process.env, { LC_ALL: 'en_US.UTF-8' }); // enforce English headings
+    const env = { ...process.env, LC_ALL: 'en_US.UTF-8' }; // enforce English headings
     return execFile('cf', args, { env }, callback);
 }
 

package/lib/mtx/util/fs.js

@@ -72,11 +72,36 @@ function isParent(maybeParent, maybeChild) {
     return ! path.relative(maybeParent, maybeChild).startsWith('..');
 }
 
+/**
+ * Searches for a regular expression in a directory tree
+ * @param folder directory to search in
+ * @param extensions file extensions to search for (use lower-case strings)
+ * @param regex regular expression to search for
+ * @return {boolean} true if the regular expression was found in a file
+ */
+function grepQR(folder, extensions, regex) {
+    for (const dirent of fs.readdirSync(folder, { withFileTypes: true })) {
+        if (dirent.isFile() &&
+            extensions.some(x => dirent.name.toLowerCase().endsWith(x))) {
+            try {
+                if (regex.test(fs.readFileSync(path.join(folder, dirent.name), { encoding: 'utf-8' }))) {
+                    return true;
+                }
+            } catch (error) { /* ignore */ }
+        }
+        if (dirent.isDirectory() && grepQR(path.join(folder, dirent.name), extensions, regex)) {
+            return true;
+        }
+    }
+    return false;
+}
+
 
 module.exports = {
     collectFileContent,
     collectFiles,
     toUnixPath,
     normalizePath,
-    isParent
+    isParent,
+    grepQR
 };

package/lib/mtx/util/logging.js

@@ -1,4 +1,4 @@
-/* eslint-disable no-console */
+ 
 
 function getMessage(errorText, { error, command, help = command && getCommandHelp(command) } = {}) {
     let message = errorText ? errorText.trim() : '';
@@ -16,8 +16,12 @@ function getMessage(errorText, { error, command, help = command && getCommandHel
         if (includeStack) {
             message += (oriMsg ? '\n' : '') + error.stack;
         }
-        if (debug && error.cause) {
-            message += '\nCaused by: ' + getMessage('', { error: error.cause }).replace(/^(?= *at)/gm, '  ');
+        if (error.cause) {
+            if (debug) {
+                message += '\nCaused by: ' + getMessage('', { error: error.cause }).replace(/^(?= *at)/gm, '  ');
+            } else if (error.cause.status) {
+                message += `\nHTTP status: ${error.cause.status}`;
+            }
         }
     }
     if (typeof help === 'string') {

package/lib/util/command.js

@@ -1,5 +1,3 @@
-// REVISIT: Consolidate with lib/util/exec.js
-
 const cp = require('child_process');
 const os = require('os');
 const cds = require('../cds');

package/lib/util/fs.js

@@ -1,6 +1,5 @@
-const { yaml: YAML } = require('@sap/cds-foss')
+const { read, write, yaml: YAML } = require('../cds').utils
 const JSONC = require('./jsonc');
-const { read, write } = require('../cds').utils;
 
 // REVISIT: Consider merging with template util
 
@@ -28,7 +27,7 @@ module.exports = new class FsUtil {
     }
 
     async writeYAML(dst, yaml) {
-        const content = YAML.stringify(yaml, { collectionStyle: 'block', lineWidth: 120 })
+        const content = YAML.stringify(yaml, { collectionStyle: 'block', lineWidth: 150 })
         await write(content).to(dst)
     }
 

package/lib/util/question.js

@@ -0,0 +1,28 @@
+const readline = require('readline')
+async function ask4(...args) {
+    const answers = []
+    const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+    })
+
+    async function askQuestion(questionParam) {
+        return new Promise(function (resolve) {
+            rl.question(`${questionParam}`, function (answer) {
+                answers.push(answer);
+                resolve();
+            });
+        });
+    }
+
+    for (const idx in args) {
+        await askQuestion(args[idx])
+    }
+
+    rl.close()
+    return answers
+}
+
+module.exports = {
+  ask4
+}

package/lib/util/term.js

@@ -9,13 +9,15 @@ const t = module.exports.codes = {
   red: '\x1b[91m', // Bright Foreground Red
   green: '\x1b[32m', // Foreground Green
   blue: '\x1b[34m', // Foreground Blue
+  yellow:'\x1b[33m', // Foreground Yellow
   orange: '\x1b[38;2;255;140;0m' // darker orange, works with bright and dark background
 }
 
-Object.defineProperty(module.exports, 'isTTY',  { get: () => process.stdin.isTTY && process.stderr.isTTY })
-
+Object.defineProperty(module.exports, 'isTTY',  { get: () => process.stdout.isTTY && process.stderr.isTTY })
+const useColor = module.exports.isTTY && process.env.NO_COLOR !== 'true' || (process.env.FORCE_COLOR && process.env.FORCE_COLOR !== 'false')
+module.exports.colors = useColor
 const as = module.exports.as = (codes, o) => {
-  return module.exports.isTTY && !process.env.NO_COLOR ? (codes + o + t.reset) : ('' + o)
+  return useColor ? (codes + o + t.reset) : ('' + o)
 }
 
 const asErr = module.exports.error = o => DEBUG ? o : as(t.red + t.bold, o)