@sap/cds-dk 7.9.3 → 7.9.5

package/bin/watch.js

@@ -65,7 +65,7 @@ const t = module.exports.codes = {
 }
 const extDefaults = 'cds,csn,csv,ts,mjs,cjs,js,json,properties,edmx,xml,env'
 const ignore = RegExp(
-  `(node_modules|_out|@types|@cds-models)\\${sep}` +
+  `(.git|node_modules|_out|@types|@cds-models)\\${sep}` +
   `|app(\\${sep}.+)?\\${sep}(` +
     `(webapp|dist|target)\\${sep}|` +
     `tsconfig\\.json$|` +

package/lib/bind/bindingResolver.js

@@ -26,10 +26,8 @@ class BindingResolver {
 
         const resolvedBindings = {}
 
-        // Serialized because of parallelization issues in the cf CLI,
-        // see https://github.com/cloudfoundry/cli/issues/2232
-        // await Promise.all(Object.keys(bindings).map(async name => {
-        for (const name of Object.keys(bindings)) {
+        // run in parallel
+        await Promise.all(Object.keys(bindings).map(async name => {
             const binding = bindings[name]
             const cacheKey = JSON.stringify(binding)
             let resolvedBinding
@@ -40,7 +38,7 @@ class BindingResolver {
                 resolvedBinding = cache[cacheKey]
             }
             resolvedBindings[name] = resolvedBinding
-        }
+        }));
         return Object.keys(resolvedBindings).length > 0 ? resolvedBindings : undefined
     }
 

package/lib/bind/index.js

@@ -32,12 +32,9 @@ async function bind(options) {
     const onText = { 'cf': 'Cloud Foundry', 'k8s': 'Kubernetes' }[on];
     if (!options['to-app-services']) logger.log(`Retrieving data from ${bold(onText)}...`);
 
+    // run in parallel
     const targets = options.to.split(/,/g);
-    // Serialized because of parallelization issues in the cf CLI,
-    // see https://github.com/cloudfoundry/cli/issues/2232
-    // resolvedServices = await Promise.all(targets.map(async target => {
-    const resolvedServices = [];
-    for (const target of targets) {
+    const resolvedServices = await Promise.all(targets.map(async target => {
         let binding;
         if (on === 'k8s') {
             binding = { type: on, name: target };
@@ -51,8 +48,8 @@ async function bind(options) {
         resolvedService._target = target;
         delete resolvedService.credentials;
         resolvedService.binding.resolved = false;
-        resolvedServices.push(resolvedService);
-    }
+        return resolvedService;
+    }));
 
     if (options.kind) {
         resolvedServices.forEach(service => service.kind = options.kind);

package/lib/build/provider/hana/template/.hdiconfig-all

@@ -158,6 +158,9 @@
         },
         "txt": {
             "plugin_name": "com.sap.hana.di.copyonly"
+        },
+        "hdbeshconfig": {
+           "plugin_name": "com.sap.hana.di.eshconfig"
         }
     }
 }

package/lib/build/provider/hana/template/.hdiconfig-cloud

@@ -132,6 +132,9 @@
         },
         "txt": {
             "plugin_name": "com.sap.hana.di.copyonly"
+        },
+        "hdbeshconfig": {
+           "plugin_name": "com.sap.hana.di.eshconfig"
         }
     }
 }

package/lib/deploy/to-hana/hana.js

@@ -17,7 +17,7 @@ const { bold, info, warn } = require('../../util/term');
 
 const { bind, storeBindings } = require('../../bind');
 
-const DEBUG = cds.debug('deploy');
+const DEBUG = cds.debug('cli');
 
 module.exports = new class HanaDeployer {
 

package/lib/init/constants.js

@@ -5,7 +5,7 @@ module.exports = {
     COMMAND_ADD: 'add',
 
     JAVA_LTS_VERSIONS: [17, 21],
-    MAVEN_ARCHETYPE_VERSION: '2.9.0',
+    MAVEN_ARCHETYPE_VERSION: '2.10.1',
 
     OPTIONS: Object.freeze({
         JAVA: 'java',

package/lib/init/index.js

@@ -245,6 +245,8 @@ module.exports = class CDSGenerator {
                     templates.set(plugin, template)
                     const dependencies = await template.requires()
                     dependencies?.forEach(d => plugins.add(d))
+                } else {
+                    throw 'cannot run plugin \'' + plugin + '\'' + (DEBUG ? 'Does not satisfy the canRun() function:\n    ' + template.canRun : '')
                 }
             }
         }

package/lib/init/template/hana/files/src/.hdiconfig

@@ -131,6 +131,9 @@
         },
         "txt": {
             "plugin_name": "com.sap.hana.di.copyonly"
+        },
+        "hdbeshconfig": {
+           "plugin_name": "com.sap.hana.di.eshconfig"
         }
     }
 }

