@sap/cds-dk 9.2.1 → 9.3.1

package/lib/init/template/sample/files/srv/cat-service.cds

@@ -1,20 +1,37 @@
-using { sap.capire.bookshop as my } from '../db/schema';
+using {sap.capire.bookshop as my} from '../db/schema';
+
 service CatalogService {
 
   /** For displaying lists of Books */
-  @readonly entity ListOfBooks as projection on Books
-  excluding { descr };
+  @readonly
+  entity ListOfBooks as
+    projection on Books
+    excluding {
+      descr
+    };
 
   /** For display in details pages */
-  @readonly entity Books as projection on my.Books { *,
-    author.name as author
-  } excluding { createdBy, modifiedBy };
+  @readonly
+  entity Books       as
+    projection on my.Books {
+      *,
+      author.name as author
+    }
+    excluding {
+      createdBy,
+      modifiedBy
+    };
 
   @requires: 'authenticated-user'
-  action submitOrder (
-    book    : Books:ID @mandatory,
-    quantity: Integer  @mandatory
-  ) returns { stock: Integer };
+  action submitOrder(book : Books : ID  @mandatory,
+                     quantity : Integer @mandatory
+  ) returns {
+    stock                         : Integer
+  };
 
-  event OrderedBook : { book: Books:ID; quantity: Integer; buyer: String };
+  event OrderedBook : {
+    book     : Books : ID;
+    quantity : Integer;
+    buyer    : String
+  };
 }

package/lib/init/template/tiny-sample/files/nodejs/db/schema.cds

@@ -1,7 +1,7 @@
 namespace my.bookshop;
 
 entity Books {
-  key ID : Integer;
-  title  : String;
-  stock  : Integer;
+  key ID    : Integer;
+      title : String;
+      stock : Integer;
 }

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

@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "@cap-js/cds-types": "^0.13.0",
+    "@cap-js/cds-types": "^0.14.0",
     "@types/node": "^22.0.0",
     "tsx": "^4",
     "typescript": "^5"

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

@@ -0,0 +1,22 @@
+const cds = require('../../../cds'), { exists, fs, path } = cds.utils
+const { readProject } = require('../../projectReader')
+const { merge } = require('../../merge')
+
+module.exports = class extends require('../../plugin') {
+
+  static hasInProduction() {
+    const startPage = path.join(cds.root, cds.env.folders.app, 'index.html')
+    const packageJson = path.join(cds.root, 'package.json')
+    return exists(startPage) && fs.readFileSync(startPage).includes('https://sapui5') ||
+           exists(packageJson) && fs.readFileSync(packageJson).includes('"sapux":')
+  }
+
+  static help() {
+    return 'SAP UI5 integration'
+  }
+
+  async run() {
+    const project = readProject()
+    await merge({ sapux: project.apps.map(({ app }) => project.appPath + app) }).into('package.json')
+  }
+}

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

