@sap/cds 8.3.0 → 8.4.0

package/libx/odata/parse/multipartToJson.js

@@ -1,6 +1,9 @@
+const cds = require('../../../')
+
 const { parsers, freeParser, HTTPParser } = require('_http_common')
 const { PassThrough, Readable } = require('stream')
 const streamConsumers = require('stream/consumers')
+
 const { getBoundary } = require('../utils')
 
 const CRLF = '\r\n'
@@ -42,16 +45,17 @@ const parseStream = async function* (body, boundary) {
         body: streamConsumers.json(wrapper).catch(() => {})
       }
 
-      const dependencies = [...req.url.matchAll(/\$(\d+)/g)]
+      const dependencies = [...req.url.matchAll(/^\/?\$([\d.\-_~a-zA-Z]+)/g)]
       if (dependencies.length) {
         request.dependsOn = []
         for (const dependency of dependencies) {
-          const index = Number.parseInt(dependency[1], 10)
-          if (Number.isNaN(index)) continue
-          const i = requests.findIndex(r => r.content_id == index) //> prefer content-id
-          const id = requests[i > -1 ? i : index - 1].id
-          request.dependsOn.push(id)
-          request.url = request.url.replace(`$${index}`, `$${id}`)
+          const dependencyId = dependency[1]
+          const dependsOnRequest = requests.findLast(r => r.content_id == dependencyId) //> prefer content-id
+          if (!dependsOnRequest) {
+            continue
+          }
+          request.dependsOn.push(dependsOnRequest.id)
+          request.url = request.url.replace(`$${dependencyId}`, `$${dependsOnRequest.id}`)
         }
         if (request.url[1] === '$') request.url = request.url.slice(1)
       }
@@ -62,7 +66,7 @@ const parseStream = async function* (body, boundary) {
       requests.push(request)
     }
 
-    parser.initialize(HTTPParser.REQUEST, { type: 'HTTPINCOMINGMESSAGE' })
+    parser.initialize(HTTPParser.REQUEST, { type: 'HTTPINCOMINGMESSAGE' }, cds.env.odata.max_batch_header_size)
 
     if (typeof body === 'string') body = [body]
 

package/libx/odata/utils/index.js

