@sap/cds-dk 8.7.1 → 8.7.2

package/CHANGELOG.md

@@ -7,6 +7,20 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
+## Version 8.7.2 - 2024-02-14
+
+### Fixed
+
+- `cds compile -o` with a file name such as `cds c srv/cat-service.cds -o srv/cat-service.json`.
+- `cds compile` without `-o` doesn't print the file name header for single services any more.
+- `cds add workzone` in combination with multitenancy doesn't throw an error any more.
+- `cds import --from rfc` stores the input file again in `srv/external/<destination>/...` instead of `srv/external/...`.
+- `cds import --name` no longer crashes with a `TypeError`.
+- `cds import --out <filename>` no longer crashes with a `Error: EEXIST`.
+- `BuildError` no longer cuts off its stack.
+- `cds bind -a` doesn't concurrently try to check the Cloud Foundry version or OAuth token.
+- `cds import` now resolves target of association/composition correctly for multiple schema files.
+
 ## Version 8.7.1 - 2024-02-04
 
 ### Fixed

package/bin/compile/index.js

@@ -217,7 +217,15 @@ async function compile_all (root='.') {
 }
 
 async function compile (models, options={}) {
-  options.service ??= 'all'
+  const { dest } = options
+  if (dest) {
+    options.service ??= 'all'
+    const ext = path.extname(dest)
+    if (ext) {
+      options.file ??= path.basename(dest, ext)
+      options.dest = path.dirname(dest)
+    }
+  }
   if (options.all)  return compile_all (models[0])
 
   const { inspect } = require('util')

package/bin/import.js

@@ -28,7 +28,6 @@ module.exports = Object.assign(_import, {
 
     *-o | --out* <filename/dirname>
         Skips copying to ./srv/external and writes to the specified location.
-        Dirname is only applicable for importing odata-V4 file with dependencies.
 
     *- | --dry*
         Writes the converted csn to stdout only.
@@ -70,7 +69,7 @@ module.exports = Object.assign(_import, {
     *-d | --dependencies* <comma-separated list of dependencies>
         Imports the given list of dependencies along with the main file. Valid for OData V4 only.
         The dependencies are written to the given dirname(-o option) or ./srv/external.
-        If the cds files of dependencies are already present in the destination, it will be skipped 
+        If the cds files of dependencies are already present in the destination, it will be skipped
         if -f option is not given.
         NOTE: The dependencies must not have any dependency.
 
@@ -106,7 +105,7 @@ async function _import(args, options = {}) {
     const messages = require('../lib/import/message').getMessages();
     const common = require('../lib/import/common');
     const cds = require('../lib/index');
-    
+
     // check if dependencies are provided and import them first
     if (options.dependencies) {
         const dependencies = options.dependencies.split(',');
@@ -133,10 +132,11 @@ async function _import(args, options = {}) {
         input = await common.preProcess(file, options, cwd);
     }
 
-    const fileType = await common.identifyFile(input);
-    if ((options.isDependency || options.isDependent) 
-            && fileType !== 'edmx') {
-        throw messages.DEPENDENCY_NOT_SUPPORTED;
+    if (input) {
+        const fileType = await common.identifyFile(input);
+        if ((options.isDependency || options.isDependent) && fileType !== 'edmx') {
+            throw messages.DEPENDENCY_NOT_SUPPORTED;
+        }
     }
 
     let csn

package/lib/build/util.js

@@ -207,7 +207,7 @@ async function getWorkspaces(wsRoot, resolve = false, devDependencies = true) {
         // read npm workspaces
         const pkgs = await _execNpmWs(wsRoot)
         pkgs.forEach(pkg => {
-            // only create tarball archives for dependencies with version '*' 
+            // only create tarball archives for dependencies with version '*'
             if (!resolve || devDependencies && pgkJson.devDependencies?.[pkg] === '*' || pgkJson.dependencies?.[pkg] === '*') {
                 const workspace = _getWorkspace(wsRoot, pkg)
                 if (workspace) {
@@ -240,11 +240,11 @@ function findWorkspaceRoot(currentPath, depth = 0) {
 }
 
 /**
- * This JavaScript function filterFeaturePaths is used to filter and categorize file paths 
+ * This JavaScript function filterFeaturePaths is used to filter and categorize file paths
  * from a given model into two categories: base and features.
  * @param {*} model - represents a data model. It's expected to have a $sources property which is an array of file paths.
  * @param {*} modelPaths - an array of file paths.
- * @returns 
+ * @returns
  */
 function filterFeaturePaths(model, modelPaths) {
     const ftsName = path.dirname(cds.env.features.folders || 'fts/*')
@@ -278,8 +278,8 @@ function filterFeaturePaths(model, modelPaths) {
 }
 
 /**
- * Read installed npm workspaces using 'npm ls -ws --json'. 
- * @returns {Array} list of package paths, or an empty array if either 
+ * Read installed npm workspaces using 'npm ls -ws --json'.
+ * @returns {Array} list of package paths, or an empty array if either
  * no workspaces are defined or have not been installed.
  */
 async function _execNpmWs(wsRoot) {
@@ -331,7 +331,7 @@ function _validateWsDependencies(wsRoot, dependencies, devDependencies) {
 /**
  * Returns a flat array of existing files and folders, trailing '/' or '\\' characters have been removed.
  * @param  {Array} modelPaths array of files and folders - optionally nested
- * @returns 
+ * @returns
  */
 function _filterModelPaths(modelPaths, filter) {
     const model = new Set()
@@ -424,7 +424,7 @@ class BuildMessage {
      * @param {string} message The message text
      * @param {string} [severity='Error'] Severity: Debug, Info, Warning, Error
      * @param {any} location Location of the message
-     * 
+     *
      * @memberOf BuildMessage
      */
     constructor(message, severity = SEVERITY_ERROR, location) {
@@ -439,9 +439,9 @@ class BuildMessage {
 }
 
 /**
- * Class for combined build and compiler errors. 
+ * Class for combined build and compiler errors.
  * Additional members:
- *   messages: vector of detailed build messages
+ *   messages: array of detailed build messages
  * @class BuildError
  * @extends {Error}
  */
@@ -450,7 +450,6 @@ class BuildError extends Error {
         super(message)
         this.name = "BuildError"
         this.messages = Array.isArray(messages) ? messages : [messages]
-        this.stack = ""
     }
 
     // for compatibility reasons

package/lib/import/common.js

@@ -444,13 +444,8 @@ function _findPackageJson(dir, cwd) {
 
 async function postProcess(filePath, options, csn, cwd) {
     const services = _getServiceNames(csn);
-    let destFilePath;
-
-    if (options.isDependency || options.isDependent) {
-        destFilePath = path.resolve(cwd, options.out ? path.join(options.out, path.basename(filePath)) : path.join(cds.env.folders.srv, 'external', path.basename(filePath)));
-    } else {
-        destFilePath = path.resolve(cwd, options.out ? path.join(path.dirname(options.out), path.basename(filePath)) : path.join(cds.env.folders.srv, 'external', path.basename(filePath)));
-    }
+    const out = options.out || path.join(cds.env.folders.srv, 'external');
+    let destFilePath = path.resolve(cwd, path.join(out, path.basename(filePath)));
 
     if (options.out) {
         options.out = _validateAndComputeOutputFilePath(options.out, options.as, destFilePath);
@@ -465,7 +460,7 @@ async function postProcess(filePath, options, csn, cwd) {
     const kind = options.inputFileKind;
     let result;
     try {
-        result = await _getResult(csn, options.as, options.out || destFilePath.replace(/\.[^.]+$/, ''), options.force, kind, options.isDependent);  
+        result = await _getResult(csn, options.as, options.out || destFilePath.replace(/\.[^.]+$/, ''), options.force, kind, options.isDependent);
     } catch (error) {
         if (options.isDependency && error.message === messages.FILE_MODIFIED) {
             return console.log(info(`[cds] - skipping import of ${path.basename(filePath)} as it is already imported`));
@@ -476,6 +471,9 @@ async function postProcess(filePath, options, csn, cwd) {
 
     const [serviceCsn, csnFile] = result;
 
+    // destFilePath might be wrongly computed and contain the csn file name in the path. Fix it here.
+    destFilePath = destFilePath.replace(csnFile, path.dirname(csnFile));
+
     if (!options.dry && !options.no_save) {
         if (cds.env['project-nature'] === 'java') {
             await _updateJavaConfig(kind, services, csn, options)

package/lib/import/importapi.js

@@ -28,7 +28,7 @@ module.exports = Object.assign(cds_import, {
  */
 async function cds_import(filepath, options = { keepNamespace: false }) {
     // identifies the file and calls the respective api
-    let fileType = await common.identifyFile(filepath);
+    let fileType = filepath && await common.identifyFile(filepath);
 
     let csn;
     switch (fileType) {

package/lib/import/odata/ParserContext.js

@@ -37,6 +37,7 @@ module.exports = class ParserContext {
         this.primarySchema = "";
         this.schemaAliasToNamespace = {};
         this.schemaToSchemaDataIndex = {};
+        this.schemaToPrimarySchema = {};
         this.vocabNamespaceToAlias = {};
         this.entityToBoundActions = {};
         this.entityToBoundFunctions = {};

package/lib/import/odata/v4parser.js

@@ -641,11 +641,11 @@ function _parseAssociationProperty(foreignReference, associationNode, parserCont
         if (entityTypeMapping.length > 1) {
             for (let j = 0; j < entityTypeMapping.length; j++) {
                 if (entityTypeMapping[j] === foreignReference) {
-                    associationProperty.target = schemaName + '.' + entityTypeMapping[j];
+                    associationProperty.target = parserContext.schemaToPrimarySchema[schemaName] + '.' + entityTypeMapping[j];
                 }
             }
         } else {
-            associationProperty.target = schemaName + '.' + entityTypeMapping;
+            associationProperty.target = parserContext.schemaToPrimarySchema[schemaName] + '.' + entityTypeMapping;
         }
     } else {
         associationProperty.target = resolvedEntityName;
@@ -1554,6 +1554,7 @@ function _preProcess(edmxAsJson, parserContext, importerContext) {
                 parserContext.schemaAliasToNamespace[schemaData.$Alias] = schemaName;
             }
             parserContext.schemaToSchemaDataIndex[schemaName] = indexOfSchema;
+            parserContext.schemaToPrimarySchema[schemaName] = parserContext.primarySchema;
             indexOfSchema++;
         }
         // if mock server use case & traversing primary schema, collect relevant mappings

package/lib/init/template/multitenancy/index.js

@@ -24,11 +24,6 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
     return options?.add?.has('mtx') || options?.add?.has('multitenancy') || !!env.requires?.multitenancy || false
   }
 
-  canRun() {
-    if (cds.requires.workzone) throw `There is no 'cds add multitenancy' support for SAP BTP WorkZone yet.`
-    return true
-  }
-
   async run() {
     const project = readProject()
     const { isNodejs, isJava, configFile } = project

package/lib/init/template/workzone-standard/index.js

@@ -19,13 +19,6 @@ module.exports = class extends require('../../plugin') {
       return !!env.requires?.workzone || cds.cli.options.add.has('workzone-standard')
     }
 
-    canRun() {
-      if (cds.requires.multitenancy) {
-        throw `SAP BTP Work Zone, Standard Edition does not support multitenancy yet.`
-      }
-      return true
-    }
-
     async run() {
       const project = readProject()
       const { appUIPaths, appPath } = project

package/lib/util/cf.js

@@ -44,7 +44,7 @@ module.exports = new class CfUtil {
         args = args.map(arg => arg.replace(/"/g, '\\"'));
         const cmdLine = `${CF_COMMAND} "${args.join('" "')}"`;
         DEBUG?.time(cmdLine);
-        LOG.debug('>>>', cmdLine);
+        DEBUG?.('>>>', cmdLine);
 
         try {
             const result = await execAsync(cmdLine, {
@@ -146,13 +146,21 @@ module.exports = new class CfUtil {
         }
     }
 
+    #token
     async _getCfAuthorization() {
-        DEBUG?.('getting authorization');
-        try {
-            return (await this.cfRun('oauth-token')).stdout;
-        } catch (err) {
-            throw err.message;
+        if (this.#token) return this.#token
+        if (!this._tokenPromise) {
+            this._tokenPromise = this.cfRun('oauth-token')
+            .then(result => {
+                this.#token = result.stdout
+                return this.#token
+            })
+            .catch(err => {
+                this._tokenPromise = null
+                throw err.message
+            })
         }
+        return this._tokenPromise
     }
 
     async getCfTarget() {
@@ -163,7 +171,10 @@ module.exports = new class CfUtil {
         return target;
     }
 
+    #checkedVersion = false
     async _checkCliVersion() {
+        if (this.#checkedVersion) return
+        this.#checkedVersion = true
         const result = await this.cfRun('-v');
         const version = result?.stdout?.match(/version.*(\d+\.\d+\.\d+)/i)
         if (parseInt(version?.[1]) < CF_CLIENT_MINIMUM_VERSION) {
@@ -358,7 +369,7 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
     async getOrCreateServiceKey(serviceInstance, serviceKeyName, parameters, { silent = false, create = true } = {}) {
         const serviceKey = await this._getServiceKey(serviceInstance, serviceKeyName, false);
         if (serviceKey || !create) {
-            if (serviceKey && !silent) console.log(`getting service key ${bold(serviceKeyName)}`);
+            if (serviceKey && !silent) DEBUG?.(`getting service key ${bold(serviceKeyName)}`);
             return serviceKey;
         }
 
@@ -389,4 +400,4 @@ Deployment will stop in the near future for Cloud Foundry client versions < ${CF
 
         throw `Could not create service key ${bold(serviceKeyName)}`;
     }
-}
+}

package/lib/util/write.js

@@ -88,7 +88,7 @@ function _write (content, /*to:*/ dest, _many) { // NOSONAR
 	}
 
 	file = path.resolve (cds.root,file)
-	// write to the target file, creating parent folders if neccessary
+	// write to the target file, creating parent folders if necessary
 	return mkdirp (dirname(file))
 	.then (()=> fs.writeFile (file, typeof content === 'string' ? content : JSON.stringify (content, null, 2)))
 	.then (()=> dest.foreach && dest.foreach(file))

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "8.7.1",
+  "version": "8.7.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "8.7.1",
+      "version": "8.7.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/asyncapi": "^1.0.0",
@@ -43,7 +43,7 @@
       }
     },
     "node_modules/@cap-js/db-service": {
-      "version": "1.17.0",
+      "version": "1.17.2",
       "license": "SEE LICENSE",
       "optional": true,
       "dependencies": {
@@ -121,7 +121,7 @@
       }
     },
     "node_modules/@eslint/core": {
-      "version": "0.10.0",
+      "version": "0.11.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@types/json-schema": "^7.0.15"
@@ -152,7 +152,7 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.19.0",
+      "version": "9.20.0",
       "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -176,6 +176,16 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
+      "version": "0.10.0",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/@humanfs/core": {
       "version": "0.19.1",
       "license": "Apache-2.0",
@@ -228,7 +238,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "8.7.0",
+      "version": "8.7.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": ">=5.1",
@@ -258,7 +268,7 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "5.7.2",
+      "version": "5.7.4",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -626,7 +636,7 @@
       }
     },
     "node_modules/call-bind-apply-helpers": {
-      "version": "1.0.1",
+      "version": "1.0.2",
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
@@ -906,15 +916,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.19.0",
+      "version": "9.20.1",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
         "@eslint/config-array": "^0.19.0",
-        "@eslint/core": "^0.10.0",
+        "@eslint/core": "^0.11.0",
         "@eslint/eslintrc": "^3.2.0",
-        "@eslint/js": "9.19.0",
+        "@eslint/js": "9.20.0",
         "@eslint/plugin-kit": "^0.2.5",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -1727,7 +1737,7 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.3",
+      "version": "1.13.4",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -2012,7 +2022,7 @@
       "license": "ISC"
     },
     "node_modules/semver": {
-      "version": "7.7.0",
+      "version": "7.7.1",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"

package/package.json

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