@sap/cds-dk 7.0.1 → 7.0.3

package/lib/util/pruneAxiosErrors.js

@@ -0,0 +1,22 @@
+require('axios').interceptors.response.use(
+    response => response,
+    axError => {
+        const { url, method } = axError.config ?? {};
+        const { code, response } = axError;
+        const { status, data } = response ?? {};
+        const reason = data?.error /* RFC 6749 */ ?? axError.message;
+        const message = (url && method ? `${method.toUpperCase()} ${url} ` : '') +
+            'failed' +
+            (status || code ? ':' : '') +
+            (status ? ` ${status}` : '') +
+            (code ? ` ${code}` : '') +
+            `. ${reason}.` +
+            (data ? ` Details: '${data.error_description /* RFC 6749 */ || require('util').inspect(data)}'.` : '');
+
+        const error = new Error(message);
+        if (require('../').debug('req')) {
+            error.cause = axError;
+        }
+        return Promise.reject(error);
+    }
+);

package/lib/watch/open.js

@@ -50,7 +50,10 @@ function _open(args) {
     args = ['/c', 'start'].concat(args)
   }
 
-  return childProcess.execFile(command, args, null, err => {
-    err && console.error(`Error opening '${command} ${args}' : ${err.message}`)
-  })
+  const delay = parseInt(process.env.CDS_WATCH_OPEN_DELAY) || 1000
+  setTimeout(() => {
+    childProcess.execFile(command, args, null, err => {
+      err && console.error(`Error opening '${command} ${args}' : ${err.message}`)
+    })
+  }, delay);
 }

package/npm-shrinkwrap.json

@@ -1,16 +1,15 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.0.1",
+  "version": "7.0.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "7.0.1",
+      "version": "7.0.3",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds": "^7",
-        "@sap/cds-compiler": "^4",
         "@sap/cds-foss": "^4.0.2",
         "@sap/cds-mtxs": "^1.9.0",
         "@sap/eslint-plugin-cds": "^2.6.0",
@@ -29,17 +28,6 @@
         "cds": "bin/cds.js",
         "cds-ts": "bin/cds-ts.js"
       },
-      "devDependencies": {
-        "@types/jest": "^29",
-        "chai": "^4.3.7",
-        "chai-as-promised": "^7.1.1",
-        "chai-subset": "^1.6.0",
-        "eslint-plugin-cds-dk": "file:.eslint",
-        "jest": "^29",
-        "semver": "^7",
-        "ts-node": "^10.9.1",
-        "typescript": "^5.0.4"
-      },
       "optionalDependencies": {
         "sqlite3": "^5.0.4"
       }
@@ -72,12 +60,12 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.0.3",
+      "version": "2.1.0",
       "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.5.2",
+        "espree": "^9.6.0",
         "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
