@sap/cds 6.6.2 → 6.7.0

package/lib/env/cds-env.js

@@ -32,6 +32,11 @@ class Config {
     const { NODE_ENV, CDS_ENV } = process.env, profiles = []
     if (NODE_ENV) profiles.push (NODE_ENV)
     if (CDS_ENV) profiles.push (...CDS_ENV.split(/\s*,\s*/))
+    if (_home) try {
+      const { cds } = require(path.join(_home,'package.json'))
+      if (cds?.profiles) profiles.push(...cds.profiles)
+      if (cds?.profile) profiles.push(cds.profile)
+    } catch {/* ignore */}
     if (!profiles.includes('production')) profiles.push('development')
     this._profiles = new Set (profiles)
     this._profiles._defined = new Set()
@@ -127,8 +132,9 @@ class Config {
    * Retrieves the value for a config option, specified as a property path.
    */
   get (option) {
-    if (!option)  return
-    return option.split('.').reduce ((p,n)=> p && p[n], this)
+    if (!option) return
+    let path = option.includes('/') ? option.split('/') : option.split('.')
+    return path.reduce ((p,n)=> p && p[n], this)
   }
 
   get profiles() {
@@ -244,7 +250,7 @@ class Config {
   }
 
   _link_required_services () {
-    const { requires } = this; if (!requires) return
+    const { requires, _profiles } = this; if (!requires) return
     const kinds = requires.kinds || {}
     Object.defineProperty (requires, 'kinds', { value:kinds, enumerable:false }) // for cds env
     // Object.setPrototypeOf (requires, kinds)
@@ -254,27 +260,28 @@ class Config {
       if (!val || val._is_linked) return val
       if (val === true) {
         let x = kinds[key]
-        if (!x) return val
-        else val = x
+        if (x) val = x; else return val
       }
       if (typeof val === 'string') {
         let x = kinds[val] || kinds[val+'-'+key] || kinds[key+'-'+val]
-        if (!x) return val
-        else val = { kind: val }
+        if (x) val = {kind:val}; else return val
       }
-      const preset1 = kinds[key]
-      if (typeof preset1 === 'object' && preset1 !== val) {
-        const top = val, base = _merge ({},_linked(key,preset1)), {kind} = base
-        val = _merge (base, top, false, false)  // apply/override with top-level data
-        if (kind) val.kind = kind              // but inherited kind wins
+      let k = val.kind, p, preset = kinds[p=k] || kinds[p=k+'-'+key] || kinds[p=key+'-'+k]
+      if (!preset?.$root) {
+        const preset1 = kinds[key]
+        if (typeof preset1 === 'object' && preset1 !== val) {
+          const top = val, base = _merge ({},_linked(key,preset1)), {kind} = base
+          val = _merge (base, top, false, false)  // apply/override with top-level data
+          if (kind) val.kind = kind              // but inherited kind wins
+        }
       }
-      let k = val.kind, p, preset = k && kinds[p=k] || kinds[p=k+'-'+key] || kinds[p=key+'-'+k]
       if (typeof preset === 'object' && preset !== val) {
-        const top = val, base = _merge ({},_linked(p,preset)), {kind} = base
-        val = _merge (base, top, false, false)  // apply/override with top-level data
+        const top = val, base = _merge ({},_linked(p,preset), _profiles), {kind} = base
+        val = _merge (base, top, _profiles, false)  // apply/override with top-level data
         if (kind) val.kind = kind              // but inherited kind wins
       }
-      return Object.defineProperty (val, '_is_linked', {value:true})
+      if (typeof val === 'object') Object.defineProperty (val, '_is_linked', {value:true})
+      return val
     }
   }
 
@@ -435,7 +442,8 @@ function _merge (dst, src, _profiles, _cloned, _profiles_only = false) {
       const profile = p.slice(1,-1)
       if (_profiles._defined)  _profiles._defined.add (profile)
       if (_profiles.has(profile)) {
-        profiled.push ({ profile, merge: () => _merge (dst, src[p], _profiles, _cloned, false)})
+        let o = src[p]; if (typeof o === 'string') o = {kind:o}
+        profiled.push ({ profile, merge: () => _merge (dst, o, _profiles, _cloned, false)})
       }
       continue
     }

package/lib/env/cds-requires.js

@@ -2,16 +2,8 @@ const _runtime = '@sap/cds/libx/_runtime'
 
 exports = module.exports = {
 
-  middlewares: false,
-  "[middlewares]": {
-    middlewares: true
-  },
-
-  "[schevo]": {
-    db: { schema_evolution: 'auto' },
-  },
-
-  db: undefined,
+  middlewares: undefined,   "[middlewares]": { middlewares: true },
+  db: undefined,            "[schevo]": { db: { schema_evolution: 'auto' }, },
   messaging: undefined,
   multitenancy: undefined,
   extensibility: undefined,
@@ -127,19 +119,20 @@ const _databases = {
   "sql": {
     '[development]': { kind: 'sqlite', credentials: { url: ':memory:' } },
     '[production]': { kind: 'hana' },
-    '[better-sqlite]': { kind: 'better-sqlite' },
   },
-  "better-sqlite": _compat_to_use({
+  "better-sqlite": {
     credentials: { url: ":memory:" },
     impl: "@cap-js/sqlite",
-  }),
-  "sql-mt": {
+    kind: 'sqlite'
+  },
+  "sql-mt": { // For compatibility only
     '[development]': { kind: 'sqlite' },
     '[production]': { kind: 'hana-mt' },
   },
   "sqlite": _compat_to_use({
-    credentials: { url: 'db.sqlite' },
+    '[better-sqlite]': { impl: '@cap-js/sqlite' },
     impl: `${_runtime}/sqlite/Service.js`,
+    credentials: { url: 'db.sqlite' },
   }),
   "hana": _compat_to_use ({
     impl: `${_runtime}/hana/Service.js`,
@@ -246,37 +239,12 @@ const _platform_services = {
 
 }
 
-require = (id) => { // eslint-disable-line no-global-assign
-  try {
-    return module.require(id)
-  } catch(e) {
-    if (e.code !== 'MODULE_NOT_FOUND') throw e
-  }
-}
-
-// REVISIT: we should have a real modular plugin technique for cds.env
-const utils = require ('../utils/cds-utils')
-const _mtxs = !utils._oldMtx()
-  // eslint-disable-next-line cds/no-missing-dependencies
-  && require('@sap/cds-mtxs/lib/env-requires') || {
-  "toggles": {
-    model: "@sap/cds/srv/mtx"
-  },
-  "multitenancy": {
-    model: "@sap/cds/srv/mtx",
-    kind: "saas-registry",
-  },
-  "extensibility": {
-    model: "@sap/cds/srv/mtx",
-  },
-}
 
 exports.kinds = {
   ..._authentication_strategies,
   ..._databases,
   ..._services,
   ..._messaging,
-  ..._mtxs,
   ..._platform_services,
 }
 
@@ -285,3 +253,5 @@ function _compat_to_use(o) { return Object.defineProperties (o,{
   // NOTE: Property .use is for compatibility only -> use .dialect instead!
   use: { get(){ return this.dialect || this.kind }, configurable:true, enumerable:true },
 })}
+
+Object.defineProperty(exports,'_resolved',{value:exports._resolved,enumerable:false}) // hide it in outputs

package/lib/env/compat.js

@@ -89,4 +89,16 @@ module.exports = function (conf) {
       }
     }
   })
+
+  Object.defineProperties (conf.features, {
+    fiori_preview: {
+      get: ()=> _.fiori.preview,
+      set: (v) => { _.fiori.preview = v },
+    },
+    fiori_routes: {
+      get: ()=> _.fiori.routes,
+      set: (v) => { _.fiori.routes = v },
+    },
+  })
+
 }

package/lib/env/defaults.js

@@ -1,8 +1,7 @@
-const path = require('path')
-const [,major,minor] = /v(\d+)\.(\d+)/.exec(process.version)
 const production = process.env.NODE_ENV === 'production'
+const path = require('path')
 
-module.exports = {
+const defaults = module.exports = {
 
   requires: require('./cds-requires'),
 
@@ -13,10 +12,7 @@ module.exports = {
 
   features: {
     folders: 'fts/*', // where to find feature toggles -> switch on by default when released
-    cls: major > 12 || major == 12 && minor >= 18,
     live_reload: !production,
-    fiori_preview: !production,
-    fiori_routes: !production,
     in_memory_db: !production,
     test_data: !production,
     test_mocks: !production,
@@ -30,10 +26,20 @@ module.exports = {
     assert_integrity: false,
     cds_tx_protection: true,
     cds_tx_inheritance: true,
+  },
+
+  fiori: {
+    preview: !production,
+    routes: !production,
     lean_draft: false,
-    '[lean-draft]': {
-      lean_draft: true,
-    }
+    draft_compat: false,
+    '[better-sqlite]': { lean_draft: true },
+    '[lean-draft]': { lean_draft: true },
+    '[draft-compat]': { draft_compat: true },
+  },
+
+  ql: {
+    quirks_mode: true, // IMPORTANT: Remove that for cds7 !!
   },
 
   log: {
@@ -162,3 +168,5 @@ module.exports = {
   },
 
 }
+
+require('./plugins')(defaults)

package/lib/env/plugins.js

@@ -0,0 +1,29 @@
+// REVISIT: we should have a real modular plugin technique for cds.env
+module.exports = function add_mtx_env (env) {
+
+  const mtx_env = old_mtx_env() || require('@sap/cds-mtxs/env') // eslint-disable-line cds/no-missing-dependencies
+  if (mtx_env) {
+    const {requires} = env, {kinds} = requires
+    Object.assign (env, mtx_env, {requires})
+    Object.assign (requires, mtx_env.requires, {kinds})
+    Object.assign (kinds, mtx_env.requires?.kinds)
+  }
+
+  function require (id) {
+    try { return module.require(id) }
+    catch(e) { if (e.code !== 'MODULE_NOT_FOUND') throw e }
+  }
+
+  function old_mtx_env() {
+    const {_oldMtx} = require('../utils/cds-utils')
+    if (_oldMtx()) return {
+      requires: { kinds: {
+        "multitenancy": { model: "@sap/cds/srv/mtx", kind: "saas-registry" },
+        "extensibility": { model: "@sap/cds/srv/mtx" },
+        // "toggles": { model: "@sap/cds/srv/mtx" },
+      }
+    }
+  }}
+
+  return env
+}

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

@@ -5,6 +5,20 @@
   "type": "object",
   "additionalProperties": true,
   "properties": {
+    "[development]": { "type": "object" },
+    "[production]": { "type": "object" },
+    "[hybrid]": { "type": "object" },
+    "profile": {
+      "description": "A single static profile",
+      "anyOf": [
+        { "enum": [ "mtx-sidecar", "with-mtx-sidecar" ] },
+        { "type": "string" }
+      ]
+    },
+    "profiles": {
+      "description": "An array of profiles",
+      "type": "array", "items": { "$ref": "#/properties/profile" }
+    },
     "folders": {
       "type": "object",
       "description": "Only set folders if you don't want to use the defaults 'app/', 'db/', 'srv/'.",

package/lib/index.js

@@ -77,6 +77,9 @@ const cds = module.exports = extend (new facade) .with ({
   User: require ('./req/user'),
   ql: lazy => require ('./ql/cds-ql'),
   tx: (..._) => (cds.db || cds.Service.prototype) .tx (..._),
+  inferred: lazy => require('@cap-js/sqlite/lib/ql/cds.infer'), // eslint-disable-line cds/no-missing-dependencies
+  cqn2sql: lazy => require('@cap-js/sqlite/lib/db/sql/cqn2sql'), // eslint-disable-line cds/no-missing-dependencies
+  cqn4sql: lazy => require('@cap-js/sqlite/lib/db/sql/cqn4sql'), // eslint-disable-line cds/no-missing-dependencies
   /** @type Service */ db: undefined,
 
   // Protocols and Periphery

package/lib/log/cds-log.js

@@ -65,9 +65,12 @@ 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
  */
-exports.debug = function cds_debug (module) {
-  const L = this.log (module)
-  if (L._debug) return L.debug
+exports.debug = function cds_debug (id, options) {
+  const L = cds_log (id, options)
+  if (L._debug) return Object.assign(L.debug, {
+    time:    label => console.time    (`[${id}] - ${label}`),
+    timeEnd: label => console.timeEnd (`[${id}] - ${label}`),
+  })
 }
 
 
@@ -87,7 +90,7 @@ exports.Logger = (label, level) => {
   const fmt = (level,args) => logger.format (label,level,...args)
   const logger = {
     format: exports.format, // use logger.format as this could be changed dynamically
-    trace:  level < TRACE ? ()=>{} : (...args) => console.trace (...fmt(TRACE,args)),
+    trace:  level < DEBUG ? ()=>{} : (...args) => console.trace (...fmt(TRACE,args)),
     debug:  level < DEBUG ? ()=>{} : (...args) => console.debug (...fmt(DEBUG,args)),
     log:    level < INFO  ? ()=>{} : (...args) => console.log (...fmt(INFO,args)),
     info:   level < INFO  ? ()=>{} : (...args) => console.info (...fmt(INFO,args)),

package/lib/ql/CREATE.js

@@ -10,7 +10,7 @@ module.exports = class Query extends require('./Query') {
     if (elements)
       this.CREATE.entity = { elements: elements, kind: 'entity', name:e }
     else
-      this.CREATE.entity = e && e.elements ? e : this._target_name4(e)
+      this.CREATE.entity = e && e.elements ? e : this._target4(e)
     return this
   }
 

package/lib/ql/DELETE.js

@@ -9,7 +9,7 @@ module.exports = class Query extends Whereable {
   }
 
   from(entity, key) {
-    this.DELETE.from = this._target_name4 (...arguments) // supporting tts
+    this.DELETE.from = this._target4 (...arguments) // supporting tts
     if (key) this.byKey(key)
     return this
   }

package/lib/ql/DROP.js

@@ -7,17 +7,17 @@ module.exports = class Query extends require('./Query') {
     })
   }
   entity(e) {
-    this.DROP.entity = this._target_name4 (e)
+    this.DROP.entity = this._target4 (e)
     return this
   }
   table(e) {
     const {DROP} = this
-    DROP.entity = DROP.table = this._target_name4 (e)
+    DROP.entity = DROP.table = this._target4 (e)
     return this
   }
   view(e) {
     const {DROP} = this
-    DROP.entity = DROP.view = this._target_name4 (e)
+    DROP.entity = DROP.view = this._target4 (e)
     return this
   }
 }

package/lib/ql/INSERT.js

@@ -7,7 +7,7 @@ module.exports = class Query extends require('./Query') {
   }
 
   into (entity, ...data) {
-    this[this.cmd].into = this._target_name4 (...arguments) // supporting tts
+    this[this.cmd].into = this._target4 (...arguments) // supporting tts
     if (data.length) this.entries(...data)
     return this
   }

package/lib/ql/Query.js

@@ -52,12 +52,6 @@ class Query {
     || this._expected `${{target}} to be an entity path string, a CSN definition, a {ref}, a {SELECT}, or a {SET}`
   }
 
-  //> REVISIT: should we rather have consistent .from/.entity/.into in CQN?
-  _target_name4 (...args) {
-    const {ref, as} = this._target_ref4 (...args)
-    return ref.length === 1 && typeof ref[0] === 'string' && !as ? ref[0] : as ? {ref, as} : {ref}
-  }
-
   _expected (...args) {
     return cds.error.expected (...args)
   }
@@ -72,8 +66,15 @@ class Query {
     return `${cmd} ${_name(this._target.name)} `
   }
 
+  forSQL (db = cds.db || cds) { return _flat(db.cqn4sql(this)) }
+  toSQL  (db = cds.db || cds) { return _2sql(db.cqn2sql(this)) }
+  toSql  (db = cds.db || cds) { return this.toSQL(db).sql }
+
 }
 
+// skip .cqn property when in repl
+const _2sql = cds.repl ? ({sql,values}) => ({sql,values}) : (x => x)
+const _flat = Query.prototype.flat
 
 const _target4 = (target, arg2) =>  target && (
   typeof target === 'string' ? { name: target } :
@@ -85,5 +86,12 @@ const _target4 = (target, arg2) =>  target && (
 
 const _name = cds.env.sql.names === 'quoted' ? n =>`"${n}"` : n => n.replace(/[.:]/g,'_')
 
+Object.defineProperty (Query.prototype, '_target4', { value: (
+  cds.env.ql.quirks_mode === false ? Query.prototype._target_ref4
+  : function (...args) {
+    const {ref, as} = this._target_ref4 (...args)
+    return ref.length === 1 && typeof ref[0] === 'string' && !as ? ref[0] : as ? {ref, as} : {ref}
+  }
+)})
 
 module.exports = Query

package/lib/ql/SELECT.js

@@ -104,8 +104,14 @@ module.exports = class Query extends Whereable {
     return this._where (args,'and','on')
   }
 
-  having(...x) {
-    return this._where (x,'and','having')
+  having(...args) {
+    return this._where (args,'and','having')
+  }
+
+  search (...args) {
+    let _xpr=[]; for (let val of args) _xpr.push('or',{val})
+    this.SELECT.search = _xpr.slice(1)
+    return this
   }
 
   groupBy (...args) {

package/lib/ql/UPDATE.js

@@ -10,7 +10,7 @@ module.exports = class Query extends Whereable {
   }
 
   entity (e, key) {
-    this.UPDATE.entity = this._target_name4 (...arguments) // supporting tts
+    this.UPDATE.entity = this._target4 (...arguments) // supporting tts
     if (key) this.byKey(key)
     return this
   }

package/lib/ql/Whereable.js

@@ -18,7 +18,7 @@ class Query extends require('./Query') {
         error (`Invalid attempt to call '${this.cmd}.${and_or}()' before a prior call to '${this.cmd}.where()'`)
       )
       if (clause === 'on') _ = _.from
-      let left = Reflect.getOwnPropertyDescriptor(_,clause)?.value
+      let left = _[clause]
       if (!left) { //> .where() called first time
         // SELECT.from `X` .where `x or y` .and `z` -> SELECT from X where (x or y) and z
         if (pred.includes('or')) this._left_has_or = true

package/lib/ql/cds-ql.js

@@ -9,7 +9,7 @@ require = path => { // eslint-disable-line no-global-assign
   }, api)
 }
 
-module.exports = Object.assign (_deprecated_srv_ql, { cdr: true,
+module.exports = {
   Query, clone: (q,_) => Query.prototype.clone.call(q,_),
   SELECT: require('./SELECT'),
   INSERT: require('./INSERT'),
@@ -18,14 +18,6 @@ module.exports = Object.assign (_deprecated_srv_ql, { cdr: true,
   DELETE: require('./DELETE'),
   CREATE: require('./CREATE'),
   DROP: require('./DROP'),
-})
-
-function _deprecated_srv_ql() { // eslint-disable-next-line no-console
-  console.trace(`
-    Method 'srv.ql(req)' is deprecated and superceded by 'cds.context'.
-    Please use global SELECT instead of 'const { SELECT } = srv.ql(req)'.
-  `)
-  return module.exports
 }
 
 module.exports._reset = ()=>{ // for strange tests only

package/lib/req/cds-context.js

@@ -15,12 +15,9 @@ module.exports = new class extends AsyncLocalStorage {
 
   /** @returns {EventContext} */
   _for (cds,v) {
-    Reflect.defineProperty (cds,'context', { enumerable:1, ... cds.env.features.cls ? {
+    Reflect.defineProperty (cds,'context', { enumerable:1, ... {
       set:(v) => this.enterWith(v),
       get:()=> this.getStore(),
-    } : {
-      get:()=> undefined,
-      set:()=> {},
     }})
     return cds.context = v // IMPORTANT: we need to set it initially, to get it all wired up correctly
   }

package/lib/req/request.js

@@ -1,4 +1,5 @@
 const { Responses, Errors } = require('./response')
+const cds = require('../../lib')
 
 /**
  * Class Request represents requests received via synchronous protocols.
@@ -56,6 +57,67 @@ class Request extends require('./event') {
     return this._set ('data', {})
   }
 
+  set subject(d) { if (d) super.subject = d }
+  get subject() {
+    const q = this.query
+    let subject = (
+      q?.SELECT?.from ||
+      q?.INSERT?.into ||
+      q?.UPSERT?.into ||
+      q?.UPDATE?.entity ||
+      q?.DELETE?.from
+    )
+
+    const {target} = this; if (!target) return undefined
+
+    // programmatic action calls as of now only in format /Books(201)/action
+    if (!subject) {
+      let where = []
+      for (const param of this.params) {
+        if (typeof param === 'object') {
+          for (const key in param) {
+            if (key in target.keys) {
+              if (where.length > 1) where.push('and')
+              where.push({ ref: [key] }, '=', { val: param[key] })
+            }
+          }
+        } else {
+          where.push({ ref: [Object.keys(target.keys)[0]] }, '=', { val: param })
+        }
+      }
+      subject = { id: target.name, where }
+    }
+
+    const ref = subject.ref || [ subject ]
+
+    if(!target.drafts || cds.env.fiori.lean_draft) return super.subject = { ref }
+
+    // special handling for old draft logic
+    let subjectRef = []
+    ref.forEach ((item, i) => {
+      // to one assoc & comp
+      if (typeof item === 'string') {
+        subjectRef.push(item)
+        return
+      }
+
+      // create key value pair without IsActiveEntity & adjust root target
+      const keys = {}
+      let id = item.id
+      for (let j = 0; j < item?.where?.length; j = j + 4) {
+        const key = item.where[j].ref[0]
+        const value = item.where[j + 2].val
+        if (key !== 'IsActiveEntity') keys[key] = value
+        else if (i === 0 && key === 'IsActiveEntity' && value === false) id = item.id + '_drafts'
+      }
+
+      // create copy
+      const {SELECT:{from:{ref}}} = SELECT.from(id,keys)
+      subjectRef.push(...ref)      
+    })
+    return super.subject = {ref: subjectRef}
+  }
+
   reply  (results) { return this.results = results }
   notify (...args) { return this._messages.add (1, ...args) }
   info   (...args) { return this._messages.add (2, ...args) }
@@ -116,8 +178,7 @@ const SQL2Crud = {
 }
 
 const Query2Crud = (q) => {
-  if (typeof q === 'string') return SQL2Crud[q] || /^\s*(\w+)/i.test(q) && SQL2Crud[RegExp.$1.toUpperCase()] || q
-  else for (let each in q) if (each in SQL2Crud) return SQL2Crud[each]
+  for (let each in q) if (each in SQL2Crud) return SQL2Crud[each]
 }
 
 const _path4 = (x,p) => {

package/lib/req/response.js

@@ -4,8 +4,9 @@ const cds = require ('../index')
  * Messages Collector, used for `req.errors` and `req.messages`
  */
 class Responses extends Array {
-  static get (severity, code, message, target, args) {
-   let e // be filled in below...
+  static get (severity, code, message, target, args, ...more) {
+    if (code?.raw) [ message, code ] = [ String.raw (code, message, target, args, ...more) ]
+    let e // be filled in below...
     if (typeof code === 'object') e = code; else {
       if (typeof code === 'number') e = { code }; else [ code, message, target, args, e ] = [ undefined, code, message, target, {} ]
       if (typeof message === 'object') e = Object.assign(message,e); else {