Merge branch 'main' into mocha

.eslint/index.js

@@ -1,15 +0,0 @@
-const cds = require("@sap/eslint-plugin-cds");
-
-module.exports = {
-  configs: {
-    recommended: {
-      plugins: ["cloud-cap-samples"],
-      rules: {
-        "cloud-cap-samples/no-open-services": ["error", "show"]
-      }
-    }
-  },
-  rules: {
-    "no-open-services": cds.createRule(require("./rules/no-open-services")),
-  }
-};

.eslint/package.json

@@ -1,5 +0,0 @@
-{
-    "name": "eslint-plugin-cloud-cap-samples",
-    "description": "Contains shareable custom lint rules for this repository",
-    "version": "1.0.0"
-}

.eslint/rules/no-open-services.js

@@ -1,29 +0,0 @@
-module.exports = {
-    meta: {
-      docs: {
-        description: "Service without `@requires/restrict` should not expose fields with personal data.",
-        version: "1.0.0"
-      },
-      fixable: "code",
-      model: "inferred"
-    },
-    create: function (context) {
-      const services = context.getModel() ? context.getModel().services : [];
-      const unprotectedServices = services.filter(s => !s["@requires"] && !s["@restrict"]).map(s => s.name)
-      return { entity: checkForExposedFields };
-
-      function checkForExposedFields(entity) {
-        const entityInUnprotectedService = unprotectedServices.some(service => entity.name.includes(service))
-        if (entityInUnprotectedService) {
-          const elements = Object.keys(entity.elements).filter((name) => ["createdBy", "modifiedBy"].includes(name))
-          for (let element of elements) {
-            context.report({
-              message: `Field '${element}' in '${entity.name}' exposes personal data. Remove field or add \`@restrict/requires\`.`,
-              node: context.getNode(entity),
-              file: entity.$location.file
-            })
-          }
-        }
-      }
-    }
-  }

.eslintrc

@@ -1,11 +1,7 @@
 {
     "extends": [
         "eslint:recommended",
-        "plugin:@sap/cds/recommended",
-        "plugin:cloud-cap-samples/recommended"
-    ],
-    "plugins": [
-        "cloud-cap-samples"
+        "plugin:@sap/cds/recommended"
     ],
     "env": {
         "browser": true,
@@ -17,7 +13,6 @@
     "globals": {
         "SELECT": true,
         "INSERT": true,
-        "UPSERT": true,
         "UPDATE": true,
         "DELETE": true,
         "CREATE": true,
@@ -27,7 +22,7 @@
     "rules": {
         "no-console": "off",
         "require-atomic-updates": "off",
-        "require-await": "warn",
+        "require-await":"warn",
         "no-unused-vars": ["warn", { "argsIgnorePattern": "_" }]
     }
 }

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: This channel is CLOSED. 
-    about: Use SAP community instead
-    url: https://answers.sap.com/tags/9f13aee1-834c-4105-8e43-ee442775e5ce

.github/ISSUE_TEMPLATE/question--feedback-or-bug-.md

@@ -0,0 +1,10 @@
+---
+name: This channel is CLOSED. 
+about: Use our community at  https://answers.sap.com/tags/9f13aee1-834c-4105-8e43-ee442775e5ce
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Please use our community on https://answers.sap.com/tags/9f13aee1-834c-4105-8e43-ee442775e5ce

.github/workflows/node.js.yml

@@ -26,4 +26,5 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - run: npm i -g npm@8
     - run: npm ci
-    - run: npm test
+    - run: npm run test
+    - run: npm run test:mocha

.registry/.gitignore

@@ -0,0 +1 @@
+*.tgz

.registry/server.js

@@ -0,0 +1,81 @@
+const { exec } = require ('child_process')
+const isWin = process.platform === 'win32'
+const express = require ('express')
+const fs = require ('fs')
+const app = express()
+
+const { PORT=4444 } = process.env
+const [,,port=PORT,scope='@capire'] = process.argv
+const cwd = __dirname
+
+// clean up on start (exit handler might not complete on Windows)
+exec(isWin ? 'del *.tgz' : 'rm *.tgz', {cwd})
+
+
+app.use('/-/:tarball', (req,res,next) => {
+  console.debug ('GET', req.params)
+  try {
+    const { tarball } = req.params
+    const pkgFull = tarball.substring(0, tarball.lastIndexOf('-'))
+    const [, pkg ] = /^\w+-(.+)/.exec(pkgFull)
+    fs.lstat(tarball,(err => {
+      if (err) console.debug (`npm pack ../${pkg}`)
+      if (err) exec(`npm pack ../${pkg}`,{cwd},next)
+      else next()
+    }))
+  } catch (e) {
+    console.error(e)
+    res.sendStatus(500)
+  }
+})
+
+app.use('/-', express.static(__dirname))
+
+app.get('/*', (req,res)=>{
+  const urlRegex = /^\/(@[\w-]+)\/(.+)/
+  const url = decodeURIComponent(req.url)
+  console.debug ('GET',url)
+  try {
+    if (!urlRegex.test(url))  return res.sendStatus(404)
+    const [, scpe, pkg ] = urlRegex.exec(url)
+    const package = require (`${scpe}/${pkg}/package.json`)
+    const tarball = `${scpe.slice(1)}-${pkg}-${package.version}.tgz`
+    // https://github.com/npm/registry/blob/master/docs/responses/package-metadata.md
+    res.json({
+      "name": package.name,
+      "dist-tags": {
+        "latest": package.version
+      },
+      "versions": {
+        [package.version]: {
+          "name": package.name,
+          "version": package.version,
+          "dist": {
+            "tarball": `${server.url}/-/${tarball}`
+          },
+        }
+      },
+    })
+  } catch (e) {
+    if (e.code === 'MODULE_NOT_FOUND')  return res.sendStatus(404)
+    console.error(e);  throw e
+  }
+})
+
+const server = app.listen(port, ()=>{
+  const url = server.url = `http://localhost:${server.address().port}`
+  console.log (`npm set ${scope}:registry=${url}`)
+  exec(`npm set ${scope}:registry=${url}`)
+  console.log (`${scope} registry listening on ${url}`)
+})
+
+
+const _exit = ()=>{
+  server.close()
+  exec(`npm conf rm "${scope}:registry"`, ()=> { process.exit() })
+}
+
+process.on ('SIGTERM',_exit)
+process.on ('SIGHUP',_exit)
+process.on ('SIGINT',_exit)
+process.on ('SIGUSR2',_exit)

.vscode/launch.json

@@ -13,7 +13,7 @@
         "<node_internals>/**",
         "**/node_modules/**",
         "**/cds/lib/lazy.js",
-        "**/cds/lib/req/cds-context.js",
+        "**/cds/lib/req/cls.js",
         "**/odata-v4/okra/**"
       ]
     },
