renaming

Bumps the production-dependencies group with 1 update: [@sap/cds](https://cap.cloud.sap/).


Updates `@sap/cds` from 7.8.1 to 7.8.2

---
updated-dependencies:
- dependency-name: "@sap/cds"
  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

@@ -5,4 +5,13 @@ updates:
   directory: /
   versioning-strategy: increase-if-necessary
   schedule:
-    interval: daily
+    interval: weekly
+  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"]

.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/extensions.json

@@ -4,13 +4,11 @@
 
 	// 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

@@ -14,8 +14,6 @@
       "**/odata-v4/okra/**"
     ]
   },
-  "mochaExplorer.debuggerConfig": "Debug Mocha Tests",
-  "mochaExplorer.parallel": true,
   "eslint.probe": [
     "cds",
     "csn",

bookshop/package.json

@@ -13,9 +13,8 @@
     "@cap-js/sqlite": "*"
   },
   "dependencies": {
-    "@sap/cds": "^7",
-    "express": "^4.17.1",
-    "passport": ">=0.4.1"
+    "@sap/cds": ">=7",
+    "express": "^4.17.1"
   },
   "scripts": {
     "genres": "cds serve test/genres.cds",

bookshop/srv/cat-service.js

@@ -1,29 +1,34 @@
-const cds = require('@sap/cds')
+module.exports = class CatalogService extends cds.ApplicationService { init() {
 
-class CatalogService extends cds.ApplicationService { init(){
-
-  const { Books } = cds.entities ('sap.capire.bookshop')
+  const { Books } = cds.entities('sap.capire.bookshop')
   const { ListOfBooks } = this.entities
 
-  // Reduce stock of ordered books if available stock suffices
-  this.on ('submitOrder', async req => {
-    const {book,quantity} = req.data
-    if (quantity < 1) return req.reject (400,`quantity has to be 1 or more`)
-    let b = await SELECT `stock` .from (Books,book)
-    if (!b) return req.error (404,`Book #${book} doesn't exist`)
-    let {stock} = b
-    if (quantity > stock) return req.reject (409,`${quantity} exceeds stock for book #${book}`)
-    await UPDATE (Books,book) .with ({ stock: stock -= quantity })
-    await this.emit ('OrderedBook', { book, quantity, buyer:req.user.id })
-    return { stock }
-  })
-
   // 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
+  this.on('submitOrder', async req => {
+    let { book:id, quantity } = req.data
+    let book = await SELECT.from (Books, id, b => b.stock)
+
+    // Validate input data
+    if (!book) return req.error (404, `Book #${id} doesn't exist`)
+    if (quantity < 1) return req.error (400, `quantity has to be 1 or more`)
+    if (quantity > book.stock) return req.error (409, `${quantity} exceeds stock for book #${id}`)
+
+    // Reduce stock in database and return updated stock value
+    await UPDATE (Books, id) .with ({ stock: book.stock -= quantity })
+    return book
+  })
+
+  // Emit event when an order has been submitted
+  this.after('submitOrder', async (_,req) => {
+    let { book, quantity } = req.data
+    await this.emit('OrderedBook', { book, quantity, buyer: req.user.id })
+  })
+
+  // Delegate requests to the underlying generic service
   return super.init()
 }}
-
-module.exports = { CatalogService }

eslint.config.js

@@ -0,0 +1,27 @@
+const eslintCds = require('@sap/eslint-plugin-cds')
+const eslintJs = require('@eslint/js')
+const globals = require('globals')
+
+module.exports = [
+  eslintJs.configs.recommended,
+  eslintCds.configs.recommended,
+  {
+    languageOptions: {
+      globals: {
+        sap: true,
+        ...globals.es2022,
+        ...globals.browser,
+        ...globals.node,
+        ...globals.jest,
+        ...globals.mocha,
+        ...eslintCds.configs.recommended.languageOptions.globals
+      }
+    },
+    rules: {
+      'no-console': 'off',
+      'no-unused-vars': ['warn', { argsIgnorePattern: '^_' }],
+      'require-atomic-updates': 'off',
+      'require-await': 'warn'
+    }
+  }
+]

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=Bookshop Authors
+appTitle=Manage Authors
 
 # JCI app descriptor contains lower case DESCRIPTION
-appSubTitle=Bookshop Authors
+appSubTitle=CAP Sample Application
 
 # 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": "display",
+          "action": "manage",
           "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=Bookshop Sample
+appTitle=Manage Books
 
 # JCI app descriptor contains lower case DESCRIPTION
 appSubTitle=CAP Sample Application

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

@@ -19,6 +19,22 @@
             "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-display"
+                    "targetURL": "#Authors-manage"
                   }
                 },
                 {
@@ -99,7 +99,7 @@
             },
             "BrowseAuthors": {
               "semanticObject": "Authors",
-              "action": "display",
+              "action": "manage",
               "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=Bookshop Sample
+appTitle=Browse Books
 
 # JCI app descriptor contains lower case DESCRIPTION
 appSubTitle=CAP Sample Application

fiori/package.json

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

hello/srv/world.ts

@@ -1,4 +1,4 @@
-import type { Request } from "@sap/cds/apis/services"
+import { Request } from "@sap/cds"
 
 module.exports = class say {
     hello(req: Request) {

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=Bookshop Sample
+appTitle=Manage Orders
 
 # JCI app descriptor contains lower case DESCRIPTION
 appSubTitle=CAP Sample Application

package.json

@@ -21,11 +21,12 @@
     ],
     "devDependencies": {
       "@cap-js/sqlite": "^1",
-    "@sap/eslint-plugin-cds": "^2.6.1",
+      "@sap/eslint-plugin-cds": "^3",
       "axios": "^1",
       "chai": "^4.3.4",
       "chai-as-promised": "^7.1.1",
       "chai-subset": "^1.6.0",
+      "eslint": "^9",
       "semver": "^7"
     },
     "scripts": {
@@ -38,7 +39,8 @@
       "jest": "npx jest --silent",
       "start": "cds watch fiori",
       "test": "npm run jest -- --silent",
-    "test:hello": "cd hello && npm test"
+      "test:hello": "cd hello && npm test",
+      "lint": "eslint ."
     },
     "jest": {
       "testTimeout": 20000,
@@ -53,4 +55,4 @@
     },
     "license": "SEE LICENSE IN LICENSE",
     "private": true
-}
+  }

test/cds.ql.test.js

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

test/hierarchical-data.test.js

@@ -33,8 +33,51 @@ describe('cap/samples - Hierarchical Data', ()=>{
 		]}
 	))
 
