Merge branch 'main' into fiori-ext

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.7.14 to 18.7.15.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  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,

.gitignore

@@ -18,3 +18,5 @@ reviews/msg-box
 reviews/db/test.db
 
 *.openapi3.json
+*.sqlite
+*.db

.registry/server.js

@@ -1,27 +1,34 @@
-const { exec } = require ('child_process')
+const { exec, execSync } = require ('child_process')
 const isWin = process.platform === 'win32'
 const express = require ('express')
 const fs = require ('fs')
+const { dirname, relative } = require('path')
+const axios = require('axios')
 const app = express()
 
-const { PORT=4444 } = process.env
-const [,,port=PORT,scope='@capire'] = process.argv
 const cwd = __dirname
+const port=process.env.PORT || 4444
+let scopes = process.argv.filter(a => a.startsWith('@'))
+if (!scopes.length)  scopes = ['@capire']
 
 // clean up on start (exit handler might not complete on Windows)
 exec(isWin ? 'del *.tgz' : 'rm *.tgz', {cwd})
 
 
-app.use('/-/:tarball', (req,res,next) => {
+app.use('/-/:tarball', async (req,res,next) => {
   console.debug ('GET', req.params)
   try {
     const { tarball } = req.params
     const pkgFull = tarball.substring(0, tarball.lastIndexOf('-'))
-    const [, pkg ] = /^\w+-(.+)/.exec(pkgFull)
+    const scope = '@'+pkgFull.substring(0, pkgFull.indexOf('-'))
+    const pkg = pkgFull.substring(pkgFull.indexOf('-')+1)
     fs.lstat(tarball,(err => {
-      if (err) console.debug (`npm pack ../${pkg}`)
-      if (err) exec(`npm pack ../${pkg}`,{cwd},next)
-      else next()
+      if (err) { // no tgz yet
+        const loc = dirname(require.resolve(`${scope}/${pkg}/package.json`))
+        console.debug (`npm pack ${relative(cwd, loc)}`)
+        exec(`npm pack ${loc}`,{cwd},next)
+      }
+      else next() //> express.static below
     }))
   } catch (e) {
     console.error(e)
@@ -31,14 +38,20 @@ app.use('/-/:tarball', (req,res,next) => {
 
 app.use('/-', express.static(__dirname))
 
-app.get('/*', (req,res)=>{
+app.get('/*', async (req,res)=>{
   const urlRegex = /^\/(@[\w-]+)\/(.+)/
   const url = decodeURIComponent(req.url)
   console.debug ('GET',url)
   try {
     if (!urlRegex.test(url))  return res.sendStatus(404)
     const [, scpe, pkg ] = urlRegex.exec(url)
-    const package = require (`${scpe}/${pkg}/package.json`)
+    const packageName = `${scpe}/${pkg}`
+
+    // delegate to default registry for @sap/non-cds packages
+    if (scpe === ('@sap') && !packageName.startsWith('@sap/cds')) {
+      return forward(req, res)
+    }
+    const package = require (`${packageName}/package.json`)
     const tarball = `${scpe.slice(1)}-${pkg}-${package.version}.tgz`
     // https://github.com/npm/registry/blob/master/docs/responses/package-metadata.md
     res.json({
@@ -53,6 +66,8 @@ app.get('/*', (req,res)=>{
           "dist": {
             "tarball": `${server.url}/-/${tarball}`
           },
+          dependencies: package.dependencies,
+          devDependencies: package.devDependencies
         }
       },
     })
@@ -64,15 +79,32 @@ app.get('/*', (req,res)=>{
 
 const server = app.listen(port, ()=>{
   const url = server.url = `http://localhost:${server.address().port}`
-  console.log (`npm set ${scope}:registry=${url}`)
-  exec(`npm set ${scope}:registry=${url}`)
-  console.log (`${scope} registry listening on ${url}`)
+
+  for (const scope of scopes) {
+    console.log (`npm set ${scope}:registry=${url}`)
+    execSync(`npm set ${scope}:registry=${url}`)
+  }
+  console.log (`registry listening on ${url}`)
 })
 
 
 const _exit = ()=>{
   server.close()
-  exec(`npm conf rm "${scope}:registry"`, ()=> { process.exit() })
+  for (const scope of scopes) {
+    execSync(`npm conf rm "${scope}:registry"`)
+  }
+  process.exit()
+}
+
+async function forward(req, res) {
+  try {
+    const url = `https://registry.npmjs.org${req.url}`
+    const resAxios = await axios.get(url)
+    console.debug('->', decodeURI(url), resAxios.status)
+    return res.json(resAxios.data)
+  } catch (e) {
+    return res.sendStatus(e.response.status)
+  }
 }
 
 process.on ('SIGTERM',_exit)

.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"
+  ]
+}

bookshop/@types/_/index.js

@@ -1,3 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('_')

bookshop/@types/_/index.ts

@@ -1,35 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-
-
-export namespace Association {
-    export type to <T> = T & ((fn:(a:T)=>any) => T)
-    export namespace to {
-        // type many <T> = T[] & (T extends (infer R)[] ? R[] & ((fn:(a:R)=>any) => R[]) : T[]);
-        export type many <T extends readonly unknown[]> = T & ((fn:(a:T[number])=>any) => T[number]);
-    }
-}
-
-export namespace Composition {
-    export type of <T> = T & ((fn:(a:T)=>any) => T)
-    export namespace of {
-        //type many <T> = T[] & (T extends (infer R)[] ? R[] & ((fn:(a:R)=>any) => R[]) : T[]);
-        export type many <T extends readonly unknown[]> = T & ((fn:(a:T[number])=>any) => T[number]);
-    }
-}
-
-export class Entity {
-    static data<T extends Entity> (this:T, input:Object) : T { 
-        return {} as T // mock
-    } 
-}
-  
-export type EntitySet<T> = T[] & {
-    data (input:object[]) : T[]
-    data (input:object) : T
-}
-
-
-
-
-
-

bookshop/@types/index.js

@@ -1,3 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('')

bookshop/@types/index.ts

@@ -1,57 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as _sap_common from './sap/common';
-import * as __ from './_';
-
-export type Language = __.Association.to<_sap_common.Language>;
-export type Currency = __.Association.to<_sap_common.Currency>;
-export type Country = __.Association.to<_sap_common.Country>;
-export type User = string;
-
-
-// the following represents the CDS aspect 'cuid'
-export function cuid<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class cuidAspect extends Base {
-    ID: string;
-  };
-}
-const cuidXtended = cuid(__.Entity)
-export type cuid = InstanceType<typeof cuidXtended>
-
-// the following represents the CDS aspect 'managed'
-export function managed<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class managedAspect extends Base {
-    createdAt: Date;
-    /**
-    * Canonical user ID
-    */
-    createdBy: User;
-    modifiedAt: Date;
-    /**
-    * Canonical user ID
-    */
-    modifiedBy: User;
-  };
-}
-const managedXtended = managed(__.Entity)
-export type managed = InstanceType<typeof managedXtended>
-
-// the following represents the CDS aspect 'temporal'
-export function temporal<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class temporalAspect extends Base {
-    validFrom: Date;
-    validTo: Date;
-  };
-}
-const temporalXtended = temporal(__.Entity)
-export type temporal = InstanceType<typeof temporalXtended>
-
-// the following represents the CDS aspect 'extensible'
-export function extensible<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class extensibleAspect extends Base {
-    extensions__: string;
-  };
-}
-const extensibleXtended = extensible(__.Entity)
-export type extensible = InstanceType<typeof extensibleXtended>
-
-

bookshop/@types/sap/capire/bookshop/index.js

@@ -1,9 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('sap.capire.bookshop')
-module.exports.Book = cson.Books
-module.exports.Books = cson.Books
-module.exports.Author = cson.Authors
-module.exports.Authors = cson.Authors
-module.exports.Genre = cson.Genres
-module.exports.Genres = cson.Genres

bookshop/@types/sap/capire/bookshop/index.ts

@@ -1,66 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as __ from './../../../_';
-import * as _ from './../../..';
-import * as _sap_common from './../../common';
-
-
-
-
-
-export function Book<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class BookAspect extends Base {
-    ID: number;
-    title: string;
-    descr: string;
-    author: __.Association.to<Author>;
-    genre: __.Association.to<Genre>;
-    stock: number;
-    price: number;
-    /**
-    * Type for an association to Currencies
-    * 
-    * See https://cap.cloud.sap/docs/cds/common#type-currency
-    */
-    currency: __.Association.to<_.Currency>;
-    image: string;
-  };
-}
-const BookXtended = _.managed(Book(__.Entity))
-export type Book = InstanceType<typeof BookXtended>
-
-export class Books extends Array<Book> {
-}
-
-export function Author<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class AuthorAspect extends Base {
-    ID: number;
-    name: string;
-    dateOfBirth: Date;
-    dateOfDeath: Date;
-    placeOfBirth: string;
-    placeOfDeath: string;
-    books: __.Association.to.many<Books>;
-  };
-}
-const AuthorXtended = _.managed(Author(__.Entity))
-export type Author = InstanceType<typeof AuthorXtended>
-
-export class Authors extends Array<Author> {
-}
-
-/**
-* Hierarchically organized Code List for Genres
-*/
-export function Genre<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class GenreAspect extends Base {
-    ID: number;
-    parent: __.Association.to<Genre>;
-    children: __.Composition.of.many<Genres>;
-  };
-}
-const GenreXtended = _sap_common.CodeList(Genre(__.Entity))
-export type Genre = InstanceType<typeof GenreXtended>
-
-export class Genres extends Array<Genre> {
-}
-

bookshop/@types/sap/common/index.js

@@ -1,9 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('sap.common')
-module.exports.Language = cson.Languages
-module.exports.Languages = cson.Languages
-module.exports.Country = cson.Countries
-module.exports.Countries = cson.Countries
-module.exports.Currency = cson.Currencies
-module.exports.Currencies = cson.Currencies

bookshop/@types/sap/common/index.ts

@@ -1,68 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as __ from './../../_';
-
-export type Locale = string;
-
-
-// the following represents the CDS aspect 'CodeList'
-export function CodeList<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class CodeListAspect extends Base {
-    name: string;
-    descr: string;
-  };
-}
-const CodeListXtended = CodeList(__.Entity)
-export type CodeList = InstanceType<typeof CodeListXtended>
-
-/**
-* Code list for languages
-* 
-* See https://cap.cloud.sap/docs/cds/common#entity-sapcommonlanguages
-*/
-export function Language<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class LanguageAspect extends Base {
-    /**
-    * Type for a language code
-    */
-    code: Locale;
-  };
-}
-const LanguageXtended = CodeList(Language(__.Entity))
-export type Language = InstanceType<typeof LanguageXtended>
-
-export class Languages extends Array<Language> {
-}
-
-/**
-* Code list for countries
-* 
-* See https://cap.cloud.sap/docs/cds/common#entity-sapcommoncountries
-*/
-export function Country<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class CountryAspect extends Base {
-    code: string;
-  };
-}
-const CountryXtended = CodeList(Country(__.Entity))
-export type Country = InstanceType<typeof CountryXtended>
-
-export class Countries extends Array<Country> {
-}
-
-/**
-* Code list for currencies
-* 
-* See https://cap.cloud.sap/docs/cds/common#entity-sapcommoncurrencies
-*/
-export function Currency<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class CurrencyAspect extends Base {
-    code: string;
-    symbol: string;
-  };
-}
-const CurrencyXtended = CodeList(Currency(__.Entity))
-export type Currency = InstanceType<typeof CurrencyXtended>
-
-export class Currencies extends Array<Currency> {
-}
-

bookshop/app/vue/app.js

@@ -56,7 +56,7 @@ const books = Vue.createApp ({
             } catch (err) { books.user = { id: err.message } }
         },
     }
