@sap/cds 6.6.0 → 6.6.2

package/CHANGELOG.md

@@ -4,6 +4,28 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 6.6.2 - 2023-03-17
+
+### Fixed
+
+- Exception during `cds deploy` without mtx
+- Service name specified with `cds deploy --to hana:serviceName` takes precedence over environment variables.
+
+## Version 6.6.1 - 2023-03-09
+
+### Added
+
+- `cds.xt.TENANT_UPDATED` event is emitted once a tenant was extended
+
+### Fixed
+
+- `TypeError` when using the query API with an unknown target in x4 flavor
+- The setting for `cds.requires['cds.xt.DeploymentService'].lazyT0` is now recognized in the VS Code schema validation.
+- The HDI deployment `stdout` logs are now only visible for `DEBUG` level if triggered via `cds-mtxs`. They are also streamed to `logs/<tenant>.log` in case you need the full deployment output, even without `DEBUG` enabled.
+- `.forUpdate` when used for etags
+- Prevent `TypeError` if an existing draft does not have admin data
+- Outbound-streaming error handling
+
 ## Version 6.6.0 - 2023-02-27
 
 ### Added

package/bin/deploy/to-hana/hana.js

@@ -72,7 +72,7 @@ class HanaDeployer {
       }
 
       const hasVCAPEnv = Object.keys(vcapEnv).length > 0;
