@sap/cds-dk 9.0.5 → 9.1.0

package/lib/util/axios.js

@@ -2,7 +2,16 @@ module.exports = {
     pruneErrors
 };
 
+let interceptor
+
 function pruneErrors() {
+
+    if (interceptor) {
+        // Already set up.
+        return;
+    }
+    interceptor = true;
+
     function stacklessError(message) {
         const { stackTraceLimit } = Error;
         Error.stackTraceLimit = 0;
@@ -15,56 +24,93 @@ function pruneErrors() {
         response => response,
         axError => {
             const { inspect } = require('util');
+
             let { url, method } = axError.config ?? {};
             url = url?.replace(/(passcode|refreshToken|clientsecret|key)=[^&]+/g, '$1=...');
+
             const { errno, code, response = {}, message: axMessage } = axError;
             const prefix = (url && method ? `${method.toUpperCase()} ${url}` : 'Request') + ' failed';
 
+            function fixData(data) {
+                if (Buffer.isBuffer(data)) {
+                    let str = data.toString();
+                    try {
+                        data = JSON.parse(str);
+                    } catch {
+                        data = str;
+                    }
+                }
+                return data;
+            }
+
+            function extractErrorDetails(data) {
+                if (!data) return undefined;
+
+                if (typeof data === "string") {
+                    if (/<html/i.test(data)) {
+                        return '(HTML response received. If applicable, ensure the route to MTX is configured correctly in App Router.)';
+                    }
+                    if (data.length >= 1000) return undefined;
+                    return data.trim();
+                }
+
+                if (typeof data === "object") {
+                    if (data.error_description) return data.error_description; // OAuth RFC
+                    if (data.error && typeof data.error === "object" && data.error.message) return data.error.message;
+                    if (data.error && typeof data.error === "string") return data.error;
+                    if (typeof data.message === "string") return data.message;
+                    return inspect(data); // fallback
+                }
+
+                return undefined;
+            }
+
             let error;
+            const debug = require('../').log('req')._debug;
+
             if (errno) {
-                // System error during request.
-                const message = prefix
-                    + `: ${errno} ${code}`
-                    + (/\b(ENOTFOUND|EAI_AGAIN)\b/.test(code) ? `. Make sure the URL is correct and the server is running.` : '');
+                // System/network errors
+                const message = prefix +
+                    `: ${errno} ${code}` +
+                    (/\b(ENOTFOUND|EAI_AGAIN)\b/.test(code)
+                        ? `. Make sure the URL is correct and the server is running.`
+                        : '');
                 error = stacklessError(message);
             } else {
-                // Error after request has been made.
+                // HTTP errors
                 const { status, statusText } = response;
                 let { data } = response;
-                if (Buffer.isBuffer(data)) {
-                    data = data.toString();
-                    try {
-                        data = JSON.parse(data);
-                    } catch (error) { /* unexpected; data will be included in error below */
-                    }
-                }
-                const inspectData = data && !data.error_description;
-                const reason = !inspectData && data?.error /* RFC 6749 */ && (typeof data.error === 'string' ? data.error : inspect(data.error));
-                const details = inspectData ? inspect(data) : data?.error_description /* RFC 6749 */;
-                const message = prefix + (
-                    status || statusText || reason || details
-                        ? (status || statusText ? ':' : '') +
-                        (status ? ` ${status}` : '') +
-                        (statusText ? ` ${statusText}` : '') +
-                        (reason ? `. ${reason}` : '') +
-                        (details ? `. Details: ${details}` : '')
-                        : (axMessage ? `: ${axMessage}` : '')
-                );
+                data = fixData(data);
+                const details = extractErrorDetails(data);
+                const reason = typeof data?.error === "string"
+                    ? data.error
+                    : undefined;
+                const errObj = debug && typeof data.error === 'object'
+                    ? inspect(data.error)
+                    : undefined;
+
+                const message = prefix +
+                    (status || statusText || reason || details
+                            ? (status || statusText ? ':' : '') +
+                              (status ? ` ${status}` : '') +
+                              (statusText ? ` ${statusText}` : '') +
+                              (reason ? `. ${reason}` : '') +
+                              (details ? `. Details: ${details}` : '') +
+                              (errObj ? `. Error object: ${errObj}` : '')
+                            : (axMessage ? `: ${axMessage}` : '')
+                    );
 
                 error = stacklessError(message);
-                if (status) {
-                    error.status = status;
-                }
+                if (status) error.status = status;
                 if (data?.passcode_url) {
-                    error.auth = {
-                        passcode_url: data.passcode_url
-                    };
+                    error.auth = { passcode_url: data.passcode_url };
                 }
             }
 
-            if (require('../').debug('req')) {
+            if (debug) {
                 error.cause = axError;
             }
+
             return Promise.reject(error);
         }
     );

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "9.0.5",
+  "version": "9.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "9.0.5",
+      "version": "9.1.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/asyncapi": "^1.0.0",
@@ -42,8 +42,8 @@
       }
     },
     "node_modules/@cap-js/db-service": {
-      "version": "2.1.1",
-      "integrity": "sha512-lkT8hQtMGLOWpbZzSWoMfoZe4vByuJZ9PierJPIhgLbayMLyTQ8iMKNgme1FW3nXFPc7JMJlEImskmhOygllAQ==",
+      "version": "2.1.2",
+      "integrity": "sha512-wbbEhUaSnQnYSC2029CO8MLAag5k/mJAtu6nyJUYfZbjkfr/JnP9lG5ylHg1dQtjRfAjPds+lxZIo35DHwNsVQ==",
       "devOptional": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -78,8 +78,8 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.28.0",
-      "integrity": "sha512-fnqSjGWd/CoIp4EXIxWVK/sHA6DOHN4+8Ix2cX5ycOY7LG0UY8nHCU5pIp2eaE1Mc7Qd8kHspYNzYXT2ojPLzg==",
+      "version": "9.30.1",
+      "integrity": "sha512-zXhuECFlyep42KZUhWjfvsmXGX39W8K8LFb8AWXM9gSV9dQB+MrJGLKvW6Zw0Ggnbpw0VHTtrhFXYe3Gym18jg==",
       "license": "MIT",
       "peer": true,
       "engines": {
@@ -90,8 +90,8 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "9.0.3",
-      "integrity": "sha512-9bMeDY66A8Eh+AkmemK1EdDmquswofn7qISNp9SGiIJ1cmF1LtysiAjs9IR/taHnv7IEacvHUK+A7X3VDm0iQg==",
+      "version": "9.1.0",
+      "integrity": "sha512-i5bAVbFzi1uN11O4U6SdPKzYDDxc+YDSWMiqt1ryxT0WYrrehJPg5pJQjy4AH1EgRIqa3eqK2RfmHS6SgkBOyg==",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": "^6",
@@ -120,8 +120,8 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "6.0.12",
-      "integrity": "sha512-7X68zXRJNjJfVFI7Qesp/YrCVTNCvmuGLRxdBSbpiZkgz6Wq9q4iTMeUg+8NcCynv+KaS6x1hSDfAEWTL0iLDA==",
+      "version": "6.1.0",
+      "integrity": "sha512-s71fsxDZKqHn2xvoqoNst54K/BkBzCpiU+8xc0t3nMDXmsLzSC3VfygZGwGAZD8fkxUnXh8oL2XLHWKWcvcdNg==",
       "license": "SEE LICENSE IN LICENSE",
       "bin": {
         "cdsc": "bin/cdsc.js",
@@ -142,8 +142,8 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "3.0.1",
-      "integrity": "sha512-9Jl2GgDueLHn7xuOL0igawT4knNEIogbo7r1OOwh4TPb2nbo3EZqs1/QlkF9OKk6+uD8ei7LXVohRQ/K1lvQEg==",
+      "version": "3.1.0",
+      "integrity": "sha512-ifE6RdiqIYz8OXOQYlEy0BYSHYN18T0d5kjSejX8svYsRyq//YsdxjybCFzOE3lgbHzfKsmAoe+ANx+99mhOwg==",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": "^5"
@@ -261,8 +261,8 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.9.0",
-      "integrity": "sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg==",
+      "version": "1.10.0",
+      "integrity": "sha512-/1xYAC4MP/HEG+3duIhFr4ZQXR4sQXOIe+o6sdqzeykGLx6Upp/1p8MHqhINOvGeP7xyNHe7tsiJByc4SSVUxw==",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
@@ -564,8 +564,8 @@
       }
     },
     "node_modules/dotenv": {
-      "version": "16.5.0",
-      "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==",
+      "version": "16.6.1",
+      "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
@@ -601,8 +601,8 @@
       }
     },
     "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "version": "1.4.5",
+      "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -1110,6 +1110,17 @@
         "node": ">=8.6"
       }
     },
