@sap/cds 5.9.8 → 6.0.3

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

@@ -7,48 +7,21 @@ const {
 } = require('../okra/odata-server')
 
 const { getSapMessages } = require('../../../../common/error/frontend')
-const { actionAndFunctionQueries, getActionOrFunctionReturnType } = require('../utils/handlerUtils')
+const { getActionOrFunctionReturnType, isReturnMinimal } = require('../utils/handlerUtils')
 const { validateResourcePath } = require('../utils/request')
-const readAfterWrite = require('../utils/readAfterWrite')
-const { setStatusCodeAndHeader, getKeyProperty } = require('../../../../fiori/utils/handler')
 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
-  const dataInDb = await readAfterWrite(req, service)
-  if (dataInDb.length) result = mergeJson(dataInDb[0], result, req.target)
-
-  // add static draft columns
-  result.IsActiveEntity = true
-  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
-}
+const { DRAFT_EVENTS } = require('../../../../common/constants/events')
+const { readAfterWrite } = require('../utils/readAfterWrite')
 
 const _postProcess = async (req, odataReq, odataRes, tx, result) => {
-  postProcess(req, odataRes, tx, result)
-
-  // REVISIT: harmonize getactionreturntype functions
-  const actionReturnType = getActionOrFunctionReturnType(odataReq.getUriInfo().getPathSegments(), tx.model.definitions)
-  if (actionReturnType && actionReturnType.kind === 'entity' && odataReq.getQueryOptions()) {
-    result = await actionAndFunctionQueries(req, odataReq, result, tx, actionReturnType)
+  const returnType = getActionOrFunctionReturnType(odataReq.getUriInfo().getPathSegments(), tx.model.definitions)
+  // as of spec meeting: no generic support of $select/$expand for custom actions/functions
+  if (returnType && returnType.kind === 'entity' && (req.event in DRAFT_EVENTS || req.event === 'EDIT')) {
+    result = await readAfterWrite(req, tx, { operation: { result, returnType } })
+    if (result && !('IsActiveEntity' in result)) result.IsActiveEntity = req.event === 'draftActivate'
   }
+  const _req = Object.setPrototypeOf({ target: returnType || req.target }, req)
+  postProcess(_req, odataRes, tx, result)
   return result
 }
 
@@ -78,14 +51,6 @@ const action = service => {
     try {
       result = await tx.dispatch(req)
 
-      // post processing for draftActivate
-      if (req.event === 'draftActivate') {
-        result = await _postProcessDraftActivate(req, result, service)
-
-        const k = getKeyProperty(req.target.keys)
-        setStatusCodeAndHeader(odataRes, { [k]: result[k] }, req.target.name.replace(`${service.name}.`, ''), true)
-      }
-
       result = await _postProcess(req, odataReq, odataRes, tx, result)
 
       if (changeset) {
@@ -94,6 +59,21 @@ const action = service => {
       } else {
         await tx.commit(result)
       }
+
+      if (isReturnMinimal(req) || result === null) odataRes.setStatusCode(204)
+      else if (req.event === 'draftActivate' || req.event === 'EDIT') {
+        odataRes.setStatusCode(201)
+        const keys = Object.keys(req.target.keys).filter(k => {
+          return k !== 'IsActiveEntity' && !req.target.keys[k]._isAssociationStrict
+        })
+        const keysString = keys.map(key => `${key}=${result[key]}`).join(',')
+        odataRes.setHeader(
+          'location',
+          `../${req.target.name.replace(`${service.name}.`, '')}(${keysString},IsActiveEntity=${
+            req.event === 'draftActivate'
+          })`
+        )
+      }
     } catch (e) {
       err = e
 

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

@@ -7,11 +7,9 @@ const {
 
 const { validateResourcePath } = require('../utils/request')
 const { isReturnMinimal } = require('../utils/handlerUtils')
-const readAfterWrite = require('../utils/readAfterWrite')
+const { readAfterWrite } = require('../utils/readAfterWrite')
 const { toODataResult, postProcess, postProcessMinimal } = require('../utils/result')
 
-const { mergeJson } = require('../../../services/utils/compareJson')
-
 const { getSapMessages } = require('../../../../common/error/frontend')
 
 /**
@@ -40,17 +38,15 @@ const create = service => {
     try {
       result = await tx.dispatch(req)
 
-      // REVISIT readAfterWrite -> commit -> postProcessing
-
+      // REVISIT:
+      // Performance: For `isReturnMinimal` it's enough to just read the etag.
+      // Note: Without read access, one cannot return the etag.
+      if (req._.readAfterWrite) {
+        result = await readAfterWrite(req, service, { operation: { result } })
+      }
       if (isReturnMinimal(req)) {
-        postProcessMinimal(req, result)
+        result = postProcessMinimal(req, service, result)
       } else {
-        // REVISIT: find better solution
-        if (req._.readAfterWrite) {
-          const dataInDb = await readAfterWrite(req, service)
-          if (dataInDb.length) result = mergeJson(dataInDb[0], result, req.target)
-        }
-
         postProcess(req, odataRes, service, result)
       }
 
@@ -61,7 +57,7 @@ const create = service => {
         await tx.commit(result)
       }
 
-      if (isReturnMinimal(req)) {
+      if (isReturnMinimal(req) || result === null) {
         odataRes.setStatusCode(204)
       }
     } catch (e) {
@@ -78,7 +74,7 @@ const create = service => {
       req.messages && odataRes.setHeader('sap-messages', getSapMessages(req.messages, req._.req))
 
       if (err) next(err)
-      else next(null, toODataResult(result))
+      else next(null, toODataResult(result, req))
     }
   }
 }

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

@@ -12,14 +12,12 @@ const ERROR_TO_HTTP_CODE = {
   MethodNotAllowedError: HttpStatusCodes.METHOD_NOT_ALLOWED,
   NotAcceptableError: HttpStatusCodes.NOT_ACCEPTABLE,
   NotAuthorizedError: HttpStatusCodes.UNAUTHORIZED,
-  InternalServerError: HttpStatusCodes.INTERNAL_SERVER_ERROR,
   PreconditionFailedError: HttpStatusCodes.PRECONDITION_FAILED,
   PreconditionRequiredError: HttpStatusCodes.PRECONDITION_REQUIRED,
   ConflictError: HttpStatusCodes.CONFLICT,
   NotFoundError: HttpStatusCodes.NOT_FOUND,
   BadRequestError: HttpStatusCodes.BAD_REQUEST,
   // custom
-  SerializationError: HttpStatusCodes.INTERNAL_SERVER_ERROR,
   DeserializationError: HttpStatusCodes.BAD_REQUEST
 }
 
@@ -40,9 +38,9 @@ const _buildRootCauseMessage = (message, rootCause) => {
 }
 
 const _betterOkraError = err => {
-  const statusCode = ERROR_TO_HTTP_CODE[err.name] || 500
-  if (!('code' in err)) err.code = String(statusCode)
-  if (!err.statusCode) err.statusCode = statusCode
+  const statusCode = ERROR_TO_HTTP_CODE[err.name]
+  if (statusCode && !('code' in err)) err.code = String(statusCode)
+  if (statusCode && !err.statusCode) err.statusCode = statusCode
 
   err.message = _buildRootCauseMessage(err.message, err.getRootCause())
 
@@ -68,6 +66,10 @@ const _betterOkraError = err => {
       'An error occurred during serialization of the entity collection. An error occurred during serialization of',
       'Serialization Error for'
     )
+  } else if (err.name === 'PreconditionFailedError') {
+    // REVISIT use cds.error here once it is official API?
+    const { error } = normalizeError(new cds.Request().error(412, '412'), { headers: {}, query: {} })
+    return error
   }
 
   return err
@@ -129,6 +131,8 @@ const getErrorHandler = (crashOnError = true, srv) => {
     if (contentId && !contentId.match(/^~/)) err['@Core.ContentID'] = contentId
 
     const { error, statusCode } = normalizeError(err, req)
+    // REVISIT: We should also pass stack traces in development
+    // if (!cds.env.production) error.stack = err.stack
 
     next(null, Object.assign(error, { statusCode }))
   }

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

@@ -3,6 +3,7 @@ const LOG = cds.log('odata')
 
 const { toODataResult } = require('../utils/result')
 const { normalizeError } = require('../../../../common/error/frontend')
+const getError = require('../../../../common/error')
 
 const _getMetadata4Tenant = async (tenant, locale, service) => {
   return await cds.mtx.getEdmx(tenant, service.name, locale)
@@ -24,7 +25,7 @@ const metadata = service => {
     try {
       let edmx
 
-      if (cds._mtxEnabled && service._isExtended) {
+      if (cds.mtx && service._isExtended) {
         edmx = await _getMetadata4Tenant(tenant, locale, service)
       }
 
@@ -44,7 +45,8 @@ const metadata = service => {
         LOG.error(e)
       }
       // return 503 to client
-      const { error, statusCode } = normalizeError(Object.assign(e, { statusCode: 503 }), req)
+      const err = getError(Object.assign(e, { statusCode: 503 }))
+      const { error, statusCode } = normalizeError(err, req)
       return next(Object.assign(error, { statusCode }))
     }
   }

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

@@ -1,7 +1,5 @@
 const cds = require('../../../../cds')
 
-const { SELECT } = cds.ql
-
 const ODataRequest = require('../ODataRequest')
 
 const {
@@ -16,14 +14,14 @@ const {
 const FUNCTION = { [BOUND_FUNCTION]: 1, [FUNCTION_IMPORT]: 1 }
 
 const { isCustomOperation } = require('../utils/request')
-const { actionAndFunctionQueries, getActionOrFunctionReturnType } = require('../utils/handlerUtils')
+const { getActionOrFunctionReturnType } = require('../utils/handlerUtils')
 const { validateResourcePath } = require('../utils/request')
 const { toODataResult, postProcess } = require('../utils/result')
 const { isStreaming, getStreamProperties } = require('../utils/stream')
 const { resolveStructuredName } = require('../utils/handlerUtils')
-
 const getError = require('../../../../common/error')
 const { getSapMessages } = require('../../../../common/error/frontend')
+const { getMaxPageSize } = require('../../../../common/utils/page')
 
 /**
  * Checks whether a bound function or function import is invoked.
@@ -34,10 +32,6 @@ const { getSapMessages } = require('../../../../common/error/frontend')
  */
 const _isFunction = segments => segments[segments.length - 1].getKind() in FUNCTION
 
-const _selectOrExpandInQueryOptions = queryOptions => {
-  return queryOptions && (queryOptions.$select || queryOptions.$expand)
-}
-
 /**
  * Invoke a function.
  *
@@ -47,23 +41,9 @@ const _selectOrExpandInQueryOptions = queryOptions => {
  * @returns {Promise}
  * @private
  */
-const _invokeFunction = async (tx, req, odataReq) => {
+const _invokeFunction = async (tx, req) => {
   let result = await tx.dispatch(req)
 
-  const functionReturnType = getActionOrFunctionReturnType(
-    odataReq.getUriInfo().getPathSegments(),
-    tx.model.definitions
-  )
-
-  // if $select or $expand is present, do it
-  if (
-    functionReturnType &&
-    functionReturnType.kind === 'entity' &&
-    _selectOrExpandInQueryOptions(odataReq.getQueryOptions())
-  ) {
-    result = await actionAndFunctionQueries(req, odataReq, result, tx, functionReturnType)
-  }
-
   return toODataResult(result, req)
 }
 
@@ -86,31 +66,43 @@ const _isCount = segments => segments[segments.length - 1].getKind() === COUNT
  * @private
  */
 const _getCount = async (tx, readReq) => {
-  // REVISIT: this process appears to be rather clumsy
-
-  // Copy CQN including from and where and changing columns
-  const select = SELECT.from(readReq.query.SELECT.from)
-  select.SELECT.columns = [{ func: 'count', args: [{ val: '1' }], as: '$count' }]
-
-  if (readReq.query.SELECT.where) select.SELECT.where = readReq.query.SELECT.where
-  if (readReq.query.SELECT.search) select.SELECT.search = readReq.query.SELECT.search
-  const req = readReq
-
-  // preserve _target
-  select._target = req.query._target
-
-  // remove as Object.defineProperty would cause a conflict
-  delete req.query
-
-  // Define new CQN
-  req.query = select
-  // todo check limit
-  const result = await tx.dispatch(req)
-
-  const count = (result[0] && (result[0].$count || result[0]._counted_)) || 0
-
-  // Transform into scalar result
-  return toODataResult(count)
+  // REVISIT once new parser is out of beta
+  // New parser directly removes unapplicable query options from query, no copying of cqn needed
+  if (cds.env.features.odata_new_parser) {
+    // todo check limit
+    const result = await tx.dispatch(readReq)
+
+    const count = result.reduce((acc, val) => {
+      return acc + ((val && (val.$count || val._counted_)) || (val[0] && (val[0].$count || val[0]._counted_))) || 0
+    }, 0)
+    // Transform into scalar result
+    return toODataResult(count)
+  } else {
+    // REVISIT: this process appears to be rather clumsy
+    // Copy CQN including from, where and search + changing columns
+    const select = SELECT.from(readReq.query.SELECT.from)
+    select.SELECT.columns = [{ func: 'count', args: [{ val: '1' }], as: '$count' }]
+
+    if (readReq.query.SELECT.where) select.SELECT.where = readReq.query.SELECT.where
+    if (readReq.query.SELECT.search) select.SELECT.search = readReq.query.SELECT.search
+    const req = readReq
+
+    // preserve _target
+    select._target = req.query._target
+
+    // remove as Object.defineProperty would cause a conflict
+    delete req.query
+
+    // Define new CQN
+    req.query = select
+    // todo check limit
+    const result = await tx.dispatch(req)
+
+    const count = result.$count || result._counted_ || (result[0] && (result[0].$count || result[0]._counted_)) || 0
+
+    // Transform into scalar result
+    return toODataResult(count, req)
+  }
 }
 
 /**
@@ -232,12 +224,12 @@ const _readEntityOrProperty = async (tx, req, segments) => {
   if (propertyElement === null) {
     _transformRedirectProperties(req, result)
 
-    return toODataResult(result[0])
+    return toODataResult(result[0], req)
   }
 
   result = _getResult(resolveStructuredName(segments, segments.length - 2), result[0])
 
-  if (req.target._etag) result.$etag = result[req.target._etag]
+  if (req.target._etag) result.$etag = result[req.target._etag.name]
 
   const odataResult = toODataResult(result, req)
 
@@ -269,10 +261,25 @@ const _readEntityOrProperty = async (tx, req, segments) => {
  */
 const _readCollection = async (tx, req, odataReq) => {
   const result = (await tx.dispatch(req)) || []
+  if (Array.isArray(req.query)) {
+    const adjustedResult = []
+    if (req.query[0].SELECT.count) adjustedResult.$count = 0
+    adjustedResult.push(...result[0])
+    adjustedResult.$count += result[0].$count ? result[0].$count : 0
+    for (let i = 1; i < result.length; i++) {
+      adjustedResult.push(...result[i])
+      adjustedResult.$count += result[i].$count ? result[i].$count : 0
+      //Add OData context, if it deviates from main context
+      if (req._metaInfo.contextUrl !== req._metaInfo.additionalContextUrl[i - 1])
+        result[i].forEach(entry => (entry['*@odata.context'] = req._metaInfo.additionalContextUrl[i - 1]))
+    }
+    result.splice(0, result.length, ...adjustedResult)
+    if (req.query[0].SELECT.count) result.$count = adjustedResult.$count || 0
+  } else if (req.query.SELECT.count && !('$count' in result)) result.$count = 0
 
-  if (req.query.SELECT.count && !('$count' in result)) result.$count = 0
-
-  const limit = req.query.SELECT.limit && req.query.SELECT.limit.rows && req.query.SELECT.limit.rows.val
+  const limit = Array.isArray(req.query)
+    ? getMaxPageSize(req.query[0]._target)
+    : req.query.SELECT.limit && req.query.SELECT.limit.rows && req.query.SELECT.limit.rows.val
   const top = odataReq.getUriInfo().getQueryOption(QueryOptions.TOP)
   if (limit && limit === result.length && limit !== top && !('$nextLink' in result)) {
     const token = odataReq.getUriInfo().getQueryOption(QueryOptions.SKIPTOKEN)

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

@@ -25,7 +25,7 @@ module.exports = srv => {
     }
 
     // check @requires as soon as possible (DoS)
-    if (requires.length > 0 && !requires.some(r => user.is(r))) {
+    if (requires && !requires.some(r => user.is(r))) {
       // > unauthorized or forbidden?
       if (user._is_anonymous) {
         if (user._challenges) res.set('WWW-Authenticate', user._challenges.join(';'))
@@ -51,7 +51,7 @@ module.exports = srv => {
         })
       }
 
-      odataReq.setApplicationData({ req })
+      odataReq.setApplicationData({ req, res })
     }
 
     next()

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

@@ -8,28 +8,25 @@ const {
 
 const { validateResourcePath } = require('../utils/request')
 const { isReturnMinimal } = require('../utils/handlerUtils')
-const readAfterWrite = require('../utils/readAfterWrite')
+const { readAfterWrite } = require('../utils/readAfterWrite')
 const { toODataResult, postProcess, postProcessMinimal } = require('../utils/result')
 const { hasOmitValuesPreference } = require('../utils/omitValues')
 
-const { mergeJson } = require('../../../services/utils/compareJson')
-
 const { getSapMessages } = require('../../../../common/error/frontend')
 
 const _isUpsertAllowed = target => {
   return !(cds.env.runtime && cds.env.runtime.allow_upsert === false) && !(target && target._isDraftEnabled)
 }
 
-const _infoForeignKeyInParent = (req, odataReq, odataRes, tx) => {
+const _infoForeignKeyInParent = (req, tx) => {
   const info = {}
   // keys not in data
   if (req.target.keys && Object.keys(req.target.keys).some(key => key in req.data)) {
     return info
   }
 
-  req = new ODataRequest(DATA_CREATE_HANDLER, tx, odataReq, odataRes, true)
-  const nav = req.query.INSERT.into.ref && req.query.INSERT.into.ref.length !== 0 && req.query.INSERT.into.ref[1]
-  const parent = req.query.INSERT.into.ref && req.query.INSERT.into.ref[0].id
+  const nav = req.query.UPDATE.entity.ref && req.query.UPDATE.entity.ref.length !== 0 && req.query.UPDATE.entity.ref[1]
+  const parent = req.query.UPDATE.entity.ref && req.query.UPDATE.entity.ref[0].id
 
   // not a navigation
   if (!parent || !nav) {
@@ -40,18 +37,18 @@ const _infoForeignKeyInParent = (req, odataReq, odataRes, tx) => {
   const navElement = tx.model.definitions[parent].elements[navID]
 
   // not a containment
-  if (!navElement['@odata.contained']) {
+  if (!navElement._isContained) {
     return info
   }
 
-  const where = req.query.INSERT.into.ref[0].where
+  const where = req.query.UPDATE.entity.ref[0].where
   return { parent, navElement, where }
 }
 
 const _create = async (req, odataReq, odataRes, tx) => {
   let result
 
-  const { parent, navElement, where } = _infoForeignKeyInParent(req, odataReq, odataRes, tx)
+  const { parent, navElement, where } = _infoForeignKeyInParent(req, tx)
   if (parent && navElement && where) {
     const onKeys = navElement._foreignKeys
     const parentKeys = onKeys.filter(key => key.parentElement).map(key => key.parentElement.name)
@@ -107,14 +104,10 @@ const _updateThenCreate = async (req, odataReq, odataRes, tx) => {
   return [result, req]
 }
 
-const _readAfterWriteAndVirtuals = async (req, service, result) => {
-  const dataInDb = await readAfterWrite(req, service)
-  if (dataInDb.length) result = mergeJson(dataInDb[0], result, req.target)
-  return result
-}
-
 const _shouldReadPreviousResult = req =>
-  req.event === 'UPDATE' && !isReturnMinimal(req) && hasOmitValuesPreference(req.headers.prefer, 'defaults')
+  req.event === 'UPDATE' &&
+  !isReturnMinimal(req) &&
+  (hasOmitValuesPreference(req.headers.prefer, 'defaults') || hasOmitValuesPreference(req.headers.prefer, 'nulls'))
 
 /**
  * The handler that will be registered with odata-v4.
@@ -149,21 +142,23 @@ const update = service => {
       let previousResult
 
       if (_shouldReadPreviousResult(req)) {
-        previousResult = await _readAfterWriteAndVirtuals(req, service, result)
+        // this is not a read AFTER update, but BEFORE
+        previousResult = await readAfterWrite(req, service, { isBefore: true })
       }
 
       // try UPDATE and, on 404 error, try CREATE
       ;[result, req] = await _updateThenCreate(req, odataReq, odataRes, tx)
 
+      if (!primitive && req._.readAfterWrite) {
+        // REVISIT:
+        // Performance: For `isReturnMinimal` it's enough to just read the etag.
+        // Note: Without read access, one cannot return the etag.
+        result = await readAfterWrite(req, service, { operation: { result } })
+      }
       if (!isReturnMinimal(req)) {
-        // REVISIT: find better solution
-        if (!primitive && req._.readAfterWrite) {
-          result = await _readAfterWriteAndVirtuals(req, service, result)
-        }
-
         postProcess(req, odataRes, service, result, previousResult)
       } else {
-        postProcessMinimal(req, result)
+        result = postProcessMinimal(req, service, result)
       }
 
       if (changeset) {
@@ -173,7 +168,7 @@ const update = service => {
         await tx.commit(result)
       }
 
-      if (isReturnMinimal(req)) {
+      if (isReturnMinimal(req) || result === null) {
         odataRes.setStatusCode(204)
       }
     } catch (e) {
@@ -195,7 +190,7 @@ const update = service => {
         const res = { value: result[prop] }
         for (const k of Object.keys(result).filter(k => k.match(/^\*/))) res[k] = result[k]
         next(null, res)
-      } else next(null, toODataResult(result))
+      } else next(null, toODataResult(result, req))
     }
   }
 }

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

@@ -6,6 +6,7 @@ const MethodKind = odata.uri.MethodExpression.MethodKind
 const ResourceKind = odata.uri.UriResource.ResourceKind
 const EdmPrimitiveTypeKind = odata.edm.EdmPrimitiveTypeKind
 const { getFeatureNotSupportedError } = require('../../../util/errors')
+const { getSegmentKeyValue } = require('./utils')
 
 const _binaryOperatorToCQN = new Map([
   [BinaryOperatorKind.EQ, '='],
@@ -115,11 +116,13 @@ class ExpressionToCQN {
         nextSegments[nextSegments.length - 1].getKind() === ResourceKind.COUNT &&
         segment.getKeyPredicates().reduce((prev, curr) => {
           if (prev.length > 0) prev.push('and')
-          prev.push({ ref: [curr.getEdmRef().getName()] }, '=', { val: curr.getText() })
+          const { keyName, val } = getSegmentKeyValue(curr)
+          const ref = keyName.includes('/') ? keyName.split('/') : [keyName]
+          prev.push({ ref }, '=', { val })
           return prev
         }, [])
 
-      return [where ? { id: name, where } : name, ...this._getMemberRecursively(nextSegments)]
+      return [where && where.length ? { id: name, where } : name, ...this._getMemberRecursively(nextSegments)]
     }
 
     if (segment.getKind() === ResourceKind.NAVIGATION_TO_MANY) {
@@ -240,7 +243,7 @@ class ExpressionToCQN {
 
   _compare(operator, left, right, unary) {
     return unary === 'not'
-      ? [unary, '(', left, _binaryOperatorToCQN.get(operator), right, ')']
+      ? [unary, { xpr: [left, _binaryOperatorToCQN.get(operator), right] }]
       : [left, _binaryOperatorToCQN.get(operator), right]
   }
 
@@ -258,17 +261,13 @@ class ExpressionToCQN {
     switch (operator) {
       case BinaryOperatorKind.AND:
         return unary === 'not'
-          ? [unary, '(', ...this._ensureArr(left), 'and', ...this._ensureArr(right), ')']
+          ? [unary, { xpr: [...this._ensureArr(left), 'and', ...this._ensureArr(right)] }]
           : [...this._ensureArr(left), 'and', ...this._ensureArr(right)]
 
       case BinaryOperatorKind.OR:
         return [
           ...(unary === 'not' ? [unary] : []),
-          '(',
-          ...this._ensureArr(left),
-          'or',
-          ...this._ensureArr(right),
-          ')'
+          { xpr: [...this._ensureArr(left), 'or', ...this._ensureArr(right)] }
         ]
 
       case BinaryOperatorKind.NE:
@@ -304,23 +303,17 @@ class ExpressionToCQN {
     switch (expression.getKind()) {
       case ExpressionKind.ALIAS:
         return this.parse(expression.getExpression())
-
       case ExpressionKind.BINARY:
         operator = operator || expression.getOperator()
         return this._binary(expression, operator)
-
       case ExpressionKind.LITERAL:
         return this._convert(expression)
-
       case ExpressionKind.MEMBER:
         return this._member(expression, operator)
-
       case ExpressionKind.METHOD:
         return this._method(expression, operator)
-
       case ExpressionKind.UNARY:
         return this._unary(expression)
-
       default:
         throw getFeatureNotSupportedError(`Expression "${expression.getKind()}" in $filter or $orderby query options`)
     }