renaming

refactor(lint): simplify eslint config
2024-05-03 14:23:10 +02:00 · 2024-05-03 13:53:43 +02:00
96 changed files with 3958 additions and 7204 deletions
--- a/.github/dependabot.yml
+++ b/.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"]
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -15,7 +15,7 @@ jobs:

    strategy:
      matrix:
-        node-version: [22.x, 20.x, 18.x]
+        node-version: [20.x, 18.x]

    steps:
    - uses: actions/checkout@v4
@@ -33,6 +33,6 @@ jobs:
    - uses: actions/checkout@v4
    - uses: actions/setup-node@v4
      with:
-        node-version: 22.x
+        node-version: 20.x
    - run: npm ci
    - run: npm run lint
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -24,6 +24,6 @@ Disclaimer: The code in this project may include calls to APIs (“API Calls”)
 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-2025 SAP SE or an SAP affiliate company and cap-cloud-samples
+Files: *
+Copyright: 2019-2020 SAP SE or an SAP affiliate company and cap-cloud-samples
 License: Apache-2.0
--- a/.vscode/settings.json
+++ b/.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"
+  ]
 }
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
-
-
 # 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).
@@ -9,12 +7,20 @@ Find here a collection of samples for the [SAP Cloud Application Programming Mod
 ![](etc/samples.drawio.svg)

 ![](https://github.com/SAP-samples/cloud-cap-samples/workflows/CI/badge.svg)
+[![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)



 ### Preliminaries

-Ensure you have the latest LTS version of Node.js, [`@sap/cds-dk`](https://www.npmjs.com/package/@sap/cds-dk) installed globally, `git` and your IDE ready (see [Initial Setup](https://cap.cloud.sap/docs/get-started/#setup))
+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
+   npm i -g @sap/cds-dk
+   ```
+
+3. _Optional:_ [Use Visual Studio Code](https://cap.cloud.sap/docs/get-started/tools#vscode)

 ### Download

@@ -30,7 +36,7 @@ cd samples
 In the samples folder run:

 ```sh
-npm ci
+npm install
 ```

 ### Run
--- a/app/router/bookshop
+++ b/app/router/bookshop
@@ -1 +0,0 @@
-../../bookshop/app/vue
--- a/app/router/orders
+++ b/app/router/orders
@@ -1 +0,0 @@
-../../orders/app/orders
--- a/app/router/package-lock.json
+++ b/app/router/package-lock.json
--- a/app/router/package.json
+++ b/app/router/package.json
@@ -1,12 +0,0 @@
-{
-  "name": "approuter",
-  "dependencies": {
-    "@sap/approuter": "^19.0.0"
-  },
-  "engines": {
-    "node": "^20"
-  },
-  "scripts": {
-    "start": "node node_modules/@sap/approuter/approuter.js"
-  }
-}
--- a/app/router/reviews
+++ b/app/router/reviews
@@ -1 +0,0 @@
-../../reviews/app/vue
--- a/app/router/xs-app.json
+++ b/app/router/xs-app.json
@@ -1,52 +0,0 @@
-{
-  "welcomeFile": "app/bookshop/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": "^/admin/(.*)$",
-      "target": "/admin/$1",
-      "destination": "bookstore-api",
-      "csrfProtection": true
-    },
-    {
-      "source": "^/browse/(.*)$",
-      "target": "/browse/$1",
-      "destination": "bookstore-api",
-      "csrfProtection": true
-    },
-    {
-      "source": "^/user/(.*)$",
-      "target": "/user/$1",
-      "destination": "bookstore-api",
-      "csrfProtection": true
-    },
-    {
-      "source": "^/odata/v4/orders/(.*)$",
-      "target": "/odata/v4/orders/$1",
-      "destination": "orders-api",
-      "csrfProtection": true
-    },
-    {
-      "source": "^/reviews/(.*)$",
-      "target": "/reviews/$1",
-      "destination": "reviews-api",
-      "csrfProtection": true
-    },
-    {
-      "source": "^(.*)$",
-      "target": "$1",
-      "localDir": ".",
-      "cacheControl": "no-cache, no-store, must-revalidate"
-    }
-  ]
-}
--- a/bookshop/app/vue/app.js
+++ b/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
    })
--- a/bookshop/db/init.js
+++ b/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' ],
  )
-)
+))
--- a/bookshop/index.js
+++ b/bookshop/index.js
@@ -0,0 +1,2 @@
+const { CatalogService } = require('./srv/cat-service')
+module.exports = { CatalogService }
--- a/bookshop/srv/admin-service.js
+++ b/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','CREATE'],'Books', genid)
+  this.before ('NEW','Authors', 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
 }
--- a/bookshop/srv/cat-service.js
+++ b/bookshop/srv/cat-service.js
@@ -1,6 +1,4 @@
-const cds = require('@sap/cds')
-
-class CatalogService extends cds.ApplicationService { init() {
+module.exports = 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
--- a/bookshop/test/genres.http
+++ b/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)
 ###
--- a/bookstore/_i18n/i18n_de.properties
+++ b/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
--- a/bookstore/_i18n/i18n_en.properties
+++ b/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
--- a/bookstore/_i18n/i18n_fr.properties
+++ b/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
--- a/bookstore/_i18n/messages_de.properties
+++ b/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
--- a/bookstore/_i18n/messages_en.properties
+++ b/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
--- a/bookstore/_i18n/messages_fr.properties
+++ b/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
--- a/bookstore/package.json
+++ b/bookstore/package.json
@@ -2,21 +2,14 @@
  "name": "@capire/bookstore",
  "version": "1.0.0",
  "dependencies": {
-    "@cap-js/hana": "^1.7.0",
    "@capire/bookshop": "*",
+    "@capire/reviews": "*",
+    "@capire/orders": "*",
    "@capire/common": "*",
    "@capire/data-viewer": "*",
-    "@capire/orders": "*",
-    "@capire/reviews": "*",
-    "@sap-cloud-sdk/http-client": "^3.26.4",
-    "@sap-cloud-sdk/resilience": "^3.26.4",
    "@sap/cds": ">=5",
-    "@sap/xssec": "^4.4.0",
    "express": "^4.17.1"
  },
-  "scripts": {
-    "start": "cds-serve"
-  },
  "cds": {
    "requires": {
      "ReviewsService": {
@@ -27,13 +20,15 @@
        "kind": "odata",
        "model": "@capire/orders"
      },
-      "messaging": true,
+      "messaging": {
+        "[development]": { "kind": "file-based-messaging" },
+        "[hybrid]": { "kind": "enterprise-messaging-shared" },
+        "[production]": { "kind": "enterprise-messaging" }
+      },
      "db": {
        "kind": "sql"
      }
    },
-    "log": {
-      "service": true
-    }
+    "log": { "service": true }
  }
 }
--- a/bookstore/server.js
+++ b/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
--- a/bookstore/srv/mashup.js
+++ b/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 })
-    return OrdersService.create ('OrdersNoDraft').entries({
+    const { title, price } = await db.tx(msg).read (Books, book, b => { b.title, b.price })
+    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)
--- a/bookstore/test/requests.http
+++ b/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
--- a/common/cds-plugin.js
+++ b/common/cds-plugin.js
@@ -1 +0,0 @@
-// dummy to auto-load the plugin
--- a/common/package.json
+++ b/common/package.json
@@ -4,12 +4,5 @@
  "version": "1.0.0",
  "dependencies": {
    "@sap/cds": "*"
-  },
-  "cds": {
-    "requires": {
-      "@capire/common/data": {
-        "model": "@capire/common"
-      }
-    }
  }
 }
--- a/etc/data-viewer/app/viewer/app.js
+++ b/etc/data-viewer/app/viewer/app.js
--- a/etc/data-viewer/app/viewer/index.html
+++ b/etc/data-viewer/app/viewer/index.html
--- a/etc/data-viewer/index.cds
+++ b/etc/data-viewer/index.cds
--- a/etc/data-viewer/package.json
+++ b/etc/data-viewer/package.json
--- a/etc/data-viewer/srv/data-service.cds
+++ b/etc/data-viewer/srv/data-service.cds
--- a/etc/data-viewer/srv/data-service.js
+++ b/etc/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 }
      })
@@ -34,8 +34,7 @@ class DataService extends cds.ApplicationService { init(){
    query.SELECT.limit = req.query.SELECT.limit  // forward $skip / $top

    const dataSource = findDataSource(dataSourceName, entityName)
-    let res = await dataSource.run(query)
-    if (!Array.isArray(res))  res = [res] // singleton result
+    const res = await dataSource.run(query)
    return res.map((line) => {
      const record = Object.entries(line).map(([column, data]) => ({ column, data }))
      return {
@@ -50,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 ?
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -0,0 +1,27 @@
+const eslintCds = require('@sap/eslint-plugin-cds')
+const eslintJs = require('@eslint/js')
+const globals = require('globals')
+
+module.exports = [
+  eslintJs.configs.recommended,
+  eslintCds.configs.recommended,
+  {
+    languageOptions: {
+      globals: {
+        sap: true,
+        ...globals.es2022,
+        ...globals.browser,
+        ...globals.node,
+        ...globals.jest,
+        ...globals.mocha,
+        ...eslintCds.configs.recommended.languageOptions.globals
+      }
+    },
+    rules: {
+      'no-console': 'off',
+      'no-unused-vars': ['warn', { argsIgnorePattern: '^_' }],
+      'require-atomic-updates': 'off',
+      'require-await': 'warn'
+    }
+  }
+]
--- a/eslint.config.mjs
+++ b/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/**'
-//   ]
-// }]
-//
--- a/event-mesh.json
+++ b/event-mesh.json
@@ -1,29 +0,0 @@
-{
-  "version": "1.1.0",
-  "options": {
-    "management": true,
-    "messagingrest": true,
-    "messaging": true
-  },
-  "rules": {
-    "topicRules": {
-      "publishFilter": [
-        "*"
-      ],
-      "subscribeFilter": [
-        "*"
-      ]
-    },
-    "queueRules": {
-      "publishFilter": [
-        "*"
-      ],
-      "subscribeFilter": [
-        "*"
-      ]
-    }
-  },
-  "authorities": [
-    "$ACCEPT_GRANTED_AUTHORITIES"
-  ]
-}
--- a/fiori/app/_i18n/i18n.properties
+++ b/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
--- a/fiori/app/_i18n/i18n_de.properties
+++ b/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
--- a/fiori/app/_i18n/i18n_en.properties
+++ b/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
--- a/fiori/app/browse/fiori-service.cds
+++ b/fiori/app/browse/fiori-service.cds
@@ -6,8 +6,8 @@ using CatalogService from '@capire/bookstore';
 //
 annotate CatalogService.Books with @(UI : {
    HeaderInfo        : {
-        TypeName       : '{i18n>Book}',
-        TypeNamePlural : '{i18n>Books}',
+        TypeName       : 'Book',
+        TypeNamePlural : 'Books',
        Description    : {Value : author}
    },
    HeaderFacets      : [{
--- a/fiori/app/fiori-apps.html
+++ b/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-ui-bootstrap" src="https://ui5.sap.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-theme="sap_horizon"></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://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-theme="sap_horizon"
+			data-sap-ui-frameOptions="allow"
+	></script>
 	<script>
-		sap.ui.getCore().attachInit(() =>
-			sap.ushell.Container.createRenderer().placeAt("content")
-		);
+		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"))
 	</script>
+
 </head>
-
-<body class="sapUiBody" id="content">
-</body>
-
+<body class="sapUiBody" id="content"></body>
 </html>
--- a/fiori/server.js
+++ b/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')
--- a/hello/README.md
+++ b/hello/README.md
@@ -0,0 +1,15 @@
+# Hello World Getting Started Sample
+
+## Next Steps
+
+- To run the JavaScript implementation, open a new terminal and run `cds watch`.
+- To run the TypeScript implementation, open a new terminal and run `cds-ts watch`.
+
+Then call the service at: http://localhost:4004/say/hello(to='world')
+
+## Learn More
+
+Learn more about:
+
+- [Hello World!](https://cap.cloud.sap/docs/get-started/hello-world)
+- [Using TypeScript](https://cap.cloud.sap/docs/node.js/typescript)
--- a/hello/package.json
+++ b/hello/package.json
@@ -0,0 +1,42 @@
+{
+  "name": "@capire/hello-world",
+  "version": "1.0.0",
+  "scripts": {
+    "test": "npx jest --silent",
+    "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"
+    }
+  }
+}
--- a/hello/srv/world.cds
+++ b/hello/srv/world.cds
@@ -0,0 +1,3 @@
+service say @(path: '/say') {
+  function hello (to:String) returns String;
+}
--- a/hello/srv/world.js
+++ b/hello/srv/world.js
@@ -0,0 +1,7 @@
+module.exports = class say {
+  hello(req) {
+    let {to} = req.data
+    if (to === 'me') to = require('os').userInfo().username
+    return `Hello ${to}!`
+  }
+}
--- a/hello/srv/world.ts
+++ b/hello/srv/world.ts
@@ -0,0 +1,7 @@
+import { Request } from "@sap/cds"
+
+module.exports = class say {
+    hello(req: Request) {
+        return `Hello ${req.data.to} from a TypeScript file!`
+    }
+}
--- a/hello/test/hello-world-test.js
+++ b/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)
+    })
+
+})
--- a/hello/test/test.http
+++ b/hello/test/test.http
@@ -0,0 +1 @@
+GET http://localhost:4004/say/hello(to='world')
--- a/etc/loggers/app/loggers.html
+++ b/etc/loggers/app/loggers.html
--- a/etc/loggers/package.json
+++ b/etc/loggers/package.json
@@ -13,5 +13,10 @@
  "scripts": {
    "start": "cds-serve",
    "watch": "cds watch"
+  },
+  "cds": {
+    "requires": {
+      "db": "sql"
+    }
  }
 }
--- a/etc/loggers/readme.md
+++ b/etc/loggers/readme.md
--- a/etc/loggers/srv/dummy.cds
+++ b/etc/loggers/srv/dummy.cds
--- a/etc/loggers/srv/loggers.cds
+++ b/etc/loggers/srv/loggers.cds
--- a/etc/loggers/srv/loggers.js
+++ b/etc/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 {
--- a/etc/loggers/test/requests.http
+++ b/etc/loggers/test/requests.http
--- a/media/db/data-model.cds
+++ b/media/db/data-model.cds
@@ -0,0 +1,13 @@
+namespace sap.capire.media;
+
+entity Media {
+
+   key id:Integer;
+   @Core.MediaType: mediaType
+   content : LargeBinary ;
+
+   @Core.IsMediaType: true
+   mediaType : String;
+   fileName : String;
+   applicationName:String;
+}
--- a/media/index.cds
+++ b/media/index.cds
@@ -0,0 +1,2 @@
+using from './db/data-model';
+using from './srv/media-service';
--- a/media/package.json
+++ b/media/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "@capire/media",
+  "version": "1.0.0",
+  "dependencies": {
+    "lokijs": "^1.5.6"
+  },
+  "files": [
+    "db",
+    "srv",
+    "index.cds"
+  ],
+  "cds": {
+    "requires": {
+      "db": {
+        "kind": "sql"
+      }
+    }
+  }
+}
--- a/media/srv/media-service.cds
+++ b/media/srv/media-service.cds
@@ -0,0 +1,8 @@
+using { sap.capire.media as db } from '../db/data-model';
+namespace sap.capire.media;
+
+service MediaServer  {
+    entity Media   as projection on db.Media ;
+}
+
+ 
--- a/media/srv/media-service.js
+++ b/media/srv/media-service.js
@@ -0,0 +1,68 @@
+const loki = require('lokijs')
+const db = new loki('DB')
+const mediaDB = db.addCollection('Media')
+const { Readable, PassThrough } = require('stream')
+
+module.exports = srv => {
+  srv.before('CREATE', 'Media', req => {
+    const obj = mediaDB.insert({ media: '' })
+    req.data.id = obj.$loki
+  })
+
+  srv.on('UPDATE', 'Media', (req, next) => {
+    const url = req._.req.path
+    if (url.includes('content')) {
+      const id = req.data.id
+      const obj = mediaDB.get(id)
+      if (!obj) {
+        req.reject(404, 'No record found for the ID')
+        return
+      }
+      const stream = new PassThrough()
+      const chunks = []
+      stream.on('data', chunk => {
+        chunks.push(chunk)
+      })
+      stream.on('end', () => {
+        obj.media = Buffer.concat(chunks).toString('base64')
+        mediaDB.update(obj)
+      })
+      req.data.content.pipe(stream)
+    } else return next()
+  })
+
+  srv.on('READ', 'Media', (req, next) => {
+    const url = req._.req.path
+    if (url.includes('content')) {
+      const id = req.data.id
+      const mediaObj = mediaDB.get(id)
+      if (!mediaObj) {
+        req.reject(404, 'Media not found for the ID')
+        return
+      }
+      const decodedMedia = Buffer.from(
+        mediaObj.media.split(';base64,').pop(),
+        'base64'
+      )
+      return _formatResult(decodedMedia)
+    } else return next() //> delegate to next/default handlers
+  })
+
+  srv.on('DELETE', 'Media', (req, next) => {
+    const id = req.data.id
+    mediaDB
+      .chain()
+      .find({ $loki: id })
+      .remove()
+    return next() //> delegate to next/default handlers
+  })
+
+  function _formatResult (decodedMedia) {
+    const readable = new Readable()
+    const result = new Array()
+    readable.push(decodedMedia)
+    readable.push(null)
+    result.push({ value: readable })
+    return result
+  }
+}
--- a/media/test/Test.png
+++ b/media/test/Test.png
--- a/media/test/media.http
+++ b/media/test/media.http
@@ -0,0 +1,35 @@
+### Requires REST Client for VS Code
+### https://marketplace.visualstudio.com/items?itemName=humao.rest-client
+###
+@protocol = http
+@host = localhost
+@port = 4004
+### Read Pictures
+GET {{protocol}}://{{host}}:{{port}}/media-server/Media
+Authorization: Basic admin:
+
+### Create Picture with mediatype
+POST {{protocol}}://{{host}}:{{port}}/media-server/Media
+Authorization: Basic admin:
+Accept: application/json
+Content-Type: application/json
+
+{ 
+  "id": 1,
+  "mediaType": "image/png" 
+}
+
+### Upload Binary PNG
+PUT {{protocol}}://{{host}}:{{port}}/media-server/Media(1)/content
+Authorization: Basic admin:
+Content-Type: image/png
+
+< ./Test.png
+
+### Read Binary
+GET {{protocol}}://{{host}}:{{port}}/media-server/Media(1)/content
+Authorization: Basic admin:
+
+### Delete Image
+DELETE {{protocol}}://{{host}}:{{port}}/media-server/Media(1)
+Authorization: Basic admin:
--- a/mta.yaml
+++ b/mta.yaml
@@ -1,177 +0,0 @@
-_schema-version: 3.3.0
-ID: capire.samples
-version: 3.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 ./shared-db --for hana --production
-        - npx cds build ./orders --for nodejs --production --ws-pack
-        - npx cds build ./reviews --for nodejs --production
-        - npx cds build ./bookstore --for nodejs --production --ws-pack
-modules:
-  - name: bookstore-srv
-    type: nodejs
-    path: bookstore/gen/srv
-    parameters:
-      instances: 1
-      buildpack: nodejs_buildpack
-    build-parameters:
-      builder: npm
-    properties:
-      cds_requires_ReviewsService_credentials: {"destination": "reviews-dest","path": "/reviews"} 
-      cds_requires_OrdersService_credentials: {"destination": "orders-dest","path": "/odata/v4/orders"} 
-    provides:
-      - name: bookstore-api # required by consumers of CAP services (e.g. approuter)
-        properties:
-          srv-url: ${default-url}
-    requires:
-      - name: samples-db
-      - name: samples-auth
-      - name: samples-messaging
-      - name: samples-destination
-
-  - name: orders-srv
-    type: nodejs
-    path: orders/gen/srv
-    parameters:
-      instances: 1
-      buildpack: nodejs_buildpack
-    build-parameters:
-      builder: npm
-    provides:
-      - name: orders-api # required by consumers of CAP services (e.g. approuter)
-        properties:
-          srv-url: ${default-url}
-    requires:
-      - name: samples-db
-      - name: samples-auth
-      - name: samples-messaging
-      - name: samples-destination
-
-  - name: reviews-srv
-    type: nodejs
-    path: reviews/gen/srv
-    parameters:
-      instances: 1
-      buildpack: nodejs_buildpack
-    build-parameters:
-      builder: npm
-    provides:
-      - name: reviews-api # required by consumers of CAP services (e.g. approuter)
-        properties:
-          srv-url: ${default-url}
-    requires:
-      - name: samples-db
-      - name: samples-auth
-      - name: samples-messaging
-      - name: samples-destination
-
-  - name: samples-db-deployer
-    type: hdb
-    path: shared-db/gen/db
-    parameters:
-      buildpack: nodejs_buildpack
-    requires:
-      - name: samples-db
-
-  - name: samples
-    type: approuter.nodejs
-    path: app/router
-    parameters:
-      keep-existing-routes: true
-      disk-quota: 256M
-      memory: 256M
-    requires:
-      - name: orders-api
-        group: destinations
-        properties:
-          name: orders-api
-          url: ~{srv-url}
-          forwardAuthToken: true
-      - name: reviews-api
-        group: destinations
-        properties:
-          name: reviews-api
-          url: ~{srv-url}
-          forwardAuthToken: true
-      - name: bookstore-api
-        group: destinations
-        properties:
-          name: bookstore-api
-          url: ~{srv-url}
-          forwardAuthToken: true
-      - name: samples-auth
-      - name: samples-destination
-    provides:
-      - name: app-api
-        properties:
-          app-protocol: ${protocol}
-          app-uri: ${default-uri}
-
-  - name: destination-content
-    type: com.sap.application.content
-    requires:
-      - name: orders-api
-      - name: reviews-api
-      - name: bookstore-api
-      - name: samples-auth
-        parameters:
-          service-key:
-            name: xsuaa_service-key
-      - name: samples-destination
-        parameters:
-          content-target: true
-    build-parameters:
-      no-source: true
-    parameters:
-      content:
-        instance:
-          existing_destinations_policy: update
-          destinations:
-            - Name: orders-dest
-              URL: ~{orders-api/srv-url}
-              Authentication: OAuth2ClientCredentials
-              TokenServiceInstanceName: samples-auth
-              TokenServiceKeyName: xsuaa_service-key
-            - Name: reviews-dest
-              URL: ~{reviews-api/srv-url}
-              Authentication: OAuth2ClientCredentials
-              TokenServiceInstanceName: samples-auth
-              TokenServiceKeyName: xsuaa_service-key
-
-resources:
-  - name: samples-db
-    type: com.sap.xs.hdi-container
-    parameters:
-      service: hana
-      service-plan: hdi-shared
-  - name: samples-auth
-    type: org.cloudfoundry.managed-service
-    processed-after:
-      - samples-messaging
-    parameters:
-      service: xsuaa
-      service-plan: application
-      path: ./xs-security.json
-      config:
-        xsappname: samples-${org}-${space}
-        tenant-mode: dedicated
-  - name: samples-messaging
-    type: org.cloudfoundry.managed-service
-    parameters:
-      service: enterprise-messaging
-      service-plan: default
-      path: ./event-mesh.json
-      config:
-        emname: bookstore-${org}-${space}
-        namespace: cap/samples/${space}
-  - name: samples-destination
-    type: org.cloudfoundry.managed-service
-    parameters:
-      service: destination
-      service-plan: lite
--- a/orders/_i18n/i18n_de.properties
+++ b/orders/_i18n/i18n_de.properties
@@ -1,3 +0,0 @@
-Order = Bestellung
-Orders = Bestellungen
-Price = Preis
--- a/orders/_i18n/i18n_en.properties
+++ b/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
--- a/orders/_i18n/i18n_fr.properties
+++ b/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é
--- a/orders/db/schema.cds
+++ b/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;
--- a/orders/package.json
+++ b/orders/package.json
@@ -2,18 +2,7 @@
  "name": "@capire/orders",
  "version": "1.0.0",
  "dependencies": {
-    "@cap-js/hana": "^1.7.0",
    "@capire/common": "*",
-    "@sap/cds": ">=5",
-    "@sap/xssec": "^4.4.0"
-  },
-  "scripts": {
-    "start": "cds-serve"
-  },
-  "cds": {
-    "requires": {
-      "messaging": true,
-      "db": true
-    }
+    "@sap/cds": ">=5"
  }
 }
--- a/orders/srv/orders-service.cds
+++ b/orders/srv/orders-service.cds
@@ -2,14 +2,4 @@ using { sap.capire.orders as my } from '../db/schema';

 service OrdersService {
  entity Orders as projection on my.Orders;
-
-  event OrderChanged {
-    product: String;
-    deltaQuantity: Integer;
-  }
-
-  @odata.draft.bypass
-  @(requires: 'system-user')
-  entity OrdersNoDraft as projection on my.Orders;
-
 }
--- a/orders/srv/orders-service.js
+++ b/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 })
  }

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,42 +1,52 @@
 {
    "name": "@capire/samples",
-  "version": "3.0.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",
-    "@cap-js/hana": "^1",
-    "@sap/xssec": "^4"
+      "@sap/cds": ">=7"
    },
    "workspaces": [
      "./bookshop",
      "./bookstore",
      "./common",
+      "./data-viewer",
      "./fiori",
+      "./hello",
+      "./media",
      "./orders",
-    "./reviews",
-    "./etc/data-viewer",
-    "./etc/loggers"
+      "./loggers",
+      "./reviews"
    ],
    "devDependencies": {
-    "@cap-js/cds-test": "^0",
-    "@cap-js/cds-types": "^0",
      "@cap-js/sqlite": "^1",
-    "@sap/cds-dk": "^8",
+      "@sap/eslint-plugin-cds": "^3",
+      "axios": "^1",
+      "chai": "^4.3.4",
+      "chai-as-promised": "^7.1.1",
+      "chai-subset": "^1.6.0",
      "eslint": "^9",
      "semver": "^7"
    },
    "scripts": {
-    "build": "mbt build -t gen --mtar mta.tar", 
-    "deploy": "cf deploy gen/mta.tar", 
-    "undeploy": "cf undeploy capire.samples --delete-services --delete-service-keys",
+      "cleanup": "rm -rf node_modules && rm -rf */node_modules && rm -rf */*/node_modules",
      "bookshop": "cds watch bookshop",
      "fiori": "cds watch fiori",
-    "lint": "eslint",
-    "test": "npx jest --silent",
+      "hello": "cds watch hello",
+      "media": "cds watch media",
+      "mocha": "CDS_TEST_SILENT=y npx mocha",
      "jest": "npx jest --silent",
-    "mocha": "CDS_TEST_SILENT=y npx mocha"
+      "start": "cds watch fiori",
+      "test": "npm run jest -- --silent",
+      "test:hello": "cd hello && npm test",
+      "lint": "eslint ."
+    },
+    "jest": {
+      "testTimeout": 20000,
+      "testMatch": [
+        "**/*.test.js"
+      ]
    },
    "mocha": {
      "recursive": true,
@@ -44,19 +54,5 @@
      "timeout": 6666
    },
    "license": "SEE LICENSE IN LICENSE",
-  "private": true,
-  "cds": {
-    "sql": {
-      "native_hana_associations": false
-    },
-    "requires": {
-      "[production]": {
-        "auth": "xsuaa"
-      },
-      "messaging": {
-        "kind": "enterprise-messaging"
-      },
-      "destinations": true
-    }
-  }
+    "private": true
  }
--- a/reviews/_i18n/i18n_de.properties
+++ b/reviews/_i18n/i18n_de.properties
@@ -1,3 +0,0 @@
-Date = Datum
-Rating = Bewertung
-NumberOfReviews = Anzahl der Reviews
--- a/reviews/_i18n/i18n_en.properties
+++ b/reviews/_i18n/i18n_en.properties
@@ -1,5 +0,0 @@
-Reviews = Reviews
-Review = Review
-Date = Date
-Rating = Rating
-NumberOfReviews = Number of Reviews
--- a/reviews/_i18n/i18n_fr.properties
+++ b/reviews/_i18n/i18n_fr.properties
@@ -1,5 +0,0 @@
-Reviews = Avis
-Review = Avis
-Date = Date
-Rating = Note
-NumberOfReviews = Nombre d''avis
--- a/reviews/app/vue/app.js
+++ b/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.' }
--- a/reviews/db/data/sap.capire.reviews-Reviews.csv
+++ b/reviews/db/data/sap.capire.reviews-Reviews.csv
@@ -1,5 +1,5 @@
-ID;subject;rating;reviewer;title;text
-1689144d-3b10-4849-bcbe-2408a13e161a;201;5;bob;Intriguing;Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
-1689144d-3b10-4849-bcbe-2408a13e161b;201;4;bob;Fascinating;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Id diam maecenas ultricies mi eget mauris pharetra et. Risus at ultrices mi tempus imperdiet nulla malesuada pellentesque. Pulvinar mattis nunc sed blandit libero. Facilisis magna etiam tempor orci eu. Nec sagittis aliquam malesuada bibendum arcu. Eu consequat ac felis donec. Ultricies tristique nulla aliquet enim tortor at auctor urna nunc. Tortor posuere ac ut consequat semper viverra nam libero. Amet nisl suscipit adipiscing bibendum est ultricies integer quis auctor. Scelerisque purus semper eget duis at tellus. Elementum tempus egestas sed sed risus pretium. Arcu dictum varius duis at. Amet luctus venenatis lectus magna fringilla urna. Eget velit aliquet sagittis id consectetur purus ut faucibus. Vitae auctor eu augue ut lectus. Fermentum iaculis eu non diam phasellus vestibulum.
-1689144d-3b10-4849-bcbe-2408a13e161c;207;2;bob;What is this?;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Libero justo laoreet sit amet cursus sit amet dictum. Nunc faucibus a pellentesque sit. Dis parturient montes nascetur ridiculus mus mauris vitae ultricies. Enim nunc faucibus a pellentesque. Commodo quis imperdiet massa tincidunt nunc pulvinar sapien. Cras ornare arcu dui vivamus. Facilisi etiam dignissim diam quis enim lobortis. Et molestie ac feugiat sed. Urna neque viverra justo nec ultrices dui. Ullamcorper a lacus vestibulum sed arcu non. Volutpat ac tincidunt vitae semper quis. Dignissim sodales ut eu sem. Feugiat in fermentum posuere urna nec. At augue eget arcu dictum varius.
-1689144d-3b10-4849-bcbe-2408a13e161d;251;3;bob;It's dark...;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Suscipit tellus mauris a diam. Velit aliquet sagittis id consectetur purus ut. Viverra adipiscing at in tellus integer. Vitae elementum curabitur vitae nunc. Mattis ullamcorper velit sed ullamcorper morbi. Diam quis enim lobortis scelerisque. Auctor neque vitae tempus quam pellentesque nec nam aliquam. Semper auctor neque vitae tempus. Quis eleifend quam adipiscing vitae proin. Neque convallis a cras semper auctor neque vitae. Imperdiet massa tincidunt nunc pulvinar sapien et ligula. Sit amet consectetur adipiscing elit ut aliquam purus. Pretium quam vulputate dignissim suspendisse.
+subject;rating;reviewer;title;text
+201;5;bob;Intriguing;Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+201;4;bob;Fascinating;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Id diam maecenas ultricies mi eget mauris pharetra et. Risus at ultrices mi tempus imperdiet nulla malesuada pellentesque. Pulvinar mattis nunc sed blandit libero. Facilisis magna etiam tempor orci eu. Nec sagittis aliquam malesuada bibendum arcu. Eu consequat ac felis donec. Ultricies tristique nulla aliquet enim tortor at auctor urna nunc. Tortor posuere ac ut consequat semper viverra nam libero. Amet nisl suscipit adipiscing bibendum est ultricies integer quis auctor. Scelerisque purus semper eget duis at tellus. Elementum tempus egestas sed sed risus pretium. Arcu dictum varius duis at. Amet luctus venenatis lectus magna fringilla urna. Eget velit aliquet sagittis id consectetur purus ut faucibus. Vitae auctor eu augue ut lectus. Fermentum iaculis eu non diam phasellus vestibulum.
+207;2;bob;What is this?;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Libero justo laoreet sit amet cursus sit amet dictum. Nunc faucibus a pellentesque sit. Dis parturient montes nascetur ridiculus mus mauris vitae ultricies. Enim nunc faucibus a pellentesque. Commodo quis imperdiet massa tincidunt nunc pulvinar sapien. Cras ornare arcu dui vivamus. Facilisi etiam dignissim diam quis enim lobortis. Et molestie ac feugiat sed. Urna neque viverra justo nec ultrices dui. Ullamcorper a lacus vestibulum sed arcu non. Volutpat ac tincidunt vitae semper quis. Dignissim sodales ut eu sem. Feugiat in fermentum posuere urna nec. At augue eget arcu dictum varius.
+251;3;bob;It's dark...;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Suscipit tellus mauris a diam. Velit aliquet sagittis id consectetur purus ut. Viverra adipiscing at in tellus integer. Vitae elementum curabitur vitae nunc. Mattis ullamcorper velit sed ullamcorper morbi. Diam quis enim lobortis scelerisque. Auctor neque vitae tempus quam pellentesque nec nam aliquam. Semper auctor neque vitae tempus. Quis eleifend quam adipiscing vitae proin. Neque convallis a cras semper auctor neque vitae. Imperdiet massa tincidunt nunc pulvinar sapien et ligula. Sit amet consectetur adipiscing elit ut aliquam purus. Pretium quam vulputate dignissim suspendisse.
--- a/reviews/package.json
+++ b/reviews/package.json
@@ -7,28 +7,17 @@
    "index.cds"
  ],
  "dependencies": {
-    "@cap-js/hana": "^1.7.0",
    "@sap/cds": ">=5",
-    "@sap/xssec": "^4.4.0",
    "express": "^4.17.1"
  },
-  "scripts": {
-    "start": "cds-serve"
-  },
  "cds": {
    "requires": {
      "messaging": {
-        "[development]": {
-          "kind": "file-based-messaging"
+        "[development]": { "kind": "file-based-messaging" },
+        "[hybrid]": { "kind": "enterprise-messaging-shared" },
+        "[production]": { "kind": "enterprise-messaging" }
      },
-        "[hybrid]": {
-          "kind": "enterprise-messaging-shared"
-        },
-        "[production]": {
-          "kind": "enterprise-messaging"
-        }
-      },
-      "db": true
+      "db": { "kind": "sql" }
    }
  }
 }
--- a/reviews/srv/reviews-service.js
+++ b/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 })
  })

--- a/samples.md
+++ b/samples.md
@@ -6,6 +6,12 @@ Each sub directory essentially is an individual npm package arranged in an [all-
 ![](etc/samples.drawio.svg)


+## [@capire/hello-world](hello)
+
+- A simplistic [Hello World](https://cap.cloud.sap/docs/get-started/hello-world) service using [CDS](https://cap.cloud.sap/docs/cds/) and [cds.services](https://cap.cloud.sap/docs/node.js/api#services-api).
+- [Typescript support](https://cap.cloud.sap/docs/node.js/typescript)
+
+
 ## [@capire/bookshop](bookshop)

 - [Getting Started](https://cap.cloud.sap/docs/get-started/in-a-nutshell) with CAP, briefly introducing:
@@ -54,10 +60,10 @@ Each sub directory essentially is an individual npm package arranged in an [all-
  - [@capire/reviews](reviews)
  - [@capire/orders](orders)
  - [@capire/common](common)
-  - [@capire/data-viewer](etc/data-viewer)
+  - [@capire/data-viewer](data-viewer)
 - [The Vue.js app](bookshop/app/vue) imported from `bookshop` is served as well
 - [The Vue.js app](reviews/app/vue) imported from `reviews` is served as well
- [The Vue.js app](etc/data-viewer/app/data) imported from `data-viewer` is served as well
+- [The Vue.js app](data-viewer/app/data) imported from `data-viewer` is served as well
 - [The Fiori app](orders/app) imported from `orders` is served as well
 - [OpenAPI export + Swagger UI](https://cap.cloud.sap/docs/advanced/openapi)

--- a/shared-db/db/index.cds
+++ b/shared-db/db/index.cds
@@ -1,3 +0,0 @@
-using from '@capire/bookstore';
-using from '@capire/reviews';
-using from '@capire/orders';
--- a/shared-db/package.json
+++ b/shared-db/package.json
@@ -1,17 +0,0 @@
-{
-  "name": "shared-db",
-  "version": "1.0.0",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "description": "",
-  "cds": {
-    "sql": {
-      "native_hana_associations": false
-    }
-  }
-}
--- a/test/cds.ql.test.js
+++ b/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 }],
          },
        }
--- a/test/consuming-actions.test.js
+++ b/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);
-  });
-});
--- a/test/consuming-services.test.js
+++ b/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', () => {

--- a/test/custom-handlers.test.js
+++ b/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 expect(POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`).to.be.fulfilled
-    await expect(POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`).to.be.rejectedWith(
-      /409 - 5 exceeds stock for book #201/)
+    await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`
+    await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`
+    await expect(POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`).to.be.rejectedWith(/409 - 5 exceeds stock for book #201/)
    const { data } = await GET`/admin/Books/201/stock/$value`
    expect(data).to.equal(2)
  })
--- a/test/fiori.test.js
+++ b/test/fiori.test.js
@@ -1,8 +1,4 @@
-// Quick hack: suppress deprecation warnings w/ Node22 caused by http-proxy (used by OData v2 proxy)
-// See also: https://github.com/http-party/node-http-proxy/pull/1666
-require('util')._extend = Object.assign
-
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')

 describe('cap/samples - Fiori APIs - v2', function() {

--- a/test/hello-world.test.js
+++ b/test/hello-world.test.js
@@ -0,0 +1,22 @@
+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 `/say/hello(to='world')`
+    expect(data.value).to.eql('Hello world!')
+  })
+
+  it('should say hello with another impl', async () => {
+    await cds.serve('say').from(cds.model)
+    .at('/say-again').in(cds.app)
+    .with(srv => {
+      srv.on('hello', (req) => `Hello again ${req.data.to}!`)
+    })
+    const {data} = await GET `/say-again/hello(to='world')`
+    expect(data.value).to.eql('Hello again world!')
+  })
+
+})
--- a/test/hierarchical-data.test.js
+++ b/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 (
-		SELECT.one.from (Cats, c=>{
+	it ('supports deeply nested reads', async()=>{
+		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)
 	})

 })
