typo

Fixed dependency
Added changes for simple field extensibility (UIFlex)
2021-12-10 10:41:34 +01:00 · 2021-12-10 10:40:17 +01:00 · 2021-12-07 11:10:12 +01:00 · 2021-11-29 15:38:37 +01:00 · 2021-11-29 15:33:57 +01:00 · 2021-11-29 15:33:57 +01:00
79 changed files with 14824 additions and 771 deletions
--- a/.github/workflows/node.js.yml
+++ b/.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
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@ default-env.json
 packages/messageBox
 reviews/msg-box
 reviews/db/test.db
+
+*.openapi3.json
--- a/.npmrc
+++ b/.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/
--- a/.registry/server.js
+++ b/.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
-process.chdir(__dirname)
+const [,,port=PORT,scope='@capire'] = process.argv
+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)
-    const package = require (`${capire}/${pkg}/package.json`)
-    const tarball = `capire-${pkg}-${package.version}.tgz`
+    if (!urlRegex.test(url))  return res.sendStatus(404)
+    const [, scpe, pkg ] = urlRegex.exec(url)
+    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)
-    res.sendStatus(404)
+    if (e.code === 'MODULE_NOT_FOUND')  return res.sendStatus(404)
+    console.error(e);  throw e
  }
 })

-app.listen(port, ()=>{
-  console.log (`npm set @capire:registry=http://localhost:${port}`)
-  console.log (`@capire registry listening on http://localhost:${port}`)
-  exec(`npm set @capire:registry=http://localhost:${port}`)
+const server = app.listen(port, ()=>{
+  const url = server.url = `http://localhost:${server.address().port}`
+  console.log (`npm set ${scope}:registry=${url}`)
+  exec(`npm set ${scope}:registry=${url}`)
+  console.log (`${scope} registry listening on ${url}`)
 })

+
 const _exit = ()=>{
-  console.log ('\nnpm conf rm @capire:registry')
-  exec('npm conf rm @capire:registry')
-  exec('rm *.tgz')
-  process.exit()
+  server.close()
+  exec(`npm conf rm "${scope}:registry"`, ()=> { process.exit() })
 }
+
 process.on ('SIGTERM',_exit)
 process.on ('SIGHUP',_exit)
 process.on ('SIGINT',_exit)
--- a/.tours/db-native.tour
+++ b/.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.",
-      "line": 17,
+      "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.",
+      "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"
+  ]
 }
--- a/.tours/samples.tour
+++ b/.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",
-      "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",
+      "title": "Bookstore",
+      "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
        }
      },
@@ -133,4 +136,4 @@
  ],
  "isPrimary": true,
  "description": "Overview of CAP Samples for Node.js"
-}
+}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -13,5 +13,5 @@
      "**/cds/lib/req/cls.js",
      "**/odata-v4/okra/**"
    ]
-  },
+  }
 }
--- a/README.md
+++ b/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
--- a/bookshop/app/services.cds
+++ b/bookshop/app/services.cds
--- a/bookshop/app/vue/app.js
+++ b/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 }
            }
        }

--- a/bookshop/app/vue/index.html
+++ b/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>
--- a/bookshop/db/data/sap.capire.bookshop-Books.csv
+++ b/bookshop/db/data/sap.capire.bookshop-Books.csv
@@ -3,4 +3,4 @@ ID;title;descr;author_ID;stock;price;currency_code;genre_ID
 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;"""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;"""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;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;15;EUR;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
--- a/bookshop/db/schema.cds
+++ b/bookshop/db/schema.cds
@@ -1,7 +1,7 @@
-using { Currency, managed, sap } from '@sap/cds/common';
+using { Currency, managed, sap, extensible } from '@sap/cds/common';
 namespace sap.capire.bookshop;

-entity Books : managed {
+entity Books : managed, extensible {
  key ID : Integer;
  title  : localized String(111);
  descr  : localized String(1111);
@@ -13,7 +13,7 @@ entity Books : managed {
  image : LargeBinary @Core.MediaType : 'image/png';
 }

-entity Authors : managed {
+entity Authors : managed, extensible {
  key ID : Integer;
  name   : String(111);
  dateOfBirth  : Date;
--- a/bookshop/index.js
+++ b/bookshop/index.js
@@ -1 +1,2 @@
-exports.CatalogService = require('./srv/cat-service')
+const { CatalogService } = require('./srv/cat-service')
+module.exports = { CatalogService }
--- a/bookshop/srv/cat-service.cds
+++ b/bookshop/srv/cat-service.cds
@@ -1,14 +1,16 @@
 using { sap.capire.bookshop as my } from '../db/schema';
 service CatalogService @(path:'/browse') {

-  @readonly entity Books as SELECT from my.Books { *,
+  /** 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 };

-  @readonly entity ListOfBooks as SELECT from Books
-  excluding { descr };
-
  @requires: 'authenticated-user'
-  action submitOrder ( book: Books:ID, amount: Integer ) returns { stock: Integer };
-  event OrderedBook : { book: Books:ID; amount: Integer; buyer: String };
+  action submitOrder ( book: Books:ID, quantity: Integer ) returns { stock: Integer };
+  event OrderedBook : { book: Books:ID; quantity: Integer; buyer: String };
 }
--- a/bookshop/srv/cat-service.js
+++ b/bookshop/srv/cat-service.js
@@ -1,18 +1,18 @@
 const cds = require('@sap/cds')
-const { Books } = cds.entities ('sap.capire.bookshop')

 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,amount} = req.data
+    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 (stock >= amount) {
-      await UPDATE (Books,book) .with (`stock -=`, amount)
-      await this.emit ('OrderedBook', { book, amount, buyer:req.user.id })
-      return { stock }
-    }
-    else return req.error (409,`${amount} exceeds stock for book #${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
--- a/bookshop/test/requests.http
+++ b/bookshop/test/requests.http
@@ -32,6 +32,19 @@ GET {{server}}/admin/Authors?
  # &sap-language=de
 Authorization: Basic alice:

+### ------------------------------------------------------------------------
+# Create Author
+POST {{server}}/admin/Authors
+Content-Type: application/json;IEEE754Compatible=true
+Authorization: Basic alice:
+
+{
+  "ID": 112,
+  "name": "Shakespeeeeere",
+  "age": 22
+}
+
+
 ### ------------------------------------------------------------------------
 # Create book
 POST {{server}}/admin/Books
@@ -71,7 +84,7 @@ POST {{server}}/browse/submitOrder
 Content-Type: application/json
 {{me}}

-{ "book":201, "amount":5 }
+{ "book":201, "quantity":5 }


 ### ------------------------------------------------------------------------
--- a/bookstore/index.cds
+++ b/bookstore/index.cds
@@ -0,0 +1,2 @@
+namespace sap.capire.bookshop; //> important for reflection
+using from './srv/mashup';
--- a/bookstore/package.json
+++ b/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 }
+  }
+}
--- a/bookstore/server.js
+++ b/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
--- a/bookstore/srv/mashup.cds
+++ b/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_Items } from '@capire/orders';
-extend Orders_Items with {
-  book : Association to Books on product.ID = book.ID
+using { sap.capire.orders.Orders } from '@capire/orders';
+extend Orders with {
+  extend Items with {
+    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';
--- a/bookstore/srv/mashup.js
+++ b/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
-    return UPDATE(Books,subject).with({rating})
-    // ^ Note: the framework will execute this and take care for db.tx
+    const { subject, count, rating } = msg.data
+    return UPDATE(Books,subject).with({ numberOfReviews:count, rating })
  })

  //
@@ -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)
-    .set ('stock -=', deltaAmount)
+    .and ('stock >=', deltaQuantity)
+    .set ('stock -=', deltaQuantity)
  })
 }
--- a/bookstore/srv/swagger-ui.js
+++ b/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
+}
--- a/bookstore/test/requests.http
+++ b/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

 #################################################
 #
--- a/common/data/sap.common-Currencies_texts.csv
+++ b/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
+ILS;fr;Shekel;shekel israelien
+JPY;fr;Yen;Yen japonais
--- a/fiori/.env
+++ b/fiori/.env
@@ -1,2 +0,0 @@
-# cds.requires.messaging.kind = file-based-messaging
-PORT = 4004
--- a/fiori/app/admin-authors/fiori-service.cds
+++ b/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; }
--- a/fiori/app/admin-authors/webapp/Component.js
+++ b/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 */
--- a/fiori/app/admin-authors/webapp/i18n/i18n.properties
+++ b/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
--- a/fiori/app/admin-authors/webapp/manifest.json
+++ b/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"
+  }
+}
--- a/fiori/app/admin-books/fiori-service.cds
+++ b/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 {
-	locale @ValueList:{entity:'Languages',type:#fixed}
+annotate AdminService.Books.texts {
+	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; }
--- a/fiori/app/admin-books/webapp/Component.js
+++ b/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" }
 	});
 });
--- a/fiori/app/admin-books/webapp/i18n/i18n.properties
+++ b/fiori/app/admin-books/webapp/i18n/i18n.properties
--- a/fiori/app/admin-books/webapp/manifest.json
+++ b/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" : {
--- a/fiori/app/appconfig/fioriSandboxConfig.json
+++ b/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"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
--- a/fiori/app/bookshop.html
+++ b/fiori/app/bookshop.html
@@ -1,3 +0,0 @@
-<head>
-  <meta http-equiv="refresh" content="0;url=bookshop/index.html">
-</head>
--- a/fiori/app/browse/fiori-service.cds
+++ b/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 @(
-	UI: {
-  	HeaderInfo: {
-			TypeName: 'Book',
-			TypeNamePlural: 'Books',
-  		Description: {Value: author}
-  	},
-		HeaderFacets: [
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Description}', Target: '@UI.FieldGroup#Descr'},
-		],
-		Facets: [
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Price'},
-		],
-		FieldGroup#Descr: {
-			Data: [
-				{Value: descr},
-			]
-		},
-		FieldGroup#Price: {
-			Data: [
-				{Value: price},
-				{Value: currency.symbol, Label: '{i18n>Currency}'},
-			]
-		},
-	}
-);
+annotate CatalogService.Books with @(UI : {
+    HeaderInfo        : {
+        TypeName       : 'Book',
+        TypeNamePlural : 'Books',
+        Description    : {Value : author}
+    },
+    HeaderFacets      : [{
+        $Type  : 'UI.ReferenceFacet',
+        Label  : '{i18n>Description}',
+        Target : '@UI.FieldGroup#Descr'
+    }, ],
+    Facets            : [{
+        $Type  : 'UI.ReferenceFacet',
+        Label  : '{i18n>Details}',
+        Target : '@UI.FieldGroup#Price'
+    }, ],
+    FieldGroup #Descr : {Data : [{Value : descr}, ]},
+    FieldGroup #Price : {Data : [
+        {Value : price},
+        {
+            Value : currency.symbol,
+            Label : '{i18n>Currency}'
+        },
+    ]},
+});


 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books Object Page
 //
