@sap/cds-dk 8.0.3 → 8.1.1

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

@@ -1,12 +1,17 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 
 module.exports = class AdminService extends cds.ApplicationService { init(){
-  this.before ('NEW','Books.drafts', genid)
+
+  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()
 }}
-
-/** Generate primary keys for target entity in request */
-async function genid (req) {
-  const {ID} = await cds.tx(req).run (SELECT.one.from(req.target.actives).columns('max(ID) as ID'))
-  req.data.ID = ID - ID % 100 + 100 + 1
-}

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

@@ -1,26 +1,38 @@
 const cds = require('@sap/cds')
-const { Books } = cds.entities ('sap.capire.bookshop')
 
-class CatalogService extends cds.ApplicationService { init(){
+class CatalogService extends cds.ApplicationService { init() {
 
-  // Reduce stock of ordered books if available stock suffices
-  this.on ('submitOrder', async req => {
-    const {book,quantity} = req.data
-    let {stock} = await SELECT `stock` .from (Books,book)
-    if (stock >= quantity) {
-      await UPDATE (Books,book) .with (`stock -=`, quantity)
-      await this.emit ('OrderedBook', { book, quantity, buyer:req.user.id })
-      return { stock }
-    }
-    else return req.error (409,`${quantity} exceeds stock for book #${book}`)
-  })
+  const { Books } = cds.entities('sap.capire.bookshop')
+  const { ListOfBooks } = this.entities
 
   // Add some discount for overstocked books
-  this.after ('each','ListOfBooks', book => {
+  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()
 }}
 
-module.exports = { CatalogService }
+module.exports = CatalogService

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

@@ -11,6 +11,10 @@ service CatalogService {
   } excluding { createdBy, modifiedBy };
 
   @requires: 'authenticated-user'
-  action submitOrder ( book: Books:ID, quantity: Integer ) returns { stock: Integer };
+  action submitOrder (
+    book    : Books:ID @mandatory,
+    quantity: Integer  @mandatory
+  ) returns { stock: Integer };
+
   event OrderedBook : { book: Books:ID; quantity: Integer; buyer: String };
 }

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

@@ -1,8 +1,8 @@
 {
   "devDependencies": {
-    "typescript": "^5",
-    "@cap-js/cds-types": "<1",
-    "@types/node": "^20"
+    "@cap-js/cds-types": "^0.6",
+    "@types/node": "^20",
+    "typescript": "^5"
   },
   "scripts": {
     "watch": "cds-ts w",

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

@@ -1,7 +1,4 @@
 module.exports = class extends require('../../plugin') {
-    help() {
-      return 'SAP BTP Work Zone'
-    }
 
     requires() {
       return ['workzone-standard']

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

@@ -39,7 +39,7 @@ module.exports = class XsuaaTemplate extends require('../../plugin') {
             const additions = [srv, xsuaa]
             const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
             if (hasMultitenancy && isJava) additions.push(mtxSidecar)
-
+            const overwrites = hasMultitenancy ? [{ item: [xsuaa, 'parameters.config.tenant-mode'], withValue: 'shared' }] : []
             const relationships = [{
                 insert: [xsuaa, 'name'],
                 into: [srv, 'requires', 'name']
@@ -48,11 +48,18 @@ module.exports = class XsuaaTemplate extends require('../../plugin') {
                 insert: [xsuaa, 'name'],
                 into: [mtxSidecar, 'requires', 'name']
             })
-            await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions, relationships })
+
+            await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', { project, additions, overwrites, relationships })
         }
 
         if (hasHelm || hasHelmUnifiedRuntime) {
-            await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
+            const overwrites = hasMultitenancy ? [{
+                item: [{
+                  in: 'xsuaa',
+                  where: { serviceOfferingName: 'xsuaa' }
+                }, 'parameters.tenant-mode'], withValue: 'shared'
+              }] : []
+            await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project, overwrites })
 
             await merge({
                 xsuaa: {

package/lib/mtx/push.js

@@ -95,7 +95,9 @@ module.exports = class Push {
           }, 5 * 60 * 1000);
 
           const interval = setInterval(async () => {
-            const { status, error = 'cds push failed' } = (await axios.get(jobUrl, options)).data;
+            const jobResult = await axios.get(jobUrl, options);
+            const { status, tasks } = jobResult.data;
+            const error = tasks[0]?.error ?? 'cds push failed'
             if (status === JOB_STATUS.FINISHED || status === JOB_STATUS.FAILED) {
               clearInterval(interval);
               clearTimeout(timeout);

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "8.0.3",
+  "version": "8.1.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "8.0.3",
+      "version": "8.1.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/asyncapi": "^1.0.0",
@@ -42,21 +42,24 @@
       }
     },
     "node_modules/@cap-js/db-service": {
-      "version": "1.11.0",
+      "version": "1.12.0",
       "license": "SEE LICENSE",
       "optional": true,
+      "dependencies": {
+        "generic-pool": "^3.9.0"
+      },
       "peerDependencies": {
         "@sap/cds": ">=7.9"
       }
     },
     "node_modules/@cap-js/openapi": {
-      "version": "1.0.4",
+      "version": "1.0.5",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "pluralize": "^8.0.0"
       },
       "peerDependencies": {
-        "@sap/cds": ">=7.3"
+        "@sap/cds": ">=7.6"
       }
     },
     "node_modules/@cap-js/sqlite": {
@@ -102,7 +105,7 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.17.0",
+      "version": "0.17.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@eslint/object-schema": "^2.1.4",
@@ -135,7 +138,7 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.7.0",
+      "version": "9.8.0",
       "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -200,7 +203,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "8.0.4",
+      "version": "8.1.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": ">=5",
@@ -226,7 +229,7 @@
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "5.0.6",
+      "version": "5.1.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -262,7 +265,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "2.0.3",
+      "version": "2.0.5",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": ">=4",
@@ -446,7 +449,7 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.7.2",
+      "version": "1.7.3",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
@@ -866,14 +869,14 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.7.0",
+      "version": "9.8.0",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.11.0",
-        "@eslint/config-array": "^0.17.0",
+        "@eslint/config-array": "^0.17.1",
         "@eslint/eslintrc": "^3.1.0",
-        "@eslint/js": "9.7.0",
+        "@eslint/js": "9.8.0",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.3.0",
         "@nodelib/fs.walk": "^1.2.8",
@@ -2301,7 +2304,7 @@
       }
     },
     "node_modules/uglify-js": {
-      "version": "3.19.0",
+      "version": "3.19.1",
       "license": "BSD-2-Clause",
       "optional": true,
       "bin": {
@@ -2422,7 +2425,7 @@
       }
     },
     "node_modules/yaml": {
-      "version": "2.4.5",
+      "version": "2.5.0",
       "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"

package/package.json

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