typo

Signed-off-by: Christian Georgi <christian.georgi@sap.com>

.github/workflows/node.js.yml

@@ -5,9 +5,9 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:
@@ -24,5 +24,5 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: npm install
+    - run: npm ci
     - run: npm test

.gitignore

@@ -15,3 +15,5 @@ default-env.json
 packages/messageBox
 reviews/msg-box
 reviews/db/test.db
+
+*.openapi3.json

.npmrc

@@ -0,0 +1,3 @@
+# Ensure we always use public packages, i.e. avoid using local registries from ~/.npmrc
+@sap:registry=https://registry.npmjs.org/
+registry=https://registry.npmjs.org/

.registry/server.js

@@ -1,19 +1,25 @@
 const { exec } = require ('child_process')
+const isWin = process.platform === 'win32'
 const express = require ('express')
 const fs = require ('fs')
 const app = express()
 
 const { PORT=4444 } = process.env
-const [,,port=PORT] = process.argv
+const [,,port=PORT,scope='@capire'] = process.argv
-process.chdir(__dirname)
+const cwd = __dirname
+
+// clean up on start (exit handler might not complete on Windows)
+exec(isWin ? 'del *.tgz' : 'rm *.tgz', {cwd})
+
 
 app.use('/-/:tarball', (req,res,next) => {
   console.debug ('GET', req.params)
   try {
     const { tarball } = req.params
-    const [, pkg ] = /^capire-(\w+)/.exec(tarball)
+    const [, pkg ] = /^\w+-(\w+)/.exec(tarball)
     fs.lstat(tarball,(err => {
-      if (err) exec(`npm pack ../${pkg}`,next)
+      if (err) console.debug (`npm pack ../${pkg}`)
+      if (err) exec(`npm pack ../${pkg}`,{cwd},next)
       else next()
     }))
   } catch (e) {
@@ -25,12 +31,14 @@ app.use('/-/:tarball', (req,res,next) => {
 app.use('/-', express.static(__dirname))
 
 app.get('/*', (req,res)=>{
+  const urlRegex = /^\/(@\w+)\/(\w+)/
   const url = decodeURIComponent(req.url)
   console.debug ('GET',url)
   try {
-    const [, capire, pkg ] = /^\/(@capire)\/(\w+)/.exec(url)
+    if (!urlRegex.test(url))  return res.sendStatus(404)
-    const package = require (`${capire}/${pkg}/package.json`)
+    const [, scpe, pkg ] = urlRegex.exec(url)
-    const tarball = `capire-${pkg}-${package.version}.tgz`
+    const package = require (`${scpe}/${pkg}/package.json`)
+    const tarball = `${scpe.slice(1)}-${pkg}-${package.version}.tgz`
     // https://github.com/npm/registry/blob/master/docs/responses/package-metadata.md
     res.json({
       "name": package.name,
@@ -42,29 +50,30 @@ app.get('/*', (req,res)=>{
           "name": package.name,
           "version": package.version,
           "dist": {
-            "tarball": `http://localhost:${port}/-/${tarball}`
+            "tarball": `${server.url}/-/${tarball}`
           },
         }
       },
     })
   } catch (e) {
-    console.error(e)
+    if (e.code === 'MODULE_NOT_FOUND')  return res.sendStatus(404)
-    res.sendStatus(404)
+    console.error(e);  throw e
   }
 })
 
-app.listen(port, ()=>{
+const server = app.listen(port, ()=>{
-  console.log (`npm set @capire:registry=http://localhost:${port}`)
+  const url = server.url = `http://localhost:${server.address().port}`
-  console.log (`@capire registry listening on http://localhost:${port}`)
+  console.log (`npm set ${scope}:registry=${url}`)
-  exec(`npm set @capire:registry=http://localhost:${port}`)
+  exec(`npm set ${scope}:registry=${url}`)
+  console.log (`${scope} registry listening on ${url}`)
 })
 
+
 const _exit = ()=>{
-  console.log ('\nnpm conf rm @capire:registry')
+  server.close()
-  exec('npm conf rm @capire:registry')
+  exec(`npm conf rm "${scope}:registry"`, ()=> { process.exit() })
-  exec('rm *.tgz')
-  process.exit()
 }
+
 process.on ('SIGTERM',_exit)
 process.on ('SIGHUP',_exit)
 process.on ('SIGINT',_exit)

.tours/db-native.tour

@@ -68,26 +68,35 @@
     },
     {
       "file": "fiori/package.json",
-      "description": "#### Configuration\n\nThe `cds` section in `package.json` is a place to configure which of the `db/sqlite` and `db/hana` folders are used for which database.\nWe use [Node.js profiles](https://cap.cloud.sap/docs/node.js/cds-env#profiles) to separate the configuration.\nIn the `development` profile, you can see that `db/sqlite` is set as the model, while the `db/hana` folder is configured in the `production` profile.",
+      "description": "#### Configuration\n\nThe `cds.requires` section in `package.json` is a place to configure which of the `db/sqlite` and `db/hana` folders are used for which database.\n\nWe use [Node.js profiles](https://cap.cloud.sap/docs/node.js/cds-env#profiles) to separate the configuration.\nIn the `development` profile, you can see that `db/sqlite` is set as the model, while the `db/hana` folder is configured in the `production` profile.  `db-ext` is a pseudo datasource, its name doesn't matter.\n\nSee [`cds.resolve`](https://cap.cloud.sap/docs/node.js/cds-compile#cds-resolve) to learn more about how models are found.",
-      "line": 17,
+      "selection": {
+        "start": {
+          "line": 41,
+          "character": 1
+        },
+        "end": {
+          "line": 48,
+          "character": 1
+        }
+      },
       "title": "Configuration"
     },
     {
       "file": "fiori/package.json",
       "description": "#### Run with SQLite\n\nTo run with `development` and an in-memory SQLite database, you don't need to do anything special, because it's activated by default.  Just run:\n\n>> cds watch fiori\n\nThen open [http://localhost:4004/admin/Authors](http://localhost:4004/admin/Authors) to see the two new fields.\n",
-      "line": 28,
+      "line": 43,
       "title": "Run with SQLite"
     },
     {
       "file": "fiori/package.json",
       "description": "#### Deploy the CDS Model to SAP HANA\n\nTo 'activate' SAP HANA through the `production` profile, you can use the global `--production` flag:\n\n>> cd fiori; cds deploy --to hana --production\n\n[Learn more about SAP HANA deployment](https://cap.cloud.sap/docs/guides/databases#get-hana)\n\n#### Run the Application\n\n>> cd fiori; cds watch --production\n\nThe service on [http://localhost:4004/admin/Authors](http://localhost:4004/admin/Authors) is the same as before, but this time the `Authors` entity is backed by a database view with an SAP HANA function.\n\n#### More\n\nIf you don't see data, you can add some in the next step.",
-      "line": 31,
+      "line": 46,
       "title": "Run with SAP HANA"
     },
     {
       "file": "fiori/test/requests.http",
       "description": "### Add More Data\n\nOptionally you can add some `Authors` data by clicking on the _Send Request_ link (provided by the [REST client](https://marketplace.visualstudio.com/items?itemName=humao.rest-client) extension).",
-      "line": 68,
+      "line": 72,
       "selection": {
         "start": {
           "line": 67,
@@ -104,6 +113,5 @@
       "title": "Wrap-up",
       "description": "### Summary\n\nThat's it!  You have seen: \n- How to integrate database-specific functions in a CDS model.\n- How to switch between the two implementations for SQLite and SAP HANA."
     }
-  ],
+  ]
-  "ref": "master"
 }

.tours/samples.tour

@@ -19,7 +19,7 @@
       }
     },
     {
-      "file": "hello/world.cds",
+      "file": "hello/srv/world.cds",
       "description": "### Hello World!\n\nThis is 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).",
       "line": 2,
       "selection": {
@@ -68,7 +68,7 @@
     },
     {
       "file": "orders/db/schema.cds",
-      "description": "### Compositions and Serving Documents\n\nA standalone orders management service, demonstrating:\n- Using [Compositions](https://cap.cloud.sap/docs/cds/cdl#compositions) in [Domain Models](https://cap.cloud.sap/docs/guides/domain-models), along with\n- [Serving deeply nested documents](https://cap.cloud.sap/docs/guides/generic-providers#serving-structured-data)\n",
+      "description": "### Orders - Compositions and Serving Documents\n\nA standalone orders management service, demonstrating:\n- Using [Compositions](https://cap.cloud.sap/docs/cds/cdl#compositions) in [Domain Models](https://cap.cloud.sap/docs/guides/domain-models), along with\n- [Serving deeply nested documents](https://cap.cloud.sap/docs/guides/generic-providers#serving-structured-data)\n",
       "line": 1,
       "selection": {
         "start": {
@@ -84,7 +84,7 @@
     },
     {
       "file": "reviews/db/schema.cds",
-      "description": "### More Modularity\n\nShows how to implement a modular service to manage product reviews, including:\n- Consuming other services synchronously and asynchronously\n- Serving requests synchronously\n- Emitting events asynchronously\n- Grow as you go, with:\n- Mocking app services\n- Running service meshes\n- Late-cut Micro Services\n- As well as managed data, input validations, and authorization\n",
+      "description": "### Reviews - More Modularity\n\nShows how to implement a modular service to manage product reviews, including:\n- Consuming other services synchronously and asynchronously\n- Serving requests synchronously\n- Emitting events asynchronously\n- Grow as you go, with:\n- Mocking app services\n- Running service meshes\n- Late-cut Micro Services\n- As well as managed data, input validations, and authorization\n",
       "line": 1,
       "selection": {
         "start": {
@@ -99,8 +99,12 @@
       "title": "Reviews"
     },
     {
-      "file": "fiori/app/index.cds",
+      "title": "Bookstore",
-      "description": "### Annotations for SAP Fiori Elements\n\nA [composite app, reusing and combining](https://cap.cloud.sap/docs/guides/verticalize) these packages:\n  - [@capire/bookshop](bookshop)\n  - [@capire/reviews](reviews)\n  - [@capire/orders](orders)\n  - [@capire/common](common)\n\n[Adds a SAP Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/) to bookshop, thereby introducing to:\n  - [OData Annotations](https://cap.cloud.sap/docs/guides/fiori#adding-odata-annotations) in `.cds` files\n  - Support for [Fiori Draft](https://cap.cloud.sap/docs/guides/fiori#draft)\n  - Support for [Value Helps](https://cap.cloud.sap/docs/guides/fiori#value-help)\n  - Serving SAP Fiori apps locally\n\n[The Vue.js app](bookshop/app/vue) imported from bookshop is served as well.\n",
+      "description": "### Bookstore - Reuse and UI\n\n- A [composite app, reusing and combining](https://cap.cloud.sap/docs/guides/reuse-and-compose) these packages:\n  - [@capire/bookshop](bookshop)\n  - [@capire/reviews](reviews)\n  - [@capire/orders](orders)\n  - [@capire/common](common)\n- [The Vue.js app](bookshop/app/vue) imported from bookshop is served as well\n- [The Vue.js app](reviews/app/vue) imported from reviews is served as well\n- [The Fiori app](orders/app) imported from orders is served as well\n- [OpenAPI export + Swagger UI](https://cap.cloud.sap/docs/advanced/openapi)"
+    },
+    {
+      "file": "fiori/app/services.cds",
+      "description": "### Annotations for SAP Fiori Elements\n\n- [Adds an SAP Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/) to bookstore, thereby introducing to:\n- [OData Annotations](https://cap.cloud.sap/docs/guides/fiori#adding-odata-annotations) in `.cds` files\n- Support for [Fiori Draft](https://cap.cloud.sap/docs/guides/fiori#draft)\n- Support for [Value Helps](https://cap.cloud.sap/docs/guides/fiori#value-help)\n- Serving SAP Fiori apps locally\n",
       "line": 1,
       "selection": {
         "start": {
@@ -117,14 +121,13 @@
     {
       "file": "package.json",
       "description": "### All-in-one Monorepo\n\nEach sample sub directory essentially is a standard npm package, some with standard npm dependencies to other samples. The root folder's [package.json](package.json) has local links to the sub folders, such that an `npm install` populates a local `node_modules` folder acts like a local npm registry to the individual sample packages.\n",
-      "line": 8,
       "selection": {
         "start": {
           "line": 8,
           "character": 1
         },
         "end": {
-          "line": 15,
+          "line": 16,
           "character": 1
         }
       },

.vscode/settings.json

@@ -13,5 +13,5 @@
       "**/cds/lib/req/cls.js",
       "**/odata-v4/okra/**"
     ]
-  },
+  }
 }

README.md

@@ -17,7 +17,7 @@ Find here a collection of samples for the [SAP Cloud Application Programming Mod
 
 ### Download
 
-If you've [Git](https://git-scm.com/downloads) installed, clone this repo as shown below, otherwise [download as ZIP file](archive/master.zip).
+If you've [Git](https://git-scm.com/downloads) installed, clone this repo as shown below, otherwise [download as ZIP file](archive/main.zip).
 
 ```sh
 git clone https://github.com/sap-samples/cloud-cap-samples samples

bookshop/app/vue/app.js

@@ -10,7 +10,7 @@ const books = new Vue ({
     data: {
         list: [],
         book: undefined,
-        order: { amount:1, succeeded:'', failed:'' }
+        order: { quantity:1, succeeded:'', failed:'' }
     },
 
     methods: {
@@ -26,18 +26,18 @@ const books = new Vue ({
             const book = books.book = books.list [eve.currentTarget.rowIndex-1]
             const res = await GET(`/Books/${book.ID}?$select=descr,stock,image`)
             Object.assign (book, res.data)
-            books.order = { amount:1 }
+            books.order = { quantity:1 }
             setTimeout (()=> $('form > input').focus(), 111)
         },
 
         async submitOrder () {
-            const {book,order} = books, amount = parseInt (order.amount) || 1 // REVISIT: Okra should be less strict
+            const {book,order} = books, quantity = parseInt (order.quantity) || 1 // REVISIT: Okra should be less strict
             try {
-                const res = await POST(`/submitOrder`, { amount, book: book.ID })
+                const res = await POST(`/submitOrder`, { quantity, book: book.ID })
                 book.stock = res.data.stock
-                books.order = { amount, succeeded: `Successfully orderd ${amount} item(s).` }
+                books.order = { quantity, succeeded: `Successfully ordered ${quantity} item(s).` }
             } catch (e) {
-                books.order = { amount, failed: e.response.data.error.message }
+                books.order = { quantity, failed: e.response.data.error.message }
             }
         }
 

bookshop/app/vue/index.html

@@ -34,7 +34,7 @@
             <td>{{ book.author }}</td>
             <td>{{ book.genre.name }}</td>
             <td class="rating-stars">
-                {{ ('★'.repeat(Math.round(book.rating))+'☆☆☆☆☆').slice(0,5) }}
+                {{ ('★'.repeat(Math.round(book.rating))+'☆☆☆☆☆').slice(0,5) }} ({{ book.numberOfReviews }})
             </td>
             <td>{{ book.currency && book.currency.symbol }} {{ book.price }}</td>
         </tr>
@@ -48,7 +48,7 @@
             &nbsp;&nbsp; {{ book.stock }} in stock
         </label>
         <form @submit.prevent="submitOrder" style="float:right; display:flex; flex-direction:row-reverse">
-            <input type="number" v-model="order.amount" v-bind:class="{ failed: order.failed }" style="width:5em">
+            <input type="number" v-model="order.quantity" v-bind:class="{ failed: order.failed }" style="width:5em">
             <input type="submit" value="Order:" class="muted-button">
         </form>
         <h4> {{ book.title }} </h4>

bookshop/db/data/sap.capire.bookshop-Authors.csv

@@ -1,5 +1,5 @@
-ID;name
+ID;name;dateOfBirth;placeOfBirth;dateOfDeath;placeOfDeath
-101;Emily Brontë
+101;Emily Brontë;1818-07-30;Thornton, Yorkshire;1848-12-19;Haworth, Yorkshire
-107;Charlotte Brontë
+107;Charlotte Brontë;1818-04-21;Thornton, Yorkshire;1855-03-31;Haworth, Yorkshire
-150;Edgar Allen Poe
+150;Edgar Allen Poe;1809-01-19;Boston, Massachusetts;1849-10-07;Baltimore, Maryland
-170;Richard Carpenter
+170;Richard Carpenter;1929-08-14;King’s Lynn, Norfolk;2012-02-26;Hertfordshire, England

bookshop/db/data/sap.capire.bookshop-Books.csv

@@ -1,6 +1,6 @@
-ID;title;author_ID;genre_ID
+ID;title;descr;author_ID;stock;price;currency_code;genre_ID
-201;Wuthering Heights;101;11
+201;Wuthering Heights;"Wuthering Heights, Emily Brontë's only novel, was published in 1847 under the pseudonym ""Ellis Bell"". It was written between October 1845 and June 1846. Wuthering Heights and Anne Brontë's Agnes Grey were accepted by publisher Thomas Newby before the success of their sister Charlotte's novel Jane Eyre. After Emily's death, Charlotte edited the manuscript of Wuthering Heights and arranged for the edited version to be published as a posthumous second edition in 1850.";101;12;11.11;GBP;11
-207;Jane Eyre;107;11
+207;Jane Eyre;"Jane Eyre /ɛər/ (originally published as Jane Eyre: An Autobiography) is a novel by English writer Charlotte Brontë, published under the pen name ""Currer Bell"", on 16 October 1847, by Smith, Elder & Co. of London. The first American edition was published the following year by Harper & Brothers of New York. Primarily a bildungsroman, Jane Eyre follows the experiences of its eponymous heroine, including her growth to adulthood and her love for Mr. Rochester, the brooding master of Thornfield Hall. The novel revolutionised prose fiction in that the focus on Jane's moral and spiritual development is told through an intimate, first-person narrative, where actions and events are coloured by a psychological intensity. The book contains elements of social criticism, with a strong sense of Christian morality at its core and is considered by many to be ahead of its time because of Jane's individualistic character and how the novel approaches the topics of class, sexuality, religion and feminism.";107;11;12.34;GBP;11
-251;The Raven;150;16
+251;The Raven;"""The Raven"" is a narrative poem by American writer Edgar Allan Poe. First published in January 1845, the poem is often noted for its musicality, stylized language, and supernatural atmosphere. It tells of a talking raven's mysterious visit to a distraught lover, tracing the man's slow fall into madness. The lover, often identified as being a student, is lamenting the loss of his love, Lenore. Sitting on a bust of Pallas, the raven seems to further distress the protagonist with its constant repetition of the word ""Nevermore"". The poem makes use of folk, mythological, religious, and classical references.";150;333;13.13;USD;16
-252;Eleonora;150;16
+252;Eleonora;"""Eleonora"" is a short story by Edgar Allan Poe, first published in 1842 in Philadelphia in the literary annual The Gift. It is often regarded as somewhat autobiographical and has a relatively ""happy"" ending.";150;555;14;USD;16
-271;Catweazle;170;13
+271;Catweazle;Catweazle is a British fantasy television series, starring Geoffrey Bayldon in the title role, and created by Richard Carpenter for London Weekend Television. The first series, produced and directed by Quentin Lawrence, was screened in the UK on ITV in 1970. The second series, directed by David Reid and David Lane, was shown in 1971. Each series had thirteen episodes, most but not all written by Carpenter, who also published two books based on the scripts.;170;22;150;JPY;13

bookshop/db/data/sap.capire.bookshop-Books_texts.csv

@@ -1,5 +1,5 @@
-ID;locale;title
+ID;locale;title;descr
-201;de;Sturmhöhe
+201;de;Sturmhöhe;Sturmhöhe (Originaltitel: Wuthering Heights) ist der einzige Roman der englischen Schriftstellerin Emily Brontë (1818–1848). Der 1847 unter dem Pseudonym Ellis Bell veröffentlichte Roman wurde vom viktorianischen Publikum weitgehend abgelehnt, heute gilt er als ein Klassiker der britischen Romanliteratur des 19. Jahrhunderts.
-201;fr;Les Hauts de Hurlevent
+201;fr;Les Hauts de Hurlevent;Les Hauts de Hurlevent (titre original : Wuthering Heights), parfois orthographié Les Hauts de Hurle-Vent, est l'unique roman d'Emily Brontë, publié pour la première fois en 1847 sous le pseudonyme d’Ellis Bell. Loin d'être un récit moralisateur, Emily Brontë achève néanmoins le roman dans une atmosphère sereine, suggérant le triomphe de la paix et du Bien sur la vengeance et le Mal.
-207;de;Jane Eyre
+207;de;Jane Eyre;Jane Eyre. Eine Autobiographie (Originaltitel: Jane Eyre. An Autobiography), erstmals erschienen im Jahr 1847 unter dem Pseudonym Currer Bell, ist der erste veröffentlichte Roman der britischen Autorin Charlotte Brontë und ein Klassiker der viktorianischen Romanliteratur des 19. Jahrhunderts. Der Roman erzählt in Form einer Ich-Erzählung die Lebensgeschichte von Jane Eyre (ausgesprochen /ˌdʒeɪn ˈɛə/), die nach einer schweren Kindheit eine Stelle als Gouvernante annimmt und sich in ihren Arbeitgeber verliebt, jedoch immer wieder um ihre Freiheit und Selbstbestimmung kämpfen muss. Als klein, dünn, blass, stets schlicht dunkel gekleidet und mit strengem Mittelscheitel beschrieben, gilt die Heldin des Romans Jane Eyre nicht zuletzt aufgrund der Kino- und Fernsehversionen der melodramatischen Romanvorlage als die bekannteste englische Gouvernante der Literaturgeschichte
-252;de;Eleonora
+252;de;Eleonora;“Eleonora” ist eine Erzählung von Edgar Allan Poe. Sie wurde 1841 erstveröffentlicht. In ihr geht es um das Paradox der Treue in der Treulosigkeit.

bookshop/db/data/sap.capire.bookshop-Genres.csv

@@ -14,8 +14,3 @@ ID;parent_ID;name
 22;21;Autobiography
 23;20;Essay
 24;20;Speech
-30;;Others
-31;30;Other-A
-32;30;Other-A
-33;30;Other-A
-34;30;Other-A

bookshop/db/schema.cds

@@ -1,19 +1,29 @@
-using { Currency, managed, sap } from '@sap/cds/common';
+using { Currency, managed, sap, extensible } from '@sap/cds/common';
 namespace sap.capire.bookshop;
 
-entity Books {
+entity Books : managed, extensible {
   key ID : Integer;
   title  : localized String(111);
+  descr  : localized String(1111);
   author : Association to Authors;
   genre  : Association to Genres;
+  stock  : Integer;
+  price  : Decimal;
+  currency : Currency;
+  image : LargeBinary @Core.MediaType : 'image/png';
 }
 
-entity Authors {
+entity Authors : managed, extensible {
   key ID : Integer;
   name   : String(111);
+  dateOfBirth  : Date;
+  dateOfDeath  : Date;
+  placeOfBirth : String;
+  placeOfDeath : String;
   books  : Association to many Books on books.author = $self;
 }
 
+/** Hierarchically organized Code List for Genres */
 entity Genres : sap.common.CodeList {
   key ID   : Integer;
   parent   : Association to Genres;

bookshop/index.cds

@@ -1,3 +1,4 @@
 namespace sap.capire.bookshop; //> important for reflection
 using from './db/schema';
+using from './srv/cat-service';
 using from './srv/admin-service';

bookshop/index.js

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

bookshop/package.json

@@ -3,42 +3,20 @@
   "version": "1.0.0",
   "description": "A simple self-contained bookshop service.",
   "dependencies": {
+    "@capire/common": "*",
     "@sap/cds": "^5.0.4",
     "express": "^4.17.1",
-    "passport": "0.4.1",
+    "passport": "0.4.1"
-    "@sap/hana-client": "^2.7.21"
   },
   "scripts": {
+    "genres": "cds serve test/genres.cds",
+    "start": "cds run",
     "watch": "cds watch"
   },
   "cds": {
     "requires": {
       "db": {
-        "kind": "sql",
+        "kind": "sql"
-        "xxx-model": "*",
-        "xxx-credentials": {
-            "database": "localSqlite.db"
-        }
-      },
-      "[production]": {
-          "db": {
-              "kind": "hana",
-              "model": [
-                  "db",
-                  "srv"
-              ]
-          }
-      }
-    },
-    "features": {
-      "assert_integrity": false
-    },
-    "hana": {
-        "deploy-format": "hdbtable"
-    },
-    "cdsc": {
-      "beta": {
-        "foreignKeyConstraints": true
       }
     }
   }

bookshop/readme.md

@@ -1,126 +1,31 @@
-# Foreign key constraints on DB
+# Bookshop Getting Started Sample
 
-As model we use a simplified version of the bookshop scenario, we work with nodejs runtime.
+This stand-alone sample introduces the essential tasks in the development of CAP-based services as also covered in the [Getting Started guide in capire](https://cap.cloud.sap/docs/get-started/in-a-nutshell).
 
+## Hypothetical Use Cases
 
-## Preparation
+1. Build a service that allows to browse _Books_ and _Authors_.
+2. Books have assigned _Genres_, which are organized hierarchically.
+3. All users may browse books without login.
+4. All entries are maintained by Administrators.
+5. End users may order books (the actual order mgmt being out of scope).
 
-As we want to see the effects of the database constaints, we first need to switch off the integrity checks done by the node runtime. In the `package.json`:
+## Running the Sample
-```json
+
-"cds": {
+```sh
-  ...,
+npm run watch
-  "features": {
-    "assert_integrity": false
-  }
-}
 ```
 
-Then switch on constraint generation. In the `package.json`:
+## Content & Best Practices
-```json
-"cds": {
-  ...,
-  "cdsc": {
-    "beta": {
-      "foreignKeyConstraints": true
-    }
-  }
-}
-```
 
-## SQLite
+| Links to capire                                                                                           | Sample files / folders               |
-
+| --------------------------------------------------------------------------------------------------------- | ------------------------------------ |
-In SQLite, FK constraints can only be specified during the creation of a table. They cannot be altered for an existing table. So here we at least don't have issues with existing data.
+| [Project Setup & Layouts](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)    | [`./`](./)                           |
-
+| [Domain Modeling with CDS](https://cap.cloud.sap/docs/guides/domain-models)                               | [`./db/schema.cds`](./db/schema.cds) |
-For SQLite, constraint checks need to be enabled by application at runtime for each db connection with the command
+| [Defining Services](https://cap.cloud.sap/docs/guides/services#defining-services)                         | [`./srv/*.cds`](./srv)               |
-```sql
+| [Single-purposed Services](https://cap.cloud.sap/docs/guides/services#single-purposed-services)           | [`./srv/*.cds`](./srv)               |
-PRAGMA foreign_keys = ON;
+| [Providing & Consuming Providers](https://cap.cloud.sap/docs/guides/providing-services)                   | http://localhost:4004                |
-```
+| [Using Databases](https://cap.cloud.sap/docs/guides/databases)                                            | [`./db/data/*.csv`](./db/data)       |
-We do this via a custom handler in `admin-service.js`.
+| [Adding Custom Logic](https://cap.cloud.sap/docs/guides/service-impl)                                     | [`./srv/*.js`](./srv)                |
-
+| Adding Tests                                                                                              | [`./test`](./test)                   |
-Now run the requests in `requests.http` (use `http://localhost:4004` as server URL). They behave as expected.
+| [Sharing for Reuse](https://cap.cloud.sap/docs/guides/reuse-and-compose)                                  | [`./index.cds`](./index.cds)         |
-
-But the error messages are not providing any details. They say "constraint violation", but they don't say which table/constraint is violated:
-```
-HTTP/1.1 500 Internal Server Error
-...
-{
-  "error": {
-    "code": "SQLITE_CONSTRAINT",
-    "message": "SQLITE_CONSTRAINT: FOREIGN KEY constraint failed in: \nCOMMIT"
-  }
-}
-```
-
-The runtime constraint checks do provide the name of the restricting association (but not the name of the entity where the association lives).
-
-## HANA
-
-Preparation:
-* logon to cf account (e.g. trial)
-* create HANA service instance: `cf create-service hanatrial hdi-shared bookshop-db`
-
-First make the deplyoment without constraints (switch off constraint generation in `package.json`).
-
-* Run `cds build --production`. No constraints are generated.
-* Deploy db model: `cf push -f gen/db`
-* Deploy nodejs app: `cf push -f gen/srv --random-route`. Take note of the app URL.
-
-Run the requests in `request.http` (use the URL from the previous step as server URL, prepend with `https://`).
-Make sure to introduce some data that violates the constraints. No errors are reported - as expected.
-
-Now switch on constraint generation in `package.json`. 
-
-* Run `cds build --production`. The constraints are placed in separate `hdbconstraint` files in `gen\db\src\gen`. They are generated with `VALIDATED ON`.
-* Re-deploy db model: `cf push -f gen/db`. It fails, as the existing data violates the constraints.
-* Check logs: `cf logs bookshop-db-deployer --recent`.
-
-```
-Error: com.sap.hana.di.constraint: Could not create the database object [8250005]
-  at "src/gen/sap.capire.bookshop.Books_author.hdbconstraint" (1:1)
- Error: com.sap.hana.di.constraint: Database error 7: : feature not supported: referential constraint violated by existing value [8201003]
-   at "src/gen/sap.capire.bookshop.Books_author.hdbconstraint" (1:1)
-```
-You can see which constraint is violated, but there is no info about the offensive entries.
-
-Now use the requests from `request.http` to fix the entries that have been broken above.
-
-* Re-deploy db model: `cf push -f gen/db`. It should succeed.
-
-Again run the requests from `request.http`. This time all changes that would lead to a
-constraint violation fail.
-
-Inserting a book with non-existing author ID or changing a book's author ID to an invalid value yields
-the message
-```
-HTTP/1.1 500 Internal Server Error
-...
-{
-  "error": {
-    "code": "500",
-    "message": "Internal Server Error"
-  }
-}
-```
-When trying to delete a genre that is still referenced in a book we get
-```
-HTTP/1.1 462 status code 462
-...
-{
-  "error": {
-    "code": "462",
-    "message": "failed on update or delete by foreign key constraint violation: TrexColumnUpdate failed on table '21F87859727E470E94917B690908A09D:SAP_CAPIRE_BOOKSHOP_GENRES' with error: DELETE on 21F87859727E470E94917B690908A09D:SAP_CAPIRE_BOOKSHOP_GENRES(ID) failed, because 1 rows with corresponding foreign keys still exist in 21F87859727E470E94917B690908A09D:SAP_CAPIRE_BOOKSHOP_BOOKS(GENRE_ID), rc=1536"
-  }
-}
-```
-
-Note: when using `cdsc` to generate the constraints
-```
-cdsc Q --beta foreignKeyConstraints -d hana -s hdi -o dbstuff db\schema.cds srv\admin-service.cds
-```
-there will be constraints for e.g. `sap_common_Currencies_texts`. This cannot be deplyoed, as the corresponding table is removed from `cds` via the tree-shaking mechanism. These constraints need to be removed manually before deployment.
-
-## Todo
-
-* Provide a way to control parameters `VALIDATED` and `ENFORCED` of the constraints (only interesting for HANA, as in SQLite changing constraints after table generation is not possible).
-* Provide some tool to identify existing entries that violate constraints. We can generate a list of `SELECT` statements that find these entries, but how do we run it and show the results to the user?
-* Can runtimes improve the error messages?

bookshop/srv/admin-service.cds

@@ -1,6 +1,5 @@
 using { sap.capire.bookshop as my } from '../db/schema';
-service AdminService {
+service AdminService @(requires:'admin') {
   entity Books as projection on my.Books;
   entity Authors as projection on my.Authors;
-  entity Genres as projection on my.Genres;
 }

bookshop/srv/admin-service.js

@@ -1,15 +1,12 @@
-// sqlite: FK constraint checks need to be enabled by application at runtime
-// for each db connection
 const cds = require('@sap/cds')
-module.exports = cds.service.impl (async function(){ 
 
-  const db = await cds.connect.to('db')
+module.exports = cds.service.impl (function(){
-
+  this.before ('NEW','Authors', genid)
-  if (db.kind === 'sqlite')
+  this.before ('NEW','Books', genid)
-  {
-    db.before('BEGIN', function (req) { 
-      //console.log('--- PRAGMA foreign_keys = ON ---')
-      return this.dbc.run('PRAGMA foreign_keys = ON;')
-    })
-  }
 })
+
+/** Generate primary keys for target entity in request */
+async function genid (req) {
+  const {ID} = await cds.tx(req).run (SELECT.one.from(req.target).columns('max(ID) as ID'))
+  req.data.ID = ID - ID % 100 + 100 + 1
+}

bookshop/srv/cat-service.cds

@@ -0,0 +1,16 @@
+using { sap.capire.bookshop as my } from '../db/schema';
+service CatalogService @(path:'/browse') {
+
+  /** For displaying lists of Books */
+  @readonly entity ListOfBooks as projection on Books
+  excluding { descr };
+
+  /** For display in details pages */
+  @readonly entity Books as projection on my.Books { *,
+    author.name as author
+  } excluding { createdBy, modifiedBy };
+
+  @requires: 'authenticated-user'
+  action submitOrder ( book: Books:ID, quantity: Integer ) returns { stock: Integer };
+  event OrderedBook : { book: Books:ID; quantity: Integer; buyer: String };
+}

bookshop/srv/cat-service.js

@@ -0,0 +1,26 @@
+const cds = require('@sap/cds')
+
+class CatalogService extends cds.ApplicationService { init(){
+
+  const { Books } = cds.entities ('sap.capire.bookshop')
+
+  // Reduce stock of ordered books if available stock suffices
+  this.on ('submitOrder', async req => {
+    const {book,quantity} = req.data
+    if (quantity < 1) return req.reject (400,`quantity has to be 1 or more`)
+    let {stock} = await SELECT `stock` .from (Books,book)
+    if (quantity > stock) return req.reject (409,`${quantity} exceeds stock for book #${book}`)
+    await UPDATE (Books,book) .with ({ stock: stock -= quantity })
+    await this.emit ('OrderedBook', { book, quantity, buyer:req.user.id })
+    return { stock }
+  })
+
+  // Add some discount for overstocked books
+  this.after ('READ','ListOfBooks', each => {
+    if (each.stock > 111) each.title += ` -- 11% discount!`
+  })
+
+  return super.init()
+}}
+
+module.exports = { CatalogService }

bookshop/test/genres.cds

@@ -0,0 +1,4 @@
+using { sap.capire.bookshop as my } from '../db/schema';
+service TestService {
+  entity Genres as projection on my.Genres;
+}

bookshop/test/genres.http

@@ -0,0 +1,38 @@
+#################################################
+#
+#   Genres
+#
+
+GET http://localhost:4004/test/Genres?
+###
+
+GET http://localhost:4004/test/Genres?
+&$filter=parent_ID eq null&$select=name
+&$expand=children($select=name)
+###
+
+POST http://localhost:4004/test/Genres?
+Content-Type: application/json
+
+{ "ID":100, "name":"Some Sample Genres...", "children":[
+    { "ID":101, "name":"Cat", "children":[
+        { "ID":102, "name":"Kitty", "children":[
+            { "ID":103, "name":"Kitty Cat", "children":[
+                { "ID":104, "name":"Aristocat" } ]},
+            { "ID":105, "name":"Kitty Bat" } ]},
+        { "ID":106, "name":"Catwoman", "children":[
+            { "ID":107, "name":"Catalina" } ]} ]},
+    { "ID":108, "name":"Catweazle" }
+]}
+###
+
+GET http://localhost:4004/test/Genres(100)?
+# &$expand=children
+# &$expand=children($expand=children($expand=children($expand=children)))
+###
+
+DELETE http://localhost:4004/test/Genres(103)
+###
+
+DELETE http://localhost:4004/test/Genres(100)
+###

bookshop/test/requests.http

@@ -1,68 +1,95 @@
-# running locally
 @server = http://localhost:4004
-
+@me = Authorization: Basic {{$processEnv USER}}:
-# running on cf
-#@server = https://bookshop-srv-....hana.ondemand.com
-
-### get all books
-GET {{server}}/admin/Books
-
-### get all authors
-GET {{server}}/admin/Authors
-
-### get all genres
-GET {{server}}/admin/Genres
 
 
-### create book with wrong author ID -> should fail
+### ------------------------------------------------------------------------
-POST {{server}}/admin/Books
+# Get service info
-Content-Type: application/json
+GET {{server}}/browse
+{{me}}
+
+
+### ------------------------------------------------------------------------
+# Get $metadata document
+GET {{server}}/browse/$metadata
+{{me}}
+
+
+### ------------------------------------------------------------------------
+# Browse Books as any user
+GET {{server}}/browse/Books?
+  # &$select=title,stock
+  # &$expand=currency
+  # &sap-language=de
+{{me}}
+
+
+### ------------------------------------------------------------------------
+# Fetch Authors as admin
+GET {{server}}/admin/Authors?
+  # &$select=name,dateOfBirth,placeOfBirth
+  # &$expand=books($select=title;$expand=currency)
+  # &$filter=ID eq 101
+  # &sap-language=de
+Authorization: Basic alice:
+
+### ------------------------------------------------------------------------
+# Create Author
+POST {{server}}/admin/Authors
+Content-Type: application/json;IEEE754Compatible=true
+Authorization: Basic alice:
 
 {
-  "ID": 701,
+  "ID": 112,
-  "title": "XXX",
+  "name": "Shakespeeeeere",
-  "author": { "ID": 9999 }
+  "age": 22
 }
 
-### create book with correct author ID -> should work
+
+### ------------------------------------------------------------------------
+# Create book
 POST {{server}}/admin/Books
 Content-Type: application/json;IEEE754Compatible=true
+Authorization: Basic alice:
 
 {
-  "ID": 702,
+  "ID": 2,
   "title": "Poems : Pocket Poets",
-  "author": { "ID": 101 }
+  "descr": "The Everyman's Library Pocket Poets hardcover series is popular for its compact size and reasonable price which does not compromise content. Poems: Bronte contains poems that demonstrate a sensibility elemental in its force with an imaginative discipline and flexibility of the highest order. Also included are an Editor's Note and an index of first lines.",
+  "author": { "ID": 101 },
+  "genre": { "ID": 12 },
+  "stock": 5,
+  "price": "12.05",
+  "currency": { "code": "USD" }
 }
 
-### delete book
-DELETE {{server}}/admin/Books(ID=701)
 
-### change book to wrong author ID -> should fail
+### ------------------------------------------------------------------------
+# Put image to books
+PUT {{server}}/admin/Books(2)/image
+Content-Type: image/png
+Authorization: Basic alice:
 
-PATCH {{server}}/admin/Books(ID=207)
+data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAANwAAADcCAYAAAAbWs+BAAAGwElEQVR4Ae3cwZFbNxBFUY5rkrDTmKAUk5QT03Aa44U22KC7NHptw+DRikVAXf8fzC3u8Hj4R4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgZzAW26USQT+e4HPx+Mz+RRvj0e0kT+SD2cWAQK1gOBqH6sEogKCi3IaRqAWEFztY5VAVEBwUU7DCNQCgqt9rBKICgguymkYgVpAcLWPVQJRAcFFOQ0jUAsIrvaxSiAqILgop2EEagHB1T5WCUQFBBflNIxALSC42scqgaiA4KKchhGoBQRX+1glEBUQXJTTMAK1gOBqH6sEogKCi3IaRqAWeK+Xb1z9iN558fHxcSPS9p2ezx/ROz4e4TtIHt+3j/61hW9f+2+7/+UXbifjewIDAoIbQDWSwE5AcDsZ3xMYEBDcAKqRBHYCgtvJ+J7AgIDgBlCNJLATENxOxvcEBgQEN4BqJIGdgOB2Mr4nMCAguAFUIwnsBAS3k/E9gQEBwQ2gGklgJyC4nYzvCQwICG4A1UgCOwHB7WR8T2BAQHADqEYS2AkIbifjewIDAoIbQDWSwE5AcDsZ3xMYEEjfTzHwiK91B8npd6Q8n8/oGQ/ckRJ9vvQwv3BpUfMIFAKCK3AsEUgLCC4tah6BQkBwBY4lAmkBwaVFzSNQCAiuwLFEIC0guLSoeQQKAcEVOJYIpAUElxY1j0AhILgCxxKBtIDg0qLmESgEBFfgWCKQFhBcWtQ8AoWA4AocSwTSAoJLi5pHoBAQXIFjiUBaQHBpUfMIFAKCK3AsEUgLCC4tah6BQmDgTpPsHSTFs39p6fQ7Q770UsV/Ov19X+2OFL9wxR+rJQJpAcGlRc0jUAgIrsCxRCAtILi0qHkECgHBFTiWCKQFBJcWNY9AISC4AscSgbSA4NKi5hEoBARX4FgikBYQXFrUPAKFgOAKHEsE0gKCS4uaR6AQEFyBY4lAWkBwaVHzCBQCgitwLBFICwguLWoegUJAcAWOJQJpAcGlRc0jUAgIrsCxRCAt8J4eePq89B0ar3ZnyOnve/rfn1+400/I810lILirjtPLnC4guNNPyPNdJSC4q47Ty5wuILjTT8jzXSUguKuO08ucLiC400/I810lILirjtPLnC4guNNPyPNdJSC4q47Ty5wuILjTT8jzXSUguKuO08ucLiC400/I810lILirjtPLnC4guNNPyPNdJSC4q47Ty5wuILjTT8jzXSUguKuO08ucLiC400/I810l8JZ/m78+szP/zI47fJo7Q37vgJ7PHwN/07/3TOv/9gu3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhg4P6H9J0maYHXuiMlrXf+vOfA33Turf3C5SxNItAKCK4lsoFATkBwOUuTCLQCgmuJbCCQExBcztIkAq2A4FoiGwjkBASXszSJQCsguJbIBgI5AcHlLE0i0AoIriWygUBOQHA5S5MItAKCa4lsIJATEFzO0iQCrYDgWiIbCOQEBJezNIlAKyC4lsgGAjkBweUsTSLQCgiuJbKBQE5AcDlLkwi0Akff//Dz6U+/I6U1/sUNr3bnytl3kPzi4bXb/cK1RDYQyAkILmdpEoFWQHAtkQ0EcgKCy1maRKAVEFxLZAOBnIDgcpYmEWgFBNcS2UAgJyC4nKVJBFoBwbVENhDICQguZ2kSgVZAcC2RDQRyAoLLWZpEoBUQXEtkA4GcgOByliYRaAUE1xLZQCAnILicpUkEWgHBtUQ2EMgJCC5naRKBVkBwLZENBHIC/4M7TXIv+3PS22d24qvdQfL3C/7N5P5i/MLlLE0i0AoIriWygUBOQHA5S5MItAKCa4lsIJATEFzO0iQCrYDgWiIbCOQEBJezNIlAKyC4lsgGAjkBweUsTSLQCgiuJbKBQE5AcDlLkwi0AoJriWwgkBMQXM7SJAKtgOBaIhsI5AQEl7M0iUArILiWyAYCOQHB5SxNItAKCK4lsoFATkBwOUuTCBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDAvyrwDySEJ2VQgUSoAAAAAElFTkSuQmCC
-Content-Type:application/json
-
-{"author_ID": 9999}
-
-### change book to correct author ID -> should work
-
-PATCH {{server}}/admin/Books(ID=207)
-Content-Type:application/json
-
-{"author_ID": 170}
 
 
-
+### ------------------------------------------------------------------------
-### delete "leaf" genre that is used in a book -> should not work
+# Reading image from from the server directly
-DELETE {{server}}/admin/Genres(ID=13)
+GET {{server}}/browse/Books(2)/image
-
-### delete "leaf" genre that is not used in a book -> should work
-DELETE {{server}}/admin/Genres(ID=14)
 
 
-### delete "header" genre where leaves are used in a book -> should not work
+### ------------------------------------------------------------------------
-DELETE {{server}}/admin/Genres(ID=10)
+# Submit Order as authenticated user
+# (send that three times to get out-of-stock message)
+POST {{server}}/browse/submitOrder
+Content-Type: application/json
+{{me}}
+
+{ "book":201, "quantity":5 }
 
 
-### delete "header" genre where leaves are not used in a book -> should work and delete all leaves
+### ------------------------------------------------------------------------
-DELETE {{server}}/admin/Genres(ID=30)
+# Browse Genres
+GET {{server}}/browse/Genres?
+# &$filter=parent_ID eq null&$select=name
+# &$expand=children($select=name)
+{{me}}

bookstore/index.cds

@@ -0,0 +1,2 @@
+namespace sap.capire.bookshop; //> important for reflection
+using from './srv/mashup';

bookstore/package.json

@@ -0,0 +1,33 @@
+{
+  "name": "@capire/bookstore",
+  "version": "1.0.0",
+  "dependencies": {
+    "@capire/bookshop": "*",
+    "@capire/reviews": "*",
+    "@capire/orders": "*",
+    "@capire/common": "*",
+    "@sap/cds": "^5",
+    "express": "^4.17.1"
+  },
+  "cds": {
+    "requires": {
+      "ReviewsService": {
+        "kind": "odata",
+        "model": "@capire/reviews"
+      },
+      "OrdersService": {
+        "kind": "odata",
+        "model": "@capire/orders"
+      },
+      "messaging": {
+        "[development]": { "kind": "file-based-messaging" },
+        "[hybrid]": { "kind": "enterprise-messaging-shared" },
+        "[production]": { "kind": "enterprise-messaging" }
+      },
+      "db": {
+        "kind": "sql"
+      }
+    },
+    "log": { "service": true }
+  }
+}

bookstore/server.js

@@ -0,0 +1,21 @@
+const cds = require ('@sap/cds')
+
+// Add mashup logic
+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')
+})
+
+// Add Swagger UI
+require('./srv/swagger-ui')
+
+// Returning cds.server
+module.exports = cds.server
+
+// For didactic reasons in capire
+const { ReviewsService, OrdersService } = cds.requires
+if (!ReviewsService.credentials && !OrdersService.credentials) cds.requires.messaging = false

bookstore/srv/mashup.cds

@@ -1,6 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////
 //
-//    Mashing up imported models...
+//    Enhancing bookshop with Reviews and Orders provided through
+//    respective reuse packages and services
 //
 
 using { sap.capire.bookshop.Books } from '@capire/bookshop';
@@ -8,18 +9,24 @@ using { sap.capire.bookshop.Books } from '@capire/bookshop';
 //
 //  Extend Books with access to Reviews and average ratings
 //
-
 using { ReviewsService.Reviews } from '@capire/reviews';
 extend Books with {
   reviews : Composition of many Reviews on reviews.subject = $self.ID;
   rating  : Decimal;
+  numberOfReviews : Integer;
 }
 
+
 //
 //  Extend Orders with Books as Products
 //
-
+using { sap.capire.orders.Orders } from '@capire/orders';
-using { sap.capire.orders.Orders_Items } from '@capire/orders';
+extend Orders with {
-extend Orders_Items with {
+  extend Items with {
-  book : Association to Books on product.ID = book.ID
+    book : Association to Books on product.ID = book.ID
+  }
 }
+
+
+// Add orders fiori app (in case of embedded orders service)
+using from '@capire/orders/app/fiori';

bookstore/srv/mashup.js

@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 //
-//    Mashing up provided and required services...
+//    Mashing up bookshop services with required services...
 //
 module.exports = async()=>{ // called by server.js
 
@@ -20,30 +20,29 @@ module.exports = async()=>{ // called by server.js
   CatalogService.prepend (srv => srv.on ('READ', 'Books/reviews', (req) => {
     console.debug ('> delegating request to ReviewsService')
     const [id] = req.params, { columns, limit } = req.query.SELECT
-    return ReviewsService.tx(req).read ('Reviews',columns).limit(limit).where({subject:String(id)})
+    return ReviewsService.read ('Reviews',columns).limit(limit).where({subject:String(id)})
   }))
 
   //
   // Create an order with the OrdersService when CatalogService signals a new order
   //
   CatalogService.on ('OrderedBook', async (msg) => {
-    const { book, amount, buyer } = msg.data
+    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({
       OrderNo: 'Order at '+ (new Date).toLocaleString(),
-      Items: [{ product:{ID:`${book}`}, title, price, amount }],
+      Items: [{ product:{ID:`${book}`}, title, price, quantity }],
       buyer, createdBy: buyer
     })
   })
 
   //
-  // Update Books' average ratings when ReviewsService signals updatd reviews
+  // Update Books' average ratings when ReviewsService signals updated reviews
   //
   ReviewsService.on ('reviewed', (msg) => {
     console.debug ('> received:', msg.event, msg.data)
-    const { subject, rating } = msg.data
+    const { subject, count, rating } = msg.data
-    return UPDATE(Books,subject).with({rating})
+    return UPDATE(Books,subject).with({ numberOfReviews:count, rating })
-    // ^ Note: the framework will execute this and take care for db.tx
   })
 
   //
@@ -51,9 +50,9 @@ module.exports = async()=>{ // called by server.js
   //
   OrdersService.on ('OrderChanged', (msg) => {
     console.debug ('> received:', msg.event, msg.data)
-    const { product, deltaAmount } = msg.data
+    const { product, deltaQuantity } = msg.data
     return UPDATE (Books) .where ('ID =', product)
-    .and ('stock >=', deltaAmount)
+    .and ('stock >=', deltaQuantity)
-    .set ('stock -=', deltaAmount)
+    .set ('stock -=', deltaQuantity)
   })
 }

bookstore/srv/swagger-ui.js

@@ -0,0 +1,10 @@
+
+// -----------------------------------------------------------------------
+// Adding Swagger UI - see https://cap.cloud.sap/docs/advanced/openapi
+const cds = require ('@sap/cds')
+try {
+  const cds_swagger = require ('cds-swagger-ui-express')
+  cds.once ('bootstrap', app => app.use (cds_swagger()) )
+} catch (err) {
+  if (err.code !== 'MODULE_NOT_FOUND')  throw err
+}

bookstore/test/requests.http

@@ -2,7 +2,7 @@
 @bookshop = http://localhost:4004
 @reviews-service = {{bookshop}}/reviews
 # Uncomment this when running a separate reviews service
-@reviews-service = http://localhost:4005/reviews
+# @reviews-service = http://localhost:4005/reviews
 
 
 
@@ -38,7 +38,11 @@ GET {{bookshop}}/browse/Books(201)?
 &$select=ID,title,rating
 &$expand=reviews
 
+###
 
+GET {{bookshop}}/browse/Books?
+  &$select=title,author&$expand=currency
+Accept-Language: de
 
 #################################################
 #

common/data/sap.common-Currencies_texts.csv

@@ -5,9 +5,11 @@ CAD;de;Kanadischer Dollar;Kanadischer Dollar
 AUD;de;Australischer Dollar;Australischer Dollar
 GBP;de;Pfund;Britische Pfund
 ILS;de;Schekel;Israelische Schekel
+JPY;de;Yen;Japanische Yen
 EUR;fr;euro;de la Zone euro
 USD;fr;dollar;dollar des États-Unis
 CAD;fr;dollar canadien;dollar canadien
 AUD;fr;dollar australien;dollar australien
 GBP;fr;livre sterling;pound sterling
 ILS;fr;Shekel;shekel israelien
+JPY;fr;Yen;Yen japonais

fiori/.env

@@ -1,2 +0,0 @@
-# cds.requires.messaging.kind = file-based-messaging
-PORT = 4004

fiori/app/admin-authors/fiori-service.cds

@@ -0,0 +1,47 @@
+using {AdminService} from '@capire/bookshop';
+
+annotate AdminService.Authors with @odata.draft.enabled;
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Authors Object Page
+//
+annotate AdminService.Authors with @(UI : {
+  HeaderInfo : {
+    TypeName : 'Author',
+    TypeNamePlural : 'Authors',
+    Description : {Value : lifetime}
+  },
+  Facets : [
+    {
+      $Type : 'UI.ReferenceFacet',
+      Label : '{i18n>Details}',
+      Target : '@UI.FieldGroup#Details'
+    },
+    {
+      $Type : 'UI.ReferenceFacet',
+      Label : '{i18n>Books}',
+      Target : 'books/@UI.LineItem'
+    },
+  ],
+  FieldGroup #Details : {Data : [
+    {Value : placeOfBirth},
+    {Value : placeOfDeath},
+    {Value : dateOfBirth},
+    {Value : dateOfDeath},
+    {
+      Value : age,
+      Label : '{i18n>Age}'
+    },
+  ]},
+});
+
+
+// Workaround to avoid errors for unknown db-specific calculated fields above
+extend sap.capire.bookshop.Authors with {
+  virtual age      : Integer;
+  virtual lifetime : String;
+}
+
+// Workaround for Fiori popup for asking user to enter a new UUID on Create
+annotate AdminService.Authors with { ID @Core.Computed; }

fiori/app/admin-authors/webapp/Component.js

@@ -0,0 +1,7 @@
+sap.ui.define(["sap/fe/core/AppComponent"], function (AppComponent) {
+  "use strict";
+  return AppComponent.extend("authors.Component", {
+    metadata: { manifest: "json" },
+  });
+});
+/* eslint no-undef:0 */

fiori/app/admin-authors/webapp/i18n/i18n.properties

@@ -0,0 +1,11 @@
+# This is the resource bundle of itelo
+# __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
+
+# JCI app descriptor contains lower case TITLE
+appTitle=Bookshop Authors
+
+# JCI app descriptor contains lower case DESCRIPTION
+appSubTitle=Bookshop Authors
+
+# JCI app descriptor contains lower case DESCRIPTION
+appDescription=Bookshop Authors

fiori/app/admin-authors/webapp/manifest.json

@@ -0,0 +1,145 @@
+{
+  "_version": "1.28.0",
+  "sap.app": {
+    "id": "authors",
+    "type": "application",
+    "title": "Manage Authors",
+    "description": "Sample Application",
+    "i18n": "i18n/i18n.properties",
+    "applicationVersion": {
+      "version": "1.0.0"
+    },
+    "dataSources": {
+      "AdminService": {
+        "uri": "/admin/",
+        "type": "OData",
+        "settings": {
+          "odataVersion": "4.0"
+        }
+      }
+    },
+    "sourceTemplate": {
+      "id": "ui5template.basicSAPUI5ApplicationProject",
+      "-id": "ui5template.smartTemplate",
+      "version": "1.40.12"
+    },
+    "crossNavigation": {
+      "inbounds": {
+        "intent1": {
+          "signature": {
+            "parameters": {
+              "Books.author.ID":{
+                "renameTo": "ID"
+              }
+            },
+            "additionalParameters": "ignored"
+          },
+          "semanticObject": "Authors",
+          "action": "display",
+          "title": "{{appTitle}}",
+          "info": "{{appInfo}}",
+          "subTitle": "{{appSubTitle}}",
+          "icon": "sap-icon://SAP-icons-TNT/user",
+          "indicatorDataSource": {
+            "dataSource": "AdminService",
+            "path": "Authors/$count",
+            "refresh": 1800
+          }
+        }
+      }
+    }
+  },
+  "sap.ui5": {
+    "flexEnabled": true,
+        "config": {   
+            "experimentalCAPScenario": true
+        },
+    "dependencies": {
+      "minUI5Version": "1.81.0",
+      "libs": {
+        "sap.fe.templates": {}
+      }
+    },
+    "models": {
+      "i18n": {
+        "type": "sap.ui.model.resource.ResourceModel",
+        "uri": "i18n/i18n.properties"
+      },
+      "": {
+        "dataSource": "AdminService",
+        "settings": {
+          "synchronizationMode": "None",
+          "operationMode": "Server",
+          "autoExpandSelect": true,
+          "earlyRequests": true,
+          "groupProperties": {
+            "default": {
+              "submit": "Auto"
+            }
+          }
+        }
+      }
+    },
+    "routing": {
+      "routes": [
+        {
+          "pattern": ":?query:",
+          "name": "AuthorsList",
+          "target": "AuthorsList"
+        },
+        {
+          "pattern": "Authors({key}):?query:",
+          "name": "AuthorsDetails",
+          "target": "AuthorsDetails"
+        }
+      ],
+      "targets": {
+        "AuthorsList": {
+          "type": "Component",
+          "id": "AuthorsList",
+          "name": "sap.fe.templates.ListReport",
+          "options": {
+            "settings": {
+              "entitySet": "Authors",
+              "initialLoad": true,
+              "navigation": {
+                "Authors": {
+                  "detail": {
+                    "route": "AuthorsDetails"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "AuthorsDetails": {
+          "type": "Component",
+          "id": "AuthorsDetailsList",
+          "name": "sap.fe.templates.ObjectPage",
+          "options": {
+            "settings": {
+              "entitySet": "Authors"
+            }
+          }
+        }
+      }
+    },
+    "contentDensities": {
+      "compact": true,
+      "cozy": true
+    }
+  },
+  "sap.ui": {
+    "technology": "UI5",
+    "fullWidth": false,
+    "deviceTypes":{
+      "desktop": true,
+      "tablet": true,
+      "phone": true
+    }
+  },
+  "sap.fiori": {
+    "registrationIds": [],
+    "archeType": "transactional"
+  }
+}

fiori/app/admin-books/fiori-service.cds

@@ -1,4 +1,5 @@
-using { AdminService } from '../../db/schema';
+using { AdminService } from '@capire/bookstore';
+using from '../common'; // to help UI linter get the complete annotations
 
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -39,27 +40,6 @@ annotate AdminService.Books with @(
 	}
 );
 
-annotate AdminService.Authors with @(
-	UI: {
-		HeaderInfo: {
-			Description: {Value: lifetime}
-		},
-		Facets: [
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Books}', Target: 'books/@UI.LineItem'},
-		],
-		FieldGroup#Details: {
-			Data: [
-				{Value: placeOfBirth},
-				{Value: placeOfDeath},
-				{Value: dateOfBirth},
-				{Value: dateOfDeath},
-				{Value: age, Label: '{i18n>Age}'},
-			]
-		},
-	}
-);
-
 
 
 ////////////////////////////////////////////////////////////
@@ -70,7 +50,7 @@ annotate AdminService.Authors with @(
 annotate sap.capire.bookshop.Books with @fiori.draft.enabled;
 annotate AdminService.Books with @odata.draft.enabled;
 
-annotate AdminService.Books_texts with @(
+annotate AdminService.Books.texts with @(
 	UI: {
 		Identification: [{Value:title}],
 		SelectionFields: [ locale, title ],
@@ -83,11 +63,15 @@ annotate AdminService.Books_texts with @(
 );
 
 // Add Value Help for Locales
-annotate AdminService.Books_texts {
+annotate AdminService.Books.texts {
-	locale @ValueList:{entity:'Languages',type:#fixed}
+	locale @ValueList:{entity:'Languages'};
+	locale @Common.ValueListWithFixedValues:true; //show as drop down, not a dialog
 }
-// In addition we need to expose Languages through AdminService
+// In addition we need to expose Languages through AdminService as a target for ValueList
 using { sap } from '@sap/cds/common';
 extend service AdminService {
-	entity Languages as projection on sap.common.Languages;
+	@readonly entity Languages as projection on sap.common.Languages;
 }
+
+// Workaround for Fiori popup for asking user to enter a new UUID on Create
+annotate AdminService.Books with { ID @Core.Computed; }

fiori/app/admin-books/webapp/Component.js

@@ -1,6 +1,6 @@
 sap.ui.define(["sap/fe/core/AppComponent"], function(AppComponent) {
 	"use strict";
-	return AppComponent.extend("admin.Component", {
+	return AppComponent.extend("books.Component", {
 		metadata: { manifest: "json" }
 	});
 });

fiori/app/admin-books/webapp/manifest.json

@@ -1,7 +1,7 @@
 {
     "_version": "1.8.0",
     "sap.app": {
-        "id": "admin",
+        "id": "books",
         "type": "application",
         "title": "Manage Books",
         "description": "Sample Application",
@@ -22,6 +22,10 @@
         }
     },
     "sap.ui5": {
+        "flexEnabled": true,
+        "config": {   
+            "experimentalCAPScenario": true
+        },
         "dependencies": {
             "libs": {
                 "sap.fe.templates": {}
@@ -73,6 +77,7 @@
                     "options": {
                         "settings" : {
                             "entitySet" : "Books",
+                            "initialLoad": true,
                             "navigation" : {
                                 "Books" : {
                                     "detail" : {

fiori/app/appconfig/fioriSandboxConfig.json

@@ -0,0 +1,142 @@
+{
+  "services": {
+    "LaunchPage": {
+      "adapter": {
+        "config": {
+          "catalogs": [],
+          "groups": [
+            {
+              "id": "Bookshop",
+              "title": "Bookshop",
+              "isPreset": true,
+              "isVisible": true,
+              "isGroupLocked": false,
+              "tiles": [
+                {
+                  "id": "BrowseBooks",
+                  "tileType": "sap.ushell.ui.tile.StaticTile",
+                  "properties": {
+                    "title": "Browse Books",
+                    "targetURL": "#Books-display"
+                  }
+                }
+              ]
+            },
+            {
+              "id": "Administration",
+              "title": "Administration",
+              "isPreset": true,
+              "isVisible": true,
+              "isGroupLocked": false,
+              "tiles": [
+                {
+                  "id": "ManageBooks",
+                  "tileType": "sap.ushell.ui.tile.StaticTile",
+                  "properties": {
+                    "title": "Manage Books",
+                    "targetURL": "#Books-manage"
+                  }
+                },
+                {
+                  "id": "ManageAuthors",
+                  "tileType": "sap.ushell.ui.tile.StaticTile",
+                  "properties": {
+                    "title": "Manage Authors",
+                    "targetURL": "#Authors-display"
+                  }
+                },
+                {
+                  "id": "ManageOrders",
+                  "tileType": "sap.ushell.ui.tile.StaticTile",
+                  "properties": {
+                    "title": "Manage Orders",
+                    "targetURL": "#Orders-manage"
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      }
+    },
+    "NavTargetResolution": {
+      "config": {
+        "enableClientSideTargetResolution": true
+      }
+    },
+    "ClientSideTargetResolution": {
+      "adapter": {
+        "config": {
+          "inbounds": {
+            "BrowseBooks": {
+              "semanticObject": "Books",
+              "action": "display",
+              "title": "Browse Books",
+              "signature": {
+                "parameters": {
+                  "Books.ID": {
+                    "renameTo": "ID"
+                  },
+                  "Authors.books.ID": {
+                    "renameTo": "ID"
+                  }
+                },
+                "additionalParameters": "ignored"
+              },
+              "resolutionResult": {
+                "applicationType": "SAPUI5",
+                "additionalInformation": "SAPUI5.Component=bookshop",
+                "url": "/browse/webapp"
+              }
+            },
+            "BrowseAuthors": {
+              "semanticObject": "Authors",
+              "action": "display",
+              "title": "Browse Authors",
+              "signature": {
+                "parameters": {
+                  "Books.author.ID":{
+                    "renameTo": "ID"
+                  }
+                },
+                "additionalParameters": "ignored"
+              },
+              "resolutionResult": {
+                "applicationType": "SAPUI5",
+                "additionalInformation": "SAPUI5.Component=authors",
+                "url": "/admin-authors/webapp"
+              }
+            },
+            "ManageBooks": {
+              "semanticObject": "Books",
+              "action": "manage",
+              "title": "Manage Books",
+              "signature": {
+                "parameters": {},
+                "additionalParameters": "allowed"
+              },
+              "resolutionResult": {
+                "applicationType": "SAPUI5",
+                "additionalInformation": "SAPUI5.Component=books",
+                "url": "/admin-books/webapp"
+              }
+            },
+            "ManageOrders": {
+              "semanticObject": "Orders",
+              "action": "manage",
+              "signature": {
+                "parameters": {},
+                "additionalParameters": "allowed"
+              },
+              "resolutionResult": {
+                "applicationType": "SAPUI5",
+                "additionalInformation": "SAPUI5.Component=orders",
+                "url": "/orders/webapp"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

fiori/app/bookshop.html

@@ -1,3 +0,0 @@
-<head>
-  <meta http-equiv="refresh" content="0;url=bookshop/index.html">
-</head>

fiori/app/browse/fiori-service.cds

@@ -1,50 +1,60 @@
-using CatalogService from '@capire/bookshop';
+using CatalogService from '@capire/bookstore';
 
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books Object Page
 //
-annotate CatalogService.Books with @(
+annotate CatalogService.Books with @(UI : {
-	UI: {
+    HeaderInfo        : {
-  	HeaderInfo: {
+        TypeName       : 'Book',
-			TypeName: 'Book',
+        TypeNamePlural : 'Books',
-			TypeNamePlural: 'Books',
+        Description    : {Value : author}
-  		Description: {Value: author}
+    },
-  	},
+    HeaderFacets      : [{
-		HeaderFacets: [
+        $Type  : 'UI.ReferenceFacet',
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Description}', Target: '@UI.FieldGroup#Descr'},
+        Label  : '{i18n>Description}',
-		],
+        Target : '@UI.FieldGroup#Descr'
-		Facets: [
+    }, ],
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Price'},
+    Facets            : [{
-		],
+        $Type  : 'UI.ReferenceFacet',
-		FieldGroup#Descr: {
+        Label  : '{i18n>Details}',
-			Data: [
+        Target : '@UI.FieldGroup#Price'
-				{Value: descr},
+    }, ],
-			]
+    FieldGroup #Descr : {Data : [{Value : descr}, ]},
-		},
+    FieldGroup #Price : {Data : [
-		FieldGroup#Price: {
+        {Value : price},
-			Data: [
+        {
-				{Value: price},
+            Value : currency.symbol,
-				{Value: currency.symbol, Label: '{i18n>Currency}'},
+            Label : '{i18n>Currency}'
-			]
+        },
-		},
+    ]},
-	}
+});
-);
 
 
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books Object Page
 //
-annotate CatalogService.Books with @(
+annotate CatalogService.Books with @(UI : {
-	UI: {
+    SelectionFields : [
-	  SelectionFields: [ ID, price, currency_code ],
+        ID,
-		LineItem: [
+        price,
-			{Value: title},
+        currency_code
-			{Value: author, Label:'{i18n>Author}'},
+    ],
-			{Value: genre.name},
+    LineItem        : [
-			{Value: price},
+        {
-			{Value: currency.symbol, Label:' '},
+            Value : ID,
-		]
+            Label : '{i18n>Title}'
-	},
+        },
-);
+        {
+            Value : author,
+            Label : '{i18n>Author}'
+        },
+        {Value : genre.name},
+        {Value : price},
+        {
+            Value : currency.symbol,
+            Label : ' '
+        },
+    ]
+}, );

fiori/app/browse/webapp/manifest.json

@@ -1,11 +1,14 @@
 {
-  "_version": "1.8.0",
+  "_version": "1.28.0",
   "sap.app": {
     "id": "bookshop",
     "type": "application",
     "title": "Browse Books",
     "description": "Sample Application",
     "i18n": "i18n/i18n.properties",
+    "applicationVersion": {
+      "version": "1.0.0"
+    },
     "dataSources": {
       "CatalogService": {
         "uri": "/browse/",
@@ -15,14 +18,43 @@
         }
       }
     },
-    "-sourceTemplate": {
+    "sourceTemplate": {
       "id": "ui5template.basicSAPUI5ApplicationProject",
       "-id": "ui5template.smartTemplate",
-      "-version": "1.40.12"
+      "version": "1.40.12"
+    },
+    "crossNavigation": {
+      "inbounds": {
+        "intent1": {
+          "signature": {
+            "parameters": {
+              "Books.ID":{
+                "renameTo": "ID"
+              },
+              "Authors.books.ID": {
+                "renameTo": "ID"                    
+              }
+            },
+            "additionalParameters": "ignored"
+          },
+          "semanticObject": "Books",
+          "action": "display",
+          "title": "{{appTitle}}",
+          "info": "{{appInfo}}",
+          "subTitle": "{{appSubTitle}}",
+          "icon": "sap-icon://course-book",
+          "indicatorDataSource": {
+            "dataSource": "CatalogService",
+            "path": "Books/$count",
+            "refresh": 1800
+          }
+        }
+      }
     }
   },
   "sap.ui5": {
     "dependencies": {
+      "minUI5Version": "1.81.0",
       "libs": {
         "sap.fe.templates": {}
       }
@@ -68,6 +100,7 @@
           "options": {
             "settings": {
               "entitySet": "Books",
+              "initialLoad": true,
               "navigation": {
                 "Books": {
                   "detail": {
@@ -97,7 +130,12 @@
   },
   "sap.ui": {
     "technology": "UI5",
-    "fullWidth": false
+    "fullWidth": false,
+    "deviceTypes":{
+      "desktop": true,
+      "tablet": true,
+      "phone": true
+    }
   },
   "sap.fiori": {
     "registrationIds": [],

fiori/app/common.cds

@@ -1,8 +1,8 @@
 /*
-	Common Annotations shared by all apps
+ Common Annotations shared by all apps
 */
 
-using { sap.capire.bookshop as my } from '@capire/bookshop';
+using { sap.capire.bookshop as my } from '@capire/bookstore';
 using { sap.common } from '@capire/common';
 
 ////////////////////////////////////////////////////////////////////////////
@@ -10,39 +10,52 @@ using { sap.common } from '@capire/common';
 //	Books Lists
 //
 annotate my.Books with @(
-	Common.SemanticKey: [title],
+    Common.SemanticKey : [ID],
-	UI: {
+    UI                 : {
-		Identification: [{Value:title}],
+        Identification  : [{Value : title}],
-		SelectionFields: [ ID, author_ID, price, currency_code ],
+        SelectionFields : [
-		LineItem: [
+            ID,
-			{Value: ID},
+            author_ID,
-			{Value: title},
+            price,
-			{Value: author.name, Label:'{i18n>Author}'},
+            currency_code
-			{Value: genre.name},
+        ],
-			{Value: stock},
+        LineItem        : [
-			{Value: price},
+            {
-			{Value: currency.symbol, Label:' '},
+                Value : ID,
-		]
+                Label : '{i18n>Title}'
-	}
+            },
+            {
+                Value : author.ID,
+                Label : '{i18n>Author}'
+            },
+            {Value : genre.name},
+            {Value : stock},
+            {Value : price},
+            {
+                Value : currency.symbol,
+                Label : ' '
+            },
+        ]
+    }
 ) {
-	author @ValueList.entity:'Authors';
+    ID  @Common: {
+        SemanticObject : 'Books',
+        Text: title,
+        TextArrangement : #TextOnly
+    };
+    author @ValueList.entity      : 'Authors';
 };
 
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books Details
 //
-annotate my.Books with @(
+annotate my.Books with @(UI : {HeaderInfo : {
-	UI: {
+    TypeName       : '{i18n>Book}',
-		HeaderInfo: {
+    TypeNamePlural : '{i18n>Books}',
-			TypeName: '{i18n>Book}',
+    Title          : {Value : title},
-			TypeNamePlural: '{i18n>Books}',
+    Description    : {Value : author.name}
-			Title: {Value: title},
+}, });
-			Description: {Value: author.name}
-		},
-	}
-);
-
 
 
 ////////////////////////////////////////////////////////////////////////////
@@ -50,13 +63,19 @@ annotate my.Books with @(
 //	Books Elements
 //
 annotate my.Books with {
-	ID @title:'{i18n>ID}' @UI.HiddenFilter;
+    ID     @title : '{i18n>ID}';
-	title @title:'{i18n>Title}';
+    title  @title : '{i18n>Title}';
-	genre  @title:'{i18n>Genre}'  @Common: { Text: genre.name,  TextArrangement: #TextOnly };
+    genre  @title : '{i18n>Genre}'  @Common               : {
-	author @title:'{i18n>Author}' @Common: { Text: author.name, TextArrangement: #TextOnly };
+        Text            : genre.name,
-	price @title:'{i18n>Price}';
+        TextArrangement : #TextOnly
-	stock @title:'{i18n>Stock}';
+    };
-	descr @UI.MultiLineText;
+    author @title : '{i18n>Author}'  @Common              : {
+        Text            : author.name,
+        TextArrangement : #TextOnly
+    };
+    price  @title : '{i18n>Price}'  @Measures.ISOCurrency : currency_code;
+    stock  @title : '{i18n>Stock}';
+    descr  @UI.MultiLineText;
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -64,42 +83,45 @@ annotate my.Books with {
 //	Genres List
 //
 annotate my.Genres with @(
-	Common.SemanticKey: [name],
+    Common.SemanticKey : [name],
-	UI: {
+    UI                 : {
-		SelectionFields: [ name ],
+        SelectionFields : [name],
-		LineItem:[
+        LineItem        : [
-			{Value: name},
+            {Value : name},
-			{Value: parent.name, Label: 'Main Genre'},
+            {
-		],
+                Value : parent.name,
-	}
+                Label : 'Main Genre'
+            },
+        ],
+    }
 );
 
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Genre Details
 //
-annotate my.Genres with @(
+annotate my.Genres with @(UI : {
-	UI: {
+    Identification : [{Value : name}],
-		Identification: [{Value:name}],
+    HeaderInfo     : {
-		HeaderInfo: {
+        TypeName       : '{i18n>Genre}',
-			TypeName: '{i18n>Genre}',
+        TypeNamePlural : '{i18n>Genres}',
-			TypeNamePlural: '{i18n>Genres}',
+        Title          : {Value : name},
-			Title: {Value: name},
+        Description    : {Value : ID}
-			Description: {Value: ID}
+    },
-		},
+    Facets         : [{
-		Facets: [
+        $Type  : 'UI.ReferenceFacet',
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>SubGenres}', Target: 'children/@UI.LineItem'},
+        Label  : '{i18n>SubGenres}',
-		],
+        Target : 'children/@UI.LineItem'
-	}
+    }, ],
-);
+});
 
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Genres Elements
 //
 annotate my.Genres with {
-	ID  @title: '{i18n>ID}';
+    ID   @title : '{i18n>ID}';
-	name  @title: '{i18n>Genre}';
+    name @title : '{i18n>Genre}';
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -107,38 +129,42 @@ annotate my.Genres with {
 //	Authors List
 //
 annotate my.Authors with @(
-	Common.SemanticKey: [name],
+    Common.SemanticKey : [ID],
-	UI: {
+    UI                 : {
-		Identification: [{Value:name}],
+        Identification  : [{Value : name}],
-		SelectionFields: [ name ],
+        SelectionFields : [name],
-		LineItem:[
+        LineItem        : [
-			{Value: ID},
+            {Value : ID},
-			{Value: name},
+            {Value : dateOfBirth},
-			{Value: dateOfBirth},
+            {Value : dateOfDeath},
-			{Value: dateOfDeath},
+            {Value : placeOfBirth},
-			{Value: placeOfBirth},
+            {Value : placeOfDeath},
-			{Value: placeOfDeath},
+        ],
-		],
+    }
-	}
+) {
-);
+    ID  @Common: {
+        SemanticObject : 'Authors',
+        Text: name,
+        TextArrangement : #TextOnly,
+    };
+};
 
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Author Details
 //
-annotate my.Authors with @(
+annotate my.Authors with @(UI : {
-	UI: {
+    HeaderInfo : {
-		HeaderInfo: {
+        TypeName       : '{i18n>Author}',
-			TypeName: '{i18n>Author}',
+        TypeNamePlural : '{i18n>Authors}',
-			TypeNamePlural: '{i18n>Authors}',
+        Title          : {Value : name},
-			Title: {Value: name},
+        Description    : {Value : dateOfBirth}
-			Description: {Value: dateOfBirth}
+    },
-		},
+    Facets     : [{
-		Facets: [
+        $Type  : 'UI.ReferenceFacet',
-			{$Type: 'UI.ReferenceFacet', Target: 'books/@UI.LineItem'},
+        Target : 'books/@UI.LineItem'
-		],
+    }, ],
-	}
+});
-);
 
 
 ////////////////////////////////////////////////////////////////////////////
@@ -146,12 +172,12 @@ annotate my.Authors with @(
 //	Authors Elements
 //
 annotate my.Authors with {
-	ID @title:'{i18n>ID}' @UI.HiddenFilter;
+    ID           @title : '{i18n>ID}';
-	name @title:'{i18n>Name}';
+    name         @title : '{i18n>Name}';
-	dateOfBirth @title:'{i18n>DateOfBirth}';
+    dateOfBirth  @title : '{i18n>DateOfBirth}';
-	dateOfDeath @title:'{i18n>DateOfDeath}';
+    dateOfDeath  @title : '{i18n>DateOfDeath}';
-	placeOfBirth @title:'{i18n>PlaceOfBirth}';
+    placeOfBirth @title : '{i18n>PlaceOfBirth}';
-	placeOfDeath @title:'{i18n>PlaceOfDeath}';
+    placeOfDeath @title : '{i18n>PlaceOfDeath}';
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -159,99 +185,105 @@ annotate my.Authors with {
 //	Languages List
 //
 annotate common.Languages with @(
-	Common.SemanticKey: [code],
+    Common.SemanticKey : [code],
-	Identification: [{Value:code}],
+    Identification     : [{Value : code}],
-	UI: {
+    UI                 : {
-		SelectionFields: [ name, descr ],
+        SelectionFields : [
-		LineItem:[
+            name,
-			{Value: code},
+            descr
-			{Value: name},
+        ],
-		],
+        LineItem        : [
-	}
+            {Value : code},
+            {Value : name},
+        ],
+    }
 );
 
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Language Details
 //
-annotate common.Languages with @(
+annotate common.Languages with @(UI : {
-	UI: {
+    HeaderInfo          : {
-		HeaderInfo: {
+        TypeName       : '{i18n>Language}',
-			TypeName: '{i18n>Language}',
+        TypeNamePlural : '{i18n>Languages}',
-			TypeNamePlural: '{i18n>Languages}',
+        Title          : {Value : name},
-			Title: {Value: name},
+        Description    : {Value : descr}
-			Description: {Value: descr}
+    },
-		},
+    Facets              : [{
-		Facets: [
+        $Type  : 'UI.ReferenceFacet',
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
+        Label  : '{i18n>Details}',
-		],
+        Target : '@UI.FieldGroup#Details'
-		FieldGroup#Details: {
+    }, ],
-			Data: [
+    FieldGroup #Details : {Data : [
-				{Value: code},
+        {Value : code},
-				{Value: name},
+        {Value : name},
-				{Value: descr}
+        {Value : descr}
-			]
+    ]},
-		},
+});
-	}
-);
 
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Currencies List
 //
 annotate common.Currencies with @(
-	Common.SemanticKey: [code],
+    Common.SemanticKey : [code],
-	Identification: [{Value:code}],
+    Identification     : [{Value : code}],
-	UI: {
+    UI                 : {
-		SelectionFields: [ name, descr ],
+        SelectionFields : [
-		LineItem:[
+            name,
-			{Value: descr},
+            descr
-			{Value: symbol},
+        ],
-			{Value: code},
+        LineItem        : [
-		],
+            {Value : descr},
-	}
+            {Value : symbol},
+            {Value : code},
+        ],
+    }
 );
 
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Currency Details
 //
-annotate common.Currencies with @(
+annotate common.Currencies with @(UI : {
-	UI: {
+    HeaderInfo           : {
-		HeaderInfo: {
+        TypeName       : '{i18n>Currency}',
-			TypeName: '{i18n>Currency}',
+        TypeNamePlural : '{i18n>Currencies}',
-			TypeNamePlural: '{i18n>Currencies}',
+        Title          : {Value : descr},
-			Title: {Value: descr},
+        Description    : {Value : code}
-			Description: {Value: code}
+    },
-		},
+    Facets               : [
-		Facets: [
+        {
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
+            $Type  : 'UI.ReferenceFacet',
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Extended}', Target: '@UI.FieldGroup#Extended'},
+            Label  : '{i18n>Details}',
-		],
+            Target : '@UI.FieldGroup#Details'
-		FieldGroup#Details: {
+        },
-			Data: [
+        {
-				{Value: name},
+            $Type  : 'UI.ReferenceFacet',
-				{Value: symbol},
+            Label  : '{i18n>Extended}',
-				{Value: code},
+            Target : '@UI.FieldGroup#Extended'
-				{Value: descr}
+        },
-			]
+    ],
-		},
+    FieldGroup #Details  : {Data : [
-		FieldGroup#Extended: {
+        {Value : name},
-			Data: [
+        {Value : symbol},
-				{Value: numcode},
+        {Value : code},
-				{Value: minor},
+        {Value : descr}
-				{Value: exponent}
+    ]},
-			]
+    FieldGroup #Extended : {Data : [
-		},
+        {Value : numcode},
-	}
+        {Value : minor},
-);
+        {Value : exponent}
+    ]},
+});
 
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Currencies Elements
 //
 annotate common.Currencies with {
-	numcode @title:'{i18n>NumCode}';
+    numcode  @title : '{i18n>NumCode}';
-	minor @title:'{i18n>MinorUnit}';
+    minor    @title : '{i18n>MinorUnit}';
-	exponent @title:'{i18n>Exponent}';
+    exponent @title : '{i18n>Exponent}';
 }

fiori/app/fiori-apps.html

@@ -10,32 +10,21 @@
 	<script>
 		window["sap-ushell-config"] = {
 			defaultRenderer: "fiori2",
-			applications: {
+			applications: {},
-				"browse-books": {
+			bootstrapPlugins: {
-					title: "Browse Books",
+          RuntimeAuthoringPlugin: {
-					description: "w/ SAP Fiori Elements",
+            component: "sap.ushell.plugins.rta",
-					additionalInformation: "SAPUI5.Component=bookshop",
+            config: {
-					applicationType : "URL",
+              validateAppVersion: false,
-					url: "/browse/webapp",
+            },
-					navigationMode: "embedded"
+          },
-				},
+          PersonalizePlugin: {
-				"manage-books": {
+            component: "sap.ushell.plugins.rta-personalize",
-					title: "Manage Books",
+            config: {
-					description: "w/ SAP Fiori Elements",
+              validateAppVersion: false,
-					additionalInformation: "SAPUI5.Component=admin",
+            },
-					applicationType : "URL",
+          },
-					url: "/admin/webapp",
+        }
-					navigationMode: "embedded"
-				},
-				"manage-orders": {
-					title: "Manage Orders",
-					description: "w/ SAP Fiori Elements",
-					additionalInformation: "SAPUI5.Component=orders",
-					applicationType : "URL",
-					url: "/orders/webapp",
-					navigationMode: "embedded"
-				}
-			}
 		};
 	</script>
 
@@ -47,8 +36,13 @@
     	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>
+		sap.ui
+        .getCore()
+        .getConfiguration()
+        .setFlexibilityServices([{ connector: "SessionStorageConnector" }]);
+				sap.ui.getCore().getConfiguration().setLanguage("en");
+</script>
 
 </head>
 <body class="sapUiBody" id="content"></body>

fiori/app/reviews.html

@@ -1,3 +0,0 @@
-<head>
-  <meta http-equiv="refresh" content="0;url=reviews/index.html">
-</head>

fiori/app/services.cds

@@ -2,11 +2,8 @@
   This model controls what gets served to Fiori frontends...
 */
 
-using from './admin/fiori-service';
+using from './admin-authors/fiori-service';
+using from './admin-books/fiori-service';
 using from './browse/fiori-service';
 using from './common';
-
+using from '@capire/bookstore/srv/mashup';
-using from '@capire/common';
-
-// only works in case of embedded orders service
-using from '@capire/orders/app/orders/fiori-service';

fiori/db/hana/index.cds

@@ -2,7 +2,7 @@
 //  Add Author.age and .lifetime with a DB-specific function
 //
 
-using { AdminService } from '../schema';
+using { AdminService } from '@capire/bookshop';
 
 extend projection AdminService.Authors with {
   YEARS_BETWEEN(dateOfBirth, dateOfDeath)         as age: Integer,

fiori/db/schema.cds

@@ -1,8 +0,0 @@
-using { sap.capire.bookshop } from '@capire/bookshop';
-
-// Forward-declare calculated fields to be filled in database-specific ways
-// TODO find a better way to have 'default' fields that still can be overwritten.
-extend bookshop.Authors with {
-	virtual age: Integer;
-	virtual lifetime: String;
-}

fiori/db/sqlite/index.cds

@@ -2,7 +2,7 @@
 //  Add Author.age and .lifetime with a DB-specific function
 //
 
-using { AdminService } from '../schema';
+using { AdminService } from '@capire/bookshop';
 
 extend projection AdminService.Authors with {
   strftime('%Y',dateOfDeath)-strftime('%Y',dateOfBirth)              as age: Integer,

fiori/package.json

@@ -2,11 +2,8 @@
   "name": "@capire/fiori",
   "version": "1.0.0",
   "dependencies": {
-    "@capire/bookshop": "*",
+    "@capire/bookstore": "*",
-    "@capire/reviews": "*",
+    "@sap/cds": "^5",
-    "@capire/orders": "*",
-    "@capire/common": "*",
-    "@sap/cds": ">=4",
     "express": "^4.17.1",
     "passport": "^0.4.1"
   },
@@ -15,10 +12,10 @@
     "watch": "cds watch"
   },
   "cds": {
-    "hana": {
-      "deploy-format": "hdbtable"
-    },
     "requires": {
+      "extensibility": {
+        "kind": "uiflex"
+      },
       "auth": {
         "strategy": "dummy"
       },
@@ -30,14 +27,30 @@
         "kind": "odata",
         "model": "@capire/orders"
       },
+      "messaging": {
+        "[production]": {
+          "kind": "enterprise-messaging"
+        },
+        "[development]": {
+          "kind": "file-based-messaging"
+        },
+        "[hybrid!]": {
+          "kind": "enterprise-messaging-shared"
+        }
+      },
       "db": {
-        "kind": "sql",
+        "kind": "sql"
+      },
+      "db-ext": {
         "[development]": {
           "model": "db/sqlite"
         },
         "[production]": {
           "model": "db/hana"
         }
+      },
+      "hana": {
+        "deploy-format": "hdbtable"
       }
     }
   }

fiori/server.js

@@ -1,18 +1 @@
-const cds = require ('@sap/cds')
+module.exports = require('@capire/bookstore/server.js')
-
-cds.once('bootstrap',(app)=>{
-  app.use ('/orders/webapp', _from('@capire/orders/app/orders/webapp/manifest.json'))
-  app.use ('/bookshop', _from('@capire/bookshop/app/vue/index.html'))
-  app.use ('/reviews', _from('@capire/reviews/app/vue/index.html'))
-})
-
-cds.once('served', require('./srv/mashup'))
-
-module.exports = cds.server
-
-
-// -----------------------------------------------------------------------
-// Helper for serving static content from npm-installed packages
-const {static} = require('express')
-const {dirname} = require('path')
-const _from = target => static (dirname (require.resolve(target)))

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/get-started/using-typescript)

hello/package.json

@@ -2,6 +2,53 @@
   "name": "@capire/hello-world",
   "version": "1.0.0",
   "scripts": {
-    "watch": "cds serve world.cds"
+    "test": "npx jest --silent",
+    "start": "cds serve srv/world.cds",
+    "start:ts": "cds-ts serve srv/world.cds"
+  },
+  "devDependencies": {
+    "@types/jest": "^27.0.2",
+    "@types/node": "^16.11.6",
+    "ts-jest": "^27.0.2",
+    "typescript": "^4.3.5"
+  },
+  "jest": {
+    "testEnvironment": "node",
+    "preset": "ts-jest",
+    "globals": {
+      "ts-jest": {
+        "diagnostics": {
+          "_comment": "see https://githubmemory.com/repo/kulshekhar/ts-jest/issues/2722",
+          "ignoreCodes": [
+            151001
+          ]
+        }
+      }
+    }
+  },
+  "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.ts

@@ -0,0 +1,7 @@
+import type { Request } from "@sap/cds/apis/services"
+
+module.exports = class say {
+    hello(req: Request) {
+        return `Hello ${req.data.to} from a TypeScript file!`
+    }
+}

hello/test/hello-world-ts.test.ts

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

orders/app/fiori.cds

@@ -10,7 +10,7 @@
 
 
 
-using { OrdersService } from '../../srv/orders-service';
+using { OrdersService } from '../srv/orders-service';
 
 
 @odata.draft.enabled
@@ -68,16 +68,16 @@ annotate OrdersService.Orders with @(
 
 
 
-annotate OrdersService.Orders_Items with @(
+annotate OrdersService.Orders.Items with @(
 	UI: {
 		LineItem: [
 			{Value: product_ID, Label:'Product ID'},
 			{Value: title, Label:'Product Title'},
 			{Value: price, Label:'Unit Price'},
-			{Value: amount, Label:'Quantity'},
+			{Value: quantity, Label:'Quantity'},
 		],
 		Identification: [ //Is the main field group
-			{Value: amount, Label:'Amount'},
+			{Value: quantity, Label:'Quantity'},
 			{Value: title, Label:'Product'},
 			{Value: price, Label:'Unit Price'},
 		],
@@ -86,7 +86,7 @@ annotate OrdersService.Orders_Items with @(
 		],
 	},
 ) {
-	amount @(
+	quantity @(
 		Common.FieldControl: #Mandatory
 	);
 };

orders/app/index.cds

@@ -1,5 +0,0 @@
-/*
-  This model controls what gets served to Fiori frontends...
-*/
-
-using from './orders/fiori-service';

orders/db/data/sap.capire.orders-Orders.Items.csv

@@ -1,4 +1,4 @@
-ID;up__ID;amount;product_ID;title;price
+ID;up__ID;quantity;product_ID;title;price
 58040e66-1dcd-4ffb-ab10-fdce32028b79;7e2f2640-6866-4dcf-8f4d-3027aa831cad;1;201;Wuthering Heights;11.11
 64e718c9-ff99-47f1-8ca3-950c850777d4;7e2f2640-6866-4dcf-8f4d-3027aa831cad;1;271;Catweazle;15
 e9641166-e050-4261-bfee-d1e797e6cb7f;64e718c9-ff99-47f1-8ca3-950c850777d4;2;252;Eleonora;28

orders/db/schema.cds

@@ -3,21 +3,22 @@ namespace sap.capire.orders;
 
 entity Orders : cuid, managed {
   OrderNo  : String @title:'Order Number'; //> readable key
-  Items    : Composition of many Orders_Items on Items.up_ = $self;
+  Items    : Composition of many {
+    key ID    : UUID;
+    product   : Association to Products;
+    quantity  : Integer;
+    title     : String; //> intentionally replicated as snapshot from product.title
+    price     : Double; //> materialized calculated field
+  };
   buyer    : User;
   currency : Currency;
 }
 
-entity Orders_Items {
-  key ID    : UUID;
-  up_       : Association to Orders;
-  product   : Association to Products @assert.integrity:false; // REVISIT: this is a temporary workaround for a glitch in cds-runtime
-  amount    : Integer;
-  title     : String; //> intentionally replicated as snapshot from product.title
-  price     : Double;
-}
-
 /** This is a stand-in for arbitrary ordered Products */
 entity Products @(cds.persistence.skip:'always') {
   key ID : String;
 }
+
+
+// this is to ensure we have filled-in currencies
+using from '@capire/common';

orders/package.json

@@ -2,6 +2,7 @@
   "name": "@capire/orders",
   "version": "1.0.0",
   "dependencies": {
-    "@sap/cds": ">=4.3.0"
+    "@capire/common": "*",
+    "@sap/cds": "^5"
   }
 }

orders/srv/orders-service.js

@@ -3,34 +3,34 @@ class OrdersService extends cds.ApplicationService {
 
   /** register custom handlers */
   init(){
-    const { Orders_Items:OrderItems } = this.entities
+    const { 'Orders.Items':OrderItems } = this.entities
 
     this.before ('UPDATE', 'Orders', async function(req) {
       const { ID, Items } = req.data
-      if (Items) for (let { product_ID, amount } of Items) {
+      if (Items) for (let { product_ID, quantity } of Items) {
-        const { amount:before } = await cds.tx(req).run (
+        const { quantity:before } = await cds.tx(req).run (
-          SELECT.one.from (OrderItems, oi => oi.amount) .where ({up__ID:ID, product_ID})
+          SELECT.one.from (OrderItems, oi => oi.quantity) .where ({up__ID:ID, product_ID})
         )
-        if (amount != before) await this.orderChanged (product_ID, amount-before)
+        if (quantity != before) await this.orderChanged (product_ID, quantity-before)
       }
     })
 
     this.before ('DELETE', 'Orders', async function(req) {
       const { ID } = req.data
       const Items = await cds.tx(req).run (
-        SELECT.from (OrderItems, oi => { oi.product_ID, oi.amount }) .where ({up__ID:ID})
+        SELECT.from (OrderItems, oi => { oi.product_ID, oi.quantity }) .where ({up__ID:ID})
       )
-      if (Items) await Promise.all (Items.map(it => this.orderChanged (it.product_ID, -it.amount)))
+      if (Items) await Promise.all (Items.map(it => this.orderChanged (it.product_ID, -it.quantity)))
     })
 
     return super.init()
   }
 
   /** order changed -> broadcast event */
-  orderChanged (product, deltaAmount) {
+  orderChanged (product, deltaQuantity) {
     // Emit events to inform subscribers about changes in orders
-    console.log ('> emitting:', 'OrderChanged', { product, deltaAmount })
+    console.log ('> emitting:', 'OrderChanged', { product, deltaQuantity })
-    return this.emit ('OrderChanged', { product, deltaAmount })
+    return this.emit ('OrderChanged', { product, deltaQuantity })
   }
 
 }

package.json

@@ -5,36 +5,44 @@
   "repository": "https://github.com/sap-samples/cloud-cap-samples.git",
   "author": "daniel.hutzel@sap.com",
   "dependencies": {
+    "@capire/bookstore": "./bookstore",
     "@capire/bookshop": "./bookshop",
     "@capire/common": "./common",
     "@capire/fiori": "./fiori",
     "@capire/hello": "./hello",
     "@capire/media": "./media",
     "@capire/orders": "./orders",
-    "@capire/reviews": "./reviews"
+    "@capire/reviews": "./reviews",
+    "@sap/cds": "^5.5.3"
   },
   "devDependencies": {
-    "chai": "^4.2.0",
+    "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "chai-subset": "^1.6.0",
-    "sqlite3": "^5.0.0"
+    "sqlite3": "^5"
   },
   "scripts": {
     "cleanup": "rm -rf node_modules && rm -rf */node_modules && rm -rf */*/node_modules",
     "registry": "node .registry/server.js",
     "bookshop": "cds watch bookshop",
     "fiori": "cds watch fiori",
+    "hello": "cds watch hello",
     "media": "cds watch media",
     "mocha": "npx mocha || echo",
     "jest": "npx jest",
-    "test": "npm run jest --silent"
+    "test": "npm run jest -- --silent",
+    "test:hello": "cd hello && npm test"
+  },
+  "jest": {
+    "testEnvironment": "node",
+    "testTimeout": 20000,
+    "testMatch": [
+      "**/*.test.js"
+    ]
   },
   "mocha": {
     "parallel": true
   },
-  "jest": {
-    "testEnvironment": "node"
-  },
   "license": "SAP SAMPLE CODE LICENSE",
   "private": true
 }

reviews/.env

@@ -1,2 +1,2 @@
-cds.requires.messaging.kind = file-based-messaging
+# cds.requires.messaging.kind = file-based-messaging
 PORT = 4005

reviews/db/data/sap.capire.reviews-Reviews.csv

@@ -1,5 +1,5 @@
-subject;rating;title;text
+subject;rating;reviewer;title;text
-201;5;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;5;adam;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;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.
+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;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.
+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;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.
+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.

reviews/package.json

@@ -7,18 +7,17 @@
     "index.cds"
   ],
   "dependencies": {
-    "@sap/cds": ">=4",
+    "@sap/cds": "^5",
     "express": "^4.17.1"
   },
-  "scripts": {
-    "reviews-service": "cds watch",
-    "books-reviewed": "cds watch ../reviewed"
-  },
   "cds": {
     "requires": {
-      "db": {
+      "messaging": {
-        "kind": "sql"
+        "[development]": { "kind": "file-based-messaging" },
-      }
+        "[hybrid]": { "kind": "enterprise-messaging-shared" },
+        "[production]": { "kind": "enterprise-messaging" }
+      },
+      "db": { "kind": "sql" }
     }
   }
 }

reviews/srv/reviews-service.cds

@@ -8,10 +8,11 @@ service ReviewsService {
   action unlike (review: type of Reviews:ID);
 
   // Async API
-   event reviewed : {
+  event reviewed : {
-     subject: type of Reviews:subject;
+    subject : type of Reviews:subject;
-     rating: Decimal(2,1)
+    count   : Integer;
-   }
+    rating  : Decimal;
+  }
 
   // Input validation
   annotate Reviews with {
@@ -27,14 +28,7 @@ service ReviewsService {
 annotate ReviewsService.Reviews with @restrict:[
   { grant:'READ',   to:'any' },                 // everybody can read reviews
   { grant:'CREATE', to:'authenticated-user' },  // users must login to add reviews
-  /////////////////////////////////////////////////
+  { grant:'UPDATE', to:'authenticated-user', where:'reviewer=$user' },
-  //
-  // Temporarily disabling this due to glitch in CAP Node.js runtime:
-  // { grant:'UPDATE', to:'authenticated-user', where:'reviewer=$user' },
-  // -> reenable it when the issue is fixed
-     { grant:'UPDATE', to:'authenticated-user' },
-  //
-  ////////////////////////////////////////////////////
   { grant:'DELETE', to:'admin' },
 ];
 

reviews/srv/reviews-service.js

@@ -12,11 +12,11 @@ module.exports = cds.service.impl (function(){
   // Emit an event to inform subscribers about new avg ratings for reviewed subjects
   this.after (['CREATE','UPDATE','DELETE'], 'Reviews', async function(_,req) {
     const {subject} = req.data
-    const {rating} = await cds.tx(req) .run (
+    const { count, rating } = await cds.tx(req) .run (
-      SELECT.one (['round(avg(rating),2) as rating']) .from (Reviews) .where ({subject})
+      SELECT.one `round(avg(rating),2) as rating, count(*) as count` .from (Reviews) .where ({subject})
     )
-    global.it || console.log ('< emitting:', 'reviewed', { subject, rating })
+    global.it || console.log ('< emitting:', 'reviewed', { subject, count, rating })
-    await this.emit ('reviewed', { subject, rating })
+    await this.emit ('reviewed', { subject, count, rating })
   })
 
   // Increment counter for reviews considered helpful

samples.md

@@ -7,6 +7,7 @@ Each sub directory essentially is an individual npm package arranged in an [all-
 ## [@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/get-started/using-typescript)
 
 
 ## [@capire/bookshop](bookshop)
@@ -50,19 +51,27 @@ Each sub directory essentially is an individual npm package arranged in an [all-
 - As well as managed data, input validations, and authorization
 
 
-## [@capire/fiori](fiori)
+## [@capire/bookstore](bookstore)
 
 - A [composite app, reusing and combining](https://cap.cloud.sap/docs/guides/verticalize) these packages:
   - [@capire/bookshop](bookshop)
   - [@capire/reviews](reviews)
   - [@capire/orders](orders)
   - [@capire/common](common)
-- [Adds an SAP Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/) to bookshop, thereby introducing to:
-  - [OData Annotations](https://cap.cloud.sap/docs/guides/fiori#adding-odata-annotations) in `.cds` files
-  - Support for [Fiori Draft](https://cap.cloud.sap/docs/guides/fiori#draft)
-  - Support for [Value Helps](https://cap.cloud.sap/docs/guides/fiori#value-help)
-  - Serving SAP Fiori apps locally
 - [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 Fiori app](orders/app) imported from orders is served as well
+- [OpenAPI export + Swagger UI](https://cap.cloud.sap/docs/advanced/openapi)
+
+
+
+## [@capire/fiori](fiori)
+
+- [Adds an SAP Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/) to bookstore, thereby introducing to:
+- [OData Annotations](https://cap.cloud.sap/docs/guides/fiori#adding-odata-annotations) in `.cds` files
+- Support for [Fiori Draft](https://cap.cloud.sap/docs/guides/fiori#draft)
+- Support for [Value Helps](https://cap.cloud.sap/docs/guides/fiori#value-help)
+- Serving SAP Fiori apps locally
 
 <br>
 

test/cds.ql.test.js

@@ -1,96 +1,267 @@
-const { expect } = require('../test')
 const cds = require('@sap/cds/lib')
-const CQL = ([cql]) => cds.parse.cql(cql)
+const { expect } = cds.test
+const { cdr } = cds.ql
 const Foo = { name: 'Foo' }
 const Books = { name: 'capire.bookshop.Books' }
 
-const { parse:cdr } = cds.ql
 
-// while jest has 'test' as alias to 'it', mocha doesn't
+const STAR = cdr ? '*' : { ref: ['*'] }
-if (!global.test) global.test = it
+const skip = {to:{eql:()=>skip}}
+const srv = new cds.Service
+let cqn
+
+expect.plain = (cqn) => !cqn.SELECT.one && !cqn.SELECT.distinct ? expect(cqn) : skip
+expect.one = (cqn) => !cqn.SELECT.distinct ? expect(cqn) : skip
 
 describe('cds.ql → cqn', () => {
   //
-  let cqn
 
-  describe.skip(`BUGS + GAPS...`, () => {
+  for (let each of ['SELECT', 'SELECT one', 'SELECT distinct']) {
+    let SELECT; beforeEach(()=> SELECT = (
+      each === 'SELECT distinct' ? cds.ql.SELECT.distinct :
+      each === 'SELECT one' ? cds.ql.SELECT.one :
+      cds.ql.SELECT
+    ))
+  describe(`${each}...`, () => {
 
-    it('should consistently handle *', () => {
+    test(`from Foo`, () => {
-      expect({
+      expect(cqn = SELECT `from Foo`)
-        SELECT: { from: { ref: ['Foo'] }, columns: ['*'] },
+      .to.eql(SELECT.from `Foo`)
+      .to.eql(SELECT.from('Foo'))
+      .to.eql(SELECT.from(Foo))
+      .to.eql(SELECT`Foo`)
+      .to.eql(SELECT('Foo'))
+      .to.eql(SELECT(Foo))
+      expect.plain(cqn)
+      .to.eql(CQL`SELECT from Foo`)
+      .to.eql(srv.read `Foo`)
+      .to.eql(srv.read('Foo'))
+      .to.eql(srv.read(Foo))
+      .to.eql({
+        SELECT: { from: { ref: ['Foo'] } },
       })
-      .to.eql(CQL`SELECT * from Foo`)
-      .to.eql(CQL`SELECT from Foo{*}`)
-      .to.eql(SELECT('*').from(Foo))
-      .to.eql(SELECT.from(Foo,['*']))
     })
 
-
+    if (each === 'SELECT')
-    it('should consistently handle lists', () => {
+    test('SELECT ( Foo )', () => {
-      const ID = 11,  args = [`foo`, "'bar'", 3]
-      const cqn = CQL`SELECT from Foo where ID=11 and x in (foo,'bar',3)`
-      expect(SELECT.from(Foo).where(`ID=${ID} and x in (${args})`)).to.eql(cqn)
-      expect(SELECT.from(Foo).where(`ID=`, ID, `and x in`, args)).to.eql(cqn)
-      expect(SELECT.from(Foo).where({ ID, x:args })).to.eql(cqn)
-    })
-
-  })
-
-
-  describe(`SELECT...`, () => {
-    test('from ( Foo )', () => {
       expect({
         SELECT: { from: { ref: ['Foo'] } },
       })
       .to.eql(CQL`SELECT from Foo`)
-      .to.eql(SELECT.from(Foo))
+      .to.eql(SELECT(Foo))
     })
 
-    test('from ( ..., <key>)', () => {
+    if (each === 'SELECT')
-      // Compiler
+    test('SELECT ( Foo ) .from ( Bar )', () => {
-      expect(CQL`SELECT from Foo[11]`).to.eql({
+
-        SELECT: {
+      expect({
-          // REVISIT: add one:true?
+        SELECT: { columns:[{ref:['Foo']}], from: { ref: ['Bar'] } },
-          from: { ref: [{ id: 'Foo', where: [{ val: 11 }] }] },
+      })
-        },
+      .to.eql(CQL`SELECT Foo from Bar`)
+      .to.eql(SELECT `Foo` .from `Bar`)
+      .to.eql(SELECT `Foo` .from('Bar'))
+      .to.eql(SELECT('Foo').from('Bar'))
+      .to.eql(SELECT(['Foo']).from('Bar'))
+      .to.eql(SELECT(['Foo']).from('Bar'))
+      .to.eql(SELECT `Bar` .columns `Foo`)
+      .to.eql(SELECT `Bar` .columns ('Foo'))
+      .to.eql(SELECT `Bar` .columns (['Foo']))
+      .to.eql(SELECT.from `Bar` .columns ('Foo'))
+      .to.eql(SELECT.from `Bar` .columns (['Foo']))
+
+      expect({
+        SELECT: { columns:[
+          {ref:['Foo']},
+          {ref:['Boo']},
+        ], from: { ref: ['Bar'] } },
+      })
+      .to.eql(CQL`SELECT Foo, Boo from Bar`)
+      .to.eql(SELECT `Foo, Boo` .from `Bar`)
+      .to.eql(SELECT `Foo, Boo` .from('Bar'))
+      .to.eql(SELECT('Foo','Boo').from('Bar'))
+      .to.eql(SELECT(['Foo','Boo']).from('Bar'))
+      .to.eql(SELECT `Bar` .columns `Foo, Boo`)
+      .to.eql(SELECT `Bar` .columns ('Foo','Boo'))
+      .to.eql(SELECT `Bar` .columns (['Foo','Boo']))
+      .to.eql(SELECT.from `Bar` .columns ('Foo','Boo'))
+      .to.eql(SELECT.from `Bar` .columns (['Foo','Boo']))
+
+      expect({
+        SELECT: { columns:[
+          {ref:['Foo']},
+          {ref:['Boo']},
+          {ref:['Moo']},
+        ], from: { ref: ['Bar'] } },
+      })
+      .to.eql(CQL`SELECT Foo, Boo, Moo from Bar`)
+      .to.eql(SELECT `Foo, Boo, Moo` .from `Bar`)
+      .to.eql(SELECT `Foo, Boo, Moo` .from('Bar'))
+      .to.eql(SELECT('Foo','Boo','Moo').from('Bar'))
+      .to.eql(SELECT(['Foo','Boo','Moo']).from('Bar'))
+      .to.eql(SELECT `Bar` .columns `Foo, Boo, Moo`)
+      .to.eql(SELECT `Bar` .columns ('Foo','Boo','Moo'))
+      .to.eql(SELECT `Bar` .columns (['Foo','Boo','Moo']))
+      .to.eql(SELECT.from `Bar` .columns ('Foo','Boo','Moo'))
+      .to.eql(SELECT.from `Bar` .columns (['Foo','Boo','Moo']))
+
+
+      expect({
+        SELECT: { one:true, columns:[{ref:['Foo']}], from: { ref: ['Bar'] } },
+      })
+      // .to.eql(CQL`SELECT one Foo from Bar`)
+      .to.eql(SELECT.one `Foo` .from `Bar`)
+      .to.eql(SELECT.one `Foo` .from('Bar'))
+      .to.eql(SELECT.one('Foo').from('Bar'))
+      .to.eql(SELECT.one(['Foo']).from('Bar'))
+      .to.eql(SELECT.one(['Foo']).from('Bar'))
+      .to.eql(SELECT.one('Bar',['Foo']))
+      .to.eql(SELECT.one `Bar` .columns `Foo`)
+      .to.eql(SELECT.one('Bar').columns('Foo'))
+      .to.eql(SELECT.one('Bar').columns(['Foo']))
+      .to.eql(SELECT.one.from('Bar',['Foo']))
+      .to.eql(SELECT.one.from('Bar').columns('Foo'))
+      .to.eql(SELECT.one.from('Bar').columns(['Foo']))
+
+      expect({
+        SELECT: { one:true, columns:[
+          {ref:['Foo']},
+          {ref:['Boo']},
+        ], from: { ref: ['Bar'] } },
+      })
+      // .to.eql(CQL`SELECT Foo, Boo from Bar`)
+      .to.eql(SELECT.one `Foo, Boo` .from `Bar`)
+      .to.eql(SELECT.one `Foo, Boo` .from('Bar'))
+      .to.eql(SELECT.one('Foo','Boo').from('Bar'))
+      .to.eql(SELECT.one(['Foo','Boo']).from('Bar'))
+      .to.eql(SELECT.one('Bar',['Foo','Boo']))
+      .to.eql(SELECT.one `Bar` .columns `Foo, Boo`)
+      .to.eql(SELECT.one('Bar').columns('Foo','Boo'))
+      .to.eql(SELECT.one('Bar').columns(['Foo','Boo']))
+      .to.eql(SELECT.one.from('Bar',['Foo','Boo']))
+      .to.eql(SELECT.one.from('Bar').columns('Foo','Boo'))
+      .to.eql(SELECT.one.from('Bar').columns(['Foo','Boo']))
+
+      expect({
+        SELECT: { one:true, columns:[
+          {ref:['Foo']},
+          {ref:['Boo']},
+          {ref:['Moo']},
+        ], from: { ref: ['Bar'] } },
+      })
+      // .to.eql(CQL`SELECT Foo, Boo, Moo from Bar`)
+      .to.eql(SELECT.one `Foo, Boo, Moo` .from `Bar`)
+      .to.eql(SELECT.one `Foo, Boo, Moo` .from('Bar'))
+      .to.eql(SELECT.one('Foo','Boo','Moo').from('Bar'))
+      .to.eql(SELECT.one(['Foo','Boo','Moo']).from('Bar'))
+      .to.eql(SELECT.one('Bar',['Foo','Boo','Moo']))
+      .to.eql(SELECT.one `Bar` .columns `Foo, Boo, Moo`)
+      .to.eql(SELECT.one('Bar').columns('Foo','Boo','Moo'))
+      .to.eql(SELECT.one('Bar').columns(['Foo','Boo','Moo']))
+      .to.eql(SELECT.one.from('Bar',['Foo','Boo','Moo']))
+      .to.eql(SELECT.one.from('Bar').columns('Foo','Boo','Moo'))
+      .to.eql(SELECT.one.from('Bar').columns(['Foo','Boo','Moo']))
+
+    })
+
+    if (each === 'SELECT')
+    test('from ( Foo )', () => {
+      expect({
+        SELECT: { from: {ref: [{ id:'Foo', where: [{val:11}] }] }}
+      })
+      .to.eql(srv.read`Foo[${11}]`)
+      .to.eql(SELECT`Foo[${11}]`)
+
+      expect((cqn = SELECT`from Foo[ID=11]`))
+      .to.eql(SELECT`from Foo[ID=${11}]`)
+      .to.eql(SELECT.from `Foo[ID=11]`)
+      .to.eql(SELECT.from `Foo[ID=${11}]`)
+      .to.eql(SELECT`Foo[ID=11]`)
+      expect.plain(cqn)
+      .to.eql(CQL`SELECT from Foo[ID=11]`)
+      .to.eql(srv.read`Foo[ID=11]`)
+      .to.eql({
+        SELECT: { from: {
+          ref: [{ id: 'Foo', where: [{ ref: ['ID'] }, '=', { val: 11 }] }],
+        }},
       })
 
-      expect(CQL`SELECT from Foo[ID=11]`).to.eql({
+      if (cdr) expect.plain (cqn)
-        SELECT: {
+      .to.eql(SELECT`Foo[ID=${11}]`)
-          // REVISIT: add one:true
+      .to.eql(srv.read`Foo[ID=${11}]`)
-          from: {
-            ref: [{ id: 'Foo', where: [{ ref: ['ID'] }, '=', { val: 11 }] }],
-          },
-        },
-      })
 
-      // Runtime ds.ql
+      // Following implicitly resolve to SELECT.one
-      expect(SELECT.from(Foo, 11))
+      expect(cqn = SELECT.from(Foo,11))
-        .to.eql(SELECT.from(Foo, { ID: 11 }))
+      .to.eql(SELECT.from(Foo,{ID:11}))
-        .to.eql(SELECT.from(Foo).byKey(11))
+      .to.eql(SELECT.from(Foo).byKey(11))
-        .to.eql(SELECT.from(Foo).byKey({ ID: 11 }))
+      .to.eql(SELECT.from(Foo).byKey({ID:11}))
-        .to.eql(SELECT.one.from(Foo).where({ ID: 11 }))
+      if (cds.version >= '5.6.0') {
+        expect.one(cqn)
+        .to.eql({
+          SELECT: {
+            one: true,
+            from: { ref: [{ id: 'Foo', where: [{ ref: ['ID'] }, '=', { val: 11 }] }] },
+          },
+        })
+      } else {
+        expect.one(cqn)
         .to.eql({
-          // REVISIT: should produce CQN as the ones above?
           SELECT: {
             one: true,
             from: { ref: ['Foo'] },
             where: [{ ref: ['ID'] }, '=', { val: 11 }],
           },
         })
+      }
 
-      expect(CQL`SELECT from Foo[11]{a}`).to.eql({
+    })
+
+    test('from Foo {...}', () => {
+
+      expect(cqn = SELECT `*,a,b as c` .from `Foo`)
+      .to.eql(SELECT `*,a,b as c`. from(Foo))
+      .to.eql(SELECT('*','a',{b:'c'}).from`Foo`)
+      .to.eql(SELECT('*','a',{b:'c'}).from(Foo))
+      .to.eql(SELECT(['*','a',{b:'c'}]).from(Foo))
+      .to.eql(SELECT.columns('*','a',{b:'c'}).from(Foo))
+      .to.eql(SELECT.columns(['*','a',{b:'c'}]).from(Foo))
+      .to.eql(SELECT.columns((foo) => { foo`.*`, foo.a, foo.b`as c` }).from(Foo))
+      .to.eql(SELECT.columns((foo) => { foo('*'), foo.a, foo.b.as('c') }).from(Foo))
+      .to.eql(SELECT.from(Foo).columns('*','a',{b:'c'}))
+      .to.eql(SELECT.from(Foo).columns(['*','a',{b:'c'}]))
+      .to.eql(SELECT.from(Foo).columns((foo) => { foo`.*`, foo.a, foo.b`as c` }))
+      .to.eql(SELECT.from(Foo).columns((foo) => { foo('*'), foo.a, foo.b.as('c') }))
+      .to.eql(SELECT.from(Foo,['*','a',{b:'c'}]))
+      .to.eql(SELECT.from(Foo, (foo) => { foo`.*`, foo.a, foo.b`as c` }))
+      .to.eql(SELECT.from(Foo, (foo) => { foo('*'), foo.a, foo.b.as('c') }))
+
+      expect.plain(cqn)
+      .to.eql({
         SELECT: {
-          // REVISIT: add one:true?
+          from: { ref: ['Foo'] },
-          from: { ref: [{ id: 'Foo', where: [{ val: 11 }] }] },
+          columns: [ STAR, { ref: ['a'] }, { ref: ['b'], as: 'c' }],
-          columns: [{ ref: ['a'] }],
         },
       })
 
-      expect(SELECT.from(Foo, 11, ['a']))
+      cdr && expect.plain(cqn)
-        .to.eql(SELECT.from(Foo, 11, (foo) => foo.a))
+      .to.eql(CQL`SELECT *,a,b as c from Foo`)
+      .to.eql(CQL`SELECT from Foo {*,a,b as c}`)
+
+      // Test combination with key as second argument to .from
+      expect(cqn = SELECT.from(Foo, 11, ['a']))
+      .to.eql(SELECT.from(Foo, 11, foo => foo.a))
+
+      if (cds.version >= '5.6.0') {
+        expect.one(cqn)
+        .to.eql({
+          SELECT: {
+            one: true,
+            from: { ref: [{ id: 'Foo', where: [{ ref: ['ID'] }, '=', { val: 11 }]}] },
+            columns: [{ ref: ['a'] }]
+          },
+        })
+      } else {
+        expect.one(cqn)
         .to.eql({
-          // REVISIT: should produce CQN as the ones above?
           SELECT: {
             one: true,
             from: { ref: ['Foo'] },
@@ -98,173 +269,199 @@ describe('cds.ql → cqn', () => {
             where: [{ ref: ['ID'] }, '=', { val: 11 }],
           },
         })
+      }
+
     })
 
-    test('from ( ..., => {...})', () => {
+    test('with nested expands', () => {
-      // single *, prefix and postfix, as array and function
+      // SELECT from Foo { *, x, bar.*, car{*}, boo { *, moo.zoo } }
-      let parsed, fluid
+      expect(cqn =
-      expect((parsed = CQL`SELECT * from Foo`)).to.eql(CQL`SELECT from Foo{*}`)
+        SELECT.from (Foo, foo => {
-      //> .to.eql... FIXME: see skipped 'should handle * correctly' below
+          foo`*`, foo.x, foo.car`*`, foo.boo (b => {
-      expect((fluid = SELECT('*').from(Foo)))
+            b`*`, b.moo.zoo(
-        .to.eql(SELECT.from(Foo, ['*']))
+              x => x.y.z
-        .to.eql(SELECT.from(Foo, (foo) => foo('*')))
+            )
-        .to.eql(SELECT.from(Foo).columns('*'))
+          })
-        .to.eql(SELECT.from(Foo).columns((foo) => foo('*')))
-        .to.eql({
-          SELECT: { from: { ref: ['Foo'] }, columns: [cdr ? '*' : { ref: ['*'] }] },
         })
-
+      ).to.eql(
-      if (cdr) expect(parsed).to.eql(fluid)
+        SELECT.from (Foo, foo => {
-
+          foo('*'), foo.x, foo.car('*'), foo.boo (b => {
-      // single column, prefix and postfix, as array and function
+            b('*'), b.moo.zoo(
-      expect(CQL`SELECT a from Foo`)
+              x => x.y.z
-      expect(CQL`SELECT from Foo {a}`)
+            )
-        .to.eql(SELECT.from(Foo, ['a']))
+          })
-        .to.eql(SELECT.from(Foo, (foo) => foo.a))
-        .to.eql({
-          SELECT: { from: { ref: ['Foo'] }, columns: [{ ref: ['a'] }] },
         })
+      )
 
-      // multiple columns, prefix and postfix, as array and function
+      expect.plain(cqn)
-      expect(CQL`SELECT a,b as c from Foo`)
+      .to.eql({
-
-      expect (CQL`SELECT from Foo {a,b as c}`).to.eql(cqn = {
         SELECT: {
           from: { ref: ['Foo'] },
-          columns: [{ ref: ['a'] }, { ref: ['b'], as: 'c' }],
+          columns: [
+            STAR,
+            { ref: ['x'] },
+            { ref: ['car'], expand: ['*'] },
+            {
+              ref: ['boo'],
+              expand: [ '*', { ref: ['moo', 'zoo'], expand: [{ ref: ['y', 'z'] }] }],
+            },
+          ],
         },
       })
-      expect(SELECT.from(Foo, ['a', { b: 'c' }])).to.eql(cqn)
-      expect(
-        SELECT.from(Foo, (foo) => {
-          foo.a, foo.b.as('c')
-        })
-      ).to.eql(cqn)
-      expect(SELECT.from(Foo).columns('a', { b: 'c' })).to.eql(cqn)
-      expect(SELECT.from(Foo).columns(['a', { b: 'c' }])).to.eql(cqn)
-      expect(
-        SELECT.from(Foo).columns((foo) => {
-          foo.a, foo.b.as('c')
-        })
-      ).to.eql(cqn)
-
-      // multiple columns and *, prefix and postfix, as array and function
-      expect(CQL`SELECT *,a,b from Foo`).to.eql(CQL`SELECT from Foo{*,a,b}`)
-      //> .to.eql... FIXME: see skipped 'should handle * correctly' below
-      expect(SELECT.from(Foo, ['a', 'b', '*']))
-        .to.eql(SELECT.from(Foo).columns('a', 'b', '*'))
-        .to.eql(SELECT.from(Foo).columns(['a', 'b', '*']))
-        .to.eql(
-          SELECT.from(Foo, (foo) => {
-            foo.a, foo.b, foo('*')
-          })
-        )
-        .to.eql({
-          SELECT: {
-            from: { ref: ['Foo'] },
-            columns: [{ ref: ['a'] }, { ref: ['b'] }, cdr ? '*' : { ref: ['*'] }],
-          },
-        })
-      })
-
-      test('from ( ..., => _.expand ( x=>{...}))', () => {
-        // SELECT from Foo { *, x, bar.*, car{*}, boo { *, moo.zoo } }
-        expect(
-          SELECT.from(Foo, (foo) => {
-            foo('*'),
-              foo.x,
-              foo.car('*'),
-              foo.boo((b) => {
-                b('*'), b.moo.zoo((x) => x.y.z)
-              })
-          })
-        ).to.eql({
-          SELECT: {
-            from: { ref: ['Foo'] },
-            columns: [
-              cdr ? '*' : { ref: ['*'] },
-              { ref: ['x'] },
-              { ref: ['car'], expand: ['*'] },
-              {
-                ref: ['boo'],
-                expand: ['*', { ref: ['moo', 'zoo'], expand: [{ ref: ['y', 'z'] }] }],
-              },
-            ],
-          },
-        })
-      })
-
-      test('from ( ..., => _.inline ( _=>{...}))', () => {
-        // SELECT from Foo { *, x, bar.*, car{*}, boo { *, moo.zoo } }
-        expect(
-          SELECT.from(Foo, (foo) => {
-            foo.bar('*'),
-              foo.bar('.*'), //> leading dot indicates inline
-              foo.boo((x) => x.moo.zoo),
-              foo.boo((_) => _.moo.zoo) //> underscore arg name indicates inline
-          })
-        ).to.eql({
-          SELECT: {
-            from: { ref: ['Foo'] },
-            columns: [
-              { ref: ['bar'], expand: ['*'] },
-              { ref: ['bar'], inline: ['*'] },
-              { ref: ['boo'], expand: [{ ref: ['moo', 'zoo'] }] },
-              { ref: ['boo'], inline: [{ ref: ['moo', 'zoo'] }] },
-            ],
-          },
-        })
-      })
-
-    test('one / distinct ...', () => {
-      expect(SELECT.distinct.from(Foo).SELECT)
-        // .to.eql(CQL(`SELECT distinct from Foo`).SELECT)
-        .to.eql(SELECT.distinct(Foo).SELECT)
-        .to.eql({ distinct: true, from: { ref: ['Foo'] } })
-
-      expect(SELECT.one.from(Foo).SELECT)
-        // .to.eql(CQL(`SELECT one from Foo`).SELECT)
-        .to.eql(SELECT.one(Foo).SELECT)
-        .to.eql({ one: true, from: { ref: ['Foo'] } })
-
-      expect(SELECT.one('a').from(Foo).SELECT)
-        // .to.eql(CQL(`SELECT distinct a from Foo`).SELECT)
-        .to.eql(SELECT.one(['a']).from(Foo).SELECT)
-        .to.eql(SELECT.one(Foo, ['a']).SELECT)
-        .to.eql(SELECT.one(Foo, (foo) => foo.a).SELECT)
-        .to.eql(SELECT.one.from(Foo, (foo) => foo.a).SELECT)
-        .to.eql(SELECT.one.from(Foo, ['a']).SELECT)
-        .to.eql({
-          one: true,
-          from: { ref: ['Foo'] },
-          columns: [{ ref: ['a'] }],
-        })
-      // same for works distinct
     })
 
+
+    test('with nested inlines', () => {
+      // SELECT from Foo { *, x, bar.*, car{*}, boo { *, moo.zoo } }
+      expect.plain(
+        SELECT.from (Foo, foo => {
+          foo.bar `*`,
+          foo.bar `.*`, //> leading dot indicates inline
+          foo.boo(_ => _.moo.zoo), //> underscore arg name indicates inline
+          foo.boo(x => x.moo.zoo)
+        })
+      ).to.eql({
+        SELECT: {
+          from: { ref: ['Foo'] },
+          columns: [
+            { ref: ['bar'], expand: ['*'] },
+            { ref: ['bar'], inline: ['*'] },
+            { ref: ['boo'], inline: [{ ref: ['moo', 'zoo'] }] },
+            { ref: ['boo'], expand: [{ ref: ['moo', 'zoo'] }] },
+          ],
+        },
+      })
+    })
+
+  })}
+
+  describe ('SELECT where...', ()=>{
+
     it('should correctly handle { ... and:{...} }', () => {
       expect(SELECT.from(Foo).where({ x: 1, and: { y: 2, or: { z: 3 } } })).to.eql({
         SELECT: {
           from: { ref: ['Foo'] },
-          where: [
+          where: cdr ? [
+            { ref: ['x'] },
+            '=',
+            { val: 1 },
+            'and',
+            // '(',
+            {xpr:[
+              { ref: ['y'] },
+              '=',
+              { val: 2 },
+              'or',
+              { ref: ['z'] },
+              '=',
+              { val: 3 },
+            ]},
+            // ')',
+          ] : [
             { ref: ['x'] },
             '=',
             { val: 1 },
             'and',
             '(',
-            { ref: ['y'] },
+            // {xpr:[
-            '=',
+              { ref: ['y'] },
-            { val: 2 },
+              '=',
-            'or',
+              { val: 2 },
-            { ref: ['z'] },
+              'or',
-            '=',
+              { ref: ['z'] },
-            { val: 3 },
+              '=',
+              { val: 3 },
+            // ]},
             ')',
           ],
         },
       })
     })
 
+    test ("where x='*'", ()=>{
+      if (cdr)
+      expect (SELECT.from(Foo).where({x:'*'}))
+      .to.eql(SELECT.from(Foo).where("x='*'"))
+      .to.eql(SELECT.from(Foo).where("x=",'*'))
+      .to.eql(SELECT.from(Foo).where`x=${'*'}`)
+      .to.eql(
+        CQL`SELECT from Foo where x='*'`
+      )
+      if (cdr)
+      expect (SELECT.from(Foo).where({x:['*',1]}))
+      .to.eql(SELECT.from(Foo).where("x in ('*',1)"))
+      .to.eql(SELECT.from(Foo).where("x in",['*',1]))
+      .to.eql(SELECT.from(Foo).where`x in ${['*',1]}`)
+      .to.eql(
+        CQL`SELECT from Foo where x in ('*',1)`
+      )
+    })
+
+    test ('where, and, or', ()=>{
+      expect (
+        SELECT.from(Foo).where({x:1,and:{y:2}})
+      ).to.eql (
+        CQL`SELECT from Foo where x=1 and y=2`
+      ) .to.eql ({ SELECT: {
+        from: {ref:['Foo']},
+        where: [
+          {ref:['x']}, '=', {val:1},
+          'and',
+          {ref:['y']}, '=', {val:2}
+        ]
+      }})
+
+      expect (
+        SELECT.from(Foo).where({x:1,or:{y:2}})
+      ).to.eql (
+        CQL`SELECT from Foo where x=1 or y=2`
+      ).to.eql ({ SELECT: {
+        from: {ref:['Foo']},
+        where: [
+          {ref:['x']}, '=', {val:1},
+          'or',
+          {ref:['y']}, '=', {val:2}
+        ]
+      }})
+
+      expect (
+        SELECT.from(Foo).where({x:1,and:{y:2}}).or({z:3})
+      ).to.eql (
+        CQL`SELECT from Foo where x=1 and y=2 or z=3`
+      )
+
+      if (cdr) expect (
+        SELECT.from(Foo).where({x:1}).and({y:2,or:{z:3}})
+      ).to.eql (
+        CQL`SELECT from Foo where x=1 and ( y=2 or z=3 )`
+      )
+
+      if (cdr) expect (
+        SELECT.from(Foo).where({1:1}).and({x:1,or:{x:2}}).and({y:2,or:{z:3}})
+      ).to.eql (
+        CQL`SELECT from Foo where 1=1 and ( x=1 or x=2 ) and ( y=2 or z=3 )`
+      )
+
+      if (cdr) expect (
+        SELECT.from(Foo).where({x:1,or:{x:2}}).and({y:2,or:{z:3}})
+      ).to.eql (
+        CQL`SELECT from Foo where ( x=1 or x=2 ) and ( y=2 or z=3 )`
+      )
+    })
+
+    test('where ({x:[undefined]})', () => {
+      if (cdr) expect (
+        SELECT.from(Foo).where({x:[undefined]})
+      ).to.eql ({ SELECT: {
+        from: {ref:['Foo']},
+        where: [
+          {ref:['x']},
+          'in',
+          { list: [ {val:undefined} ] }
+        ]
+      }})
+    })
+
     test('where ( ... cql  |  {x:y} )', () => {
       const args = [`foo`, "'bar'", 3]
       const ID = 11
@@ -280,18 +477,17 @@ describe('cds.ql → cqn', () => {
       ).to.eql({
         SELECT: {
           from: { ref: ['Foo'] },
-          where: cdr
+          where: cdr ? [
-            ? [
+            { ref: ['ID'] },
-                // '(', //> this one is not required
+            '=',
-                { ref: ['ID'] },
+            { val: ID },
-                '=',
+            'and',
-                { val: ID },
+            { ref: ['args'] },
-                'and',
+            'in',
-                { ref: ['args'] },
+            { list: args.map(val => ({ val })) },
-                'in',
+            'and',
-                { val: args },
+            {
-                'and',
+              xpr: [
-                '(', //> this one is missing, and that's changing the logic -> that's a BUG
                 { ref: ['x'] },
                 'like',
                 { val: '%x%' },
@@ -299,29 +495,28 @@ describe('cds.ql → cqn', () => {
                 { ref: ['y'] },
                 '>=',
                 { val: 9 },
-                ')',
               ]
-            : [
+            },
-                // '(', //> this one is not required
+          ] : [
-                { ref: ['ID'] },
+            { ref: ['ID'] },
-                '=',
+            '=',
-                { val: ID },
+            { val: ID },
-                'and',
+            'and',
-                { ref: ['args'] },
+            { ref: ['args'] },
-                'in',
+            'in',
-                { val: args },
+            { list: args.map(val => ({ val })) },
-                'and',
+            'and',
-                '(',  //> this one is missing, and that's changing the logic -> that's a BUG
+            '(',
-                { ref: ['x'] },
+            { ref: ['x'] },
-                'like',
+            'like',
-                { val: '%x%' },
+            { val: '%x%' },
-                'or',
+            'or',
-                { ref: ['y'] },
+            { ref: ['y'] },
-                '>=',
+            '>=',
-                { val: 9 },
+            { val: 9 },
-                ')',
+            ')',
-              ],
+          ],
-        },
+        }
       })
 
       // using CQL fragments -> uses cds.parse.expr
@@ -406,12 +601,32 @@ describe('cds.ql → cqn', () => {
         ).to.eql(cqn)
     })
 
-    it('w/ plain SQL', () => {
+    test('w/ plain SQL', () => {
       expect(SELECT.from(Books) + 'WHERE ...').to.eql(
         'SELECT * FROM capire_bookshop_Books WHERE ...'
       )
     })
 
+    it('should consistently handle *', () => {
+      if (!cdr) return
+      expect({
+        SELECT: { from: { ref: ['Foo'] }, columns: ['*'] },
+      })
+      .to.eql(CQL`SELECT * from Foo`)
+      .to.eql(CQL`SELECT from Foo{*}`)
+      .to.eql(SELECT('*').from(Foo))
+      .to.eql(SELECT.from(Foo,['*']))
+    })
+
+    it('should consistently handle lists', () => {
+      if (!cdr) return
+      const ID = 11,  args = [{ref:['foo']}, "bar", 3]
+      const cqn = CQL`SELECT from Foo where ID=11 and x in (foo,'bar',3)`
+      expect(SELECT.from(Foo).where`ID=${ID} and x in ${args}`).to.eql(cqn)
+      expect(SELECT.from(Foo).where(`ID=`, ID, `and x in`, args)).to.eql(cqn)
+      expect(SELECT.from(Foo).where({ ID, x:args })).to.eql(cqn)
+    })
+
     //
   })
 
@@ -466,21 +681,31 @@ describe('cds.ql → cqn', () => {
 
   describe(`UPDATE...`, () => {
     test('entity (..., <key>)', () => {
-      expect(UPDATE(Books, 4711))
+      const cqnWhere = {
-        .to.eql(UPDATE(Books, { ID: 4711 }))
-        .to.eql(UPDATE(Books).byKey(4711))
-        .to.eql(UPDATE(Books).byKey({ ID: 4711 }))
-        .to.eql(UPDATE(Books).where({ ID: 4711 }))
-        .to.eql(UPDATE(Books).where(`ID=`, 4711))
-        .to.eql(UPDATE.entity(Books, 4711))
-        .to.eql(UPDATE.entity(Books, { ID: 4711 }))
-        // etc...
-        .to.eql({
           UPDATE: {
             entity: 'capire.bookshop.Books',
             where: [{ ref: ['ID'] }, '=', { val: 4711 }],
           },
-        })
+        }
+      expect(UPDATE(Books).where({ ID: 4711 }))
+        .to.eql(UPDATE(Books).where(`ID=`, 4711))
+        .to.eql(cqnWhere)
+
+      const cqnKey = (cds.version >= '5.6.0') ?
+        {
+          UPDATE: {
+            entity: { ref: [{ id: 'capire.bookshop.Books', where: [{ ref: ['ID'] }, '=', { val: 4711 }] }] }
+          }
+        }
+        : cqnWhere
+      expect(UPDATE(Books, 4711))
+        .to.eql(UPDATE(Books, { ID: 4711 }))
+        .to.eql(UPDATE(Books).byKey(4711))
+        .to.eql(UPDATE(Books).byKey({ ID: 4711 }))
+        .to.eql(UPDATE.entity(Books, 4711))
+        .to.eql(UPDATE.entity(Books, { ID: 4711 }))
+        // etc...
+        .to.eql(cqnKey)
     })
 
     /*
@@ -531,20 +756,29 @@ describe('cds.ql → cqn', () => {
 
   describe(`DELETE...`, () => {
     test('from (..., <key>)', () => {
+      const cqnWhere = {
+          DELETE: {
+            from: 'capire.bookshop.Books',
+            where: [{ ref: ['ID'] }, '=', { val: 4711 }],
+          },
+        }
+      expect(DELETE.from(Books).where({ ID: 4711 }))
+        .to.eql(DELETE.from(Books).where(`ID=`, 4711))
+        .to.eql(cqnWhere)
+      const cqnKey = (cds.version >= '5.6.0') ?
+        {
+          DELETE: {
+          from: { ref: [{ id: 'capire.bookshop.Books', where: [{ ref: ['ID'] }, '=', { val: 4711 }]}] }
+          },
+        } : cqnWhere
+
       expect(DELETE(Books, 4711))
         .to.eql(DELETE(Books, { ID: 4711 }))
         .to.eql(DELETE.from(Books, 4711))
         .to.eql(DELETE.from(Books, { ID: 4711 }))
         .to.eql(DELETE.from(Books).byKey(4711))
         .to.eql(DELETE.from(Books).byKey({ ID: 4711 }))
-        .to.eql(DELETE.from(Books).where({ ID: 4711 }))
+        .to.eql(cqnKey)
-        .to.eql(DELETE.from(Books).where(`ID=`, 4711))
-        .to.eql({
-          DELETE: {
-            from: 'capire.bookshop.Books',
-            where: [{ ref: ['ID'] }, '=', { val: 4711 }],
-          },
-        })
     })
 
     test('/w plain SQL', () => {

test/consuming-services.test.js

@@ -1,11 +1,11 @@
-const { expect } = require('../test') .run (
+const cds = require('@sap/cds/lib')
+const { expect } = cds.test (
   'serve', 'AdminService', '--from', '@capire/bookshop,@capire/common', '--in-memory'
 )
-const cds = require('@sap/cds/lib')
 
 describe('Consuming Services locally', () => {
   //
-  it('bootrapped the database successfully', ()=>{
+  it('bootstrapped the database successfully', ()=>{
     const { AdminService } = cds.services
     const { Authors } = AdminService.entities
     expect(AdminService).not.to.be.undefined
@@ -15,17 +15,17 @@ describe('Consuming Services locally', () => {
   it('supports targets as strings or reflected defs', async () => {
     const AdminService = await cds.connect.to('AdminService')
     const { Authors } = AdminService.entities
-    const _ = expect (await AdminService.read(Authors))
+    expect (await SELECT.from(Authors))
+    .to.eql(await SELECT.from('Authors'))
+    .to.eql(await AdminService.read(Authors))
     .to.eql(await AdminService.read('Authors'))
     .to.eql(await AdminService.run(SELECT.from(Authors)))
-    // temporary workaround
+    .to.eql(await AdminService.run(SELECT.from('Authors')))
-    if (cds.version >= '4.2.0')
-      _.to.eql(await AdminService.run(SELECT.from('Authors')))
   })
 
   it('allows reading from local services using cds.ql', async () => {
     const AdminService = await cds.connect.to('AdminService')
-    const query = SELECT.from('Authors', (a) => {
+    const authors = await AdminService.read (`Authors`, a => {
       a.name,
         a.books((b) => {
           b.title,
@@ -34,10 +34,6 @@ describe('Consuming Services locally', () => {
             })
         })
     }).where(`name like`, 'E%')
-    // temporary workaround
-    if (cds.version < '4.2.0')
-      query.SELECT.from.ref[0] = 'AdminService.Authors'
-    const authors = await AdminService.run(query)
     expect(authors).to.containSubset([
       {
         name: 'Emily Brontë',

test/custom-handlers.test.js

@@ -1,18 +1,14 @@
-const { GET, POST, expect } = require('../test') .run ('bookshop')
 const cds = require('@sap/cds/lib')
+const { GET, POST, expect } = cds.test(__dirname+'/../bookshop')
 if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
 else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
 
 describe('Custom Handlers', () => {
 
   it('should reject out-of-stock orders', async () => {
-    await expect(
+    await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`
-      Promise.all([
+    await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`
-        POST('/browse/submitOrder', { book: 201, amount: 5 }),
+    await expect(POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`).to.be.rejectedWith(/409 - 5 exceeds stock for book #201/)
-        POST('/browse/submitOrder', { book: 201, amount: 5 }),
-        POST('/browse/submitOrder', { book: 201, amount: 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)
   })

test/hello-world.test.js

@@ -1,4 +1,5 @@
-const { GET, expect } = require('../test') .run ('serve','hello/world.cds')
+const cds = require('@sap/cds/lib')
+const { GET, expect } = cds.test (__dirname+'/../hello')
 
 describe('Hello world!', () => {
 

test/hierarchical-data.test.js

@@ -1,7 +1,5 @@
-const {expect} = require('../test')
 const cds = require('@sap/cds/lib')
-
+const {expect} = cds.test
-const { parse:cdr } = cds.ql
 
 // should become cds.compile(...) when cds5 is released
 const model = cds.compile.to.csn (`
@@ -76,11 +74,9 @@ describe('Hierarchical Data', ()=>{
 		const expected = [
       { ID:100, name:'Some Cats...' },
       { ID:101, name:'Cat' },
-        { ID:104, name:'Aristocat' },  // REVISIT: Should be deleted as well?
       { ID:108, name:'Catweazle' }
 		]
-		if (cdr) expect ( await SELECT.from(Cats) ).to.containSubset (expected)
+		expect ( await SELECT`ID,name`.from(Cats) ).to.eql (expected)
-		else expect ( await SELECT.from(Cats) ).to.eql (expected)
 	})
 
 })

test/index.js

@@ -1,2 +0,0 @@
-const cds = require('@sap/cds')
-module.exports = cds.test.in(__dirname,'..')

test/localized-data.test.js

@@ -1,5 +1,5 @@
-const { GET, expect } = require('../test') .run ('serve', 'test/localized-data.cds', '--in-memory')
 const cds = require('@sap/cds/lib')
+const { GET, expect } = cds.test.run ('serve', __dirname+'/localized-data.cds', '--in-memory')
 if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
 else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
 
@@ -43,7 +43,7 @@ describe('Localized Data', () => {
       { title: 'Jane Eyre', author: 'Charlotte Brontë', currency: { name: 'Pfund' } },
       { title: 'The Raven', author: 'Edgar Allen Poe', currency: { name: 'US-Dollar' } },
       { title: 'Eleonora', author: 'Edgar Allen Poe', currency: { name: 'US-Dollar' } },
-      { title: 'Catweazle', author: 'Richard Carpenter', currency: { name: 'Euro' } },
+      { title: 'Catweazle', author: 'Richard Carpenter', currency: { name: 'Yen' } },
     ])
   })
 
@@ -85,7 +85,7 @@ describe('Localized Data', () => {
       { title: 'Jane Eyre', currency: { name: 'British Pound' } },
       { title: 'The Raven', currency: { name: 'US Dollar' } },
       { title: 'Eleonora',  currency: { name: 'US Dollar' } },
-      { title: 'Catweazle', currency: { name: 'Euro' } },
+      { title: 'Catweazle', currency: { name: 'Yen' } },
     ])
   })
 })

test/messaging.test.js

@@ -1,5 +1,5 @@
-const { expect } = require('../test')
 const cds = require('@sap/cds/lib')
+const { expect } = cds.test
 const _model = '@capire/reviews'
 if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
 else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
@@ -60,11 +60,11 @@ describe('Messaging', ()=>{
         expect(M).equals(N)
         expect(received.length).equals(N)
         expect(received.map(m=>m.data)).to.deep.equal([
-            { subject: '201', rating: 1 },
+            { count: 1, subject: '201', rating: 1 },
-            { subject: '201', rating: 1.5 },
+            { count: 2, subject: '201', rating: 1.5 },
-            { subject: '201', rating: 2 },
+            { count: 3, subject: '201', rating: 2 },
-            { subject: '201', rating: 2.5 },
+            { count: 4, subject: '201', rating: 2.5 },
-            { subject: '201', rating: 3 },
+            { count: 5, subject: '201', rating: 3 },
         ])
     })
 })

test/odata.test.js

@@ -1,5 +1,5 @@
-const { GET, expect } = require('../test') .run ('bookshop')
 const cds = require('@sap/cds/lib')
+const { GET, expect } = cds.test ('@capire/bookshop')
 if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
 else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
 
@@ -18,9 +18,9 @@ describe('OData Protocol', () => {
   })
 
   it('supports $search in multiple fields', async () => {
-    const { data } = await GET(`/browse/Books`, {
+    const { data } = await GET `/browse/Books ${{
       params: { $search: 'Po', $select: `title,author` },
-    })
+    }}`
     expect(data.value).to.eql([
       { ID: 201, title: 'Wuthering Heights', author: 'Emily Brontë' },
       { ID: 207, title: 'Jane Eyre', author: 'Charlotte Brontë' },

test/registry.test.js

@@ -0,0 +1,54 @@
+
+const { fork } = require('child_process')
+const { resolve } = require('path')
+const Axios = require('axios')
+const verbose = process.env.CDS_TEST_VERBOSE
+// ||true
+
+describe('Local NPM registry', () => {
+  let registry
+  let axios
+  const cwd = resolve(__dirname, '..')
+
+  beforeAll(async ()=> {
+    const env = Object.assign(process.env, {PORT:'0'})
+    const res = await exec (resolve(cwd, '.registry/server.js'), {cwd, stdio: 'pipe', env})
+    registry = res.cp
+    axios = Axios.default.create ({ baseURL: res.url, validateStatus: (status)=>status<500 })
+  })
+
+  afterAll(() => { registry.kill() })
+
+  for (const mod of ['bookshop','fiori','orders','reviews']) {
+    it(`should serve ${mod}`, async () => {
+      const resp = await axios.get(`/@capire/${mod}`)
+      expect(resp.data).toMatchObject({name: `@capire/${mod}`, versions:{}})
+      const versions = Object.values(resp.data.versions)
+      await axios.get(versions[0].dist.tarball)
+    })
+  }
+  it(`should return 404 for unknown packages`, async () => {
+    let resp = await axios.get(`/@capire/foo`)
+    expect(resp.status).toEqual(404)
+    resp = await axios.get(`/foo`)
+    expect(resp.status).toEqual(404)
+  })
+
+})
+
+function exec (script, opts) {
+  return new Promise((resolve, reject)=> {
+    const cp = fork (script, [], opts)
+      .on('error', err => reject(new Error(err)))
+    cp.stdout.on('data', chunk => {
+      if (verbose) console.log(chunk.toString())
+      if (chunk.toString().match(/listening.*(http:.*:\d+)/i)) {
+         resolve({cp, url:RegExp.$1})
+      }
+    })
+    cp.stderr.on('data', chunk => {
+      if (verbose)  console.error(chunk.toString())
+    })
+  })
+
+}