@sap/cds 7.8.1 → 7.9.0

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

@@ -1,274 +1,2 @@
-const { DRAFT_COLUMNS_MAP } = require('../../../common/constants/draft')
-
-const _deepEqual = (val1, val2) => {
-  if (val1 && typeof val1 === 'object' && val2 && typeof val2 === 'object') {
-    for (const key in val1) {
-      if (!_deepEqual(val1[key], val2[key])) return false
-    }
-    return true
-  }
-  return val1 === val2
-}
-
-const _getCorrespondingEntryWithSameKeys = (source, entry, keys) => {
-  const idx = _getIdxCorrespondingEntryWithSameKeys(source, entry, keys)
-  return idx !== -1 ? source[idx] : undefined
-}
-
-const _getIdxCorrespondingEntryWithSameKeys = (source, entry, keys) =>
-  source.findIndex(sourceEntry => keys.every(key => _deepEqual(sourceEntry[key], entry[key])))
-
-const _getKeysOfEntity = entity =>
-  Object.keys(entity.keys).filter(key => !(key in DRAFT_COLUMNS_MAP) && !entity.elements[key].isAssociation)
-
-const _getCompositionsOfEntity = entity => Object.keys(entity.elements).filter(e => entity.elements[e].isComposition)
-
-const _createToBeDeletedEntries = (oldEntry, entity, keys, compositions) => {
-  const toBeDeletedEntry = {
-    _op: 'delete'
-  }
-
-  for (const prop in oldEntry) {
-    if (prop in DRAFT_COLUMNS_MAP) {
-      continue
-    }
-    if (keys.includes(prop)) {
-      toBeDeletedEntry[prop] = oldEntry[prop]
-    } else if (compositions.includes(prop) && oldEntry[prop]) {
-      toBeDeletedEntry[prop] = entity.elements[prop].is2one
-        ? _createToBeDeletedEntries(
-            oldEntry[prop],
-            entity.elements[prop]._target,
-            _getKeysOfEntity(entity.elements[prop]._target),
-            _getCompositionsOfEntity(entity.elements[prop]._target)
-          )
-        : oldEntry[prop].map(entry =>
-            _createToBeDeletedEntries(
-              entry,
-              entity.elements[prop]._target,
-              _getKeysOfEntity(entity.elements[prop]._target),
-              _getCompositionsOfEntity(entity.elements[prop]._target)
-            )
-          )
-    } else {
-      toBeDeletedEntry._old = toBeDeletedEntry._old || {}
-      toBeDeletedEntry._old[prop] = oldEntry[prop]
-    }
-  }
-
-  return toBeDeletedEntry
-}
-
-const _hasOpDeep = (entry, element) => {
-  const entryArray = Array.isArray(entry) ? entry : [entry]
-  for (const entry_ of entryArray) {
-    if (entry_._op) return true
-
-    if (element && element.isComposition) {
-      const target = element._target
-      for (const prop in entry_) {
-        if (_hasOpDeep(entry_[prop], target.elements[prop])) {
-          return true
-        }
-      }
-    }
-  }
-
-  return false
-}
-
-const _addCompositionsToResult = (result, entity, prop, newValue, oldValue, opts) => {
-  /*
-   * REVISIT: the current impl results in {} instead of keeping null for compo to one.
-   *          unfortunately, many follow-up errors occur (e.g., prop in null checks) if changed.
-   */
-  let composition
-  if (
-    newValue[prop] &&
-    typeof newValue[prop] === 'object' &&
-    !Array.isArray(newValue[prop]) &&
-    Object.keys(newValue[prop]).length === 0
-  ) {
-    composition = compareJsonDeep(entity.elements[prop]._target, undefined, oldValue && oldValue[prop], opts)
-  } else {
-    composition = compareJsonDeep(entity.elements[prop]._target, newValue[prop], oldValue && oldValue[prop], opts)
-  }
-  if (composition.some(c => _hasOpDeep(c, entity.elements[prop]))) {
-    result[prop] = entity.elements[prop].is2one ? composition[0] : composition
-  }
-}
-
-const _addPrimitiveValuesAndOperatorToResult = (result, prop, newValue, oldValue) => {
-  result[prop] = newValue[prop]
-
-  if (!result._op) {
-    result._op = oldValue ? 'update' : 'create'
-  }
-
-  if (result._op === 'update') {
-    result._old = result._old || {}
-    result._old[prop] = oldValue[prop]
-  }
-}
-
-const _addKeysToResult = (result, prop, newValue, oldValue) => {
-  result[prop] = newValue[prop]
-  if (!oldValue) {
-    result._op = 'create'
-  }
-}
-
-const _addToBeDeletedEntriesToResult = (results, entity, keys, newValues, oldValues) => {
-  // add to be deleted entries
-  for (const oldEntry of oldValues) {
-    const entry = _getCorrespondingEntryWithSameKeys(newValues, oldEntry, keys)
-
-    if (!entry) {
-      // prepare to be deleted (deep) entry without manipulating oldData
-      const toBeDeletedEntry = _createToBeDeletedEntries(oldEntry, entity, keys, _getCompositionsOfEntity(entity))
-      results.push(toBeDeletedEntry)
-    }
-  }
-}
-
-const _normalizeToArray = value => (Array.isArray(value) ? value : value === null ? [] : [value])
-
-const _isUnManaged = element => {
-  return element.on && !element._isSelfManaged
-}
-
-const _skip = (entity, prop) => entity.elements[prop]._target._hasPersistenceSkip
-
-const _skipToOne = (entity, prop) => {
-  return (
-    entity.elements[prop] && entity.elements[prop].is2one && _skip(entity, prop) && _isUnManaged(entity.elements[prop])
-  )
-}
-
-const _skipToMany = (entity, prop) => {
-  return entity.elements[prop] && entity.elements[prop].is2many && _skip(entity, prop)
-}
-
-// Returns all property names from the new entry and add missing managed elements
-const _propertiesAndManaged = (newEntry, entity) => {
-  return [
-    ...Object.getOwnPropertyNames(newEntry),
-    ...Object.keys(entity.elements).filter(
-      elementName => newEntry[elementName] === undefined && entity.elements[elementName]['@cds.on.update']
-    )
-  ]
-}
-
-const _iteratePropsInNewEntry = (newEntry, keys, result, oldEntry, entity, opts) => {
-  // On app-service layer, generated foreign keys are not enumerable,
-  // include them here too.
-  for (const prop of _propertiesAndManaged(newEntry, entity)) {
-    if (keys.includes(prop)) {
-      _addKeysToResult(result, prop, newEntry, oldEntry)
-      continue
-    }
-
-    // if value did not change --> ignored
-    if (newEntry[prop] === (oldEntry && oldEntry[prop]) || (opts.ignoreDraftColumns && prop in DRAFT_COLUMNS_MAP)) {
-      continue
-    }
-
-    if (_skipToMany(entity, prop)) {
-      continue
-    }
-
-    if (_skipToOne(entity, prop)) {
-      continue
-    }
-
-    if (entity.elements[prop] && entity.elements[prop].isComposition) {
-      _addCompositionsToResult(result, entity, prop, newEntry, oldEntry, opts)
-      continue
-    }
-
-    _addPrimitiveValuesAndOperatorToResult(result, prop, newEntry, oldEntry)
-  }
-}
-
-const compareJsonDeep = (entity, newValue = [], oldValue = [], opts) => {
-  const resultsArray = []
-  const keys = _getKeysOfEntity(entity)
-
-  // normalize input
-  const newValues = _normalizeToArray(newValue)
-  const oldValues = _normalizeToArray(oldValue)
-
-  // add to be created and to be updated entries
-  for (const newEntry of newValues) {
-    const result = {}
-    const oldEntry = _getCorrespondingEntryWithSameKeys(oldValues, newEntry, keys)
-    _iteratePropsInNewEntry(newEntry, keys, result, oldEntry, entity, opts)
-    resultsArray.push(result)
-  }
-
-  _addToBeDeletedEntriesToResult(resultsArray, entity, keys, newValues, oldValues)
-
-  return resultsArray
-}
-
-/**
- * Compares newValue with oldValues in a deep fashion.
- * Output format is newValue with additional administrative properties.
- * - "_op" provides info about the CRUD action to perform
- * - "_old" provides info about the current DB state
- *
- * Unchanged values are not part of the result.
- *
- * Output format is:
- * {
- *   _op: 'update',
- *   _old: { orderedAt: 'DE' },
- *   ID: 1,
- *   orderedAt: 'EN',
- *   items: [
- *     {
- *       _op: 'update',
- *       _old: { amount: 7 },
- *       ID: 7,
- *       amount: 8
- *     },
- *     {
- *       _op: 'create',
- *       ID: 8,
- *       amount: 8
- *     },
- *     {
- *       _op: 'delete',
- *       _old: {
- *         amount: 6
- *       },
- *       ID: 6
- *     }
- *   ]
- * }
- *
- *
- * If there is no change in an UPDATE, result is an object containing only the keys of the entity.
- *
- * @example
- * compareJson(csnEntity, [{ID: 1, col1: 'A'}], [{ID: 1, col1: 'B'}])
- *
- * @param oldValue
- * @param {object} entity
- * @param {Array | object} newValue
- * @param {Array} oldValues
- *
- * @returns {Array}
- */
-const compareJson = (newValue, oldValue, entity, opts = {}) => {
-  const options = Object.assign({ ignoreDraftColumns: false }, opts)
-  const result = compareJsonDeep(entity, newValue, oldValue, options)
-
-  // in case of batch insert, result is an array
-  // in all other cases it is an array with just one entry
-  return Array.isArray(newValue) ? result : result[0]
-}
-
-module.exports = {
-  compareJson
-}
+// REVISIT: remove with cds^8
+module.exports = require('../../../common/utils/compareJson')

