@sap/cds-dk 7.5.1 → 7.6.1

package/lib/util/cf.js

@@ -116,7 +116,7 @@ class CfUtil {
             if (config) {
                 return {
                     apiEndpoint: this._extract(config.Target, /\s*(.+)\s*/, `CF API endpoint is missing. Use 'cf login' to login.`),
-                    org: this._extract(config.OrganizationFields.Name, /\s*(.+)\s*/, `CF org is missing. Use 'cf target -o <ORG> to specify.`),
+                    org: this._extract(config.OrganizationFields.Name, /\s*(.+)\s*/, `CF org is missing. Use 'cf target -o <ORG>' to specify.`),
                     space: this._extract(config.SpaceFields.Name, /\s*(.+)\s*/, `CF space is missing. Use 'cf target -s <SPACE>' to specify.`)
                 }
             }
@@ -131,7 +131,7 @@ class CfUtil {
             return {
                 apiEndpoint: this._extract(result.stdout, /api endpoint\s*:\s*([^\s]+)/i, `CF API endpoint is missing. Use 'cf login' to login.`),
                 user: this._extract(result.stdout, /user\s*:\s*(.+)/i, `CF user is missing. Use 'cf login' to login.`),
-                org: this._extract(result.stdout, /org\s*:\s*(.+)/i, `CF org is missing. Use 'cf target -o <ORG> to specify.`),
+                org: this._extract(result.stdout, /org\s*:\s*(.+)/i, `CF org is missing. Use 'cf target -o <ORG>' to specify.`),
                 space: this._extract(result.stdout, /space\s*:\s*(.+)/i, `CF space is missing. Use 'cf target -s <SPACE>' to specify.`),
             };
         }
@@ -189,6 +189,14 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
         return this.spaceInfo;
     }
 
+    async getServices(app) {
+        const { spaceGuid: space_guids, orgGuid: organization_guids } = await this.getCfSpaceInfo();
+        const apps = await this._cfRequest('/v3/apps', { space_guids, organization_guids, names: app });
+        const guid = apps.resources[0].guid;
+        const env = await this._cfRequest('/v3/apps/'+guid+'/env', { space_guids, organization_guids, names: app });
+        return Object.values(env.system_env_json.VCAP_SERVICES).flat();
+    }
+
     async getService(serviceName, showMessage = true) {
         showMessage && console.log(`Getting service ${bold(serviceName)}`);
         const spaceInfo = await this.getCfSpaceInfo();
@@ -323,15 +331,14 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
     }
 
 
-    async getOrCreateServiceKey(serviceInstance, serviceKeyName) {
-
+    async getOrCreateServiceKey(serviceInstance, serviceKeyName, parameters, { silent = false, create = true } = {}) {
         const serviceKey = await this.getServiceKey(serviceInstance, serviceKeyName, false);
-        if (serviceKey) {
-            console.log(`Getting service key ${bold(serviceKeyName)}`);
+        if (serviceKey || !create) {
+            if (serviceKey && !silent) console.log(`Getting service key ${bold(serviceKeyName)}`);
             return serviceKey;
         }
 
-        console.log(`Creating service key ${bold(serviceKeyName)} - please be patient...`);
+        if (!silent) console.log(`Creating service key ${bold(serviceKeyName)} - please be patient...`);
 
         const body = {
             type: 'key',
@@ -343,9 +350,7 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
                     }
                 }
             },
-            parameters: {
-                permissions: 'development'
-            }
+            parameters
         }
 
         const postResult = await this._cfRequest('/v3/service_credential_bindings', undefined, body);

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.5.1",
+  "version": "7.6.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "7.5.1",
+      "version": "7.6.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds": "^7",
@@ -40,7 +40,7 @@
       }
     },
     "node_modules/@cap-js/cds-types": {
-      "version": "0.1.0",
+      "version": "0.2.0",
       "license": "SEE LICENSE IN LICENSE",
       "peerDependencies": {
         "@sap/cds": ">=7"
@@ -100,11 +100,11 @@
       "optional": true
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.13",
+      "version": "0.11.14",
       "license": "Apache-2.0",
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.1",
-        "debug": "^4.1.1",
+        "@humanwhocodes/object-schema": "^2.0.2",
+        "debug": "^4.3.1",
         "minimatch": "^3.0.5"
       },
       "engines": {
@@ -123,7 +123,7 @@
       }
     },
     "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.1",
