@sap/cds 8.8.1 → 8.8.2

package/CHANGELOG.md

@@ -4,6 +4,13 @@
 - The format is based on [Keep a Changelog](https://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](https://semver.org/).
 
+## Version 8.8.2 - 2025-03-13
+
+### Fixed
+
+- Consuming REST actions returning anonymous structures
+- `i18n.labels/messages` were occasionally missing
+
 ## Version 8.8.1 - 2025-03-07
 
 ### Fixed

package/lib/i18n/bundles.js

@@ -1,5 +1,7 @@
 const cds = require('..'), {i18n} = cds.env
 const I18nFiles = require ('./files')
+const DEFAULTS = i18n.default_language
+const FALLBACK = ''
 
 
 class I18nBundle {
@@ -7,14 +9,14 @@ class I18nBundle {
   constructor (options={}) {
     this.files = new I18nFiles (options)
     this.file = this.files.basename
+    this.fallback = this.#translations[FALLBACK] = Object.assign ({}, ...this.files.content4(FALLBACK))
+    this.defaults = this.#translations[DEFAULTS] = Object.assign (
+      i18n.fatjson ? {...this.fallback} : {__proto__:this.fallback}, ...this.files.content4(DEFAULTS)
+    )
   }
 
   #translations = {}
 
-  /** The default texts to use as fallbacks if a requested translation is not found. */
-  get defaults() { return super.defaults = this.texts4 (i18n.default_language, this.fallback) }
-  get fallback() { return super.fallback = this.texts4 ('',false) }
-
   /** Synonym for {@link at `this.at`} */
   get for() { return this.at }
 
@@ -23,6 +25,7 @@ class I18nBundle {
    * Looks up the entry for the given key and locale.
    * - if `locale` is omitted, the current locale is used.
    * - if `args` are provided, fills in placeholders with them.
+   * @example cds.i18n.labels.at ('CreatedAt','de')
    * @returns {string|undefined}
    */
   at (key, locale, args) {
@@ -62,32 +65,29 @@ class I18nBundle {
 
   /**
    * Returns translated texts for a specific locale.
+   * @example cds.i18n.labels.texts4 ('de')
    */
-  texts4 (locale='', _defaults) {
+  texts4 (locale='') {
     const $ = this.#translations;             if (locale in $) return $[locale]
     const suffix = locale.replace(/-/g,'_');  if (suffix in $) return $[locale] = $[suffix]
-    // nothing cached yet, load content and create translations ...
-    let all = this.files.content4 (locale, suffix)    // load content from all folders
-    if (all.length === 0 && suffix.includes('_')) {   // nothing found, try w/o region ...
-      const lang = suffix.match(/(\w+)_/)[1]          // i.e. en_UK => en
-      if (lang in $) return $[locale] = $[lang]       // already cached -> leave method
-      else all = this.files.content4 (lang, lang)     // load content for language only
+    const all = this.files.content4 (locale, suffix) // load content from all folders
+    if (!all.length) { // nothing found, try w/o region, or return defaults
+      const _ = suffix.indexOf('_')
+      return $[locale] = $[suffix] = _ < 0 ? this.defaults : this.texts4 (suffix.slice(0,_))
     }
-    const defaults = (_defaults ?? this.defaults) || Object.prototype
-    const texts = i18n.fatjson ? Object.assign ({},defaults) : Object.create (defaults)
-    return $[locale] = $[suffix] = Object.assign (texts, ...all)
+    const texts = i18n.fatjson ? {...this.defaults} : {__proto__:this.defaults}
+    return $[locale] = $[suffix] = Object.assign (texts, ...all )
   }
 
 
   /**
    * Returns all translations for an array of locales or all locales.
-   * @example { de, fr } = cds.i18n.labels.translations('de','fr')
+   * @example { de, fr } = cds.i18n.labels.translations4 ('de','fr')
    * @param { 'all' | string[] } [locale]
    * @returns {{ [locale:string]: Record<string,string> }}
    */
   translations4 (...locales) {
-    let first = locales[0]
-    if (first == null)  locales = cds.env.i18n.languages
+    let first = locales[0] || cds.env.i18n.languages
     if (first == 'all') locales = this.files.locales()
     else if (Array.isArray(first)) locales = first
     return locales.reduce ((all,l) => (all[l] = this.texts4(l),all), {})

package/lib/i18n/files.js

@@ -36,7 +36,7 @@ class I18nFiles {
       const leafs = model?.$sources.map(path.dirname) ?? roots, visited = {}
       ;[...new Set(leafs)].reverse() .forEach (function _visit (dir) {
         if (dir in visited) return; else visited[dir] = true
-        LOG.debug ('searching for i18n files in the neighborhood of', dir)
+        LOG.debug ('fetching', basename, 'bundles in', dir, relative_folders)
         // is there an i18n folder in the currently visited directory?
         for (const each of relative_folders) {
           const f = path.join(dir,each), _exists = _folders[f] ??= exists(f)
@@ -60,6 +60,8 @@ class I18nFiles {
       const matches = (_entries[f] ??= fs.readdirSync(f)) .filter (f => f.match(base))
       if (matches.length) return files[f] = matches
     }
+
+    LOG.debug ('found', basename, 'bundles in these folders', Object.keys(files))
   }
 
 
@@ -68,7 +70,7 @@ class I18nFiles {
    * @returns {entries[]} An array of entries, one for each file found.
    */
   content4 (locale, suffix = locale?.replace(/-/g,'_')) {
-    const content = [], cached = I18nFiles.content ??= {}
+    const content = [], cached = I18nFiles[this.basename] ??= {}
     const _suffix = suffix ? '_'+ suffix : ''
     for (let dir in this) {
       const all = cached[dir] ??= this.load('.json',dir) || this.load('.csv',dir) || false
@@ -87,7 +89,7 @@ class I18nFiles {
       case '.json': return _load_json(file)
       case '.csv': return _load_csv(file)
     }}
-    finally { LOG.debug ('read:', file) }
+    finally { LOG.debug ('loading:', file) }
   }
 
 

package/lib/i18n/index.js

@@ -27,7 +27,7 @@ class I18nFacade {
    * The default bundle for UI labels and texts.
    */
   get labels() {
-    return super.labels = this.bundle4 (cds.context?.model || cds.model)
+    return super.labels = this.bundle4 (cds.model)
   }
 
   /**

package/lib/i18n/localize.js

@@ -62,7 +62,7 @@ function localize (input,...etc) {
 }
 
 exports.edmx4 = service => new class extends Localize { get input(){
-  const model = this.model || cds.context?.model || cds.model
+  const model = this.model || cds.model
   return super.input = cds.compile.to.edmx (model,{service})
 }}
 
@@ -124,7 +124,7 @@ exports.json = json => {
 }
 
 /** @deprecated */ exports.bundle4 = function (model, locale) {
-  if (typeof model === 'string') [ model, locale ] = [ cds.context?.model || cds.model, model ]
+  if (typeof model === 'string') [ model, locale ] = [ cds.model, model ]
   const b = i18n.bundle4 (model)
   return b.texts4 (locale)
 }

package/libx/_runtime/remote/Service.js

@@ -93,7 +93,7 @@ const _handleUnboundActionFunction = (srv, def, req, event) => {
   if (def.kind === 'action') {
     // REVISIT: only for "rest" unbound actions/functions, we enforce axios to return a buffer
     // required by cds-mt
-    const isBinary = srv.kind === 'rest' && def?.returns?.type.match(/binary/i)
+    const isBinary = srv.kind === 'rest' && def?.returns?.type?.match(/binary/i)
     const { headers, data } = req
 
     return srv.send({ method: 'POST', path: `/${event}`, headers, data, _binary: isBinary })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds",
-  "version": "8.8.1",
+  "version": "8.8.2",
   "description": "SAP Cloud Application Programming Model - CDS for Node.js",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [