Enforce eslint 9, fix config

Update eslint.config.js
Update package.json
2024-04-15 14:33:27 +02:00 · 2024-04-15 14:24:28 +02:00 · 2024-04-15 14:21:13 +02:00 · 2024-04-15 08:55:06 +02:00 · 2024-04-15 08:24:42 +02:00 · 2024-04-15 08:22:48 +02:00
22 changed files with 671 additions and 608 deletions
--- a/.eslintrc
+++ b/.eslintrc
@@ -0,0 +1,31 @@
 {
  "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": "_" }]
  }
 }
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -15,6 +15,3 @@ 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"]
--- a/.github/workflows/node.js.yml
+++ b/.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
--- a/bookshop/package.json
+++ b/bookshop/package.json
@@ -13,7 +13,7 @@
    "@cap-js/sqlite": "*"
  },
  "dependencies": {
-    "@sap/cds": ">=7",
+    "@sap/cds": "^7",
    "express": "^4.17.1"
  },
  "scripts": {
--- a/bookshop/srv/admin-service.js
+++ b/bookshop/srv/admin-service.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')
 module.exports = class AdminService extends cds.ApplicationService { init(){
  this.before ('NEW','Authors', genid)
--- a/bookshop/srv/cat-service.js
+++ b/bookshop/srv/cat-service.js
@@ -1,4 +1,3 @@
 const cds = require('@sap/cds')
 module.exports = class CatalogService extends cds.ApplicationService { init() {
  const { Books } = cds.entities('sap.capire.bookshop')
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,36 +1,27 @@
-const cds = require('@sap/eslint-plugin-cds')
+const globals = require("globals");
-const globals = require('globals')
+const js = require('@eslint/js');
-const js = require('@eslint/js')
+const cds = require('@sap/eslint-plugin-cds');
 module.exports = [
  cds.configs.recommended,
  js.configs.recommended,
  {
-    languageOptions: {
+    "files": ["**/*.js"],
-      globals: {
+    ...js.configs.recommended,
-        es2022: true,
+    "languageOptions": {
      "globals": {
        ...globals.browser,
        ...globals.node,
        ...globals.jest,
        ...globals.mocha,
-        cds: true,
+        "es2022": true
        sap: true,
        CDL: true,
        CQL: true,
        CREATE: true,
        DELETE: true,
        DROP: true,
        INSERT: true,
        SELECT: true,
        UPDATE: true,
        UPSERT: true
      }
      },
-    rules: {
+    },
-      'no-console': 'off',
+    "rules": {
-      'no-unused-vars': ['warn', { argsIgnorePattern: '^_' }],
+      ...js.configs.recommended.rules,
-      'require-atomic-updates': 'off',
+      "no-console": "off",
-      'require-await': 'warn'
+      "require-atomic-updates": "off",
      "require-await": "warn",
      "no-unused-vars": ["warn", { "argsIgnorePattern": "_" }]
    }
  }
 ]
--- a/fiori/app/fiori-apps.html
+++ b/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>
--- a/fiori/server.js
+++ b/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')
--- a/hello/test/hello-world-test.js
+++ b/hello/test/hello-world-test.js
@@ -1,10 +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).to.match(/Hello world.*typescript.*/i)
+        expect(data.value).toMatch(/Hello world.*typescript.*/i)
    })
 })
--- a/loggers/srv/loggers.js
+++ b/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 {
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -39,8 +39,7 @@
    "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,
@@ -55,4 +54,4 @@
  },
  "license": "SEE LICENSE IN LICENSE",
  "private": true
-  }
+}
--- a/test/cds.ql.test.js
+++ b/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' }
--- a/test/consuming-services.test.js
+++ b/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', () => {
--- a/test/custom-handlers.test.js
+++ b/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)
  })
--- a/test/fiori.test.js
+++ b/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() {
--- a/test/hello-world.test.js
+++ b/test/hello-world.test.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')
 describe('cap/samples - Hello world!', () => {
--- a/test/hierarchical-data.test.js
+++ b/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', ()=>{
@@ -77,27 +77,29 @@ describe('cap/samples - Hierarchical Data', ()=>{
 		)
 	})
-	it ('supports nested reads', ()=> expect (
+	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.eventually.eql (
+		) .to.eql (
 			{ ID:101, parent:'Cat', children:[
 				{ child:'Kitty' },
 				{ child:'Catwoman' },
 			]}
-	))
+		)
 	})
-	it ('supports deeply nested reads', ()=> expect (
+	it ('supports deeply nested reads', async()=>{
-		SELECT.one.from (Cats, c=>{
+		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:[
 				{ name:'Kitty', children:[
 					{ name:'Kitty Cat', children:[
@@ -106,16 +108,18 @@ describe('cap/samples - Hierarchical Data', ()=>{
 				{ 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)
-		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)
 	})
 })
--- a/test/localized-data/services.test.js
+++ b/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', () => {
--- a/test/messaging.test.js
+++ b/test/messaging.test.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')
 describe('cap/samples - Messaging', ()=>{
--- a/test/odata.test.js
+++ b/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,8 +28,6 @@ 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` },
@@ -89,7 +86,6 @@ describe('cap/samples - Bookshop APIs', () => {
      { ID: 271, title: 'Catweazle' },
    ])
  })
  })
  it('serves user info', async () => {
    const { data: alice } = await GET `/user/me`
Author	SHA1	Message	Date
Christian Georgi	ce3aaa778f	Enforce eslint 9, fix config	2024-04-15 14:33:27 +02:00
Mara Kiefer	2861c80e16	Update eslint.config.js	2024-04-15 14:24:28 +02:00
Mara Kiefer	b2c26278b5	Update package.json	2024-04-15 14:21:13 +02:00
Mara Kiefer	11b43a924d	Update eslint.config.js	2024-04-15 08:55:06 +02:00
Mara Kiefer	48173c75ed	Update package.json	2024-04-15 08:24:42 +02:00
Mara Kiefer	b59997aa47	Update package.json	2024-04-15 08:22:48 +02:00
Mara Kiefer	a30cfefd88	Update eslint.config.js	2024-04-12 08:45:51 +02:00
Mara Kiefer	8887c614d8	Update eslint.config.js	2024-04-12 08:42:25 +02:00
Mara Kiefer	3f78e8249f	Update eslint.config.js	2024-04-12 08:41:07 +02:00
Mara Kiefer	b584de02a3	Update eslint.config.js	2024-04-12 08:38:39 +02:00
Mara Kiefer	6a6b498d9a	Create eslint.config.js	2024-04-11 13:35:42 +02:00
`@@ -1,4 +1,4 @@`
	`const cds = require('@sap/cds')`	`const cds = require('@sap/cds/lib')`

	`describe('cap/samples - Consuming Services locally', () => {`	`describe('cap/samples - Consuming Services locally', () => {`