@sap/cds 7.8.2 → 7.9.1

package/lib/compile/to/yaml.js

@@ -1,36 +1,37 @@
 // A simple YAML serializer
-module.exports = function _2yaml (object, options={}) { // NOSONAR
-  if (!object)  return object
-  const limit = options.limit || 111
-  return (function $(o, indent='') { // NOSONAR
-
-    if (o === null)  return o
-    if (typeof o === 'function')  return ''
-    if (o.toJSON)  o = o.toJSON()
+module.exports = function _2yaml (object, {limit=111}={}) {
+  return $(object,'',1).toString().replace(/^\n/,'')
+  function $(o, indent, count, _visited) {
+    if (o == null) return o
+    if (o.toJSON) o = o.toJSON()
     if (Array.isArray(o)) {
       let s = ''
-      for (let e of o)  s += '\n'+indent+'- '+ $(e,indent+'    ')
-      return s.length > limit ? s : '['+ s.replace (/\n\s*- /g, ', ').slice(2) +']'
+      for (let e of o)  s += '\n'+indent+'- '+ $(e,indent+'  ',0)
+      return s.length > limit ? s : '['+ s.replace (/\n\s*- /g, ', ').replace(/^, /,'') +']'
     }
     if (typeof o === 'object') {
+      const visited = new Set (_visited)
+      if (visited.has(o)) return console.error('circular reference to',o)
+      else visited.add(o)
       let s = ''
       for (let k in o) {
         let e = o[k]
-        if (e === undefined)  continue
-        if (typeof e === 'function')  continue
-        if ((e||1).valueOf && (e||1).valueOf() === undefined)  continue
-        if ((e||1).toJSON && (e||1).toJSON() === undefined)  continue
+        if (e === undefined) continue
+        if (typeof e === 'function') continue
+        if (e?.valueOf && e.valueOf() === undefined) continue
+        if (e?.toJSON && e.toJSON() === undefined) continue
         let key = /^[$\w]/.test(k) ? k : "'"+ k +"'"
-        s += '\n'+indent + key +': '+ $(e,indent+'  ')
+        if (count++ > 0) s += '\n'+indent
+        s += key +': '+ $(e,indent+'  ',1,visited)
       }
-      return s.length > limit ? s : '{'+ s.replace (/\n\s*/g, ', ').slice(2) +'}'
+      return s.length > limit ? s : '{'+ s.replace (/\n\s*/g, ', ').replace(/^, /,'') +'}'
     }
     if (typeof o === 'string') {
-      if (o.indexOf('\n')>=0)  return '|'+'\n'+indent+ o.replace(/\n/g,'\n'+indent)
+      if (o.indexOf('\n')>=0) return '|'+'\n'+indent+ o.replace(/\n/g,'\n'+indent)
       let s = o.trim()
-      return  !s || /^[\^@#:,*]/.test(s)  ? '"'+ o.replace(/\\/g,'\\\\') +'"'  :  s
+      return !s || /^[\^@#:,=!<>*|]/.test(s)  ? '"'+ o.replace(/\\/g,'\\\\') +'"'  :  s
     }
+    if (typeof o === 'function') return ''
     else return o
-
-  })(object).toString().replace(/^\n/,'')
-}
+  }
+}

package/lib/dbs/cds-deploy.js

@@ -58,14 +58,13 @@ const deploy = module.exports = function cds_deploy (model, options, csvs) {
 deploy.schema = async function (db, csn = db.model, o) {
 
   if (!o.to || o.to === db.options.kind)  o = { ...db.options, ...o }
-  if (o.impl === '@cap-js/sqlite') {
-    // REVISIT: Move that to configuration or to cds.compile -> currently cds compile creates wrong output
-    o.betterSqliteSessionVariables = true
-    o.sqlDialect = 'sqlite'
-  }
 
   let drops, creas
-  let schevo = o.schema_evolution === 'auto' || o['with-auto-schema-evolution'] || o['model-only'] || o['delta-from'] || (o.kind === 'postgres' && o.schema_evolution !== false);
+  let schevo = (o.kind === 'postgres' && o.schema_evolution !== false)
+  || o.schema_evolution === 'auto'
+  || o['with-auto-schema-evolution']
+  || o['model-only']
+  || o['delta-from']
   if (schevo) {
     const { prior, table_exists } = await get_prior_model()
     const { afterImage, drops: d, createsAndAlters } = cds.compile.to.sql.delta(csn, o, prior);

package/lib/env/cds-env.js

@@ -91,6 +91,13 @@ class Config {
     if (this.features && this.features.emulate_vcap_services) {
       this._emulate_vcap_services()
     }
+
+    // new odata adapter shall include new parser, cds.assert(), and decimals as strings
+    if (this.features?.odata_new_adapter) {
+      this.features.odata_new_parser = true
+      this.features.cds_assert = true
+      this.features.string_decimals = true
+    }
   }
 
   /**

package/lib/env/cds-requires.js

@@ -91,7 +91,7 @@ const _services = {
 
   "app-service": {
     // this is the default implementation used for provided services
-    impl: `${_runtime}/cds-services/services/Service.js`
+    impl: `${_runtime}/common/Service.js`
   },
   "rest": {
     impl: `${_runtime}/remote/Service.js`,
@@ -125,6 +125,7 @@ const _databases = {
   },
 
   "sqlite": {
+    '[legacy-sqlite]': { impl: `${_runtime}/sqlite/Service.js` },
     '[better-sqlite]': { impl: '@cap-js/sqlite' },
     impl: `${_runtime}/sqlite/Service.js`,
     credentials: { url: 'db.sqlite' },
@@ -141,11 +142,16 @@ const _databases = {
   },
 
   "hana": {
+    '[better-hana]': { impl: '@cap-js/hana' },
     impl: `${_runtime}/hana/Service.js`,
   },
   "hana-cloud": {
     kind: 'hana', "deploy-format": "hdbtable",
   },
+  "legacy-hana": {
+    impl: `${_runtime}/hana/Service.js`,
+    kind: 'hana'
+  },
 
   "sql-mt": { // For compatibility only
     '[development]': { kind: 'sqlite' },
@@ -213,6 +219,12 @@ const _messaging = {
     vcap: { label: "enterprise-messaging" },
     outbox: true
   },
+  "event-broker": {
+    impl: `${_runtime}/messaging/event-broker.js`,
+    vcap: {
+      label: "eventmesh-sap2sap-internal"
+    }
+  },
   'message-queuing': {
     impl: `${_runtime}/messaging/message-queuing.js`,
     outbox: true
@@ -243,6 +255,13 @@ const _messaging = {
 
 const _platform_services = {
 
+  ucl: {
+    impl: `${_runtime}/ucl/Service.js`,
+    host: 'compass-gateway-sap-mtls.mps.kyma.cloud.sap',
+    path: '/director/graphql',
+    vcap: { label: 'xsuaa' }
+  },
+
   destinations: {
     vcap: {
       label: 'destination'

package/lib/env/defaults.js

@@ -20,6 +20,8 @@ const defaults = module.exports = {
 
   features: {
     folders: 'fts/*', // where to find feature toggles -> switch on by default when released
+    pre_compile_edmxs: false,
+    odata_new_adapter: false, // switch default with cds^8
     live_reload: !production,
     in_memory_db: !production,
     test_data: !production,
@@ -34,24 +36,26 @@ const defaults = module.exports = {
     assert_integrity: false,
     cds_tx_inheritance: true,
     serve_on_root: false,
-    precise_timestamps: false
+    precise_timestamps: false,
+    string_decimals: false, // switch default with cds^8
   },
 
   fiori: {
     preview: !production,
     routes: !production,
     lean_draft: true,
-    wrap_multiple_errors: true, // switch default with cds 8
+    wrap_multiple_errors: true, // switch default with cds^8
     draft_lock_timeout: true,
-    draft_deletion_timeout: false, // switch default with cds 8
+    draft_deletion_timeout: false, // switch default with cds^8
     draft_compat: undefined,
     '[better-sqlite]': { lean_draft: true },
+    '[better-hana]': { lean_draft: true },
     '[lean-draft]': { lean_draft: true },
     '[draft-compat]': { draft_compat: true },
   },
 
   ql: {
-    quirks_mode: true, // IMPORTANT: Remove that for cds7 !!
+    quirks_mode: true, // IMPORTANT: Remove that for cds^7 !!
   },
 
   log: {
@@ -65,7 +69,7 @@ const defaults = module.exports = {
     service: false,
     // the rest is only applicable for the json formatter
     user: false,
-    mask_headers: ['/authorization/i', '/cookie/i'],
+    mask_headers: ['/authorization/i', '/cookie/i', '/cert/i', '/ssl/i'],
     aspects: ['./aspects/cf', './aspects/als'], //> EXPERIMENTAL!!!
     // adds custom fields in kibana's error rendering (unknown fields are ignored); key: index
     // note: custom fields are a feature of Application Logging Service (ALS) and not Kibana per se
@@ -142,6 +146,17 @@ const defaults = module.exports = {
   },
 
   sql: {
+    /**
+     * Allows to skip generating transitive localized views for entities which don't have own localized elements, but only associations to such.
+     * - `undefined` → skipped for new db services.
+     * - `false` → always skipped.
+     * - `true` → never skipped.
+     */
+    transitive_localized_views: true,
+    '[java]': {
+      transitive_localized_views: false
+    },
+    native_hana_associations: true,
     names: 'plain', // or 'quoted', or 'hdbcds'
     dialect: 'sqlite' // or 'plain' or 'hana'
   },
@@ -173,6 +188,7 @@ const defaults = module.exports = {
   cdsc: {
     moduleLookupDirectories: ['node_modules/'],
     '[java]': {
+      betterSqliteSessionVariables: true,
       moduleLookupDirectories: ['node_modules/', 'target/cds/'],
     }
     // cv2: {

package/lib/env/schemas/cds-package.js

@@ -8,7 +8,7 @@ module.exports = {
   // and not in the root of the package.json
 
   title: 'JSON schema for CDS configuration in package.json',
-  $schema: 'https://json-schema.org/draft/2020-12/schema',
+  $schema: 'https://json-schema.org/draft-07/schema',
   description: 'This is a JSON schema representation of the CDS project configuration inside a project root level package.json',
   type: 'object',
   properties: {

package/lib/env/schemas/cds-rc.js

@@ -4,7 +4,7 @@ module.exports = {
   _version: cds.version,
 
   title: 'JSON schema for CDS configuration',
-  $schema: 'https://json-schema.org/draft/2020-12/schema',
+  $schema: 'https://json-schema.org/draft-07/schema',
   description: 'This is a JSON schema representation for CDS project configuration',
   type: 'object',
   additionalProperties: true,
@@ -27,17 +27,32 @@ module.exports = {
 
   $defs: {
     cdsRoot: {
+      allowAdditionalProperties: true,
+      patternProperties: {
+        '\\[.+\\]': {
+          default: {},
+          description: 'Generic cds profile',
+          $ref: '#/$defs/cdsRoot'
+        }
+      },
       properties: {
         '[development]': {
-          type: 'object'
+          default: {},
+          description: 'Development profile',
+          $ref: '#/$defs/cdsRoot'
         },
         '[production]': {
-          type: 'object'
+          default: {},
+          description: 'Production profile',
+          $ref: '#/$defs/cdsRoot'
         },
         '[hybrid]': {
-          type: 'object'
+          default: {},
+          description: 'Hybrid profile',
+          $ref: '#/$defs/cdsRoot'
         },
         profile: {
+          default: {},
           description: 'A single static profile',
           anyOf: [
             {
@@ -53,6 +68,7 @@ module.exports = {
           ]
         },
         profiles: {
+          default: [],
           description: 'An array of profiles',
           type: 'array',
           uniqueItems: true,
@@ -62,6 +78,7 @@ module.exports = {
         },
         folders: {
           type: 'object',
+          default: {},
           description: 'Only set folders if you don\'t want to use the defaults \'app/\', \'db/\', \'srv/\'.',
           additionalProperties: true,
           properties: {
@@ -82,6 +99,11 @@ module.exports = {
             }
           },
           patternProperties: {
+            '\\[.+\\]': {
+              default: {},
+              description: 'Generic folders profile',
+              $ref: '#/$defs/cdsRoot/properties/folders'
+            },
             '.+': {
               description: 'A static name identifying this folder.'
             }
@@ -91,6 +113,13 @@ module.exports = {
           type: 'object',
           description: 'Customize CDS translation settings.',
           additionalProperties: true,
+          patternProperties: {
+            '\\[.+\\]': {
+              default: {},
+              description: 'Generic i18n profile',
+              $ref: '#/$defs/cdsRoot/properties/i18n'
+            }
+          },
           properties: {
             default_language: {
               type: 'string'
@@ -104,6 +133,7 @@ module.exports = {
         },
         requires: {
           type: 'object',
+          default: {},
           description: 'List CDS dependencies to databases and services within the requires section.',
           additionalProperties: true,
           properties: {
@@ -126,6 +156,13 @@ module.exports = {
                   description: 'Use custom authentication settings.',
                   default: {},
                   additionalProperties: true,
+                  // support for [profileName] syntax
+                  patternProperties: {
+                    '\\[.+\\]': {
+                      description: 'aloha',
+                      $ref: '#/$defs/cdsRoot/properties/requires/properties/auth'
+                    }
+                  },
                   properties: {
                     kind: {
                       type: 'string',
@@ -176,6 +213,11 @@ module.exports = {
                   description: 'Use custom database-specific settings.',
                   default: {},
                   additionalProperties: true,
+                  patternProperties: {
+                    '\\[.+\\]': {
+                      $ref: '#/$defs/cdsRoot/properties/requires/properties/db'
+                    }
+                  },
                   properties: {
                     kind: {
                       type: 'string',
@@ -232,6 +274,12 @@ module.exports = {
                 {
                   type: 'object',
                   description: 'Multitenancy configuration options.',
+                  additionalProperties: true,
+                  patternProperties: {
+                    '\\[.+\\]': {
+                      $ref: '#/$defs/cdsRoot/properties/requires/properties/multitenancy'
+                    }
+                  },
                   properties: {
                     jobs: {
                       type: 'object',
@@ -260,6 +308,12 @@ module.exports = {
                 {
                   type: 'object',
                   description: 'Extensibility configuration options.',
+                  additionalProperties: true,
+                  patternProperties: {
+                    '\\[.+\\]': {
+                      $ref: '#/$defs/cdsRoot/properties/requires/properties/extensibility'
+                    }
+                  },
                   properties: {
                     tenantCheckInterval: {
                       type: 'number',
@@ -290,6 +344,11 @@ module.exports = {
                   type: 'object',
                   description: 'ModelProviderService configuration options.',
                   additionalProperties: true,
+                  patternProperties: {
+                    '\\[.+\\]': {
+                      $ref: '#/$defs/cdsRoot/properties/requires/properties/cds.xt.ModelProviderService'
+                    }
+                  },
                   properties: {
                     root: {
                       type: 'string',
@@ -323,6 +382,12 @@ module.exports = {
                 {
                   type: 'object',
                   description: 'DeploymentService configuration options.',
+                  additionalProperties: true,
+                  patternProperties: {
+                    '\\[.+\\]': {
+                      $ref: '#/$defs/cdsRoot/properties/requires/properties/cds.xt.DeploymentService'
+                    }
+                  },
                   properties: {
                     hdi: {
                       type: 'object',
@@ -367,6 +432,11 @@ module.exports = {
                   type: 'object',
                   description: 'SaasProvisioningService configuration options.',
                   additionalProperties: true,
+                  patternProperties: {
+                    '\\[.+\\]': {
+                      $ref: '#/$defs/cdsRoot/properties/requires/properties/cds.xt.SaasProvisioningService'
+                    }
+                  },
                   properties: {
                     jobs: {
                       type: 'object',
@@ -389,6 +459,11 @@ module.exports = {
             }
           },
           patternProperties: {
+            '\\[.+\\]': {
+              default: {},
+              description: 'Generic requires profile',
+              $ref: '#/$defs/cdsRoot/properties/requires'
+            },
             '.+': {
               oneOf: [
                 {
@@ -448,9 +523,15 @@ module.exports = {
         },
         protocols: {
           type: 'object',
+          default: {},
           description: 'List protocols to enable in addition to the default protocol adaptors.',
           additionalProperties: true,
           patternProperties: {
+            '\\[.+\\]': {
+              default: {},
+              description: 'Generic protocols profile',
+              $ref: '#/$defs/cdsRoot/properties/protocols/patternProperties/.+/oneOf/2'
+            },
             '.+': {
               oneOf: [
                 {

package/lib/index.js

@@ -79,7 +79,7 @@ const cds = module.exports = global.cds = new class cds extends EventEmitter {
   get User() { return super.User = require('./req/user') }
 
   // Services, Protocols and Periphery
-  get ApplicationService() { return super.ApplicationService = require('../libx/_runtime/cds-services/services/Service.js') }
+  get ApplicationService() { return super.ApplicationService = require('../libx/_runtime/common/Service.js') }
   get MessagingService() { return super.MessagingService = require('../libx/_runtime/messaging/service.js') }
   get DatabaseService() { return super.DatabaseService = require('../libx/_runtime/db/Service.js') }
   get RemoteService() { return super.RemoteService = require('../libx/_runtime/remote/Service.js') }

package/lib/linked/entities.js

@@ -5,6 +5,16 @@ const _derived = Symbol('derived')
 
 class entity extends struct {
   is (kind) { return kind === 'entity' || kind === 'view' && !!this.query || super.is(kind) }
+
+  /**
+   * Experimental API to write:
+   * ```js
+   * SELECT.from(Foo.as('bar')) // ... as alternative to:
+   * SELECT.from(Foo).alias('bar')
+   * ```
+   */
+  as (alias) { return { ntt:this, ref:[this.name], as:alias } }
+
   get keys() {
     return this._elements ('key')
   }

package/lib/linked/models.js

@@ -15,7 +15,7 @@ class LinkedCSN {
   constructor(x) {
 
     if (typeof x === 'string') x = require('../index').compile(x) //> for convenience in repl
-    const defs = x.definitions = _iterable (x.definitions)
+    const defs = x.definitions = _iterable (x.definitions||{})
     for (let d in defs) _link (defs[d],d)
     return Object.setPrototypeOf (x, new.target.prototype)
 

package/lib/plugins.js

@@ -30,7 +30,7 @@ exports.fetch = function (DEV = process.env.NODE_ENV !== 'production') {
 exports.activate = async function () {
   const DEBUG = cds.debug ('plugins', {label:'cds'})
   DEBUG && console.time ('[cds] - loaded plugins in')
-  const { plugins } = cds.env, { local } = cds.utils
+  const plugins = exports.fetch(), { local } = cds.utils
   await Promise.all (Object.entries(plugins) .map (async ([ plugin, conf ]) => {
     DEBUG?.(`loading plugin ${plugin}:`, { impl: local(conf.impl) })
     // TODO: support ESM plugins. But see cap/cds/pull/1838#issuecomment-1177200 !

package/lib/ql/INSERT.js

@@ -13,6 +13,8 @@ module.exports = class Query extends require('./Query') {
   }
 
   entries (...x) {
+    if (!x.length) return this
+    if (x[0].SELECT) return this.from(x[0])
     this[this.cmd].entries = is_array(x[0]) ? x[0] : x
     return this
   }
@@ -31,11 +33,22 @@ module.exports = class Query extends require('./Query') {
     return this
   }
 
-  as (query) {
-    if (!query || !query.SELECT) this._expected `${{query}} to be a CQN {SELECT} query object`
-    this[this.cmd].as = query
+  from (query) {
+    if (!query) return this
+    if (!query.SELECT) {
+      if (query.name || typeof query === 'string') query = SELECT.from(query)
+      else this._expected `${{query}} to be a CQN {SELECT} query object`
+    }
+    this[this.cmd].as = query // REVISIT: should we also change CSN spec, and adopt db service impls?
     return this
   }
+
+  /** @deprecated */ as (query) {
+    INSERT_as_SELECT ??= require('../utils').deprecated(()=>{},{old:'INSERT.as(SELECT)', use:'INSERT.entries(SELECT)'})
+    INSERT_as_SELECT()
+    return this.from(query)
+  }
+
   valueOf() {
     return super.valueOf('INSERT INTO')
   }
@@ -44,3 +57,4 @@ module.exports = class Query extends require('./Query') {
 }
 
 const is_array = Array.isArray
+let INSERT_as_SELECT

package/lib/ql/Query.js

@@ -5,6 +5,10 @@ class Query {
 
   constructor(_={}) { this[this.cmd] = _ }
 
+  /**
+   * Note to self: We can't use .as (alias) as that would conflict with
+   * sub selects in columns, which in turn may has aliases in .as.
+   */
   alias (a) {
     this._target_ref.as = a
     return this

package/lib/ql/infer.js

@@ -78,7 +78,7 @@ function elements4 (columns, source) {
     if (c.ref && d?.elements) {
       for (let r of ref) d = (d.SELECT ? d : d._target||d).elements?.[r]
         || cds.error `Couldn't resolve element "${ref.join('/')}" in ${source.kind} ${source.name||''} ${Object.keys(source.elements)}`
-      if (d._target) { is2many = d.is2many; d = d._target }
+      if (d._target) { is2many = d.is2many; c.expand || c.inline ? d = d._target : d }
       // ... d is further processed in steps 5,6,7 below
     }
 

package/lib/req/request.js

@@ -205,5 +205,5 @@ const _path4 = (x,p) => {
 //  REVISIT: Legacy stuff...
 //
 Object.defineProperties (Request.prototype, {
-  diff: { get: ()=> require('../../libx/_runtime/cds-services/services/utils/differ').reqDiff }
+  diff: { get: ()=> require('../../libx/_runtime/common/utils/differ').reqDiff }
 })

package/lib/srv/cds-serve.js

@@ -101,6 +101,7 @@ module.exports = function cds_serve (som, _options) { // NOSONAR
 
     /** Fluent method to serve constructed providers to express app */
     in (app) {
+      if (!cds.env.features.odata_new_adapter && cds.edmxs) ready = ready.then (()=> cds.edmxs)
       ready = ready.then (()=> all.forEach (each => {
         const d = each.definition
         if (d['@protocol'] === 'none' || d['@cds.api.ignore']) return each._is_dark = true

package/lib/srv/middlewares/cds-context.js

@@ -19,7 +19,7 @@ module.exports = ()=> {
       req.headers['x-vcap-request-id'] ||
       uuid()
     )
-    req.res.set('X-Correlation-ID', id)
+    req.res.set('x-correlation-id', id)
     return id
   }
 

package/lib/srv/protocols/odata-v4.js

@@ -4,11 +4,10 @@ const cds = require('../../index'),
 const express = require('express') // eslint-disable-line cds/no-missing-dependencies
 
 if (cds.env.features.odata_new_adapter) {
+  cds.log().info('using new OData adapter')
+
   const { isStream, stream } = require('../../../libx/odata/middleware/stream')
   const BaseProtocolAdapter = require('./http')
-  // REVISIT: odata_new_adapter shouldn't influence odata_new_parser and cds_assert, but we'd need to set marker in cds.context or so to remove this
-  cds.env.features.odata_new_parser = true
-  cds.env.features.cds_assert = true
 
   module.exports = class ODataAdapter extends BaseProtocolAdapter {
     log(req) {
@@ -44,7 +43,7 @@ if (cds.env.features.odata_new_adapter) {
             if (typeof req.body === 'object') return next()
             if (req.method === 'PUT' && isStream(req._query)) {
               req.body = { value: req }
-              return next(null, req, res)
+              return next()
             }
             // TODO: check if the raw body still exists, then we can remove deepCopy() in the handlers
             return jsonBodyParser(req, res, next)
@@ -59,8 +58,8 @@ if (cds.env.features.odata_new_adapter) {
           .post('*', require('../../../libx/odata/middleware/create')(srv))
           .get('*', stream(srv))
           .get('*', require('../../../libx/odata/middleware/read')(srv))
-          .put('*', require('../../../libx/odata/middleware/update')(srv))
-          .patch('*', require('../../../libx/odata/middleware/update')(srv))
+          .put('*', require('../../../libx/odata/middleware/update')(srv, router))
+          .patch('*', require('../../../libx/odata/middleware/update')(srv, router))
           .delete('*', require('../../../libx/odata/middleware/delete')(srv))
           // error
           .use(require('../../../libx/odata/middleware/error')(srv))

package/lib/srv/srv-models.js

@@ -182,9 +182,16 @@ if (!extensibility) {
 
 // helper to get model for tenant/features
 const _is_extended = extensibility ? ()=> cds.db.exists('cds.xt.Extensions') : ()=> false
-const _get_model4 = (tenant, features) => {
+const _get_model4 = async (tenant, features) => {
   const { 'cds.xt.ModelProviderService':mps } = cds.services
-  return mps.getCsn (tenant, features) .then (cds.compile.for.nodejs)
+  const csn = await mps.getCsn (tenant, features)
+  const nsn = cds.compile.for.nodejs(csn)
+  if (cds.edmxs) await cds.compile.to.edmx.files ( csn,
+    // adding tenant and features to runtime model, for later use when fetching generated files
+    nsn.tenant = tenant,
+    nsn.features = features.join()
+  )
+  return nsn
 }
 
 

package/lib/utils/cds-test.js

@@ -53,6 +53,7 @@ class Test extends require('./axios') {
 
     // launch cds server...
     before (async ()=>{
+      process.env.cds_test_temp = cds.utils.path.resolve(cds.root,'_out',''+process.pid)
       if (!args.includes('--port')) args.push('--port', '0')
       let { server, url } = await cds.exec(...args)
       this.server = server
@@ -66,6 +67,7 @@ class Test extends require('./axios') {
       // delete cds.services
       // delete cds.plugins
       // delete cds.env
+      return cds.utils.rimraf(process.env.cds_test_temp)
     })
 
     return this