-}).mount("#app")
+}).mount('#app')
 
 books.getUserInfo()
 books.fetch() // initially fill list of books
@@ -65,3 +65,25 @@ 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/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/jsconfig.json

@@ -1,5 +0,0 @@
-{
-  "compilerOptions": {
-    "checkJs": true
-  }
-}

bookshop/package.json

@@ -21,9 +21,7 @@
   },
   "cds": {
     "requires": {
-      "db": {
-        "kind": "sql"
-      }
+      "db": "sql"
     }
   }
 }

bookshop/srv/admin-service.js

@@ -1,9 +1,10 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')
 
-module.exports = cds.service.impl (function(){
+module.exports = class AdminService extends cds.ApplicationService { init(){
   this.before ('NEW','Authors', genid)
   this.before ('NEW','Books', genid)
-})
+  return super.init()
+}}
 
 /** Generate primary keys for target entity in request */
 async function genid (req) {

bookshop/srv/cat-service.js

@@ -2,8 +2,8 @@ const cds = require('@sap/cds')
 
 class CatalogService extends cds.ApplicationService { init(){
 
-  //const { Books } = this.entities ('sap.capire.bookshop')
-  const { Books, Book } = require('../@types/sap/capire/bookshop')
+  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 => {
@@ -19,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/user-service.cds

@@ -5,7 +5,7 @@ service UserService {
   /**
    * The current user
    */
-  @odata.singleton entity me {
+  @odata.singleton entity me @cds.persistence.skip {
     id     : String; // user id
     locale : String;
     tenant : String;

bookstore/@types/AdminService/index.js

@@ -1,7 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('AdminService')
-module.exports.Book = cson.Books
-module.exports.Books = cson.Books
-module.exports.Author = cson.Authors
-module.exports.Authors = cson.Authors

bookstore/@types/AdminService/index.ts

@@ -1,54 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as _sap_capire_bookshop from './../sap/capire/bookshop';
-import * as __ from './../_';
-import * as _ from './..';
-import * as _ReviewsService from './../ReviewsService';
-
-
-
-
-
-export function Book<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class BookAspect extends Base {
-    ID: number;
-    title: string;
-    descr: string;
-    author: __.Association.to<_sap_capire_bookshop.Author>;
-    genre: __.Association.to<_sap_capire_bookshop.Genre>;
-    stock: number;
-    price: number;
-    /**
-    * Type for an association to Currencies
-    * 
-    * See https://cap.cloud.sap/docs/cds/common#type-currency
-    */
-    currency: __.Association.to<_.Currency>;
-    image: string;
-    reviews: __.Composition.of.many<_ReviewsService.Reviews>;
-    rating: number;
-    numberOfReviews: number;
-  };
-}
-const BookXtended = _.managed(Book(__.Entity))
-export type Book = InstanceType<typeof BookXtended>
-
-export class Books extends Array<Book> {
-}
-
-export function Author<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class AuthorAspect extends Base {
-    ID: number;
-    name: string;
-    dateOfBirth: Date;
-    dateOfDeath: Date;
-    placeOfBirth: string;
-    placeOfDeath: string;
-    books: __.Association.to.many<_sap_capire_bookshop.Books>;
-  };
-}
-const AuthorXtended = _.managed(Author(__.Entity))
-export type Author = InstanceType<typeof AuthorXtended>
-
-export class Authors extends Array<Author> {
-}
-

bookstore/@types/CatalogService/index.js

@@ -1,7 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('CatalogService')
-module.exports.ListOfBook = cson.ListOfBooks
-module.exports.ListOfBooks = cson.ListOfBooks
-module.exports.Book = cson.Books
-module.exports.Books = cson.Books

bookstore/@types/CatalogService/index.ts

@@ -1,72 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as _sap_capire_bookshop from './../sap/capire/bookshop';
-import * as __ from './../_';
-import * as _ from './..';
-import * as _ReviewsService from './../ReviewsService';
-
-
-
-
-
-/**
-* For displaying lists of Books
-*/
-export function ListOfBook<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class ListOfBookAspect extends Base {
-    ID: number;
-    title: string;
-    descr: string;
-    author: __.Association.to<_sap_capire_bookshop.Author>;
-    genre: __.Association.to<_sap_capire_bookshop.Genre>;
-    stock: number;
-    price: number;
-    /**
-    * Type for an association to Currencies
-    * 
-    * See https://cap.cloud.sap/docs/cds/common#type-currency
-    */
-    currency: __.Association.to<_.Currency>;
-    image: string;
-    reviews: __.Composition.of.many<_ReviewsService.Reviews>;
-    rating: number;
-    numberOfReviews: number;
-  };
-}
-const ListOfBookXtended = _.managed(ListOfBook(__.Entity))
-export type ListOfBook = InstanceType<typeof ListOfBookXtended>
-
-export class ListOfBooks extends Array<ListOfBook> {
-}
-
-/**
-* For display in details pages
-*/
-export function Book<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class BookAspect extends Base {
-    ID: number;
-    title: string;
-    descr: string;
-    author: __.Association.to<_sap_capire_bookshop.Author>;
-    genre: __.Association.to<_sap_capire_bookshop.Genre>;
-    stock: number;
-    price: number;
-    /**
-    * Type for an association to Currencies
-    * 
-    * See https://cap.cloud.sap/docs/cds/common#type-currency
-    */
-    currency: __.Association.to<_.Currency>;
-    image: string;
-    reviews: __.Composition.of.many<_ReviewsService.Reviews>;
-    rating: number;
-    numberOfReviews: number;
-  };
-}
-const BookXtended = _.managed(Book(__.Entity))
-export type Book = InstanceType<typeof BookXtended>
-
-export class Books extends Array<Book> {
-}
-
-// action
-export declare const submitOrder: (book: Books, quantity: number) => {};

bookstore/@types/DataService/index.js

@@ -1,7 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('DataService')
-module.exports.Entity = cson.Entities
-module.exports.Entities = cson.Entities
-module.exports.Data = cson.Data
-module.exports.Data_ = cson.Data

bookstore/@types/DataService/index.ts

@@ -1,40 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as __ from './../_';
-
-
-
-
-
-/**
-* Metadata like name and columns/elements
-*/
-export function Entity<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class EntityAspect extends Base {
-    name: string;
-    columns: {
-    name: string;
-    type: string;
-    isKey: boolean;
-  };
-  };
-}
-const EntityXtended = Entity(__.Entity)
-export type Entity = InstanceType<typeof EntityXtended>
-
-export class Entities extends Array<Entity> {
-}
-
-/**
-* The actual data, organized by column name
-*/
-export function Data<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class DataAspect extends Base {
-    record: {};
-  };
-}
-const DataXtended = Data(__.Entity)
-export type Data = InstanceType<typeof DataXtended>
-
-export class Data_ extends Array<Data> {
-}
-

bookstore/@types/OrdersService/index.js

@@ -1,5 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('OrdersService')
-module.exports.Order = cson.Orders
-module.exports.Orders = cson.Orders

bookstore/@types/OrdersService/index.ts

@@ -1,39 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as _sap_capire_orders from './../sap/capire/orders';
-import * as __ from './../_';
-import * as _sap_capire_bookshop from './../sap/capire/bookshop';
-import * as _ from './..';
-
-
-
-
-
-export function Order<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class OrderAspect extends Base {
-    OrderNo: string;
-    Items: {
-    ID: string;
-    product: __.Association.to<_sap_capire_orders.Product>;
-    quantity: number;
-    title: string;
-    price: number;
-    book: __.Association.to<_sap_capire_bookshop.Book>;
-  };
-    /**
-    * Canonical user ID
-    */
-    buyer: _.User;
-    /**
-    * Type for an association to Currencies
-    * 
-    * See https://cap.cloud.sap/docs/cds/common#type-currency
-    */
-    currency: __.Association.to<_.Currency>;
-  };
-}
-const OrderXtended = _.cuid(_.managed(Order(__.Entity)))
-export type Order = InstanceType<typeof OrderXtended>
-
-export class Orders extends Array<Order> {
-}
-