+    "node_modules/micromatch/node_modules/picomatch": {
+      "version": "2.3.1",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/mime": {
       "version": "1.6.0",
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
@@ -1273,17 +1284,6 @@
       "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
       "license": "MIT"
     },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
     "node_modules/pluralize": {
       "version": "8.0.0",
       "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
@@ -1336,8 +1336,8 @@
       "license": "MIT"
     },
     "node_modules/pump": {
-      "version": "3.0.2",
-      "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
+      "version": "3.0.3",
+      "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -1799,8 +1799,8 @@
       "optional": true
     },
     "node_modules/ws": {
-      "version": "8.18.2",
-      "integrity": "sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==",
+      "version": "8.18.3",
+      "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "9.0.5",
+  "version": "9.1.0",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [

package/lib/init/template/cloud-logging/files/java-cdsrc.json

@@ -1,5 +0,0 @@
-{
-  "requires": {
-    "telemetry": "to-cloud-logging"
-  }
-}

package/lib/lint/generators.js

@@ -1,103 +0,0 @@
-const os = require('node:os')
-const cp = require('node:child_process')
-const term = require('../util/term')
-
-const IS_WIN = os.platform() === 'win32'
-const REGEX_FLAGS = /--[a-z,a-z-]+[,\s+]\s+/gm
-const REGEX_OPTIONS = /--[a-z,a-z-]+\s[^\s]/gm
-const REGEX_SHORTCUT_MAPPINGS = /\s-[a-zA-Z]+, --[a-zA-Z-]+/gm
-
-module.exports = {
-  /**
-   * Generates `cds lint` help string to print when calling `cds lint [-h, --help]`
-   * by getting available options/shortcuts from installed version of ESLint
-   * @param {string} eslintCmd - ESLint command to call
-   * @returns {string} `cds lint` help string
-   */
-  genEslintHelp: function (eslintCmd) {
-    let eslintHelp
-    try {
-      eslintHelp = cp
-        .execSync(`${eslintCmd} -h`, {
-          cwd: process.cwd(),
-          shell: IS_WIN,
-          stdio: 'pipe',
-        })
-        .toString()
-    } catch {
-      console.log(
-        `${term.error('Cannot call "eslint -h", install and try again.')}\n`
-      )
-    }
-    const eslintOpts = eslintHelp.split('\n')
-    const cdslintCmd = eslintOpts[0].replace('eslint', '*cds lint*')
-    eslintOpts[0] = `
-        # SYNOPSIS
-
-            ${cdslintCmd}
-
-            Runs environment checks and/or checks the specified models
-            based on the ESLint framework
-
-        # OPTIONS`
-    return `${eslintOpts.join('\n    ')}\n`
-  },
-
-  /**
-   * Generates `cds lint` options array by extracting
-   * all [--options] and [-shortcuts] strings from help string
-   * Shortcut order must match order of [options, flags]
-   * Any options without an shortcut must act as filler (undefined)
-   * until the shortcuts for the flags start
-   * @param {string} help - help string and shortcuts array for `cds lint`
-   * @param {string[]} flags help string and shortcuts array for `cds lint`
-   * @returns {{
-   *  help: string,
-   *  options: string[],
-   *  shortcuts: string[],
-   *  flags: string[]
-   * }} `cds lint` allowed options
-   */
-  genEslintShortcutsAndOpts: function (help, flags) {
-    const allOptions = help
-      .match(REGEX_OPTIONS)
-      .map((str) => str.split(' ')[0].trim().replace(',', ''))
-    const shortcutMappings = help
-      .match(REGEX_SHORTCUT_MAPPINGS)
-      .map((str) => str.trim().split(/,\s?/))
-    const optionsWithShortcuts = []
-    /** @type {string[]} */
-    let shortcuts = []
-    const shortcutsForFlags = []
-    shortcutMappings.forEach(([short, long]) => {
-      if (!flags.includes(long)) {
-        optionsWithShortcuts.push(long)
-        shortcuts.push(short)
-      } else {
-        const index = flags.indexOf(long)
-        flags.splice(index, 1)
-        flags.unshift(long)
-        shortcutsForFlags.unshift(short)
-      }
-    })
-    const optionsWithoutShortcuts = allOptions.filter((o) => !optionsWithShortcuts.includes(o))
-    optionsWithoutShortcuts.forEach(() => {
-      shortcuts.push(undefined)
-    })
-    /** @type {string[]} */
-    const options = optionsWithShortcuts.concat(optionsWithoutShortcuts)
-    shortcuts = shortcuts.concat(shortcutsForFlags)
-    return [help, options, shortcuts, flags]
-  },
-
-  /**
-   * Generates a list of ESLint flags by extracting
-   * all [--options] strings from help string which
-   * do not require an extra argument
-   * @param help string from `cds lint [-h, --help]`
-   * @returns ESLint flags
-   */
-  genEslintFlags: help => help
-    .match(REGEX_FLAGS)
-    .map(str => str.trim().replace(',', ''))
-}