+	it ('should generate correct queries for expands', ()=>{
+		let q = SELECT.from (Cats, c => { c.ID, c.name, c.children (c => c.name) })
+		expect (q) .to.eql ({
+			SELECT: {
+				from: { ref:[ "Categories" ] },
+				columns: [
+					{ ref: [ "ID" ] },
+					{ ref: [ "name" ] },
+					{ ref: [ "children" ], expand: [ {ref:['name']} ] },
+				]
+			}
+		})
+		if (q.forSQL) expect (q.forSQL()) .to.eql ({
+			SELECT: {
+				from: { ref:[ "Categories" ], as: "Categories" },
+				columns: [
+					{ ref: [ "Categories", "ID" ] },
+					{ ref: [ "Categories", "name" ] },
+					{ as: "children", SELECT: { expand: true,
+						one: false,
+						columns: [{ ref: [ "children", "name" ]}],
+						from: { ref:["Categories"], as: "children" },
+						where: [
+							{ref:[ "Categories", "ID" ]}, "=", {ref:[ "children", "parent_ID" ]}
+						],
+					}},
+				],
+			}
+		})
+		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', async()=>{
-		if (require('semver').gte(cds.version, '5.9.0')) {
 		expect (await
 			SELECT.one.from (Cats, c=>{
 				c.ID, c.name.as('parent'), c.children (c=>{
@@ -47,24 +90,9 @@ describe('cap/samples - Hierarchical Data', ()=>{
 				{ child:'Catwoman' },
 			]}
 		)
-			return
-		}
-		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:[
-				{ ID:102, child:'Kitty' },
-				{ ID:106, child:'Catwoman' },
-			]}
-		)
 	})
 
 	it ('supports deeply nested reads', async()=>{
-		if (require('semver').gte(cds.version, '5.9.0')) {
 		expect (await SELECT.one.from (Cats, c=>{
 			c.ID, c.name, c.children (
 				c => { c.name },
@@ -81,24 +109,6 @@ describe('cap/samples - Hierarchical Data', ()=>{
 					{ 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.eql (
-			{ ID:101, name:'Cat', children:[
-				{ ID:102, name:'Kitty', children:[
-					{ ID:103, name:'Kitty Cat', children:[
-						{ ID:104, name:'Aristocat' }, ]},  // level 3
-					{ ID:105, name:'Kitty Bat', children:[] }, ]},
-				{ ID:106, name:'Catwoman', children:[
-					{ ID:107, name:'Catalina', children:[] } ]},
-			]}
-		)
 	})
 
 	it ('supports cascaded deletes', async()=>{