shared db at design- and runtime

.eslintrc

@@ -0,0 +1,31 @@
+{
+  "extends": [
+    "plugin:@sap/cds/recommended",
+    "eslint:recommended"
+  ],
+  "env": {
+    "browser": true,
+    "es2022": true,
+    "node": true,
+    "jest": true,
+    "mocha": true
+  },
+  "globals": {
+    "SELECT": true,
+    "INSERT": true,
+    "UPSERT": true,
+    "UPDATE": true,
+    "DELETE": true,
+    "CREATE": true,
+    "DROP": true,
+    "CDL": true,
+    "CQL": true,
+    "cds": true
+  },
+  "rules": {
+    "no-console": "off",
+    "require-atomic-updates": "off",
+        "require-await":"warn",
+        "no-unused-vars": ["warn", { "argsIgnorePattern": "_" }]
+  }
+}

.github/dependabot.yml

@@ -15,6 +15,3 @@ updates:
     - dependency-name: "chai"
         # chai 5 doesn't work atm w/ cds.test, TODO fix that in cds.test
       versions: ["5.x"]
-    - dependency-name: "chai-as-promised"
-        # chai-as-promised 8 doesn't work atm w/ cds.test, TODO fix that in cds.test
-      versions: ["8.x"]

.github/workflows/node.js.yml

@@ -11,28 +11,18 @@ on:
 
 jobs:
   build:
+
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [22.x, 20.x, 18.x]
+        node-version: [20.x, 18.x]
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm ci
     - run: npm test
-
-  lint:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version: 22.x
-    - run: npm ci
-    - run: npm run lint

.reuse/dep5

@@ -0,0 +1,29 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: cloud-cap-samples
+Upstream-Contact: <Christian Georgi (christian.georgi@sap.com)>
+Source: https://github.com/SAP-samples/cloud-cap-samples
+Disclaimer: The code in this project may include calls to APIs (“API Calls”) of
+ SAP or third-party products or services developed outside of this project
+ (“External Products”).
+ “APIs” means application programming interfaces, as well as their respective
+ specifications and implementing code that allows software to communicate with
+ other software.
+ API Calls to External Products are not licensed under the open source license
+ that governs this project. The use of such API Calls and related External
+ Products are subject to applicable additional agreements with the relevant
+ provider of the External Products. In no event shall the open source license
+ that governs this project grant any rights in or to any External Products,or
+ alter, expand or supersede any terms of the applicable additional agreements.
+ If you have a valid license agreement with SAP for the use of a particular SAP
+ External Product, then you may make use of any API Calls included in this
+ project’s code for that SAP External Product, subject to the terms of such
+ license agreement. If you do not have a valid license agreement for the use of
+ a particular SAP External Product, then you may only make use of any API Calls
+ in this project for that SAP External Product for your internal, non-productive
+ and non-commercial test and evaluation of such API Calls. Nothing herein grants
+ you any rights to use or access any SAP External Product, or provide any third
+ parties the right to use of access any SAP External Product, through API Calls.
+
+Files: *
+Copyright: 2019-2020 SAP SE or an SAP affiliate company and cap-cloud-samples
+License: Apache-2.0

.vscode/settings.json

@@ -13,5 +13,13 @@
       "**/cds/lib/req/cds-context.js",
       "**/odata-v4/okra/**"
     ]
-  }
+  },
+  "eslint.probe": [
+    "cds",
+    "csn",
+    "csv",
+    "csv (semicolon)",
+    "tsv",
+    "tab"
+  ]
 }

README.md

