@sap/cds 7.9.4 → 8.0.4

package/lib/compile/to/json.js

@@ -15,7 +15,7 @@ module.exports = (csn,o={}) => {
       // Note: This has moved to cds.compile.for.java meanwhile, but is kept
       // here for compatibility, at least temporarily.
       return {...v, _where: JSON.stringify (cds.parse.xpr(v.where)) }
-    } catch(e){/* ignored */}
+    } catch {/* ignored */}
 
     else if (v.kind === "service" && !v['@source'] && v.$location?.file) {
       // Preserve original sources for services so we can use them for finding

package/lib/compile/to/sql.js

@@ -16,12 +16,15 @@ function cds_compile_to_sql (csn,_o) {
   return sql
 }
 
-
 function cds_compile_to_hdbtable (csn,o) {
   const all = cdsc.to.hdi (cds.minify(csn),o)
   return _2many(all)
 }
 
+function cds_compile_to_hana(csn, o, beforeCsn) {
+  return require('./hana')(cds.minify(csn), o, beforeCsn)
+} 
+
 function cds_compile_to_deltaSql (csn, o, beforeCsn) {
   const options = cdsc._options.for.sql(o)
   if (typeof beforeCsn === 'string') beforeCsn = JSON.parse(beforeCsn)
@@ -53,6 +56,7 @@ function* _2many (all,_file=f=>f) {
 module.exports = Object.assign (cds_compile_to_sql, {
   hdbcds: cds_compile_to_hdbcds,
   hdbtable: cds_compile_to_hdbtable,
+  hana: cds_compile_to_hana,
   delta: cds_compile_to_deltaSql,
   sqlite: { keywords: sqliteKeywords },
   postgres: { keywords: postgresKeywords },

package/lib/compile/to/yaml.js

@@ -1,6 +1,6 @@
 // A simple YAML serializer
 module.exports = function _2yaml (object, {limit=111}={}) {
-  return $(object,'',1).toString().replace(/^\n/,'')
+  return $(object,'',1)?.toString().replace(/^\n/,'')
   function $(o, indent, count, _visited) {
     if (o == null) return o
     if (o.toJSON) o = o.toJSON()
@@ -11,7 +11,7 @@ module.exports = function _2yaml (object, {limit=111}={}) {
     }
     if (typeof o === 'object') {
       const visited = new Set (_visited)
-      if (visited.has(o)) return console.error('circular reference to',o)
+      if (visited.has(o)) return console.error('circular reference to',o) // eslint-disable-line no-console
       else visited.add(o)
       let s = ''
       for (let k in o) {
@@ -31,7 +31,7 @@ module.exports = function _2yaml (object, {limit=111}={}) {
       let s = o.trim()
       return !s || /^[\^@#:,=!<>*|]/.test(s)  ? '"'+ o.replace(/\\/g,'\\\\') +'"'  :  s
     }
-    if (typeof o === 'function') return ''
+    if (typeof o === 'function') return
     else return o
   }
 }

package/lib/dbs/cds-deploy.js

@@ -6,10 +6,12 @@ const TRACE = cds.debug('trace')
 
 /** Fluent API: cds.deploy(model).to(db) */
 const deploy = module.exports = function cds_deploy (model, options, csvs) {
+
   return { async to (/** @type {import('../../lib/srv/srv-api')} */ db, o = options||{}) {
+    /* eslint-disable no-console */
 
     // prepare logging
-    const [ GREY, RESET ] = !!process.stdout.isTTY && !!process.stderr.isTTY && !process.env.NO_COLOR ? ['\x1b[2m', '\x1b[0m' ] : ['','']
+    const [ GREY, RESET ] = process.stdout.isTTY && !process.env.NO_COLOR || process.env.FORCE_COLOR ? ['\x1b[2m', '\x1b[0m' ] : ['','']
     const LOG = !o.silent && !o.dry && cds.log('deploy')._info ? console.log : undefined
 
     // prepare model
@@ -290,7 +292,7 @@ deploy.resources = async function (csn, opts) {
           }
           const e = _entity4(f,csn); if (!e || e['@cds.persistence.skip'] === true) continue
           if (cds.env.features.deploy_data_onconflict === 'replace' && !/[._]texts_/.test(f)) {
-            const seenBefore = Object.entries(found).find(([_, entity]) => entity === e.name )
+            const seenBefore = Object.entries(found).find(([,entity]) => entity === e.name )
             if (seenBefore) {
               DEBUG?.(`Conflict for '${e.name}': replacing '${local(seenBefore[0])}' with '${local(path.join(subdir,fx))}'`)
               continue

package/lib/env/cds-env.js

@@ -91,13 +91,6 @@ 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
-    }
   }
 
   /**
@@ -227,7 +220,7 @@ class Config {
     if (val) try {
       // CDS_CONFIG={ /* json */}
       config = JSON.parse (val)
-    } catch (e) {
+    } catch {
       // CDS_CONFIG=/path/to/config.json *OR* CDS_CONFIG=/path/to/config/dir
       if (typeof val === "string") {
         // Load from JSON file or directory; No profile support!
@@ -391,13 +384,16 @@ class Config {
       _fetch ({ type: conf.dialect || conf.kind })
 
     function _fetch (predicate) {
+      const filters = []
       for (let k in predicate) {
         const v = predicate[k]; if (!v) continue
         const filter = k === 'tag' ? e => _array(e,'tags').includes(v) : e => e[k] === v
-        for (let stype in vcaps) {
-          const found = _array(vcaps,stype) .find (filter)
-          if (found)  return found
-        }
+        filters.push(filter)
+      }
+      if (filters.length === 0)  return false
+      for (let stype in vcaps) {
+        const found = _array(vcaps,stype).find(e => filters.every(f => f(e)))
+        if (found)  return found
       }
     }
 
@@ -491,8 +487,8 @@ function _merge (dst, src, _profiles) {
 }
 
 function _value4 (val) {
-  if (val && val[0] === '{') try { return JSON.parse(val) } catch(e) {/* ignored */}
-  if (val && val[0] === '[') try { return JSON.parse(val) } catch(e) {/* ignored */}
+  if (val && val[0] === '{') try { return JSON.parse(val) } catch {/* ignored */}
+  if (val && val[0] === '[') try { return JSON.parse(val) } catch {/* ignored */}
   if (val === 'true')  return true
   if (val === 'false')  return false
   if (!isNaN(val))  return parseFloat(val)

package/lib/env/cds-requires.js

@@ -2,7 +2,7 @@ const _runtime = '@sap/cds/libx/_runtime'
 
 exports = module.exports = {
 
-  middlewares: true,
+  middlewares: true, // REVISIT: odata-v2-adapter uses this
   db: undefined,            "[schevo]": { db: { schema_evolution: 'auto' }, },
   messaging: undefined,
   multitenancy: undefined,
@@ -23,8 +23,7 @@ exports = module.exports = {
     const dict = Object.create (this)
     for (let [name,e] of Object.entries (this)) if (e.service) {
       if (e.service in dict && !e.override && e.service !== name) {
-        console.error (`Datasource name '${e.service}' conflicts with 'service' definition referred to in 'cds.requires.${name}':`, e) // eslint-disable-line no-console
-        throw new Error (`Datasource name '${e.service}' conflicts with service definition`)
+        throw new Error (`Datasource name '${e.service}' conflicts with service definition, referred to in 'cds.requires.${name}'`)
       }
       else dict[e.service] = { ...e, name }
     }
@@ -33,8 +32,8 @@ exports = module.exports = {
 }
 
 
-const admin = [ 'cds.Subscriber', 'admin' ]
-const builder = [ 'cds.ExtensionDeveloper', 'cds.UIFlexDeveloper' ]
+const admin = [ 'admin' ]
+const builder = [ 'cds.ExtensionDeveloper' ]
 const _authentication_strategies = {
 
   "basic-auth": {
@@ -81,6 +80,7 @@ const _authentication_strategies = {
 
 for (let each of Object.values(_authentication_strategies)) {
   Object.defineProperty (each, 'strategy', {get() {
+    // eslint-disable-next-line no-console
     if (process.env.NODE_ENV !== 'production') console.trace('WARNING: auth.strategy is deprecated, use auth.kind instead')
     return { jwt: 'JWT', mocked: 'mock' }[this.kind] || this.kind
   }})
@@ -116,6 +116,17 @@ const _services = {
 
 }
 
+const better_sqlite = '@cap-js/sqlite'
+const better_hana = '@cap-js/hana'
+
+const legacy_sqlite = `${_runtime}/sqlite/Service.js`
+const legacy_hana = `${_runtime}/hana/Service.js`
+
+const _resolve = (preferred, fallback) => {
+  try { return require.resolve(preferred) && preferred }
+  catch { return fallback }
+}
+
 
 const _databases = {
 
@@ -125,9 +136,9 @@ const _databases = {
   },
 
   "sqlite": {
-    '[legacy-sqlite]': { impl: `${_runtime}/sqlite/Service.js` },
-    '[better-sqlite]': { impl: '@cap-js/sqlite' },
-    impl: `${_runtime}/sqlite/Service.js`,
+    '[legacy-sqlite!]': { impl: legacy_sqlite },
+    '[better-sqlite!]': { impl: better_sqlite },
+    impl: _resolve (better_sqlite, legacy_sqlite),
     credentials: { url: 'db.sqlite' },
   },
   "better-sqlite": {
@@ -136,21 +147,21 @@ const _databases = {
     kind: 'sqlite'
   },
   "legacy-sqlite": {
-    impl: `${_runtime}/sqlite/Service.js`,
+    impl: legacy_sqlite,
     credentials: { url: 'db.sqlite' },
     kind: 'sqlite'
   },
 
   "hana": {
-    '[legacy-hana]': { impl: `${_runtime}/hana/Service.js` },
-    '[better-hana]': { impl: '@cap-js/hana' },
-    impl: `${_runtime}/hana/Service.js`,
+    '[legacy-hana]': { impl: legacy_hana },
+    '[better-hana]': { impl: better_hana },
+    impl: _resolve (better_hana, legacy_hana),
   },
   "hana-cloud": {
     kind: 'hana', "deploy-format": "hdbtable",
   },
   "legacy-hana": {
-    impl: `${_runtime}/hana/Service.js`,
+    impl: legacy_hana,
     kind: 'hana'
   },
 
@@ -222,6 +233,7 @@ const _messaging = {
   },
   "event-broker": {
     impl: `${_runtime}/messaging/event-broker.js`,
+    format: 'cloudevents',
     vcap: {
       label: "eventmesh-sap2sap-internal"
     }
@@ -268,6 +280,11 @@ const _platform_services = {
       label: 'destination'
     }
   },
+  connectivity: {
+    vcap: {
+      label: 'connectivity'
+    }
+  },
 
   approuter: undefined,
 

package/lib/env/defaults.js

@@ -2,12 +2,46 @@ const production = process.env.NODE_ENV === 'production'
 
 const defaults = module.exports = {
 
+  /**
+   * For our own tests to replace hard-coded checks for CDS_ENV === 'better-sqlite'
+   * which don't work anymore with cds8 where that is the default.
+   */
+  get _better_sqlite() {
+    if (process.env.CDS_ENV === 'better-sqlite') return true
+    let conf = this.requires.db || this.requires.kinds.sql
+    if (conf?.impl === '@cap-js/sqlite') return true
+    else return false
+  },
+
+  "[attic!]": {
+    features: {
+      pre_compile_edmxs: false,
+      odata_new_adapter: false,
+      odata_new_parser: false,
+    },
+    requires: {
+      kinds: {
+        sqlite: { impl: '@sap/cds/libx/_runtime/sqlite/Service.js' },
+        hana: { impl: '@sap/cds/libx/_runtime/hana/Service.js' },
+      },
+    },
+  },
+
+  "[noa]": {
+    features: {
+      odata_new_adapter: true,
+      odata_new_parser: true,
+    },
+  },
+
   production,
 
   requires: require('./cds-requires'),
 
   server: {
     force_exit_timeout: 1111,
+    cors:  !production, // CORS middleware is off in production
+    index: !production, // index page is off in production
     port: 4004,
   },
 
@@ -20,8 +54,11 @@ const defaults = module.exports = {
 
   features: {
     folders: 'fts/*', // where to find feature toggles -> switch on by default when released
+    sql_simple_queries: 0,
     pre_compile_edmxs: false,
-    odata_new_adapter: false, // switch default with cds^8
+    odata_new_adapter: true,
+    odata_new_parser: true,
+    get cds_validate() { return this.odata_new_adapter },
     live_reload: !production,
     in_memory_db: !production,
     test_data: !production,
@@ -31,31 +68,26 @@ const defaults = module.exports = {
     // skip_unused: 'all',
     skip_unused: true,
     deploy_data_onconflict: 'insert',
-    one_model: true,
     localized: true,
     assert_integrity: false,
-    cds_tx_inheritance: true,
-    serve_on_root: false,
     precise_timestamps: false,
-    string_decimals: false, // switch default with cds^8
+    ieee754compatible: undefined,
+    // compat for db
+    get string_decimals() { return this.ieee754compatible }
   },
 
   fiori: {
     preview: !production,
     routes: !production,
     lean_draft: true,
-    wrap_multiple_errors: true, // switch default with cds^8
+    wrap_multiple_errors: true,
     draft_lock_timeout: true,
-    draft_deletion_timeout: false, // switch default with cds^8
+    draft_deletion_timeout: true,
     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 cds^7 !!
   },
 
   log: {
@@ -152,13 +184,11 @@ const defaults = module.exports = {
      * - `false` → always skipped.
      * - `true` → never skipped.
      */
-    transitive_localized_views: true,
-    '[java]': {
-      transitive_localized_views: false
-    },
-    native_hana_associations: true,
+    transitive_localized_views: undefined,
+    native_hana_associations: undefined,
     names: 'plain', // or 'quoted', or 'hdbcds'
     dialect: 'sqlite' // or 'plain' or 'hana'
+    // dialect: undefined, // or 'sqlite', 'hana', 'postgres', 'h2', ...
   },
 
   hana: {

package/lib/env/plugins.js

@@ -1,7 +1,7 @@
 // REVISIT: we should have a real modular plugin technique for cds.env
 module.exports = function add_mtx_env (env) {
 
-  const mtx_env = require('@sap/cds-mtxs/env') // eslint-disable-line cds/no-missing-dependencies
+  const mtx_env = require('@sap/cds-mtxs/env')
   if (mtx_env) {
     const {requires} = env, {kinds} = requires
     Object.assign (env, mtx_env, {requires})

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

@@ -261,10 +261,6 @@ module.exports = {
                 }
               ]
             },
-            middlewares: {
-              type: 'boolean',
-              description: 'Enables new middlewares support (experimental).'
-            },
             multitenancy: {
               oneOf: [
                 {
@@ -760,6 +756,14 @@ module.exports = {
                 description: 'Number of fields to be added at most.',
                 minimum: 1
               },
+              'fields': {
+                type: 'array',
+                description: 'Fields that are allowed to be extended.',
+                uniqueItems: true,
+                items: {
+                  type: 'string'
+                }
+              },
               'new-entities': {
                 type: 'integer',
                 description: 'Number of entities to be added at most',

package/lib/env/schemas/index.js

@@ -1,12 +1,12 @@
 const { join } = require('path')
 
 module.exports = new class {
-    async default4(name) {
-        const file = join(__dirname, name.replace(/\.\w+$/, ''))
-        try {
-            return structuredClone(require(file))
-        } catch (err) {
-            throw new Error(`ENOENT: Could not load schema '${name}' from ${file}`)
-        }
+  async default4(name) {
+    const file = join(__dirname, name.replace(/\.\w+$/, ''))
+    try {
+      return structuredClone(require(file))
+    } catch {
+      throw new Error(`ENOENT: Could not load schema '${name}' from ${file}`)
     }
+  }
 }

package/lib/env/serviceBindings.js

@@ -25,7 +25,7 @@ const DEFAULT_META_DATA_PROPERTIES = { type: true, provider: true }
 function parseJsonSafe(str) {
   try {
     return JSON.parse(str)
-  } catch (error) {
+  } catch {
     return undefined
   }
 }

package/lib/index.js

@@ -1,7 +1,6 @@
 if (process.env.CDS_STRICT_NODE_VERSION !== 'false') require ('./utils/check-version')
 !(global.__cds_loaded_from ??= new Set).add(__filename) // track from where we loaded cds
 
-/** @typedef { import('../apis/linked.js').LinkedCSN } Linked */
 /** @typedef { import('./srv/srv-api') } Service */
 
 const { EventEmitter } = require('node:events')
@@ -45,6 +44,7 @@ const cds = module.exports = global.cds = new class cds extends EventEmitter {
   get linked()      { return super.linked = require('./linked/models') }
   get infer()       { return super.infer = require('./ql/infer') }
   get builtin()     { return super.builtin = require('./linked/types') }
+  get validate()    { return super.validate = require('./linked/validate') }
   get Association() { return super.Association = this.builtin.classes.Association }
   get Composition() { return super.Composition = this.builtin.classes.Composition }
   get entity()      { return super.entity = this.builtin.classes.entity }
@@ -84,16 +84,16 @@ const cds = module.exports = global.cds = new class cds extends EventEmitter {
   get DatabaseService() { return super.DatabaseService = require('../libx/_runtime/db/Service.js') }
   get RemoteService() { return super.RemoteService = require('../libx/_runtime/remote/Service.js') }
 
-  // Contexts and Transactions
-  get _context() { return super._context = require('./req/cds-context') }
-  get context()  { return this._context._for(this) }
-  set context(_) { this._context._for(this,_) }
+  /** Contexts and Transactions @type {import('./req/context.js')} */
+  get context()  { return this._context.getStore() }
+  set context(x) { this._context.enterWith(x) }
   get spawn()    { return super.spawn = this._context.spawn }
+  get _context() { return super._context = require('./req/cds-context') }
 
   // Helpers
   get utils() { return super.utils = require('./utils/cds-utils') }
   get error() { return super.error = require('./log/cds-error') }
-  get exec() { return super.exec = require('../bin/cds-serve') }
+  get exec() { return super.exec = require('../bin/serve').exec }
   get test() { return super.test = require('./utils/cds-test') }
   get log() { return super.log = require('./log/cds-log') }
   get debug() { return super.debug = this.log.debug }
@@ -108,7 +108,6 @@ const cds = module.exports = global.cds = new class cds extends EventEmitter {
   tx         (..._) { return (this.db || this.txs).tx(..._) }
   run        (..._) { return (this.db || typeof _[0] === 'function' && this.txs || this.error._no_primary_db).run(..._) }
   foreach    (..._) { return (this.db || this.error._no_primary_db).foreach(..._) }
-  stream     (..._) { return (this.db || this.error._no_primary_db).stream(..._) }
   read       (..._) { return (this.db || this.error._no_primary_db).read(..._) }
   create     (..._) { return (this.db || this.error._no_primary_db).create(..._) }
   insert     (..._) { return (this.db || this.error._no_primary_db).insert(..._) }
@@ -119,7 +118,6 @@ const cds = module.exports = global.cds = new class cds extends EventEmitter {
 
   // legacy and to be moved stuff -> hidden for tools in cds.__proto__
   /** @deprecated */ transaction (..._) { return (this.db||this.error._no_primary_db).transaction(..._) }
-  /** @deprecated */ get build() { return super.build = this.error._outdated_dk }
   /** @deprecated */ get in() { return super.in = cwd => !cwd ? this : {__proto__:this, cwd, env: this.env.for('cds',cwd) } }
 }
 
@@ -137,8 +135,12 @@ extend (global) .with (class {
   static get CXL() { return cds.parse.CXL }
 })
 
-// install jest util if jest is defined
-if (process.env.CDS_JEST_MEM_FIX && typeof jest !== 'undefined') require('./utils/jest.js')
+// ensure cds.test is loaded for running tests w/ node --test
+'describe' in global || ['describe','before','beforeAll','afterAll'].forEach (p => {
+  Object.defineProperty (global,p, { configurable:1, set(v){Object.defineProperty(global,p,{value:v})},
+    get(){ return cds.test, global[p] }
+  })
+})
 
 // Allow for import cds from '@sap/cds' without esModuleInterop
 // FIXME: remove this flag in the next release. Only serves as fallback switch if people report issues with value:cds

package/lib/lazy.js

@@ -42,7 +42,7 @@ const lazify_module = (module) => {
   extend(module).with({ set exports(all) {
     extend(module).with({ exports: lazify(all) })
   }})
-  return (id) => (lazy) => module.require(id)
+  return (id) => (lazy) => module.require(id) // eslint-disable-line no-unused-vars
 }
 
 const is_lazy = (x) => typeof x === 'function' && /^(function\s?)?\(?lazy[,)\t =]/.test(x)

package/lib/linked/classes.js

@@ -7,7 +7,7 @@ class any { is (kind) { return this.kind === kind || kind === 'any' }
   set name(n) { this.set('name', n, false) }
   set kind(k) { this.set('kind', k, true) }
   get kind() { return this.set('kind', this.parent ? 'element' : 'type') }
-  valueOf() { return this.name || this }
+  toString(){ return !this.type ? this : this.type.startsWith('cds.') ? this.type.slice(4) : this.type }
 
   own (property, ifAbsent) {
     const pd = Reflect.getOwnPropertyDescriptor (this, property)
@@ -40,8 +40,14 @@ class type extends any { is(kind) { return kind === 'type' || super.is(kind) }
     class boolean extends scalar {}
       class Boolean extends boolean {}
 
-    class string extends scalar {}
-      class UUID extends string {}
+    class string extends scalar {
+      toString(){
+        return this.length ? `${super.toString()}(${this.length})` : super.toString()
+      }
+    }
+      class UUID extends string {
+        toString(){ return 'UUID' }
+      }
       class String extends string {}
         class LargeString extends String {}
       class Binary extends string {}
@@ -56,7 +62,11 @@ class type extends any { is(kind) { return kind === 'type' || super.is(kind) }
         class Int64 extends Integer {}
       class Float extends number {}
         class Double extends Float {}
-        class Decimal extends Float {}
+        class Decimal extends Float {
+          toString(){
+            return this.precision ? this.scale ? `Decimal(${this.precision},${this.scale})` : `Decimal(${this.precision})` : 'Decimal'
+          }
+        }
 
     class date extends scalar {}
       class Date extends date {}
@@ -64,8 +74,17 @@ class type extends any { is(kind) { return kind === 'type' || super.is(kind) }
       class DateTime extends date {}
         class Timestamp extends DateTime {}
 
-  class array extends type { is(kind) { return kind === 'array' || super.is(kind) }}
-  class struct extends type { is(kind) { return kind === 'struct' || super.is(kind) }
+  class array extends type {
+    toString(){ return 'array of ' + this.items.toString() }
+    is(kind) { return kind === 'array' || super.is(kind) }
+  }
+  class struct extends type {
+    toString(){
+      const elements = []
+      for (let each in this.elements) elements.push(each)
+      return `{ ${elements.join(', ')} }`
+    }
+    is(kind) { return kind === 'struct' || super.is(kind) }
 
     /**
      * Gets the foreign key data for a given managed association from inbound data
@@ -167,11 +186,20 @@ class LinkedDefinitions {
   *[Symbol.iterator](){ for (let e in this) yield this[e] }
   forEach(f){ let i=0; for (let k in this) f(this[k],i++,this) }
   filter(f){ let i=0, r=[]; for (let k in this) f(this[k],i++,this) && r.push(this[k]); return r }
+  find(f){ for (let k in this) if (f(this[k])) return this[k] }
   map(f){ let i=0, r=[]; for (let k in this) r.push(f(this[k],i++,this)); return r }
   some(f){ for (let k in this) if (f(this[k])) return true }
-  find(f){ for (let k in this) if (f(this[k])) return this[k] }
+  every(f){ for (let k in this) if (!f(this[k])) return false }
 }
 
+// Protect LinkedDefinitions methods from erroneously being used as linked definitions/elements
+Object.entries(Object.getOwnPropertyDescriptors(LinkedDefinitions.prototype)).forEach(([p,pd]) => p === 'constructor' || Object.defineProperties(pd.value, {
+  own: {get(){ throw new Error(`'${p}' is not a linked definition but a method inherited from LinkedDefinitions`) }},
+  name: {get(){ throw new Error(`'${p}' is not a linked definition but a method inherited from LinkedDefinitions`) }},
+  kind: {get(){ throw new Error(`'${p}' is not a linked definition but a method inherited from LinkedDefinitions`) }},
+  type: {get(){ throw new Error(`'${p}' is not a linked definition but a method inherited from LinkedDefinitions`) }},
+  _type: {get(){ throw new Error(`'${p}' is not a linked definition but a method inherited from LinkedDefinitions`) }},
+}))
 
 module.exports = {
 
@@ -179,7 +207,7 @@ module.exports = {
 
   any, type, aspect, struct, array,
   scalar, boolean, string, number, date,
-  service, event, action,
+  service, event, action, function: action,
   context,
 
   UUID, Boolean, String,

package/lib/linked/entities.js

@@ -32,15 +32,6 @@ class entity extends struct {
     return derived[kind] = any
   }
 
-  get drafts() {
-    if (cds.env.fiori.lean_draft) return null
-    // Remove this getter when old draft is removed
-    return this.own('_drafts') || this.set('_drafts', this.elements?.HasDraftEntity && {
-      name: this.name + '_drafts', keys: this.keys,
-      toString(){ return this.name.replace(/\./g,'_') }
-    })
-  }
-
   toJSON() {
     return this.own('query') ? {...this} : super.toJSON(this)
   }
@@ -67,7 +58,8 @@ class Association extends type {
     for (const k of keys) {
       const el = k.ref.reduce((target,n)=> target.elements[n], this._target)
       const as = k.as || k.ref.at(-1)
-      foreignKeys[as] = Object.create (el, { name:{value:as} }) //, parent:{value:this} })
+      foreignKeys[as] = Object.create (el, { name:{value:as}, notNull: {value:true} }) //, parent:{value:this} })
+      // For structures, foreign keys must be provided, (autogenerated) UUIDs are skipped for validation
       // REVISIT: We should change the line above to set parent correctly, as in the commented tail part.
       // But that breaks code in _runtime which expects it to be the wrong parent.
     }

package/lib/linked/models.js

@@ -5,8 +5,9 @@ const _kinds = {
   context:1,
   service:1,
   entity:1,
+  event:1,
   action:1,
-  event:1
+  function:1,
 }