+      "version": "2.0.2",
       "license": "BSD-3-Clause"
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -177,7 +177,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "7.5.2",
+      "version": "7.6.3",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/cds-types": "<1",
@@ -194,7 +194,7 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "4.5.0",
+      "version": "4.6.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -230,7 +230,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "1.14.2",
+      "version": "1.15.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": "^4",
@@ -242,7 +242,7 @@
       }
     },
     "node_modules/@sap/eslint-plugin-cds": {
-      "version": "2.6.4",
+      "version": "2.6.5",
       "license": "See LICENSE file",
       "dependencies": {
         "@sap/cds": ">=5.6.0",
@@ -256,12 +256,12 @@
       }
     },
     "node_modules/@sap/hdi-deploy": {
-      "version": "4.9.1",
+      "version": "4.9.2",
       "license": "See LICENSE file",
       "dependencies": {
-        "@sap/hana-client": "2.19.18",
+        "@sap/hana-client": "2.19.21",
         "@sap/hdi": "4.5.2",
-        "@sap/xsenv": "3.4.0",
+        "@sap/xsenv": "4.2.0",
         "async": "3.2.3",
         "dotenv": "10.0.0",
         "handlebars": "4.7.7",
@@ -273,7 +273,7 @@
       }
     },
     "node_modules/@sap/hdi-deploy/node_modules/@sap/hana-client": {
-      "version": "2.19.18",
+      "version": "2.19.21",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN developer-license-3_1.txt",
       "dependencies": {
@@ -317,7 +317,7 @@
       }
     },
     "node_modules/@sap/hdi-deploy/node_modules/@sap/xsenv": {
-      "version": "3.4.0",
+      "version": "4.2.0",
       "license": "SEE LICENSE IN LICENSE file",
       "dependencies": {
         "debug": "4.3.3",
@@ -325,7 +325,7 @@
         "verror": "1.10.0"
       },
       "engines": {
-        "node": "^10.0.0 || ^12.0.0 || ^14.0.0 || ^16.0.0 || ^18.0.0"
+        "node": "^12.0.0 || ^14.0.0 || ^16.0.0 || ^18.0.0 || ^20.0.0"
       }
     },
     "node_modules/@sap/hdi-deploy/node_modules/@sap/xsenv/node_modules/assert-plus": {
@@ -689,7 +689,7 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.6.5",
+      "version": "1.6.7",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.4",
@@ -876,12 +876,17 @@
       "optional": true
     },
     "node_modules/call-bind": {
-      "version": "1.0.5",
+      "version": "1.0.7",
       "license": "MIT",
       "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.1",
-        "set-function-length": "^1.1.1"
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -1047,15 +1052,19 @@
       "license": "MIT"
     },
     "node_modules/define-data-property": {
-      "version": "1.1.1",
+      "version": "1.1.3",
       "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
         "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
+        "has-property-descriptors": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/delayed-stream": {
@@ -1159,6 +1168,23 @@
       "license": "MIT",
       "optional": true
     },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/escape-html": {
       "version": "1.0.3",
       "license": "MIT"
@@ -1378,7 +1404,7 @@
       "license": "MIT"
     },
     "node_modules/fastq": {
-      "version": "1.16.0",
+      "version": "1.17.1",
       "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
@@ -1468,7 +1494,7 @@
       "license": "ISC"
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.4",
+      "version": "1.15.5",
       "funding": [
         {
           "type": "individual",
@@ -1564,14 +1590,18 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.2",
+      "version": "1.2.4",
       "license": "MIT",
       "dependencies": {
+        "es-errors": "^1.3.0",
         "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3",
         "hasown": "^2.0.0"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -1649,10 +1679,10 @@
       }
     },
     "node_modules/has-property-descriptors": {
-      "version": "1.0.1",
+      "version": "1.0.2",
       "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.2"
+        "es-define-property": "^1.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -1684,7 +1714,7 @@
       "optional": true
     },
     "node_modules/hasown": {
-      "version": "2.0.0",
+      "version": "2.0.1",
       "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
@@ -1775,7 +1805,7 @@
       "optional": true
     },
     "node_modules/ignore": {
-      "version": "5.3.0",
+      "version": "5.3.1",
       "license": "MIT",
       "engines": {
         "node": ">= 4"
@@ -1832,10 +1862,17 @@
       "license": "ISC",
       "optional": true
     },
-    "node_modules/ip": {
-      "version": "2.0.0",
+    "node_modules/ip-address": {
+      "version": "9.0.5",
       "license": "MIT",
-      "optional": true
+      "optional": true,
+      "dependencies": {
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
     },
     "node_modules/ipaddr.js": {
       "version": "1.9.1",
@@ -1903,6 +1940,11 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/jsbn": {
+      "version": "1.1.0",
+      "license": "MIT",
+      "optional": true
+    },
     "node_modules/json-buffer": {
       "version": "3.0.1",
       "license": "MIT"
@@ -2230,9 +2272,12 @@
       }
     },
     "node_modules/node-addon-api": {
-      "version": "7.0.0",
+      "version": "7.1.0",
       "license": "MIT",
-      "optional": true
+      "optional": true,
+      "engines": {
+        "node": "^16 || ^18 || >= 20"
+      }
     },
     "node_modules/node-gyp": {
       "version": "8.4.1",
@@ -2681,7 +2726,7 @@
       "license": "ISC"
     },
     "node_modules/semver": {
-      "version": "7.5.4",
+      "version": "7.6.0",
       "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -2763,13 +2808,15 @@
       "optional": true
     },
     "node_modules/set-function-length": {
-      "version": "1.1.1",
+      "version": "1.2.1",
       "license": "MIT",
       "dependencies": {
-        "define-data-property": "^1.1.1",
-        "get-intrinsic": "^1.2.1",
+        "define-data-property": "^1.1.2",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.3",
         "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
+        "has-property-descriptors": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -2797,12 +2844,16 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.4",
+      "version": "1.0.5",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2866,15 +2917,15 @@
       }
     },
     "node_modules/socks": {
-      "version": "2.7.1",
+      "version": "2.7.3",
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "ip": "^2.0.0",
+        "ip-address": "^9.0.5",
         "smart-buffer": "^4.2.0"
       },
       "engines": {
-        "node": ">= 10.13.0",
+        "node": ">= 10.0.0",
         "npm": ">= 3.0.0"
       }
     },
@@ -2891,6 +2942,11 @@
         "node": ">= 10"
       }
     },
+    "node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "license": "BSD-3-Clause",
+      "optional": true
+    },
     "node_modules/sqlite3": {
       "version": "5.1.7",
       "hasInstallScript": true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.5.1",
+  "version": "7.6.1",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [
@@ -40,14 +40,5 @@
     "npm-shrinkwrap.json",
     "LICENSE"
   ],
-  "overrides": {
-    "sqlite3": {
-      "@mapbox/node-pre-gyp": {
-        "make-dir": {
-          "semver": "^7"
-        }
-      }
-    }
-  },
   "_hasShrinkwrap": true
 }

