ES Modules

.eslintrc

@@ -0,0 +1,34 @@
+{
+  "extends": [
+    "plugin:@sap/cds/recommended",
+    "eslint:recommended"
+  ],
+  "env": {
+    "browser": true,
+    "es2022": true,
+    "node": true,
+    "jest": true,
+    "mocha": true
+  },
+  "parserOptions": {
+    "sourceType": "module"
+  },
+  "globals": {
+    "SELECT": true,
+    "INSERT": true,
+    "UPSERT": true,
+    "UPDATE": true,
+    "DELETE": true,
+    "CREATE": true,
+    "DROP": true,
+    "CDL": true,
+    "CQL": true,
+    "cds": true
+  },
+  "rules": {
+    "no-console": "off",
+    "require-atomic-updates": "off",
+        "require-await":"warn",
+        "no-unused-vars": ["warn", { "argsIgnorePattern": "_" }]
+  }
+}

.github/dependabot.yml

@@ -5,16 +5,4 @@ updates:
   directory: /
   versioning-strategy: increase-if-necessary
   schedule:
-    interval: weekly
+    interval: daily
-  groups:
-    production-dependencies:
-      dependency-type: "production"
-    development-dependencies:
-      dependency-type: "development"
-  ignore:
-    - dependency-name: "chai"
-        # chai 5 doesn't work atm w/ cds.test, TODO fix that in cds.test
-      versions: ["5.x"]
-    - dependency-name: "chai-as-promised"
-        # chai-as-promised 8 doesn't work atm w/ cds.test, TODO fix that in cds.test
-      versions: ["8.x"]

.github/workflows/node.js.yml

@@ -11,6 +11,7 @@ on:
 
 jobs:
   build:
+
     runs-on: ubuntu-latest
 
     strategy:
@@ -18,21 +19,10 @@ jobs:
         node-version: [20.x, 18.x]
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm ci
     - run: npm test
-
-  lint:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version: 20.x
-    - run: npm ci
-    - run: npm run lint

.vscode/extensions.json

@@ -4,11 +4,13 @@
 
 	// List of extensions which should be recommended for users of this workspace.
 	"recommendations": [
-		"qwtel.sqlite-viewer",
 		"sapse.vscode-cds",
 		"dbaeumer.vscode-eslint",
+		"esbenp.prettier-vscode",
 		"mechatroner.rainbow-csv",
 		"humao.rest-client",
+		"alexcvzz.vscode-sqlite",
+		"hbenl.vscode-mocha-test-adapter",
 		"sdras.night-owl",
 		"vsls-contrib.codetour"
 	],

.vscode/settings.json

@@ -13,5 +13,15 @@
       "**/cds/lib/req/cds-context.js",
       "**/odata-v4/okra/**"
     ]
-  }
+  },
+  "mochaExplorer.debuggerConfig": "Debug Mocha Tests",
+  "mochaExplorer.parallel": true,
+  "eslint.probe": [
+    "cds",
+    "csn",
+    "csv",
+    "csv (semicolon)",
+    "tsv",
+    "tab"
+  ]
 }

bookshop/.gitignore

@@ -0,0 +1,2 @@
+@cds-models
+@cds

bookshop/app/vue/app.js

@@ -77,7 +77,7 @@ function csrfToken (request) {
         document.csrfToken = token
         request.headers['x-csrf-token'] = document.csrfToken
         return request
-    }).catch(() => {
+    }).catch(_ => {
         document.csrfToken = null // set mark to not try again
         return request
     })

bookshop/db/init.js

@@ -1,5 +1,3 @@
-import cds from '@sap/cds'
-
 /**
  * In order to keep basic bookshop sample as simple as possible, we don't add
  * reuse dependencies. This db/init.js ensures we still have a minimum set of
@@ -8,7 +6,7 @@ import cds from '@sap/cds'
 
 // NOTE: We use cds.on('served') to delay the UPSERTs after the db init
 // to run after all INSERTs from .csv files happened.
-export default cds.on('served', ()=>
+cds.on('served', ()=> cds.run(
   UPSERT.into ('sap.common.Currencies') .columns (
     [ 'code', 'symbol', 'name' ]
   ) .rows (
@@ -18,4 +16,4 @@ export default cds.on('served', ()=>
     [ 'ILS', '₪', 'Shekel' ],
     [ 'JPY', '¥', 'Yen' ],
   )
-)
+))

bookshop/index.js

@@ -0,0 +1 @@
+export { CatalogService } from './srv/cat-service'

bookshop/jsconfig.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "module": "NodeNext",
+    "moduleResolution": "nodenext",
+    "paths": {
+      "#cds/*": [
+        "./@cds/*"
+      ]
+    }
+  }
+}

bookshop/package.json

@@ -11,15 +11,20 @@
     "index.js"
   ],
   "devDependencies": {
-    "@cap-js/sqlite": "*"
+    "@cap-js/sqlite": "*",
+    "@cap-js/cds-typer": ">=0.1"
   },
   "dependencies": {
-    "@sap/cds": ">=7",
+    "@sap/cds": "^7",
-    "express": "^4.17.1"
+    "express": "^4.17.1",
+    "passport": ">=0.4.1"
   },
   "scripts": {
     "genres": "cds serve test/genres.cds",
     "start": "cds-serve",
     "watch": "cds watch"
+  },
+  "imports": {
+    "#cds/*": "./@cds/*/index.js"
   }
 }

bookshop/srv/admin-service.js