package/lib/util/cf.js

@@ -1,18 +1,18 @@
-// eslint-disable-next-line no-console
-
 const cp = require('child_process');
 const fsp = require('fs').promises;
 const os = require('os');
 const path = require('path');
 const util = require('util');
 
+const axios = require('axios');
+
 const IS_WIN = os.platform() === 'win32';
 const execAsync = util.promisify(cp.exec);
 
 const cds = require('../cds')
 
-const LOG = cds.log ? cds.log('deploy') : console;
-const DEBUG = cds.debug('deploy');
+const LOG = cds.log ? cds.log('cli') : console;
+const DEBUG = cds.debug('cli');
 
 const { bold, warn } = require('./term');
 
@@ -27,6 +27,7 @@ const OPERATION_STATE_FAILED = 'failed';
 const OPERATION_STATE_SUCCEEDED = 'succeeded';
 
 const CF_CLIENT_MINIMUM_VERSION = 8;
+const ENCODED_COMMA = encodeURIComponent(',');
 
 module.exports = new class CfUtil {
     spaceInfo;
@@ -56,47 +57,46 @@ module.exports = new class CfUtil {
             err.stderr = err.stderr?.trim();
             throw err;
         } finally {
-            // eslint-disable-next-line no-console
             DEBUG && console.timeEnd(cmdLine);
         }
     }
 
     async cfRequest(urlPath, queryObj, bodyObj) {
-        if (queryObj) {
-            const entries = Object.entries(queryObj);
-            const queryStr = entries.map(([key, value]) => {
-                if (Array.isArray(value)) {
-                    value = value.join(',');
-                }
-                // commas cause problems in cf curl when not double encoded
-                // value = value.replace(/,/g, encodeURIComponent(','));
-                return `${key}=${encodeURIComponent(value)}`;
-            }).join('&');
+        const url = this.spaceInfo.apiEndpoint + urlPath;
 
-            urlPath = urlPath + `?${queryStr}`;
-        }
+        const options = {
+            headers: { 'Authorization': this.spaceInfo.token }
+        };
 
-        // cf curl PATH [-iv] [-X METHOD] [-H HEADER]... [-d DATA] [--output FILE]
-        const args = ['curl', urlPath];
-        if (bodyObj) {
-            args.push('-d');
-            args.push(JSON.stringify(bodyObj)); // cfRun uses spawn so no special handling for quotes on cli required
-        }
-
-        const result = await this.cfRun(...args);
-        let response = {};
-        if (result.stdout) {
-            response = JSON.parse(result.stdout);
-        } else if (result.stderr) {
-            response = { errors: [{ title: result.stderr }] };
+        if (queryObj && Object.keys(queryObj).length > 0) {
+            const params = {};
+            for (const [k, v] of Object.entries(queryObj)) {
+                // cf rest API does not accept comma in query parameters
+                params[k] = v.replaceAll(',', ENCODED_COMMA);
+            }
+            options.params = params;
         }
 
-        if (response.errors) {
-            const errorMessage = response.errors.map((entry) => `${entry.title || ''}: ${entry.detail || ''} (${entry.code || ''})`).join('\n');
-            throw new Error(errorMessage);
+        try {
+            let response;
+            if (bodyObj) {
+                response = (await axios.post(url, bodyObj, options));
+            } else {
+                response = (await axios.get(url, options));
+            }
+            if (DEBUG) {
+                options.headers.Authorization = 'bearer <token>';
+                LOG.debug(`POST ${url}\n${JSON.stringify(options, null, 4)}\n${JSON.stringify(response.data, null, 4)}`);
+            }
+            return response.data;
+        } catch (err) {
+            if (err instanceof axios.AxiosError) {
+                if (err.response?.data?.errors[0]) {
+                    throw JSON.stringify(err.response.data.errors[0], null, 4);
+                }
+                throw err.message;
+            }
         }
-
-        return response;
     }
 
     _extract(string, pattern, errorMsg) {
@@ -104,7 +104,7 @@ module.exports = new class CfUtil {
         if (match?.[1]) {
             return match[1];
         }
-        throw new Error(errorMsg);
+        throw errorMsg;
     }
 
     async _getCfTargetFromConfigFile() {
@@ -147,8 +147,10 @@ module.exports = new class CfUtil {
 
     async getCfTarget() {
         await this._checkCliVersion();
-        await this._getCfAuthorization();
-        return await this._getCfTargetFromConfigFile() || await this._getCfTargetFromCli();
+        const token = await this._getCfAuthorization();
+        const target = await this._getCfTargetFromConfigFile() || await this._getCfTargetFromCli();
+        target.token = token;
+        return target;
     }
 
     async _checkCliVersion() {
@@ -167,22 +169,26 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
             LOG.debug('getting space info');
 
             const target = await this.getCfTarget();
-
+            this.spaceInfo = target;
             const { org, space } = target;
-            const orgs = await this.cfRequest(`/v3/organizations`, { names: org });
+            const orgs = await this.cfRequest('/v3/organizations', { names: org });
             if (!orgs?.resources?.length) {
-                throw new Error(`CF org ${bold(org)} not found!`);
+                throw `CF org ${bold(org)} not found!`;
             }
 
             const orgGuid = orgs.resources[0].guid;
-            const spaces = await this.cfRequest(`/v3/spaces`, { names: space, organization_guids: orgGuid });
+            const spaces = await this.cfRequest('/v3/spaces', { names: space, organization_guids: orgGuid });
             if (!spaces?.resources?.length) {
-                throw new Error(`CF space ${bold(space)} not found in org ${bold(org)}!`);
+                throw `CF space ${bold(space)} not found in org ${bold(org)}!`;
             }
 
             const spaceGuid = spaces.resources[0].guid;
 
-            this.spaceInfo = Object.assign({}, target, { orgGuid, spaceGuid });
+            this.spaceInfo = {
+                ...target,
+                orgGuid,
+                spaceGuid
+            }
         }
 
         return this.spaceInfo;
@@ -228,7 +234,10 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
                     return serviceInstance;
 
                 case OPERATION_STATE_FAILED:
-                    throw new Error(`The returned service reported state '${OPERATION_STATE_FAILED}'.\n${JSON.stringify(serviceInstance, null, 4)}`);
+                    if (!DEBUG && serviceInstance?.last_operation?.description) {
+                        throw serviceInstance.last_operation.description;
+                    }
+                    throw `The returned service reported state '${OPERATION_STATE_FAILED}'.\n${JSON.stringify(serviceInstance, null, 4)}`;
 
                 default:
                     console.error(`Unsupported server response state '${serviceInstance?.last_operation?.state}'. Waiting for next response.`);
@@ -236,7 +245,7 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
             }
         }
 
-        throw new Error(`Timeout occurred while getting service ${bold(serviceName)}`);
+        throw `Timeout occurred while getting service ${bold(serviceName)}`;
     }
 
 
@@ -260,7 +269,7 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
         });
 
         if (!servicePlan?.resources?.length) {
-            throw new Error(`No service plans found`);
+            throw `No service plans found for ${planName} in service offering ${serviceOfferingName}.`;
         }
 
         const body = {
@@ -287,7 +296,7 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
 
         const postResult = await this.cfRequest('/v3/service_instances', undefined, body);
         if (postResult?.errors) {
-            throw new Error(postResult.errors[0].detail);
+            throw postResult.errors[0].detail;
         }
 
         const newService = await this.getService(serviceName, false);
@@ -295,7 +304,7 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
             return newService;
         }
 
