@sap/cds-dk 9.2.1 → 9.3.0

package/lib/init/template/github-actions/files/workflows/test.yaml.hbs

@@ -9,13 +9,16 @@ on:
     branches:
       - main
 
+permissions:
+  contents: read
+
 jobs:
   tests:
-    runs-on: [self-hosted, {{#sap}}solinas{{/sap}}{{^sap}}ubuntu-latest{{/sap}}]
+    runs-on: {{#sap}}[self-hosted, solinas]{{/sap}}{{^sap}}ubuntu-latest{{/sap}}
     steps:
       - uses: actions/setup-node@v4
         with:
           node-version: 22
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - run: npm install
       - run: npm test

package/lib/init/template/github-actions/index.js

@@ -34,34 +34,33 @@ module.exports = class GitHubActionTemplate extends require('../../plugin') {
   async combine() {
     const project = readProject()
     const { hasMta, hasHelm } = project, { force } = cds.cli.options
-    project.literal = () => text => text
     project.sap = cds.cli.options.sap
     if (hasMta) {
       const cf = '.github/workflows/cf.yaml'
-      if (!exists(cf) || force) {
+      if (force || !exists(cf)) {
         await renderAndCopy(path.join(__dirname, 'files/workflows/cf.yaml.hbs'), cf, project)
       }
       const cfSetup = '.github/actions/cf-setup'
-      if (!exists(cfSetup) || force) {
+      if (force || !exists(cfSetup)) {
         await copy(path.join(__dirname, 'files/cf-setup'), cfSetup)
       }
-      const cfGithub = '.github/actions/cf-github-deploy'
-      if (!exists(cfGithub) || force) {
-        await copy(path.join(__dirname, 'files/cf-github-deploy'), cfGithub)
+      const cfGithub = '.github/actions/github-deployment'
+      if (force || !exists(cfGithub)) {
+        await copy(path.join(__dirname, 'files/github-deployment'), cfGithub)
       }
     }
     if (hasHelm) {
       const kyma = '.github/workflows/kyma.yaml'
-      if (!exists(kyma) || force) {
+      if (force || !exists(kyma)) {
         await renderAndCopy(path.join(__dirname, 'files/workflows/kyma.yaml.hbs'), kyma, project)
       }
       const kymaSetup = '.github/actions/kyma-setup'
-      if (!exists(kymaSetup) || force) {
+      if (force || !exists(kymaSetup)) {
         await copy(path.join(__dirname, 'files/kyma-setup'), kymaSetup)
       }
 
       const kymaInfo = '.github/actions/kyma-info'
-      if (!exists(kymaInfo) || force) {
+      if (force || !exists(kymaInfo)) {
         await copy(path.join(__dirname, 'files/kyma-info'), kymaInfo)
       }
     }

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 } = require('../../merge')
+const { merge, sort } = require('../../merge')
 const mvn = require('../../mvn')
 
 const { srv4, hdbDeployer, serviceManager, hdiContainer, mtxSidecar4 } = require('../../registries/mta')
@@ -39,6 +39,7 @@ module.exports = class HanaTemplate extends require('../../plugin') {
             delete packageJson.dependencies['@sap/hana-client']
             await write('package.json', packageJson, { spaces: 2 })
         }
+        await sort('package.json', 'dependencies')
     }
 
     async combine() {

package/lib/init/template/html5-repo/files/mta.yaml.hbs

@@ -25,7 +25,11 @@ modules:
     type: com.sap.application.content
     path: {{#isNodejs}}gen{{/isNodejs}}{{#isJava}}.{{/isJava}}
     requires:
-      - name: {{appName}}-auth
+      - name: {{appName}}-auth{{#hasIas}}
+        parameters:
+          config:
+            credential-type: X509_GENERATED
+            app-identifier: app-deployer{{/hasIas}}
       - name: srv-api
       - name: {{appName}}-html5-repo-host
         parameters:

package/lib/init/template/html5-repo/files/package.json.hbs

@@ -6,7 +6,7 @@
       {{#profile}}
       "[{{profile}}]": {
       {{/profile}}
-        "html5-runtime": true
+        "html5-repo": true
       {{#profile}}
       }
       {{/profile}}

package/lib/init/template/html5-repo/index.js

@@ -23,25 +23,9 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
 
     async run() {
         const project = readProject()
-        const { appUIPaths, apps, appPath, configFile, hasUI5 } = project
+        const { appUIPaths, appPath, configFile } = project
         await merge(__dirname, 'files/package.json.hbs').into(configFile, { project })
 
-        if (hasUI5) {
-            for (const { app } of apps) {
-                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) {
-            project.app = app
-            await merge(__dirname, 'files/app-package.json.hbs').into(join(appPath, app, 'package.json'), { project })
-        }
-
         // app deployer requires a manifest.json
         await Promise.all(appUIPaths.map(p =>
             merge(__dirname, 'files/manifest.json')
@@ -51,17 +35,38 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { isJava, srvPath, appPath, hasMta, hasXsuaa, hasMultitenancy, hasWorkzoneStandard, hasHelm, hasHelmUnifiedRuntime, hasApprouter, hasContainerize, apps } = project
+        const {
+            isJava, srvPath, appPath, apps,
+            hasApprouter, hasContainerize,  hasMultitenancy, hasWorkzoneStandard,
+            hasMta, hasXsuaa, hasHelm, hasHelmUnifiedRuntime, hasUI5
+        } = project
 
         await Promise.all(apps.map(async ({ app }) => {
             project.app = app
             project.hasIndexHtml = exists(join(appPath, app, 'webapp/index.html'))
             const additions = [odataApi]
             await merge(__dirname, 'files/xs-app.json.hbs').into(join(appPath, app, 'xs-app.json'), { with: project, additions })
+            await merge(__dirname, 'files/app-package.json.hbs').into(join(appPath, app, 'package.json'), { project })
         }))
 
+        if (hasUI5) {
+            for (const { app } of apps) {
+                project.app = app
+                await merge(__dirname, 'files/app-package.json.hbs').into(join(appPath, app,    'package.json'), { project })
+            }
+
+            for (const { app } of apps) {
+                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 })
+            }
+        }
+
         if (hasMultitenancy) {
-            await merge({ cds: { requires: { 'html5-runtime':true } } }).into('mtx/sidecar/package.json')
+            await merge({ cds: { requires: { 'html5-repo': true } } }).into('mtx/sidecar/package.json')
         }
 
         if (hasMta) {

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

@@ -20,7 +20,7 @@ modules:
 
   - name: {{appName}}
     type: approuter.nodejs
-    path: app/router
+    path: {{& approuterPath}}
     requires:
       - name: {{appName}}-auth
         parameters:
@@ -59,8 +59,11 @@ resources:
         display-name: {{appName}}
         {{#hasApprouter}}
         oauth2-configuration:
+          token-policy:
+            access-token-format: "jwt"
           redirect-uris:
             - ~{app-api/app-protocol}://*.~{app-api/app-uri}/login/callback
+            - ~{app-api/app-protocol}://~{app-api/app-uri}/login/callback
           post-logout-redirect-uris:
             - ~{app-api/app-protocol}://*.~{app-api/app-uri}/*/logout.html
         {{/hasApprouter}}
@@ -71,6 +74,4 @@ resources:
         {{#hasMultitenancy}}
         multi-tenant: true
         {{/hasMultitenancy}}
-        {{#hasXsuaa}}
         xsuaa-cross-consumption: true
-        {{/hasXsuaa}}

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

@@ -1,49 +1,50 @@
 {{#hasMultitenancy}}
 sidecar:
-    bindings:
-        auth:
-            serviceInstanceName: identity
-            parameters:
-                credential-type: X509_GENERATED
-                app-identifier: mtx
+  bindings:
+    auth:
+      serviceInstanceName: identity
+      parameters:
+        credential-type: X509_GENERATED
+        app-identifier: mtx
 {{/hasMultitenancy}}
 {{#hasApprouter}}
 approuter:
-    bindings:
-        auth:
-            serviceInstanceName: identity
-            parameters:
-                credential-type: X509_GENERATED
-                app-identifier: approuter
+  bindings:
+    auth:
+      serviceInstanceName: identity
+        parameters:
+          credential-type: X509_GENERATED
+          app-identifier: approuter
 {{/hasApprouter}}
 srv:
-    bindings:
-        auth:
-            serviceInstanceName: identity
-            parameters:
-                credential-type: X509_GENERATED
-                app-identifier: srv
+  bindings:
+    auth:
+      serviceInstanceName: identity
+      parameters:
+        credential-type: X509_GENERATED
+        app-identifier: srv
 
 identity:
-    serviceOfferingName: identity
-    servicePlanName: application
-    parameters:
-        display-name: {{appName}}
-        {{#hasMultitenancy}}
-        multi-tenant: true
-        {{/hasMultitenancy}}
-        {{#hasXsuaa}}
-        xsuaa-cross-consumption: true
-        {{/hasXsuaa}}
-        {{#hasApprouter}}
-        oauth2-configuration:
-            redirect-uris:
-                {{=<% %>=}}
-                - https://*.{{ tpl .Values.global.domain . }}/login/callback
-                <%={{ }}=%>
-            post-logout-redirect-uris:
-                {{=<% %>=}}
-                - https://*.{{ tpl .Values.global.domain . }}/*/logout.html
-                <%={{ }}=%>
-        {{/hasApprouter}}
-
+  serviceOfferingName: identity
+  servicePlanName: application
+  parameters:
+    display-name: {{appName}}
+    {{#hasMultitenancy}}
+    multi-tenant: true
+    {{/hasMultitenancy}}
+    {{#hasXsuaa}}
+    xsuaa-cross-consumption: true
+    {{/hasXsuaa}}
+    {{#hasApprouter}}
+    oauth2-configuration:
+      token-policy:
+        access-token-format: "jwt"
+      redirect-uris:
+        {{=<% %>=}}
+        - https://*.{{ tpl .Values.global.domain . }}/login/callback
+        <%={{ }}=%>
+      post-logout-redirect-uris:
+        {{=<% %>=}}
+        - https://*.{{ tpl .Values.global.domain . }}/*/logout.html
+        <%={{ }}=%>
+    {{/hasApprouter}}

package/lib/init/template/mta/files/package.json

@@ -1,5 +1,5 @@
 {
   "devDependencies": {
-    "@sap/cds-dk": ">=8"
+    "@sap/cds-dk": "^9"
   }
 }

package/lib/init/template/nodejs/files/.vscode/extensions.json

@@ -2,7 +2,6 @@
 	"recommendations": [
 		"SAPSE.vscode-cds",
 		"dbaeumer.vscode-eslint",
-		"esbenp.prettier-vscode",
 		"mechatroner.rainbow-csv",
 		"qwtel.sqlite-viewer",
 		"humao.rest-client"

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

@@ -2,21 +2,15 @@
   "name": "{{ projectName }}",
   "version": "1.0.0",
   "description": "A simple CAP project.",
-  "repository": "<Add your repository here>",
-  "license": "UNLICENSED",
-  "private": true,
   "dependencies": {
     "@sap/cds": "^9",
     "express": "^4"
   },
-  "engines": {
-    "node": ">=20"
-  },
   "devDependencies": {
-    "@cap-js/sqlite": "^2",
-    "@cap-js/cds-types": "^0.13.0"
+    "@cap-js/sqlite": "^2"
   },
   "scripts": {
     "start": "cds-serve"
-  }
+  },
+  "private": true
 }

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

@@ -37,7 +37,11 @@ modules:
             name: {{appName}}-portal-key
             config:
               content-endpoint: developer
-      - name: {{appName}}-auth
+      - name: {{appName}}-auth{{#hasIas}}
+        parameters:
+          config:
+            credential-type: X509_GENERATED
+            app-identifier: portal-deployer{{/hasIas}}
       - name: {{appName}}-html5-repo-host
       - name: {{appName}}-app-deployer
     deployed-after:

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

@@ -23,7 +23,6 @@ module.exports = class PortalTemplate extends require('../../plugin') {
     const project = readProject()
     const { configFile } = project
     await merge(__dirname, 'files/package.json.hbs').into(configFile, { project })
-    project.literal = () => text => text
     await renderAndCopy(path.join(__dirname, 'files/portal-site'), 'app/portal/portal-site', project)
   }
 

package/lib/init/template/sample/files/app/_i18n/i18n.properties

@@ -12,3 +12,18 @@ Stock = Stock
 Order = Order
 Orders = Orders
 Price = Price
+Genre = Genre
+Genres = Genres
+DateOfBirth = Date of Birth
+DateOfDeath = Date of Death
+PlaceOfBirth = Place of Birth
+PlaceOfDeath = Place of Death
+Details = Details
+Languages = Languages
+Currencies = Currencies
+MainGenre = Main Genre
+SubGenres = Subgenres
+Admin = Admin
+Translations = Translations
+General = General
+Locale = Locale

package/lib/init/template/sample/files/app/_i18n/i18n_de.properties

@@ -12,3 +12,18 @@ Stock = Bestand
 Order = Bestellung
 Orders = Bestellungen
 Price = Preis
+Genre = Genre
+Genres = Genres
+DateOfBirth = Geburtsdatum
+DateOfDeath = Todesdatum
+PlaceOfBirth = Geburtsort
+PlaceOfDeath = Todesort
+Details = Details
+Languages = Sprachen
+Currencies = Währungen
+MainGenre = Hauptgenre
+SubGenres = Subgenres
+Admin = Admin
+Translations = Übersetzungen
+General = Allgemein
+Locale = Gebietsschema

package/lib/init/template/sample/files/app/admin-books/fiori-service.cds

@@ -1,5 +1,4 @@
-using { AdminService } from '../../srv/admin-service.cds';
-using { sap.capire.bookshop } from '../../db/schema';
+using {AdminService} from '../../srv/admin-service.cds';
 
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -7,13 +6,13 @@ using { sap.capire.bookshop } from '../../db/schema';
 //
 
 annotate AdminService.Books with @(UI: {
-  HeaderInfo       : {
+  HeaderInfo         : {
     TypeName      : '{i18n>Book}',
     TypeNamePlural: '{i18n>Books}',
     Title         : {Value: title},
     Description   : {Value: author.name}
   },
-  Facets: [
+  Facets             : [
     {
       $Type : 'UI.ReferenceFacet',
       Label : '{i18n>General}',
@@ -49,7 +48,7 @@ annotate AdminService.Books with @(UI: {
       Label: '{i18n>Currency}'
     },
   ]},
-  FieldGroup #Admin: {Data: [
+  FieldGroup #Admin  : {Data: [
     {Value: createdBy},
     {Value: createdAt},
     {Value: modifiedBy},
@@ -67,23 +66,23 @@ annotate sap.capire.bookshop.Books with @fiori.draft.enabled;
 annotate AdminService.Books with @odata.draft.enabled;
 
 annotate AdminService.Books.texts with @(UI: {
-  Identification: [{Value: title}],
+  Identification : [{Value: title}],
   SelectionFields: [
     locale,
     title
   ],
-  LineItem: [
+  LineItem       : [
     {
       Value: locale,
-      Label: 'Locale'
+      Label: '{i18n>Locale}'
     },
     {
       Value: title,
-      Label: 'Title'
+      Label: '{i18n>Title}'
     },
     {
       Value: descr,
-      Label: 'Description'
+      Label: '{i18n>Description}'
     },
   ]
 });
@@ -105,13 +104,13 @@ annotate AdminService.Books.texts {
 using {sap} from '@sap/cds/common';
 
 extend service AdminService {
-  @readonly entity Languages as projection on sap.common.Languages;
+  @readonly
+  entity Languages as projection on sap.common.Languages;
 }
 
-// Workaround for Fiori popup for asking user to enter a new UUID on Create
-annotate AdminService.Books with {
-  ID @Core.Computed;
-}
+// Workaround for Fiori popups for asking user to enter a valid UUID on Create
+annotate AdminService.Authors : ID with  @Core.Computed  @odata.Type: 'Edm.String';
+annotate AdminService.Books : ID with  @Core.Computed  @odata.Type: 'Edm.String';
 
 // Show Genre as drop down, not a dialog
 annotate AdminService.Books with {

package/lib/init/template/sample/files/app/browse/fiori-service.cds

@@ -1,57 +1,57 @@
-using { CatalogService } from '../../srv/cat-service.cds';
+using {CatalogService} from '../../srv/cat-service.cds';
 
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books Object Page
 //
-annotate CatalogService.Books with @(UI : {
-    HeaderInfo: {
-        TypeName      : '{i18n>Book}',
-        TypeNamePlural: '{i18n>Books}',
-        Title         : {Value: title},
-        Description   : {Value : author}
+annotate CatalogService.Books with @(UI: {
+  HeaderInfo       : {
+    TypeName      : '{i18n>Book}',
+    TypeNamePlural: '{i18n>Books}',
+    Title         : {Value: title},
+    Description   : {Value: author}
+  },
+  HeaderFacets     : [{
+    $Type : 'UI.ReferenceFacet',
+    Label : '{i18n>Description}',
+    Target: '@UI.FieldGroup#Descr'
+  }, ],
+  Facets           : [{
+    $Type : 'UI.ReferenceFacet',
+    Label : '{i18n>Details}',
+    Target: '@UI.FieldGroup#Price'
+  }, ],
+  FieldGroup #Descr: {Data: [{Value: descr}, ]},
+  FieldGroup #Price: {Data: [
+    {Value: price},
+    {
+      Value: currency.symbol,
+      Label: '{i18n>Currency}'
     },
-    HeaderFacets: [{
-        $Type : 'UI.ReferenceFacet',
-        Label : '{i18n>Description}',
-        Target: '@UI.FieldGroup#Descr'
-    }, ],
-    Facets: [{
-        $Type : 'UI.ReferenceFacet',
-        Label : '{i18n>Details}',
-        Target: '@UI.FieldGroup#Price'
-    }, ],
-    FieldGroup #Descr: {Data : [{Value : descr}, ]},
-    FieldGroup #Price: {Data : [
-        {Value: price},
-        {
-            Value: currency.symbol,
-            Label: '{i18n>Currency}'
-        },
-    ]},
+  ]},
 });
 
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books List Page
 //
-annotate CatalogService.Books with @(UI : {
-    SelectionFields: [
-        ID,
-        price,
-        currency_code
-    ],
-    LineItem: [
-        {
-            Value: ID,
-            Label: '{i18n>Title}'
-        },
-        {
-            Value: author,
-            Label: '{i18n>Author}'
-        },
-        {Value: genre.name},
-        {Value: price},
-        {Value: currency.symbol},
-    ]
+annotate CatalogService.Books with @(UI: {
+  SelectionFields: [
+    ID,
+    price,
+    currency_code
+  ],
+  LineItem       : [
+    {
+      Value: ID,
+      Label: '{i18n>Title}'
+    },
+    {
+      Value: author,
+      Label: '{i18n>Author}'
+    },
+    {Value: genre.name},
+    {Value: price},
+    {Value: currency.symbol},
+  ]
 });