-annotate CatalogService.Books with @(
-	UI: {
-	  SelectionFields: [ ID, price, currency_code ],
-		LineItem: [
-			{Value: title},
-			{Value: author, Label:'{i18n>Author}'},
-			{Value: genre.name},
-			{Value: price},
-			{Value: currency.symbol, Label:' '},
-		]
-	},
-);
+annotate CatalogService.Books with @(UI : {
+    SelectionFields : [
+        ID,
+        price,
+        currency_code
+    ],
+    LineItem        : [
+        {
+            Value : ID,
+            Label : '{i18n>Title}'
+        },
+        {
+            Value : author,
+            Label : '{i18n>Author}'
+        },
+        {Value : genre.name},
+        {Value : price},
+        {
+            Value : currency.symbol,
+            Label : ' '
+        },
+    ]
+}, );
--- a/fiori/app/browse/webapp/manifest.json
+++ b/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": [],
--- a/fiori/app/common.cds
+++ b/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],
-	UI: {
-		Identification: [{Value:title}],
-		SelectionFields: [ ID, author_ID, price, currency_code ],
-		LineItem: [
-			{Value: ID},
-			{Value: title},
-			{Value: author.name, Label:'{i18n>Author}'},
-			{Value: genre.name},
-			{Value: stock},
-			{Value: price},
-			{Value: currency.symbol, Label:' '},
-		]
-	}
+    Common.SemanticKey : [ID],
+    UI                 : {
+        Identification  : [{Value : title}],
+        SelectionFields : [
+            ID,
+            author_ID,
+            price,
+            currency_code
+        ],
+        LineItem        : [
+            {
+                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 @(
-	UI: {
-		HeaderInfo: {
-			TypeName: '{i18n>Book}',
-			TypeNamePlural: '{i18n>Books}',
-			Title: {Value: title},
-			Description: {Value: author.name}
-		},
-	}
-);
-
+annotate my.Books with @(UI : {HeaderInfo : {
+    TypeName       : '{i18n>Book}',
+    TypeNamePlural : '{i18n>Books}',
+    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;
-	title @title:'{i18n>Title}';
-	genre  @title:'{i18n>Genre}'  @Common: { Text: genre.name,  TextArrangement: #TextOnly };
-	author @title:'{i18n>Author}' @Common: { Text: author.name, TextArrangement: #TextOnly };
-	price @title:'{i18n>Price}';
-	stock @title:'{i18n>Stock}';
-	descr @UI.MultiLineText;
+    ID     @title : '{i18n>ID}';
+    title  @title : '{i18n>Title}';
+    genre  @title : '{i18n>Genre}'  @Common               : {
+        Text            : genre.name,
+        TextArrangement : #TextOnly
+    };
+    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],
-	UI: {
-		SelectionFields: [ name ],
-		LineItem:[
-			{Value: name},
-			{Value: parent.name, Label: 'Main Genre'},
-		],
-	}
+    Common.SemanticKey : [name],
+    UI                 : {
+        SelectionFields : [name],
+        LineItem        : [
+            {Value : name},
+            {
+                Value : parent.name,
+                Label : 'Main Genre'
+            },
+        ],
+    }
 );

 ////////////////////////////////////////////////////////////////////////////
 //
 //	Genre Details
 //
-annotate my.Genres with @(
-	UI: {
-		Identification: [{Value:name}],
-		HeaderInfo: {
-			TypeName: '{i18n>Genre}',
-			TypeNamePlural: '{i18n>Genres}',
-			Title: {Value: name},
-			Description: {Value: ID}
-		},
-		Facets: [
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>SubGenres}', Target: 'children/@UI.LineItem'},
-		],
-	}
-);
+annotate my.Genres with @(UI : {
+    Identification : [{Value : name}],
+    HeaderInfo     : {
+        TypeName       : '{i18n>Genre}',
+        TypeNamePlural : '{i18n>Genres}',
+        Title          : {Value : name},
+        Description    : {Value : ID}
+    },
+    Facets         : [{
+        $Type  : 'UI.ReferenceFacet',
+        Label  : '{i18n>SubGenres}',
+        Target : 'children/@UI.LineItem'
+    }, ],
+});

 ////////////////////////////////////////////////////////////////////////////
 //
 //	Genres Elements
 //
 annotate my.Genres with {
-	ID  @title: '{i18n>ID}';
-	name  @title: '{i18n>Genre}';
+    ID   @title : '{i18n>ID}';
+    name @title : '{i18n>Genre}';
 }

 ////////////////////////////////////////////////////////////////////////////
@@ -107,38 +129,42 @@ annotate my.Genres with {
 //	Authors List
 //
 annotate my.Authors with @(
-	Common.SemanticKey: [name],
-	UI: {
-		Identification: [{Value:name}],
-		SelectionFields: [ name ],
-		LineItem:[
-			{Value: ID},
-			{Value: name},
-			{Value: dateOfBirth},
-			{Value: dateOfDeath},
-			{Value: placeOfBirth},
-			{Value: placeOfDeath},
-		],
-	}
-);
+    Common.SemanticKey : [ID],
+    UI                 : {
+        Identification  : [{Value : name}],
+        SelectionFields : [name],
+        LineItem        : [
+            {Value : ID},
+            {Value : dateOfBirth},
+            {Value : dateOfDeath},
+            {Value : placeOfBirth},
+            {Value : placeOfDeath},
+        ],
+    }
+) {
+    ID  @Common: {
+        SemanticObject : 'Authors',
+        Text: name,
+        TextArrangement : #TextOnly,
+    };
+};

 ////////////////////////////////////////////////////////////////////////////
 //
 //	Author Details
 //
-annotate my.Authors with @(
-	UI: {
-		HeaderInfo: {
-			TypeName: '{i18n>Author}',
-			TypeNamePlural: '{i18n>Authors}',
-			Title: {Value: name},
-			Description: {Value: dateOfBirth}
-		},
-		Facets: [
-			{$Type: 'UI.ReferenceFacet', Target: 'books/@UI.LineItem'},
-		],
-	}
-);
+annotate my.Authors with @(UI : {
+    HeaderInfo : {
+        TypeName       : '{i18n>Author}',
+        TypeNamePlural : '{i18n>Authors}',
+        Title          : {Value : name},
+        Description    : {Value : dateOfBirth}
+    },
+    Facets     : [{
+        $Type  : 'UI.ReferenceFacet',
+        Target : 'books/@UI.LineItem'
+    }, ],
+});


 ////////////////////////////////////////////////////////////////////////////
@@ -146,12 +172,12 @@ annotate my.Authors with @(
 //	Authors Elements
 //
 annotate my.Authors with {
-	ID @title:'{i18n>ID}' @UI.HiddenFilter;
-	name @title:'{i18n>Name}';
-	dateOfBirth @title:'{i18n>DateOfBirth}';
-	dateOfDeath @title:'{i18n>DateOfDeath}';
-	placeOfBirth @title:'{i18n>PlaceOfBirth}';
-	placeOfDeath @title:'{i18n>PlaceOfDeath}';
+    ID           @title : '{i18n>ID}';
+    name         @title : '{i18n>Name}';
+    dateOfBirth  @title : '{i18n>DateOfBirth}';
+    dateOfDeath  @title : '{i18n>DateOfDeath}';
+    placeOfBirth @title : '{i18n>PlaceOfBirth}';
+    placeOfDeath @title : '{i18n>PlaceOfDeath}';
 }

 ////////////////////////////////////////////////////////////////////////////
@@ -159,99 +185,105 @@ annotate my.Authors with {
 //	Languages List
 //
 annotate common.Languages with @(
-	Common.SemanticKey: [code],
-	Identification: [{Value:code}],
-	UI: {
-		SelectionFields: [ name, descr ],
-		LineItem:[
-			{Value: code},
-			{Value: name},
-		],
-	}
+    Common.SemanticKey : [code],
+    Identification     : [{Value : code}],
+    UI                 : {
+        SelectionFields : [
+            name,
+            descr
+        ],
+        LineItem        : [
+            {Value : code},
+            {Value : name},
+        ],
+    }
 );

 ////////////////////////////////////////////////////////////////////////////
 //
 //	Language Details
 //
-annotate common.Languages with @(
-	UI: {
-		HeaderInfo: {
-			TypeName: '{i18n>Language}',
-			TypeNamePlural: '{i18n>Languages}',
-			Title: {Value: name},
-			Description: {Value: descr}
-		},
-		Facets: [
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
-		],
-		FieldGroup#Details: {
-			Data: [
-				{Value: code},
-				{Value: name},
-				{Value: descr}
-			]
-		},
-	}
-);
+annotate common.Languages with @(UI : {
+    HeaderInfo          : {
+        TypeName       : '{i18n>Language}',
+        TypeNamePlural : '{i18n>Languages}',
+        Title          : {Value : name},
+        Description    : {Value : descr}
+    },
+    Facets              : [{
+        $Type  : 'UI.ReferenceFacet',
+        Label  : '{i18n>Details}',
+        Target : '@UI.FieldGroup#Details'
+    }, ],
+    FieldGroup #Details : {Data : [
+        {Value : code},
+        {Value : name},
+        {Value : descr}
+    ]},
+});

 ////////////////////////////////////////////////////////////////////////////
 //
 //	Currencies List
 //
 annotate common.Currencies with @(
-	Common.SemanticKey: [code],
-	Identification: [{Value:code}],
-	UI: {
-		SelectionFields: [ name, descr ],
-		LineItem:[
-			{Value: descr},
-			{Value: symbol},
-			{Value: code},
-		],
-	}
+    Common.SemanticKey : [code],
+    Identification     : [{Value : code}],
+    UI                 : {
+        SelectionFields : [
+            name,
+            descr
+        ],
+        LineItem        : [
+            {Value : descr},
+            {Value : symbol},
+            {Value : code},
+        ],
+    }
 );

 ////////////////////////////////////////////////////////////////////////////
 //
 //	Currency Details
 //
-annotate common.Currencies with @(
-	UI: {
-		HeaderInfo: {
-			TypeName: '{i18n>Currency}',
-			TypeNamePlural: '{i18n>Currencies}',
-			Title: {Value: descr},
-			Description: {Value: code}
-		},
-		Facets: [
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Extended}', Target: '@UI.FieldGroup#Extended'},
-		],
-		FieldGroup#Details: {
-			Data: [
-				{Value: name},
-				{Value: symbol},
-				{Value: code},
-				{Value: descr}
-			]
-		},
-		FieldGroup#Extended: {
-			Data: [
-				{Value: numcode},
-				{Value: minor},
-				{Value: exponent}
-			]
-		},
-	}
-);
+annotate common.Currencies with @(UI : {
+    HeaderInfo           : {
+        TypeName       : '{i18n>Currency}',
+        TypeNamePlural : '{i18n>Currencies}',
+        Title          : {Value : descr},
+        Description    : {Value : code}
+    },
+    Facets               : [
+        {
+            $Type  : 'UI.ReferenceFacet',
+            Label  : '{i18n>Details}',
+            Target : '@UI.FieldGroup#Details'
+        },
+        {
+            $Type  : 'UI.ReferenceFacet',
+            Label  : '{i18n>Extended}',
+            Target : '@UI.FieldGroup#Extended'
+        },
+    ],
+    FieldGroup #Details  : {Data : [
+        {Value : name},
+        {Value : symbol},
+        {Value : code},
+        {Value : descr}
+    ]},
+    FieldGroup #Extended : {Data : [
+        {Value : numcode},
+        {Value : minor},
+        {Value : exponent}
+    ]},
+});

 ////////////////////////////////////////////////////////////////////////////
 //
 //	Currencies Elements
 //
 annotate common.Currencies with {
-	numcode @title:'{i18n>NumCode}';
-	minor @title:'{i18n>MinorUnit}';
-	exponent @title:'{i18n>Exponent}';
+    numcode  @title : '{i18n>NumCode}';
+    minor    @title : '{i18n>MinorUnit}';
+    exponent @title : '{i18n>Exponent}';
 }
