Moved ord-service into plugin package

Bumps the production-dependencies group with 3 updates in the / directory: [@sap/cds](https://cap.cloud.sap/), [express](https://github.com/expressjs/express) and [@cap-js-community/odata-v2-adapter](https://github.com/cap-js-community/odata-v2-adapter).


Updates `@sap/cds` from 8.5.0 to 8.6.1

Updates `express` from 4.21.1 to 4.21.2
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/4.21.2/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.21.1...4.21.2)

Updates `@cap-js-community/odata-v2-adapter` from 1.13.8 to 1.14.0
- [Release notes](https://github.com/cap-js-community/odata-v2-adapter/releases)
- [Changelog](https://github.com/cap-js-community/odata-v2-adapter/blob/main/CHANGELOG.md)
- [Commits](https://github.com/cap-js-community/odata-v2-adapter/compare/v1.13.8...v1.14.0)

---
updated-dependencies:
- dependency-name: "@sap/cds"
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
- dependency-name: express
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: "@cap-js-community/odata-v2-adapter"
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/node.js.yml

@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.x, 18.x]
+        node-version: [22.x, 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: 20.x
+        node-version: 22.x
     - run: npm ci
     - run: npm run lint

.vscode/settings.json

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

README.md

@@ -13,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/))
+1. Ensure you have the latest LTS version of Node.js installed (see [Getting Started](https://cap.cloud.sap/docs/get-started/jumpstart))
 2. Install [**@sap/cds-dk**](https://cap.cloud.sap/docs/get-started/) globally:
 
    ```sh
@@ -36,7 +36,7 @@ cd samples
 In the samples folder run:
 
 ```sh
-npm install
+npm ci
 ```
 
 ### Run

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,currency${etc}`)
+            const {data} = await GET(`/ListOfBooks?$expand=genre($select=name),currency($select=symbol)${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,3 +1,5 @@
+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
@@ -6,7 +8,7 @@
 
 // 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', ()=> cds.run(
+module.exports = cds.on('served', ()=>
   UPSERT.into ('sap.common.Currencies') .columns (
     [ 'code', 'symbol', 'name' ]
   ) .rows (
@@ -16,4 +18,4 @@ module.exports = cds.on('served', ()=> cds.run(
     [ 'ILS', '₪', 'Shekel' ],
     [ 'JPY', '¥', 'Yen' ],
   )
-))
+)

bookshop/index.js

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

bookshop/package.json

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

bookshop/srv/admin-service.js

@@ -1,13 +1,14 @@
 const cds = require('@sap/cds')
 
 module.exports = class AdminService extends cds.ApplicationService { init(){
-  this.before ('NEW','Authors', genid)
-  this.before ('NEW','Books', genid)
+  this.before (['NEW','CREATE'],'Authors', genid)
+  this.before (['NEW','CREATE'],'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 - id % 100 + 100 + 1
+  req.data.ID = id + 4 // Note: that is not safe! ok for this sample only.
 }

bookshop/srv/cat-service.js

@@ -1,5 +1,6 @@
 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
@@ -33,3 +34,5 @@ module.exports = 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/test/Genres?
+GET http://localhost:4004/odata/v4/test/Genres?
 ###
 
-GET http://localhost:4004/test/Genres?
+GET http://localhost:4004/odata/v4/test/Genres?
 &$filter=parent_ID eq null&$select=name
 &$expand=children($select=name)
 ###
 
-POST http://localhost:4004/test/Genres?
+POST http://localhost:4004/odata/v4/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/test/Genres(100)?
+GET http://localhost:4004/odata/v4/test/Genres(100)?
 # &$expand=children
 # &$expand=children($expand=children($expand=children($expand=children)))
 ###
 
-DELETE http://localhost:4004/test/Genres(103)
+DELETE http://localhost:4004/odata/v4/test/Genres(103)
 ###
 
-DELETE http://localhost:4004/test/Genres(100)
+DELETE http://localhost:4004/odata/v4/test/Genres(100)
 ###

bookstore/_i18n/i18n_de.properties

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

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

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

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

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

@@ -0,0 +1,34 @@
+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/server.js

@@ -5,10 +5,15 @@ cds.once('served', require('./srv/mashup'))
 
 // Add routes to UIs from imported packages
 cds.once('bootstrap',(app)=>{
-  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')
+  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')
+    console.debug ('> delegating request to ReviewsService') // eslint-disable-line no-console
     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.tx(msg).read (Books, book, b => { b.title, b.price })
-    return OrdersService.tx(msg).create ('Orders').entries({
+    const { title, price } = await db.read (Books, book, b => { b.title, b.price })
+    return OrdersService.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)
+    console.debug ('> received:', msg.event, msg.data) // eslint-disable-line no-console
     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)
+    console.debug ('> received:', msg.event, msg.data) // eslint-disable-line no-console
     const { product, deltaQuantity } = msg.data
     return UPDATE (Books) .where ('ID =', product)
     .and ('stock >=', deltaQuantity)

bookstore/test/requests.http

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

common/cds-plugin.js

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

common/package.json

@@ -4,5 +4,12 @@
   "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,6 +49,7 @@ 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 ?

eslint.config.js

@@ -1,36 +0,0 @@
-const cds = require('@sap/eslint-plugin-cds')
-const globals = require('globals')
-const js = require('@eslint/js')
-
-module.exports = [
-  cds.configs.recommended,
-  js.configs.recommended,
-  {
-    languageOptions: {
-      globals: {
-        es2022: true,
-        ...globals.browser,
-        ...globals.node,
-        ...globals.jest,
-        ...globals.mocha,
-        cds: true,
-        sap: true,
-        CDL: true,
-        CQL: true,
-        CREATE: true,
-        DELETE: true,
-        DROP: true,
-        INSERT: true,
-        SELECT: true,
-        UPDATE: true,
-        UPSERT: true
-      }
-    },
-    rules: {
-      'no-console': 'off',
-      'no-unused-vars': ['warn', { argsIgnorePattern: '^_' }],
-      'require-atomic-updates': 'off',
-      'require-await': 'warn'
-    }
-  }
-]

eslint.config.mjs

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

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

fiori/app/_i18n/i18n_en.properties

@@ -0,0 +1,8 @@
+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       : 'Book',
-        TypeNamePlural : 'Books',
+        TypeName       : '{i18n>Book}',
+        TypeNamePlural : '{i18n>Books}',
         Description    : {Value : author}
     },
     HeaderFacets      : [{

hello/package.json

@@ -3,40 +3,10 @@
   "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 @(path: '/say') {
+service say {
   function hello (to:String) returns String;
-}
+}

hello/test/hello-world-test.js

@@ -1,10 +0,0 @@
-const cds = require ('@sap/cds')
-describe('Hello world!', () => {
-    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).to.match(/Hello world.*typescript.*/i)
-    })
-
-})

hello/test/test.http

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

loggers/package.json

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

media/srv/media-service.cds

@@ -1,6 +1,7 @@
 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._.req.path
+    const url = 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._.req.path
+    const url = req.path
     if (url.includes('content')) {
       const id = req.data.id
       const mediaObj = mediaDB.get(id)

ord/cds-plugin.js

@@ -0,0 +1 @@
+// just a dummy tag file to be identified as a plugin

ord/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "@cap-js/ord",
+  "version": "2.0.0",
+  "cds": {
+    "requires": {
+      "SAP ORD Service": {
+        "model": "@cap-js/ord/srv/ord-service",
+        "service": "OrdService"
+      }
+    }
+  }
+}

ord/srv/ord-service.cds

@@ -0,0 +1,12 @@
+// @requires: 'ORDconsumer'
+@rest @path:'/ord/v1'
+service OrdService {
+  @readonly entity documents {
+    key id: String;
+  }
+  @readonly entity csn {
+    key id: String;
+  }
+
+  function api (service: String, format: String) returns {};
+}

ord/srv/ord-service.mjs

@@ -0,0 +1,73 @@
+import cds from '@sap/cds'
+export class OrdService extends cds.ApplicationService {
+  init(){
+
+    this.on('READ','documents', req => {
+      let csn = cds.context?.model || cds.model
+      return { ord: csn }
+    })
+
+    /**
+     * Just an example to do something with id, if given.
+     * Try it out with URLs like that:
+     *
+     * - http://localhost:4004/ord/v1/documents
+     * - http://localhost:4004/ord/v1/documents/CatalogService
+     * - http://localhost:4004/ord/v1/documents/CatalogService.Books
+     * - http://localhost:4004/ord/v1/documents/CatalogService.Authors
+     */
+    this.on('READ','csn', req => {
+      let csn = cds.context?.model || cds.model
+      let { id } = req.data
+      if (id) csn = csn.definitions[id] || 'not in model!'
+      return { id, csn }
+    })
+
+    /**
+     * Just an example to serve arbitrary content with a function.
+     * Try it out with URLs like that:
+     *
+     * - http://localhost:4004/ord/v1/api?service=CatalogService
+     * - http://localhost:4004/ord/v1/api?service=CatalogService&format=edmx
+     * - http://localhost:4004/ord/v1/api?service=CatalogService&format=edmx-v2
+     * - http://localhost:4004/ord/v1/api?service=CatalogService&format=openapi
+     */
+    this.on('api', req => {
+      let csn = cds.context?.model || cds.model
+      let { service, format = 'csn' } = req.data
+      let { res } = req.http
+      if (format === 'csn') {
+        if (!service) return res.send(csn)
+        service = csn.services[service]
+        return res.send({ definitions: [ service, ...service.entities ] .reduce ((all,e) => {
+          let d = all[e.name] = {...e}
+          delete d.projection // not part of the API
+          delete d.query     // not part of the API
+          return all
+        },{})})
+      }
+      let api = cds.compile(csn).to[format]({service})
+      return res.send(api)
+    })
+
+    /**
+     * Example how to register arbitrary express routes,
+     * and map them to our service's interface.
+     * Try it out with URLs like that:
+     *
+     * - http://localhost:4004/ord/v1/csn/CatalogService
+     * - http://localhost:4004/ord/v1/edmx/CatalogService
+     * - http://localhost:4004/ord/v1/openapi/CatalogService
+     * - http://localhost:4004/ord/v1/asyncapi/CatalogService
+     *
+     * NOTE: we add cds.middlewares.before to the route, which gives us all
+     * the context and auth handling, which is also available to CAP services.
+     */
+    cds.app.get (`${this.path}/:api?/:service?`, cds.middlewares.before, req => {
+      const { api, service } = req.params
+      return this.api (service, api)
+    })
+
+    return super.init()
+  }
+}

orders/_i18n/i18n_de.properties

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

orders/_i18n/i18n_en.properties

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

@@ -0,0 +1,10 @@
+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/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(22) @title:'Order Number'; //> readable key
+  OrderNo  : String(44) @title:'Order Number'; //> readable key
   Items    : Composition of many {
     key ID    : UUID;
     product   : Association to Products;

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 })
+    console.log ('> emitting:', 'OrderChanged', { product, deltaQuantity }) // eslint-disable-line no-console
     return this.emit ('OrderChanged', { product, deltaQuantity })
   }
 

package.json

@@ -1,58 +1,52 @@
 {
-    "name": "@capire/samples",
-    "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": ">=7"
-    },
-    "workspaces": [
-      "./bookshop",
-      "./bookstore",
-      "./common",
-      "./data-viewer",
-      "./fiori",
-      "./hello",
-      "./media",
-      "./orders",
-      "./loggers",
-      "./reviews"
-    ],
-    "devDependencies": {
-      "@cap-js/sqlite": "^1",
-      "@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": {
-      "cleanup": "rm -rf node_modules && rm -rf */node_modules && rm -rf */*/node_modules",
-      "bookshop": "cds watch bookshop",
-      "fiori": "cds watch fiori",
-      "hello": "cds watch hello",
-      "media": "cds watch media",
-      "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",
-      "lint": "eslint ."
-    },
-    "jest": {
-      "testTimeout": 20000,
-      "testMatch": [
-        "**/*.test.js"
-      ]
-    },
-    "mocha": {
-      "recursive": true,
-      "parallel": true,
-      "timeout": 6666
-    },
-    "license": "SEE LICENSE IN LICENSE",
-    "private": true
-  }
+  "name": "@capire/samples",
+  "version": "2.1.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"
+  },
+  "workspaces": [
+    "./bookshop",
+    "./bookstore",
+    "./common",
+    "./data-viewer",
+    "./fiori",
+    "./hello",
+    "./media",
+    "./ord",
+    "./orders",
+    "./loggers",
+    "./reviews"
+  ],
+  "devDependencies": {
+    "@cap-js/cds-types": "^0",
+    "@cap-js/sqlite": "^1",
+    "axios": "^1",
+    "chai": "^4.3.4",
+    "chai-as-promised": "^7.1.1",
+    "chai-subset": "^1.6.0",
+    "eslint": "^9",
+    "semver": "^7"
+  },
+  "scripts": {
+    "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",
+    "test:hello": "cd hello && npm test"
+  },
+  "mocha": {
+    "recursive": true,
+    "parallel": true,
+    "timeout": 6666
+  },
+  "license": "SEE LICENSE IN LICENSE",
+  "private": true
+}

reviews/_i18n/i18n_de.properties

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

reviews/_i18n/i18n_en.properties

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

reviews/_i18n/i18n_fr.properties

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

reviews/app/vue/app.js

@@ -50,7 +50,6 @@ 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/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 })
+    global.it || console.log ('< emitting:', 'reviewed', { subject, count, rating }) // eslint-disable-line no-console
     await this.emit ('reviewed', { subject, count, rating })
   })
 

test/cds.ql.test.js

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

test/consuming-actions.test.js

@@ -0,0 +1,53 @@
+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/hello-world.test.js

@@ -5,7 +5,7 @@ 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')`
+    const {data} = await GET `/odata/v4/say/hello(to='world')`
     expect(data.value).to.eql('Hello world!')
   })