@sap/cds-dk 8.7.1 → 8.7.3

package/CHANGELOG.md

@@ -7,7 +7,31 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
-## Version 8.7.1 - 2024-02-04
+## Version 8.7.3 - 2025-02-19
+
+### Fixed
+
+- `cds compile -o` fixes the output file name in `-o <service>.json`.
+- `cds lint` won't stumble over scalar config objects anymore.
+- `cds init` uses latest Maven Java archetype version 3.7.2 for creating Java projects.
+- `cds deploy --to hana --dry` doesn't exit with a `TypeError` if there are no models.
+- `cds add ias` fixes a few scenarios in combination with multitenancy.
+
+## Version 8.7.2 - 2025-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 - 2025-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')
@@ -286,7 +294,7 @@ async function compile (models, options={}) {
   const write = require ('../../lib/util/write')
   chain = chain.then (write.to ({
     folder: options.dest,
-    file: options.file || options.service === 'all' ? path.basename(src) : options.service,
+    file: options.file || (options.service === 'all' ? path.basename(src) : options.service),
     suffix: options.suffix || suffix4(_suffix),
     [options.dest ? 'foreach' : 'log']: options.log || consoleLog
   }))

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/bin/lint.js

@@ -1,7 +1,13 @@
 const Linter = require('../lib/lint/Linter');
 const linter = new Linter();
 
-module.exports = Object.assign(
-    linter.lint,
-    linter.init()
-);
+// cds cli exec expects an executable object with various additional properties.
+// As most of the linting functionality is bound to a class instance, we need to wrap the instance
+// to not lose the this-context and attach the additional properties to the function.
+const lint = (...args) => linter.lint(...args)
+const additionalProperties = Object.entries(linter.init())
+    .map(([key, value]) => [key, { value }])
+
+Object.defineProperties(lint, Object.fromEntries(additionalProperties))
+
+module.exports = lint

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/deploy/to-hana/hana.js

@@ -79,6 +79,7 @@ Therefore, specifying the CDS model is not required when calling 'cds deploy'.`;
     }
 
     if (dry) {
+      if (!buildResult) return
       const sortedResult = Array.from(buildResult.hana).sort();
       for (const file of sortedResult) {
         const srcPath = path.join(buildResult.dest, file);
@@ -87,7 +88,7 @@ Therefore, specifying the CDS model is not required when calling 'cds deploy'.`;
         console.log();
       }
     } else {
-      // the primary database is always built and deployed 
+      // the primary database is always built and deployed
       const dest = path.join(cds.env.build.target, cds.env.folders.db);
 
       let serviceName = pServiceName;
@@ -211,8 +212,7 @@ Therefore, specifying the CDS model is not required when calling 'cds deploy'.`;
       src: cds.env.folders.db,
       [OUTPUT_MODE]: OUTPUT_MODE_FILESYSTEM | OUTPUT_MODE_RESULT
     }
-    console.log(`Running build`);
-    
+
     // cds build throws an error if the src folder does not exist
     const buildResult = await build(buildTaskOptions);
     return buildResult[0].result;

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/constants.js

@@ -5,7 +5,7 @@ module.exports = {
     COMMAND_ADD: 'add',
 
     JAVA_LTS_VERSIONS: [17, 21],
-    MAVEN_ARCHETYPE_VERSION: '3.7.1',
+    MAVEN_ARCHETYPE_VERSION: '3.7.2',
 
     OPTIONS: Object.freeze({
         COMPLETION: 'completion',

package/lib/init/merge.js

@@ -330,7 +330,7 @@ async function _mergeYAML(into, from, project, semantics = {}) {
                     })
                     .filter(item => !entryMap.get(item))
                     .forEach(item => {
-                        if (!templateEntryMap.get(item)) throw 'Error: did not find entry in template for ' + inspect(item, { colors }) + ' in ' + from
+                        if (!templateEntryMap.get(item)) throw 'Error: did not find entry in template for ' + inspect(item, { colors, depth:11 }) + ' in ' + from
                         const templateNode = templateEntryMap.get(item).node
                         item.at !== undefined ? targetNode.items.splice(item.at, 0, templateNode) : targetNode.add(templateNode)
                     })

package/lib/init/registries/mta.js

@@ -140,7 +140,7 @@ const requiredMtxSidecarApi4 = srv => ({
     where: { 'properties.CDS_MULTITENANCY_SIDECAR_URL': '~{mtx-url}' }
 })
 
-const providedJavaApprouterApi4 = srv => ({
+const requiredJavaApprouterApi4 = srv => ({
     in: [srv, 'requires'],
     where: { 'properties.CDS_MULTITENANCY_APPUI_URL': '~{url}' }
 })
@@ -216,7 +216,7 @@ module.exports = {
     requiredMtxSidecarApi4,
     providedAppApi,
     requiredAppApi4,
-    providedJavaApprouterApi4,
+    requiredJavaApprouterApi4,
     providedJavaApprouterApi,
     applicationLogging,
     approuterMTXRoute,

package/lib/init/template/approuter/files/mta.yaml.hbs

@@ -12,9 +12,9 @@ modules:
     requires:
       - name: {{appName}}-auth
     {{#isJava}}
-      - name: app-api
+      - name: app-api{{#hasMultitenancy}}
         properties:
-          CDS_MULTITENANCY_APPUI_URL: ~{url}
+          CDS_MULTITENANCY_APPUI_URL: ~{url}{{/hasMultitenancy}}
     {{/isJava}}
 
   - name: {{appName}}

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

@@ -6,7 +6,7 @@ const { sort, merge } = require('../../merge')
 const {
     srv4, mtxSidecar4, approuter, // Modules
     xsuaa, // BTP Services
-    requiredMtxApi, providedJavaApprouterApi4, providedJavaApprouterApi, // APIs
+    requiredMtxApi, requiredJavaApprouterApi4, providedJavaApprouterApi, // APIs
     requiredAppApi4, providedAppApi,
     approuterMTXRoute,
     approuterMTXRouteJava // xs-app.json config
@@ -36,7 +36,7 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
 
         if (hasMta) {
             const srv = srv4(srvPath)
-            const apis = isJava ? [providedJavaApprouterApi4(srv), providedJavaApprouterApi] : []
+            const apis = isJava && hasMultitenancy ? [requiredJavaApprouterApi4(srv), providedJavaApprouterApi] : []
             const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
             if (isNodejs && hasMultitenancy) apis.push(requiredMtxApi, requiredAppApi4(mtxSidecar), providedAppApi)
             if (isJava && hasMultitenancy) apis.push(requiredMtxApi)

package/lib/init/template/ias/files/mta.yaml.hbs

@@ -36,7 +36,7 @@ modules:
 
   - name: {{appName}}-mtx
     type: nodejs
-    path: gen/mtx/sidecar
+    path: {{#isNodejs}}gen/{{/isNodejs}}mtx/sidecar
     requires:
       - name: {{appName}}-auth
         parameters:

package/lib/init/template/ias/files/sidecar.package.json.hbs

@@ -0,0 +1,12 @@
+{
+  "dependencies": {
+    "@sap/xssec": "^4"
+  },
+  "cds": {
+    "requires": {
+      "auth": {
+        "kind": "ias"
+      }
+    }
+  }
+}

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

@@ -23,9 +23,6 @@ module.exports = class IasTemplate extends require('../../plugin') {
         const { configFile, isNodejs } = project
         await merge(__dirname, 'files/package.json.hbs').into(configFile, { project, forceOverwrite: true })
         if (isNodejs) await sort('package.json', 'dependencies')
-        if (project.hasMultitenancy) {
-            await merge(__dirname, 'files/package.json.hbs').into('mtx/sidecar/package.json', { project, forceOverwrite: true })
-        }
         // if (project.isJava) await mvn.add('ias')
     }
 
@@ -43,6 +40,7 @@ module.exports = class IasTemplate extends require('../../plugin') {
                 conf.cds.profiles.push('subscription-manager')
             }
             await write('mtx/sidecar/package.json', conf, { spaces: 2 })
+            await merge(__dirname, 'files/sidecar.package.json.hbs').into('mtx/sidecar/package.json')
         }
 
         if (hasMta) {

package/lib/init/template/multitenancy/files/mta.yaml.hbs

@@ -92,14 +92,14 @@ resources:
         applicationType: application
         appName: {{appName}}-${org}-${space}
         appCallbacks:
-            dependenciesCallbacks:
-              url: ~{mtx-api/mtx-cert-url}/-/cds/sms-provisioning/dependencies/{app_tid}
-            subscriptionCallbacks:
-              url: ~{mtx-api/mtx-cert-url}/-/cds/sms-provisioning/tenant/{app_tid}
-              async:
-                subscribeEnable: true
-                unSubscribeEnable: true
-                timeoutInMillis: 300000 # Increase if your deployments are taking longer than that
+          dependenciesCallbacks:
+            url: {{#isJava}}~{srv-api/srv-cert-url}/mt/sms/subscriptions/tenants/{app_tid}/dependencies{{/isJava}}{{#isNodejs}}~{mtx-api/mtx-cert-url}/-/cds/sms-provisioning/dependencies/{app_tid}{{/isNodejs}}
+          subscriptionCallbacks:
+            url: {{#isJava}}~{srv-api/srv-cert-url}/mt/sms/subscriptions/tenants/{app_tid}{{/isJava}}{{#isNodejs}}~{mtx-api/mtx-cert-url}/-/cds/sms-provisioning/tenant/{app_tid}{{/isNodejs}}
+            async:
+              subscribeEnable: true
+              unSubscribeEnable: true
+              timeoutInMillis: 300000 # Increase if your deployments are taking longer than that
         displayName: {{appName}}
         description: Description for {{appName}}
         category: Category

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