@sap/cds-dk 10.1.2 → 10.2.1

package/node_modules/@sap/cds/lib/compile/resolve.js

@@ -45,8 +45,10 @@ resolve.options = function (options) {
 
 
 resolve.all = function (o) {
-  
-  const _required = env => Object.values(env.requires) .map (r => r.model) .filter(x=>x) .flat()
+
+  const _required = env => Object.values(env.requires)
+    .filter (r => r.model && (r.model_kind === undefined || r.model_kind === 'cds'))
+    .map (r => r.model) .flat()
   const env = o.env || cds.env
 
   // resolve(...,false) => return cds.env.roots + all required models
@@ -55,7 +57,7 @@ resolve.all = function (o) {
   // return cached prior result, if any
   const {cached} = o; if ('*' in cached) return cached['*']
   else cached['*'] = [] // important to avoid endless recursion on '*'
-  
+
   // resolve all roots, plus all cds.required.models (unless csn.json already there)
   const files = resolve.many (env.roots,o) || []
   const is_csn_json = files.length === 1 && files[0].endsWith('csn.json')
@@ -72,8 +74,8 @@ resolve.many = function (models, o) {
 }
 
 
-resolve.single = function (model,o) { 
-  
+resolve.single = function (model,o) {
+
   if (!model || model === '--') return
   if (model == '*') return resolve.all(o)
 
@@ -115,10 +117,10 @@ resolve.single = function (model,o) {
 
 resolve.folder = function (folder) {
   const files = fs.readdirSync(folder), all=[], unique={}
-  for (let f of files) if (f.endsWith('.csn')) {
+  for (let f of files) if (f.endsWith('.csn') && !is_dir(path.join(folder,f))) {
     all.push (unique[f.slice(0,-4)] = path.join(folder,f))
   }
-  for (let f of files) if (f.endsWith('.cds')) {
+  for (let f of files) if (f.endsWith('.cds') && !is_dir(path.join(folder,f))) {
     unique[f.slice(0,-4)] || all.push (path.join(folder,f))
   }
   return all
@@ -132,7 +134,7 @@ resolve.nested = function (pattern,o) {
 
   // fetch all subdirectories matching the pattern
   const folder = pattern.slice(0,-2), dir = path.resolve (o.root, folder)
-  try { var nested = fs.readdirSync(dir) .filter (d => is_dir(path.join(dir,d))) .map (d => path.join(folder,d,path.sep)) } 
+  try { var nested = fs.readdirSync(dir) .filter (d => is_dir(path.join(dir,d))) .map (d => path.join(folder,d,path.sep)) }
   catch(e) { if (e.code === 'ENOENT') return cached[pattern] = null }
 
   // don't resolve, if resolve(...,false)
@@ -145,17 +147,17 @@ resolve.nested = function (pattern,o) {
 
 
 resolve.module = function (module_name, o = resolve.options()) {
-  try { return _resolve (module_name,o) } 
+  try { return _resolve (module_name,o) }
   catch { return null }
 }
 
 
 exports.suffixes = [ // always .csn before .cds to prefer compiled files
-  '.csn', 
-  '.cds', 
-  path.sep+'index.csn', 
-  path.sep+'index.cds', 
-  path.sep+'csn.json' 
+  '.csn',
+  '.cds',
+  path.sep+'index.csn',
+  path.sep+'index.cds',
+  path.sep+'csn.json'
 ]
 exports.cache = {}
 

package/node_modules/@sap/cds/lib/core/classes.js

@@ -173,6 +173,7 @@ class service extends context {
     return dict
   }
 
+  get endpoints()  { return this.set('endpoints',  service.endpoints4(this)) }
   get protocols()  { return this.set('protocols',  service.protocols.for(this)) }
   static get protocols() { return this._lazy ('protocols', require('../srv/protocols')) }
   static get bindings() { return this._lazy ('bindings', require('../srv/bindings')) }

package/node_modules/@sap/cds/lib/dbs/cds-deploy.js

@@ -308,7 +308,7 @@ deploy.prepare = async function (csn, srces) {
  */
 deploy.resources = async function (csn,o) {
 
-  const { fs, isdir, isfile } = cds.utils, ts = process.env.CDS_TYPESCRIPT
+  const { fs, isdir, isfile } = cds.utils
   const subfolders = ['data','csv']
   const filetypes = ['.csv','.json','.yaml']
   const found={}, neighborhood = new Set
@@ -322,7 +322,7 @@ deploy.resources = async function (csn,o) {
   }
 
   // fetching csvs in db/data and test/data
-  let d = cds.env.requires.db?.data || (
+  let d = cds.requires.db?.data || (
     // REVISIT: fallback for some very special cds build and mtxs tests with mocked cds.env?
     o?.testdata ? ['db/data','test/data'] : ['db/data']
   )
@@ -330,7 +330,7 @@ deploy.resources = async function (csn,o) {
 
   // fetching init.js files in models' neighborhood ...
   for (let folder of neighborhood) {
-    const init_js = ts && isfile(folder,'init.ts') || isfile(folder,'init.js')
+    const init_js = isfile(folder,'init.js') || isfile(folder,'init.ts')
     if (init_js) found[init_js] = '*'
   }
   return found
@@ -374,8 +374,7 @@ deploy.include_external_entities_in = function (csn) {
 
 /** Exclude external entities from the given model */
 deploy.exclude_external_entities_in = function (csn) {
-  // IMPORTANT to use cds.env.requires below, not cds.requires !!
-  for (let [each,{service=each,credentials}] of Object.entries (cds.env.requires)) {
+  for (let [each,{service=each,credentials}] of Object.entries (cds.requires)) {
     if (!csn.definitions[service]?.['@cds.external']) continue
     if (!credentials && csn._mocked) continue //> not for mocked unbound services
       DEBUG?.('excluding external entities for', service, '...')

package/node_modules/@sap/cds/lib/env/cds-env.js

@@ -19,7 +19,6 @@ class Config {
     let cwd = _cwd || this._home || cds?.root || process.cwd()
     DEBUG?.('[cds.env] - loading config for', {context,cwd})
     let env = new Config (context, cwd, _defaults)
-    cds?.emit?.('env',env)
     return env
   }
 
@@ -27,21 +26,15 @@ class Config {
    * Only used internally, i.e. through cds.env.for(<context>)
    */
   constructor (_context, _home, _defaults=true) {
-    Object.assign (this, { _context, _home, _sources:[] })
 
     // Capture stack trace to report cds.env usage before cds.test()
-    if (global.test) Error.captureStackTrace(this,Config.prototype.for)
+    if (global.test) Error.captureStackTrace (this, Config.prototype.for)
 
     // Determine profiles from NODE_ENV + CDS_ENV
-    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) _add_static_profiles (_home, profiles);
-    if (_home && this['project-nature'] === 'java') profiles.push('java')
-    if (!profiles.includes('production')) profiles.push('development')
-    this._profiles = new Set (profiles)
-    this._profiles._defined = new Set
-    this._profiles._important = []
+    this._context = _context
+    this._home = _home
+    this._sources = []
+    this._profiles = new Profiles (this)
 
     // Set compat requires default values
     if (_context === 'cds' && _defaults)  this.add (DEFAULTS, defaults)
@@ -55,22 +48,28 @@ class Config {
       if (_defaults) {
         for (let {impl} of Object.values(this.plugins)) {
           const _plugin = path.dirname(impl)
-          this.#import (_plugin,'.cdsrc.yaml', { load: _readYaml })
+          this.#import (_plugin,'.cdsrc.yaml')
           this.#import (_plugin,'.cdsrc.json')
           this.#import (_plugin,'.cdsrc.js')
           this.#import (_plugin,'package.json', { get: p => p.cds })
         }
       }
       const user_ = process.env.CDS_USER_HOME || require('os').homedir()
+      this.#import (user_,'.cdsrc.yaml')
       this.#import (user_,'.cdsrc.json')
       this.#import (user_,'.cdsrc.js')
-      this.#import (_home,'.cdsrc.yaml', { load: _readYaml })
+      this.#import (_home,'.cdsrc.yaml')
       this.#import (_home,'.cdsrc.json')
       this.#import (_home,'.cdsrc.js')
       this.#import (_home,'package.json', { get: _ext_package_json })
+      this.#import (_home,'cap.yaml')
       this.#import (_home,'.cdsrc-private.json')
     }
 
+    if (this.features?.cap_yaml && this.subroot) for (let each in this.folders) {
+      this.folders[each] = this.subroot +'/'+ this.folders[each]
+    }
+
     // Apply important (!) profiles from config sources
     for (let each of this._profiles._important) each()
     delete this._profiles._important
@@ -113,12 +112,14 @@ class Config {
 
 
   #import (dir, file, etc) {
+    if (file === 'cap.yaml' && !this.features?.cap_yaml) return
     let conf = this.load (dir, file, etc)
     if (conf) this.add (conf)
   }
 
 
-  load (dir, file, { load=_readJson, get = x => x.cds||x } = {}) {
+  load (dir, file, { load, get = x => x.cds||x } = {}) {
+    load ??= file.endsWith('.yaml') ? _readYaml : _readJson
     file = path.join (dir, file)
     DEBUG?.('[cds.env] - checking', {file})
     let cont = load(file); if (!cont) return
@@ -137,12 +138,17 @@ class Config {
   add (conf, /*from:*/ _src, profiles = this._profiles) {
     if (!conf)  return this
     if (_src)  this._sources.push (_src)
-    const reqs = conf.requires
-    if (reqs) { // normalize requires.x = kind to requires.x = {kind}
-      for (let each in reqs) {
-        if (typeof reqs[each] === 'string') reqs[each] = {kind:conf.requires[each]}
+    !function _expand_requires_shortcuts (conf) {
+      // We need to expand cds.requires.foo = <string> shortcuts before merging below.
+      // When doing so, we need to deep-recurse into profile sections and nested requires.
+      for (let each in conf)
+        if (each[0] === '[') _expand_requires_shortcuts (conf[each]) // recurse profile sections
+      for (let each in conf.requires) {
+        if (each[0] === '[') _expand_requires_shortcuts ({ requires: conf.requires[each] }) // recurse profile sections
+        let kind = conf.requires[each]
+        if (typeof kind === 'string') conf.requires[each] = {kind}
       }
-    }
+    } (conf)
     _merge (this, conf, profiles)
     return this
   }
@@ -161,7 +167,8 @@ class Config {
   }
 
   get roots() {
-    return super.roots = Object.values(this.folders) .concat ([ 'schema', 'services' ])
+    const root = this.subroot ? this.subroot + '/' : ''
+    return super.roots = Object.values(this.folders) .concat ([ root+'schema', root+'services' ])
   }
 
   get tmp() { return super.tmp = require('os').tmpdir() }
@@ -265,34 +272,67 @@ class Config {
     for (let each in kinds)  kinds[each] = _linked (each, kinds[each])
     for (let each in requires) requires[each] = _linked (each, requires[each])
     function _linked (key, val) {
+
+      // skip if the value is null, undefined, or already linked
       if (!val || val._is_linked) return val
+
+      // handle boolean true as a reference to a kind
       if (val === true) {
         let x = kinds[key]
         if (x) val = x; else if (key+'-defaults' in kinds) val = {kind:key+'-defaults'}; else return val
       }
+
+      // handle string values as references to kinds
       if (typeof val === 'string') {
         let x = kinds[val] || kinds[val+'-'+key] || kinds[key+'-'+val]
         if (x) val = {kind:val}; else return val
       }
-      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)    // apply/override with top-level data
-          if (kind) val.kind = kind  // but inherited kind wins
+
+      // determine the appropriate preset based on the kind and key
+      let p, k = val.kind
+      let preset = p // REVISIT: first two below are for deprecated mtxs presets
+      || !k && key.endsWith('-from-sidecar') && kinds [p=key.slice(0,-13)]
+      || !k && key.endsWith('-in-sidecar') && kinds [p=key.slice(0,-11)]
+      || kinds[p=k] || kinds[p=k+'-'+key] || kinds[p=key+'-'+k]
+      || kinds[key] !== val && kinds[p=key]
+
+      // if a preset was found, merge it with the current value
+      if (is_object(preset) && preset !== val) {
+        let base = _merge ({}, _linked(p,preset), _profiles), {kind} = base
+        // apply base preset to preset, e.g., telemetry to telemetry-to-console
+        const base_preset = kinds[key]
+        if (!preset.$root && is_object(base_preset) && base_preset !== val && base_preset !== preset) {
+          base = _merge (_merge ({}, _linked(key,base_preset), _profiles), base, _profiles)
         }
-      }
-      if (typeof preset === 'object' && preset !== val) {
-        const top = val, base = _merge ({},_linked(p,preset), _profiles), {kind} = base
-        val = _merge (base, top, _profiles)  // apply/override with top-level data
+        val = _merge (base, val, _profiles)  // apply/override with top-level data
         if (kind) val.kind = kind           // but inherited kind wins
       }
+
+      // mark the value as linked to prevent redundant processing
       if (typeof val === 'object') Object.defineProperty (val, '_is_linked', {value:true})
+
       return val
     }
+    this._resolve_required_services()
   }
 
+
+  /**
+   * This is the implementation for `cds.requires` which is `cds.env.requires`
+   * plus additional hidden entries for all cds.required.<name>.service
+   */
+  _resolve_required_services() {
+    const { requires } = this; if (!requires) return
+    for (let [name,e] of Object.entries(requires)) {
+      if (name.includes('/#')) e.service ??= name.split('/#')[0] //> e.g. 'my-service/#odata' -> 'my-service'
+      if (e.service && !(e.service in requires)) {
+        Object.defineProperty (requires, e.service, { value: e })
+        e._name = name //> to be able to resolve the original name of a service in cds.requires
+      }
+    }
+  }
+
+
   _add_vcap_services (VCAP_SERVICES) {
     if (this.features && this.features.vcaps === false)  return
     if (!this.requires)  return
@@ -421,7 +461,7 @@ class Config {
       _fetch ({ type: conf.dialect || conf.kind })
 
     function _fetch (predicate) {
-      if (Array.isArray(predicate)) {
+      if (is_array(predicate)) {
         for (const p of predicate) {
           const found = _fetch(p)
           if (found) return found
@@ -443,7 +483,7 @@ class Config {
     function _array(o,p) {
       const v = o[p]
       if (!v) return []
-      if (Array.isArray(v)) return v
+      if (is_array(v)) return v
       throw new Error(`Expected VCAP entry '${p}' to be an array, but was: ${require('util').inspect(vcaps)}`)
     }
   }
@@ -486,49 +526,43 @@ function _add_static_profiles (_home, profiles) {
   } catch (e) { if (e.code !== 'MODULE_NOT_FOUND') throw e }
 }
 
+
 /**
- * @returns {Config} dst
+ * Merges the source config `src` into the destination config `dst`,
+ * taking into account profiles specified in `_profiles`.
+ * @type {<T,S>(dst:T, src:S, _profiles:Profiles) => (T&S)}
  */
 function _merge (dst, src, _profiles) {
-  const profiled = [], descr = Object.getOwnPropertyDescriptors(src)
-  for (let p in descr) {
-    const pd = descr[p]
 
-    if ('get' in pd || !pd.enumerable) {
-      Object.defineProperty(dst,p,pd)
-      continue
-    }
+  const profiled = {}
+  Reflect.ownKeys(src).forEach (key => {
 
-    if (_profiles && p[0] === '[') {
-      const important = p.endsWith('!]')
-      const profile = p.slice (1, important ? -2 : -1)
-      if (_profiles._defined) _profiles._defined.add (profile)
-      if (_profiles.has(profile)) {
-        let o = src[p]; if (typeof o !== 'object') continue
-        let merge = () => _merge (dst, o, _profiles, false)
-        if (important && _profiles._important) _profiles._important.push(merge)
-        else profiled.push ({ profile, merge })
-      }
-      continue
-    }
+    // Getters or hidden properties are recreated in destination objects
+    const pd = Reflect.getOwnPropertyDescriptor (src, key)
+    if (pd.get || !pd.enumerable) return Object.defineProperty(dst,key,pd)
 
-    const v = pd.value
-    if (typeof v === 'object' && !Array.isArray(v) && v != null) {
-      if (!dst[p]) dst[p] = {}
-      if (typeof dst[p] !== 'object' || Array.isArray(dst[p])) dst[p] = v
-      else _merge (dst[p], v, _profiles)
-      continue
+    // Profile entries with [...] keys are handled deferred below
+    if (_profiles && key[0] === '[') {
+      let I = key.endsWith('!]'), p = key.slice (1,-1-I) // ! = important
+      if (!_profiles.include(p)) return
+      const o = src[key]; if (!is_object(o)) return
+      const deferred = I ? _profiles._important : profiled[p] ??= []
+      return deferred.push (()=> _merge (dst,o, _profiles))
     }
-    else if ((v === true || typeof v === 'string') && typeof dst[p] === 'object' && dst[p]?.kind) {
-      if (typeof v === 'string') dst[p].kind = v  // requires.db = 'foo' -> requires.db.kind = 'foo'
-    }
-    else if (v !== undefined) dst[p] = v
-  }
-  if (profiled.length > 1 && !_profiles.has('production')) {
-    const profiles = Array.from(_profiles)
-    profiled.sort((a,b) => profiles.indexOf(b.profile) - profiles.indexOf(a.profile))
-  }
-  for (let each of profiled) each.merge()
+
+    // Regular properties are merged here
+    let x = pd.value, y = dst[key]      // x >> y
+    if (x === undefined) return        // just skipped, not overridden
+    if (x === true && y?.kind) return // true >> {kind,...} don't override
+    if (is_object(x))                // merge objects recursively
+      return dst[key] = _merge (is_object(y)||{}, x, _profiles)
+    else dst[key] = x              // all others override existing ones
+  })
+
+  // Apply deferred merges in order of given profiles
+  if (_profiles) for (let p of _profiles)
+    profiled[p]?.forEach (merge => merge())
+
   return dst
 }
 
@@ -578,6 +612,34 @@ function _ext_package_json (pkg) { // fill cds.extends from .extends
   return cds
 }
 
+class Profiles extends Set {
+
+  /**
+   * @param {Config} config
+   */
+  constructor (config) {
+    let { 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 (config._home) _add_static_profiles (config._home, profiles);
+    if (config._home && config['project-nature'] == 'java') profiles.push('java')
+    if (!profiles.includes('production')) profiles.push('development')
+    super (profiles.reverse())
+    this._defined = new Set
+    this._important = []
+  }
+
+  /**
+   * Checks if a profile is included, plus records it as defined in the configuration.
+   */
+  include (p) {
+    this._defined.add(p)
+    return this.has(p)
+  }
+}
+
+const is_object = x => typeof x === 'object' && !is_array(x) && x
+const is_array = Array.isArray
 
 /** @type Config & typeof DEFAULTS */
 module.exports = Config.prototype

package/node_modules/@sap/cds/lib/env/cds-requires/auth-strategies.js

@@ -0,0 +1,62 @@
+const admin = [ 'admin' ]
+const builder = [ 'cds.ExtensionDeveloper' ]
+
+const strategies = {
+
+  "basic-auth": {
+    kind: 'basic',
+    users: {},
+    tenants: {}
+  },
+
+  "mocked-auth": {
+    restrict_all_services: false,
+    kind: 'mocked',
+    users: {
+      alice: { tenant: 't1', roles: [ ...admin ] },
+      bob:   { tenant: 't1', roles: [ ...builder ] },
+      carol: { tenant: 't1', roles: [ ...admin, ...builder ] },
+      dave:  { tenant: 't1', roles: [ ...admin ], features: [] },
+      erin:  { tenant: 't2', roles: [ ...admin, ...builder ] },
+      fred:  { tenant: 't2', features: ['isbn'] },
+      me:    { tenant: 't1', features: ['*'] },
+      yves:  { roles: ['internal-user'] },
+      '*': true
+    },
+    tenants: {
+      t1: { features: [ 'isbn' ], }, // tenant-specific features
+      t2: { features: '*', },
+    }
+  },
+
+  "jwt-auth": {
+    kind: 'jwt',
+    vcap: { label: 'xsuaa' }
+  },
+
+  "ias-auth": {
+    kind: 'ias',
+    vcap: { label: 'identity' }
+  },
+
+  "xsuaa-auth": {
+    kind: 'xsuaa',
+    vcap: { label: 'xsuaa' }
+  },
+
+  "dummy-auth": {
+    kind: 'dummy',
+  },
+
+}
+
+for (let each of Object.values(strategies)) {
+  Object.defineProperty (each, 'strategy', {get() {
+    return { jwt: 'JWT', mocked: 'mock' }[this.kind] || this.kind
+  }})
+}
+
+// enable credentials lookup for xsuaa fallback
+strategies.xsuaa = { vcap: { label: 'xsuaa' } }
+
+module.exports = strategies

package/node_modules/@sap/cds/lib/env/cds-requires/databases.js

@@ -0,0 +1,49 @@
+const _db_data = {
+  '[development]': { data: [ 'db/data', 'db/csv', 'test/data' ] },
+  '[production]': { data: [ 'db/data', 'db/csv' ] },
+}
+
+module.exports = {
+
+  "db-defaults": { kind: 'sql', ..._db_data }, //> applied only for cds.requires.db: true
+
+  "sql": {
+    // REVISIT: should be '[development]': { kind: 'sqlite:memory' },
+    '[development]': { kind: 'sqlite', credentials: { url: ':memory:' } },
+    '[production]': { kind: 'hana' },
+  },
+
+  "sqlite": {
+    impl: '@cap-js/sqlite', credentials: { url: 'db.sqlite' },
+    pool: { evictionRunIntervalMillis: 0, min: 1, max: 1 },
+    ..._db_data,
+  },
+  "sqlite:memory": {
+    kind: 'sqlite', credentials: { url: ':memory:' },
+  },
+  "hana": {
+    impl: '@cap-js/hana',
+    ..._db_data,
+  },
+  "hana-cloud": {
+    kind: 'hana',
+    "deploy-format": "hdbtable", //> REVISIT: still needed?
+  },
+  "hana-serverless": {
+    kind: 'hana',
+    serverless: true,
+    vcap: { label: 'hana-cloud', plan: 'serverless' },
+    dialect: "hana", //> REVISIT: why needed?
+    "deploy-format": "hdbtable", //> REVISIT: still needed?
+  },
+
+  "sql-mt": { // For compatibility only
+    '[development]': { kind: 'sqlite' },
+    '[production]': { kind: 'hana-mt' },
+  },
+  "hana-mt": { // For compatibility only
+    kind: 'hana',
+    "vcap": { "label": "service-manager" },
+    "deploy-format": "hdbtable", //> REVISIT: still needed?
+  },
+}

package/node_modules/@sap/cds/lib/env/cds-requires/embeddings.js

@@ -0,0 +1,8 @@
+module.exports = {
+
+  "embeddings": {
+    model: 'SAP_GXY.20250407', // one of the available embedding models in HANA NLP
+    model_kind: 'embeddings'
+  },
+
+}

package/node_modules/@sap/cds/lib/env/cds-requires/index.js

@@ -0,0 +1,27 @@
+
+exports = module.exports = {
+  auth: {
+    '[development]': { kind: 'mocked-auth' },
+    '[production]': { kind: 'jwt-auth' }
+  },
+  db: undefined, "[schevo]": { db: { schema_evolution: 'auto' }, },
+  middlewares: true, // REVISIT: odata-v2-adapter uses this
+  queue: true,
+  scheduling: true,
+  messaging: undefined,
+  multitenancy: undefined,
+  extensibility: undefined,
+  toggles: undefined,
+  embeddings: undefined,
+}
+
+
+exports.kinds = {
+  ...require('./auth-strategies'),
+  ...require('./databases'),
+  ...require('./messaging'),
+  ...require('./queues'),
+  ...require('./services'),
+  ...require('./platform'),
+  ...require('./embeddings'),
+}