empty line at end

Co-authored-by: Patrice Bender <info@patrice.codes>

.github/workflows/node.js.yml

@@ -5,9 +5,9 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:

.registry/server.js

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

.tours/db-native.tour

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

.tours/samples.tour

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

README.md

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

bookshop/app/vue/app.js

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

bookshop/app/vue/index.html

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

bookshop/index.js

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

bookshop/package.json

@@ -18,6 +18,9 @@
       "db": {
         "kind": "sql"
       }
+    },
+    "features": {
+      "assert_integrity": "db"
     }
   }
 }

bookshop/srv/cat-service.cds

@@ -11,6 +11,6 @@ service CatalogService @(path:'/browse') {
   } excluding { createdBy, modifiedBy };
 
   @requires: 'authenticated-user'
-  action submitOrder ( book: Books:ID, amount: Integer ) returns { stock: Integer };
+  action submitOrder ( book: Books:ID, quantity: Integer ) returns { stock: Integer };
-  event OrderedBook : { book: Books:ID; amount: Integer; buyer: String };
+  event OrderedBook : { book: Books:ID; quantity: Integer; buyer: String };
 }

bookshop/srv/cat-service.js

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

bookshop/test/requests.http

@@ -17,7 +17,7 @@ GET {{server}}/browse/$metadata
 ### ------------------------------------------------------------------------
 # Browse Books as any user
 GET {{server}}/browse/Books?
-  # &$select=title,stock
+  &$select=title,stock,author
   # &$expand=currency
   # &sap-language=de
 {{me}}
@@ -32,6 +32,19 @@ GET {{server}}/admin/Authors?
   # &sap-language=de
 Authorization: Basic alice:
 
+### ------------------------------------------------------------------------
+# Create Author
+POST {{server}}/admin/Authors
+Content-Type: application/json;IEEE754Compatible=true
+Authorization: Basic alice:
+
+{
+  "ID": 112,
+  "name": "Shakespeeeeere",
+  "age": 22
+}
+
+
 ### ------------------------------------------------------------------------
 # Create book
 POST {{server}}/admin/Books
@@ -49,6 +62,22 @@ Authorization: Basic alice:
   "currency": { "code": "USD" }
 }
 
+### ------------------------------------------------------------------------
+# Create book with invalid author ID -> will fail
+POST {{server}}/admin/Books
+Content-Type: application/json;IEEE754Compatible=true
+Authorization: Basic alice:
+
+{
+  "ID": 34,
+  "title": "Let constraints do the magic",
+  "descr": "Database constraints are helpful little things that prevent messing up your data.",
+  "author": { "ID": 777 },
+  "genre": { "ID": 14 },
+  "stock": 4,
+  "price": "19.99",
+  "currency": { "code": "USD" }
+}
 
 ### ------------------------------------------------------------------------
 # Put image to books
@@ -71,7 +100,7 @@ POST {{server}}/browse/submitOrder
 Content-Type: application/json
 {{me}}
 
-{ "book":201, "amount":5 }
+{ "book":201, "quantity":5 }
 
 
 ### ------------------------------------------------------------------------

bookstore/index.cds

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

bookstore/package.json

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

bookstore/server.js

@@ -0,0 +1,21 @@
+const cds = require ('@sap/cds')
+
+// Add mashup logic
+cds.once('served', require('./srv/mashup'))
+
+// Add routes to UIs from imported packages
+cds.once('bootstrap',(app)=>{
+  app.serve ('/bookshop') .from ('@capire/bookshop','app/vue')
+  app.serve ('/reviews') .from ('@capire/reviews','app/vue')
+  app.serve ('/orders') .from('@capire/orders','app/orders')
+})
+
+// Add Swagger UI
+require('./srv/swagger-ui')
+
+// Returning cds.server
+module.exports = cds.server
+
+// For didactic reasons in capire
+const { ReviewsService, OrdersService } = cds.requires
+if (!ReviewsService.credentials && !OrdersService.credentials) cds.requires.messaging = false