bookstore/@types/ReviewsService/index.js

@@ -1,5 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('ReviewsService')
-module.exports.Review = cson.Reviews
-module.exports.Reviews = cson.Reviews

bookstore/@types/ReviewsService/index.ts

@@ -1,35 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as _sap_capire_reviews from './../sap/capire/reviews';
-import * as _ from './..';
-import * as __ from './../_';
-
-
-
-
-
-export function Review<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class ReviewAspect extends Base {
-    ID: string;
-    subject: _sap_capire_reviews.ReviewedSubject;
-    /**
-    * Canonical user ID
-    */
-    reviewer: _.User;
-    rating: _sap_capire_reviews.Rating;
-    title: string;
-    text: string;
-    date: Date;
-    likes: __.Composition.of.many<_sap_capire_reviews.Likes>;
-    liked: number;
-  };
-}
-const ReviewXtended = Review(__.Entity)
-export type Review = InstanceType<typeof ReviewXtended>
-
-export class Reviews extends Array<Review> {
-}
-
-// action
-export declare const like: (review: Reviews) => {};
-// action
-export declare const unlike: (review: Reviews) => {};

bookstore/@types/_/index.js

@@ -1,3 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('_')

bookstore/@types/_/index.ts

@@ -1,35 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-
-
-export namespace Association {
-    export type to <T> = T & ((fn:(a:T)=>any) => T)
-    export namespace to {
-        // type many <T> = T[] & (T extends (infer R)[] ? R[] & ((fn:(a:R)=>any) => R[]) : T[]);
-        export type many <T extends readonly unknown[]> = T & ((fn:(a:T[number])=>any) => T[number]);
-    }
-}
-
-export namespace Composition {
-    export type of <T> = T & ((fn:(a:T)=>any) => T)
-    export namespace of {
-        //type many <T> = T[] & (T extends (infer R)[] ? R[] & ((fn:(a:R)=>any) => R[]) : T[]);
-        export type many <T extends readonly unknown[]> = T & ((fn:(a:T[number])=>any) => T[number]);
-    }
-}
-
-export class Entity {
-    static data<T extends Entity> (this:T, input:Object) : T { 
-        return {} as T // mock
-    } 
-}
-  
-export type EntitySet<T> = T[] & {
-    data (input:object[]) : T[]
-    data (input:object) : T
-}
-
-
-
-
-
-

bookstore/@types/index.js

@@ -1,3 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('')

bookstore/@types/index.ts

@@ -1,57 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as _sap_common from './sap/common';
-import * as __ from './_';
-
-export type Language = __.Association.to<_sap_common.Language>;
-export type Currency = __.Association.to<_sap_common.Currency>;
-export type Country = __.Association.to<_sap_common.Country>;
-export type User = string;
-
-
-// the following represents the CDS aspect 'cuid'
-export function cuid<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class cuidAspect extends Base {
-    ID: string;
-  };
-}
-const cuidXtended = cuid(__.Entity)
-export type cuid = InstanceType<typeof cuidXtended>
-
-// the following represents the CDS aspect 'managed'
-export function managed<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class managedAspect extends Base {
-    createdAt: Date;
-    /**
-    * Canonical user ID
-    */
-    createdBy: User;
-    modifiedAt: Date;
-    /**
-    * Canonical user ID
-    */
-    modifiedBy: User;
-  };
-}
-const managedXtended = managed(__.Entity)
-export type managed = InstanceType<typeof managedXtended>
-
-// the following represents the CDS aspect 'temporal'
-export function temporal<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class temporalAspect extends Base {
-    validFrom: Date;
-    validTo: Date;
-  };
-}
-const temporalXtended = temporal(__.Entity)
-export type temporal = InstanceType<typeof temporalXtended>
-
-// the following represents the CDS aspect 'extensible'
-export function extensible<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class extensibleAspect extends Base {
-    extensions__: string;
-  };
-}
-const extensibleXtended = extensible(__.Entity)
-export type extensible = InstanceType<typeof extensibleXtended>
-
-

bookstore/@types/sap/capire/bookshop/index.js

@@ -1,9 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('sap.capire.bookshop')
-module.exports.Book = cson.Books
-module.exports.Books = cson.Books
-module.exports.Author = cson.Authors
-module.exports.Authors = cson.Authors
-module.exports.Genre = cson.Genres
-module.exports.Genres = cson.Genres

bookstore/@types/sap/capire/bookshop/index.ts

@@ -1,70 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as __ from './../../../_';
-import * as _ from './../../..';
-import * as _ReviewsService from './../../../ReviewsService';
-import * as _sap_common from './../../common';
-
-
-
-
-
-export function Book<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class BookAspect extends Base {
-    ID: number;
-    title: string;
-    descr: string;
-    author: __.Association.to<Author>;
-    genre: __.Association.to<Genre>;
-    stock: number;
-    price: number;
-    /**
-    * Type for an association to Currencies
-    * 
-    * See https://cap.cloud.sap/docs/cds/common#type-currency
-    */
-    currency: __.Association.to<_.Currency>;
-    image: string;
-    reviews: __.Composition.of.many<_ReviewsService.Reviews>;
-    rating: number;
-    numberOfReviews: number;
-  };
-}
-const BookXtended = _.managed(Book(__.Entity))
-export type Book = InstanceType<typeof BookXtended>
-
-export class Books extends Array<Book> {
-}
-
-export function Author<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class AuthorAspect extends Base {
-    ID: number;
-    name: string;
-    dateOfBirth: Date;
-    dateOfDeath: Date;
-    placeOfBirth: string;
-    placeOfDeath: string;
-    books: __.Association.to.many<Books>;
-  };
-}
-const AuthorXtended = _.managed(Author(__.Entity))
-export type Author = InstanceType<typeof AuthorXtended>
-
-export class Authors extends Array<Author> {
-}
-
-/**
-* Hierarchically organized Code List for Genres
-*/
-export function Genre<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class GenreAspect extends Base {
-    ID: number;
-    parent: __.Association.to<Genre>;
-    children: __.Composition.of.many<Genres>;
-  };
-}
-const GenreXtended = _sap_common.CodeList(Genre(__.Entity))
-export type Genre = InstanceType<typeof GenreXtended>
-
-export class Genres extends Array<Genre> {
-}
-

bookstore/@types/sap/capire/orders/index.js

@@ -1,7 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('sap.capire.orders')
-module.exports.Order = cson.Orders
-module.exports.Orders = cson.Orders
-module.exports.Product = cson.Products
-module.exports.Products = cson.Products

bookstore/@types/sap/capire/orders/index.ts

