@sap/cds-dk 8.6.1 → 8.7.0

package/lib/import/odata/v4parser.js

@@ -7,7 +7,7 @@
 const messages = require("../message").getMessages();
 const common = require("../common");
 const versionInfo = require("../../../package.json").version;
-const Multimap = require("./util/MultiMap");
+const ParserContext = require("./ParserContext");
 const ignoreObjects = ["$Reference"]; // add all the objects that needs to be ignored for parsing.
 const { warn, info } = require("../../util/term");
 const MetadataConverterFactory = require("./metadataconverter/MetadataConverterFactory");
@@ -82,30 +82,7 @@ const known_vocabularies = {
     'com.sap.vocabularies.UI.v1': 'UI',
 };
 
-function _initialize(parserContext) {
-    parserContext.unboundActions = {};
-    parserContext.unboundFunctions = {};
-    parserContext.entityTypes = [];
-    parserContext.entityTypeOpenEntries = [];
-    parserContext.complexTypeOpenEntries = [];
-    parserContext.complexTypes = [];
-    parserContext.enumTypes = [];
-    parserContext.typeDefinitions = [];
-    parserContext.entityContainerName = "";
-    parserContext.entityToEntitySetMap = new Multimap();
-    parserContext.entityToSingletonMap = new Multimap();
-    parserContext.actionToActionImportMap = new Multimap();
-    parserContext.functionToFunctionImportMap = new Multimap();
-    parserContext.primarySchema = "";
-    parserContext.schemaAliasToNamespace = {};
-    parserContext.schemaToSchemaDataIndex = {};
-    parserContext.vocabNamespaceToAlias = {};
-    parserContext.entityToBoundActions = {};
-    parserContext.entityToBoundFunctions = {};
-    parserContext.entityContainerAnnotations = {};
-    parserContext.mockServerUc = true;
-    parserContext.beta = false;
-}
+
 function _isJson(edmx) {
     let isJson = false;
     try {
@@ -291,7 +268,7 @@ function _replaceSpecialCharacters(text) {
     return text.replace(/(?:\\[rn]|[\r\n]+)+/gm, "\n").replace(/\s+/g, ' ').replace(/"/g, """).trim();
 }
 
-function _resolveCoreTerm(annotationTerm, annotationTermObject, csnDefsTargetObject, parserContext) {
+function _resolveCoreTerm(annotationTerm, annotationTermObject, csnDefsTargetObject) {
     if (annotationTerm === "@Core.Description" || annotationTerm === "@Core.LongDescription") {
         // we don't capture `null` value for doc
         if (annotationTermObject === null)  return;
@@ -314,9 +291,7 @@ function _resolveCoreTerm(annotationTerm, annotationTermObject, csnDefsTargetObj
     if (annotationTermObject === null) annotationTermObject = true;
 
     if (annotationTerm === "@Core.OptionalParameter") {
-        if (parserContext.beta) {
-            _updateElementObjectForDefaultValue(csnDefsTargetObject, annotationTermObject.DefaultValue);
-        }
+        _updateElementObjectForDefaultValue(csnDefsTargetObject, annotationTermObject.DefaultValue);
     } else {
         _captureAnnotationInCSN(annotationTerm, annotationTermObject, csnDefsTargetObject);
     }
@@ -405,13 +380,13 @@ function _parseValidationTerm(annotationTerm, annotationTermObject, csnDefsTarge
     _captureAnnotationInCSN(annotationTerm, annotationTermObject, csnDefsTargetObject);
 }
 
-function _parseAnnotationTerms(annotationTerm, annotationTermObject, csnDefsTargetObject, parserContext) {
+function _parseAnnotationTerms(annotationTerm, annotationTermObject, csnDefsTargetObject) {
     const term = annotationTerm.split('.');
     const vocabAlias = term[0];
 
     switch (vocabAlias) {
         case "@Core":
-            _resolveCoreTerm(annotationTerm, annotationTermObject, csnDefsTargetObject, parserContext);
+            _resolveCoreTerm(annotationTerm, annotationTermObject, csnDefsTargetObject);
             break;
         case "@Capabilities":
             _parseCapabilitiesTerm(annotationTerm, annotationTermObject, csnDefsTargetObject);
@@ -477,13 +452,12 @@ function _resolveAnnotationTerm(schemaDataAnnotation, parserContext) {
         }
     }
 
-    let index = 0;
-    while (schemaDataAnnotation.indexOf('@', index) != -1) {
-
-        let i = schemaDataAnnotation.indexOf('@', index);
-        let annotationTerm = schemaDataAnnotation.substring(i, schemaDataAnnotation.indexOf('"', i));
+    let index = schemaDataAnnotation.indexOf('"@');
+    while (index != -1) {
+        let i = schemaDataAnnotation.indexOf('"', index + 1);
+        let annotationTerm = schemaDataAnnotation.substring(index+1, i);
         _validateAnnotationNamespace(annotationTerm, parserContext.vocabNamespaceToAlias);
-        index = i+1;
+        index = schemaDataAnnotation.indexOf('"@', i+1);
     }
 
     return JSON.parse(schemaDataAnnotation);
@@ -504,7 +478,7 @@ function _captureAnnotationWithinElement(sourceObject, targetObject, parserConte
     Object.keys(sourceObject).forEach(key => {
         if (key.startsWith('@')) {
             element = _resolveAnnotationTerm(JSON.stringify(key), parserContext);
-            _parseAnnotationTerms(element, sourceObject[key], targetObject, parserContext);
+            _parseAnnotationTerms(element, sourceObject[key], targetObject);
         }
     });
 }
@@ -643,6 +617,12 @@ function _parseAssociationProperty(foreignReference, associationNode, parserCont
     const associationProperty = {};
     associationProperty.type = (associationNode.$OnDelete === 'Cascade') ? 'cds.Composition' : 'cds.Association';
 
+    let schemaName = associationNode.$Type.substring(0, associationNode.$Type.lastIndexOf('.'));
+
+    if (parserContext.schemaAliasToNamespace[schemaName]) {
+        schemaName = parserContext.schemaAliasToNamespace[schemaName];
+    }
+
     let resolvedEntityName;
     let entityTypeMapping = (
         parserContext.entityToEntitySetMap?.get(associationNode.$Type) ||
@@ -661,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 = parserContext.primarySchema + '.' + entityTypeMapping[j];
+                    associationProperty.target = schemaName + '.' + entityTypeMapping[j];
                 }
             }
         } else {
-            associationProperty.target = parserContext.primarySchema + '.' + entityTypeMapping;
+            associationProperty.target = schemaName + '.' + entityTypeMapping;
         }
     } else {
         associationProperty.target = resolvedEntityName;
@@ -1219,7 +1199,7 @@ function _parseAnnotations(schemaAnnotations, csnDefs, parserContext) {
             let annotationTerms = schemaAnnotations[annotationTargetPath];
             Object.keys(annotationTerms).forEach(annotationTerm => {
                 let annotationTermObject = schemaAnnotations[annotationTargetPath][annotationTerm];
-                _parseAnnotationTerms(annotationTerm, annotationTermObject, csnDefsTargetObject, parserContext);
+                _parseAnnotationTerms(annotationTerm, annotationTermObject, csnDefsTargetObject);
             });
         }
     });
@@ -1673,10 +1653,10 @@ function _generateEDMX2JSON(edmx, name_space) {
                     console.log(missingReferencedDocuments);  
                 }
 
-                if (error) {
-                    reject(error);
-                } else {
+                if (json) {
                     resolve(json);
+                } else {
+                    reject(error);
                 }
             });
         } catch (err) {
@@ -1690,13 +1670,7 @@ async function getEdmxv4CSN(edmx, ignorePersistenceSkip, mockServerUc, importerC
     let edmjConverted;
     let name_space = [];
 
-    const parserContext = {};
-    _initialize(parserContext);
-    parserContext.mockServerUc = mockServerUc;
-
-    if (importerContext.beta) {
-        parserContext.beta = importerContext.beta
-    }
+    const parserContext = ParserContext.getInstance(mockServerUc);
 
     if (importerContext.include_all_namespaces) {
         name_space.push(true);

package/lib/init/add.js

@@ -3,8 +3,6 @@ const registered = new Map
 module.exports = {
   Plugin: require('./plugin'),
   merge: require('./merge').merge, // fluent API
-  removeFromYAML: require('./merge').removeFromYAML,
-  removeFromYAMLArray: require('./merge').removeFromYAMLArray,
   readProject: require('./projectReader').readProject,
   mvn: {
     add: require('./mvn').add

package/lib/init/constants.js

@@ -5,7 +5,7 @@ module.exports = {
     COMMAND_ADD: 'add',
 
     JAVA_LTS_VERSIONS: [17, 21],
-    MAVEN_ARCHETYPE_VERSION: '3.6.0',
+    MAVEN_ARCHETYPE_VERSION: '3.7.0',
 
     OPTIONS: Object.freeze({
         COMPLETION: 'completion',
@@ -14,11 +14,11 @@ module.exports = {
         JAVA_PACKAGE: 'java:package',
         NODEJS: 'nodejs',
         ESM: 'esm',
+        TYPER: 'typer',
+        TYPESCRIPT: 'typescript',  // must run before SAMPLE, as that influences whether .js or .ts files are created
         SAMPLES: 'samples', // deprecated
         TINY_SAMPLE: 'tiny-sample',
         SAMPLE: 'sample',
-        TYPER: 'typer',
-        TYPESCRIPT: 'typescript',
         HANDLER: 'handler', // influenced by esm, typer and typescript
         MTA: 'mta',
         CF_MANIFEST: 'cf-manifest',

package/lib/init/index.js

@@ -181,7 +181,7 @@ module.exports = class CDSGenerator {
             if (err.code === 'MODULE_NOT_FOUND') {
                 const entries = this.constructor.readPlugins()
                 const fuzzySearch = require('../../bin/util/fuzzySearch')
-                const [bestMatch] = fuzzySearch(plugin, entries.map(e => e.name))
+                const [bestMatch] = fuzzySearch(plugin, entries.map(e => e.name), null, { maxListLength: entries.length })
                 const max = entries.reduce((max, {name}) => Math.max(max, name.length), 0)
                 const allFacetsText = entries.filter(({module})=> module.help()).map(({name, module}) => {
                     const help = module.help?.() ?? ''

package/lib/init/merge.js

@@ -1,7 +1,7 @@
 const { EOL } = require('node:os')
 const { inspect } = require('node:util')
 const cds = require('../cds')
-const { copy, read, write, exists, path, yaml: YAML } = cds.utils
+const { copy, read, write, exists, path: {resolve, join}, yaml: YAML } = cds.utils
 const { readYAML, writeYAML, readJSON } = require('../util/fs')
 const { detectIndent } = require('./indent')
 const { colors } = require('../util/term')
@@ -29,7 +29,7 @@ function _mergeObject(target, source) {
 module.exports.sort = async function(path, key) {
   const json = await read(path)
   json[key] = Object.fromEntries(
-      Object.entries(json[key]).sort(([a],[b]) => a>b ? 1 : -1)
+      Object.entries(json[key] ?? {}).sort(([a],[b]) => a>b ? 1 : -1)
   )
   await write(path, json, { spaces: 2 });
 }
@@ -206,6 +206,10 @@ async function _mergeYAML(into, from, project, semantics = {}) {
             } else {
                 _traverseYAMLCollection(node, actions, templateNode)
             }
+        } else if(node.value?.source === '' && YAML.isSeq(templateNode?.value)) {
+            node.value = new YAML.YAMLSeq()
+            collectionStack.unshift(node.value)
+            _traverseYAMLNode(node.value, index, actions, templateNode?.value)
         } else if (node.value?.items || node.value && semantics.forceOverwrite) {
             _traverseYAMLNode(node.value, index, actions, templateNode?.value)
         }
@@ -374,75 +378,72 @@ async function _mergeYAML(into, from, project, semantics = {}) {
     return target
 }
 
-module.exports.removeFromYAML = async function (name, keyPaths) {
-    const yaml = await readYAML(name)
-    for (const keyPath of keyPaths) {
-        let node = yaml
-        const keys = keyPath.split('.')
-        for (const [index, key] of keys.entries()) {
-            if (index === keys.length - 1) {
-                node.delete(key)
-            } else {
-                node = node.get(key)
-                if(node === undefined) break;
-            }
-        }
-    }
-    await writeYAML(name, yaml)
-}
-
-module.exports.removeFromYAMLArray = async function(name, keyPath, aliasToRemove) {
-    const yaml = await readYAML(name)
-
-    let node = yaml
-    // traverse to the array node
-    const keys = keyPath.split('.')
-    for (const key of keys) {
-        node = node.get(key)
-    }
-
-    // find index of array entry with aliasToRemove entry
-    let index = 0;
-    let entryNode = node.getIn([index])
-    while(entryNode !== undefined) {
-        if(entryNode.toJSON().alias === aliasToRemove) {
-            node.deleteIn([index])
-            break;
-        }
-        index++;
-        entryNode = node.getIn([index])
-    }
-
-    await writeYAML(name, yaml)
-}
-
 /**
  * @param {...(string | Object | YAML.Document)} src The source to merge from.
  * @returns {{
-*   into: (dst: (string | Object | YAML.Document), options?: {project?: Object, semantics?: MergingSemantics}) => Promise<any>
-* }} An object with an 'into' method to merge the sources into the specified destination.
-*/
+ *   into: (dst: (string | Object | YAML.Document), options?: {project?: Object, semantics?: MergingSemantics}) => Promise<any>,
+ *   remove: (items: (string | object)[]) => Promise<void>
+ * }} An object with an 'into' method to merge the sources into the specified destination.
+ */
 module.exports.merge = (...src) => {
-    return {
-        /**
-         * Merges sources into the specified destination.
-         * @param {(string | Object | YAML.Document)} dst File path or object to merge into.
-         * @param {Object} [options] Merging options.
-         * @param {Object} [options.project] Project descriptor used for Mustache replacements.
-         * @param {MergingSemantics} [options.semantics] Merging algorithm semantics.
-         * @returns {Promise} A promise resolving to the merged object.
-         */
-        into: (dst, { with: withProject, project, ...semantics } = {}) => {
-            if (Object.keys(semantics).length === 0) semantics = undefined
-            project ??= withProject // to allow { with: project } for a more fluent API
-            const isYAML = typeof dst === 'string' && ['.yaml', '.yml', '.yaml.hbs', '.yml.hbs'].some(ext => dst.endsWith(ext))
-            const _merge = isYAML ? _mergeYAML : _mergeJSON
-            const target = typeof dst === 'string' ? path.resolve(cds.root, dst) : dst
-            if (typeof src[src.length-1] === 'string') {
-                return _merge(target, path.join(...src), project, semantics)
-            } else {
-                return _merge(target, ...src, project, semantics)
+  return {
+    /**
+     * Merges sources into the specified destination.
+     * @param {(string | Object | YAML.Document)} dst File path or object to merge into.
+     * @param {Object} [options] Merging options.
+     * @param {Object} [options.project] Project descriptor used for Mustache replacements.
+     * @param {MergingSemantics} [options.semantics] Merging algorithm semantics.
+     * @returns {Promise} A promise resolving to the merged object.
+     */
+    into: (dst, { with: withProject, project, ...semantics } = {}) => {
+      if (Object.keys(semantics).length === 0) semantics = undefined
+      project ??= withProject // to allow { with: project } for a more fluent API
+      const isYAML = typeof dst === 'string' && ['.yaml', '.yml', '.yaml.hbs', '.yml.hbs'].some(ext => dst.endsWith(ext))
+      const _merge = isYAML ? _mergeYAML : _mergeJSON
+      const target = typeof dst === 'string' ? resolve(cds.root, dst) : dst
+      if (typeof src[src.length - 1] === 'string') {
+        return _merge(target, join(...src), project, semantics)
+      } else {
+        return _merge(target, ...src, project, semantics)
+      }
+    },
+    /**
+     * Removes items from the specified YAML file.
+     * @param {(string | object)[]} items An array of dotted‐path strings or objects to remove.
+     * @returns {Promise<void>} A promise that resolves once the file is updated.
+     */
+    remove: async items => {
+      const yaml = await readYAML(resolve(cds.root, ...src))
+      for (const item of items) {
+        if (typeof item === 'string') {
+          const keys = item.split('.')
+          let node = yaml
+          for (let i = 0; i < keys.length - 1; i++) {
+            node = node.get(keys[i])
+            if (node === undefined) break
+          }
+          node?.delete?.(keys[keys.length - 1])
+        } else if (item && typeof item === 'object') {
+          const stack = [{ node: yaml, obj: item }]
+          while (stack.length) {
+            const { node, obj } = stack.pop()
+            for (const [k, v] of Object.entries(obj)) {
+              const child = node.get(k)
+              if (YAML.isSeq(child)) {
+                child.items = child.items.filter(x => {
+                  if (YAML.isMap(x)) {
+                    return !Object.entries(v).every(([kk, vv]) => x.get(kk) === vv)
+                  }
+                  return true
+                })
+              } else if (YAML.isMap(child)) {
+                stack.push({ node: child, obj: v })
+              }
             }
+          }
         }
+        await writeYAML(join(...src), yaml)
+      }
     }
+  }
 }

package/lib/init/mvn.js

@@ -10,25 +10,29 @@ const LOG = cds.log('cli|init|add|mvn'), DEBUG = cds.debug('cli|init|add|mvn')
 
 const { URLS, MAVEN_ARCHETYPE_VERSION, OPTIONS: { JAVA_PACKAGE, HANA }, REGEX_JAVA_PACKAGE } = require('./constants')
 
-module.exports.add = async function (feature) {
+module.exports.add = async function (feature, featureOptions={}) {
     const params = new Map()
+    let archetypeVersion = MAVEN_ARCHETYPE_VERSION
+
+    params.set(`com.sap.cds:cds-maven-plugin:${archetypeVersion}:add`)
 
-    const { 'java:mvn': javaMvn, force } = cds.cli.options
-    if (javaMvn) _scan(javaMvn).forEach(([k,v]) => params.set(k,v))
-    const archetypeVersion = params.get('-DarchetypeVersion') ?? MAVEN_ARCHETYPE_VERSION
     if (feature === HANA) { // REVISIT: compat for HANA until -Dfeature HANA is provided by Java
-        params.set(`com.sap.cds:cds-maven-plugin:${archetypeVersion}:add`)
-        params.set(`-Dfeature`, `CF`) // REVISIT: Should get rid of CF dependency for Kyma scenarios
-    } else {
-        params.set(`com.sap.cds:cds-maven-plugin:${archetypeVersion}:add`)
-        params.set(`-Dfeature`, feature)
-        const profile = cds.cli.options.for
-        params.set(`-Dprofile`, profile === 'production' ? 'cloud' : profile ?? 'default')
+        feature = `CF` // REVISIT: Should get rid of CF dependency for Kyma scenarios
     }
+    params.set(`-Dfeature`, feature)
+
+    const profile = cds.cli.options.for
+    params.set(`-Dprofile`, profile === 'production' ? 'cloud' : profile ?? 'default')
 
+    Object.entries(featureOptions).forEach(([k,v]) => params.set(`-Doptions.${k}`, v))
+
+    // evaluate last to allow generic override from CLI
+    const { 'java:mvn': javaMvn, force } = cds.cli.options
+    if (javaMvn) _scan(javaMvn).forEach(([k,v]) => params.set(k,v))
     if (force) params.set(`-Doverwrite`, true)
+
     try {
-        await cmd.spawnCommand('mvn', _finalize(params), { cwd: cds.root })
+        return await cmd.spawnCommand('mvn', _finalize(params), { cwd: cds.root }, false, true)
     } catch (err) {
         if (err.code === 'ENOENT' && err.path === 'mvn') {
             throw `Maven executable 'mvn' not found. Follow ${term.info(URLS.MAVEN_INSTALL_HELP)} and install Maven on your machine.`

package/lib/init/projectReader.js

@@ -62,7 +62,7 @@ module.exports = new class ProjectReader {
      * @property {string} appName The name of the application.
      * @property {string} appId The ID of the application.
      * @property {string} appDescription The description of the application.
-     * @property {string} language The programming language of the project.
+     * @property {'java' | 'nodejs'} language The programming language of the project.
      * @property {string} srvPath The path to the server module.
      * @property {string} archiveName The name of the archive.
      * @property {Object} db Database configuration.
@@ -120,7 +120,6 @@ module.exports = new class ProjectReader {
         const _isESM        = () => pkgJson().type === 'module'
         const _isTypescript = () => !!pkgJson().dependencies?.typescript || !!pkgJson().devDependencies?.typescript
         const _hasTyper     = () => !!pkgJson().dependencies?.['@cap-js/cds-typer'] || !!pkgJson().devDependencies?.['@cap-js/cds-typer']
-
         const _inProd = plugin => require(`./template/${plugin}`).hasInProduction(env)
         const _ui5 = () => pkgJson().sapux
         const _uiEmbedded = () => exists(join(env.folders.app, 'xs-app.json'))
@@ -128,6 +127,7 @@ module.exports = new class ProjectReader {
         const _isJava = () => this.isJava
         const isApp = name => name !== 'appconfig' && !name.startsWith('_') && name !== 'router' && name !== 'portal'
         const reserved = {
+            dependencies: () => pkgJson().dependencies,
             has: x => _inProd(x),
             profile: () => cds.cli.options?.for,
             language: () => _isJava() ? 'java' : 'nodejs',

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

@@ -33,10 +33,8 @@ modules:
         group: destinations
         properties:
           name: srv-api # must be used in xs-app.json as well
-          url: {{#hasIas}}~{srv-cert-url}{{/hasIas}}{{^hasIas}}~{srv-url}{{/hasIas}}
-          forwardAuthToken: true{{#hasIas}}
-          forwardAuthCertificates: true
-          strictSSL: true{{/hasIas}}
+          url: ~{srv-url}
+          forwardAuthToken: true
       {{#hasMultitenancy}}
       - name: mtx-api
         group: destinations

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

@@ -2,7 +2,7 @@ const { join } = require('path')
 const cds = require('../../../cds')
 const { read, write, exists, copy, rimraf } = cds.utils
 const { readProject } = require('../../projectReader')
-const { merge, removeFromYAML, removeFromYAMLArray } = require('../../merge')
+const { merge } = require('../../merge')
 const mvn = require('../../mvn')
 
 const { srv4, hdbDeployer, serviceManager, hdiContainer, mtxSidecar4 } = require('../../registries/mta')
@@ -14,7 +14,7 @@ module.exports = class HanaTemplate extends require('../../plugin') {
     }
 
     static hasInProduction(env) {
-        return env.requires?.db?.kind === 'hana' || env.dependencies?.['@cap-js/hana']
+        return env.requires?.db?.kind === 'hana' || readProject().dependencies?.['@cap-js/hana']
     }
 
     async run() {
@@ -79,17 +79,21 @@ module.exports = class HanaTemplate extends require('../../plugin') {
             }
 
             const modules = hasMultitenancy ? [srv] : [srv, hdbDeployer]
-
-            await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { with: project,
-                additions: [...modules, db].filter(a => a), deletions, relationships
+            await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
+                with: project, additions: [...modules, db].filter(a => a), deletions, relationships
             })
         }
 
         if (hasHelm || hasHelmUnifiedRuntime) {
             if (hasMultitenancy) {
-                await removeFromYAML(join('chart', 'values.yaml'), ['hana-deployer', 'srv.bindings.db', 'hana'])
-                await removeFromYAMLArray(join('chart', 'Chart.yaml'), 'dependencies', 'hana')
-                await removeFromYAMLArray(join('chart', 'Chart.yaml'), 'dependencies', 'hana-deployer')
+                await merge('chart/values.yaml')
+                    .remove(['hana-deployer', 'srv.bindings.db', 'hana'])
+
+                await merge('chart/Chart.yaml')
+                    .remove([
+                        { dependencies: { alias: 'hana' } },
+                        { dependencies: { alias: 'hana-deployer' } }
+                    ])
 
                 if (!hasHtml5Repo) {
                     await rimraf('chart/charts/content-deployment') // REVISIT: Move to build task

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

@@ -1,3 +1,4 @@
+---
 modules:
   - name: {{appName}}-srv
     type: {{language}}
@@ -8,6 +9,14 @@ modules:
           config:
             credential-type: X509_GENERATED
             app-identifier: srv
+    parameters:
+      routes:
+        - route: "${default-url}"
+        - route: "${default-host}.cert.${default-domain}"
+    provides:
+      - name: srv-api
+        properties:
+          srv-cert-url: '${protocol}://${default-host}.cert.${default-domain}'
 
   - name: {{appName}}
     type: approuter.nodejs
@@ -18,6 +27,12 @@ modules:
           config:
             credential-type: X509_GENERATED
             app-identifier: approuter
+      - name: srv-api
+        group: destinations
+        properties:
+          url: ~{srv-cert-url}
+          forwardAuthCertificates:  true
+          strictSSL: true
 
   - name: {{appName}}-mtx
     type: nodejs

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

@@ -2,6 +2,7 @@ const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, approuter, mtxSidecar4 } = require('../../registries/mta')
 const cds = require('../../../cds')
+const { read, write } = cds.utils
 // const mvn = require('../../mvn')
 
 module.exports = class IasTemplate extends require('../../plugin') {
@@ -31,21 +32,37 @@ module.exports = class IasTemplate extends require('../../plugin') {
         const project = readProject()
         const { isJava, hasMta, hasCfManifest, hasHelm, hasHelmUnifiedRuntime, hasApprouter, hasMultitenancy, srvPath } = project
 
+        if (hasMultitenancy) {
+            const conf = (await read('mtx/sidecar/package.json')).cds ?? {}
+            if (conf.profile) delete conf.profile
+            conf.profiles ??= conf.profile ? [conf.profile] : []
+            if (!conf.profiles.includes('subscription-manager')) {
+                conf.profiles.push('subscription-manager')
+            }
+            await write('mtx/sidecar/package.json', conf, { spaces: 2 })
+        }
+
         if (hasMta) {
             const srv = srv4(srvPath)
             const identity = { in: 'resources', where: { 'parameters.service': 'identity' } }
             const srvIdentityBinding = { in: [srv, 'requires'], where: { 'parameters.config.app-identifier': 'srv' } }
-            const additions = [srv, identity, srvIdentityBinding]
+            const srvCertUrlApi = { in: [srv, 'provides'], where: { 'name': 'srv-api' } }
+            const additions = [srv, identity, srvIdentityBinding, srvCertUrlApi]
+            const overwrites = []
+
             if (hasApprouter) {
-                const approuterIdentityBinding = { in: [approuter, 'requires'], where: { 'parameters.config.app-identifier': 'approuter' } }
-                additions.push(approuter, approuterIdentityBinding)
+                additions.push(approuter)
+                additions.push({ in: [approuter, 'requires'], where: { 'parameters.config.app-identifier': 'approuter' }})
+                const srvApi = { in: [approuter, 'requires'], where: { 'name': 'srv-api' } }
+                additions.push(srvApi)
+                overwrites.push({ item: [srvApi, 'properties.url'], withValue: '~{srv-cert-url}' })
             }
             if (hasMultitenancy) {
                 const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
                 const mtxIdentityBinding = { in: [mtxSidecar, 'requires'], where: { 'parameters.config.app-identifier': 'mtx' } }
                 additions.push(mtxSidecar, mtxIdentityBinding)
             }
-            await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions })
+            await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions, overwrites })
         }
 
         if (hasHelm || hasHelmUnifiedRuntime) {
@@ -62,7 +79,7 @@ module.exports = class IasTemplate extends require('../../plugin') {
 
     async #combineWithCfManifest(project) {
         const srv = { in: 'applications', where: { 'name': `${project.appName}-srv` } }
-        const identityBinding = { in: 'services', where: { 'parameters.app-identifier': project.appName } }
+        const identityBinding = { in: 'services', where: { 'parameters.app-identifier': 'srv' } }
         await merge(__dirname, 'files/manifest.yml.hbs').into('manifest.yml', { project, additions: [srv, identityBinding] })
 
         const identity = { in: 'create-services', where: { 'broker': 'identity' } }

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

@@ -19,27 +19,18 @@ modules:
     path: {{& srvPath}}
 {{#isNodejs}}
     parameters:
+      instances: 1
       buildpack: nodejs_buildpack
       readiness-health-check-type: http
       readiness-health-check-http-endpoint: /health
-      {{#hasIas}}
-      routes:
-        - route: "${default-url}"
-        - route: "${default-host}.cert.${default-domain}"
-      {{/hasIas}}
     build-parameters:
-      builder: npm
+      builder: npm-ci
 {{/isNodejs}}
 {{#isJava}}
     parameters:
       buildpack: sap_java_buildpack_jakarta
       readiness-health-check-type: http
       readiness-health-check-http-endpoint: /actuator/health/readiness
-      {{#hasIas}}
-      routes:
-        - route: "${default-url}"
-        - route: "${default-host}.cert.${default-domain}"
-      {{/hasIas}}
     properties:
       SPRING_PROFILES_ACTIVE: cloud,sandbox
       JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']"
@@ -53,8 +44,7 @@ modules:
     provides:
       - name: srv-api # required by consumers of CAP services (e.g. approuter)
         properties:
-          srv-url: ${default-url}{{#hasIas}}
-          srv-cert-url: '${protocol}://${default-host}.cert.${default-domain}'{{/hasIas}}
+          srv-url: ${default-url}
     requires: []
 
 resources:

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

@@ -33,6 +33,7 @@ modules:
         []
     {{/isJava}}
     parameters:
+      instances: 1
       memory: 256M
       disk-quota: 512M{{#hasIas}}
       routes:

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

@@ -24,6 +24,11 @@ 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