@sap/cds-dk 10.1.1 → 10.2.0

package/lib/init/template/react/files/src/{main.jsx → main.{{jsxExtension}}.hbs}

@@ -1,9 +1,9 @@
 import { StrictMode } from 'react'
 import { createRoot } from 'react-dom/client'
 import './index.css'
-import App from './App.jsx'
+import App from './App{{^typescript}}.jsx{{/typescript}}'
 
-createRoot(document.getElementById('root')).render(
+createRoot(document.getElementById('root'){{#typescript}}!{{/typescript}}).render(
   <StrictMode>
     <App />
   </StrictMode>,

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

@@ -1,6 +1,8 @@
 const cds = require('../../../cds')
 const { path, sh: $ } = cds.utils
 const { renderAndCopy } = require('../../template')
+const { merge } = require('../../merge')
+const { readProject } = require('../../projectReader')
 
 module.exports = class ReactTemplate extends require('../../plugin') {
 
@@ -10,6 +12,14 @@ module.exports = class ReactTemplate extends require('../../plugin') {
         type: 'string',
         short: 'i',
         help: `Name of the app folder in 'app/'. Example: 'catalog' → 'app/catalog'. Omit for a single-UI scenario where the Vite app sits directly in 'app/'.`
+      },
+      'ts': {
+        type: 'boolean',
+        help: 'Override the inferred project type and generate a TypeScript app.'
+      },
+      'js': {
+        type: 'boolean',
+        help: 'Override the inferred project type and generate a JavaScript app.'
       }
     }
   }
@@ -23,15 +33,24 @@ module.exports = class ReactTemplate extends require('../../plugin') {
     const isRoot = !into || into === '.' || into === ''
     const app = isRoot ? path.basename(cds.root) : into
     const target = isRoot ? cds.env.folders.app : path.join(cds.env.folders.app, into)
+    const modelsPath = path.relative(target, '@cds-models').split(path.sep).join('/')
+    if (cds.cli.options.ts && cds.cli.options.js) throw "options '--ts' and '--js' cannot be combined"
+    const typescript = cds.cli.options.ts || !cds.cli.options.js && readProject().isTypescript
     await renderAndCopy(path.join(__dirname, 'files'), target, {
       app,
+      typescript,
+      extension: typescript ? 'ts' : 'js',
+      jsxExtension: typescript ? 'tsx' : 'jsx',
       isJava: cds.env['project-nature'] === 'java',
       isRoot,
-      base: isRoot ? '/' : `/${into}/`,
+      base: './',
       archiveName: isRoot ? app : into,
+      modelsPath,
     })
-    let prefix = target
-    if (cds.cli.command === 'init') prefix = path.join(cds.cli.argv[0], target)
-    await $`npm i --prefix ${prefix}`
+    if (typescript) await renderAndCopy(path.join(__dirname, 'typescript'), target, { modelsPath })
+    await merge({ scripts: { watch: 'cds watch --exclude app/' }, workspaces: ['app/*'] }).into('package.json')
+    if (typescript) await merge({ compilerOptions: { noEmit: true }, exclude: ['app'] }).into('tsconfig.json')
+    const root = cds.cli.command === 'init' ? cds.cli.argv[0] : cds.root
+    await $`npm i --prefix ${root}`
   }
 }

package/lib/init/template/react/typescript/src/vite-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />

package/lib/init/template/react/typescript/tsconfig.json.hbs

@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "jsx": "react-jsx",
+    "strict": true,
+    "noEmit": true,
+    "types": ["vite/client"],
+    "paths": {
+      "#cds-models/*": ["{{& modelsPath}}/*"]
+    }
+  },
+  "include": ["src"]
+}

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