@@ -1,52 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as __ from './../../../_';
-import * as _sap_capire_bookshop from './../bookshop';
-import * as _ from './../../..';
-
-
-
-
-
-export function Order<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class OrderAspect extends Base {
-    OrderNo: string;
-    Items: {
-    ID: string;
-    product: __.Association.to<Product>;
-    quantity: number;
-    title: string;
-    price: number;
-    book: __.Association.to<_sap_capire_bookshop.Book>;
-  };
-    /**
-    * Canonical user ID
-    */
-    buyer: _.User;
-    /**
-    * Type for an association to Currencies
-    * 
-    * See https://cap.cloud.sap/docs/cds/common#type-currency
-    */
-    currency: __.Association.to<_.Currency>;
-  };
-}
-const OrderXtended = _.cuid(_.managed(Order(__.Entity)))
-export type Order = InstanceType<typeof OrderXtended>
-
-export class Orders extends Array<Order> {
-}
-
-/**
-* This is a stand-in for arbitrary ordered Products
-*/
-export function Product<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class ProductAspect extends Base {
-    ID: string;
-  };
-}
-const ProductXtended = Product(__.Entity)
-export type Product = InstanceType<typeof ProductXtended>
-
-export class Products extends Array<Product> {
-}
-

bookstore/@types/sap/capire/reviews/index.js

@@ -1,7 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('sap.capire.reviews')
-module.exports.Review = cson.Reviews
-module.exports.Reviews = cson.Reviews
-module.exports.Like = cson.Likes
-module.exports.Likes = cson.Likes

bookstore/@types/sap/capire/reviews/index.ts

@@ -1,51 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as _ from './../../..';
-import * as __ from './../../../_';
-
-export type ReviewedSubject = string;
-export enum Rating {
-  Best = 5,
-  Good = 4,
-  Avg = 3,
-  Poor = 2,
-  Worst = 1,
-}
-
-
-export function Review<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class ReviewAspect extends Base {
-    ID: string;
-    subject: ReviewedSubject;
-    /**
-    * Canonical user ID
-    */
-    reviewer: _.User;
-    rating: Rating;
-    title: string;
-    text: string;
-    date: Date;
-    likes: __.Composition.of.many<Likes>;
-    liked: number;
-  };
-}
-const ReviewXtended = Review(__.Entity)
-export type Review = InstanceType<typeof ReviewXtended>
-
-export class Reviews extends Array<Review> {
-}
-
-export function Like<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class LikeAspect extends Base {
-    review: __.Association.to<Review>;
-    /**
-    * Canonical user ID
-    */
-    user: _.User;
-  };
-}
-const LikeXtended = Like(__.Entity)
-export type Like = InstanceType<typeof LikeXtended>
-
-export class Likes extends Array<Like> {
-}
-

bookstore/@types/sap/common/countries/index.js

@@ -1,9 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('sap.common.countries')
-module.exports.Region = cson.Regions
-module.exports.Regions = cson.Regions
-module.exports.City = cson.Cities
-module.exports.Cities = cson.Cities
-module.exports.District = cson.Districts
-module.exports.Districts = cson.Districts

bookstore/@types/sap/common/countries/index.ts

@@ -1,47 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as __ from './../../../_';
-import * as _sap_common from './..';
-
-
-
-
-
-export function Region<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class RegionAspect extends Base {
-    code: string;
-    children: __.Composition.of.many<Regions>;
-    cities: __.Composition.of.many<Cities>;
-    _parent: string;
-  };
-}
-const RegionXtended = _sap_common.CodeList(Region(__.Entity))
-export type Region = InstanceType<typeof RegionXtended>
-
-export class Regions extends Array<Region> {
-}
-
-export function City<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class CityAspect extends Base {
-    code: string;
-    region: __.Association.to<Region>;
-    districts: __.Composition.of.many<Districts>;
-  };
-}
-const CityXtended = _sap_common.CodeList(City(__.Entity))
-export type City = InstanceType<typeof CityXtended>
-
-export class Cities extends Array<City> {
-}
-
-export function District<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class DistrictAspect extends Base {
-    code: string;
-    city: __.Association.to<City>;
-  };
-}
-const DistrictXtended = _sap_common.CodeList(District(__.Entity))
-export type District = InstanceType<typeof DistrictXtended>
-
-export class Districts extends Array<District> {
-}
-

bookstore/@types/sap/common/index.js

@@ -1,9 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('sap.common')
-module.exports.Language = cson.Languages
-module.exports.Languages = cson.Languages
-module.exports.Country = cson.Countries
-module.exports.Countries = cson.Countries
-module.exports.Currency = cson.Currencies
-module.exports.Currencies = cson.Currencies

bookstore/@types/sap/common/index.ts

@@ -1,73 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as __ from './../../_';
-import * as _sap_common_countries from './countries';
-
-export type Locale = string;
-
-
-// the following represents the CDS aspect 'CodeList'
-export function CodeList<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class CodeListAspect extends Base {
-    name: string;
-    descr: string;
-  };
-}
-const CodeListXtended = CodeList(__.Entity)
-export type CodeList = InstanceType<typeof CodeListXtended>
-
-/**
-* Code list for languages
-* 
-* See https://cap.cloud.sap/docs/cds/common#entity-sapcommonlanguages
-*/
-export function Language<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class LanguageAspect extends Base {
-    /**
-    * Type for a language code
-    */
-    code: Locale;
-  };
-}
-const LanguageXtended = CodeList(Language(__.Entity))
-export type Language = InstanceType<typeof LanguageXtended>
-
-export class Languages extends Array<Language> {
-}
-
-/**
-* Code list for countries
-* 
-* See https://cap.cloud.sap/docs/cds/common#entity-sapcommoncountries
-*/
-export function Country<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class CountryAspect extends Base {
-    code: string;
-    regions: __.Composition.of.many<_sap_common_countries.Regions>;
-  };
-}
-const CountryXtended = CodeList(Country(__.Entity))
-export type Country = InstanceType<typeof CountryXtended>
-
-export class Countries extends Array<Country> {
-}
-
-/**
-* Code list for currencies
-* 
-* See https://cap.cloud.sap/docs/cds/common#entity-sapcommoncurrencies
-*/
-export function Currency<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class CurrencyAspect extends Base {
-    code: string;
-    symbol: string;
-    numcode: number;
-    exponent: number;
-    minor: string;
-  };
-}
-const CurrencyXtended = CodeList(Currency(__.Entity))
-export type Currency = InstanceType<typeof CurrencyXtended>
-
-export class Currencies extends Array<Currency> {
-}
-

bookstore/jsconfig.json

@@ -1,5 +0,0 @@
-{
-  "compilerOptions": {
-    "checkJs": true
-  }
-}

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

bookstore/srv/mashup.js

