@sap/cds-dk 9.4.3 → 9.5.0

package/lib/build/provider/hana/2migration.js

@@ -48,31 +48,23 @@ function _compileToHana(model, options, beforeImage) {
     let migrations = []
     let afterImage
 
-    if (cds.compile.to.hana) {
-        const result = cds.compile.to.hana(model, options, beforeImage);
-
-        for (const [content, { file }] of result) {
-            switch (file) {
-                case 'deletions.json':
-                    break
-                case 'migrations.json':
-                    migrations = content
-                    break
-                case 'afterImage.json':
-                    afterImage = content
-                    break
-                default: {
-                    const { name, ext: suffix } = path.parse(file)
-                    definitions.push({ name, suffix, sql: content })
-                }
+    const result = cds.compile.to.hana(model, options, beforeImage);
+
+    for (const [content, { file }] of result) {
+        switch (file) {
+            case 'deletions.json':
+                break
+            case 'migrations.json':
+                migrations = content
+                break
+            case 'afterImage.json':
+                afterImage = content
+                break
+            default: {
+                const { name, ext: suffix } = path.parse(file)
+                definitions.push({ name, suffix, sql: content })
             }
         }
-    } else {
-        // compatibility with cds < 8.0.0
-        const result = cdsc.to.hdi.migration(cds.minify(model), options, beforeImage)
-        definitions = result.definitions
-        migrations = result.migrations
-        afterImage = result.afterImage
     }
     let migrationTableNames = new Set()
     if (afterImage) {
@@ -97,7 +89,7 @@ function _compileToHana(model, options, beforeImage) {
  * @param {String} srcPath Fully qualified path of the directory containing .hdbmigrationtable files
  * @param {String} migration the migration descriptor
  * @param {String} tableSql SQL TABLE definition
- * @returns {Object} Providing access to 'content' and 'fileName'.
+ * @returns {Promise<Object>} Providing access to 'content' and 'fileName'.
  */
 async function _2migrationtable(srcPath, migration, tableSql) {
     let migrationTableModel = null

package/lib/build/provider/hana/index.js

@@ -586,7 +586,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
     /**
      * Returns all hana native artifacts located in db/src/** workspace folders.
      * @param {Array} workspacePaths Array of workspace paths, 'cds.root' is excluded from the list
-     * @returns {Array} Array of workspace files, each entry contains the db src directory,
+     * @returns {Promise<Array>} Array of workspace files, each entry contains the db src directory,
      * the relative file path and the file name.
      */
     async _getWorkspaceFiles(workspacePaths) {

package/lib/build/provider/hana/template/.hdiconfig-all

@@ -167,6 +167,12 @@
         },
         "hdbschedulerjob" : {
             "plugin_name" : "com.sap.hana.di.schedulerjob"
+        },
+        "hdblogicalschema" : { 
+           "plugin_name" : "com.sap.hana.di.logicalschema"
+        }, 
+        "hdblogicalschemaconfig" : { 
+           "plugin_name" : "com.sap.hana.di.logicalschema.config" 
         }
     }
-}
+}

package/lib/build/provider/hana/template/package.json

@@ -1,7 +1,7 @@
 {
   "name": "deploy",
   "dependencies": {
-    "hdb": "^0",
+    "hdb": "^2.0.0",
     "@sap/hdi-deploy": "^5"
   },
   "engines": {

package/lib/build/provider/internalBuildPlugin.js

@@ -4,6 +4,7 @@ const cds = require('../../cds')
 const Plugin = require('../plugin')
 const { hasOptionValue, getFiles } = require('../util')
 const { FOLDER_GEN, DEFAULT_BUILTIN_PRIORITY_MAX } = require('../constants')
+const TRACE = cds.debug('trace')
 
 class InternalBuildPlugin extends Plugin {
     /**
@@ -116,7 +117,7 @@ class InternalBuildPlugin extends Plugin {
             cwd: cds.root,
             src: this.hasBuildOption('flatDeployLayout', true) || this.task.src === this.task.dest ? this.task.src : cds.root
         }
-        const csnStr = cds.compile.to.json(model, jsonOptions)
+        const csnStr = cds_compile_to_json(model, jsonOptions)
         await this.write(csnStr).to(csnFile)
         return csnStr
     }
@@ -156,4 +157,17 @@ class InternalBuildPlugin extends Plugin {
         return null
     }
 }
+
+// Emits the 'compile.for.runtime' event, as the produced CSN is for runtime usage.
+// Plugins use it to modify the CSN before it is stringified.
+function cds_compile_to_json (csn,o) {
+  TRACE?.time('cds.compile 2json'.padEnd(22)); try {
+    let result, next = ()=> result ??= cds.compile.to.json (csn,o)
+    cds.emit ('compile.for.runtime', csn, o, next)
+    return next() //> in case no handler called next
+  }
+  finally { TRACE?.timeEnd('cds.compile 2json'.padEnd(22)) }
+}
+
+
 module.exports = InternalBuildPlugin

package/lib/build/provider/java/index.js

@@ -7,6 +7,7 @@ const { OUTPUT_MODE, OUTPUT_MODE_RESULT, FILE_EXT_CDS, CONTENT_LANGUAGE_BUNDLES,
 const { getI18nDefaultFolder } = require('../../util')
 const DEFAULT_COMPILE_DEST_FOLDER = path.normalize('src/main/resources/edmx')
 const DEBUG = cds.debug('cli|build')
+const LOG = cds.log('cli|build')
 
 class JavaBuildPlugin extends EdmxBuildPlugin {
     init() {
@@ -25,7 +26,17 @@ class JavaBuildPlugin extends EdmxBuildPlugin {
 
         if (!this.hasBuildOption(CONTENT_EDMX, false)) {
             // generate edmx files containing all features - localized edmx for backward compatibility
-            if (this.hasBuildOption(CONTENT_LOCALIZED_EDMX, true)) {
+            let localized = this.hasBuildOption(CONTENT_LOCALIZED_EDMX, true)
+
+            // Force localized to true for OData v2
+            if (cds.env.odata.version === 'v2') {
+                if (!localized) {
+                    LOG.info('Forcing localized EDMX generation for OData v2')
+                    localized = true
+                }
+            }
+
+            if (localized) {
                 await this.compileToEdmx(model, compileDest, { [FLAVOR_LOCALIZED_EDMX]: true })
             }
             // non-localized edmx

package/lib/build/provider/mtx-sidecar/index.js

@@ -86,7 +86,8 @@ class MtxSidecarBuildPlugin extends NodejsBuildPlugin {
             return
         }
         const { dictionary, sources } = await this.compileAll(model, destMainSrv, destMain)
-        await this.collectAllLanguageBundles(dictionary, sources, destMainSrv, destMain)
+        // await this.collectAllLanguageBundles(dictionary, sources, destMainSrv, destMain)
+        await this.collectAllLanguageBundles(dictionary, sources, destMain, destMain)
 
         if (!this.hasBuildOption(CONTENT_EDMX, false)) {
             //inferred model expected by cds.compile.to.edmx()

package/lib/build/provider/nodejs/index.js

@@ -53,7 +53,8 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         if (model) {
             const { dictionary, sources } = await this.compileAll(model, destSrv, destRoot)
             // collect and write language bundles into single i18n.json file
-            await this.collectAllLanguageBundles(dictionary, sources, destSrv, destRoot)
+            await this.collectAllLanguageBundles(dictionary, sources, destRoot, destRoot)
+            // await this.collectAllLanguageBundles(dictionary, sources, destSrv, destRoot)
 
             if (!this.hasBuildOption(CONTENT_EDMX, false)) {
                 const compileOptions = { [FLAVOR_LOCALIZED_EDMX]: this.hasBuildOption(FLAVOR_LOCALIZED_EDMX, true) }

package/lib/build/util.js

@@ -165,9 +165,9 @@ function flatten(modelPaths) {
 
 function getI18nDefaultFolder() {
     // keep '_i18n' as preferred folder for compatibility reasons
-    if (cds.env.i18n.folders.includes('_i18n')) return '_i18n'
-    if (cds.env.i18n.folders.includes('i18n')) return 'i18n'
-    return cds.env.i18n.folders[0] ?? 'i18n'
+    // if (cds.env.i18n.folders.includes('_i18n')) return '_i18n'
+    // if (cds.env.i18n.folders.includes('i18n')) return 'i18n'
+    return cds.env.i18n.folders?.[0] ?? '_i18n'
 }
 
 async function pathExists(path) {

package/lib/compile/to_openapi.js

@@ -1,8 +1,4 @@
 const cds = require('../cds')
-const { compile } = cds._local('@cap-js/openapi') // load a local cap-js/openapi (fallback to our own)
-
-function cds_compile_to_openapi (csn, options) {
-  return compile(csn, options)
-}
+const { compile: cds_compile_to_openapi } = cds._local('@cap-js/openapi') // load a local cap-js/openapi (fallback to our own)
 
 module.exports = cds_compile_to_openapi

package/lib/import/common.js

@@ -510,7 +510,8 @@ async function postProcess(filePath, options, csn, cwd) {
         usingStatements.push(`using from './${path.basename(csnFile.replace(`'`, `''`))}';`);
     }
 
-    _printUsageHint(csnFile, services, cwd);
+    if (!options.dry)
+        _printUsageHint(csnFile, services, cwd);
 
     if (!options.dry && !options.no_copy)
         await _copyToSrvExternal(filePath, destFilePath, cwd);

package/lib/import/odata/ParserContext.js

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

package/lib/import/odata/v4parser.js

@@ -634,7 +634,7 @@ function _generateStructuredDataTypeCsn(dataType, propertyObject, isPrimaryKey,
 
 function _parseAssociationProperty(foreignReference, associationNode, parserContext) {
     const associationProperty = {};
-    associationProperty.type = (associationNode.$OnDelete === 'Cascade') ? 'cds.Composition' : 'cds.Association';
+    associationProperty.type = (associationNode.$OnDelete === 'Cascade' || associationNode.$ContainsTarget) ? 'cds.Composition' : 'cds.Association';
 
     let schemaName = associationNode.$Type.substring(0, associationNode.$Type.lastIndexOf('.'));
 
@@ -642,6 +642,11 @@ function _parseAssociationProperty(foreignReference, associationNode, parserCont
         schemaName = parserContext.schemaAliasToNamespace[schemaName];
     }
 
+    if (associationNode.$ContainsTarget) {
+        parserContext.schemaDetails[schemaName] ??= {}
+        parserContext.schemaDetails[schemaName].containment = true
+    }
+
     let resolvedEntityName;
     let entityTypeMapping = (
         parserContext.entityToEntitySetMap?.get(associationNode.$Type) ||
@@ -676,9 +681,18 @@ function _parseAssociationProperty(foreignReference, associationNode, parserCont
     } else {
         associationProperty.cardinality.max = 1;
     }
-    // Convert managed associations and compositions in unmanaged with empty key to avoid
+
+    // Generate on condition in case $Partner exists, as that indicates a backlink with which the 
+    // condition can be generated.
+    // If not given convert managed associations and compositions in unmanaged with empty key to avoid
     // "generation" of keys, that do not exist in the external service.
-    if (common.checkForEmptyKeys(associationProperty, "V4")) {
+    if (associationNode.$Partner && associationProperty.type === 'cds.Composition') {
+        associationProperty.on = [
+            {ref: [foreignReference, associationNode.$Partner]},
+            '=',
+            {ref: ['$self']}
+        ]
+    } else if (common.checkForEmptyKeys(associationProperty, "V4")) {
         associationProperty.keys = [];
     }
     _captureAnnotationWithinElement(associationNode, associationProperty, parserContext);
@@ -1653,12 +1667,43 @@ function _generateCSN(edmxAsJson, ignorePersistenceSkip, parserContext, importer
         csn.definitions[parserContext.primarySchema].kind = 'service';
         csn.definitions[parserContext.primarySchema]['@cds.external'] = true;
 
+        if (parserContext.schemaDetails[parserContext.primarySchema]?.containment) {
+            csn.definitions[parserContext.primarySchema]['@odata.containment'] = true;
+        }
+
         // Step 8: parse entity container contents and their annotations
         let schemaData = schemaDataList[parserContext.schemaToSchemaDataIndex[parserContext.primarySchema]];
         let entityContainerElements = schemaData[parserContext.entityContainerName];
         csn.definitions = Object.assign(_parseEntityContainer(csn.definitions, entityContainerElements, parserContext), csn.definitions);
     }
 
+
+    // Step 9: 2. Step for generating $ContainsTarget & $Partner links
+    // The containing composition is already generated. Now the Keys: [] has to be removed
+    // on the backlink association because per OData spec, OData does not expose the foreign key fields 
+    // used by the backlink and thus it is save to assume they must be generated for proper mocking
+    // 
+    // This happens after Step 8 because that adjusts the names of entity container entities where 
+    // entity type and entity set differ in naming
+    for (const entity in csn.definitions) {
+        if (entity.type !== 'entity') continue;
+
+        const containingCompositions = Object.keys(csn.definitions[entity].elements).filter(e => 
+            csn.definitions[entity].elements[e].type === 'cds.Composition' && 
+            csn.definitions[entity].elements[e].on
+        );
+        for (const comp of containingCompositions) {
+            const compTarget = csn.definitions[csn.definitions[entity].elements[comp].target];
+            const backLink = Object.keys(compTarget.elements).find(e => 
+                compTarget.elements[e].type === 'cds.Association' && 
+                compTarget.elements[e].target === entity
+            )
+            if (compTarget.elements[backLink].keys) {
+                delete compTarget.elements[backLink].keys
+            }
+        }
+    }
+
     return JSON.stringify(csn, null, 4);
 }
 

package/lib/import/openapi/importOpenAPI.js

@@ -4,6 +4,8 @@ const {
   pathAndMethod,
   serviceName,
 } = require("./utilities");
+const cds = require('../../cds');
+
 
 module.exports = { importOpenAPI };
 
@@ -32,7 +34,10 @@ function importOpenAPI(input) {
   };
 
   const context = {
-    serviceName: serviceName(input.info?.title || "TODO.service"),
+    serviceName: serviceName(cds.cli.options["into-namespace"]
+      ?? input.info?.title
+      ?? "TODO.service"
+    ),
     oasVersion: input.openapi || input.swagger,
     v3: !!input.openapi,
     schemas: input.openapi ? input.components?.schemas : input.definitions,

package/lib/init/constants.js

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

package/lib/init/index.js

@@ -231,17 +231,26 @@ module.exports = class CDSGenerator {
         const templates = new Map
         for (let plugin of plugins) {
             // Compat
-            if (plugin === 'appfront') plugin = 'app-front'
             if (plugin === 'helm' && cds.cli.options['internal-unified-runtime-charts']) {
+                console.warn(term.warn('"--internal-unified-runtime-charts" is deprecated, please use "cds add kyma --unified-runtime" instead'))
                 plugin = 'helm-unified-runtime'
                 cds.cli.options.add?.delete('helm')
                 cds.cli.options.add?.add('helm-unified-runtime')
             }
-            if (plugin === 'sample-tiny') plugin = 'tiny-sample'
-            if (plugin in { 'kibana-logging': 1, 'kibana': 1 }) plugin = 'application-logging'
-            if (plugin === 'postgresql') plugin = 'postgres'
-            if (plugin === 'gha') plugin = 'github-actions'
-            if (plugin === 'app-front') plugin = 'app-frontend'
+            const _alias = (alias, preferred) => {
+                if (plugin === alias) {
+                    plugin = preferred
+                    cds.cli.options.add?.delete(alias)
+                    cds.cli.options.add?.add(preferred)
+                    cds.cli.argv[0] = cds.cli.argv[0].replace(alias, preferred)
+                }
+            }
+            _alias('appfront', 'app-frontend')
+            _alias('app-front', 'app-frontend')
+            _alias('gha', 'github-actions')
+            _alias('postgresql', 'postgres')
+            _alias('kibana', 'application-logging')
+            _alias('kibana-logging', 'application-logging')
 
             if (!templates.has(plugin)) {
                 const template = await this._createTemplate(plugin)

package/lib/init/merge.js

@@ -106,6 +106,9 @@ async function _mergeYAML(into, from, project, semantics = {}) {
             if (project) await writeYAML(into, source)
             else await copy(from, into)
             return source
+        } else if (typeof into === 'string') {
+            await writeYAML(into, source)
+            return source
         }
         throw new Error(`Target YAML doesn't exist`)
     }
@@ -113,6 +116,19 @@ async function _mergeYAML(into, from, project, semantics = {}) {
     const entryMap = new Map, templateEntryMap = new Map
 
     const { additions, overwrites, deletions, relationships } = semantics
+    if (relationships && Array.isArray(relationships)) {
+        semantics.additions ??= []
+        const add = semantics.additions
+
+        for (const rel of relationships) {
+            for (const ins of (Array.isArray(rel.insert) ? rel.insert : [rel.insert])) {
+                if (!add.includes(ins)) add.push(ins)
+            }
+            const base = rel.into?.[0]
+            if (base && !add.includes(base)) add.push(base)
+        }
+    }
+
     for (const entry of additions ?? []) {
         entryMap.set(entry, undefined)
         templateEntryMap.set(entry, undefined)

package/lib/init/projectReader.js

@@ -123,9 +123,9 @@ module.exports = new class ProjectReader {
                     const inbounds = manifest?.['sap.app']?.crossNavigation?.inbounds
                     const [firstInbound] = Object.values(inbounds ?? { intent: { semanticObject: 'Books', action: 'display' } })
                     const vizId = firstInbound.semanticObject + '-' + firstInbound.action
-                    // Try to read archiveName from ui5-deploy.yaml if it exists
+                    // Try to read archiveName from ui5.yaml if it exists
                     let archiveName = ''
-                    const ui5DeployPath = path.resolve(cds.root, cds.env.folders.app, app, 'ui5-deploy.yaml')
+                    const ui5DeployPath = path.resolve(cds.root, cds.env.folders.app, app, 'ui5.yaml')
                     if (exists(ui5DeployPath)) {
                         const ui5Deploy = cds.load.yaml(ui5DeployPath)
                         const customTasks = ui5Deploy?.builder?.customTasks
@@ -159,6 +159,7 @@ module.exports = new class ProjectReader {
             hasUIEmbedded: _uiEmbedded,
             hasUIModule: _uiModule,
             hasUI: () => _uiEmbedded() || _uiModule(),
+            hasUI5: () => _uiEmbedded() || _uiModule(),
             literal: () => () => text => text,
             hasMTXRoute: () => _inProd('extensibility') || (_inProd('multitenancy') && !_isJava()),
             hasMTXRouteJava: () => (_inProd('helm-unified-runtime') || _inProd('helm')) && _isJava() && _inProd('multitenancy'),
@@ -175,7 +176,21 @@ module.exports = new class ProjectReader {
                 return this.npmWorkspaceRoot() !== cds.root
             },
             hasRoles: () => { }, roles: () => { }, // for xs-security generation
-            hasCustomRoleCollections: () => exists('xs-security.json') && !!JSON.parse(fs.readFileSync(path.join(cds.root, 'xs-security.json')))['role-collections']
+            hasCustomRoleCollections: () => exists('xs-security.json') && !!JSON.parse(fs.readFileSync(path.join(cds.root, 'xs-security.json')))['role-collections'],
+            k8s: () => {
+                if (!exists('chart/values.yaml')) return {}
+
+                const values = cds.load.yaml(join(cds.root, 'chart/values.yaml'))
+
+                let containerize = {}
+                if (exists('containerize.yaml'))
+                    containerize = cds.load.yaml(join(cds.root, 'containerize.yaml'))
+
+                return {
+                    values: values ?? {},
+                    containerize: containerize ?? {}
+                }
+            }
         }
 
         // Automatically creates availability checks for `cds add` commands.
@@ -311,4 +326,4 @@ function _normalizeSpringBootCfg(obj) {
  * @property {String} githubSlug GitHub org/repo.
  * @property {boolean} isMonorepoMicroservice Indicates if the project is a monorepo microservice.
  * @property {String} npmWorkspaceRoot The root path of the monorepo workspace.
- */
+ */

package/lib/init/registries/mta.js

@@ -152,9 +152,9 @@ const requiredAppApi4 = module => ({
     where: { name: 'app-api' }
 })
 
-const requiredMtxSidecarApi4 = srv => ({
+const requiredMtxSidecarApi4 = (srv, name) => ({
     in: [srv, 'requires'],
-    where: { 'properties.CDS_MULTITENANCY_SIDECAR_URL': '~{mtx-url}' }
+    where: { 'properties.CDS_MULTITENANCY_SIDECAR_URL': name }
 })
 
 const requiredJavaApprouterApi4 = srv => ({

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

@@ -15,7 +15,7 @@ module.exports = class AmsTemplate extends require('../../plugin') {
 
     static hasInProduction(env) {
         const { dependencies, devDependencies } = readProject()
-        return env.requires?.auth?.ams || devDependencies?.['@sap/ams-dev'] || dependencies?.['@sap/ams']
+        return env.requires?.auth?.ams || devDependencies?.['@sap/ams-dev'] || devDependencies?.['@sap/ams'] || dependencies?.['@sap/ams']
     }
 
     async run() {

package/lib/init/template/app-frontend/files/app-package.json.hbs

@@ -3,18 +3,12 @@
   "version": "1.0.0",
   "main": "webapp/index.html",
   "scripts": {
-    "build": "ui5 build preload --clean-dest --config ui5-deploy.yaml",
-    "build-local": "ui5 build preload --clean-dest",
+    "build": "ui5 build preload --clean-dest",
     "start": "ui5 serve"
   },
   "devDependencies": {
     "@ui5/cli": "^4",
     "ui5-task-zipper": "^3"
-  },
-  "ui5": {
-    "dependencies": [
-      "ui5-task-zipper"
-    ]
   }
   {{/hasUI5}}
 }

package/lib/init/template/app-frontend/files/ui5.yaml.hbs

@@ -1,6 +1,25 @@
 ---
 # yaml-language-server: $schema=https://sap.github.io/ui5-tooling/schema/ui5.yaml.json
-specVersion: '3.1'
+specVersion: '4.0'
 metadata:
   name: {{app}}
 type: application
+resources:
+  configuration:
+    propertiesFileSourceEncoding: UTF-8
+builder:
+  resources:
+    excludes:
+      - "/test/**"
+      - "/localService/**"
+  customTasks:
+    - name: ui5-task-zipper
+      afterTask: generateVersionInfo
+      configuration:
+        archiveName: {{app}}
+        additionalFiles:
+          - xs-app.json
+    {{#isTypescript}}
+    - name: ui5-tooling-transpile-task
+      afterTask: replaceVersion
+    {{/isTypescript}}

package/lib/init/template/app-frontend/index.js

@@ -26,10 +26,6 @@ module.exports = class extends require('../../plugin') {
                 project.app = app
                 await merge(__dirname, 'files/ui5.yaml.hbs').into(join(appPath, app, 'ui5.yaml'), { project })
             }
-            for (const { app } of apps) {
-                project.app = app
-                await merge(__dirname, 'files/ui5-deploy.yaml.hbs').into(join(appPath, app, 'ui5-deploy.yaml'), { project })
-            }
         }
 
         for (const { app } of apps) {

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

@@ -28,28 +28,23 @@ module.exports = class ApplicationLoggingTemplate extends require('../../plugin'
 
     async combine() {
         const project = readProject()
-        const { addMta, addApprouter, isJava, addMultitenancy, srvPath } = project
+        const { addMta, hasMta, hasApprouter, isJava, addMultitenancy, hasMultitenancy, srvPath } = project
 
-        if (addMta || addMultitenancy) {
+        if (addMta || (addMultitenancy && hasMta)) {
             const additions = [], relationships = []
-            if (addMta) {
-                const srv = srv4(srvPath)
-                additions.push(srv, applicationLogging)
-                relationships.push({
-                    insert: [applicationLogging, 'name'],
-                    into: [srv, 'requires', 'name']
-                })
-            }
-            if (addMultitenancy) {
+            const srv = srv4(srvPath)
+            relationships.push({
+                insert: [applicationLogging, 'name'],
+                into: [srv, 'requires', 'name']
+            })
+            if (hasMultitenancy) {
                 const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
-                additions.push(mtxSidecar)
                 relationships.push({
                     insert: [applicationLogging, 'name'],
                     into: [mtxSidecar, 'requires', 'name']
                 })
             }
-            if (addApprouter) {
-                additions.push(approuter)
+            if (hasApprouter) {
                 relationships.push({
                     insert: [applicationLogging, 'name'],
                     into: [approuter, 'requires', 'name']

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

@@ -57,7 +57,6 @@ modules:
           url: ${default-url}
     {{/isJava}}
 
-  {{#hasMultitenancy}}
   - name: {{appName}}-mtx
     type: nodejs
     path: {{#isNodejs}}gen/{{/isNodejs}}mtx/sidecar{{#isNodejs}}
@@ -66,7 +65,6 @@ modules:
         properties:
           SUBSCRIPTION_URL: ~{app-protocol}://\${tenant_subdomain}-~{app-uri}
     {{/isNodejs}}
-  {{/hasMultitenancy}}
 
 resources:
   - name: {{appName}}-auth

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

@@ -35,30 +35,29 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
         const {
             isNodejs, isJava,
             addIas, addXsuaa, hasXsuaa, hasIas, addMultitenancy, hasMTXRoute, hasMTXRouteJava,
-            addMta, addHelm, addHelmUnifiedRuntime, hasMta, hasHelm, hasHelmUnifiedRuntime,
+            addMta, addHelm, addHelmUnifiedRuntime,
+            hasMta, hasHelm, hasHelmUnifiedRuntime, hasMultitenancy,
             addContainerize, srvPath, approuterPath
         } = project
 
 
         if (addMta || (addMultitenancy || addXsuaa || addIas) && hasMta) {
             const srv = srv4(srvPath)
-            const apis = isJava && addMultitenancy ? [requiredJavaApprouterApi4(srv), providedJavaApprouterApi] : []
+            const apis = isJava && hasMultitenancy ? [requiredJavaApprouterApi4(srv), providedJavaApprouterApi] : []
             const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
-            if (isNodejs && addMultitenancy) apis.push(requiredMtxApi, requiredAppApi4(mtxSidecar), providedAppApi)
-            if (isJava && addMultitenancy) apis.push(requiredMtxApi)
+            if (isNodejs && hasMultitenancy) apis.push(requiredMtxApi, requiredAppApi4(mtxSidecar), providedAppApi)
+            if (isJava && hasMultitenancy) apis.push(requiredMtxApi)
             const modules = [srv, approuter]
-            if (addMultitenancy) modules.push(mtxSidecar)
+            if (hasMultitenancy) modules.push(mtxSidecar)
             const additions = [...modules, ...apis]
             const relationships = []
             if (hasXsuaa) {
-                additions.push(xsuaa)
                 relationships.push({
                     insert: [xsuaa, 'name'],
                     into: [approuter, 'requires', 'name']
                 })
             }
             if (hasIas) {
-                additions.push(ias)
                 relationships.push({
                     insert: [ias, 'name'],
                     into: [approuter, 'requires', 'name']