@sap/cds-dk 8.6.0 → 8.7.0

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

@@ -24,6 +24,11 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
     return options?.add?.has('mtx') || options?.add?.has('multitenancy') || !!env.requires?.multitenancy || false
   }
 
+  canRun() {
+    if (cds.requires.workzone) throw `There is no 'cds add multitenancy' support for SAP BTP WorkZone yet.`
+    return true
+  }
+
   async run() {
     const project = readProject()
     const { isNodejs, isJava, configFile } = project

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

@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@cap-js/sqlite": "^1",
-    "@cap-js/cds-types": "^0.8.0"
+    "@cap-js/cds-types": "^0.9.0"
   },
   "scripts": {
     "start": "cds-serve"

package/lib/init/template/portal/files/portal-site/i18n/catalog.properties

@@ -1 +1 @@
-title=Bookshop
+title=Application Title

package/lib/init/template/portal/files/portal-site/i18n/catalog_de.properties

@@ -1 +1 @@
-title=Bücherladen
+title=Name der Anwendung

package/lib/init/template/portal/files/portal-site/i18n/group.properties

@@ -1 +1 @@
-title=Bookshop
+title=Application Title

package/lib/init/template/portal/files/portal-site/i18n/group_de.properties

@@ -1 +1 @@
-title=Bücherladen
+title=Name der Anwendung

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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,38 @@
+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()
+}}

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

@@ -1,5 +1,5 @@
 const { join } = require('path')