@@ -11,8 +11,7 @@ module.exports = async()=>{ // called by server.js
   const db = await cds.connect.to ('db')
 
   // reflect entity definitions used below...
-  //const { Books } = db.entities ('sap.capire.bookshop')
-  const { Books, Book } = require('../@types/sap/capire/bookshop')
+  const { Books } = db.entities ('sap.capire.bookshop')
 
   //
   // Delegate requests to read reviews to the ReviewsService
@@ -20,8 +19,8 @@ module.exports = async()=>{ // called by server.js
   //
   CatalogService.prepend (srv => srv.on ('READ', 'Books/reviews', (req) => {
     console.debug ('> delegating request to ReviewsService')
-    const [id] = req.params, { columns, limit } = 'SELECT' in req.query ? req.query.SELECT : {columns: [], limit: { rows: 0 }}
-    return ReviewsService.read ('Reviews',columns).limit(limit.rows).where({subject:String(id)})
+    const [id] = req.params, { columns, limit } = req.query.SELECT
+    return ReviewsService.read ('Reviews',columns).limit(limit).where({subject:String(id)})
   }))
 
   //
@@ -29,7 +28,7 @@ module.exports = async()=>{ // called by server.js
   //
   CatalogService.on ('OrderedBook', async (msg) => {
     const { book, quantity, buyer } = msg.data
-    const { title, price } = await db.tx(msg).read ('Books').where('ID = ' + book.ID).columns((/** @type {Book} */ b) => { b.title, b.price })
+    const { title, price } = await db.tx(msg).read (Books, book, b => { b.title, b.price })
     return OrdersService.tx(msg).create ('Orders').entries({
       OrderNo: 'Order at '+ (new Date).toLocaleString(),
       Items: [{ product:{ID:`${book}`}, title, price, quantity }],

common/@types/_/index.js

@@ -1,3 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('_')

common/@types/_/index.ts

@@ -1,35 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-
-
-export namespace Association {
-    export type to <T> = T & ((fn:(a:T)=>any) => T)
-    export namespace to {
-        // type many <T> = T[] & (T extends (infer R)[] ? R[] & ((fn:(a:R)=>any) => R[]) : T[]);
-        export type many <T extends readonly unknown[]> = T & ((fn:(a:T[number])=>any) => T[number]);
-    }
-}
-
-export namespace Composition {
-    export type of <T> = T & ((fn:(a:T)=>any) => T)
-    export namespace of {
-        //type many <T> = T[] & (T extends (infer R)[] ? R[] & ((fn:(a:R)=>any) => R[]) : T[]);
-        export type many <T extends readonly unknown[]> = T & ((fn:(a:T[number])=>any) => T[number]);
-    }
-}
-
-export class Entity {
-    static data<T extends Entity> (this:T, input:Object) : T { 
-        return {} as T // mock
-    } 
-}
-  
-export type EntitySet<T> = T[] & {
-    data (input:object[]) : T[]
-    data (input:object) : T
-}
-
-
-
-
-
-

common/@types/index.js

@@ -1,3 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('')

common/@types/index.ts

@@ -1,57 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as _sap_common from './sap/common';
-import * as __ from './_';
-
-export type Language = __.Association.to<_sap_common.Language>;
-export type Currency = __.Association.to<_sap_common.Currency>;
-export type Country = __.Association.to<_sap_common.Country>;
-export type User = string;
-
-
-// the following represents the CDS aspect 'cuid'
-export function cuid<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class cuidAspect extends Base {
-    ID: string;
-  };
-}
-const cuidXtended = cuid(__.Entity)
-export type cuid = InstanceType<typeof cuidXtended>
-
-// the following represents the CDS aspect 'managed'
-export function managed<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class managedAspect extends Base {
-    createdAt: Date;
-    /**
-    * Canonical user ID
-    */
-    createdBy: User;
-    modifiedAt: Date;
-    /**
-    * Canonical user ID
-    */
-    modifiedBy: User;
-  };
-}
-const managedXtended = managed(__.Entity)
-export type managed = InstanceType<typeof managedXtended>
-
-// the following represents the CDS aspect 'temporal'
-export function temporal<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class temporalAspect extends Base {
-    validFrom: Date;
-    validTo: Date;
-  };
-}
-const temporalXtended = temporal(__.Entity)
-export type temporal = InstanceType<typeof temporalXtended>
-
-// the following represents the CDS aspect 'extensible'
-export function extensible<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class extensibleAspect extends Base {
-    extensions__: string;
-  };
-}
-const extensibleXtended = extensible(__.Entity)
-export type extensible = InstanceType<typeof extensibleXtended>
-
-

common/@types/sap/common/countries/index.js

@@ -1,9 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('sap.common.countries')
-module.exports.Region = cson.Regions
-module.exports.Regions = cson.Regions
-module.exports.City = cson.Cities
-module.exports.Cities = cson.Cities
-module.exports.District = cson.Districts
-module.exports.Districts = cson.Districts

common/@types/sap/common/countries/index.ts

@@ -1,47 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as __ from './../../../_';
-import * as _sap_common from './..';
-
-
-
-
-
-export function Region<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class RegionAspect extends Base {
-    code: string;
-    children: __.Composition.of.many<Regions>;
-    cities: __.Composition.of.many<Cities>;
-    _parent: string;
-  };
-}
-const RegionXtended = _sap_common.CodeList(Region(__.Entity))
-export type Region = InstanceType<typeof RegionXtended>
-
-export class Regions extends Array<Region> {
-}
-
-export function City<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class CityAspect extends Base {
-    code: string;
-    region: __.Association.to<Region>;
-    districts: __.Composition.of.many<Districts>;
-  };
-}
-const CityXtended = _sap_common.CodeList(City(__.Entity))
-export type City = InstanceType<typeof CityXtended>
-
-export class Cities extends Array<City> {
-}
-
-export function District<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class DistrictAspect extends Base {
-    code: string;
-    city: __.Association.to<City>;
-  };
-}
-const DistrictXtended = _sap_common.CodeList(District(__.Entity))
-export type District = InstanceType<typeof DistrictXtended>
-
-export class Districts extends Array<District> {
-}
-

common/@types/sap/common/index.js

@@ -1,9 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('sap.common')
-module.exports.Language = cson.Languages
-module.exports.Languages = cson.Languages
-module.exports.Country = cson.Countries
-module.exports.Countries = cson.Countries
-module.exports.Currency = cson.Currencies
-module.exports.Currencies = cson.Currencies

common/@types/sap/common/index.ts

@@ -1,73 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as __ from './../../_';
-import * as _sap_common_countries from './countries';
-
-export type Locale = string;
-
-
-// the following represents the CDS aspect 'CodeList'
-export function CodeList<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class CodeListAspect extends Base {
-    name: string;
-    descr: string;
-  };
-}
-const CodeListXtended = CodeList(__.Entity)
-export type CodeList = InstanceType<typeof CodeListXtended>
-
-/**
-* Code list for languages
-* 
-* See https://cap.cloud.sap/docs/cds/common#entity-sapcommonlanguages
-*/
-export function Language<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class LanguageAspect extends Base {
-    /**
-    * Type for a language code
-    */
-    code: Locale;
-  };
-}
-const LanguageXtended = CodeList(Language(__.Entity))
-export type Language = InstanceType<typeof LanguageXtended>
-
-export class Languages extends Array<Language> {
-}
-
-/**
-* Code list for countries
-* 
-* See https://cap.cloud.sap/docs/cds/common#entity-sapcommoncountries
-*/
-export function Country<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class CountryAspect extends Base {
-    code: string;
-    regions: __.Composition.of.many<_sap_common_countries.Regions>;
-  };
-}
-const CountryXtended = CodeList(Country(__.Entity))
-export type Country = InstanceType<typeof CountryXtended>
-
-export class Countries extends Array<Country> {
-}
-
-/**
-* Code list for currencies
-* 
-* See https://cap.cloud.sap/docs/cds/common#entity-sapcommoncurrencies
-*/
-export function Currency<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class CurrencyAspect extends Base {
-    code: string;
-    symbol: string;
-    numcode: number;
-    exponent: number;
-    minor: string;
-  };
-}
-const CurrencyXtended = CodeList(Currency(__.Entity))
-export type Currency = InstanceType<typeof CurrencyXtended>
-
-export class Currencies extends Array<Currency> {
-}
-

common/jsconfig.json

@@ -1,5 +0,0 @@
-{
-  "compilerOptions": {
-    "checkJs": true
-  }
-}

data-viewer/@types/DataService/index.js

@@ -1,7 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('DataService')
-module.exports.Entity = cson.Entities
-module.exports.Entities = cson.Entities
-module.exports.Data = cson.Data
-module.exports.Data_ = cson.Data

data-viewer/@types/DataService/index.ts

@@ -1,40 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as __ from './../_';
-
-
-
-
-
-/**
-* Metadata like name and columns/elements
-*/
-export function Entity<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class EntityAspect extends Base {
-    name: string;
-    columns: {
-    name: string;
-    type: string;
-    isKey: boolean;
-  };
-  };
-}
-const EntityXtended = Entity(__.Entity)
-export type Entity = InstanceType<typeof EntityXtended>
-
-export class Entities extends Array<Entity> {
-}
-
-/**
-* The actual data, organized by column name
-*/
-export function Data<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class DataAspect extends Base {
-    record: {};
-  };
-}
-const DataXtended = Data(__.Entity)
-export type Data = InstanceType<typeof DataXtended>
-
-export class Data_ extends Array<Data> {
-}
-

data-viewer/@types/_/index.js

@@ -1,3 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('_')

data-viewer/@types/_/index.ts

@@ -1,35 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-
-
-export namespace Association {
-    export type to <T> = T & ((fn:(a:T)=>any) => T)
-    export namespace to {
-        // type many <T> = T[] & (T extends (infer R)[] ? R[] & ((fn:(a:R)=>any) => R[]) : T[]);
-        export type many <T extends readonly unknown[]> = T & ((fn:(a:T[number])=>any) => T[number]);
-    }
-}
-
-export namespace Composition {
-    export type of <T> = T & ((fn:(a:T)=>any) => T)
-    export namespace of {
-        //type many <T> = T[] & (T extends (infer R)[] ? R[] & ((fn:(a:R)=>any) => R[]) : T[]);
-        export type many <T extends readonly unknown[]> = T & ((fn:(a:T[number])=>any) => T[number]);
-    }
-}
-
-export class Entity {
-    static data<T extends Entity> (this:T, input:Object) : T { 
-        return {} as T // mock
-    } 
-}
-  
-export type EntitySet<T> = T[] & {
-    data (input:object[]) : T[]
-    data (input:object) : T
-}
-
-
-
-
-
-

data-viewer/jsconfig.json

@@ -1,5 +0,0 @@
-{
-  "compilerOptions": {
-    "checkJs": true
-  }
-}

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-ext/.vscode/settings.json

@@ -0,0 +1,11 @@
+{
+  "eslint.validate": [
+    "cds",
+    "csn",
+    "csv",
+    "csv",
+    "csv (semicolon)",
+    "tsv",
+    "tab"
+  ]
+}