@@ -26,9 +26,9 @@ module.exports = class extends require('../../plugin') {
 
   async combine(facet) {
     const project = readProject(facet)
-    const { addMta, srv } = project
+    const { affected, srv } = project
 
-    if (addMta) {
+    if (affected('mta')) {
       const srvModule = srv4(srv.path)
       await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
         project,

package/lib/init/template/side-by-side-extensibility/index.js

@@ -28,8 +28,11 @@ module.exports = class extends require('../../plugin') {
       await merge(__dirname, 'files/package.json.hbs').into(configFile, { with: project })
     }
 
-    async combine() {
-      const project = readProject()
-      await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { with: project, additions: [destinations, destinationSideBySideExtensibility]})
+    async combine(facet) {
+      const project = readProject(facet)
+      const { affected } = project
+      if (affected('mta')) {
+        await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { with: project, additions: [destinations, destinationSideBySideExtensibility]})
+      }
     }
 }

package/lib/init/template/typescript/files/tsconfig.json

@@ -7,10 +7,12 @@
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "skipLibCheck": true,
+    "noEmit": true,
     "sourceMap": true,
     "allowJs": true,
     "paths": {
       "@sap/cds": ["./node_modules/@cap-js/cds-types"]
     }
-  }
+  },
+  "exclude": ["app"]
 }

package/lib/init/template/vue/files/index.html.hbs

@@ -8,6 +8,6 @@
   </head>
   <body>
     <div id="app"></div>
-    <script type="module" src="/src/main.js"></script>
+    <script type="module" src="/src/main.{{extension}}"></script>
   </body>
 </html>

package/lib/init/template/vue/files/package.json.hbs