@@ -93,7 +81,7 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.43.0",
+      "version": "8.44.0",
       "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -132,7 +120,7 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/@mapbox/node-pre-gyp": {
-      "version": "1.0.10",
+      "version": "1.0.11",
       "license": "BSD-3-Clause",
       "optional": true,
       "dependencies": {
@@ -201,7 +189,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "7.0.0",
+      "version": "7.0.3",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": ">=3.9",
@@ -254,7 +242,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "1.9.0",
+      "version": "1.9.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": "^4",
@@ -263,9 +251,6 @@
       "bin": {
         "cds-mtx": "bin/cds-mtx.js",
         "cds-mtx-migrate": "bin/cds-mtx-migrate.js"
-      },
-      "peerDependencies": {
-        "@sap/cds": ">=6"
       }
     },
     "node_modules/@sap/eslint-plugin-cds": {
@@ -591,7 +576,7 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.9.0",
+      "version": "8.10.0",
       "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
@@ -1030,7 +1015,7 @@
       }
     },
     "node_modules/detect-libc": {
-      "version": "2.0.1",
+      "version": "2.0.2",
       "license": "Apache-2.0",
       "optional": true,
       "engines": {
@@ -1110,13 +1095,13 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.43.0",
+      "version": "8.45.0",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.0.3",
-        "@eslint/js": "8.43.0",
+        "@eslint/eslintrc": "^2.1.0",
+        "@eslint/js": "8.44.0",
         "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -1128,7 +1113,7 @@
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^7.2.0",
         "eslint-visitor-keys": "^3.4.1",
-        "espree": "^9.5.2",
+        "espree": "^9.6.0",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -1138,7 +1123,6 @@
         "globals": "^13.19.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
         "is-path-inside": "^3.0.3",
@@ -1148,9 +1132,8 @@
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
+        "optionator": "^0.9.3",
         "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
         "text-table": "^0.2.0"
       },
       "bin": {
@@ -1164,7 +1147,7 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "7.2.0",
+      "version": "7.2.1",
       "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
@@ -1188,10 +1171,10 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.5.2",
+      "version": "9.6.1",
       "license": "BSD-2-Clause",
       "dependencies": {
-        "acorn": "^8.8.0",
+        "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
         "eslint-visitor-keys": "^3.4.1"
       },
@@ -1829,7 +1812,7 @@
       }
     },
     "node_modules/make-dir/node_modules/semver": {
-      "version": "6.3.0",
+      "version": "6.3.1",
       "license": "ISC",
       "optional": true,
       "bin": {
@@ -2544,7 +2527,7 @@
       "license": "ISC"
     },
     "node_modules/semver": {
-      "version": "7.5.3",
+      "version": "7.5.4",
       "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "7.0.1",
+  "version": "7.0.3",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [
@@ -17,7 +17,6 @@
   "main": "lib/index.js",
   "dependencies": {
     "@sap/cds": "^7",
-    "@sap/cds-compiler": "^4",
     "@sap/cds-foss": "^4.0.2",
     "@sap/cds-mtxs": "^1.9.0",
     "@sap/eslint-plugin-cds": "^2.6.0",

package/lib/init/template/kibana-logging/files/cds.package.json

@@ -1,7 +0,0 @@
-{
-  "cds": {
-    "features": {
-      "kibana_formatter": true
-    }
-  }
-}

package/lib/init/template/kibana-logging/files/mta.yaml.hbs

@@ -1,14 +0,0 @@
----
-modules:
-  - name: {{appName}}-srv
-    type: {{language}}
-    path: {{& srvPath}}
-    requires:
-      - name: {{appName}}-cf-logging
-
-resources:
-  - name: {{appName}}-cf-logging
-    type: org.cloudfoundry.managed-service
-    parameters:
-      service: application-logs
-      service-plan: lite

package/lib/init/template/kibana-logging/index.js

@@ -1,45 +0,0 @@
-const { join } = require('path')
-const cds = require('../../../cds')
-const { readProject } = require('../../util/projectReader')
-const { mergeJSON, mergeYAML } = require('../../util/merge')
-const { srvNode4, srvJava4, kibanaLogging } = require('../_merging/registry-mta')
-
-module.exports = class KibanaLoggingTemplate extends require('../templateBase') {
-
-    async canRun() {
-        const { hasMta, hasHelm } = await readProject(this.options)
-        if (hasHelm && !hasMta) {
-            throw `'cds add kibana-logging' is not available for Kyma yet`
-        }
-        return true
-    }
-
-    async run() {
-        const project = await readProject(this.options)
-        const { isJava } = project
-        if (isJava) cds.error(`kibana-logging is not implemented for project type Java yet`)
-        await mergeJSON('package.json', join(__dirname, 'files', 'package.json.hbs'), project)
-        await this.runDependentMerging()
-    }
-
-    async runDependentMerging() {
-        const project = await readProject(this.options)
-        const { hasMta, isNodejs, srvPath } = project
-
-        if (hasMta) {
-            const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)
-            await mergeYAML(
-                'mta.yaml',
-                join(__dirname, 'files', 'mta.yaml.hbs'),
-                project,
-                {
-                    additions: [srv, kibanaLogging],
-                    relationships: [{
-                        insert: [kibanaLogging, 'name'],
-                        into: [srv, 'requires', 'name']
-                    }],
-                }
-            )
-        }
-    }
-}