--- a/fiori/app/admin-fiori.html
+++ b/fiori/app/admin-fiori.html
@@ -10,32 +10,21 @@
 	<script>
 		window["sap-ushell-config"] = {
 			defaultRenderer: "fiori2",
-			applications: {
-				"browse-books": {
-					title: "Browse Books",
-					description: "w/ SAP Fiori Elements",
-					additionalInformation: "SAPUI5.Component=bookshop",
-					applicationType : "URL",
-					url: "/browse/webapp",
-					navigationMode: "embedded"
-				},
-				"manage-books": {
-					title: "Manage Books",
-					description: "w/ SAP Fiori Elements",
-					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"
-				}
-			}
+			applications: {},
+			bootstrapPlugins: {
+          RuntimeAuthoringPlugin: {
+            component: "sap.ushell.plugins.rta",
+            config: {
+              validateAppVersion: false,
+            },
+          },
+          PersonalizePlugin: {
+            component: "sap.ushell.plugins.rta-personalize",
+            config: {
+              validateAppVersion: false,
+            },
+          },
+        }
 		};
 	</script>

@@ -47,8 +36,13 @@
    	data-sap-ui-frameOptions="allow"
 	></script>
 	<script>
-		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"))
-	</script>
+		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"));
+		sap.ui
+        .getCore()
+        .getConfiguration()
+        .setFlexibilityServices([{ connector: "SessionStorageConnector" }]);
+				sap.ui.getCore().getConfiguration().setLanguage("en");
+</script>

 </head>
 <body class="sapUiBody" id="content"></body>
