@sap/cds-dk 6.8.0 → 6.8.2

package/CHANGELOG.md

@@ -7,6 +7,27 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 6.8.2 - 2023-05-31
+
+### Changed
+
+- `cds compile` to `openapi` now uses `@Common.Label` annotation to generate `x-sap-shortText`.
+- `cds import` now removes `x-` from elements in the `@AsyncAPI.Extensions` annotation while importing AsyncAPI documents.
+- `cds compile` to `openapi` now sorts the `tags` and `paths` in alphabetical order.
+- The livereload feature of `cds watch` can be disabled through `cds.livereload: false` in `package.json`.
+
+### Fixed
+
+- `@sap/cds-dk` 6.8.2
+- `@sap/cds-mtxs` 1.8.2
+- `cds add mta` adds configuration `enterprise-messaging-shared` if necessary
+
+## Version 6.8.1 - 2023-05-10
+
+### Fixed
+
+- `cds-ts watch` no longer fails with strange compilation errors if called in combination w/ `ts-node`
+
 ## Version 6.8.0 - 2023-05-04
 
 ### Added

package/bin/build/all.js

@@ -67,6 +67,10 @@ async function build([project], options = {}) {
 
     const cds = require('../../lib/cds')
     try {
+        if (!cds.build) {
+            const { CliError } = require('../../lib/client/helper/errors')
+            throw new CliError('This application uses @sap/cds version >= 7, which is not compatible with the installed @sap/cds-dk version 6. Either update @sap/cds-dk to version 7 or downgrade @sap/cds to version 6 instead.')
+        }
         if (typeof cds.build === 'function') {
             return await cds.build(options)
         }

package/bin/watch.js

@@ -80,8 +80,8 @@ async function watch ([cwd], {
     _options: JSON.stringify(options)
   })
   if (process.env.CDS_TYPESCRIPT) {
-    const tsNodeRegister = localOrGlobal('ts-node', 'register')
-    env.NODE_OPTIONS = `-r ${tsNodeRegister} ` + (env.NODE_OPTIONS || '')
+    // Needed by ts-node/tsc to find the tsconfig.json. Same as `--project`.
+    env.TS_NODE_PROJECT = env.TS_NODE_PROJECT ?? cwd ?? process.cwd()
   }
 
   // allow running w/o or partial local node_modules, also add cds-dk for its sqlite
@@ -92,7 +92,7 @@ async function watch ([cwd], {
   let includes
   let liveReload //= ...
   let firstTime = true
-  if (!/false|no/.test(options['livereload'])) {
+  if (!/false|no/.test(options['livereload']) && cds.env.for('cds', cwd||process.cwd()).livereload !== false) {
     ext += ',css,gif,html,jpg,png,svg'
     includes = fioriIncludes
     liveReload = new (require ('../lib/watch/livereload-server'))
@@ -194,18 +194,6 @@ function paths (dir) {
   return parts.map ((_,i,a)=> a.slice(0,n-i).join(sep)+nm).filter(p => fs.existsSync(p))
 }
 
-function localOrGlobal (id, pathInMod) {
-  // require package.json to get a stable root path of the moduloe, not its main script
-  const modPath = require.resolve (id+'/package.json', { paths:[ process.cwd(), npmGlobalModules() ] })
-  return resolve(modPath, '..', pathInMod)
-}
-
-function npmGlobalModules() {
-  try {
-    return require ('child_process').execSync('npm root -g').toString().trim()
-  } catch (err) { return }
-}
-
 //
 // Child process impl launched by watch
 //

package/lib/compile/openapi/csdl2openapi.js

@@ -264,7 +264,10 @@ module.exports.csdl2openapi = function (
         }
         description += (diagram ? getResourceDiagram(csdl, entityContainer) : '');
         let title;
-        if (entityContainer && entityContainer[voc.Core.Description]) {
+        if (entityContainer && entityContainer[voc.Common.Label]) {
+            title = entityContainer[voc.Common.Label];
+        }
+        else if (entityContainer && entityContainer[voc.Core.Description]) {
             title = entityContainer[voc.Core.Description];
         }
         else if (containerSchema && containerSchema[voc.Core.Description]) {
@@ -474,7 +477,7 @@ module.exports.csdl2openapi = function (
             if (description) tag.description = description;
             tags.push(tag);
         })
-        return tags;
+        return tags.sort(function(pre, next){return pre.name.localeCompare(next.name)});
     }
 
     /**
@@ -502,7 +505,7 @@ module.exports.csdl2openapi = function (
             }
         })
         if (resources.length > 0) pathItemBatch(paths, container);
-        return paths;
+        return Object.keys(paths).sort().reduce((p, c) => (p[c] = paths[c], p), {});
     }
 
     /**

package/lib/import/asyncapi/parserContext.js

@@ -133,11 +133,11 @@ module.exports = class ParserContext {
                 annotations['@AsyncAPI.' + annotationsMapping[key]] = value;
             } 
             // case: unkown annotation
-            else if (key.startsWith('x-sap-')) {
+            else if (key.startsWith('x-')) {
                 if (!annotations['@AsyncAPI.Extensions']) {
                     annotations['@AsyncAPI.Extensions'] = {};
                 }
-                annotations['@AsyncAPI.Extensions'][key] = value;
+                annotations['@AsyncAPI.Extensions'][key.substring(2)] = value; //removes x- from the element
             }
         }
 

package/lib/init/template/enterprise-messaging-shared/index.js

@@ -16,7 +16,7 @@ module.exports = class EnterpriseMessagingSharedTemplate extends require('../tem
   }
 
   static hasFacet(env) {
-    return env.requires?.messaging?.kind === 'enterprise-messaging-shared'
+    return env.requires?.messaging?.kind === 'enterprise-messaging-amqp'
   }
 
   async run() {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "6.8.0",
+  "version": "6.8.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "6.8.0",
+      "version": "6.8.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds": "~6.8.0",
@@ -54,12 +54,12 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.0.2",
+      "version": "2.0.3",
       "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.5.1",
+        "espree": "^9.5.2",
         "globals": "^13.19.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
@@ -75,7 +75,7 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.39.0",
+      "version": "8.41.0",
       "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -183,7 +183,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "6.8.1",
+      "version": "6.8.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": "^3.2.0",
@@ -227,7 +227,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "1.8.0",
+      "version": "1.8.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": "^4",
@@ -256,10 +256,10 @@
       }
     },
     "node_modules/@sap/hdi-deploy": {
-      "version": "4.6.0",
+      "version": "4.6.1",
       "license": "See LICENSE file",
       "dependencies": {
-        "@sap/hana-client": "2.16.21",
+        "@sap/hana-client": "2.16.26",
         "@sap/hdi": "4.4.0",
         "@sap/xsenv": "3.4.0",
         "async": "3.2.3",
@@ -273,7 +273,7 @@
       }
     },
     "node_modules/@sap/hdi-deploy/node_modules/@sap/hana-client": {
-      "version": "2.16.21",
+      "version": "2.16.26",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN developer-license-3_1.txt",
       "dependencies": {
@@ -1083,13 +1083,13 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.39.0",
+      "version": "8.41.0",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
-        "@eslint/eslintrc": "^2.0.2",
-        "@eslint/js": "8.39.0",
+        "@eslint/eslintrc": "^2.0.3",
+        "@eslint/js": "8.41.0",
         "@humanwhocodes/config-array": "^0.11.8",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -1100,8 +1100,8 @@
         "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^7.2.0",
-        "eslint-visitor-keys": "^3.4.0",
-        "espree": "^9.5.1",
+        "eslint-visitor-keys": "^3.4.1",
+        "espree": "^9.5.2",
         "esquery": "^1.4.2",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -1109,13 +1109,12 @@
         "find-up": "^5.0.0",
         "glob-parent": "^6.0.2",
         "globals": "^13.19.0",
-        "grapheme-splitter": "^1.0.4",
+        "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",
-        "js-sdsl": "^4.1.4",
         "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
@@ -1152,7 +1151,7 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "3.4.0",
+      "version": "3.4.1",
       "license": "Apache-2.0",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -1162,12 +1161,12 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.5.1",
+      "version": "9.5.2",
       "license": "BSD-2-Clause",
       "dependencies": {
         "acorn": "^8.8.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.0"
+        "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -1454,11 +1453,12 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.0",
+      "version": "1.2.1",
       "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
+        "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3"
       },
       "funding": {
@@ -1511,8 +1511,8 @@
       "license": "ISC",
       "optional": true
     },
-    "node_modules/grapheme-splitter": {
-      "version": "1.0.4",
+    "node_modules/graphemer": {
+      "version": "1.4.0",
       "license": "MIT"
     },
     "node_modules/has": {
@@ -1532,6 +1532,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/has-proto": {
+      "version": "1.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/has-symbols": {
       "version": "1.0.3",
       "license": "MIT",
@@ -1727,14 +1737,6 @@
       "version": "2.0.0",
       "license": "ISC"
     },
-    "node_modules/js-sdsl": {
-      "version": "4.4.0",
-      "license": "MIT",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/js-sdsl"
-      }
-    },
     "node_modules/js-yaml": {
       "version": "4.1.0",
       "license": "MIT",
@@ -2057,7 +2059,7 @@
       "optional": true
     },
     "node_modules/node-fetch": {
-      "version": "2.6.9",
+      "version": "2.6.11",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -2515,7 +2517,7 @@
       "license": "ISC"
     },
     "node_modules/semver": {
-      "version": "7.5.0",
+      "version": "7.5.1",
       "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -2761,7 +2763,7 @@
       }
     },
     "node_modules/tar": {
-      "version": "6.1.14",
+      "version": "6.1.15",
       "license": "ISC",
       "optional": true,
       "dependencies": {
@@ -2986,7 +2988,7 @@
       }
     },
     "node_modules/yaml": {
-      "version": "2.2.2",
+      "version": "2.3.1",
       "license": "ISC",
       "engines": {
         "node": ">= 14"

package/package.json

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