@sap/cds-dk 10.1.2 → 10.2.0

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

@@ -1,7 +1,14 @@
 const { readProject } = require('../../projectReader')
 const { merge, sort } = require('../../merge')
-const { srv4 } = require('../../registries/mta')
+const { srv4, mtxSidecar4 } = require('../../registries/mta')
 const mvn = require('../../mvn')
+const cds = require('../../../cds')
+const { read, write, exists, mkdirp, path: { join, dirname } } = cds.utils
+
+// Keep custom policies below the DCL root; cds build regenerates ams/dcl/cap/.
+const EXTENSION_DEVELOPER_DCL = join('ams', 'dcl', 'extensibility', 'extensionDeveloper.dcl')
+
+const SIDECAR_PACKAGE_JSON = join('mtx', 'sidecar', 'package.json')
 
 module.exports = class AmsTemplate extends require('../../plugin') {
 
@@ -24,54 +31,49 @@ module.exports = class AmsTemplate extends require('../../plugin') {
         project.isNodejs && await sort('package.json', 'dependencies')
         await sort('package.json', 'devDependencies')
         if (project.isJava) await mvn.add('ams')
+        // The sidecar's cds.ExtensionDeveloper role needs a custom DCL policy.
+        if (project.hasExtensibility && !exists(EXTENSION_DEVELOPER_DCL)) {
+            const template = await read(join(__dirname, 'files', 'extensionDeveloper.dcl'), 'utf-8')
+            await mkdirp(dirname(EXTENSION_DEVELOPER_DCL))
+            await write(EXTENSION_DEVELOPER_DCL, template)
+        }
+        if (project.isNodejs && exists(SIDECAR_PACKAGE_JSON)) {
+            await merge(__dirname, 'files/sidecar.package.json.hbs').into(SIDECAR_PACKAGE_JSON, { project })
+            await sort(SIDECAR_PACKAGE_JSON, 'dependencies')
+        }
     }
 
     async combine(facet) {
         const project = readProject(facet)
-        const { addMta, addCfManifest, addKyma } = project
+        const { affected } = project
 
-        if (addMta) {
-            await this.#combineWithMta(project)
+        if (affected('mta')) {
+            const additions = [
+                srv4(project.srv.path),
+                { in: 'modules', where: { name: `${project.appName}-ams-policies-deployer` } }
+            ]
+            if (project.hasMultitenancy) {
+                additions.push(mtxSidecar4(project.isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar'))
+            }
+            await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions })
         }
 
-        if (addCfManifest) {
-            await this.#combineWithCfManifest(project)
+        if (affected('cf-manifest')) {
+            const amsPoliciesDeployer = {
+                in: 'applications',
+                where: { name: `${project.appName}-ams-policies-deployer` }
+            }
+            await merge(__dirname, 'files/manifest.yml.hbs').into('manifest.yml', { project, additions: [amsPoliciesDeployer] })
         }
 
-        if (addKyma) {
-            await this.#combineWithHelm(project)
-            await this.#combineWithContainerize(project)
+        if (affected('kyma')) {
+            const chartDependency = { in: 'dependencies', where: { alias: 'ams-policies-deployer' } }
+            const containerModule = { in: 'modules', where: { name: `${project.appName}-ams-policies-deployer` } }
+            await Promise.all([
+                merge(__dirname, 'files/Chart.yaml.hbs').into('chart/Chart.yaml', { project, additions: [chartDependency] }),
+                merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { project }),
+                merge(__dirname, 'files/containerize.yaml.hbs').into('containerize.yaml', { project, additions: [containerModule] })
+            ])
         }
     }
-
-    async #combineWithMta(project) {
-        const srvModule = srv4(project.srv.path)
-        const amsPoliciesDeployer = {
-            in: 'modules',
-            where: { 'name': `${project.appName}-ams-policies-deployer` }
-        }
-        await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions: [srvModule, amsPoliciesDeployer] })
-    }
-
-    async #combineWithCfManifest(project) {
-        const amsPoliciesDeployer = {
-            in: 'applications',
-            where: { 'name': `${project.appName}-ams-policies-deployer` }
-        }
-        await merge(__dirname, 'files/manifest.yml.hbs').into('manifest.yml', { project, additions: [amsPoliciesDeployer] })
-    }
-
-    async #combineWithHelm(project) {
-        const amsPoliciesDeployer = {
-            in: 'dependencies',
-            where: { 'alias': 'ams-policies-deployer' }
-        }
-        await merge(__dirname, 'files/Chart.yaml.hbs').into('chart/Chart.yaml', { project, additions: [amsPoliciesDeployer] })
-        await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { project })
-    }
-
-    async #combineWithContainerize(project) {
-        const amsDeployer = { in: 'modules', where: { 'name': `${project.appName}-ams-policies-deployer` } }
-        await merge(__dirname, 'files/containerize.yaml.hbs').into('containerize.yaml', { project, additions: [amsDeployer] })
-    }
 }

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