--- a/test/localized-data/services.test.js
+++ b/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', () => {

--- a/test/messaging.test.js
+++ b/test/messaging.test.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')

 describe('cap/samples - Messaging', ()=>{

--- a/test/odata.test.js
+++ b/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`
--- a/xs-security.json
+++ b/xs-security.json
@@ -1,34 +0,0 @@
-{
-  "scopes": [
-    {
-      "name": "$XSAPPNAME.admin",
-      "description": "admin"
-    },
-    {
-      "name": "$XSAPPNAME.emcallback",
-      "description": "Enterprise-Messaging Callback Access",
-      "grant-as-authority-to-apps": [
-        "$XSSERVICENAME(samples-messaging)"
-      ]
-    },
-    {
-      "name": "$XSAPPNAME.emmanagement",
-      "description": "Enterprise-Messaging Management Access"
-    }
-  ],
-  "attributes": [],
-  "role-templates": [
-    {
-      "name": "admin",
-      "scope-references": [
-        "$XSAPPNAME.admin"
-      ],
-      "description": "cap samples multi-service shared-db"
-    }
-  ],
-  "authorities-inheritance": false,
-  "authorities": [
-    "$XSAPPNAME.emmanagement",
-    "$XSAPPNAME.mtcallback"
-  ]
-}
Author	SHA1	Message	Date
Jörg Mann	55e4c92a60	renaming	2024-05-03 14:23:10 +02:00
Jörg Mann	7738f85036	refactor(lint): simplify eslint config	2024-05-03 13:53:43 +02:00
				`@@ -0,0 +1 @@`
				`GET http://localhost:4004/say/hello(to='world')`