@sap/cds 5.8.2 → 5.9.0

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

@@ -1,84 +1,100 @@
 const cds = require('../../../cds')
 const LOG = cds.log('odata')
+const { BASE_TENANT, channelName } = require('../../../common/utils/extensibilityUtils')
 
-const OData = require('./OData')
-
-const { alias2ref } = require('../../../common/utils/csn')
+const { SYSTEM_SERVICES, createOdataService, createNewService, getModelHash } = require('./utils/dispatcherUtils')
 
 const { normalizeError } = require('../../../common/error/frontend')
 
-function _createNewService(name, csn, defaultOptions) {
-  const reflectedModel = cds.linked(cds.compile.for.odata(csn))
-  const options = Object.assign({}, defaultOptions, { reflectedModel })
-
-  const service = new cds.ApplicationService(name, csn, options)
-  service.init()
-  if (options.impl) service.impl(options.impl)
-  service._isExtended = true
-
-  const edm = cds.compile.to.edm(csn, { service: name })
-  alias2ref(service, edm)
-
-  const odataService = new OData(edm, csn, options)
-  odataService.addCDSServiceToChannel(service)
-
-  return odataService
-}
-
 class Dispatcher {
   /**
-   * Constructs an Dispatcher for OData service.
-   * New OData services will be created in case of extensibility.
+   * Constructs an Dispatcher for cds service.
+   * New OData services will be created.
    *
-   * @param odata
+   * @param service
    */
-  constructor(odata) {
-    this._odata = odata
+  constructor(service) {
+    this._serviceName = service.definition.name
+    this._options = service.options
+
+    this._extMap = new Map()
+    this._extMap.set(getModelHash(BASE_TENANT, []), createOdataService(service))
+
+    if (cds.requires.extensibility && !SYSTEM_SERVICES.includes(this._serviceName)) {
+      cds.services['mtx-messaging'].on(channelName(), async msg => {
+        const tenant = msg.data.tenant
+        const hash = getModelHash(tenant, [])
+        for (const entry of this._extMap.entries()) {
+          if (entry[0].startsWith(hash)) {
+            this._extMap.delete(entry[0])
+          }
+        }
+      })
+    }
+
+    if (cds._mtxEnabled) {
+      cds.mtx.eventEmitter.on(cds.mtx.events.TENANT_UPDATED, async hash => {
+        this._extMap.delete(hash)
+      })
+    }
+  }
+
+  async _getService4Tenant(req) {
+    // here, req is express' req -> req.tenant not available
+    const tenant = req.user && req.user.tenant
+    const isExtended = await cds.mtx.isExtended(tenant) // REVISIT: avoid await
+    if (!isExtended) return false
+
+    const csn = await cds.mtx.getCsn(tenant)
+    const model = cds.compile.for.nodejs(csn)
+    const service = await createNewService(this._serviceName, model, this._options)
+    service._cdsService._isExtended = true
+    return service
+  }
+
+  async _getService4(tenant, features) {
+    const csn = await this._mps.getCsn(tenant, features || [], 'nodejs')
+    const model = cds.compile.for.nodejs(csn)
+    return createNewService(this._serviceName, model, this._options)
   }
 
-  _getService4Tenant(req) {
-    const {
-      user: { tenant }
-    } = req
+  async _getService(tenant, features, hash, req) {
+    if (cds._mtxEnabled) {
+      const service = await this._getService4Tenant(req)
 
-    // eslint-disable-next-line no-async-promise-executor
-    return new Promise(async (resolve, reject) => {
-      try {
-        const isExtended = await cds.mtx.isExtended(tenant)
-        if (!isExtended) return resolve(false)
+      if (service) return service
 
-        const csn = await cds.mtx.getCsn(tenant)
+      return this._extMap.get(getModelHash(BASE_TENANT, []))
+    }
 
-        resolve(_createNewService(this._odata._cdsService.definition.name, csn, this._odata._options))
-      } catch (e) {
-        reject(e)
+    if (!this._mps) this._mps = await cds.connect.to('cds_r.ModelProviderService')
+    const hashBase = getModelHash(BASE_TENANT, features)
+    if (tenant && tenant !== BASE_TENANT && hash !== hashBase) {
+      const isExtended = cds.requires.extensibility && (await this._mps.isExtended(tenant))
+      if (isExtended) {
+        return this._getService4(tenant, features)
+      } else {
+        if (!this._extMap.has(hashBase)) {
+          this._extMap.set(hashBase, this._getService4(BASE_TENANT, features))
+        }
+        return this._extMap.get(hashBase)
       }
-    })
+    } else {
+      return this._getService4(BASE_TENANT, features)
+    }
   }
 
-  _getService4Toggles(req) {
-    const {
-      user: { tenant }
-    } = req
-
-    // eslint-disable-next-line no-async-promise-executor
-    return new Promise(async (resolve, reject) => {
-      try {
-        if (!this._mps) this._mps = await cds.connect.to('ModelProviderService')
-
-        /*
-         * ModelProviderService:
-         *   action csn(tenant:TenantID, version:String, toggles: array of String) returns CSN;
-         *   action edmx(tenant:TenantID, version:String, toggles: array of String, service:String, locale:Locale, odataVersion:String) returns XML;
-         */
-        const toggles = (req.features && Object.keys(req.features)) || []
-        const csn = await this._mps.csn(tenant, 'dummy', toggles)
-
-        resolve(_createNewService(this._odata._cdsService.definition.name, csn, this._odata._options))
-      } catch (e) {
-        reject(e)
-      }
-    })
+  async _handleError(err, hash, req, res) {
+    if (LOG._error) {
+      err.message = 'Unable to get service from service map due to error: ' + err.message
+      LOG.error(err)
+    }
+    // clear map entry
+    this._extMap.delete(hash)
+    // return 503 to client
+    const { error } = normalizeError(Object.assign(err, { statusCode: 503 }), req)
+
+    return res.status(503).send({ error })
   }
 
   /**
@@ -91,46 +107,36 @@ class Dispatcher {
    */
   async dispatch(req, res) {
     // here, req is express' req -> req.tenant not available
-    if (cds._mtxEnabled && req.user && req.user.tenant) {
-      // enable mtx, if not done yet
-      if (!this._extMap) {
-        this._extMap = new Map()
-        cds.mtx.eventEmitter.on(cds.mtx.events.TENANT_UPDATED, async hash => {
-          this._extMap.delete(hash)
-        })
-      }
+    const tenant = req.user && req.user.tenant
 
-      const { alpha_toggles: alphaToggles } = cds.env.features
-
-      // here, req is express' req -> req.tenant not available
-      const hash = alphaToggles ? cds.mtx._getHash(req) : req.user.tenant
-
-      // add hash to map, if not done yet
-      if (!this._extMap.has(hash)) {
-        this._extMap.set(hash, alphaToggles ? this._getService4Toggles(req) : this._getService4Tenant(req))
-      }
+    if (SYSTEM_SERVICES.includes(this._serviceName) || (!tenant && !cds._mpsEnabled)) {
+      const service = this._extMap.get(getModelHash(BASE_TENANT, []))
+      return service.process(req, res)
+    }
 
-      // await extended service promise
-      let service
-      try {
-        service = await this._extMap.get(hash)
-      } catch (e) {
-        if (LOG._error) {
-          e.message = 'Unable to get service from service map due to error: ' + e.message
-          LOG.error(e)
-        }
-        // clear map entry
-        this._extMap.delete(hash)
-        // return 503 to client
-        const { error } = normalizeError(Object.assign(e, { statusCode: 503 }), req)
-        return res.status(503).send({ error })
-      }
+    // ensure features is an array (some stakeholders set req.features themselves)
+    const features = req.features
+      ? Array.isArray(req.features)
+        ? req.features
+        : Object.keys(req.features)
+            .filter(k => req.features[k])
+            .sort()
+      : []
+    const hash = getModelHash(tenant, features)
+
+    // set promise into the map to avoid conflicts
+    if (!this._extMap.has(hash)) {
+      this._extMap.set(hash, this._getService(tenant, features, hash, req))
+    }
 
-      // invoke extended service, if exists
-      if (service) return service.process(req, res)
+    let service
+    try {
+      service = await this._extMap.get(hash)
+    } catch (err) {
+      return this._handleError(err, hash, req, res)
     }
 
-    this._odata.process(req, res)
+    service.process(req, res)
   }
 
   /**

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

@@ -84,8 +84,8 @@ const _logger = {
   path: () => {},
   info: arg => LOG._info && _log('info', arg),
   warning: arg => LOG._warn && _log('warn', arg),
-  error: arg => LOG._error && _log('error', arg),
-  fatal: arg => LOG._error && _log('error', arg)
+  error: arg => _log('error', arg),
+  fatal: arg => _log('error', arg)
 }
 
 /**

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

@@ -79,7 +79,7 @@ class ODataRequest extends cds.Request {
     /*
      * data
      */
-    const data = getData(type, odataReq, service)
+    const data = getData(type, odataReq, service, target)
 
     /*
      * query

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

@@ -14,6 +14,12 @@ const { setStatusCodeAndHeader, getKeyProperty } = require('../../../../fiori/ut
 const { toODataResult, postProcess } = require('../utils/result')
 const { mergeJson } = require('../../../services/utils/compareJson')
 
+const _isAssocOrCompNotLocalized = (reqTarget, el) => {
+  return (
+    reqTarget.elements[el].isAssociation && (!reqTarget.texts || reqTarget.elements[el].target !== reqTarget.texts.name)
+  )
+}
+
 const _postProcessDraftActivate = async (req, result, service) => {
   // update req.data (keys needed in readAfterWrite)
   req.data = result
@@ -25,6 +31,13 @@ const _postProcessDraftActivate = async (req, result, service) => {
   result.HasActiveEntity = false
   result.HasDraftEntity = false
 
+  // remove children from result, excluding localized composition 'text'
+  if (!(cds.env.effective.odata.structs || cds.env.features.ucsn_struct_conversion)) {
+    for (const k in req.target.elements) {
+      if (_isAssocOrCompNotLocalized(req.target, k)) delete result[k]
+    }
+  }
+
   return result
 }
 

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

@@ -1,13 +1,7 @@
-const cds = require('../../../../cds')
+const localeFrom = require('../../../../../../lib/req/locale')
 const { toODataResult } = require('../utils/result')
 
 module.exports = (req, res, next) => {
-  const _ = {
-    req: req.getIncomingRequest(),
-    odataReq: req
-  }
-  const user = new cds.User()
-  Object.defineProperty(user, '_req', { enumerable: false, value: _.req })
-  const locale = user.locale
+  const locale = localeFrom(req.getIncomingRequest())
   next(null, toODataResult(locale))
 }

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

@@ -2,30 +2,10 @@ const cds = require('../../../../cds')
 const LOG = cds.log('odata')
 
 const { toODataResult } = require('../utils/result')
-
 const { normalizeError } = require('../../../../common/error/frontend')
 
-let _mps
-
-const _get4Tenant = async (tenant, locale, service) => {
-  if (cds._mtxEnabled && service._isExtended) {
-    const edmx = await cds.mtx.getEdmx(tenant, service.name, locale)
-    return edmx
-  }
-}
-
-const _get4Toggles = async (tenant, locale, service, req) => {
-  if (!_mps) _mps = await cds.connect.to('ModelProviderService')
-
-  /*
-   * ModelProviderService:
-   *   action csn(tenant:TenantID, version:String, toggles: array of String) returns CSN;
-   *   action edmx(tenant:TenantID, version:String, toggles: array of String, service:String, locale:Locale, odataVersion:String) returns XML;
-   */
-  const toggles = (req.features && Object.keys(req.features)) || []
-  const edmx = await _mps.edmx(tenant, 'dummy', toggles, service.name, locale, 'v4')
-
-  return edmx
+const _getMetadata4Tenant = async (tenant, locale, service) => {
+  return await cds.mtx.getEdmx(tenant, service.name, locale)
 }
 
 /**
@@ -37,20 +17,15 @@ const _get4Toggles = async (tenant, locale, service, req) => {
 const metadata = service => {
   return async (odataReq, odataRes, next) => {
     const req = odataReq.getIncomingRequest()
-
     const tenant = req.user && req.user.tenant
-
     // REVISIT: can we take locale from user, or is there some odata special wrt metadata?
     const locale = odataRes.getContract().getLocale()
 
     try {
       let edmx
 
-      if (tenant) {
-        const { alpha_toggles: alphaToggles } = cds.env.features
-        edmx = alphaToggles
-          ? await _get4Toggles(tenant, locale, service, req)
-          : await _get4Tenant(tenant, locale, service)
+      if (cds._mtxEnabled && service._isExtended) {
+        edmx = await _getMetadata4Tenant(tenant, locale, service)
       }
 
       if (!edmx) {

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

@@ -13,6 +13,7 @@ const {
     }
   }
 } = require('../okra/odata-server')
+const FUNCTION = { [BOUND_FUNCTION]: 1, [FUNCTION_IMPORT]: 1 }
 
 const { isCustomOperation } = require('../utils/request')
 const { actionAndFunctionQueries, getActionOrFunctionReturnType } = require('../utils/handlerUtils')
@@ -31,7 +32,7 @@ const { getSapMessages } = require('../../../../common/error/frontend')
  * @returns {boolean} - True if a function is invoked, else false.
  * @private
  */
-const _isFunction = segments => [BOUND_FUNCTION, FUNCTION_IMPORT].includes(segments[segments.length - 1].getKind())
+const _isFunction = segments => segments[segments.length - 1].getKind() in FUNCTION
 
 const _selectOrExpandInQueryOptions = queryOptions => {
   return queryOptions && (queryOptions.$select || queryOptions.$expand)

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

@@ -1,9 +1,10 @@
 const cds = require('../../../../cds')
 
-const { UNAUTHORIZED, FORBIDDEN, getRequiresAsArray } = require('../../../../auth/utils')
+const { UNAUTHORIZED, FORBIDDEN, getRequiresAsArray, isRestricted } = require('../../../../auth/utils')
 
 module.exports = srv => {
   const requires = getRequiresAsArray(srv.definition)
+  const restricted = isRestricted(srv)
 
   return (odataReq, odataRes, next) => {
     const req = odataReq.getBatchApplicationData()
@@ -18,7 +19,7 @@ module.exports = srv => {
     }
 
     // in case of $batch we need to challenge directly, as the header is not processed if in $batch response body
-    if (user && user._challenges && path.endsWith('/$batch')) {
+    if (path.endsWith('/$batch') && user && user._challenges && restricted) {
       res.set('WWW-Authenticate', user._challenges.join(';'))
       return next(UNAUTHORIZED)
     }

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

@@ -23,7 +23,7 @@ const _isUpsertAllowed = target => {
 const _infoForeignKeyInParent = (req, odataReq, odataRes, tx) => {
   const info = {}
   // keys not in data
-  if (req.target.keys && Object.keys(req.target.keys).some(key => Object.keys(req.data).includes(key))) {
+  if (req.target.keys && Object.keys(req.target.keys).some(key => key in req.data)) {
     return info
   }
 
@@ -62,7 +62,7 @@ const _create = async (req, odataReq, odataRes, tx) => {
       let parentKeyVal, parentUpdateRequired
       if (parentKeyObj.length !== 0 && parentKeyObj[0][key.parentElement.name] !== null) {
         parentKeyVal = parentKeyObj[0][key.parentElement.name]
-      } else if (key.childElement.type === 'cds.UUID' && key.childElement.key) {
+      } else if (key.childElement.isUUID && key.childElement.key) {
         parentUpdateRequired = true
         parentKeyVal = cds.utils.uuid()
       } else {

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/ExpressionToCQN.js

@@ -16,6 +16,8 @@ const _binaryOperatorToCQN = new Map([
   [BinaryOperatorKind.LT, '<']
 ])
 
+const LAMBDA_EXPRESSION = { [ResourceKind.ANY_EXPRESSION]: 1, [ResourceKind.ALL_EXPRESSION]: 1 }
+
 class ExpressionToCQN {
   constructor(entity, model, columns = []) {
     this._model = model
@@ -145,11 +147,7 @@ class ExpressionToCQN {
 
   _member(expression, operator) {
     const pathSegments = expression.getPathSegments()
-    if (
-      pathSegments.some(segment =>
-        [ResourceKind.ANY_EXPRESSION, ResourceKind.ALL_EXPRESSION].includes(segment.getKind())
-      )
-    ) {
+    if (pathSegments.some(segment => segment.getKind() in LAMBDA_EXPRESSION)) {
       return this._lambda(pathSegments, operator)
     }
 
@@ -252,7 +250,7 @@ class ExpressionToCQN {
 
     // add cds type to right operand for use in _convert
     if (left.ref && left.ref.length === 1 && this._entity && this._entity.elements[left.ref[0]]) {
-      expression.getRightOperand()._cdsType = this._entity.elements[left.ref[0]].type
+      expression.getRightOperand()._cdsType = this._entity.elements[left.ref[0]]._type
     }
 
     const right = this.parse(expression.getRightOperand())

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/expandToCQN.js

@@ -23,15 +23,14 @@ const getError = require('../../../../common/error')
  * @private
  */
 const _getExpandItem = (isAll, expandItems, name) => {
-  if (isAll) {
-    return null
-  }
+  if (isAll) return null
 
   return expandItems.find(item => {
     const pathSegments = item.getPathSegments()
     if (pathSegments[pathSegments.length - 1].getKind() === 'COUNT') {
       throw getError(501, 'EXPAND_COUNT_UNSUPPORTED')
     }
+
     const navigation = pathSegments[pathSegments.length - 1].getNavigationProperty()
     return navigation && navigation.getName() === name
   })
@@ -44,9 +43,7 @@ const _getExpandItem = (isAll, expandItems, name) => {
  * @private
  */
 const _notSupported = expandItem => {
-  if (!expandItem) {
-    return
-  }
+  if (!expandItem) return
 
   if (expandItem.getOption(QueryOptions.COUNT)) {
     throw getFeatureNotSupportedError(`Expand with query option "${QueryOptions.COUNT}"`)
@@ -73,24 +70,27 @@ const _getColumnsFromTargetType = (targetType, relatedEntity, all = false) => {
 
   if (all) {
     return getColumns(relatedEntity, { onlyNames: true, removeIgnore: true, filterDraft: false })
-      .filter(c => c !== 'DraftAdministrativeData_DraftUUID')
-      .map(c => ({
-        ref: [c]
+      .filter(column => column !== 'DraftAdministrativeData_DraftUUID')
+      .map(column => ({
+        ref: [column]
       }))
   }
 
-  return Object.keys(relatedEntity.keys)
-    .filter(k => !relatedEntity.keys[k].is2one && !relatedEntity.keys[k].is2many)
-    .map(element => ({
-      ref: [element]
-    }))
+  const columnNames = Object.values(relatedEntity.elements)
+    .filter(element => element['@odata.etag'])
+    .map(element => element.name)
+
+  const keyNames = Object.keys(relatedEntity.keys).filter(keyName => {
+    const key = relatedEntity.keys[keyName]
+    return !key.is2one && !key.is2many
+  })
+
+  columnNames.push(...keyNames)
+  return columnNames.map(element => ({ ref: [element] }))
 }
 
 const _getInnerSelect = expandItem => {
-  if (!expandItem) {
-    return []
-  }
-
+  if (!expandItem) return []
   return expandItem.getOption(QueryOptions.SELECT) || []
 }
 
@@ -110,6 +110,7 @@ const _getSelectedElements = (expandItem, targetType, relatedEntity, options) =>
     targetType.getProperties().forEach((value, key) => {
       if (!relatedEntity.keys[key]) proxy = false
     })
+
     if (proxy) {
       return _getColumnsFromTargetType(targetType, relatedEntity)
     }
@@ -181,9 +182,10 @@ const _getItemCQN = (model, name, navigationProperty, expandItem, options) => {
 
   // autoexposed entities now used . in csn and _ in edm
   const relatedEntity = findCsnTargetFor(entityName, model, namespace)
+  const expand = _getSelectedElements(expandItem, targetType, relatedEntity, options)
   const item = {
     ref: name, // ['structured', 'nested_', nestedAssocToOne] if expand on structured
-    expand: _getSelectedElements(expandItem, targetType, relatedEntity, options)
+    expand
   }
 
   item.expand.push(..._getInnerExpandItems(model, expandItem, targetType))
@@ -203,7 +205,6 @@ const _getItemCQN = (model, name, navigationProperty, expandItem, options) => {
     addLimit(item, top != null ? top : null, expandItem.getOption(QueryOptions.SKIP) || 0)
 
   _filter(item, expandItem.getOption(QueryOptions.FILTER))
-
   return item
 }
 
@@ -237,13 +238,15 @@ const expandToCQN = (model, expandItems, type, options) => {
     const expandItem = _getExpandItem(isAll, expandItems, name)
 
     if (isAll || expandItem) {
-      allElements.push(_getItemCQN(model, [name], navigationProperty, expandItem, options))
+      const itemCQN = _getItemCQN(model, [name], navigationProperty, expandItem, options)
+      allElements.push(itemCQN)
     }
   }
 
   // structured
   for (const expandItem of expandItems) {
     const pathSegments = expandItem.getPathSegments()
+
     if (pathSegments.length && pathSegments[0].getKind() === 'COMPLEX.PROPERTY') {
       const navigationProperty = _getNavigationProperty(pathSegments)
 

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/index.js

@@ -9,6 +9,7 @@ const readToCQN = require('./readToCQN')
 const updateToCQN = require('./updateToCQN')
 const createToCQN = require('./createToCQN')
 const deleteToCQN = require('./deleteToCQN')
+const parseToCqn = require('../../../../../odata/parseToCqn')
 
 /**
  * This method transforms an odata request into a CQN object.
@@ -22,7 +23,12 @@ const deleteToCQN = require('./deleteToCQN')
  * @returns {object} - The CQN object
  */
 module.exports = (component, service, target, data, odataReq, upsert) => {
-  const odata2cqn = cds.env.features.odata_new_parser
+  if (
+    cds.env.features.odata_new_parser &&
+    !(component in { 'BOUND.ACTION': 1, 'BOUND.FUNCTION': 1, 'FUNCTION.IMPORT': 1, 'ACTION.IMPORT': 1 })
+  ) {
+    return parseToCqn(component, service, target, data, odataReq, upsert)
+  }
 
   switch (component) {
     case DATA_CREATE_HANDLER:
@@ -30,7 +36,7 @@ module.exports = (component, service, target, data, odataReq, upsert) => {
     case DATA_DELETE_HANDLER:
       return deleteToCQN(service, odataReq)
     case DATA_READ_HANDLER:
-      return odata2cqn ? cds.odata.parse(odataReq, { service }) : readToCQN(service, target, odataReq)
+      return readToCQN(service, target, odataReq)
     case DATA_UPDATE_HANDLER:
       return updateToCQN(service, data, odataReq)
     case 'BOUND.ACTION':

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/uri/UriHelper.js

@@ -50,7 +50,7 @@ class UriHelper {
     if (value === null) return 'null'
     if (edmType === EdmPrimitiveTypeKind.String) return "'" + value.replace(REGEXP_SINGLE_QUOTE, "''") + "'"
     if (edmType === EdmPrimitiveTypeKind.Duration) return "duration'" + value + "'"
-    if (edmType === EdmPrimitiveTypeKind.Binary) return "binary'" + value + "'"
+    if (edmType === EdmPrimitiveTypeKind.Binary) return "binary'" + value.replace(/\//g, '_').replace(/\+/g, '-') + "'"
     if (edmType.getKind() === EdmTypeKind.DEFINITION) {
       return UriHelper.toUriLiteral(value, edmType.getUnderlyingType())
     }

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

@@ -1,5 +1,7 @@
 'use strict'
 
+const cds = require('../../../../../../cds')
+
 const stream = require('stream')
 const commons = require('../../odata-commons')
 const PrimitiveValueDecoder = commons.utils.PrimitiveValueDecoder

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

@@ -347,12 +347,9 @@ class ResourceJsonDeserializer {
       }
       const expectedTypeName =
         expectedType.getKind() === EdmTypeKind.PRIMITIVE ? expectedType.getName() : expectedType.getFullQualifiedName()
-      const typeName =
-        typeof value === 'string' &&
-        value.startsWith(isCollection ? '#Collection(' : '#') &&
-        value.endsWith(isCollection ? ')' : '')
-          ? value.substring(isCollection ? 12 : 1, value.length - (isCollection ? 1 : 0))
-          : null
+      const typeNameRegex = isCollection ? /^#?Collection\((.*)\)$/ : /^#?(.*)$/
+      const matchedTypeName = typeof value === 'string' && value.match(typeNameRegex)
+      const typeName = matchedTypeName && matchedTypeName[1]
       // The type name could be an alias-qualified name; for that case we have to do an EDM look-up.
       const fullQualifiedName =
         typeName && typeName.indexOf('.') > 0 && typeName.lastIndexOf('.') < typeName.length - 1
@@ -369,6 +366,8 @@ class ResourceJsonDeserializer {
         throw new DeserializationError(
           "The value of '" + name + "' must describe correctly the type '" + expectedType.getFullQualifiedName() + "'."
         )
+      } else {
+        delete structureValue[name]
       }
     } else if (name.endsWith(JsonAnnotations.BIND) && !isDelta) {
       const navigationPropertyName = name.substring(0, name.length - JsonAnnotations.BIND.length)

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/invocation/DispatcherCommand.js

@@ -34,11 +34,7 @@ class DispatcherCommand extends Command {
     super()
     this._request = request
     this._response = response
-
-    // dummy cache if alpha_toggles
-    if (cds.env.features.alpha_toggles) this._metadataCache = { get: () => {}, set: () => {} }
-    else this._metadataCache = metadataCache
-    
+    this._metadataCache = metadataCache
     this._componentManager = componentManager
     this._dispatcher = dispatcher
     this._logger = logger
@@ -78,7 +74,7 @@ class DispatcherCommand extends Command {
               locale,
               result.data.value
             )
-            if (!cds.env.features.alpha_toggles && !this._metadataCache.get(contract.getContentTypeInfo().getMimeType(), locale)) {
+            if (!this._metadataCache.get(contract.getContentTypeInfo().getMimeType(), locale)) {
               this._logger.info(
                 'Metadata size exceeds cache boundary. Use cds option odata.metadataCacheLimit to increase the cache size.'
               )