bookstore/srv/mashup.cds

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

bookstore/srv/mashup.js

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

bookstore/srv/swagger-ui.js

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

bookstore/test/requests.http

@@ -2,7 +2,7 @@
 @bookshop = http://localhost:4004
 @reviews-service = {{bookshop}}/reviews
 # Uncomment this when running a separate reviews service
-@reviews-service = http://localhost:4005/reviews
+# @reviews-service = http://localhost:4005/reviews
 
 
 

fiori/.env

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,7 @@
 {
     "_version": "1.8.0",
     "sap.app": {
-        "id": "admin",
+        "id": "books",
         "type": "application",
         "title": "Manage Books",
         "description": "Sample Application",
@@ -73,6 +73,7 @@
                     "options": {
                         "settings" : {
                             "entitySet" : "Books",
+                            "initialLoad": true,
                             "navigation" : {
                                 "Books" : {
                                     "detail" : {

fiori/app/appconfig/fioriSandboxConfig.json

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

fiori/app/bookshop.html

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

fiori/app/browse/fiori-service.cds

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

fiori/app/browse/webapp/manifest.json

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

fiori/app/common.cds

@@ -2,7 +2,7 @@
  Common Annotations shared by all apps
 */
 
-using { sap.capire.bookshop as my } from '@capire/bookshop';
+using { sap.capire.bookshop as my } from '@capire/bookstore';
 using { sap.common } from '@capire/common';
 
 ////////////////////////////////////////////////////////////////////////////
@@ -10,21 +10,39 @@ using { sap.common } from '@capire/common';
 //	Books Lists
 //
 annotate my.Books with @(
-	Common.SemanticKey: [title],
+    Common.SemanticKey : [ID],
     UI                 : {
         Identification  : [{Value : title}],
-		SelectionFields: [ ID, author_ID, price, currency_code ],
+        SelectionFields : [
+            ID,
+            author_ID,
+            price,
+            currency_code
+        ],
         LineItem        : [
-			{Value: ID},
+            {
-			{Value: title},
+                Value : ID,
-			{Value: author.name, Label:'{i18n>Author}'},
+                Label : '{i18n>Title}'
+            },
+            {
+                Value : author.ID,
+                Label : '{i18n>Author}'
+            },
             {Value : genre.name},
             {Value : stock},
             {Value : price},
-			{Value: currency.symbol, Label:' '},
+            {
+                Value : currency.symbol,
+                Label : ' '
+            },
         ]
     }
 ) {
+    ID  @Common: {
+        SemanticObject : 'Books',
+        Text: title,
+        TextArrangement : #TextOnly
+    };
     author @ValueList.entity      : 'Authors';
 };
 
@@ -32,17 +50,12 @@ annotate my.Books with @(
 //
 //	Books Details
 //
-annotate my.Books with @(
+annotate my.Books with @(UI : {HeaderInfo : {
-	UI: {
-		HeaderInfo: {
     TypeName       : '{i18n>Book}',
     TypeNamePlural : '{i18n>Books}',
     Title          : {Value : title},
     Description    : {Value : author.name}
-		},
+}, });
-	}
-);
-
 
 
 ////////////////////////////////////////////////////////////////////////////
@@ -50,10 +63,16 @@ annotate my.Books with @(
 //	Books Elements
 //
 annotate my.Books with {
-	ID @title:'{i18n>ID}' @UI.HiddenFilter;
+    ID     @title : '{i18n>ID}';
     title  @title : '{i18n>Title}';
-	genre  @title:'{i18n>Genre}'  @Common: { Text: genre.name,  TextArrangement: #TextOnly };
+    genre  @title : '{i18n>Genre}'  @Common               : {
-	author @title:'{i18n>Author}' @Common: { Text: author.name, TextArrangement: #TextOnly };
+        Text            : genre.name,
+        TextArrangement : #TextOnly
+    };
+    author @title : '{i18n>Author}'  @Common              : {
+        Text            : author.name,
+        TextArrangement : #TextOnly
+    };
     price  @title : '{i18n>Price}'  @Measures.ISOCurrency : currency_code;
     stock  @title : '{i18n>Stock}';
     descr  @UI.MultiLineText;
@@ -69,7 +88,10 @@ annotate my.Genres with @(
         SelectionFields : [name],
         LineItem        : [
             {Value : name},
-			{Value: parent.name, Label: 'Main Genre'},
+            {
+                Value : parent.name,
+                Label : 'Main Genre'
+            },
         ],
     }
 );
@@ -78,8 +100,7 @@ annotate my.Genres with @(
 //
 //	Genre Details
 //
-annotate my.Genres with @(
+annotate my.Genres with @(UI : {
-	UI: {
     Identification : [{Value : name}],
     HeaderInfo     : {
         TypeName       : '{i18n>Genre}',
@@ -87,11 +108,12 @@ annotate my.Genres with @(
         Title          : {Value : name},
         Description    : {Value : ID}
     },
-		Facets: [
+    Facets         : [{
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>SubGenres}', Target: 'children/@UI.LineItem'},
+        $Type  : 'UI.ReferenceFacet',
-		],
+        Label  : '{i18n>SubGenres}',
-	}
+        Target : 'children/@UI.LineItem'
-);
+    }, ],
+});
 
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -107,38 +129,42 @@ annotate my.Genres with {
 //	Authors List
 //
 annotate my.Authors with @(
-	Common.SemanticKey: [name],
+    Common.SemanticKey : [ID],
     UI                 : {
         Identification  : [{Value : name}],
         SelectionFields : [name],
         LineItem        : [
             {Value : ID},
-			{Value: name},
             {Value : dateOfBirth},
             {Value : dateOfDeath},
             {Value : placeOfBirth},
             {Value : placeOfDeath},
         ],
     }
-);
+) {
+    ID  @Common: {
+        SemanticObject : 'Authors',
+        Text: name,
+        TextArrangement : #TextOnly,
+    };
+};
 
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Author Details
 //
-annotate my.Authors with @(
+annotate my.Authors with @(UI : {
-	UI: {
     HeaderInfo : {
         TypeName       : '{i18n>Author}',
         TypeNamePlural : '{i18n>Authors}',
         Title          : {Value : name},
         Description    : {Value : dateOfBirth}
     },
-		Facets: [
+    Facets     : [{
-			{$Type: 'UI.ReferenceFacet', Target: 'books/@UI.LineItem'},
+        $Type  : 'UI.ReferenceFacet',
-		],
+        Target : 'books/@UI.LineItem'
-	}
+    }, ],
-);
+});
 
 
 ////////////////////////////////////////////////////////////////////////////
@@ -146,7 +172,7 @@ annotate my.Authors with @(
 //	Authors Elements
 //
 annotate my.Authors with {
-	ID @title:'{i18n>ID}' @UI.HiddenFilter;
+    ID           @title : '{i18n>ID}';
     name         @title : '{i18n>Name}';
     dateOfBirth  @title : '{i18n>DateOfBirth}';
     dateOfDeath  @title : '{i18n>DateOfDeath}';
@@ -162,7 +188,10 @@ annotate common.Languages with @(
     Common.SemanticKey : [code],
     Identification     : [{Value : code}],
     UI                 : {
-		SelectionFields: [ name, descr ],
+        SelectionFields : [
+            name,
+            descr
+        ],
         LineItem        : [
             {Value : code},
             {Value : name},
@@ -174,26 +203,24 @@ annotate common.Languages with @(
 //
 //	Language Details
 //
-annotate common.Languages with @(
+annotate common.Languages with @(UI : {
-	UI: {
     HeaderInfo          : {
         TypeName       : '{i18n>Language}',
         TypeNamePlural : '{i18n>Languages}',
         Title          : {Value : name},
         Description    : {Value : descr}
     },
-		Facets: [
+    Facets              : [{
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
+        $Type  : 'UI.ReferenceFacet',
-		],
+        Label  : '{i18n>Details}',
-		FieldGroup#Details: {
+        Target : '@UI.FieldGroup#Details'
-			Data: [
+    }, ],
+    FieldGroup #Details : {Data : [
         {Value : code},
         {Value : name},
         {Value : descr}
-			]
+    ]},
-		},
+});
-	}
-);
 
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -203,7 +230,10 @@ annotate common.Currencies with @(
     Common.SemanticKey : [code],
     Identification     : [{Value : code}],
     UI                 : {
-		SelectionFields: [ name, descr ],
+        SelectionFields : [
+            name,
+            descr
+        ],
         LineItem        : [
             {Value : descr},
             {Value : symbol},
@@ -216,8 +246,7 @@ annotate common.Currencies with @(
 //
 //	Currency Details
 //
-annotate common.Currencies with @(
+annotate common.Currencies with @(UI : {
-	UI: {
     HeaderInfo           : {
         TypeName       : '{i18n>Currency}',
         TypeNamePlural : '{i18n>Currencies}',
@@ -225,26 +254,29 @@ annotate common.Currencies with @(
         Description    : {Value : code}
     },
     Facets               : [
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
+        {
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Extended}', Target: '@UI.FieldGroup#Extended'},
+            $Type  : 'UI.ReferenceFacet',
+            Label  : '{i18n>Details}',
+            Target : '@UI.FieldGroup#Details'
+        },
+        {
+            $Type  : 'UI.ReferenceFacet',
+            Label  : '{i18n>Extended}',
+            Target : '@UI.FieldGroup#Extended'
+        },
     ],
-		FieldGroup#Details: {
+    FieldGroup #Details  : {Data : [
-			Data: [
         {Value : name},
         {Value : symbol},
         {Value : code},
         {Value : descr}
-			]
+    ]},
-		},
+    FieldGroup #Extended : {Data : [
-		FieldGroup#Extended: {
-			Data: [
         {Value : numcode},
         {Value : minor},
         {Value : exponent}
-			]
+    ]},
-		},
+});
-	}
-);
 
 ////////////////////////////////////////////////////////////////////////////
 //

fiori/app/fiori-apps.html

@@ -10,32 +10,7 @@
 	<script>
 		window["sap-ushell-config"] = {
 			defaultRenderer: "fiori2",
-			applications: {
+			applications: {}
-				"browse-books": {
-					title: "Browse Books",
-					description: "w/ SAP Fiori Elements",
-					additionalInformation: "SAPUI5.Component=bookshop",
-					applicationType : "URL",
-					url: "/browse/webapp",
-					navigationMode: "embedded"
-				},
-				"manage-books": {
-					title: "Manage Books",
-					description: "w/ SAP Fiori Elements",
-					additionalInformation: "SAPUI5.Component=admin",
-					applicationType : "URL",
-					url: "/admin/webapp",
-					navigationMode: "embedded"
-				},
-				"manage-orders": {
-					title: "Manage Orders",
-					description: "w/ SAP Fiori Elements",
-					additionalInformation: "SAPUI5.Component=orders",
-					applicationType : "URL",
-					url: "/orders/webapp",
-					navigationMode: "embedded"
-				}
-			}
 		};
 	</script>
 

fiori/app/reviews.html

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

fiori/app/services.cds

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

fiori/db/hana/index.cds

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

fiori/db/schema.cds

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

fiori/db/sqlite/index.cds

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

fiori/package.json

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

fiori/server.js

@@ -1,23 +1 @@
-const cds = require ('@sap/cds')
+module.exports = require('@capire/bookstore/server.js')
-module.exports = cds.server
-
-cds.once('bootstrap',(app)=>{
-  app.use ('/orders/webapp', _from('@capire/orders/app/orders/webapp/manifest.json'))
-  app.use ('/bookshop', _from('@capire/bookshop/app/vue/index.html'))
-  app.use ('/reviews', _from('@capire/reviews/app/vue/index.html'))
-})
-
-cds.once('served', require('./srv/mashup'))
-
-// Swagger UI - see https://cap.cloud.sap/docs/advanced/openapi
-if (process.env.NODE_ENV !== 'production') {
-  const cds_swagger = require ('cds-swagger-ui-express')
-  cds.once ('bootstrap', app => app.use (cds_swagger()) )
-}
-
-
-// -----------------------------------------------------------------------
-// Helper for serving static content from npm-installed packages
-const {static} = require('express')
-const {dirname} = require('path')
-const _from = target => static (dirname (require.resolve(target)))

hello/README.md

@@ -0,0 +1,15 @@
+# Hello World Getting Started Sample
+
+## Next Steps
+
+- To run the JavaScript implementation, open a new terminal and run `cds watch`.
+- To run the TypeScript implementation, open a new terminal and run `cds-ts watch`.
+
+Then call the service at: http://localhost:4004/say/hello(to='world')
+
+## Learn More
+
+Learn more about:
+
+- [Hello World!](https://cap.cloud.sap/docs/get-started/hello-world)
+- [Using TypeScript](https://cap.cloud.sap/docs/get-started/using-typescript)

hello/package.json

@@ -3,12 +3,12 @@
   "version": "1.0.0",
   "scripts": {
     "test": "npx jest --silent",
-    "watch": "cds serve world.cds",
+    "start": "cds serve srv/world.cds",
-    "watch:ts": "cds-ts serve world.cds"
+    "start:ts": "cds-ts serve srv/world.cds"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.23",
+    "@types/jest": "^27.0.2",
-    "@types/node": "^15.12.0",
+    "@types/node": "^16.11.6",
     "ts-jest": "^27.0.2",
     "typescript": "^4.3.5"
   },
@@ -25,5 +25,30 @@
         }
       }
     }
+  },
+  "eslintConfig": {
+    "extends": "eslint:recommended",
+    "env": {
+      "es2020": true,
+      "node": true,
+      "jest": true,
+      "mocha": true
+    },
+    "globals": {
+      "SELECT": true,
+      "INSERT": true,
+      "UPDATE": true,
+      "DELETE": true,
+      "CREATE": true,
+      "DROP": true,
+      "CDL": true,
+      "CQL": true,
+      "CXL": true,
+      "cds": true
+    },
+    "rules": {
+      "no-console": "off",
+      "require-atomic-updates": "off"
+    }
   }
 }

hello/srv/world.ts

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

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

@@ -2,7 +2,7 @@ process.env.CDS_TYPESCRIPT = 'true';
 import * as cds from '@sap/cds';
 
 //@ts-ignore
-const {GET} = cds.test.in(__dirname,'..').run('serve', 'world.cds');
+const {GET} = cds.test.in(__dirname,'../srv').run('serve', 'world.cds');
 
 describe('Hello world!', () => {
     afterAll(() => { delete process.env.CDS_TYPESCRIPT; });

hello/world.ts

@@ -1,5 +0,0 @@
-module.exports = class say {
-    hello(req: any) {
-        return `Hello ${req.data.to} from a typescript file!`
-    }
-}

orders/app/fiori.cds

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

orders/app/index.cds

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

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

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

orders/db/schema.cds

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

orders/package.json

@@ -2,6 +2,12 @@
   "name": "@capire/orders",
   "version": "1.0.0",
   "dependencies": {
+    "@capire/common": "*",
     "@sap/cds": "^5"
+  },
+  "cds": {
+    "features": {
+      "assert_integrity": "db"
+    }
   }
 }

orders/srv/orders-service.js

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

package.json

@@ -5,6 +5,7 @@
   "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",
@@ -12,30 +13,33 @@
     "@capire/media": "./media",
     "@capire/orders": "./orders",
     "@capire/reviews": "./reviews",
-    "@sap/cds": "^5",
+    "@sap/cds": "^5.7.3"
-    "express": "^4"
   },
   "devDependencies": {
-    "cds-swagger-ui-express": "^0.2.0",
+    "chai": "^4.3.4",
-    "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "chai-subset": "^1.6.0",
-    "sqlite3": "^5.0.0"
+    "sqlite3": "^5"
   },
   "scripts": {
     "cleanup": "rm -rf node_modules && rm -rf */node_modules && rm -rf */*/node_modules",
     "registry": "node .registry/server.js",
     "bookshop": "cds watch bookshop",
     "fiori": "cds watch fiori",
+    "hello": "cds watch hello",
     "media": "cds watch media",
     "mocha": "npx mocha || echo",
     "jest": "npx jest",
-    "test": "npm run jest --silent && npm run test:hello",
+    "start": "cds watch fiori",
+    "test": "npm run jest -- --silent",
     "test:hello": "cd hello && npm test"
   },
   "jest": {
     "testEnvironment": "node",
-    "testMatch": ["**/*.test.js"]
+    "testTimeout": 20000,
+    "testMatch": [
+      "**/*.test.js"
+    ]
   },
   "mocha": {
     "parallel": true

reviews/.env

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

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

@@ -1,5 +1,5 @@
-subject;rating;title;text
+subject;rating;reviewer;title;text
-201;5;Intriguing;Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+201;5;adam;Intriguing;Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
-201;4;Fascinating;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Id diam maecenas ultricies mi eget mauris pharetra et. Risus at ultrices mi tempus imperdiet nulla malesuada pellentesque. Pulvinar mattis nunc sed blandit libero. Facilisis magna etiam tempor orci eu. Nec sagittis aliquam malesuada bibendum arcu. Eu consequat ac felis donec. Ultricies tristique nulla aliquet enim tortor at auctor urna nunc. Tortor posuere ac ut consequat semper viverra nam libero. Amet nisl suscipit adipiscing bibendum est ultricies integer quis auctor. Scelerisque purus semper eget duis at tellus. Elementum tempus egestas sed sed risus pretium. Arcu dictum varius duis at. Amet luctus venenatis lectus magna fringilla urna. Eget velit aliquet sagittis id consectetur purus ut faucibus. Vitae auctor eu augue ut lectus. Fermentum iaculis eu non diam phasellus vestibulum.
+201;4;bob;Fascinating;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Id diam maecenas ultricies mi eget mauris pharetra et. Risus at ultrices mi tempus imperdiet nulla malesuada pellentesque. Pulvinar mattis nunc sed blandit libero. Facilisis magna etiam tempor orci eu. Nec sagittis aliquam malesuada bibendum arcu. Eu consequat ac felis donec. Ultricies tristique nulla aliquet enim tortor at auctor urna nunc. Tortor posuere ac ut consequat semper viverra nam libero. Amet nisl suscipit adipiscing bibendum est ultricies integer quis auctor. Scelerisque purus semper eget duis at tellus. Elementum tempus egestas sed sed risus pretium. Arcu dictum varius duis at. Amet luctus venenatis lectus magna fringilla urna. Eget velit aliquet sagittis id consectetur purus ut faucibus. Vitae auctor eu augue ut lectus. Fermentum iaculis eu non diam phasellus vestibulum.
-207;2;What is this?;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Libero justo laoreet sit amet cursus sit amet dictum. Nunc faucibus a pellentesque sit. Dis parturient montes nascetur ridiculus mus mauris vitae ultricies. Enim nunc faucibus a pellentesque. Commodo quis imperdiet massa tincidunt nunc pulvinar sapien. Cras ornare arcu dui vivamus. Facilisi etiam dignissim diam quis enim lobortis. Et molestie ac feugiat sed. Urna neque viverra justo nec ultrices dui. Ullamcorper a lacus vestibulum sed arcu non. Volutpat ac tincidunt vitae semper quis. Dignissim sodales ut eu sem. Feugiat in fermentum posuere urna nec. At augue eget arcu dictum varius.
+207;2;bob;What is this?;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Libero justo laoreet sit amet cursus sit amet dictum. Nunc faucibus a pellentesque sit. Dis parturient montes nascetur ridiculus mus mauris vitae ultricies. Enim nunc faucibus a pellentesque. Commodo quis imperdiet massa tincidunt nunc pulvinar sapien. Cras ornare arcu dui vivamus. Facilisi etiam dignissim diam quis enim lobortis. Et molestie ac feugiat sed. Urna neque viverra justo nec ultrices dui. Ullamcorper a lacus vestibulum sed arcu non. Volutpat ac tincidunt vitae semper quis. Dignissim sodales ut eu sem. Feugiat in fermentum posuere urna nec. At augue eget arcu dictum varius.
-251;3;It's dark...;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Suscipit tellus mauris a diam. Velit aliquet sagittis id consectetur purus ut. Viverra adipiscing at in tellus integer. Vitae elementum curabitur vitae nunc. Mattis ullamcorper velit sed ullamcorper morbi. Diam quis enim lobortis scelerisque. Auctor neque vitae tempus quam pellentesque nec nam aliquam. Semper auctor neque vitae tempus. Quis eleifend quam adipiscing vitae proin. Neque convallis a cras semper auctor neque vitae. Imperdiet massa tincidunt nunc pulvinar sapien et ligula. Sit amet consectetur adipiscing elit ut aliquam purus. Pretium quam vulputate dignissim suspendisse.
+251;3;bob;It's dark...;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Suscipit tellus mauris a diam. Velit aliquet sagittis id consectetur purus ut. Viverra adipiscing at in tellus integer. Vitae elementum curabitur vitae nunc. Mattis ullamcorper velit sed ullamcorper morbi. Diam quis enim lobortis scelerisque. Auctor neque vitae tempus quam pellentesque nec nam aliquam. Semper auctor neque vitae tempus. Quis eleifend quam adipiscing vitae proin. Neque convallis a cras semper auctor neque vitae. Imperdiet massa tincidunt nunc pulvinar sapien et ligula. Sit amet consectetur adipiscing elit ut aliquam purus. Pretium quam vulputate dignissim suspendisse.

reviews/package.json

@@ -10,15 +10,17 @@
     "@sap/cds": "^5",
     "express": "^4.17.1"
   },
-  "scripts": {
-    "reviews-service": "cds watch",
-    "books-reviewed": "cds watch ../reviewed"
-  },
   "cds": {
     "requires": {
-      "db": {
+      "messaging": {
-        "kind": "sql"
+        "[development]": { "kind": "file-based-messaging" },
-      }
+        "[hybrid]": { "kind": "enterprise-messaging-shared" },
+        "[production]": { "kind": "enterprise-messaging" }
+      },
+      "db": { "kind": "sql" }
+    },
+    "features": {
+      "assert_integrity": "db"
     }
   }
 }

reviews/srv/reviews-service.cds

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

reviews/srv/reviews-service.js

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

samples.md

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

test/cds.ql.test.js

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

test/consuming-services.test.js

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

test/custom-handlers.test.js

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

test/hello-world.test.js

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

test/hierarchical-data.test.js

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

test/index.js

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

test/localized-data.test.js

@@ -1,5 +1,5 @@
-const { GET, expect } = require('../test') .run ('serve', 'test/localized-data.cds', '--in-memory')
 const cds = require('@sap/cds/lib')
+const { GET, expect } = cds.test.run ('serve', __dirname+'/localized-data.cds', '--in-memory')
 if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
 else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
 

test/messaging.test.js

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

test/odata.test.js

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

test/registry.test.js

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