@@ -1,14 +1,13 @@
 import cds from '@sap/cds'
 
 export class AdminService extends cds.ApplicationService { init(){
-  this.before (['NEW','CREATE'],'Authors', genid)
+  this.before ('NEW','Authors', genid)
-  this.before (['NEW','CREATE'],'Books', genid)
+  this.before ('NEW','Books', genid)
   return super.init()
 }}
 
 /** Generate primary keys for target entity in request */
 async function genid (req) {
-  if (req.data.ID) return
   const {id} = await SELECT.one.from(req.target).columns('max(ID) as id')
-  req.data.ID = id + 4 // Note: that is not safe! ok for this sample only.
+  req.data.ID = id - id % 100 + 100 + 1
 }

bookshop/srv/cat-service.js

@@ -6,8 +6,8 @@ export class CatalogService extends cds.ApplicationService { init() {
   const { ListOfBooks } = this.entities
 
   // Add some discount for overstocked books
-  this.after('each', ListOfBooks, book => {
+  this.after('READ', ListOfBooks, each => {
-    if (book.stock > 111) book.title += ` -- 11% discount!`
+    if (each.stock > 111) each.title += ` -- 11% discount!`
   })
 
   // Reduce stock of ordered books if available stock suffices

bookshop/test/genres.http

@@ -3,15 +3,15 @@
 #   Genres
 #
 
-GET http://localhost:4004/odata/v4/test/Genres?
+GET http://localhost:4004/test/Genres?
 ###
 
-GET http://localhost:4004/odata/v4/test/Genres?
+GET http://localhost:4004/test/Genres?
 &$filter=parent_ID eq null&$select=name
 &$expand=children($select=name)
 ###
 
-POST http://localhost:4004/odata/v4/test/Genres?
+POST http://localhost:4004/test/Genres?
 Content-Type: application/json
 
 { "ID":100, "name":"Some Sample Genres...", "children":[
@@ -26,13 +26,13 @@ Content-Type: application/json
 ]}
 ###
 
-GET http://localhost:4004/odata/v4/test/Genres(100)?
+GET http://localhost:4004/test/Genres(100)?
 # &$expand=children
 # &$expand=children($expand=children($expand=children($expand=children)))
 ###
 
-DELETE http://localhost:4004/odata/v4/test/Genres(103)
+DELETE http://localhost:4004/test/Genres(103)
 ###
 
-DELETE http://localhost:4004/odata/v4/test/Genres(100)
+DELETE http://localhost:4004/test/Genres(100)
 ###

bookstore/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@capire/bookstore",
   "version": "1.0.0",
-  "type": "module",
   "dependencies": {
     "@capire/bookshop": "*",
     "@capire/reviews": "*",

bookstore/server.js

@@ -1,8 +1,7 @@
-import mashup from './srv/mashup.js'
+const cds = require ('@sap/cds')
-import cds from '@sap/cds'
 
 // Add mashup logic
-cds.once('served', mashup)
+cds.once('served', require('./srv/mashup'))
 
 // Add routes to UIs from imported packages
 cds.once('bootstrap',(app)=>{
@@ -11,3 +10,6 @@ cds.once('bootstrap',(app)=>{
   app.serve ('/orders') .from('@capire/orders','app/orders')
   app.serve ('/data') .from('@capire/data-viewer','app/viewer')
 })
+
+// Add Swagger UI
+require('./srv/swagger-ui')

bookstore/srv/mashup.js

@@ -1,11 +1,10 @@
-import cds from '@sap/cds'
-
 ////////////////////////////////////////////////////////////////////////////
 //
 //    Mashing up bookshop services with required services...
 //
-export default async()=>{ // called by server.js
+module.exports = async()=>{ // called by server.js
 
+  const cds = require('@sap/cds')
   const CatalogService = await cds.connect.to ('CatalogService')
   const ReviewsService = await cds.connect.to ('ReviewsService')
   const OrdersService = await cds.connect.to ('OrdersService')
@@ -19,7 +18,7 @@ export default async()=>{ // called by server.js
   // Note: prepend is neccessary to intercept generic default handler
   //
   CatalogService.prepend (srv => srv.on ('READ', 'Books/reviews', (req) => {
-    console.debug ('> delegating request to ReviewsService') // eslint-disable-line no-console
+    console.debug ('> delegating request to ReviewsService')
     const [id] = req.params, { columns, limit } = req.query.SELECT
     return ReviewsService.read ('Reviews',columns).limit(limit).where({subject:String(id)})
   }))
@@ -41,7 +40,7 @@ export default async()=>{ // called by server.js
   // Update Books' average ratings when ReviewsService signals updated reviews
   //
   ReviewsService.on ('reviewed', (msg) => {
-    console.debug ('> received:', msg.event, msg.data) // eslint-disable-line no-console
+    console.debug ('> received:', msg.event, msg.data)
     const { subject, count, rating } = msg.data
     return UPDATE(Books,subject).with({ numberOfReviews:count, rating })
   })
@@ -50,7 +49,7 @@ export default async()=>{ // called by server.js
   // Reduce stock of ordered books for orders are created from Orders admin UI
   //
   OrdersService.on ('OrderChanged', (msg) => {
-    console.debug ('> received:', msg.event, msg.data) // eslint-disable-line no-console
+    console.debug ('> received:', msg.event, msg.data)
     const { product, deltaQuantity } = msg.data
     return UPDATE (Books) .where ('ID =', product)
     .and ('stock >=', deltaQuantity)

bookstore/srv/swagger-ui.js

@@ -0,0 +1,10 @@
+
+// -----------------------------------------------------------------------
+// Adding Swagger UI - see https://cap.cloud.sap/docs/advanced/openapi
+const cds = require ('@sap/cds')
+try {
+  const cds_swagger = require ('cds-swagger-ui-express')
+  cds.once ('bootstrap', app => app.use (cds_swagger()) )
+} catch (err) {
+  if (err.code !== 'MODULE_NOT_FOUND')  throw err
+}

bookstore/test/requests.http

@@ -12,12 +12,11 @@
 #
 
 GET {{reviews-service}}/Reviews
-Authorization: Basic me:
 
 ###
 
 POST {{reviews-service}}/Reviews
-Authorization: Basic me:
+Authorization: Basic {{$processEnv USER}}:
 Content-Type: application/json
 
 {"subject":"201", "title":"boo", "rating":3 }
@@ -42,7 +41,7 @@ GET {{bookshop}}/browse/Books(201)?
 ###
 
 GET {{bookshop}}/browse/Books?
-&$select=title,author&$expand=currency
+  &$select=title,author&$expand=currency
 Accept-Language: de
 
 #################################################
@@ -51,23 +50,23 @@ Accept-Language: de
 #
 @newOrderID = e939604c-ab83-4d4f-bdb6-95fe30b3773e
 
-GET {{bookshop}}/odata/v4/orders/Orders
+GET {{bookshop}}/orders/Orders
 
 ### Create order, still inactive
-POST {{bookshop}}/odata/v4/orders/Orders
+POST {{bookshop}}/orders/Orders
 Content-Type: application/json
 
 {"ID": "{{newOrderID}}"}
 
 ### Get inactive order.  We have to specify `IsActiveEntity`.
-GET {{bookshop}}/odata/v4/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)
+GET {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)
 
 ### Activate order using `.../<servicename>.draftActivate`
-POST {{bookshop}}/odata/v4/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)/OrdersService.draftActivate
+POST {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)/OrdersService.draftActivate
 Content-Type: application/json
 
 ### Get active order
-GET {{bookshop}}/odata/v4/orders/Orders(ID={{newOrderID}},IsActiveEntity=true)
+GET {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=true)
 
 ### Create author
 POST {{bookshop}}/admin/Authors

data-viewer/srv/data-service.js

@@ -18,7 +18,7 @@ class DataService extends cds.ApplicationService { init(){
       .sort((e1, e2) => e1.name.localeCompare(e2.name))
       .map(e => {
         const columns = Object.entries(e.elements)
-          .filter(([,el]) => !(el instanceof cds.Association)) // exclude assocs+compositions
+          .filter(([_, el]) => !(el instanceof cds.Association)) // exclude assocs+compositions
           .map(([name, el]) => { return { name, type: el.type, isKey:!!el.key }})
         return { name: e.name, columns }
       })

eslint.config.mjs

@@ -1,20 +0,0 @@
-import cds from '@sap/cds/eslint.config.mjs'
-export default [ ...cds.recommended ]
-
-//
-// The above is the recommended minimalistic eslint config, just using
-// recommended defaults provided by cds. Alternatively, go for enhanced
-// project-specific options, but only if really required, like this:
-//
-// export default [ ...cds.recommended, {
-//   rules: {
-//     'complexity': [ 'warn', 66 ],
-//     'require-await': 'warn',
-//     'no-await-in-loop': 'warn',
-//   },
-// }, {
-//   ignores: [
-//     '**/webapp/**'
-//   ]
-// }]
-//

fiori/app/admin-authors/webapp/i18n/i18n.properties

@@ -2,10 +2,10 @@
 # __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
 
 # JCI app descriptor contains lower case TITLE
-appTitle=Manage Authors
+appTitle=Bookshop Authors
 
 # JCI app descriptor contains lower case DESCRIPTION
-appSubTitle=CAP Sample Application
+appSubTitle=Bookshop Authors
 
 # JCI app descriptor contains lower case DESCRIPTION
 appDescription=Bookshop Authors

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

@@ -35,7 +35,7 @@
             "additionalParameters": "ignored"
           },
           "semanticObject": "Authors",
-          "action": "manage",
+          "action": "display",
           "title": "{{appTitle}}",
           "info": "{{appInfo}}",
           "subTitle": "{{appSubTitle}}",

fiori/app/admin-books/webapp/i18n/i18n.properties

@@ -2,7 +2,7 @@
 # __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
 
 # JCI app descriptor contains lower case TITLE
-appTitle=Manage Books
+appTitle=Bookshop Sample
 
 # JCI app descriptor contains lower case DESCRIPTION
 appSubTitle=CAP Sample Application

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

@@ -19,22 +19,6 @@
             "id": "ui5template.basicSAPUI5ApplicationProject",
             "-id": "ui5template.smartTemplate",
             "-version": "1.40.12"
-        },
-        "crossNavigation": {
-            "inbounds": {
-                "intent1": {
-                        "signature": {
-                        "parameters": {},
-                        "additionalParameters": "allowed"
-                    },
-                    "semanticObject": "Books",
-                    "action": "manage",
-                    "title": "{{appTitle}}",
-                    "info": "{{appInfo}}",
-                    "subTitle": "{{appSubTitle}}",
-                    "icon": "sap-icon://course-book"
-                }
-            }
         }
     },
     "sap.ui5": {

fiori/app/appconfig/fioriSandboxConfig.json

@@ -50,7 +50,7 @@
                   "tileType": "sap.ushell.ui.tile.StaticTile",
                   "properties": {
                     "title": "Manage Authors",
-                    "targetURL": "#Authors-manage"
+                    "targetURL": "#Authors-display"
                   }
                 },
                 {
@@ -99,7 +99,7 @@
             },
             "BrowseAuthors": {
               "semanticObject": "Authors",
-              "action": "manage",
+              "action": "display",
               "title": "Browse Authors",
               "signature": {
                 "parameters": {

fiori/app/browse/webapp/i18n/i18n.properties

@@ -2,7 +2,7 @@
 # __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
 
 # JCI app descriptor contains lower case TITLE
-appTitle=Browse Books
+appTitle=Bookshop Sample
 
 # JCI app descriptor contains lower case DESCRIPTION
 appSubTitle=CAP Sample Application

fiori/app/fiori-apps.html

@@ -1,7 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
-
 <head>
+
 	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -10,22 +10,21 @@
 	<script>
 		window["sap-ushell-config"] = {
 			defaultRenderer: "fiori2",
-			applications: {},
+			applications: {}
 		};
 	</script>
 
-	<script id="sap-ushell-bootstrap" src="https://ui5.sap.com/test-resources/sap/ushell/bootstrap/sandbox.js"></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://ui5.sap.com/resources/sap-ui-core.js"
+	<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-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
-		data-sap-ui-theme="sap_horizon"></script>
+			data-sap-ui-compatVersion="edge"
+			data-sap-ui-theme="sap_horizon"
+			data-sap-ui-frameOptions="allow"
+	></script>
 	<script>
-		sap.ui.getCore().attachInit(() =>
+		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"))
-			sap.ushell.Container.createRenderer().placeAt("content")
-		);
 	</script>
+
 </head>
-
+<body class="sapUiBody" id="content"></body>
-<body class="sapUiBody" id="content">
-</body>
-
 </html>

fiori/package.json

@@ -5,7 +5,8 @@
     "@capire/bookstore": "*",
     "@sap/cds": ">=5",
     "@cap-js-community/odata-v2-adapter": "^1",
-    "express": "^4.17.1"
+    "express": "^4.17.1",
+    "passport": ">=0.4.1"
   },
   "devDependencies": {
     "@cap-js/sqlite": "^1"
@@ -50,10 +51,5 @@
     "hana": {
       "deploy-format": "hdbtable"
     }
-  },
+  }
-  "sapux": [
-    "app/admin-authors",
-    "app/admin-books",
-    "app/browse"
-  ]
 }

fiori/server.js

@@ -0,0 +1,8 @@
+// install OData v2 adapter
+const cds = require("@sap/cds")
+const proxy = require('@cap-js-community/odata-v2-adapter')
+const opts = global.it ? { target:'auto' } : {}   // for tests, set 'auto' to detect port dynamically
+cds.on('bootstrap', app => app.use(proxy(opts)))  // install proxy
+// cds.log('cov2ap','silent') // suppress anoying log outpout, e.g. for `npm run mocha -- --reporter nyan`
+
+module.exports = require('@capire/bookstore/server.js')

hello/package.json

@@ -1,13 +1,42 @@
 {
   "name": "@capire/hello-world",
   "version": "1.0.0",
-  "type": "module",
   "scripts": {
     "test": "npx jest --silent",
-    "start": "cds-serve srv/world.cds",
+    "start": "cds serve srv/world.cds",
     "start:ts": "cds-ts serve srv/world.cds"
   },
   "dependencies": {
     "@sap/cds": ">=5.0.4"
+  },
+  "devDependencies": {
+    "@types/jest": "*",
+    "@types/node": "*",
+    "typescript": ">=4.3.5"
+  },
+  "eslintConfig": {
+    "extends": "eslint: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"
+    }
   }
 }

hello/srv/world.cds

@@ -1,3 +1,3 @@
-service say {
+service say @(path: '/say') {
   function hello (to:String) returns String;
-}
+}

hello/srv/world.js

@@ -1,6 +1,7 @@
-import cds from '@sap/cds'
+module.exports = class say {
-export class say extends cds.ApplicationService {
+  hello(req) {
-  hello (to = 'World') {
+    let {to} = req.data
+    if (to === 'me') to = require('os').userInfo().username
     return `Hello ${to}!`
   }
 }

hello/srv/world.ts

@@ -1,6 +1,7 @@
-import cds from '@sap/cds'
+import type { Request } from "@sap/cds/apis/services"
-export class say extends cds.ApplicationService {
+
-  hello (to : String = 'World') {
+module.exports = class say {
-    return `Hello ${to} from TypeScript!`
+    hello(req: Request) {
-  }
+        return `Hello ${req.data.to} from a TypeScript file!`
+    }
 }

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/test.http

@@ -1,5 +1 @@
-GET http://localhost:4004/odata/v4/say/hello
+GET http://localhost:4004/say/hello(to='world')
-###
-
-GET http://localhost:4004/odata/v4/say/hello(to='me')
-###

loggers/package.json

@@ -13,5 +13,10 @@
   "scripts": {
     "start": "cds-serve",
     "watch": "cds watch"
+  },
+  "cds": {
+    "requires": {
+      "db": "sql"
+    }
   }
 }

loggers/srv/loggers.js

@@ -1,4 +1,4 @@
-const cds = require ('@sap/cds')
+const cds = require ('@sap/cds/lib')
 const LOG = cds.log('cds.log')
 
 module.exports = class LogService extends cds.Service {

orders/app/orders/webapp/i18n/i18n.properties

@@ -2,7 +2,7 @@
 # __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
 
 # JCI app descriptor contains lower case TITLE
-appTitle=Manage Orders
+appTitle=Bookshop Sample
 
 # JCI app descriptor contains lower case DESCRIPTION
 appSubTitle=CAP Sample Application

orders/srv/orders-service.js

@@ -29,7 +29,7 @@ class OrdersService extends cds.ApplicationService {
   /** order changed -> broadcast event */
   orderChanged (product, deltaQuantity) {
     // Emit events to inform subscribers about changes in orders
-    console.log ('> emitting:', 'OrderChanged', { product, deltaQuantity }) // eslint-disable-line no-console
+    console.log ('> emitting:', 'OrderChanged', { product, deltaQuantity })
     return this.emit ('OrderChanged', { product, deltaQuantity })
   }
 

package.json

@@ -1,50 +1,56 @@
 {
-    "name": "@capire/samples",
+  "name": "@capire/samples",
-    "version": "2.1.0",
+  "version": "2.0.0",
-    "description": "A monorepo with several samples for CAP.",
+  "description": "A monorepo with several samples for CAP.",
-    "repository": "https://github.com/sap-samples/cloud-cap-samples.git",
+  "repository": "https://github.com/sap-samples/cloud-cap-samples.git",
-    "author": "daniel.hutzel@sap.com",
+  "author": "daniel.hutzel@sap.com",
-    "dependencies": {
+  "dependencies": {
-      "@sap/cds": ">=8"
+    "@sap/cds": ">=7"
-    },
+  },
-    "workspaces": [
+  "workspaces": [
-      "./bookshop",
+    "./bookshop",
-      "./bookstore",
+    "./bookstore",
-      "./common",
+    "./common",
-      "./data-viewer",
+    "./data-viewer",
-      "./fiori",
+    "./fiori",
-      "./hello",
+    "./hello",
-      "./media",
+    "./media",
-      "./orders",
+    "./orders",
-      "./loggers",
+    "./loggers",
-      "./reviews"
+    "./reviews"
-    ],
+  ],
-    "devDependencies": {
+  "devDependencies": {
-      "@cap-js/sqlite": "^1",
+    "@cap-js/sqlite": "^1",
-      "axios": "^1",
+    "@sap/eslint-plugin-cds": "^2.6.1",
-      "chai": "^4.3.4",
+    "axios": "^1",
-      "chai-as-promised": "^7.1.1",
+    "chai": "^4.3.4",
-      "chai-subset": "^1.6.0",
+    "chai-as-promised": "^7.1.1",
-      "eslint": "^9",
+    "chai-subset": "^1.6.0",
-      "semver": "^7"
+    "semver": "^7"
-    },
+  },
-    "scripts": {
+  "scripts": {
-      "bookshop": "cds watch bookshop",
+    "cleanup": "rm -rf node_modules && rm -rf */node_modules && rm -rf */*/node_modules",
-      "start": "cds watch fiori",
+    "bookshop": "cds watch bookshop",
-      "fiori": "cds watch fiori",
+    "fiori": "cds watch fiori",
-      "hello": "cds watch hello",
+    "hello": "cds watch hello",
-      "media": "cds watch media",
+    "media": "cds watch media",
-      "lint": "eslint",
+    "mocha": "CDS_TEST_SILENT=y npx mocha",
-      "test": "npx jest --silent",
+    "jest": "npx jest --silent",
-      "jest": "npx jest --silent",
+    "start": "cds watch fiori",
-      "mocha": "CDS_TEST_SILENT=y npx mocha",
+    "test": "npm run jest -- --silent",
-      "test:hello": "cd hello && npm test"
+    "test:hello": "cd hello && npm test"
-    },
+  },
-    "mocha": {
+  "jest": {
-      "recursive": true,
+    "testTimeout": 20000,
-      "parallel": true,
+    "testMatch": [
-      "timeout": 6666
+      "**/*.test.js"
-    },
+    ]
-    "license": "SEE LICENSE IN LICENSE",
+  },
-    "private": true
+  "mocha": {
-  }
+    "recursive": true,
+    "parallel": true,
+    "timeout": 6666
+  },
+  "license": "SEE LICENSE IN LICENSE",
+  "private": true
+}

reviews/app/vue/app.js

@@ -50,6 +50,7 @@ const reviews = Vue.createApp ({
                     const res = await POST(`/Reviews`,review)
                     reviews.ID = res.data.ID
                 } else {
+                    console.trace()
                     await PUT(`/Reviews/${review.ID}`,review)
                 }
                 reviews.message = { succeeded: 'Your review was submitted successfully. Thanks.' }

reviews/srv/reviews-service.js

@@ -15,7 +15,7 @@ module.exports = cds.service.impl (function(){
     const { count, rating } = await cds.tx(req) .run (
       SELECT.one `round(avg(rating),2) as rating, count(*) as count` .from (Reviews) .where ({subject})
     )
-    global.it || console.log ('< emitting:', 'reviewed', { subject, count, rating }) // eslint-disable-line no-console
+    global.it || console.log ('< emitting:', 'reviewed', { subject, count, rating })
     await this.emit ('reviewed', { subject, count, rating })
   })
 

test/cds.ql.test.js

@@ -1,8 +1,7 @@
-const cds = require('@sap/cds')
-const { expect } = cds.test
-
 describe('cds.ql → cqn', () => {
 
+  const cds = require('@sap/cds/lib')
+  const { expect } = cds.test
   const Foo = { name: 'Foo' }
   const Books = { name: 'capire.bookshop.Books' }
 
@@ -677,7 +676,7 @@ describe('cds.ql → cqn', () => {
         .to.eql(INSERT.into(Foo).entries(...entries))
         .to.eql(INSERT.into(Foo).entries(entries))
         .to.eql({
-          INSERT: { into: { ref: ['Foo'] }, entries },
+          INSERT: { into: 'Foo', entries },
         })
     })
 
@@ -693,7 +692,7 @@ describe('cds.ql → cqn', () => {
         .to.eql(INSERT.into(Foo).columns('a', 'b').rows([1, 2], [3, 4]))
         .to.eql({
           INSERT: {
-            into: { ref: ['Foo'] },
+            into: 'Foo',
             columns: ['a', 'b'],
             rows: [
               [1, 2],
@@ -707,7 +706,7 @@ describe('cds.ql → cqn', () => {
       expect(INSERT.into(Foo).columns('a', 'b').values([1, 2]))
         .to.eql(INSERT.into(Foo).columns('a', 'b').values(1, 2))
         .to.eql({
-          INSERT: { into:  { ref: ['Foo'] }, columns: ['a', 'b'], values: [1, 2] },
+          INSERT: { into: 'Foo', columns: ['a', 'b'], values: [1, 2] },
         })
     })
 
@@ -722,7 +721,7 @@ describe('cds.ql → cqn', () => {
     test('entity (..., <key>)', () => {
       const cqnWhere = {
           UPDATE: {
-            entity: { ref: ['capire.bookshop.Books'] },
+            entity: 'capire.bookshop.Books',
             where: [{ ref: ['ID'] }, '=', { val: 4711 }],
           },
         }
@@ -766,7 +765,7 @@ describe('cds.ql → cqn', () => {
         .to.eql(UPDATE(Foo).with({ foo: 11, bar: { '-=': 22 } }))
         .to.eql({
           UPDATE: {
-            entity: { ref: ['Foo'] },
+            entity: 'Foo',
             data: { foo: 11 },
             with: {
               bar: { xpr: [{ ref: ['bar'] }, '-', { val: 22 }] },
@@ -777,7 +776,7 @@ describe('cds.ql → cqn', () => {
       // some more
       expect(UPDATE(Foo).with(`bar = coalesce(x,y), car = 'foo''s bar, car'`)).to.eql({
         UPDATE: {
-          entity: { ref: ['Foo'] },
+          entity: 'Foo',
           data: {
             car: "foo's bar, car",
           },
@@ -797,7 +796,7 @@ describe('cds.ql → cqn', () => {
     test('from (..., <key>)', () => {
       const cqnWhere = {
           DELETE: {
-            from: { ref: ['capire.bookshop.Books'] },
+            from: 'capire.bookshop.Books',
             where: [{ ref: ['ID'] }, '=', { val: 4711 }],
           },
         }

test/consuming-services.test.js

@@ -1,4 +1,4 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')
 
 describe('cap/samples - Consuming Services locally', () => {
 

test/custom-handlers.test.js

@@ -1,4 +1,4 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')
 
 describe('cap/samples - Custom Handlers', () => {
 
@@ -8,10 +8,9 @@ describe('cap/samples - Custom Handlers', () => {
   })
 
   it('should reject out-of-stock orders', async () => {
-    await expect(POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`).to.be.fulfilled
+    await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`
-    await expect(POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`).to.be.fulfilled
+    await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`
-    await expect(POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`).to.be.rejectedWith(
+    await expect(POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`).to.be.rejectedWith(/409 - 5 exceeds stock for book #201/)
-      /409 - 5 exceeds stock for book #201/)
     const { data } = await GET`/admin/Books/201/stock/$value`
     expect(data).to.equal(2)
   })

test/fiori.test.js

@@ -1,8 +1,4 @@
-// Quick hack: suppress deprecation warnings w/ Node22 caused by http-proxy (used by OData v2 proxy)
+const cds = require('@sap/cds/lib')
-// See also: https://github.com/http-party/node-http-proxy/pull/1666
-require('util')._extend = Object.assign
-
-const cds = require('@sap/cds')
 
 describe('cap/samples - Fiori APIs - v2', function() {
 

test/hello-world.test.js

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

test/hierarchical-data.test.js

@@ -1,4 +1,4 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')
 const { expect } = cds.test.in(__dirname,'..')
 
 describe('cap/samples - Hierarchical Data', ()=>{
@@ -33,89 +33,83 @@ describe('cap/samples - Hierarchical Data', ()=>{
 		]}
 	))
 
-	it ('should generate correct queries for expands', ()=>{
+	it ('supports nested reads', async()=>{
-		let q = SELECT.from (Cats, c => { c.ID, c.name, c.children (c => c.name) })
+		if (require('semver').gte(cds.version, '5.9.0')) {
-		expect (q) .to.eql ({
+			expect (await
-			SELECT: {
+				SELECT.one.from (Cats, c=>{
-				from: { ref:[ "Categories" ] },
+					c.ID, c.name.as('parent'), c.children (c=>{
-				columns: [
+						c.name.as('child')
-					{ ref: [ "ID" ] },
+					})
-					{ ref: [ "name" ] },
+				}) .where ({name:'Cat'})
-					{ ref: [ "children" ], expand: [ {ref:['name']} ] },
+			) .to.eql (
-				]
+				{ ID:101, parent:'Cat', children:[
-			}
+					{ child:'Kitty' },
-		})
+					{ child:'Catwoman' },
-		if (q.forSQL) expect (q.forSQL()) .to.eql ({
+				]}
-			SELECT: {
+			)
-				from: { ref:[ "Categories" ], as: "Categories" },
+			return
-				columns: [
+		}
-					{ ref: [ "Categories", "ID" ] },
+		expect (await
-					{ ref: [ "Categories", "name" ] },
+			SELECT.one.from (Cats, c=>{
-					{ as: "children", SELECT: { expand: true,
+				c.ID, c.name.as('parent'), c.children (c=>{
-						one: false,
+					c.name.as('child')
-						columns: [{ ref: [ "children", "name" ]}],
+				})
-						from: { ref:["Categories"], as: "children" },
+			}) .where ({name:'Cat'})
-						where: [
+		) .to.eql (
-							{ref:[ "Categories", "ID" ]}, "=", {ref:[ "children", "parent_ID" ]}
+			{ ID:101, parent:'Cat', children:[
-						],
+				{ ID:102, child:'Kitty' },
-					}},
+				{ ID:106, child:'Catwoman' },
-				],
+			]}
-			}
-		})
-		if (q.toSql) expect (q.toSql()) .to.eql (
-			`SELECT json_insert('{}',` +
-				`'$."ID"',ID,` +
-				`'$."name"',name,` +
-				`'$."children"',children->'$'` +
-			`) as _json_ FROM (` +
-				`SELECT Categories.ID,Categories.name,(` +
-					`SELECT jsonb_group_array(jsonb_insert('{}','$."name"',name)) as _json_ FROM (` +
-						`SELECT children.name FROM Categories as children WHERE Categories.ID = children.parent_ID` +
-					`)` +
-				`) as children FROM Categories as Categories` +
-			`)`
 		)
 	})
 
-	it ('supports nested reads', ()=> expect (
+	it ('supports deeply nested reads', async()=>{
-		SELECT.one.from (Cats, c=>{
+		if (require('semver').gte(cds.version, '5.9.0')) {
-			c.ID, c.name.as('parent'), c.children (c=>{
+			expect (await SELECT.one.from (Cats, c=>{
-				c.name.as('child')
+				c.ID, c.name, c.children (
-			})
+					c => { c.name },
-		}) .where ({name:'Cat'})
+					{levels:3}
-	) .to.eventually.eql (
+				)
-		{ ID:101, parent:'Cat', children:[
+			}) .where ({name:'Cat'})
-			{ child:'Kitty' },
+			) .to.eql (
-			{ child:'Catwoman' },
+				{ ID:101, name:'Cat', children:[
-		]}
+					{ name:'Kitty', children:[
-	))
+						{ name:'Kitty Cat', children:[
-
+							{ name:'Aristocat' }, ]},  // level 3
-	it ('supports deeply nested reads', ()=> expect (
+						{ name:'Kitty Bat', children:[] }, ]},
-		SELECT.one.from (Cats, c=>{
+					{ name:'Catwoman', children:[
+						{ name:'Catalina', children:[] } ]},
+				]}
+			)
+			return
+		}
+		expect (await SELECT.one.from (Cats, c=>{
 			c.ID, c.name, c.children (
 				c => { c.name },
 				{levels:3}
 			)
 		}) .where ({name:'Cat'})
-	) .to.eventually.eql (
+		) .to.eql (
-		{ ID:101, name:'Cat', children:[
+			{ ID:101, name:'Cat', children:[
-			{ name:'Kitty', children:[
+				{ ID:102, name:'Kitty', children:[
-				{ name:'Kitty Cat', children:[
+					{ ID:103, name:'Kitty Cat', children:[
-					{ name:'Aristocat' }, ]},  // level 3
+						{ ID:104, name:'Aristocat' }, ]},  // level 3
-				{ name:'Kitty Bat', children:[] }, ]},
+					{ ID:105, name:'Kitty Bat', children:[] }, ]},
-			{ name:'Catwoman', children:[
+				{ ID:106, name:'Catwoman', children:[
-				{ name:'Catalina', children:[] } ]},
+					{ ID:107, name:'Catalina', children:[] } ]},
-		]}
+			]}
-	))
+		)
+	})
 
 	it ('supports cascaded deletes', async()=>{
 		const affectedRows = await DELETE.from (Cats) .where ({ID:[102,106]})
 		expect (affectedRows) .to.be.greaterThan (0)
-		await expect (SELECT`ID,name`.from(Cats) ).to.eventually.eql ([
+		const expected = [
 			{ ID:100, name:'Some Cats...' },
 			{ ID:101, name:'Cat' },
 			{ ID:108, name:'Catweazle' }
-		])
+		]
+		expect ( await SELECT`ID,name`.from(Cats) ).to.eql (expected)
 	})
 
 })

test/localized-data/services.test.js

@@ -1,4 +1,4 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')
 
 describe('cap/samples - Localized Data', () => {
 

test/messaging.test.js

@@ -1,4 +1,4 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')
 
 describe('cap/samples - Messaging', ()=>{
 

test/odata.test.js

@@ -1,4 +1,4 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')
 
 describe('cap/samples - Bookshop APIs', () => {
   const { GET, expect, axios } = cds.test ('@capire/bookshop')
@@ -8,10 +8,9 @@ describe('cap/samples - Bookshop APIs', () => {
     const { headers, status, data } = await GET `/browse/$metadata`
     expect(status).to.equal(200)
     expect(headers).to.contain({
-      // 'content-type': 'application/xml', //> fails with 'application/xml;charset=utf-8', which is set by express
+      'content-type': 'application/xml',
       'odata-version': '4.0',
     })
-    expect(headers['content-type']).to.match(/application\/xml/)
     expect(data).to.contain('<EntitySet Name="Books" EntityType="CatalogService.Books">')
     expect(data).to.contain('<Annotation Term="Common.Label" String="Currency"/>')
   })
@@ -29,66 +28,63 @@ describe('cap/samples - Bookshop APIs', () => {
     ])
   })
 
-  describe('query options...', () => {
+  it('supports $search in multiple fields', async () => {
+    const { data } = await GET `/browse/Books ${{
+      params: { $search: 'Po', $select: `title,author` },
+    }}`
+    expect(data.value).to.containSubset([
+      { ID: 201, title: 'Wuthering Heights', author: 'Emily Brontë' },
+      { ID: 207, title: 'Jane Eyre', author: 'Charlotte Brontë' },
+      { ID: 251, title: 'The Raven', author: 'Edgar Allen Poe' },
+      { ID: 252, title: 'Eleonora', author: 'Edgar Allen Poe' },
+    ])
+  })
 
-    it('supports $search in multiple fields', async () => {
+  it('supports $select', async () => {
-      const { data } = await GET `/browse/Books ${{
+    const { data } = await GET(`/browse/Books`, {
-        params: { $search: 'Po', $select: `title,author` },
+      params: { $select: `ID,title` },
-      }}`
-      expect(data.value).to.containSubset([
-        { ID: 201, title: 'Wuthering Heights', author: 'Emily Brontë' },
-        { ID: 207, title: 'Jane Eyre', author: 'Charlotte Brontë' },
-        { ID: 251, title: 'The Raven', author: 'Edgar Allen Poe' },
-        { ID: 252, title: 'Eleonora', author: 'Edgar Allen Poe' },
-      ])
     })
+    expect(data.value).to.containSubset([
+      { ID: 201, title: 'Wuthering Heights' },
+      { ID: 207, title: 'Jane Eyre' },
+      { ID: 251, title: 'The Raven' },
+      { ID: 252, title: 'Eleonora' },
+      { ID: 271, title: 'Catweazle' },
+    ])
+  })
 
-    it('supports $select', async () => {
+  it('supports $expand', async () => {
-      const { data } = await GET(`/browse/Books`, {
+    const { data } = await GET(`/admin/Authors`, {
-        params: { $select: `ID,title` },
+      params: {
-      })
+        $select: `name`,
-      expect(data.value).to.containSubset([
+        $expand: `books($select=title)`,
-        { ID: 201, title: 'Wuthering Heights' },
+      },
-        { ID: 207, title: 'Jane Eyre' },
-        { ID: 251, title: 'The Raven' },
-        { ID: 252, title: 'Eleonora' },
-        { ID: 271, title: 'Catweazle' },
-      ])
     })
+    expect(data.value).to.containSubset([
+      { name: 'Emily Brontë', books: [{ title: 'Wuthering Heights' }] },
+      { name: 'Charlotte Brontë', books: [{ title: 'Jane Eyre' }] },
+      { name: 'Edgar Allen Poe', books: [{ title: 'The Raven' }, { title: 'Eleonora' }] },
+      { name: 'Richard Carpenter', books: [{ title: 'Catweazle' }] },
+    ])
+  })
 
-    it('supports $expand', async () => {
+  it('supports $value requests', async () => {
-      const { data } = await GET(`/admin/Authors`, {
+    const { data } = await GET`/admin/Books/201/stock/$value`
-        params: {
+    expect(data).to.equal(12)
-          $select: `name`,
+  })
-          $expand: `books($select=title)`,
-        },
-      })
-      expect(data.value).to.containSubset([
-        { name: 'Emily Brontë', books: [{ title: 'Wuthering Heights' }] },
-        { name: 'Charlotte Brontë', books: [{ title: 'Jane Eyre' }] },
-        { name: 'Edgar Allen Poe', books: [{ title: 'The Raven' }, { title: 'Eleonora' }] },
-        { name: 'Richard Carpenter', books: [{ title: 'Catweazle' }] },
-      ])
-    })
 
-    it('supports $value requests', async () => {
+  it('supports $top/$skip paging', async () => {
-      const { data } = await GET`/admin/Books/201/stock/$value`
+    const { data: p1 } = await GET`/browse/Books?$select=title&$top=3`
-      expect(data).to.equal(12)
+    expect(p1.value).to.containSubset([
-    })
+      { ID: 201, title: 'Wuthering Heights' },
-
+      { ID: 207, title: 'Jane Eyre' },
-    it('supports $top/$skip paging', async () => {
+      { ID: 251, title: 'The Raven' },
-      const { data: p1 } = await GET`/browse/Books?$select=title&$top=3`
+    ])
-      expect(p1.value).to.containSubset([
+    const { data: p2 } = await GET`/browse/Books?$select=title&$skip=3`
-        { ID: 201, title: 'Wuthering Heights' },
+    expect(p2.value).to.containSubset([
-        { ID: 207, title: 'Jane Eyre' },
+      { ID: 252, title: 'Eleonora' },
-        { ID: 251, title: 'The Raven' },
+      { ID: 271, title: 'Catweazle' },
-      ])
+    ])
-      const { data: p2 } = await GET`/browse/Books?$select=title&$skip=3`
-      expect(p2.value).to.containSubset([
-        { ID: 252, title: 'Eleonora' },
-        { ID: 271, title: 'Catweazle' },
-      ])
-    })
   })
 
   it('serves user info', async () => {