-        throw new Error(`Could not create service ${bold(serviceName)}`);
+        throw `Could not create service ${bold(serviceName)}`;
     }
 
     async _getServiceKey(serviceInstance, serviceKeyName, showMessage = true) {
@@ -322,7 +331,10 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
                 }
 
                 case OPERATION_STATE_FAILED:
-                    throw new Error(`The returned binding reported state '${OPERATION_STATE_FAILED}'.\n${JSON.stringify(binding, null, 4)}`);
+                    if (!DEBUG && binding?.last_operation?.description) {
+                        throw binding.last_operation.description;
+                    }
+                    throw `The returned binding reported state '${OPERATION_STATE_FAILED}'.\n${JSON.stringify(binding, null, 4)}`;
 
                 default:
                     console.error(`Unsupported server response state '${binding?.last_operation?.state}'. Waiting for next response.`);
@@ -330,7 +342,7 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
             }
         }
 
-        throw new Error(`Timeout occurred while getting service key ${bold(serviceKeyName)}`);
+        throw `Timeout occurred while getting service key ${bold(serviceKeyName)}`;
     }
 
     async getOrCreateServiceKey(serviceInstance, serviceKeyName, parameters, { silent = false, create = true } = {}) {
@@ -357,7 +369,7 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
 
         const postResult = await this.cfRequest('/v3/service_credential_bindings', undefined, body);
         if (postResult?.errors) {
-            throw new Error(postResult.errors[0].detail);
+            throw postResult.errors[0].detail;
         }
 
         const newServiceKey = await this._getServiceKey(serviceInstance, serviceKeyName, false);
@@ -365,6 +377,6 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
             return newServiceKey;
         }
 