@@ -26,24 +26,10 @@
         "<node_internals>/**",
         "**/node_modules/**",
         "**/cds/lib/lazy.js",
-        "**/cds/lib/req/cds-context.js",
+        "**/cds/lib/req/cls.js",
         "**/odata-v4/okra/**"
       ]
-    },
-    {
-      "name": "Debug Mocha Tests",
-      "type": "node",
-      "request": "attach",
-      "port": 9229,
-      "continueOnAttach": true,
-      "skipFiles": [
-        "<node_internals>/**",
-        "**/node_modules/**",
-        "**/cds/lib/lazy.js",
-        "**/cds/lib/req/cds-context.js",
-        "**/odata-v4/okra/**",
-      ]
-    },
+    }
   ],
   "inputs": [
     {

.vscode/settings.json

@@ -10,11 +10,10 @@
       "<node_internals>/**",
       "**/node_modules/**",
       "**/cds/lib/lazy.js",
-      "**/cds/lib/req/cds-context.js",
+      "**/cds/lib/req/cls.js",
       "**/odata-v4/okra/**"
     ]
   },
-  "mochaExplorer.debuggerConfig": "Debug Mocha Tests",
   "mochaExplorer.parallel": true,
   "eslint.validate": [
     "cds",
@@ -23,5 +22,5 @@
     "csv (semicolon)",
     "tsv",
     "tab"
-  ],
+  ]
 }

bookshop/db/data/sap.capire.bookshop-Books.csv