@@ -48,7 +48,9 @@ modules:
       build-result: dist
       builder: custom
       commands:
+        {{^hasNpmWorkspaces}}
         - npm ci
+        {{/hasNpmWorkspaces}}
         - npm run build
       supported-platforms: []
   {{/apps}}

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

@@ -13,10 +13,6 @@ builder:
       - "/test/**"
       - "/localService/**"
   customTasks:
-    {{#isTypescript}}
-    - name: ui5-tooling-transpile-task
-      afterTask: replaceVersion
-    {{/isTypescript}}
     - name: ui5-task-zipper
       afterTask: generateVersionInfo
       configuration:

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

@@ -17,8 +17,13 @@ module.exports = class extends require('../../plugin') {
 
     async run() {
         const project = readProject()
-        const { appUIPaths, apps, appPath, configFile, hasUI5 } = project
+        const { configFile } = project
         await merge(__dirname, 'files/package.json.hbs').into(configFile, { project })
+        await this._prepareApps(project)
+    }
+
+    async _prepareApps(project) {
+        const { appUIPaths, apps, appPath, hasUI5 } = project
 
         for (const { app } of apps) {
             project.app = app
@@ -28,9 +33,12 @@ module.exports = class extends require('../../plugin') {
             project.ui5 = ui5
             await merge(__dirname, 'files/app-package.json.hbs').into(pJsonPath, { project })
             if (ui5) {
+                const isTs = !!pJson.devDependencies?.typescript || !!pJson.dependencies?.typescript
                 const additions = [{ in: 'builder.customTasks', where: { name: 'ui5-task-zipper' } }]
-                if (project.isTypescript) additions.unshift({ in: 'builder.customTasks', where: { name: 'ui5-tooling-transpile-task' }, at: 0 })
-                await merge(__dirname, 'files/ui5.yaml.hbs').into(join(appPath, app, 'ui5.yaml'), { project, additions })
+                const transpileTask = { in: 'builder.customTasks', where: { name: 'ui5-tooling-transpile-task' }, at: 0 }
+                const ui5YamlPath = join(appPath, app, 'ui5.yaml')
+                await merge(__dirname, 'files/ui5.yaml.hbs').into(ui5YamlPath, { project, additions, deletions: isTs ? [] : [{ item: transpileTask }] })
+                if (isTs) await merge({ builder: { customTasks: [{ name: 'ui5-tooling-transpile-task', afterTask: 'replaceVersion' }] } }).into(ui5YamlPath, { additions: [transpileTask] })
                 await renderAndCopy(join(__dirname, 'files/index.html.hbs'), join(appPath, app, 'webapp/index.html'), project)
             }
         }
@@ -53,32 +61,30 @@ module.exports = class extends require('../../plugin') {
     async combine(facet) {
         const project = readProject(facet)
         const {
-            srv, appPath, apps,
-            hasMta, addMta, hasXsuaa, addSample, addApprouter, addWorkzoneStandard, addXsuaa, addIas,
-            addVue, addReact, addAppFrontend, hasKyma, addKyma
+            srv, appPath, apps, affected
         } = project
 
-        await Promise.all(apps.map(async ({ app }) => {
-            project.app = app
-            project.hasIndexHtml = exists(join(appPath, app, 'webapp/index.html'))
-            const additions = [srvApi]
-            await merge(__dirname, 'files/xs-app.json.hbs').into(join(appPath, app, 'xs-app.json'), { with: project, additions })
-        }))
+        if (affected('app-frontend', 'xsuaa', 'sample', 'vue', 'react')) {
+            await Promise.all(apps.map(async ({ app }) => {
+                project.app = app
+                project.hasIndexHtml = exists(join(appPath, app, 'webapp/index.html'))
+                const additions = [srvApi]
+                await merge(__dirname, 'files/xs-app.json.hbs').into(join(appPath, app, 'xs-app.json'), { with: project, additions })
+            }))
+        }
 
         // later -> rather consider adding to app-front package.json
         // if (hasMultitenancy) {
         //  await merge({ cds: { requires: { 'app-front':true } } }).into('mtx/sidecar/package.json')
         // }
 
-        const affected = addXsuaa || addApprouter || addWorkzoneStandard || addSample || addIas
-        if (addMta || affected && hasMta) {
+        if (affected('mta', 'xsuaa', 'approuter', 'workzone-standard', 'sample', 'ias')) {
             const srvModule = srv4(srv.path)
             project.apps = apps
             const relationships = [{
                 insert: [appFront, 'name'],
                 into: [appDeployer, 'requires', 'name'],
             }]
-            const appModules = []
             for (const { app } of project.apps) {
                 const html5App = { in: 'modules', where: { type: 'html5', path: `${appPath}${app}` } }
                 relationships.push({
@@ -86,7 +92,7 @@ module.exports = class extends require('../../plugin') {
                     into: [appDeployer, 'build-parameters.requires'],
                 })
             }
-            if (hasXsuaa) {
+            if (affected('xsuaa', 'mta')) {
                 relationships.push({
                     insert: [xsuaa, 'name'],
                     into: [appDeployer, 'requires']
@@ -94,16 +100,16 @@ module.exports = class extends require('../../plugin') {
             }
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
                 with: project,
-                additions: [srvModule, appDeployer, appFront, ...appModules],
+                additions: [srvModule, appDeployer, appFront],
                 relationships
             })
         }
 
 
         // Vue + React
-        const promises = []
         const cds = require('../../../cds')
-        if (addAppFrontend || addVue || addReact) {
+        if (affected('app-frontend', 'vue', 'react')) {
+            await this._prepareApps(project)
             const addVite = cds.cli.argv[0] === 'react' || cds.cli.argv[0] === 'vue'
             const into = cds.cli.options.into
             const isRootLayout = addVite && (into === undefined || into === '' || into === '.')
@@ -124,26 +130,25 @@ module.exports = class extends require('../../plugin') {
                 const fromXsApp = join(appPath, 'xs-app.json')
                 const toXsApp = join(appPath, 'public/xs-app.json')
                 if (exists(fromXsApp) && !exists(toXsApp)) {
-                    promises.push(rename(fromXsApp, toXsApp))
+                    await rename(fromXsApp, toXsApp)
                 }
                 const fromManifest = join(appPath, 'webapp/manifest.json')
                 const toManifest = join(appPath, 'public/manifest.json')
                 if (exists(fromManifest) && !exists(toManifest)) {
-                    promises.push(rename(fromManifest, toManifest))
+                    await rename(fromManifest, toManifest)
                 }
                 $`npm install --prefix ${appPath} adm-zip --save-dev` // required for zipping /dist in the Vite build step
             }
         }
-        await Promise.all(promises)
 
-        if (addKyma) {
+        if (affected('kyma')) {
             const additions = [{
                 in: 'modules',
                 where: { name: `${project.appName}-html5-deployer` }
             }]
             await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project, additions })
         }
-        if (addKyma || affected && hasKyma) {
+        if (affected('kyma', 'xsuaa', 'approuter', 'workzone-standard', 'sample', 'ias')) {
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
         }
     }

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

@@ -28,30 +28,30 @@ module.exports = class ApplicationLoggingTemplate extends require('../../plugin'
 
     async combine(facet) {
         const project = readProject(facet)
-        const { addMta, hasMta, hasApprouter, isJava, addMultitenancy, hasMultitenancy, srv } = project
+        const { affected, isJava, srv } = project
 
-        if (addMta || (addMultitenancy && hasMta)) {
-            const additions = [], relationships = []
+        if (affected('mta', 'multitenancy', 'approuter')) {
+            const relationships = []
             const srvModule = srv4(srv.path)
             relationships.push({
                 insert: [applicationLogging, 'name'],
                 into: [srvModule, 'requires', 'name']
             })
-            if (hasMultitenancy) {
+            if (affected('multitenancy', 'mta')) {
                 const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
                 relationships.push({
                     insert: [applicationLogging, 'name'],
                     into: [mtxSidecar, 'requires', 'name']
                 })
             }
-            if (hasApprouter) {
+            if (affected('approuter', 'mta')) {
                 relationships.push({
                     insert: [applicationLogging, 'name'],
                     into: [approuter, 'requires', 'name']
                 })
             }
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
-                with: project, additions, relationships
+                with: project, relationships
             })
         }
     }

package/lib/init/template/approuter/files/xs-app.json.hbs

@@ -2,6 +2,9 @@
   {{#hasPortal}}
   "welcomeFile": "/cp.portal",
   {{/hasPortal}}
+  {{#hasHtml5Repo}}
+  "authenticationMethod": "route",
+  {{/hasHtml5Repo}}
   "routes": [
     {{#hasMTXRoute}}
     {
@@ -17,11 +20,30 @@
       "authenticationType": "none"
     },
     {{/hasMTXRouteJava}}
+    {{#hasHtml5Repo}}
+    {
+      "source": "^/?odata/(.*)$",
+      "target": "/odata/$1",
+      "destination": "srv-api",
+      {{^hasIas}}{{#hasXsuaa}}"authenticationType": "xsuaa",{{/hasXsuaa}}{{/hasIas}}
+      {{#hasIas}}"authenticationType": "ias",{{/hasIas}}
+      "csrfProtection": true
+    },
+    {
+      "source": "^(.*)$",
+      "target": "$1",
+      "service": "html5-apps-repo-rt"{{^hasIas}}{{#hasXsuaa}},
+      "authenticationType": "xsuaa"{{/hasXsuaa}}{{/hasIas}}{{#hasIas}},
+      "authenticationType": "ias"{{/hasIas}}
+    }
+    {{/hasHtml5Repo}}
+    {{^hasHtml5Repo}}
     {
       "source": "^/(.*)$",
       "target": "$1",
       "destination": "srv-api",
       "csrfProtection": true
     }
+    {{/hasHtml5Repo}}
   ]
 }

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

@@ -11,6 +11,7 @@ const {
     approuterMTXRoute,
     approuterMTXRouteJava // xs-app.json config
 } = require('../../registries/mta')
+const { srvApi, html5RepoApi } = require('../../registries/xs-app')
 const KymaTemplate = require('../kyma')
 
 module.exports = class ApprouterTemplate extends require('../../plugin') {
@@ -35,13 +36,12 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
         const project = readProject(facet)
         const {
             isNodejs, isJava,
-            addIas, addXsuaa, hasXsuaa, hasIas, addMultitenancy, hasMTXRoute, hasMTXRouteJava,
-            addMta, hasMta, hasMultitenancy,
-            addKyma, hasKyma, srv, approuterPath
+            hasMTXRoute, hasMTXRouteJava, hasMultitenancy, hasHtml5Repo,
+            affected, srv, approuterPath
         } = project
 
 
-        if (addMta || (addMultitenancy || addXsuaa || addIas) && hasMta) {
+        if (affected('mta', 'multitenancy', 'xsuaa', 'ias')) {
             const srvModule = srv4(srv.path)
             const apis = isJava && hasMultitenancy ? [requiredJavaApprouterApi4(srvModule), providedJavaApprouterApi] : []
             const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
@@ -52,13 +52,13 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
             const additions = [...modules, ...apis]
             const relationships = []
             const deletions = []
-            if (hasXsuaa) {
+            if (affected('xsuaa', 'mta')) {
                 relationships.push({
                     insert: [xsuaa, 'name'],
                     into: [approuter, 'requires', 'name']
                 })
             }
-            if (hasIas) {
+            if (affected('ias', 'mta')) {
                 relationships.push({
                     insert: [ias, 'name'],
                     into: [approuter, 'requires', 'name']
@@ -73,15 +73,15 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
             })
         }
 
-        if(addKyma) {
+        if (affected('kyma')) {
           await KymaTemplate.mergeDependency('web-application', 'approuter')
         }
 
-        if (addKyma || (addMultitenancy && hasKyma)) {
+        if (affected('kyma', 'multitenancy')) {
             await merge(__dirname, 'files', 'values.yaml.hbs').into('chart/values.yaml', { with: project })
         }
 
-        if (addKyma) {
+        if (affected('kyma')) {
             const additions = [{
                 in: 'modules',
                 where: { name: `${project.appName}-approuter` }
@@ -89,9 +89,16 @@ module.exports = class ApprouterTemplate extends require('../../plugin') {
             await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project, additions })
         }
 
-        const xsAppPath = join(approuterPath, 'xs-app.json')
-        const additions = hasMTXRoute ? [{ ...approuterMTXRoute, at: 0 }] : []
-        if (hasMTXRouteJava) additions.push({ ...approuterMTXRouteJava, at: 0 })
-        await merge(__dirname, 'files/xs-app.json.hbs').into(xsAppPath, { project, additions })
+        if (affected('approuter', 'html5-repo', 'xsuaa', 'ias', 'multitenancy', 'extensibility', 'kyma', 'portal')) {
+            const xsAppPath = join(approuterPath, 'xs-app.json')
+            const additions = hasMTXRoute ? [{ ...approuterMTXRoute, at: 0 }] : []
+            if (hasMTXRouteJava) additions.push({ ...approuterMTXRouteJava, at: 0 })
+            const deletions = []
+            if (hasHtml5Repo) {
+                additions.push(srvApi, html5RepoApi)
+                deletions.push({ item: { in: 'routes', where: { source: '^/(.*)$' } } })
+            }
+            await merge(__dirname, 'files/xs-app.json.hbs').into(xsAppPath, { project, additions, deletions })
+        }
     }
 }

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

@@ -27,9 +27,9 @@ module.exports = class AttachmentsTemplate extends require('../../plugin') {
 
     async combine(facet) {
         const project = readProject(facet)
-        const { addMta, addKyma, srv } = project
+        const { affected, srv } = project
 
-        if (addMta) {
+        if (affected('mta')) {
             const srvModule = srv4(srv.path)
             const additions = [srvModule, attachments]
             const relationships = [{
@@ -41,7 +41,7 @@ module.exports = class AttachmentsTemplate extends require('../../plugin') {
             })
         }
 
-        if (addKyma) {
+        if (affected('kyma')) {
             await merge(__dirname, 'files', 'values.yaml').into('chart/values.yaml')
             await KymaTemplate.mergeDependency('service-instance', 'attachments')
         }

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

@@ -34,15 +34,15 @@ module.exports = class AuditLoggingTemplate extends require('../../plugin') {
 
   async combine(facet) {
     const project = readProject(facet)
-    const { addMta, addKyma, addMultitenancy, srv } = project
+    const { affected, srv } = project
     const { plan = 'premium' } = cds.cli.options
     project.servicePlan = plan
 
-    if (addMultitenancy) {
+    if (affected('multitenancy')) {
       await merge(__dirname, 'files/package.sidecar.json').into('mtx/sidecar/package.json')
     }
 
-    if (addMta) {
+    if (affected('mta')) {
       const srvModule = srv4(srv.path)
       await merge(join(__dirname, 'files/mta.yaml.hbs')).into('mta.yaml', {
         with: project,
@@ -54,7 +54,7 @@ module.exports = class AuditLoggingTemplate extends require('../../plugin') {
         ]
       })
     }
-    if (addKyma) {
+    if (affected('kyma')) {
       await merge({
         srv: { bindings: { auditlog: { serviceInstanceName: 'auditlog' }}},
         auditlog: {

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

@@ -1,4 +1,5 @@
 const cds = require('../../../cds')
+const { read, write } = cds.utils
 const { merge, sort } = require('../../merge')
 
 const mvn = require('../../mvn')
@@ -31,6 +32,11 @@ module.exports = class extends require('../../plugin') {
     if (isNodejs) {
       project.profile ??= 'production'
       await merge(__dirname, 'files/package.json.hbs').into('package.json', { with: project })
+      if (project.withTelemetry) {
+        const packageJson = await read('package.json')
+        delete packageJson.cds.requires['cloud-logging']
+        await write('package.json', packageJson, { spaces: 2 })
+      }
       await sort('package.json', 'dependencies')
     } else if (isJava) {
       await merge(__dirname, 'files/java-cdsrc.json.hbs').into('.cdsrc.json', { with: project })
@@ -40,9 +46,9 @@ module.exports = class extends require('../../plugin') {
 
   async combine(facet) {
     const project = readProject(facet)
-    const { hasMta, addMta, addKyma, addApprouter, hasApprouter, isJava, addMultitenancy, hasMultitenancy, srv } = project
+    const { affected, isJava, srv } = project
 
-    if (addMta || (addMultitenancy || addApprouter) && hasMta) {
+    if (affected('mta', 'multitenancy', 'approuter')) {
       const cloudLogging = {
         in: 'resources',
         where: {
@@ -52,20 +58,20 @@ module.exports = class extends require('../../plugin') {
       }
       const additions = [cloudLogging], relationships = []
       const srvModule = srv4(srv.path)
-      if (addMta) {
+      if (affected('mta')) {
         relationships.push({
           insert: [cloudLogging, 'name'],
           into: [srvModule, 'requires', 'name']
         })
       }
-      if (hasMultitenancy) {
+      if (affected('multitenancy', 'mta')) {
         const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
         relationships.push({
           insert: [cloudLogging, 'name'],
           into: [mtxSidecar, 'requires', 'name']
         })
       }
-      if (hasApprouter) {
+      if (affected('approuter', 'mta')) {
         relationships.push({
           insert: [cloudLogging, 'name'],
           into: [approuter, 'requires', 'name']
@@ -77,7 +83,7 @@ module.exports = class extends require('../../plugin') {
         with: project, additions, relationships
       })
     }
-    if (addKyma) {
+    if (affected('kyma')) {
       await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml')
       await KymaTemplate.mergeDependency('service-instance', 'cloud-logging')
     }

package/lib/init/template/completion/completionSetup.js

@@ -12,9 +12,28 @@ const SUPPORTED_LINUX_SHELLS = ['bash', 'fish', 'gitbash', 'zsh'];
 const SUPPORTED_WINDOWS_SHELLS = ['ps'];
 const SUPPORTED_SHELLS = [...SUPPORTED_LINUX_SHELLS, ...SUPPORTED_WINDOWS_SHELLS].sort();
 
+// Single source of truth for the shell → generated-script basename mapping.
+const SCRIPT_FILES = { bash: 'cds.sh', gitbash: 'cds.sh', fish: 'cds.fish', ps: 'cds.ps1', zsh: 'cds.zsh' };
+
+// The one place the installer references the runtime scripts' location.
+const SCRIPTS_DIR = path.join(__dirname, '../../../../bin/completion/scripts');
+
 
 module.exports = new class CompletionSetup {
     supportedShells = SUPPORTED_SHELLS
+    scriptFiles = SCRIPT_FILES
+
+    resolveScriptPath(shell) {
+        if (!shell) {
+            throw 'Internal error: option --shell is missing';
+        }
+
+        if (!SCRIPT_FILES[shell]) {
+            throw `Internal error: unsupported shell: ${shell}, supported shells are ${this.supportedShells.join(', ')}`;
+        }
+
+        return path.join(SCRIPTS_DIR, SCRIPT_FILES[shell]);
+    }
 
     resolveShell(options) {
         return options?.shell
@@ -124,12 +143,6 @@ module.exports = new class CompletionSetup {
         console.log(`\nSource your shell using\n${bold('. $PROFILE')}\nto activate the changes.`);
     }
 
-    // Returns the absolute path to the pre-generated cache file bundled with this package.
-    resolveScriptPath(shell) {
-        const cacheFiles = { bash: 'cds.sh', gitbash: 'cds.sh', fish: 'cds.fish', ps: 'cds.ps1', zsh: 'cds.zsh' };
-        return path.join(__dirname, '../../../../bin/completion/scripts', cacheFiles[shell]);
-    }
-
     // Generates the snippet written to the user's shell profile. The script path is hardcoded at
     // install time to avoid spawning a subprocess on every shell startup.
     getScript(shell, scriptPath) {

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

@@ -20,9 +20,9 @@ module.exports = class ConnectivityTemplate extends require('../../plugin') {
 
     async combine(facet) {
         const project = readProject(facet)
-        const { srv, addKyma, addMta } = project
+        const { srv, affected } = project
 
-        if (addMta) {
+        if (affected('mta')) {
             const srvModule = srv4(srv.path)
             const additions = [srvModule, connectivity]
             const relationships = [{
@@ -32,7 +32,7 @@ module.exports = class ConnectivityTemplate extends require('../../plugin') {
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions, relationships })
         }
 
-        if (addKyma) {
+        if (affected('kyma')) {
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', {
                 project,
                 additions: [{

package/lib/init/template/data/as-csv.js

@@ -39,7 +39,8 @@ module.exports = async (data={}, csn, { headerOnly=false, keysOnly=false, separa
               if (targetRecord) for (const k of element.keys) fk[k.ref[k.ref.length - 1]] = targetRecord[k.ref[k.ref.length - 1]]
               const {headers: fkHeaders, records: fkRecords} = resolveStruct(fk, name)
               if (i === 0) header.push(...fkHeaders)
-              record.push(...(keysOnly && !element.key ? fkRecords.map(() => '') : fkRecords))
+              // keep foreign keys even in keys-only mode, to preserve referential integrity
+              record.push(...fkRecords)
             }
           }
           else if (element._type === 'cds.Association') {
@@ -51,8 +52,8 @@ module.exports = async (data={}, csn, { headerOnly=false, keysOnly=false, separa
             if (i === 0) {
               header.push(...fkHeaders)
             }
-            // foreign keys of key associations are part of the primary key and must be kept
-            record.push(...(keysOnly && !element.key ? fkRecords.map(() => '') : fkRecords))
+            // keep foreign keys even in keys-only mode, to preserve referential integrity
+            record.push(...fkRecords)
           }
           else if (element.is_struct && element.type !== 'cds.Map') {
             const {headers: structHeaders, records: structRecords} = resolveStruct(value, name);
@@ -69,7 +70,9 @@ module.exports = async (data={}, csn, { headerOnly=false, keysOnly=false, separa
         records.push(record.join(separator))
       }
       let res = header.join(separator)
-      if (!headerOnly)
+      // 'keys only' (headerOnly) still emits rows for model-defined code lists (enum keys),
+      // since those keys/values come from the model, not from random generation.
+      if (!headerOnly || entityData.fromModel)
         res += '\n' + records.join('\n')
 
       if (!res.endsWith('\n')) res += '\n'