Merge branch 'main' into mocha

Bumps [semver](https://github.com/npm/node-semver) from 7.3.7 to 7.3.8.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v7.3.7...v7.3.8)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.eslintrc

@@ -1,15 +1,15 @@
 {
-    "extends": "eslint:recommended",
+    "extends": [
+        "eslint:recommended",
+        "plugin:@sap/cds/recommended"
+    ],
     "env": {
         "browser": true,
+        "es2022": true,
         "node": true,
-        "es6": true,
         "jest": true,
         "mocha": true
     },
-    "parserOptions": {
-        "ecmaVersion": 2020
-    },
     "globals": {
         "SELECT": true,
         "INSERT": true,

.github/workflows/node.js.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x, 14.x, 12.x]
+        node-version: [16.x, 14.x]
 
     steps:
     - uses: actions/checkout@v2
@@ -24,5 +24,7 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
+    - run: npm i -g npm@8
     - run: npm ci
-    - run: npm test
+    - run: npm run test
+    - run: npm run test:mocha

.gitignore

@@ -12,8 +12,11 @@ target/
 *.mtar
 connection.properties
 default-env.json
+.cdsrc-private.json
 packages/messageBox
 reviews/msg-box
 reviews/db/test.db
 
 *.openapi3.json
+*.sqlite
+*.db

.tours/samples.tour

@@ -104,7 +104,7 @@
     },
     {
       "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",
+      "description": "### Annotations for SAP Fiori Elements\n\nAdds an SAP Fiori elements application to bookstore, thereby introducing:\n- OData Annotations in `.cds` files\n- Support for Fiori Draft\n- Support for Value Helps\n- Serving SAP Fiori apps locally\n\nSee the [Serving Fiori UIs](https://cap.cloud.sap/docs/advanced/fiori) documentation for more information.",
       "line": 1,
       "selection": {
         "start": {

.vscode/settings.json

@@ -14,5 +14,13 @@
       "**/odata-v4/okra/**"
     ]
   },
-  "mochaExplorer.parallel": true
+  "mochaExplorer.parallel": true,
+  "eslint.validate": [
+    "cds",
+    "csn",
+    "csv",
+    "csv (semicolon)",
+    "tsv",
+    "tab"
+  ]
 }

LICENSES/Apache-2.0.txt

@@ -0,0 +1,73 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+     (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+     (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
+
+     (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+
+     (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+
+     You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!)  The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

README.md

@@ -7,13 +7,14 @@ Find here a collection of samples for the [SAP Cloud Application Programming Mod
 
 ### Preliminaries
 
-1. Install [**@sap/cds-dk**](https://cap.cloud.sap/docs/get-started/) globally:
+1. Ensure you have the latest LTS version of Node.js installed (see [Getting Started](https://cap.cloud.sap/docs/get-started/))
+2. Install [**@sap/cds-dk**](https://cap.cloud.sap/docs/get-started/) globally:
 
    ```sh
    npm i -g @sap/cds-dk
    ```
 
-2. _Optional:_ [Use Visual Studio Code](https://cap.cloud.sap/docs/get-started/tools#vscode)
+3. _Optional:_ [Use Visual Studio Code](https://cap.cloud.sap/docs/get-started/tools#vscode)
 
 ### Download
 

bookshop/app/vue/app.js

@@ -10,7 +10,7 @@ const books = Vue.createApp ({
         list: [],
         book: undefined,
         order: { quantity:1, succeeded:'', failed:'' },
-        user: {}
+        user: undefined
       }
     },
 
@@ -42,20 +42,48 @@ const books = Vue.createApp ({
             }
         },
 
-        async fetchUserInfo() {
+        async login() {
             try {
-                const { data } = await axios.get('/user/me')
+                const { data:user } = await axios.post('/user/login',{})
-                books.user = data
+                if (user.id !== 'anonymous') books.user = user
             } catch (err) { books.user = { id: err.message } }
-        }
+        },
-    }
-}).mount("#app")
 
-// initially fill list of books
+        async getUserInfo() {
-books.fetch()
+            try {
+                const { data:user } = await axios.get('/user/me')
+                if (user.id !== 'anonymous') books.user = user
+            } catch (err) { books.user = { id: err.message } }
+        },
+    }
+}).mount('#app')
+
+books.getUserInfo()
+books.fetch() // initially fill list of books
 
-books.fetchUserInfo()
 document.addEventListener('keydown', (event) => {
     // hide user info on request
     if (event.key === 'u')  books.user = undefined
 })
+
+axios.interceptors.request.use(csrfToken)
+function csrfToken (request) {
+    if (request.method === 'head' || request.method === 'get') return request
+    if ('csrfToken' in document) {
+        request.headers['x-csrf-token'] = document.csrfToken
+        return request
+    }
+    return fetchToken().then(token => {
+        document.csrfToken = token
+        request.headers['x-csrf-token'] = document.csrfToken
+        return request
+    }).catch(_ => {
+        document.csrfToken = null // set mark to not try again
+        return request
+    })
+
+    function fetchToken() {
+        return axios.get('/', { headers: { 'x-csrf-token': 'fetch' } })
+        .then(res => res.headers['x-csrf-token'])
+    }
+}

bookshop/app/vue/index.html

@@ -18,11 +18,17 @@
 <body class="small-container", style="margin-top: 70px;">
 <div id='app'>
 
-    <div v-if="user" class="user">
+    <form class="user" @submit.prevent="login">
-        <div>User: {{ user.id || 'anonymous' }}</div>
+        <div v-if="user">
-        <div>Locale: {{ user.locale }}</div>
             <div v-if="user.tenant">Tenant: {{ user.tenant }}</div>
+            <div> User: {{ user.id }}</div>
+            <div>Locale: {{ user.locale }}</div>
         </div>
+        <div v-else>
+            <input type="submit" value="Login" class="muted-button">
+            <!-- <a href="/user/login()">Login</a> -->
+        </div>
+    </form>
 
     <h1> Capire Books </h1>
 

bookshop/db/handlers/sandbox.cds

@@ -1,2 +0,0 @@
-using from '..\..\schema';
-

bookshop/db/schema.cds

@@ -1,14 +1,7 @@
-using {
+using { Currency, managed, sap } from '@sap/cds/common';
-  Currency,
-  managed,
-  sap,
-  extensible
-} from '@sap/cds/common';
-
 namespace sap.capire.bookshop;
 
-@Extensibility.Any.Enabled : true
+entity Books : managed {
-entity Books : managed, extensible {
   key ID : Integer;
   title  : localized String(111);
   descr  : localized String(1111);
@@ -18,39 +11,21 @@ entity Books : managed, extensible {
   price  : Decimal;
   currency : Currency;
   image : LargeBinary @Core.MediaType : 'image/png';
-      authorName : String;
 }
 
-
+entity Authors : managed {
-entity Authors : managed, extensible {
   key ID : Integer;
   name   : String(111);
   dateOfBirth  : Date;
   dateOfDeath  : Date;
   placeOfBirth : String;
   placeOfDeath : String;
-
+  books  : Association to many Books on books.author = $self;
-      books        : Association to many Books
-                       on books.author = $self;
 }
 
-extend Authors with {
+/** Hierarchically organized Code List for Genres */
-  virtual age : Integer;
-  virtual exampleBook: String;
-}
-
-/**
- * Hierarchically organized Code List for Genres
- */
 entity Genres : sap.common.CodeList {
   key ID   : Integer;
   parent   : Association to Genres;
-      children : Composition of many Genres
+  children : Composition of many Genres on children.parent = $self;
-                   on children.parent = $self;
-}
-
-entity Publishers: managed {
-  key ID: Integer;
-  name: String(111);
-
 }

bookshop/handlers/AdminService.Authors.CREATE.js

@@ -1,17 +0,0 @@
-async function run() {
-  //debugger
-  //while (true) {}
-  //process.exit()
-  //1.substring()
-  // let res = await specialselect
-  let res = await SELECT.one`title`.from(`Books`).where(`ID=201`)
-  let { title } = res
-  let Author = req.data
-  //await srv.read('Books')
-  
-  Author.modifiedBy = "Custom Event handler changed this!"
-  Author.placeOfDeath = " --- Somewhere over " + title + " --- create in Sandbox"
-  //await this.emit("createdAuthor", { Author })
-  return Author
-}
-run()

bookshop/handlers/AdminService.Authors.READ.js

@@ -1,41 +0,0 @@
-function getYear(v) {
-  return parseInt(v.substr(0, 4))
-}
-function getMonth(v) {
-  return parseInt(v.substr(5, 2))
-}
-function getDay(v) {
-  return parseInt(v.substr(8, 2))
-}
-
-function getAge(from, to) {
-  if (from === undefined || from == null) return 0
-  if (to === undefined || to == null) to = new Date().toISOString()
-  let year = getYear(to) - getYear(from) - 1
-  if (
-    getMonth(to) > getMonth(from) ||
-    (getMonth(to) === getMonth(from) && getDay(to) >= getDay(from))
-  ) {
-    year++
-  }
-  return year
-}
-
-async function run() {
-  const result_ = Array.isArray(result) ? result : [result]
-  for (const row of result_) {
-    row.age = getAge(row.dateOfBirth, row.dateOfDeath)
-    let res = await SELECT.one`title`.from(`Books`).where({ author_ID: row.ID })
-    if (!res) {
-      res = {}
-    }
-    let { title } = res
-    if (!title) {
-      title = "no Books yet"
-    }
-    row.exampleBook = title
-    //let pub = await SELECT.one`name`.from(`sap_capire_bookshop_Publishers`)
-  }
-}
-
-run()

bookshop/handlers/AdminService.Books.CREATE.js

@@ -1,9 +0,0 @@
-
-async function run() {
-  const {stock, price, author_ID} = req.data
-  if (stock<0) return req.reject('409', 'Stock must not be negative')
-  if (price<0) return req.reject('409', 'Price must not be negative')
-  let {name} = await SELECT.one`name`.from(`Authors`).where({ID: author_ID})
-  req.data.authorName=name
-}
-output = run()

bookshop/handlers/AdminService.Books.READ.js

@@ -1,6 +0,0 @@
-const result_ = Array.isArray(result) ? result : [result];
-for (const row of result_) {
-  if (row.stock > 50) {
-    row.title += " ---Order now for a 10% discount!";
-  }
-}

bookshop/handlers/AdminService.renameAuthor.ON.js

@@ -1,9 +0,0 @@
-async function run() {
-  const {author, newName} = req.data
-  let a = await SELECT `name`.from(`Authors`).where({ID: author})
-  if(!a) return req.error (404, `Can't rename a non-existing author`)
-  await UPDATE (`Authors`,author).with ({ name: newName })
-    //await this.emit ('renamedAuthor', { author, newName })
-  output.msg = 'Success' 
-}
-run()

bookshop/handlers/createdAuthor.ON.js

@@ -1,5 +0,0 @@
-async function run() {
-  let {Author} = req.data
-  Author.placeOfBirth += ' --- modified in custom event' 
-}
-run()

bookshop/index.cds

@@ -2,3 +2,4 @@ namespace sap.capire.bookshop; //> important for reflection
 using from './db/schema';
 using from './srv/cat-service';
 using from './srv/admin-service';
+using from './srv/user-service';

bookshop/notebook.md

@@ -1,112 +0,0 @@
-# Base assumption
-
-Event handlers will always use **publicly available application API's**(services)
-
-- already done in Sandbox API by overwriting **SELECT**, **UPDATE**, **READ** and **CREATE**
-
-## Inbound data for validations
-
-- req.target plus expand on related data
-  - lazy loading on expand
-- event facade could have an explicit publishing of specific services or documents (e.g. remote services)
-- CQN Protocol adapter for subsequent reads --> req.data plus application service calls
-- what is the CDS subset to put in?
-  - req.data + target-rec (proxy, unloaded)
-  - ORM type lazy loading (dereferenced)
-  - application developer could actually provide custom proxies for specific functions
-  - performance impact of multiple accesses to object graph and multiple DB roundtrips
-  - can static code checking or developer annotations influence what is loaded into a graph?
-  - alternative: Stripped-down SELECT limited to req.target and ID
-    - application service only
-    - access rights of user respected
-- What about to-many relationships? For compositions essential, for associations to be questioned
-- Application Service Reads
-- outbound data for changes
-- call remote services
-  - register new remote services dynamically
-  - CAP provides an API on remote services - connect doesn't need to be done by extension developer
-  - alternative: declarative remote services plumbing with CDS service facade
-    - model looks like static internal services, remote calls done transparently behind the scenes
-
--Emit Events
-
-- choreography of extension points
-  - deep inserts vs. fine grained operations
-  - input validation may be suited for fine grained operations
-  - today not in scope for performance reasons
-  - two different use case: Insert new page to book vs. update order-header with items-constraints in place
-- reject request, return errors and warnings - suitable for UI, too
-
-*/
-
-/*
-Annotations available:
-
-Entity level
-  @expression.constraint : [{if: 'expression evaluates to bool'}, on: ['INSERT, UPDATE, DELETE'], error: 'Transaction Rollback and error message', warning: 'Transaction proceeds and warning message']
-  @expression.computed : [{expression: 'ability to access request payload and modify it', on: ['INSERT, UPDATE']}]
-  @event : [{if: 'expression evaluates to bool', on: ['INSERT, UPDATE, DELETE, READ'], when: 'before or after, default before', emit: 'Event Name', to: 'Messaging target, optional'}]
-  @expresion.code :[{file: 'file name', on:['insert', 'update'], when: 'before or after, default before'},
-                    {source: 'each => { if (each.stock > 111) {each.title += `-- 11% discount!`; each.price= each.price*0.9}', on:['insert', 'update'], when: 'before or after'}]  
-Atribute Level
-  @assert.constraint : {if: 'stock>=0 OR stock <1000', error: 'i18n/error102'};
-  @event : {if: 'expression evaluates to bool', on: ['INSERT, UPDATE, DELETE, READ'], when: 'before or after', emit: 'Event Name', to: 'Messaging target, optional' }
-
-Functions available:
-  EXISTS(association target)
-  COUNT,AVG,MIN,MAX,SUM: Composition items, arrays etc
-  OLD:  before image
-  EACH: loop over composition items
-
-Events covered:
-CRUD --> Longhand and Shorthand supported?
-Upsert as one event?
-Before and after:
-  Before can change change request payload and stop transaction
-  After should trigger only asynchronous messages
-Specific Events for status changes? I think expression based event emitter suffices
-*/
-
-//Entity level annotations
-@expression.constraint : [{if: 'stock>100 AND price>15)', on: ['INSERT', 'UPDATE'], error: 'No Book over price 15 should have more than 100 stock' }, // error, rollback transactions
-{if: 'stock>90 AND price>15)', on: ['I', 'U'], warning: 'No Book over price 15 should have more than 100 stock' }] //warning, proceed with transaction but report warning back to UI
-@expression.computed : {expression: 'if(stock>100) then price=price*0.9', on: ['INSERT']}  //ability to modify the payload of the request, but nothing beyond it
-@expresion.code :[{file: 'sap.capire.bookshop-Books-beforeInsert', on:['insert', 'update'], when: 'before'},  //naming can be arbitrary?
-{source: 'each => { if (each.stock > 111) {each.title += `-- 11% discount!`; each.price= each.price*0.9}', on:['insert', 'update'], when: 'before'}]  //alternative
-@event : { if:'price>200', emit: 'Expensive Book', to: 'RulesEngine'}
-entity Books : managed {
-key ID : Integer;
-title  : localized String(111); @event : {if: 'old.title="Hello"', emit: 'Hello changed' }  //old refers to before Image. No "to" clause means message is emitted to any subscriber interested
-descr  : localized String(1111);
-author : Association to Authors @assert.constraint: 'exists(author)';  //function calls need to evaluate to bool
-genre  : Association to Genres;
-stock  : Integer @assert.constraint : {if: 'stock>=0 OR stock <1000', error: 'Stock not within permitted parameters'}; //when operand is used, no auto-insert
-price  : Decimal(9,2) @assert.constraint : '>0'; //insert operand on left side by default
-currency : Currency;
-image : LargeBinary @Core.MediaType : 'image/png';
-stockWorth: Decimal(9,2) @expression.computed : 'stock*price'; //persisted on write. Overhead in runtime, but performance benefit on read. Payload ignored?
-// stockWorth2 = stock*price;  -- long term goal from compiler team, not persisted on write, but calculated on read
-stockWorth3 : Decimal @expression.computed: 'if (stock*price>1000) then stockWorth3=stock.price else stockworth3=1000';  //which altenative?
-stockWorth4 : Decimal @expression.computed: {if: '(stock*price>1000)', then: 'stockWorth3=stock.price', else: 'stockworth3=1000'};
-}
-//@assert.expression: 'dateOfBirth<dateOfDeath'
-entity Authors : managed {
-key ID : Integer;
-name   : String(111);
-dateOfBirth  : Date ;
-dateOfDeath  : Date @expression.constraint: '>dateOfBirth';
-placeOfBirth : String;
-placeOfDeath : String;
-books  : Association to many Books on books.author = $self;
-}
-
-/** Hierarchically organized Code List for Genres */
-entity Genres : sap.common.CodeList {
-key ID   : Integer;
-parent   : Association to Genres;
-children : Composition of many Genres on children.parent = $self;
-}
-
-```
-
-```

bookshop/package.json

@@ -12,8 +12,7 @@
   "dependencies": {
     "@sap/cds": ">=5.9",
     "express": "^4.17.1",
-    "passport": ">=0.4.1",
+    "passport": ">=0.4.1"
-    "vm2": ">=3.9.9"
   },
   "scripts": {
     "genres": "cds serve test/genres.cds",
@@ -22,13 +21,7 @@
   },
   "cds": {
     "requires": {
-      "code-extensibility" : true,
+      "db": "sql"
-      "db": {
-        "kind": "sqlite",
-        "credentials": {
-          "database": "sqlite.db"
-        }
-      }
     }
   }
 }

bookshop/srv/admin-service.cds

@@ -1,30 +1,5 @@
 using { sap.capire.bookshop as my } from '../db/schema';
-
+service AdminService @(requires:'admin') {
-service AdminService // @(requires : 'admin')
+  entity Books as projection on my.Books;
-{
-  entity Books   as projection on my.Books actions {
-    action   increaseStock(count : Integer);
-    function stock() returns Integer;
-  };
-
-@Extensibility : {
-  Fields.Enabled      : true,
-  Fields.Quota: 100,
-  Relations.Enabled   : false,
-  Annotations.Enabled : true,
-  Logic.Enabled : true,
-  Logic.constraints: true,
-  Logic.calculations: true,
-  Logic.Handler : [create, update, delete, read]
-}
   entity Authors as projection on my.Authors;
-
-  action renameAuthor(author : Authors:ID, newName : String) returns {
-    msg : String
-  };
-  function getStock(book: Books:ID) returns Integer;
-  event newBook : {
-    book : Books:ID;
-    name : Books:title
-  };
 }

bookshop/srv/admin-service.js

@@ -1,135 +1,13 @@
-const cds = require("@sap/cds")
+const cds = require('@sap/cds/lib')
-//const cds_sandbox = require("sap/cds/sandbox")
-const { VM, VMScript } = require("vm2")
-const fs = require("fs")
-const path = require("path")
-const { nextTick } = require("process")
-
-class AdminService extends cds.ApplicationService {
-  init() {
-    this.after("READ", async (result, req) => {
-      if (!(result === undefined || result == null)) {
-        const code = getCode(req.target.name, "READ")
-        if (code) {
-          await executeCode.call(this, code, req, result)
-        }
-      }
-    })
-
-    this.before("CREATE", async (req) => {
-      const code = getCode(req.target.name, "CREATE")
-      if (code) {
-        await executeCode.call(this, code, req)
-      }
-    })
-
-    this.before("UPDATE", async (req) => {
-      const code = getCode(req.target.name, "CREATE")
-      if (code) {
-        await executeCode.call(this, code, req)
-      }
-    })
-
-    this.on("*", async (req, next) => {
-      if (!(req.target === undefined || req.target == null)) return next()
-      //ToDo: check whether action or event is part of an extension
-      // DO NOT OVERWRITE EXISTING Action Implementations!
-      // evaluate: Can we augment action implementation with super.next?
-      if (req.constructor.name === "EventMessage") {
-        const code = getCode(req.event, "ON")
-        if (code) {
-          await executeCode.call(this, code, req)
-        }
-      } else if (req.constructor.name === "ODataRequest") {
-        var output = {}
-        const code = getCode(this.name + "." + req.event, "ON")
-        if (code) {
-          await executeCode.call(this, code, req, {}, output)
-          return output
-        }
-      }
-    })
-
-    //ToDo: Prefix for Service not in event emitter
-    this.before("CREATE", "Authors", async (req) => {
-      let Author = req.data
-      await this.emit("createdAuthor", { Author })
-
-    })
 
+module.exports = class AdminService extends cds.ApplicationService { init(){
+  this.before ('NEW','Authors', genid)
+  this.before ('NEW','Books', genid)
   return super.init()
-  }
+}}
-}
 
-var counter = 1;
-
-function newLabel() {return "VM2 - req: " + counter++}
-
-//should only work in local exection (cds watch)
-// alternative: Upon Bootstrapping, merge files into CSN
-function getCodeFromFile(name, operation) {
-  const filename = name + "." + operation + ".js"
-  const file = path.join(__dirname, "..", "handlers", filename)
-  try {
-    const code = fs.readFileSync(file, "utf8")
-    return code
-  } catch (error) {
-    return ""
-  }
-}
-
-//after push this should be the only thing that works
-function getCodeFromAnnotation(name, operation) {
-  return ""
-}
-
-function getCode(name, operation) {
-  let code=getCodeFromAnnotation(name, operation)
-  if (code==="") {code=getCodeFromFile(name, operation)}
-  return code
-}
-
-function scanCode(code) {
-  //ESLINT
-}
-
-async function executeCode(code, req, result, output) {
-  const srv = this
-  const label=newLabel()
-  console.time(label)
-  const vm = new VM({
-    console: "inherit",
-    timeout: 500,
-    allowAsync: true,
-    sandbox: { req, //todo: isolate req.data, req.reject, req.error, req.message
-      result, //important for READ
-      output, //used for Action Implementation
-      SELECT :  (class extends require('@sap/cds/lib/ql/SELECT')  {then(r,e) {return srv.run(this).then(r,e)}})._api(),  
-      INSERT :  (class extends require('@sap/cds/lib/ql/INSERT')  {then(r,e) {return srv.run(this).then(r,e)}})._api(), 
-      UPDATE :  (class extends require('@sap/cds/lib/ql/UPDATE')  {then(r,e) {return srv.run(this).then(r,e)}})._api(), 
-      CREATE :  (class extends require('@sap/cds/lib/ql/CREATE')  {then(r,e) {return srv.run(this).then(r,e)}})._api(), 
-      //srv: this,
-      JSON },
-  })
-
-  try {
-    await vm.run(code)
-    return output
-  } catch (error) {
-    console.log(error)
-    req.reject("409", "Error in VM")
-  }
-  finally {
-    console.timeEnd(label)
-  }
-  // console.log(req.data)
-}
 /** Generate primary keys for target entity in request */
 async function genid (req) {
-  const { ID } = await cds
+  const {ID} = await cds.tx(req).run (SELECT.one.from(req.target).columns('max(ID) as ID'))
-    .tx(req)
+  req.data.ID = ID - ID % 100 + 100 + 1
-    .run(SELECT.one.from(req.target).columns("max(ID) as ID"))
-  req.data.ID = ID - (ID % 100) + 100 + 1
 }
-
-module.exports = { AdminService }

bookshop/srv/cat-service.cds

@@ -10,8 +10,6 @@ service CatalogService @(path:'/browse') {
     author.name as author
   } excluding { createdBy, modifiedBy };
 
-@readonly entity Publishers as projection on my.Publishers;
-
   @requires: 'authenticated-user'
   action submitOrder ( book: Books:ID, quantity: Integer ) returns { stock: Integer };
   event OrderedBook : { book: Books:ID; quantity: Integer; buyer: String };

bookshop/srv/cat-service.js

@@ -3,6 +3,7 @@ const cds = require('@sap/cds')
 class CatalogService extends cds.ApplicationService { init(){
 
   const { Books } = cds.entities ('sap.capire.bookshop')
+  const { ListOfBooks } = this.entities
 
   // Reduce stock of ordered books if available stock suffices
   this.on ('submitOrder', async req => {
@@ -18,7 +19,7 @@ class CatalogService extends cds.ApplicationService { init(){
   })
 
   // Add some discount for overstocked books
-  this.after ('READ','ListOfBooks', each => {
+  this.after ('READ', ListOfBooks, each => {
     if (each.stock > 111) each.title += ` -- 11% discount!`
   })
 

bookshop/srv/code-extensions.cds

@@ -1,11 +0,0 @@
-//this file is machine-created during cds.build
-namespace sap.capire.bookshop; //> important for reflection
-using from '../db/schema';
-using from '../srv/cat-service';
-using from '../srv/admin-service';
-
-annotate AdminService.Authors with @extension.logic: [{when: 'CREATE', code: 'async function run() {\r\n  \/\/debugger\r\n  \/\/while (true) {}\r\n  \/\/process.exit()\r\n  \/\/1.substring()\r\n  \/\/ let res = await specialselect\r\n  let res = await SELECT.one`title`.from(`Books`).where(`ID=201`)\r\n  let { title } = res\r\n  let Author = req.data\r\n  Author.modifiedBy = \"Custom Event handler changed this!\"\r\n  Author.placeOfDeath = \" --- Somewhere over \" + title + \" --- create in Sandbox\"\r\n  \/\/await this.emit(\"createdAuthor\", { Author })\r\n  return Author\r\n}\r\nrun()\r\n'},
-{when: 'READ', code: 'function getYear(v) {\r\n  return parseInt(v.substr(0, 4))\r\n}\r\nfunction getMonth(v) {\r\n  return parseInt(v.substr(5, 2))\r\n}\r\nfunction getDay(v) {\r\n  return parseInt(v.substr(8, 2))\r\n}\r\n\r\nfunction getAge(from, to) {\r\n  if (from === undefined || from == null) return 0\r\n  if (to === undefined || to == null) to = new Date().toISOString()\r\n  let year = getYear(to) - getYear(from) - 1\r\n  if (\r\n    getMonth(to) > getMonth(from) ||\r\n    (getMonth(to) === getMonth(from) && getDay(to) >= getDay(from))\r\n  ) {\r\n    year++\r\n  }\r\n  return year\r\n}\r\n\r\nconst result_ = Array.isArray(result) ? result : [result]\r\nfor (const row of result_) {\r\n  row.modifiedBy += \" --- read in sandbox\"\r\n  row.age = getAge(row.dateOfBirth, row.dateOfDeath)\r\n}'}
-];
-annotate AdminService.Books with @extension.logic;
-annotate CatalogService.ListOfBooks with @extension.logic;

bookshop/srv/user-service.cds

@@ -1,16 +1,15 @@
 /**
  * Exposes user information
  */
-@requires: 'authenticated-user'
 service UserService {
-
   /**
    * The current user
    */
-  @odata.singleton entity me {
+  @odata.singleton entity me @cds.persistence.skip {
     id     : String; // user id
     locale : String;
     tenant : String;
   }
 
+  action login() returns me;
 }

bookshop/srv/user-service.js

@@ -1,4 +1,9 @@
 const cds = require('@sap/cds')
-module.exports = cds.service.impl((srv) => {
+module.exports = class UserService extends cds.Service { init(){
-  srv.on('READ', 'me', ({ tenant, user, locale }) => ({ id: user.id, locale, tenant }))
+  this.on('READ', 'me', ({ tenant, user, locale }) => ({ id: user.id, locale, tenant }))
+  this.on('login', (req) => {
+    if (req.user._is_anonymous)
+      req._.res.set('WWW-Authenticate','Basic realm="Users"').sendStatus(401)
+    else return this.read('me')
   })
+}}

bookshop/test/requests.http

@@ -1,46 +1,10 @@
 @server = http://localhost:4004
 @me = Authorization: Basic {{$processEnv USER}}:
-@id = 2000
-
-
-### ------------------------------------------------------------------------
-# Fetch Authors
-GET {{server}}/admin/Authors
-
-### ------------------------------------------------------------------------
-# Fetch one Author
-GET {{server}}/admin/Authors({{id}})
-
-### ------------------------------------------------------------------------
-# Create Author
-POST {{server}}/admin/Authors
-Content-Type: application/json;IEEE754Compatible=true
-
-{
-  "ID": {{id}},
-  "name": "Nick",
-  "placeOfBirth": "Somewhere",
-  "placeOfDeath": "over the Rainbox",
-  "dateOfBirth" : "1975-05-27"
-}
-
-### ------------------------------------------------------------------------
-# rename author via unbound action
-POST {{server}}/admin/renameAuthor
-Content-Type: application/json
-{{me}}
-
-{ "author":{{id}}, "newName":"Super Nick" }
 
 
 ### ------------------------------------------------------------------------
 # Get service info
-GET {{server}}/admin
+GET {{server}}/browse
-{{me}}
-
-### ------------------------------------------------------------------------
-# Get $metadata document
-GET {{server}}/admin/$metadata
 {{me}}
 
 
@@ -59,12 +23,27 @@ GET {{server}}/browse/ListOfBooks?
 {{me}}
 
 
-
+### ------------------------------------------------------------------------
-
+# Fetch Authors as admin
+GET {{server}}/admin/Authors?
+  # &$select=name,dateOfBirth,placeOfBirth
+  # &$expand=books($select=title;$expand=currency)
+  # &$filter=ID eq 101
+  # &sap-language=de
+Authorization: Basic alice:
 
 ### ------------------------------------------------------------------------
-# Fetch Books as admin
+# Create Author
-GET {{server}}/admin/Books
+POST {{server}}/admin/Authors
+Content-Type: application/json;IEEE754Compatible=true
+Authorization: Basic alice:
+
+{
+  "ID": 112,
+  "name": "Shakespeeeeere",
+  "age": 22
+}
+
 
 ### ------------------------------------------------------------------------
 # Create book
@@ -73,12 +52,12 @@ Content-Type: application/json;IEEE754Compatible=true
 Authorization: Basic alice:
 
 {
-  "ID": 16,
+  "ID": 2,
-  "title": "Deh4",
+  "title": "Poems : Pocket Poets",
   "descr": "The Everyman's Library Pocket Poets hardcover series is popular for its compact size and reasonable price which does not compromise content. Poems: Bronte contains poems that demonstrate a sensibility elemental in its force with an imaginative discipline and flexibility of the highest order. Also included are an Editor's Note and an index of first lines.",
   "author": { "ID": 101 },
   "genre": { "ID": 12 },
-  "stock": -100,
+  "stock": 5,
   "price": "12.05",
   "currency": { "code": "USD" }
 }

bookstore/server.js

@@ -19,4 +19,4 @@ module.exports = cds.server
 
 // For didactic reasons in capire
 const { ReviewsService, OrdersService } = cds.requires
-if (!ReviewsService.credentials && !OrdersService.credentials) cds.requires.messaging = false
+if (!ReviewsService?.credentials && !OrdersService?.credentials) cds.requires.messaging = false

data-viewer/srv/data-service.cds

@@ -2,12 +2,12 @@
  * Exposes data + entity metadata
  */
 @requires:'authenticated-user'
-service DataService @( path:'-data' ) {
+@odata service DataService @( path:'-data' ) {
 
   /**
    * Metadata like name and columns/elements
    */
-  entity Entities {
+  entity Entities @cds.persistence.skip {
     key name : String;
     columns: Composition of many {
       name :  String;
@@ -19,7 +19,7 @@ service DataService @( path:'-data' ) {
   /**
    * The actual data, organized by column name
    */
-  entity Data {
+  entity Data @cds.persistence.skip {
     record   : array of {
       column : String;
       data   : String;

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

@@ -39,7 +39,7 @@ annotate AdminService.Authors with @(UI : {
 
 // Workaround to avoid errors for unknown db-specific calculated fields above
 extend sap.capire.bookshop.Authors with {
-  //virtual age      : Integer;
+  virtual age      : Integer;
   virtual lifetime : String;
 }
 

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

@@ -50,10 +50,6 @@
     }
   },
   "sap.ui5": {
-    "flexEnabled": true,
-    "config": {           
-      "experimentalCAPScenario": true
-      },
     "dependencies": {
       "minUI5Version": "1.81.0",
       "libs": {

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

@@ -22,10 +22,6 @@
         }
     },
     "sap.ui5": {
-        "flexEnabled": true,
-    "config": {           
-      "experimentalCAPScenario": true
-      },
         "dependencies": {
             "libs": {
                 "sap.fe.templates": {}

fiori/app/appconfig/fioriSandboxConfig.json

@@ -19,6 +19,14 @@
                     "title": "Browse Books",
                     "targetURL": "#Books-display"
                   }
+                },
+                {
+                  "id": "BrowseGenres",
+                  "tileType": "sap.ushell.ui.tile.StaticTile",
+                  "properties": {
+                    "title": "Browse Genres (OData v2)",
+                    "targetURL": "#Genres-display"
+                  }
                 }
               ]
             },
@@ -107,6 +115,24 @@
                 "url": "/admin-authors/webapp"
               }
             },
+            "BrowseGenres": {
+              "semanticObject": "Genres",
+              "action": "display",
+              "title": "Browse Genres",
+              "signature": {
+                "parameters": {
+                  "Genre.ID": {
+                    "renameTo": "ID"
+                  }
+                },
+                "additionalParameters": "ignored"
+              },
+              "resolutionResult": {
+                "applicationType": "SAPUI5",
+                "additionalInformation": "SAPUI5.Component=genres",
+                "url": "/genres/webapp"
+              }
+            },
             "ManageBooks": {
               "semanticObject": "Books",
               "action": "manage",

fiori/app/browse/fiori-service.cds

@@ -33,7 +33,7 @@ annotate CatalogService.Books with @(UI : {
 
 ////////////////////////////////////////////////////////////////////////////
 //
-//	Books Object Page
+//	Books List Page
 //
 annotate CatalogService.Books with @(UI : {
     SelectionFields : [

fiori/app/browse/webapp/manifest.json

@@ -53,10 +53,6 @@
     }
   },
   "sap.ui5": {
-    "flexEnabled": true,
-    "config": {           
-      "experimentalCAPScenario": true
-      },
     "dependencies": {
       "minUI5Version": "1.81.0",
       "libs": {

fiori/app/common.cds

@@ -20,21 +20,12 @@ annotate my.Books with @(
       currency_code
     ],
     LineItem        : [
-            {
+      { Value: ID, Label: '{i18n>Title}' },
-                Value : ID,
+      { Value: author.ID, 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 : ' '
-            },
     ]
   }
 ) {
@@ -65,14 +56,8 @@ annotate my.Books with @(UI : {HeaderInfo : {
 annotate my.Books with {
   ID     @title: '{i18n>ID}';
   title  @title: '{i18n>Title}';
-    genre  @title : '{i18n>Genre}'  @Common               : {
+  genre  @title: '{i18n>Genre}'   @Common: { Text: genre.name, TextArrangement: #TextOnly };
-        Text            : genre.name,
+  author @title: '{i18n>Author}'  @Common: { Text: author.name, TextArrangement: #TextOnly };
-        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;

fiori/app/fiori-apps.html

@@ -10,21 +10,7 @@
 	<script>
 		window["sap-ushell-config"] = {
 			defaultRenderer: "fiori2",
-			applications: {},
+			applications: {}
-			bootstrapPlugins: {
-          RuntimeAuthoringPlugin: {
-            component: "sap.ushell.plugins.rta",
-            config: {
-              validateAppVersion: false,
-            },
-          },
-          PersonalizePlugin: {
-            component: "sap.ushell.plugins.rta-personalize",
-            config: {
-              validateAppVersion: false,
-            },
-          },
-        }
 		};
 	</script>
 
@@ -36,11 +22,7 @@
 			data-sap-ui-frameOptions="allow"
 	></script>
 	<script>
-		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"));
+		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"))
-		sap.ui
-        .getCore()
-        .getConfiguration()
-        .setFlexibilityServices([{ connector: "SessionStorageConnector" }]);
 	</script>
 
 </head>

fiori/app/genres/fiori-service.cds

@@ -0,0 +1,8 @@
+using { sap.capire.bookshop } from '../../db/common';
+
+annotate bookshop.GenreHierarchy {
+  ID             @sap.hierarchy.node.for;
+  parent         @sap.hierarchy.parent.node.for;
+  hierarchyLevel @sap.hierarchy.level.for;
+  drillState     @sap.hierarchy.drill.state.for;
+}

fiori/app/genres/webapp/Component.js

@@ -0,0 +1,7 @@
+sap.ui.define(["sap/suite/ui/generic/template/lib/AppComponent"], (AppComponent) =>
+  AppComponent.extend("genres.Component", {
+    metadata: {
+      manifest: "json",
+    },
+  })
+);

fiori/app/genres/webapp/i18n/i18n.properties

@@ -0,0 +1,4 @@
+#XTIT
+appTitle=Genres
+#XTXT
+appDescription=Browse Genres

fiori/app/genres/webapp/manifest.json

@@ -0,0 +1,155 @@
+{
+  "_version": "1.8.0",
+  "sap.app": {
+    "id": "genres",
+    "type": "application",
+    "i18n": "i18n/i18n.properties",
+    "applicationVersion": {
+      "version": "1.0.0"
+    },
+    "title": "Browse Genres Hierarchy (OData v2)",
+    "description": "{{appDescription}}",
+    "tags": {
+      "keywords": []
+    },
+    "crossNavigation": {
+      "inbounds": {
+        "appShow": {
+          "title": "{{appTitle}}",
+          "semanticObject": "GenreHierarchy",
+          "action": "display",
+          "deviceTypes": {
+            "desktop": true,
+            "tablet": true,
+            "phone": true
+          },
+          "icon": "sap-icon://settings",
+          "size": "1x1"
+        }
+      },
+      "outbounds": {}
+    },
+    "ach": "",
+    "resources": "resources.json",
+    "dataSources": {
+      "main": {
+        "uri": "/v2/browse",
+        "type": "OData",
+        "settings": {
+          "annotations": ["localAnnotations"],
+          "localUri": "localService/metadata.xml"
+        }
+      },
+      "localAnnotations": {
+        "type": "ODataAnnotation",
+        "uri": "annotations/localAnnotations.xml",
+        "settings": {
+          "localUri": "annotations/localAnnotations.xml"
+        }
+      }
+    },
+    "offline": false,
+    "sourceTemplate": {
+      "id": "ui5template.smartTemplate",
+      "version": "1.40.12"
+    }
+  },
+  "sap.ui": {
+    "technology": "UI5",
+    "icons": {
+      "icon": "",
+      "favIcon": "",
+      "phone": "",
+      "phone@2": "",
+      "tablet": "",
+      "tablet@2": ""
+    },
+    "deviceTypes": {
+      "desktop": true,
+      "tablet": true,
+      "phone": true
+    },
+    "supportedThemes": ["sap_hcb", "sap_belize", "sap_belize_deep", "sap_fiori_3"]
+  },
+  "sap.ui5": {
+    "resources": {
+      "js": [],
+      "css": []
+    },
+    "dependencies": {
+      "minUI5Version": "1.65.6",
+      "libs": {},
+      "components": {}
+    },
+    "models": {
+      "i18n": {
+        "type": "sap.ui.model.resource.ResourceModel",
+        "uri": "i18n/i18n.properties"
+      },
+      "@i18n": {
+        "type": "sap.ui.model.resource.ResourceModel",
+        "uri": "i18n/i18n.properties"
+      },
+      "json": {
+        "type": "sap.ui.model.json.JSONModel"
+      },
+      "i18n|sap.suite.ui.generic.template.ListReport|Genres": {
+        "type": "sap.ui.model.resource.ResourceModel",
+        "uri": "i18n/ListReport/Genres/i18n.properties"
+      },
+      "": {
+        "dataSource": "main",
+        "preload": true,
+        "settings": {
+          "useBatch": true,
+          "defaultBindingMode": "TwoWay",
+          "defaultCountMode": "Inline",
+          "refreshAfterChange": true,
+          "metadataUrlParams": {
+            "sap-value-list": "none"
+          }
+        }
+      }
+    },
+    "contentDensities": {
+      "compact": true,
+      "cozy": true
+    }
+  },
+  "sap.ui.generic.app": {
+    "_version": "1.3.0",
+    "settings": {
+      "forceGlobalRefresh": false,
+      "useColumnLayoutForSmartForm": false,
+      "showBasicSearch": false
+    },
+    "pages": {
+      "ListReport|Genres": {
+        "entitySet": "GenreHierarchy",
+        "component": {
+          "name": "sap.suite.ui.generic.template.ListReport",
+          "list": true,
+          "settings": {
+            "condensedTableLayout": true,
+            "smartVariantManagement": true,
+            "tableType": "TreeTable",
+            "enableTableFilterInPageVariant": true,
+            "dataLoadSettings": {
+              "loadDataOnAppLaunch": "always"
+            }
+          }
+        }
+      }
+    }
+  },
+  "sap.fiori": {
+    "registrationIds": [],
+    "archeType": "transactional"
+  },
+  "sap.platform.hcp": {
+    "uri": ""
+  },
+  "sap.platform.cf": {
+    "oAuthScopes": []
+  }
+}

fiori/app/services.cds

@@ -5,5 +5,6 @@
 using from './admin-authors/fiori-service';
 using from './admin-books/fiori-service';
 using from './browse/fiori-service';
+using from './genres/fiori-service';
 using from './common';
 using from '@capire/bookstore/srv/mashup';

fiori/db/common.cds

@@ -0,0 +1,14 @@
+namespace sap.capire.bookshop;
+
+using { sap.capire.bookshop } from '@capire/bookstore/srv/mashup';
+
+entity GenreHierarchy : bookshop.Genres {
+  hierarchyLevel : Integer default 0;
+  drillState     : String default 'leaf';
+  parent         : Association to GenreHierarchy;
+  children       : Composition of many GenreHierarchy on children.parent = $self;
+}
+
+extend service CatalogService with {
+  @readonly entity GenreHierarchy as projection on bookshop.GenreHierarchy;
+}

fiori/db/data/sap.capire.bookshop-GenreHierarchy.csv

@@ -0,0 +1,16 @@
+ID;parent_ID;name;hierarchyLevel;drillState
+10;;Fiction;0;expanded
+11;10;Drama;1;leaf
+12;10;Poetry;1;leaf
+13;10;Fantasy;1;leaf
+14;10;Science Fiction;1;leaf
+15;10;Romance;1;leaf
+16;10;Mystery;1;leaf
+17;10;Thriller;1;leaf
+18;10;Dystopia;1;leaf
+20;;Non-Fiction;0;expanded
+19;10;Fairy Tale;1;leaf
+21;20;Biography;1;expanded
+22;21;Autobiography;2;leaf
+23;20;Essay;1;leaf
+24;20;Speech;1;leaf

fiori/index.cds

@@ -0,0 +1 @@
+using from './db/common';

fiori/package.json

@@ -4,6 +4,7 @@
   "dependencies": {
     "@capire/bookstore": "*",
     "@sap/cds": ">=5",
+    "@sap/cds-odata-v2-adapter-proxy": "^1.9.0",
     "express": "^4.17.1",
     "passport": ">=0.4.1"
   },
@@ -13,9 +14,6 @@
   },
   "cds": {
     "requires": {
-      "auth": {
-        "kind": "dummy-auth"
-      },
       "ReviewsService": {
         "kind": "odata",
         "model": "@capire/reviews"
@@ -36,10 +34,7 @@
         }
       },
       "db": {
-        "kind": "sqlite",
+        "kind": "sql"
-        "credentials": {
-          "database": "sqlite.db"
-        }
       },
       "db-ext": {
         "[development]": {
@@ -48,10 +43,10 @@
         "[production]": {
           "model": "db/hana"
         }
+      }
     },
     "hana": {
       "deploy-format": "hdbtable"
     }
   }
 }
-}

fiori/server.js

@@ -1 +1,8 @@
+const cds = require("@sap/cds")
+
+// install OData v2 adapter
+const proxy = require('@sap/cds-odata-v2-adapter-proxy')
+const proxyOpts = global.it ? { target:'auto' } : {} // for tests, set 'auto' to detect port dynamically
+cds.on('bootstrap', app => app.use(proxy(proxyOpts)))
+
 module.exports = require('@capire/bookstore/server.js')

hello/package.json

@@ -12,23 +12,8 @@
   "devDependencies": {
     "@types/jest": "*",
     "@types/node": "*",
-    "ts-jest": "^27.0.2",
     "typescript": "^4.3.5"
   },
-  "jest": {
-    "testEnvironment": "node",
-    "preset": "ts-jest",
-    "globals": {
-      "ts-jest": {
-        "diagnostics": {
-          "_comment": "see https://githubmemory.com/repo/kulshekhar/ts-jest/issues/2722",
-          "ignoreCodes": [
-            151001
-          ]
-        }
-      }
-    }
-  },
   "eslintConfig": {
     "extends": "eslint:recommended",
     "env": {

hello/test/hello-world-test.js

@@ -0,0 +1,13 @@
+const cds = require ('@sap/cds')
+describe('Hello world!', () => {
+
+    beforeAll (()=> process.env.CDS_TYPESCRIPT = true)
+    afterAll (()=> delete process.env.CDS_TYPESCRIPT)
+    const {GET} = cds.test.in(__dirname,'../srv').run('serve', 'world.cds')
+
+    it('should say hello with class impl', async () => {
+        const {data} = await GET`/say/hello(to='world')`
+        expect(data.value).toMatch(/Hello world.*typescript.*/i)
+    })
+
+})

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

@@ -1,15 +0,0 @@
-process.env.CDS_TYPESCRIPT = 'true';
-import * as cds from '@sap/cds';
-
-//@ts-ignore
-const {GET} = cds.test.in(__dirname,'../srv').run('serve', 'world.cds');
-
-describe('Hello world!', () => {
-    afterAll(() => { delete process.env.CDS_TYPESCRIPT; });
-
-    it('should say hello with class impl from a typescript file', async () => {
-        const {data} = await GET`/say/hello(to='world')`
-        expect(data.value).toMatch(/Hello world.*typescript.*/i)
-    })
-
-})

orders/app/fiori.cds

@@ -16,11 +16,12 @@ using { OrdersService } from '../srv/orders-service';
 @odata.draft.enabled
 annotate OrdersService.Orders with @(
 	UI: {
-		SelectionFields: [ createdAt, createdBy ],
+		SelectionFields: [ createdBy ],
 		LineItem: [
 			{Value: OrderNo, Label:'OrderNo'},
 			{Value: buyer, Label:'Customer'},
-			{Value: createdAt, Label:'Date'}
+			{Value: currency.symbol, Label:'Currency'},
+			{Value: createdAt, Label:'Date'},
 		],
 		HeaderInfo: {
 			TypeName: 'Order', TypeNamePlural: 'Orders',

orders/app/orders/index.html

@@ -13,7 +13,7 @@
 			applications: {
 				"manage-orders": {
 					title: "Manage Orders",
-					description: "... testing FE v42",
+					description: "CAP Sample App",
 					additionalInformation: "SAPUI5.Component=orders",
 					applicationType : "URL",
 					url: "/orders/webapp",

orders/app/orders/webapp/manifest.json

@@ -3,8 +3,8 @@
 	"sap.app": {
 		"id": "orders",
 		"type": "application",
-		"title": "Order Books",
+		"title": "Order Management",
-		"description": "Sample Application",
+		"description": "CAP Sample Application",
 		"i18n": "i18n/i18n.properties",
 		"dataSources": {
 			"OrdersService": {

orders/db/schema.cds

@@ -2,7 +2,7 @@ using { Currency, User, managed, cuid } from '@sap/cds/common';
 namespace sap.capire.orders;
 
 entity Orders : cuid, managed {
-  OrderNo  : String @title:'Order Number'; //> readable key
+  OrderNo  : String(22) @title:'Order Number'; //> readable key
   Items    : Composition of many {
     key ID    : UUID;
     product   : Association to Products;

package.json

@@ -5,18 +5,21 @@
   "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/data-viewer": "./data-viewer",
-    "@capire/fiori": "./fiori",
-    "@capire/hello": "./hello",
-    "@capire/media": "./media",
-    "@capire/orders": "./orders",
-    "@capire/reviews": "./reviews",
     "@sap/cds": ">=5.5.3"
   },
+  "workspaces": [
+    "./bookshop",
+    "./bookstore",
+    "./common",
+    "./data-viewer",
+    "./fiori",
+    "./hello",
+    "./media",
+    "./orders",
+    "./reviews"
+  ],
   "devDependencies": {
+    "axios": "^0",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "chai-subset": "^1.6.0",
@@ -34,10 +37,10 @@
     "jest": "npx jest",
     "start": "cds watch fiori",
     "test": "npm run jest -- --silent",
+    "test:mocha": "npx mocha --parallel --recursive --timeout 20000",
     "test:hello": "cd hello && npm test"
   },
   "jest": {
-    "testEnvironment": "node",
     "testTimeout": 20000,
     "testMatch": [
       "**/*.test.js"

samples.md

@@ -69,14 +69,20 @@ Each sub directory essentially is an individual npm package arranged in an [all-
 
 ## [@capire/fiori](fiori)
 
-- [Adds an SAP Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/) to bookstore, thereby introducing to:
+- Adds an SAP Fiori elements application to bookstore, thereby introducing:
-- [OData Annotations](https://cap.cloud.sap/docs/guides/fiori#adding-odata-annotations) in `.cds` files
+- OData Annotations in `.cds` files
-- Support for [Fiori Draft](https://cap.cloud.sap/docs/guides/fiori#draft)
+- Support for Fiori Draft
-- Support for [Value Helps](https://cap.cloud.sap/docs/guides/fiori#value-help)
+- Support for Value Helps
 - Serving SAP Fiori apps locally
+- Fiori Elements V2
+  - OData V2 using CDS OData V2 Adapter Proxy
+  - List Report (type `TreeTable`)
+  - `@sap.hierarchy` annotations
+
+See the [Serving Fiori UIs](https://cap.cloud.sap/docs/advanced/fiori) documentation for more information.
 
 <br>
 
 # All-in-one Monorepo
 
-Each 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.
+Each 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 and acts like a local npm registry to the individual sample packages.

test/cds.ql.test.js

@@ -1,10 +1,11 @@
+describe('cds.ql → cqn', () => {
+
   const cds = require('@sap/cds/lib')
   const { expect } = cds.test
   const { cdr } = cds.ql
   const Foo = { name: 'Foo' }
   const Books = { name: 'capire.bookshop.Books' }
 
-
   const STAR = cdr ? '*' : { ref: ['*'] }
   const skip = {to:{eql:()=>skip}}
   const srv = new cds.Service
@@ -13,9 +14,6 @@ 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', () => {
-  //
-
   describe.each(['SELECT', 'SELECT one', 'SELECT distinct'])(`%s...`, (each) => {
 
     let SELECT; beforeEach(()=> SELECT = (
@@ -413,19 +411,68 @@ describe('cds.ql → cqn', () => {
         ]
       }})
 
+      const ql_with_groups_fix = !!cds.ql.Query.prototype.flat
+      if (ql_with_groups_fix) {
+
         expect (
-        SELECT.from(Foo).where({x:1,or:{y:2}})
+          SELECT.from(Foo).where({x:1}).or({y:2}).and({z:3})
-      ).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}
+            {ref:['y']}, '=', {val:2},
+            'and',
+            {ref:['z']}, '=', {val:3},
           ]
         }})
 
+        expect (
+          SELECT.from(Foo).where({x:1,or:{y:2}}).and({z:3})
+        ).to.eql ({ SELECT: {
+          from: {ref:['Foo']},
+          where: [
+            {xpr:[
+              {ref:['x']}, '=', {val:1},
+              'or',
+              {ref:['y']}, '=', {val:2},
+            ]},
+            'and',
+            {ref:['z']}, '=', {val:3},
+          ]
+        }})
+
+        expect (
+          SELECT.from(Foo).where({a:1}).or({x:1,or:{y:2}}).and({z:3})
+        ).to.eql ({ SELECT: {
+          from: {ref:['Foo']},
+          where: [
+            {ref:['a']}, '=', {val:1},
+            'or',
+            {xpr:[
+              {ref:['x']}, '=', {val:1},
+              'or',
+              {ref:['y']}, '=', {val:2},
+            ]},
+            'and',
+            {ref:['z']}, '=', {val:3},
+          ]
+        }})
+
+        expect (
+          { SELECT: SELECT.from(Foo).where({x:1,or:{y:2}}).SELECT }
+        ).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 (

test/consuming-services.test.js

@@ -1,8 +1,9 @@
 const cds = require('@sap/cds/lib')
-const { expect } = cds.test ('@capire/bookshop')
 
 describe('cap/samples - Consuming Services locally', () => {
-  //
+
+  const { expect } = cds.test ('@capire/bookshop')
+
   it('bootstrapped the database successfully', ()=>{
     const { AdminService } = cds.services
     const { Authors } = AdminService.entities
@@ -14,7 +15,7 @@ describe('cap/samples - Consuming Services locally', () => {
     const AdminService = await cds.connect.to('AdminService')
     const { Authors } = AdminService.entities
     expect (await SELECT.from(Authors))
-    .to.eql(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)))

test/custom-handlers.test.js

@@ -1,10 +1,11 @@
 const cds = require('@sap/cds/lib')
+
+describe('cap/samples - Custom Handlers', () => {
+
   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('cap/samples - Custom Handlers', () => {
-
   it('should reject out-of-stock orders', async () => {
     await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`
     await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`

test/fiori.test.js

@@ -0,0 +1,23 @@
+const cds = require('@sap/cds/lib')
+
+describe('cap/samples - Fiori APIs - v2', () => {
+
+  const { GET, expect, axios } = cds.test ('@capire/fiori', '--with-mocks')
+  axios.defaults.auth = { username: 'alice', password: 'admin' }
+
+  it('serves $metadata documents in v2', async () => {
+    const { headers, data } = await GET `/v2/browse/$metadata`
+    expect(headers).to.contain({
+      'content-type': 'application/xml',
+      'dataserviceversion': '2.0',
+    })
+    expect(data).to.contain('<EntitySet Name="GenreHierarchy" EntityType="CatalogService.GenreHierarchy"/>')
+  })
+
+  it('serves Books in v2', async () => {
+    const { data } = await GET `/v2/browse/Books`
+    expect(data).to.containSubset({d:{results:[]}})
+    expect(data.d.results.length).to.be.greaterThanOrEqual(5)
+  })
+
+})

test/hello-world.test.js

@@ -1,8 +1,9 @@
 const cds = require('@sap/cds/lib')
-const { GET, expect } = cds.test (__dirname+'/../hello')
 
 describe('cap/samples - Hello world!', () => {
 
+  const { GET, expect } = cds.test (__dirname+'/../hello')
+
   it('should say hello with class impl', async () => {
     const {data} = await GET `/say/hello(to='world')`
     expect(data.value).to.eql('Hello world!')

test/hierarchical-data.test.js

@@ -1,19 +1,17 @@
 const cds = require('@sap/cds/lib')
-const {expect} = cds.test
 
-// should become cds.compile(...) when cds5 is released
+describe('cap/samples - Hierarchical Data', ()=>{
-const model = cds.compile.to.csn (`
+
+	const model = CDL`
 		entity Categories {
 			key ID   : Integer;
 			name     : String;
 			children : Composition of many Categories on children.parent = $self;
 			parent   : Association to Categories;
 		}
-`)
+	`
 	const {Categories:Cats} = model.definitions
-
+	const {expect} = cds.test
-
-describe('cap/samples - Hierarchical Data', ()=>{
 
 	before ('bootstrap sqlite in-memory db...', async()=>{
 		await cds.deploy (model) .to ('sqlite::memory:')

test/localized-data/services.test.js

@@ -1,25 +1,14 @@
+describe('cap/samples - Localized Data', () => {
+
   const { GET, expect, cds } = require('@sap/cds/lib').test (__dirname)
   if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
   else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
 
-describe('cap/samples - Localized Data', () => {
-
   it('serves localized $metadata documents', async () => {
-    const { data } = await GET`/browse/$metadata?sap-language=de`
+    const { data } = await GET(`/browse/$metadata?sap-language=de`, { headers: { 'accept-language': 'de' }})
     expect(data).to.contain('<Annotation Term="Common.Label" String="Währung"/>')
   })
 
-  it('supports sap-language param', async () => {
-    const { data } = await GET(`/browse/Books?$select=title,author` + '&sap-language=de')
-    expect(data.value).to.containSubset([
-      { title: 'Sturmhöhe', author: 'Emily Brontë' },
-      { title: 'Jane Eyre', author: 'Charlotte Brontë' },
-      { title: 'The Raven', author: 'Edgar Allen Poe' },
-      { title: 'Eleonora', author: 'Edgar Allen Poe' },
-      { title: 'Catweazle', author: 'Richard Carpenter' },
-    ])
-  })
-
   it('supports accept-language header', async () => {
     const { data } = await GET(`/browse/Books?$select=title,author`, {
       headers: { 'Accept-Language': 'de' },

test/messaging.test.js

@@ -1,14 +1,20 @@
 const cds = require('@sap/cds/lib')
-const { expect } = cds.test
+const {resolve} = require('path')
-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
 
 describe('cap/samples - Messaging', ()=>{
 
+    const { expect } = cds.test
+    const _model = '@capire/reviews'
+    const Reviews = 'sap.capire.reviews.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
+
+    beforeAll(() => { cds.root = resolve(__dirname, '..') })
+    afterAll(() => { cds.root = process.cwd() })
+
     it ('should bootstrap sqlite in-memory db', async()=>{
         const db = await cds.deploy (_model) .to ('sqlite::memory:')
-        await db.delete('Reviews')
+        await db.delete(Reviews)
         expect (db.model) .not.undefined
     })
 

test/odata.test.js

@@ -1,8 +1,8 @@
 const cds = require('@sap/cds/lib')
-const { GET, expect, axios } = cds.test ('@capire/bookshop')
-axios.defaults.auth = { username: 'alice', password: 'admin' }
 
 describe('cap/samples - Bookshop APIs', () => {
+  const { GET, expect, axios } = cds.test ('@capire/bookshop')
+  axios.defaults.auth = { username: 'alice', password: 'admin' }
 
   // Genres
   const Drama = {

test/registry.test.js

@@ -1,12 +1,14 @@
 
 const cds = require('@sap/cds/lib')
-const { expect } = cds.test
 const { fork } = require('child_process')
 const { resolve } = require('path')
 const verbose = process.env.CDS_TEST_VERBOSE
-// ||true
 
 describe('cap/samples - Local NPM registry', () => {
+
+  const { expect } = cds.test
+  // ||true
+
   let registry
   let axios
   const cwd = resolve(__dirname, '..')