@sap/cds 8.9.3 → 9.0.2

package/libx/_runtime/common/aspects/any.js

@@ -27,39 +27,6 @@ const _isReadOnly = e => {
   )
 }
 
-const Relation = require('./relation')
-
-const _exposeRelation = relation => Object.defineProperty({}, '_', { get: () => relation })
-
-const _relationHandler = relation => ({
-  get: (target, name) => {
-    const path = name.split(',')
-    const prop = path.join('_')
-    if (!target[prop]) {
-      if (path.length === 1) {
-        // REVISIT: property 'join' must not be used in CSN to make this working
-        if (relation._has(prop)) return relation[prop]
-        const newRelation = Relation.to(relation, prop)
-        if (newRelation) {
-          target[prop] = new Proxy(_exposeRelation(newRelation), _relationHandler(newRelation))
-        }
-
-        return target[prop]
-      }
-
-      target[prop] = path.reduce((relation, value) => relation[value] || relation.csn._relations[value], relation)
-      target[prop].path = path
-    }
-
-    return target[prop]
-  }
-})
-
-const _getRelations = e => {
-  const newRelation = Relation.to(e)
-  return new Proxy(_exposeRelation(newRelation), _relationHandler(newRelation))
-}
-
 // NOTE: Please only add things which are relevant to _any_ type,
 // use specialized types otherwise (entity, Association, ...).
 module.exports = class {
@@ -83,11 +50,6 @@ module.exports = class {
     )
   }
 
-  // REVISIT: Where to put?
-  get _relations() {
-    return this.own('__relations', () => _getRelations(this))
-  }
-
   get _foreignKey4() {
     return this.own('__foreignKey4', () => foreignKey4(this))
   }

package/libx/_runtime/common/constants/events.js

@@ -1,13 +1,5 @@
-const MOD_EVENTS = { UPDATE: 1, DELETE: 1, EDIT: 1 }
-const WRITE_EVENTS = Object.assign({ CREATE: 1, NEW: 1, PATCH: 1, CANCEL: 1 }, MOD_EVENTS)
-const CRUD_EVENTS = Object.assign({ READ: 1 }, WRITE_EVENTS)
-const DRAFT_EVENTS = { PATCH: 1, CANCEL: 1, draftActivate: 1, draftPrepare: 1 }
-const CDS_EVENTS = Object.assign({}, CRUD_EVENTS, DRAFT_EVENTS)
-
-module.exports = {
-  MOD_EVENTS,
-  WRITE_EVENTS,
-  CRUD_EVENTS,
-  DRAFT_EVENTS,
-  CDS_EVENTS
-}
+exports.MOD_EVENTS = { UPDATE: 1, DELETE: 1, EDIT: 1 }
+exports.WRITE_EVENTS = { CREATE: 1, NEW: 1, PATCH: 1, CANCEL: 1, ...exports.MOD_EVENTS }
+exports.CRUD_EVENTS = { READ: 1, ...exports.WRITE_EVENTS }
+exports.DRAFT_EVENTS = { PATCH: 1, CANCEL: 1, draftActivate: 1, draftPrepare: 1 }
+exports.CDS_EVENTS = { ...exports.CRUD_EVENTS, ...exports.DRAFT_EVENTS }

package/libx/_runtime/common/generic/auth/autoexpose.js

