@sap/cds-compiler 6.4.6 → 6.5.2

package/lib/compiler/populate.js

@@ -75,7 +75,7 @@ function populate( model ) {
     resolvePath,
     nestedElements,
     attachAndEmitValidNames,
-    initArtifact,
+    initMainArtifact,
     extendArtifactBefore,
     extendArtifactAfter,
   } = model.$functions;
@@ -716,8 +716,7 @@ function populate( model ) {
     return initFromColumns( elem, elem.expand );
   }
 
-  // TODO: make this function shorter - make part of this (e.g. setting
-  // parent/name) also be part of definer.js
+  // TODO: make this function shorter
   // TODO: query is actually the elemParent, where the new elements are added to
   // top-level: ( query, query.columns )
   // inline: ( queryOrColParent, col.inline, col )
@@ -730,14 +729,13 @@ function populate( model ) {
         query._main.elements = elemsParent.elements;
     }
 
-    const isExpand = (query.expand === columns);
     if (!columns)
       columns = [ { val: '*' } ];
 
     for (let i = 0; i < columns.length; ++i) {
       const col = columns[i];
       if (col.val === '*') {
-        const siblings = wildcardSiblings( columns, query );
+        const siblings = wildcardSiblings( columns );
         expandWildcard( col, siblings, inlineHead, query );
       }
       // If neither expression (value), expand, new virtual nor new association.
@@ -748,6 +746,7 @@ function populate( model ) {
         q.$inlines.push( col );
         col.kind = '$inline';
         col.name = { id: `.${ q.$inlines.length }`, $inferred: '$internal' };
+        // TODO: use a name already set in define.js
         // TODO: really use $inferred: '$internal', not '$inline' ? Re-check.
         // a name for this internal symtab entry (e.g. '.2' to avoid clashes
         // with real elements) is only relevant for `cdsc -R`/debugging
@@ -755,14 +754,15 @@ function populate( model ) {
         // (is also relevant for the semantic location - only use positive)
         dependsOnSilent( q, col );
         // or use userQuery( query ) in the following, too?
-        setMemberParent( col, null, query );
+        setMemberParent( col, null, query ); // TODO: really set _parent?
         initFromColumns( query, col.inline, col );
       }
       else if (!col.$replacement) {
-        const id = ensureColumnName( col, i, query, isExpand );
+        const { id } = col.name;
         col.kind = 'element';
-        dictAdd( elemsParent.elements, id, col, ( name, location ) => {
-          error( 'duplicate-definition', [ location, query ], { name, '#': 'element' } );
+        dictAdd( elemsParent.elements, id, col, ( name, location, c ) => {
+          if (c.name.$inferred !== '$internal')
+            error( 'duplicate-definition', [ location, query ], { name, '#': 'element' } );
         } );
         setMemberParent( col, id, query );
       }
@@ -771,54 +771,6 @@ function populate( model ) {
     return true;
   }
 
-  /**
-   * TODO: probably do this already in definer.js
-   *
-   * @param col
-   * @param {number} colIndex
-   * @param query
-   * @param {boolean} insideExpand
-   *     Whether the column is inside 'expand'.
-   *     Anonymous 'expands' don't have a column parent, hence why we need to know this explicitly.
-   */
-  function ensureColumnName( col, colIndex, query, insideExpand ) {
-    if (col.name)
-      return col.name.id;
-    if (col.inline || col.val === '*' || col.val === '**') // '**' = duplicate '*'
-      return '';
-    const path = col.value &&
-        (col.value.path || !col.value.args && col.value.func?.path);
-    if (path) {
-      const last = path.length && !path.broken && path[path.length - 1];
-      if (last) {
-        col.name = { id: last.id || '', location: last.location, $inferred: 'as' };
-        return col.name.id;
-      }
-    }
-    else if (insideExpand || col.expand ||
-        col.value && (col._columnParent || query._parent.kind !== 'select')) {
-      // _columnParent => inline/expand with path head; _parent -> only allowed in sub-selects
-      error( 'query-req-name', [ col.value?.location || col.location, query ], {},
-             'Alias name is required for this select item' );
-    }
-    else if (col.value) {
-      col.name = {
-        // NOTE: If the alias is changed, corresponding name-clash tests must be updated as well!
-        id: `$_column_${ colIndex + 1 }`,
-        location: col.value.location || col.location,
-        $inferred: '$internal',
-      };
-      return col.name.id;
-    }
-    // invent a name for code completion in expression, see also #10596
-    col.name = {
-      id: '',
-      location: col.value?.location || col.location,
-      $inferred: 'none',
-    };
-    return '';
-  }
-
   function initElem( elem ) {
     // TODO: we could share code with initMembers/init() in define.js
     if (elem.type && !elem.type.$inferred)
@@ -844,23 +796,21 @@ function populate( model ) {
 
   // col ($replacement set before *)
   // false if two cols have same name
-  function wildcardSiblings( columns, query ) {
+  function wildcardSiblings( columns ) {
     const siblings = Object.create( null );
     if (!columns)
       return siblings;
 
     let seenWildcard = null;
-    let colIndex = 0;
     for (const col of columns) {
-      const id = ensureColumnName( col, colIndex, query, false );
-      if (id) {
+      const { name } = col;
+      if (name) {
         col.$replacement = !seenWildcard;
-        siblings[id] = !(id in siblings) && col;
+        siblings[name.id] = !(name.id in siblings) && col;
       }
       else if (col.val === '*') {
         seenWildcard = true;
       }
-      ++colIndex;
     }
     return siblings;
   }
@@ -975,7 +925,14 @@ function populate( model ) {
     if (!sibling.target || sibling.target.$inferred || // not explicit REDIRECTED TO
         path && path[path.length - 1].id !== sibling.name.id) { // or renamed
       const { id } = sibling.name;
-      if (Array.isArray( navElem )) {
+      if (sibling.name.$inferred === '$internal') {
+        error( 'query-req-name',
+               // TODO: message function: `query` should work directly
+               [ (sibling.value || sibling).location, query ],
+               {},
+               'Alias name is required for this select item' );
+      }
+      else if (Array.isArray( navElem )) {
         // ID published! Used in stakeholder project; if renamed, add to oldMessageIds
         info( 'wildcard-excluding-many', [ sibling.name.location, query ],
               { id, keyword: 'excluding' },
@@ -1156,9 +1113,7 @@ function populate( model ) {
   // To avoid repeated messages: if already tried to do autoexposure, return
   // auto-exposed entity when successful, or `target` otherwise (no/failed autoexposure)
   function minimalExposure( target, service, elemScope ) {
-    const descendants = scopedExposure( target._descendants &&
-                                        target._descendants[service.name.id] ||
-                                        [],
+    const descendants = scopedExposure( target._descendants?.[service.name.id] || [],
                                         elemScope, target );
     const preferred = descendants.filter( d => annotationVal( d['@cds.redirection.target'] ) );
     const exposed = preferred.length ? preferred : descendants;
@@ -1215,7 +1170,7 @@ function populate( model ) {
       kind: 'namespace', name: { id: autoScopeName, location }, location,
     };
     model.definitions[autoScopeName] = nullScope;
-    initArtifact( nullScope );
+    initMainArtifact( nullScope );
     return nullScope;
   }
 
@@ -1250,7 +1205,6 @@ function populate( model ) {
   function isDirectProjection( proj, base ) {
     return proj.kind === 'entity' && // not event
       // direct proj (TODO: or should we add them to another list?)
-      // TODO: delete ENTITY._from - maybe not...
       proj.query && proj.query.op && proj.query.op.val === 'SELECT' &&
       proj._from && proj._from.length === 1 &&
       base === resolvePath( proj._from[0], 'from', proj.query );
@@ -1259,6 +1213,7 @@ function populate( model ) {
   // Auto-exposure -----------------------------------------------------------
 
   // TODO: do something in kick-start.js ?
+  // Remark: With includes, the compiler propagates @cds.autoexpose early.
   function isAutoExposed( target ) {
     if (target.$autoexpose !== undefined)
       return target.$autoexpose;
@@ -1396,7 +1351,7 @@ function populate( model ) {
     }
     setLink( art, '_service', service );
     setLink( art, '_block', model.$internal );
-    initArtifact( art, !!autoexposed );
+    initMainArtifact( art, !!autoexposed );
     effectiveType( art );
     // TODO: try to set locations of elements locations of orig target elements
     newAutoExposed.push( art );

package/lib/compiler/propagator.js

@@ -12,7 +12,6 @@ const {
   forEachDefinition,
   forEachMember,
   forEachGeneric,
-  isBetaEnabled,
 } = require( '../base/model');
 const {
   setLink,
@@ -297,7 +296,7 @@ function propagate( model ) {
     else if (destination.kind === 'element' &&
              destination._main?.query && // query element
              !destination.$calc && origin.$calc !== true &&
-             isBetaEnabled( model.options, '$calcForDraft' )) {
+             !model.options.noDollarCalc ) {
       destination.$calc
         = Object.assign( copyExpr( origin[prop] ), { $inferred: 'prop' } );
       if (rewriteRefsInExpression( destination, origin, '$calc' ))

package/lib/compiler/resolve.js

@@ -75,7 +75,6 @@ const $location = Symbol.for( 'cds.$location' );
 const $inferred = Symbol.for( 'cds.$inferred' );
 
 // TODO: make this part of specExpected in shared.js
-// (standard: not possible on last if !ref.$expected → ref.scope: '$exists')
 const expWithFilter = [ 'from', 'expand', 'inline' ];
 
 // Export function of this file.  Resolve type references in augmented CSN
@@ -1557,16 +1556,6 @@ function resolve( model ) {
   }
 
   function resolveExprPath( expr, expected, user ) {
-    // TODO: re-think this $expected: 'exists' thing
-    if (expr.$expected === 'exists') {
-      if (expected !== 'annotation') { // `exists e[…]` allowed in annotation expressions
-        error( 'expr-unexpected-exists', [ expr.location, user ], {},
-               'An EXISTS predicate is not expected here' );
-      }
-      // We complain about the EXISTS before, as EXISTS subquery is also not supported
-      // TODO: location of EXISTS, TODO: really do this in define.js
-      expr.$expected = 'approved-exists'; // only complain once
-    }
     const ref = resolvePath( expr, expected, user );
 
     if (expected === 'annotation') {
@@ -1588,9 +1577,10 @@ function resolve( model ) {
         last._navigation?.kind === '$tableAlias') // error already reported
       return ref;
 
-    if (expr.$expected === 'approved-exists') {
+    if (expr.$syntax === 'after-exists') {
       if (last.where?.args?.length === 0) {
         // at the moment, empty filter is not allowed on last path step
+        // TODO: allow it at some places
         reportUnexpectedArgsAndFilter( last, expected, user, null, 'last-empty-filter' );
       }
       return ref;
@@ -1679,7 +1669,8 @@ function resolve( model ) {
     }
     const symbols = type && type.enum;
     if (!symbols) {
-      if (user.kind !== '$annotation') { // TODO: better type deduction for annotations
+      if ((user.kind ?? user._outer?.kind) !== '$annotation') {
+        // TODO: better type deduction for annotations
         const msg = (user.kind === 'enum') ? 'symbolDef' : type && 'invalidType';
         warning( 'ref-unexpected-enum', [ expr.location, user ],
                  { '#': msg || 'untyped', enum: sym.id, type: type || '' } );

package/lib/compiler/shared.js

@@ -64,6 +64,17 @@ function fns( model ) {
       notFound: undefinedForAnnotate,
       accept: extendableArtifact,
     },
+    'annotate-sec': {
+      isMainRef: 'all',
+      lexical: userBlock,
+      dynamic: modelDefinitions,
+      notFound: undefinedDefinition,
+      messageMap: {
+        'ref-undefined-art': 'ext-undefined-art-sec',
+        'ref-undefined-def': 'ext-undefined-def-sec',
+      },
+      accept: extendableArtifact,
+    },
     extend: {
       isMainRef: 'no-generated',
       lexical: userBlock,
@@ -233,6 +244,7 @@ function fns( model ) {
       check: checkAssocOn,
       param: () => '$scopePar', // TODO: check that assocs containing param in ON is not published
     },
+    'rewrite-on': {},           // only for traversal when rewriting on condition
     'orderBy-ref': {
       lexical: tableAliasesAndSelf,
       dollar: true,
@@ -382,7 +394,7 @@ function fns( model ) {
     }
     if (expr.args) {
       const args = Array.isArray( expr.args ) ? expr.args : Object.values( expr.args );
-      for (const arg of args ) {
+      for (const arg of args) {
         if (traverseExpr( arg, exprCtx, user, callback ) === traverseExpr.STOP)
           return traverseExpr.STOP;
       }
@@ -1283,11 +1295,11 @@ function fns( model ) {
 
   // Functions called via semantics.notFound: -----------------------------------
 
-  function undefinedDefinition( user, item, valid, _dict, prev ) {
+  function undefinedDefinition( user, item, valid, _dict, prev, _path, semantics ) {
     // in a CSN source or for `using`, only one env was tested (valid.length 1) :
     const art = (!prev) ? item.id : searchName( prev, item.id, 'absolute' );
     signalNotFound( (valid.length > 1 ? 'ref-undefined-art' : 'ref-undefined-def'),
-                    [ item.location, user ], valid, { art } );
+                    [ item.location, user ], valid, { art }, semantics );
     // TODO: improve text, use text variant for: "or builtin" or "definitions" or none
   }
 
@@ -1876,8 +1888,9 @@ function fns( model ) {
     }
     const index = userTargetElementPathIndex( user, path );
     checkOnlyForeignKeyNavigation( user, path, index );
+    // TODO: did we check for no filter/args, no `exists` etc?
     const last = path[path.length - 1];
-    if (!last.where && ref._artifact?.on) { // filter already complained about
+    if (!last.where && ref._artifact?.on) { // filter already complained about - TODO: where?
       const target = index > 0 && index < path.length && ref._artifact?.target;
       const msg = (target?._artifact === user._main) ? 'self' : 'unmanaged';
       error( 'ref-unexpected-assoc', [ last.location, user ],
@@ -2016,7 +2029,7 @@ function fns( model ) {
   }
 
   function checkNoUnmanaged( ref, user, self, messageVariant = 'unmanaged' ) {
-    if (ref._artifact?.on && !ref.$expected) {
+    if (ref._artifact?.on && ref.$syntax !== 'after-exists') {
       const { path } = ref;
       const last = path[path.length - 1];
       if (self && last.where)   // already complained about filter

package/lib/compiler/tweak-assocs.js

@@ -5,7 +5,6 @@
 const {
   forEachGeneric,
   forEachInOrder,
-  isBetaEnabled,
 } = require('../base/model');
 const { dictLocation, weakLocation, weakRefLocation } = require('../base/location');
 
@@ -138,10 +137,10 @@ function tweakAssocs( model ) {
 
   function handleQueryElements( column ) {
     rewriteAssociationCheck( column );
-    if (!isBetaEnabled( model.options, '$calcForDraft' ))
-      return;
+    if (model.options.noDollarCalc || column._columnParent)
+      return;                   // no $calc supported with inline
     const { value } = column;  // `value` = column expression
-    if (!value || !value.args && !value.suffix)
+    if (!value || value.path)  // not with references
       return;
     // TODO: what about non-simple refs (assocs, even with filter/args)?
 
@@ -946,6 +945,8 @@ function tweakAssocs( model ) {
    * for item.
    */
   function rewriteColumnPath( ref, column ) {
+    if (ref.query)
+      return traverseExpr.STOP; // sub queries rewrite not supported
     if (!ref._artifact)
       return null;
     const root = ref.path?.[0];
@@ -1010,9 +1011,12 @@ function tweakAssocs( model ) {
           state = setArtifactLink( i, elem );
       }
       else {
-        state = rewriteItem( state, i, assoc );
-        if (!state || state === true)
-          break;
+        state = rewriteItem( state, i, assoc, !location );
+        if (state && state !== true)
+          continue;
+        if (!state && !location)
+          return true;
+        break;
       }
     }
     if (state !== true)
@@ -1032,7 +1036,7 @@ function tweakAssocs( model ) {
    * @param item Path segment to rewrite.
    * @param assoc Published association of query.
    */
-  function rewriteItem( elem, item, assoc ) {
+  function rewriteItem( elem, item, assoc, noError ) {
     if (!elem._redirected)
       return true;
     let name = item.id;
@@ -1055,7 +1059,7 @@ function tweakAssocs( model ) {
     if (env?.target)
       env = env.target._artifact?._effectiveType;
     const found = setArtifactLink( item, env?.elements?.[name] );
-    if (found)
+    if (found || noError)
       return found;
 
     const isExplicit = elem.target && !elem.target.$inferred;

package/lib/compiler/utils.js

@@ -134,6 +134,28 @@ function proxyCopyMembers( art, dictProp, originDict, location, kind, tmpDepreca
   }
 }
 
+// Initialization (define.js), shared with extend.js: ---------------------------
+
+/**
+ * Initialize artifact links inside `obj.items` (for nested ones as well).
+ * Does nothing, it `obj.items` does not exist.
+ *
+ * @param {XSN.Artifact} obj
+ * @param {object} block
+ * @return {XSN.Artifact}
+ */
+function initItemsLinks( obj, block ) {
+  let { items } = obj;
+  while (items) {
+    setLink( items, '_outer', obj );
+    setLink( items, '_parent', obj._parent );
+    setLink( items, '_block', block );
+    obj = items;
+    items = obj.items;
+  }
+  return obj;
+}
+
 /**
  * Set the member `elem` to have a _parent link to `parent` and a corresponding
  * _main link.  Also set the member's name accordingly, where argument `name`
@@ -162,6 +184,76 @@ function createAndLinkCalcDepElement( elem ) {
   setLink( r, '_outer', elem );
 }
 
+function initExprAnnoBlock( art, block ) {
+  // remark: `art` could also be the extension
+  for (const prop in art) {
+    if (prop.charAt(0) !== '@')
+      continue;
+    const anno = art[prop];
+    // _block links needed for `cast( … as Type )`, `[ ..., cast( … as Type ) ]`
+    if (anno.literal === 'array') {
+      anno.kind = '$annotation';
+      for (const item of anno.val)
+        setLink( item, '_block', block );
+    }
+    else if (anno.$tokenTexts) {
+      // remark: it wouldn't hurt to set it always...
+      anno.kind = '$annotation';
+      setLink( anno, '_block', block );
+    }
+  }
+}
+
+function initDollarSelf( art ) {
+  // TODO: use setMemberParent() ?
+  const self = {
+    name: { id: '$self', location: art.location },
+    kind: '$self',
+    location: art.location,
+  };
+  setLink( self, '_parent', art );
+  setLink( self, '_main', art ); // used on main artifact
+  setLink( self, '_origin', art );
+  art.$tableAliases = Object.create( null );
+  art.$tableAliases.$self = self;
+}
+
+function initDollarParameters( art ) {
+  // TODO: use setMemberParent() ?
+  const parameters = {
+    name: { id: '$parameters' },
+    kind: '$parameters',
+    location: art.location,
+    deprecated: true, // hide in code completion
+  };
+  setLink( parameters, '_parent', art );
+  setLink( parameters, '_main', art );
+  // Search for :const after :param.  If there will be a possibility in the
+  // future that we can extend <query>.columns, we must be sure to use
+  // _block of that new column after :param (or just allow $parameters there).
+  setLink( parameters, '_block', art._block );
+  if (art.params) {
+    parameters.elements = art.params;
+    parameters.$tableAliases = art.params; // TODO: find better name - $lexical?
+  }
+  art.$tableAliases.$parameters = parameters;
+}
+
+function initBoundSelfParam( params, main ) {
+  if (!params)
+    return;
+  const first = params[Object.keys( params )[0] || ''];
+  const type = first?.type || first?.items?.type; // this sequence = no derived type
+  const path = type?.path;
+  if (path?.length === 1 && path[0]?.id === '$self') { // TODO: no where: ?
+    const $self = main.$tableAliases?.$self ||
+      main.kind === 'extend' && { name: { id: '$self' } };
+    // remark: an 'extend' has no "table alias" `$self` (relevant for parse-cdl)
+    setLink( type, '_artifact', $self );
+    setLink( path[0], '_artifact', $self );
+  }
+}
+
 /**
  * Adds a dependency user -> art with the given location.
  *
@@ -193,10 +285,9 @@ function dependsOnSilent( user, art ) {
   user._deps.push( { art } );
 }
 
-function storeExtension( elem, name, prop, parent, block ) {
+function storeExtension( elem, name, prop, parent ) {
   if (prop === 'enum')
     prop = 'elements';
-  setLink( elem, '_block', block );
   const kind = `_${ elem.kind }`; // _extend or _annotate
   if (!parent[kind])
     setLink( parent, kind, {} );
@@ -702,8 +793,13 @@ module.exports = {
   proxyCopyMembers,
   dependsOn,
   dependsOnSilent,
+  initItemsLinks,
   setMemberParent,
   createAndLinkCalcDepElement,
+  initExprAnnoBlock,
+  initDollarSelf,
+  initDollarParameters,
+  initBoundSelfParam,
   storeExtension,
   withAssociation,
   pathName,

package/lib/compiler/xpr-rewrite.js

@@ -395,7 +395,8 @@ function xprRewriteFns( model ) {
       }
     }
 
-    if (isSimpleSelectItem && model.options.testMode)
+    if (isSimpleSelectItem && model.options.testMode &&
+        destination.value?.path[0]._navigation?.kind !== 'mixin')
       throw new CompilerAssertion(`select item has no table alias: ${ JSON.stringify(destination.value.path) }`);
 
     if (isAnnoPathAbsolute( expr ))

package/lib/edm/annotations/edmJson.js

@@ -93,8 +93,6 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
     //----------------------------------
     // operators not supported as dynamic expression
     '.': notADynExpr,
-    isNull: (p, o) => notADynExpr(p, o, null, null, null, null, 'is null'),
-    isNotNull: (p, o) => notADynExpr(p, o, null, null, null, null, 'is not null'),
     exists: notADynExpr,
     SELECT: notADynExpr,
     SET: (p, o) => notADynExpr(p, o, null, null, null, null, 'UNION'),
@@ -302,6 +300,8 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
   transform.$Mul = noOp;
   transform['/'] = op('$DivBy');
   transform.$DivBy = noOp;
+  transform.isNull = op('$Eq');
+  transform.isNotNull = op('$Ne');
   // $Div, $Mod are functions
   //----------------------------------
   // LITERALS
@@ -885,10 +885,13 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
       if (xpr.length === 2 && (xpr[0] === '+' || xpr[0] === '-' || xpr[0] === 'not' || xpr[0] === 'new'))
         return { [xpr[0]]: xpr[1] };
 
-      if (xpr.length === 3 && xpr[1] === 'is' && xpr[2] === 'null') {
-        rejectInvalidExpression(xpr);
-        return xpr;
-      }
+      // is null
+      if (xpr.length === 3 && xpr[1] === 'is' && xpr[2] === 'null')
+        return { isNull: [ xpr[0], { val: null } ] };
+
+      // is not null
+      if (xpr.length === 4 && xpr[1] === 'is' && xpr[2] === 'not' && xpr[3] === 'null')
+        return { isNotNull: [ xpr[0], { val: null } ] };
 
       // binary operators: '=', '<>', 'like', ...
       if (xpr.length === 3 && typeof xpr[1] === 'string')

package/lib/edm/annotations/genericTranslation.js

@@ -916,8 +916,8 @@ function csn2annotationEdm( reqDefs, reqDefsUtils, csnVocabularies, serviceName,
         }
         // expression
         const res = handleExpression(cAnnoValue['='], dTypeName);
-        oTarget.setXml( { [res.name]: res.value });
-        oTarget.setJSON( { [res.name]: res.value });
+        oTarget.setXml({ [res.name]: res.value });
+        oTarget.setJSON({ [res.name]: res.value });
       }
       else if (cAnnoValue['#'] !== undefined) {
         const enumSymbol = cAnnoValue['#'];
@@ -968,9 +968,13 @@ function csn2annotationEdm( reqDefs, reqDefsUtils, csnVocabularies, serviceName,
       }
       else if (cAnnoValue.$edmJson) {
         // "pseudo-structure" used for embedding a piece of JSON that represents "OData CSDL, JSON Representation"
-        oTarget.append(handleEdmJson(cAnnoValue.$edmJson, msg));
+        const edmNode = handleEdmJson(cAnnoValue.$edmJson, msg);
+        if (edmNode && edmNode._kind === 'Path' && typeof edmNode._value === 'string' && !edmNode._children.length)
+          oTarget.setXml({ [edmNode._kind]: edmNode._value });
+        else
+          oTarget.append(edmNode);
       }
-      else if ( Object.keys(cAnnoValue).filter( x => x[0] !== '@' ).length === 0) {
+      else if (Object.keys(cAnnoValue).filter( x => x[0] !== '@' ).length === 0) {
         // object consists only of properties starting with "@", no $value
         setProp(oTarget, '$isInvalid', true);
         message('odata-anno-value', msg.location,

package/lib/edm/csn2edm.js

@@ -49,7 +49,6 @@ function csn2edm( _csn, serviceName, _options, messageFunctions ) {
 function csn2edmAll( _csn, _options, serviceNames, messageFunctions ) {
   // get us a fresh model copy that we can work with
   const csn = cloneFullCsn(_csn, _options);
-  const special$self = !csn?.definitions?.$self && '$self';
   messageFunctions.setModel(csn);
 
   const {
@@ -689,7 +688,7 @@ function csn2edmAll( _csn, _options, serviceNames, messageFunctions ) {
               }
             }
 
-            if (options.isV2() && isBetaEnabled(options, 'draftAdminDataHiddenFilter')) {
+            if (options.isV2()) {
               if (elementCsn._edmParentCsn.name === `${ elementCsn._edmParentCsn.$mySchemaName }.DraftAdministrativeData`)
                 elementCsn['@UI.HiddenFilter'] ??= true;
             }
@@ -762,7 +761,7 @@ function csn2edmAll( _csn, _options, serviceNames, messageFunctions ) {
           const entries = Object.entries(actionCsn.params);
           const firstParam = entries[0][1];
           const type = firstParam?.items?.type || firstParam?.type;
-          if (type === special$self) {
+          if (type === '$self') {
             bpName = entries[0][0];
             setProp(actionCsn, '$bindingParam', firstParam);
             // preserve the original type (as it is the key to reqDefs.defintions)
@@ -938,7 +937,7 @@ function csn2edmAll( _csn, _options, serviceNames, messageFunctions ) {
             if (parameterCsn['@cds.api.ignore'])
               return;
             const type = parameterCsn?.items?.type || parameterCsn?.type;
-            if (i === 0 && type === special$self) {
+            if (i === 0 && type === '$self') {
             // skip and remove the first parameter if it is a $self binding parameter to
             // omit annotation rendering later on
               setProp(actionCsn, '$bindingParam', parameterCsn);

package/lib/edm/edmInboundChecks.js

@@ -130,12 +130,11 @@ function inboundQualificationChecks( csn, options, messageFunctions,
     // we need to know if the first path step is the bindind param
     // for the rejection of V2 paths where the BP is ignored
     function markBindingParamPaths( action, loc ) {
-      const special$self = !csn?.definitions?.$self && '$self';
       if (action.params) {
         const params = Object.entries(action.params);
         const firstParam = params[0][1];
         const type = firstParam?.items?.type || firstParam?.type;
-        if (type === special$self) {
+        if (type === '$self') {
           const bindingParamName = params[0][0];
           const markBindingParam = {
             ref: (parent, prop, xpr) => {