--- a/fiori/app/reviews.html
+++ b/fiori/app/reviews.html
@@ -1,3 +0,0 @@
-<head>
-  <meta http-equiv="refresh" content="0;url=reviews/index.html">
-</head>
--- a/fiori/app/services.cds
+++ b/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/common';
-
-// only works in case of embedded orders service
-using from '@capire/orders/app/orders/fiori-service';
+using from '@capire/bookstore/srv/mashup';
--- a/fiori/db/hana/index.cds
+++ b/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,
--- a/fiori/db/schema.cds
+++ b/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;
-}
--- a/fiori/db/sqlite/index.cds
+++ b/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,
--- a/fiori/package.json
+++ b/fiori/package.json
@@ -2,11 +2,8 @@
  "name": "@capire/fiori",
  "version": "1.0.0",
  "dependencies": {
-    "@capire/bookshop": "*",
-    "@capire/reviews": "*",
-    "@capire/orders": "*",
-    "@capire/common": "*",
-    "@sap/cds": ">=4",
+    "@capire/bookstore": "*",
+    "@sap/cds": "^5",
    "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,15 +27,31 @@
        "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"
      }
    }
  }
-}
+}
--- a/fiori/server.js
+++ b/fiori/server.js
@@ -1,18 +1 @@
-const cds = require ('@sap/cds')
-
-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)))
+module.exports = require('@capire/bookstore/server.js')
--- a/hello/README.md
+++ b/hello/README.md
@@ -0,0 +1,15 @@
+# Hello World Getting Started Sample
+
+## Next Steps
+
+- To run the JavaScript implementation, open a new terminal and run `cds watch`.
+- To run the TypeScript implementation, open a new terminal and run `cds-ts watch`.
+
+Then call the service at: http://localhost:4004/say/hello(to='world')
+
+## Learn More
+
+Learn more about:
+
+- [Hello World!](https://cap.cloud.sap/docs/get-started/hello-world)
+- [Using TypeScript](https://cap.cloud.sap/docs/get-started/using-typescript)
--- a/hello/package.json
+++ b/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"
+    }
  }
