@sap/cds-dk 7.4.0 → 7.5.0

package/lib/util/pruneAxiosErrors.js

@@ -11,26 +11,43 @@ require('axios').interceptors.response.use(
     axError => {
         const { inspect } = require('util');
         const { url, method } = axError.config ?? {};
-        const { response = {} } = axError;
-        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 { errno, code, response = {} } = axError;
+        const prefix = (url && method ? `${method.toUpperCase()} ${url} ` : '') + 'failed';
+
+        let error;
+        if (errno) {
+            // System error during request.
+            const message = prefix
+                + `: ${errno} ${code}`
+                + (code === 'ENOTFOUND' ? `. Make sure the URL is correct and the server is running.` : '');
+            error = stacklessError(message);
+        } else {
+            // Error after request has been made.
+            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 ? ':' : '') +
+                (status ? ` ${status}` : '') +
+                (statusText ? ` ${statusText}` : '') +
+                (reason ? `. ${reason}` : '') +
+                (details ? `. Details: ${details}` : '');
+
+            error = stacklessError(message);
+            if (status) {
+                error.status = status;
+            }
         }
-        const reason = data?.error /* RFC 6749 */ && (typeof data.error === 'string' ? data.error : inspect(data.error));
-        const message = (url && method ? `${method.toUpperCase()} ${url} ` : '') +
-            'failed' +
-            (status || statusText ? ':' : '') +
-            (status ? ` ${status}` : '') +
-            (statusText ? ` ${statusText}` : '') +
-            (reason ? `. ${reason}` : '') +
-            (data ? `. Details: '${data.error_description /* RFC 6749 */ || inspect(data)}'` : '');
 
-        const error = stacklessError(message);
-        error.status = status;
         if (require('../').debug('req')) {
             error.cause = axError;
         }

package/lib/util/write.js

@@ -1,5 +1,5 @@
 // eslint-disable-next-line no-unused-vars
-const USAGE = ()=>{ //NOSONAR
+const USAGE = ()=>{
 
 	// with a fully specified target file
 	write ({foo:'bar'}) .to ('some/folder/foo.json')

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.4.0",
+  "version": "7.5.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "7.4.0",
+      "version": "7.5.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds": "^7",
@@ -39,6 +39,13 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/@cap-js/cds-types": {
+      "version": "0.1.0",
+      "license": "SEE LICENSE IN LICENSE",
+      "peerDependencies": {
+        "@sap/cds": ">=7"
+      }
+    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
       "license": "MIT",
@@ -60,7 +67,7 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.3",
+      "version": "2.1.4",
       "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
@@ -100,7 +107,7 @@
       "license": "MIT"
     },
     "node_modules/@eslint/js": {
-      "version": "8.53.0",
+      "version": "8.55.0",
       "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -190,14 +197,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir/node_modules/semver": {
-      "version": "6.3.1",
-      "license": "ISC",
-      "optional": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "license": "MIT",
@@ -249,9 +248,10 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "7.4.0",
+      "version": "7.5.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
+        "@cap-js/cds-types": "<1",
         "@sap/cds-compiler": "^4",
         "@sap/cds-fiori": "^1",
         "@sap/cds-foss": "^5.0.0"
@@ -265,7 +265,7 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "4.4.0",
+      "version": "4.5.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -280,7 +280,7 @@
       }
     },
     "node_modules/@sap/cds-fiori": {
-      "version": "1.1.0",
+      "version": "1.2.2",
       "license": "SEE LICENSE IN LICENSE",
       "peerDependencies": {
         "@sap/cds": ">=7",
@@ -301,7 +301,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "1.13.0",
+      "version": "1.14.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": "^4",
@@ -327,7 +327,7 @@
       }
     },
     "node_modules/@sap/hana-client": {
-      "version": "2.18.24",
+      "version": "2.19.18",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN developer-license-3_1.txt",
       "dependencies": {
@@ -338,7 +338,7 @@
       }
     },
     "node_modules/@sap/hdi": {
-      "version": "4.5.1",
+      "version": "4.5.2",
       "license": "See LICENSE file",
       "dependencies": {
         "async": "3.2.3"
@@ -360,11 +360,11 @@
       }
     },
     "node_modules/@sap/hdi-deploy": {
-      "version": "4.8.2",
+      "version": "4.9.1",
       "license": "See LICENSE file",
       "dependencies": {
-        "@sap/hana-client": "2.18.24",
-        "@sap/hdi": "4.5.1",
+        "@sap/hana-client": "2.19.18",
+        "@sap/hdi": "4.5.2",
         "@sap/xsenv": "3.4.0",
         "async": "3.2.3",
         "dotenv": "10.0.0",
@@ -989,13 +989,13 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.53.0",
+      "version": "8.55.0",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.3",
-        "@eslint/js": "8.53.0",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.55.0",
         "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -1420,7 +1420,7 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.23.0",
+      "version": "13.24.0",
       "license": "MIT",
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -1637,7 +1637,7 @@
       }
     },
     "node_modules/ignore": {
-      "version": "5.2.4",
+      "version": "5.3.0",
       "license": "MIT",
       "engines": {
         "node": ">= 4"
@@ -3016,7 +3016,7 @@
       "license": "ISC"
     },
     "node_modules/ws": {
-      "version": "8.14.2",
+      "version": "8.15.1",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"

package/package.json

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

package/lib/client/base_command.js

@@ -1,54 +0,0 @@
-const path = require('path');
-const fs = require('fs').promises;
-
-require('../util/pruneAxiosErrors');
-
-const { getMessage } = require('./helper/logging');
-
-const MTX_URL_PATH_PREFIX = 'mtx/v1/model/';
-const CUSTOM_FILE_URL_SUFFIX = 'customTenantContent';
-
-module.exports = class BaseCommand {
-
-    static get CUSTOM_FILE_URL_SUFFIX() { return CUSTOM_FILE_URL_SUFFIX; }
-
-    static async checkProject(folder) {
-        const exists = await fs.access(path.join(folder, 'package.json')).then(() => true).catch(() => false)
-        return exists;
-    }
-
-    static handleHttpError(error, params, { url, command } = {}) {
-        url = url ?? params.get('appUrl');
-        const prefix = `Request to ${url} failed`;
-        switch (error.status) {
-            case 401:
-                throw getMessage(`${prefix}: invalid authentication.\nRetry with valid passcode${
-                    params.has('passcodeUrl') ? ` from ${params.get('passcodeUrl')}` : ''
-                } or username/password (required if SaaS app is configured with mocked-auth).`, { error, command });
-            case 403:
-                throw getMessage(prefix + ': insufficient authorization. Ensure client has all necessary roles.', { error, command });
-            case 404:
-                throw getMessage(prefix + ': resource not found.', { error, command });
-            case 422:
-                // Compilation or native-extension error.
-                throw getMessage(prefix + '.', { error, command });
-            default:
-                // Unexpected error should be transparent to user.
-                throw error;
-        }
-    }
-
-    static concatUrls(...parts) {
-        return parts
-            .map((p, i) => i === 0
-                ? p.replace(/\/$/ /*end slash*/, '')
-                : i === parts.length - 1
-                    ? p.replace(/^\// /*begin slash*/, '')
-                    : p.replace(/^\/|\/$/g /*both*/, ''))
-            .join('/');
-    }
-
-    static getMtxApiUrl(url, action) {
-        return BaseCommand.concatUrls(url, MTX_URL_PATH_PREFIX, action);
-    }
-}

package/lib/init/template/_merging/registry-mta.js

@@ -1,304 +0,0 @@
-// Registry of sequence matchers in mta.yaml files
-
-const srvNode4 = path => ({
-    in: 'modules',
-    where: [{
-        property: 'type',
-        isEqualTo: 'nodejs',
-    }, {
-        property: 'path',
-        isEqualTo: path
-    }],
-})
-
-const srvJava4 = path => ({
-    in: 'modules',
-    where: [{
-        property: 'type',
-        isEqualTo: 'java'
-    }, {
-        property: 'path',
-        isEqualTo: path
-    }],
-})
-
-const approuter = {
-    in: 'modules',
-    where: [{
-        property: 'type',
-        isEqualTo: 'approuter.nodejs'
-    }]
-}
-
-const xsuaa = {
-    in: 'resources',
-    where: [{
-        property: 'parameters.service',
-        isEqualTo: 'xsuaa',
-    }]
-}
-
-const destination = {
-    in: 'resources',
-    where: [{
-        property: 'type',
-        isEqualTo: 'org.cloudfoundry.managed-service',
-    }, {
-        property: 'parameters.service',
-        isEqualTo: 'destination',
-    }]
-}
-
-const connectivity = {
-    in: 'resources',
-    where: [{
-        property: 'type',
-        isEqualTo: 'org.cloudfoundry.managed-service',
-    }, {
-        property: 'parameters.service',
-        isEqualTo: 'connectivity',
-    }]
-}
-
-const redis = {
-    in: 'resources',
-    where: [{
-        property: 'type',
-        isEqualTo: 'org.cloudfoundry.managed-service',
-    }, {
-        property: 'parameters.service',
-        isEqualTo: 'redis-cache',
-    }]
-}
-
-const enterpriseMessaging = {
-    in: 'resources',
-    where: [{
-        property: 'type',
-        isEqualTo: 'org.cloudfoundry.managed-service',
-    }, {
-        property: 'parameters.service',
-        isEqualTo: 'enterprise-messaging',
-    }]
-}
-
-const kibana = {
-    in: 'resources',
-    where: [{
-        property: 'type',
-        isEqualTo: 'org.cloudfoundry.managed-service',
-    }, {
-        property: 'parameters.service',
-        isEqualTo: 'application-logs',
-    }, {
-        property: 'parameters.service-plan',
-        isEqualTo: 'lite',
-    }]
-}
-
-const hdbDeployer = {
-    in: 'modules',
-    where: [{
-        property: 'type',
-        isEqualTo: 'hdb'
-    }]
-}
-
-const hdiContainer = {
-    in: 'resources',
-    where: [{
-        property: 'type',
-        isEqualTo: 'com.sap.xs.hdi-container',
-    }]
-}
-
-const notificationTypesDeployer = {
-    in: 'modules',
-    where: [{
-        property: 'name',
-        isEqualTo: 'notification-content-deployment'
-    }, {
-        property: 'type',
-        isEqualTo: 'nodejs'
-    }]
-}
-
-const serviceManager = {
-    in: 'resources',
-    where: [{
-        property: 'type',
-        isEqualTo: 'org.cloudfoundry.managed-service',
-    }, {
-        property: 'parameters.service',
-        isEqualTo: 'service-manager',
-    }, {
-        property: 'parameters.service-plan',
-        isEqualTo: 'container'
-    }]
-}
-
-const postgres = {
-    in: 'resources',
-    where: [{
-        property: 'parameters.service',
-        isEqualTo: 'postgresql-db',
-    }]
-}
-
-const postgresDeployer = {
-    in: 'modules',
-    where: [{
-        property: 'type',
-        isEqualTo: 'nodejs',
-    }, {
-        property: 'path',
-        isEqualTo: 'gen/pg',
-    }]
-}
-
-const saasRegistry = {
-    in: 'resources',
-    where: [{
-        property: 'type',
-        isEqualTo: 'org.cloudfoundry.managed-service',
-    }, {
-        property: 'parameters.service',
-        isEqualTo: 'saas-registry',
-    }]
-}
-
-const srvApi4 = srv => ({
-    in: [srv, 'provides'],
-    where: [{
-        property: 'name',
-        isEqualTo: 'srv-api'
-    }, {
-        property: 'properties.srv-url',
-        isEqualTo: '${default-url}'
-    }]
-})
-
-const mtxSidecar4 = path => ({
-    in: 'modules',
-    where: [{
-        property: 'type',
-        isEqualTo: `nodejs`
-    }, {
-        property: 'path',
-        isEqualTo: path // 'gen/mtx/sidecar' REVISIT: Same build destination for Java/Node.js would simplify this a lot
-    }]
-})
-
-const providedMtxApiSidecar4 = mtxSidecar => ({
-    in: [mtxSidecar, 'provides'],
-    where: [{
-        property: 'name',
-        isEqualTo: 'mtx-api'
-    }, {
-        property: 'properties.mtx-url',
-        isEqualTo: '${default-url}'
-    }]
-})
-
-const requiredMtxApi = {
-    in: [approuter, 'requires'],
-    where: [{
-        property: 'properties.name',
-        isEqualTo: 'mtx-api'
-    }, {
-        property: 'properties.url',
-        isEqualTo: '~{mtx-url}'
-    }]
-}
-
-const providedAppApi = {
-    in: [approuter, 'provides'],
-    where: [{
-        property: 'name',
-        isEqualTo: 'app-api'
-    }, {
-        property: 'properties.app-protocol',
-        isEqualTo: '${protocol}'
-    }, {
-        property: 'properties.app-uri',
-        isEqualTo: '${default-uri}'
-    }],
-}
-
-const requiredAppApi4 = module => ({
-    in: [module, 'requires'],
-    where: [{
-        property: 'name',
-        isEqualTo: 'app-api'
-    }, {
-        property: 'properties.SUBSCRIPTION_URL',
-        isEqualTo: '~{app-protocol}://\\${tenant_subdomain}-~{app-uri}'
-    }]
-})
-
-const requiredMtxSidecarApi4 = srv => ({
-    in: [srv, 'requires'],
-    where: [{
-        property: 'properties.CDS_MULTITENANCY_SIDECAR_URL',
-        isEqualTo: '~{mtx-url}'
-    }]
-})
-
-const providedJavaApprouterApi4 = srv => ({
-    in: [srv, 'requires'],
-    where: [{
-        property: 'properties.CDS_MULTITENANCY_APPUI_URL',
-        isEqualTo: '~{url}'
-    }]
-})
-
-const providedJavaApprouterApi = {
-    in: [approuter, 'requires'],
-    where: [{
-        property: 'properties.url',
-        isEqualTo: '${default-url}'
-    }]
-}
-
-const approuterExtensibility = {
-    in: 'routes',
-    where: [{
-        property: 'source',
-        isEqualTo: '^/-/cds/.*'
-    }, {
-        property: 'destination',
-        isEqualTo: 'mtx-api',
-    }, {
-        property: 'authenticationType',
-        isEqualTo: 'none',
-    }]
-}
-
-module.exports = {
-    srvNode4,
-    srvJava4,
-    approuter,
-    xsuaa,
-    destination,
-    connectivity,
-    enterpriseMessaging,
-    hdbDeployer,
-    hdiContainer,
-    notificationTypesDeployer,
-    serviceManager,
-    postgres,
-    postgresDeployer,
-    saasRegistry,
-    redis,
-    srvApi4,
-    mtxSidecar4,
-    providedMtxApiSidecar4,
-    requiredMtxApi,
-    requiredMtxSidecarApi4,
-    providedAppApi,
-    requiredAppApi4,
-    providedJavaApprouterApi4,
-    providedJavaApprouterApi,
-    kibana,
-    approuterExtensibility
-}

package/lib/init/template/helm/Model.d.ts

@@ -1,53 +0,0 @@
-
-/**
- * CDS Kubernetes Configuration
- */
-interface BaseConfig {
-    /** image prefix */
-    image: string,
-    cloudService: string
-}
-
-interface RegistryConfig {
-    imageRegistry: string
-}
-
-interface DeployConfig {
-    releaseName: string,
-    namespace: string,
-    imagePullSecret: string,
-    dbSecret: string,
-    domain: string
-}
-
-interface Service {
-    binding: string;
-    name: string;
-    label: string;
-}
-
-interface ApplicationModel {
-    isJava: boolean;
-    destinations: Map<string,string>; // Unfortunately today needed at build time
-    services: Service[]; // Need to know if destination service is required?
-}
-
-interface BuildModel extends BaseConfig, ApplicationModel {
-}
-
-/**
- * Data required at image push and deploy time
- */
-interface PushModel extends BaseConfig, RegistryConfig {
-}
-
-/**
- * Data required at chart add time
- */
-interface AddChartModel extends BaseConfig, ApplicationModel {
-}
-
-interface Model extends BaseConfig, ApplicationModel {
-    registry : RegistryConfig,
-    deployment : DeployConfig
-}

package/lib/init/template/kibana/files/package.json.hbs

@@ -1,17 +0,0 @@
-{
-  {{#isNodejs}}
-  "cds": {
-  {{/isNodejs}}
-    "features": {
-      {{#profile}}
-      "[{{profile}}]": {
-      {{/profile}}
-        "kibana_formatter": true
-      {{#profile}}
-      }
-      {{/profile}}
-    }
-  {{#isNodejs}}
-  }
-  {{/isNodejs}}
-}