@@ -278,9 +278,11 @@ const skipToken = (token, cqn) => {
 const calculateLocationHeader = (target, srv, result) => {
   const targetName = target.name.replace(`${srv.definition.name}.`, '')
   const filteredKeys = [...target.keys].filter(k => !k.isAssociation).map(k => k.name)
+  if (!filteredKeys.every(k => k in result)) return
+
   const keyValuePairs = filteredKeys.reduce((acc, key) => {
     const value = result[key]
-    if (value === undefined) return
+    if (value === undefined) return acc
     if (Buffer.isBuffer(value)) {
       acc[key] = value.toString('base64')
     } else {
@@ -290,7 +292,6 @@ const calculateLocationHeader = (target, srv, result) => {
     }
     return acc
   }, {})
-  if (!keyValuePairs) return
   let keys
   const entries = Object.entries(keyValuePairs)
   if (entries.length === 1) {

package/libx/odata/utils/metadata.js

@@ -1,5 +1,5 @@
 const { cds2edm } = require('./index')
-
+const cds = require('../../../lib')
 const { where2obj } = require('../../_runtime/common/utils/cqn')
 
 const _isNavToDraftAdmin = path => path.length > 1 && path[path.length - 1] === 'DraftAdministrativeData'
@@ -109,6 +109,36 @@ const _odataContext = (query, options) => {
     path += '/' + lastRef
   }
 
+  if (cds.env.odata.context_with_columns && query.SELECT && !isSingleton && !propertyAccess) {
+    const { columns } = query.SELECT
+    let containments = []
+
+    function processColumns(column) {
+      const refName = column.ref?.[0]
+      if (!refName) return ''
+
+      if (column.expand) {
+        // Process nested expands recursively
+        const expandSelects = column.expand.map(exp => processColumns(exp)).filter(Boolean)
+        return `${refName}(${expandSelects.join(',')})`
+      } else if (column.xpr) {
+        // Handle xpr cases
+        const xprRefName = column.xpr.find(item => item.ref?.[0])?.ref?.[0]
+        return xprRefName || ''
+      } else if (refName !== '*') {
+        return refName
+      }
+    }
+
+    columns.forEach(column => {
+      const result = processColumns(column)
+      if (result) {
+        containments.push(result)
+      }
+    })
+    if (containments.length) path += `(${containments.join(',')})`
+  }
+
   if ((!isCollection && !isSingleton && !propertyAccess) || (isNavToDraftAdmin && !propertyAccess)) {
     path += '/$entity'
   }

package/libx/outbox/index.js

@@ -287,7 +287,11 @@ function outboxed(srv, customOpts) {
             else await originalSrv.emit(_req)
           } catch (e) {
             LOG.error('Emit failed', { event: _req.event, cause: e })
-            if (isStandardError(e)) cds.exit(1)
+            if (isStandardError(e)) {
+              cds.log().error('❗️Uncaught', e)
+              await cds.shutdown(e)
+              return
+            }
           }
         }
         delete context[$stored_reqs]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds",
-  "version": "8.3.0",
+  "version": "8.4.0",
   "description": "SAP Cloud Application Programming Model - CDS for Node.js",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [
@@ -25,11 +25,10 @@
     "libx/",
     "srv/",
     "tasks/",
-    "server.js",
     "common.cds",
+    "server.js",
     "eslint.config.mjs",
-    "CHANGELOG.md",
-    "LICENSE"
+    "CHANGELOG.md"
   ],
   "engines": {
     "node": ">=18"

package/server.js

@@ -17,6 +17,24 @@ module.exports = async function cds_server (options) {
 
   // prepare express app
   const o = { ...options, __proto__:defaults }
+
+  // handle cluster mode
+  let WORKERS = o.workers || process.env.WORKERS || process.env.CDS_WORKERS
+  if (WORKERS) {
+
+    const LOG = cds.log('cluster|server')
+    const cluster = require('cluster')
+    if (cluster.isMaster) {
+      if (WORKERS in {true:1}) WORKERS = require('os').availableParallelism()
+      LOG.info (`Spawning ${WORKERS} workers...`)
+      for (let i=0; i < WORKERS; ) cluster.fork ({ id: ++i })
+      return { on(){}, once(){}, close(){} } // dummy http server
+    }
+
+    else LOG.info(`Worker ${process.env.id} started - pid: ${process.pid}`)
+    // and continue boostrapping cds.server below...
+  }
+
   const app = cds.app = o.app || express()
   cds.emit ('bootstrap', app)
 

package/lib/lazy.js

@@ -1,51 +0,0 @@
-/** @type <T> (target:T) => ({
-  with <X,Y,Z> (x:X, y:Y, z:Z): ( T & X & Y & Z )
-  with <X,Y> (x:X, y:Y): ( T & X & Y )
-  with <X> (x:X): ( T & X )
-}) */
-const extend = (target) => ({
-  with(...aspects) {
-    const excludes = _excludes[typeof target] || {}
-    for (let each of aspects) {
-      for (let p of Reflect.ownKeys(each)) {
-        if (p in excludes) continue
-        Reflect.defineProperty (target,p, Reflect.getOwnPropertyDescriptor(each,p))
-      }
-      if (is_class(target) && is_class(each)) {
-        extend(target.prototype).with(each.prototype)
-      }
-    }
-    return target
-  },
-})
-
-const _excludes = {
-  function: Object.assign(Object.create(null),{ name: 1, length: 2, arguments: 3, caller: 4, prototype: 5 }),
-  object: Object.assign(Object.create(null),{ constructor: 1 }),
-}
-
-/** @type <T>(target:T) => T */
-const lazify = (o) => {
-  if (o.constructor === module.constructor) return lazify_module(o)
-  for (let p of Reflect.ownKeys(o)) {
-    const d = Reflect.getOwnPropertyDescriptor(o,p)
-    if (is_lazy(d.value)) Reflect.defineProperty (o,p,{
-      set(v) { Reflect.defineProperty (this,p,{value:v,__proto__:d}) },
-      get() { return this[p] = d.value.call(this,p,this) },
-      configurable: true,
-    })
-  }
-  return o
-}
-
-const lazify_module = (module) => {
-  extend(module).with({ set exports(all) {
-    extend(module).with({ exports: lazify(all) })
-  }})
-  return (id) => (lazy) => module.require(id) // eslint-disable-line no-unused-vars
-}
-
-const is_lazy = (x) => typeof x === 'function' && /^(function\s?)?\(?lazy[,)\t =]/.test(x)
-const is_class = (x) => typeof x === 'function' && x.prototype && /^class\b/.test(x)
-
-module.exports = { extend, lazify, lazified:lazify }

package/lib/test/index.js

@@ -1,2 +0,0 @@
-// we might move cds-test.js here, but for now we just re-export it
-module.exports = require('../utils/cds-test')