@sap/cds 8.6.0 → 8.6.1

package/CHANGELOG.md

@@ -4,6 +4,15 @@
 - The format is based on [Keep a Changelog](https://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](https://semver.org/).
 
+## Version 8.6.1 - 2025-01-10
+
+### Fixed
+
+- `default-env.json` was not loaded anymore when in production mode.
+- i18n texts like `1` or `true` were returned as numbers, or booleans instead of strings
+- CSN files produced by `cds build` now again contain information to resolve handler files. That was broken in case of reflected/linked models set by e.g. plugins.
+- `average` aggregation used with draft enabled entities
+
 ## Version 8.6.0 - 2024-12-17
 
 ### Added

package/lib/compile/etc/properties.js

@@ -1,21 +1,19 @@
 const path = require('path')
 const fs = require('fs')
 
-const Properties = module.exports = { read, parse }
-
-function read (res, ext = '.properties') {
+exports.read = function read (res, ext = '.properties', options) {
   try {
     // Although properties are actually latin1-encoded, people tend to have
     // unicode chars in them (e.g.German umlauts), so let's parse in utf-8.
     if (!/\.(env|.+rc)$/.test(res) && !path.extname(res)) res += ext
     const src = fs.readFileSync(path.resolve(res),'utf-8')
-    return Object.defineProperty (Properties.parse(src), '_source', {value:res})
+    return Object.defineProperty (exports.parse(src,options), '_source', {value:res})
   } catch (e) {
     if (e.code !== 'ENOENT') throw new Error (`Corrupt ${ext} file: ${res+ext}`)
   }
 }
 
-function parse (props) {
+exports.parse = function parse (props, options) {
   if (props.match(/^\s*{/)) return JSON.parse(props)
   const lines = props.split(/(?<![\\\r])\r?\n/)
   const rows = lines.filter(each => !!each.trim()).map(each => each.replace(/\\\r?\n/, '')).map(each => {
@@ -23,18 +21,23 @@ function parse (props) {
     if (index < 0)  return [each, '']
     return [each.slice(0, index).trim(), each.slice(index + 1).trim()]
   })
+  const val = options?.strings ? string4 : value4
   const bundle = rows.reduce((all, [key, value]) => {
-    if (key && !/^\s*[#;]/.test(key)) all[key] = value4(value)
+    if (key && !/^\s*[#;]/.test(key)) all[key] = val(value)
     return all
   }, {})
   return bundle
 }
 
-function value4(raw) {
+function value4 (raw) {
   if (raw === 'true') return true
   if (raw === 'false') return false
   if (raw === '0') return 0
-  else return Number(raw) || raw
+  else return Number(raw) || string4(raw)
+}
+
+function string4 (raw) {
+  return raw
   .replace(/''/g,"'") .replace(/^"(.*)"$/,"$1") .replace(/^'(.*)'$/,"$1")
   .replace(/\\u[\dA-F]{4}/gi, (match) => String.fromCharCode(parseInt(match.replace(/\\u/g, ''), 16)))
 }

package/lib/compile/to/json.js

@@ -6,8 +6,8 @@ module.exports = (csn,o={}) => {
   const relative_cds_home = RegExp ('^' + path.relative (o.src || o.cwd || cds.root, cds.home) + '/')
   const { moduleLookupDirectories } = cds.env.cdsc
 
-  const resolver = (_,v) => {
-
+  const resolver = function (k) {
+    const v = this[k] // need the original value w/ non-enumerable $location, not the one that went through classes.toJSON()
     if (!v) return v
 
     else if (v.grant && v.where) try {

package/lib/env/cds-env.js

@@ -201,8 +201,8 @@ class Config {
   _add_process_env() {
     const prefix = this._context, cwd = this._home
     const {env} = process
+    this._add_to_env ('default-env.json', env)
     if (this._profiles.has('development')) {
-      this._add_to_env ('default-env.json', env)
       for (let each of this._profiles)
         each === 'development' || this._add_to_env (`.${each}.env`, env)
       this._add_to_env ('.env', env)

package/lib/i18n/files.js

@@ -83,8 +83,8 @@ class I18nFiles {
     const fn = `${this.basename}${_suffix}${ext}`; if (!this[dir].includes(fn)) return
     const file = path.join (dir, fn)
     try { switch (ext) {
-      case '.properties': return _load_properties(file);
-      case '.json': return _load_json(file);
+      case '.properties': return _load_properties(file)
+      case '.json': return _load_json(file)
       case '.csv': return _load_csv(file)
     }}
     finally { LOG.debug ('read:', file) }
@@ -119,7 +119,7 @@ class I18nFiles {
 }
 
 
-const _load_properties = cds.load.properties
+const _load_properties = file => cds.load.properties(file, '.properties', { strings: true })
 const _load_json = require
 const _load_csv = file => {
   const csv = cds.load.csv(file); if (!csv) return

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

@@ -14,7 +14,7 @@ const { handleStreamProperties } = require('../common/utils/streamProp')
 const LOG = cds.log('fiori|drafts')
 const original = Symbol('original')
 const DRAFT_PARAMS = Symbol('draftParams')
-const AGGREGATION_FUNCTIONS = ['sum', 'min', 'max', 'avg', 'count']
+const AGGREGATION_FUNCTIONS = ['sum', 'min', 'max', 'avg', 'average', 'count']
 
 const calcTimeMs = timeout => {
   const match = timeout.match(/^([0-9]+)(w|d|h|hrs|min)$/)

package/package.json

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