@@ -14,6 +14,7 @@
   "devDependencies": {
     "@vitejs/plugin-vue": "^6",
     "adm-zip": "^0",
-    "vite": "^8"
+    {{#typescript}}"typescript": "~5.9.3",
+    {{/typescript}}"vite": "^8"
   }
 }

package/lib/init/template/vue/files/src/App.vue.hbs

@@ -1,7 +1,13 @@
-<script setup>
+<script setup{{#typescript}} lang="ts"{{/typescript}}>
 import { ref, onMounted } from 'vue'
 
-const books = ref([])
+{{#typescript}}interface Book {
+  ID: string
+  title: string
+  author?: string
+}
+
+{{/typescript}}const books = ref{{#typescript}}<Book[]>{{/typescript}}([])
 
 onMounted(async () => {
   const r = await fetch('/odata/v4/{{#isJava}}CatalogService{{/isJava}}{{^isJava}}catalog{{/isJava}}/Books')

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

@@ -1,6 +1,8 @@
 const cds = require('../../../cds')
 const { path, sh: $ } = cds.utils
 const { renderAndCopy } = require('../../template')
+const { merge } = require('../../merge')
+const { readProject } = require('../../projectReader')
 
 module.exports = class VueTemplate extends require('../../plugin') {
 
@@ -10,6 +12,14 @@ module.exports = class VueTemplate extends require('../../plugin') {
         type: 'string',
         short: 'i',
         help: `Name of the app folder in 'app/'. Example: 'catalog' → 'app/catalog'. Omit for a single-UI scenario where the Vite app sits directly in 'app/'.`
+      },
+      'ts': {
+        type: 'boolean',
+        help: 'Override the inferred project type and generate a TypeScript app.'
+      },
+      'js': {
+        type: 'boolean',
+        help: 'Override the inferred project type and generate a JavaScript app.'
       }
     }
   }
@@ -23,16 +33,22 @@ module.exports = class VueTemplate extends require('../../plugin') {
     const isRoot = !into || into === '.' || into === ''
     const app = isRoot ? path.basename(cds.root) : into
     const target = isRoot ? cds.env.folders.app : path.join(cds.env.folders.app, into)
+    if (cds.cli.options.ts && cds.cli.options.js) throw "options '--ts' and '--js' cannot be combined"
+    const typescript = cds.cli.options.ts || !cds.cli.options.js && readProject().isTypescript
     await renderAndCopy(path.join(__dirname, 'files'), target, {
       app,
+      typescript,
+      extension: typescript ? 'ts' : 'js',
       isJava: cds.env['project-nature'] === 'java',
       isRoot,
-      base: isRoot ? '/' : `/${into}/`,
+      base: './',
       archiveName: isRoot ? app : into,
       literal: () => text => text,
     })
-    let prefix = target
-    if (cds.cli.command === 'init') prefix = path.join(cds.cli.argv[0], target)
-    await $`npm i --prefix ${prefix}`
+    if (typescript) await renderAndCopy(path.join(__dirname, 'typescript'), target)
+    await merge({ scripts: { watch: 'cds watch --exclude app/' }, workspaces: ['app/*'] }).into('package.json')
+    if (typescript) await merge({ compilerOptions: { noEmit: true }, exclude: ['app'] }).into('tsconfig.json')
+    const root = cds.cli.command === 'init' ? cds.cli.argv[0] : cds.root
+    await $`npm i --prefix ${root}`
   }
 }

package/lib/init/template/vue/typescript/tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "strict": true,
+    "types": ["vite/client"]
+  },
+  "include": ["src/**/*.ts", "src/**/*.vue"]
+}

package/lib/init/template/workzone-standard/files/mta.yaml.hbs

@@ -56,9 +56,9 @@ resources:
     parameters:
       service: destination
       service-plan: lite
-      {{#hasMultitenancy}}
       config:
         HTML5Runtime_enabled: true
+        {{#hasMultitenancy}}
         init_data:
           subaccount:
             existing_destinations_policy: update
@@ -69,7 +69,7 @@ resources:
                 ProxyType: Internet
                 URL: https://${org}.launchpad.${default-domain}
                 CEP.HTML5contentprovider: true
-      {{/hasMultitenancy}}
+        {{/hasMultitenancy}}
     requires:
       - name: srv-api
 

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

@@ -41,33 +41,35 @@ module.exports = class extends require('../../plugin') {
 
   async combine(facet) {
     const project = readProject(facet)
-    const { isJava, addMta, hasMta, srv, apps, appPath, appUIPaths, addMultitenancy, addXsuaa, strippedAppName } = project
+    const { isJava, affected, srv, apps, appPath, appUIPaths, strippedAppName } = project
 
-    await Promise.all(appUIPaths.map(async p => {
-      project.uiApp = p
-      const manifestPath = join(appPath, p, 'webapp/manifest.json')
-      const manifest = exists(manifestPath) ? await read(manifestPath) : {}
-      if (!manifest['sap.app']?.crossNavigation?.inbounds) {
-        return merge(__dirname, 'files/manifest.json.hbs').into(join(appPath, p, 'webapp/manifest.json'), { project })
-      } else {
-        return merge({ 'sap.cloud': {
-          public: true,
-          service: `${strippedAppName}.service`
-        }}).into(join(appPath, p, 'webapp/manifest.json'), { project })
-      }
-    }))
+    if (affected('workzone-standard', 'sample', 'xsuaa')) {
+      await Promise.all(appUIPaths.map(async p => {
+        project.uiApp = p
+        const manifestPath = join(appPath, p, 'webapp/manifest.json')
+        const manifest = exists(manifestPath) ? await read(manifestPath) : {}
+        if (!manifest['sap.app']?.crossNavigation?.inbounds) {
+          return merge(__dirname, 'files/manifest.json.hbs').into(join(appPath, p, 'webapp/manifest.json'), { project })
+        } else {
+          return merge({ 'sap.cloud': {
+            public: true,
+            service: `${strippedAppName}.service`
+          }}).into(join(appPath, p, 'webapp/manifest.json'), { project })
+        }
+      }))
 
-    await Promise.all(apps.map(async ({ app }) => {
-      const additions = [srvApi]
-      const overwrites = [{
-        item: [srvApi, 'destination'],
-        withValue: `srv-api`
-      }]
-      project.app = app
-      await merge(__dirname, 'files/xs-app.json.hbs').into(join(appPath, app, 'xs-app.json'), { with: project, additions, overwrites })
-    }))
+      await Promise.all(apps.map(async ({ app }) => {
+        const additions = [srvApi]
+        const overwrites = [{
+          item: [srvApi, 'destination'],
+          withValue: `srv-api`
+        }]
+        project.app = app
+        await merge(__dirname, 'files/xs-app.json.hbs').into(join(appPath, app, 'xs-app.json'), { with: project, additions, overwrites })
+      }))
+    }
 
-    if (addMultitenancy) {
+    if (affected('multitenancy')) {
       const mtxPackageJson = await read('mtx/sidecar/package.json')
       mtxPackageJson.cds ??= {}
       mtxPackageJson.cds.requires ??= {}
@@ -78,22 +80,22 @@ module.exports = class extends require('../../plugin') {
       await write('mtx/sidecar/package.json', mtxPackageJson, { spaces: 2 })
     }
 
-    if (addMta || (addMultitenancy || addXsuaa) && hasMta) {
+    if (affected('mta', 'multitenancy', 'xsuaa')) {
       const srvModule = srv4(srv.path)
       const additions = [srvModule, destinations, destination, {
         in: [destination, 'requires'],
         where: { name: 'srv-api' }
       }]
       const relationships = []
-      if (addMultitenancy) {
+      if (affected('multitenancy')) {
         relationships.push({
           insert: [html5RepoHost, 'name'],
           into: [mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar'), 'requires', 'name']
         })
       }
-      if (addXsuaa) {
+      if (affected('xsuaa')) {
         relationships.push({
-          insert: [xsuaa],
+          insert: [xsuaa, 'name'],
           into: [destinations, 'requires']
         })
         additions.push({

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

@@ -13,7 +13,7 @@ modules:
       - name: {{appName}}-auth
 
 resources:
-  - name: {{appName}}-auth{{#servicePlan}}-{{servicePlan}}{{/servicePlan}}
+  - name: {{appName}}-auth
     type: org.cloudfoundry.managed-service
     parameters:
       service: xsuaa

package/lib/init/template/xsuaa/files/values.yaml.hbs

@@ -17,7 +17,7 @@ srv:
       serviceInstanceName: xsuaa
 xsuaa:
   serviceOfferingName: xsuaa
-  servicePlanName: application
+  servicePlanName: {{#servicePlan}}{{servicePlan}}{{/servicePlan}}{{^servicePlan}}application{{/servicePlan}}
   parameters:
     tenant-mode: {{#hasMultitenancy}}shared{{/hasMultitenancy}}{{^hasMultitenancy}}dedicated{{/hasMultitenancy}}
     oauth2-configuration:

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

@@ -2,7 +2,7 @@ const cds = require('../../../cds')
 const { exists, read } = cds.utils
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
-const { srv4, xsuaa: xsuaaDefault, xsuaa4, mtxSidecar4 } = require('../../registries/mta')
+const { srv4, xsuaa, mtxSidecar4 } = require('../../registries/mta')
 const KymaTemplate = require('../kyma')
 
 module.exports = class XsuaaTemplate extends require('../../plugin') {
@@ -34,32 +34,37 @@ module.exports = class XsuaaTemplate extends require('../../plugin') {
 
     async combine(facet) {
         const project = readProject(facet)
-        const { addMultitenancy, hasMultitenancy, addMta, hasMta, addKyma, isJava, srv, hasKyma } = project
+        const { affected, isJava, srv } = project
 
-        const cds = require('../../../../lib')
-        const xsSecurity = await (async () => {
-            try {
-                const models = await cds.load(cds.env.folders.srv)
-                return cds.compile.to.xsuaa(models)
-            } catch { /* ignore */ }
-        })() ?? { scopes: [], attributes: [], 'role-templates': [], 'authorities-inheritance': false }
+        let xsSecurity
+        if (affected('xsuaa', 'sample', 'multitenancy', 'extensibility')) {
+            const cds = require('../../../../lib')
+            xsSecurity = await (async () => {
+                try {
+                    const models = await cds.load(cds.env.folders.srv)
+                    return cds.compile.to.xsuaa(models)
+                } catch { /* ignore */ }
+            })() ?? { scopes: [], attributes: [], 'role-templates': [], 'authorities-inheritance': false }
 
-        const additions = xsSecurity.scopes.map(scope => ({ in: 'scopes', where: { name: scope.name } }))
-        await merge(xsSecurity).into('xs-security.json', { project, additions })
+            const additions = xsSecurity.scopes.map(scope => ({ in: 'scopes', where: { name: scope.name } }))
+            await merge(xsSecurity).into('xs-security.json', { project, additions })
+        }
 
-        if (addMta || addMultitenancy && hasMta) {
+        if (affected('mta', 'multitenancy', 'extensibility')) {
+            xsSecurity ??= exists('xs-security.json') ? await read('xs-security.json') : {}
+            const roles = xsSecurity['role-templates'] ?? []
             const additions = [], overwrites = [], relationships = []
             const { plan } = cds.cli.options
-            const xsuaa = plan ? xsuaa4(plan) : xsuaaDefault
             additions.push(xsuaa)
-            if (addMta) {
+            if (plan) overwrites.push({ item: [xsuaa, 'parameters.service-plan'], withValue: plan })
+            if (affected('mta')) {
                 const srvModule = srv4(srv.path)
                 relationships.push({
                     insert: [xsuaa, 'name'],
                     into: [srvModule, 'requires', 'name']
                 })
             }
-            if (hasMultitenancy) {
+            if (affected('multitenancy', 'mta')) {
                 const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
                 overwrites.push({ item: [xsuaa, 'parameters.config.tenant-mode'], withValue: 'shared' })
                 relationships.push({
@@ -69,11 +74,11 @@ module.exports = class XsuaaTemplate extends require('../../plugin') {
             }
             if (plan) project.servicePlan = plan
 
-            project.hasRoles = xsSecurity['role-templates'].length > 0
-            project.roles = xsSecurity['role-templates'].map(role => role)
+            project.hasRoles = roles.length > 0
+            project.roles = roles
 
             if (!project.hasCustomRoleCollections) {
-                for (const role of xsSecurity['role-templates']) {
+                for (const role of roles) {
                     additions.push({
                         in: [xsuaa, 'parameters.role-collections'],
                         where: { 'role-template-references': ['XSAPPNAME'+role.name] }
@@ -93,14 +98,21 @@ module.exports = class XsuaaTemplate extends require('../../plugin') {
             }
         }
 
-        if (addKyma || addMultitenancy && hasKyma) {
-            const overwrites = addMultitenancy ? [{ item: 'xsuaa.parameters.tenant-mode', withValue: 'shared' }] : []
+        if (affected('kyma', 'multitenancy', 'extensibility')) {
+            xsSecurity ??= exists('xs-security.json') ? await read('xs-security.json') : {}
+            const roles = xsSecurity['role-templates'] ?? []
+            const overwrites = affected('multitenancy') ? [{ item: 'xsuaa.parameters.tenant-mode', withValue: 'shared' }] : []
+            const { plan } = cds.cli.options
+            if (plan) {
+                project.servicePlan = plan
+                overwrites.push({ item: 'xsuaa.servicePlanName', withValue: plan })
+            }
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project, overwrites })
             const parameters = {
                 xsappname: `${project.appName}-{{ .Release.Namespace }}`
             }
-            if (!project.hasCustomRoleCollections && xsSecurity['role-templates'].length) {
-                parameters['role-collections'] = xsSecurity['role-templates'].map(role => ({
+            if (!project.hasCustomRoleCollections && roles.length) {
+                parameters['role-collections'] = roles.map(role => ({
                     name: `${role.name} (${project.appName} {{ .Release.Namespace }})`,
                     description: 'generated',
                     'role-template-references': [`$XSAPPNAME.${role.name}`],

package/lib/mtx/auth_manager.js

@@ -57,10 +57,16 @@ function reqParams(method, params) {
         }
         if (params.has('refreshToken')) {
             d.refresh_token = params.get('refreshToken');
-            const param = ['passcode', 'clientid'].find(param => params.has(param));
+            const param = ['passcode', 'authorizationCode', 'clientid'].find(param => params.has(param));
             if (param) {
                 ignored[param] = 'refresh token is present';
             }
+        } else if (params.has('authorizationCode')) {
+            d.grant_type = 'authorization_code';
+            d.authorization_code = params.get('authorizationCode');
+            if (params.has('codeVerifier')) d.code_verifier = params.get('codeVerifier');
+            if (params.has('redirectUri')) d.redirect_uri = params.get('redirectUri');
+            if (params.has('appTid')) d.app_tid = params.get('appTid');
         } else if (params.has('passcode')) {
             d.passcode = params.get('passcode');
         } else if (params.has('clientsecret')) {
@@ -143,7 +149,7 @@ async function postToken(req, params) {
 }
 
 async function fetchToken(params) {
-    if (params.has('token') || !(params.has('refreshToken') || params.has('passcode') || params.has('clientid') || !params.has('passcodeUrl'))) {
+    if (params.has('token') || !(params.has('refreshToken') || params.has('passcode') || params.has('authorizationCode') || params.has('clientid') || !params.has('passcodeUrl'))) {
         return;
     }