@@ -2,5 +2,5 @@ ID;title;descr;author_ID;stock;price;currency_code;genre_ID
 201;Wuthering Heights;"Wuthering Heights, Emily Brontë's only novel, was published in 1847 under the pseudonym ""Ellis Bell"". It was written between October 1845 and June 1846. Wuthering Heights and Anne Brontë's Agnes Grey were accepted by publisher Thomas Newby before the success of their sister Charlotte's novel Jane Eyre. After Emily's death, Charlotte edited the manuscript of Wuthering Heights and arranged for the edited version to be published as a posthumous second edition in 1850.";101;12;11.11;GBP;11
 207;Jane Eyre;"Jane Eyre /ɛər/ (originally published as Jane Eyre: An Autobiography) is a novel by English writer Charlotte Brontë, published under the pen name ""Currer Bell"", on 16 October 1847, by Smith, Elder & Co. of London. The first American edition was published the following year by Harper & Brothers of New York. Primarily a bildungsroman, Jane Eyre follows the experiences of its eponymous heroine, including her growth to adulthood and her love for Mr. Rochester, the brooding master of Thornfield Hall. The novel revolutionised prose fiction in that the focus on Jane's moral and spiritual development is told through an intimate, first-person narrative, where actions and events are coloured by a psychological intensity. The book contains elements of social criticism, with a strong sense of Christian morality at its core and is considered by many to be ahead of its time because of Jane's individualistic character and how the novel approaches the topics of class, sexuality, religion and feminism.";107;11;12.34;GBP;11
 251;The Raven;"""The Raven"" is a narrative poem by American writer Edgar Allan Poe. First published in January 1845, the poem is often noted for its musicality, stylized language, and supernatural atmosphere. It tells of a talking raven's mysterious visit to a distraught lover, tracing the man's slow fall into madness. The lover, often identified as being a student, is lamenting the loss of his love, Lenore. Sitting on a bust of Pallas, the raven seems to further distress the protagonist with its constant repetition of the word ""Nevermore"". The poem makes use of folk, mythological, religious, and classical references.";150;333;13.13;USD;16
-252;Eleonora;"""Eleonora"" is a short story by Edgar Allan Poe, first published in 1842 in Philadelphia in the literary annual The Gift. It is often regarded as somewhat autobiographical and has a relatively ""happy"" ending.";150;555;14;USD;15
+252;Eleonora;"""Eleonora"" is a short story by Edgar Allan Poe, first published in 1842 in Philadelphia in the literary annual The Gift. It is often regarded as somewhat autobiographical and has a relatively ""happy"" ending.";150;555;14;USD;16
 271;Catweazle;Catweazle is a British fantasy television series, starring Geoffrey Bayldon in the title role, and created by Richard Carpenter for London Weekend Television. The first series, produced and directed by Quentin Lawrence, was screened in the UK on ITV in 1970. The second series, directed by David Reid and David Lane, was shown in 1971. Each series had thirteen episodes, most but not all written by Carpenter, who also published two books based on the scripts.;170;22;150;JPY;13

bookshop/db/init.js

@@ -4,21 +4,21 @@
  * currencies, if not obtained through @capire/common.
  */
 
-module.exports = async (tx)=>{
+module.exports = async (db)=>{
 
-  const has_common = tx.model.definitions['sap.common.Currencies']?.elements.numcode
+  const has_common = db.model.definitions['sap.common.Currencies'].elements.numcode
   if (has_common) return
 
-  const already_filled = await tx.exists('sap.common.Currencies',{code:'EUR'})
+  const already_filled = await db.exists('sap.common.Currencies',{code:'EUR'})
   if (already_filled) return
 
-  await tx.run (INSERT.into ('sap.common.Currencies') .columns (
-    [ 'code', 'symbol', 'name' ]
+  await INSERT.into ('sap.common.Currencies') .columns (
+    'code','symbol','name'
   ) .rows (
-    [ 'EUR', '€', 'Euro' ],
-    [ 'USD', '$', 'US Dollar' ],
-    [ 'GBP', '£', 'British Pound' ],
-    [ 'ILS', '₪', 'Shekel' ],
-    [ 'JPY', '¥', 'Yen' ],
-  ))
+    [ 'EUR','€','Euro' ],
+    [ 'USD','$','US Dollar' ],
+    [ 'GBP','£','British Pound' ],
+    [ 'ILS','₪','Shekel' ],
+    [ 'JPY','¥','Yen' ],
+  )
 }

bookstore/srv/mashup.cds

@@ -12,11 +12,7 @@ using { sap.capire.bookshop.Books } from '@capire/bookshop';
 using { ReviewsService.Reviews } from '@capire/reviews';
 extend Books with {
   reviews : Composition of many Reviews on reviews.subject = $self.ID;
-
-  @Common.Label : '{i18n>Rating}'
   rating  : Decimal;
-
-  @Common.Label : '{i18n>NumberOfReviews}'
   numberOfReviews : Integer;
 }
 

fiori/app/_i18n/i18n.properties

@@ -6,33 +6,16 @@ Author = Author
 AuthorID = Author ID
 Stock = Stock
 Name = Name
-Description = Description
-Image = Image
 AuthorName = Author's Name
 DateOfBirth = Date of Birth
 DateOfDeath = Date of Death
 PlaceOfBirth = Place of Birth
 PlaceOfDeath = Place of Death
 Age = Age
-Lifetime = Lifetime
 Authors = Authors
-
 Order = Order
 Orders = Orders
-OrderNo = Order Number
-OrderItems = Order Items
-Customer = Customer
-Product = Product
-ProductID = Product ID
-ProductTitle = Product Title
-UnitPrice = Unit Price
-Quantity = Quantity
-
 Price = Price
-Currency = Currency
-Date = Date
-Rating = Rating
-NumberOfReviews = Number of Reviews
 
 Genre = Genre
 Genres = Genres

fiori/app/admin-authors/fiori-service.cds

@@ -43,10 +43,5 @@ extend sap.capire.bookshop.Authors with {
   virtual lifetime : String;
 }
 
-annotate AdminService.Authors with {
-  age      @Common.Label : '{i18n>Age}';
-  lifetime @Common.Label : '{i18n>Lifetime}'
-}
-
 // Workaround for Fiori popup for asking user to enter a new UUID on Create
 annotate AdminService.Authors with { ID @Core.Computed; }

fiori/app/admin-books/fiori-service.cds

@@ -62,11 +62,6 @@ annotate AdminService.Books.texts with @(
 	}
 );
 
-annotate AdminService.Books.texts with {
-    ID       @UI.Hidden;
-    ID_texts @UI.Hidden;
-};
-
 // Add Value Help for Locales
 annotate AdminService.Books.texts {
 	locale @(

fiori/app/browse/fiori-service.cds

@@ -52,6 +52,9 @@ annotate CatalogService.Books with @(UI : {
         },
         {Value : genre.name},
         {Value : price},
-        {Value : currency.symbol},
+        {
+            Value : currency.symbol,
+            Label : ' '
+        },
     ]
 }, );

fiori/app/common.cds

@@ -4,7 +4,6 @@
 
 using { sap.capire.bookshop as my } from '@capire/bookstore';
 using { sap.common } from '@capire/common';
-using { sap.common.Currencies } from '@sap/cds/common';
 
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -26,7 +25,7 @@ annotate my.Books with @(
       { Value: genre.name },
       { Value: stock },
       { Value: price },
-      { Value: currency.symbol },
+      { Value: currency.symbol, Label: ' ' },
     ]
   }
 ) {
@@ -38,10 +37,6 @@ annotate my.Books with @(
   author @ValueList.entity      : 'Authors';
 };
 
-annotate Currencies with {
-  symbol @Common.Label : '{i18n>Currency}';
-}
-
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books Details
@@ -65,8 +60,7 @@ annotate my.Books with {
   author @title: '{i18n>Author}'  @Common: { Text: author.name, TextArrangement: #TextOnly };
   price  @title: '{i18n>Price}'   @Measures.ISOCurrency : currency_code;
   stock  @title: '{i18n>Stock}';
-  descr  @title: '{i18n>Description}'  @UI.MultiLineText;
-  image  @title: '{i18n>Image}';
+  descr  @UI.MultiLineText;
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -87,10 +81,6 @@ annotate my.Genres with @(
   }
 );
 
-annotate my.Genres with {
-  ID  @Common.Text : name  @Common.TextArrangement : #TextOnly;
-}
-
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Genre Details

fiori/server.js

@@ -1,8 +1,8 @@
-// install OData v2 adapter
 const cds = require("@sap/cds")
+
+// install OData v2 adapter
 const proxy = require('@sap/cds-odata-v2-adapter-proxy')
-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`
+const proxyOpts = global.it ? { target:'auto' } : {} // for tests, set 'auto' to detect port dynamically
+cds.on('bootstrap', app => app.use(proxy(proxyOpts)))
 
 module.exports = require('@capire/bookstore/server.js')

hello/srv/world.js

@@ -1,7 +1,3 @@
 module.exports = class say {
-  hello(req) {
-    let {to} = req.data
-    if (to === 'me') to = require('os').userInfo().username
-    return `Hello ${to}!`
-  }
+  hello(req) { return `Hello ${req.data.to}!` }
 }

loggers/app/loggers.html

@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-  <title> cds.log </title>
-  <link rel="stylesheet" href="https://unpkg.com/primitive-ui/dist/css/main.css">
-  <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/vue@3/dist/vue.global.prod.js"></script>
-  <style>
-    select { border-color: transparent; padding: 4px 12px; margin: 0px; }
-    button { padding: 2px 11px; margin: 0px 4px; font: 90% italic; }
-  </style>
-</head>
-
-<body class="small-container" , style="margin-top: 70px;">
-  <div id='app'>
-    <h1> Log Levels </h1>
-    <input type="text" placeholder="Search by ID or Log Level..." @input="fetch">
-    <table id='loggers'>
-      <thead>
-        <th> Module ID </th>
-        <th> Log Level </th>
-      </thead>
-      <tr v-for="each in list">
-        <td>{{ each.id }}</td>
-        <td><select v-bind:id="each.id" v-model="each.level" @change="set">
-            <option>SILENT</option>
-            <option>ERROR</option>
-            <option>WARN</option>
-            <option>INFO</option>
-            <option>DEBUG</option>
-            <option>TRACE</option>
-          </select>
-        </td>
-      </tr>
-    </table>
-    <h4>Log Format:</h4>
-    [ <button class="round-button" :class={'muted-button':!format.timestamp} @click="toggle_format" id="timestamp">Timestamp </button>
-    | <button class="round-button" :class={'muted-button':!format.level} @click="toggle_format" id="level">Log Level </button>
-    | <button class="round-button" :class={'muted-button':!format.tenant} @click="toggle_format" id="tenant">Tenant </button>
-    | <button class="round-button" :class={'muted-button':!format.reqid} @click="toggle_format" id="reqid">Request ID </button>
-    | <button class="round-button" :class={'muted-button':!format.id} @click="toggle_format" id="module">Logger ID </button>
-    ] - <i>log message ...</i>
-  </div>
-</body>
-
-<script>
-  axios.defaults.headers['Content-Type'] = 'application/json'
-  axios.defaults.baseURL = '/log'
-  const loggers = Vue.createApp({ el: '#app',
-  data() {
-      return {
-        format: { timestamp:false, level:false, tenant:false, reqid:false, id:true, },
-        list: [],
-      }
-    },
-    methods: {
-      async fetch (eve) {
-        this.list = (await axios.get (`/Loggers${
-          eve && eve.target.value ? `?$search=${eve.target.value}` : ''
-        }`)).data
-      },
-      async set (eve) {
-        const { id, value:level } = eve.target
-        await axios.put (`/Logger/${id}`, {id,level})
-      },
-      async toggle_format (eve) {
-        this.format[eve.target.id] = !this.format[eve.target.id]
-        await axios.post (`/format`, this.format)
-      },
-    },
-  }).mount('#app')
-  loggers.fetch() // initially fill list of loggers
-</script>
-
-</html>

loggers/package.json

@@ -1,22 +0,0 @@
-{
-  "name": "@capire/loggers",
-  "version": "1.0.0",
-  "description": "Simple sample on how to dynamically set cds.log levels and formats.",
-  "files": [
-    "app",
-    "srv"
-  ],
-  "dependencies": {
-    "@sap/cds": ">=5.9",
-    "express": "^4.17.1"
-  },
-  "scripts": {
-    "start": "cds run",
-    "watch": "cds watch"
-  },
-  "cds": {
-    "requires": {
-      "db": "sql"
-    }
-  }
-}

loggers/readme.md

@@ -1,11 +0,0 @@
-# Dynamically Set `cds.log` Levels and Formats
-
-### Run 
-
-```sh
-cds watch
-```
-
-### Test
-
-Either using the UI through http://localhost:4004/loggers.html, or try the requests in `test/requests.http`

loggers/srv/dummy.cds

@@ -1,3 +0,0 @@
-service Sue {
-  entity Dummy { key ID: UUID; title: String; }
-}

loggers/srv/loggers.cds

@@ -1,20 +0,0 @@
-@rest service LogService {
-
-  @readonly entity Loggers : Logger {};
-  entity Logger {
-    key id : String;
-    level  : String;
-  }
-
-  action format (
-    timestamp : Boolean,
-    level     : Boolean,
-    tenant    : Boolean,
-    reqid     : Boolean,
-    id        : Boolean,
-  );
-
-  action debug (logger : String) returns Logger;
-  action reset (logger : String) returns Logger;
-
-}

loggers/srv/loggers.js

@@ -1,56 +0,0 @@
-const cds = require ('@sap/cds/lib')
-const LOG = cds.log('cds.log')
-
-module.exports = class LogService extends cds.Service {
-  init(){
-
-    this.on('GET','Loggers', (req)=>{
-      let loggers = Object.values(cds.log.loggers).map (_logger)
-      let {$search} = req._.req.query
-      if ($search) {
-        const re = RegExp($search,'i')
-        loggers = loggers.filter (l => re.test(l.id) || re.test(l.level))
-      }
-      return loggers.sort ((a,b) => a.id < b.id ? -1 : 1)
-    })
-
-    this.on('PUT','Logger', (req)=>{
-      const {id} = req.params[0] || req.data
-      if (!id) return req.reject('No logger id specified in request')
-      return _logger (cds.log (id, req.data))
-    })
-
-    this.on('debug', (req)=>{
-      const {logger:id} = req.params[0] || req.data
-      if (!id) return req.reject('No logger id specified in request')
-      return _logger (cds.log (id, {level:'debug'}))
-    })
-
-    this.on('reset', (req)=>{
-      const {logger:id} = req.params[0] || req.data
-      if (!id) return req.reject('No logger id specified in request')
-      return _logger (cds.log (id, {level:'info'}))
-    })
-
-    this.on('format', (req)=>{
-      const $ = req.data; LOG.info('format:',$)
-      // Set format for new loggers constructed subsequently
-      cds.log.format = (id, level, ...args) => {
-        const fmt = []
-        if ($.timestamp) fmt.push ('|', (new Date).toISOString())
-        if ($.level) fmt.push ('|', _levels[level].padEnd(5))
-        if ($.tenant) fmt.push ('|', cds.context && cds.context.tenant)
-        if ($.reqid) fmt.push ('|', cds.context && cds.context.id)
-        if ($.id) fmt.push ('|', id)
-        fmt[0] = '[', fmt.push ('] -', ...args)
-        return fmt
-      }
-      // Apply this format to all existing loggers
-      Object.values(cds.log.loggers).forEach (l => l.setFormat (cds.log.format))
-    })
-  }
-
-}
-
-const _logger = ({id,level}) => ({id, level:_levels[level] })
-const _levels = [ 'SILENT', 'ERROR', 'WARN', 'INFO', 'DEBUG', 'TRACE' ]

loggers/test/requests.http

@@ -1,18 +0,0 @@
-http://localhost:4004/loggers.html
-@body: = Content-Type: application/json\n\n
-
-###
-GET http://localhost:4004/log/Loggers
-
-###
-PUT http://localhost:4004/log/Logger/sqlite
-{{body:}} { "level": "debug" }
-
-###
-POST http://localhost:4004/log/debug(logger='sqlite')
-
-###
-POST http://localhost:4004/log/reset(logger='sqlite')
-
-### Dummy request to see sqlite debug output
-GET http://localhost:4004/sue/Dummy

media/srv/media-service.js

@@ -40,7 +40,7 @@ module.exports = srv => {
         req.reject(404, 'Media not found for the ID')
         return
       }
-      const decodedMedia = Buffer.from(
+      const decodedMedia = new Buffer(
         mediaObj.media.split(';base64,').pop(),
         'base64'
       )

orders/app/fiori.cds

@@ -18,22 +18,22 @@ annotate OrdersService.Orders with @(
 	UI: {
 		SelectionFields: [ createdBy ],
 		LineItem: [
-			{Value: OrderNo, Label:'{i18n>OrderNo}'},
-			{Value: buyer, Label:'{i18n>Customer}'},
-			{Value: currency.symbol, Label:'{i18n>Currency}'},
-			{Value: createdAt, Label:'{i18n>Date}'},
+			{Value: OrderNo, Label:'OrderNo'},
+			{Value: buyer, Label:'Customer'},
+			{Value: currency.symbol, Label:'Currency'},
+			{Value: createdAt, Label:'Date'},
 		],
 		HeaderInfo: {
-			TypeName: '{i18n>Order}', TypeNamePlural: '{i18n>Orders}',
+			TypeName: 'Order', TypeNamePlural: 'Orders',
 			Title: {
-				Label: '{i18n>OrderNo}', //A label is possible but it is not considered on the ObjectPage yet
+				Label: 'Order number ', //A label is possible but it is not considered on the ObjectPage yet
 				Value: OrderNo
 			},
 			Description: {Value: createdBy}
 		},
 		Identification: [ //Is the main field group
-			{Value: createdBy, Label:'{i18n>Customer}'},
-			{Value: createdAt, Label:'{i18n>Date}'},
+			{Value: createdBy, Label:'Customer'},
+			{Value: createdAt, Label:'Date'},
 			{Value: OrderNo },
 		],
 		HeaderFacets: [
@@ -46,7 +46,7 @@ annotate OrdersService.Orders with @(
 		],
 		FieldGroup#Details: {
 			Data: [
-				{Value: currency.code, Label:'{i18n>Currency}'}
+				{Value: currency.code, Label:'Currency'}
 			]
 		},
 		FieldGroup#Created: {
@@ -65,7 +65,6 @@ annotate OrdersService.Orders with @(
 ) {
 	createdAt @UI.HiddenFilter:false;
 	createdBy @UI.HiddenFilter:false;
-        ID        @UI.Hidden;
 };
 
 
@@ -73,15 +72,15 @@ annotate OrdersService.Orders with @(
 annotate OrdersService.Orders.Items with @(
 	UI: {
 		LineItem: [
-			{Value: product_ID, Label:'{i18n>ProductID}'},
-			{Value: title, Label:'{i18n>ProductTitle}'},
-			{Value: price, Label:'{i18n>UnitPrice}'},
-			{Value: quantity, Label:'{i18n>Quantity}'},
+			{Value: product_ID, Label:'Product ID'},
+			{Value: title, Label:'Product Title'},
+			{Value: price, Label:'Unit Price'},
+			{Value: quantity, Label:'Quantity'},
 		],
 		Identification: [ //Is the main field group
-			{Value: quantity, Label:'{i18n>Quantity}'},
-			{Value: title, Label:'{i18n>Product}'},
-			{Value: price, Label:'{i18n>UnitPrice}'},
+			{Value: quantity, Label:'Quantity'},
+			{Value: title, Label:'Product'},
+			{Value: price, Label:'Unit Price'},
 		],
 		Facets: [
 			{$Type: 'UI.ReferenceFacet', Label: '{i18n>OrderItems}', Target: '@UI.Identification'},
@@ -91,7 +90,4 @@ annotate OrdersService.Orders.Items with @(
 	quantity @(
 		Common.FieldControl: #Mandatory
 	);
-        ID       @UI.Hidden;
-        up_      @UI.Hidden;
-
 };

package.json

@@ -16,30 +16,28 @@
     "./hello",
     "./media",
     "./orders",
-    "./loggers",
     "./reviews"
   ],
   "devDependencies": {
-    "axios": "^1",
+    "axios": "^0",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "chai-subset": "^1.6.0",
-    "eslint": "^8.9",
     "semver": "^7",
-    "sqlite3": "^5",
-    "@sap/eslint-plugin-cds": "^2.6.0",
-    "eslint-plugin-cloud-cap-samples": "file:.eslint"
+    "sqlite3": "^5"
   },
   "scripts": {
     "cleanup": "rm -rf node_modules && rm -rf */node_modules && rm -rf */*/node_modules",
+    "registry": "node .registry/server.js",
     "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",
+    "mocha": "npx mocha || echo",
+    "jest": "npx jest",
     "start": "cds watch fiori",
     "test": "npm run jest -- --silent",
+    "test:mocha": "npx mocha --parallel --recursive --timeout 20000",
     "test:hello": "cd hello && npm test"
   },
   "jest": {
@@ -50,8 +48,7 @@
   },
   "mocha": {
     "recursive": true,
-    "parallel": true,
-    "timeout": 6666
+    "parallel": true
   },
   "license": "SAP SAMPLE CODE LICENSE",
   "private": true

samples.md

@@ -1,7 +1,7 @@
 # Overview of Samples
 
 The following list gives an overview of the samples provided in subdirectories.
-Each sub directory essentially is an individual npm package arranged in an [all-in-one monorepo](#all-in-one-monorepo) umbrella setup.
+Each sub directory essentially is an individual npm package arranged in an [all-in-one monorepo](all-in-one-monorepo) umbrella setup.
 
 
 ## [@capire/hello-world](hello)

test/custom-handlers.test.js

@@ -3,9 +3,8 @@ const cds = require('@sap/cds/lib')
 describe('cap/samples - Custom Handlers', () => {
 
   const { GET, POST, expect } = cds.test(__dirname+'/../bookshop')
-  beforeAll(()=>{
-    cds.User.default = cds.User.Privileged // hard core monkey patch
-  })
+  if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
+  else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
 
   it('should reject out-of-stock orders', async () => {
     await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`

test/fiori.test.js

@@ -1,12 +1,10 @@
 const cds = require('@sap/cds/lib')
 
-describe('cap/samples - Fiori APIs - v2', function() {
+describe('cap/samples - Fiori APIs - v2', () => {
 
   const { GET, expect, axios } = cds.test ('@capire/fiori', '--with-mocks')
   axios.defaults.auth = { username: 'alice', password: 'admin' }
 
-  // if (this.timeout) this.timeout(1e6)
-
   it('serves $metadata documents in v2', async () => {
     const { headers, data } = await GET `/v2/browse/$metadata`
     expect(headers).to.contain({

test/hierarchical-data.test.js

@@ -16,21 +16,21 @@ describe('cap/samples - Hierarchical Data', ()=>{
 	before ('bootstrap sqlite in-memory db...', async()=>{
 		await cds.deploy (model) .to ('sqlite::memory:')
 		expect (cds.db) .to.exist
-		expect (cds.db.model) .to.exist
+    expect (cds.db.model) .to.exist
 	})
 
 	it ('supports deeply nested inserts', ()=> INSERT.into (Cats,
-		{ ID:100, name:'Some Cats...', children:[
-			{ ID:101, name:'Cat', children:[
-				{ ID:102, name:'Kitty', children:[
-					{ ID:103, name:'Kitty Cat', children:[
-						{ ID:104, name:'Aristocat' } ]},
-					{ ID:105, name:'Kitty Bat' } ]},
-				{ ID:106, name:'Catwoman', children:[
-					{ ID:107, name:'Catalina' } ]} ]},
-			{ ID:108, name:'Catweazle' }
-		]}
-	))
+    { ID:100, name:'Some Cats...', children:[
+      { ID:101, name:'Cat', children:[
+        { ID:102, name:'Kitty', children:[
+          { ID:103, name:'Kitty Cat', children:[
+            { ID:104, name:'Aristocat' } ]},
+          { ID:105, name:'Kitty Bat' } ]},
+        { ID:106, name:'Catwoman', children:[
+          { ID:107, name:'Catalina' } ]} ]},
+      { ID:108, name:'Catweazle' }
+    ]}
+  ))
 
 	it ('supports nested reads', async()=>{
 		if (require('semver').gte(cds.version, '5.9.0')) {
@@ -101,12 +101,12 @@ describe('cap/samples - Hierarchical Data', ()=>{
 	})
 
 	it ('supports cascaded deletes', async()=>{
-		const affectedRows = await DELETE.from (Cats) .where ({ID:[102,106]})
-		expect (affectedRows) .to.be.greaterThan (0)
+    const affectedRows = await DELETE.from (Cats) .where ({ID:[102,106]})
+    expect (affectedRows) .to.be.greaterThan (0)
 		const expected = [
-			{ ID:100, name:'Some Cats...' },
-			{ ID:101, name:'Cat' },
-			{ ID:108, name:'Catweazle' }
+      { 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,12 +1,8 @@
-const cds = require('@sap/cds/lib')
-
 describe('cap/samples - Localized Data', () => {
 
-  const { GET, expect } = cds.test (__dirname)
-  beforeAll(()=>{
-    cds.User.default = cds.User.Privileged // hard core monkey patch
-  })
-
+  const { GET, expect, cds } = require('@sap/cds/lib').test (__dirname)
+  if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
+  else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
 
   it('serves localized $metadata documents', async () => {
     const { data } = await GET(`/browse/$metadata?sap-language=de`, { headers: { 'accept-language': 'de' }})

test/messaging.test.js

@@ -1,13 +1,16 @@
 const cds = require('@sap/cds/lib')
+const {resolve} = require('path')
 
 describe('cap/samples - Messaging', ()=>{
 
-    const { expect } = cds.test.in(__dirname,'..')
+    const { expect } = cds.test
     const _model = '@capire/reviews'
     const Reviews = 'sap.capire.reviews.Reviews'
-    beforeAll(()=>{
-        cds.User.default = cds.User.Privileged // hard core monkey patch
-    })
+    if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
+    else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
+
+    beforeAll(() => { cds.root = resolve(__dirname, '..') })
+    afterAll(() => { cds.root = process.cwd() })
 
     it ('should bootstrap sqlite in-memory db', async()=>{
         const db = await cds.deploy (_model) .to ('sqlite::memory:')
@@ -32,7 +35,6 @@ describe('cap/samples - Messaging', ()=>{
 
     it ('should add review', async ()=>{
         const review = { subject: "201", title: "Captivating", rating: ++N }
-        cds._debug = 1
         const response = await srv.create ('Reviews') .entries (review)
         expect (response) .to.containSubset (review)
     })

test/odata.test.js

@@ -4,6 +4,47 @@ describe('cap/samples - Bookshop APIs', () => {
   const { GET, expect, axios } = cds.test ('@capire/bookshop')
   axios.defaults.auth = { username: 'alice', password: 'admin' }
 
+  // Genres
+  const Drama = {
+    "name": "Drama",
+    "descr": null,
+    "ID": 11,
+    "parent_ID": 10
+  }
+  const Mystery = {
+    "name": "Mystery",
+    "descr": null,
+    "ID": 16,
+    "parent_ID": 10
+  }
+  const Fantasy = {
+    "name": "Fantasy",
+    "descr": null,
+    "ID": 13,
+    "parent_ID": 10
+  }
+
+  // Currencies
+  const GBP = {
+    "name": "British Pound",
+    "descr": null,
+    "code": "GBP",
+    "symbol": "£"
+  }
+  const USD = {
+    "name": "US Dollar",
+    "descr": null,
+    "code": "USD",
+    "symbol": "$"
+  }
+  const JPY = {
+    "name": "Yen",
+    "descr": null,
+    "code": "JPY",
+    "symbol": "¥"
+  }
+
+
   it('serves $metadata documents in v4', async () => {
     const { headers, status, data } = await GET `/browse/$metadata`
     expect(status).to.equal(200)
@@ -16,15 +57,12 @@ describe('cap/samples - Bookshop APIs', () => {
   })
 
   it('serves ListOfBooks?$expand=genre,currency', async () => {
-    const Mystery = { ID: 16, name: 'Mystery', descr: null, parent_ID: 10 }
-    const Romance = { ID: 15, name: 'Romance', descr: null, parent_ID: 10 }
-    const USD = { code: 'USD', name: 'US Dollar', descr: null, symbol: '$' }
     const { data } = await GET `/browse/ListOfBooks ${{
       params: { $search: 'Po', $select: `title,author`, $expand:`genre,currency` },
     }}`
     expect(data.value).to.eql([
       { ID: 251, title: 'The Raven', author: 'Edgar Allen Poe', genre:Mystery, currency:USD  },
-      { ID: 252, title: 'Eleonora', author: 'Edgar Allen Poe', genre:Romance, currency:USD  },
+      { ID: 252, title: 'Eleonora', author: 'Edgar Allen Poe', genre:Mystery, currency:USD  },
     ])
   })
 
@@ -88,10 +126,14 @@ describe('cap/samples - Bookshop APIs', () => {
   })
 
   it('serves user info', async () => {
-    const { data: alice } = await GET `/user/me`
-    expect(alice).to.containSubset({ id: 'alice', locale:'en' })
-    const { data: joe } = await GET (`/user/me`, {auth: { username: 'joe' }})
-    expect(joe).to.containSubset({ id: 'joe', locale:'en' })
+    {
+      const { data } = await GET (`/user/me`)
+      expect(data).to.containSubset({ id: 'alice', locale:'en', tenant: null })
+    }
+    {
+      const { data } = await GET (`/user/me`, {auth: { username: 'joe' }})
+      expect(data).to.containSubset({ id: 'joe', locale:'en', tenant: null })
+    }
   })
 
 })

test/registry.test.js

@@ -0,0 +1,57 @@
+
+const cds = require('@sap/cds/lib')
+const { fork } = require('child_process')
+const { resolve } = require('path')
+const verbose = process.env.CDS_TEST_VERBOSE
+
+describe('cap/samples - Local NPM registry', () => {
+
+  const { expect } = cds.test
+  // ||true
+
+  let registry
+  let axios
+  const cwd = resolve(__dirname, '..')
+
+  before(async ()=> {
+    const env = Object.assign(process.env, {PORT:'0'})
+    const res = await exec (resolve(cwd, '.registry/server.js'), {cwd, stdio: 'pipe', env})
+    registry = res.cp
+    axios = require('axios').default.create ({ baseURL: res.url, validateStatus: (status)=>status<500 })
+  })
+
+  after(() => { registry.kill() })
+
+  for (const mod of ['bookshop', 'data-viewer', 'fiori','orders','reviews']) {
+    it(`should serve ${mod}`, async () => {
+      const resp = await axios.get(`/@capire/${mod}`)
+      expect(resp.data).to.containSubset({name: `@capire/${mod}`, versions:{}})
+      const versions = Object.values(resp.data.versions)
+      await axios.get(versions[0].dist.tarball)
+    })
+  }
+  it(`should return 404 for unknown packages`, async () => {
+    let resp = await axios.get(`/@capire/foo`)
+    expect(resp.status).to.equal(404)
+    resp = await axios.get(`/foo`)
+    expect(resp.status).to.equal(404)
+  })
+
+})
+
+function exec (script, opts) {
+  return new Promise((resolve, reject)=> {
+    const cp = fork (script, [], opts)
+      .on('error', err => reject(new Error(err)))
+    cp.stdout.on('data', chunk => {
+      if (verbose) console.log(chunk.toString())
+      if (chunk.toString().match(/listening.*(http:.*:\d+)/i)) {
+         resolve({cp, url:RegExp.$1})
+      }
+    })
+    cp.stderr.on('data', chunk => {
+      if (verbose)  console.error(chunk.toString())
+    })
+  })
+
+}