Fix ignore version

Bumps the production-dependencies group with 2 updates in the / directory: [@sap/cds](https://cap.cloud.sap/) and [@cap-js-community/odata-v2-adapter](https://github.com/cap-js-community/odata-v2-adapter).


Updates `@sap/cds` from 7.9.2 to 7.9.3

Updates `@cap-js-community/odata-v2-adapter` from 1.12.10 to 1.12.11
- [Release notes](https://github.com/cap-js-community/odata-v2-adapter/releases)
- [Changelog](https://github.com/cap-js-community/odata-v2-adapter/blob/main/CHANGELOG.md)
- [Commits](https://github.com/cap-js-community/odata-v2-adapter/compare/v1.12.10...v1.12.11)

---
updated-dependencies:
- dependency-name: "@sap/cds"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
- dependency-name: "@cap-js-community/odata-v2-adapter"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: production-dependencies
...

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

.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

bookshop/package.json

@@ -13,7 +13,7 @@
     "@cap-js/sqlite": "*"
   },
   "dependencies": {
-    "@sap/cds": "^7",
+    "@sap/cds": ">=7",
     "express": "^4.17.1"
   },
   "scripts": {

bookshop/srv/admin-service.js

@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 
 module.exports = class AdminService extends cds.ApplicationService { init(){
   this.before ('NEW','Authors', genid)

bookshop/srv/cat-service.js

@@ -1,3 +1,4 @@
+const cds = require('@sap/cds')
 module.exports = class CatalogService extends cds.ApplicationService { init() {
 
   const { Books } = cds.entities('sap.capire.bookshop')

eslint.config.js

@@ -1,27 +1,36 @@
-const globals = require("globals");
+const cds = require('@sap/eslint-plugin-cds')
-const js = require('@eslint/js');
+const globals = require('globals')
-const cds = require('@sap/eslint-plugin-cds');
+const js = require('@eslint/js')
 
 module.exports = [
   cds.configs.recommended,
+  js.configs.recommended,
   {
-    "files": ["**/*.js"],
+    languageOptions: {
-    ...js.configs.recommended,
+      globals: {
-    "languageOptions": {
+        es2022: true,
-      "globals": {
         ...globals.browser,
         ...globals.node,
         ...globals.jest,
         ...globals.mocha,
-        "es2022": true
+        cds: true,
-      },
+        sap: true,
+        CDL: true,
+        CQL: true,
+        CREATE: true,
+        DELETE: true,
+        DROP: true,
+        INSERT: true,
+        SELECT: true,
+        UPDATE: true,
+        UPSERT: true
+      }
     },
-    "rules": {
+    rules: {
-      ...js.configs.recommended.rules,
+      'no-console': 'off',
-      "no-console": "off",
+      'no-unused-vars': ['warn', { argsIgnorePattern: '^_' }],
-      "require-atomic-updates": "off",
+      'require-atomic-updates': 'off',
-      "require-await": "warn",
+      'require-await': 'warn'
-      "no-unused-vars": ["warn", { "argsIgnorePattern": "_" }]
     }
   }
 ]

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-ushell-bootstrap" src="https://ui5.sap.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"
+	<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-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout" data-sap-ui-compatVersion="edge"
-			data-sap-ui-compatVersion="edge"
+		data-sap-ui-theme="sap_horizon"></script>
-			data-sap-ui-theme="sap_horizon"
-			data-sap-ui-frameOptions="allow"
-	></script>
 	<script>
-		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"))
+		sap.ui.getCore().attachInit(() =>
+			sap.ushell.Container.createRenderer().placeAt("content")
+		);
 	</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/test/hello-world-test.js

@@ -1,13 +1,10 @@
 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)
+        expect(data.value).to.match(/Hello world.*typescript.*/i)
     })
 
 })

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 {

package.json

@@ -1,57 +1,58 @@
 {
-  "name": "@capire/samples",
+    "name": "@capire/samples",
-  "version": "2.0.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": ">=7"
+      "@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",
-    "@sap/eslint-plugin-cds": "^3",
+      "@sap/eslint-plugin-cds": "^3",
-    "axios": "^1",
+      "axios": "^1",
-    "chai": "^4.3.4",
+      "chai": "^4.3.4",
-    "chai-as-promised": "^7.1.1",
+      "chai-as-promised": "^7.1.1",
-    "chai-subset": "^1.6.0",
+      "chai-subset": "^1.6.0",
-    "eslint": "^9",
+      "eslint": "^9",
-    "semver": "^7"
+      "semver": "^7"
-  },
+    },
-  "scripts": {
+    "scripts": {
-    "cleanup": "rm -rf node_modules && rm -rf */node_modules && rm -rf */*/node_modules",
+      "cleanup": "rm -rf node_modules && rm -rf */node_modules && rm -rf */*/node_modules",
-    "bookshop": "cds watch bookshop",
+      "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",
-    "mocha": "CDS_TEST_SILENT=y npx mocha",
+      "mocha": "CDS_TEST_SILENT=y npx mocha",
-    "jest": "npx jest --silent",
+      "jest": "npx jest --silent",
-    "start": "cds watch fiori",
+      "start": "cds watch fiori",
-    "test": "npm run jest -- --silent",
+      "test": "npm run jest -- --silent",
-    "test:hello": "cd hello && npm test"
+      "test:hello": "cd hello && npm test",
-  },
+      "lint": "eslint ."
-  "jest": {
+    },
-    "testTimeout": 20000,
+    "jest": {
-    "testMatch": [
+      "testTimeout": 20000,
-      "**/*.test.js"
+      "testMatch": [
-    ]
+        "**/*.test.js"
-  },
+      ]
-  "mocha": {
+    },
-    "recursive": true,
+    "mocha": {
-    "parallel": true,
+      "recursive": true,
-    "timeout": 6666
+      "parallel": true,
-  },
+      "timeout": 6666
-  "license": "SEE LICENSE IN LICENSE",
+    },
-  "private": true
+    "license": "SEE LICENSE IN LICENSE",
-}
+    "private": true
+  }

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

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 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 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.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,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 
 describe('cap/samples - 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()=>{
+	it ('supports nested reads', ()=> expect (
-		expect (await
+		SELECT.one.from (Cats, c=>{
-			SELECT.one.from (Cats, c=>{
+			c.ID, c.name.as('parent'), c.children (c=>{
-				c.ID, c.name.as('parent'), c.children (c=>{
+				c.name.as('child')
-					c.name.as('child')
+			})
-				})
+		}) .where ({name:'Cat'})
-			}) .where ({name:'Cat'})
+	) .to.eventually.eql (
-		) .to.eql (
+		{ ID:101, parent:'Cat', children:[
-			{ ID:101, parent:'Cat', children:[
+			{ child:'Kitty' },
-				{ child:'Kitty' },
+			{ child:'Catwoman' },
-				{ child:'Catwoman' },
+		]}
-			]}
+	))
-		)
-	})
 
-	it ('supports deeply nested reads', async()=>{
+	it ('supports deeply nested reads', ()=> expect (
-		expect (await SELECT.one.from (Cats, c=>{
+		SELECT.one.from (Cats, c=>{
 			c.ID, c.name, c.children (
 				c => { c.name },
 				{levels:3}
 			)
 		}) .where ({name:'Cat'})
-		) .to.eql (
+	) .to.eventually.eql (
-			{ ID:101, name:'Cat', children:[
+		{ ID:101, name:'Cat', children:[
-				{ name:'Kitty', children:[
+			{ name:'Kitty', children:[
-					{ name:'Kitty Cat', children:[
+				{ name:'Kitty Cat', children:[
-						{ name:'Aristocat' }, ]},  // level 3
+					{ name:'Aristocat' }, ]},  // level 3
-					{ name:'Kitty Bat', children:[] }, ]},
+				{ name:'Kitty Bat', children:[] }, ]},
-				{ name:'Catwoman', children:[
+			{ name:'Catwoman', children:[
-					{ name:'Catalina', 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 () => {
+  describe('query options...', () => {
-    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 $select', async () => {
+    it('supports $search in multiple fields', async () => {
-    const { data } = await GET(`/browse/Books`, {
+      const { data } = await GET `/browse/Books ${{
-      params: { $select: `ID,title` },
+        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 () => {
+    it('supports $select', async () => {
-    const { data } = await GET(`/admin/Authors`, {
+      const { data } = await GET(`/browse/Books`, {
-      params: {
+        params: { $select: `ID,title` },
-        $select: `name`,
+      })
-        $expand: `books($select=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 () => {
+    it('supports $expand', async () => {
-    const { data } = await GET`/admin/Books/201/stock/$value`
+      const { data } = await GET(`/admin/Authors`, {
-    expect(data).to.equal(12)
+        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 () => {
+    it('supports $value requests', async () => {
-    const { data: p1 } = await GET`/browse/Books?$select=title&$top=3`
+      const { data } = await GET`/admin/Books/201/stock/$value`
-    expect(p1.value).to.containSubset([
+      expect(data).to.equal(12)
-      { ID: 201, title: 'Wuthering Heights' },
+    })
-      { ID: 207, title: 'Jane Eyre' },
+
-      { ID: 251, title: 'The Raven' },
+    it('supports $top/$skip paging', async () => {
-    ])
+      const { data: p1 } = await GET`/browse/Books?$select=title&$top=3`
-    const { data: p2 } = await GET`/browse/Books?$select=title&$skip=3`
+      expect(p1.value).to.containSubset([
-    expect(p2.value).to.containSubset([
+        { ID: 201, title: 'Wuthering Heights' },
-      { ID: 252, title: 'Eleonora' },
+        { ID: 207, title: 'Jane Eyre' },
-      { ID: 271, title: 'Catweazle' },
+        { 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 () => {