Patch for missing containment in v4

.github/workflows/node.js.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x, 14.x]
+        node-version: [10.x, 12.x, 14.x]
 
     steps:
     - uses: actions/checkout@v2

.registry/.gitignore

@@ -1 +0,0 @@
-*.tgz

.registry/server.js

@@ -5,9 +5,9 @@ const app = express()
 
 const { PORT=4444 } = process.env
 const [,,port=PORT] = process.argv
-process.chdir(__dirname)
 
 app.use('/-/:tarball', (req,res,next) => {
+  const url = decodeURIComponent(req.url)
   console.debug ('GET', req.params)
   try {
     const { tarball } = req.params

.tours/samples.tour

@@ -1,136 +0,0 @@
-{
-  "$schema": "https://aka.ms/codetour-schema",
-  "title": "CAP Samples",
-  "steps": [
-    {
-      "title": "Welcome",
-      "file": "README.md",
-      "description": "### Welcome to CAP Samples!\n\nThis tour leads you through a collection of samples for the [SAP Cloud Application Programming Model](https://cap.cloud.sap)\nYou will learn which features of the programming models are demonstrated in which sample.\n\nLet's start!",
-      "line": 2,
-      "selection": {
-        "start": {
-          "line": 1,
-          "character": 1
-        },
-        "end": {
-          "line": 3,
-          "character": 108
-        }
-      }
-    },
-    {
-      "file": "hello/world.cds",
-      "description": "### Hello World!\n\nThis is a simplistic [Hello World](https://cap.cloud.sap/docs/get-started/hello-world) service using [CDS](https://cap.cloud.sap/docs/cds/) and [cds.services](https://cap.cloud.sap/docs/node.js/api#services-api).",
-      "line": 2,
-      "selection": {
-        "start": {
-          "line": 1,
-          "character": 1
-        },
-        "end": {
-          "line": 4,
-          "character": 1
-        }
-      },
-      "title": "Hello World!"
-    },
-    {
-      "file": "bookshop/db/schema.cds",
-      "description": "### A Bookshop!\n\nIntroduces:\n- [Project Setup](https://cap.cloud.sap/docs/get-started/) and [Layouts](https://cap.cloud.sap/docs/get-started/projects)\n- [Domain Modeling](https://cap.cloud.sap/docs/guides/domain-models)\n- [Defining Services](https://cap.cloud.sap/docs/guides/providing-services)\n- [Generic Providers](https://cap.cloud.sap/docs/guides/generic-providers)\n- [Adding Custom Logic](https://cap.cloud.sap/docs/guides/service-impl)\n- [Using Databases](https://cap.cloud.sap/docs/guides/databases)\n",
-      "line": 1,
-      "selection": {
-        "start": {
-          "line": 1,
-          "character": 1
-        },
-        "end": {
-          "line": 32,
-          "character": 1
-        }
-      },
-      "title": "Bookshop"
-    },
-    {
-      "file": "common/index.cds",
-      "description": "### Extend and Reuse\n\nShowcases how to extend [@sap/cds/common](https://cap.cloud.sap/docs/cds/common) thereby covering:\n- Building [extension packages](https://cap.cloud.sap/docs/guides/domain-models#aspects-extensibility)\n- Providing [reuse packages](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)\n- [Verticalization](https://cap.cloud.sap/docs/cds/common#adapting-to-your-needs)\n- Using [Aspects](https://cap.cloud.sap/docs/cds/cdl#aspects)\n- Used in the [fiori app sample](#fiori)\n",
-      "line": 1,
-      "selection": {
-        "start": {
-          "line": 1,
-          "character": 1
-        },
-        "end": {
-          "line": 46,
-          "character": 1
-        }
-      },
-      "title": "Common"
-    },
-    {
-      "file": "orders/db/schema.cds",
-      "description": "### Compositions and Serving Documents\n\nA standalone orders management service, demonstrating:\n- Using [Compositions](https://cap.cloud.sap/docs/cds/cdl#compositions) in [Domain Models](https://cap.cloud.sap/docs/guides/domain-models), along with\n- [Serving deeply nested documents](https://cap.cloud.sap/docs/guides/generic-providers#serving-structured-data)\n",
-      "line": 1,
-      "selection": {
-        "start": {
-          "line": 1,
-          "character": 1
-        },
-        "end": {
-          "line": 27,
-          "character": 1
-        }
-      },
-      "title": "Orders"
-    },
-    {
-      "file": "reviews/db/schema.cds",
-      "description": "### More Modularity\n\nShows how to implement a modular service to manage product reviews, including:\n- Consuming other services synchronously and asynchronously\n- Serving requests synchronously\n- Emitting events asynchronously\n- Grow as you go, with:\n- Mocking app services\n- Running service meshes\n- Late-cut Micro Services\n- As well as managed data, input validations, and authorization\n",
-      "line": 1,
-      "selection": {
-        "start": {
-          "line": 1,
-          "character": 1
-        },
-        "end": {
-          "line": 39,
-          "character": 1
-        }
-      },
-      "title": "Reviews"
-    },
-    {
-      "file": "fiori/app/index.cds",
-      "description": "### Annotations for SAP Fiori Elements\n\nA [composite app, reusing and combining](https://cap.cloud.sap/docs/guides/verticalize) these packages:\n  - [@capire/bookshop](bookshop)\n  - [@capire/reviews](reviews)\n  - [@capire/orders](orders)\n  - [@capire/common](common)\n\n[Adds a SAP Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/) to bookshop, thereby introducing to:\n  - [OData Annotations](https://cap.cloud.sap/docs/guides/fiori#adding-odata-annotations) in `.cds` files\n  - Support for [Fiori Draft](https://cap.cloud.sap/docs/guides/fiori#draft)\n  - Support for [Value Helps](https://cap.cloud.sap/docs/guides/fiori#value-help)\n  - Serving SAP Fiori apps locally\n\n[The Vue.js app](bookshop/app/vue) imported from bookshop is served as well.\n",
-      "line": 1,
-      "selection": {
-        "start": {
-          "line": 1,
-          "character": 1
-        },
-        "end": {
-          "line": 13,
-          "character": 1
-        }
-      },
-      "title": "Fiori"
-    },
-    {
-      "file": "package.json",
-      "description": "### All-in-one Monorepo\n\nEach sample sub directory essentially is a standard npm package, some with standard npm dependencies to other samples. The root folder's [package.json](package.json) has local links to the sub folders, such that an `npm install` populates a local `node_modules` folder acts like a local npm registry to the individual sample packages.\n",
-      "line": 8,
-      "selection": {
-        "start": {
-          "line": 8,
-          "character": 1
-        },
-        "end": {
-          "line": 15,
-          "character": 1
-        }
-      },
-      "title": "Packages"
-    }
-  ],
-  "isPrimary": true,
-  "description": "Overview of CAP Samples for Node.js"
-}

.vscode/extensions.json

@@ -4,15 +4,14 @@
 
 	// List of extensions which should be recommended for users of this workspace.
 	"recommendations": [
-		"sapse.vscode-cds",
+		"SAPSE.vscode-cds",
 		"dbaeumer.vscode-eslint",
 		"esbenp.prettier-vscode",
 		"mechatroner.rainbow-csv",
 		"humao.rest-client",
 		"alexcvzz.vscode-sqlite",
 		"hbenl.vscode-mocha-test-adapter",
-		"sdras.night-owl",
+		"sdras.night-owl"
-		"vsls-contrib.codetour"
 	],
 	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
 	"unwantedRecommendations": [

README.md

@@ -3,22 +3,18 @@
 Find here a collection of samples for the [SAP Cloud Application Programming Model](https://cap.cloud.sap) organized in a simplistic [monorepo setup](samples.md#all-in-one-monorepo). → See [**Overview** of contained samples](samples.md)
 
 ![](https://github.com/SAP-samples/cloud-cap-samples/workflows/CI/badge.svg)
-<!--[![REUSE status](https://api.reuse.software/badge/github.com/SAP-samples/cloud-cap-samples)](https://api.reuse.software/info/github.com/SAP-samples/cloud-cap-samples)-->
+[![REUSE status](https://api.reuse.software/badge/github.com/SAP-samples/cloud-cap-samples)](https://api.reuse.software/info/github.com/SAP-samples/cloud-cap-samples)
-
 
 ### Preliminaries
 
-1. Install [**@sap/cds-dk**](https://cap.cloud.sap/docs/get-started/) globally:
+1. [Install @sap/cds-dk](https://cap.cloud.sap/docs/get-started/) as documented in [capire](https://cap.cloud.sap)
+2. _Optional:_ [Use Visual Studio Code](https://cap.cloud.sap/docs/get-started/in-vscode)
 
-   ```sh
-   npm i -g @sap/cds-dk
-   ```
-
-2. _Optional:_ [Use Visual Studio Code](https://cap.cloud.sap/docs/get-started/tools#vscode)
 
 ### Download
 
-If you have [Git](https://git-scm.com/downloads) installed, clone this repo as shown below, otherwise [download as ZIP file](archive/master.zip).
+Clone this repo as shown below, if you have [git](https://git-scm.com/downloads) installed,
+otherwise [download as zip file](archive/master.zip).
 
 ```sh
 git clone https://github.com/sap-samples/cloud-cap-samples samples
@@ -43,12 +39,9 @@ cds watch bookshop
 
 After that open this link in your browser: [http://localhost:4004](http://localhost:4004)
 
-When asked to log in, type `alice` as user and leave the password field blank, which is the [default user](https://cap.cloud.sap/docs/node.js/authentication#mocked).
-
 ### Testing
 
 Run the provided tests with [_jest_](http://jestjs.io) or [_mocha_](http://mochajs.org), for example:
-
 ```sh
 npx jest
 ```
@@ -57,7 +50,7 @@ npx jest
 
 ### Serve `npm` 
 
-We've included a simple npm registry mock, which allows you to do an `npm install @capire/<package>` locally. Use it as follows:
+We've simple npm registry mock included which allows you to do an `npm install @capire/<package>` anywhere locally. Use it as follows:
 
 1. Start the @capire registry:
 ```sh
@@ -65,8 +58,7 @@ npm run registry
 ```
 > While running this will have `@capire:registry=http://localhost:4444` set with npmrc. 
 
-2. Install one of the @capire packages wherever you like, for example:
+2. Install one of the @capire packages wherever you like, e.g.:
-
 ```sh
 npm add @capire/common @capire/bookshop
 ```
@@ -80,4 +72,4 @@ In case you have a question, find a bug, or otherwise need support, please use o
 
 ## License
 
-Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, version 2.0 except as noted otherwise in the [LICENSE](LICENSES/Apache-2.0.txt) file.
+Copyright (c) 2020 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, version 2.0 except as noted otherwise in the [LICENSE](LICENSES/Apache-2.0.txt) file.

bookshop/app/vue/index.html

@@ -36,7 +36,7 @@
             <td class="rating-stars">
                 {{ ('★'.repeat(Math.round(book.rating))+'☆☆☆☆☆').slice(0,5) }}
             </td>
-            <td>{{ book.currency && book.currency.symbol }} {{ book.price }}</td>
+            <td>{{ book.currency.symbol }} {{ book.price }}</td>
         </tr>
     </table>
 

bookshop/readme.md

@@ -5,10 +5,10 @@ This stand-alone sample introduces the essential tasks in the development of CAP
 ## Hypothetical Use Cases
 
 1. Build a service that allows to browse _Books_ and _Authors_.
-2. Books have assigned _Genres_, which are organized hierarchically.
+2. Books have assigned _Genres_ which are organized hierarchically.
 3. All users may browse books without login.
 4. All entries are maintained by Administrators.
-5. End users may order books (the actual order mgmt being out of scope).
+5. End users may order books (the actual order mgmt being out of scope)
 
 ## Running the Sample
 
@@ -20,12 +20,12 @@ npm run watch
 
 | Links to capire                                                                                           | Sample files / folders               |
 | --------------------------------------------------------------------------------------------------------- | ------------------------------------ |
-| [Project Setup & Layouts](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)    | [`./`](./)                           |
+| [Project Setup and Layouts](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)  | [`./`](./)                           |
-| [Domain Modeling with CDS](https://cap.cloud.sap/docs/guides/domain-models)                               | [`./db/schema.cds`](./db/schema.cds) |
+| [Defining Domain Models](https://cap.cloud.sap/docs/guides/domain-models)                                 | [`./db/schema.cds`](./db/schema.cds) |
-| [Defining Services](https://cap.cloud.sap/docs/guides/services#defining-services)                         | [`./srv/*.cds`](./srv)               |
+| [Defining Services](https://cap.cloud.sap/docs/guides/providing-services)                                 | [`./srv/*.cds`](./srv)               |
-| [Single-purposed Services](https://cap.cloud.sap/docs/guides/services#single-purposed-services)           | [`./srv/*.cds`](./srv)               |
+| [Single-purposed Services](https://cap.cloud.sap/docs/guides/providing-services#single-purposed-services) | [`./srv/*.cds`](./srv)               |
-| [Providing & Consuming Providers](https://cap.cloud.sap/docs/guides/providing-services)                   | http://localhost:4004                |
+| [Generic Providers](https://cap.cloud.sap/docs/guides/providing-services)                                  | http://localhost:4004                |
-| [Using Databases](https://cap.cloud.sap/docs/guides/databases)                                            | [`./db/data/*.csv`](./db/data)       |
+| Using Databases                                            | [`./db/data/*.csv`](./db/data)       |
 | [Adding Custom Logic](https://cap.cloud.sap/docs/guides/service-impl)                                     | [`./srv/*.js`](./srv)                |
 | Adding Tests                                                 | [`./test`](./test)                   |
-| [Sharing for Reuse](https://cap.cloud.sap/docs/guides/reuse-and-compose)                                  | [`./index.cds`](./index.cds)         |
+| [Sharing for Reuse](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)          | [`./index.cds`](./index.cds)         |

bookshop/srv/admin-service.js

@@ -7,6 +7,6 @@ module.exports = cds.service.impl (function(){
 
 /** Generate primary keys for target entity in request */
 async function genid (req) {
-  const {ID} = await cds.tx(req).run (SELECT.one.from(req.target).columns('max(ID) as ID'))
+  const {ID} = await SELECT.one.from(req.target).columns('max(ID) as ID')
   req.data.ID = ID - ID % 100 + 100 + 1
 }

bookshop/srv/cat-service.js

@@ -1,25 +1,30 @@
 const cds = require('@sap/cds')
-const { Books } = cds.entities ('sap.capire.bookshop')
 
 class CatalogService extends cds.ApplicationService { init(){
 
+  // Reflect entities from model
+  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, tx = cds.tx(req)
+    const {book,amount} = req.data
-    let {stock} = await tx.read('stock').from(Books,book)
+    // Read stock from database
+    let {stock} = await SELECT.from (Books, book, b => b.stock)
     if (stock >= amount) {
-      await tx.update (Books,book).with ({ stock: stock -= amount })
+      // Reduce stock by ordered amount
+      await UPDATE (Books,book) .with ({ stock: stock -= amount })
+      // Emit event to inform others
       await this.emit ('OrderedBook', { book, amount, buyer:req.user.id })
-      return { stock }
+      // Return reduced stock to caller
+      return req.reply ({ stock })
     }
+    // Return error about insufficient stock
     else return req.error (409,`${amount} exceeds stock for book #${book}`)
   })
 
   // Add some discount for overstocked books
   this.after ('READ','Books', each => {
-    if (each.stock > 111) {
+    if (each.stock > 111) each.title += ` -- 11% discount!`
-      each.title += ` -- 11% discount!`
-    }
   })
 
   return super.init()

common/package.json

@@ -3,6 +3,6 @@
   "description": "Provides a pre-built extension package for std @sap/cds/common",
   "version": "1.0.0",
   "dependencies": {
-    "@sap/cds": "*"
+    "@sap/cds": "latest"
   }
 }

fiori/app/admin-fiori.html

@@ -13,7 +13,7 @@
 			applications: {
 				"browse-books": {
 					title: "Browse Books",
-					description: "w/ SAP Fiori Elements",
+					description: "... testing FE v42",
 					additionalInformation: "SAPUI5.Component=bookshop",
 					applicationType : "URL",
 					url: "/browse/webapp",
@@ -21,7 +21,7 @@
 				},
 				"manage-books": {
 					title: "Manage Books",
-					description: "w/ SAP Fiori Elements",
+					description: "... testing FE v42",
 					additionalInformation: "SAPUI5.Component=admin",
 					applicationType : "URL",
 					url: "/admin/webapp",
@@ -29,7 +29,7 @@
 				},
 				"manage-orders": {
 					title: "Manage Orders",
-					description: "w/ SAP Fiori Elements",
+					description: "... testing FE v42",
 					additionalInformation: "SAPUI5.Component=orders",
 					applicationType : "URL",
 					url: "/orders/webapp",
@@ -40,7 +40,8 @@
 	</script>
 
 	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
+	<!-- <script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js" -->
+	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.78.6/resources/sap-ui-core.js"
     	data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
     	data-sap-ui-compatVersion="edge"
     	data-sap-ui-theme="sap_fiori_3"

fiori/app/bookshop.html

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

fiori/app/reviews.html

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

fiori/server.js

@@ -1,18 +1,19 @@
+const express = require ('express')
 const cds = require ('@sap/cds')
 
 cds.once('bootstrap',(app)=>{
-  app.use ('/orders/webapp', _from('@capire/orders/app/orders/webapp/manifest.json'))
+  const {dirname} = require ('path')
-  app.use ('/bookshop', _from('@capire/bookshop/app/vue/index.html'))
+  // serving the orders app imported from @capire/orders
-  app.use ('/reviews', _from('@capire/reviews/app/vue/index.html'))
+  const orders_app = dirname (require.resolve('@capire/orders/app/orders/webapp/manifest.json'))
+  app.use ('/orders/webapp', express.static(orders_app))
+  // serving the vue.js app imported from @capire/bookshop
+  const bookshop_app = dirname (require.resolve('@capire/bookshop/app/vue/index.html'))
+  app.use ('/vue/bookshop', express.static(bookshop_app))
+  // serving the vue.js app imported from @capire/reviews
+  const reviews_app = dirname (require.resolve('@capire/reviews/app/vue/index.html'))
+  app.use ('/vue/reviews', express.static(reviews_app))
 })
 
 cds.once('served', require('./srv/mashup'))
 
 module.exports = cds.server
-
-
-// -----------------------------------------------------------------------
-// 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)))

fiori/srv/mashup.js

@@ -5,13 +5,17 @@
 module.exports = async()=>{ // called by server.js
 
   const cds = require('@sap/cds')
+
+  // Connect to services to mashup
   const CatalogService = await cds.connect.to ('CatalogService')
   const ReviewsService = await cds.connect.to ('ReviewsService')
   const OrdersService = await cds.connect.to ('OrdersService')
   const db = await cds.connect.to ('db')
 
-  // reflect entity definitions used below...
+  // Reflect entity definitions used below...
   const { Books } = db.entities ('sap.capire.bookshop')
+  const { Orders } = OrdersService.entities
+  const { Reviews } = ReviewsService.entities
 
   //
   // Delegate requests to read reviews to the ReviewsService
@@ -20,7 +24,7 @@ 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 SELECT.from (Reviews,columns).limit(limit).where({subject:String(id)})
   }))
 
   //
@@ -28,8 +32,9 @@ module.exports = async()=>{ // called by server.js
   //
   CatalogService.on ('OrderedBook', async (msg) => {
     const { book, amount, buyer } = msg.data
-    const { title, price } = await db.tx(msg).read (Books, book, b => { b.title, b.price })
+    const { title, price } = await SELECT.from (Books, book, b => { b.title, b.price })
-    return OrdersService.tx(msg).create ('Orders').entries({
+    // FIXME: Fails due to Draft glitches when OrdersService is remote
+    return INSERT.into (Orders).entries({
       OrderNo: 'Order at '+ (new Date).toLocaleString(),
       Items: [{ product:{ID:`${book}`}, title, price, amount }],
       buyer, createdBy: buyer
@@ -42,12 +47,11 @@ module.exports = async()=>{ // called by server.js
   ReviewsService.on ('reviewed', (msg) => {
     console.debug ('> received:', msg.event, msg.data)
     const { subject, rating } = msg.data
-    return UPDATE(Books,subject).with({rating})
+    return UPDATE (Books,subject) .with ({rating})
-    // ^ Note: the framework will execute this and take care for db.tx
   })
 
   //
-  // Reduce stock of ordered books for orders are created from Orders admin UI
+  // Reduce stock of ordered books when orders are modified in admin UI
   //
   OrdersService.on ('OrderChanged', (msg) => {
     console.debug ('> received:', msg.event, msg.data)
@@ -56,4 +60,5 @@ module.exports = async()=>{ // called by server.js
     .and ('stock >=', deltaAmount)
     .set ('stock -=', deltaAmount)
   })
+
 }

fiori/test/build/build-task.js

@@ -1,14 +0,0 @@
-const cds = require ('./sap-cds')
-
-module.exports = class extends cds.build.Task {
-
-  async build ({src='*'}) {
-    this.log (`Generating edmx output for '${src}'...`)
-    const csn = await this.model(src)
-    return Promise.all (csn.services.map (({name:service}) => {
-      const edmx = cds.compile(csn).to.edmx({service})
-      return this.write(edmx).to(`{srv}/src/main/resources/${service}.edmx`)
-    }))
-  }
-
-}

fiori/test/build/sap-cds.js

@@ -1,51 +0,0 @@
-const cds = require ('@sap/cds/lib')
-const path = require('path')
-const cwd = process.cwd()
-
-const _resolve = (root,file) => path.resolve (cwd, root, file.replace(/{(app|db|srv)}\/?/g, (_,folder) => cds.env.folders[folder]))
-const _local = (file) => path.relative (cwd,file)
-
-
-class BuildTask {
-
-  async build (options) {}
-  async clean (options) {}
-
-  async model(src='*') {
-    return cds.linked (await cds.load(src))
-  }
-
-  log(...args) { return console.log(...args) }
-  warn(...args) { return console.warn(...args) }
-  error(...args) { return console.error(...args) }
-
-  write(x) {
-    if (typeof x === 'object') x = JSON.stringify(x,null,'  ')
-    return { to: async (dst)=>{
-      const file = _resolve (this.options.dest, dst)
-      await cds.utils.mkdirp (path.dirname (file))
-      await cds.utils.promises.writeFile (file,x)
-      console.log ('> wrote:', _local(file))
-      return file
-    }}
-  }
-
-  copy(x) {
-    return { to: async (dst) => {} }
-  }
-
-}
-
-
-module.exports = Object.assign (cds, {
-  build: {
-    run (tasks, _options) {
-      const options = { dest:'gen', ..._options }
-      return Promise.all(tasks.map (async each => {
-        const task = Object.assign (new each, {options})
-        await task.build (options)
-      }))
-    },
-    Task: BuildTask
-  }
-})

fiori/test/build/test.js

@@ -1,5 +0,0 @@
-const cds = require ('./sap-cds')
-const task = require('./build-task')
-
-cds.build.run ([task], {src:process.argv[2]})
-.catch(console.error)

orders/db/schema.cds

@@ -18,6 +18,9 @@ entity Orders_Items {
 }
 
 /** This is a stand-in for arbitrary ordered Products */
-entity Products @(cds.persistence.skip:'always') {
+entity Products @(cds.persistence.skip:'always',cds.autoexpose) {
   key ID : String;
 }
+
+// Activate extension package
+using from '@capire/common';

orders/package.json

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

orders/srv/orders-service.js

@@ -8,18 +8,14 @@ class OrdersService extends cds.ApplicationService {
     this.before ('UPDATE', 'Orders', async function(req) {
       const { ID, Items } = req.data
       if (Items) for (let { product_ID, amount } of Items) {
-        const { amount:before } = await cds.tx(req).run (
+        const { amount:before } = await SELECT.one.from (OrderItems, oi => oi.amount) .where ({up__ID:ID, product_ID})
-          SELECT.one.from (OrderItems, oi => oi.amount) .where ({up__ID:ID, product_ID})
-        )
         if (amount != before) await this.orderChanged (product_ID, amount-before)
       }
     })
 
     this.before ('DELETE', 'Orders', async function(req) {
       const { ID } = req.data
-      const Items = await cds.tx(req).run (
+      const Items = await SELECT.from (OrderItems, oi => { oi.product_ID, oi.amount }) .where ({up__ID:ID})
-        SELECT.from (OrderItems, oi => { oi.product_ID, oi.amount }) .where ({up__ID:ID})
-      )
       if (Items) await Promise.all (Items.map(it => this.orderChanged (it.product_ID, -it.amount)))
     })
 

package.json

@@ -17,10 +17,10 @@
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "chai-subset": "^1.6.0",
-    "sqlite3": "5.0.0"
+    "sqlite3": "^5"
   },
   "scripts": {
-    "registry": "node .registry/server.js",
+    "registry": "cd .registry && node server.js",
     "bookshop": "cds watch bookshop",
     "fiori": "cds watch fiori",
     "media": "cds watch media",
@@ -31,6 +31,9 @@
   "mocha": {
     "parallel": true
   },
+  "engines": {
+    "node": ">= 12.18"
+  },
   "jest": {
     "testEnvironment": "node"
   },

reviews/srv/reviews-service.js

@@ -12,9 +12,7 @@ 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 {rating} = await SELECT.one (['round(avg(rating),2) as rating']) .from (Reviews) .where ({subject})
-      SELECT.one (['round(avg(rating),2) as rating']) .from (Reviews) .where ({subject})
-    )
     global.it || console.log ('< emitting:', 'reviewed', { subject, rating })
     await this.emit ('reviewed', { subject, rating })
   })
@@ -23,8 +21,7 @@ module.exports = cds.service.impl (function(){
   this.on ('like', (req) => {
     if (!req.user)  return req.reject(400, 'You must be identified to like a review')
     const {review} = req.data, {user} = req
-    const tx = cds.tx(req)
+    return cds.run ([
-    return tx.run ([
       INSERT.into (Likes) .entries ({review_ID: review, user: user.id}),
       UPDATE (Reviews) .set({liked: {'+=': 1}}) .where({ID:review})
     ]).catch(() => req.reject(400, 'You already liked that review'))
@@ -34,9 +31,8 @@ module.exports = cds.service.impl (function(){
   this.on ('unlike', async (req) => {
     if (!req.user)  return req.reject(400, 'You must be identified to remove a former like of yours')
     const {review} = req.data, {user} = req
-    const tx = cds.tx(req)
+    const affectedRows = await DELETE.from (Likes) .where ({review_ID: review,user: user.id})
-    const affectedRows = await tx.run (DELETE.from (Likes) .where ({review_ID: review,user: user.id}))
+    if (affectedRows === 1)  return UPDATE (Reviews) .set ({liked: {'-=': 1}}) .where ({ID:review})
-    if (affectedRows === 1)  return tx.run (UPDATE (Reviews) .set ({liked: {'-=': 1}}) .where ({ID:review}))
   })
 
 })

samples.md

@@ -1,7 +1,7 @@
 # Overview of Samples
 
-The following list gives an overview of the samples provided in subdirectories.
+The list below gives an overview of the samples provided in subdirectories.
-Each sub directory essentially is an individual npm package arranged in an [all-in-one monorepo](all-in-one-monorepo) umbrella setup.
+Each sub directory essentially is a individual npm package arranged in an [all-in-one monorepo](all-in-one-monorepo) umbrella setup.
 
 
 ## [@capire/hello-world](hello)
@@ -13,7 +13,7 @@ Each sub directory essentially is an individual npm package arranged in an [all-
 
 - [Getting Started](https://cap.cloud.sap/docs/get-started/in-a-nutshell) with CAP, briefly introducing:
 - [Project Setup](https://cap.cloud.sap/docs/get-started/) and [Layouts](https://cap.cloud.sap/docs/get-started/projects)
-- [Domain Modeling](https://cap.cloud.sap/docs/guides/domain-models)
+- [Domain Modelling](https://cap.cloud.sap/docs/guides/domain-models)
 - [Defining Services](https://cap.cloud.sap/docs/guides/providing-services)
 - [Generic Providers](https://cap.cloud.sap/docs/guides/generic-providers)
 - [Adding Custom Logic](https://cap.cloud.sap/docs/guides/service-impl)
@@ -22,7 +22,7 @@ Each sub directory essentially is an individual npm package arranged in an [all-
 
 ## [@capire/common](common)
 
-- Showcases how to extend [@sap/cds/common](https://cap.cloud.sap/docs/cds/common) thereby covering:
+- Showcases how to extend [@sap/cds/common](https://cap.cloud.sap/docs/cds/common) thereby covering...
 - Building [extension packages](https://cap.cloud.sap/docs/guides/domain-models#aspects-extensibility)
 - Providing [reuse packages](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)
 - [Verticalization](https://cap.cloud.sap/docs/cds/common#adapting-to-your-needs)
@@ -32,22 +32,22 @@ Each sub directory essentially is an individual npm package arranged in an [all-
 
 ## [@capire/orders](orders)
 
-- A standalone orders management service, demonstrating:
+- A standalone orders mgmt service, demonstrating...
 - Using [Compositions](https://cap.cloud.sap/docs/cds/cdl#compositions) in [Domain Models](https://cap.cloud.sap/docs/guides/domain-models), along with
 - [Serving deeply nested documents](https://cap.cloud.sap/docs/guides/generic-providers#serving-structured-data)
 
 
 ## [@capire/reviews](reviews)
 
-- Shows how to implement a modular service to manage product reviews, including:
+- Shows how to implement a modular service to manage product reviews, including...
 - Consuming other services synchronously and asynchronously
 - Serving requests synchronously
 - Emitting events asynchronously
-- Grow as you go, with:
+- Grow as you go, with...
 - Mocking app services
 - Running service meshes
 - Late-cut Micro Services
-- As well as managed data, input validations, and authorization
+- As well as managed data, input validations and authorization
 
 
 ## [@capire/fiori](fiori)
@@ -57,11 +57,11 @@ Each sub directory essentially is an individual npm package arranged in an [all-
   - [@capire/reviews](reviews)
   - [@capire/orders](orders)
   - [@capire/common](common)
-- [Adds a SAP Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/) to bookshop, thereby introducing to:
+- [Adds a Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/) to bookshop, thereby introducing to...
   - [OData Annotations](https://cap.cloud.sap/docs/guides/fiori#adding-odata-annotations) in `.cds` files
   - Support for [Fiori Draft](https://cap.cloud.sap/docs/guides/fiori#draft)
   - Support for [Value Helps](https://cap.cloud.sap/docs/guides/fiori#value-help)
-  - Serving SAP Fiori apps locally
+  - Serving Fiori apps locally
 - [The Vue.js app](bookshop/app/vue) imported from bookshop is served as well
 
 

test/cds.ql.test.js

@@ -325,26 +325,7 @@ describe('cds.ql → cqn', () => {
       })
 
       // using CQL fragments -> uses cds.parse.expr
-      const is_v2 = !!cds.parse.expr('(1,2)').list
+      expect((cqn = CQL`SELECT from Foo where ID=11 and x in ( foo, 'bar', 3)`)).to.eql({
-      if (is_v2) expect((cqn = CQL`SELECT from Foo where ID=11 and x in ( foo, 'bar', 3)`)).to.eql({
-        SELECT: {
-          from: { ref: ['Foo'] },
-          where: [
-            { ref: ['ID'] },
-            '=',
-            { val: ID },
-            'and',
-            { ref: ['x'] },
-            'in',
-            {list:[
-              { ref: ['foo'] },
-              { val: 'bar' },
-              { val: 3 },
-            ]}
-          ],
-        },
-      })
-      else expect((cqn = CQL`SELECT from Foo where ID=11 and x in ( foo, 'bar', 3)`)).to.eql({
         SELECT: {
           from: { ref: ['Foo'] },
           where: [

test/messaging.test.js

@@ -42,16 +42,16 @@ describe('Messaging', ()=>{
         //     { ID: 111 + (++N),  subject: "201", title: "Captivating", rating: N },
         // ),
         srv.create ('Reviews') .entries (
-            { ID: String(111 + (++N)),  subject: "201", title: "Captivating", rating: N }
+            { ID: 111 + (++N),  subject: "201", title: "Captivating", rating: N }
         ),
         srv.create ('Reviews') .entries (
-            { ID: String(111 + (++N)),  subject: "201", title: "Captivating", rating: N }
+            { ID: 111 + (++N),  subject: "201", title: "Captivating", rating: N }
         ),
         srv.create ('Reviews') .entries (
-            { ID: String(111 + (++N)),  subject: "201", title: "Captivating", rating: N }
+            { ID: 111 + (++N),  subject: "201", title: "Captivating", rating: N }
         ),
         srv.create ('Reviews') .entries (
-            { ID: String(111 + (++N)),  subject: "201", title: "Captivating", rating: N }
+            { ID: 111 + (++N),  subject: "201", title: "Captivating", rating: N }
         ),
     ]))