fiori-ext/README.md

@@ -0,0 +1,21 @@
+# Welcome to your Extension Project for the CAP Bookshop Fiori App
+
+It contains these folders and files, following our recommended project layout:
+
+| File or Folder | Purpose                            |
+|----------------|------------------------------------|
+| `app/`         | content for UI frontends goes here |
+| `test/`        | contet for local tests             |
+| `package.json` | project metadata and configuration |
+| `readme.md`    | this getting started guide         |
+
+
+## Next Steps
+
+- Runs `cds login ...`
+- Runs `cds pull ...`
+
+
+## Learn More
+
+Learn more at https://cap.cloud.sap/docs/get-started/.

fiori-ext/app/extension.cds

@@ -0,0 +1,25 @@
+using { OrdersService, sap, sap.capire.orders.Orders } from '@capire/fiori';
+namespace x_bookshop.extension;
+
+// Adding 2 new fields for Orders
+extend Orders with {
+  x_priority    : String @assert.range enum {high; medium; low} default 'medium' ;
+  x_salesRegion : Association to SalesRegion;
+}
+
+/** Value Help for x_salesRegion */
+entity SalesRegion : sap.common.CodeList {
+  key code : String(11);
+}
+
+// --- UI ---
+
+annotate Orders:x_priority with @title : 'Priority';
+annotate SalesRegion:name with @title : 'Sales Region';
+
+annotate OrdersService.Orders with @UI.LineItem : [
+  ... up to { Value: OrderNo },
+  { Value : x_priority },
+  { Value : x_salesRegion.name },
+  ...
+];

fiori-ext/package.json

@@ -0,0 +1,49 @@
+{
+  "name": "@capire/fiori-ext",
+  "version": "1.0.0",
+  "description": "A simple CAP project.",
+  "repository": "<Add your repository here>",
+  "license": "UNLICENSED",
+  "private": true,
+  "dependencies": {
+    "@sap/cds": "^6"
+  },
+  "devDependencies": {
+    "sqlite3": "^5.0.4",
+    "@sap/eslint-plugin-cds": "^2.5.0"
+  },
+  "scripts": {
+    "start": "cds run"
+  },
+  "cds": {
+    "extends": "@capire/fiori"
+  },
+  "eslintConfig": {
+    "extends": [
+      "eslint:recommended",
+      "plugin:@sap/cds/recommended"
+    ],
+    "env": {
+      "es2020": true,
+      "node": true,
+      "jest": true,
+      "mocha": true
+    },
+    "globals": {
+      "SELECT": true,
+      "INSERT": true,
+      "UPDATE": true,
+      "DELETE": true,
+      "CREATE": true,
+      "DROP": true,
+      "CDL": true,
+      "CQL": true,
+      "CXL": true,
+      "cds": true
+    },
+    "rules": {
+      "no-console": "off",
+      "require-atomic-updates": "off"
+    }
+  }
+}

fiori-ext/test/data/sap.capire.orders-Orders.csv

@@ -0,0 +1,3 @@
+ID;createdAt;createdBy;buyer;OrderNo;currency_code;Z_priority;Z_SalesRegion_regionCode
+7e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-01-31;john.doe@test.com;john.doe@test.com;1;EUR;high;AMER
+64e718c9-ff99-47f1-8ca3-950c850777d4;2019-01-30;jane.doe@test.com;jane.doe@test.com;2;EUR;low;APJ

fiori-ext/test/data/x_bookshop.extension-SalesRegion.csv

@@ -0,0 +1,4 @@
+code;name;descr
+AMER;Americas;North, Central and South America
+EMEA;Europe, the Middle East and Africa;Europe, the Middle East and Africa
+APJ;Asia Pacific and Japan;Asia Pacific and Japan

fiori/app/_router/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "approuter",
+  "dependencies": {
+    "@sap/approuter": "^11.0.0"
+  },
+  "engines": {
+    "node": "^16"
+  },
+  "scripts": {
+    "start": "node node_modules/@sap/approuter/approuter.js"
+  }
+}

fiori/app/_router/xs-app.json

@@ -0,0 +1,23 @@
+{
+  "authenticationMethod": "route",
+  "routes": [
+    {
+      "source": "^/app/(.*)$",
+      "target": "$1",
+      "localDir": ".",
+      "authenticationType": "xsuaa",
+      "cacheControl": "no-cache, no-store, must-revalidate"
+    },
+    {
+      "source": "^/-/cds/.*",
+      "destination": "mtx-api",
+      "authenticationType": "none"
+    },
+    {
+      "source": "^/(.*)$",
+      "target": "$1",
+      "destination": "srv-api",
+      "authenticationType": "xsuaa"
+    }
+  ]
+}

fiori/app/xs-app.json

@@ -0,0 +1,24 @@
+{
+  "authenticationMethod": "route",
+  "routes": [
+    {
+      "source": "^/-/cds/.*",
+      "destination": "mtx-api",
+      "authenticationType": "none"
+    },
+    {
+      "source": "^/app/(.*)$",
+      "target": "$1",
+      "localDir": ".",
+      "authenticationType": "xsuaa",
+      "cacheControl": "no-cache, no-store, must-revalidate"
+    },
+    {
+      "source": "^/(.*)$",
+      "target": "$1",
+      "destination": "srv-api",
+      "authenticationType": "xsuaa",
+      "csrfProtection": true
+    }
+  ]
+}

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

@@ -0,0 +1,5 @@
+ID_texts;ID;locale;title;descr
+201_de;201;de;Sturmhöhe;Sturmhöhe (Originaltitel: Wuthering Heights) ist der einzige Roman der englischen Schriftstellerin Emily Brontë (1818–1848). Der 1847 unter dem Pseudonym Ellis Bell veröffentlichte Roman wurde vom viktorianischen Publikum weitgehend abgelehnt, heute gilt er als ein Klassiker der britischen Romanliteratur des 19. Jahrhunderts.
+201_fr;201;fr;Les Hauts de Hurlevent;Les Hauts de Hurlevent (titre original : Wuthering Heights), parfois orthographié Les Hauts de Hurle-Vent, est l'unique roman d'Emily Brontë, publié pour la première fois en 1847 sous le pseudonyme d’Ellis Bell. Loin d'être un récit moralisateur, Emily Brontë achève néanmoins le roman dans une atmosphère sereine, suggérant le triomphe de la paix et du Bien sur la vengeance et le Mal.
+207_de;207;de;Jane Eyre;Jane Eyre. Eine Autobiographie (Originaltitel: Jane Eyre. An Autobiography), erstmals erschienen im Jahr 1847 unter dem Pseudonym Currer Bell, ist der erste veröffentlichte Roman der britischen Autorin Charlotte Brontë und ein Klassiker der viktorianischen Romanliteratur des 19. Jahrhunderts. Der Roman erzählt in Form einer Ich-Erzählung die Lebensgeschichte von Jane Eyre (ausgesprochen /ˌdʒeɪn ˈɛə/), die nach einer schweren Kindheit eine Stelle als Gouvernante annimmt und sich in ihren Arbeitgeber verliebt, jedoch immer wieder um ihre Freiheit und Selbstbestimmung kämpfen muss. Als klein, dünn, blass, stets schlicht dunkel gekleidet und mit strengem Mittelscheitel beschrieben, gilt die Heldin des Romans Jane Eyre nicht zuletzt aufgrund der Kino- und Fernsehversionen der melodramatischen Romanvorlage als die bekannteste englische Gouvernante der Literaturgeschichte
+207_fr;252;de;Eleonora;“Eleonora” ist eine Erzählung von Edgar Allan Poe. Sie wurde 1841 erstveröffentlicht. In ihr geht es um das Paradox der Treue in der Treulosigkeit.

fiori/db/hana/index.cds

@@ -2,9 +2,14 @@
 //  Add Author.age and .lifetime with a DB-specific function
 //
 
-using { AdminService } from '@capire/bookshop';
+using { AdminService, sap.common } from '@capire/bookshop';
 
 extend projection AdminService.Authors with {
   YEARS_BETWEEN(dateOfBirth, dateOfDeath)         as age: Integer,
   YEAR(dateOfBirth) || ' – ' || YEAR(dateOfDeath) as lifetime : String
 }
+
+
+// Workaround: include Countries table because csv files point to it
+// TODO fix by ignoring hdbtabledata generation for unused entities
+annotate common.Countries with @cds.persistence.skip : false;

fiori/mta.yaml