@@ -24,11 +24,12 @@ resources:
       config:
         xsappname: {{appName}}-${org}-${space}
         tenant-mode: {{#hasMultitenancy}}shared{{/hasMultitenancy}}{{^hasMultitenancy}}dedicated{{/hasMultitenancy}}
-        {{#hasRoles}}
+        {{#hasRoles}}{{^hasCustomRoleCollections}}
         role-collections:
           {{#roles}}
           - name: '{{name}} ({{appName}} ${org}-${space})'
             description: 'generated'
             role-template-references: ['$XSAPPNAME.{{name}}']
           {{/roles}}
+        {{/hasCustomRoleCollections}}
         {{/hasRoles}}

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

@@ -67,11 +67,13 @@ module.exports = class XsuaaTemplate extends require('../../plugin') {
             project.hasRoles = xsSecurity['role-templates'].length > 0
             project.roles = xsSecurity['role-templates'].map(role => role)
 
-            for (const role of xsSecurity['role-templates']) {
-                additions.push({
-                    in: [xsuaa, 'parameters.role-collections'],
-                    where: { 'role-template-references': ['XSAPPNAME'+role.name] }
-                })
+            if (!project.hasCustomRoleCollections) {
+                for (const role of xsSecurity['role-templates']) {
+                    additions.push({
+                        in: [xsuaa, 'parameters.role-collections'],
+                        where: { 'role-template-references': ['XSAPPNAME'+role.name] }
+                    })
+                }
             }
 
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions, overwrites, relationships })

package/lib/lint/eslintHelp.json

@@ -1,6 +1,6 @@
 {
-  "version": "9.32.0",
-  "help": "\n# SYNOPSIS\n\n    *cds lint* [options] file.js [file.js] [dir]\n\n    Runs environment checks and/or checks the specified models\n    based on the ESLint framework\n\n# OPTIONS\n    \n    Basic configuration:\n      --no-config-lookup               Disable look up for eslint.config.js\n      -c, --config path::String        Use this configuration instead of eslint.config.js, eslint.config.mjs, or eslint.config.cjs\n      --inspect-config                 Open the config inspector with the current configuration\n      --ext [String]                   Specify additional file extensions to lint\n      --global [String]                Define global variables\n      --parser String                  Specify the parser to be used\n      --parser-options Object          Specify parser options\n    \n    Specify Rules and Plugins:\n      --plugin [String]                Specify plugins\n      --rule Object                    Specify rules\n    \n    Fix Problems:\n      --fix                            Automatically fix problems\n      --fix-dry-run                    Automatically fix problems without saving the changes to the file system\n      --fix-type Array                 Specify the types of fixes to apply (directive, problem, suggestion, layout)\n    \n    Ignore Files:\n      --no-ignore                      Disable use of ignore files and patterns\n      --ignore-pattern [String]        Patterns of files to ignore\n    \n    Use stdin:\n      --stdin                          Lint code provided on <STDIN> - default: false\n      --stdin-filename String          Specify filename to process STDIN as\n    \n    Handle Warnings:\n      --quiet                          Report errors only - default: false\n      --max-warnings Int               Number of warnings to trigger nonzero exit code - default: -1\n    \n    Output:\n      -o, --output-file path::String   Specify file to write report to\n      -f, --format String              Use a specific output format - default: stylish\n      --color, --no-color              Force enabling/disabling of color\n    \n    Inline configuration comments:\n      --no-inline-config               Prevent comments from changing config or rules\n      --report-unused-disable-directives  Adds reported errors for unused eslint-disable and eslint-enable directives\n      --report-unused-disable-directives-severity String  Chooses severity level for reporting unused eslint-disable and eslint-enable directives - either: off, warn, error, 0, 1, or 2\n      --report-unused-inline-configs String  Adds reported errors for unused eslint inline config comments - either: off, warn, error, 0, 1, or 2\n    \n    Caching:\n      --cache                          Only check changed files - default: false\n      --cache-file path::String        Path to the cache file. Deprecated: use --cache-location - default: .eslintcache\n      --cache-location path::String    Path to the cache file or directory\n      --cache-strategy String          Strategy to use for detecting changed files in the cache - either: metadata or content - default: metadata\n    \n    Suppressing Violations:\n      --suppress-all                   Suppress all violations - default: false\n      --suppress-rule [String]         Suppress specific rules\n      --suppressions-location path::String  Specify the location of the suppressions file\n      --prune-suppressions             Prune unused suppressions - default: false\n      --pass-on-unpruned-suppressions  Ignore unused suppressions - default: false\n    \n    Miscellaneous:\n      --init                           Run config initialization wizard - default: false\n      --env-info                       Output execution environment information - default: false\n      --no-error-on-unmatched-pattern  Prevent errors when pattern is unmatched\n      --exit-on-fatal-error            Exit with exit code 2 in case of fatal error - default: false\n      --no-warn-ignored                Suppress warnings when the file list includes ignored files\n      --pass-on-no-patterns            Exit with exit code 0 in case no file patterns are passed\n      --debug                          Output debugging information\n      -h, --help                       Show help\n      -v, --version                    Output the version number\n      --print-config path::String      Print the configuration for the given file\n      --stats                          Add statistics to the lint report - default: false\n      --flag [String]                  Enable a feature flag\n      --mcp                            Start the ESLint MCP server\n    \n",
+  "version": "9.35.0",
+  "help": "\n# SYNOPSIS\n\n    *cds lint* [options] file.js [file.js] [dir]\n\n    Runs environment checks and/or checks the specified models\n    based on the ESLint framework\n\n# OPTIONS\n    \n    Basic configuration:\n      --no-config-lookup               Disable look up for eslint.config.js\n      -c, --config path::String        Use this configuration instead of eslint.config.js, eslint.config.mjs, or eslint.config.cjs\n      --inspect-config                 Open the config inspector with the current configuration\n      --ext [String]                   Specify additional file extensions to lint\n      --global [String]                Define global variables\n      --parser String                  Specify the parser to be used\n      --parser-options Object          Specify parser options\n    \n    Specify Rules and Plugins:\n      --plugin [String]                Specify plugins\n      --rule Object                    Specify rules\n    \n    Fix Problems:\n      --fix                            Automatically fix problems\n      --fix-dry-run                    Automatically fix problems without saving the changes to the file system\n      --fix-type Array                 Specify the types of fixes to apply (directive, problem, suggestion, layout)\n    \n    Ignore Files:\n      --no-ignore                      Disable use of ignore files and patterns\n      --ignore-pattern [String]        Patterns of files to ignore\n    \n    Use stdin:\n      --stdin                          Lint code provided on <STDIN> - default: false\n      --stdin-filename String          Specify filename to process STDIN as\n    \n    Handle Warnings:\n      --quiet                          Report errors only - default: false\n      --max-warnings Int               Number of warnings to trigger nonzero exit code - default: -1\n    \n    Output:\n      -o, --output-file path::String   Specify file to write report to\n      -f, --format String              Use a specific output format - default: stylish\n      --color, --no-color              Force enabling/disabling of color\n    \n    Inline configuration comments:\n      --no-inline-config               Prevent comments from changing config or rules\n      --report-unused-disable-directives  Adds reported errors for unused eslint-disable and eslint-enable directives\n      --report-unused-disable-directives-severity String  Chooses severity level for reporting unused eslint-disable and eslint-enable directives - either: off, warn, error, 0, 1, or 2\n      --report-unused-inline-configs String  Adds reported errors for unused eslint inline config comments - either: off, warn, error, 0, 1, or 2\n    \n    Caching:\n      --cache                          Only check changed files - default: false\n      --cache-file path::String        Path to the cache file. Deprecated: use --cache-location - default: .eslintcache\n      --cache-location path::String    Path to the cache file or directory\n      --cache-strategy String          Strategy to use for detecting changed files in the cache - either: metadata or content - default: metadata\n    \n    Suppressing Violations:\n      --suppress-all                   Suppress all violations - default: false\n      --suppress-rule [String]         Suppress specific rules\n      --suppressions-location path::String  Specify the location of the suppressions file\n      --prune-suppressions             Prune unused suppressions - default: false\n      --pass-on-unpruned-suppressions  Ignore unused suppressions - default: false\n    \n    Miscellaneous:\n      --init                           Run config initialization wizard - default: false\n      --env-info                       Output execution environment information - default: false\n      --no-error-on-unmatched-pattern  Prevent errors when pattern is unmatched\n      --exit-on-fatal-error            Exit with exit code 2 in case of fatal error - default: false\n      --no-warn-ignored                Suppress warnings when the file list includes ignored files\n      --pass-on-no-patterns            Exit with exit code 0 in case no file patterns are passed\n      --debug                          Output debugging information\n      -h, --help                       Show help\n      -v, --version                    Output the version number\n      --print-config path::String      Print the configuration for the given file\n      --stats                          Add statistics to the lint report - default: false\n      --flag [String]                  Enable a feature flag\n      --mcp                            Start the ESLint MCP server\n      --concurrency Int|String         Number of linting threads, auto to choose automatically, off for no multithreading - default: off\n    \n",
   "options": [
     "--config",
     "--output-file",
@@ -24,7 +24,8 @@
     "--suppress-rule",
     "--suppressions-location",
     "--print-config",
-    "--flag"
+    "--flag",
+    "--concurrency"
   ],
   "shortcuts": [
     "-c",
@@ -50,6 +51,7 @@
     null,
     null,
     null,
+    null,
     "-v",
     "-h"
   ],

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "9.2.1",
+  "version": "9.3.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "9.2.1",
+      "version": "9.3.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/asyncapi": "^1.0.0",
@@ -42,8 +42,8 @@
       }
     },
     "node_modules/@cap-js/db-service": {
-      "version": "2.3.0",
-      "integrity": "sha512-KkYrnI05bx0PvwP5jxEUos8UQ+XYPucUMQt3i0muQXWJw3rEkWvEArvOwCYjTNnjzHqtVQfpPXsy1+ehkHUrWg==",
+      "version": "2.4.0",
+      "integrity": "sha512-tWZUkgAPgZQIVu3xownD9cA9joXPI84KDstx3ZezOxXJuRsapgM2QEs0TXwQK5XLG43FUAsGO7wVJPoZ29ZH2Q==",
       "devOptional": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -78,8 +78,8 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.33.0",
-      "integrity": "sha512-5K1/mKhWaMfreBGJTwval43JJmkip0RmM+3+IuqupeSKNC/Th2Kc7ucaq5ovTSra/OOKB9c58CGSz3QMVbWt0A==",
+      "version": "9.35.0",
+      "integrity": "sha512-30iXE9whjlILfWobBkNerJo+TXYsgVM5ERQwMcMKCHckHflCmf7wXDAHlARoWnh0s1U72WqlbeyE7iAcCzuCPw==",
       "license": "MIT",
       "peer": true,
       "engines": {
@@ -90,11 +90,11 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "9.2.1",
-      "integrity": "sha512-0zjjZGlBvcJMyVj48hTs6Q22/w9hNnJR6O88rGoEj4R87uaP4uM5gFLf3PDnPDUwkAeveVHgJRnWPqDGqIMgvA==",
+      "version": "9.3.1",
+      "integrity": "sha512-xA9EN29X8HKaz83Aod1e3Bs6LRvqcCVoaTvCtyOup5rMYDQumcoZ7UOKH6NIUTeO0zOtafUiMHucMG+dBnq5XQ==",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "@sap/cds-compiler": "^6",
+        "@sap/cds-compiler": "^6.1",
         "@sap/cds-fiori": "^2",
         "js-yaml": "^4.1.0"
       },
@@ -120,8 +120,8 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "6.2.2",
-      "integrity": "sha512-LqRNfBsWnEJpXVJ6/v52VqAdelWoETLbECMPcy7BfoHE63DGBpKA/ZIgoH11t7vUm7GYQDcSfR7ryy02Q/fP7A==",
+      "version": "6.3.0",
+      "integrity": "sha512-4HhZuiKa8SztqtjfM9Iey7yb2U6xQGzUbjib3JXcSSP6AJ6Bz0gViliTwf8dASPTLRtv7HU82277m4uqxU2qjw==",
       "license": "SEE LICENSE IN LICENSE",
       "bin": {
         "cdsc": "bin/cdsc.js",
@@ -142,8 +142,8 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "3.2.0",
-      "integrity": "sha512-8X+fK0rsnOaKZpettVAXuzCJT9MRebpuzN1JjNEWPiYVafvIjXIQc2diYgq8rtzhfdFWk6QNlZUjMM7jLgNfsw==",
+      "version": "3.3.1",
+      "integrity": "sha512-66yWxkVlqu5FsOHxDF8w2JJSlcbgtT2PTegBSECEq9+fjMOaqlxnBHpXXTODCUgK762Ad3kyCUZqW///gmpuMA==",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": "^5"
@@ -1213,8 +1213,8 @@
       "license": "MIT"
     },
     "node_modules/node-abi": {
-      "version": "3.75.0",
-      "integrity": "sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg==",
+      "version": "3.77.0",
+      "integrity": "sha512-DSmt0OEcLoK4i3NuscSbGjOf3bqiDEutejqENSplMSFA/gmB8mkED9G4pKWnPl7MDU4rSHebKPHeitpDfyH0cQ==",
       "license": "MIT",
       "optional": true,
       "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "9.2.1",
+  "version": "9.3.1",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [

package/lib/init/template/github-actions/files/cf-github-deploy/action.yaml

@@ -1,48 +0,0 @@
-name: GitHub Deployment for Cloud Foundry
-description: "Creates a GitHub deployment for your Cloud Foundry app"
-
-inputs:
-  app-name:
-    description: "Base name of the deployed CAP app"
-    required: true
-
-runs:
-  using: "composite"
-  steps:
-    - name: Get deployed server URL
-      id: get-url
-      shell: bash
-      run: |
-        raw=$(cf app "${{ inputs.app-name }}" | awk '/routes:/ {print $2}')
-        raw=$(echo "$raw" | sed -E 's#^https?://##')
-        echo "url=https://$raw" >> "$GITHUB_OUTPUT"
-
-    - name: Create GitHub Deployment
-      uses: actions/github-script@v7
-      env:
-        URL: ${{ steps.get-url.outputs.url }}
-      with:
-        script: |
-          const { owner, repo } = context.repo
-          const ref = context.ref
-          const url = process.env.URL
-
-          const deployment = await github.rest.repos.createDeployment({
-            owner,
-            repo,
-            ref,
-            required_contexts: [],
-            environment: 'Production',
-            auto_merge: false,
-            description: 'Deployed to Cloud Foundry',
-          })
-
-          await github.rest.repos.createDeploymentStatus({
-            owner,
-            repo,
-            deployment_id: deployment.data.id,
-            state: 'success',
-            environment_url: url,
-            log_url: `https://github.com/${owner}/${repo}/actions/runs/${context.runId}`,
-            description: 'CAP app is live',
-          })

package/lib/init/template/sample/files/javascript/admin-service.js.hbs

@@ -1,24 +0,0 @@
-{{#isESM}}
-import cds from '@sap/cds'
-
-export class AdminService extends cds.ApplicationService { init() {
-{{/isESM}}
-{{^isESM}}
-const cds = require('@sap/cds')
-
-module.exports = class AdminService extends cds.ApplicationService { init() {
-{{/isESM}}
-
-  const { Books } = this.entities
-
-  /**
-   * Generate IDs for new Books drafts
-   */
-  this.before ('NEW', Books.drafts, async (req) => {
-    if (req.data.ID) return
-    const { ID:id1 } = await SELECT.one.from(Books).columns('max(ID) as ID')
-    const { ID:id2 } = await SELECT.one.from(Books.drafts).columns('max(ID) as ID')
-    req.data.ID = Math.max(id1||0, id2||0) + 1
-  })
-  return super.init()
-}}

package/lib/init/template/sample/files/javascript/cat-service.js.hbs

@@ -1,43 +0,0 @@
-{{#isESM}}
-import cds from '@sap/cds'
-
-export class CatalogService extends cds.ApplicationService { init() {
-{{/isESM}}
-{{^isESM}}
-const cds = require('@sap/cds')
-
-module.exports = class CatalogService extends cds.ApplicationService { init() {
-{{/isESM}}
-
-  const { Books } = cds.entities('sap.capire.bookshop')
-  const { ListOfBooks } = this.entities
-
-  // Add some discount for overstocked books
-  this.after('each', ListOfBooks, book => {
-    if (book.stock > 111) book.title += ` -- 11% discount!`
-  })
-
-  // Reduce stock of ordered books if available stock suffices
-  this.on('submitOrder', async req => {
-    let { book:id, quantity } = req.data
-    let book = await SELECT.one.from (Books, id, b => b.stock)
-
-    // Validate input data
-    if (!book) return req.error (404, `Book #${id} doesn't exist`)
-    if (quantity < 1) return req.error (400, `quantity has to be 1 or more`)
-    if (!book.stock || quantity > book.stock) return req.error (409, `${quantity} exceeds stock for book #${id}`)
-
-    // Reduce stock in database and return updated stock value
-    await UPDATE (Books, id) .with ({ stock: book.stock -= quantity })
-    return book
-  })
-
-  // Emit event when an order has been submitted
-  this.after('submitOrder', async (_,req) => {
-    let { book, quantity } = req.data
-    await this.emit('OrderedBook', { book, quantity, buyer: req.user.id })
-  })
-
-  // Delegate requests to the underlying generic service
-  return super.init()
-}}

package/lib/init/template/sample/files/typescript/admin-service.ts.hbs

@@ -1,16 +0,0 @@
-import cds from '@sap/cds'
-
-import { Books } from '#cds-models/AdminService'
-
-export class AdminService extends cds.ApplicationService { async init() {
-
-  /**
-   * Generate primary keys for target entity in request
-   */
-  this.before ('NEW', Books.drafts, async req => {
-    if (req.data.ID) return
-    const { ID } = await SELECT.one.from(Books).columns('max(ID) as ID') ?? { ID: 0 }
-    req.data.ID = ID! - ID! % 100 + 100 + 1
-  })
-  return super.init()
-}}

package/lib/init/template/sample/files/typescript/cat-service.ts.hbs

@@ -1,38 +0,0 @@
-import cds from '@sap/cds'
-
-import { Books } from '#cds-models/sap/capire/bookshop'
-import { submitOrder, OrderedBook, ListOfBooks } from '#cds-models/CatalogService'
-
-export class CatalogService extends cds.ApplicationService { async init() {
-
-  // Add some discount for overstocked books
-  this.after('each', ListOfBooks, book => {
-    if (book?.stock === undefined || book.stock === null) return
-    if (book?.stock > 111) book.title += ` -- 11% discount!`
-  })
-
-  // Reduce stock of ordered books if available stock suffices
-  this.on(submitOrder, async req => {
-    let { book:id, quantity } = req.data
-    if(!id) return req.error (400, `Book ID missing`)  // FIXED
-    let book = await SELECT.from (Books, id, b => b.stock)
-
-    // Validate input data
-    if (!book) return req.error (404, `Book #${id} doesn't exist`)
-    if (!quantity || quantity < 1) return req.error (400, `quantity has to be 1 or more`)
-    if (quantity > book.stock!) return req.error (409, `${quantity} exceeds stock for book #${id}`)
-
-    // Reduce stock in database and return updated stock value
-    await UPDATE (Books, id) .with ({ stock: book.stock! -= quantity })
-    return book
-  })
-
-  // Emit event when an order has been submitted
-  this.after(submitOrder, async (_,req) => {
-    let { book, quantity } = req.data
-    await this.emit(OrderedBook, { book, quantity, buyer: req.user.id })
-  })
-
-  // Delegate requests to the underlying generic service
-  return super.init()
-}}