@sap/cds 7.5.2 → 7.5.3

package/CHANGELOG.md

@@ -4,6 +4,17 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 7.5.3 - 2024-01-23
+
+### Fixed
+
+- `cds.localize` and `cds build` produce `i18n.json` again with keys from all base languages
+- `cds.compile.to.serviceinfo` now correctly parses SpringBoot config with nested objects, e.g. for `cds.odata-v4.endpoint.path`
+- Recommend to use `chai` 4 for the time being, as `chai` 5 doesn't properly work yet (requires ESM, `chai-as-promised` not working)
+- View resolving for entities using property names that are identical to entity names
+- Direct modifications with `cds.fiori.bypass_draft` if `cds.fiori.draft_compat` is not enabled
+- Draft: Field validation error message does not display the name of the field
+
 ## Version 7.5.2 - 2024-01-05
 
 ### Fixed
@@ -37,7 +48,7 @@
         "csrf": { // this configuration implies `csrf: true`
           "method": "get",
           "url": "..."
-        } 
+        }
       }
     }
   }

package/lib/compile/to/srvinfo.js

@@ -79,10 +79,12 @@ module.exports = (model, options={}) => {
       if (file) {
         const yaml = cds.load.yaml(file)
         for (let yamlDoc of Array.isArray(yaml) ? yaml : [yaml]) {
-          const cds = yamlDoc?.cds;
+          let cds = yamlDoc?.cds;
           if (!cds)   continue
-          return cds['odataV4.endpoint.path']  || cds['odataV2.endpoint.path'] // https://cap.cloud.sap/docs/java/application-services#configure-base-path
-              || cds['odata-v4.endpoint.path'] || cds['odata-v2.endpoint.path'] // older/intermediate config, keep for backward compatibility
+          cds = _normalizeSpringBootCfg(cds)
+          // https://cap.cloud.sap/docs/java/application-services#configure-base-path
+          return cds.odataV4?.endpoint?.path || cds.odataV2?.endpoint?.path
+              || cds['odata-v4']?.endpoint?.path || cds['odata-v2']?.endpoint?.path // alternative config
               || javaPrefixDefault
         }
         return javaPrefixDefault
@@ -92,4 +94,24 @@ module.exports = (model, options={}) => {
     return is_java && javaPrefixDefault
   }
 
+  // SpringBoot allows dots in keys to express nested objects, so we need to split them
+  function _normalizeSpringBootCfg(obj) {
+    if (typeof obj !== 'object')  return obj
+    Object.keys(obj).forEach(k => {
+      const prop = k.split('.')
+      const last = prop.pop()
+      // and define the object if not already defined
+      const res = prop.reduce((o, key) => {
+        // define the object if not defined and return
+        return o[key] = o[key] ?? {}
+      }, obj)
+      res[last] = obj[k]
+      // recursively normalize
+      _normalizeSpringBootCfg(obj[k])
+      // delete the original property from object if it was rewritten
+      if (prop.length)  delete obj[k]
+    })
+    return obj
+  }
+
 }

package/lib/i18n/localize.js

@@ -140,7 +140,10 @@ function bundle4 (model, locale) {
   if (!folders.length) return bundles[locale] = {}
 
   const {i18n} = cds.env
-  let bundle = null, locales = (
+  let bundle = Object.create(null)
+  bundle.toJSON = jsonWithAllProps // allows JSON.stringify with all inherited props
+
+  let locales = (
     locale === i18n.fallback_bundle ? [ i18n.fallback_bundle ] :
     locale === i18n.default_language ? [ i18n.fallback_bundle, i18n.default_language ] :
     [ i18n.fallback_bundle, i18n.default_language, locale ]
@@ -158,6 +161,7 @@ function bundle4 (model, locale) {
       Object.assign (b, next)
     }
   }
+
   return bundles[locale] = bundle
 }
 
@@ -255,3 +259,13 @@ function escapeXmlAttr (str) {
 }
 
 const escapeJson = str => str.replace(/"/g, '\\"')
+
+function jsonWithAllProps() {
+  const res = {}
+  for (let key in this) {
+    if (typeof this[key] !== 'function') {
+      res[key] = this[key]
+    }
+  }
+  return res
+}

package/lib/utils/cds-test.js

@@ -168,7 +168,7 @@ class Test extends require('./axios') {
     function require (mod) { try { return module.require(mod) } catch(e) {
       if (e.code === 'MODULE_NOT_FOUND') throw new Error (`
       Failed to load required package '${mod}'. Please add it thru:
-      npm add -D chai chai-as-promised chai-subset
+      npm add -D chai@4 chai-as-promised chai-subset
     `)}}
   }
   get assert() { return this.chai.assert }

package/libx/_runtime/common/utils/resolveView.js

@@ -237,28 +237,13 @@ const _newInsertColumns = (columns = [], transition) => {
 const _newWhereRef = (newWhereElement, transition, alias, tableName, isSubSelect) => {
   const newRef = Array.isArray(newWhereElement.ref) ? [...newWhereElement.ref] : [newWhereElement.ref]
 
-  if (newRef[0] === alias) {
+  if (newRef.length > 1 && newRef[0] === alias) {
     const mapped = transition.mapping.get(newRef[1])
-    if (mapped) {
-      const tableAlias =
-        transition.queryTarget.query?.SELECT?.from.as ??
-        transition.queryTarget.query?.SELECT?.from.ref.at(-1).split('.').pop()
-      const newMapped = []
-
-      if (tableAlias && mapped.ref[0] === tableAlias) {
-        // remove table alias from mapped array
-        newMapped.push(...mapped.ref.slice(1))
-      } else {
-        newMapped.push(...mapped.ref)
-      }
-
-      // we assume it's a foreign key or single element
-      newRef[1] = newMapped.join('_')
-    }
-  } else if (newRef[0] === tableName) {
+    if (mapped) newRef[1] = mapped.ref.join('_')
+  } else if (newRef.length > 1 && newRef[0] === tableName) {
     newRef[0] = transition.target.name
     const mapped = transition.mapping.get(newRef[1])
-    if (mapped) newRef[1] = mapped.ref[0]
+    if (mapped) newRef[1] = mapped.ref.join('_')
   } else {
     const mapped = transition.mapping.get(newRef[0])
     if (isSubSelect && mapped && newRef.length === 1) {

package/libx/_runtime/fiori/lean-draft.js

@@ -28,6 +28,13 @@ const DRAFT_ADMIN_ELEMENTS = [
   'DraftIsProcessedByMe'
 ]
 
+const reject_bypassed_draft = req => {
+  const msg =
+    !cds.profiles?.includes('production') &&
+    '`cds.env.fiori.bypass_draft` must be enabled to support the directly modification of active instances.'
+  return req.reject(501, msg)
+}
+
 const _fillIsActiveEntity = (row, IsActiveEntity, target) => {
   if (target.drafts) row.IsActiveEntity = IsActiveEntity
   for (const key in target.associations) {
@@ -203,10 +210,11 @@ cds.ApplicationService.prototype.handle = async function (req) {
   }
 
   if (req.event === 'NEW' || req.event === 'CANCEL' || req.event === 'draftPrepare') {
-    if (draftParams.IsActiveEntity && !cds.env.fiori.bypass_draft) req.reject(501)
-    if (req.data.IsActiveEntity === true && cds.env.fiori.bypass_draft) {
+    if (req.event === 'draftPrepare' && draftParams.IsActiveEntity) req.reject(400)
+    if (req.event === 'NEW' && req.data?.IsActiveEntity === true) {
+      if (!cds.env.fiori.bypass_draft) return reject_bypassed_draft(req)
       const containsDraftRoot =
-        this.model.entities[query.INSERT.into?.ref?.[0]?.id || query.INSERT.into?.ref?.[0] || query.INSERT.into][
+        this.model.definitions[query.INSERT.into?.ref?.[0]?.id || query.INSERT.into?.ref?.[0] || query.INSERT.into][
           '@Common.DraftRoot.ActivationAction'
         ]
 
@@ -380,16 +388,11 @@ cds.ApplicationService.prototype.handle = async function (req) {
 
     LOG.debug('patch active')
 
-    if (!cds.env.fiori.bypass_draft) {
-      const msg =
-        !cds.profiles?.includes('production') &&
-        '`cds.env.fiori.bypass_draft` must be enabled to support updating active instances.'
-      return req.reject(403, msg)
-    }
+    if (!cds.env.fiori.bypass_draft) return reject_bypassed_draft(req)
 
     const entityRef = query.UPDATE.entity.ref
 
-    if (!this.model.entities[entityRef[0].id]['@Common.DraftRoot.ActivationAction']) {
+    if (!this.model.definitions[entityRef[0].id]['@Common.DraftRoot.ActivationAction']) {
       req.reject(403, 'DRAFT_MODIFICATION_ONLY_VIA_ROOT')
     }
 
@@ -716,7 +719,7 @@ function _cleanseParams(params, target) {
       if (key === 'IsActiveEntity') {
         const value = params[key]
         delete params[key]
-        if (cds.env.fiori?.draft_compat) Object.defineProperty(params, key, { value, enumerable: false })
+        Object.defineProperty(params, key, { value, enumerable: false })
       }
     }
   }

package/package.json

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