@@ -0,0 +1,97 @@
+_schema-version: '3.1'
+ID: capire.fiori
+version: 1.0.0
+description: "fiori"
+parameters:
+  enable-parallel-deployments: true
+build-parameters:
+  before-all:
+    - builder: custom
+      commands:
+        - npx -p @sap/cds-dk cds build --production
+
+modules:
+  - name: fiori-srv
+    type: nodejs
+    path: gen/srv
+    parameters:
+      buildpack: nodejs_buildpack
+    build-parameters:
+      builder: npm
+    provides:
+      - name: srv-api # required by consumers of CAP services (e.g. approuter)
+        properties:
+          srv-url: ${default-url}
+      - name: mtx-api # potentially required by approuter
+        properties:
+          mtx-url: ${default-url}
+    requires:
+      - name: fiori-db
+      - name: fiori-registry
+      - name: fiori-auth
+      - name: app-api
+        properties:
+          SUBSCRIPTION_URL: ~{app-protocol}://\${tenant_subdomain}-~{app-uri}
+
+  - name: fiori
+    type: approuter.nodejs
+    path: app/_router # from cds.env.folders. Consider also cds.env.build.target -> gen/app
+    parameters:
+      keep-existing-routes: true
+      disk-quota: 256M
+      memory: 256M
+    properties:
+      TENANT_HOST_PATTERN: "^(.*)-${default-uri}"
+    requires:
+      - name: srv-api
+        group: destinations
+        properties:
+          name: srv-api # must be used in xs-app.json as well
+          url: ~{srv-url}
+          forwardAuthToken: true
+      - name: mtx-api
+        group: destinations
+        properties:
+          name: mtx-api # must be used in xs-app.json as well
+          url: ~{mtx-url}
+      - name: fiori-auth
+    provides:
+      - name: app-api
+        properties:
+          app-protocol: ${protocol}
+          app-uri: ${default-uri}
+
+resources:
+  - name: fiori-db
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: service-manager
+      service-plan: container
+  - name: fiori-registry
+    type: org.cloudfoundry.managed-service
+    requires:
+      - name: mtx-api
+    parameters:
+      service: saas-registry
+      service-plan: application
+      config:
+        xsappname: fiori-${org}-${space}
+        appName: fiori-${org}-${space}
+        displayName: fiori
+        description: A simple CAP project.
+        category: 'Category'
+        appUrls:
+          getDependencies: ~{mtx-api/mtx-url}/-/cds/saas-provisioning/dependencies
+          onSubscription: ~{mtx-api/mtx-url}/-/cds/saas-provisioning/tenant/{tenantId}
+          onSubscriptionAsync: false
+          onUnSubscriptionAsync: false
+          callbackTimeoutMillis: 300000
+  - name: fiori-auth
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: xsuaa
+      service-plan: application
+      path: ./xs-security.json
+      config:
+        xsappname: fiori-${org}-${space}
+        tenant-mode: shared

fiori/package.json

@@ -4,19 +4,25 @@
   "dependencies": {
     "@capire/bookstore": "*",
     "@sap/cds": ">=5",
+    "@sap/cds-mtxs": "^1",
     "@sap/cds-odata-v2-adapter-proxy": "^1.9.0",
+    "@sap/xssec": "^3",
     "express": "^4.17.1",
+    "hdb": "^0.19.5",
     "passport": ">=0.4.1"
   },
   "scripts": {
     "start": "cds run --in-memory?",
     "watch": "cds watch"
   },
+  "engines": {
+    "node": "^16"
+  },
   "cds": {
+    "features": {
+      "deploy_data_onconflict": "replace"
+    },
     "requires": {
-      "auth": {
-        "kind": "dummy-auth"
-      },
       "ReviewsService": {
         "kind": "odata",
         "model": "@capire/reviews"
@@ -37,7 +43,7 @@
         }
       },
       "db": {
-        "kind": "sql"
+        "kind": "sql-mt"
       },
       "db-ext": {
         "[development]": {
@@ -47,9 +53,40 @@
           "model": "db/hana"
         }
       },
-      "hana": {
-        "deploy-format": "hdbtable"
+      "multitenancy": true,
+      "toggles": true,
+      "extensibility": true,
+      "cds.xt.ExtensibilityService": {
+        "element-prefix": [
+          "x_"
+        ],
+        "extension-allowlist": [
+          {
+            "for": [
+              "sap.capire.orders"
+            ],
+            "kind": "entity",
+            "new-fields": 3
+          },
+          {
+            "for": [
+              "OrdersService"
+            ],
+            "new-entities": 2
+          }
+        ]
+      },
+      "[production]": {
+        "auth": {
+          "kind": "xsuaa"
+        },
+        "db": {
+          "kind": "hana-mt"
+        }
+      },
+      "approuter": {
+        "kind": "cloudfoundry"
       }
     }
   }
-}
+}

fiori/server.js

@@ -5,4 +5,11 @@ 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')
+module.exports = require('@capire/bookstore/server.js')
+
+// For didactic reasons in capire, run below services embedded
+// TODO find a better way to switch this
+if (cds.requires.multitenancy) {
+  delete cds.env.requires.OrdersService
+  delete cds.env.requires.ReviewsService
+}

fiori/srv/index.cds

@@ -0,0 +1 @@
+using from '@capire/bookstore';

fiori/xs-security.json

@@ -0,0 +1,51 @@
+{
+  "scopes": [
+    {
+      "name": "$XSAPPNAME.admin",
+      "description": "admin"
+    },
+    {
+      "name": "$XSAPPNAME.mtcallback",
+      "description": "Subscription via SaaS Registry",
+      "grant-as-authority-to-apps": [
+        "$XSAPPNAME(application,sap-provisioning,tenant-onboarding)"
+      ]
+    },
+    {
+      "name": "$XSAPPNAME.cds.Subscriber",
+      "description": "Subscribe to applications"
+    },
+    {
+      "name": "$XSAPPNAME.cds.ExtensionDeveloper",
+      "description": "Extend CAP applications via extension projects"
+    },
+    {
+      "name": "$XSAPPNAME.cds.UIFlexDeveloper",
+      "description": "Extend CAP applications via UIFlex extensibility"
+    }
+  ],
+  "attributes": [],
+  "role-templates": [
+    {
+      "name": "admin",
+      "description": "admin",
+      "scope-references": [
+        "$XSAPPNAME.admin"
+      ]
+    },
+    {
+      "name": "ExtensionDeveloper",
+      "description": "Extension development including UIFlex extensibility",
+      "scope-references": [
+        "$XSAPPNAME.cds.ExtensionDeveloper",
+        "$XSAPPNAME.cds.UIFlexDeveloper"
+      ]
+    }
+  ],
+  "authorities-inheritance": false,
+  "authorities": [
+    "$XSAPPNAME.cds.Subscriber",
+    "$XSAPPNAME.cds.ExtensionDeveloper",
+    "$XSAPPNAME.cds.UIFlexDeveloper"
+  ]
+}

hello/@types/_/index.js

@@ -1,3 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('_')

hello/@types/_/index.ts

@@ -1,35 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-
-
-export namespace Association {
-    export type to <T> = T & ((fn:(a:T)=>any) => T)
-    export namespace to {
-        // type many <T> = T[] & (T extends (infer R)[] ? R[] & ((fn:(a:R)=>any) => R[]) : T[]);
-        export type many <T extends readonly unknown[]> = T & ((fn:(a:T[number])=>any) => T[number]);
-    }
-}
-
-export namespace Composition {
-    export type of <T> = T & ((fn:(a:T)=>any) => T)
-    export namespace of {
-        //type many <T> = T[] & (T extends (infer R)[] ? R[] & ((fn:(a:R)=>any) => R[]) : T[]);
-        export type many <T extends readonly unknown[]> = T & ((fn:(a:T[number])=>any) => T[number]);
-    }
-}
-
-export class Entity {
-    static data<T extends Entity> (this:T, input:Object) : T { 
-        return {} as T // mock
-    } 
-}
-  
-export type EntitySet<T> = T[] & {
-    data (input:object[]) : T[]
-    data (input:object) : T
-}
-
-
-
-
-
-

hello/jsconfig.json

@@ -1,5 +0,0 @@
-{
-  "compilerOptions": {
-    "checkJs": true
-  }
-}

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)
-    })
-
-})

media/@types/_/index.js

@@ -1,3 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('_')

media/@types/_/index.ts

@@ -1,35 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-
-
-export namespace Association {
-    export type to <T> = T & ((fn:(a:T)=>any) => T)
-    export namespace to {
-        // type many <T> = T[] & (T extends (infer R)[] ? R[] & ((fn:(a:R)=>any) => R[]) : T[]);
-        export type many <T extends readonly unknown[]> = T & ((fn:(a:T[number])=>any) => T[number]);
-    }
-}
-
-export namespace Composition {
-    export type of <T> = T & ((fn:(a:T)=>any) => T)
-    export namespace of {
-        //type many <T> = T[] & (T extends (infer R)[] ? R[] & ((fn:(a:R)=>any) => R[]) : T[]);
-        export type many <T extends readonly unknown[]> = T & ((fn:(a:T[number])=>any) => T[number]);
-    }
-}
-
-export class Entity {
-    static data<T extends Entity> (this:T, input:Object) : T { 
-        return {} as T // mock
-    } 
-}
-  
-export type EntitySet<T> = T[] & {
-    data (input:object[]) : T[]
-    data (input:object) : T
-}
-
-
-
-
-
-