-      if (hasVCAPEnv) {
+      if (!serviceName && hasVCAPEnv) {
         await fs.mkdir(currentModelFolder, { recursive: true });
       } else {
         const { cfServiceInstanceName, cfServiceInstanceKeyName, serviceKey } =

package/bin/deploy/to-hana/hdiDeployUtil.js

@@ -5,8 +5,9 @@ const util = require('util');
 const execAsync = util.promisify(cp.exec);
 
 const cds = require('../../../lib');
-const { SILENT } = cds.log.levels;
 const LOG = cds.log ? cds.log('deploy') : console;
+const DEBUG = cds.debug('deploy');
+const { SILENT } = cds.log.levels;
 
 class HdiDeployUtil {
 
@@ -17,7 +18,7 @@ class HdiDeployUtil {
     }
 
     async deployTenant(dbDir, env) {
-        await this._executeDeploy(dbDir, env);
+        await this._executeDeploy(dbDir, env, true);
     }
 
     async deploy(dbDir, vcapEnv, options) {
@@ -89,7 +90,7 @@ class HdiDeployUtil {
 Add it either as a devDependency using 'npm install -D ${this.deployerName}' or install it globally using 'npm install -g ${this.deployerName}'.`);
         }
 
-        console.log(`Using HDI deployer from ${libPath}`)
+        LOG.info(`Using HDI deployer from ${libPath}`)
 
         // let any error go through and abort deploy
         return require(libPath);
@@ -109,29 +110,40 @@ Add it either as a devDependency using 'npm install -D ${this.deployerName}' or
     }
 
 
-    async _executeDeploy(dbDir, env) {
+    async _executeDeploy(dbDir, env, fromMtx) {
         const hdiDeployLib = await this._getHdiDeployLib(dbDir);
+        let writeStream
+        if (fromMtx) {
+            await cds.utils.mkdirp('logs')
+            writeStream = require('fs').createWriteStream(path.join(cds.root, 'logs', `${cds.context.tenant}.log`))
+        }
         return new Promise((resolve, reject) => {
             const callbacks = {
-                stderrCB: error => LOG.error(error.toString())
+                stderrCB: buffer => {
+                    LOG.error(buffer.toString())
+                    writeStream?.write(buffer)
+                },
             }
-            if (LOG.level !== SILENT) {
-                callbacks.stdoutCB = (data) => LOG.log(data.toString());
+            if (fromMtx) {
+                callbacks.stdoutCB = buffer => {
+                    DEBUG?.(buffer.toString())
+                    writeStream.write(buffer)
+                }
+            } else if (LOG.level !== SILENT) {
+                callbacks.stdoutCB = buffer => LOG.info(buffer.toString())
             }
-
             hdiDeployLib.deploy(dbDir, env, (error, response) => {
                 if (error) {
                     return reject(error);
                 }
-                if (response && response.exitCode && response.exitCode !== 0) {
+                if (response?.exitCode) {
                     let message = `HDI deployment failed with exit code ${response.exitCode}`
                     if (response.signal) message += `. ${response.signal}`
                     return reject(new Error(message));
                 }
                 return resolve();
-            }, callbacks
-            );
-        });
+            }, callbacks);
+        }).finally(() => writeStream?.end());
     }
 }
 

package/lib/env/schemas/cds-rc.json

@@ -342,6 +342,10 @@
                       "description": "HDI deployment parameters as defined on https://www.npmjs.com/package/@sap/hdi-deploy#supported-features"
                     }
                   }
+                },
+                "lazyT0": {
+                  "type": "boolean",
+                  "description": "Onboard bookkeeping t0 container at the first subscription."
                 }
               }
             }

package/lib/srv/srv-models.js

@@ -115,6 +115,7 @@ class ExtendedModels {
       })
       if (has_new_extensions) { // new extensions arrived -> refresh model in cache
         let [ tenant = undefined, toggles ] = key.split(':')
+        cds.emit('cds.xt.TENANT_UPDATED', { tenant })
         return _get_model4 (tenant, toggles.split(','))
       } else {                        // no new extensions...
         _cached.touched = Date.now() // check again in 1 min or so

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

@@ -147,13 +147,6 @@ const update = service => {
         previousResult = await readAfterWrite(req, service, { isBefore: true })
       }
 
-      // in case of express errors in streaming do rollback
-      const segments = odataReq.getUriInfo().getPathSegments()
-      if (isStreaming(segments)) {
-        odataReq.getIncomingRequest().on('error', async err => {
-          await tx.rollback(err).catch(() => {})
-        })
-      }
       // try UPDATE and, on 404 error, try CREATE
       ;[result, req] = await _updateThenCreate(req, odataReq, odataRes, tx)
 

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/deserializer/DeserializerFactory.js

@@ -127,16 +127,14 @@ class DeserializerFactory {
   static createBinaryDeserializer () {
     return (request, next) => {
       let type = request.getUriInfo() && request.getUriInfo().getFinalEdmType()
-      if (type && type.getKind() === EdmTypeKind.DEFINITION) type = type.getUnderlyingType()
+      if (type && type.getKind() === EdmTypeKind.DEFINITION) type = type.getUnderlyingType()      
       if (type && type === EdmPrimitiveTypeKind.Stream) {
-        next(
-          null,
-          request
-            .getIncomingRequest()
-            .on('error', next)
-            .pipe(new stream.PassThrough())
-            .on('error', next)
-        )
+        if (request.getIncomingRequest().complete) { // empty or NULL
+          next(null, request.getIncomingRequest())
+        } else {
+          const streamPipeline = stream.pipeline(request.getIncomingRequest(), new stream.PassThrough(), () => {})
+          next(null, streamPipeline)
+        }
       } else {
         request
           .getIncomingRequest()

package/libx/_runtime/common/generic/etag.js

@@ -7,26 +7,27 @@ const { ensureDraftsSuffix } = require('../../fiori/utils/handler')
 const { cqn2cqn4sql } = require('../../common/utils/cqn2cqn4sql')
 const { isAsteriskColumn } = require('../../common/utils/rewriteAsterisks')
 const ODataRequest = require('../../cds-services/adapter/odata-v4/ODataRequest')
+const { resolveView, getTransition } = require('../utils/resolveView')
 
 const C_U_ = {
   CREATE: 1,
   UPDATE: 1
 }
 
-const getSelectCQN = (query, target, model) => {
-  // REVISIT DRAFT HANDLING: this function is a hack until we solve drafts properly
-  let requestTarget
+const getRequestedTarget = query => {
   if (query.SELECT) {
-    requestTarget = query.SELECT.from
+    return query.SELECT.from
   } else if (query.UPDATE) {
-    requestTarget = query.UPDATE.entity
+    return query.UPDATE.entity
   } else {
-    requestTarget = query.DELETE.from
+    return query.DELETE.from
   }
+}
 
-  const targetName = isActiveEntityRequested(requestTarget.ref[0].where) ? target.name : ensureDraftsSuffix(target.name)
-  const cqn = cqn2cqn4sql(SELECT.from(requestTarget), model)
-  cqn.columns([target._etag.name])
+const getSelectCQN = (query, target, model, isActive, etag) => {
+  const targetName = isActive ? target.name : ensureDraftsSuffix(target.name)
+  const cqn = cqn2cqn4sql(SELECT.from(getRequestedTarget(query)), model)
+  cqn.columns([etag || target._etag.name])
   cqn.SELECT.from.ref[0] = targetName
 
   return cqn
@@ -81,8 +82,17 @@ const commonGenericEtag = async function (req) {
 
     // validate
     if (req.isConditional && !req.query.INSERT) {
-      let cqn = getSelectCQN(req.query, req.target, this.model)
-      if (req.query.UPDATE || req.query.DELETE) cqn = cqn.forUpdate()
+      let cqn
+      const isActive = isActiveEntityRequested(getRequestedTarget(req.query).ref[0].where)
+      if ((req.query.UPDATE || req.query.DELETE) && isActive) {
+        const query_ = resolveView(req.query, this.model, cds.db)
+        const transition = (query_.UPDATE && query_.UPDATE._transitions[0]) || query_.DELETE._transitions[0]
+        const etag = transition.mapping.get(req.target._etag.name).ref[0]
+        cqn = getSelectCQN(query_, transition.target, this.model, isActive, etag).forUpdate()
+      } else {
+        cqn = getSelectCQN(req.query, req.target, this.model, isActive)
+      }
+
       const result = await cds.tx(req).run(cqn)
 
       if (result.length === 1) {

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

@@ -276,6 +276,7 @@ const flattenStructuredSelect = ({ SELECT }, model) => {
 
   for (const entityNameAndId of entityNamesAndIds) {
     const entity = model.definitions[entityNameAndId.name]
+    if (!entity) return
     const tableId = entityNameAndId.id
 
     if (Array.isArray(SELECT.columns) && SELECT.columns.length > 0) {

package/libx/_runtime/fiori/generic/edit.js

@@ -132,6 +132,9 @@ const fioriGenericEdit = async function (req) {
       SELECT.one('DRAFT.DraftAdministrativeData', ['InProcessByUser', 'LastChangeDateTime']).where(draftExists[0])
     )
 
+    // temp check if draft admin data in not maintained - raise 500 error
+    if (!adminData) req.reject(500, 'Draft administrative data is not maintained')
+
     // draft is locked (default cancellation timeout timer has not expired) OR
     // draft is not locked but must be rejected for popup
     if (draftIsLocked(adminData.LastChangeDateTime) || req.data.PreserveChanges) {

package/package.json

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