@sap/cds-compiler 2.15.8 → 3.1.0

package/lib/json/from-csn.js

@@ -88,6 +88,7 @@
  */
 
 const { dictAdd } = require('../base/dictionaries');
+const { quotedLiteralPatterns } = require('../compiler/builtins');
 
 const $location = Symbol.for('cds.$location');
 
@@ -136,7 +137,7 @@ const schemaClasses = {
   condition: {
     arrayOf: exprOrString,
     type: condition,
-    msgId: 'syntax-csn-expected-term',
+    msgId: 'syntax-expected-term',
     // TODO: also specify requires here, and adapt onlyWith()
     optional: exprProperties,
   },
@@ -146,11 +147,11 @@ const schemaClasses = {
   },
   natnumOrStar: {
     type: natnumOrStar,
-    msgId: 'syntax-csn-expected-cardinality',
+    msgId: 'syntax-expected-cardinality',
   },
   columns: {
     arrayOf: selectItem,
-    msgId: 'syntax-csn-expected-column',
+    msgId: 'syntax-expected-column',
     defaultKind: '$column',
     validKinds: [], // pseudo kind '$column'
     // A column with only as+cast.type is a new association
@@ -228,7 +229,7 @@ const schema = compileSchema( {
     dictionaryOf: definition,
     defaultKind: 'action',
     validKinds: [ 'action', 'function' ],
-    inKind: [ 'entity', 'annotate', 'extend' ],
+    inKind: [ 'entity', 'aspect', 'annotate', 'extend' ],
   },
   params: {
     dictionaryOf: definition,
@@ -291,7 +292,7 @@ const schema = compileSchema( {
   // type properties (except: elements, enum, keys, on): ---------------------
   type: {
     type: artifactRef,
-    msgId: 'syntax-csn-expected-reference',
+    msgId: 'syntax-expected-reference',
     optional: [ 'ref', 'global' ],
     inKind: [ 'element', 'type', 'param', 'mixin', 'event', 'annotation' ],
   },
@@ -367,7 +368,7 @@ const schema = compileSchema( {
   ref: {
     arrayOf: refItem,
     type: renameTo( 'path', arrayOf( refItem ) ),
-    msgId: 'syntax-csn-expected-reference',
+    msgId: 'syntax-expected-reference',
     minLength: 1,
     requires: 'id',
     optional: [ 'id', 'args', 'cardinality', 'where' ],
@@ -583,7 +584,7 @@ const schema = compileSchema( {
     inKind: [ 'element', '$column' ],
   },
   masked: {
-    type: boolOrNull,
+    type: masked,
     inKind: [ 'element' ],
   },
   notNull: {
@@ -683,15 +684,6 @@ const topLevelSpec = {
   schema,
 };
 
-const validLiteralsExtra = Object.assign( Object.create(null), {
-  // TODO: should we use quotedLiteralPatterns from genericAntlrParser?
-  number: 'string',
-  x: 'string',
-  time: 'string',
-  date: 'string',
-  timestamp: 'string',
-} );
-
 // Module variables, schema compilation, and functors ------------------------
 
 /** @type {(id, location, textOrArguments, texts?) => void} */
@@ -780,7 +772,7 @@ function arrayOf( fn, filter = undefined ) {
     } );
     const minLength = spec.minLength || 0;
     if (minLength > val.length) {
-      message( 'syntax-csn-expected-length', location(true),
+      message( 'syntax-expected-length', location(true),
                { prop: spec.prop, n: minLength, '#': minLength === 1 ? 'one' : 'std' });
     }
     if (val.length)
@@ -850,7 +842,7 @@ function object( obj, spec ) {
   if (requires === undefined || requires === true) {
     // console.log(csnProps,JSON.stringify(spec))
     if (!relevantProps) {
-      error( 'syntax-csn-required-subproperty', location(true),
+      error( 'syntax-required-subproperty', location(true),
              {
                prop: spec.msgProp,
                '#': (
@@ -876,7 +868,7 @@ function object( obj, spec ) {
 
 function vZeroDelete( o, spec ) { // for old-CSN property 'origin'
   if (!csnVersionZero) {
-    warning( 'syntax-csn-zero-delete', location(true), { prop: spec.msgProp },
+    warning( 'syntax-zero-delete', location(true), { prop: spec.msgProp },
              'Delete/inline CSN v0.1.0 property $(PROP)' );
   }
   string( o, spec );
@@ -961,7 +953,7 @@ function definition( def, spec, xsn, csn, name ) {
 function dictionaryOf( elementFct ) {
   return function dictionary( dict, spec ) {
     if (!dict || typeof dict !== 'object' || Array.isArray( dict )) {
-      error( 'syntax-csn-expected-object', location(true),
+      error( 'syntax-expected-object', location(true),
              { prop: spec.prop }); // spec.prop, not spec.msgProp!
       return ignore( dict );
     }
@@ -973,7 +965,7 @@ function dictionaryOf( elementFct ) {
     ++virtualLine;
     for (const name of allNames) {
       if (!name) {
-        warning( 'syntax-csn-empty-name', location(true),
+        warning( 'syntax-empty-name', location(true),
                  { prop: spec.prop }, // TODO: Error
                  'Property names in dictionary $(PROP) must not be empty' );
       }
@@ -1050,11 +1042,11 @@ function validKind( val, spec, xsn ) {
   if (val === xsn.kind)         // has been set in definition - the same = ok!
     return undefined;           // already set in definition
   if (val === 'view' && xsn.kind === 'entity') {
-    warning( 'syntax-csn-zero-value', location(true), { prop: spec.msgProp },
+    warning( 'syntax-zero-value', location(true), { prop: spec.msgProp },
              'Replace CSN v0.1.0 value in $(PROP) by something specified' );
   }
   else if ((val === 'entity' || val === 'type') && xsn.kind === 'aspect') {
-    info( 'syntax-csn-aspect', location(true), { kind: 'aspect', '#': val },
+    info( 'syntax-aspect', location(true), { kind: 'aspect', '#': val },
           {
             std: 'Use the dedicated kind $(KIND) for aspect definitions',
             // eslint-disable-next-line max-len
@@ -1062,7 +1054,7 @@ function validKind( val, spec, xsn ) {
           } );
   }
   else {
-    error( 'syntax-csn-expected-valid', location(true), { prop: spec.msgProp },
+    error( 'syntax-expected-valid', location(true), { prop: spec.msgProp },
            'Expected valid string for property $(PROP)' );
   }
   return ignore( val );
@@ -1104,7 +1096,7 @@ function vZeroRef( name, spec, xsn ) {
     return;
   const path = name.split('.');
   if (!path.every( id => id)) {
-    warning( 'syntax-csn-expected-name', location(true), { prop: spec.msgProp },
+    warning( 'syntax-expected-name', location(true), { prop: spec.msgProp },
              'Expected correct name for property $(PROP)' );
   }
   xsn.path = path.map( id => ({ id, location: location() }) );
@@ -1115,7 +1107,7 @@ function vZeroRef( name, spec, xsn ) {
 function boolOrNull( val, spec ) {
   if ([ true, false, null ].includes( val ))
     return { val, location: location() };
-  warning( 'syntax-csn-expected-boolean', location(true), { prop: spec.msgProp },
+  warning( 'syntax-expected-boolean', location(true), { prop: spec.msgProp },
            'Expected boolean or null for property $(PROP)' );
   ignore( val );
   return { val: !!val, location: location() };
@@ -1125,7 +1117,7 @@ function string( val, spec ) {
   if (typeof val === 'string' && val)
     //  XSN TODO: do not require literal
     return val;
-  error( 'syntax-csn-expected-string', location(true), { prop: spec.msgProp },
+  error( 'syntax-expected-string', location(true), { prop: spec.msgProp },
          'Expected non-empty string for property $(PROP)' );
   return ignore( val );
 }
@@ -1134,7 +1126,7 @@ function stringVal( val, spec ) {
   if (typeof val === 'string' && val)
     //  XSN TODO: do not require literal
     return { val, literal: 'string', location: location() };
-  error( 'syntax-csn-expected-string', location(true), { prop: spec.msgProp },
+  error( 'syntax-expected-string', location(true), { prop: spec.msgProp },
          'Expected non-empty string for property $(PROP)' );
   return ignore( val );
 }
@@ -1156,7 +1148,7 @@ function natnum( val, spec ) {
   if (typeof val === 'number' && val >= 0)
     //  XSN TODO: do not require literal
     return { val, literal: 'number', location: location() };
-  error( spec.msgId || 'syntax-csn-expected-natnum', location(true),
+  error( spec.msgId || 'syntax-expected-natnum', location(true),
          { prop: spec.msgProp } );
   return ignore( val );
 }
@@ -1191,10 +1183,8 @@ function annoValue( val, spec ) {
     /** @type {string|boolean} */
     let seenEllipsis = false;
     if (arrayLevelCount > 0) {  // TODO: also inside structure (possible in CSN!)
-      if (val.some( isEllipsis )) {
-        error( 'syntax-csn-unexpected-ellipsis', location(true), { code: '...' },
-               'Unexpected $(CODE) in nested array' );
-      }
+      if (val.some( isEllipsis ))
+        error( 'syntax-unexpected-ellipsis', location(true), { '#': 'nested-array', code: '...' } );
     }
     else {
       for (const item of val) {
@@ -1203,7 +1193,7 @@ function annoValue( val, spec ) {
         }
         else if (isEllipsis( item )) { // with or without UP TO
           // error position at the beginning of the array, but that is fine
-          error( 'syntax-csn-duplicate-ellipsis', location(true), { code: '...' },
+          error( 'syntax-duplicate-ellipsis', location(true), { code: '...' },
                  'Expected no more than one $(CODE)' );
           break;
         }
@@ -1217,7 +1207,7 @@ function annoValue( val, spec ) {
     };
     arrayLevelCount--;
     if (seenEllipsis === 'upTo') {
-      error( 'syntax-csn-expecting-ellipsis', location(true), // at closing bracket
+      error( 'syntax-expecting-ellipsis', location(true), // at closing bracket
              { code: '... up to', newcode: '...' },
              // TODO: should we be more CSN specific in the message?
              'Expecting an array item $(NEWCODE) after an item with $(CODE)' );
@@ -1264,11 +1254,14 @@ function annoValue( val, spec ) {
 }
 
 function annotation( val, spec, xsn, csn, name ) {
-  const variantIndex = name.indexOf('#') + 1 || name.length;
-  const n = refSplit( name.substring( (xsn ? 1 : 0), variantIndex ), spec.msgProp );
+  const absolute = (xsn ? name.substring(1) : name);
+  // TODO: really care about variant (qualifier parts)?
+  const variantIndex = absolute.indexOf('#') + 1 || absolute.length;
+  const n = refSplit( absolute.substring( 0, variantIndex ), spec.msgProp );
   if (!n)
     return undefined;
-  if (variantIndex < name.length)
+  n.absolute = absolute;
+  if (variantIndex < absolute.length)
     n.variant = { id: name.substring( variantIndex ), location: location() };
   const r = annoValue( val, spec );
   r.name = n;
@@ -1283,21 +1276,27 @@ function value( val, spec, xsn ) { // for CSN property 'val'
       xsn.literal = (val === null) ? 'null' : typeof val;
     return val;
   }
-  error( 'syntax-csn-expected-scalar', location(true), { prop: spec.msgProp },
+  error( 'syntax-expected-scalar', location(true), { prop: spec.msgProp },
          'Only scalar values are supported for property $(PROP)' );
   return ignore( val );
 }
 
-function literal( val, spec, xsn, csn ) {
+function literal( lit, spec, xsn, csn ) {
   // TODO: general: requires other property (here: 'val')
   const type = (csn.val == null) ? 'null' : typeof csn.val;
-  if (val === type)            // also for 'object' which is an error for 'val'
-    return val;
-  if (typeof val === 'string' && validLiteralsExtra[val] === type)
-    return val;
-  error( 'syntax-csn-expected-valid', location(true), { prop: spec.msgProp },
+  if (lit === type)            // also for 'object' which is an error for 'val'
+    return lit;
+  if (typeof lit === 'string' && quotedLiteralPatterns[lit]?.json_type === type) {
+    const p = quotedLiteralPatterns[lit];
+    if (p && p.test_fn && !p.test_fn(csn.val))
+      warning( 'syntax-invalid-literal', location(), { '#': p.test_variant } );
+    return lit;
+  }
+  if (lit === 'number' && type === 'string') // special case, not a quoted literal in CDL
+    return lit;
+  error( 'syntax-expected-valid', location(true), { prop: spec.msgProp },
          'Expected valid string for property $(PROP)' );
-  return ignore( val );
+  return ignore( lit );
 }
 
 function func( val, spec, xsn ) {
@@ -1310,7 +1309,7 @@ function func( val, spec, xsn ) {
 function xpr( exprs, spec, xsn, csn ) {
   if (csn.func) {
     if (!exprs.length) {
-      message( 'syntax-csn-expected-length', location(true),
+      message( 'syntax-expected-length', location(true),
                { prop: 'xpr', otherprop: 'func', '#': 'suffix' });
     }
     xsn.suffix = exprArgs( exprs, spec );
@@ -1343,7 +1342,7 @@ function args( exprs, spec ) {
     return arrayOf( exprOrString )( exprs, spec );
   }
   else if (!exprs || typeof exprs !== 'object') {
-    error( 'syntax-csn-expected-args', location(true),
+    error( 'syntax-expected-args', location(true),
            { prop: spec.prop }, // spec.prop, not spec.msgProp!
            'Expected array or object for property $(PROP)' );
     return ignore( exprs );
@@ -1406,12 +1405,12 @@ function condition( cond, spec ) {
 function vZeroValue( obj, spec, xsn ) {
   if (xsn.value) {
     // TODO: also "sign" xsn.value created by inValue to complain about both 'value' and 'ref' etc
-    warning( 'syntax-csn-unexpected-property', location(true), { prop: spec.msgProp },
+    warning( 'syntax-unexpected-property', location(true), { prop: spec.msgProp },
              'Unexpected CSN property $(PROP)' );
     return undefined;
   }
   if (!csnVersionZero) {
-    warning( 'syntax-csn-zero-delete', location(true), { prop: spec.msgProp },
+    warning( 'syntax-zero-delete', location(true), { prop: spec.msgProp },
              'Delete/inline CSN v0.1.0 property $(PROP)' );
   }
   return expr( obj, spec );
@@ -1458,6 +1457,12 @@ function excluding( array, spec, xsn ) {
   xsn.excludingDict = r;
 }
 
+function masked( val, spec ) {
+  message('syntax-invalid-masked', location(), { keyword: 'masked' },
+          'Keyword $(KEYWORD) not supported');
+  return boolOrNull( val, spec );
+}
+
 function duplicateExcluding( name, loc ) {
   error( 'duplicate-excluding', loc, { name, keyword: 'excluding' },
          'Duplicate $(NAME) in the $(KEYWORD) clause' );
@@ -1478,7 +1483,7 @@ function join( val, spec, xsn ) {
 
 function queryArgs( val, spec, xsn, csn ) {
   if (Array.isArray( val ) && val.length > 1 && !csn.op) {
-    warning( 'syntax-csn-expected-property', location(true),
+    warning( 'syntax-expected-property', location(true),
              { prop: 'args', otherprop: 'op' },
              'CSN property $(PROP) expects property $(OTHERPROP) to be specified' );
     xsn.op = { val: 'union', location: location() };
@@ -1497,7 +1502,7 @@ function i18nLang( val, spec, xsn, csn, langKey ) {
 function translations( keyVal, spec, xsn, csn, textKey ) {
   if (typeof keyVal === 'string') // allow empty string
     return { val: keyVal, literal: 'string', location: location() };
-  error( 'syntax-csn-expected-translation', location(true),
+  error( 'syntax-expected-translation', location(true),
          { prop: textKey, otherprop: spec.prop },
          'Expected string for text key $(PROP) of language $(OTHERPROP)' );
   return ignore( keyVal );
@@ -1511,7 +1516,7 @@ function getSpec( parentSpec, csn, prop, xor, expected, kind ) {
   if (!s || s.noPrefix && prop !== p0 ) {
     if (ourpropsRegex.test( prop )) {
       // TODO v2: Warning only with --sloppy
-      warning( 'syntax-csn-unknown-property', location(true), { prop },
+      warning( 'syntax-unknown-property', location(true), { prop },
                'Unknown CSN property $(PROP)' );
     }
     else {                      // TODO v2: always (i.e. also with message) add to $extra
@@ -1522,14 +1527,14 @@ function getSpec( parentSpec, csn, prop, xor, expected, kind ) {
     if (s.ignore)
       return { type: ignore };
     if (s.vZeroIgnore && s.vZeroIgnore === csn[prop]) { // for "op": "call"
-      warning( 'syntax-csn-zero-delete', location(true), { prop },
+      warning( 'syntax-zero-delete', location(true), { prop },
                'Delete/inline CSN v0.1.0 property $(PROP)' );
       return { type: ignore };
     }
     const zero = s.vZeroFor;
     if (zero) {                 // (potential) CSN v0.1.0 property
       const group = s.xorGroup;
-      if (zero && expected( zero, schema[zero] ) && !(group && xor[group])) {
+      if (expected( zero, schema[zero] ) && !(group && xor[group])) {
         replaceZeroProp( prop, zero );
         if (group)
           xor[group] = prop;
@@ -1541,7 +1546,7 @@ function getSpec( parentSpec, csn, prop, xor, expected, kind ) {
     const variant = kind && s.inKind
       ? ([ 'extend', 'annotate' ].includes(kind) ? kind : 'def')
       : (parentSpec.msgProp ? 'std' : 'top');
-    message( 'syntax-csn-unexpected-property', location(true),
+    message( 'syntax-unexpected-property', location(true),
              {
                prop, otherprop: parentSpec.msgProp, kind, '#': variant,
              },
@@ -1549,7 +1554,7 @@ function getSpec( parentSpec, csn, prop, xor, expected, kind ) {
                std: 'CSN property $(PROP) is not expected in $(OTHERPROP)',
                top: 'CSN property $(PROP) is not expected top-level',
                def: 'CSN property $(PROP) is not expected by a definition of kind $(KIND)',
-               extend: 'CSN property $(PROP) is not expected by an extend in $(OTHERPROP))',
+               extend: 'CSN property $(PROP) is not expected by an extend in $(OTHERPROP)',
                annotate: 'CSN property $(PROP) is not expected by an annotate in $(OTHERPROP)',
              } );
     // TODO: or still augment it? (but then also handle xorGroup)
@@ -1599,13 +1604,13 @@ function onlyWith( spec, need, csn, prop, xor, expected ) {
     need = allowed.find( p => !xor[schema[p].xorGroup] ) || allowed[0];
   }
   if (prop) {
-    error( 'syntax-csn-dependent-property', location(true),
+    error( 'syntax-dependent-property', location(true),
            { prop, otherprop: need },
            'CSN property $(PROP) can only be used in combination with $(OTHERPROP)');
     xor['no:req'] = prop;
   }
   else if (!xor['no:req']) {
-    error( 'syntax-csn-required-property', location(true),
+    error( 'syntax-required-property', location(true),
            { prop: need, otherprop: spec.msgProp, '#': spec.prop },
            {  // TODO $(PARENT), TODO: do not use prop===0 hack
              std: 'Object in $(OTHERPROP) must have the property $(PROP)',
@@ -1627,7 +1632,7 @@ function checkAndSetXorGroup( group, prop, xor ) {
   if (prop === 'func' && xor[group] === 'xpr' ||
       prop === 'xpr' && xor[group] === 'func')
     return true;                // hack for window function: both func and xpr is allowed
-  error( 'syntax-csn-excluded-property', location(true),
+  error( 'syntax-excluded-property', location(true),
          { prop, otherprop: xor[group] },
          'CSN property $(PROP) can only be used alternatively to $(OTHERPROP)');
   return false;
@@ -1642,7 +1647,7 @@ function implicitName( ref ) {
 function replaceZeroProp( otherprop, prop ) {
   if (csnVersionZero)
     return;
-  warning( 'syntax-csn-zero-prop', location(true), { prop, otherprop },
+  warning( 'syntax-zero-prop', location(true), { prop, otherprop },
            'Replace CSN v0.1.0 property $(OTHERPROP) by $(PROP)' );
 }
 
@@ -1651,7 +1656,7 @@ function replaceZeroProp( otherprop, prop ) {
 function isArray( array, spec ) {
   if (Array.isArray( array ))
     return array;
-  error( 'syntax-csn-expected-array', location(true), { prop: spec.prop },
+  error( 'syntax-expected-array', location(true), { prop: spec.prop },
          'Expected array for property $(PROP)' );
   return ignore( array );
 }
@@ -1659,7 +1664,7 @@ function isArray( array, spec ) {
 function isObject( obj, spec ) {
   if (obj && typeof obj === 'object' && !Array.isArray( obj ))
     return obj;
-  error( spec.msgId || 'syntax-csn-expected-object', location(true),
+  error( spec.msgId || 'syntax-expected-object', location(true),
          { prop: spec.msgProp });
   return ignore( obj );
 }
@@ -1667,7 +1672,7 @@ function isObject( obj, spec ) {
 function refSplit( name, prop ) {
   const path = name.split('.');
   if (!path.every( id => id)) {
-    warning( 'syntax-csn-expected-name', location(true), { prop },
+    warning( 'syntax-expected-name', location(true), { prop },
              'Expected correct name for property $(PROP)' );
   }
   return { path: path.map( id => ({ id, location: location() }) ), location: location() };
@@ -1675,7 +1680,7 @@ function refSplit( name, prop ) {
 
 function replaceZeroValue( spec ) {
   if (!csnVersionZero && spec.vZeroFor == null) { // but 0 does not match!
-    warning( 'syntax-csn-zero-value', location(true), { prop: spec.msgProp },
+    warning( 'syntax-zero-value', location(true), { prop: spec.msgProp },
              'Replace CSN v0.1.0 value in $(PROP) by something specified' );
   }
 }
@@ -1705,7 +1710,7 @@ function pushLocation( obj ) {
   else if (!loc || typeof loc !== 'string') {
     if (loc)
       dollarLocations.push( null ); // must match with popLocation()
-    error( 'syntax-csn-expected-object', location(true), { prop: '$location' } );
+    error( 'syntax-expected-object', location(true), { prop: '$location' } );
   }
   // hidden feature: string $location
   const m = /:(\d+)(?::(\d+))?$/.exec( loc ); // extra '^'s at end deliberately left out
@@ -1777,7 +1782,7 @@ function toXsn( csn, filename, options, messageFunctions ) {
 }
 
 
-function augment( csn, filename = 'csn.json', options = {}, messageFunctions ) {
+function augment( csn, filename = 'csn.json', options = {}, messageFunctions = {} ) {
   try {
     return toXsn( csn, filename, options, messageFunctions );
   }
@@ -1787,7 +1792,7 @@ function augment( csn, filename = 'csn.json', options = {}, messageFunctions ) {
   }
 }
 
-function parse( source, filename = 'csn.json', options = {}, messageFunctions ) {
+function parse( source, filename = 'csn.json', options = {}, messageFunctions = {} ) {
   try {
     return augment( JSON.parse(source), filename, options, messageFunctions );
   }
@@ -1818,7 +1823,7 @@ function parse( source, filename = 'csn.json', options = {}, messageFunctions )
       line,
       col: column,
     };
-    messageFunctions.error( 'syntax-csn-illegal-json', loc, { msg }, 'Illegal JSON: $(MSG)' );
+    messageFunctions.error( 'syntax-illegal-json', loc, { msg }, 'Illegal JSON: $(MSG)' );
     return xsn;
   }
 }

package/lib/json/to-csn.js

@@ -13,6 +13,7 @@
 
 const { locationString } = require('../base/messages');
 const { isBetaEnabled, isDeprecatedEnabled } = require('../base/model');
+const { pathName } = require('../compiler/utils');
 
 const compilerVersion = require('../../package.json').version;
 const creator = `CDS Compiler v${ compilerVersion }`;
@@ -126,9 +127,6 @@ const transformers = {
   // location is not renamed to $location as the name is well established in
   // XSN and too many places (also outside the compiler) had to be adapted
   location,                     // non-enumerable $location in CSN
-  $a2j: (e, csn) => {           // on artifact level
-    Object.assign( csn, e );
-  },
   $extra: (e, csn) => {
     Object.assign( csn, e );
   },
@@ -224,7 +222,7 @@ const operators = {
   unboundedFollowing: [ 'unbounded', 'following' ],
   following: postfix( [ 'following' ] ),
   frameBetween: exprs => [ 'between', ...exprs[0], 'and', ...exprs[1] ],
-  // xpr: (exprs) => [].concat( ...exprs ), see below - handled extra
+  ixpr: exprs => [].concat( ...exprs ), // xpr extra, due to extra parentheses
 };
 
 const csnDictionaries = [
@@ -727,7 +725,8 @@ function annotationsAndDocComment( node, annotated ) {
     const val = node[prop];
     // val.$priority isn't set for computed annotations like @Core.Computed
     // and @odata.containment.ignore
-    if (val.$priority && (val.$priority !== 'define') === annotated) {
+    // TODO: use $inferred instead special $priority value
+    if (val.$priority !== undefined && (!!val.$priority) === annotated) {
       // transformer (= value) takes care to exclude $inferred annotation assignments
       const sub = transformer( val );
       // As value() just has one value, so we do not provide ( val, csn, node, prop )
@@ -1219,8 +1218,8 @@ function value( node ) {
   if (node.$inferred && gensrcFlavor)
     return undefined;
   if (node.path) {
-    const ref = node.path.map( id => id.id ).join('.');
-    return extra( { '=': node.variant ? `${ ref }#${ node.variant.id }` : ref }, node );
+    const ref = pathName( node.path );
+    return extra( { '=': node.variant ? `${ ref }#${ pathName(node.variant.path) }` : ref }, node );
   }
   if (node.literal === 'enum')
     return extra( { '#': node.sym.id }, node );
@@ -1276,8 +1275,11 @@ function expression( node, dollarExtra ) {
     return { ref: [ node.param.val ], param: true }; // CDL rule for runtimes
   }
   if (node.path) {
+    const ref = node.path.map( pathItem );
+    if (node.path.$prefix)
+      ref.unshift( node.path.$prefix );
     // we would need to consider node.global here if we introduce that
-    return extra( { ref: node.path.map( pathItem ) }, dollarExtraNode );
+    return extra( { ref }, dollarExtraNode );
   }
   if (node.literal) {
     if (typeof node.val === node.literal || node.val === null)
@@ -1590,10 +1592,11 @@ function compactExpr( e ) {     // TODO: options
  */
 function initModuleVars( options = { csnFlavor: 'gensrc' } ) {
   gensrcFlavor = options.parseCdl || options.csnFlavor === 'gensrc' ||
-                 options.toCsn && options.toCsn.flavor === 'gensrc';
-  universalCsn = (options.csnFlavor === 'universal' ||
-                  options.toCsn && options.toCsn.flavor === 'universal' ) &&
-    isBetaEnabled( options, 'enableUniversalCsn' ) && !options.parseCdl;
+               ( options.toCsn && options.toCsn.flavor === 'gensrc');
+  universalCsn = ( options.csnFlavor === 'universal' ||
+                   ( options.toCsn && options.toCsn.flavor === 'universal') ) &&
+                  isBetaEnabled( options, 'enableUniversalCsn' ) &&
+                  !options.parseCdl;
   strictMode = options.testMode;
   const proto = options.dictionaryPrototype;
   // eslint-disable-next-line no-nested-ternary
@@ -1601,8 +1604,8 @@ function initModuleVars( options = { csnFlavor: 'gensrc' } ) {
     ? proto
     : (proto) ? Object.prototype : null;
   withLocations = options.withLocations;
-  parensAsStrings = isDeprecatedEnabled( options, 'parensAsStrings' );
-  projectionAsQuery = isDeprecatedEnabled( options, 'projectionAsQuery' );
+  parensAsStrings = isDeprecatedEnabled( options, '_parensAsStrings' );
+  projectionAsQuery = isDeprecatedEnabled( options, '_projectionAsQuery' );
 }
 
 module.exports = {

package/lib/language/antlrParser.js

@@ -13,8 +13,8 @@ const antlr4 = require('antlr4');
 const { CompileMessage } = require('../base/messages');
 const errorStrategy = require('./errorStrategy');
 
-const Parser = require('../gen/languageParser').languageParser;
-const Lexer = require('../gen/languageLexer').languageLexer;
+const Parser = require('../gen/languageParser').default;
+const Lexer = require('../gen/languageLexer').default;
 
 // Error listener used for ANTLR4-generated parser
 class ErrorListener extends antlr4.error.ErrorListener {