@sap/cds 7.5.2 → 7.6.1

package/lib/srv/srv-api.js

@@ -1,16 +1,18 @@
-const cds = require('..'), { Event, Request } = cds
-const add_methods_to = require ('./srv-methods')
-
+const cds = require('..'),
+  { Event, Request } = cds
+const add_methods_to = require('./srv-methods')
+const LOG = cds.log()
 
 class Service extends require('./srv-handlers') {
-
-  constructor (name, model, o) {
+  constructor(name, model, o) {
     if (is_object(name)) {
-      [ model, o ] = [ name, model ]
-      let srv = cds.linked(model).services[0] || cds.error.expected `${{model}} passed as first argument to be a CSN with a single service definition`
+      ;[model, o] = [name, model]
+      let srv =
+        cds.linked(model).services[0] ||
+        cds.error.expected`${{ model }} passed as first argument to be a CSN with a single service definition`
       name = srv.name
     }
-    super (name || new.target.name) .options = o || (o={})
+    super(name || new.target.name).options = o || (o = {})
     if (o.kind) this.kind = o.kind // shortcut
     if (model) this.model = model
   }
@@ -18,11 +20,11 @@ class Service extends require('./srv-handlers') {
   /**
    * Subclasses may override this to prepare the given model appropriately
    */
-  set model (csn) {
+  set model(csn) {
     if (csn) {
-      let {definitions:defs={}} = super.model = cds.compile.for.nodejs(csn)
+      let { definitions: defs = {} } = (super.model = cds.compile.for.nodejs(csn))
       super.definition = defs[this.options?.service] || defs[this.name]
-      add_methods_to (this)
+      add_methods_to(this)
     } else {
       super.model = undefined
     }
@@ -31,89 +33,146 @@ class Service extends require('./srv-handlers') {
   /**
    * Messaging API to emit asynchronous event messages, i.e. instances of `cds.Event`.
    */
-  emit (event, data, headers) {
-    const eve = event instanceof Event ? event : new Event (
-      is_object(event) ? event : { event, data, headers }
-    )
-    return this.dispatch (eve)
+  emit(event, data, headers) {
+    const eve = event instanceof Event ? event : new Event(is_object(event) ? event : { event, data, headers })
+    return this.dispatch(eve)
   }
 
   /**
    * REST-style API to send synchronous requests...
    */
-  send (method, path, data, headers) {
-    const req = method instanceof Request ? method : new Request (
-      is_object(method) ? method : is_object(path) ? { method, data:path, headers:data } : { method, path, data, headers }
-    )
-    return this.dispatch (req)
-  }
-  get    (...args) { return is_rest(args[0]) ? this.send('GET',   ...args) : this.read   (...args) }
-  put    (...args) { return is_rest(args[0]) ? this.send('PUT',   ...args) : this.update (...args) }
-  post   (...args) { return is_rest(args[0]) ? this.send('POST',  ...args) : this.create (...args) }
-  patch  (...args) { return is_rest(args[0]) ? this.send('PATCH', ...args) : this.update (...args) }
-  delete (...args) { return is_rest(args[0]) ? this.send('DELETE',...args) : DELETE.from (...args).bind(this) }
+  send(method, path, data, headers) {
+    const req =
+      method instanceof Request
+        ? method
+        : new Request(
+            is_object(method)
+              ? method
+              : is_object(path)
+                ? { method, data: path, headers: data }
+                : { method, path, data, headers }
+          )
+    return this.dispatch(req)
+  }
+  get(...args) {
+    return is_rest(args[0]) ? this.send('GET', ...args) : this.read(...args)
+  }
+  put(...args) {
+    return is_rest(args[0]) ? this.send('PUT', ...args) : this.update(...args)
+  }
+  post(...args) {
+    return is_rest(args[0]) ? this.send('POST', ...args) : this.create(...args)
+  }
+  patch(...args) {
+    return is_rest(args[0]) ? this.send('PATCH', ...args) : this.update(...args)
+  }
+  delete(...args) {
+    return is_rest(args[0]) ? this.send('DELETE', ...args) : DELETE.from(...args).bind(this)
+  }
 
   /**
    * Querying API to send synchronous requests...
    */
-  run (query, data) {
+  run(query, data) {
     if (typeof query === 'function') {
-      const ctx = cds.context, fn = query
+      const ctx = cds.context,
+        fn = query
 
-      if (!ctx?.tx) return this.tx(fn)               // run fn with root tx
+      if (!ctx?.tx) return this.tx(fn) // run fn with root tx
       else {
-        if (!ctx.tx._done) return fn(this.tx(ctx))   // run fn with nested tx
-        else if (ctx.tx._done === 'rolled back')     // > reject
+        if (!ctx.tx._done) return fn(this.tx(ctx)) // run fn with nested tx
+        else if (ctx.tx._done === 'rolled back')
+          // > reject
           ctx.tx._throw_closed_error()
-        else return this.tx(fn)                      // run fn with detached root tx
+        else return this.tx(fn) // run fn with detached root tx
       }
     }
 
-    const req = new Request ({ query, data })
-    return this.dispatch (req)
+    const req = new Request({ query, data })
+    return this.dispatch(req)
+  }
+  read(...args) {
+    return is_query(args[0]) ? this.run(...args) : SELECT(...args).bind(this)
+  }
+  // Deprecated: To be removed with the next major release
+  stream(...args) {
+    cds._logDeprecation('stream method is deprecated and will be removed in upcoming releases!')
+    if (is_query(args[0])) {
+      Object.defineProperty(args[0], '_stream', { value: true, enumerable: false })
+      if (cds.env.features.stream_compat)
+        Object.defineProperty(args[0], '_streaming', { value: true, enumerable: false })
+      return this.run(...args).then(result => (result ? Object.values(result)[0] : result))
+    }
+    const q = (args ? SELECT.one.columns(args) : SELECT.one).bind(this)
+    Object.defineProperty(q, '_stream', { value: true, enumerable: false })
+    if (cds.env.features.stream_compat) Object.defineProperty(q, '_streaming', { value: true, enumerable: false })
+    return q
+  }
+  insert(...args) {
+    return INSERT(...args).bind(this)
+  }
+  create(...args) {
+    return INSERT.into(...args).bind(this)
+  }
+  update(...args) {
+    return UPDATE.entity(...args).bind(this)
+  }
+  upsert(...args) {
+    return UPSERT(...args).bind(this)
+  }
+  exists(...args) {
+    return SELECT.one([1])
+      .from(...args)
+      .bind(this)
   }
-  read   (...args) { return is_query(args[0]) ? this.run(...args) : SELECT(...args).bind(this) }
-  stream (...args) { return is_query(args[0]) ? this.run(...args) : STREAM(...args).bind(this) }
-  insert (...args) { return INSERT(...args).bind(this) }
-  create (...args) { return INSERT.into(...args).bind(this) }
-  update (...args) { return UPDATE.entity(...args).bind(this) }
-  upsert (...args) { return UPSERT(...args).bind(this) }
-  exists (...args) { return SELECT.one([1]).from(...args).bind(this) }
 
   /**
    * Streaming API variant of .run(). Subclasses should override this to support real streaming.
    * The default implementation doesn't stream, but simply invokes the callback on each row.
    * The callback function is invoked with (row, index).
    */
-  foreach (query, data, callback) {
-    if (!callback)  [ data, callback ] = [ undefined, data ]
-    return this.run (query, data) .then (rows => rows.forEach(callback) || rows)
+  foreach(query, data, callback) {
+    if (!callback) [data, callback] = [undefined, data]
+    return this.run(query, data).then(rows => rows.forEach(callback) || rows)
   }
 
   /**
    * Model Reflection API...
    */
-  get namespace()  {
-    return super.namespace  = this.definition?.name || this.model?.namespace
-    || !(this.isDatabaseService) && !/\W/.test(this.name) && this.name || undefined
+  get namespace() {
+    return (super.namespace =
+      this.definition?.name ||
+      this.model?.namespace ||
+      (!this.isDatabaseService && !/\W/.test(this.name) && this.name) ||
+      undefined)
   }
 
-  get operations() { return super.operations = _reflect (this, d => d.kind === 'action' || d.kind === 'function') }
-  get entities()   { return super.entities   = _reflect (this, d => d.kind === 'entity') }
-  get events()     { return super.events     = _reflect (this, d => d.kind === 'event') }
-  get types()      { return super.types      = _reflect (this, d => !d.kind || d.kind === 'type') }
+  get operations() {
+    return (super.operations = _reflect(this, d => d.kind === 'action' || d.kind === 'function'))
+  }
+  get entities() {
+    return (super.entities = _reflect(this, d => d.kind === 'entity'))
+  }
+  get events() {
+    return (super.events = _reflect(this, d => d.kind === 'event'))
+  }
+  get types() {
+    return (super.types = _reflect(this, d => !d.kind || d.kind === 'type'))
+  }
 
   /**
    * Flag to control whether this service is extensible.
    * Can be overridden by subclasses.
    * REVISIT cds.xt name check should move to respective services
    */
-  get isExtensible() { return !this.name?.startsWith('cds.xt.') && this.model === cds.model}
+  get isExtensible() {
+    return !this.name?.startsWith('cds.xt.') && this.model === cds.model
+  }
 
   /**
    * Subclasses may override this to free private resources
    */
-  disconnect (tenant) {
+  disconnect(tenant) {
     if (this === cds.db) {
       if (tenant && cds.db.dbcs) cds.db.dbcs.delete[tenant]
       else if (!tenant) cds.db = undefined //> REVISIT: should go into DatabaseService
@@ -121,11 +180,19 @@ class Service extends require('./srv-handlers') {
     delete cds.services[this.name]
   }
 
-  get path() { return super.path = cds.service.protocols.path4(this) }
-  set path(p) { super.path = p }
+  get path() {
+    return (super.path = cds.service.protocols.path4(this))
+  }
+  set path(p) {
+    super.path = p
+  }
 
-  get endpoints() { return super.endpoints = cds.service.protocols.endpoints4(this) }
-  set endpoints(p) { super.endpoints = p }
+  get endpoints() {
+    return (super.endpoints = cds.service.protocols.endpoints4(this))
+  }
+  set endpoints(p) {
+    super.endpoints = p
+  }
 }
 
 const { dispatch, handle } = require('./srv-dispatch')
@@ -138,8 +205,8 @@ Service.prototype._is_service_instance = Service._is_service_class = true //> fo
 module.exports = Service
 
 // Helpers...
-const _reflect = (srv,filter) => !srv.model ? [] : srv.model.childrenOf (srv.namespace,filter)
+const _reflect = (srv, filter) => (!srv.model ? [] : srv.model.childrenOf(srv.namespace, filter))
 const is_rest = x => x && typeof x === 'string' && x[0] === '/'
-const is_query = x => x && x.bind || is_array(x) && !x.raw
-const is_array = (x) => Array.isArray(x) && !x.raw
-const is_object = (x) => typeof x === 'object'
+const is_query = x => (x && x.bind) || (is_array(x) && !x.raw)
+const is_array = x => Array.isArray(x) && !x.raw
+const is_object = x => typeof x === 'object'

package/lib/srv/srv-handlers.js

@@ -131,7 +131,6 @@ class EventHandler {
 }
 
 
-const is_impl = x => typeof x === 'function' && !(x.prototype && /^class\b/.test(x))
 const is_array = Array.isArray
 const AlternativeEvents = {
   SELECT: 'READ',

package/lib/srv/srv-models.js

@@ -62,6 +62,7 @@ class ExtendedModels {
         _has_extensions = tenant && extensibility && await _is_extended(tenant)
       } catch (error) {
         // Better error message for client
+        if (error.status === 404) throw error
         cds.error('`extensibility: true` is configured but table "cds.xt.Extensions" does not exist. Please redeploy.', error)
       }
       if (!_has_extensions) {

package/lib/utils/cds-test.js

@@ -168,7 +168,7 @@ class Test extends require('./axios') {
     function require (mod) { try { return module.require(mod) } catch(e) {
       if (e.code === 'MODULE_NOT_FOUND') throw new Error (`
       Failed to load required package '${mod}'. Please add it thru:
-      npm add -D chai chai-as-promised chai-subset
+      npm add -D chai@4 chai-as-promised chai-subset
     `)}}
   }
   get assert() { return this.chai.assert }

package/lib/utils/cds-utils.js

@@ -28,6 +28,16 @@ exports.Object_keys = o => ({
 })
 
 
+/**
+ * CSN-aware function to deep clone objectx
+ */
+exports.clone = (x) => {
+  const y = structuredClone(x)
+  if (x.$sources) Object.defineProperty (y, '$sources', { value: x.$sources })
+  return y
+}
+
+
 /**
  * Simple helper to always access results as arrays.
  */
@@ -180,6 +190,22 @@ exports.find = function find (base, patterns='*', filter=()=>true) {
   return files
 }
 
+exports.deprecated = (fn, { kind = 'Method', old = fn.name+'()', use } = {}) => function() {
+  if (!fn.warned) {
+    let o={}; Error.captureStackTrace(o)
+    console.warn (
+      '\n------------------------------------------------------------------------------',
+      '\nDEPRECATED:', old, '\n',
+      '\n  ', kind, old, 'is deprecated and will be removed in upcoming releases!',
+      use ? `\n   => Please use ${use} instead.` : '', '\n',
+      o.stack.replace(/^Error\n\s*at.*\n/,'\n'), '\n',
+      '\n------------------------------------------------------------------------------\n',
+    )
+    if (cds.env.features.deprecated !== 'show all') fn.warned = true
+  }
+  return fn.apply (this, arguments)
+}
+
 exports.csv = require('./csv-reader')
 
 /**

package/lib/utils/check-version.js

@@ -1,23 +1,20 @@
-const major_minor = version => {
-  let [ major, minor ] = version.split('.').map(x => +x)
-  return { version, major, minor }
-}
-const required = major_minor(
+const required = _major_minor(
   require('../../package.json').engines.node.match(/>=(.*)/)[1]
 )
-const given = major_minor(
+const given = _major_minor(
   process.version.match(/^v(\d+\.\d+)/)[1]
 )
 
-if (given.major < required.major || given.major === required.major && given.minor < required.minor) process.exit (
-  process.stderr.write (`
+if (given.major < required.major || given.major === required.major && given.minor < required.minor) process.exit (process.stderr.write (`
   Node.js v${required.version} or higher is required for @sap/cds.
   Current v${given.version} does not satisfy this.
-  \n`
-) || 1)
+  \n`) || 1)
 
-if (given.major < 18) {
-  process.stderr.write (`WARNING: \n
+if (given.major < 18) process.stderr.write (`WARNING: \n
   Node.js v${given.major} has reached end of life. Please upgrade to v18 or higher.
-  `)
+  \n`)
+
+function _major_minor (version) {
+  let [ major, minor ] = version.split('.').map(x => +x)
+  return { version, major, minor }
 }

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

@@ -1,7 +1,5 @@
 /* eslint-disable complexity */
 const cds = require('../../../cds')
-// requesting logger without module on purpose!
-const LOG = cds.log()
 
 const {
   uri: {
@@ -63,6 +61,26 @@ function _add4Odata(query) {
   else Object.defineProperty(query.SELECT, '_4odata', { value: true })
 }
 
+function _addAllColumns(query) {
+  if (Array.isArray(query)) {
+    query.forEach(q => {
+      if (!q.SELECT.from.SELECT) _addAllColumns(q)
+    })
+  } else {
+    if (!query.SELECT.columns) query.SELECT.columns = ['*']
+  }
+}
+
+function _handleStreamProperties(target, query, model) {
+  if (Array.isArray(query)) {
+    query.forEach(q => {
+      _handleStreamProperties(target, q, model)
+    })
+  } else {
+    handleStreamProperties(target, query.SELECT.columns, model)
+  }
+}
+
 /**
  * Class representing an OData request.
  * @extends cds.Request
@@ -95,8 +113,8 @@ class ODataRequest extends cds.Request {
       const { event, unbound } = info
       if (event === 'READ') {
         _add4Odata(query)
-        if (query.SELECT && !query.SELECT.columns) query.SELECT.columns = ['*']
-        if (!isStreaming(segments)) handleStreamProperties(target, query, service.model, true)
+        _addAllColumns(query)
+        if (!isStreaming(segments)) _handleStreamProperties(target, query, service.model)
       }
       const _queryOptions = odataReq.getQueryOptions()
       // prettier-ignore
@@ -155,8 +173,6 @@ class ODataRequest extends cds.Request {
         else if (type === 'DELETE' && data.IsActiveEntity !== true) event = 'CANCEL'
       }
 
-      if (query.STREAM) event = 'STREAM'
-
       // mark query as for an OData READ
       if (event === 'READ') Object.defineProperty(query.SELECT, '_4odata', { value: true })
 

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

@@ -1,4 +1,3 @@
-const { join } = require('path')
 const cds = require('../../../../cds')
 const LOG = cds.log('odata')
 
@@ -7,9 +6,9 @@ const { normalizeError } = require('../../../../common/error/frontend')
 const getError = require('../../../../common/error')
 
 const mpSupportsEmptyLocale = () => {
-  const pkg = require(join('@sap/cds-mtxs', 'package.json'))
-  const version = pkg.version.match(/^(\d+\.)?(\d+\.)?(\*|\d+)$/).map(Number)
-  return version[1] > 1 || (version[1] === 1 && version[2] >= 12)
+  const pkg = require(require.resolve('@sap/cds-mtxs/package.json'))
+  const [major, minor] = pkg.version.split('.').map(Number)
+  return major > 1 || (major === 1 && minor >= 12)
 }
 
 /**

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

@@ -1,5 +1,5 @@
 const cds = require('../../../../cds')
-
+const LOG = cds.log('odata')
 const ODataRequest = require('../ODataRequest')
 
 const {
@@ -23,7 +23,9 @@ const getError = require('../../../../common/error')
 const { getSapMessages } = require('../../../../common/error/frontend')
 const { getPageSize, commonGenericPaging } = require('../../../../common/generic/paging')
 const { handler: commonGenericSorting } = require('../../../../common/generic/sorting')
-const { isNewStream, transformRedirectProperties } = require('../../../../common/utils/stream')
+const { transformRedirectProperties } = require('../../../../common/utils/stream')
+const { getTransition } = require('../../../../common/utils/resolveView')
+const { Readable } = require('stream')
 
 /**
  * Checks whether a bound function or function import is invoked.
@@ -274,6 +276,7 @@ const _readCollection = async (tx, req, odataReq) => {
     ? getPageSize(req.query[0]._target).max
     : req.query.SELECT.limit && req.query.SELECT.limit.rows && req.query.SELECT.limit.rows.val
   const top = odataReq.getUriInfo().getQueryOption(QueryOptions.TOP) || parseInt(odataReq._queryOptions?.$top)
+
   if (limit && limit === result.length && limit !== top && !('$nextLink' in result)) {
     const token = odataReq.getUriInfo().getQueryOption(QueryOptions.SKIPTOKEN) || odataReq._queryOptions?.$skiptoken
     if (cds.env.query.limit.reliablePaging && _reliablePagingPossible(req)) {
@@ -298,6 +301,64 @@ const _readCollection = async (tx, req, odataReq) => {
   return toODataResult(result, req)
 }
 
+const _resolveContentProperty = (req, annotName, resolvedProp) => {
+  if (req.target.elements[resolvedProp]) {
+    return resolvedProp
+  } else {
+    LOG._warn &&
+      LOG.warn(
+        `"${annotName}" in entity "${req.target.name}" points to property "${resolvedProp}" which was renamed or is not part of the projection. You must update the annotation value.`
+      )
+    const mapping = getTransition(req.target, cds.db).mapping
+    const key = [...mapping.entries()].find(({ 1: val }) => val.ref[0] === resolvedProp)
+    return key?.length && key[0]
+  }
+}
+
+const _addMetadataProperty = (req, property, annotName, odataName) => {
+  if (typeof property[annotName] === 'object') {
+    const contentProperty = _resolveContentProperty(req, annotName, property[annotName]['='].replaceAll(/\./g, '_'))
+    req.target.elements[contentProperty]
+      ? req.query.SELECT.columns.push({ ref: [contentProperty], as: odataName })
+      : LOG._warn &&
+        LOG.warn(`"${annotName.split('.')[1]}" ${contentProperty} not found in entity "${req.target.name}".`)
+  } else {
+    req.query.SELECT.columns.push({ val: property[annotName], as: odataName })
+  }
+}
+
+const _addStreamMetadata = req => {
+  // new odata parser sets streaming property in SELECT.from
+  const ref = req.query.SELECT.columns?.[0].ref || req.query.SELECT.from.ref
+  const propertyName = ref[ref.length - 1]
+  let mediaTypeProperty
+  for (let key in req.target.elements) {
+    const val = req.target.elements[key]
+    if (val['@Core.MediaType'] && val.name === propertyName) {
+      mediaTypeProperty = val
+      break
+    }
+  }
+
+  _addMetadataProperty(req, mediaTypeProperty, '@Core.MediaType', '$mediaContentType')
+
+  if (mediaTypeProperty['@Core.ContentDisposition.Filename']) {
+    _addMetadataProperty(
+      req,
+      mediaTypeProperty,
+      '@Core.ContentDisposition.Filename',
+      '$mediaContentDispositionFilename'
+    )
+  }
+
+  if (mediaTypeProperty['@Core.ContentDisposition.Type']) {
+    req.query.SELECT.columns.push({
+      val: mediaTypeProperty['@Core.ContentDisposition.Type'],
+      as: '$mediaContentDispositionType'
+    })
+  }
+}
+
 /**
  * Reading the full entity or only a property of it is alike.
  * In case of an entity, odata-v4 wants the value an object structure,
@@ -309,7 +370,8 @@ const _readCollection = async (tx, req, odataReq) => {
  * @private
  */
 const _readStream = async (tx, req) => {
-  req.query._streaming = true
+  if (cds.env.features.stream_compat) req.query._streaming = true
+  else if (!req.target['@cds.persistence.skip']) _addStreamMetadata(req)
 
   let result = await tx.dispatch(req)
 
@@ -330,8 +392,10 @@ const _readStream = async (tx, req) => {
   if (result[0] === null) return null
 
   result = result[0]
-  const readable = result.value
 
+  const readable = cds.env.features.stream_compat
+    ? result.value
+    : Object.values(result).find(v => v instanceof Readable)
   if (readable) {
     readable.on('error', () => {
       readable.removeAllListeners('error')
@@ -393,26 +457,20 @@ const _readAndTransform = (tx, req, odataReq) => {
     return _readCollection(tx, req, odataReq)
   }
 
-  if (isNewStream()) {
-    if (req.query.STREAM) {
-      return _readStream(tx, req)
-    }
-  } else {
-    // REVISIT: move to afterburner
-    if (segments[segments.length - 1]._isStreamByDollarValue) {
-      for (const k in req.target.elements) {
-        if (req.target.elements[k]['@Core.MediaType']) {
-          req.query.SELECT.columns = [{ ref: [k] }]
-          break
-        }
+  // REVISIT: move to afterburner
+  if (segments[segments.length - 1]._isStreamByDollarValue) {
+    for (const k in req.target.elements) {
+      if (req.target.elements[k]['@Core.MediaType']) {
+        req.query.SELECT.columns = [{ ref: [k] }]
+        break
       }
-
-      return _readStream(tx, req)
     }
 
-    if (isStreaming(segments)) {
-      return _readStream(tx, req)
-    }
+    return _readStream(tx, req)
+  }
+
+  if (isStreaming(segments)) {
+    return _readStream(tx, req)
   }
 
   if (req.target._isSingleton) {
@@ -443,6 +501,14 @@ const _removeKeysForParams = result => {
   return options
 }
 
+const _ensureStream = result => {
+  // temp workaround for url streaming
+  const stream_ = new Readable()
+  stream_.push(result.value)
+  stream_.push(null)
+  result.value = stream_
+}
+
 /**
  * The handler that will be registered with odata-v4.
  *
@@ -490,6 +556,8 @@ const read = service => {
         // for passing into commit
         odataReq.getBatchApplicationData().results[changeset].push({ result, req })
       } else if (result.value && isStreaming(odataReq.getUriInfo().getPathSegments())) {
+        // REVISIT: temp workaround for url streaming
+        if (!(result.value instanceof Readable)) _ensureStream(result)
         result.value.on('end', () => tx.commit(result).catch(() => {}))
         result.value.once('error', err => tx.rollback(err).catch(() => {}))
       } else {

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

@@ -11,18 +11,20 @@ const {
   ENTITY_COLLECTION,
   NAVIGATION_TO_MANY,
   NAVIGATION_TO_ONE,
-  PRIMITIVE_PROPERTY
+  PRIMITIVE_PROPERTY,
+  SINGLETON
 } = require('../okra/odata-server').uri.UriResource.ResourceKind
 
 const SUPPORTED_SEGMENT_KINDS = {
   [BOUND_ACTION]: 1,
   [BOUND_FUNCTION]: 1,
+  [COUNT]: 1,
   [ENTITY]: 1,
   [ENTITY_COLLECTION]: 1,
   [NAVIGATION_TO_ONE]: 1,
   [NAVIGATION_TO_MANY]: 1,
   [PRIMITIVE_PROPERTY]: 1,
-  [COUNT]: 1
+  [SINGLETON]: 1
 }
 
 /**