-}
+}
--- a/hello/srv/world.cds
+++ b/hello/srv/world.cds
--- a/hello/srv/world.js
+++ b/hello/srv/world.js
--- a/hello/srv/world.ts
+++ b/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!`
+    }
+}
--- a/hello/test/hello-world-ts.test.ts
+++ b/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)
+    })
+
+})
--- a/hello/test/test.http
+++ b/hello/test/test.http
--- a/orders/app/orders/fiori-service.cds
+++ b/orders/app/orders/fiori-service.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
 	);
 };
--- a/orders/app/index.cds
+++ b/orders/app/index.cds
@@ -1,5 +0,0 @@
-/*
-  This model controls what gets served to Fiori frontends...
-*/
-
-using from './orders/fiori-service';
--- a/orders/app/orders/index.html
+++ b/orders/app/orders/index.html
--- a/orders/db/data/sap.capire.orders-Orders.Items.csv
+++ b/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
--- a/orders/db/schema.cds
+++ b/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';
--- a/orders/package.json
+++ b/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"
  }
 }
--- a/orders/srv/orders-service.js
+++ b/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) {
-        const { amount:before } = await cds.tx(req).run (
-          SELECT.one.from (OrderItems, oi => oi.amount) .where ({up__ID:ID, product_ID})
+      if (Items) for (let { product_ID, quantity } of Items) {
+        const { quantity:before } = await cds.tx(req).run (
+          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 })
-    return this.emit ('OrderChanged', { product, deltaAmount })
+    console.log ('> emitting:', 'OrderChanged', { product, deltaQuantity })
+    return this.emit ('OrderChanged', { product, deltaQuantity })
  }

 }
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -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
 }
--- a/reviews/.env
+++ b/reviews/.env
@@ -1,2 +1,2 @@
-cds.requires.messaging.kind = file-based-messaging
+# cds.requires.messaging.kind = file-based-messaging
 PORT = 4005
--- a/reviews/db/data/sap.capire.reviews-Reviews.csv
+++ b/reviews/db/data/sap.capire.reviews-Reviews.csv
@@ -1,5 +1,5 @@
-subject;rating;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;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.
-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.
-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.
+subject;rating;reviewer;title;text
+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;bob;Fascinating;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Id diam maecenas ultricies mi eget mauris pharetra et. Risus at ultrices mi tempus imperdiet nulla malesuada pellentesque. Pulvinar mattis nunc sed blandit libero. Facilisis magna etiam tempor orci eu. Nec sagittis aliquam malesuada bibendum arcu. Eu consequat ac felis donec. Ultricies tristique nulla aliquet enim tortor at auctor urna nunc. Tortor posuere ac ut consequat semper viverra nam libero. Amet nisl suscipit adipiscing bibendum est ultricies integer quis auctor. Scelerisque purus semper eget duis at tellus. Elementum tempus egestas sed sed risus pretium. Arcu dictum varius duis at. Amet luctus venenatis lectus magna fringilla urna. Eget velit aliquet sagittis id consectetur purus ut faucibus. Vitae auctor eu augue ut lectus. Fermentum iaculis eu non diam phasellus vestibulum.
+207;2;bob;What is this?;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Libero justo laoreet sit amet cursus sit amet dictum. Nunc faucibus a pellentesque sit. Dis parturient montes nascetur ridiculus mus mauris vitae ultricies. Enim nunc faucibus a pellentesque. Commodo quis imperdiet massa tincidunt nunc pulvinar sapien. Cras ornare arcu dui vivamus. Facilisi etiam dignissim diam quis enim lobortis. Et molestie ac feugiat sed. Urna neque viverra justo nec ultrices dui. Ullamcorper a lacus vestibulum sed arcu non. Volutpat ac tincidunt vitae semper quis. Dignissim sodales ut eu sem. Feugiat in fermentum posuere urna nec. At augue eget arcu dictum varius.
+251;3;bob;It's dark...;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Suscipit tellus mauris a diam. Velit aliquet sagittis id consectetur purus ut. Viverra adipiscing at in tellus integer. Vitae elementum curabitur vitae nunc. Mattis ullamcorper velit sed ullamcorper morbi. Diam quis enim lobortis scelerisque. Auctor neque vitae tempus quam pellentesque nec nam aliquam. Semper auctor neque vitae tempus. Quis eleifend quam adipiscing vitae proin. Neque convallis a cras semper auctor neque vitae. Imperdiet massa tincidunt nunc pulvinar sapien et ligula. Sit amet consectetur adipiscing elit ut aliquam purus. Pretium quam vulputate dignissim suspendisse.
--- a/reviews/package.json
+++ b/reviews/package.json
@@ -7,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": {
-        "kind": "sql"
-      }
+      "messaging": {
+        "[development]": { "kind": "file-based-messaging" },
+        "[hybrid]": { "kind": "enterprise-messaging-shared" },
+        "[production]": { "kind": "enterprise-messaging" }
+      },
+      "db": { "kind": "sql" }
    }
  }
 }
--- a/reviews/srv/reviews-service.cds
+++ b/reviews/srv/reviews-service.cds
@@ -8,10 +8,11 @@ service ReviewsService {
  action unlike (review: type of Reviews:ID);

  // Async API
-   event reviewed : {
-     subject: type of Reviews:subject;
-     rating: Decimal(2,1)
-   }
+  event reviewed : {
+    subject : type of Reviews:subject;
+    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
-  /////////////////////////////////////////////////
-  //
-  // 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:'UPDATE', to:'authenticated-user', where:'reviewer=$user' },
  { grant:'DELETE', to:'admin' },
 ];

--- a/reviews/srv/reviews-service.js
+++ b/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 (
-      SELECT.one (['round(avg(rating),2) as rating']) .from (Reviews) .where ({subject})
+    const { count, rating } = await cds.tx(req) .run (
+      SELECT.one `round(avg(rating),2) as rating, count(*) as count` .from (Reviews) .where ({subject})
    )
-    global.it || console.log ('< emitting:', 'reviewed', { subject, rating })
-    await this.emit ('reviewed', { subject, rating })
+    global.it || console.log ('< emitting:', 'reviewed', { subject, count, rating })
+    await this.emit ('reviewed', { subject, count, rating })
  })

  // Increment counter for reviews considered helpful
--- a/samples.md
+++ b/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>

--- a/test/cds.ql.test.js
+++ b/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
-if (!global.test) global.test = it
+const STAR = cdr ? '*' : { ref: ['*'] }
+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 *', () => {
-      expect({
-        SELECT: { from: { ref: ['Foo'] }, columns: ['*'] },
+    test(`from Foo`, () => {
+      expect(cqn = SELECT `from Foo`)
+      .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,['*']))
    })

-
-    it('should consistently handle lists', () => {
-      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 )', () => {
+    if (each === 'SELECT')
+    test('SELECT ( Foo )', () => {
      expect({
        SELECT: { from: { ref: ['Foo'] } },
      })
      .to.eql(CQL`SELECT from Foo`)
-      .to.eql(SELECT.from(Foo))
+      .to.eql(SELECT(Foo))
    })

-    test('from ( ..., <key>)', () => {
-      // Compiler
-      expect(CQL`SELECT from Foo[11]`).to.eql({
-        SELECT: {
-          // REVISIT: add one:true?
-          from: { ref: [{ id: 'Foo', where: [{ val: 11 }] }] },
-        },
+    if (each === 'SELECT')
+    test('SELECT ( Foo ) .from ( Bar )', () => {
+
+      expect({
+        SELECT: { columns:[{ref:['Foo']}], from: { ref: ['Bar'] } },
+      })
+      .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({
-        SELECT: {
-          // REVISIT: add one:true
-          from: {
-            ref: [{ id: 'Foo', where: [{ ref: ['ID'] }, '=', { val: 11 }] }],
-          },
-        },
-      })
+      if (cdr) expect.plain (cqn)
+      .to.eql(SELECT`Foo[ID=${11}]`)
+      .to.eql(srv.read`Foo[ID=${11}]`)

-      // Runtime ds.ql
-      expect(SELECT.from(Foo, 11))
-        .to.eql(SELECT.from(Foo, { ID: 11 }))
-        .to.eql(SELECT.from(Foo).byKey(11))
-        .to.eql(SELECT.from(Foo).byKey({ ID: 11 }))
-        .to.eql(SELECT.one.from(Foo).where({ ID: 11 }))
+      // Following implicitly resolve to SELECT.one
+      expect(cqn = SELECT.from(Foo,11))
+      .to.eql(SELECT.from(Foo,{ID:11}))
+      .to.eql(SELECT.from(Foo).byKey(11))
+      .to.eql(SELECT.from(Foo).byKey({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: [{ id: 'Foo', where: [{ val: 11 }] }] },
-          columns: [{ ref: ['a'] }],
+          from: { ref: ['Foo'] },
+          columns: [ STAR, { ref: ['a'] }, { ref: ['b'], as: 'c' }],
        },
      })

-      expect(SELECT.from(Foo, 11, ['a']))
-        .to.eql(SELECT.from(Foo, 11, (foo) => foo.a))
+      cdr && expect.plain(cqn)
+      .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 ( ..., => {...})', () => {
-      // single *, prefix and postfix, as array and function
-      let parsed, fluid
-      expect((parsed = CQL`SELECT * from Foo`)).to.eql(CQL`SELECT from Foo{*}`)
-      //> .to.eql... FIXME: see skipped 'should handle * correctly' below
-      expect((fluid = SELECT('*').from(Foo)))
-        .to.eql(SELECT.from(Foo, ['*']))
-        .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: ['*'] }] },
+    test('with nested expands', () => {
+      // SELECT from Foo { *, x, bar.*, car{*}, boo { *, moo.zoo } }
+      expect(cqn =
+        SELECT.from (Foo, foo => {
+          foo`*`, foo.x, foo.car`*`, foo.boo (b => {
+            b`*`, b.moo.zoo(
+              x => x.y.z
+            )
+          })
        })
-
-      if (cdr) expect(parsed).to.eql(fluid)
-
-      // single column, prefix and postfix, as array and function
-      expect(CQL`SELECT a from Foo`)
-      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'] }] },
+      ).to.eql(
+        SELECT.from (Foo, foo => {
+          foo('*'), foo.x, foo.car('*'), foo.boo (b => {
+            b('*'), b.moo.zoo(
+              x => x.y.z
+            )
+          })
        })
+      )

-      // multiple columns, prefix and postfix, as array and function
-      expect(CQL`SELECT a,b as c from Foo`)
-
-      expect (CQL`SELECT from Foo {a,b as c}`).to.eql(cqn = {
+      expect.plain(cqn)
+      .to.eql({
        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'] },
-            '=',
-            { val: 2 },
-            'or',
-            { ref: ['z'] },
-            '=',
-            { val: 3 },
+            // {xpr:[
+              { ref: ['y'] },
+              '=',
+              { val: 2 },
+              'or',
+              { ref: ['z'] },
+              '=',
+              { 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
-            ? [
-                // '(', //> this one is not required
-                { ref: ['ID'] },
-                '=',
-                { val: ID },
-                'and',
-                { ref: ['args'] },
-                'in',
-                { val: args },
-                'and',
-                '(', //> this one is missing, and that's changing the logic -> that's a BUG
+          where: cdr ? [
+            { ref: ['ID'] },
+            '=',
+            { val: ID },
+            'and',
+            { ref: ['args'] },
+            'in',
+            { list: args.map(val => ({ val })) },
+            'and',
+            {
+              xpr: [
                { ref: ['x'] },
                'like',
                { val: '%x%' },
@@ -299,29 +495,28 @@ describe('cds.ql → cqn', () => {
                { ref: ['y'] },
                '>=',
                { val: 9 },
-                ')',
              ]
-            : [
-                // '(', //> this one is not required
-                { ref: ['ID'] },
-                '=',
-                { val: ID },
-                'and',
-                { ref: ['args'] },
-                'in',
-                { val: args },
-                'and',
-                '(',  //> this one is missing, and that's changing the logic -> that's a BUG
-                { ref: ['x'] },
-                'like',
-                { val: '%x%' },
-                'or',
-                { ref: ['y'] },
-                '>=',
-                { val: 9 },
-                ')',
-              ],
-        },
+            },
+          ] : [
+            { ref: ['ID'] },
+            '=',
+            { val: ID },
+            'and',
+            { ref: ['args'] },
+            'in',
+            { list: args.map(val => ({ val })) },
+            'and',
+            '(',
+            { ref: ['x'] },
+            'like',
+            { val: '%x%' },
+            'or',
+            { ref: ['y'] },
+            '>=',
+            { 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))
-        .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({
+      const cqnWhere = {
          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(DELETE.from(Books).where(`ID=`, 4711))
-        .to.eql({
-          DELETE: {
-            from: 'capire.bookshop.Books',
-            where: [{ ref: ['ID'] }, '=', { val: 4711 }],
-          },
-        })
+        .to.eql(cqnKey)
    })

    test('/w plain SQL', () => {
--- a/test/consuming-services.test.js
+++ b/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
-    if (cds.version >= '4.2.0')
-      _.to.eql(await AdminService.run(SELECT.from('Authors')))
+    .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ë',
--- a/test/custom-handlers.test.js
+++ b/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(
-      Promise.all([
-        POST('/browse/submitOrder', { book: 201, amount: 5 }),
-        POST('/browse/submitOrder', { book: 201, amount: 5 }),
-        POST('/browse/submitOrder', { book: 201, amount: 5 }),
-      ])
-    ).to.be.rejectedWith(/409 - 5 exceeds stock for book #201/)
+    await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`
+    await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`
+    await expect(POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`).to.be.rejectedWith(/409 - 5 exceeds stock for book #201/)
    const { data } = await GET`/admin/Books/201/stock/$value`
    expect(data).to.equal(2)
  })