@@ -1,6 +1,4 @@
-const cds = require('../../../../../lib')
-
-function noah_handler(req) {
+function check_autoexposed(req) {
   if (!req.subject) return
   const root = this.model.definitions[req.subject.ref[0].id || req.subject.ref[0]]
   if (!root) return
@@ -11,32 +9,20 @@ function noah_handler(req) {
    * Draft case is an exception. Direct requests are allowed.
    */
   if (!root._isDraftEnabled && root['@cds.autoexposed']) {
-    if (root['@cds.autoexpose']) {
-      if (req.event === 'READ') return //> allow read for value help requests
-      req.reject(405, 'ENTITY_IS_AUTOEXPOSE_READONLY', [root.name])
-    }
-    req.reject(405, 'ENTITY_IS_AUTOEXPOSED', [root.name])
+    if (!root['@cds.autoexpose']) return req.reject(405, 'ENTITY_IS_AUTOEXPOSED', [root.name])
+    if (req.event !== 'READ') return req.reject(405, 'ENTITY_IS_AUTOEXPOSE_READONLY', [root.name])
   }
-  const isAutoexposed = _isAutoexposed(req.target)
-  if (isAutoexposed && req.event !== 'READ') {
-    req.reject(405, 'ENTITY_IS_AUTOEXPOSE_READONLY', [req.target.name])
+  if (req.event !== 'READ' && _isAutoexposed(req.target)) {
+    return req.reject(405, 'ENTITY_IS_AUTOEXPOSE_READONLY', [req.target.name])
   }
 }
 
 const _isAutoexposed = entity => {
-  if (!entity) return false
-  return (entity['@cds.autoexpose'] && entity['@cds.autoexposed']) || entity.name.match(/\.DraftAdministrativeData$/)
-}
-
-// REVISIT: To be deleted after okra is removed
-function okra_handler(req) {
-  const isAutoexposed = _isAutoexposed(req.target)
-  if (isAutoexposed && req.event !== 'READ') {
-    req.reject(405, 'ENTITY_IS_AUTOEXPOSE_READONLY', [req.target.name])
-  }
+  if (!entity) return
+  if (entity['@cds.autoexpose'] && entity['@cds.autoexposed']) return true
+  if (entity.name.endsWith('.DraftAdministrativeData')) return true
 }
 
-const handler = cds.env.features.odata_new_adapter ? noah_handler : okra_handler
-handler._initial = true
+check_autoexposed._initial = true
 
-module.exports = handler
+module.exports = check_autoexposed

package/libx/_runtime/common/generic/auth/capabilities.js

@@ -1,15 +1,15 @@
-const { cqnFrom } = require('./utils')
-const { RESTRICTIONS } = require('./constants')
-
-const _getRestriction = (req, capability, capabilityReadByKey) => {
-  if (capabilityReadByKey !== undefined && req.query.SELECT?.one) {
-    return capabilityReadByKey
-  }
-  return capability
+const RESTRICTIONS = {
+  CREATE: 'InsertRestrictions.Insertable',
+  READ: 'ReadRestrictions.Readable',
+  READABLE_BY_KEY: 'ReadRestrictions.ReadByKeyRestrictions.Readable',
+  UPDATE: 'UpdateRestrictions.Updatable',
+  DELETE: 'DeleteRestrictions.Deletable'
 }
 
+const _getRestriction = (req, capability, capabilityReadByKey) =>
+  capabilityReadByKey !== undefined && req.query.SELECT?.one ? capabilityReadByKey : capability
+
 const _getNavigationRestriction = (target, path, annotation, req) => {
-  if (!target) return
   if (!Array.isArray(target['@Capabilities.NavigationRestrictions.RestrictedProperties'])) return
 
   const [restriction, operation] = annotation.split('.')
@@ -33,14 +33,15 @@ const _getNav = from => {
   return []
 }
 
-function handler(req) {
+function check_odata_constraints(req) {
   // TODO: Determine auth-relevant entity
   const annotation = RESTRICTIONS[req.event]
+  if (!annotation) return
+  if (!req.target) return
 
-  if (!req.target || !annotation) return
+  const from = req.subject
+  if (!from) return //> exit fast
 
-  const action = annotation.split('.').pop().toLowerCase()
-  const from = cqnFrom(req)
   const nav = _getNav(from)
 
   let navRestriction
@@ -61,11 +62,12 @@ function handler(req) {
     }
     if (lastTarget && navigation) {
       navRestriction = _getNavigationRestriction(lastTarget, navigation, annotation, req)
-    }
-    if (navRestriction === false) {
-      // REVISIT: rework exception with using target
-      const trgt = `${_localName(lastTarget)}.${navs.join('.')}`
-      req.reject(405, 'ENTITY_IS_NOT_CRUD_VIA_NAVIGATION', [_localName(req.target), action, trgt])
+      if (navRestriction === false) {
+        // REVISIT: rework exception with using target
+        const trgt = `${_localName(lastTarget)}.${navs.join('.')}`
+        const action = annotation.split('.').pop().toLowerCase() // REVISIT: .split.pop is an anti pattern !!
+        req.reject(405, 'ENTITY_IS_NOT_CRUD_VIA_NAVIGATION', [_localName(req.target), action, trgt])
+      }
     }
   }
 
@@ -77,10 +79,11 @@ function handler(req) {
       req.target['@Capabilities.' + RESTRICTIONS.READABLE_BY_KEY]
     ) === false
   ) {
+    const action = annotation.split('.').pop().toLowerCase() // REVISIT: .split.pop is an anti pattern !!
     req.reject(405, 'ENTITY_IS_NOT_CRUD', [_localName(req.target), action])
   }
 }
 
-handler._initial = true
+check_odata_constraints._initial = true
 
-module.exports = handler
+module.exports = check_odata_constraints

package/libx/_runtime/common/generic/auth/expand.js

@@ -40,7 +40,7 @@ const _getRestrictedExpand = (columns, target, definitions) => {
   }
 }
 
-function handler(req) {
+function restrict_expand(req) {
   if (!req.query) return
   const restricted = _getRestrictedExpand(
     req.query.SELECT && req.query.SELECT.columns,
@@ -50,6 +50,6 @@ function handler(req) {
   if (restricted) req.reject(400, 'EXPAND_IS_RESTRICTED', [restricted])
 }
 
-handler._initial = true
+restrict_expand._initial = true
 
-module.exports = handler
+module.exports = restrict_expand

package/libx/_runtime/common/generic/auth/index.js

@@ -41,7 +41,7 @@ module.exports = cds.service.impl(function authorization() {
   // }
 
   // mark entities that depend on ancestor for auth with that ancestor
-  const defs = this.model.definitions
+  const defs = this.model?.definitions
   for (const each of this.entities) {
     for (const k in each.compositions) {
       const c = each.compositions[k]
@@ -59,8 +59,8 @@ module.exports = cds.service.impl(function authorization() {
   }
 
   // service-level restrictions (not all requests are dispatched by protocol adapter with its early access check)
-  // REVISIT: make default in cds^9 -> remove feature flag completely or at least make it an opt-out
-  if (cds.env.features.service_level_restrictions) this.before('*', serviceHandler)
+  // REVISIT cds^10: remove opt-out
+  if (cds.env.features.service_level_restrictions !== false && this.definition) this.before('*', serviceHandler)
 
   /*
    * @requires

package/libx/_runtime/common/generic/auth/insertOnly.js

@@ -1,6 +1,6 @@
 const { getAuthRelevantEntity } = require('./utils')
 
-function handler(req) {
+function check_insertonly(req) {
   const entity = getAuthRelevantEntity(req, this.model, ['@insertonly'])
   if (!entity || !entity['@insertonly']) return
 
@@ -10,6 +10,6 @@ function handler(req) {
   }
 }
 
-handler._initial = true
+check_insertonly._initial = true
 
-module.exports = handler
+module.exports = check_insertonly

package/libx/_runtime/common/generic/auth/readOnly.js

@@ -1,7 +1,7 @@
 const { getAuthRelevantEntity } = require('./utils')
-const { WRITE_EVENTS } = require('./constants')
+const { WRITE_EVENTS } = require('../../constants/events')
 
-function handler(req) {
+function check_readonly(req) {
   // @read-only
   let entity = getAuthRelevantEntity(req, this.model, ['@readonly'])
   entity = entity?.actives || entity
@@ -10,6 +10,6 @@ function handler(req) {
   if (entity['@readonly'] && req.event in WRITE_EVENTS) req.reject(405, 'ENTITY_IS_READ_ONLY', [entity.name])
 }
 
-handler._initial = true
+check_readonly._initial = true
 
-module.exports = handler
+module.exports = check_readonly

package/libx/_runtime/common/generic/auth/requires.js

@@ -1,5 +1,5 @@
 const { reject, getRejectReason, getAuthRelevantEntity } = require('./utils')
-const { CRUD_EVENTS } = require('./constants')
+const { CRUD_EVENTS } = require('../../constants/events')
 
 const _getRequiresAsArray = definition =>
   definition['@requires']
@@ -8,7 +8,7 @@ const _getRequiresAsArray = definition =>
       : [definition['@requires']]
     : false
 
-function handler(req) {
+function check_auth_privileges(req) {
   if (req.user._is_privileged) {
     // > skip checks
     return
@@ -37,6 +37,6 @@ function handler(req) {
   reject(req, getRejectReason(req, '@requires', definition))
 }
 
-handler._initial = true
+check_auth_privileges._initial = true
 
-module.exports = handler
+module.exports = check_auth_privileges

package/libx/_runtime/common/generic/auth/restrict.js

@@ -2,8 +2,8 @@ const cds = require('../../../cds'),
   LOG = cds.log('auth')
 
 const { reject, getRejectReason, resolveUserAttrs, getAuthRelevantEntity } = require('./utils')
-const { DRAFT_EVENTS, MOD_EVENTS } = require('./constants')
-const { getNormalizedPlainRestrictions } = require('./restrictions')
+const { DRAFT_EVENTS, MOD_EVENTS } = require('../../constants/events')
+const { getNormalizedPlainRestrictions, getRestrictions } = require('./restrictions')
 
 const _hasRef = xpr => {
   for (const each of xpr) if (each.ref || (each.xpr && _hasRef(each.xpr))) return true
@@ -164,41 +164,23 @@ const _addRestrictionsToRead = async (req, model, resolvedApplicables) => {
 }
 
 const _getUnrestrictedCount = async req => {
-  const dbtx = cds.tx(req)
-
   const target =
     (req.query.UPDATE && req.query.UPDATE.entity) ||
     (req.query.DELETE && req.query.DELETE.from) ||
     (req.query.SELECT && req.query.SELECT.from)
-  const selectUnrestricted = SELECT.one(['count(*) as n']).from(target)
-
-  // REVISIT: remove with cds^9
-  if (cds.env.features.compat_restrict_where) {
-    const whereUnrestricted =
-      (req.query.UPDATE && req.query.UPDATE.where) || (req.query.DELETE && req.query.DELETE.where)
-    if (whereUnrestricted) selectUnrestricted.where(whereUnrestricted)
-  }
 
   // Because of side effects, the statements have to be fired sequentially.
-  const { n } = await dbtx.run(selectUnrestricted)
+  const { n } = await cds.run(SELECT.one(['count(*) as n']).from(target))
   return n
 }
 
 const _getRestrictedCount = async (req, model, resolvedApplicables) => {
-  const dbtx = cds.tx(req)
-
   const target =
     (req.query.UPDATE && req.query.UPDATE.entity) ||
     (req.query.DELETE && req.query.DELETE.from) ||
     (req.query.SELECT && req.query.SELECT.from)
   const selectRestricted = SELECT.one(['count(*) as n']).from(target)
 
-  // REVISIT: remove with cds^9
-  if (cds.env.features.compat_restrict_where) {
-    const whereRestricted = (req.query.UPDATE && req.query.UPDATE.where) || (req.query.DELETE && req.query.DELETE.where)
-    if (whereRestricted) selectRestricted.where(whereRestricted)
-  }
-
   if (typeof selectRestricted.SELECT === 'object') {
     selectRestricted.SELECT.from.ref = _addWheresToRef(selectRestricted.SELECT.from.ref, model, resolvedApplicables)
   }
@@ -206,11 +188,11 @@ const _getRestrictedCount = async (req, model, resolvedApplicables) => {
   const restrictionForTarget = _getRestrictionForTarget(resolvedApplicables, req.target)
   if (restrictionForTarget) selectRestricted.where(restrictionForTarget)
 
-  const { n } = await dbtx.run(selectRestricted)
+  const { n } = await cds.run(selectRestricted)
   return n
 }
 
-async function check_roles(req) {
+async function enforce_auth(req) {
   if (req.user._is_privileged || DRAFT_EVENTS[req.event]) {
     // > skip checks (events in DRAFT_EVENTS are checked in draft handlers via InProcessByUser)
     return
@@ -233,7 +215,8 @@ async function check_roles(req) {
     return
   }
 
-  let restrictions = this.getRestrictions.call(this, definition, req.event, req.user)
+  // REVISIT: that (this.getRestrictions||getRestrictions) thing below is for a bad test only!
+  let restrictions = (this.getRestrictions || getRestrictions)(definition, req.event, req.user)
   if (restrictions instanceof Promise) restrictions = await restrictions
 
   if (!restrictions) {
@@ -268,7 +251,7 @@ async function check_roles(req) {
   }
 
   // Instance based authorization for bound actions /functions
-  await restrictBoundActionFunctions(req, resolvedApplicables, definition, this)
+  await restrictBoundActionFunctions(req, resolvedApplicables, definition)
 
   // no modification -> nothing more to do
   if (!MOD_EVENTS[req.event]) return
@@ -293,12 +276,12 @@ const isBoundToCollection = action =>
   action['@cds.odata.bindingparameter.collection'] ||
   (action.params && Object.values(action.params).some(param => param?.items?.type === '$self'))
 
-const restrictBoundActionFunctions = async (req, resolvedApplicables, definition, srv) => {
+const restrictBoundActionFunctions = async (req, resolvedApplicables, definition) => {
   if (req.target?.actions?.[req.event] && !isBoundToCollection(req.target.actions[req.event])) {
     // Clone to avoid target modification, which would cause a different query
     const query = req.query ? cds.ql.clone(req.query) : SELECT.one.from(req.subject)
     _addRestrictionsToRead({ query: query, target: req.target }, cds.model, resolvedApplicables)
-    const result = await (cds.env.features.compat_restrict_bound ? srv : cds.tx(req)).run(query)
+    const result = await cds.db.run(query)
     if (!result || result.length === 0) {
       // If we got a result, we don't need to check for the existence, hence only in this special case we must determine if `404` or `403`.
       const unrestrictedCount = await _getUnrestrictedCount(req)
@@ -310,6 +293,6 @@ const restrictBoundActionFunctions = async (req, resolvedApplicables, definition
   }
 }
 
-check_roles._initial = true
+enforce_auth._initial = true
 
-module.exports = check_roles
+module.exports = enforce_auth

package/libx/_runtime/common/generic/auth/service.js

@@ -7,7 +7,7 @@ const _getRequiresAsArray = definition =>
       : [definition['@requires']]
     : false
 
-function handler(req) {
+function check_service_level_restrictions(req) {
   if (req.user._is_privileged) {
     // > skip checks
     return
@@ -19,6 +19,6 @@ function handler(req) {
   reject(req, getRejectReason(req, '@requires', this.definition))
 }
 
-handler._initial = true
+check_service_level_restrictions._initial = true
 
-module.exports = handler
+module.exports = check_service_level_restrictions

package/libx/_runtime/common/generic/auth/utils.js

@@ -1,7 +1,7 @@
 const cds = require('../../../cds')
 const LOG = cds.log('app')
 
-const { CRUD_EVENTS } = require('./constants')
+const { CRUD_EVENTS } = require('../../constants/events')
 
 const { getDraftTreeRoot } = require('../../utils/csn')
 
@@ -163,15 +163,6 @@ const _authDependsOnAncestor = (entity, annotations) => {
   )
 }
 
-const cqnFrom = req => {
-  const { query } = req
-  if (!query) return
-  if (query.SELECT) return query.SELECT.from
-  if (query.INSERT) return query.INSERT.into
-  if (query.UPDATE) return query.UPDATE.entity
-  if (query.DELETE) return query.DELETE.from
-}
-
 const getAuthRelevantEntity = (req, model, annotations) => {
   if (!req.target || !(req.event in CRUD_EVENTS)) return
 
@@ -179,7 +170,7 @@ const getAuthRelevantEntity = (req, model, annotations) => {
   if (!it) return req.target
   if (it?.kind === 'entity' && req.subject.ref?.length === 1) return it
 
-  let cqn = cqnFrom(req)
+  let cqn = req.subject
 
   // REVISIT: needed in draft for some reason
   if (typeof cqn === 'string') cqn = { ref: [cqn] }
@@ -218,6 +209,5 @@ module.exports = {
   reject,
   getRejectReason,
   resolveUserAttrs,
-  cqnFrom,
   getAuthRelevantEntity
 }

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

@@ -1,58 +1,46 @@
 const cds = require('../../cds')
 const { SELECT } = cds.ql
 
-const { deepCopy } = require('../utils/copy')
-const { getColumns } = require('../utils/columns')
-const { enhanceStreamResult } = require('../utils/stream')
-const getError = require('../error')
-
 const _targetEntityDoesNotExist = async req => {
-  const exists = await cds.tx(req).run(SELECT.from(req.subject, [1]))
+  const exists = await cds.run(SELECT.from(req.subject, [1]))
   return exists.length === 0
 }
 
-exports.impl = cds.service.impl(function () {
-  this.on(['CREATE', 'READ', 'UPDATE', 'DELETE', 'UPSERT'], '*', async function (req) {
-    if (!req.query) {
-      throw getError({
-        code: 501,
-        message: 'The request has no query and cannot be served generically.'
-      })
-    }
-    if (typeof req.query !== 'string' && req.target && req.target._hasPersistenceSkip) {
-      throw getError({
-        code: 501,
-        message: `Entity "${req.target.name}" is annotated with "@cds.persistence.skip" and cannot be served generically.`
-      })
-    }
+module.exports = cds.service.impl(function () {
+  // prettier-ignore
+  this.on(['CREATE', 'READ', 'UPDATE', 'DELETE', 'UPSERT'], '*', async function handle_crud_requests(req) {
+
+    if (!cds.db)
+      return req.reject ('NO_DATABASE_CONNECTION') // REVISIT: error message
 
-    // REVISIT: error message
-    if (!cds.db) req.reject('NO_DATABASE_CONNECTION')
+    if (!req.query)
+      return req.reject (501, 'The request has no query and cannot be served generically.')
 
-    let result
+    if (typeof req.query !== 'string' && req.target?._hasPersistenceSkip)
+      return req.reject (501, `Entity "${req.target.name}" is annotated with "@cds.persistence.skip" and cannot be served generically.`)
 
     // validate that all elements in path exist on db, if necessary
     // - INSERT has no where clause to do this in one roundtrip
     // - SELECT returns [] -> really empty collection or invalid path?
-    let pathExistsQuery
-
-    const { ref } = (req.query.INSERT && req.query.INSERT.into) || (req.query.SELECT && req.query.SELECT.from) || {}
-    // REVISIT: why is copy necessary?
-    if (ref && ref.length > 1) pathExistsQuery = SELECT(1).from({ ref: deepCopy(ref.slice(0, -1)) })
+    const subject = req.query.INSERT?.into || req.query.SELECT?.from
+    const pathExistsQuery = subject?.ref?.length > 1 && SELECT(1).from({ ref: subject.ref.slice(0,-1) })
 
     if (req.event === 'CREATE' && pathExistsQuery) {
+      // REVISIT: Why dont't we just run the insert and check affected rows?
       const res = await pathExistsQuery
       if (res.length === 0) req.reject(404)
     }
 
-    if (req.event in { DELETE: 1, UPDATE: 1 } && req.target && req.target._isSingleton) {
-      if (req.event === 'DELETE' && !req.target['@odata.singleton.nullable']) req.reject(400, 'SINGLETON_NOT_NULLABLE')
+    if (req.event in { DELETE: 1, UPDATE: 1 } && req.target?._isSingleton) {
+      if (req.event === 'DELETE' && !req.target['@odata.singleton.nullable'])
+        return req.reject (400, 'SINGLETON_NOT_NULLABLE')
+
       const selectSingleton = SELECT.one(req.target)
-      const keyColumns = getColumns(req.target, { onlyNames: true, keysOnly: true })
+      const keyColumns = [...(req.target.keys||[])].filter(e => !e.isAssociation).map(e => e.name)
 
       // if no keys available, select all columns so we can delete the singleton with same content
       if (keyColumns.length) selectSingleton.columns(keyColumns)
-      const singleton = await cds.tx(req).run(selectSingleton)
+      const singleton = await cds.run(selectSingleton)
       if (!singleton) req.reject(404)
 
       // REVISIT: Workaround for singleton, to get keys into singleton
@@ -64,13 +52,9 @@ exports.impl = cds.service.impl(function () {
       req.query.where(singleton)
     }
 
-    if (req.event === 'READ' && req.query?.SELECT) {
-      req.query.SELECT.localized ??= true
-    }
+    if (req.event === 'READ' && req.query?.SELECT && req.locale) req.query.SELECT.localized ??= true
 
-    if (!result) {
-      result = await cds.tx(req).run(req.query, req.data)
-    }
+    const result = await cds.run (req.query, req.data)
 
     if (req.event === 'READ') {
       // do not execute additional select to distinguish between 412 and 404
@@ -81,12 +65,6 @@ exports.impl = cds.service.impl(function () {
         if (res.length === 0) req.reject(404)
       }
 
-      if (cds.env.features.stream_compat) {
-        if (result !== undefined && req.query?._streaming && (result === null || result.pipe)) {
-          return { value: result }
-        }
-      }
-
       return result
     }
 
@@ -106,13 +84,4 @@ exports.impl = cds.service.impl(function () {
 
     return req.data
   })
-
-  this.after('READ', '*', async function ([result], req) {
-    if (!result) return
-    if (cds.env.features.stream_compat) {
-      if (req.query?._streaming) {
-        await enhanceStreamResult(req, req.query, result, this.model)
-      }
-    }
-  })
 })