@sap/cds 7.5.2 → 7.6.1

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

@@ -44,7 +44,6 @@ const { isStreaming } = require('../utils/stream')
 const { getPageSize } = require('../../../../common/generic/paging')
 const { isAsteriskColumn } = require('../../../../common/utils/rewriteAsterisks')
 const { handleStreamProperties } = require('../../../../common/utils/streamProp')
-const { isNewStream } = require('../../../../common/utils/stream')
 
 const { ensureUnlocalized } = require('../../../../fiori/utils/handler')
 
@@ -316,28 +315,6 @@ const readToCQN = (service, target, odataReq) => {
   const segments = uriInfo.getPathSegments()
   isPathSupported(SUPPORTED_SEGMENT_KINDS, segments)
 
-  if (isNewStream()) {
-    let propertyParam
-    if (isStreaming(segments)) {
-      propertyParam = getPropertyParam(segments)
-    } else if (segments[segments.length - 1]._isStreamByDollarValue) {
-      // REVISIT: Issue with multiple streaming properties ? Also in read.js
-      for (const k in target.elements) {
-        if (target.elements[k]['@Core.MediaType']) {
-          propertyParam = { ref: [k] }
-          break
-        }
-      }
-    }
-
-    if (propertyParam) {
-      const isView = target.params && Object.keys(target.params).length > 0
-      return STREAM.from(isView ? convertUrlPathToViewCqn(segments) : convertUrlPathToCqn(segments, service)).column(
-        propertyParam.ref[0]
-      )
-    }
-  }
-
   const queryOptions = odataReq.getQueryOptions()
   const entity = service.model.definitions[ensureUnlocalized(target.name)]
   const propertyParam = getPropertyParam(segments)
@@ -375,7 +352,7 @@ const readToCQN = (service, target, odataReq) => {
   // keep target as input because of localized view
   const cqn = SELECT.from(isView ? convertUrlPathToViewCqn(segments) : convertUrlPathToCqn(segments, service), select)
   if (!cqn.SELECT.columns) cqn.SELECT.columns = ['*']
-  if (!streaming) handleStreamProperties(target, cqn, service.model, true)
+  if (!streaming) handleStreamProperties(target, cqn.SELECT.columns, service.model)
 
   const isCount =
     isCollectionOrToMany &&

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

@@ -3,8 +3,7 @@ const { UPDATE } = cds.ql
 
 const { getFeatureNotSupportedError } = require('../../../util/errors')
 const { isStreaming } = require('../utils/stream')
-const { convertUrlPathToCqn, getPropertyParam } = require('./utils')
-const { isNewStream } = require('../../../../common/utils/stream')
+const { convertUrlPathToCqn } = require('./utils')
 
 const { ENTITY, NAVIGATION_TO_ONE, PRIMITIVE_PROPERTY, SINGLETON } =
   require('../okra/odata-server').uri.UriResource.ResourceKind
@@ -29,11 +28,6 @@ const updateToCQN = (service, data, odataReq) => {
   const segment = segments[segments.length - 1]
   const streaming = isStreaming(segments)
 
-  if (isNewStream() && streaming) {
-    const col = getPropertyParam(segments).ref[0]
-    return STREAM.into(convertUrlPathToCqn(segments, service)).data(data[col]).column(col)
-  }
-
   if (SUPPORTED_KINDS[segment.getKind()] || streaming) {
     return UPDATE(convertUrlPathToCqn(segments, service)).data(data)
   }

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

@@ -700,10 +700,10 @@ class ApplyParser {
       }
       pathSegments.push(this._createPropertyResource(property))
     }
-    if (pathSegments[pathSegments.length - 1].isCollection()) {
-      throw new UriQueryOptionSemanticError(UriQueryOptionSemanticError.Message.COLLECTION)
-    }
     if (!pathSegments.length) this._tokenizer.requireNext(TokenKind.ODataIdentifier) // for the error message
+    if (pathSegments[pathSegments.length - 1]?.isCollection()) {
+      throw new UriQueryOptionSemanticError(UriQueryOptionSemanticError.Message.COLLECTION)
+    }    
     // TODO: Generalize to more than one segment and to other than structural properties.
     if (pathSegments.length === 1 && pathSegments[0].getProperty()) {
       referencedType.protectProperty(pathSegments[0].getProperty().getName())

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

@@ -336,6 +336,13 @@ class TrustedResourceJsonSerializer {
         const propertyValue = data[entityProp]
         const isCollection = Array.isArray(propertyValue)
         const edmProperty = type.getStructuralProperty(entityProp)
+
+        // enterprise search result? -> simple return what was provided
+        if (type._fqn?.name === 'sap_esh_SearchResult') {
+          result[entityProp] = propertyValue
+          continue
+        }
+
         if (edmProperty) {
           let propertyType = edmProperty.getType()
 

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

@@ -1,8 +1,6 @@
 const cds = require('../../../cds')
 const OData = require('./OData')
 
-const { alias2ref } = require('../../../common/utils/csn')
-
 /**
  * This is the express handler for a specific OData endpoint.
  * Note: the same service can be served at different endpoints.
@@ -14,9 +12,6 @@ module.exports = srv => {
 
 function OkraAdapter(srv, model = srv.model) {
   const edm = cds.compile.to.edm(model, { service: srv.definition?.name || srv.name })
-
-  alias2ref(srv, edm)
-
   return new OData(edm, model, srv.options).addCDSServiceToChannel(srv)
 }
 

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

@@ -89,7 +89,9 @@ const _getExpandColumn = (data, element) => {
 const _getColumns = (target, data, prefix = []) => {
   const columns = []
   for (const each in target.elements) {
+    if (target.elements[each]['@cds.api.ignore']) continue
     if (each in DRAFT_COLUMNS_MAP) continue
+    if (!cds.env.features.stream_compat && target.elements[each].type === 'cds.LargeBinary') continue
     const element = target.elements[each]
     if (element.elements && data[each]) {
       prefix.push(element.name)

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

@@ -199,7 +199,23 @@ const _getCanonicalUrl = (path, target, model) => {
   const toManySegment =
     path.length > 1 && Array.isArray(path[path.length - 1].where) && path[path.length - 1].where.length && path.pop()
   if (target.params) path.push('Set')
-  const odataUrl = cds.odata.urlify({ SELECT: { from: { ref: path } } }, { model, kind: 'odata' })
+  // construct path with only innermost refs for @odata.context
+  const _path = []
+  for (const seg of path) {
+    if (typeof seg === 'string') _path.push(seg)
+    else {
+      const _seg = { ...seg }
+      if (_seg.where) {
+        _seg.where = []
+        for (const ele of seg.where) {
+          if (ele.ref && ele.ref.length > 1) _seg.where.push({ ref: [ele.ref[ele.ref.length - 1]] })
+          else _seg.where.push(ele)
+        }
+      }
+      _path.push(_seg)
+    }
+  }
+  const odataUrl = cds.odata.urlify({ SELECT: { from: { ref: _path } } }, { model, kind: 'odata' })
   let contextPath = odataUrl.path && odataUrl.path.match(/^([^?]*)\??/)[1]
   if (toManySegment) {
     contextPath += `/${toManySegment.id}`

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

@@ -88,6 +88,8 @@ 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 ''
 
@@ -115,8 +117,26 @@ const toODataResult = (result, req) => {
 
   let value = result
   if (typeof result === 'object') {
-    if ('value' in result && (result.value instanceof Readable || isStream)) value = result.value
-    else if (propertyName) value = result[propertyName]
+    if (cds.env.features.stream_compat) {
+      // REVISIT: test implicit streaming with null value
+      if ('value' in result && (result.value instanceof Readable || isStream)) value = result.value
+      else if (propertyName) value = result[propertyName]
+    } else {
+      if (propertyName && result[propertyName] !== undefined) {
+        value = result[propertyName]
+      }
+      // implicit streaming
+      else if (req._.odataReq.getUriInfo().getLastSegment().getKind() === 'VALUE') {
+        const property = Object.values(req.target.elements).find(
+          el => el.type === 'cds.LargeBinary' && result[el.name] !== undefined
+        )
+        value = property && result[property.name]
+      }
+      // result.value can be obtained from custom handlers
+      else if (isStream && result.value !== undefined) {
+        value = result.value
+      }
+    }
   }
 
   const odataResult = _cleanupMetadata({ value }, result, req)

package/libx/_runtime/cds-services/services/utils/columns.js

@@ -1,6 +1,5 @@
 const cds = require('../../../cds')
-// requesting logger without module on purpose!
-const LOG = cds.log()
+
 const { DRAFT_COLUMNS_UNION_MAP } = require('../../../common/constants/draft')
 const DEFAULT_SEARCHABLE_TYPE = 'cds.String'
 

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

@@ -4,15 +4,23 @@ const { foreignKeyPropagations } = require('../utils/foreignKeyPropagations')
 
 const _hasJoinCondition = e => e.isAssociation && e.on && e.on.length > 2
 
-const _isSelfRef = e => e.ref && e.ref[0] === '$self'
-
-const _getBacklinkName = on => {
-  const i = on.findIndex(_isSelfRef)
-  if (i === -1) return
-  let ref
-  if (on[i + 1] && on[i + 1] === '=') ref = on[i + 2].ref
-  if (on[i - 1] && on[i - 1] === '=') ref = on[i - 2].ref
-  return ref && ref[ref.length - 1]
+const _isSelfRef = e => (e.xpr ? e.xpr.find(_isSelfRef) : e.ref && e.ref[0] === '$self')
+
+const _getBacklinkName = xpr => {
+  for (let i = 0; i < xpr.length; i++) {
+    const element = xpr[i]
+    if (element.xpr) {
+      const selfComparison = _getBacklinkName(element.xpr)
+      if (selfComparison) return selfComparison
+    }
+
+    if (element.ref?.[0] === '$self') {
+      let ref
+      if (xpr[i + 1] && xpr[i + 1] === '=') ref = xpr[i + 2].ref
+      if (xpr[i - 1] && xpr[i - 1] === '=') ref = xpr[i - 2].ref
+      if (ref) return ref[ref.length - 1]
+    }
+  }
 }
 
 const isSelfManaged = e => {

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

@@ -82,6 +82,13 @@ exports.impl = cds.service.impl(function () {
       }
 
       if (result == null && req._etagValidationType === 'if-match') req.reject(412)
+
+      if (cds.env.features.stream_compat) {
+        if (result !== undefined && req.query?._streaming && (result === null || result.pipe)) {
+          return { value: result }
+        }
+      }
+
       return result
     }
 
@@ -94,7 +101,7 @@ exports.impl = cds.service.impl(function () {
     // -> affected rows === 0 -> no change or not exists?
     if (req.event === 'UPDATE' && result === 0 && !req._authChecked) {
       if (req._etagValidationType) req.reject(412)
-      if (await _targetEntityDoesNotExist(req)) req.reject(404)
+      if (await _targetEntityDoesNotExist(req)) req.reject(404) // REVISIT: add a reasonable error message
     }
 
     // flag to trigger read after write in protocol adapter
@@ -103,27 +110,11 @@ exports.impl = cds.service.impl(function () {
   })
 
   this.after('READ', '*', async function ([result], req) {
-    if (req.query?._streaming) {
-      await enhanceStreamResult(req, req.query, result, this.model)
-    }
-  })
-
-  this.on('STREAM', '*', async function (req) {
-    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.`
-      })
-    }
-
-    if (req.query.STREAM.from) {
-      return { value: await cds.tx(req).run(req.query, req.data) }
-    } else {
-      return await cds.tx(req).run(req.query, req.data)
+    if (!result) return
+    if (cds.env.features.stream_compat) {
+      if (req.query?._streaming) {
+        await enhanceStreamResult(req, req.query, result, this.model)
+      }
     }
   })
-
-  this.after(['STREAM'], '*', async function ([result], req) {
-    if (req.query.STREAM.from) await enhanceStreamResult(req, req.query, result, this.model)
-  })
 })

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

@@ -77,7 +77,7 @@ const commonGenericValidateETag = async function (req) {
   if (req.protocol !== 'odata-v4') return
 
   // automatically add etag columns if not already there
-  if (req.query.SELECT) addEtagColumns(req.query.SELECT.columns, req.target)
+  if (req.query.SELECT && !req.query._streaming) addEtagColumns(req.query.SELECT.columns, req.target)
 
   // querying a collection?
   if (req.event === 'READ' && !req.query.SELECT.one) return

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

@@ -116,6 +116,9 @@ const _processCategory = (req, category, value, elementInfo, assertMap) => {
     // Always take over the values from active entities
     if (cds.env.fiori?.lean_draft && req.context?.event === 'EDIT') return
 
+    // Read-only valus are already deleted before `NEW` (and they can be set in a `NEW` handler!)
+    if (cds.env.fiori?.lean_draft && event === 'CREATE' && req.context?.event === 'NEW' && req.target.isDraft) return
+
     delete row[key]
     value.val = undefined
     return
@@ -132,7 +135,12 @@ const _processCategory = (req, category, value, elementInfo, assertMap) => {
   }
 
   // generate UUIDs
-  if (category === 'uuid' && !value.val && ((event !== 'UPDATE' && event !== 'PATCH') || !isRoot)) {
+  if (
+    category === 'uuid' &&
+    !value.val &&
+    ((event !== 'UPDATE' && event !== 'PATCH') || !isRoot) &&
+    !element.parent.elements[element._foreignKey4]?._isAssociationStrict
+  ) {
     value.val = row[key] = cds.utils.uuid()
   }
 

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

@@ -5,8 +5,8 @@ module.exports = exports = cds.service.impl(function () {
   this.before('READ', '*', commonGenericPaging)
 })
 
-const DEFAULT = cds.env.query?.limit?.default || 1000
-const MAX = cds.env.query?.limit?.max || 1000
+const DEFAULT = cds.env.query?.limit?.default ?? 1000
+const MAX = cds.env.query?.limit?.max ?? 1000
 const _cached = Symbol('@cds.query.limit')
 
 const getPageSize = def => {
@@ -35,7 +35,7 @@ const commonGenericPaging = function (req) {
 }
 
 const _addPaging = function ({ SELECT }, target) {
-  if (SELECT.limit === false) return
+  if (SELECT.limit === null) return
   const { rows } = SELECT.limit || (SELECT.limit = {})
   const conf = getPageSize(target)
   SELECT.limit.rows = {

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

@@ -35,6 +35,26 @@ const _getStaticOrders = req => {
   return [...defaultOrders, ...ordersFromKeys]
 }
 
+const _addDefaultSortOrder = (req, select) => {
+  // "static orders" = the orders not from the query options
+  let staticOrders = _getStaticOrders(req)
+
+  // remove defaultOrder if not part of group by
+  const groupBy = select?.groupBy || select?.from?.SELECT?.groupBy
+
+  if (groupBy?.length > 0) staticOrders = staticOrders.filter(d => groupBy.some(e => e.ref[0] === d.by['=']))
+
+  if (!staticOrders.length) return
+
+  if (select?.from?.SELECT?.groupBy?.length > 0) select = select.from.SELECT
+  select.orderBy = select.orderBy ?? []
+  select.orderBy.push(
+    ...staticOrders
+      .filter(d => !select.orderBy.find(o => o.ref && o.ref.join('_') === d.by['=']))
+      .map(d => ({ ref: [d.by['=']], sort: d.desc ? 'desc' : 'asc' }))
+  )
+}
+
 /**
  * 1. query options --> already set in req.query
  * 2. orders from view || @cds.default.order/@odata.default.order
@@ -52,24 +72,14 @@ const commonGenericSorting = function (req) {
     return
   }
 
-  // apply default sort to bottom-most sub-query
   if (select.from && select.from.SELECT) {
-    while (select.from.SELECT) select = select.from.SELECT
-  }
+    // add default sort to root query
+    if (select.orderBy) _addDefaultSortOrder(req, select)
 
-  // "static orders" = the orders not from the query options
-  let staticOrders = _getStaticOrders(req)
-
-  // remove defaultOrder if not part of group by
-  if (select.groupBy && select.groupBy.length > 0) {
-    staticOrders = staticOrders.filter(d => select.groupBy.find(e => e.ref[0] === d.by['=']))
+    // apply default sort to bottom-most sub-query
+    while (select.from.SELECT) select = select.from.SELECT
   }
-  if (!staticOrders.length) return
-  ;(select.orderBy || (select.orderBy = [])).push(
-    ...staticOrders
-      .filter(d => !select.orderBy.find(o => o.ref && o.ref.join('_') === d.by['=']))
-      .map(d => ({ ref: [d.by['=']], sort: d.desc ? 'desc' : 'asc' }))
-  )
+  _addDefaultSortOrder(req, select)
 }
 
 /**

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

@@ -1,5 +1,3 @@
-const { isNewStream } = require('../utils/stream')
-
 const cds = require('../../cds')
 
 const _getStreamingProperties = elements => {
@@ -27,26 +25,14 @@ function _addContentType(req, mtValue) {
   if (streamProp) req.data[streamProp.type] = mtValue
 }
 
-async function _addContentTypeStream(req, mtValue) {
-  if (req.query.UPDATE || req.query.STREAM?.from) return
-  if (req.target._hasPersistenceSkip) return
-  const streamProp = _getStreamingProperties(req.target.elements).find(prop => req.query.STREAM.column === prop.stream)
-  // REVISIT: move this update to after handler and add etag
-  if (streamProp) await UPDATE.entity(req.query.STREAM.into).data({ [streamProp.type]: mtValue })
-}
-
 async function addContentType(req) {
   if (!req.query || !req.target) return
   const mtValue = _getMediaTypeValue()
   if (!mtValue) return
 
-  if (isNewStream()) {
-    _addContentTypeStream(req, mtValue)
-  } else {
-    _addContentType(req, mtValue)
-  }
+  _addContentType(req, mtValue)
 }
 
 module.exports = cds.service.impl(function () {
-  this.before(['PATCH', 'UPDATE', 'STREAM'], '*', addContentType)
+  this.before(['PATCH', 'UPDATE'], '*', addContentType)
 })

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

@@ -1,3 +1,5 @@
+const { Readable } = require('stream')
+
 const _deepCopy = arg => {
   if (Buffer.isBuffer(arg)) {
     return Buffer.from(arg)
@@ -5,6 +7,9 @@ const _deepCopy = arg => {
   if (Array.isArray(arg)) {
     return deepCopyArray(arg)
   }
+  if (arg instanceof Readable) {
+    return arg
+  }
   if (typeof arg === 'object') {
     return deepCopyObject(arg)
   }

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

@@ -37,7 +37,7 @@ function where2obj(where, target = null, data = {}) {
     // optional validation if target is passed
     if (target) {
       const colEl = target.elements[colName]
-      if (!colEl || !colEl.key) continue
+      if (!colEl || !(colEl.key || colEl.__foreignKey4)) continue
     }
     const opWhere = where[i + 1]
     const valWhere = where[i + 2]

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

@@ -15,7 +15,6 @@ const { removeIsActiveEntityRecursively } = require('../../fiori/utils/where')
 const { addRefToWhereIfNecessary } = require('../../../odata/afterburner')
 const { addAliasToExpression, PARENT_ALIAS, FOREIGN_ALIAS } = require('../../db/utils/generateAliases')
 const { getColumns } = require('../../cds-services/services/utils/columns')
-const { handleStreamProperties } = require('./streamProp')
 
 const _elementFromRef = (name, entity) => {
   if (!entity) return
@@ -717,7 +716,10 @@ const _convertToOneEqNullInFilter = (query, target) => {
 // eslint-disable-next-line complexity
 const _convertSelect = (query, model, _options) => {
   const _4db = _options.service?.isDatabaseService
-  const options = Object.assign({ _4db, isStreaming: query._streaming, localized: query.SELECT.localized }, _options)
+  const options = Object.assign(
+    { _4db, isStreaming: cds.env.features.stream_compat && query._streaming, localized: query.SELECT.localized },
+    _options
+  )
 
   // ensure query is ql enabled
   if (!(query instanceof Query)) Object.setPrototypeOf(query, Object.getPrototypeOf(SELECT()))
@@ -743,7 +745,6 @@ const _convertSelect = (query, model, _options) => {
   const entity =
     (query.SELECT.from.ref && (query.SELECT.from.ref[0].id || query.SELECT.from.ref[0])) || query.SELECT.from
   const target = entity && model.definitions[entity]
-  handleStreamProperties(target, query, model)
 
   if (query.SELECT.where) {
     if (_isCountNavigation(query.SELECT.where)) {

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

@@ -1,7 +1,5 @@
 const cds = require('../../cds')
 
-const resolveStructured = require('../../common/utils/resolveStructured')
-
 const getEtagElement = entity => {
   return Object.values(entity.elements).find(element => element['@odata.etag'])
 }
@@ -116,25 +114,6 @@ const getElementDeep = (entity, ref) => {
   return current
 }
 
-const _setAlias2ref = entity => {
-  const _ref2alias = {}
-  const _alias2ref = {}
-  const keys = entity.keys
-  for (const key in keys) {
-    const structKeys = resolveStructured({ element: keys[key], structProperties: [] }, false, true)
-    for (const structKey of structKeys) {
-      if (_alias2ref[structKey.key] != null) {
-        // key clash, aliasing not possible
-        return entity
-      }
-      _alias2ref[structKey.key] = structKey.resolved
-      _ref2alias[structKey.resolved.join('/')] = key
-    }
-  }
-  entity._alias2ref = Object.defineProperty(_alias2ref, '__2alias', { value: _ref2alias, configurable: true })
-  return entity
-}
-
 const prefixForStruct = element => {
   const prefixes = []
   let parent = element.parent
@@ -145,33 +124,6 @@ const prefixForStruct = element => {
   return prefixes.length ? prefixes.reverse().join('_') + '_' : ''
 }
 
-/*
- * REVISIT:
- * - which scenarios require this?
- * - does it still work when serving multiple protocols?
- * - can we cache it?
- */
-function alias2ref(service, edm) {
-  if (!edm) {
-    // REST
-    for (const each of service.entities) _setAlias2ref(each)
-  } else {
-    // OData
-    const defs = edm[service.definition.name]
-    for (const each of service.entities) {
-      const def = defs[each.name.replace(service.definition.name + '.', '').replace(/\./g, '_')]
-      if (!def || !def.$Key || def.$Key.every(ele => typeof ele === 'string')) continue
-      each._alias2ref = Object.defineProperty({}, '__2alias', { value: {}, configurable: true })
-      for (const mapping of def.$Key.filter(ele => typeof ele !== 'string')) {
-        for (const [key, value] of Object.entries(mapping)) {
-          each._alias2ref[key] = value.split('/')
-          each._alias2ref.__2alias[value] = key
-        }
-      }
-    }
-  }
-}
-
 function getDraftTreeRoot(entity, model) {
   if (entity.own('__draftTreeRoot')) return entity.__draftTreeRoot
 
@@ -204,7 +156,6 @@ module.exports = {
   getEtagElement,
   findCsnTargetFor,
   getElementDeep,
-  alias2ref,
   getComp2oneParents,
   prefixForStruct,
   getDraftTreeRoot,

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

@@ -11,17 +11,17 @@ const _sub = (newOn, subOns = []) => {
       subOns.push([])
       return subOns
     }
+
     if (onEl.xpr) {
       _sub(onEl.xpr, subOns)
-      // after xpr there usually should be and/or
-      i++
       continue
     }
-    if (currArr.length === 0) {
+    if (currArr.length === 0 && onEl !== 'and') {
       subOns.push(currArr)
     }
-    if (onEl !== 'and') currArr.push(onEl)
-    else {
+    if (onEl !== 'and') {
+      currArr.push(onEl)
+    } else {
       currArr = []
     }
   }