Patch for missing containment in v4

README.md

@@ -5,20 +5,16 @@ Find here a collection of samples for the [SAP Cloud Application Programming Mod
 ![](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)
 
-
 ### 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/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)    | [`./`](./)                           |
-| [Domain Modeling with CDS](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)               |
-| [Single-purposed Services](https://cap.cloud.sap/docs/guides/services#single-purposed-services)           | [`./srv/*.cds`](./srv)               |
-| [Providing & Consuming Providers](https://cap.cloud.sap/docs/guides/providing-services)                   | http://localhost:4004                |
-| [Using Databases](https://cap.cloud.sap/docs/guides/databases)                                            | [`./db/data/*.csv`](./db/data)       |
+| [Project Setup and Layouts](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)  | [`./`](./)                           |
+| [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/providing-services)                                 | [`./srv/*.cds`](./srv)               |
+| [Single-purposed Services](https://cap.cloud.sap/docs/guides/providing-services#single-purposed-services) | [`./srv/*.cds`](./srv)               |
+| [Generic Providers](https://cap.cloud.sap/docs/guides/providing-services)                                  | http://localhost:4004                |
+| 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)         |
+| Adding Tests                                                 | [`./test`](./test)                   |
+| [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)
-    let {stock} = await tx.read('stock').from(Books,book)
+    const {book,amount} = req.data
+    // 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) {
-      each.title += ` -- 11% discount!`
-    }
+    if (each.stock > 111) each.title += ` -- 11% discount!`
   })
 
   return super.init()

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/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 })
-    return OrdersService.tx(msg).create ('Orders').entries({
+    const { title, price } = await SELECT.from (Books, book, b => { b.title, b.price })
+    // 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})
-    // ^ Note: the framework will execute this and take care for db.tx
+    return UPDATE (Books,subject) .with ({rating})
   })
 
   //
-  // 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)
   })
+
 }

odata/.npmrc

@@ -1 +0,0 @@
-@sap:registry=http://nexus.wdf.sap.corp:8081/nexus/repository/build.milestones.npm/

odata/.vscode/extensions.json

@@ -1,15 +0,0 @@
-{
-	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
-	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-
-	// List of extensions which should be recommended for users of this workspace.
-	"recommendations": [
-		"SirTobi.pegjs-language",
-		"tamuratak.vscode-pegjs",
-		"joeandaverde.vscode-pegjs-live"
-	],
-	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
-	"unwantedRecommendations": [
-
-	]
-}

odata/lib/index.js

@@ -1,26 +0,0 @@
-const fs = require("fs");
-const path = require("path");
-const peg = require("pegjs");
-const pegGrammarPath = path.join(__dirname, "/odata2cqn.pegjs");
-const odataPegGrammar = fs.readFileSync(pegGrammarPath, {
-  encoding: "utf8",
-  flag: "r",
-});
-const parser = peg.generate(odataPegGrammar);
-
-
-module.exports = {
-  parse: {
-    url: parser.parse,
-  },
-  to: {
-    cqn: parser.parse,
-    url: (cqn) => pending(cqn)
-  },
-  serialize: (data) => pending(data),
-  deserialize: (body) => pending(body),
-}
-
-const pending = ()=>{
-  throw new Error ('Not yet implemented')
-}

odata/lib/odata2cqn.pegjs