--- a/test/hello-world.test.js
+++ b/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!', () => {

--- a/test/hierarchical-data.test.js
+++ b/test/hierarchical-data.test.js
@@ -1,7 +1,5 @@
-const {expect} = require('../test')
 const cds = require('@sap/cds/lib')
-
-const { parse:cdr } = cds.ql
+const {expect} = cds.test

 // 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)
-		else expect ( await SELECT.from(Cats) ).to.eql (expected)
+		expect ( await SELECT`ID,name`.from(Cats) ).to.eql (expected)
 	})

 })
--- a/test/index.js
+++ b/test/index.js
@@ -1,2 +0,0 @@
-const cds = require('@sap/cds')
-module.exports = cds.test.in(__dirname,'..')
--- a/test/localized-data.test.js
+++ b/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' } },
    ])
  })
 })
--- a/test/messaging.test.js
+++ b/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 },
-            { subject: '201', rating: 1.5 },
-            { subject: '201', rating: 2 },
-            { subject: '201', rating: 2.5 },
-            { subject: '201', rating: 3 },
+            { count: 1, subject: '201', rating: 1 },
+            { count: 2, subject: '201', rating: 1.5 },
+            { count: 3, subject: '201', rating: 2 },
+            { count: 4, subject: '201', rating: 2.5 },
+            { count: 5, subject: '201', rating: 3 },
        ])
    })
 })
