@sap/cds 8.9.4 → 9.0.2

package/lib/env/cds-requires.js

@@ -8,6 +8,7 @@ exports = module.exports = {
   multitenancy: undefined,
   extensibility: undefined,
   toggles: undefined,
+  queue: true,
 
   auth: {
     '[development]': { kind: 'mocked-auth' },
@@ -113,17 +114,6 @@ 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 = {
 
@@ -134,35 +124,15 @@ const _databases = {
   },
 
   "sqlite": {
-    '[legacy-sqlite!]': { impl: legacy_sqlite },
-    '[better-sqlite!]': { impl: better_sqlite },
-    impl: _resolve (better_sqlite, legacy_sqlite),
-    credentials: { url: 'db.sqlite' },
-  },
-  "better-sqlite": {
-    credentials: { url: ":memory:" },
-    impl: "@cap-js/sqlite",
-    kind: 'sqlite'
-  },
-  "legacy-sqlite": {
-    impl: legacy_sqlite,
+    impl: '@cap-js/sqlite',
     credentials: { url: 'db.sqlite' },
-    kind: 'sqlite'
   },
-
   "hana": {
-    '[legacy-hana]': { impl: legacy_hana },
-    '[better-hana]': { impl: better_hana },
-    impl: _resolve (better_hana, legacy_hana),
+    impl: '@cap-js/hana',
   },
   "hana-cloud": {
     kind: 'hana', "deploy-format": "hdbtable",
   },
-  "legacy-hana": {
-    impl: legacy_hana,
-    kind: 'hana'
-  },
-
   "sql-mt": { // For compatibility only
     '[development]': { kind: 'sqlite' },
     '[production]': { kind: 'hana-mt' },
@@ -176,19 +146,22 @@ const _databases = {
 }
 
 
-const _outbox = {
-
-  outbox: "persistent-outbox",
-
-  "in-memory-outbox": {},
-  "persistent-outbox": {
+const _queue = {
+  queue: "persistent-queue",
+  "in-memory-queue": {},
+  "persistent-queue": {
     model: "@sap/cds/srv/outbox",
     maxAttempts: 20,
-    chunkSize: 100,
+    chunkSize: 10,
     parallel: true,
-    storeLastError: true
-  }
-
+    storeLastError: true,
+    timeout: '1h',
+    legacyLocking: true,
+    ignoredContext: ['user', 'http', 'model', 'timestamp']
+  },
+  // legacy
+  "in-memory-outbox": "in-memory-queue",
+  "persistent-outbox": "persistent-queue",
 }
 
 
@@ -216,7 +189,7 @@ const _messaging = {
   "file-based-messaging": {
     impl: `${_runtime}/messaging/file-based.js`,
     file:'~/.cds-msg-box',
-    outbox: true
+    outboxed: true
   },
   "enterprise-messaging": {
     kind: "enterprise-messaging-http",
@@ -228,21 +201,21 @@ const _messaging = {
     deployForProvider: true,
     impl: `${_runtime}/messaging/enterprise-messaging.js`,
     vcap: { label: "enterprise-messaging" },
-    outbox: true
+    outboxed: true
   },
   "enterprise-messaging-amqp": {
     impl: `${_runtime}/messaging/enterprise-messaging-shared.js`,
     vcap: { label: "enterprise-messaging" },
-    outbox: true
+    outboxed: true
   },
   'message-queuing': {
     impl: `${_runtime}/messaging/message-queuing.js`,
-    outbox: true
+    outboxed: true
   },
   'kafka': {
     impl: `${_runtime}/messaging/kafka.js`,
     topic: 'cds.default',
-    outbox: true,
+    outboxed: true,
     local: false
   },
   "composite-messaging": {
@@ -257,7 +230,7 @@ const _messaging = {
   "redis-messaging": {
     impl: `${_runtime}/messaging/redis-messaging.js`,
     vcap: { label: "redis-cache" },
-    outbox: true
+    outboxed: true
   }
 
 }
@@ -292,7 +265,7 @@ exports.kinds = {
   ..._authentication_strategies,
   ..._databases,
   ..._services,
-  ..._outbox,
+  ..._queue,
   ..._messaging,
   ..._platform_services,
 }

package/lib/env/defaults.js

@@ -1,6 +1,6 @@
 const production = process.env.NODE_ENV === 'production'
 
-const defaults = module.exports = {
+module.exports = {
 
   /**
    * For our own tests to replace hard-coded checks for CDS_ENV === 'better-sqlite'
@@ -13,34 +13,19 @@ const defaults = module.exports = {
     else return false
   },
 
-  "[attic!]": {
-    features: {
-      pre_compile_edmxs: false,
-      odata_new_adapter: false,
-      odata_new_parser: false,
-      base64_binaries: true
-    },
-    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'),
 
+  runtime: {
+    patch_as_upsert: false,
+    put_as_upsert: true,
+    put_as_replace: false,
+  },
+
   server: {
     shutdown_on_uncaught_errors: true,
+    exit_on_multi_install: true,
     force_exit_timeout: 1111,
     body_parser: undefined, // Allows to configure all body parser options, e.g. limit
     cors:  !production, // CORS middleware is off in production
@@ -51,7 +36,6 @@ const defaults = module.exports = {
   protocols: {
     'odata-v4' : { path: '/odata/v4' },
     'odata-v2' : { path: '/odata/v2' },
-    'okra' : { path: '/okra' },
     'rest' : { path: '/rest' },
     'hcql' : { path: '/hcql' },
   },
@@ -60,9 +44,6 @@ const defaults = module.exports = {
     folders: 'fts/*', // where to find feature toggles -> switch on by default when released
     sql_simple_queries: 0,
     pre_compile_edmxs: false,
-    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,
@@ -75,6 +56,7 @@ const defaults = module.exports = {
     assert_integrity: false,
     precise_timestamps: false,
     ieee754compatible: undefined,
+    consistent_params: true, //> remove with cds^10
     // compat for db
     get string_decimals() { return this.ieee754compatible }
   },
@@ -85,9 +67,7 @@ const defaults = module.exports = {
     lean_draft: true,
     wrap_multiple_errors: true,
     draft_lock_timeout: true,
-    draft_deletion_timeout: true,
-    draft_compat: undefined,
-    '[draft-compat]': { draft_compat: true },
+    draft_deletion_timeout: true
   },
 
   ql: {
@@ -149,8 +129,6 @@ const defaults = module.exports = {
       'zh_HK',
       'zh_TW'
     ],
-    /** @deprecated */ for_sqlite: ['de', 'fr'],
-    /** @deprecated */ for_sql: ['de', 'fr'],
     /** @deprecated */ fallback_bundle: '',
     /** @deprecated */ fatjson: true, // REVISIT: remove in cds9
   },
@@ -211,6 +189,11 @@ const defaults = module.exports = {
     'deploy-format': 'hdbtable',
     journal:  {
       'change-mode': 'alter'
+    },
+    table_data: {
+      column_mapping: {
+        LargeBinary: 'decodeBase64'
+      }
     }
   },
 
@@ -221,16 +204,6 @@ const defaults = module.exports = {
     }
   },
 
-  mtx: {
-    api: {
-      model: true,
-      provisioning: true,
-      metadata: true,
-      diagnose: true
-    },
-    domain: '__default__'
-  },
-
   cdsc: {
     moduleLookupDirectories: ['node_modules/'],
     '[java]': {
@@ -252,5 +225,3 @@ const defaults = module.exports = {
   },
 
 }
-
-require('./plugins')(defaults)

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

@@ -19,7 +19,7 @@ module.exports = {
     cds: {
       type: 'object',
       additionalProperties: true,
-      $ref: 'cdsJsonSchema://schemas/cds-rc.json#/$defs/cdsRoot',
+      $ref: 'cdsjsonschema://schemas/cds-rc.json#/$defs/cdsRoot',
       description: 'CDS configuration root',
       default: {}
     }

package/lib/i18n/index.js

@@ -61,3 +61,4 @@ const _is_model = x => typeof x === 'object' && '$sources' in x
 const _is_string = x => typeof x === 'string'
 
 module.exports = exports = new I18nFacade
+exports.locale = require('./locale')

package/lib/i18n/locale.js

@@ -0,0 +1,41 @@
+exports = module.exports = normalized_locale_from
+exports.from = normalized_locale_from
+exports.header = raw_locale_from
+
+const cds = require('../index'), {i18n} = cds.env
+// REVISIT: remove fallback with cds^10
+const _default = cds.env.features.locale_fallback ? i18n.default_language : undefined
+
+function normalized_locale_from (req) {
+  if (!req) return _default
+  if ('locale' in req) return req.locale
+  const header = raw_locale_from (req); if (!header) return req.locale = _default
+  const locale = header .match (/^[^,; ]*/)[0] .replace (/-/g,'_')
+  return req.locale = COMMON[locale]
+  || locale.match(/[A-Za-z]+/)?.[0].toLowerCase()
+  || i18n.default_language // wildcard or invalid header, fall back to default
+}
+
+function raw_locale_from (req) {
+  return !req ? undefined :
+  req.query['sap-locale'] || SAP_LANGUAGES[req.query['sap-language']] ||
+  req.headers['x-sap-request-language'] ||
+  req.headers['accept-language']
+}
+
+const SAP_LANGUAGES = {
+  '1Q': 'en_US_x_saptrc',
+  '2Q': 'en_US_x_sappsd',
+  '3Q': 'en_US_x_saprigi'
+}
+
+const COMMON = {
+  ...Object.fromEntries (i18n.preserved_locales.map(l=>[l.toUpperCase(),l])), // REVISIT: why uppercase?
+  ...Object.fromEntries (i18n.preserved_locales.map(l=>[l,l])),
+  en_US_x_saptrc: 'en_US_saptrc',
+  en_US_x_sappsd: 'en_US_sappsd',
+  en_US_x_saprigi: 'en_US_saprigi',
+  // Gain a tiny bit of lookup speed by listing some common locales
+  de:'de', en:'en', es:'es', fr:'fr', in:'in', it:'it',
+  ja:'ja', ko:'ko', pt:'pt', ru:'ru', zh:'zh',
+}

package/lib/index.js

@@ -1,11 +1,24 @@
 if (process.env.CDS_STRICT_NODE_VERSION !== 'false') require ('./utils/check-version.js')
-! (global.__cds_loaded_from ??= new Set).add(__filename) // track from where we loaded cds
+! (global.__cds_loaded_from ??= new Set).add(__filename.toLowerCase()) // track from where we loaded cds, lowercase to avoid path duplicates on Windows
+
+const { AsyncLocalStorage } = require ('async_hooks')
+const context = new AsyncLocalStorage
 
 const { EventEmitter } = require('node:events')
-const cds = module.exports = global.cds = new class cds extends EventEmitter {
+const cds = module.exports = global.cds = new class cds_facade extends EventEmitter {
+
+  /** Contexts and Transactions @type {import('./req/context')} */
+  get context()  { return context.getStore() }
+  set context(x) { this._with(x) }
+  _with (x,fn,...args) {
+    const ctx = typeof x !== 'object' || x instanceof cds.EventContext ? x : x.context || cds.EventContext.for(x)
+    return fn ? context.run (ctx,fn,...args) : context.enterWith (ctx)
+  }
+  get spawn() { return super.spawn = require('./req/spawn') }
 
-  /** @typedef {import('./srv/cds.ServiceProvider')} Service */
-  /** @type {import('./core/linked-csn')} */ model = undefined
+  /** @import {LinkedCSN} from './core/linked-csn' */
+  /** @import {Service} from './srv/cds.Service' */
+  /** @type LinkedCSN */ model = undefined
   /** @type Service */ db = undefined
   /** CLI args */ cli = { command:'', options:{}, argv:[] }
   /** Working dir */ root = process.cwd()
@@ -22,7 +35,7 @@ const cds = module.exports = global.cds = new class cds extends EventEmitter {
   get requires() { return super.requires = this.env.requires._resolved() }
   get plugins()  { return super.plugins = require('./plugins').activate() }
   get version()  { return super.version = require('../package.json').version }
-  get env()      { return super.env = require('./env/cds-env').for('cds',this.root) }
+  get env()      { return super.env = require('./env/cds-env').for(this) }
   get home()     { return super.home = __dirname.slice(0,-4) }
   get schema()   { return super.schema = require('./env/schemas') } // REVISIT: Better move that to cds-dk?
 
@@ -64,15 +77,17 @@ const cds = module.exports = global.cds = new class cds extends EventEmitter {
   get server() { return super.server = require('../server.js') }
   get serve() { return super.serve = require('./srv/cds-serve') }
   get connect() { return super.connect = require('./srv/cds-connect') }
-  get outboxed() { return super.outboxed = require('../libx/outbox').outboxed }
-  get unboxed() { return super.unboxed = require('../libx/outbox').unboxed }
+  get outboxed() { return this.queued }
+  get unboxed() { return this.unqueued }
+  get queued() { return super.queued = require('../libx/queue').queued }
+  get unqueued() { return super.unqueued = require('../libx/queue').unqueued }
   get middlewares() { return super.middlewares = require('./srv/middlewares') }
   get odata() { return super.odata = require('../libx/odata') }
   get auth() { return super.auth = require('./auth') }
   shutdown() { this.app?.server && process.exit() } // is overridden in bin/serve.js
 
   // Core Services API
-  get Service() { return super.Service = require('./srv/cds.ServiceProvider') }
+  get Service() { return super.Service = require('./srv/cds.Service') }
   get EventContext() { return super.EventContext = require('./req/context') }
   get Request() { return super.Request = require('./req/request') }
   get Event() { return super.Event = require('./req/event') }
@@ -82,15 +97,9 @@ const cds = module.exports = global.cds = new class cds extends EventEmitter {
   // Services, Protocols and Periphery
   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 DatabaseService() { return super.DatabaseService = require('@cap-js/db-service').DatabaseService }
   get RemoteService() { return super.RemoteService = require('../libx/_runtime/remote/Service.js') }
 
-  /** Contexts and Transactions @type {import('./req/context')} */
-  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') }
@@ -104,6 +113,7 @@ const cds = module.exports = global.cds = new class cds extends EventEmitter {
   get infer(){ return super.infer = require('./ql/cds.ql-infer.js') }
   get txs()  { return super.txs = new this.Service('cds.tx') }
   get ql()   { return super.ql = require('./ql/cds-ql') }
+  // get tx() { return super.tx = this.Service.prototype.tx.bind (new this.Service) } // Note: this would break too much of existing code/tests
   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(..._) }

package/lib/log/cds-error.js

@@ -22,11 +22,11 @@ const { format, inspect } = require('../utils/cds-utils')
  * @param {Function} [caller] - The function calling this
  */
 const error = exports = module.exports = function cds_error ( status, message, details, caller ) {
-  if (typeof status !== 'number') [ status, message, details, caller, status ] = status.raw ? [ undefined, error.message(...arguments) ] : [ undefined, status, message, details ]
+  if (typeof status !== 'number') [ status, message, details, caller ] = status.raw ? [ undefined, error.message(...arguments) ] : [ undefined, status, message, details ]
   if (typeof message === 'object') [ message, details, caller ] = [ undefined, message, details ]
-  const err = details?.stack ? details : Object.assign (new Error (message, details), details)
+  let err = details && 'stack' in details ? details : Object.assign (new Error (message, details), details)
   if (caller) Error.captureStackTrace (err, caller); else Error.captureStackTrace (err, error)
-  if (status) err.status = status
+  if (status) Object.defineProperty (err, 'status', {value:status})
   if (new.target) return err
   else throw err
 }
@@ -62,6 +62,15 @@ exports.expected = ([,type], arg) => {
 }
 
 
+exports.isSystemError = err => err.name in {
+  TypeError:1,
+  ReferenceError:1,
+  SyntaxError:1,
+  RangeError:1,
+  URIError:1,
+}
+
+
 //
 // Private helpers ...
 //

package/lib/log/cds-log.js

@@ -1,6 +1,6 @@
-const cds = require('../index'), conf = cds.env.log
 const log = module.exports = exports = cds_log
-const path = require('path')
+const cds = require('../index'), defaults = { format: 'plain', levels: {} }
+let conf = Object.hasOwn(cds,'env') ? cds.env.log : defaults
 /* eslint-disable no-console */
 
 
@@ -68,6 +68,7 @@ function cds_log (module, options) { // NOSONAR
 /**
  * Shortcut to `cds.log(...).debug`, returning undefined if `cds.log(...)._debug` is false.
  * @param {string} [module] the module for which a logger is requested
+ * @param {object} [options] logger options
  */
 exports.debug = function cds_debug (id, options) {
   const L = cds_log (id, options)
@@ -136,18 +137,9 @@ exports.winstonLogger = (options) => (label, level) => {
 /**
  * Built-in formatters
  */
- const { _simple, _mt } = exports.formatters = {
-  _simple: (label, level, ...args) => [ `[${label}] -`, ...args ],
-  _mt: (label, level, ...args) => {
-    const t = cds.context?.tenant; if (t) label += '|'+t
-    return _simple (label, level, ...args)
-  },
-  get plain() {
-    return this._plain || (this._plain = cds.requires.multitenancy ? _mt : _simple)
-  },
-  get json() {
-    return this._json || (this._json = require('./format/json'))
-  }
+ exports.formatters = new class {
+  plain (label, level, ...args) { return [ `[${label}] -`, ...args ] }
+  get json() { return super.json = require('./format/json') }
 }
 
 
@@ -162,7 +154,7 @@ exports.winstonLogger = (options) => (label, level) => {
  * @param {number} level the log level to enable -> 0=off, 1=error, 2=warn, 3=info, 4=debug, 5=trace
  * @param {any[]} args  the arguments passed to Logger.debug|log|info|warn|error()
  */
-exports.format = log.formatters[cds.env.log.format || 'plain']
+exports.format = log.formatters[conf.format || 'plain']
 
 
 const DEBUG_matches = (m) => process.env.DEBUG?.match(RegExp(`\\b(y|all|${m||'any'})\\b`))
@@ -171,9 +163,42 @@ const { ERROR, WARN, INFO, DEBUG, TRACE } = exports.levels = {
 }
 
 
-;(function _init() {
-  const conf = cds.env.log
+// If cds.env is not yet loaded, update the loggers when it is
+if (conf === defaults) cds.once ('env', ()=>{
+  let { loggers, format } = exports, fmt = format
+  let { plain } = log.formatters
+  conf = cds.env.log
+
+  // Update log levels for already existing loggers
+  if (conf.levels) {
+    for (let each in conf.levels) cds_log (each, conf.levels[each])
+  }
+
+  // User configured formatter, if any
+  if (conf.format) {
+    fmt = exports.format = log.formatters [conf.format]
+  }
+
+  // Include tenant in plain log output if multitenancy is enabled
+  if (fmt === plain && cds.env.requires.multitenancy) {
+    fmt = exports.format = (label, level, ...args) => {
+      const t = cds.context?.tenant; if (t) label += '|'+t
+      return plain (label, level, ...args)
+    }
+  }
+
+  // If formatter got changed above, propagate to all loggers
+  if (fmt !== format) {
+    for (let each in loggers) loggers[each] .setFormat (fmt)
+  }
+
+  _init()
+}); else _init()
+
+
+function _init() {
   if (conf.Logger) {
+    const path = require('path')
     let resolvedPath
     try { resolvedPath = require.resolve(conf.Logger) } catch {
       try { resolvedPath = require.resolve(path.join(cds.root, conf.Logger)) } catch {
@@ -186,4 +211,4 @@ const { ERROR, WARN, INFO, DEBUG, TRACE } = exports.levels = {
     const {app} = cds, serveIn = app => require('./service').serveIn(app)
     app ? setImmediate(() => serveIn(app)) : cds.on('bootstrap', app => serveIn(app))
   }
-})()
+}

package/lib/log/format/aspects/als.js

@@ -1,20 +1,7 @@
 const cds = require('../../..')
 
-let _kibana_custom_fields_deprecation_logged = false
-const _get_als_custom_fields = () => {
-  const { als_custom_fields, kibana_custom_fields } = cds.env.log
-  if (kibana_custom_fields) {
-    if (!_kibana_custom_fields_deprecation_logged) {
-      _kibana_custom_fields_deprecation_logged = true
-      cds.utils.deprecated({ old: 'cds.env.log.kibana_custom_fields', use: 'cds.env.log.als_custom_fields' })
-    }
-    return kibana_custom_fields
-  }
-  return als_custom_fields
-}
-
 function als_aspect(module, level, args, toLog) {
-  this._ALS_CUSTOM_FIELDS ??= { ..._get_als_custom_fields() }
+  this._ALS_CUSTOM_FIELDS ??= { ...cds.env.log.als_custom_fields }
   this._ALS_HAS_CUSTOM_FIELDS ??= Object.keys(this._ALS_CUSTOM_FIELDS).length > 0
 
   // ALS custom fields
@@ -31,6 +18,6 @@ function als_aspect(module, level, args, toLog) {
   }
 }
 
-als_aspect.cf = () => Object.keys({ ..._get_als_custom_fields() })
+als_aspect.cf = () => Object.keys({ ...cds.env.log.als_custom_fields })
 
 module.exports = process.env.VCAP_SERVICES?.match(/"label":\s*"application-logs"/) ? als_aspect : () => {}

package/lib/plugins.js

@@ -1,27 +1,28 @@
+const DEBUG = /plugins/.test(process.env.DEBUG) ? console : undefined // eslint-disable-line no-console
 const cds = require('.')
 const prio_plugins = {
-  '@cap-js/telemetry': true // to allow better instrumentation.
+  '@sap/cds-mtxs': true,    // plugins may register handlers for mtxs services
+  '@cap-js/telemetry': true // to allow better instrumentation
 }
 
-exports.require = require
-
 /**
  * Fetch cds-plugins from project's package dependencies.
  * Used in and made available through cds.env.plugins.
  */
 exports.fetch = function (DEV = process.env.NODE_ENV !== 'production') {
+  DEBUG?.time ('[cds.plugins] - fetched plugins in')
   const plugins = {}
   fetch_plugins_in (cds.home, false)
   fetch_plugins_in (cds.root, DEV)
   function fetch_plugins_in (root, dev) {
-    let pkg; try { pkg = exports.require(root + '/package.json') } catch { return }
+    let pkg; try { pkg = require(root + '/package.json') } catch { return }
     let deps = { ...pkg.dependencies, ...dev && pkg.devDependencies }
     for (let each in deps) try {
-      let impl = exports.require.resolve(each + '/cds-plugin', { paths: [root] })
-      const packageJson = exports.require.resolve(each + '/package.json', { paths: [root] })
-      plugins[each] = { impl, packageJson }
+      let impl = require.resolve(each + '/cds-plugin', { paths: [root] })
+      plugins[each] = { impl }
     } catch { /* no cds-plugin.js */ }
   }
+  DEBUG?.timeEnd ('[cds.plugins] - fetched plugins in')
   return plugins
 }
 
@@ -30,11 +31,10 @@ exports.fetch = function (DEV = process.env.NODE_ENV !== 'production') {
  * Used in and made available through cds.plugins.
  */
 exports.activate = async function () {
-  const DEBUG = cds.debug ('plugins', {label:'cds'})
-  DEBUG?.time ('[cds] - loaded plugins in')
+  DEBUG?.time ('[cds.plugins] - loaded plugins in')
   const { plugins } = cds.env, { local } = cds.utils
   const loadPlugin = async ([plugin, conf]) => {
-    DEBUG?.(`loading plugin ${plugin}:`, { impl: local(conf.impl) })
+    DEBUG?.log(`[cds.plugins] - loading ${plugin}:`, { impl: local(conf.impl) })
     const p = cds.utils._import (conf.impl)
     if (p.activate) {
       cds.log('plugins').warn(`WARNING: \n
@@ -48,6 +48,6 @@ exports.activate = async function () {
   const all = Object.entries(plugins)
   await Promise.all (all .filter(([name]) =>  prio_plugins[name]) .map (loadPlugin))
   await Promise.all (all .filter(([name]) => !prio_plugins[name]) .map (loadPlugin))
-  DEBUG?.timeEnd ('[cds] - loaded plugins in')
+  DEBUG?.timeEnd ('[cds.plugins] - loaded plugins in')
   return plugins
 }

package/lib/ql/CREATE.js

@@ -23,7 +23,7 @@ class CREATE extends Query {
     return this
   }
 
-  get _target_ref(){ return this.CREATE.entity }
+  get _subject(){ return this.CREATE.entity }
 }
 
 /** @type CREATE.API & (...entries:[]) => CREATE */

package/lib/ql/DELETE.js

@@ -19,7 +19,7 @@ class DELETE extends Whereable {
     return super.valueOf('DELETE FROM')
   }
 
-  get _target_ref(){ return this.DELETE.from }
+  get _subject(){ return this.DELETE.from }
 }
 
 /** @type DELETE.API & (...entries:[]) => DELETE */

package/lib/ql/DROP.js

@@ -26,7 +26,7 @@ class DROP extends Query {
     return this
   }
 
-  get _target_ref(){ return this.DROP.entity }
+  get _subject(){ return this.DROP.entity }
 }
 
 /** @type DROP.API & (...entries:[]) => DROP */