Finalize ToDo's

Package.json
Sandbox API with Application Service
2022-07-28 15:29:53 +02:00 · 2022-07-28 14:58:32 +02:00 · 2022-07-28 14:55:37 +02:00 · 2022-07-28 14:54:08 +02:00 · 2022-07-26 09:47:56 +02:00 · 2022-07-26 09:47:30 +02:00
47 changed files with 1450 additions and 10972 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+
+updates:
+- package-ecosystem: npm
+  directory: /
+  versioning-strategy: increase-if-necessary
+  schedule:
+    interval: daily
--- a/.registry/server.js
+++ b/.registry/server.js
@@ -16,7 +16,8 @@ app.use('/-/:tarball', (req,res,next) => {
  console.debug ('GET', req.params)
  try {
    const { tarball } = req.params
-    const [, pkg ] = /^\w+-(\w+)/.exec(tarball)
+    const pkgFull = tarball.substring(0, tarball.lastIndexOf('-'))
+    const [, pkg ] = /^\w+-(.+)/.exec(pkgFull)
    fs.lstat(tarball,(err => {
      if (err) console.debug (`npm pack ../${pkg}`)
      if (err) exec(`npm pack ../${pkg}`,{cwd},next)
@@ -31,7 +32,7 @@ app.use('/-/:tarball', (req,res,next) => {
 app.use('/-', express.static(__dirname))

 app.get('/*', (req,res)=>{
-  const urlRegex = /^\/(@\w+)\/(\w+)/
+  const urlRegex = /^\/(@[\w-]+)\/(.+)/
  const url = decodeURIComponent(req.url)
  console.debug ('GET',url)
  try {
--- a/bookshop/app/vue/app.js
+++ b/bookshop/app/vue/app.js
@@ -3,14 +3,15 @@ const $ = sel => document.querySelector(sel)
 const GET = (url) => axios.get('/browse'+url)
 const POST = (cmd,data) => axios.post('/browse'+cmd,data)

-const books = new Vue ({
+const books = Vue.createApp ({

-    el:'#app',
-
-    data: {
+    data() {
+      return {
        list: [],
        book: undefined,
-        order: { quantity:1, succeeded:'', failed:'' }
+        order: { quantity:1, succeeded:'', failed:'' },
+        user: {}
+      }
    },

    methods: {
@@ -37,12 +38,24 @@ const books = new Vue ({
                book.stock = res.data.stock
                books.order = { quantity, succeeded: `Successfully ordered ${quantity} item(s).` }
            } catch (e) {
-                books.order = { quantity, failed: e.response.data.error.message }
+                books.order = { quantity, failed: e.response.data.error ? e.response.data.error.message : e.response.data }
            }
-        }
+        },

+        async fetchUserInfo() {
+            try {
+                const { data } = await axios.get('/user/me')
+                books.user = data
+            } catch (err) { books.user = { id: err.message } }
+        }
    }
-})
+}).mount("#app")

 // initially fill list of books
 books.fetch()
+
+books.fetchUserInfo()
+document.addEventListener('keydown', (event) => {
+    // hide user info on request
+    if (event.key === 'u')  books.user = undefined
+})
--- a/bookshop/app/vue/index.html
+++ b/bookshop/app/vue/index.html
@@ -5,19 +5,26 @@
    <title> Capire Books </title>
    <link rel="stylesheet" href="https://unpkg.com/primitive-ui/dist/css/main.css">
    <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/vue"></script>
+    <script src="https://cdn.jsdelivr.net/npm/vue@3/dist/vue.global.prod.js"></script>
    <style>
        .hovering tr:hover td { color:cyan; background: #123; cursor: pointer; }
        .rating-stars { color:teal }
        .succeeded { color:teal }
        .failed { color:red }
+        .user {text-align: end; color: grey;}
    </style>
 </head>

 <body class="small-container", style="margin-top: 70px;">
 <div id='app'>

-    <h1> {{ document.title }} </h1>
+    <div v-if="user" class="user">
+        <div>User: {{ user.id || 'anonymous' }}</div>
+        <div>Locale: {{ user.locale }}</div>
+        <div v-if="user.tenant">Tenant: {{ user.tenant }}</div>
+    </div>
+
+    <h1> Capire Books </h1>

    <input type="text" placeholder="Search..." @input="search">

--- a/bookshop/db/handlers/sandbox.cds
+++ b/bookshop/db/handlers/sandbox.cds
@@ -0,0 +1,2 @@
+using from '..\..\schema';
+
--- a/bookshop/db/schema.cds
+++ b/bookshop/db/schema.cds
@@ -1,31 +1,56 @@
-using { Currency, managed, sap } from '@sap/cds/common';
+using {
+  Currency,
+  managed,
+  sap,
+  extensible
+} from '@sap/cds/common';
+
 namespace sap.capire.bookshop;

-entity Books : managed {
-  key ID : Integer;
-  title  : localized String(111);
-  descr  : localized String(1111);
-  author : Association to Authors;
-  genre  : Association to Genres;
-  stock  : Integer;
-  price  : Decimal;
-  currency : Currency;
-  image : LargeBinary @Core.MediaType : 'image/png';
+@Extensibility.Any.Enabled : true
+entity Books : managed, extensible {
+  key ID         : Integer;
+      title      : localized String(111);
+      descr      : localized String(1111);
+      author     : Association to Authors;
+      genre      : Association to Genres;
+      stock      : Integer;
+      price      : Decimal;
+      currency   : Currency;
+      image      : LargeBinary @Core.MediaType : 'image/png';
+      authorName : String;
 }

-entity Authors : managed {
-  key ID : Integer;
-  name   : String(111);
-  dateOfBirth  : Date;
-  dateOfDeath  : Date;
-  placeOfBirth : String;
-  placeOfDeath : String;
-  books  : Association to many Books on books.author = $self;
+
+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;
 }

-/** Hierarchically organized Code List for Genres */
+extend Authors with {
+  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 on children.parent = $self;
+  key ID       : Integer;
+      parent   : Association to Genres;
+      children : Composition of many Genres
+                   on children.parent = $self;
 }
+
+entity Publishers: managed {
+  key ID: Integer;
+  name: String(111);
+
+}
--- a/bookshop/handlers/AdminService.Authors.CREATE.js
+++ b/bookshop/handlers/AdminService.Authors.CREATE.js
@@ -0,0 +1,17 @@
+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()
--- a/bookshop/handlers/AdminService.Authors.READ.js
+++ b/bookshop/handlers/AdminService.Authors.READ.js
@@ -0,0 +1,41 @@
+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()
--- a/bookshop/handlers/AdminService.Books.CREATE.js
+++ b/bookshop/handlers/AdminService.Books.CREATE.js
@@ -0,0 +1,9 @@
+
+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()
--- a/bookshop/handlers/AdminService.Books.READ.js
+++ b/bookshop/handlers/AdminService.Books.READ.js
@@ -0,0 +1,6 @@
+const result_ = Array.isArray(result) ? result : [result];
+for (const row of result_) {
+  if (row.stock > 50) {
+    row.title += " ---Order now for a 10% discount!";
+  }
+}
--- a/bookshop/handlers/AdminService.renameAuthor.ON.js
+++ b/bookshop/handlers/AdminService.renameAuthor.ON.js
@@ -0,0 +1,9 @@
+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()
--- a/bookshop/handlers/createdAuthor.ON.js
+++ b/bookshop/handlers/createdAuthor.ON.js
@@ -0,0 +1,5 @@
+async function run() {
+  let {Author} = req.data
+  Author.placeOfBirth += ' --- modified in custom event' 
+}
+run()
--- a/bookshop/notebook.md
+++ b/bookshop/notebook.md
@@ -0,0 +1,112 @@
+# 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;
+}
+
+```
+
+```
--- a/bookshop/package.json
+++ b/bookshop/package.json
@@ -2,10 +2,18 @@
  "name": "@capire/bookshop",
  "version": "1.0.0",
  "description": "A simple self-contained bookshop service.",
+  "files": [
+    "app",
+    "srv",
+    "db",
+    "index.cds",
+    "index.js"
+  ],
  "dependencies": {
-    "@sap/cds": "^5.0.4",
+    "@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",
@@ -14,9 +22,13 @@
  },
  "cds": {
    "requires": {
+      "code-extensibility" : true,
      "db": {
-        "kind": "sql"
+        "kind": "sqlite",
+        "credentials": {
+          "database": "sqlite.db"
+        }
      }
    }
  }
-}
+}
--- a/bookshop/sqlite.db
+++ b/bookshop/sqlite.db
--- a/bookshop/srv/admin-service.cds
+++ b/bookshop/srv/admin-service.cds
@@ -1,5 +1,30 @@
-using { sap.capire.bookshop as my } from '../db/schema';
-service AdminService @(requires:'admin') {
-  entity Books as projection on my.Books;
-  entity Authors as projection on my.Authors;
+using {sap.capire.bookshop as my} from '../db/schema';
+
+service AdminService // @(requires : 'admin')
+{
+  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
+  };
 }
--- a/bookshop/srv/admin-service.js
+++ b/bookshop/srv/admin-service.js
@@ -1,12 +1,135 @@
-const cds = require('@sap/cds')
+const cds = require("@sap/cds")
+//const cds_sandbox = require("sap/cds/sandbox")
+const { VM, VMScript } = require("vm2")
+const fs = require("fs")
+const path = require("path")
+const { nextTick } = require("process")

-module.exports = cds.service.impl (function(){
-  this.before ('NEW','Authors', genid)
-  this.before ('NEW','Books', genid)
-})
+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)
+        }
+      }
+    })

-/** 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'))
-  req.data.ID = ID - ID % 100 + 100 + 1
+    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 })
+
+    })
+ 
+    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
+    .tx(req)
+    .run(SELECT.one.from(req.target).columns("max(ID) as ID"))
+  req.data.ID = ID - (ID % 100) + 100 + 1
+}
+
+module.exports = { AdminService }
--- a/bookshop/srv/cat-service.cds
+++ b/bookshop/srv/cat-service.cds
@@ -10,6 +10,8 @@ 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 };
--- a/bookshop/srv/code-extensions.cds
+++ b/bookshop/srv/code-extensions.cds
@@ -0,0 +1,11 @@
+//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;
--- a/bookshop/srv/user-service.cds
+++ b/bookshop/srv/user-service.cds
@@ -0,0 +1,16 @@
+/**
+ * Exposes user information
+ */
+@requires: 'authenticated-user'
+service UserService {
+
+  /**
+   * The current user
+   */
+  @odata.singleton entity me {
+    id     : String; // user id
+    locale : String;
+    tenant : String;
+  }
+
+}
--- a/bookshop/srv/user-service.js
+++ b/bookshop/srv/user-service.js
@@ -0,0 +1,4 @@
+const cds = require('@sap/cds')
+module.exports = cds.service.impl((srv) => {
+  srv.on('READ', 'me', ({ tenant, user, locale }) => ({ id: user.id, locale, tenant }))
+})
--- a/bookshop/test/requests.http
+++ b/bookshop/test/requests.http
@@ -1,10 +1,46 @@
@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}}/browse
+GET {{server}}/admin
+{{me}}
+
+### ------------------------------------------------------------------------
+# Get $metadata document
+GET {{server}}/admin/$metadata
 {{me}}


@@ -16,34 +52,19 @@ GET {{server}}/browse/$metadata

 ### ------------------------------------------------------------------------
 # Browse Books as any user
-GET {{server}}/browse/Books?
+GET {{server}}/browse/ListOfBooks?
  # &$select=title,stock
-  # &$expand=currency
+  &$expand=genre
  # &sap-language=de
 {{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:
+
+

 ### ------------------------------------------------------------------------
-# Create Author
-POST {{server}}/admin/Authors
-Content-Type: application/json;IEEE754Compatible=true
-Authorization: Basic alice:
-
-{
-  "ID": 112,
-  "name": "Shakespeeeeere",
-  "age": 22
-}
-
+# Fetch Books as admin
+GET {{server}}/admin/Books

 ### ------------------------------------------------------------------------
 # Create book
@@ -52,12 +73,12 @@ Content-Type: application/json;IEEE754Compatible=true
 Authorization: Basic alice:

 {
-  "ID": 2,
-  "title": "Poems : Pocket Poets",
+  "ID": 16,
+  "title": "Deh4",
  "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": 5,
+  "stock": -100,
  "price": "12.05",
  "currency": { "code": "USD" }
 }
--- a/bookstore/package.json
+++ b/bookstore/package.json
@@ -7,7 +7,7 @@
    "@capire/orders": "*",
    "@capire/common": "*",
    "@capire/data-viewer": "*",
-    "@sap/cds": "^5",
+    "@sap/cds": ">=5",
    "express": "^4.17.1"
  },
  "cds": {
--- a/data-viewer/package.json
+++ b/data-viewer/package.json
@@ -3,7 +3,7 @@
  "version": "0.1.0",
  "description": "A generic browser for data",
  "dependencies": {
-    "@sap/cds": "^5.0.4"
+    "@sap/cds": ">=5.0.4"
  },
  "files": [
    "app",
--- a/fiori/app/admin-authors/fiori-service.cds
+++ b/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;
 }

--- a/fiori/app/admin-authors/webapp/manifest.json
+++ b/fiori/app/admin-authors/webapp/manifest.json
@@ -11,7 +11,7 @@
    },
    "dataSources": {
      "AdminService": {
-        "uri": "/admin/",
+        "uri": "admin/",
        "type": "OData",
        "settings": {
          "odataVersion": "4.0"
@@ -50,6 +50,10 @@
    }
  },
  "sap.ui5": {
+    "flexEnabled": true,
+    "config": {           
+      "experimentalCAPScenario": true
+      },
    "dependencies": {
      "minUI5Version": "1.81.0",
      "libs": {
--- a/fiori/app/admin-books/webapp/manifest.json
+++ b/fiori/app/admin-books/webapp/manifest.json
@@ -8,7 +8,7 @@
        "i18n": "i18n/i18n.properties",
        "dataSources": {
            "AdminService": {
-                "uri": "/admin/",
+                "uri": "admin/",
                "type": "OData",
                "settings": {
                    "odataVersion": "4.0"
@@ -22,6 +22,10 @@
        }
    },
    "sap.ui5": {
+        "flexEnabled": true,
+    "config": {           
+      "experimentalCAPScenario": true
+      },
        "dependencies": {
            "libs": {
                "sap.fe.templates": {}
--- a/fiori/app/browse/webapp/manifest.json
+++ b/fiori/app/browse/webapp/manifest.json
@@ -11,7 +11,7 @@
    },
    "dataSources": {
      "CatalogService": {
-        "uri": "/browse/",
+        "uri": "browse/",
        "type": "OData",
        "settings": {
          "odataVersion": "4.0"
@@ -32,7 +32,7 @@
                "renameTo": "ID"
              },
              "Authors.books.ID": {
-                "renameTo": "ID"                    
+                "renameTo": "ID"
              }
            },
            "additionalParameters": "ignored"
@@ -53,6 +53,10 @@
    }
  },
  "sap.ui5": {
+    "flexEnabled": true,
+    "config": {           
+      "experimentalCAPScenario": true
+      },
    "dependencies": {
      "minUI5Version": "1.81.0",
      "libs": {
--- a/fiori/app/fiori-apps.html
+++ b/fiori/app/fiori-apps.html
@@ -10,19 +10,37 @@
 	<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>

 	<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"
-    	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"
-    	data-sap-ui-frameOptions="allow"
+			data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
+			data-sap-ui-compatVersion="edge"
+			data-sap-ui-theme="sap_horizon"
+			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>
--- a/fiori/package.json
+++ b/fiori/package.json
@@ -3,9 +3,9 @@
  "version": "1.0.0",
  "dependencies": {
    "@capire/bookstore": "*",
-    "@sap/cds": "^5",
+    "@sap/cds": ">=5",
    "express": "^4.17.1",
-    "passport": "^0.4.1"
+    "passport": ">=0.4.1"
  },
  "scripts": {
    "start": "cds run --in-memory?",
@@ -14,7 +14,7 @@
  "cds": {
    "requires": {
      "auth": {
-        "strategy": "dummy"
+        "kind": "dummy-auth"
      },
      "ReviewsService": {
        "kind": "odata",
@@ -36,7 +36,10 @@
        }
      },
      "db": {
-        "kind": "sql"
+        "kind": "sqlite",
+        "credentials": {
+          "database": "sqlite.db"
+        }
      },
      "db-ext": {
        "[development]": {
--- a/hello/package.json
+++ b/hello/package.json
@@ -7,11 +7,11 @@
    "start:ts": "cds-ts serve srv/world.cds"
  },
  "dependencies": {
-    "@sap/cds": "^5.0.4"
+    "@sap/cds": ">=5.0.4"
  },
  "devDependencies": {
-    "@types/jest": "^27.0.2",
-    "@types/node": "^16.11.6",
+    "@types/jest": "*",
+    "@types/node": "*",
    "ts-jest": "^27.0.2",
    "typescript": "^4.3.5"
  },
--- a/orders/app/orders/index.html
+++ b/orders/app/orders/index.html
@@ -25,10 +25,10 @@

 	<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"
-    	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"
-    	data-sap-ui-frameOptions="allow"
+			data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
+			data-sap-ui-compatVersion="edge"
+			data-sap-ui-theme="sap_horizon"
+			data-sap-ui-frameOptions="allow"
 	></script>
 	<script>
 		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"))
--- a/orders/package.json
+++ b/orders/package.json
@@ -3,6 +3,6 @@
  "version": "1.0.0",
  "dependencies": {
    "@capire/common": "*",
-    "@sap/cds": "^5"
+    "@sap/cds": ">=5"
  }
 }
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -14,13 +14,14 @@
    "@capire/media": "./media",
    "@capire/orders": "./orders",
    "@capire/reviews": "./reviews",
-    "@sap/cds": "^5.5.3"
+    "@sap/cds": ">=5.5.3"
  },
  "devDependencies": {
    "chai": "^4.3.4",
    "chai-as-promised": "^7.1.1",
    "chai-subset": "^1.6.0",
-    "sqlite3": "npm:@mendix/sqlite3@^5"
+    "semver": "^7",
+    "sqlite3": "^5"
  },
  "scripts": {
    "cleanup": "rm -rf node_modules && rm -rf */node_modules && rm -rf */*/node_modules",
--- a/reviews/app/vue/app.js
+++ b/reviews/app/vue/app.js
@@ -4,21 +4,21 @@ const GET = (url) => axios.get('/reviews'+url)
 const PUT = (cmd,data) => axios.patch('/reviews'+cmd,data)
 const POST = (cmd,data) => axios.post('/reviews'+cmd,data)

-const reviews = new Vue ({
+const reviews = Vue.createApp ({

-    el:'#app',
-
-    data: {
-        list: [],
-        review: undefined,
-        message: {},
-        Ratings: Object.entries({
+    data() {
+        return {
+          list: [],
+          review: undefined,
+          message: {},
+          Ratings: Object.entries({
            5 : '★★★★★',
            4 : '★★★★',
            3 : '★★★',
            2 : '★★',
            1 : '★',
-        }).reverse()
+          }).reverse()
+        }
    },

    methods: {
@@ -66,7 +66,7 @@ const reviews = new Vue ({
        datetime: (d) => d && new Date(d).toLocaleString(),
    },

-})
+}).mount("#app")

 // initially fill list of my reviews
 reviews.fetch()
--- a/reviews/app/vue/index.html
+++ b/reviews/app/vue/index.html
@@ -5,7 +5,7 @@
    <title> Capire Reviews </title>
    <link rel="stylesheet" href="https://unpkg.com/primitive-ui/dist/css/main.css">
    <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/vue"></script>
+    <script src="https://cdn.jsdelivr.net/npm/vue@3/dist/vue.global.prod.js"></script>
    <style>
        .hovering tr:hover td { color:cyan; background: #123; cursor: pointer; }
        .rating-stars { color:teal }
@@ -18,7 +18,7 @@
 <body class="small-container", style="margin-top: 70px;">
 <div id='app'>

-    <h1> {{ document.title }} </h1>
+    <h1> Capire Reviews </h1>

    <input type="text" placeholder="Search..." @input="search">

--- a/reviews/package.json
+++ b/reviews/package.json
@@ -7,7 +7,7 @@
    "index.cds"
  ],
  "dependencies": {
-    "@sap/cds": "^5",
+    "@sap/cds": ">=5",
    "express": "^4.17.1"
  },
  "cds": {
--- a/test/cds.ql.test.js
+++ b/test/cds.ql.test.js
@@ -81,6 +81,8 @@ describe('cds.ql → cqn', () => {
      .to.eql(SELECT('Foo','Boo').from('Bar'))
      .to.eql(SELECT(['Foo','Boo']).from('Bar'))
      .to.eql(SELECT `Bar` .columns `Foo, Boo`)
+      .to.eql(SELECT `Bar` .columns `{ Foo, Boo }`)
+      .to.eql(SELECT `Bar` .columns ('{ Foo, Boo }'))
      .to.eql(SELECT `Bar` .columns ('Foo','Boo'))
      .to.eql(SELECT `Bar` .columns (['Foo','Boo']))
      .to.eql(SELECT.from `Bar` .columns ('Foo','Boo'))
--- a/test/consuming-services.test.js
+++ b/test/consuming-services.test.js
@@ -1,7 +1,7 @@
 const cds = require('@sap/cds/lib')
 const { expect } = cds.test ('@capire/bookshop')

-describe('Consuming Services locally', () => {
+describe('cap/samples - Consuming Services locally', () => {
  //
  it('bootstrapped the database successfully', ()=>{
    const { AdminService } = cds.services
@@ -32,6 +32,27 @@ describe('Consuming Services locally', () => {
            })
        })
    }).where(`name like`, 'E%')
+    if (require('semver').gte(cds.version, '5.9.0')) {
+      expect(authors).to.containSubset([
+        {
+          name: 'Emily Brontë',
+          books: [
+            {
+              title: 'Wuthering Heights',
+              currency: { name: 'British Pound', symbol: '£' },
+            },
+          ],
+        },
+        {
+          name: 'Edgar Allen Poe',
+          books: [
+            { title: 'The Raven', currency: { name: 'US Dollar', symbol: '$' } },
+            { title: 'Eleonora', currency: { name: 'US Dollar', symbol: '$' } },
+          ],
+        },
+      ])
+      return
+    }
    expect(authors).to.containSubset([
      {
        name: 'Emily Brontë',
--- a/test/custom-handlers.test.js
+++ b/test/custom-handlers.test.js
@@ -3,7 +3,7 @@ const { GET, POST, expect } = cds.test(__dirname+'/../bookshop')
 if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
 else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases

-describe('Custom Handlers', () => {
+describe('cap/samples - Custom Handlers', () => {

  it('should reject out-of-stock orders', async () => {
    await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`
--- a/test/hello-world.test.js
+++ b/test/hello-world.test.js
@@ -1,7 +1,7 @@
 const cds = require('@sap/cds/lib')
 const { GET, expect } = cds.test (__dirname+'/../hello')

-describe('Hello world!', () => {
+describe('cap/samples - Hello world!', () => {

  it('should say hello with class impl', async () => {
    const {data} = await GET `/say/hello(to='world')`
--- a/test/hierarchical-data.test.js
+++ b/test/hierarchical-data.test.js
@@ -13,7 +13,7 @@ const model = cds.compile.to.csn (`
 const {Categories:Cats} = model.definitions


-describe('Hierarchical Data', ()=>{
+describe('cap/samples - Hierarchical Data', ()=>{

 	before ('bootstrap sqlite in-memory db...', async()=>{
 		await cds.deploy (model) .to ('sqlite::memory:')
@@ -35,6 +35,21 @@ describe('Hierarchical Data', ()=>{
  ))

 	it ('supports nested reads', async()=>{
+		if (require('semver').gte(cds.version, '5.9.0')) {
+			expect (await
+				SELECT.one.from (Cats, c=>{
+					c.ID, c.name.as('parent'), c.children (c=>{
+						c.name.as('child')
+					})
+				}) .where ({name:'Cat'})
+			) .to.eql (
+				{ ID:101, parent:'Cat', children:[
+					{ child:'Kitty' },
+					{ child:'Catwoman' },
+				]}
+			)
+			return
+		}
 		expect (await
 			SELECT.one.from (Cats, c=>{
 				c.ID, c.name.as('parent'), c.children (c=>{
@@ -50,6 +65,25 @@ describe('Hierarchical Data', ()=>{
 	})

 	it ('supports deeply nested reads', async()=>{
+		if (require('semver').gte(cds.version, '5.9.0')) {
+			expect (await SELECT.one.from (Cats, c=>{
+				c.ID, c.name, c.children (
+					c => { c.name },
+					{levels:3}
+				)
+			}) .where ({name:'Cat'})
+			) .to.eql (
+				{ ID:101, name:'Cat', children:[
+					{ name:'Kitty', children:[
+						{ name:'Kitty Cat', children:[
+							{ name:'Aristocat' }, ]},  // level 3
+						{ name:'Kitty Bat', children:[] }, ]},
+					{ name:'Catwoman', children:[
+						{ name:'Catalina', children:[] } ]},
+				]}
+			)
+			return
+		}
 		expect (await SELECT.one.from (Cats, c=>{
 			c.ID, c.name, c.children (
 				c => { c.name },
--- a/test/localized-data/services.test.js
+++ b/test/localized-data/services.test.js
@@ -2,7 +2,7 @@ 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('Localized Data', () => {
+describe('cap/samples - Localized Data', () => {

  it('serves localized $metadata documents', async () => {
    const { data } = await GET`/browse/$metadata?sap-language=de`
--- a/test/messaging.test.js
+++ b/test/messaging.test.js
@@ -4,7 +4,7 @@ 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('Messaging', ()=>{
+describe('cap/samples - Messaging', ()=>{

    it ('should bootstrap sqlite in-memory db', async()=>{
        const db = await cds.deploy (_model) .to ('sqlite::memory:')
--- a/test/odata.test.js
+++ b/test/odata.test.js
@@ -1,9 +1,48 @@
 const cds = require('@sap/cds/lib')
-const { GET, expect } = cds.test ('@capire/bookshop')
-if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
-else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
+const { GET, expect, axios } = cds.test ('@capire/bookshop')
+axios.defaults.auth = { username: 'alice', password: 'admin' }

-describe('OData Protocol', () => {
+describe('cap/samples - Bookshop APIs', () => {
+
+  // Genres
+  const Drama = {
+    "name": "Drama",
+    "descr": null,
+    "ID": 11,
+    "parent_ID": 10
+  }
+  const Mystery = {
+    "name": "Mystery",
+    "descr": null,
+    "ID": 16,
+    "parent_ID": 10
+  }
+  const Fantasy = {
+    "name": "Fantasy",
+    "descr": null,
+    "ID": 13,
+    "parent_ID": 10
+  }
+
+  // Currencies
+  const GBP = {
+    "name": "British Pound",
+    "descr": null,
+    "code": "GBP",
+    "symbol": "£"
+  }
+  const USD = {
+    "name": "US Dollar",
+    "descr": null,
+    "code": "USD",
+    "symbol": "$"
+  }
+  const JPY = {
+    "name": "Yen",
+    "descr": null,
+    "code": "JPY",
+    "symbol": "¥"
+  }


  it('serves $metadata documents in v4', async () => {
@@ -17,6 +56,16 @@ describe('OData Protocol', () => {
    expect(data).to.contain('<Annotation Term="Common.Label" String="Currency"/>')
  })

+  it('serves ListOfBooks?$expand=genre,currency', async () => {
+    const { data } = await GET `/browse/ListOfBooks ${{
+      params: { $search: 'Po', $select: `title,author`, $expand:`genre,currency` },
+    }}`
+    expect(data.value).to.eql([
+      { ID: 251, title: 'The Raven', author: 'Edgar Allen Poe', genre:Mystery, currency:USD  },
+      { ID: 252, title: 'Eleonora', author: 'Edgar Allen Poe', genre:Mystery, currency:USD  },
+    ])
+  })
+
  it('supports $search in multiple fields', async () => {
    const { data } = await GET `/browse/Books ${{
      params: { $search: 'Po', $select: `title,author` },
@@ -75,4 +124,16 @@ describe('OData Protocol', () => {
      { ID: 271, title: 'Catweazle' },
    ])
  })
+
+  it('serves user info', async () => {
+    {
+      const { data } = await GET (`/user/me`)
+      expect(data).to.containSubset({ id: 'alice', locale:'en', tenant: null })
+    }
+    {
+      const { data } = await GET (`/user/me`, {auth: { username: 'joe' }})
+      expect(data).to.containSubset({ id: 'joe', locale:'en', tenant: null })
+    }
+  })
+
 })
--- a/test/registry.test.js
+++ b/test/registry.test.js
@@ -6,7 +6,7 @@ const { resolve } = require('path')
 const verbose = process.env.CDS_TEST_VERBOSE
 // ||true

-describe('Local NPM registry', () => {
+describe('cap/samples - Local NPM registry', () => {
  let registry
  let axios
  const cwd = resolve(__dirname, '..')
@@ -20,7 +20,7 @@ describe('Local NPM registry', () => {

  after(() => { registry.kill() })

-  for (const mod of ['bookshop','fiori','orders','reviews']) {
+  for (const mod of ['bookshop', 'data-viewer', 'fiori','orders','reviews']) {
    it(`should serve ${mod}`, async () => {
      const resp = await axios.get(`/@capire/${mod}`)
      expect(resp.data).to.containSubset({name: `@capire/${mod}`, versions:{}})
Author	SHA1	Message	Date
nkaputnik	2f1af693c9	Finalize ToDo's	2022-07-28 15:29:53 +02:00
nkaputnik	d2ab511d6d	Package.json	2022-07-28 14:58:32 +02:00
nkaputnik	6c27228d62	Sandbox API with Application Service	2022-07-28 14:55:37 +02:00
nkaputnik	44880c7745	Better Sandbox API	2022-07-28 14:54:08 +02:00
nkaputnik	9c2a7598f2	First push	2022-07-26 09:47:56 +02:00
nkaputnik	9617e576f0	First push	2022-07-26 09:47:30 +02:00
nkaputnik	c3c9dae80d	First push	2022-07-26 09:45:34 +02:00
nkaputnik	2b6d4c625e	First push	2022-05-06 11:09:04 +02:00
nkaputnik	7d46db42ec	First push	2022-05-06 11:05:33 +02:00
dependabot[bot]	df57a9d8d0	Bump sqlite3 from 5.0.5 to 5.0.6 Bumps [sqlite3](https://github.com/TryGhost/node-sqlite3) from 5.0.5 to 5.0.6. - [Release notes](https://github.com/TryGhost/node-sqlite3/releases) - [Changelog](https://github.com/TryGhost/node-sqlite3/blob/master/CHANGELOG.md) - [Commits](https://github.com/TryGhost/node-sqlite3/compare/v5.0.5...v5.0.6) --- updated-dependencies: - dependency-name: sqlite3 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-04-28 14:19:35 +02:00
dependabot[bot]	2d92b851f1	Bump @sap/cds from 5.9.2 to 5.9.3 Bumps [@sap/cds](https://cap.cloud.sap/) from 5.9.2 to 5.9.3. --- updated-dependencies: - dependency-name: "@sap/cds" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-04-27 15:42:39 +02:00
dependabot[bot]	e157fc8a92	Bump sqlite3 from 5.0.4 to 5.0.5 Bumps [sqlite3](https://github.com/TryGhost/node-sqlite3) from 5.0.4 to 5.0.5. - [Release notes](https://github.com/TryGhost/node-sqlite3/releases) - [Changelog](https://github.com/TryGhost/node-sqlite3/blob/master/CHANGELOG.md) - [Commits](https://github.com/TryGhost/node-sqlite3/compare/v5.0.4...v5.0.5) --- updated-dependencies: - dependency-name: sqlite3 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-04-25 14:37:35 +02:00
Christian Georgi	3b69a80975	Use original sqlite3 again	2022-04-20 09:00:05 +02:00
dependabot[bot]	b80ba7445d	Bump semver from 7.3.6 to 7.3.7 Bumps [semver](https://github.com/npm/node-semver) from 7.3.6 to 7.3.7. - [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.6...v7.3.7) --- updated-dependencies: - dependency-name: semver dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-04-13 14:24:24 +02:00
Daniel	b733643f2a	fixed accidential push	2022-04-09 12:38:24 +02:00
Daniel	bf317bc2c9	fixed	2022-04-09 11:54:12 +02:00
Daniel	bbebff4066	.	2022-04-08 19:52:26 +02:00
dependabot[bot]	eb75394044	Bump @sap/cds from 5.9.1 to 5.9.2 Bumps [@sap/cds](https://cap.cloud.sap/) from 5.9.1 to 5.9.2. --- updated-dependencies: - dependency-name: "@sap/cds" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-04-08 12:35:56 +02:00
dependabot[bot]	b8f65b687f	Bump semver from 7.3.5 to 7.3.6 Bumps [semver](https://github.com/npm/node-semver) from 7.3.5 to 7.3.6. - [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.5...v7.3.6) --- updated-dependencies: - dependency-name: semver dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-04-08 12:33:12 +02:00
Daniel	c49c9691bd	.	2022-04-06 15:29:46 +02:00
Daniel	7e4bc0985e	Revert change to npm workspaces This PARTIALLY reverts commit `912271338d`.	2022-04-06 13:17:51 +02:00
Daniel Hutzel	912271338d	Prepare for cds6 (#341 )	2022-04-05 16:30:04 +02:00
Daniel Hutzel	bbf1194a09	Cosmetics to test outlines (#340 )	2022-04-03 12:36:11 +02:00
dependabot[bot]	529c431518	Bump @sap/cds from 5.9.0 to 5.9.1 Bumps [@sap/cds](https://cap.cloud.sap/) from 5.9.0 to 5.9.1. --- updated-dependencies: - dependency-name: "@sap/cds" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-04-01 14:51:22 +02:00
Christian Georgi	3f85676edd	Registry to handle packages with dashes Like `@capire/data-viewer`, resulting in requests like `GET /capire-data-viewer-0.1.0.tgz`	2022-04-01 11:49:28 +02:00
Daniel	959c07cee3	minor cosmetics for user service	2022-03-31 09:49:47 +02:00
Daniel	8cc09fde38	Fixed SELECT...columns `{ foo, bar }`	2022-03-28 14:44:06 +02:00
Christian Georgi	bb55c432c9	Bookshop showing user info Show current user name, locale and tenant (if available). Useful in deployments w/ real auth and tenant contexts.	2022-03-28 14:36:32 +02:00
dependabot[bot]	5fc86d45ad	Bump minimist from 1.2.5 to 1.2.6 Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-03-28 14:31:42 +02:00
Steffen Waldmann	e86d0dc3a2	Use cds.requires.auth.kind instead of cds.requires.auth.strategy As recently discussed, this is the preferred version as opposed to the legacy `cds.requires.auth.strategy`.	2022-03-28 14:29:58 +02:00
dependabot[bot]	a661fb2d45	Bump @sap/cds from 5.8.4 to 5.9.0 Bumps [@sap/cds](https://cap.cloud.sap/) from 5.8.4 to 5.9.0. --- updated-dependencies: - dependency-name: "@sap/cds" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-03-28 14:26:16 +02:00
Christian Georgi	bfe0c831d6	Relative Fiori dataSource URLs Since this is what 'real' Fiori apps use as well, to allow serving from FLP. CDS's fiori helper takes care that they work w/o FLP as well.	2022-03-28 13:31:58 +02:00
dependabot[bot]	cad615a662	Bump @sap/cds from 5.8.3 to 5.8.4 Bumps [@sap/cds](https://cap.cloud.sap/) from 5.8.3 to 5.8.4. --- updated-dependencies: - dependency-name: "@sap/cds" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-03-17 15:07:20 +01:00
Christian Georgi	7101c58920	Use new horizon theme of Fiori	2022-03-02 15:48:58 +01:00
dependabot[bot]	07dc1e88b3	Bump @sap/cds from 5.8.2 to 5.8.3 Bumps [@sap/cds](https://cap.cloud.sap/) from 5.8.2 to 5.8.3. --- updated-dependencies: - dependency-name: "@sap/cds" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-03-02 11:40:49 +01:00
dependabot[bot]	6f8d74dc9a	Bump @sap/cds from 5.8.1 to 5.8.2 Bumps [@sap/cds](https://cap.cloud.sap/) from 5.8.1 to 5.8.2. --- updated-dependencies: - dependency-name: "@sap/cds" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-03-01 14:57:33 +01:00
Christian Georgi	ec57c5ea48	Enable dependency updates	2022-03-01 14:53:44 +01:00
Christian Georgi	c040a47279	Merge pull request #326 from MikhailGoncharov/followup-324 Follow-up #324: better version handling	2022-02-21 09:45:44 +01:00
Christian Georgi	30bfd70c49	Update package-lock	2022-02-21 09:42:12 +01:00
Mikhail Goncharov	6fb9581cf1	Update package.json	2022-02-17 10:39:18 +01:00
Mikhail Goncharov	e87d6cdfc5	Update devDependencies	2022-02-17 10:35:35 +01:00
Mikhail Goncharov	29ea2bc2da	Better version handling	2022-02-17 10:09:43 +01:00
Heiko Witteborg	12574271ac	Merge pull request #324 from MikhailGoncharov/service-api-read-no-keys-if-not-asked Fixed eagerly read IDs (CAP !== OData)	2022-02-17 08:53:01 +01:00
Mikhail Goncharov	17b5cc1ad2	Merge branch 'main' into service-api-read-no-keys-if-not-asked	2022-02-15 08:56:08 +01:00
Daniel Hutzel	26ca7f54ad	Specified files in package.json (#325 )	2022-02-15 01:33:02 +01:00
dependabot[bot]	573e78253d	Merge pull request #323 from SAP-samples/dependabot/npm_and_yarn/follow-redirects-1.14.8	2022-02-14 12:02:04 +00:00
Mikhail Goncharov	a7511ed677	Sync with cds runtime for next release	2022-02-14 12:06:22 +01:00
dependabot[bot]	f1289b436b	Bump follow-redirects from 1.14.7 to 1.14.8 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-02-14 10:32:09 +00:00
Dr. David A. Kunz	984ea2133b	Merge pull request #322 from SAP-samples/fix-change-to-vue3 Changes in Vue 3 and stable version	2022-02-09 10:23:27 +01:00
D065023	179d301acb	Use stable URI	2022-02-09 10:12:41 +01:00
D065023	bbf20b1ca3	Change to Vue 3	2022-02-09 10:10:19 +01:00