-const cds = require('../../../cds'), { exists, read, write, copy } = cds.utils
+const cds = require('../../../cds'), { read, write, copy } = cds.utils
 const { env4, readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { renderAndCopy } = require('../../template')
@@ -12,19 +12,23 @@ module.exports = class SampleTemplate extends require('../../plugin') {
     }
 
     async run() {
-        const { db, srv, app } = env4('production').folders
-        const language = exists('pom.xml') ? 'java' : 'nodejs'
         const project = readProject()
+        const { db, srv, app } = env4('production').folders
 
-        if (language === 'nodejs') {
-            await Promise.all([
-                copy(join(__dirname, 'files/db')).to(db),
-                copy(join(__dirname, 'files/srv')).to(srv)
-            ])
-            await renderAndCopy(join(__dirname, 'files', language), srv, project)
-            await copy(join(__dirname, 'files/app')).to(app)
-        } else if (language === 'java') {
-            await mvn.add('sample')
+        switch (project.language) {
+            case 'nodejs': {
+                await Promise.all([
+                    copy(join(__dirname, 'files/db')).to(db),
+                    copy(join(__dirname, 'files/srv')).to(srv)
+                ])
+                const lang = project.isTypescript ? 'typescript' : 'javascript'
+                await renderAndCopy(join(__dirname, 'files', lang), srv, project)
+                await copy(join(__dirname, 'files/app')).to(app)
+                break
+            }
+            case 'java':
+                await mvn.add('sample')
+                break
         }
 
         const { appName, appPath, appUIPaths } = project

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

@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "@cap-js/cds-types": "^0.8.0",
+    "@cap-js/cds-types": "^0.9.0",
     "@types/node": "^22.0.0",
     "typescript": "^5"
   },

package/lib/lint/io.js

@@ -52,15 +52,13 @@ module.exports = {
  */
   async readEslintConfig(configPath) {
     let config;
-    const configFile = path.basename(configPath);
-    switch (configFile) {
+    switch (path.basename(configPath)) {
+      case "eslint.config.mjs":
+        try { config = await import (configPath) } catch { config = null }
+        break
       case "eslint.config.js":
       case "eslint.config.cjs":
-      case "eslint.config.mjs":
-        config = this.safeRequire(configPath)
-        break;
-      default:
-        break;
+        try { config = require (configPath) } catch { config = null }
     }
     return config;
   },
@@ -77,7 +75,7 @@ module.exports = {
     let configContents;
     const isFilePath = typeof configIn === "string";
     if (isFilePath) {
-      configContents = this.safeRequire(configIn); // TODO error handling invalid json
+      configContents = await this.readEslintConfig(configIn)
     }
 
     configContents ??= { ...configIn };
@@ -372,12 +370,4 @@ export default [...cds.recommended, cdsPlugin.configs.recommended]
     }
     return userOpts;
   },
-
-  safeRequire(module) {
-    try {
-      return require(module)
-    } catch (e) {
-      return null
-    }
-  }
 };

package/lib/watch/node-watch.js

@@ -2,7 +2,7 @@ const cds = require ('../cds')
 const LOG = cds.log('cli|watch'), DEBUG = cds.debug('cli|watch')
 const { relative } = require('path')
 
-module.exports = ({ cwd, script, ext, ignore=RegExp(), env={}, delay=200, options={} })=>{
+module.exports = ({ cwd = process.cwd(), script, ext, ignore=RegExp(), watched, env={}, delay=200, options={} })=>{
   const debugOpts = _debugOpts(options)
 
   let child
@@ -58,7 +58,7 @@ module.exports = ({ cwd, script, ext, ignore=RegExp(), env={}, delay=200, option
     // else  DEBUG?. (`NOT ignored: ${relative(cwd||process.cwd(), f)}`, include.test(f), include)
     return isIn
   }
-  const watcher = watch (cwd||process.cwd(),{ recursive:true, filter, delay:0 })
+  const watcher = watch (watched,{ recursive:true, filter, delay:0 })
   if (LOG._debug) watcher.on('close', ()=> DEBUG('⚡️', 'cds watch - file watcher closed'))
   watcher.on('change', restart)
   process.on('shutdown', ()=> watcher.close())
@@ -96,7 +96,7 @@ const ps = (child,env) => console.log (`\x1b[32m
   \x1b[0m`
 )
 
-// reduces mutiple node-watch events in a time frame into a bulk
+// reduces multiple node-watch events in a time frame into a bulk
 function _coalesceEvents(delay, fn) {
   let timer, cache = []
   return function(type, name) { // node-watch callback signature

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@sap/cds-dk",
-  "version": "8.6.0",
+  "version": "8.7.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@sap/cds-dk",
-      "version": "8.6.0",
+      "version": "8.7.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@cap-js/asyncapi": "^1.0.0",
@@ -43,7 +43,7 @@
       }
     },
     "node_modules/@cap-js/db-service": {
-      "version": "1.16.1",
+      "version": "1.17.0",
       "license": "SEE LICENSE",
       "optional": true,
       "dependencies": {
@@ -54,7 +54,7 @@
       }
     },
     "node_modules/@cap-js/openapi": {
-      "version": "1.1.1",
+      "version": "1.1.2",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "pluralize": "^8.0.0"
@@ -64,11 +64,11 @@
       }
     },
     "node_modules/@cap-js/sqlite": {
-      "version": "1.7.8",
+      "version": "1.8.0",
       "license": "SEE LICENSE",
       "optional": true,
       "dependencies": {
-        "@cap-js/db-service": "^1.14.1",
+        "@cap-js/db-service": "^1.17.0",
         "better-sqlite3": "^11.0.0"
       },
       "peerDependencies": {
@@ -121,7 +121,7 @@
       }
     },
     "node_modules/@eslint/core": {
-      "version": "0.9.1",
+      "version": "0.10.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@types/json-schema": "^7.0.15"
@@ -152,7 +152,7 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.17.0",
+      "version": "9.19.0",
       "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -166,9 +166,10 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.2.4",
+      "version": "0.2.5",
       "license": "Apache-2.0",
       "dependencies": {
+        "@eslint/core": "^0.10.0",
         "levn": "^0.4.1"
       },
       "engines": {
@@ -227,7 +228,7 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "8.6.0",
+      "version": "8.7.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/cds-compiler": ">=5.1",
@@ -244,16 +245,20 @@
         "node": ">=18"
       },
       "peerDependencies": {
-        "express": ">=4"
+        "express": "^4",
+        "tar": "^7"
       },
       "peerDependenciesMeta": {
         "express": {
           "optional": true
+        },
+        "tar": {
+          "optional": true
         }
       }
     },
     "node_modules/@sap/cds-compiler": {
-      "version": "5.6.0",
+      "version": "5.7.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "antlr4": "4.9.3"
@@ -268,7 +273,7 @@
       }
     },
     "node_modules/@sap/cds-fiori": {
-      "version": "1.2.8",
+      "version": "1.3.0",
       "license": "SEE LICENSE IN LICENSE",
       "peerDependencies": {
         "@sap/cds": ">=7.6",
@@ -289,7 +294,7 @@
       }
     },
     "node_modules/@sap/cds-mtxs": {
-      "version": "2.4.1",
+      "version": "2.5.0",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "@sap/hdi-deploy": ">=4",
@@ -315,13 +320,13 @@
       }
     },
     "node_modules/@sap/hdi": {
-      "version": "4.6.0",
+      "version": "4.7.0",
       "license": "See LICENSE file",
       "dependencies": {
         "async": "^3.2.3"
       },
       "engines": {
-        "node": ">=18 <=20"
+        "node": ">=18"
       },
       "peerDependencies": {
         "@sap/hana-client": "^2 >= 2.5",
@@ -501,7 +506,7 @@
       "optional": true
     },
     "node_modules/better-sqlite3": {
-      "version": "11.7.0",
+      "version": "11.8.1",
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
@@ -877,7 +882,7 @@
       }
     },
     "node_modules/es-object-atoms": {
-      "version": "1.0.0",
+      "version": "1.1.1",
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0"
@@ -901,16 +906,16 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.17.0",
+      "version": "9.19.0",
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
         "@eslint/config-array": "^0.19.0",
-        "@eslint/core": "^0.9.0",
+        "@eslint/core": "^0.10.0",
         "@eslint/eslintrc": "^3.2.0",
-        "@eslint/js": "9.17.0",
-        "@eslint/plugin-kit": "^0.2.3",
+        "@eslint/js": "9.19.0",
+        "@eslint/plugin-kit": "^0.2.5",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.4.1",
@@ -1264,19 +1269,19 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.6",
+      "version": "1.2.7",
       "license": "MIT",
       "dependencies": {
         "call-bind-apply-helpers": "^1.0.1",
-        "dunder-proto": "^1.0.0",
         "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
         "es-object-atoms": "^1.0.0",
         "function-bind": "^1.1.2",
+        "get-proto": "^1.0.0",
         "gopd": "^1.2.0",
         "has-symbols": "^1.1.0",
         "hasown": "^2.0.2",
-        "math-intrinsics": "^1.0.0"
+        "math-intrinsics": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1285,6 +1290,17 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/github-from-package": {
       "version": "0.0.0",
       "license": "MIT",
@@ -1367,7 +1383,7 @@
       }
     },
     "node_modules/hdb": {
-      "version": "0.19.11",
+      "version": "0.19.12",
       "license": "Apache-2.0",
       "dependencies": {
         "iconv-lite": "^0.4.18"
@@ -1553,7 +1569,7 @@
       "license": "MIT"
     },
     "node_modules/math-intrinsics": {
-      "version": "1.0.0",
+      "version": "1.1.0",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -1663,7 +1679,7 @@
       }
     },
     "node_modules/napi-build-utils": {
-      "version": "1.0.2",
+      "version": "2.0.0",
       "license": "MIT",
       "optional": true
     },
@@ -1683,7 +1699,7 @@
       "license": "MIT"
     },
     "node_modules/node-abi": {
-      "version": "3.71.0",
+      "version": "3.73.0",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -1832,7 +1848,7 @@
       }
     },
     "node_modules/prebuild-install": {
-      "version": "7.1.2",
+      "version": "7.1.3",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -1841,7 +1857,7 @@
         "github-from-package": "0.0.0",
         "minimist": "^1.2.3",
         "mkdirp-classic": "^0.5.3",
-        "napi-build-utils": "^1.0.1",
+        "napi-build-utils": "^2.0.0",
         "node-abi": "^3.3.0",
         "pump": "^3.0.0",
         "rc": "^1.2.7",
@@ -2229,7 +2245,7 @@
       }
     },
     "node_modules/tar-fs": {
-      "version": "2.1.1",
+      "version": "2.1.2",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -2425,7 +2441,7 @@
       }
     },
     "node_modules/yaml": {
-      "version": "2.6.1",
+      "version": "2.7.0",
       "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"

package/package.json

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