media/@types/sap/capire/media/MediaServer/index.js

@@ -1,5 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('sap.capire.media.MediaServer')
-module.exports.Media = cson.Media
-module.exports.Media_ = cson.Media

media/@types/sap/capire/media/MediaServer/index.ts

@@ -1,22 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as __ from './../../../../_';
-
-
-
-
-
-export function Media<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class MediaAspect extends Base {
-    id: number;
-    content: string;
-    mediaType: string;
-    fileName: string;
-    applicationName: string;
-  };
-}
-const MediaXtended = Media(__.Entity)
-export type Media = InstanceType<typeof MediaXtended>
-
-export class Media_ extends Array<Media> {
-}
-

media/@types/sap/capire/media/index.js

@@ -1,5 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('sap.capire.media')
-module.exports.Media = cson.Media
-module.exports.Media_ = cson.Media

media/@types/sap/capire/media/index.ts

@@ -1,22 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as __ from './../../../_';
-
-
-
-
-
-export function Media<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class MediaAspect extends Base {
-    id: number;
-    content: string;
-    mediaType: string;
-    fileName: string;
-    applicationName: string;
-  };
-}
-const MediaXtended = Media(__.Entity)
-export type Media = InstanceType<typeof MediaXtended>
-
-export class Media_ extends Array<Media> {
-}
-

media/jsconfig.json

@@ -1,5 +0,0 @@
-{
-  "compilerOptions": {
-    "checkJs": true
-  }
-}

orders/@types/OrdersService/index.js

@@ -1,5 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('OrdersService')
-module.exports.Order = cson.Orders
-module.exports.Orders = cson.Orders

orders/@types/OrdersService/index.ts

@@ -1,37 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as _sap_capire_orders from './../sap/capire/orders';
-import * as __ from './../_';
-import * as _ from './..';
-
-
-
-
-
-export function Order<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class OrderAspect extends Base {
-    OrderNo: string;
-    Items: {
-    ID: string;
-    product: __.Association.to<_sap_capire_orders.Product>;
-    quantity: number;
-    title: string;
-    price: number;
-  };
-    /**
-    * Canonical user ID
-    */
-    buyer: _.User;
-    /**
-    * Type for an association to Currencies
-    * 
-    * See https://cap.cloud.sap/docs/cds/common#type-currency
-    */
-    currency: __.Association.to<_.Currency>;
-  };
-}
-const OrderXtended = _.cuid(_.managed(Order(__.Entity)))
-export type Order = InstanceType<typeof OrderXtended>
-
-export class Orders extends Array<Order> {
-}
-

orders/@types/_/index.js

@@ -1,3 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('_')

orders/@types/_/index.ts

@@ -1,35 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-
-
-export namespace Association {
-    export type to <T> = T & ((fn:(a:T)=>any) => T)
-    export namespace to {
-        // type many <T> = T[] & (T extends (infer R)[] ? R[] & ((fn:(a:R)=>any) => R[]) : T[]);
-        export type many <T extends readonly unknown[]> = T & ((fn:(a:T[number])=>any) => T[number]);
-    }
-}
-
-export namespace Composition {
-    export type of <T> = T & ((fn:(a:T)=>any) => T)
-    export namespace of {
-        //type many <T> = T[] & (T extends (infer R)[] ? R[] & ((fn:(a:R)=>any) => R[]) : T[]);
-        export type many <T extends readonly unknown[]> = T & ((fn:(a:T[number])=>any) => T[number]);
-    }
-}
-
-export class Entity {
-    static data<T extends Entity> (this:T, input:Object) : T { 
-        return {} as T // mock
-    } 
-}
-  
-export type EntitySet<T> = T[] & {
-    data (input:object[]) : T[]
-    data (input:object) : T
-}
-
-
-
-
-
-

orders/@types/index.js

@@ -1,3 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('')

orders/@types/index.ts

@@ -1,57 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as _sap_common from './sap/common';
-import * as __ from './_';
-
-export type Language = __.Association.to<_sap_common.Language>;
-export type Currency = __.Association.to<_sap_common.Currency>;
-export type Country = __.Association.to<_sap_common.Country>;
-export type User = string;
-
-
-// the following represents the CDS aspect 'cuid'
-export function cuid<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class cuidAspect extends Base {
-    ID: string;
-  };
-}
-const cuidXtended = cuid(__.Entity)
-export type cuid = InstanceType<typeof cuidXtended>
-
-// the following represents the CDS aspect 'managed'
-export function managed<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class managedAspect extends Base {
-    createdAt: Date;
-    /**
-    * Canonical user ID
-    */
-    createdBy: User;
-    modifiedAt: Date;
-    /**
-    * Canonical user ID
-    */
-    modifiedBy: User;
-  };
-}
-const managedXtended = managed(__.Entity)
-export type managed = InstanceType<typeof managedXtended>
-
-// the following represents the CDS aspect 'temporal'
-export function temporal<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class temporalAspect extends Base {
-    validFrom: Date;
-    validTo: Date;
-  };
-}
-const temporalXtended = temporal(__.Entity)
-export type temporal = InstanceType<typeof temporalXtended>
-
-// the following represents the CDS aspect 'extensible'
-export function extensible<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class extensibleAspect extends Base {
-    extensions__: string;
-  };
-}
-const extensibleXtended = extensible(__.Entity)
-export type extensible = InstanceType<typeof extensibleXtended>
-
-

orders/@types/sap/capire/orders/index.js

@@ -1,7 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('sap.capire.orders')
-module.exports.Order = cson.Orders
-module.exports.Orders = cson.Orders
-module.exports.Product = cson.Products
-module.exports.Products = cson.Products

orders/@types/sap/capire/orders/index.ts

@@ -1,50 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as __ from './../../../_';
-import * as _ from './../../..';
-
-
-
-
-
-export function Order<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class OrderAspect extends Base {
-    OrderNo: string;
-    Items: {
-    ID: string;
-    product: __.Association.to<Product>;
-    quantity: number;
-    title: string;
-    price: number;
-  };
-    /**
-    * Canonical user ID
-    */
-    buyer: _.User;
-    /**
-    * Type for an association to Currencies
-    * 
-    * See https://cap.cloud.sap/docs/cds/common#type-currency
-    */
-    currency: __.Association.to<_.Currency>;
-  };
-}
-const OrderXtended = _.cuid(_.managed(Order(__.Entity)))
-export type Order = InstanceType<typeof OrderXtended>
-
-export class Orders extends Array<Order> {
-}
-
-/**
-* This is a stand-in for arbitrary ordered Products
-*/
-export function Product<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class ProductAspect extends Base {
-    ID: string;
-  };
-}
-const ProductXtended = Product(__.Entity)
-export type Product = InstanceType<typeof ProductXtended>
-
-export class Products extends Array<Product> {
-}
-

orders/@types/sap/common/countries/index.js

@@ -1,9 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-const cds = require('@sap/cds')
-const cson = cds.entities('sap.common.countries')
-module.exports.Region = cson.Regions
-module.exports.Regions = cson.Regions
-module.exports.City = cson.Cities
-module.exports.Cities = cson.Cities
-module.exports.District = cson.Districts
-module.exports.Districts = cson.Districts

orders/@types/sap/common/countries/index.ts

@@ -1,47 +0,0 @@
-// This is an automatically generated file. Please do not change its contents manually!
-import * as __ from './../../../_';
-import * as _sap_common from './..';
-
-
-
-
-
-export function Region<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class RegionAspect extends Base {
-    code: string;
-    children: __.Composition.of.many<Regions>;
-    cities: __.Composition.of.many<Cities>;
-    _parent: string;
-  };
-}
-const RegionXtended = _sap_common.CodeList(Region(__.Entity))
-export type Region = InstanceType<typeof RegionXtended>
-
-export class Regions extends Array<Region> {
-}
-
-export function City<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class CityAspect extends Base {
-    code: string;
-    region: __.Association.to<Region>;
-    districts: __.Composition.of.many<Districts>;
-  };
-}
-const CityXtended = _sap_common.CodeList(City(__.Entity))
-export type City = InstanceType<typeof CityXtended>
-
-export class Cities extends Array<City> {
-}
-
-export function District<TBase extends new (...args: any[]) => {}>(Base: TBase) {
-  return class DistrictAspect extends Base {
-    code: string;
-    city: __.Association.to<City>;
-  };
-}
-const DistrictXtended = _sap_common.CodeList(District(__.Entity))
-export type District = InstanceType<typeof DistrictXtended>
-
-export class Districts extends Array<District> {
-}
-