--- a/test/odata.test.js
+++ b/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ë' },
--- a/test/registry.test.js
+++ b/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())
+    })
+  })
+
+}
Author	SHA1	Message	Date
nkaputnik	e08cdf7831	typo	2021-12-10 10:41:34 +01:00
nkaputnik	1ec44aaecf	Fixed dependency	2021-12-10 10:40:17 +01:00
nkaputnik	a6ea2fb130	Added changes for simple field extensibility (UIFlex)	2021-12-07 11:10:12 +01:00
Daniel	1fde0c928b	Fixed submit order -> returned stock was wrong	2021-11-29 15:38:37 +01:00
Christian Georgi	fa854a2411	Add hint on `db-ext` datasource to code tour Signed-off-by: Christian Georgi <christian.georgi@sap.com>	2021-11-29 15:33:57 +01:00
Daniel	40b6acee6a	Fixing erroneous db.model config	2021-11-29 15:33:57 +01:00
Daniel	a37f1b8e0c	Reformatted package.json	2021-11-29 15:33:57 +01:00
Christian Georgi	042ddec41c	Adjust code tour	2021-11-29 15:33:57 +01:00
Daniel	8d8aa6c2c9	Fixing copy errors Signed-off-by: Daniel <daniel.hutzel@sap.com>	2021-11-29 15:33:57 +01:00
Daniel	756ed48ce3	Fiori apps with manage authors Signed-off-by: Daniel <daniel.hutzel@sap.com>	2021-11-29 15:33:57 +01:00
Daniel	19b680ab3d	Moving lifetime + age to where it is used Signed-off-by: Daniel <daniel.hutzel@sap.com>	2021-11-29 15:33:57 +01:00
Daniel	33380c0792	Restore simple bookshop - no workarounds Signed-off-by: Daniel <daniel.hutzel@sap.com>	2021-11-29 15:33:57 +01:00
Christian Georgi	0d5b65d93f	Merge pull request #291 from gregorwolf/navigation Demo for Semantic Navigation using the local Fiori Launchpad	2021-11-22 13:08:57 +01:00
Christian Georgi	dcf5ec6068	Merge branch 'main' into navigation	2021-11-18 16:19:57 +01:00
Christian Georgi	fb41dd100b	Merge pull request #293 from SAP-samples/bookstore In Fiori app, use bookstore consistently	2021-11-18 16:12:12 +01:00
Christian Georgi	769aa2b4f5	Adjust samples tour to bookstore	2021-11-18 15:34:59 +01:00
Christian Georgi	f6c5e620c0	In Fiori app, use bookstore consistently This also fixes validation errors from annotation LSP, which missed some of the bookstore elements Signed-off-by: Christian Georgi <christian.georgi@sap.com>	2021-11-18 14:14:09 +01:00
Gregor Wolf	7013cb6296	remove name	2021-11-13 00:48:13 +01:00
Gregor Wolf	6411ce4ea3	remove redundant annotation	2021-11-13 00:48:04 +01:00
Gregor Wolf	cd914a8d87	show ID in LineItem	2021-11-13 00:41:48 +01:00
Gregor Wolf	b35e92b5bc	TextArrangement : #TextOnly	2021-11-13 00:41:28 +01:00
Gregor Wolf	8350aff111	correct renameTo	2021-11-13 00:36:22 +01:00
Gregor Wolf	9aa604c5a0	remove @UI.HiddenFilter	2021-11-12 23:56:11 +01:00
Gregor Wolf	f5cb53adf8	add inbounds parameter	2021-11-12 23:48:51 +01:00
Gregor Wolf	9fe16edc55	fix manifest issues	2021-11-12 23:48:26 +01:00
Gregor Wolf	0093883f25	add Author ID column	2021-11-12 23:46:41 +01:00
Gregor Wolf	14024a4837	add semantic object for navigation	2021-11-12 22:31:58 +01:00
Gregor Wolf	2e13b37096	activate automatic load	2021-11-12 22:31:42 +01:00
Gregor Wolf	7407b0aae3	format	2021-11-12 22:04:48 +01:00
Gregor Wolf	152d088ff4	rename author to authorName	2021-11-12 21:49:39 +01:00
Gregor Wolf	19c886d6dc	fix implicit redirection issue	2021-11-12 21:41:39 +01:00
Gregor Wolf	575cffe70a	migrate to fioriSandboxConfig.json	2021-11-12 21:29:21 +01:00
Gregor Wolf	03869e5896	Fiori UI for Authors	2021-11-12 21:28:49 +01:00
Gregor Wolf	597afeb3d8	format, rename author to authorName	2021-11-12 21:28:23 +01:00
Gregor Wolf	d376e6e063	UI annotations for Authors	2021-11-12 21:27:40 +01:00
Gregor Wolf	2a44cfa9dc	add Authors, rename author attribute	2021-11-12 21:25:33 +01:00
Gregor Wolf	7964c9aefd	adjust formatting	2021-11-12 20:59:45 +01:00
Christian Georgi	ce752097d0	Merge pull request #290 from dinurp/main Annotations for Admin.Book service	2021-11-10 08:55:47 +01:00
dinurp	e838f380c5	annotation to make language value list a drop down. type:#Fixed was not rendering the value list as a drop down. There was not UI validation for values entered. The added annotation does both these: UI validation and renders the a drop down list.	2021-11-10 11:18:41 +04:00
dinurp	e89e012eba	Update bookshop/srv/admin-service.cds Co-authored-by: Christian Georgi <chgeo@users.noreply.github.com>	2021-11-10 11:12:18 +04:00
Christian Georgi	bf0f57efe5	Merge branch 'main' into main	2021-11-09 17:55:55 +01:00
Dinu	40ea057f7f	Annotation for value list for languages for locale	2021-11-09 15:46:22 +04:00
Dinu	31d2f4c932	Avoid popup for ID in Fiori preview for Books.	2021-11-09 14:01:53 +04:00
Daniel Hutzel	8cc2db7118	Using managed compositions for Order.Items (#273 ) * Using managed compositions for Order.Items Co-authored-by: sjvans <30337871+sjvans@users.noreply.github.com>	2021-11-08 17:41:33 +01:00
Daniel Hutzel	482b71e60b	Remove workaround for integrity check (#173 ) * Remove workaround for integrity check	2021-11-08 14:23:41 +01:00
Daniel Hutzel	7536451e29	Enhanced cds.ql tests (#228 ) * Enhanced cds.ql tests	2021-11-08 13:49:43 +01:00
Daniel	2703e8b999	Removed authorization workaround	2021-11-08 13:19:12 +01:00
Daniel	ac2e4dd6f9	Updating package-lock to v2	2021-11-08 13:17:31 +01:00
PierreFritsch	c718fa400d	`import {Request}` => `import type {Request}`	2021-11-08 13:14:02 +01:00
Pierre Fritsch	730da6e435	hello TypeScript: Define type of `req` object Make it clearer that `req` is a CDS `Request` object.	2021-11-08 13:14:02 +01:00
Daniel	7d9b4f7a5d	Fixes for Node16	2021-11-05 17:01:59 +01:00
Daniel	35d3708592	Fixes for Node16	2021-11-05 15:49:05 +01:00
Daniel	eaaf0d29a5	Updated package-lock.json	2021-11-04 10:37:33 +01:00
Daniel	64fe700d1e	...	2021-11-04 10:37:33 +01:00
Daniel	5c3cec973e	Using bookstore as composite app	2021-11-04 10:37:33 +01:00
Daniel	680a6ae68f	Introduced bookstore composite app	2021-11-04 10:37:33 +01:00
Daniel	366b0f8f9a	Using flat fiori app folder	2021-11-04 10:37:33 +01:00
Daniel	b95df77b9a	Fixed access to cds.entities	2021-11-04 10:37:33 +01:00
Christian Georgi	7f6b87171a	Merge pull request #284 from SAP-samples/registry NPM registry: more robust, work on Windows	2021-10-26 22:21:32 +02:00
Christian Georgi	21e74bbbfb	Add test for NPM registry	2021-10-26 22:17:25 +02:00
Christian Georgi	102b15c3cd	NPM registry: more robust, work on Windows - Run `npm rm` in correct dir - Encode args in `npm conf rm` command for Powershell - Don't cleanup in exit handler, this might not complete. Instead, do it on startup. - Different cleanup command for Windows and Linux - Explicitly close server, instead of relying on process.exit() - Make scope configurable	2021-10-26 19:11:08 +02:00
Dr. David A. Kunz	73db2e96bc	Merge pull request #283 from SAP-samples/ql-changes-typo-fix fix typo in ql changes	2021-10-26 11:57:44 +02:00
Dr. David A. Kunz	7bb58ee2d5	Merge branch 'main' into ql-changes-typo-fix	2021-10-26 11:56:15 +02:00
D065023	27e82d16e0	fix typo	2021-10-26 11:55:33 +02:00
Dr. David A. Kunz	ff9bbe6d8d	Merge pull request #282 from SAP-samples/ql-changes Changes in ql for cds version 5.6.0	2021-10-26 11:32:09 +02:00
Dr. David A. Kunz	5f1b7b8cbf	Merge branch 'main' into ql-changes	2021-10-26 11:27:27 +02:00
D065023	0253300557	Changes in ql for cds version 5.6.0	2021-10-26 11:22:43 +02:00
Daniel	139d957495	Added reviewed.count to messsages	2021-10-18 18:04:33 +02:00
Daniel	404427237b	Updated reviews samples for messaging GA	2021-10-18 18:04:33 +02:00
Christian Georgi	5f89334403	Remove refs to 'master' branch	2021-10-12 18:46:21 +02:00
Christian Georgi	e612fa97ea	Merge pull request #277 from SAP-samples/updated-package.json Updated package.json	2021-10-08 11:16:10 +02:00
Christian Georgi	da2ea39466	Do not fail on absent cds-swagger-ui-express	2021-10-08 10:23:12 +02:00
Daniel	117000df71	Revert "temporarily using sqlite3 until next release to fix vulnerabilities" This reverts commit `f3ffb69d3a`.	2021-10-08 07:50:04 +02:00
Daniel	f3ffb69d3a	temporarily using sqlite3 until next release to fix vulnerabilities	2021-10-08 07:41:18 +02:00
Daniel	f908484973	Updated package.json	2021-10-08 06:42:50 +02:00
Christian Georgi	c4529f3cd7	Increase test timeout At least on slower machines or when file system caches are not filled, the default 5000 ms are not enough for the tests to finish.	2021-09-29 13:51:49 +02:00
Christian Georgi	0220400484	Avoid mixed spaces/tabs	2021-09-20 15:56:53 +02:00
dependabot[bot]	c1911b6e96	Bump axios from 0.21.1 to 0.21.4 Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.4. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.4) --- updated-dependencies: - dependency-name: axios dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2021-09-10 15:42:25 +02:00
Daniel	19083d156e	Rename amount -> quantity	2021-09-10 15:39:30 +02:00
Christian Georgi	48d547e6cd	Make jest really silent	2021-09-10 15:35:36 +02:00
Daniel	bae491a832	one more more more	2021-08-31 20:36:36 +02:00
Daniel	ca41a2141c	one more	2021-08-31 19:30:09 +02:00
Daniel Hutzel	08f409af73	more (#267 )	2021-08-31 18:05:22 +02:00
Daniel Hutzel	efa60550fb	fix cds.ql (#266 )	2021-08-31 13:29:05 +02:00
Daniel Hutzel	f599206bf4	Fixed cds.ql in latest release (#232 ) * Fixed cds.ql in latest release * Requires @sap/cds ^5.1.5 * fixed fixes * More cdr tests Co-authored-by: Christian Georgi <chgeo@users.noreply.github.com>	2021-08-31 09:59:06 +02:00
Daniel	2f5d159428	using cds.test	2021-08-30 16:08:25 +02:00
Daniel	2be3d50389	More cds.ql cleanup	2021-08-30 11:09:42 +02:00
Daniel	46b58f1b5c	skipping ts test	2021-08-27 14:19:17 +02:00
Daniel	e87527cbcd	fixed package-lock	2021-08-27 14:19:17 +02:00
Daniel	091844219b	Upgrade to jest 27	2021-08-27 14:19:17 +02:00
Daniel	de796e5a89	Fixed '*' in upcomming release	2021-08-27 10:46:53 +02:00
Daniel	f988088412	'*' is still different	2021-08-26 06:50:13 +02:00
Daniel	c4a51ab719	fixed test	2021-08-26 06:50:13 +02:00
Daniel	f58376607a	Prep for cleaning up cds.ql	2021-08-26 06:50:13 +02:00
Dr. David A. Kunz	839048d87c	Merge pull request #260 from SAP-samples/fixing-test Cascade delete test: Yes it should have been deleted	2021-08-19 12:57:56 +02:00
D065023	3b3463f889	skipped	2021-08-19 12:55:48 +02:00
D065023	d3396304ec	yes it should be deleted	2021-08-19 12:45:03 +02:00
Pierre Fritsch	ae09caf7ad	Enable `cds watch hello` by moving the `hello` implementation into the subfolder `srv`	2021-08-03 16:01:10 +02:00
Daniel Hutzel	e1052c209b	Removing workaround for glitch in drafts (#254 ) * Removing workaround for glitch in drafts * cosmetics	2021-08-02 17:20:46 +02:00
Christian Georgi	cd3aad59e1	Fix UI warnings These were caused by the UI check not being aware of the parallel `common.cds` file.	2021-07-14 10:11:21 +02:00
Christian Georgi	bcbf65f95e	Draft for localized: expose Books.texts well `Books.texts` must be explicitly exposed in order to be drafted	2021-07-13 16:23:44 +02:00
Christian Georgi	1189374860	Update to cds 5.3.1	2021-07-13 15:16:27 +02:00
Christian Georgi	9f2eb8fa83	Merge pull request #248 from SAP-samples/ts-node_support Ts node support + tests	2021-07-13 14:32:49 +02:00
Christian Georgi	7b18e15e5b	Jest config in package.json again	2021-07-13 13:55:05 +02:00
Christian Georgi	00bfc1507e	Isolate all TS stuff in `hello` package	2021-07-13 13:24:29 +02:00
Christian Georgi	47a58e7393	Moved typescript dependencies to `hello` package This allows TS specifics to stay local in just one package	2021-07-13 13:09:54 +02:00
Christian Georgi	c04b972d27	Cosmetics	2021-07-13 13:01:50 +02:00
Christian Georgi	85b9b9d3a3	Clear process variable after test	2021-07-13 13:01:50 +02:00
Tobias Steckenborn	3655eef971	fix: 🚑 Add testEnvironment again	2021-07-13 13:01:50 +02:00
Tobias Steckenborn	87dd356204	refactor: 🔥 Add ts-jest preset, remove manual transformation	2021-07-13 13:01:50 +02:00
Christian Georgi	a89ec34f7c	Move jest config out of the way	2021-07-13 13:01:50 +02:00
Christian Georgi	444dcacb14	Add typescript package	2021-07-13 13:01:50 +02:00
Christian Georgi	2011a1ca7a	Use `transform` option to make ts test work	2021-07-13 13:01:50 +02:00
Christian Georgi	7e0c36ede5	use cds-ts binary for starting cds with ts-node runtime	2021-07-13 13:01:50 +02:00
Christian Georgi	e8d08d039e	Add example for starting cds with ts-node	2021-07-13 13:01:46 +02:00
Christian Georgi	5e3258913e	Merge pull request #247 from SAP-samples/openapi OpenAPI and Swagger UI	2021-07-12 14:04:30 +02:00
Christian Georgi	44e14926e4	Use latest Jest	2021-07-12 14:02:42 +02:00
Christian Georgi	592e945c28	Update package-lock	2021-07-12 14:02:21 +02:00
Christian Georgi	5d5c787365	Merge remote-tracking branch 'origin/master' into openapi	2021-07-05 17:59:00 +02:00
Christian Georgi	bb79def1d9	Merge pull request #239 from SAP-samples/using-package-lock.json Using package-lock.json	2021-07-05 17:58:25 +02:00
Christian Georgi	bd4a38bf54	Update package-lock	2021-07-05 17:55:10 +02:00
Christian Georgi	abf18d74db	Use `npm ci` instead of `npm install`	2021-07-05 17:55:10 +02:00
Christian Georgi	f144354229	Merge branch 'origin/master' into using-package-lock.json	2021-07-05 17:50:39 +02:00
Christian Georgi	97670bbc84	Swagger UI with cds-swagger-ui-express Moved from `bookshop` to `fiori`, as that one already has a `server.js`	2021-07-05 17:46:24 +02:00
Christian Georgi	82d6f54337	Merge remote-tracking branch 'origin/master' into openapi	2021-07-05 17:39:06 +02:00
Heiko Witteborg	a4baee6e3b	Merge pull request #243 from MikhailGoncharov/not-simple-args-fluent-api-v2 Sync with cds-runtime	2021-06-10 08:37:14 +02:00
Mikhail Goncharov	95b01e7d7a	Do not trim quotes	2021-06-09 13:39:12 +02:00
Mikhail Goncharov	c2437fc419	Handle cds versions	2021-06-09 12:49:39 +02:00
Mikhail Goncharov	9381459458	Sync with cds-runtime	2021-06-09 10:43:10 +02:00
Daniel Hutzel	28a7c16895	Merge branch 'master' into using-package-lock.json	2021-06-09 07:38:42 +02:00
Christian Georgi	c1141e6c87	Remove trailing comma	2021-06-08 16:19:34 +02:00
Daniel	6e686c6c8b	adding top-level dependencies to @sap/cds	2021-06-04 11:52:49 +02:00
Daniel	1ccddb2155	.	2021-06-04 11:44:21 +02:00
Daniel	7c8e52d5e9	Using package-lock.json	2021-06-04 11:43:59 +02:00
Christian Georgi	0dc1dc198d	Merge pull request #227 from gregorwolf/fiori-currency-format Fiori currency format	2021-05-28 15:08:15 +02:00
Christian Georgi	20bfb5c5f7	Merge branch 'master' into fiori-currency-format	2021-05-28 15:03:54 +02:00
Pierre Fritsch	be87f5617a	Fix typo orderd -> ordered	2021-05-28 14:58:51 +02:00
Christian Georgi	3117df1282	Test with Jest 26 `cds.test` seems to have issues w/ Jest 27. To be investigated...	2021-05-28 14:56:25 +02:00
Heiko Witteborg	be685437aa	Merge pull request #231 from SAP-samples/windows-test-fix Avoid race condition in customer-handlers.test	2021-05-14 13:41:17 +02:00
d049904	ff3801be71	Avoid race condition	2021-05-12 12:41:31 +02:00
Christian Georgi	702c3245bd	Fix broken translation UI Use `Books.texts` instead of `_texts`, requiring sap/cds 5	2021-05-10 10:33:39 +02:00
Daniel Hutzel	14002300c5	Rename index.cds to services.cds	2021-05-03 21:07:04 +02:00
Gregor Wolf	ad417ec061	fix test for Yen	2021-05-03 09:33:05 +02:00
Gregor Wolf	a6ec296129	add annotation for ISOCurrency	2021-05-03 09:04:38 +02:00
Gregor Wolf	1b10bbbfe4	switch currency of a book	2021-05-03 09:04:13 +02:00
Gregor Wolf	aaa1b2d6c7	add translation for Japanese Yen	2021-05-03 09:03:48 +02:00
Daniel	1cb169e886	fixed indentation	2021-04-27 16:06:59 +02:00
Daniel	9b9bb4c114	No process.chdir	2021-04-24 17:16:02 +02:00
Daniel	2536f36596	Adjust to latest capire docs	2021-04-13 09:55:27 +02:00
Christian Georgi	5e829ae7bb	Merge branch 'origin/master' into openapi	2021-02-17 09:50:04 +01:00
Christian Georgi	d265a385f8	Some comments	2020-11-17 11:12:32 +01:00
Christian Georgi	80f469b5b6	Remove need for host to swagger UI	2020-11-17 11:06:04 +01:00
Christian Georgi	8e8ae949df	Allow swagger.io to call us	2020-11-16 18:21:06 +01:00
Christian Georgi	3d24dc491d	Create files for all services	2020-11-16 12:06:29 +01:00
Christian Georgi	f593265687	Cosmetics	2020-11-14 21:56:08 +01:00
Christian Georgi	6d488b042c	Create diagram for Open API spec	2020-11-14 21:38:18 +01:00
Christian Georgi	d5ef630743	Link in index.html. Better server URL	2020-11-14 21:18:50 +01:00
Christian Georgi	b47c9d75df	Embed Swagger UI	2020-11-13 16:10:07 +01:00