Using ES Modules

* Post TechEd cosmetics

* Update package-lock.json

.eslintrc

@@ -1,31 +0,0 @@
-{
-  "extends": [
-    "plugin:@sap/cds/recommended",
-    "eslint:recommended"
-  ],
-  "env": {
-    "browser": true,
-    "es2022": true,
-    "node": true,
-    "jest": true,
-    "mocha": true
-  },
-  "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

@@ -15,3 +15,6 @@ updates:
     - 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,7 +11,6 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     strategy:
@@ -19,10 +18,21 @@ jobs:
         node-version: [20.x, 18.x]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v4
       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/settings.json

@@ -13,13 +13,5 @@
       "**/cds/lib/req/cds-context.js",
       "**/odata-v4/okra/**"
     ]
-  },
-  "eslint.probe": [
-    "cds",
-    "csn",
-    "csv",
-    "csv (semicolon)",
-    "tsv",
-    "tab"
-  ]
+  }
 }

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,3 +1,5 @@
+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
@@ -6,7 +8,7 @@
 
 // NOTE: We use cds.on('served') to delay the UPSERTs after the db init
 // to run after all INSERTs from .csv files happened.
-module.exports = cds.on('served', ()=> cds.run(
+export default cds.on('served', ()=>
   UPSERT.into ('sap.common.Currencies') .columns (
     [ 'code', 'symbol', 'name' ]
   ) .rows (
@@ -16,4 +18,4 @@ module.exports = cds.on('served', ()=> cds.run(
     [ 'ILS', '₪', 'Shekel' ],
     [ 'JPY', '¥', 'Yen' ],
   )
-))
+)

bookshop/index.js

@@ -1,2 +0,0 @@
-const { CatalogService } = require('./srv/cat-service')
-module.exports = { CatalogService }

bookshop/package.json

@@ -2,6 +2,7 @@
   "name": "@capire/bookshop",
   "version": "1.0.0",
   "description": "A simple self-contained bookshop service.",
+  "type": "module",
   "files": [
     "app",
     "srv",
@@ -13,7 +14,7 @@
     "@cap-js/sqlite": "*"
   },
   "dependencies": {
-    "@sap/cds": "^7",
+    "@sap/cds": ">=7",
     "express": "^4.17.1"
   },
   "scripts": {

bookshop/srv/admin-service.js

@@ -1,13 +1,14 @@
-const cds = require('@sap/cds/lib')
+import cds from '@sap/cds'
 
-module.exports = class AdminService extends cds.ApplicationService { init(){
-  this.before ('NEW','Authors', genid)
-  this.before ('NEW','Books', genid)
+export class AdminService extends cds.ApplicationService { init(){
+  this.before (['NEW','CREATE'],'Authors', genid)
+  this.before (['NEW','CREATE'],'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 - id % 100 + 100 + 1
+  req.data.ID = id + 4 // Note: that is not safe! ok for this sample only.
 }

bookshop/srv/cat-service.js

@@ -1,11 +1,13 @@
-module.exports = class CatalogService extends cds.ApplicationService { init() {
+import cds from '@sap/cds'
+
+export class CatalogService extends cds.ApplicationService { init() {
 
   const { Books } = cds.entities('sap.capire.bookshop')
   const { ListOfBooks } = this.entities
 
   // Add some discount for overstocked books
-  this.after('READ', ListOfBooks, each => {
-    if (each.stock > 111) each.title += ` -- 11% discount!`
+  this.after('each', ListOfBooks, book => {
+    if (book.stock > 111) book.title += ` -- 11% discount!`
   })
 
   // Reduce stock of ordered books if available stock suffices

bookshop/srv/user-service.js

@@ -1,5 +1,5 @@
-const cds = require('@sap/cds')
-module.exports = class UserService extends cds.Service { init(){
+import cds from '@sap/cds'
+export class UserService extends cds.Service { init(){
   this.on('READ', 'me', ({ tenant, user, locale }) => ({ id: user.id, locale, tenant }))
   this.on('login', (req) => {
     if (req.user._is_anonymous)

bookshop/test/genres.http

@@ -3,15 +3,15 @@
 #   Genres
 #
 
-GET http://localhost:4004/test/Genres?
+GET http://localhost:4004/odata/v4/test/Genres?
 ###
 
-GET http://localhost:4004/test/Genres?
+GET http://localhost:4004/odata/v4/test/Genres?
 &$filter=parent_ID eq null&$select=name
 &$expand=children($select=name)
 ###
 
-POST http://localhost:4004/test/Genres?
+POST http://localhost:4004/odata/v4/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/test/Genres(100)?
+GET http://localhost:4004/odata/v4/test/Genres(100)?
 # &$expand=children
 # &$expand=children($expand=children($expand=children($expand=children)))
 ###
 
-DELETE http://localhost:4004/test/Genres(103)
+DELETE http://localhost:4004/odata/v4/test/Genres(103)
 ###
 
-DELETE http://localhost:4004/test/Genres(100)
+DELETE http://localhost:4004/odata/v4/test/Genres(100)
 ###

bookstore/package.json

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

bookstore/server.js

@@ -1,7 +1,8 @@
-const cds = require ('@sap/cds')
+import mashup from './srv/mashup.js'
+import cds from '@sap/cds'
 
 // Add mashup logic
-cds.once('served', require('./srv/mashup'))
+cds.once('served', mashup)
 
 // Add routes to UIs from imported packages
 cds.once('bootstrap',(app)=>{
@@ -10,6 +11,3 @@ 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,10 +1,11 @@
+import cds from '@sap/cds'
+
 ////////////////////////////////////////////////////////////////////////////
 //
 //    Mashing up bookshop services with required services...
 //
-module.exports = async()=>{ // called by server.js
+export default 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')
@@ -18,7 +19,7 @@ module.exports = 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')
+    console.debug ('> delegating request to ReviewsService') // eslint-disable-line no-console
     const [id] = req.params, { columns, limit } = req.query.SELECT
     return ReviewsService.read ('Reviews',columns).limit(limit).where({subject:String(id)})
   }))
@@ -40,7 +41,7 @@ module.exports = 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)
+    console.debug ('> received:', msg.event, msg.data) // eslint-disable-line no-console
     const { subject, count, rating } = msg.data
     return UPDATE(Books,subject).with({ numberOfReviews:count, rating })
   })
@@ -49,7 +50,7 @@ module.exports = 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)
+    console.debug ('> received:', msg.event, msg.data) // eslint-disable-line no-console
     const { product, deltaQuantity } = msg.data
     return UPDATE (Books) .where ('ID =', product)
     .and ('stock >=', deltaQuantity)

bookstore/srv/swagger-ui.js

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

@@ -0,0 +1,20 @@
+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/fiori-apps.html

@@ -1,7 +1,7 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
-<head>
 
+<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,21 +10,22 @@
 	<script>
 		window["sap-ushell-config"] = {
 			defaultRenderer: "fiori2",
-			applications: {}
+			applications: {},
 		};
 	</script>
 
-	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
-			data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
-			data-sap-ui-compatVersion="edge"
-			data-sap-ui-theme="sap_horizon"
-			data-sap-ui-frameOptions="allow"
-	></script>
+	<script id="sap-ushell-bootstrap" src="https://ui5.sap.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
+	<script id="sap-ui-bootstrap" src="https://ui5.sap.com/resources/sap-ui-core.js"
+		data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout" data-sap-ui-compatVersion="edge"
+		data-sap-ui-theme="sap_horizon"></script>
 	<script>
-		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"))
+		sap.ui.getCore().attachInit(() =>
+			sap.ushell.Container.createRenderer().placeAt("content")
+		);
 	</script>
-
 </head>
-<body class="sapUiBody" id="content"></body>
+
+<body class="sapUiBody" id="content">
+</body>
+
 </html>

fiori/server.js

@@ -1,8 +0,0 @@
-// 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,42 +1,13 @@
 {
   "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 @(path: '/say') {
+service say {
   function hello (to:String) returns String;
-}
+}

hello/srv/world.js

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

hello/srv/world.ts

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

hello/test/hello-world-test.js

@@ -1,13 +0,0 @@
-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 +1,5 @@
-GET http://localhost:4004/say/hello(to='world')
+GET http://localhost:4004/odata/v4/say/hello
+###
+
+GET http://localhost:4004/odata/v4/say/hello(to='me')
+###

loggers/package.json

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

loggers/srv/loggers.js

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

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 })
+    console.log ('> emitting:', 'OrderChanged', { product, deltaQuantity }) // eslint-disable-line no-console
     return this.emit ('OrderChanged', { product, deltaQuantity })
   }
 

package.json

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

reviews/app/vue/app.js

@@ -50,7 +50,6 @@ 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 })
+    global.it || console.log ('< emitting:', 'reviewed', { subject, count, rating }) // eslint-disable-line no-console
     await this.emit ('reviewed', { subject, count, rating })
   })
 

test/cds.ql.test.js

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

test/consuming-services.test.js

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

test/custom-handlers.test.js

@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 
 describe('cap/samples - Custom Handlers', () => {
 
@@ -8,9 +8,10 @@ describe('cap/samples - Custom Handlers', () => {
   })
 
   it('should reject out-of-stock orders', async () => {
-    await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`
-    await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`
-    await expect(POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`).to.be.rejectedWith(/409 - 5 exceeds stock for book #201/)
+    await expect(POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`).to.be.fulfilled
+    await expect(POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`).to.be.fulfilled
+    await expect(POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`).to.be.rejectedWith(
+      /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,4 +1,8 @@
-const cds = require('@sap/cds/lib')
+// Quick hack: suppress deprecation warnings w/ Node22 caused by http-proxy (used by OData v2 proxy)
+// 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/lib')
+const cds = require('@sap/cds')
 
 describe('cap/samples - Hello world!', () => {
 
   const { GET, expect } = cds.test (__dirname+'/../hello')
 
   it('should say hello with class impl', async () => {
-    const {data} = await GET `/say/hello(to='world')`
+    const {data} = await GET `/odata/v4/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/lib')
+const cds = require('@sap/cds')
 const { expect } = cds.test.in(__dirname,'..')
 
 describe('cap/samples - Hierarchical Data', ()=>{
@@ -77,49 +77,45 @@ describe('cap/samples - Hierarchical Data', ()=>{
 		)
 	})
 
-	it ('supports nested reads', async()=>{
-		expect (await
-			SELECT.one.from (Cats, c=>{
-				c.ID, c.name.as('parent'), c.children (c=>{
-					c.name.as('child')
-				})
-			}) .where ({name:'Cat'})
-		) .to.eql (
-			{ ID:101, parent:'Cat', children:[
-				{ child:'Kitty' },
-				{ child:'Catwoman' },
-			]}
-		)
-	})
+	it ('supports nested reads', ()=> expect (
+		SELECT.one.from (Cats, c=>{
+			c.ID, c.name.as('parent'), c.children (c=>{
+				c.name.as('child')
+			})
+		}) .where ({name:'Cat'})
+	) .to.eventually.eql (
+		{ ID:101, parent:'Cat', children:[
+			{ child:'Kitty' },
+			{ child:'Catwoman' },
+		]}
+	))
 
-	it ('supports deeply nested reads', async()=>{
-		expect (await SELECT.one.from (Cats, c=>{
+	it ('supports deeply nested reads', ()=> expect (
+		SELECT.one.from (Cats, c=>{
 			c.ID, c.name, c.children (
 				c => { c.name },
 				{levels:3}
 			)
 		}) .where ({name:'Cat'})
-		) .to.eql (
-			{ ID:101, name:'Cat', children:[
-				{ name:'Kitty', children:[
-					{ name:'Kitty Cat', children:[
-						{ name:'Aristocat' }, ]},  // level 3
-					{ name:'Kitty Bat', children:[] }, ]},
-				{ name:'Catwoman', children:[
-					{ name:'Catalina', children:[] } ]},
-			]}
-		)
-	})
+	) .to.eventually.eql (
+		{ ID:101, name:'Cat', children:[
+			{ name:'Kitty', children:[
+				{ name:'Kitty Cat', children:[
+					{ name:'Aristocat' }, ]},  // level 3
+				{ name:'Kitty Bat', children:[] }, ]},
+			{ name:'Catwoman', children:[
+				{ name:'Catalina', children:[] } ]},
+		]}
+	))
 
 	it ('supports cascaded deletes', async()=>{
 		const affectedRows = await DELETE.from (Cats) .where ({ID:[102,106]})
 		expect (affectedRows) .to.be.greaterThan (0)
-		const expected = [
+		await expect (SELECT`ID,name`.from(Cats) ).to.eventually.eql ([
 			{ 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/lib')
+const cds = require('@sap/cds')
 
 describe('cap/samples - Localized Data', () => {
 

test/messaging.test.js

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

test/odata.test.js

@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 
 describe('cap/samples - Bookshop APIs', () => {
   const { GET, expect, axios } = cds.test ('@capire/bookshop')
@@ -8,9 +8,10 @@ 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',
+      // 'content-type': 'application/xml', //> fails with 'application/xml;charset=utf-8', which is set by express
       '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"/>')
   })
@@ -28,63 +29,66 @@ describe('cap/samples - Bookshop APIs', () => {
     ])
   })
 
-  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' },
-    ])
-  })
+  describe('query options...', () => {
 
-  it('supports $select', async () => {
-    const { data } = await GET(`/browse/Books`, {
-      params: { $select: `ID,title` },
+    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' },
+      ])
     })
-    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 $expand', async () => {
-    const { data } = await GET(`/admin/Authors`, {
-      params: {
-        $select: `name`,
-        $expand: `books($select=title)`,
-      },
+    it('supports $select', async () => {
+      const { data } = await GET(`/browse/Books`, {
+        params: { $select: `ID,title` },
+      })
+      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' },
+      ])
     })
-    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 () => {
-    const { data } = await GET`/admin/Books/201/stock/$value`
-    expect(data).to.equal(12)
-  })
+    it('supports $expand', async () => {
+      const { data } = await GET(`/admin/Authors`, {
+        params: {
+          $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 $top/$skip paging', async () => {
-    const { data: p1 } = await GET`/browse/Books?$select=title&$top=3`
-    expect(p1.value).to.containSubset([
-      { ID: 201, title: 'Wuthering Heights' },
-      { ID: 207, title: 'Jane Eyre' },
-      { ID: 251, title: 'The Raven' },
-    ])
-    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('supports $value requests', async () => {
+      const { data } = await GET`/admin/Books/201/stock/$value`
+      expect(data).to.equal(12)
+    })
+
+    it('supports $top/$skip paging', async () => {
+      const { data: p1 } = await GET`/browse/Books?$select=title&$top=3`
+      expect(p1.value).to.containSubset([
+        { ID: 201, title: 'Wuthering Heights' },
+        { ID: 207, title: 'Jane Eyre' },
+        { ID: 251, title: 'The Raven' },
+      ])
+      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 () => {