@sap/cds 8.7.0 → 8.7.2

package/CHANGELOG.md

@@ -4,6 +4,25 @@
 - The format is based on [Keep a Changelog](https://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](https://semver.org/).
 
+## Version 8.7.2 - 2025-02-14
+
+### Fixed
+
+- Strip `Z` suffix of values of `cds.Timestamp` with OData type `Edm.DateTime`
+- Skip validation for mandatory fields in update scenarios for entities in draft activation
+- `cds.compile.to.yaml` escapes strings including colons if necessary
+
+## Version 8.7.1 - 2025-02-04
+
+### Fixed
+
+- Loading of CAP Plugins implemented in Typescript
+- `Location` header if read after write returns empty result due to missing read authentication
+- Enable accessing `req.params` when handling requests on parameterized views
+- `cds.connect.to(class {...})` did not call the `init` function
+- Generic Paging/Sorting was run twice for non-draft requests
+- Service implementation loaded from `node_modules`
+
 ## Version 8.7.0 - 2025-01-28
 
 ### Added

package/lib/compile/to/yaml.js

@@ -29,7 +29,7 @@ module.exports = function _2yaml (object, {limit=111}={}) {
     if (typeof o === 'string') {
       if (o.indexOf('\n')>=0) return '|'+'\n'+indent+ o.replace(/\n/g,'\n'+indent)
       let s = o.trim()
-      return !s || /^[\^@#:,=!<>*|]/.test(s)  ? '"'+ o.replace(/\\/g,'\\\\') +'"'  :  s
+      return !s || /^[\^@#:,=!<>*|]/.test(s) || /:\s/.test(o) ? '"'+ o.replace(/\\/g,'\\\\') +'"'  :  s
     }
     if (typeof o === 'function') return
     else return o

package/lib/env/cds-env.js

@@ -52,12 +52,12 @@ class Config {
     if (_context !== 'cds') {
       this.#import (_home,'package.json', { get: p => p[_context] })
     } else {
-      for (let {impl} of Object.values(this.plugins)) {
+      for (let {impl, packageJson} of Object.values(this.plugins)) {
         const _plugin = path.dirname(impl)
         this.#import (_plugin,'.cdsrc.yaml', { load: _readYaml })
         this.#import (_plugin,'.cdsrc.json')
         this.#import (_plugin,'.cdsrc.js')
-        this.#import (_plugin,'package.json', { get: p => p.cds })
+        this.#import (path.dirname(packageJson), 'package.json', { get: p => p.cds })
       }
       const user_ = process.env.CDS_USER_HOME || require('os').homedir()
       this.#import (user_,'.cdsrc.json')

package/lib/req/validate.js

@@ -171,7 +171,8 @@ const $any = class any {
     // different keys and thus different insert checks.
     const _is_insert = this.own('__is_insert', () => {
       const entity = this._target || this
-      const keys = Object.keys (entity.keys||{})
+      let keys = Object.keys (entity.keys||{})
+      keys = keys.filter(k => !entity.elements[k].virtual)
       if (!keys.length) return ()=> true
       else return data => typeof data === 'object' && !keys.every(k => k in data)
     })

package/lib/srv/cds-connect.js

@@ -43,7 +43,7 @@ connect.to = (datasource, options) => {
       throw new Error (`No service definition found for '${required.service || datasource}'`)
     }
     // construct new service instance
-    let srv = await new Service (datasource,m,o); await Service.init?.(srv)
+    let srv = await new Service (datasource,m,o); await (Service._is_service_class ? srv.init?.() : Service.init?.(srv))
     if (o.outbox) srv = cds.outboxed(srv)
     if (datasource) {
       if (datasource === 'db') cds.db = srv

package/lib/srv/factory.js

@@ -1,4 +1,3 @@
-const exts = process.env.CDS_TYPESCRIPT ? ['ts','js','mjs'] : ['js','mjs']
 const cds = require('..'), { path, isfile } = cds.utils
 /**
  * NOTE: Need this typed helper variable to be able to use IntelliSense for calls with new keyword.
@@ -44,13 +43,17 @@ function ServiceFactory (name, model, options) {
 }
 
 
+const exts = process.env.CDS_TYPESCRIPT ? ['.ts','.js','.mjs'] : ['.js','.mjs']
 const _source4 = d => d['@source'] || d.$location?.file
 const _sibling = d => {
   let file = _source4(d); if (!file) return
-  let { dir, name } = path.parse (file)
-  for (let subdir of ['', './lib', './handlers']) {
-    for (let ext of exts) {
-      if (file = isfile (dir, subdir, name + '.' + ext)) return file // eslint-disable-line no-cond-assign
+  let { dir, name } = path.parse (file); if (!dir) dir = '.'
+  for (let subdir of ['/', '/lib/', '/handlers/']) {
+    for (let ext of exts) try {
+      const impl = dir + subdir + name + ext
+      return isfile(impl) || require.resolve (impl)
+    } catch(e) {
+      if (e.code !== 'MODULE_NOT_FOUND') throw e
     }
   }
 }

package/libx/_runtime/cds-services/adapter/odata-v4/handlers/read.js

@@ -560,8 +560,7 @@ const read = service => {
         odataReq.getBatchApplicationData().results[changeset].push({ result, req })
       } else if (result.value && isStreaming(odataReq.getUriInfo().getPathSegments())) {
         if (odataRes._response.destroyed) {
-          err = new Error('Response is closed while streaming')
-          err.code = 'ERR_STREAM_PREMATURE_CLOSE'
+          err = new cds.error({ code: 'ERR_STREAM_PREMATURE_CLOSE', message: 'Response was closed while streaming' })
           tx.rollback(err).catch(() => {})
         } else {
           // REVISIT: temp workaround for url streaming
@@ -574,7 +573,10 @@ const read = service => {
           })
           odataRes._response.on('close', () => {
             if (!finished) {
-              err = new Error('Response is closed while streaming')
+              err = new cds.error({
+                code: 'ERR_STREAM_PREMATURE_CLOSE',
+                message: 'Response was closed while streaming'
+              })
               tx.rollback(err).catch(() => {})
             }
           })

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

@@ -407,10 +407,6 @@ cds.ApplicationService.prototype.handle = async function (req) {
   }
 
   if (req.event === 'READ') {
-    // apply paging and sorting on original query for protocol adapters relying on it
-    commonGenericPaging(req)
-    commonGenericSorting(req)
-
     if (
       !Object.keys(draftParams).length &&
       !req.query._target.name?.endsWith('DraftAdministrativeData') &&
@@ -419,6 +415,11 @@ cds.ApplicationService.prototype.handle = async function (req) {
       req.query = query
       return handle(req)
     }
+
+    // apply paging and sorting on original query for protocol adapters relying on it
+    commonGenericPaging(req)
+    commonGenericSorting(req)
+
     const read =
       draftParams.IsActiveEntity === false &&
       _hasStreaming(query.SELECT.columns, query._target) &&

package/libx/common/utils/path.js

@@ -25,6 +25,8 @@ const getKeysAndParamsFromPath = (from, { model }) => {
         const seg_keys = where2obj(ref.where)
         Object.assign(keys, seg_keys)
         params[i] = seg_keys.ID && Object.keys(seg_keys).length === 1 ? seg_keys.ID : seg_keys
+      } else if (ref.args) {
+        params[i] = Object.fromEntries(Object.entries(ref.args).map(([k, v]) => [k, 'val' in v ? v.val : v]))
       }
       if (lastElement.isAssociation && from.ref.length > 1) {
         // add keys for navigation from path

package/libx/odata/middleware/create.js

@@ -72,14 +72,14 @@ module.exports = (adapter, isUpsert) => {
 
         handleSapMessages(cdsReq, req, res)
 
-        // case: read after write returns no results, e.g., due to auth (academic but possible)
-        if (result == null) return res.sendStatus(204)
-
         if (!target._isSingleton) {
           // determine calculation based on result with req.data as fallback
           res.set('location', calculateLocationHeader(cdsReq.target, service, result || cdsReq.data))
         }
 
+        // case: read after write returns no results, e.g., due to auth (academic but possible)
+        if (result == null) return res.sendStatus(204)
+
         const preference = getPreferReturnHeader(req)
         postProcess(cdsReq.target, model, result, preference === 'minimal')
         if (result?.$etag) res.set('ETag', result.$etag) //> must be done after post processing

package/libx/odata/middleware/stream.js

@@ -232,13 +232,23 @@ module.exports = adapter => {
           _setStreamingHeaders(result, res)
 
           return new Promise((resolve, reject) => {
-            if (res.destroyed) return reject(new Error('Response was closed while streaming'))
+            if (res.destroyed)
+              return reject(
+                new cds.error({ code: 'ERR_STREAM_PREMATURE_CLOSE', message: 'Response was closed while streaming' })
+              )
             stream.pipe(res)
             stream.on('end', () => resolve(result))
             stream.once('error', reject)
             let finished = false
             res.on('finish', () => (finished = true))
-            res.on('close', () => !finished && reject(new Error('Response was closed while streaming')))
+            res.on(
+              'close',
+              () =>
+                !finished &&
+                reject(
+                  new cds.error({ code: 'ERR_STREAM_PREMATURE_CLOSE', message: 'Response was closed while streaming' })
+                )
+            )
           })
         })
       })

package/libx/odata/utils/index.js

@@ -145,7 +145,11 @@ const _v2 = (val, element) => {
     case 'cds.Time':
       return `time'${_PT(val.split(':'))}'`
     case 'cds.Timestamp':
-      return element['@odata.Type'] === 'Edm.DateTime' ? `datetime'${val}'` : `datetimeoffset'${val}'`
+      return element['@odata.Type'] === 'Edm.DateTime'
+        ? val.endsWith('Z')
+          ? `datetime'${val.slice(0, -1)}'`
+          : `datetime'${val}'`
+        : `datetimeoffset'${val}'`
     // bool
     case 'cds.Boolean':
       return val

package/package.json

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