@sap/cds 6.0.4 → 6.1.0

package/libx/_runtime/messaging/service.js

@@ -1,6 +1,7 @@
 const cds = require('../cds')
 const queued = require('./common-utils/queued')
 const OutboxService = require('./Outbox')
+const ExtendedModels = require('../../../lib/srv/srv-models')
 
 const appId = require('./common-utils/appId')
 
@@ -76,9 +77,17 @@ class MessagingService extends OutboxService {
     return super.init()
   }
 
-  emit(event, data, headers) {
+  async emit(event, data, headers) {
     const _msg = typeof event === 'object' ? event : { event, data, headers }
-    const msg = _msg instanceof cds.Event ? _msg : new cds.Event(this.message4(_msg))
+    if (_msg instanceof cds.Event) return super.emit(_msg)
+    if (_msg.inbound && !cds.context) {
+      cds.context = { tenant: _msg.tenant, user: cds.User.privileged }
+      if (cds.model) {
+        const ctx = cds.context
+        ctx.model = await ExtendedModels.model4(ctx.tenant, ctx.features)
+      }
+    }
+    const msg = new cds.Event(this.message4(_msg))
     return super.emit(msg)
   }
 
@@ -112,10 +121,6 @@ class MessagingService extends OutboxService {
 
   message4(msg) {
     const _msg = { ...msg }
-    if (msg.inbound && !cds.context) {
-      // REVISIT: why are all inbound messages executed with privileged user?
-      cds.context = { tenant: msg.tenant, user: cds.User.privileged }
-    }
     _msg.event = _warnAndStripTopicPrefix(_msg.event, this.LOG)
     if (!_msg.headers) _msg.headers = {}
     if (!_msg.inbound) {

package/libx/_runtime/remote/utils/data.js

@@ -114,6 +114,7 @@ const _convertValue = (ieee754Compatible, exponentialDecimals) => (value, elemen
 
   return value
 }
+const _PT = ([hh, mm, ss]) => `PT${hh}H${mm}M${ss}S`
 
 const _convertPayloadValue = (value, element) => {
   const type = _elementType(element)
@@ -121,6 +122,10 @@ const _convertPayloadValue = (value, element) => {
   // see https://www.odata.org/documentation/odata-version-2-0/json-format/
   if (value == null) return value
   switch (type) {
+    case 'cds.Time':
+      return value.match(/^(PT)([H,M,S,0-9])*$/) ? value : _PT(value.split(':'))
+    case 'cds.Decimal':
+      return typeof value === 'string' ? value : new String(value)
     case 'cds.Date':
     case 'cds.DateTime':
       return `/Date(${new Date(value).getTime()})/`

package/libx/_runtime/sqlite/Service.js

@@ -70,7 +70,6 @@ module.exports = class SQLiteDatabase extends DatabaseService {
   }
 
   _registerBeforeHandlers() {
-    this._ensureModel && this.before('*', this._ensureModel)
     this.before(['CREATE', 'UPDATE'], '*', this._input) // > has to run before rewrite
     this.before(['CREATE', 'READ', 'UPDATE', 'DELETE'], '*', this._rewrite)
 

package/libx/odata/afterburner.js

@@ -111,6 +111,77 @@ function addRefToWhereIfNecessary(where, entity) {
   return 1
 }
 
+function getResolvedElement(entity, { ref }) {
+  const element = entity.elements[ref[0]]
+  if (element && element.isAssociation && ref.length > 1) {
+    return getResolvedElement(element._target, { ref: ref.slice(1) })
+  } else if (element && element._isStructured) {
+    return getResolvedElement(element, { ref: ref.slice(1) })
+  }
+
+  return element
+}
+
+function _processWhere(where, entity) {
+  for (let i = 0; i < where.length; i++) {
+    const ref = where[i]
+    const val = where[i + 2]
+
+    if (ref === '(' || ref === ')' || ref === 'and' || ref === 'or' || ref === 'not' || val === 'not' || ref.func) {
+      continue
+    }
+    if (ref.xpr) {
+      _processWhere(ref.xpr, entity)
+      continue
+    }
+
+    let valIndex = -1
+    let refIndex = -1
+    if (typeof val === 'object') {
+      if (val.val !== undefined) valIndex = i + 2
+      if (val.ref != undefined) refIndex = i + 2
+    }
+    if (typeof ref === 'object') {
+      if (ref.val !== undefined) valIndex = i
+      if (ref.ref != undefined) refIndex = i
+    }
+
+    // no need to check ref = ref or val = val, if no ref or no val exists we can't do anything
+    if (valIndex === refIndex || valIndex === -1 || refIndex == -1) continue
+
+    const realRef = where[refIndex]
+    const element = getResolvedElement(entity, realRef)
+
+    if (element) {
+      i += 2
+      where[valIndex].val = _convertVal(element, where[valIndex].val)
+    }
+  }
+}
+
+function _convertVal(element, value) {
+  if (value === null) return value
+  switch (element._type) {
+    case 'cds.Integer':
+      // eslint-disable-next-line no-case-declarations
+      const n = Number(value)
+      if (Number.isSafeInteger(n)) return n
+      throw new Error('Not a valid integer') // TODO
+    case 'cds.String':
+    case 'cds.LargeString':
+    case 'cds.Decimal':
+    case 'cds.DecimalFloat':
+    case 'cds.Double':
+    case 'cds.Integer64':
+      if (typeof value === 'string') return value
+      return String(value)
+    case 'cds.Boolean':
+      return typeof value === 'string' ? value === 'true' : value
+    default:
+      return value
+  }
+}
+
 function _processSegments(from, model, namespace) {
   const { ref } = from
 
@@ -142,8 +213,7 @@ function _processSegments(from, model, namespace) {
           .join(',')})`
         base.where.push({ ref: [key] }, '=', { val })
       } else {
-        const val =
-          element._type === 'cds.Integer' ? Number(seg) : element._type === 'cds.Boolean' ? seg === 'true' : seg
+        const val = _convertVal(element, seg)
         base.where.push({ ref: [key] }, '=', { val })
       }
       ref[i] = null
@@ -168,6 +238,7 @@ function _processSegments(from, model, namespace) {
           keyCount += addRefToWhereIfNecessary(ref[i].where, current)
           _resolveAliasesInXpr(ref[i].where, current)
           _resolveAliasInParams(params, current)
+          _processWhere(ref[i].where, current)
         }
 
         _addDefaultParams(ref[i], current)
@@ -201,6 +272,7 @@ function _processSegments(from, model, namespace) {
           _resolveAliasInParams(params, current)
           // in case of Foo(1), params will be {} (before addRefToWhereIfNecessary was called)
           if (!Object.keys(params).length) params = where2obj(ref[i].where)
+          _processWhere(ref[i].where, current)
           _checkAllKeysProvided(params, current)
         }
       } else if ({ action: 1, function: 1 }[current.kind]) {
@@ -221,6 +293,7 @@ function _processSegments(from, model, namespace) {
         if (ref[i].where) {
           keyCount += addRefToWhereIfNecessary(ref[i].where, current)
           _resolveAliasesInXpr(ref[i].where, current)
+          _processWhere(ref[i].where, current)
         }
       } else if (current._isStructured) {
         // > nested property
@@ -349,6 +422,10 @@ function _4service(service) {
      */
     const { one, current, target } = _processSegments(from, model, namespace)
 
+    if (cqn.SELECT.where) {
+      _processWhere(cqn.SELECT.where, root)
+    }
+
     // one?
     if (one) cqn.SELECT.one = true
 

package/libx/odata/cqn2odata.js

@@ -114,11 +114,11 @@ const _odataV2Func = (func, args) => {
   }
 }
 
-const _format = (cur, element, target, kind, isLambda) => {
-  if (typeof cur !== 'object') return encodeURIComponent(formatVal(cur, element, target, kind))
+const _format = (cur, elementName, target, kind, isLambda) => {
+  if (typeof cur !== 'object') return encodeURIComponent(formatVal(cur, elementName, target, kind))
   if (hasValidProps(cur, 'ref'))
     return encodeURIComponent(isLambda ? [LAMBDA_VARIABLE, ...cur.ref].join('/') : cur.ref[0].id || cur.ref.join('/'))
-  if (hasValidProps(cur, 'val')) return encodeURIComponent(formatVal(cur.val, element, target, kind))
+  if (hasValidProps(cur, 'val')) return encodeURIComponent(formatVal(cur.val, elementName, target, kind))
   if (hasValidProps(cur, 'xpr')) return `(${_xpr(cur.xpr, target, kind, isLambda)})`
   // REVISIT: How to detect the types for all functions?
   if (hasValidProps(cur, 'func', 'args')) {
@@ -180,7 +180,8 @@ function _xpr(expr, target, kind, isLambda) {
         res.push(OPERATORS[cur] || cur.toLowerCase())
       }
     } else {
-      const formatted = _format(cur, res[res.length - 2], target, kind, isLambda)
+      const ref = expr[i - 2]
+      const formatted = _format(cur, ref?.ref && (ref.ref.length ? ref.ref : ref.ref[0]), target, kind, isLambda)
       if (formatted !== undefined) res.push(formatted)
     }
   }
@@ -406,7 +407,7 @@ function $orderBy(orderBy) {
   return '$orderby=' + res.join(',')
 }
 
-function parseSearch(search) {
+function parseSearch(search, kind) {
   const res = []
 
   for (const cur of search) {
@@ -417,7 +418,8 @@ function parseSearch(search) {
 
     if (hasValidProps(cur, 'val')) {
       // search term must not be formatted
-      res.push(`"${encodeURIComponent(cur.val)}"`)
+      if (kind === 'odata-v2') res.push(`${encodeURIComponent(cur.val)}`)
+      else res.push(`"${encodeURIComponent(cur.val)}"`)
     }
 
     if (typeof cur === 'string') {
@@ -433,7 +435,7 @@ function parseSearch(search) {
 }
 
 function $search(search, kind) {
-  const expr = parseSearch(search).join('%20').replace('(%20', '(').replace('%20)', ')')
+  const expr = parseSearch(search, kind).join('%20').replace('(%20', '(').replace('%20)', ')')
 
   if (expr) {
     // odata-v2 may support custom query option "search"

package/libx/odata/grammar.pegjs

@@ -27,6 +27,7 @@
 //
 // ---------- JavaScript Helpers -------------
   {
+
     const $ = Object.assign
     const { strict, minimal } = options
     const stack = []
@@ -243,7 +244,7 @@
 
   ODataRelativeURI // Note: case-sensitive!
     = '/'? (p:path { SELECT = p })
-    ( o"?"o QueryOption ( o'&'o QueryOption )* )? o "?"? o {
+    ( o"?"o (QueryOption ( o'&'o QueryOption )*)? )? o {
       if (count) {
         // columns set because of $count: ignore $select, $expand, $top, $skip, $orderby
         // REVISIT: don't ignore query options but throw bad request (as okra did)?
@@ -334,46 +335,39 @@
   QueryOption = option:ExpandOption { if(option && option.apply) SELECT.apply = option.apply} /
     "$skiptoken="   o skiptoken /
     format /
-    custom
+    custom /
+    aliasedParamEqualsVal
   // @OData spec for $expand:
   // "Allowed system query options are $filter, $select, $orderby, $skip, $top, $count, $search, $expand and $apply (http://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/cs02/odata-data-aggregation-ext-v4.0-cs02.html#_The_expand_Transformation)."
   ExpandOption =
     "$select="      o select ( COMMA select )* /
-    "$expand="      o expand ( COMMA expand )* /
-    "$filter="      o f:filter{SELECT.where = f} /
+    "$expand="      o expand ( COMMA expand )* expandCount? /
+    "$filter="      o f:filter { SELECT.where = f } /
     "$orderby="     o o:orderby ( COMMA o2:orderby{_setOrderBy(o2)} )* {_setOrderBy(o,true)} /
-    "$top="         o val:top{(SELECT.limit || (SELECT.limit={})).rows = {val}} /
-    "$skip="        o val:skip{_setLimitOffset(val)} /
-    "$search="      o s:search {if (s) SELECT.search = s} /
+    "$top="         o val:top { (SELECT.limit || (SELECT.limit={})).rows = {val} } /
+    "$skip="        o val:skip { _setLimitOffset(val) } /
+    "$search="      o s:search { if (s) SELECT.search = s } /
     "$count="       o count /
-    "$apply="       o trafos:transformations {return trafos}
+    "$apply="       o trafos:transformations { return trafos }
 
 
   select
-    = col:('*'/ref) {
+    = col:('*' / ref) {
       SELECT.columns = Array.isArray(SELECT.columns) ? SELECT.columns : []
       if (!SELECT.columns.find(_compareRefs(col))) SELECT.columns.push(col)
       return col
     }
 
-//REVISIT: per OData spec $apply should be also supported inside of $expand
-  expand =
-    (
-      c:('*'/ref) {
-        const col = c === '*' ? {} : c
-        col.expand = '*'
-        if (!Array.isArray(SELECT.expand)) SELECT.expand = []
-        if (!SELECT.expand.find(_compareRefs(col))) SELECT.expand.push(col)
-        return col
-      }
-    )
-    ( // --- nested query options, if any
-      (OPEN {
-        stack.push (SELECT)
-        SELECT = SELECT.expand[SELECT.expand.length-1]
-        SELECT.expand = '*' // by default expand everything
-      })(
-      expandOptions:( o ";"? o option:ExpandOption{return option})*
+  expandCount 
+    = "/$count" {
+      const err = new Error("EXPAND_COUNT_UNSUPPORTED");
+      err.statusCode=501;
+      throw err;
+    }
+
+  expandQueryOptions
+   = (
+      expandOptions:(option:ExpandOption o ";"? { return option })*
       {
       	if (expandOptions.find(option => option && option.apply !== undefined)) {
         	const err = new Error("EXPAND_APPLY_UNSUPPORTED");
@@ -390,29 +384,50 @@
           if (Array.isArray(SELECT.expand) && SELECT.expand.indexOf('*') === -1) SELECT.expand.unshift('*')
         }
       }
-      )(CLOSE {
+      )
+
+  expandQueryOption
+   = (OPEN {
+        stack.push (SELECT)
+        SELECT = SELECT.expand[SELECT.expand.length-1]
+        SELECT.expand = '*' // by default expand everything
+      }) 
+      expandQueryOptions? 
+      (CLOSE {
         SELECT = stack.pop()
       })
-    )? // --- end of nested query options
-    ( COMMA expand )?
-    ("/$count" {
-      const err = new Error("EXPAND_COUNT_UNSUPPORTED");
-      err.statusCode=501;
-      throw err;
-    })?
+    
+
+//REVISIT: per OData spec $apply should be also supported inside of $expand
+  expand
+  = (
+      c:('*' / ref) {
+        const col = c === '*' ? {} : c
+        col.expand = '*'
+        if (!Array.isArray(SELECT.expand)) SELECT.expand = []
+        if (!SELECT.expand.find(_compareRefs(col))) SELECT.expand.push(col)
+        return col
+      }
+    )
+    expandQueryOption?
+
   top
-    = val:integer {return val}
+    = val:integer { return val }
+
   skiptoken
     = val:integer? skiptoken:skiptokenChars? {
       // REVISIT ignore non-numeric $skiptoken as not supported by CQN
       if (skiptoken) return
       _setLimitOffset(val)
     }
+
   skip
-    = val:integer {return val}
+    = val:integer { return val }
+
   search
     = p:search_clause {return p}
       / o // Do not add search property for space only
+
   search_clause
     = p:( n:NOT? {return n?[n]:[]} )(
       OPEN xpr:search_clause CLOSE {p.push({xpr})}
@@ -422,9 +437,11 @@
           val:word {p.push({val})}
         )
     )( ao:(AND/OR/AND_SPACE) more:search_clause {p.push(ao,...more)} )*
-    {return p}
+    { return p }
+
   filter
     = p:where_clause { return p }
+
   where_clause = p:( n:NOT? {return n?[n]:[]} )(
       OPEN xpr:where_clause CLOSE {p.push({xpr})}
       / comp:comparison {p.push(...comp)}
@@ -437,8 +454,10 @@
       }
       / func:boolish {p.push(func)}
       / val:bool {p.push({val})}
+      / list:listFilter {p.push(...list)}
     )( ao:(AND/OR) more:where_clause {p.push(ao,...more)} )*
-    {return p}
+    { return p }
+
   lambda =
     nav:( n:identifier {return[n]} ) '/' ( n:identifier '/' {nav.push(n)} )*
     xpr:(
@@ -467,28 +486,48 @@
       }
     )
     { return xpr }
+
   inner_lambda =
     p:( n:NOT? { return n ? [n] : [] } )(
       OPEN xpr:inner_lambda CLOSE { p.push('(', ...xpr, ')') }
       / comp:comparison { p.push(...comp) }
       / func:function { p.push(func) }
       / lambda:lambda { p.push(...lambda)}
+      / list:listFilter {p.push(...list)}
     )
     ( ao:(AND/OR) more:inner_lambda { p.push(ao, ...more) } )*
     { return p }
-  lambda_clause = prefix:identifier ":" inner:inner_lambda {
-    return _removeLambdaPrefix(prefix, inner)
-  }
-  any = "any" OPEN p:lambda_clause? CLOSE { return p }
-  all = "all" OPEN p:lambda_clause CLOSE { return p }
+
+  lambda_clause =
+    prefix:identifier ":" inner:inner_lambda {
+      return _removeLambdaPrefix(prefix, inner)
+    }
+
+  any =
+   "any" OPEN p:lambda_clause? CLOSE { return p }
+
+  all =
+   "all" OPEN p:lambda_clause CLOSE { return p }
+
   orderby
-    = ref:(lambda{const err = new Error("ORDERBY_LAMBDA_UNSUPPORTED");err.statusCode=501;throw err;}/function/ref) sort:( _ s:$("asc"/"desc") {return s})? {
+    = ref:(
+        lambda {
+          const err = new Error("ORDERBY_LAMBDA_UNSUPPORTED");
+          err.statusCode=501;
+          throw err;
+        } /
+        function /
+        ref
+      ) 
+      sort:( _ s:$("asc" / "desc") { return s })? {
         // TODO: Lambda support
         const appendObj = $(ref, sort && {sort});
         return appendObj;
     }
+
   count
     = val:bool { if(val) SELECT.count = true }
+
   transformations
     = mainTransformation:trafo additionalTransformation:("/" t2:trafo {
       return t2
@@ -523,6 +562,8 @@
 
   custom
     = [a-zA-Z0-9-_.~]+ "=" [^&]*
+  aliasedParam "an aliased parameter (@param)" = "@" i:identifier { return "@" + i }
+  aliasedParamEqualsVal "@alias=value" = a:aliasedParam "=" v:([^&]*) {return a + "=" + v} 
 
   format = "$format=" f:$([^&]*) {
     if (f.toLowerCase() !== "json") {
@@ -531,17 +572,25 @@
       throw err;
     }
   }
+
 //
 // ---------- Expressions ------------
-  comparison "a comparison"
-    = a:operand _ o:$("eq"/"ne"/"lt"/"gt"/"le"/"ge") _ b:operand {
-      const op = { eq:'=', ne:'!=', lt:'<', gt:'>', le:'<=', ge:'>=' }[o]||o
+  comparison
+    = a:operand _ o:$("eq" / "ne" / "lt" / "gt" / "le" / "ge") _ b:operand {
+      const op = { eq:'=', ne:'!=', lt:'<', gt:'>', le:'<=', ge:'>=' }[o] || o
       return [ a, op, b ]
     }
+
+  listFilter
+    = a:operand _ "in" _ b:listRoundBrackets {
+      return [ a, "in", b ]
+    }
   mathCalc
     = operand (_ ("add" / "sub" / "mul" / "div" / "mod") _ operand)*
-  operand "an operand"
+  
+  operand
     = navigationCount / function / val / ref / jsonObject / jsonArray / list
+  
   navigationCount "navigation with $count"
   = navigationPath:(head:identifier key:(OPEN keyArgs:args CLOSE {return keyArgs;})? '/' {
     if (key) {
@@ -551,6 +600,7 @@
     return head;
   })+ count: '$count'
     { return {func: 'count', as: '$count', args: [{ref: navigationPath}]} }
+  
   ref "a reference"
     = head:identifier tail:( '/' n:identifier {return n})*
     {
@@ -559,34 +609,56 @@
       }
       return { ref:[ head, ...tail ] }
     }
+
   val
     = val:(bool / date) {return {val}}
     / val:guid {return {val}}
     / val:number {return typeof val === 'number' ? {val} : { val, literal:'number' }}
     / val:string {return {val}}
     / val:binary {return {val}}
-  jsonObject = val:$("{" (jsonObject / [^}])* "}") {return {val}}
-  jsonArray = val:$("[" o "]" / "[" o "{" (jsonArray / [^\]])* "]") {return {val}}
-
-  list
+    / val:aliasedParam {return {val}}
+    / null
+
+  null "null" =  "null" {return {val: null }}
+  
+  jsonObject "a json object"
+    = val:$("{" (jsonObject / [^}])* "}") {return {val}}
+  
+  jsonArray "a json array"
+    = val:$("[" o "]" / "[" o "{" (jsonArray / [^\]])* "]") {return {val}}
+
+  list "a list"
     = "[" any:$([^\]])* "]" // > needs improvment
     { return { list: any.replace(/"/g,'').split(',').map(ele => ({ val: ele })) } }
 
-  function "a function call"
-    = func:$[a-zA-Z]+ OPEN a:operand more:( COMMA o:operand {return o} )* CLOSE {
+  listRoundBrackets "a list"
+    = OPEN list:(val1:val val2:("," v:val { return v })* { return [val1, ...val2] }) CLOSE // > needs improvment
+    { 
+      return { list }
+    }
+
+  
+  functionName "a function name"
+  = $[a-zA-Z]+
+
+  function 
+    = func:functionName OPEN fnArgs:functionArgs CLOSE {
       if (strict && !(func.toLowerCase() in strict.functions)) {
         throw Object.assign(new Error(`"${func}" is an unknown function in OData URL spec (strict mode)`), { statusCode: 400 })
       }
-      return { func: func.toLowerCase(), args:[a,...more] }
+      return { func: func.toLowerCase(), args:[fnArgs.a,...fnArgs.more] }
     }
 
-  boolish "a boolean function"
+  functionArgs
+    = a:operand more:( COMMA o:operand {return o} )* {return { a, more }}
+
+  boolish
     = func:("contains"i/"endswith"i/"startswith"i) OPEN a:operand COMMA b:operand CLOSE
     { return { func: func.toLowerCase(), args:[a,b] }}
 
   NOT = o "NOT"i _ {return 'not'}
   AND = _ "AND"i _ {return 'and'}
-  AND_SPACE =   _ {return 'and'}
+  AND_SPACE =    _ {return 'and'}
   OR  = _  "OR"i _ {return 'or'}
 
 
@@ -622,7 +694,7 @@
         }        
         return {aggregate: [{ func, args }]}
       } /
-      identity: identityTrafo{return identity}
+      identity: identityTrafo {return identity}
       // customFunction
     )
 
@@ -663,7 +735,11 @@
   groupByElem
     = c:(rollupSpec / ref) { return c }
   rollupSpec // TODO fix this + add CAP support
-    = rollup:("rollup" OPEN o ('$all' / ref) (o COMMA ref)+ o CLOSE) {const err = new Error("Rollup in groupby is not supported yet.");err.statusCode=501;throw err;}
+    = rollup:("rollup" OPEN o ('$all' / ref) (o COMMA ref)+ o CLOSE) {
+        const err = new Error("Rollup in groupby is not supported yet.");
+        err.statusCode=501;
+        throw err;
+      }
 
   filterTrafo = OPEN o where:(where:filter{
     return where
@@ -707,20 +783,21 @@
 //
 // ---------- Literals -----------
 
-  bool = b:("true" / "false") { return b === 'true'}
+  bool "a boolean"
+    = b:("true" / "false") { return b === 'true'}
 
-  string "Edm.String"
-    = "'" s:$("''"/[^'])* "'"
+  string "a single quoted string" // "Edm.String"
+    = "'" s:$("''" / [^'])* "'" // 'A user''s story'
     {return s.replace(/''/g,"'")}
 
-  doubleQuotedString
+  doubleQuotedString "a doubled quoted string"
     = '"' s:$('\\"'/[^"])* '"'
     {return s.replace(/\\\\/g,"\\").replace(/\\"/g,'"')}
 
-  word
+  word "a string"
     = $([^ \t\n()"&;]+)
 
-  date
+  date "a date"
     = s:$( [0-9]+"-"[0-9][0-9]"-"[0-9][0-9] // date
       ( "T"[0-9][0-9]":"[0-9][0-9](":"[0-9][0-9]("."[0-9]+)?)? // time
       ( "Z" / (("+" / "-")[0-9][0-9]":"[0-9][0-9]) )? // timezone (Z or +-hh:mm)
@@ -730,19 +807,23 @@
       return s
     }
 
-  number
-    = s:$( [+-]? [0-9]+ ("."[0-9]+)? ("e"[0-9]+)? ) { return safeNumber(s) }
+  // to avoid 123-123-123 being matched as number and showing error for "-123-123"
+  endsWithMinus
+    = [0-9]+ "-"
+
+  number "a number"
+    = !endsWithMinus s:$( [+-]? [0-9]+ ("."[0-9]+)? ("e"[0-9]+)? ) { return safeNumber(s) }
 
-  integer
+  integer "an integer"
     = s:$( [+-]? [0-9]+ ) { return parseInt(s) }
 
-  identifier
+  identifier "an identifier"
     = !bool !guid s:$([_a-zA-Z][_a-zA-Z0-9"."]*) { return s }
 
-  guid
+  guid "a guid"
     = $( hex16 hex16 "-"? hex16 "-"? hex16 "-"? hex16 "-"? hex16 hex16 hex16 )
 
-  hex16
+  hex16 "a hex value"
     = $( [0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F] )
 
   segment // > everything except / and ?
@@ -751,7 +832,7 @@
   skiptokenChars
     = $( [a-zA-Z0-9-"."_~!$'()*+,;=:@"/""?"]+ )
 
-  binary // > url-safe base64
+  binary "a binary" // > url-safe base64
     = "binary'" s:$([a-zA-Z0-9-_]+ ("=="/"=")?) "'" { return standardBase64(s) }
 
 //
@@ -766,8 +847,8 @@
 //
 // ---------- Whitespaces -----------
 
-  o "optional whitespaces" = $[ \t\n]*
-  _ "mandatory whitespaces" = $[ \t\n]+
+  o "an optional whitespace" = $[ \t\n]*
+  _ "a whitespace" = $[ \t\n]+
 
 //
-// ------------------------------------
+// ------------------------------------