-        throw new Error(`Could not create service key ${bold(serviceKeyName)}`);
+        throw `Could not create service key ${bold(serviceKeyName)}`;
     }
-}
+}

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.9.3",
+  "version": "7.9.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "7.9.3",
+      "version": "7.9.5",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds": "^7",
@@ -53,7 +53,7 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.10.1",
+      "version": "4.11.0",
       "license": "MIT",
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -208,7 +208,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "7.9.2",
+      "version": "7.9.3",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/cds-types": "<1",
@@ -240,15 +240,15 @@
       }
     },
     "node_modules/@sap/cds-fiori": {
-      "version": "1.2.3",
+      "version": "1.2.7",
       "license": "SEE LICENSE IN LICENSE",
       "peerDependencies": {
-        "@sap/cds": ">=7.1",
+        "@sap/cds": ">=7.6",
         "express": ">=4"
       }
     },
     "node_modules/@sap/cds-foss": {
-      "version": "5.0.0",
+      "version": "5.0.1",
       "license": "See LICENSE in LICENSE",
       "dependencies": {
         "big.js": "^6.1.1",
@@ -261,7 +261,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "1.18.1",
+      "version": "1.18.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": "^4",
@@ -273,10 +273,10 @@
       }
     },
     "node_modules/@sap/eslint-plugin-cds": {
-      "version": "3.0.3",
+      "version": "3.0.4",
       "license": "See LICENSE file",
       "dependencies": {
-        "@sap/cds": ">=5.6.0",
+        "@sap/cds": ">=7",
         "semver": "^7.3.4"
       },
       "engines": {
@@ -396,7 +396,7 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.11.3",
+      "version": "8.12.1",
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -1175,7 +1175,7 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.5.0",
+      "version": "1.6.0",
       "license": "BSD-3-Clause",
       "dependencies": {
         "estraverse": "^5.1.0"
@@ -2214,7 +2214,7 @@
       "license": "MIT"
     },
     "node_modules/node-abi": {
-      "version": "3.63.0",
+      "version": "3.65.0",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -2301,8 +2301,11 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.1",
+      "version": "1.13.2",
       "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -3136,7 +3139,7 @@
       }
     },
     "node_modules/uglify-js": {
-      "version": "3.17.4",
+      "version": "3.18.0",
       "license": "BSD-2-Clause",
       "optional": true,
       "bin": {
@@ -3244,7 +3247,7 @@
       "license": "ISC"
     },
     "node_modules/ws": {
-      "version": "8.17.0",
+      "version": "8.18.0",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
@@ -3280,7 +3283,7 @@
       }
     },
     "node_modules/yaml": {
-      "version": "2.4.3",
+      "version": "2.4.5",
       "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"

package/package.json

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