renaming

refactor(lint): simplify eslint config
2024-05-03 14:23:10 +02:00 · 2024-05-03 13:53:43 +02:00
18 changed files with 3473 additions and 3543 deletions
--- 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/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,29 +1,20 @@
-const cds = require('@sap/eslint-plugin-cds')
+const eslintCds = require('@sap/eslint-plugin-cds')
 const eslintJs = require('@eslint/js')
 const globals = require('globals')
 const js = require('@eslint/js')
 module.exports = [
-  cds.configs.recommended,
+  eslintJs.configs.recommended,
-  js.configs.recommended,
+  eslintCds.configs.recommended,
  {
    languageOptions: {
      globals: {
-        es2022: true,
+        sap: true,
        ...globals.es2022,
        ...globals.browser,
        ...globals.node,
        ...globals.jest,
        ...globals.mocha,
-        cds: true,
+        ...eslintCds.configs.recommended.languageOptions.globals
        sap: true,
        CDL: true,
        CQL: true,
        CREATE: true,
        DELETE: true,
        DROP: true,
        INSERT: true,
        SELECT: true,
        UPDATE: true,
        UPSERT: true
      }
    },
    rules: {
--- 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/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,45 +77,49 @@ describe('cap/samples - Hierarchical Data', ()=>{
 		)
 	})
-	it ('supports nested reads', ()=> expect (
+	it ('supports nested reads', async()=>{
-		SELECT.one.from (Cats, c=>{
+		expect (await
-			c.ID, c.name.as('parent'), c.children (c=>{
+			SELECT.one.from (Cats, c=>{
-				c.name.as('child')
+				c.ID, c.name.as('parent'), c.children (c=>{
-			})
+					c.name.as('child')
-		}) .where ({name:'Cat'})
+				})
-	) .to.eventually.eql (
+			}) .where ({name:'Cat'})
-		{ ID:101, parent:'Cat', children:[
+		) .to.eql (
-			{ child:'Kitty' },
+			{ ID:101, parent:'Cat', children:[
-			{ child:'Catwoman' },
+				{ 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:[
+			{ 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)
-		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,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 () => {
Author	SHA1	Message	Date
Jörg Mann	55e4c92a60	renaming	2024-05-03 14:23:10 +02:00
Jörg Mann	7738f85036	refactor(lint): simplify eslint config	2024-05-03 13:53:43 +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', () => {`