@@ -1,6 +1,3 @@
-[![REUSE status](https://api.reuse.software/badge/github.com/SAP-samples/cloud-cap-samples)](https://api.reuse.software/info/github.com/SAP-samples/cloud-cap-samples)
-
-
 # Welcome to cap/samples
 
 Find here a collection of samples for the [SAP Cloud Application Programming Model](https://cap.cloud.sap) organized in a simplistic [monorepo setup](samples.md#all-in-one-monorepo).
@@ -16,7 +13,7 @@ Find here a collection of samples for the [SAP Cloud Application Programming Mod
 
 ### Preliminaries
 
-1. Ensure you have the latest LTS version of Node.js installed (see [Getting Started](https://cap.cloud.sap/docs/get-started/jumpstart))
+1. Ensure you have the latest LTS version of Node.js installed (see [Getting Started](https://cap.cloud.sap/docs/get-started/))
 2. Install [**@sap/cds-dk**](https://cap.cloud.sap/docs/get-started/) globally:
 
    ```sh
@@ -39,7 +36,7 @@ cd samples
 In the samples folder run:
 
 ```sh
-npm ci
+npm install
 ```
 
 ### Run

REUSE.toml

@@ -1,11 +0,0 @@
-version = 1
-SPDX-PackageName = "cloud-cap-samples"
-SPDX-PackageSupplier = "<CAP (cap@sap.com)>"
-SPDX-PackageDownloadLocation = "https://github.com/SAP-samples/cloud-cap-samples"
-SPDX-PackageComment = "The code in this project may include calls to APIs (“API Calls”) of\n SAP or third-party products or services developed outside of this project\n (“External Products”).\n “APIs” means application programming interfaces, as well as their respective\n specifications and implementing code that allows software to communicate with\n other software.\n API Calls to External Products are not licensed under the open source license\n that governs this project. The use of such API Calls and related External\n Products are subject to applicable additional agreements with the relevant\n provider of the External Products. In no event shall the open source license\n that governs this project grant any rights in or to any External Products,or\n alter, expand or supersede any terms of the applicable additional agreements.\n If you have a valid license agreement with SAP for the use of a particular SAP\n External Product, then you may make use of any API Calls included in this\n project’s code for that SAP External Product, subject to the terms of such\n license agreement. If you do not have a valid license agreement for the use of\n a particular SAP External Product, then you may only make use of any API Calls\n in this project for that SAP External Product for your internal, non-productive\n and non-commercial test and evaluation of such API Calls. Nothing herein grants\n you any rights to use or access any SAP External Product, or provide any third\n parties the right to use of access any SAP External Product, through API Calls."
-
-[[annotations]]
-path = "**.**"
-precedence = "aggregate"
-SPDX-FileCopyrightText = "2019-2025 SAP SE or an SAP affiliate company and cap-cloud-samples"
-SPDX-License-Identifier = "Apache-2.0"

bookshop/app/vue/app.js

@@ -19,7 +19,7 @@ const books = Vue.createApp ({
         search: ({target:{value:v}}) => books.fetch(v && '&$search='+v),
 
         async fetch (etc='') {
-            const {data} = await GET(`/ListOfBooks?$expand=genre($select=name),currency($select=symbol)${etc}`)
+            const {data} = await GET(`/ListOfBooks?$expand=genre,currency${etc}`)
             books.list = data.value
         },
 
@@ -77,7 +77,7 @@ function csrfToken (request) {
         document.csrfToken = token
         request.headers['x-csrf-token'] = document.csrfToken
         return request
-    }).catch(() => {
+    }).catch(_ => {
         document.csrfToken = null // set mark to not try again
         return request
     })

bookshop/db/init.js

@@ -1,5 +1,3 @@
-const cds = require('@sap/cds')
-
 /**
  * In order to keep basic bookshop sample as simple as possible, we don't add
  * reuse dependencies. This db/init.js ensures we still have a minimum set of
@@ -8,7 +6,7 @@ const cds = require('@sap/cds')
 
 // NOTE: We use cds.on('served') to delay the UPSERTs after the db init
 // to run after all INSERTs from .csv files happened.
-module.exports = cds.on('served', ()=>
+module.exports = cds.on('served', ()=> cds.run(
   UPSERT.into ('sap.common.Currencies') .columns (
     [ 'code', 'symbol', 'name' ]
   ) .rows (
@@ -18,4 +16,4 @@ module.exports = cds.on('served', ()=>
     [ 'ILS', '₪', 'Shekel' ],
     [ 'JPY', '¥', 'Yen' ],
   )
-)
+))

bookshop/index.js

@@ -0,0 +1,2 @@
+const { CatalogService } = require('./srv/cat-service')
+module.exports = { CatalogService }

bookshop/package.json

@@ -13,7 +13,7 @@
     "@cap-js/sqlite": "*"
   },
   "dependencies": {
-    "@sap/cds": ">=7",
+    "@sap/cds": "^7",
     "express": "^4.17.1"
   },
   "scripts": {

bookshop/srv/admin-service.js

@@ -1,14 +1,13 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')
 
 module.exports = class AdminService extends cds.ApplicationService { init(){
-  this.before (['NEW','CREATE'],'Authors', genid)
+  this.before ('NEW','Authors', genid)
-  this.before (['NEW','CREATE'],'Books', genid)
+  this.before ('NEW','Books', genid)
   return super.init()
 }}
 
 /** Generate primary keys for target entity in request */
 async function genid (req) {
-  if (req.data.ID) return
   const {id} = await SELECT.one.from(req.target).columns('max(ID) as id')
-  req.data.ID = id + 4 // Note: that is not safe! ok for this sample only.
+  req.data.ID = id - id % 100 + 100 + 1
 }

bookshop/srv/cat-service.js

@@ -1,6 +1,4 @@
-const cds = require('@sap/cds')
+module.exports = class CatalogService extends cds.ApplicationService { init() {
-
-class CatalogService extends cds.ApplicationService { init() {
 
   const { Books } = cds.entities('sap.capire.bookshop')
   const { ListOfBooks } = this.entities
@@ -34,5 +32,3 @@ class CatalogService extends cds.ApplicationService { init() {
   // Delegate requests to the underlying generic service
   return super.init()
 }}
-
-module.exports = CatalogService

bookshop/test/genres.http

@@ -3,15 +3,15 @@
 #   Genres
 #
 
-GET http://localhost:4004/odata/v4/test/Genres?
+GET http://localhost:4004/test/Genres?
 ###
 
-GET http://localhost:4004/odata/v4/test/Genres?
+GET http://localhost:4004/test/Genres?
 &$filter=parent_ID eq null&$select=name
 &$expand=children($select=name)
 ###
 
-POST http://localhost:4004/odata/v4/test/Genres?
+POST http://localhost:4004/test/Genres?
 Content-Type: application/json
 
 { "ID":100, "name":"Some Sample Genres...", "children":[
@@ -26,13 +26,13 @@ Content-Type: application/json
 ]}
 ###
 
-GET http://localhost:4004/odata/v4/test/Genres(100)?
+GET http://localhost:4004/test/Genres(100)?
 # &$expand=children
 # &$expand=children($expand=children($expand=children($expand=children)))
 ###
 
-DELETE http://localhost:4004/odata/v4/test/Genres(103)
+DELETE http://localhost:4004/test/Genres(103)
 ###
 
-DELETE http://localhost:4004/odata/v4/test/Genres(100)
+DELETE http://localhost:4004/test/Genres(100)
 ###

bookstore/_i18n/i18n_de.properties

@@ -1,12 +0,0 @@
-Books = Bücher
-Book = Buch
-Title = Titel
-Description = Beschreibung
-Stock = Bestand
-Image = Bild
-Price = Preis
-Currency = Währung
-
-Authors = Autoren
-Author = Autor
-AuthorID = ID des Autors

bookstore/_i18n/i18n_en.properties

@@ -1,21 +0,0 @@
-Books = Books
-Book = Book
-ID = ID
-Title = Title
-Description = Description
-Stock = Stock
-Image = Image
-Price = Price
-Currency = Currency
-
-Authors = Authors
-Author = Author
-AuthorID = Author''s ID
-Name = Name
-DateOfBirth = Date of Birth
-DateOfDeath = Date of Death
-PlaceOfBirth = Place of Birth
-PlaceOfDeath = Place of Death
-
-Genres = Genres
-Genre = Genre

bookstore/_i18n/i18n_fr.properties

@@ -1,20 +0,0 @@
-Books = Livres
-Book = Livre
-Title = Titre
-Description = Description
-Stock = Action
-Image = Image
-Price = Prix
-Currency = Devise
-
-Authors = Auteurs
-Author = Auteur
-AuthorID = ID de l''auteur
-Name = Nom
-DateOfBirth = Date de naissance
-DateOfDeath = Date de décès
-PlaceOfBirth = Lieu de naissance
-PlaceOfDeath = Lieu de décès
-
-Genres = Genre
-Genre = Genre

bookstore/_i18n/messages_de.properties

@@ -1,34 +0,0 @@
-400 = Ungültige Anfrage
-401 = Nicht autorisiert
-403 = Verboten
-404 = Nicht gefunden
-405 = Methode nicht zulässig
-406 = Nicht akzeptabel
-407 = Proxy-Authentifizierung erforderlich
-408 = Anfrage-Timeout
-409 = Konflikt
-410 = Weg
-411 = Erforderliche Länge
-412 = Vorbedingung fehlgeschlagen
-413 = Nutzlast zu groß
-414 = URI zu lang
-415 = Nicht unterstützter Medientyp
-416 = Bereich nicht erfüllbar
-417 = Erwartung fehlgeschlagen
-422 = Nicht verarbeitbarer Inhalt
-424 = Fehlgeschlagene Abhängigkeit
-428 = Vorbedingung erforderlich
-429 = Zu viele Anfragen
-431 = Anfrage-Headerfelder zu groß
-451 = Aus rechtlichen Gründen nicht verfügbar
-500 = Interner Serverfehler
-501 = Der Server unterstützt die zur Erfüllung der Anfrage erforderliche Funktionalität nicht
-502 = Ungültiges Gateway
-503 = Dienst nicht verfügbar
-504 = Gateway-Timeout
-
-ASSERT_RANGE = Wert {0} liegt nicht im angegebenen Bereich [{1}, {2}]
-ASSERT_FORMAT = Wert "{0}" liegt nicht im angegebenen Format "{1}"
-ASSERT_ARRAY = Wert muss ein Array sein
-ASSERT_ENUM = Wert {0} ist gemäß Enumerationsdeklaration {{1}} ungültig
-ASSERT_NOT_NULL = Wert ist erforderlich

bookstore/_i18n/messages_en.properties

@@ -1,34 +0,0 @@
-400 = Bad Request
-401 = Unauthorized
-403 = Forbidden
-404 = Not Found
-405 = Method Not Allowed
-406 = Not Acceptable
-407 = Proxy Authentication Required
-408 = Request Timeout
-409 = Conflict
-410 = Gone
-411 = Length Required
-412 = Precondition Failed
-413 = Payload Too Large
-414 = URI Too Long
-415 = Unsupported Media Type
-416 = Range Not Satisfiable
-417 = Expectation Failed
-422 = Unprocessable Content
-424 = Failed Dependency
-428 = Precondition Required
-429 = Too Many Requests
-431 = Request Header Fields Too Large
-451 = Unavailable For Legal Reasons
-500 = Internal Server Error
-501 = The server does not support the functionality required to fulfill the request
-502 = Bad Gateway
-503 = Service Unavailable
-504 = Gateway Timeout
-
-ASSERT_RANGE = Value {0} is not in specified range [{1}, {2}]
-ASSERT_FORMAT = Value "{0}" is not in specified format "{1}"
-ASSERT_ARRAY = Value must be an array
-ASSERT_ENUM = Value {0} is invalid according to enum declaration {{1}}
-ASSERT_NOT_NULL = Value is required

bookstore/_i18n/messages_fr.properties

@@ -1,34 +0,0 @@
-400 = Requête incorrecte
-401 = Non autorisée
-403 = Interdite
-404 = Introuvable
-405 = Méthode non autorisée
-406 = Non acceptable
-407 = Authentification proxy requise
-408 = Délai d''expiration de la requête
-409 = Conflit
-410 = Disparu
-411 = Longueur requise
-412 = Échec de la condition préalable
-413 = Charge utile trop importante
-414 = URI trop longue
-415 = Type de média non pris en charge
-416 = Plage non satisfaisante
-417 = Échec de l''attente
-422 = Contenu non traitable
-424 = Dépendance échouée
-428 = Condition préalable requise
-429 = Trop de requêtes
-431 = Champs d''en-tête de requête trop importants
-451 = Indisponible pour des raisons juridiques
-500 = Erreur interne du serveur
-501 = Le serveur ne prend pas en charge la fonctionnalité requise pour répondre à la requête
-502 = Passerelle incorrecte
-503 = Service indisponible
-504 = Délai d''attente de la passerelle
-
-ASSERT_RANGE = La valeur {0} n''est pas dans la plage spécifiée [{1}, {2}]
-ASSERT_FORMAT = La valeur "{0}" n''est pas au format spécifié "{1}"
-ASSERT_ARRAY = La valeur doit être un tableau
-ASSERT_ENUM = La valeur {0} n''est pas valide selon la déclaration d''énumération {{1}}
-ASSERT_NOT_NULL = La valeur est obligatoire

bookstore/mta.yaml

@@ -0,0 +1,43 @@
+_schema-version: '3.1'
+ID: capire.bookstore
+version: 1.0.0
+description: "A simple CAP project."
+parameters:
+  enable-parallel-deployments: true
+build-parameters:
+  before-all:
+    - builder: custom
+      commands:
+        - npm ci
+        - npx cds build --production
+modules:
+  - name: bookstore-srv
+    type: nodejs
+    path: gen/srv
+    parameters:
+      buildpack: nodejs_buildpack
+      readiness-health-check-type: http
+      readiness-health-check-http-endpoint: /health
+    build-parameters:
+      builder: npm
+    provides:
+      - name: srv-api # required by consumers of CAP services (e.g. approuter)
+        properties:
+          srv-url: ${default-url}
+    requires:
+      - name: bookstore-destination
+      - name: bookstore-messaging
+      - name: samples-db
+
+resources:
+  - name: bookstore-destination
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: destination
+      service-plan: lite
+  - name: bookstore-messaging
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: enterprise-messaging
+      service-plan: default
+      path: ./event-mesh.json

bookstore/package.json

@@ -21,14 +21,32 @@
         "model": "@capire/orders"
       },
       "messaging": {
-        "[development]": { "kind": "file-based-messaging" },
+        "[development]": {
-        "[hybrid]": { "kind": "enterprise-messaging-shared" },
+          "kind": "file-based-messaging"
-        "[production]": { "kind": "enterprise-messaging" }
         },
+        "[hybrid]": {
+          "kind": "enterprise-messaging-shared"
+        },
+        "[production]": {
+          "kind": "enterprise-messaging"
+        }
+      },
+      "db": { "kind": "sql" },
+      "[multimodule]": {
         "db": {
-        "kind": "sql"
+          "kind": "sqlite",
+          "impl": "@cap-js/sqlite",
+          "credentials": {
+            "url": "../db.sqlite"
+          }
+        }
       }
     },
-    "log": { "service": true }
+    "log": {
+      "service": true
+    }
+  },
+  "devDependencies": {
+    "@sap/cds-dk": "^7"
   }
 }

bookstore/server.js

@@ -5,15 +5,10 @@ cds.once('served', require('./srv/mashup'))
 
 // Add routes to UIs from imported packages
 cds.once('bootstrap',(app)=>{
-  try {
   app.serve ('/bookshop') .from ('@capire/bookshop','app/vue')
   app.serve ('/reviews') .from ('@capire/reviews','app/vue')
   app.serve ('/orders') .from('@capire/orders','app/orders')
   app.serve ('/data') .from('@capire/data-viewer','app/viewer')
-  } catch (err) {
-    if (err.code === 'MODULE_NOT_FOUND') throw new Error('Run "npm ci" to install the required dependencies', { cause: err })
-    throw err
-  }
 })
 
 // Add Swagger UI

bookstore/srv/mashup.js

@@ -18,7 +18,7 @@ module.exports = async()=>{ // called by server.js
   // Note: prepend is neccessary to intercept generic default handler
   //
   CatalogService.prepend (srv => srv.on ('READ', 'Books/reviews', (req) => {
-    console.debug ('> delegating request to ReviewsService') // eslint-disable-line no-console
+    console.debug ('> delegating request to ReviewsService')
     const [id] = req.params, { columns, limit } = req.query.SELECT
     return ReviewsService.read ('Reviews',columns).limit(limit).where({subject:String(id)})
   }))
@@ -28,8 +28,8 @@ module.exports = async()=>{ // called by server.js
   //
   CatalogService.on ('OrderedBook', async (msg) => {
     const { book, quantity, buyer } = msg.data
-    const { title, price } = await db.read (Books, book, b => { b.title, b.price })
+    const { title, price } = await db.tx(msg).read (Books, book, b => { b.title, b.price })
-    return OrdersService.create ('Orders').entries({
+    return OrdersService.tx(msg).create ('Orders').entries({
       OrderNo: 'Order at '+ (new Date).toLocaleString(),
       Items: [{ product:{ID:`${book}`}, title, price, quantity }],
       buyer, createdBy: buyer
@@ -40,7 +40,7 @@ module.exports = async()=>{ // called by server.js
   // Update Books' average ratings when ReviewsService signals updated reviews
   //
   ReviewsService.on ('reviewed', (msg) => {
-    console.debug ('> received:', msg.event, msg.data) // eslint-disable-line no-console
+    console.debug ('> received:', msg.event, msg.data)
     const { subject, count, rating } = msg.data
     return UPDATE(Books,subject).with({ numberOfReviews:count, rating })
   })
@@ -49,7 +49,7 @@ module.exports = async()=>{ // called by server.js
   // Reduce stock of ordered books for orders are created from Orders admin UI
   //
   OrdersService.on ('OrderChanged', (msg) => {
-    console.debug ('> received:', msg.event, msg.data) // eslint-disable-line no-console
+    console.debug ('> received:', msg.event, msg.data)
     const { product, deltaQuantity } = msg.data
     return UPDATE (Books) .where ('ID =', product)
     .and ('stock >=', deltaQuantity)

bookstore/test/requests.http

@@ -12,12 +12,11 @@
 #
 
 GET {{reviews-service}}/Reviews
-Authorization: Basic me:
 
 ###
 
 POST {{reviews-service}}/Reviews
-Authorization: Basic me:
+Authorization: Basic {{$processEnv USER}}:
 Content-Type: application/json
 
 {"subject":"201", "title":"boo", "rating":3 }
@@ -51,23 +50,23 @@ Accept-Language: de
 #
 @newOrderID = e939604c-ab83-4d4f-bdb6-95fe30b3773e
 
-GET {{bookshop}}/odata/v4/orders/Orders
+GET {{bookshop}}/orders/Orders
 
 ### Create order, still inactive
-POST {{bookshop}}/odata/v4/orders/Orders
+POST {{bookshop}}/orders/Orders
 Content-Type: application/json
 
 {"ID": "{{newOrderID}}"}
 
 ### Get inactive order.  We have to specify `IsActiveEntity`.
-GET {{bookshop}}/odata/v4/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)
+GET {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)
 
 ### Activate order using `.../<servicename>.draftActivate`
-POST {{bookshop}}/odata/v4/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)/OrdersService.draftActivate
+POST {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)/OrdersService.draftActivate
 Content-Type: application/json
 
 ### Get active order
-GET {{bookshop}}/odata/v4/orders/Orders(ID={{newOrderID}},IsActiveEntity=true)
+GET {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=true)
 
 ### Create author
 POST {{bookshop}}/admin/Authors

common/cds-plugin.js

@@ -1 +0,0 @@
-// dummy to auto-load the plugin

common/package.json

@@ -4,12 +4,5 @@
   "version": "1.0.0",
   "dependencies": {
     "@sap/cds": "*"
-  },
-  "cds": {
-    "requires": {
-      "@capire/common/data": {
-        "model": "@capire/common"
-      }
-    }
   }
 }

data-viewer/srv/data-service.js

@@ -18,7 +18,7 @@ class DataService extends cds.ApplicationService { init(){
       .sort((e1, e2) => e1.name.localeCompare(e2.name))
       .map(e => {
         const columns = Object.entries(e.elements)
-          .filter(([,el]) => !(el instanceof cds.Association)) // exclude assocs+compositions
+          .filter(([_, el]) => !(el instanceof cds.Association)) // exclude assocs+compositions
           .map(([name, el]) => { return { name, type: el.type, isKey:!!el.key }})
         return { name: e.name, columns }
       })
@@ -49,7 +49,6 @@ class DataService extends cds.ApplicationService { init(){
 
 module.exports = { DataService }
 
-/** @returns {cds.Service} */
 function findDataSource(dataSourceName, entityName) {
   for (let srv of Object.values(cds.services)) { // all connected services
     if (!srv.name)  continue // FIXME intermediate/pending in cds.services ?

db/sqlite/index.cds

@@ -0,0 +1,5 @@
+using from '@capire/bookstore';
+using from '@capire/common';
+using from '@capire/orders';
+using from '@capire/reviews';
+using from '@capire/fiori';

eslint.config.mjs

@@ -1,20 +0,0 @@
-import cds from '@sap/cds/eslint.config.mjs'
-export default [ ...cds.recommended ]
-
-//
-// The above is the recommended minimalistic eslint config, just using
-// recommended defaults provided by cds. Alternatively, go for enhanced
-// project-specific options, but only if really required, like this:
-//
-// export default [ ...cds.recommended, {
-//   rules: {
-//     'complexity': [ 'warn', 66 ],
-//     'require-await': 'warn',
-//     'no-await-in-loop': 'warn',
-//   },
-// }, {
-//   ignores: [
-//     '**/webapp/**'
-//   ]
-// }]
-//

fiori/app/_i18n/i18n.properties

@@ -0,0 +1,43 @@
+Books = Books
+Book = Book
+ID = ID
+Title = Title
+Author = Author
+AuthorID = Author ID
+Stock = Stock
+Name = Name
+Description = Description
+Image = Image
+AuthorName = Author's Name
+DateOfBirth = Date of Birth
+DateOfDeath = Date of Death
+PlaceOfBirth = Place of Birth
+PlaceOfDeath = Place of Death
+Age = Age
+Lifetime = Lifetime
+Authors = Authors
+
+Order = Order
+Orders = Orders
+OrderNo = Order Number
+OrderItems = Order Items
+Customer = Customer
+Product = Product
+ProductID = Product ID
+ProductTitle = Product Title
+UnitPrice = Unit Price
+Quantity = Quantity
+
+Price = Price
+Currency = Currency
+Date = Date
+Rating = Rating
+NumberOfReviews = Number of Reviews
+
+Genre = Genre
+Genres = Genres
+SubGenres = Sub Genres
+
+NumCode = Numeric Code
+MinorUnit = Minor Unit
+Exponent = Exponent

fiori/app/_i18n/i18n_de.properties

@@ -1,5 +1,14 @@
+Books = Bücher
+Book = Buch
+ID = ID
+Title = Titel
+Authors = Autoren
+Author = Autor
+AuthorID = ID des Autors
 AuthorName = Name des Autors
 Age = Alter
-rder = Bestellung
+Name = Name
+Stock = Bestand
+Order = Bestellung
 Orders = Bestellungen
 Price = Preis

fiori/app/_i18n/i18n_en.properties

@@ -1,8 +0,0 @@
-Age = Age
-Lifetime = Lifetime
-
-SubGenres = Sub Genres
-
-NumCode = Numeric Code
-MinorUnit = Minor Unit
-Exponent = Exponent

fiori/app/browse/fiori-service.cds

@@ -6,8 +6,8 @@ using CatalogService from '@capire/bookstore';
 //
 annotate CatalogService.Books with @(UI : {
     HeaderInfo        : {
-        TypeName       : '{i18n>Book}',
+        TypeName       : 'Book',
-        TypeNamePlural : '{i18n>Books}',
+        TypeNamePlural : 'Books',
         Description    : {Value : author}
     },
     HeaderFacets      : [{

fiori/app/fiori-apps.html

@@ -1,7 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
-
 <head>
+
 	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -10,22 +10,21 @@
 	<script>
 		window["sap-ushell-config"] = {
 			defaultRenderer: "fiori2",
-			applications: {},
+			applications: {}
 		};
 	</script>
 
-	<script id="sap-ushell-bootstrap" src="https://ui5.sap.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
+	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://ui5.sap.com/resources/sap-ui-core.js"
+	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
-		data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout" data-sap-ui-compatVersion="edge"
+			data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
-		data-sap-ui-theme="sap_horizon"></script>
+			data-sap-ui-compatVersion="edge"
+			data-sap-ui-theme="sap_horizon"
+			data-sap-ui-frameOptions="allow"
+	></script>
 	<script>
-		sap.ui.getCore().attachInit(() =>
+		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"))
-			sap.ushell.Container.createRenderer().placeAt("content")
-		);
 	</script>
+
 </head>
-
+<body class="sapUiBody" id="content"></body>
-<body class="sapUiBody" id="content">
-</body>
-
 </html>

fiori/app/router/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "approuter",
+  "dependencies": {
+    "@sap/approuter": "^16.0.0"
+  },
+  "engines": {
+    "node": "^20.0.0"
+  },
+  "scripts": {
+    "start": "node node_modules/@sap/approuter/approuter.js"
+  }
+}

fiori/app/router/xs-app.json

@@ -0,0 +1,22 @@
+{
+  "welcomeFile": "app/index.html",
+  "routes": [
+    {
+      "source": "^/app/(.*)$",
+      "target": "$1",
+      "localDir": ".",
+      "cacheControl": "no-cache, no-store, must-revalidate"
+    },
+    {
+      "source": "^/appconfig/",
+      "localDir": ".",
+      "cacheControl": "no-cache, no-store, must-revalidate"
+    },
+    {
+      "source": "^/(.*)$",
+      "target": "$1",
+      "destination": "srv-api",
+      "csrfProtection": true
+    }
+  ]
+}

fiori/index.cds

@@ -1 +1,2 @@
 using from './db/common';
+using from './app/services';

fiori/mta.yaml

@@ -0,0 +1,69 @@
+_schema-version: '3.1'
+ID: capire.fiori
+version: 1.0.0
+description: "A simple CAP project."
+parameters:
+  enable-parallel-deployments: true
+build-parameters:
+  before-all:
+    - builder: custom
+      commands:
+        - npm ci
+        - npx cds build --production
+modules:
+  - name: fiori-srv
+    type: nodejs
+    path: gen/srv
+    parameters:
+      buildpack: nodejs_buildpack
+      readiness-health-check-type: http
+      readiness-health-check-http-endpoint: /health
+    build-parameters:
+      builder: npm
+    provides:
+      - name: srv-api # required by consumers of CAP services (e.g. approuter)
+        properties:
+          srv-url: ${default-url}
+    requires:
+      - name: fiori-auth
+      - name: fiori-destination
+      - name: fiori-messaging
+      - name: samples-db
+
+  - name: fiori
+    type: approuter.nodejs
+    path: app/router
+    parameters:
+      keep-existing-routes: true
+      disk-quota: 256M
+      memory: 256M
+    requires:
+      - name: srv-api
+        group: destinations
+        properties:
+          name: srv-api # must be used in xs-app.json as well
+          url: ~{srv-url}
+          forwardAuthToken: true
+      - name: fiori-auth
+
+resources:
+  - name: fiori-auth
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: xsuaa
+      service-plan: application
+      path: ./xs-security.json
+      config:
+        xsappname: fiori-${org}-${space}
+        tenant-mode: dedicated
+  - name: fiori-destination
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: destination
+      service-plan: lite
+  - name: fiori-messaging
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: enterprise-messaging
+      service-plan: default
+      path: ./event-mesh.json

fiori/package.json

@@ -38,6 +38,15 @@
       "db": {
         "kind": "sql"
       },
+      "[multimodule]": {
+        "db": {
+          "kind": "sqlite",
+          "impl": "@cap-js/sqlite",
+          "credentials": {
+            "url": "../db.sqlite"
+          }
+        }
+      },
       "db-ext": {
         "[development]": {
           "model": "db/sqlite"

fiori/server.js

@@ -0,0 +1,8 @@
+// install OData v2 adapter
+const cds = require("@sap/cds")
+const proxy = require('@cap-js-community/odata-v2-adapter')
+const opts = global.it ? { target:'auto' } : {}   // for tests, set 'auto' to detect port dynamically
+cds.on('bootstrap', app => app.use(proxy(opts)))  // install proxy
+// cds.log('cov2ap','silent') // suppress anoying log outpout, e.g. for `npm run mocha -- --reporter nyan`
+
+module.exports = require('@capire/bookstore/server.js')

fiori/xs-security.json

@@ -0,0 +1,22 @@
+{
+  "scopes": [
+    {
+      "name": "$XSAPPNAME.emcallback",
+      "description": "Enterprise-Messaging Callback Access",
+      "grant-as-authority-to-apps": [
+        "$XSSERVICENAME(fiori-messaging)"
+      ]
+    },
+    {
+      "name": "$XSAPPNAME.emmanagement",
+      "description": "Enterprise-Messaging Management Access"
+    }
+  ],
+  "attributes": [],
+  "role-templates": [],
+  "authorities-inheritance": false,
+  "authorities": [
+    "$XSAPPNAME.emmanagement",
+    "$XSAPPNAME.mtcallback"
+  ]
+}

hello/package.json

@@ -3,10 +3,40 @@
   "version": "1.0.0",
   "scripts": {
     "test": "npx jest --silent",
-    "start": "cds-serve srv/world.cds",
+    "start": "cds serve srv/world.cds",
     "start:ts": "cds-ts serve srv/world.cds"
   },
   "dependencies": {
     "@sap/cds": ">=5.0.4"
+  },
+  "devDependencies": {
+    "@types/jest": "*",
+    "@types/node": "*",
+    "typescript": ">=4.3.5"
+  },
+  "eslintConfig": {
+    "extends": "eslint:recommended",
+    "env": {
+      "es2020": true,
+      "node": true,
+      "jest": true,
+      "mocha": true
+    },
+    "globals": {
+      "SELECT": true,
+      "INSERT": true,
+      "UPDATE": true,
+      "DELETE": true,
+      "CREATE": true,
+      "DROP": true,
+      "CDL": true,
+      "CQL": true,
+      "CXL": true,
+      "cds": true
+    },
+    "rules": {
+      "no-console": "off",
+      "require-atomic-updates": "off"
+    }
   }
 }

hello/srv/world.cds

@@ -1,3 +1,3 @@
-service say {
+service say @(path: '/say') {
   function hello (to:String) returns String;
 }

hello/test/hello-world-test.js

@@ -0,0 +1,13 @@
+const cds = require ('@sap/cds')
+describe('Hello world!', () => {
+
+    beforeAll (()=> process.env.CDS_TYPESCRIPT = true)
+    afterAll (()=> delete process.env.CDS_TYPESCRIPT)
+    const {GET} = cds.test.in(__dirname,'../srv').run('serve', 'world.cds')
+
+    it('should say hello with class impl', async () => {
+        const {data} = await GET`/say/hello(to='world')`
+        expect(data.value).toMatch(/Hello world.*typescript.*/i)
+    })
+
+})

hello/test/test.http

@@ -1,5 +1 @@
-GET http://localhost:4004/odata/v4/say/hello
+GET http://localhost:4004/say/hello(to='world')
-###
-
-GET http://localhost:4004/odata/v4/say/hello(to='me')
-###

loggers/package.json

@@ -13,5 +13,10 @@
   "scripts": {
     "start": "cds-serve",
     "watch": "cds watch"
+  },
+  "cds": {
+    "requires": {
+      "db": "sql"
+    }
   }
 }

loggers/srv/loggers.js

@@ -1,4 +1,4 @@
-const cds = require ('@sap/cds')
+const cds = require ('@sap/cds/lib')
 const LOG = cds.log('cds.log')
 
 module.exports = class LogService extends cds.Service {

media/srv/media-service.cds

@@ -1,7 +1,6 @@
 using { sap.capire.media as db } from '../db/data-model';
 namespace sap.capire.media;
 
-@path: '/media-server'
 service MediaServer  {
     entity Media   as projection on db.Media ;
 }

media/srv/media-service.js

@@ -10,7 +10,7 @@ module.exports = srv => {
   })
 
   srv.on('UPDATE', 'Media', (req, next) => {
-    const url = req.path
+    const url = req._.req.path
     if (url.includes('content')) {
       const id = req.data.id
       const obj = mediaDB.get(id)
@@ -32,7 +32,7 @@ module.exports = srv => {
   })
 
   srv.on('READ', 'Media', (req, next) => {
-    const url = req.path
+    const url = req._.req.path
     if (url.includes('content')) {
       const id = req.data.id
       const mediaObj = mediaDB.get(id)

mta.yaml

@@ -0,0 +1,27 @@
+_schema-version: '3.1'
+ID: capire.samples
+version: 2.0.0
+description: "A monorepo with several samples for CAP."
+parameters:
+  enable-parallel-deployments: true
+build-parameters:
+  before-all:
+    - builder: custom
+      commands:
+        - npm ci
+        - npx cds build --production --ws
+modules:
+  - name: samples-db-deployer
+    type: hdb
+    path: gen/db
+    parameters:
+      buildpack: nodejs_buildpack
+    requires:
+      - name: samples-db
+
+resources:
+  - name: samples-db
+    type: com.sap.xs.hdi-container
+    parameters:
+      service: hana
+      service-plan: hdi-shared

orders/_i18n/i18n_de.properties

@@ -1,3 +0,0 @@
-Order = Bestellung
-Orders = Bestellungen
-Price = Preis

orders/_i18n/i18n_en.properties

@@ -1,10 +0,0 @@
-Order = Order
-Orders = Orders
-OrderNo = Order Number
-OrderItems = Order Items
-Customer = Customer
-Product = Product
-ProductID = Product ID
-ProductTitle = Product Title
-UnitPrice = Unit Price
-Quantity = Quantity

orders/_i18n/i18n_fr.properties

@@ -1,10 +0,0 @@
-Order = Order
-Orders = Orders
-OrderNo = Numéro de commande
-OrderItems = Articles de la commande
-Customer = Client
-Product = Produit
-ProductID = ID du produit
-ProductTitle = Titre du produit
-UnitPrice = Prix unitaire
-Quantity = Quantité

orders/app/router/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "approuter",
+  "dependencies": {
+    "@sap/approuter": "^16.0.0"
+  },
+  "engines": {
+    "node": "^20.0.0"
+  },
+  "scripts": {
+    "start": "node node_modules/@sap/approuter/approuter.js"
+  }
+}

orders/app/router/xs-app.json

@@ -0,0 +1,22 @@
+{
+  "welcomeFile": "app/index.html",
+  "routes": [
+    {
+      "source": "^/app/(.*)$",
+      "target": "$1",
+      "localDir": ".",
+      "cacheControl": "no-cache, no-store, must-revalidate"
+    },
+    {
+      "source": "^/appconfig/",
+      "localDir": ".",
+      "cacheControl": "no-cache, no-store, must-revalidate"
+    },
+    {
+      "source": "^/(.*)$",
+      "target": "$1",
+      "destination": "srv-api",
+      "csrfProtection": true
+    }
+  ]
+}

orders/db/schema.cds

@@ -2,7 +2,7 @@ using { Currency, User, managed, cuid } from '@sap/cds/common';
 namespace sap.capire.orders;
 
 entity Orders : cuid, managed {
-  OrderNo  : String(44) @title:'Order Number'; //> readable key
+  OrderNo  : String(22) @title:'Order Number'; //> readable key
   Items    : Composition of many {
     key ID    : UUID;
     product   : Association to Products;

orders/mta.yaml

@@ -0,0 +1,55 @@
+_schema-version: '3.1'
+ID: capire.orders
+version: 1.0.0
+description: "A simple CAP project."
+parameters:
+  enable-parallel-deployments: true
+build-parameters:
+  before-all:
+    - builder: custom
+      commands:
+        - npm ci
+        - npx cds build --production
+modules:
+  - name: orders-srv
+    type: nodejs
+    path: gen/srv
+    parameters:
+      buildpack: nodejs_buildpack
+      readiness-health-check-type: http
+      readiness-health-check-http-endpoint: /health
+    build-parameters:
+      builder: npm
+    provides:
+      - name: srv-api # required by consumers of CAP services (e.g. approuter)
+        properties:
+          srv-url: ${default-url}
+    requires:
+      - name: orders-auth
+
+  - name: orders
+    type: approuter.nodejs
+    path: app/router
+    parameters:
+      keep-existing-routes: true
+      disk-quota: 256M
+      memory: 256M
+    requires:
+      - name: srv-api
+        group: destinations
+        properties:
+          name: srv-api # must be used in xs-app.json as well
+          url: ~{srv-url}
+          forwardAuthToken: true
+      - name: orders-auth
+
+resources:
+  - name: orders-auth
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: xsuaa
+      service-plan: application
+      path: ./xs-security.json
+      config:
+        xsappname: orders-${org}-${space}
+        tenant-mode: dedicated

orders/package.json

@@ -4,5 +4,19 @@
   "dependencies": {
     "@capire/common": "*",
     "@sap/cds": ">=5"
+  },
+  "cds": {
+    "requires": {
+      "db": { "kind": "sql" },
+      "[multimodule]": {
+        "db": {
+          "kind": "sqlite",
+          "impl": "@cap-js/sqlite",
+          "credentials": {
+            "url": "../db.sqlite"
+          }
+        }
+      }
+    }
   }
 }

orders/srv/orders-service.js

@@ -29,7 +29,7 @@ class OrdersService extends cds.ApplicationService {
   /** order changed -> broadcast event */
   orderChanged (product, deltaQuantity) {
     // Emit events to inform subscribers about changes in orders
-    console.log ('> emitting:', 'OrderChanged', { product, deltaQuantity }) // eslint-disable-line no-console
+    console.log ('> emitting:', 'OrderChanged', { product, deltaQuantity })
     return this.emit ('OrderChanged', { product, deltaQuantity })
   }
 

orders/xs-security.json

@@ -0,0 +1,5 @@
+{
+  "scopes": [],
+  "attributes": [],
+  "role-templates": []
+}

package.json

@@ -1,11 +1,12 @@
 {
   "name": "@capire/samples",
-  "version": "2.1.0",
+  "version": "2.0.0",
   "description": "A monorepo with several samples for CAP.",
   "repository": "https://github.com/sap-samples/cloud-cap-samples.git",
   "author": "daniel.hutzel@sap.com",
   "dependencies": {
-    "@sap/cds": ">=8"
+    "@sap-cloud-sdk/resilience": "^3.14.0",
+    "@sap/cds": ">=7"
   },
   "workspaces": [
     "./bookshop",
@@ -20,32 +21,48 @@
     "./reviews"
   ],
   "devDependencies": {
-    "@cap-js/cds-types": "^0",
     "@cap-js/sqlite": "^1",
+    "@sap/cds-dk": "^7",
+    "@sap/eslint-plugin-cds": "^2.6.1",
     "axios": "^1",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "chai-subset": "^1.6.0",
-    "eslint": "^9",
     "semver": "^7"
   },
   "scripts": {
+    "cleanup": "rm -rf node_modules && rm -rf */node_modules && rm -rf */*/node_modules",
     "bookshop": "cds watch bookshop",
-    "start": "cds watch fiori",
     "fiori": "cds watch fiori",
     "hello": "cds watch hello",
     "media": "cds watch media",
-    "lint": "eslint",
-    "test": "npx jest --silent",
-    "jest": "npx jest --silent",
     "mocha": "CDS_TEST_SILENT=y npx mocha",
+    "jest": "npx jest --silent",
+    "start": "cds watch fiori",
+    "test": "npm run jest -- --silent",
     "test:hello": "cd hello && npm test"
   },
+  "jest": {
+    "testTimeout": 20000,
+    "testMatch": [
+      "**/*.test.js"
+    ]
+  },
   "mocha": {
     "recursive": true,
     "parallel": true,
     "timeout": 6666
   },
+  "cds": {
+    "requires": {
+      "db": {
+        "kind": "sql",
+        "[development]": {
+          "model": "db/sqlite"
+        }
+      }
+    }
+  },
   "license": "SEE LICENSE IN LICENSE",
   "private": true
 }

reviews/_i18n/i18n_de.properties

@@ -1,3 +0,0 @@
-Date = Datum
-Rating = Bewertung
-NumberOfReviews = Anzahl der Reviews

reviews/_i18n/i18n_en.properties

@@ -1,5 +0,0 @@
-Reviews = Reviews
-Review = Review
-Date = Date
-Rating = Rating
-NumberOfReviews = Number of Reviews

reviews/_i18n/i18n_fr.properties

@@ -1,5 +0,0 @@
-Reviews = Avis
-Review = Avis
-Date = Date
-Rating = Note
-NumberOfReviews = Nombre d''avis

reviews/app/vue/app.js

@@ -50,6 +50,7 @@ const reviews = Vue.createApp ({
                     const res = await POST(`/Reviews`,review)
                     reviews.ID = res.data.ID
                 } else {
+                    console.trace()
                     await PUT(`/Reviews/${review.ID}`,review)
                 }
                 reviews.message = { succeeded: 'Your review was submitted successfully. Thanks.' }

reviews/package.json

@@ -17,7 +17,17 @@
         "[hybrid]": { "kind": "enterprise-messaging-shared" },
         "[production]": { "kind": "enterprise-messaging" }
       },
-      "db": { "kind": "sql" }
+      
+      "db": { "kind": "sql" },
+      "[multimodule]": {
+        "db": {
+          "kind": "sqlite",
+          "impl": "@cap-js/sqlite",
+          "credentials": {
+            "url": "../db.sqlite"
+          }
+        }
+      }
     }
   }
 }

reviews/srv/reviews-service.js

@@ -15,7 +15,7 @@ module.exports = cds.service.impl (function(){
     const { count, rating } = await cds.tx(req) .run (
       SELECT.one `round(avg(rating),2) as rating, count(*) as count` .from (Reviews) .where ({subject})
     )
-    global.it || console.log ('< emitting:', 'reviewed', { subject, count, rating }) // eslint-disable-line no-console
+    global.it || console.log ('< emitting:', 'reviewed', { subject, count, rating })
     await this.emit ('reviewed', { subject, count, rating })
   })
 

test/cds.ql.test.js

@@ -1,8 +1,7 @@
-const cds = require('@sap/cds')
-const { expect } = cds.test
-
 describe('cds.ql → cqn', () => {
 
+  const cds = require('@sap/cds/lib')
+  const { expect } = cds.test
   const Foo = { name: 'Foo' }
   const Books = { name: 'capire.bookshop.Books' }
 
@@ -677,7 +676,7 @@ describe('cds.ql → cqn', () => {
         .to.eql(INSERT.into(Foo).entries(...entries))
         .to.eql(INSERT.into(Foo).entries(entries))
         .to.eql({
-          INSERT: { into: { ref: ['Foo'] }, entries },
+          INSERT: { into: cds.env.ql.quirks_mode ? 'Foo' : { ref: ['Foo'] }, entries },
         })
     })
 
@@ -693,7 +692,7 @@ describe('cds.ql → cqn', () => {
         .to.eql(INSERT.into(Foo).columns('a', 'b').rows([1, 2], [3, 4]))
         .to.eql({
           INSERT: {
-            into: { ref: ['Foo'] },
+            into: cds.env.ql.quirks_mode ? 'Foo' : { ref: ['Foo'] },
             columns: ['a', 'b'],
             rows: [
               [1, 2],
@@ -707,7 +706,7 @@ describe('cds.ql → cqn', () => {
       expect(INSERT.into(Foo).columns('a', 'b').values([1, 2]))
         .to.eql(INSERT.into(Foo).columns('a', 'b').values(1, 2))
         .to.eql({
-          INSERT: { into:  { ref: ['Foo'] }, columns: ['a', 'b'], values: [1, 2] },
+          INSERT: { into:  cds.env.ql.quirks_mode ? 'Foo' : { ref: ['Foo'] }, columns: ['a', 'b'], values: [1, 2] },
         })
     })
 
@@ -722,7 +721,7 @@ describe('cds.ql → cqn', () => {
     test('entity (..., <key>)', () => {
       const cqnWhere = {
           UPDATE: {
-            entity: { ref: ['capire.bookshop.Books'] },
+            entity: cds.env.ql.quirks_mode ? 'capire.bookshop.Books' : { ref: ['capire.bookshop.Books'] },
             where: [{ ref: ['ID'] }, '=', { val: 4711 }],
           },
         }
@@ -766,7 +765,7 @@ describe('cds.ql → cqn', () => {
         .to.eql(UPDATE(Foo).with({ foo: 11, bar: { '-=': 22 } }))
         .to.eql({
           UPDATE: {
-            entity: { ref: ['Foo'] },
+            entity: cds.env.ql.quirks_mode ? 'Foo' : { ref: ['Foo'] },
             data: { foo: 11 },
             with: {
               bar: { xpr: [{ ref: ['bar'] }, '-', { val: 22 }] },
@@ -777,7 +776,7 @@ describe('cds.ql → cqn', () => {
       // some more
       expect(UPDATE(Foo).with(`bar = coalesce(x,y), car = 'foo''s bar, car'`)).to.eql({
         UPDATE: {
-          entity: { ref: ['Foo'] },
+          entity: cds.env.ql.quirks_mode ? 'Foo' : { ref: ['Foo'] },
           data: {
             car: "foo's bar, car",
           },
@@ -797,7 +796,7 @@ describe('cds.ql → cqn', () => {
     test('from (..., <key>)', () => {
       const cqnWhere = {
           DELETE: {
-            from: { ref: ['capire.bookshop.Books'] },
+            from: cds.env.ql.quirks_mode ? 'capire.bookshop.Books' : { ref: ['capire.bookshop.Books'] },
             where: [{ ref: ['ID'] }, '=', { val: 4711 }],
           },
         }

test/consuming-actions.test.js

@@ -1,53 +0,0 @@
-const cds = require("@sap/cds");
-const { expect } = cds.test(
-  "serve",
-  "CatalogService",
-  "--from",
-  "@capire/bookshop,@capire/common",
-  "--in-memory"
-);
-
-describe("Consuming actions locally", () => {
-  let cats, CatalogService, Books, stockBefore;
-  const BOOK_ID = 251;
-  const QUANTITY = 1;
-
-  before("bootstrap the database", async () => {
-    CatalogService = cds.services.CatalogService;
-    expect(CatalogService).not.to.be.undefined;
-
-    Books = CatalogService.entities.Books;
-    expect(Books).not.to.be.undefined;
-
-    cats = await cds.connect.to("CatalogService");
-  });
-
-  beforeEach(async () => {
-    // Read the stock before the action is called
-    stockBefore = (await cats.get(Books, BOOK_ID)).stock;
-  });
-
-  it("calls unbound actions - basic variant using srv.send", async () => {
-    // Use a managed transaction to create a continuation with an authenticated user
-    const res1 = await cats.tx({ user: "alice" }, () => {
-      return cats.send("submitOrder", { book: BOOK_ID, quantity: QUANTITY });
-    });
-    expect(res1.stock).to.eql(stockBefore - QUANTITY);
-  });
-
-  it("calls unbound actions - named args variant", async () => {
-    // Use a managed transaction to create a continuation with an authenticated user
-    const res2 = await cats.tx({ user: "alice" }, () => {
-      return cats.submitOrder({ book: BOOK_ID, quantity: QUANTITY });
-    });
-    expect(res2.stock).to.eql(stockBefore - QUANTITY);
-  });
-
-  it("calls unbound actions - positional args variant", async () => {
-    // Use a managed transaction to create a continuation with an authenticated user
-    const res3 = await cats.tx({ user: "alice" }, () => {
-      return cats.submitOrder(BOOK_ID, QUANTITY);
-    });
-    expect(res3.stock).to.eql(stockBefore - QUANTITY);
-  });
-});

test/consuming-services.test.js

@@ -1,4 +1,4 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')
 
 describe('cap/samples - Consuming Services locally', () => {
 

test/custom-handlers.test.js

@@ -1,4 +1,4 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')
 
 describe('cap/samples - Custom Handlers', () => {
 
@@ -8,10 +8,9 @@ describe('cap/samples - Custom Handlers', () => {
   })
 
   it('should reject out-of-stock orders', async () => {
-    await expect(POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`).to.be.fulfilled
+    await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`
-    await expect(POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`).to.be.fulfilled
+    await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`
-    await expect(POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`).to.be.rejectedWith(
+    await expect(POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`).to.be.rejectedWith(/409 - 5 exceeds stock for book #201/)
-      /409 - 5 exceeds stock for book #201/)
     const { data } = await GET`/admin/Books/201/stock/$value`
     expect(data).to.equal(2)
   })

test/fiori.test.js

@@ -1,8 +1,4 @@
-// Quick hack: suppress deprecation warnings w/ Node22 caused by http-proxy (used by OData v2 proxy)
+const cds = require('@sap/cds/lib')
-// See also: https://github.com/http-party/node-http-proxy/pull/1666
-require('util')._extend = Object.assign
-
-const cds = require('@sap/cds')
 
 describe('cap/samples - Fiori APIs - v2', function() {
 

test/hello-world.test.js

@@ -1,11 +1,11 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')
 
 describe('cap/samples - Hello world!', () => {
 
   const { GET, expect } = cds.test (__dirname+'/../hello')
 
   it('should say hello with class impl', async () => {
-    const {data} = await GET `/odata/v4/say/hello(to='world')`
+    const {data} = await GET `/say/hello(to='world')`
     expect(data.value).to.eql('Hello world!')
   })
 

test/hierarchical-data.test.js

@@ -1,4 +1,4 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')
 const { expect } = cds.test.in(__dirname,'..')
 
 describe('cap/samples - Hierarchical Data', ()=>{
@@ -77,27 +77,29 @@ describe('cap/samples - Hierarchical Data', ()=>{
 		)
 	})
 
-	it ('supports nested reads', ()=> expect (
+	it ('supports nested reads', async()=>{
+		expect (await
 			SELECT.one.from (Cats, c=>{
 				c.ID, c.name.as('parent'), c.children (c=>{
 					c.name.as('child')
 				})
 			}) .where ({name:'Cat'})
-	) .to.eventually.eql (
+		) .to.eql (
 			{ ID:101, parent:'Cat', children:[
 				{ child:'Kitty' },
 				{ child:'Catwoman' },
 			]}
-	))
+		)
+	})
 
-	it ('supports deeply nested reads', ()=> expect (
+	it ('supports deeply nested reads', async()=>{
-		SELECT.one.from (Cats, c=>{
+		expect (await SELECT.one.from (Cats, c=>{
 			c.ID, c.name, c.children (
 				c => { c.name },
 				{levels:3}
 			)
 		}) .where ({name:'Cat'})
-	) .to.eventually.eql (
+		) .to.eql (
 			{ ID:101, name:'Cat', children:[
 				{ name:'Kitty', children:[
 					{ name:'Kitty Cat', children:[
@@ -106,16 +108,18 @@ describe('cap/samples - Hierarchical Data', ()=>{
 				{ name:'Catwoman', children:[
 					{ name:'Catalina', children:[] } ]},
 			]}
-	))
+		)
+	})
 
 	it ('supports cascaded deletes', async()=>{
 		const affectedRows = await DELETE.from (Cats) .where ({ID:[102,106]})
 		expect (affectedRows) .to.be.greaterThan (0)
-		await expect (SELECT`ID,name`.from(Cats) ).to.eventually.eql ([
+		const expected = [
 			{ ID:100, name:'Some Cats...' },
 			{ ID:101, name:'Cat' },
 			{ ID:108, name:'Catweazle' }
-		])
+		]
+		expect ( await SELECT`ID,name`.from(Cats) ).to.eql (expected)
 	})
 
 })

test/localized-data/services.test.js

@@ -1,4 +1,4 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')
 
 describe('cap/samples - Localized Data', () => {
 

test/messaging.test.js

@@ -1,4 +1,4 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')
 
 describe('cap/samples - Messaging', ()=>{
 

test/odata.test.js

@@ -1,4 +1,4 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')
 
 describe('cap/samples - Bookshop APIs', () => {
   const { GET, expect, axios } = cds.test ('@capire/bookshop')
@@ -8,10 +8,9 @@ describe('cap/samples - Bookshop APIs', () => {
     const { headers, status, data } = await GET `/browse/$metadata`
     expect(status).to.equal(200)
     expect(headers).to.contain({
-      // 'content-type': 'application/xml', //> fails with 'application/xml;charset=utf-8', which is set by express
+      'content-type': 'application/xml',
       'odata-version': '4.0',
     })
-    expect(headers['content-type']).to.match(/application\/xml/)
     expect(data).to.contain('<EntitySet Name="Books" EntityType="CatalogService.Books">')
     expect(data).to.contain('<Annotation Term="Common.Label" String="Currency"/>')
   })
@@ -29,8 +28,6 @@ describe('cap/samples - Bookshop APIs', () => {
     ])
   })
 
-  describe('query options...', () => {
-
   it('supports $search in multiple fields', async () => {
     const { data } = await GET `/browse/Books ${{
       params: { $search: 'Po', $select: `title,author` },
@@ -89,7 +86,6 @@ describe('cap/samples - Bookshop APIs', () => {
       { ID: 271, title: 'Catweazle' },
     ])
   })
-  })
 
   it('serves user info', async () => {
     const { data: alice } = await GET `/user/me`