@@ -1,200 +0,0 @@
-/** ------------------------------------------
- * This is a peg.js adaptation of the https://github.com/oasis-tcs/odata-abnf/blob/master/abnf/odata-abnf-construction-rules.txt
- * which directly constructs CQN out of parsed sources.
- *
- * NOTE:
- * In contrast to the OData ABNF source, which uses very detailedsemantic rules,
- * this adaptation uses rather generic syntactic rules only, e.g. not distinguishing
- * betwenn Collection Navigation or not knowing individual function names.
- * This is to be open to future enhancements of the OData standard, as well as
- * to improve error messages. For example a typo in a function name could be
- * reported specifically instead of throwing a generic parser error.
- *
- * See also: https://docs.microsoft.com/en-us/odata/concepts/queryoptions-overview
- * Future test cases http://docs.oasis-open.org/odata/odata/v4.0/errata03/os/complete/abnf/odata-abnf-testcases.xml
- *
- * Limitations: Type, Geo functions are not supported,
- * maxdatetime, mindatetime, fractionalseconds,
- * totaloffsetminutes, date, totalseconds,
- * floor, ceiling also are not supported by CAP
- *
- * Examples:
- * Books
- * Books/201
- * Books?$select=ID,title&$expand=author($select=name)&$filter=stock gt 1&$orderby=title
- */
-
-// ---------- JavaScript Helpers -------------
-	{
-		const stack=[]
-		let SELECT
-	}
-
-// ---------- Entity Paths ---------------
-
-	ODataRelativeURI // Note: case-sensitive!
-		= (p:path { SELECT = { from:p } })
-		( o"?"o QueryOption ( o'&'o QueryOption )* )? {
-			if (SELECT.expand) {
-				SELECT.columns = SELECT.expand
-				delete SELECT.expand
-			}
-			return { SELECT }
-		}
-
-	path
-		= crv:$("$count"/"$ref"/"$value") {return {ref:[crv]}}
-		/ head:identifier filter:(OPEN args CLOSE)? tail:( '/' p:path {return p} )? {
-			const ref = [ filter ? { id:head, where:filter[1] } : head ]
-			if (tail) ref.push (...tail.ref)
-			return {ref}
-		}
-
-	args
-		= val:( number / integer / string ) {return [{val}]}
-		/ ref:identifier o"="o val:( number / integer / string ) more:( COMMA args )? {
-			const args = [ {ref}, '=', {val} ]
-			if (more) args.push ('and', ...more[1])
-			return args
-		}
-
-	ref "a reference"
-		= head:identifier tail:( '/' identifier )* {
-			return { ref:[ head, ...tail ] }
-		}
-
- //
-// ---------- Query Options ------------
-
-	QueryOption = ExpandOption
-	ExpandOption =
-		"$select="  		o select ( COMMA select )* /
-		"$expand="  		o expand ( COMMA expand )* /
-		"$filter="  		o filter /
-		"$orderby=" 		o orderby /
-		"$top="     		o top /
-		"$skip="    		o skip /
-		"$search=" 			o search /
-		"$count=" 			o count
-
-	select
-		= col:ref {
-			(SELECT.expand || (SELECT.expand = [])).push(col)
-			return col
-		}
-
-	expand =
-		( c:select {c.expand='*'} )
-		( // --- nested query options, if any
-			(OPEN {
-				stack.push (SELECT)
-				SELECT = SELECT.expand[SELECT.expand.length-1]
-				SELECT.expand = []
-			})
-			ExpandOption ( o";"o ExpandOption )*
-			(CLOSE {
-				SELECT = stack.pop()
-			})
-		)? // --- end of nested query options
-		( COMMA expand )?
-
-	top
-		= val:integer {
-			(SELECT.limit || (SELECT.limit={})).rows = {val}
-		}
-
-	skip
-		= val:integer {
-			(SELECT.limit || (SELECT.limit={})).offset = {val}
-		}
-
-	search
-		= p:search_clause {SELECT.search = p}
-		search_clause = p:( n:NOT? {return n?[n]:[]} )(
-			OPEN xpr:search_clause CLOSE {p.push({xpr})}
-			/ val:(identifier/string) {p.push({val})}
-		)( ao:(AND/OR) more:search_clause {p.push(ao,...more)} )*
-		{return p}
-
-	filter
-		= p:where_clause {SELECT.where = p}
-		where_clause = p:( n:NOT? {return n?[n]:[]} )(
-			OPEN xpr:where_clause CLOSE {p.push({xpr})}
-			/ comp:comparison {p.push(...comp)}
-			/ func:boolish {p.push(func)}
-		)( ao:(AND/OR) more:where_clause {p.push(ao,...more)} )*
-		{return p}
-
-	orderby
-		= ref:ref sort:( _ s:$("asc"/"desc") {return s})? {
-			SELECT.orderby = $(ref, sort && {sort})
-		}
-
-	count
-		= c:$[^,?&()]+ { SELECT.count = true }
-
- //
-// ---------- Expressions ------------
-
-
-	comparison "a comparison"
-		= a:operand _ o:$("eq"/"ne"/"lt"/"gt"/"le"/"ge") _ b:operand {
-			const op = { eq:'=', ne:'!=', lt:'<', gt:'>', le:'<=', ge:'>=' }[o]||o
-			return [ a, op, b ]
-		}
-
-	operand "an operand"
-		= val:number {return Number.isSafeInteger(val) ? {val} : { val:String(val), literal:'number' }}
-		/ val:string {return {val}}
-		/ function
-		/ ref
-
-	function "a function call"
-		= func:$[a-z]+ OPEN a:operand more:( COMMA o:operand {return o} )* CLOSE
-		{ return { func, args:[a,...more] }}
-
-	boolish "a boolean function"
-		= func:("contains"/"endswith"/"startswith") OPEN a:operand COMMA b:operand CLOSE
-		{ return { func, args:[a,b] }}
-
-	NOT = o "not"i _ {return 'not'}
-	AND = _ "and"i _ {return 'and'}
-	OR  = _  "or"i _ {return 'or'}
-
-
- //
-// ---------- Literals -----------
-
-	string "Edm.String"
-		= "'" s:$("''"/[^'])* "'"
-		{return s.replace(/''/g,"'")}
-
-	number
-		= x:$( [+-]? [0-9]+ ("."[0-9]+)? ("e"[0-9]+)? )
-		{return Number(x)}
-
-	integer
-		= x:$( [+-]? [0-9]+ )
-		{return parseInt(x)}
-
-	identifier
-		= $([a-zA-Z][_a-zA-Z0-9]*)
-
-
- //
-// ---------- Punctuation ----------
-
-	COLON = o":"o
-	COMMA = o","o
-	SEMI  = o";"o
-	OPEN  = o"("o
-	CLOSE = o")"
-
- //
-// ---------- Whitespaces -----------
-
-	o "optional whitespaces" = $[ \t\n]*
-	_ "mandatory whitespaces" = $[ \t\n]+
-
- //
-// ------------------------------------

odata/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "@sap/cds-odata",
-  "version": "1.0.0",
-  "dependencies": {
-    "@sap/cds-compiler": "latest",
-    "@sap/cds": "^4.4.10"
-  },
-  "scripts": {
-    "postinstall": "rm -fr node_modules/@sap/cds/node_modules"
-  },
-  "devDependencies": {
-    "pegjs": "^0.10.0"
-  },
-  "private": true
-}

odata/test/odata2cqn.test.js

@@ -1,105 +0,0 @@
-const cds = require("@sap/cds/lib"), {expect} = cds.test
-cds.odata = require("../lib")
-
-describe("$filter", () => {
-
-  describe("comparing expressions", () => {
-
-    const types = {
-      strings: "'some string'",
-      integers: 11,
-      decimals: 0.99,
-      // ...
-    }
-    it.each(Object.keys(types))("should support expressions with %s", (t) => {
-      expect (cds.odata.parse.url(`Foo?$filter=bar eq ${types[t]}`))
-      .to.eql (cds.parse.cql(`SELECT from Foo where bar = ${types[t]}`))
-    })
-
-    const operators = {
-      eq: '=',
-      lt: '<',
-      le: '<=',
-      gt: '>',
-      ge: '>=',
-      ne: '!=',
-      // ...
-    }
-    it.each(Object.keys(operators))("should support comparison operator '%s'", (op) => {
-      expect (cds.odata.parse.url(`Foo?$filter=bar ${op} 11`))
-      .to.eql (cds.parse.cql(`SELECT from Foo where bar ${operators[op]} 11`))
-    })
-
-  });
-
-  describe("logical expressions", () => {
-
-    it.each(['and','or'])("should support '%s'", (t) => {
-      expect (cds.odata.parse.url(`Foo?$filter=bar lt 11 ${t} name eq 'some name'`))
-      .to.eql (cds.parse.cql(`SELECT from Foo where bar < 11 ${t} name = 'some name'`))
-    })
-
-    it("should support 'not'", () => {
-      // REVISIT: We need to check with the Node.js team why they translated that to the equivalent of:
-      // not name like concat('%','sunny','%') escape '^'
-      expect (cds.odata.parse.url(`Foo?$filter= not contains(name,'sunny')`))
-      .to.eql (cds.parse.cql(`SELECT from Foo where not contains(name,'sunny')`))
-    });
-
-    // REVISIT: wait for compiler v2
-    it("should support group expr", () => {
-      expect (cds.odata.parse.url(`Foo?$filter= (unitPrice gt 11 and length(name) eq 12) or name eq 'Restless and Wild'`))
-      .to.eql (cds.parse.cql(`SELECT from Foo where (unitPrice > 11 and length(name) = 12) or name = 'Restless and Wild'`))
-    });
-  });
-
-  describe("function expressions", () => {
-
-    it("should support contains", () => {
-      expect (cds.odata.parse.url(`Foo?$filter= contains(name,'sunny')`))
-      .to.eql (cds.parse.cql(`SELECT from Foo where contains(name,'sunny')`))
-    });
-
-    it("should support startswith", () => {
-      expect (cds.odata.parse.url(`Foo?$filter= startswith(name,'sunny')`))
-      .to.eql (cds.parse.cql(`SELECT from Foo where startswith(name,'sunny')`))
-    });
-
-    it("should support endswith", () => {
-      expect (cds.odata.parse.url(`Foo?$filter= endswith(name,'sunny')`))
-      .to.eql (cds.parse.cql(`SELECT from Foo where endswith(name,'sunny')`))
-    });
-
-    it("should support length", () => {
-      expect (cds.odata.parse.url(`Foo?$filter= length(name) lt 11`))
-      .to.eql (cds.parse.cql(`SELECT from Foo where length(name) < 11`))
-    });
-
-    it("should support indexof", () => {
-      expect (cds.odata.parse.url(`Foo?$filter= indexof(name,'x') eq 11`))
-      .to.eql (cds.parse.cql(`SELECT from Foo where indexof(name,'x') = 11`))
-    });
-
-    it("should support substring", () => {
-      expect (cds.odata.parse.url(`Foo?$filter= substring(name,1) eq 'foo'`))
-      .to.eql (cds.parse.cql(`SELECT from Foo where substring(name,1) = 'foo'`))
-    });
-
-    it.each(['tolower','toupper','trim'])("should support '%s'", (fn) => {
-      expect (cds.odata.parse.url(`Foo?$filter= ${fn}(name) eq 'foo'`))
-      .to.eql (cds.parse.cql(`SELECT from Foo where ${fn}(name) = 'foo'`))
-    });
-
-    it("should support 'day'", () => {
-      expect (cds.odata.parse.url(`Foo?$filter= day(name) eq 11`))
-      .to.eql (cds.parse.cql(`SELECT from Foo where day(name) = 11`))
-    });
-
-    it("should support concat", () => {
-      expect (cds.odata.parse.url(`Foo?$filter= concat(name,'o') eq 'foo'`))
-      .to.eql (cds.parse.cql(`SELECT from Foo where concat(name,'o') = 'foo'`))
-    });
-
-  });
-
-});

orders/db/schema.cds

@@ -18,7 +18,7 @@ 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;
 }
 

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 (
-          SELECT.one.from (OrderItems, oi => oi.amount) .where ({up__ID:ID, product_ID})
-        )
+        const { amount:before } = await 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 (
-        SELECT.from (OrderItems, oi => { oi.product_ID, oi.amount }) .where ({up__ID:ID})
-      )
+      const Items = await 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

@@ -14,7 +14,6 @@
     "@capire/reviews": "./reviews"
   },
   "devDependencies": {
-    "pegjs": "^0.10.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "chai-subset": "^1.6.0",
@@ -32,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 (
-      SELECT.one (['round(avg(rating),2) as rating']) .from (Reviews) .where ({subject})
-    )
+    const {rating} = await 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 tx.run ([
+    return cds.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 tx.run (DELETE.from (Likes) .where ({review_ID: review,user: user.id}))
-    if (affectedRows === 1)  return tx.run (UPDATE (Reviews) .set ({liked: {'-=': 1}}) .where ({ID:review}))
+    const affectedRows = await DELETE.from (Likes) .where ({review_ID: review,user: user.id})
+    if (affectedRows === 1)  return 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.
-Each sub directory essentially is an individual npm package arranged in an [all-in-one monorepo](all-in-one-monorepo) umbrella setup.
+The list below gives an overview of the samples provided in subdirectories.
+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
-      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({
+      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 }
         ),
     ]))