@sap/cds 7.9.4 → 8.0.4

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

@@ -1,4 +1,5 @@
 const cds = require('../../../../cds')
+
 const { isStandardError } = require('../../../../common/error/standardError')
 
 const { StatusCodes: HttpStatusCodes } = require('../okra/odata-commons/http/HttpStatusCode')
@@ -21,7 +22,7 @@ const ERROR_TO_HTTP_CODE = {
   DeserializationError: HttpStatusCodes.BAD_REQUEST
 }
 
-const { normalizeError } = require('../../../../common/error/frontend')
+const { normalizeError, unwrapMultipleErrors } = require('../../../../common/error/frontend')
 
 const _beautifyMessage = msg => (msg.endsWith('.') ? msg : msg + '.')
 
@@ -83,7 +84,6 @@ const _betterOkraError = err => {
  * @returns {Function}
  */
 const getErrorHandler = (crashOnError = true, srv) => {
-  // eslint-disable-next-line complexity
   return async (odataReq, odataRes, next, err) => {
     // REVISIT: crashOnError
     if (isStandardError(err) && crashOnError) {
@@ -124,7 +124,7 @@ const getErrorHandler = (crashOnError = true, srv) => {
         // lost cds.context -> as we fixed that we don't get into this if branch anymore,
         // but then the ctx in the else branch below isn't the ODataRequest anymore
         // > error before req was dispatched
-        const creq = new cds.Request({ req, res: req.res, user: req.user || new cds.User.default() })
+        const creq = new cds.Request({ req, res: req.res, user: cds.context.user })
         for (const each of srv._handlers._error) each.handler.call(srv, err, creq)
       } else if (ctx._tx?._done !== 'rolled back') {
         // > error after req was dispatched, e.g., serialization error in okra
@@ -146,18 +146,12 @@ const getErrorHandler = (crashOnError = true, srv) => {
     }
 
     const { error, statusCode } = normalizeError(err, req)
+
     // REVISIT: We should also pass stack traces in development
     // if (!cds.env.production) error.stack = err.stack
 
-    if (cds.env.fiori.wrap_multiple_errors === false) {
-      // According to the Fiori Elements Failed Message specification, the format must be:
-      // Root level: First error, Details: Other errors
-      if (error.details) {
-        const [firstDetail, ...restDetails] = error.details
-        Object.assign(error, firstDetail)
-        if (restDetails.length) error.details = restDetails
-        else delete error.details
-      }
+    if (error.details && cds.env.fiori.wrap_multiple_errors === false) {
+      unwrapMultipleErrors(error)
     }
 
     next(null, Object.assign(error, { statusCode }))

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

@@ -20,9 +20,7 @@ const mpSupportsEmptyLocale = () => {
 const metadata = service => {
   return async (odataReq, odataRes, next) => {
     const req = odataReq.getIncomingRequest()
-    const tenant = req.tenant ?? req.user?.tenant
-    // REVISIT: can we take locale from user, or is there some odata special wrt metadata?
-    const locale = odataRes.getContract().getLocale()
+    const { tenant, locale } = cds.context
 
     try {
       const { 'cds.xt.ModelProviderService': mps } = cds.services

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

@@ -252,7 +252,6 @@ const _reliablePagingPossible = req => {
  * @returns {Promise}
  * @private
  */
-// eslint-disable-next-line complexity
 const _readCollection = async (tx, req, odataReq) => {
   const result = (await tx.dispatch(req)) || []
 

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

@@ -7,16 +7,13 @@ module.exports = srv => {
   const containsRestrictions = containsAnyRestrictions(srv)
   const accessRestrictions = getAccessRestrictions(srv)
 
-  // eslint-disable-next-line complexity
   return function ODataRequestHandler(odataReq, odataRes, next) {
     const req = odataReq.getBatchApplicationData()
       ? odataReq.getBatchApplicationData().req
       : odataReq.getIncomingRequest()
 
-    // ensure there always is a user going forward (not always the case with old or custom auth)
-    if (!req.user) req.user = new cds.User.default()
-
-    const { res, user, path, headers } = req
+    const { res, path, headers } = req
+    const { user } = cds.context
 
     const { protectMetadata } = cds.env.odata
     if (protectMetadata === false && (path === '/' || path.endsWith('/$metadata'))) {
@@ -25,7 +22,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 (containsRestrictions && path.endsWith('/$batch') && req.user._is_anonymous) {
+    if (containsRestrictions && path.endsWith('/$batch') && user._is_anonymous) {
       // NOTE: "return req._login()" would not invoke custom error handlers
       if (req._login) res.set('www-authenticate', `Basic realm="Users"`)
       else if (user._challenges) res.set('www-authenticate', user._challenges.join(';'))
@@ -35,7 +32,7 @@ module.exports = srv => {
     // check @restrict and @requires as soon as possible (DoS)
     if (!accessRestrictions.some(r => user.is(r))) {
       // > unauthorized or forbidden?
-      if (req.user._is_anonymous) {
+      if (user._is_anonymous) {
         // NOTE: "return req._login()" would not invoke custom error handlers
         if (req._login) res.set('www-authenticate', `Basic realm="Users"`)
         else if (user._challenges) res.set('www-authenticate', user._challenges.join(';'))

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

@@ -14,14 +14,19 @@ const { hasOmitValuesPreference } = require('../utils/omitValues')
 
 const { getSapMessages } = require('../../../../common/error/frontend')
 
+const _extractIfNoneMatch = header => {
+  if (header) {
+    if (header.startsWith('W/')) header = header.substring(2)
+    if (header.startsWith('"') && header.endsWith('"')) header = header.substring(1, header.length - 1)
+  }
+
+  return header
+}
+
 const _isUpsertAllowed = req => {
   return (
     !(cds.env.runtime && cds.env.runtime.allow_upsert === false) &&
-    !(
-      req.target &&
-      req.target._isDraftEnabled &&
-      (!cds.env.fiori.lean_draft || (!req.data.IsActiveEntity && req.event === 'PATCH'))
-    )
+    !(req.target && req.target._isDraftEnabled && !req.data.IsActiveEntity && req.event === 'PATCH')
   )
 }
 
@@ -102,7 +107,8 @@ const _updateThenCreate = async (req, odataReq, odataRes, tx) => {
   } catch (e) {
     const is404 = e.code === 404 || e.status === 404 || e.statusCode === 404
     const isForcedInsert =
-      (e.code === 412 || e.status === 412 || e.statusCode === 412) && req.headers['if-none-match'] === '*'
+      (e.code === 412 || e.status === 412 || e.statusCode === 412) &&
+      _extractIfNoneMatch(req.headers?.['if-none-match']) === '*'
     if ((is404 || isForcedInsert) && _isUpsertAllowed(req)) {
       // PUT/ PATCH with if-match header means "only if already exists", i.e., no insert if not
       if (req.headers['if-match']) {

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

@@ -56,7 +56,7 @@ class ExpressionToCQN {
             // cut off ms if cds.DateTime
             return { val: new Date(value).toISOString().replace(/\.\d\d\dZ$/, 'Z') }
           return { val: normalizeTimestamp(value) }
-        } catch (e) {
+        } catch {
           throw Object.assign(new Error(`The type Edm.DateTimeOffset is not compatible with "${value}"`), {
             status: 400
           })
@@ -189,14 +189,13 @@ class ExpressionToCQN {
           ele.list = JSON.parse(ele.val).map(ele => ({ val: ele }))
           delete ele.val
         }
-      } catch (e) {
+      } catch {
         // ignore
       }
     }
     return operator ? [operator, { func: `${methodName}`, args }] : { func: `${methodName}`, args }
   }
 
-  /* eslint-disable complexity */
   /**
    * Evaluate an method expression, which in SQL would be 'column condition value'.
    * Can also be nested.
@@ -241,7 +240,6 @@ class ExpressionToCQN {
         throw getFeatureNotSupportedError(`Method "${method}" in $filter or $orderby query options`)
     }
   }
-  /* eslint-enable complexity */
 
   _ensureArr(something) {
     return Array.isArray(something) ? something : [something]

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

@@ -230,6 +230,7 @@ const applyToCQN = (transformations, entity, model) => {
         break
       default: {
         const numericKind = transformation.getKind()
+        // eslint-disable-next-line no-unused-vars
         const stringKind = Object.entries(TransformationKind).find(([_, v]) => v === numericKind)?.[0]
         throw getFeatureNotSupportedError(`Transformation "${stringKind || numericKind}" with query option $apply`)
       }

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

@@ -222,7 +222,7 @@ const expandToCQN = (expandItems, type, service, options) => {
   const allElements = []
   const isAll = expandItems.some(item => item.isAll())
 
-  for (const [name, navigationProperty] of type.getNavigationProperties(isAll)) {
+  for (const [name, navigationProperty] of type.getNavigationProperties()) {
     const expandItem = _getExpandItem(isAll, expandItems, name)
 
     if (isAll || expandItem) {

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

@@ -40,7 +40,6 @@ const parseToCqn = (component, service, target, data, odataReq, upsert) => {
         return DELETE.from(_target)
       }
     case 'UPDATE':
-      // eslint-disable-next-line no-throw-literal
       if (!one) throw { statusCode: 400, code: '400', message: `INVALID_${odataReq.getMethod()}` }
       return UPDATE(_target).data(data)
     default:

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

@@ -44,8 +44,7 @@ const { isStreaming } = require('../utils/stream')
 const { getPageSize } = require('../../../../common/generic/paging')
 const { isAsteriskColumn } = require('../../../../common/utils/rewriteAsterisks')
 const { handleStreamProperties } = require('../../../../common/utils/streamProp')
-
-const { ensureUnlocalized } = require('../../../../fiori/utils/handler')
+const { ensureUnlocalized } = require('../../../../common/utils/draft')
 
 const { skipToken: handleSkipToken } = require('../../../../../odata/utils')
 
@@ -309,7 +308,6 @@ const _skipToken = (token, cqn) => {
  * @param {object} odataReq - OKRA's req
  * @private
  */
-// eslint-disable-next-line complexity
 const readToCQN = (service, target, odataReq) => {
   const uriInfo = odataReq.getUriInfo()
   const segments = uriInfo.getPathSegments()

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

@@ -195,7 +195,7 @@ const getSegmentKeyValue = segmentParam => {
     try {
       val = value === 'undefined' ? undefined : JSON.parse(value)
       return { keyName, val }
-    } catch (e) {
+    } catch {
       // plain string
     }
     val = _parsePrimitiveValue(edmRef, value) //> REVISIT: undefined handling needed here as well?

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/edm/AbstractEdmStructuredType.js

@@ -190,11 +190,10 @@ class AbstractEdmStructuredType extends EdmType {
    * Returns a map of navigation properties including those from base type.
    * @returns {Map.<string, EdmNavigationProperty>} A Map of navigation properties
    */
-  getNavigationProperties (ignoreSibling) {
+  getNavigationProperties () {
     if (!this._navigationProperties) {
       this._navigationProperties = new Map(this.getBaseType() ? this.getBaseType().getNavigationProperties() : [])
       for (const [name, property] of this.getOwnNavigationProperties()) {
-        if (!cds.env.fiori.lean_draft && ignoreSibling && name === 'SiblingEntity') continue; // This will cause subtle caching bugs but will enable expand=* in old draft
         this._navigationProperties.set(name, property)
       }
     }

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

@@ -214,6 +214,11 @@ class ResourceJsonDeserializer {
         throw new DeserializationError(`Parameter '${paramName}' is not nullable`)
       }
 
+      if (edmParam.isCollection() && !paramValue) {
+        if (paramValue === undefined) break
+        throw new DeserializationError(`'${edmParam.getName()}' must be a collection.`)
+      }
+
       if (paramValue === undefined) {
         // OData JSON Format Version 4.0 Plus Errata 03 - 17 Action Invocation:
         // "Any parameter values not specified in the JSON object are assumed to have the null value."

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/serializer/ContextURLFactory.js

@@ -354,7 +354,7 @@ class ContextURLFactory {
         // Define a local function because navigation properties must be searched recursively.
         const getExpandPaths = structuredType => {
           let structureResult = []
-          for (const name of structuredType.getNavigationProperties(true).keys()) structureResult.push(name)
+          for (const name of structuredType.getNavigationProperties().keys()) structureResult.push(name)
           for (const [name, property] of structuredType.getProperties()) {
             if (property.getType().getKind() === EdmTypeKind.COMPLEX) {
               for (const innerPath of getExpandPaths(property.getType())) {

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

@@ -160,53 +160,35 @@ const _addForeignKeys = (service, odataReq, data) => {
   }
 }
 
-const _getFunctionParameters = (lastSegment, keyValues, service, target, odataReq) => {
-  const { cds_assert: CDS_ASSERT } = cds.env.features
-
+const _getFunctionParameters = (lastSegment, keyValues, service, target) => {
   const functionParameters = lastSegment.getFunctionParameters()
   const paramValues = _getParamData(functionParameters)
 
   // Working assumption for the case of name collisions: take the entity's key
   for (const key in keyValues) paramValues[key] = keyValues[key]
 
-  let assertTarget
-
   const errors = []
   if (lastSegment.getKind() === 'BOUND.FUNCTION') {
     const targetFunction = target && target.actions && target.actions[lastSegment.getFunction().getName()]
     if (!targetFunction.params) return {}
-    if (!CDS_ASSERT) convertStructured(service, targetFunction, paramValues, { errors })
-    else assertTarget = targetFunction
+    convertStructured(service, targetFunction, paramValues, { errors })
   } else if (lastSegment.getKind() === 'FUNCTION.IMPORT') {
     const { namespace, name } = lastSegment.getFunctionImport().getFullQualifiedName()
     const targetFunction = service.model && service.model.definitions[`${namespace}.${name}`]
     if (!targetFunction.params) return {}
-    if (!CDS_ASSERT) convertStructured(service, targetFunction, paramValues, { errors })
-    else assertTarget = targetFunction
+    convertStructured(service, targetFunction, paramValues, { errors })
   }
 
   if (errors.length > 1) throw Object.assign(new Error(MULTIPLE_ERRORS), { details: errors })
   if (errors.length === 1) throw errors[0]
 
-  if (CDS_ASSERT) {
-    const assertOptions = { filter: true, http: { req: odataReq.getIncomingRequest() } }
-    const errs = cds.assert(paramValues, assertTarget, assertOptions)
-    if (errs) {
-      if (errs.length === 1) throw errs[0]
-      throw Object.assign(new Error('MULTIPLE_ERRORS'), { statusCode: 400, details: errs })
-    }
-  }
-
   return paramValues
 }
 
 const _getCopiedData = (odataReq, segments, service, target) => {
-  const { cds_assert: CDS_ASSERT } = cds.env.features
-
   const lastSegment = segments[segments.length - 1]
 
   let data = odataReq.getBody() || {}
-  let assertTarget = target
 
   if (lastSegment.getKind() === 'PRIMITIVE.PROPERTY') {
     data = { [lastSegment.getProperty().getName()]: data }
@@ -224,20 +206,18 @@ const _getCopiedData = (odataReq, segments, service, target) => {
     if (lastSegment.getKind() === 'BOUND.ACTION') {
       const targetAction = target.actions && target.actions[lastSegment.getAction().getName()]
       if (!targetAction || !targetAction.params) return { data: {} }
-      if (!CDS_ASSERT) convertStructured(service, targetAction, data)
-      else assertTarget = targetAction
+      convertStructured(service, targetAction, data)
     } else if (lastSegment.getKind() === 'ACTION.IMPORT') {
       const { namespace, name } = lastSegment.getActionImport().getFullQualifiedName()
       const targetAction = service.model && service.model.definitions[`${namespace}.${name}`]
       if (!targetAction || !targetAction.params) return { data: {} }
-      if (!CDS_ASSERT) convertStructured(service, targetAction, data)
-      else assertTarget = targetAction
+      convertStructured(service, targetAction, data)
     } else {
-      if (!CDS_ASSERT) convertStructured(service, target, data)
+      convertStructured(service, target, data)
     }
   }
 
-  return { data, assertTarget }
+  return data
 }
 
 /**
@@ -263,7 +243,7 @@ const getData = (component, odataReq, service, target) => {
   const keyValues = _getParamData(keyPredicates)
 
   if (component === DATA_READ_HANDLER && _isFunctionInvocation(odataReq)) {
-    return _getFunctionParameters(lastSegment, keyValues, service, target, odataReq)
+    return _getFunctionParameters(lastSegment, keyValues, service, target)
   }
 
   if (component === DATA_DELETE_HANDLER || component === DATA_READ_HANDLER) {
@@ -274,7 +254,7 @@ const getData = (component, odataReq, service, target) => {
   }
 
   // copy so that original payload is preserved
-  const { data, assertTarget } = _getCopiedData(odataReq, segments, service, target)
+  const data = _getCopiedData(odataReq, segments, service, target)
 
   // Only to be done for post via navigation
   if (
@@ -295,20 +275,6 @@ const getData = (component, odataReq, service, target) => {
     Array.isArray(data) ? Object.assign(data[0], keyValues) : Object.assign(data, keyValues)
   }
 
-  // we need the (foreign) keys from the URL before asserting -> we can't assert in _getCopiedData()
-  if (cds.env.features.cds_assert && assertTarget) {
-    const assertOptions = {
-      filter: true,
-      http: { req: odataReq.getIncomingRequest() },
-      mandatories: component === 'CREATE' || undefined
-    }
-    const errs = cds.assert(data, assertTarget, assertOptions)
-    if (errs) {
-      if (errs.length === 1) throw errs[0]
-      throw Object.assign(new Error('MULTIPLE_ERRORS'), { statusCode: 400, details: errs })
-    }
-  }
-
   return data
 }
 

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

@@ -308,7 +308,6 @@ const _partialCopyColumns = query => {
   return []
 }
 
-// eslint-disable-next-line complexity
 const _getPathInfo = (query, model) => {
   const queryFrom =
     (query.SELECT && resolveFromSelect(query)) ||

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

@@ -1,4 +1,3 @@
-const { removeDraftUUIDIfNecessary } = require('../../../../fiori/utils/handler')
 const cds = require('../../../../cds')
 const {
   Request,
@@ -10,13 +9,19 @@ const { hasDeepUpdate } = require('../../../../common/composition/update')
 const { WRITE_EVENTS, CDS_EVENTS } = require('../../../../common/constants/events')
 const { addEtagColumns } = require('../../../../common/utils/etag')
 
+// Only works for root entity, otherwise the relative position needs to be adapted
+const removeDraftUUIDIfNecessary = req =>
+  req.http?.req?.headers?.['x-cds-odata-version'] === 'v2'
+    ? () => {}
+    : result => delete result.DraftAdministrativeData_DraftUUID
+
 const setLocationHeader = (req, { model }) => {
   const { odataRes } = req._
   const cqn = getSimpleSelectCQN(req.target, req.data)
   const { path: location } = cds.odata.urlify(cqn, { kind: 'odata', model, method: 'GET' })
   // REVISIT: needs reworking for new adapter, especially re $batch
   if (odataRes) {
-    odataRes.setHeader('Location', location.replace(/\?.*$/, ''))
+    odataRes.setHeader('location', location.replace(/\?.*$/, ''))
   } else if (req.http?.res) {
     req.http.res.set('location', location.replace(/\?.*$/, ''))
   }
@@ -51,7 +56,7 @@ const _ensureKeysAreSelected = query => {
   }
 }
 
-const readAfterWrite = async (req, srv, { operation, isBefore, columns } = { isBefore: false }) => {
+const readAfterWrite = async (req, srv, { operation, columns }) => {
   let query
 
   if (_isActionOrFunction(req)) {

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

@@ -35,7 +35,9 @@ const validateResourcePath = (odataReq, service) => {
   if (segment.getKind() === ENTITY || segment.getKind() === ENTITY_COLLECTION) {
     const name = segment.getEntitySet().getName()
     // REVISIT: This validation is violating all principles of locality
-    const entity = service.model.definitions[`${service.definition.name}.${name}`]
+    const entity =
+      service.model.definitions[`${service.definition.name}.${name}`] ||
+      service.model.definitions[`${service.definition.name}.${name.replace(/_texts$/, '.texts')}`]
     if (!entity) return
 
     /*
@@ -50,7 +52,7 @@ const validateResourcePath = (odataReq, service) => {
         return
       }
       throw getError(405, entity['@cds.autoexpose'] ? 'ENTITY_IS_AUTOEXPOSE_READONLY' : 'ENTITY_IS_AUTOEXPOSED', [
-        entity.name
+        `${service.definition.name}.${name}`
       ])
     }
   }

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

@@ -53,7 +53,7 @@ const setStreamingHeaders = (result, req) => {
   if ('$mediaContentDispositionFilename' in result && req) {
     const cdt = result.$mediaContentDispositionType || 'attachment'
     req._.odataRes.setHeader(
-      'Content-Disposition',
+      'content-disposition',
       `${cdt}; filename="${encodeURIComponent(result.$mediaContentDispositionFilename)}"`
     )
   }
@@ -88,8 +88,6 @@ const _cleanupMetadata = (odataResult, result, req) => {
  * @param {*} [req]
  * @returns {string | object}
  */
-// REVISIT: complexity
-// eslint-disable-next-line complexity
 const toODataResult = (result, req) => {
   if (result == null) return ''
 

package/libx/_runtime/cds-services/util/assert.js

@@ -5,7 +5,7 @@ const templatePathSerializer = require('../../common/utils/templateProcessorPath
 // REVISIT: replace with cds.Request
 const getEntry = require('../../common/error/entry')
 
-const typeCheckers = require('../../../common/assert/type')
+const typeCheckers = require('../../../common/assert/type-strict')
 const { 'cds.Decimal': checkDecimal } = typeCheckers
 const { checkMandatory, checkEnum, checkRange, checkFormat } = require('../../../common/assert/validation')
 

package/libx/_runtime/cds.js

@@ -1,4 +1,3 @@
-/** @type {import('../../lib')} */
 const cds = require('../../lib')
 module.exports = cds
 
@@ -11,6 +10,14 @@ cds.extend(Association).with(require('./common/aspects/Association'))
 cds.extend(entity).with(require('./common/aspects/entity'))
 
 /*
- * cds.assert(data, definition, options?)
+ * Determines whether a request requires resolving of the target entity.
+ * Added to cds.Service so it can be reused in cds.ApplicationService and cds.RemoteService.
  */
-Object.defineProperty(cds, 'assert', { get: () => require('../common/assert') })
+cds.Service.prototype._requires_resolving = function (req) {
+  const already_resolved = req._resolved
+  const belongs_to_me = req.target?.name?.startsWith(this.definition?.name + '.')
+  const is_resolvable = this.model && _is_simple_cqn_query(req.query)
+  const requires_resolving = !(already_resolved || belongs_to_me) && is_resolvable
+  return requires_resolving
+}
+const _is_simple_cqn_query = q => typeof q === 'object' && q !== null && !Array.isArray(q) && Object.keys(q).length > 0

package/libx/_runtime/common/Service.js

@@ -2,9 +2,6 @@ const cds = require('../cds')
 
 const { resolveView, findQueryTarget } = require('./utils/resolveView')
 const postProcess = require('./utils/postProcess')
-const ensureIEEE754 = require('./utils/ensureIEEE754')
-
-const _isSimpleCqnQuery = q => typeof q === 'object' && q !== null && !Array.isArray(q) && Object.keys(q).length > 0
 
 /**
  * Generic Application Service Provider
@@ -70,7 +67,7 @@ class ApplicationService extends cds.Service {
   }
 
   static handle_fiori() {
-    require('../fiori/draft').impl.call(this)
+    require('../fiori/lean-draft').impl.call(this)
   }
 
   static handle_crud() {
@@ -80,37 +77,20 @@ class ApplicationService extends cds.Service {
   // Overload .handle in order to resolve projections up to a definition that is known by the remote service instance.
   // Result is post processed according to the inverse projection in order to reflect the correct result of the original query.
   async handle(req) {
-    let result,
-      target = req.target
+    let result
+    let target = req.target
 
-    if (req._resolved || req.target?.name?.startsWith(this.namespace + '.')) {
+    if (!this._requires_resolving(req)) {
       result = await super.handle(req)
-    }
-    // req.query can be:
-    // - empty object in case of unbound action/function
-    // - undefined/null in case of plain string queries
-    else if (this.model && _isSimpleCqnQuery(req.query)) {
-      const q = resolveView(req.query, this.model, this)
-      target = findQueryTarget(q) || req.target // REVISIT: why is req.target not correct?
-
-      // REVISIT: get rid of this
-      if (req.query.SELECT?._4odata) Object.defineProperty(q.SELECT, '_4odata', { value: true })
-
-      // REVISIT: We need to provide target explicitly because it's cached already within ensure_target
-      const _req = new cds.Request({ query: q, target, _resolved: true })
+    } else {
+      const query = resolveView(req.query, this.model, this)
+      target = findQueryTarget(query) || req.target
+      // REVISIT: get rid of _4odata
+      if (req.query.SELECT?._4odata) Object.defineProperty(query.SELECT, '_4odata', { value: true })
+      // we need to provide target explicitly because it's cached within ensure_target
+      const _req = new cds.Request({ query, target, _resolved: true })
       result = await super.dispatch(_req)
-      result = postProcess(q, result, this)
-    }
-    // default to super.handle()
-    else {
-      result = await super.handle(req)
-    }
-
-    // REVISIT: when do?
-    // const ieee754 = req.headers.accept?.match(/IEEE754Compatible=(\w+)/i)?.[1]
-    // if (cds.env.features.ensure_ieee754 || (cds.env.features.odata_new_adapter && ieee754 === 'true')) {
-    if (cds.env.features.ensure_ieee754) {
-      ensureIEEE754(target, this, result)
+      result = postProcess(query, result, this)
     }
 
     return result

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

@@ -78,6 +78,7 @@ module.exports = class {
   get _mandatories() {
     return this.own(
       '__mandatories',
+      // eslint-disable-next-line no-unused-vars
       () => this.elements && Object.entries(this.elements).filter(([_, v]) => v._isMandatory)
     )
   }

package/libx/_runtime/common/code-ext/execute.js

@@ -36,7 +36,7 @@ module.exports = async function executeCode(code, req) {
   const workerId = worker.id
   const contextId = cds.utils.uuid()
   const executePromise = new Promise(function executeCodePromiseExecutor(resolve, reject) {
-    queueMicrotask(AsyncResource.bind(onStarted))
+    queueMicrotask(AsyncResource.bind(onStarted)) // eslint-disable-line no-undef
     const onMessageReceivedProxy = AsyncResource.bind(onMessageReceived)
     const onErrorProxy = AsyncResource.bind(onError)
     const onExitProxy = AsyncResource.bind(onExit)

package/libx/_runtime/common/code-ext/worker.js

@@ -10,7 +10,6 @@ parentPort.on('message', function onWorkerMessageReceived(message) {
   if (kind !== 'start' || workerId !== workerData.id) return
   if (LOG._debug) LOG.debug(`Post message received on worker thread (worker.js) from main thread`, message)
 
-  // eslint-disable-next-line cds/no-missing-dependencies
   const { VM } = require('vm2')
   const workerReq = new WorkerReq(contextId, reqData)
 

package/libx/_runtime/common/composition/data.js

@@ -30,7 +30,6 @@ const _isSameEntityInWhere = (where, target, persistentObj) => {
     const val = where[i + 2].val
     const sign = where[i + 1]
 
-    // eslint-disable-next-line
     if (target.elements[key].key && key in persistentObj && sign === '=' && val !== persistentObj[key]) {
       return false
     }

package/libx/_runtime/common/composition/delete.js

@@ -225,7 +225,6 @@ const _getDataFromOncond = (onCond, parent) => {
   }, {})
 }
 
-// eslint-disable-next-line complexity
 const getSetNullParentForeignKeyCQNs = async (model, req, dbQuery) => {
   const cqns = []
   const query = dbQuery || req.query

package/libx/_runtime/common/composition/tree.js

@@ -64,7 +64,6 @@ const _createSubElement = (element, definitions) => {
   return subObject
 }
 
-// eslint-disable-next-line complexity
 const _getCompositionTreeRec = ({
   rootEntityName,
   definitions,