package/lib/env/schemas/cds-rc.json

@@ -1,101 +0,0 @@
-{
-    "title": "JSON schema for CDS-DK configuration",
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "description": "This is a JSON schema representation for CDS project configuration",
-    "type": "object",
-    "additionalProperties": true,
-    "properties": {
-        "build": {
-            "type": "object",
-            "description": "Customize CDS build settings.",
-            "additionalProperties": true,
-            "properties": {
-                "target": {
-                    "type": "string",
-                    "description": "Specify the folder which contains generated build results. Defaults to './gen'.",
-                    "format": "uri-reference"
-                },
-                "tasks": {
-                    "type": "array",
-                    "description": "Control which tasks 'cds build' will execute on your project modules. This is a typical task configuration: '\"tasks\": [{ \"for\": \"hana\"}];",
-                    "uniqueItems": true,
-                    "default": [
-                        {}
-                    ],
-                    "items": {
-                        "type": "object",
-                        "additionalProperties": true,
-                        "properties": {
-                            "dest": {
-                                "type": "string",
-                                "description": "Optional: Define the destination folder for this build task, relative to build target folder. \nFor example: Destination defined as 'custom' results in an output written to 'gen/custom'.",
-                                "format": "uri-reference"
-                            },
-                            "src": {
-                                "type": "string",
-                                "description": "Optional: Prefer defining 'cds.folders'. Use 'src' if you want it only to be valid for this specific build task, which excludes, for example, 'cds watch'.",
-                                "format": "uri-reference"
-                            },
-                            "for": {
-                                "type": "string",
-                                "description": "Define the target technology for this build task.",
-                                "minLength": 1,
-                                "enum": [
-                                    "nodejs",
-                                    "java",
-                                    "hana",
-                                    "mtx-sidecar",
-                                    "mtx-extension",
-                                    "mtx",
-                                    "fiori",
-                                    "node-cf",
-                                    "java-cf"
-                                ]
-                            },
-                            "options": {
-                                "type": "object",
-                                "description": "Optional: Set target technology specific options for this build task.",
-                                "additionalProperties": true,
-                                "properties": {
-                                    "model": {
-                                        "$ref": "#/$defs/foldersStringArray"
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "deploy": {
-            "type": "object",
-            "description": "Customize 'cds deploy' settings.",
-            "additionalProperties": true,
-            "properties": {
-                "no_save": {
-                    "type": "boolean",
-                    "description": "Do / don't update configuration in package.json.",
-                    "default": true
-                }
-            }
-        }
-    },
-    "$defs": {
-        "foldersStringArray": {
-            "oneOf": [
-                {
-                    "type": "string",
-                    "format": "uri-reference"
-                },
-                {
-                    "type": "array",
-                    "uniqueItems": true,
-                    "items": {
-                        "type": "string",
-                        "format": "uri-reference"
-                    }
-                }
-            ]
-        }
-    }
-}