OData Containment switched on

2020-11-20 19:04:33 +01:00
89 changed files with 819 additions and 1620 deletions
--- a/.eslintrc
+++ b/.eslintrc
@@ -21,7 +21,6 @@
    },
    "rules": {
        "no-console": "off",
-        "require-atomic-updates": "off",
+        "require-atomic-updates": "off"
        "require-await":"warn"
    }
 }
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -5,9 +5,9 @@ name: CI
 on:
  push:
-    branches: [ main ]
+    branches: [ master ]
  pull_request:
-    branches: [ main ]
+    branches: [ master ]
 jobs:
  build:
@@ -16,7 +16,7 @@ jobs:
    strategy:
      matrix:
-        node-version: [12.x, 14.x]
+        node-version: [10.x, 12.x, 14.x]
    steps:
    - uses: actions/checkout@v2
@@ -24,5 +24,5 @@ jobs:
      uses: actions/setup-node@v1
      with:
        node-version: ${{ matrix.node-version }}
-    - run: npm ci
+    - run: npm install
    - run: npm test
--- a/.gitignore
+++ b/.gitignore
@@ -15,5 +15,3 @@ default-env.json
 packages/messageBox
 reviews/msg-box
 reviews/db/test.db
 *.openapi3.json
--- a/.npmrc
+++ b/.npmrc
@@ -1,3 +0,0 @@
 # 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/.gitignore
+++ b/.registry/.gitignore
@@ -1 +0,0 @@
 *.tgz
--- a/.registry/server.js
+++ b/.registry/server.js
@@ -1,24 +1,19 @@
 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,scope='@capire'] = process.argv
+const [,,port=PORT] = 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) => {
  const url = decodeURIComponent(req.url)
  console.debug ('GET', req.params)
  try {
    const { tarball } = req.params
-    const [, pkg ] = /^\w+-(\w+)/.exec(tarball)
+    const [, pkg ] = /^capire-(\w+)/.exec(tarball)
    fs.lstat(tarball,(err => {
-      if (err) exec(`npm pack ../${pkg}`,{cwd},next)
+      if (err) exec(`npm pack ../${pkg}`,next)
      else next()
    }))
  } catch (e) {
@@ -30,14 +25,12 @@ 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 {
-    if (!urlRegex.test(url))  return res.sendStatus(404)
+    const [, capire, pkg ] = /^\/(@capire)\/(\w+)/.exec(url)
-    const [, scpe, pkg ] = urlRegex.exec(url)
+    const package = require (`${capire}/${pkg}/package.json`)
-    const package = require (`${scpe}/${pkg}/package.json`)
+    const tarball = `capire-${pkg}-${package.version}.tgz`
    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,
@@ -49,30 +42,29 @@ app.get('/*', (req,res)=>{
          "name": package.name,
          "version": package.version,
          "dist": {
-            "tarball": `/-/${tarball}`
+            "tarball": `http://localhost:${port}/-/${tarball}`
          },
        }
      },
    })
  } catch (e) {
-    if (e.code === 'MODULE_NOT_FOUND')  return res.sendStatus(404)
+    console.error(e)
-    console.error(e);  throw e
+    res.sendStatus(404)
  }
 })