package/libx/_runtime/{cds-services/services → common}/Service.js

@@ -1,7 +1,8 @@
-const cds = require('../../cds')
+const cds = require('../cds')
 
-const { resolveView, restoreLink, findQueryTarget } = require('../../common/utils/resolveView')
-const { postProcess } = require('../../common/utils/postProcessing')
+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
 
@@ -28,27 +29,27 @@ class ApplicationService extends cds.Service {
   }
 
   static handle_authorization() {
-    require('../../common/generic/auth').call(this)
+    require('./generic/auth').call(this)
   }
 
   static handle_etags() {
-    require('../../common/generic/etag').call(this)
+    require('./generic/etag').call(this)
   }
 
   static handle_validations() {
-    require('../../common/generic/input').call(this)
+    require('./generic/input').call(this)
   }
 
   static handle_stream_property() {
-    require('../../common/generic/stream').call(this)
+    require('./generic/stream').call(this)
   }
 
   static handle_puts() {
-    require('../../common/generic/put').call(this)
+    require('./generic/put').call(this)
   }
 
   static handle_temporal_data() {
-    require('../../common/generic/temporal').call(this)
+    require('./generic/temporal').call(this)
   }
 
   static handle_localized_data() {
@@ -60,50 +61,59 @@ class ApplicationService extends cds.Service {
   }
 
   static handle_paging() {
-    require('../../common/generic/paging').call(this) // > paging must be executed before sorting
-    require('../../common/generic/sorting').call(this)
+    require('./generic/paging').call(this) // > paging must be executed before sorting
+    require('./generic/sorting').call(this)
   }
 
   static handle_code_ext() {
-    if (cds.env.requires.extensibility?.code) require('../../common/code-ext/handlers').call(this)
+    if (cds.env.requires.extensibility?.code) require('./code-ext/handlers').call(this)
   }
 
   static handle_fiori() {
-    require('../../fiori/draft').impl.call(this)
+    require('../fiori/draft').impl.call(this)
   }
 
   static handle_crud() {
-    require('../../common/generic/crud').impl.call(this)
+    require('./generic/crud').impl.call(this)
   }
 
   // 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) {
-    // compat mode
-    if (req._resolved) return super.handle(req)
-    if (req.target && req.target.name && req.target.name.startsWith(this.namespace + '.')) return super.handle(req)
+    let result,
+      target = req.target
 
+    if (req._resolved || req.target?.name?.startsWith(this.namespace + '.')) {
+      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
-    if (this.model && _isSimpleCqnQuery(req.query)) {
+    else if (this.model && _isSimpleCqnQuery(req.query)) {
       const q = resolveView(req.query, this.model, this)
-      const t = findQueryTarget(q) || req.target // REVISIT: why is req.target not correct?
+      target = findQueryTarget(q) || req.target // REVISIT: why is req.target not correct?
 
-      // compat
-      restoreLink(req)
-      if (req.query.SELECT && req.query.SELECT._4odata) {
-        Object.defineProperty(q.SELECT, '_4odata', { value: req.query.SELECT._4odata })
-      }
+      // 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 newReq = new cds.Request({ query: q, target: t, _resolved: true })
-      const result = await super.dispatch(newReq)
+      const _req = new cds.Request({ query: q, target, _resolved: true })
+      result = await super.dispatch(_req)
+      result = postProcess(q, result, this)
+    }
+    // default to super.handle()
+    else {
+      result = await super.handle(req)
+    }
 
-      return postProcess(q, result, this)
+    // 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)
     }
 
-    return super.handle(req)
+    return result
   }
 
   /**
@@ -125,7 +135,7 @@ class ApplicationService extends cds.Service {
 }
 
 // NOTE: getRestrictions is VERY INOFFICIAL!!!
-const { getRestrictions } = require('../../common/generic/auth/restrictions')
+const { getRestrictions } = require('./generic/auth/restrictions')
 ApplicationService.prototype.getRestrictions = function (..._) {
   return getRestrictions.call(this, ..._)
 }

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

@@ -0,0 +1,41 @@
+const cds = require('../../../../../lib')
+
+function noah_handler(req) {
+  const target = req.target
+  if (!target) return
+
+  // direct changes to draft administrative data is forbidden
+  if (target.name.match(/\.DraftAdministrativeData$/) && req.event !== 'READ') {
+    req.reject(405, 'ENTITY_IS_AUTOEXPOSE_READONLY', [target.name])
+  }
+
+  // if draft enabled, allow direct access
+  if (target._isDraftEnabled || !target['@cds.autoexposed']) return
+
+  if (target['@cds.autoexpose']) {
+    if (req.event === 'READ') return //> allow read for value help requests
+    req.reject(405, 'ENTITY_IS_AUTOEXPOSE_READONLY', [target.name])
+  }
+
+  // here, we are autoexposed (i.e., a composition)
+  // -> reject all direct changes (i.e., only via navigation is allowed)
+  if (req.subject?.ref.length === 1) req.reject(405, 'ENTITY_IS_AUTOEXPOSED', [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])
+  }
+}
+
+const handler = cds.env.features.odata_new_adapter ? noah_handler : okra_handler
+handler._initial = true
+
+module.exports = handler

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

@@ -4,6 +4,7 @@ const requiresHandler = require('./requires')
 const readOnlyHandler = require('./readOnly')
 const insertOnlyHandler = require('./insertOnly')
 const capabilitiesHandler = require('./capabilities')
+const autoexposeHandler = require('./autoexpose')
 const restrictHandler = require('./restrict')
 const restrictExpandHandler = require('./expand')
 
@@ -19,6 +20,7 @@ module.exports = cds.service.impl(function authorization() {
   this.before('*', readOnlyHandler)
   this.before('*', insertOnlyHandler)
   this.before('*', capabilitiesHandler)
+  this.before('*', autoexposeHandler)
 
   /*
    * @restrict

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

@@ -2,18 +2,7 @@ const cds = require('../../../cds')
 const { getAuthRelevantEntity } = require('./utils')
 const { WRITE_EVENTS } = require('./constants')
 
-const _isAutoexposed = entity => {
-  if (!entity) return false
-  return (entity['@cds.autoexpose'] && entity['@cds.autoexposed']) || entity.name.match(/\.DraftAdministrativeData$/)
-}
-
 function handler(req) {
-  // autoexposed
-  const isAutoexposed = _isAutoexposed(req.target)
-  if (isAutoexposed && req.event !== 'READ') {
-    req.reject(405, 'ENTITY_IS_AUTOEXPOSED', [req.target.name])
-  }
-
   // @read-only
   let entity = getAuthRelevantEntity(req, this.model, ['@readonly'])
   if (cds.env.fiori.lean_draft) entity = entity?.actives || entity

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

@@ -144,8 +144,12 @@ const _addRestrictionsToRead = async (req, model, resolvedApplicables) => {
     req.query._draftRestrictions = resolvedApplicables
     return
   }
-  // in case of $apply take a query from sub SELECT//
-  const query = req.query.SELECT.from.SELECT?.from?.ref ? req.query.SELECT.from : req.query
+
+  // in case of $apply take a query from sub SELECT
+  let query = req.query
+  while (query.SELECT.from.SELECT) {
+    query = query.SELECT.from
+  }
 
   query.SELECT.from.ref = _addWheresToRef(query.SELECT.from.ref, model, resolvedApplicables)
 
@@ -278,9 +282,6 @@ async function handler(req) {
   if (restrictedCount < unrestrictedCount) {
     reject(req, getRejectReason(req, '@restrict', definition, restrictedCount, unrestrictedCount))
   }
-
-  // for minor optimization in generic crud handler
-  req._authChecked = true
 }
 
 handler._initial = true

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

@@ -11,7 +11,7 @@ const reject = (req, reason = null) => {
     // REVISIT: challenges handling should be done in protocol adapter (i.e., express error middleware)
     // REVISIT: improve `req.http.req` check if this is an HTTP request
     if (req.http?.res && req.user._challenges && req.user._challenges.length > 0) {
-      req.http.res.set('WWW-Authenticate', req.user._challenges.join(';'))
+      req.http.res.set('www-authenticate', req.user._challenges.join(';'))
     }
 
     return req.reject(401)

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

@@ -2,7 +2,7 @@ const cds = require('../../cds')
 const { SELECT } = cds.ql
 
 const { deepCopyArray } = require('../utils/copy')
-const { getColumns } = require('../../cds-services/services/utils/columns')
+const { getColumns } = require('../utils/columns')
 const { enhanceStreamResult } = require('../utils/stream')
 const getError = require('../error')
 
@@ -73,16 +73,15 @@ exports.impl = cds.service.impl(function () {
       result = await cds.tx(req).run(req.query, req.data)
     }
 
-    // regarding etag validation: we do not want to execute an additional select to distinguish between 412 and 404
-
     if (req.event === 'READ') {
+      // do not execute additional select to distinguish between 412 and 404
+      if (result == null && req._etagValidationType === 'if-match') req.reject(412)
+
       if ((result == null || result.length === 0) && pathExistsQuery) {
         const res = await pathExistsQuery
         if (res.length === 0) req.reject(404)
       }
 
-      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 }
@@ -97,9 +96,7 @@ exports.impl = cds.service.impl(function () {
       return result
     }
 
-    // case: no authorization check and payload more than just keys but no changes
-    // -> affected rows === 0 -> no change or not exists?
-    if (req.event === 'UPDATE' && result === 0 && !req._authChecked) {
+    if (req.event === 'UPDATE' && result === 0) {
       if (req._etagValidationType) req.reject(412)
       if (await _targetEntityDoesNotExist(req)) req.reject(404) // REVISIT: add a reasonable error message
     }

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

@@ -45,7 +45,7 @@ const _getValidationStmt = (ifMatchEtags, ifNoneMatchEtags, req, model) => {
     if (ifMatchEtags.length === 1) cond.push('=', { val: ifMatchEtags[0] })
     else cond.push('in', { list: ifMatchEtags.map(val => ({ val })) })
   } else {
-    if (ifNoneMatchEtags.includes('*')) return false
+    if (req.event !== 'READ' && ifNoneMatchEtags.includes('*')) return false
     // if a malformed time value is present, it cannot match -> precondition true
     if (
       (etagElement.type === 'cds.Timestamp' || etagElement.type === 'cds.DateTime') &&
@@ -54,11 +54,13 @@ const _getValidationStmt = (ifMatchEtags, ifNoneMatchEtags, req, model) => {
       return true
     }
 
-    cond.push({ ref: alias ? [alias, etagElement.name] : [etagElement.name] })
-    if (ifNoneMatchEtags.length === 1) cond.push('!=', { val: ifNoneMatchEtags[0] })
-    else cond.push('not', 'in', { list: ifNoneMatchEtags.map(val => ({ val })) })
+    if (req.event !== 'READ') {
+      cond.push({ ref: alias ? [alias, etagElement.name] : [etagElement.name] })
+      if (ifNoneMatchEtags.length === 1) cond.push('!=', { val: ifNoneMatchEtags[0] })
+      else cond.push('not', 'in', { list: ifNoneMatchEtags.map(val => ({ val })) })
+    }
   }
-  if (!cond.length) return
+  if (!cond.length) return true
 
   return select.where(cond)
 }
@@ -77,7 +79,7 @@ const commonGenericValidateETag = async function (req) {
   if (req.protocol !== 'odata-v4') return
 
   // automatically add etag columns if not already there
-  if (req.query.SELECT && !req.query._streaming) addEtagColumns(req.query.SELECT.columns, req.target)
+  if (req.query.SELECT) addEtagColumns(req.query.SELECT.columns, req.target)
 
   // querying a collection?
   if (req.event === 'READ' && !req.query.SELECT.one) return

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

@@ -6,11 +6,11 @@ const _getStaticOrders = req => {
   const defaultOrders = entity['@cds.default.order'] || entity['@odata.default.order'] || []
 
   if (entity['@cds.default.order']) {
-    // Remove with cds 8
+    // Remove with cds^8
     cds.utils.deprecated({ kind: 'Annotation', old: '@cds.default.order of entity ' + entity.name })
   }
   if (entity['@odata.default.order']) {
-    // Remove with cds 8
+    // Remove with cds^8
     cds.utils.deprecated({ kind: 'Annotation', old: '@odata.default.order of entity ' + entity.name })
   }
 

package/libx/_runtime/common/i18n/messages.properties

@@ -68,6 +68,7 @@ ENTITY_IS_READ_ONLY=Entity "{0}" is read-only
 ENTITY_IS_NOT_CRUD=Entity "{0}" is not {1}
 ENTITY_IS_NOT_CRUD_VIA_NAVIGATION=Entity "{0}" is not {1} via navigation "{2}"
 ENTITY_IS_AUTOEXPOSED=Entity "{0}" is not explicitly exposed as part of the service
+ENTITY_IS_AUTOEXPOSE_READONLY=Entity "{0}" is explicitly exposed as readonly
 EXPAND_IS_RESTRICTED=Navigation property "{0}" is not allowed for expand operation
 
 # rest protocol adapter

package/libx/_runtime/{cds-services/services → common}/utils/columns.js

@@ -1,6 +1,6 @@
-const cds = require('../../../cds')
+const cds = require('../../cds')
 
-const { DRAFT_COLUMNS_UNION_MAP } = require('../../../common/constants/draft')
+const { DRAFT_COLUMNS_UNION_MAP } = require('../constants/draft')
 const DEFAULT_SEARCHABLE_TYPE = 'cds.String'
 
 // REVISIT: Can we combine that with db/utils/columns.js?
@@ -113,7 +113,7 @@ const _getSearchableColumns = entity => {
   const defaultSearchFilteredColumns = searchableColumns.filter(column => column[defaultSearchElementTerm])
 
   if (defaultSearchFilteredColumns.length > 0) {
-    // Remove with cds 8
+    // Remove with cds^8
     cds.utils.deprecated({
       kind: 'Annotation',
       old: '@Search.defaultSearchElement in entity ' + entity.name,
@@ -126,7 +126,7 @@ const _getSearchableColumns = entity => {
 }
 
 /**
- * @returns {import('../../../types/api').ColumnRefs}
+ * @returns {import('../../types/api').ColumnRefs}
  */
 const computeColumnsToBeSearched = (cqn, entity = { __searchableColumns: [] }, alias) => {
   let toBeSearched = []