-const server = app.listen(port, ()=>{
+app.listen(port, ()=>{
-  const url = `http://localhost:${server.address().port}`
+  console.log (`npm set @capire:registry=http://localhost:${port}`)
-  console.log (`npm set ${scope}:registry=${url}`)
+  console.log (`@capire registry listening on http://localhost:${port}`)
-  exec(`npm set ${scope}:registry=${url}`)
+  exec(`npm set @capire:registry=http://localhost:${port}`)
  console.log (`${scope} registry listening on ${url}`)
 })
 const _exit = ()=>{
-  server.close()
+  console.log ('\nnpm conf rm @capire:registry')
-  exec(`npm conf rm "${scope}:registry"`, ()=> { process.exit() })
+  exec('npm conf rm @capire:registry')
  exec('rm *.tgz')
  process.exit()
 }
 process.on ('SIGTERM',_exit)
 process.on ('SIGHUP',_exit)
 process.on ('SIGINT',_exit)
--- a/.tours/db-native.tour
+++ b/.tours/db-native.tour
@@ -1,109 +0,0 @@
 {
  "$schema": "https://aka.ms/codetour-schema",
  "title": "Database Functions",
  "steps": [
    {
      "title": "Introduction",
      "description": "### Database Functions in CDS Models\n\nIn this tour, you'll learn how to add database-specific functions to CDS models in your application."
    },
    {
      "file": "bookshop/db/schema.cds",
      "description": "#### Basic Schema\n\nWe want to add two fields to the `Authors` entity, one for the author's age and one for the span of years that she or he lived.\n\nThese two fields can be computed out of the existing `dateOfBirth` and `dateOfDeath` fields.",
      "selection": {
        "start": {
          "line": 19,
          "character": 1
        },
        "end": {
          "line": 21,
          "character": 1
        }
      },
      "title": "Base fields in Author"
    },
    {
      "file": "bookshop/srv/admin-service.cds",
      "description": "This is how the `Authors` entity gets exposed in an OData or REST service.\n\nIn the next step, you'll see how we extend this projection.",
      "selection": {
        "start": {
          "line": 4,
          "character": 1
        },
        "end": {
          "line": 5,
          "character": 1
        }
      },
      "title": "Authors service"
    },
    {
      "file": "fiori/db/sqlite/index.cds",
      "description": "#### SQLite Implementation\n\nHere's the first implementation for SQLite.  It computes the two fields `age` and `lifetime` through SQLite's [strftime](https://sqlite.org/lang_datefunc.html) function.\n\nThrough the [`extend projection`](https://cap.cloud.sap/docs/cds/cdl#extend-view) clause you can add additional fields to projection entities.  These are deployed as database views, which is why we can integrate the database functions in the first place.\n",
      "selection": {
        "start": {
          "line": 7,
          "character": 1
        },
        "end": {
          "line": 11,
          "character": 1
        }
      },
      "title": "SQLite implementation"
    },
    {
      "file": "fiori/db/hana/index.cds",
      "description": "#### SAP HANA Implementation\n\nThis is the second implementation for SAP HANA.  It computes the same two fields `age` and `lifetime` through the [YEARS_BETWEEN](https://help.sap.com/viewer/7c78579ce9b14a669c1f3295b0d8ca16/Cloud/en-US/7c0d2c161ea34def86de3f5eadd6a0af.html) and [YEAR](https://help.sap.com/viewer/7c78579ce9b14a669c1f3295b0d8ca16/Cloud/en-US/20f5fac6751910148dabd3c6821f907d.html) functions of SAP HANA.\n\n#### File Layout and Code Structure\n\nNote the path of the `.cds` file we are in: it's in a subfolder of `db`, so that it's _not_ automatically picked up when we start the application.  The same is true for the SQLite implementation: it's in a separate `db/sqlite/` folder as well.  In the next step, you'll see how these files are loaded.\n\nAlso, we choose to implement all of that as an extension of the original bookshop here in the _fiori_ package.  See the first [CAP Samples] code tour for more details on the different packages of this repository.",
      "selection": {
        "start": {
          "line": 7,
          "character": 1
        },
        "end": {
          "line": 11,
          "character": 1
        }
      },
      "title": "SAP HANA implementation"
    },
    {
      "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,
      "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,
      "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,
      "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,
      "selection": {
        "start": {
          "line": 67,
          "character": 1
        },
        "end": {
          "line": 73,
          "character": 1
        }
      },
      "title": "Add Data"
    },
    {
      "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": "main"
 }
--- a/.tours/samples.tour
+++ b/.tours/samples.tour
@@ -1,136 +0,0 @@
 {
  "$schema": "https://aka.ms/codetour-schema",
  "title": "CAP Samples",
  "steps": [
    {
      "title": "Welcome",
      "file": "README.md",
      "description": "### Welcome to CAP Samples!\n\nThis tour leads you through a collection of samples for the [SAP Cloud Application Programming Model (CAP)](https://cap.cloud.sap).\nYou will learn which features of the programming model are demonstrated in which sample.\n\nLet's start!",
      "line": 2,
      "selection": {
        "start": {
          "line": 1,
          "character": 1
        },
        "end": {
          "line": 3,
          "character": 108
        }
      }
    },
    {
      "file": "hello/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": {
        "start": {
          "line": 1,
          "character": 1
        },
        "end": {
          "line": 4,
          "character": 1
        }
      },
      "title": "Hello World!"
    },
    {
      "file": "bookshop/db/schema.cds",
      "description": "### A Bookshop!\n\nIntroduces:\n- [Project Setup](https://cap.cloud.sap/docs/get-started/) and [Layouts](https://cap.cloud.sap/docs/get-started/projects)\n- [Domain Modeling](https://cap.cloud.sap/docs/guides/domain-models)\n- [Defining Services](https://cap.cloud.sap/docs/guides/providing-services)\n- [Generic Providers](https://cap.cloud.sap/docs/guides/generic-providers)\n- [Adding Custom Logic](https://cap.cloud.sap/docs/guides/service-impl)\n- [Using Databases](https://cap.cloud.sap/docs/guides/databases)\n",
      "line": 1,
      "selection": {
        "start": {
          "line": 1,
          "character": 1
        },
        "end": {
          "line": 32,
          "character": 1
        }
      },
      "title": "Bookshop"
    },
    {
      "file": "common/index.cds",
      "description": "### Extend and Reuse\n\nShowcases how to extend [@sap/cds/common](https://cap.cloud.sap/docs/cds/common) thereby covering:\n- Building [extension packages](https://cap.cloud.sap/docs/guides/domain-models#aspects-extensibility)\n- Providing [reuse packages](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)\n- [Verticalization](https://cap.cloud.sap/docs/cds/common#adapting-to-your-needs)\n- Using [Aspects](https://cap.cloud.sap/docs/cds/cdl#aspects)\n- Used in the [fiori app sample](#fiori)\n",
      "line": 1,
      "selection": {
        "start": {
          "line": 1,
          "character": 1
        },
        "end": {
          "line": 46,
          "character": 1
        }
      },
      "title": "Common"
    },
    {
      "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",
      "line": 1,
      "selection": {
        "start": {
          "line": 1,
          "character": 1
        },
        "end": {
          "line": 27,
          "character": 1
        }
      },
      "title": "Orders"
    },
    {
      "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",
      "line": 1,
      "selection": {
        "start": {
          "line": 1,
          "character": 1
        },
        "end": {
          "line": 39,
          "character": 1
        }
      },
      "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",
      "line": 1,
      "selection": {
        "start": {
          "line": 1,
          "character": 1
        },
        "end": {
          "line": 13,
          "character": 1
        }
      },
      "title": "Fiori"
    },
    {
      "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,
          "character": 1
        }
      },
      "title": "Packages"
    }
  ],
  "isPrimary": true,
  "description": "Overview of CAP Samples for Node.js"
 }
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -4,15 +4,14 @@
 	// List of extensions which should be recommended for users of this workspace.
 	"recommendations": [
-		"sapse.vscode-cds",
+		"SAPSE.vscode-cds",
 		"dbaeumer.vscode-eslint",
 		"esbenp.prettier-vscode",
 		"mechatroner.rainbow-csv",
 		"humao.rest-client",
 		"alexcvzz.vscode-sqlite",
 		"hbenl.vscode-mocha-test-adapter",
-		"sdras.night-owl",
+		"sdras.night-owl"
 		"vsls-contrib.codetour"
 	],
 	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
 	"unwantedRecommendations": [
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,30 +5,27 @@
  "version": "0.2.0",
  "configurations": [
  {
-      "name": "bookshop",
+    "name": "Attach by Process ID",
-      "command": "npx cds watch bookshop",
+    "processId": "${command:PickProcess}",
-      "type": "node-terminal",
+    "request": "attach",
      "request": "launch",
    "skipFiles": [
-        "<node_internals>/**",
+      "<node_internals>/**"
-        "**/node_modules/**",
+    ],
-        "**/cds/lib/lazy.js",
+    "type": "pwa-node"
        "**/cds/lib/req/cls.js",
        "**/odata-v4/okra/**"
      ]
  },
    {
-      "name": "Fiori App",
+      "name": "bookshop",
-      "command": "npx cds watch fiori",
+      "command": "cds watch bookshop",
      "type": "node-terminal",
      "request": "launch",
-      "skipFiles": [
+      "type": "node-terminal",
-        "<node_internals>/**",
+      "skipFiles": ["<node_internals>/**"]
-        "**/node_modules/**",
+    },
-        "**/cds/lib/lazy.js",
+    {
-        "**/cds/lib/req/cls.js",
+      "name": "Fiori app",
-        "**/odata-v4/okra/**"
+      "command": "cds watch fiori",
-      ]
+      "request": "launch",
      "type": "node-terminal",
      "skipFiles": ["<node_internals>/**"]
    }
  ],
  "inputs": [
@@ -36,7 +33,7 @@
      "type": "pickString",
      "id": "sample",
      "description": "Which sample do you want to start?",
-      "options": [ "bookshop", "fiori", "reviews", "reviews" ],
+      "options": ["bookshop", "fiori", "reviews", "reviews/test/bookshop"],
      "default": "bookshop"
    }
  ]
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,17 +1,6 @@
 {
  "files.exclude": {
    ".reuse/**": true,
    "**/.gitignore": true,
-    "**/.vscode": true,
+    "**/.vscode": true
    "LICENSES/**": true
  },
  "debug.javascript.terminalOptions": {
    "skipFiles": [
      "<node_internals>/**",
      "**/node_modules/**",
      "**/cds/lib/lazy.js",
      "**/cds/lib/req/cls.js",
      "**/odata-v4/okra/**"
    ]
  }
 }
--- a/208
+++ b/208
@@ -0,0 +1,208 @@
 Apache License
 Version 2.0, January 2004
 http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION,
 AND DISTRIBUTION
   1. Definitions.
 "License" shall mean the terms and conditions for use, reproduction, and distribution
 as defined by Sections 1 through 9 of this document.
 "Licensor" shall mean the copyright owner or entity authorized by the copyright
 owner that is granting the License.
 "Legal Entity" shall mean the union of the acting entity and all other entities
 that control, are controlled by, or are under common control with that entity.
 For the purposes of this definition, "control" means (i) the power, direct
 or indirect, to cause the direction or management of such entity, whether
 by contract or otherwise, or (ii) ownership of fifty percent (50%) or more
 of the outstanding shares, or (iii) beneficial ownership of such entity.
 "You" (or "Your") shall mean an individual or Legal Entity exercising permissions
 granted by this License.
 "Source" form shall mean the preferred form for making modifications, including
 but not limited to software source code, documentation source, and configuration
 files.
 "Object" form shall mean any form resulting from mechanical transformation
 or translation of a Source form, including but not limited to compiled object
 code, generated documentation, and conversions to other media types.
 "Work" shall mean the work of authorship, whether in Source or Object form,
 made available under the License, as indicated by a copyright notice that
 is included in or attached to the work (an example is provided in the Appendix
 below).
 "Derivative Works" shall mean any work, whether in Source or Object form,
 that is based on (or derived from) the Work and for which the editorial revisions,
 annotations, elaborations, or other modifications represent, as a whole, an
 original work of authorship. For the purposes of this License, Derivative
 Works shall not include works that remain separable from, or merely link (or
 bind by name) to the interfaces of, the Work and Derivative Works thereof.
 "Contribution" shall mean any work of authorship, including the original version
 of the Work and any modifications or additions to that Work or Derivative
 Works thereof, that is intentionally submitted to Licensor for inclusion in
 the Work by the copyright owner or by an individual or Legal Entity authorized
 to submit on behalf of the copyright owner. For the purposes of this definition,
 "submitted" means any form of electronic, verbal, or written communication
 sent to the Licensor or its representatives, including but not limited to
 communication on electronic mailing lists, source code control systems, and
 issue tracking systems that are managed by, or on behalf of, the Licensor
 for the purpose of discussing and improving the Work, but excluding communication
 that is conspicuously marked or otherwise designated in writing by the copyright
 owner as "Not a Contribution."
 "Contributor" shall mean Licensor and any individual or Legal Entity on behalf
 of whom a Contribution has been received by Licensor and subsequently incorporated
 within the Work.
 2. Grant of Copyright License. Subject to the terms and conditions of this
 License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive,
 no-charge, royalty-free, irrevocable copyright license to reproduce, prepare
 Derivative Works of, publicly display, publicly perform, sublicense, and distribute
 the Work and such Derivative Works in Source or Object form.
 3. Grant of Patent License. Subject to the terms and conditions of this License,
 each Contributor hereby grants to You a perpetual, worldwide, non-exclusive,
 no-charge, royalty-free, irrevocable (except as stated in this section) patent
 license to make, have made, use, offer to sell, sell, import, and otherwise
 transfer the Work, where such license applies only to those patent claims
 licensable by such Contributor that are necessarily infringed by their Contribution(s)
 alone or by combination of their Contribution(s) with the Work to which such
 Contribution(s) was submitted. If You institute patent litigation against
 any entity (including a cross-claim or counterclaim in a lawsuit) alleging
 that the Work or a Contribution incorporated within the Work constitutes direct
 or contributory patent infringement, then any patent licenses granted to You
 under this License for that Work shall terminate as of the date such litigation
 is filed.
 4. Redistribution. You may reproduce and distribute copies of the Work or
 Derivative Works thereof in any medium, with or without modifications, and
 in Source or Object form, provided that You meet the following conditions:
 (a) You must give any other recipients of the Work or Derivative Works a copy
 of this License; and
 (b) You must cause any modified files to carry prominent notices stating that
 You changed the files; and
 (c) You must retain, in the Source form of any Derivative Works that You distribute,
 all copyright, patent, trademark, and attribution notices from the Source
 form of the Work, excluding those notices that do not pertain to any part
 of the Derivative Works; and
 (d) If the Work includes a "NOTICE" text file as part of its distribution,
 then any Derivative Works that You distribute must include a readable copy
 of the attribution notices contained within such NOTICE file, excluding those
 notices that do not pertain to any part of the Derivative Works, in at least
 one of the following places: within a NOTICE text file distributed as part
 of the Derivative Works; within the Source form or documentation, if provided
 along with the Derivative Works; or, within a display generated by the Derivative
 Works, if and wherever such third-party notices normally appear. The contents
 of the NOTICE file are for informational purposes only and do not modify the
 License. You may add Your own attribution notices within Derivative Works
 that You distribute, alongside or as an addendum to the NOTICE text from the
 Work, provided that such additional attribution notices cannot be construed
 as modifying the License.
 You may add Your own copyright statement to Your modifications and may provide
 additional or different license terms and conditions for use, reproduction,
 or distribution of Your modifications, or for any such Derivative Works as
 a whole, provided Your use, reproduction, and distribution of the Work otherwise
 complies with the conditions stated in this License.
 5. Submission of Contributions. Unless You explicitly state otherwise, any
 Contribution intentionally submitted for inclusion in the Work by You to the
 Licensor shall be under the terms and conditions of this License, without
 any additional terms or conditions. Notwithstanding the above, nothing herein
 shall supersede or modify the terms of any separate license agreement you
 may have executed with Licensor regarding such Contributions.
 6. Trademarks. This License does not grant permission to use the trade names,
 trademarks, service marks, or product names of the Licensor, except as required
 for reasonable and customary use in describing the origin of the Work and
 reproducing the content of the NOTICE file.
 7. Disclaimer of Warranty. Unless required by applicable law or agreed to
 in writing, Licensor provides the Work (and each Contributor provides its
 Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 KIND, either express or implied, including, without limitation, any warranties
 or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR
 A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness
 of using or redistributing the Work and assume any risks associated with Your
 exercise of permissions under this License.
 8. Limitation of Liability. In no event and under no legal theory, whether
 in tort (including negligence), contract, or otherwise, unless required by
 applicable law (such as deliberate and grossly negligent acts) or agreed to
 in writing, shall any Contributor be liable to You for damages, including
 any direct, indirect, special, incidental, or consequential damages of any
 character arising as a result of this License or out of the use or inability
 to use the Work (including but not limited to damages for loss of goodwill,
 work stoppage, computer failure or malfunction, or any and all other commercial
 damages or losses), even if such Contributor has been advised of the possibility
 of such damages.
 9. Accepting Warranty or Additional Liability. While redistributing the Work
 or Derivative Works thereof, You may choose to offer, and charge a fee for,
 acceptance of support, warranty, indemnity, or other liability obligations
 and/or rights consistent with this License. However, in accepting such obligations,
 You may act only on Your own behalf and on Your sole responsibility, not on
 behalf of any other Contributor, and only if You agree to indemnify, defend,
 and hold each Contributor harmless for any liability incurred by, or claims
 asserted against, such Contributor by reason of your accepting any such warranty
 or additional liability. END OF TERMS AND CONDITIONS
 APPENDIX: How to apply the Apache License to your work.
 To apply the Apache License to your work, attach the following boilerplate
 notice, with the fields enclosed by brackets "[]" replaced with your own identifying
 information. (Don't include the brackets!) The text should be enclosed in
 the appropriate comment syntax for the file format. We also recommend that
 a file or class name and description of purpose be included on the same "printed
 page" as the copyright notice for easier identification within third-party
 archives.
 Copyright [yyyy] [name of copyright owner]
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 http://www.apache.org/licenses/LICENSE-2.0
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,201 +0,0 @@
                                  Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/
   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
   1. Definitions.
      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.
      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.
      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.
      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.
      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.
      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.
      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).
      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.
      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."
      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.
   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.
   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.
   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:
      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and
      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and
      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and
      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.
      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.
   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.
   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.
   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.
   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.
   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.
   END OF TERMS AND CONDITIONS
   APPENDIX: How to apply the Apache License to your work.
      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.
   Copyright [yyyy] [name of copyright owner]
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
       http://www.apache.org/licenses/LICENSE-2.0
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
--- a/README.md
+++ b/README.md
@@ -7,17 +7,14 @@ Find here a collection of samples for the [SAP Cloud Application Programming Mod
 ### Preliminaries
-1. Install [**@sap/cds-dk**](https://cap.cloud.sap/docs/get-started/) globally:
+1. [Install @sap/cds-dk](https://cap.cloud.sap/docs/get-started/) as documented in [capire](https://cap.cloud.sap)
 2. _Optional:_ [Use Visual Studio Code](https://cap.cloud.sap/docs/get-started/in-vscode)
   ```sh
   npm i -g @sap/cds-dk
   ```
 2. _Optional:_ [Use Visual Studio Code](https://cap.cloud.sap/docs/get-started/tools#vscode)
 ### Download
-If you've [Git](https://git-scm.com/downloads) installed, clone this repo as shown below, otherwise [download as ZIP file](archive/main.zip).
+Clone this repo as shown below, if you have [git](https://git-scm.com/downloads) installed,
 otherwise [download as zip file](archive/master.zip).
 ```sh
 git clone https://github.com/sap-samples/cloud-cap-samples samples
@@ -42,12 +39,9 @@ cds watch bookshop
 After that open this link in your browser: [http://localhost:4004](http://localhost:4004)
 When asked to log in, type `alice` as user and leave the password field blank, which is the [default user](https://cap.cloud.sap/docs/node.js/authentication#mocked).
 ### Testing
 Run the provided tests with [_jest_](http://jestjs.io) or [_mocha_](http://mochajs.org), for example:
 ```sh
 npx jest
 ```
@@ -56,7 +50,7 @@ npx jest
 ### Serve `npm` 
-We've included a simple npm registry mock, which allows you to do an `npm install @capire/<package>` locally. Use it as follows:
+We've simple npm registry mock included which allows you to do an `npm install @capire/<package>` anywhere locally. Use it as follows:
 1. Start the @capire registry:
 ```sh
@@ -64,23 +58,18 @@ npm run registry
 ```
 > While running this will have `@capire:registry=http://localhost:4444` set with npmrc. 
-2. Install one of the @capire packages wherever you like, for example:
+2. Install one of the @capire packages wherever you like, e.g.:
 ```sh
 npm add @capire/common @capire/bookshop
 ```
 ## Code Tours
 Take one of the [guided tours](.tours) in VS Code through our CAP samples and learn which CAP features are showcased by the different parts of the repository. Just install the [CodeTour extension](https://marketplace.visualstudio.com/items?itemName=vsls-contrib.codetour) for VS Code. We'll add more code tours in the future. Stay tuned!
 ## Get Support
 Check out the documentation at [https://cap.cloud.sap](https://cap.cloud.sap). <br>
-In case you've a question, find a bug, or otherwise need support, use our [community](https://answers.sap.com/tags/9f13aee1-834c-4105-8e43-ee442775e5ce) to get more visibility.
+In case you have a question, find a bug, or otherwise need support, please use our [community](https://answers.sap.com/tags/9f13aee1-834c-4105-8e43-ee442775e5ce).
 ## License
-Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, version 2.0 except as noted otherwise in the [LICENSE](LICENSE.txt) file.
+Copyright (c) 2020 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, version 2.0 except as noted otherwise in the [LICENSE](LICENSES/Apache-2.0.txt) file.
--- 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: { quantity:1, succeeded:'', failed:'' }
+        order: { amount: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 = { quantity:1 }
+            books.order = { amount:1 }
            setTimeout (()=> $('form > input').focus(), 111)
        },
        async submitOrder () {
-            const {book,order} = books, quantity = parseInt (order.quantity) || 1 // REVISIT: Okra should be less strict
+            const {book,order} = books, amount = parseInt (order.amount) || 1 // REVISIT: Okra should be less strict
            try {
-                const res = await POST(`/submitOrder`, { quantity, book: book.ID })
+                const res = await POST(`/submitOrder`, { amount, book: book.ID })
                book.stock = res.data.stock
-                books.order = { quantity, succeeded: `Successfully ordered ${quantity} item(s).` }
+                books.order = { amount, succeeded: `Successfully orderd ${amount} item(s).` }
            } catch (e) {
-                books.order = { quantity, failed: e.response.data.error.message }
+                books.order = { amount, failed: e.response.data.error.message }
            }
        }
--- a/bookshop/app/vue/index.html
+++ b/bookshop/app/vue/index.html
@@ -34,9 +34,9 @@
            <td>{{ book.author }}</td>
            <td>{{ book.genre.name }}</td>
            <td class="rating-stars">
-                {{ ('★'.repeat(Math.round(book.rating))+'☆☆☆☆☆').slice(0,5) }} ({{ book.numberOfReviews }})
+                {{ ('★'.repeat(Math.round(book.rating))+'☆☆☆☆☆').slice(0,5) }}
            </td>
-            <td>{{ book.currency && book.currency.symbol }} {{ book.price }}</td>
+            <td>{{ book.currency.symbol }} {{ book.price }}</td>
        </tr>
    </table>
@@ -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.quantity" v-bind:class="{ failed: order.failed }" style="width:5em">
+            <input type="number" v-model="order.amount" 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;150;JPY;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;15;EUR;13
--- a/bookshop/index.js
+++ b/bookshop/index.js
@@ -1,2 +1 @@
-const { CatalogService } = require('./srv/cat-service')
+exports.CatalogService = require('./srv/cat-service')
 module.exports = { CatalogService }
--- a/bookshop/package.json
+++ b/bookshop/package.json
@@ -4,7 +4,7 @@
  "description": "A simple self-contained bookshop service.",
  "dependencies": {
    "@capire/common": "*",
-    "@sap/cds": "^5.0.4",
+    "@sap/cds": "^4",
    "express": "^4.17.1",
    "passport": "0.4.1"
  },
--- a/bookshop/readme.md
+++ b/bookshop/readme.md
@@ -5,10 +5,10 @@ This stand-alone sample introduces the essential tasks in the development of CAP
 ## Hypothetical Use Cases
 1. Build a service that allows to browse _Books_ and _Authors_.
-2. Books have assigned _Genres_, which are organized hierarchically.
+2. Books have assigned _Genres_ which are organized hierarchically.
 3. All users may browse books without login.
 4. All entries are maintained by Administrators.
-5. End users may order books (the actual order mgmt being out of scope).
+5. End users may order books (the actual order mgmt being out of scope)
 ## Running the Sample
@@ -20,12 +20,12 @@ npm run watch
 | Links to capire                                                                                           | Sample files / folders               |
 | --------------------------------------------------------------------------------------------------------- | ------------------------------------ |
-| [Project Setup & Layouts](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)    | [`./`](./)                           |
+| [Project Setup and Layouts](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)  | [`./`](./)                           |
-| [Domain Modeling with CDS](https://cap.cloud.sap/docs/guides/domain-models)                               | [`./db/schema.cds`](./db/schema.cds) |
+| [Defining Domain Models](https://cap.cloud.sap/docs/guides/domain-models)                                 | [`./db/schema.cds`](./db/schema.cds) |
-| [Defining Services](https://cap.cloud.sap/docs/guides/services#defining-services)                         | [`./srv/*.cds`](./srv)               |
+| [Defining Services](https://cap.cloud.sap/docs/guides/providing-services)                                 | [`./srv/*.cds`](./srv)               |
-| [Single-purposed Services](https://cap.cloud.sap/docs/guides/services#single-purposed-services)           | [`./srv/*.cds`](./srv)               |
+| [Single-purposed Services](https://cap.cloud.sap/docs/guides/providing-services#single-purposed-services) | [`./srv/*.cds`](./srv)               |
-| [Providing & Consuming Providers](https://cap.cloud.sap/docs/guides/providing-services)                   | http://localhost:4004                |
+| [Generic Providers](https://cap.cloud.sap/docs/guides/providing-services)                                  | http://localhost:4004                |
-| [Using Databases](https://cap.cloud.sap/docs/guides/databases)                                            | [`./db/data/*.csv`](./db/data)       |
+| Using Databases                                            | [`./db/data/*.csv`](./db/data)       |
 | [Adding Custom Logic](https://cap.cloud.sap/docs/guides/service-impl)                                     | [`./srv/*.js`](./srv)                |
 | Adding Tests                                                 | [`./test`](./test)                   |
-| [Sharing for Reuse](https://cap.cloud.sap/docs/guides/reuse-and-compose)                                  | [`./index.cds`](./index.cds)         |
+| [Sharing for Reuse](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)          | [`./index.cds`](./index.cds)         |
--- a/bookshop/sqlite.db
+++ b/bookshop/sqlite.db
--- a/bookshop/srv/cat-service.cds
+++ b/bookshop/srv/cat-service.cds
@@ -1,16 +1,14 @@
 using { sap.capire.bookshop as my } from '../db/schema';
 service CatalogService @(path:'/browse') {
-  /** For displaying lists of Books */
+  @readonly entity Books as SELECT from my.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, stock };
  @requires: 'authenticated-user'
-  action submitOrder ( book: Books:ID, quantity: Integer ) returns { stock: Integer };
+  action submitOrder ( book: Books:ID, amount: Integer ) returns { stock: Integer };
-  event OrderedBook : { book: Books:ID; quantity: Integer; buyer: String };
+  event OrderedBook : { book: Books:ID; amount: Integer; buyer: String };
 }
--- a/bookshop/srv/cat-service.js
+++ b/bookshop/srv/cat-service.js
@@ -1,24 +1,25 @@
 const cds = require('@sap/cds')
 const { Books } = cds.entities ('sap.capire.bookshop')
-class CatalogService extends cds.ApplicationService { init(){
+class CatalogService extends cds.ApplicationService { async init(){
  const { Books } = cds.entities ('sap.capire.bookshop')
  // Reduce stock of ordered books if available stock suffices
  this.on ('submitOrder', async req => {
-    const {book,quantity} = req.data
+    const {book,amount} = req.data, tx = cds.tx(req)
-    let {stock} = await SELECT `stock` .from (Books,book)
+    let {stock} = await tx.read('stock').from(Books,book)
-    if (stock >= quantity) {
+    if (stock >= amount) {
-      await UPDATE (Books,book) .with (`stock -=`, quantity)
+      await tx.update (Books,book).with ({ stock: stock -= amount })
-      await this.emit ('OrderedBook', { book, quantity, buyer:req.user.id })
+      this.emit ('OrderedBook', { book, amount, buyer:req.user.id })
      return { stock }
    }
-    else return req.error (409,`${quantity} exceeds stock for book #${book}`)
+    else return req.error (409,`${amount} exceeds stock for book #${book}`)
  })
  // Add some discount for overstocked books
-  this.after ('READ','ListOfBooks', each => {
+  this.after ('READ','Books', each => {
-    if (each.stock > 111) each.title += ` -- 11% discount!`
+    if (each.stock > 111) {
      each.title += ` -- 11% discount!`
    }
  })
  return super.init()
--- a/bookshop/test/requests.http
+++ b/bookshop/test/requests.http
@@ -71,7 +71,7 @@ POST {{server}}/browse/submitOrder
 Content-Type: application/json
 {{me}}
-{ "book":201, "quantity":5 }
+{ "book":201, "amount":5 }
 ### ------------------------------------------------------------------------
--- a/bookstore/db/hana/index.cds
+++ b/bookstore/db/hana/index.cds
@@ -1,10 +0,0 @@
 //
 //  Add Author.age and .lifetime with a DB-specific function
 //
 using { AdminService } from '../schema';
 extend projection AdminService.Authors with {
  YEARS_BETWEEN(dateOfBirth, dateOfDeath)         as age: Integer,
  YEAR(dateOfBirth) || ' – ' || YEAR(dateOfDeath) as lifetime : String
 }
--- a/bookstore/db/schema.cds
+++ b/bookstore/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/bookstore/db/sqlite/index.cds
+++ b/bookstore/db/sqlite/index.cds
@@ -1,10 +0,0 @@
 //
 //  Add Author.age and .lifetime with a DB-specific function
 //
 using { AdminService } from '../schema';
 extend projection AdminService.Authors with {
  strftime('%Y',dateOfDeath)-strftime('%Y',dateOfBirth)              as age: Integer,
  strftime('%Y',dateOfBirth) || ' – ' || strftime('%Y',dateOfDeath)  as lifetime : String
 }
--- a/bookstore/package.json
+++ b/bookstore/package.json
@@ -1,39 +0,0 @@
 {
  "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",
        "[development]": {
          "model": "db/sqlite"
        },
        "[production]": {
          "model": "db/hana"
        }
      }
    },
    "log": { "service": true }
  }
 }
--- a/bookstore/server.js
+++ b/bookstore/server.js
@@ -1,21 +0,0 @@
 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/swagger-ui.js
+++ b/bookstore/srv/swagger-ui.js
@@ -1,10 +0,0 @@
 // -----------------------------------------------------------------------
 // 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
@@ -1,81 +0,0 @@
@bookshop = http://localhost:4004
@reviews-service = {{bookshop}}/reviews
 # Uncomment this when running a separate reviews service
 # @reviews-service = http://localhost:4005/reviews
 #################################################
 #
 #   Reviews Service
 #
 GET {{reviews-service}}/Reviews
 ###
 POST {{reviews-service}}/Reviews
 Authorization: Basic {{$processEnv USER}}:
 Content-Type: application/json
 {"subject":"201", "title":"boo", "rating":3 }
 #################################################
 #
 #   Bookshop Services
 #
 GET {{bookshop}}/browse/Books/201/reviews?
 &$select=rating,date,title
 &$top=3
 ###
 GET {{bookshop}}/browse/Books(201)?
 &$select=ID,title,rating
 &$expand=reviews
 ###
 GET {{bookshop}}/browse/Books?
  &$select=title,author&$expand=currency
 Accept-Language: de
 #################################################
 #
 #   Orders Service, incl. draft choreography
 #
@newOrderID = e939604c-ab83-4d4f-bdb6-95fe30b3773e
 GET {{bookshop}}/orders/Orders
 ### Create order, still inactive
 POST {{bookshop}}/orders/Orders
 Content-Type: application/json
 {"ID": "{{newOrderID}}"}
 ### Get inactive order.  We have to specify `IsActiveEntity`.
 GET {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)
 ### Activate order using `.../<servicename>.draftActivate`
 POST {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)/OrdersService.draftActivate
 Content-Type: application/json
 ### Get active order
 GET {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=true)
 ### Create author
 POST {{bookshop}}/admin/Authors
 Content-Type: application/json
 Authorization: Basic alice:
 {
  "ID": 200,
  "name": "William Shakespeare",
  "dateOfBirth": "1564-04-26",
  "dateOfDeath": "1616-04-23"
 }
--- a/common/data/sap.common-Currencies_texts.csv
+++ b/common/data/sap.common-Currencies_texts.csv
@@ -5,11 +5,9 @@ CAD;de;Kanadischer Dollar;Kanadischer Dollar
 AUD;de;Australischer Dollar;Australischer Dollar
 GBP;de;Pfund;Britische Pfund
 ILS;de;Schekel;Israelische Schekel
 JPY;de;Yen;Japanische Yen
 EUR;fr;euro;de la Zone euro
 USD;fr;dollar;dollar des États-Unis
 CAD;fr;dollar canadien;dollar canadien
 AUD;fr;dollar australien;dollar australien
 GBP;fr;livre sterling;pound sterling
 ILS;fr;Shekel;shekel israelien
 JPY;fr;Yen;Yen japonais
--- a/common/package.json
+++ b/common/package.json
@@ -1,8 +1,4 @@
 {
  "name": "@capire/common",
-  "description": "Provides a pre-built extension package for std @sap/cds/common",
+  "version": "1.0.0"
  "version": "1.0.0",
  "dependencies": {
    "@sap/cds": "*"
  }
 }
--- a/fiori/.env
+++ b/fiori/.env
@@ -0,0 +1,2 @@
 # cds.requires.messaging.kind = file-based-messaging
 PORT = 4004
--- a/fiori/app/_i18n/i18n.properties
+++ b/fiori/app/_i18n/i18n.properties
@@ -11,7 +11,6 @@ DateOfBirth = Date of Birth
 DateOfDeath = Date of Death
 PlaceOfBirth = Place of Birth
 PlaceOfDeath = Place of Death
 Age = Age
 Authors = Authors
 Order = Order
 Orders = Orders
--- a/fiori/app/_i18n/i18n_de.properties
+++ b/fiori/app/_i18n/i18n_de.properties
@@ -6,7 +6,6 @@ Authors = Autoren
 Author = Autor
 AuthorID = ID des Autors
 AuthorName = Name des Autors
 Age = Alter
 Name = Name
 Stock = Bestand
 Order = Bestellung
--- a/fiori/app/admin-fiori.html
+++ b/fiori/app/admin-fiori.html
@@ -13,7 +13,7 @@
 			applications: {
 				"browse-books": {
 					title: "Browse Books",
-					description: "w/ SAP Fiori Elements",
+					description: "... testing FE v42",
 					additionalInformation: "SAPUI5.Component=bookshop",
 					applicationType : "URL",
 					url: "/browse/webapp",
@@ -21,7 +21,7 @@
 				},
 				"manage-books": {
 					title: "Manage Books",
-					description: "w/ SAP Fiori Elements",
+					description: "... testing FE v42",
 					additionalInformation: "SAPUI5.Component=admin",
 					applicationType : "URL",
 					url: "/admin/webapp",
@@ -29,7 +29,7 @@
 				},
 				"manage-orders": {
 					title: "Manage Orders",
-					description: "w/ SAP Fiori Elements",
+					description: "... testing FE v42",
 					additionalInformation: "SAPUI5.Component=orders",
 					applicationType : "URL",
 					url: "/orders/webapp",
@@ -40,7 +40,8 @@
 	</script>
 	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
+	<!-- <script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js" -->
 	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.78.6/resources/sap-ui-core.js"
    	data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
    	data-sap-ui-compatVersion="edge"
    	data-sap-ui-theme="sap_fiori_3"
--- a/fiori/app/admin/fiori-service.cds
+++ b/fiori/app/admin/fiori-service.cds
@@ -1,5 +1,4 @@
-using { AdminService } from '@capire/bookshop';
+using AdminService from '@capire/bookshop';
 using from '../common'; // to help UI linter get the complete annotations
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -40,27 +39,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}'},
 			]
 		},
 	}
 );
 ////////////////////////////////////////////////////////////
@@ -71,7 +49,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 ],
@@ -84,11 +62,11 @@ annotate AdminService.Books.texts with @(
 );
 // Add Value Help for Locales
-annotate AdminService.Books.texts {
+annotate AdminService.Books_texts {
 	locale @ValueList:{entity:'Languages',type:#fixed}
 }
-// In addition we need to expose Languages through AdminService as a target for ValueList
+// In addition we need to expose Languages through AdminService
 using { sap } from '@sap/cds/common';
 extend service AdminService {
-	@readonly entity Languages as projection on sap.common.Languages;
+	entity Languages as projection on sap.common.Languages;
 }
--- a/fiori/app/bookshop.html
+++ b/fiori/app/bookshop.html
@@ -0,0 +1,3 @@
 <head>
  <meta http-equiv="refresh" content="0;url=vue/bookshop/index.html">
 </head>
--- a/fiori/app/common.cds
+++ b/fiori/app/common.cds
@@ -54,7 +54,7 @@ annotate my.Books with {
 	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;
+	price @title:'{i18n>Price}';
 	stock @title:'{i18n>Stock}';
 	descr @UI.MultiLineText;
 }
--- a/fiori/app/services.cds
+++ b/fiori/app/services.cds
@@ -6,4 +6,7 @@ using from './admin/fiori-service';
 using from './browse/fiori-service';
 using from './common';
-using from '@capire/bookstore/srv/mashup';
+using from '@capire/common';
 // only works in case of embedded orders service
 using from '@capire/orders/app/orders/fiori-service';
--- a/fiori/app/reviews.html
+++ b/fiori/app/reviews.html
@@ -0,0 +1,3 @@
 <head>
  <meta http-equiv="refresh" content="0;url=vue/reviews/index.html">
 </head>
--- a/fiori/package.json
+++ b/fiori/package.json
@@ -2,10 +2,13 @@
  "name": "@capire/fiori",
  "version": "1.0.0",
  "dependencies": {
-    "@capire/bookstore": "*",
+    "@capire/bookshop": "*",
-    "@sap/cds": "^5",
+    "@capire/reviews": "*",
    "@capire/orders": "*",
    "@capire/common": "*",
    "@sap/cds": "^4",
    "express": "^4.17.1",
-    "passport": "^0.4.1"
+    "passport": "0.4.1"
  },
  "scripts": {
    "start": "cds run --in-memory?",
@@ -13,24 +16,14 @@
  },
  "cds": {
    "requires": {
      "auth": {
        "strategy": "dummy"
      },
      "ReviewsService": {
-        "kind": "odata",
+        "kind": "odata", "model": "@capire/reviews"
        "model": "@capire/reviews"
      },
      "OrdersService": {
-        "kind": "odata",
+        "kind": "odata", "model": "@capire/orders"
        "model": "@capire/orders"
      },
-      "messaging": {
+      "db": {
-        "[production]": { "kind": "enterprise-messaging" },
+        "kind": "sql"
        "[development]": { "kind": "file-based-messaging" },
        "[hybrid!]": { "kind": "enterprise-messaging-shared" }
      },
      "hana": {
        "deploy-format": "hdbtable"
      }
    }
  }
--- a/fiori/server.js
+++ b/fiori/server.js
@@ -1 +1,19 @@
-module.exports = require('@capire/bookstore/server.js')
+const express = require ('express')
 const cds = require ('@sap/cds')
 cds.once('bootstrap',(app)=>{
  const {dirname} = require ('path')
  // serving the orders app imported from @capire/orders
  const orders_app = dirname (require.resolve('@capire/orders/app/orders/webapp/manifest.json'))
  app.use ('/orders/webapp', express.static(orders_app))
  // serving the vue.js app imported from @capire/bookshop
  const bookshop_app = dirname (require.resolve('@capire/bookshop/app/vue/index.html'))
  app.use ('/vue/bookshop', express.static(bookshop_app))
  // serving the vue.js app imported from @capire/reviews
  const reviews_app = dirname (require.resolve('@capire/reviews/app/vue/index.html'))
  app.use ('/vue/reviews', express.static(reviews_app))
 })
 cds.once('served', require('./srv/mashup'))
 module.exports = cds.server
--- a/bookstore/srv/mashup.cds
+++ b/bookstore/srv/mashup.cds
@@ -1,7 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 //
-//    Enhancing bookshop with Reviews and Orders provided through
+//    Mashing up imported models...
 //    respective reuse packages and services
 //
 using { sap.capire.bookshop.Books } from '@capire/bookshop';
@@ -9,22 +8,18 @@ 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 {
+using { sap.capire.orders.OrderItems } from '@capire/orders';
 extend OrderItems 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 bookshop services with required services...
+//    Mashing up provided and required services...
 //
 module.exports = async()=>{ // called by server.js
@@ -20,39 +20,40 @@ 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.read ('Reviews',columns).limit(limit).where({subject:String(id)})
+    return ReviewsService.tx(req).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, quantity, buyer } = msg.data
+    const { book, amount, 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, quantity }],
+      Items: [{ product:{ID:`${book}`}, title, price, amount }],
      buyer, createdBy: buyer
    })
  })
  //
-  // Update Books' average ratings when ReviewsService signals updated reviews
+  // Update Books' average ratings when ReviewsService signals updatd reviews
  //
  ReviewsService.on ('reviewed', (msg) => {
    console.debug ('> received:', msg.event, msg.data)
-    const { subject, count, rating } = msg.data
+    const { subject, rating } = msg.data
-    return UPDATE(Books,subject).with({ numberOfReviews:count, rating })
+    return UPDATE(Books,subject).with({rating})
    // ^ Note: the framework will execute this and take care for db.tx
  })
  //
  // Reduce stock of ordered books for orders are created from Orders admin UI
  //
-  OrdersService.on ('OrderChanged', (msg) => {
+  OrdersService.on ('OrderChanged', async (msg) => {
    console.debug ('> received:', msg.event, msg.data)
-    const { product, deltaQuantity } = msg.data
+    const { product, deltaAmount } = msg.data
    return UPDATE (Books) .where ('ID =', product)
-    .and ('stock >=', deltaQuantity)
+    .and ('stock >=', deltaAmount)
-    .set ('stock -=', deltaQuantity)
+    .set ('stock -=', deltaAmount)
  })
 }
--- a/fiori/test/requests.http
+++ b/fiori/test/requests.http
@@ -0,0 +1,48 @@
@bookshop = http://localhost:4004
@reviews-service = {{bookshop}}/reviews
 # Uncomment this when running a separate reviews service
@reviews-service = http://localhost:4005/reviews
 #################################################
 #
 #   Reviews Service
 #
 GET {{reviews-service}}/Reviews
 ###
 POST {{reviews-service}}/Reviews
 Authorization: Basic {{$processEnv USER}}:
 Content-Type: application/json
 {"subject":"201", "title":"boo", "rating":3 }
 #################################################
 #
 #   Bookshop Services
 #
 GET {{bookshop}}/browse/Books/201/reviews?
 &$select=rating,date,title
 &$top=3
 ###
 GET {{bookshop}}/browse/Books(201)?
 &$select=ID,title,rating
 &$expand=reviews
 #################################################
 #
 #   Orders Service
 #
 GET {{bookshop}}/orders/Orders
--- a/graphql/.env
+++ b/graphql/.env
@@ -1 +0,0 @@
 PORT = 4007
--- a/graphql/db/data/sap.capire.graphql-Chapters.csv
+++ b/graphql/db/data/sap.capire.graphql-Chapters.csv
@@ -1,4 +0,0 @@
 book_ID;number;title
 201;1;Chapter 1
 201;2;Chapter 2
 201;3;Chapter 3
--- a/graphql/db/schema.cds
+++ b/graphql/db/schema.cds
@@ -1,26 +0,0 @@
 using {
  cuid,
  managed
 } from '@sap/cds/common';
 using {sap.capire.bookshop} from '@capire/bookshop';
 namespace sap.capire.graphql;
 extend bookshop.Books with {
  chapters : Composition of many Chapters
               on chapters.book = $self;
 }
 entity Chapters : managed {
  key book   : Association to bookshop.Books;
  key number : Integer;
      title  : String;
 }
 entity Orders : cuid, managed {
  @mandatory
  book     : Association to bookshop.Books;
  @mandatory
  @assert.range : [ 1, 5 ]
  quantity : Integer;
 }
--- a/graphql/examples.http
+++ b/graphql/examples.http
@@ -1,7 +0,0 @@
 # GraphQL
 GET http://localhost:4007/graphql?query={BookshopService{Books{title,author{name},chapters{number,title}}}}
 ###
 # OData
 GET http://localhost:4007/bookshop/Books?$select=title&$expand=author($select=name),chapters($select=number,title)
--- a/graphql/examples.md
+++ b/graphql/examples.md
@@ -1,16 +0,0 @@
 1. open `http://localhost:4007/graphql`
 2. paste into left field:
    ```graphql
    {
      BookshopService {
        Books {
          title
          chapters {
            number
            title
          }
        }
      }
    }
    ```
 3. press play button
--- a/graphql/package.json
+++ b/graphql/package.json
@@ -1,21 +0,0 @@
 {
  "name": "@capire/graphql",
  "version": "1.0.0",
  "dependencies": {
    "@capire/bookshop": "*",
    "@graphql-tools/schema": "^8.3.1",
    "@sap/cds": "^5.6",
    "express-graphql": "^0.12.0",
    "graphql": "^16.0.1"
  },
  "cds": {
    "features": {
      "graphql": true
    },
    "requires": {
      "auth": {
        "kind": "dummy-auth"
      }
    }
  }
 }
--- a/graphql/srv/bookshop-service.cds
+++ b/graphql/srv/bookshop-service.cds
@@ -1,11 +0,0 @@
 using {
  sap.capire.bookshop,
  sap.capire.graphql
 } from '../db/schema';
 service BookshopService {
  entity Books    as projection on bookshop.Books;
  entity Authors  as projection on bookshop.Authors;
  entity Chapters as projection on graphql.Chapters;
  entity Orders   as projection on graphql.Orders;
 }
--- a/graphql/srv/bookshop-service.js
+++ b/graphql/srv/bookshop-service.js
@@ -1,11 +0,0 @@
 module.exports = function() {
  const { Orders, Books } = this.entities
  this.before('CREATE', Orders, async function(req) {
    const { book_ID, quantity } = req.data
    // reduce the stock, if enough are available, else reject the order
    const applied = await UPDATE(Books, book_ID).set({ stock: { '-=': quantity } }).where({ stock: { '>=': quantity }})
    if (!applied) req.reject(400, `Sorry, ${quantity} are not in stock`)
  })
 }
--- a/hello/README.md
+++ b/hello/README.md
@@ -1,15 +0,0 @@
 # 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,53 +2,6 @@
  "name": "@capire/hello-world",
  "version": "1.0.0",
  "scripts": {
-    "test": "npx jest --silent",
+    "watch": "cds serve world.cds"
    "start": "cds serve srv/world.cds",
    "start:ts": "cds-ts serve srv/world.cds"
  },
  "devDependencies": {
    "@types/jest": "^26.0.23",
    "@types/node": "^15.12.0",
    "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.ts
+++ b/hello/srv/world.ts
@@ -1,5 +0,0 @@
 module.exports = class say {
    hello(req: any) {
        return `Hello ${req.data.to} from a TypeScript file!`
    }
 }
--- a/hello/test/test.http
+++ b/hello/test/test.http
--- a/hello/test/hello-world-ts.test.ts
+++ b/hello/test/hello-world-ts.test.ts
@@ -1,15 +0,0 @@
 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/srv/world.cds
+++ b/hello/srv/world.cds
--- a/hello/srv/world.js
+++ b/hello/srv/world.js
--- a/orders/app/orders/index.html
+++ b/orders/app/orders/index.html
--- a/orders/app/index.cds
+++ b/orders/app/index.cds
@@ -0,0 +1,5 @@
 /*
  This model controls what gets served to Fiori frontends...
 */
 using from './orders/fiori-service';
--- 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.OrderItems with @(
 	UI: {
 		LineItem: [
 			{Value: product_ID, Label:'Product ID'},
 			{Value: title, Label:'Product Title'},
 			{Value: price, Label:'Unit Price'},
-			{Value: quantity, Label:'Quantity'},
+			{Value: amount, Label:'Quantity'},
 		],
 		Identification: [ //Is the main field group
-			{Value: quantity, Label:'Quantity'},
+			{Value: amount, Label:'Amount'},
 			{Value: title, Label:'Product'},
 			{Value: price, Label:'Unit Price'},
 		],
@@ -86,7 +86,7 @@ annotate OrdersService.Orders_Items with @(
 		],
 	},
 ) {
-	quantity @(
+	amount @(
 		Common.FieldControl: #Mandatory
 	);
 };
--- a/orders/app/orders/webapp/manifest.json
+++ b/orders/app/orders/webapp/manifest.json
@@ -121,7 +121,7 @@
                    "name": "sap.fe.templates.ObjectPage",
                    "options": {
                        "settings" : {
-                            "entitySet": "Orders_Items"
+                            "entitySet": "OrderItems"
                        }
                    }
                },
--- 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;quantity;product_ID;title;price
+ID;order_ID;amount;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
@@ -1,23 +1,26 @@
 using { Currency, User, managed, cuid } from '@sap/cds/common';
 using from '@capire/common';
 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 OrderItems on Items.order = $self;
  buyer    : User;
  currency : Currency;
 }
-entity Orders_Items {
+entity OrderItems {
  key ID    : UUID;
-  up_       : Association to Orders;
+  order     : Association to Orders;
-  product   : Association to Products @assert.integrity:false; // REVISIT: this is a temporary workaround for a glitch in cds-runtime
+  @assert.integrity:false // REVISIT: this is a temporary workaround for a glitch in cds-runtime
-  quantity  : Integer;
+  product   : Association to Products;
-  title     : String; //> intentionally replicated as snapshot from product.title
+  amount    : Integer;
  title     : String;
  price     : Double;
 }
 /** This is a stand-in for arbitrary ordered Products */
-entity Products @(cds.persistence.skip:'always') {
+@cds.persistence.skip:'always'
 entity Products {
  key ID : String;
 }
--- a/orders/package.json
+++ b/orders/package.json
@@ -2,6 +2,12 @@
  "name": "@capire/orders",
  "version": "1.0.0",
  "dependencies": {
-    "@sap/cds": "^5"
+    "@capire/common": "*",
    "@sap/cds": "^4.3.0"
  },
  "cds": {
    "odata": {
      "containment": true
    }
  }
 }
--- 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 { OrderItems } = this.entities
    this.before ('UPDATE', 'Orders', async function(req) {
      const { ID, Items } = req.data
-      if (Items) for (let { product_ID, quantity } of Items) {
+      if (Items) for (let { product_ID, amount } of Items) {
-        const { quantity:before } = await cds.tx(req).run (
+        const { amount:before } = await cds.tx(req).run (
-          SELECT.one.from (OrderItems, oi => oi.quantity) .where ({up__ID:ID, product_ID})
+          SELECT.one.from (OrderItems, oi => oi.amount) .where ({order_ID:ID, product_ID})
        )
-        if (quantity != before) await this.orderChanged (product_ID, quantity-before)
+        if (amount != before) this.orderChanged (product_ID, amount-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.quantity }) .where ({up__ID:ID})
+        SELECT.from (OrderItems, oi => { oi.product_ID, oi.amount }) .where ({order_ID:ID})
      )
-      if (Items) await Promise.all (Items.map(it => this.orderChanged (it.product_ID, -it.quantity)))
+      if (Items) for (let it of Items) this.orderChanged (it.product_ID, -it.amount)
    })
    return super.init()
  }
  /** order changed -> broadcast event */
-  orderChanged (product, deltaQuantity) {
+  orderChanged (product, deltaAmount) {
    // Emit events to inform subscribers about changes in orders
-    console.log ('> emitting:', 'OrderChanged', { product, deltaQuantity })
+    console.log ('> emitting:', 'OrderChanged', { product, deltaAmount })
-    return this.emit ('OrderChanged', { product, deltaQuantity })
+    return this.emit ('OrderChanged', { product, deltaAmount })
  }
 }
--- a/package.json
+++ b/package.json
@@ -5,45 +5,35 @@
  "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/graphql": "./graphql",
    "@capire/hello": "./hello",
    "@capire/media": "./media",
    "@capire/orders": "./orders",
-    "@capire/reviews": "./reviews",
+    "@capire/reviews": "./reviews"
    "@sap/cds": "^5.6"
  },
  "devDependencies": {
-    "chai": "^4.3.4",
+    "chai": "^4.2.0",
    "chai-as-promised": "^7.1.1",
    "chai-subset": "^1.6.0",
    "sqlite3": "^5"
  },
  "scripts": {
-    "cleanup": "rm -rf node_modules && rm -rf */node_modules && rm -rf */*/node_modules",
+    "registry": "cd .registry && node server.js",
    "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/app/vue/app.js
+++ b/reviews/app/vue/app.js
@@ -37,7 +37,7 @@ const reviews = new Vue ({
            reviews.message = {}
        },
-        newReview () {
+        async newReview () {
            reviews.review = {}
            reviews.message = {}
            setTimeout (()=> $('form > input').focus(), 111)
--- a/reviews/package.json
+++ b/reviews/package.json
@@ -7,17 +7,18 @@
    "index.cds"
  ],
  "dependencies": {
-    "@sap/cds": "^5",
+    "@sap/cds": "^4",
    "express": "^4.17.1"
  },
  "scripts": {
    "reviews-service": "cds watch",
    "books-reviewed": "cds watch ../reviewed"
  },
  "cds": {
    "requires": {
-      "messaging": {
+      "db": {
-        "[development]": { "kind": "file-based-messaging" },
+        "kind": "sql"
-        "[hybrid]": { "kind": "enterprise-messaging-shared" },
+      }
        "[production]": { "kind": "enterprise-messaging" }
      },
      "db": { "kind": "sql" }
    }
  }
 }
--- a/reviews/readme.md
+++ b/reviews/readme.md
@@ -2,23 +2,20 @@
 ## Run all-in-one
-Open a terminal window and run the `fiori` app in it:
+Open a terminal window and run the bookshop in it:
 ```sh
-npm run fiori
+npm run bookshop
 ```
-## Run as Separate Services
+## Run as separate services
 Open two terminal windows. In the first one start the reviews service stand-alone:
 Open two terminal windows, and in the first one start the reviews service stand-alone:
 ```sh
 npm run reviews-service
 ```
-In the second one start the `fiori` app:
+In the the second one start the bookshop:
 ```sh
-npm run fiori
+npm run bookshop
 ```
--- a/reviews/srv/reviews-service.cds
+++ b/reviews/srv/reviews-service.cds
@@ -9,16 +9,15 @@ service ReviewsService {
  // Async API
   event reviewed : {
-    subject : type of Reviews:subject;
+     subject: type of Reviews:subject;
-    count   : Integer;
+     rating: Decimal(2,1)
    rating  : Decimal;
   }
  // Input validation
  annotate Reviews with {
    subject  @mandatory;
    title    @mandatory;
-    rating   @assert.range;
+    rating   @assert.enum;
  }
 }
--- a/reviews/srv/reviews-service.js
+++ b/reviews/srv/reviews-service.js
@@ -1,5 +1,5 @@
 const cds = require ('@sap/cds')
-module.exports = cds.service.impl (function(){
+module.exports = cds.service.impl (async function(){
  // Get the CSN definition for Reviews from the db schema for sub-sequent queries
  // ( Note: we explicitly specify the namespace to support embedded reuse )
@@ -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 { count, rating } = await cds.tx(req) .run (
+    const {rating} = await cds.tx(req) .run (
-      SELECT.one `round(avg(rating),2) as rating, count(*) as count` .from (Reviews) .where ({subject})
+      SELECT.one (['round(avg(rating),2) as rating']) .from (Reviews) .where ({subject})
    )
-    global.it || console.log ('< emitting:', 'reviewed', { subject, count, rating })
+    global.it || console.log ('< emitting:', 'reviewed', { subject, rating })
-    await this.emit ('reviewed', { subject, count, rating })
+    this.emit ('reviewed', { subject, rating })
  })
  // Increment counter for reviews considered helpful
--- a/samples.md
+++ b/samples.md
@@ -1,20 +1,19 @@
 # Overview of Samples
-The following list gives an overview of the samples provided in subdirectories.
+The list below gives an overview of the samples provided in subdirectories.
-Each sub directory essentially is an individual npm package arranged in an [all-in-one monorepo](all-in-one-monorepo) umbrella setup.
+Each sub directory essentially is a individual npm package arranged in an [all-in-one monorepo](all-in-one-monorepo) umbrella setup.
 ## [@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)
 - [Getting Started](https://cap.cloud.sap/docs/get-started/in-a-nutshell) with CAP, briefly introducing:
 - [Project Setup](https://cap.cloud.sap/docs/get-started/) and [Layouts](https://cap.cloud.sap/docs/get-started/projects)
- [Domain Modeling](https://cap.cloud.sap/docs/guides/domain-models)
+- [Domain Modelling](https://cap.cloud.sap/docs/guides/domain-models)
 - [Defining Services](https://cap.cloud.sap/docs/guides/providing-services)
 - [Generic Providers](https://cap.cloud.sap/docs/guides/generic-providers)
 - [Adding Custom Logic](https://cap.cloud.sap/docs/guides/service-impl)
@@ -23,7 +22,7 @@ Each sub directory essentially is an individual npm package arranged in an [all-
 ## [@capire/common](common)
- Showcases how to extend [@sap/cds/common](https://cap.cloud.sap/docs/cds/common) thereby covering:
+- Showcases how to extend [@sap/cds/common](https://cap.cloud.sap/docs/cds/common) thereby covering...
 - Building [extension packages](https://cap.cloud.sap/docs/guides/domain-models#aspects-extensibility)
 - Providing [reuse packages](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)
 - [Verticalization](https://cap.cloud.sap/docs/cds/common#adapting-to-your-needs)
@@ -33,46 +32,39 @@ Each sub directory essentially is an individual npm package arranged in an [all-
 ## [@capire/orders](orders)
- A standalone orders management service, demonstrating:
+- A standalone orders mgmt service, demonstrating...
 - Using [Compositions](https://cap.cloud.sap/docs/cds/cdl#compositions) in [Domain Models](https://cap.cloud.sap/docs/guides/domain-models), along with
 - [Serving deeply nested documents](https://cap.cloud.sap/docs/guides/generic-providers#serving-structured-data)
 ## [@capire/reviews](reviews)
- Shows how to implement a modular service to manage product reviews, including:
+- Shows how to implement a modular service to manage product reviews, including...
 - Consuming other services synchronously and asynchronously
 - Serving requests synchronously
 - Emitting events asynchronously
- Grow as you go, with:
+- Grow as you go, with...
 - Mocking app services
 - Running service meshes
 - Late-cut Micro Services
- As well as managed data, input validations, and authorization
+- As well as managed data, input validations and authorization
-## [@capire/bookstore](bookstore)
+## [@capire/fiori](fiori)
 - 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 a 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 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 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
 <br>
 # All-in-one Monorepo
--- a/test/cds.ql.test.js
+++ b/test/cds.ql.test.js
@@ -1,159 +1,96 @@
 const cds = require('@sap/cds/lib')
 const { expect } = cds.test
-const { cdr } = cds.ql
+const CQL = ([cql]) => cds.parse.cql(cql)
 const Foo = { name: 'Foo' }
 const Books = { name: 'capire.bookshop.Books' }
 const { parse:cdr } = cds.ql
-const STAR = cdr ? '*' : { ref: ['*'] }
+// while jest has 'test' as alias to 'it', mocha doesn't
-const skip = {to:{eql:()=>skip}}
+if (!global.test) global.test = it
 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
-  for (let each of ['SELECT', 'SELECT one', 'SELECT distinct']) {
+  describe.skip(`BUGS + GAPS...`, () => {
    let SELECT; beforeEach(()=> SELECT = (
      each === 'SELECT distinct' ? cds.ql.SELECT.distinct :
      each === 'SELECT one' ? cds.ql.SELECT.one :
      cds.ql.SELECT
    ))
  describe(`${each}...`, () => {
-    test(`from Foo`, () => {
+    it('should consistently handle *', () => {
-      expect(cqn = SELECT `from Foo`)
+      expect({
-      .to.eql(SELECT.from `Foo`)
+        SELECT: { from: { ref: ['Foo'] }, columns: ['*'] },
-      .to.eql(SELECT.from('Foo'))
+      })
-      .to.eql(SELECT.from(Foo))
+      .to.eql(CQL`SELECT * from Foo`)
-      .to.eql(SELECT`Foo`)
+      .to.eql(CQL`SELECT from Foo{*}`)
-      .to.eql(SELECT('Foo'))
+      .to.eql(SELECT('*').from(Foo))
-      .to.eql(SELECT(Foo))
+      .to.eql(SELECT.from(Foo,['*']))
-      expect.plain(cqn)
+    })
-      .to.eql(CQL`SELECT from Foo`)
+
-      .to.eql(srv.read `Foo`)
+
-      .to.eql(srv.read('Foo'))
+    it('should consistently handle lists', () => {
-      .to.eql(srv.read(Foo))
+      const ID = 11,  args = [`foo`, "'bar'", 3]
-      .to.eql({
+      const cqn = CQL`SELECT from Foo where ID=11 and x in (foo,'bar',3)`
      expect(SELECT.from(Foo).where(`ID=${ID} and x in (${args})`)).to.eql(cqn)
      expect(SELECT.from(Foo).where(`ID=`, ID, `and x in`, args)).to.eql(cqn)
      expect(SELECT.from(Foo).where({ ID, x:args })).to.eql(cqn)
    })
  })
  describe(`SELECT...`, () => {
    test('from ( Foo )', () => {
      expect({
        SELECT: { from: { ref: ['Foo'] } },
      })
      .to.eql(CQL`SELECT from Foo`)
      .to.eql(SELECT.from(Foo))
    })
-
+    test('from ( ..., <key>)', () => {
-    test('from Foo [<key>]', () => {
+      // Compiler
-
+      expect(CQL`SELECT from Foo[11]`).to.eql({
      expect(cqn = SELECT`from Foo[11]`)
      .to.eql(SELECT`from Foo[${11}]`)
      .to.eql(SELECT.from `Foo[11]`)
      .to.eql(SELECT.from `Foo[${11}]`)
      .to.eql(SELECT`Foo[11]`)
      expect.plain(cqn)
      .to.eql(CQL`SELECT from Foo[11]`)
      .to.eql(srv.read`Foo[11]`)
      .to.eql({
        SELECT: { from: {
          ref: [{ id: 'Foo', where: [{ val: 11 }] }]
        }},
      })
      if (cdr) expect.plain (cqn)
      .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 }] }],
        }},
      })
      if (cdr) expect.plain (cqn)
      .to.eql(SELECT`Foo[ID=${11}]`)
      .to.eql(srv.read`Foo[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,
+          // REVISIT: add one:true?
-            from: { ref: [{ id: 'Foo', where: [{ ref: ['ID'] }, '=', { val: 11 }] }] },
+          from: { ref: [{ id: 'Foo', where: [{ val: 11 }] }] },
        },
      })
-      } else {
+
-        expect.one(cqn)
+      expect(CQL`SELECT from Foo[ID=11]`).to.eql({
        SELECT: {
          // REVISIT: add one:true
          from: {
            ref: [{ id: 'Foo', where: [{ ref: ['ID'] }, '=', { val: 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 }))
        .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: {
-          from: { ref: ['Foo'] },
+          // REVISIT: add one:true?
-          columns: [ STAR, { ref: ['a'] }, { ref: ['b'], as: 'c' }],
+          from: { ref: [{ id: 'Foo', where: [{ val: 11 }] }] },
          columns: [{ ref: ['a'] }],
        },
      })
-      cdr && expect.plain(cqn)
+      expect(SELECT.from(Foo, 11, ['a']))
-      .to.eql(CQL`SELECT *,a,b as c from Foo`)
+        .to.eql(SELECT.from(Foo, 11, (foo) => foo.a))
      .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'] },
@@ -161,56 +98,110 @@ describe('cds.ql → cqn', () => {
            where: [{ ref: ['ID'] }, '=', { val: 11 }],
          },
        })
      }
    })
-    test('with nested expands', () => {
+    test('from ( ..., => {...})', () => {
-      // SELECT from Foo { *, x, bar.*, car{*}, boo { *, moo.zoo } }
+      // single *, prefix and postfix, as array and function
-      expect(cqn =
+      let parsed, fluid
-        SELECT.from (Foo, foo => {
+      expect((parsed = CQL`SELECT * from Foo`)).to.eql(CQL`SELECT from Foo{*}`)
-          foo`*`, foo.x, foo.car`*`, foo.boo (b => {
+      //> .to.eql... FIXME: see skipped 'should handle * correctly' below
-            b`*`, b.moo.zoo(
+      expect((fluid = SELECT('*').from(Foo)))
-              x => x.y.z
+        .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: ['*'] }] },
        })
        })
      ).to.eql(
        SELECT.from (Foo, foo => {
          foo('*'), foo.x, foo.car('*'), foo.boo (b => {
            b('*'), b.moo.zoo(
              x => x.y.z
            )
          })
        })
      )
-      expect.plain(cqn)
+      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'] }] },
        })
      // 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 = {
        SELECT: {
          from: { ref: ['Foo'] },
          columns: [{ ref: ['a'] }, { ref: ['b'], as: 'c' }],
        },
      })
      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: [
-            STAR,
+              cdr ? '*' : { ref: ['*'] },
              { ref: ['x'] },
              { ref: ['car'], expand: ['*'] },
              {
                ref: ['boo'],
-              expand: [ '*', { ref: ['moo', 'zoo'], expand: [{ ref: ['y', 'z'] }] }],
+                expand: ['*', { ref: ['moo', 'zoo'], expand: [{ ref: ['y', 'z'] }] }],
              },
            ],
          },
        })
      })
-
+      test('from ( ..., => _.inline ( _=>{...}))', () => {
    test('with nested inlines', () => {
        // SELECT from Foo { *, x, bar.*, car{*}, boo { *, moo.zoo } }
-      expect.plain(
+        expect(
-        SELECT.from (Foo, foo => {
+          SELECT.from(Foo, (foo) => {
-          foo.bar `*`,
+            foo.bar('*'),
-          foo.bar `.*`, //> leading dot indicates inline
+              foo.bar('.*'), //> leading dot indicates inline
-          foo.boo(_ => _.moo.zoo), //> underscore arg name indicates inline
+              foo.boo((x) => x.moo.zoo),
-          foo.boo(x => x.moo.zoo)
+              foo.boo((_) => _.moo.zoo) //> underscore arg name indicates inline
          })
        ).to.eql({
          SELECT: {
@@ -218,44 +209,49 @@ describe('cds.ql → cqn', () => {
            columns: [
              { ref: ['bar'], expand: ['*'] },
              { ref: ['bar'], inline: ['*'] },
            { ref: ['boo'], inline: [{ ref: ['moo', 'zoo'] }] },
              { 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'] } })
-  describe ('SELECT where...', ()=>{
+      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
    })
    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: cdr ? [
+          where: [
            { ref: ['x'] },
            '=',
            { val: 1 },
            'and',
            // '(',
            {xpr:[
              { ref: ['y'] },
              '=',
              { val: 2 },
              'or',
              { ref: ['z'] },
              '=',
              { val: 3 },
            ]},
            // ')',
          ] : [
            { ref: ['x'] },
            '=',
            { val: 1 },
            'and',
            '(',
            // {xpr:[
            { ref: ['y'] },
            '=',
            { val: 2 },
@@ -263,97 +259,12 @@ describe('cds.ql → cqn', () => {
            { 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
@@ -369,17 +280,18 @@ describe('cds.ql → cqn', () => {
      ).to.eql({
        SELECT: {
          from: { ref: ['Foo'] },
-          where: cdr ? [
+          where: cdr
            ? [
                // '(', //> this one is not required
                { ref: ['ID'] },
                '=',
                { val: ID },
                'and',
                { ref: ['args'] },
                'in',
-            { list: args.map(val => ({ val })) },
+                { val: args },
                'and',
-            {
+                '(', //> this one is missing, and that's changing the logic -> that's a BUG
              xpr: [
                { ref: ['x'] },
                'like',
                { val: '%x%' },
@@ -387,18 +299,19 @@ describe('cds.ql → cqn', () => {
                { ref: ['y'] },
                '>=',
                { val: 9 },
                ')',
              ]
-            },
+            : [
-          ] : [
+                // '(', //> this one is not required
                { ref: ['ID'] },
                '=',
                { val: ID },
                'and',
                { ref: ['args'] },
                'in',
-            { list: args.map(val => ({ val })) },
+                { val: args },
                'and',
-            '(',
+                '(',  //> this one is missing, and that's changing the logic -> that's a BUG
                { ref: ['x'] },
                'like',
                { val: '%x%' },
@@ -408,30 +321,11 @@ describe('cds.ql → cqn', () => {
                { val: 9 },
                ')',
              ],
-        }
+        },
      })
      // using CQL fragments -> uses cds.parse.expr
-      const is_v2 = !!cds.parse.expr('(1,2)').list
+      expect((cqn = CQL`SELECT from Foo where ID=11 and x in ( foo, 'bar', 3)`)).to.eql({
      if (is_v2) expect((cqn = CQL`SELECT from Foo where ID=11 and x in ( foo, 'bar', 3)`)).to.eql({
        SELECT: {
          from: { ref: ['Foo'] },
          where: [
            { ref: ['ID'] },
            '=',
            { val: ID },
            'and',
            { ref: ['x'] },
            'in',
            {list:[
              { ref: ['foo'] },
              { val: 'bar' },
              { val: 3 },
            ]}
          ],
        },
      })
      else expect((cqn = CQL`SELECT from Foo where ID=11 and x in ( foo, 'bar', 3)`)).to.eql({
        SELECT: {
          from: { ref: ['Foo'] },
          where: [
@@ -452,7 +346,7 @@ describe('cds.ql → cqn', () => {
        },
      })
-      if (!is_v2) expect(
+      expect(
        SELECT.from(Foo).where(`x=`, 1, `or y.z is null and (a>`, 2, `or b=`, 3, `)`)
      ).to.eql(CQL`SELECT from Foo where x=1 or y.z is null and (a>2 or b=3)`)
@@ -493,32 +387,12 @@ describe('cds.ql → cqn', () => {
        ).to.eql(cqn)
    })
-    test('w/ plain SQL', () => {
+    it('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)
    })
    //
  })
@@ -573,31 +447,21 @@ describe('cds.ql → cqn', () => {
  describe(`UPDATE...`, () => {
    test('entity (..., <key>)', () => {
      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(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(cqnKey)
+        .to.eql({
          UPDATE: {
            entity: 'capire.bookshop.Books',
            where: [{ ref: ['ID'] }, '=', { val: 4711 }],
          },
        })
    })
    /*
@@ -648,29 +512,20 @@ 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(cqnKey)
+        .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 }],
          },
        })
    })
    test('/w plain SQL', () => {
--- a/test/consuming-services.test.js
+++ b/test/consuming-services.test.js
@@ -1,11 +1,11 @@
 const cds = require('@sap/cds/lib')
 const { expect } = cds.test (
  'serve', 'AdminService', '--from', '@capire/bookshop,@capire/common', '--in-memory'
-)
+).in(__dirname)
 describe('Consuming Services locally', () => {
  //
-  it('bootstrapped the database successfully', ()=>{
+  it('bootrapped 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
-    expect (await SELECT.from(Authors))
+    const _ = expect (await AdminService.read(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)))
-    .to.eql(await AdminService.run(SELECT.from('Authors')))
+    // temporary workaround
    if (cds.version >= '4.2.0')
      _.to.eql(await AdminService.run(SELECT.from('Authors')))
  })
  it('allows reading from local services using cds.ql', async () => {
    const AdminService = await cds.connect.to('AdminService')
-    const authors = await AdminService.read (`Authors`, a => {
+    const query = SELECT.from('Authors', (a) => {
      a.name,
        a.books((b) => {
          b.title,
@@ -34,6 +34,10 @@ 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,14 +1,16 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds/lib'); cds.User = cds.User.Privileged // skip auth
-const { GET, POST, expect } = cds.test(__dirname+'/../bookshop')
+const { GET, POST, expect } = cds.test('bookshop').in(__dirname,'..')
 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 POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`
+    await expect(
-    await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`
+      Promise.all([
-    await expect(POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`).to.be.rejectedWith(/409 - 5 exceeds stock for book #201/)
+        POST('/browse/submitOrder', { book: 201, amount: 5 }),
        POST('/browse/submitOrder', { book: 201, amount: 5 }),
        POST('/browse/submitOrder', { book: 201, amount: 5 }),
      ])
    ).to.be.rejectedWith(/409 - 5 exceeds stock for book #201/)
    const { data } = await GET`/admin/Books/201/stock/$value`
    expect(data).to.equal(2)
  })
--- a/test/hello-world.test.js
+++ b/test/hello-world.test.js
@@ -1,5 +1,5 @@
 const cds = require('@sap/cds/lib')
-const { GET, expect } = cds.test (__dirname+'/../hello')
+const { GET, expect } = cds.test('serve','hello/world.cds').in(__dirname,'..')
 describe('Hello world!', () => {
--- a/test/hierarchical-data.test.js
+++ b/test/hierarchical-data.test.js
@@ -1,10 +1,12 @@
 const cwd = process.cwd(); process.chdir (__dirname) //> only for internal CI/CD@SAP
 const cds = require('@sap/cds/lib')
 const {expect} = cds.test
 // monkey patching older releases:
 if (!cds.compile.cdl) cds.compile.cdl = cds.parse
 const { parse:cdr } = cds.ql
-// should become cds.compile(...) when cds5 is released
+const model = cds.compile.cdl (`
 const model = cds.compile.to.csn (`
  entity Categories {
    key ID   : Integer;
    name     : String;
@@ -23,6 +25,8 @@ describe('Hierarchical Data', ()=>{
    expect (cds.db.model) .to.exist
 	})
 	after(()=> process.chdir(cwd))
 	it ('supports deeply nested inserts', ()=> INSERT.into (Cats,
    { ID:100, name:'Some Cats...', children:[
      { ID:101, name:'Cat', children:[
@@ -76,9 +80,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' }
 		]
    return 'skipped as this will be fixed in a newer cds version'
 		if (cdr) expect ( await SELECT.from(Cats) ).to.containSubset (expected)
 		else expect ( await SELECT.from(Cats) ).to.eql (expected)
 	})
--- a/test/localized-data.test.js
+++ b/test/localized-data.test.js
@@ -1,7 +1,5 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds/lib'); cds.User = cds.User.Privileged // skip auth
-const { GET, expect } = cds.test.run ('serve', __dirname+'/localized-data.cds', '--in-memory')
+const { GET, expect } = cds.test ('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
 describe('Localized Data', () => {
@@ -43,7 +41,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: 'Yen' } },
+      { title: 'Catweazle', author: 'Richard Carpenter', currency: { name: 'Euro' } },
    ])
  })
@@ -85,7 +83,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: 'Yen' } },
+      { title: 'Catweazle', currency: { name: 'Euro' } },
    ])
  })
 })
--- a/test/messaging.test.js
+++ b/test/messaging.test.js
@@ -1,11 +1,13 @@
 const cds = require('@sap/cds/lib')
-const { expect } = cds.test
+const cwd = process.cwd(); process.chdir (__dirname) //> only for internal CI/CD@SAP
 const {expect} = cds.test
 const _model = '@capire/reviews'
-if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
+cds.User = cds.User.Privileged // hard core monkey patch
 else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
 describe('Messaging', ()=>{
    after(()=> process.chdir(cwd))
    it ('should bootstrap sqlite in-memory db', async()=>{
        const db = await cds.deploy (_model) .to ('sqlite::memory:')
        await db.delete('Reviews')
@@ -20,11 +22,11 @@ describe('Messaging', ()=>{
    let N=0, received=[], M=0
    it ('should add messaging event handlers', ()=>{
-        srv.on('reviewed', (msg)=> received.push(msg))
+        srv.on('reviewed', (msg,next)=> { received.push(msg); return next() })
    })
    it ('should add more messaging event handlers', ()=>{
-        srv.on('reviewed', ()=> ++M)
+        srv.on('reviewed', (_,next)=> { ++M; return next() })
    })
    it ('should add review', async ()=>{
@@ -42,16 +44,16 @@ describe('Messaging', ()=>{
        //     { ID: 111 + (++N),  subject: "201", title: "Captivating", rating: N },
        // ),
        srv.create ('Reviews') .entries (
-            { ID: String(111 + (++N)),  subject: "201", title: "Captivating", rating: N }
+            { ID: 111 + (++N),  subject: "201", title: "Captivating", rating: N }
        ),
        srv.create ('Reviews') .entries (
-            { ID: String(111 + (++N)),  subject: "201", title: "Captivating", rating: N }
+            { ID: 111 + (++N),  subject: "201", title: "Captivating", rating: N }
        ),
        srv.create ('Reviews') .entries (
-            { ID: String(111 + (++N)),  subject: "201", title: "Captivating", rating: N }
+            { ID: 111 + (++N),  subject: "201", title: "Captivating", rating: N }
        ),
        srv.create ('Reviews') .entries (
-            { ID: String(111 + (++N)),  subject: "201", title: "Captivating", rating: N }
+            { ID: 111 + (++N),  subject: "201", title: "Captivating", rating: N }
        ),
    ]))
@@ -60,11 +62,11 @@ describe('Messaging', ()=>{
        expect(M).equals(N)
        expect(received.length).equals(N)
        expect(received.map(m=>m.data)).to.deep.equal([
-            { count: 1, subject: '201', rating: 1 },
+            { subject: '201', rating: 1 },
-            { count: 2, subject: '201', rating: 1.5 },
+            { subject: '201', rating: 1.5 },
-            { count: 3, subject: '201', rating: 2 },
+            { subject: '201', rating: 2 },
-            { count: 4, subject: '201', rating: 2.5 },
+            { subject: '201', rating: 2.5 },
-            { count: 5, subject: '201', rating: 3 },
+            { subject: '201', rating: 3 },
        ])
    })
 })
--- a/test/odata.test.js
+++ b/test/odata.test.js
@@ -1,11 +1,8 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds/lib'); cds.User = cds.User.Privileged // skip auth
-const { GET, expect } = cds.test ('@capire/bookshop')
+const { GET, expect } = cds.test('bookshop').in(__dirname,'..')
 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('OData Protocol', () => {
  it('serves $metadata documents in v4', async () => {
    const { headers, status, data } = await GET `/browse/$metadata`
    expect(status).to.equal(200)
@@ -18,9 +15,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
@@ -1,54 +0,0 @@
 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())
    })
  })
 }
`@@ -1,2 +1 @@`
	`const { CatalogService } = require('./srv/cat-service')`	`exports.CatalogService = require('./srv/cat-service')`
	`module.exports = { CatalogService }`
		`@@ -0,0 +1,2 @@`
							`# cds.requires.messaging.kind = file-based-messaging`
							`PORT = 4004`
`@@ -1,2 +1,2 @@`
	`# cds.requires.messaging.kind = file-based-messaging`	`cds.requires.messaging.kind = file-based-messaging`
	`PORT = 4005`	`PORT = 4005`