@sap/cds-compiler 6.6.0 → 6.7.1

package/lib/gen/CdlGrammar.checksum

@@ -1 +1 @@
-2af41f8c84ca1fa40a50b8c58903dadc
+f0320d5264a6107c245a82427b4f6338

package/lib/gen/CdlParser.js

@@ -1,6 +1,7 @@
-// Parser generated by redepage v0.3.1
+// Parser generated by redepage v0.3.2
 'use strict;'
 const { XsnSource, XsnArtifact, XsnName } = require( '../compiler/xsn-model' )
+const { isValidEnumValue } = require( '../compiler/base' )
 const AstBuildingParser = require('../parsers/AstBuildingParser')
 const keywords={
 abstract:0,
@@ -2717,7 +2718,9 @@ case'@':this.annoAssignStd({art},336);continue
 default:this.s=337;continue
 }
 case 337:switch(this.lk()){
-case'Id':case'@':case'key':this.elementDef({outer:$.outer,art},0);continue
+case'Id':case'@':case'key':if(this.elementDef({outer:$.outer,art},0)){ if (![ 'virtual', 'key', 'masked', '$syntax', 'elements', 'type', 'items' ]
+.some( p => art[p] ) && isValidEnumValue( art.value ))
+art.$syntax = 'or-enum'; }continue
 case'extend':this.ckP(338,['Id']);continue
 default:this.ei();continue
 }

package/lib/json/from-csn.js

@@ -121,6 +121,7 @@ const { isAnnotationExpression } = require('../base/builtins');
 const { CompilerAssertion } = require('../base/error');
 const { Location } = require('../base/location');
 const { XsnSource } = require('../compiler/xsn-model');
+const { isValidEnumValue } = require( '../compiler/base' );
 const { xsnAsTree, splitClauses } = require('../parsers/XprTree');
 
 const $location = Symbol.for('cds.$location');
@@ -734,7 +735,7 @@ const schema = compileSchema( {
     class: 'expression',        // calculated elements
     vZeroFor: 'val',            // CSN v0.1.0 property for `val` in enum def
     // type: annoValue,
-    inKind: [ 'element', 'enum' ], // TODO: Remove "enum" again; currently for extensions
+    inKind: [ 'element' ],
     optional: exprProperties.concat([ 'stored' ]),
   },
   stored: {
@@ -993,21 +994,15 @@ function definition( def, spec, xsn, csn, name ) {
   }
   pushLocation( def );
   const savedInExtensions = inExtensions;
-  let kind = calculateKind( def, spec ); // might set inExtensions
-  const r = (kind === '$column') ? { location: location() } : { location: location(), kind };
+  const r = { location: location(), kind: undefined };
+  const kind = calculateKind( def, spec, r ); // might set inExtensions
+  if (kind !== '$column')
+    r.kind ??= kind;
   const xor = {};
   const { prop } = spec;
   const kind0 = (spec.validKinds.length || spec.prop === 'extensions') && kind;
   const csnProps = Object.keys( def );
 
-  // For compatibility, extension property `elements` could actually be an `enum`:
-  if (savedInExtensions === '' && prop === 'elements' && // in extend property `elements`
-      !Object.keys( def ).some( couldNotBeEnumProperty )) {
-    r.$syntax = 'enum';         // could be an enum
-    if (def.val !== undefined || def['#'] !== undefined)
-      kind = 'enum';            // for function expected(), i.e. allow property `val`/`#`
-  }
-
   if (csnProps.length) {
     const valueName = (prop === 'keys' || prop === 'foreignKeys' ? 'targetElement' : 'value');
     // the next is basically object() + the inValue handling
@@ -1057,17 +1052,19 @@ function namespace( ref, spec ) {
   return ns ? { kind: 'namespace', name: ns } : null;
 }
 
-function couldNotBeEnumProperty( prop ) {
-  // returns true for `value` (which we allow with warning when extending an enum with `elements`)
+function couldBeEnumProperty( prop ) {
   const inKind = schema[prop]?.inKind; // undefined for annotations, $location, …
   // inKind for annotation assignments is function -> can be for enum
-  return Array.isArray( inKind ) && inKind.includes( 'element' );
+  return inKind &&              // `value` handled extra
+    (!Array.isArray( inKind ) || prop === 'value' || inKind.includes( 'enum' ));
 }
 
 function actions( def, spec, xsn, csn, name ) {
   if (def.kind === 'extend' && (def.elements || def.enum)) {
     // TODO: Handle this case in extend.js; already done for `returns`
     //       See message ext-expecting-returns
+    // TODO: the location would also bad here
+    // (should be at the property, not containing object - but we remove this anyway)
     error( 'syntax-unexpected-property', location(true), {
       '#': def.kind,
       prop: def.enum ? 'enum' : 'elements',
@@ -1873,7 +1870,7 @@ function getSpec( parentSpec, csn, prop, xor, expected, kind ) {
   return { type: ignore };
 }
 
-function calculateKind( def, spec ) {
+function calculateKind( def, spec, xsn ) {
   if (inExtensions) {
     inExtensions = spec.defaultKind;
     return 'annotate';
@@ -1883,9 +1880,21 @@ function calculateKind( def, spec ) {
     return (def.extend) ? 'extend' : 'annotate';
   }
   const kind = (def.kind === 'view') ? 'entity' : def.kind; // 'view' is CSN v0.1.0
-  if (kind === 'extend' && inExtensions === '') // valid extend -> keep inExtensions
+  const inExtend = inExtensions === '';
+  if (inExtend && kind === 'extend') // extend in extend -> keep inExtensions
     return 'extend';
   inExtensions = null;
+  // Compatibilitity: object rendered in `elements` of extend might be enum:
+  if (inExtend && !def.kind && spec.defaultKind === 'element' &&
+      Object.keys( def ).every( couldBeEnumProperty )) {
+    if (isValidEnumValue( def.value ))
+      xsn.$syntax = 'or-enum';  // could be an enum
+    xsn.kind = 'element';
+    // We also allow a `val` which is not embedded in a `value` also on an element
+    // def inside extensions, because that is how compiler v3 has written it:
+    if (def.val && !def.value)
+      return 'enum';            // use schema of enum (for `val`)
+  }
   if (!spec.validKinds.includes( kind ))
     return spec.defaultKind;
   return (def.abstract || def.$syntax === 'aspect')

package/lib/main.d.ts

@@ -313,6 +313,19 @@ declare namespace compiler {
      * @private
      */
     edm4OpenAPI?: boolean
+    /**
+     * Enable the draft-generated artifacts to handle state messages.
+     *
+     * @since v6.1.0
+     */
+    draftMessages?: boolean
+    /**
+     * Add `CreatedByUserDescription`, `LastChangedByUserDescription` and
+     * `InProcessByUserDescription` fields to the `DraftAdministrativeData` entity.
+     *
+     * @since v6.6.0
+     */
+    draftUserDescription?: boolean
   }
 
   /**

package/lib/model/revealInternalProperties.js

@@ -8,6 +8,8 @@
 // This function should return a meaningful result in all circumstances:
 //  * with --parse-only, with both CDL and CSN input,
 //  * for the core compiler output and all transformations working on the XSN.
+//
+// TODO: make sure that all extend statements are listed)
 
 'use strict';
 
@@ -95,6 +97,7 @@ function revealInternalProperties( model, nameOrPath ) {
     _layerExtends: layerExtends,
     _origin: origin,
     $compositionTargets: d => d,   // dictionary( boolean )
+    _extensions: revealExtensions,
     _extend: reveal,
     _annotate: reveal,
     _annotateS: artifactIdentifier,
@@ -270,6 +273,21 @@ function revealInternalProperties( model, nameOrPath ) {
     return artifactDictionary( node, parent );
   }
 
+  function revealExtensions( node ) {
+    if (Array.isArray( node ))
+      return array( node, revealSingleExtension );
+    const r = {};
+    for (const prop in node)
+      r[prop] = revealExtensions( node[prop] );
+    return r;
+  }
+
+  function revealSingleExtension( node, parent ) {
+    return (node.kind && node.__unique_id__ == null && node.$effectiveSeqNo == null && !node.builtin)
+      ? reveal( node, parent )
+      : artifactIdentifier( node, parent );
+  }
+
   function reveal( node, parent, name ) {
     if (node == null || typeof node !== 'object' )
       return node;

package/lib/parsers/AstBuildingParser.js

@@ -39,6 +39,17 @@ const valueTokens = {
   true: true,
 };
 const valueTokensLength = Object.values( valueTokens ).length;
+// likewise, if expectedArray contains all the following tokens, replace them by 'Literal'
+const literalTokens = {
+  Number: true,
+  QuotedLiteral: true,
+  String: true,
+  '#': true,
+  true: true,
+  false: true,
+  null: true,
+};
+const literalTokensLength = Object.values( literalTokens ).length;
 
 const extensionDicts = {
   elements: true, enum: true, params: true, returns: true,
@@ -107,9 +118,15 @@ class AstBuildingParser extends BaseParser {
     let array = this.expectingArray_();
     this.s = savedState;
     // Avoid clutter in messages: replace all value tokens by ‹Value› if all are there:
-    const reduced = raw ? array : array.filter( tok => valueTokens[tok] !== true );
-    if (reduced.length + valueTokensLength === array.length)
-      array = [ 'Value', ...reduced ];
+    const withoutValueTokens = raw ? array : array.filter( tok => valueTokens[tok] !== true );
+    if (withoutValueTokens.length + valueTokensLength === array.length) {
+      array = [ 'Value', ...withoutValueTokens ];
+    }
+    else {
+      const withoutLiteralTokens = raw ? array : array.filter( tok => literalTokens[tok] !== true );
+      if (withoutLiteralTokens.length + literalTokensLength === array.length)
+        array = [ 'Literal', ...withoutLiteralTokens ];
+    }
     return array.map( tok => this.antlrName( tok ) )
       .sort( (a, b) => (tokenPrecedence(a) < tokenPrecedence(b) ? -1 : 1) );
   }
@@ -153,7 +170,7 @@ class AstBuildingParser extends BaseParser {
         this.conditionStackLength == null)                 // after error recovery
       return false;
     if (this.constructor.tracingParser)
-      this._traceSubPush( 'queryOnLeft' );
+      this._traceSubPush?.( 'queryOnLeft' );
     return this.queryOnLeft( 'table', mode );
   }
 
@@ -175,7 +192,7 @@ class AstBuildingParser extends BaseParser {
       if (this.inSameRule_( this.s, this.stack.at( -1 ).followState ))
         return false;
       this.dynamic_.parenthesesCtx = [ null ];
-      this._tracePush( 'Parentheses()' );
+      this._tracePush?.( 'Parentheses()' );
     }
     const { parenthesesCtx } = this.dynamic_;
     const noQuery = parenthesesCtx?.[0];

package/lib/render/toHdbcds.js

@@ -4,7 +4,7 @@ const {
   getLastPartOf, getLastPartOfRef,
   hasValidSkipOrExists, getNormalizedQuery,
   getRootArtifactName, getResultingName, getNamespace, forEachMember, getVariableReplacement,
-  pathName, hasPersistenceSkipAnnotation, implicitAs,
+  pathName, hasPersistenceSkipAnnotation, implicitAs, forEachDefinition,
 } = require('../model/csnUtils');
 const { isBuiltinType, isMagicVariable } = require('../base/builtins');
 const keywords = require('../base/keywords');
@@ -18,7 +18,7 @@ const {
   renderReferentialConstraint,
 } = require('./utils/sql');
 const DuplicateChecker = require('./DuplicateChecker');
-const { forEachDefinition, isDeprecatedEnabled } = require('../base/model');
+const { isDeprecatedEnabled } = require('../base/model');
 const { checkCSNVersion } = require('../json/csnVersion');
 const { timetrace } = require('../utils/timetrace');
 

package/lib/render/utils/sql.js

@@ -5,7 +5,7 @@
 const { getResultingName } = require('../../model/csnUtils');
 const { smartId, delimitedId } = require('../../sql-identifier');
 const { ModelError } = require('../../base/error');
-const { isBetaEnabled, setProp } = require('../../base/model');
+const { setProp } = require('../../base/model');
 
 /**
  * Render a given referential constraint as part of a SQL CREATE TABLE statement, or as .hdbconstraint artefact.
@@ -161,7 +161,7 @@ const allowedHdbProjectionViewProperties = {
  * @returns {boolean} `true` if the artifact is a projection view, otherwise `false`.
  */
 function isProjectionView( csn, artifact, options ) {
-  if (!isBetaEnabled(options, 'projectionViews') || !artifact.projection || options.sqlDialect !== 'hana' || artifact.params || !artifact.$dataProductService)
+  if (!artifact.projection || options.sqlDialect !== 'hana' || artifact.params || !artifact.$dataProductService)
     return false;
 
   if (artifact.$isProjectionView !== undefined)

package/lib/render/utils/standardDatabaseFunctions.js

@@ -666,7 +666,7 @@ const hanaFunctions = {
       const x = this.renderArgs({ ...signature, args: [ args[0] ] });
       const y = this.renderArgs({ ...signature, args: [ args[1] ] });
       // make sure to cast NUMERIC to BIGINT (corresponds to cds.Int64)
-      return `(EXTRACT(EPOCH FROM (${ y }) - (${ x })) * 10000000)::BIGINT`;
+      return `(EXTRACT(EPOCH FROM (${ y })::TIMESTAMP - (${ x })::TIMESTAMP) * 10000000)::BIGINT`;
     },
     seconds_between(signature) {
       const { args } = signature;
@@ -674,7 +674,7 @@ const hanaFunctions = {
       const x = this.renderArgs({ ...signature, args: [ args[0] ] });
       const y = this.renderArgs({ ...signature, args: [ args[1] ] });
 
-      return `EXTRACT(EPOCH FROM (${ y }) - (${ x }))::BIGINT`;
+      return `EXTRACT(EPOCH FROM (${ y })::TIMESTAMP - (${ x })::TIMESTAMP)::BIGINT`;
     },
     days_between(signature) {
       const { args } = signature;

package/lib/transform/db/constraints.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const { forEachDefinition } = require('../../base/model');
 const { applyTransformations, getResultingName, hasPersistenceSkipAnnotation } = require('../../model/csnUtils');
 const { forEach, forEachKey } = require('../../utils/objectUtils');
 const { CompilerAssertion } = require('../../base/error');
@@ -92,7 +91,7 @@ function createReferentialConstraints( csn, options ) {
   associations.forEach(association => association.fn());
 
   // Step III: Create the final referential constraints from all dependent key <-> parent key pairs stemming from the same $sourceAssociation
-  forEachDefinition(csn, collectAndAttachReferentialConstraints);
+  forEach(csn.definitions, collectAndAttachReferentialConstraints);
 
   /**
    * Retrieve the <up_> link of an `cds.Composition` used in an on-condition like `$self = <comp>.<up_>`
@@ -501,10 +500,10 @@ function createReferentialConstraints( csn, options ) {
    *  - Find all other elements in artifact with the same sourceAssociation
    *  - Create constraints with the information supplied by $parentKey, $parentTable and $onDelete
    *
-   * @param {CSN.Artifact} artifact
    * @param {string} artifactName
+   * @param {CSN.Artifact} artifact
    */
-  function collectAndAttachReferentialConstraints( artifact, artifactName ) {
+  function collectAndAttachReferentialConstraints( artifactName, artifact ) {
     const referentialConstraints = Object.create(null);
 
     // tenant foreign keys may have multiple parent keys

package/lib/transform/db/killAnnotations.js

@@ -26,7 +26,7 @@ const requiredAnnos = {
   '@Core.Computed': true,
   [sqlServiceAnnotation]: true,
   '@cds.external': true, // for external ABAP SQL services and data products for now
-  '@DataIntegration.dataproduct.type': true, // for data product production
+  '@data.product': true, // for data product production
 };
 
 /**

package/lib/transform/db/processSqlServices.js

@@ -18,13 +18,13 @@ function processSqlServices(csn, options) {
   setProp(csn, '$dummyServiceEntities', Object.create(null));
   setProp(csn, '$dataProductEntities', Object.create(null));
   return function findAndMarkSqlServiceArtifacts(artifact, artifactName) {
-    const { sqlServiceName, dummyServiceName, dataProductServiceName } = isEntityInSqlService(artifact, artifactName, csn, options);
+    const { sqlServiceName, dummyServiceName, dataProductProductionServiceName } = isEntityInSqlService(artifact, artifactName, csn, options);
     if (sqlServiceName?.length > 0)
       setProp(artifact, '$sqlService', sqlServiceName);
     if (dummyServiceName?.length > 0)
       setProp(artifact, '$dummyService', dummyServiceName);
-    if (dataProductServiceName?.length > 0)
-      setProp(artifact, '$dataProductService', dataProductServiceName);
+    if (dataProductProductionServiceName?.length > 0)
+      setProp(artifact, '$dataProductService', dataProductProductionServiceName);
   };
 }
 
@@ -58,7 +58,7 @@ function isDummyService(artifact, options) {
  * @returns {object} An object containing the names of the SQL service and external ABAP SQL service, if found.
  */
 function isEntityInSqlService(artifact, artifactName, csn, options) {
-  const result = { sqlServiceName: undefined, dummyServiceName: undefined, dataProductServiceName: undefined };
+  const result = { sqlServiceName: undefined, dummyServiceName: undefined, dataProductProductionServiceName: undefined };
   if (artifact.kind !== 'entity' || !artifactName.includes('.') || hasPersistenceSkipAnnotation(artifact))
     return result;
 
@@ -75,8 +75,8 @@ function isEntityInSqlService(artifact, artifactName, csn, options) {
     if (isDummyService(definition, options))
       result.dummyServiceName = possibleServiceName;
 
-    if (isDataProductService(definition, options))
-      result.dataProductServiceName = possibleServiceName;
+    if (isDataProductProductionService(definition))
+      result.dataProductProductionServiceName = possibleServiceName;
 
     // We don't allow nested services/contexts - if we find one, we don't need to keep searching
     if (definition.kind === 'service' || definition.kind === 'context')
@@ -115,21 +115,20 @@ function createServiceDummy(artifact, artifactName, csn, { error }) {
 }
 
 /**
- * Determines if the given artifact is a data product service.
+ * Determines if the given artifact is a data product production service.
  *
  * @param {object} artifact - The artifact to evaluate.
- * @param {object} options - The options object containing feature flags.
  * @returns {boolean} - Returns `true` if the artifact is a data product service, otherwise `false`.
  */
-function isDataProductService(artifact, options) {
-  return isBetaEnabled(options, 'projectionViews') && artifact.kind === 'service' && artifact['@DataIntegration.dataproduct.type'] === 'primary';
+function isDataProductProductionService(artifact) {
+  return artifact.kind === 'service' && artifact['@data.product'] && !artifact['@cds.external'];
 }
 
 module.exports = {
   processSqlServices,
   isSqlService,
   isDummyService,
-  isDataProductService,
+  isDataProductProductionService,
   sqlServiceAnnotation,
   createServiceDummy,
 };

package/lib/transform/effective/associations.js

@@ -72,7 +72,7 @@ function turnAssociationsIntoUnmanaged( csn, options, transformerUtils, messageF
  * @param {object} messageFunctions
  */
 function transformBacklinks( csn, options, { csnUtils }, messageFunctions ) {
-  forEachDefinition(csn, backlinks.getBacklinkTransformer(csnUtils, messageFunctions, options, '_', true));
+  forEachDefinition(csn, backlinks.getBacklinkTransformer(csnUtils, messageFunctions, options, '_', true), { skip: [ 'aspect' ] });
 }
 
 module.exports = {

package/lib/transform/forOdata.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const { isBetaEnabled } = require('../base/model');
-const { isBuiltinType } = require('../base/builtins');
 const transformUtils = require('./transformUtils');
 const {
   forEachDefinition,
@@ -16,12 +15,14 @@ const {
 } = require('../model/csnUtils');
 const { checkCSNVersion } = require('../json/csnVersion');
 const validate = require('../checks/validator');
-const { isArtifactInSomeService, isLocalizedArtifactInService } = require('./odata/utils');
-const expandToFinalBaseType = require('./odata/toFinalBaseType');
 const { timetrace } = require('../utils/timetrace');
 const enrichUniversalCsn = require('./universalCsn/universalCsnEnricher');
+
+const { isArtifactInSomeService, isLocalizedArtifactInService } = require('./odata/utils');
+const expandToFinalBaseType = require('./odata/toFinalBaseType');
 const flattening = require('./odata/flattening');
 const createForeignKeyElements = require('./odata/createForeignKeys');
+const generateFioriTreeViewAnnotationsAndFields = require('./odata/fioriTreeViews');
 const associations = require('./db/associations');
 const expansion = require('./db/expansion');
 const generateDrafts = require('./draft/odata');
@@ -92,8 +93,7 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
 
   const transformers = transformUtils.getTransformers(csn, options, messageFunctions, '_');
   const {
-    addDefaultTypeFacets, addElement,
-    checkMultipleAssignments, createScalarElement,
+    addDefaultTypeFacets, checkMultipleAssignments,
     recurseElements, setAnnotation,
     renameAnnotation, expandStructsInExpression,
     csnUtils,
@@ -296,7 +296,8 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
     renameShorthandAnnotations(def);
 
     // Generate annotations and fields needed for the Fiori Tree Views out of the @hierarchy annotation
-    generateFioriTreeViewAnnotationsAndFields(def, defName);
+    if (def['@hierarchy'])
+      generateFioriTreeViewAnnotationsAndFields(def, defName, messageFunctions, csnUtils, transformers);
 
     // Annotate artifacts with their DB names if requested.
     // Skip artifacts that have no DB equivalent anyway
@@ -365,124 +366,6 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
   //--------------------------------------------------------------------
   // HELPER SECTION STARTS HERE
 
-  // =====================================================================
-  // Generate annotations and fields needed for the Fiori Tree Views out of the @hierarchy annotation
-  function generateFioriTreeViewAnnotationsAndFields(def, defName) {
-    const re = new RegExp('^@hierarchy#.+$');
-    if (Object.keys(def).some(key => re.test(key)))
-      error(null, [ 'definitions', defName ], {}, 'Assigning qualifier with the @hierarchy annotation is not supported');
-
-    if (!def['@hierarchy'])
-      return;
-    if (!(def.projection || def.query))
-      return;
-
-    const defKeys = [];
-    const assocs = [];
-    Object.entries(def.elements).forEach(([ name, elem ]) => {
-      if (elem.key)
-        defKeys.push([ name, elem ]);
-      if (isAssociation(elem) && elem.target === defName)
-        assocs.push([ name, elem ]);
-    });
-
-    // the definition must have exactly one scalar key field
-    if (defKeys.length !== 1 && !isBuiltinType(defKeys[0].type))
-      return;
-    const defKeyName = defKeys[0][0];
-
-    // if the @hierarchy annotation has a true value, we need to make sure the definition has exacly one
-    // association pointing to self and has the single key field as a foreign key
-    if (typeof def['@hierarchy'] === 'boolean' && def['@hierarchy'] === true) {
-      if (assocs.length !== 1)
-        return;
-      const assocName = assocs[0][0];
-      const assoc = assocs[0][1];
-      if (!isValidHierarchyAssociation(assoc, defKeyName))
-        return;
-      addHierarchyAnnotations(def, defName, defKeyName, assocName);
-      addHierarchyFields(def, defName);
-    }
-    else if (typeof def['@hierarchy'] === 'object' && def['@hierarchy']['=']) {
-      const assocName = def['@hierarchy']['='];
-      if (!isValidHierarchyAssociation(assocs.find(a => a[0] === assocName)[1], defKeyName))
-        return;
-      addHierarchyAnnotations(def, defName, defKeyName, assocName);
-      addHierarchyFields(def, defName);
-    }
-  }
-
-  // returns true if assoc has one key and that one key is the corresponding 'keyName'
-  function isValidHierarchyAssociation(assoc, keyName) {
-    return assoc.keys.length === 1 && assoc.keys[0].ref.join() === keyName;
-  }
-
-  function addHierarchyAnnotations(def, defName, defKeyName, assocName) {
-    const qualifier = `${ defName.split('.').pop() }Hierarchy`;
-
-    [ `@Aggregation.RecursiveHierarchy#${ qualifier }`,
-      `@Aggregation.RecursiveHierarchy#${ qualifier }.NodeProperty`,
-      `@Aggregation.RecursiveHierarchy#${ qualifier }.ParentNavigationProperty`,
-      `@Hierarchy.RecursiveHierarchy#${ qualifier }`,
-      `@Hierarchy.RecursiveHierarchy#${ qualifier }.LimitedDescendantCount`,
-      `@Hierarchy.RecursiveHierarchy#${ qualifier }.DistanceFromRoot`,
-      `@Hierarchy.RecursiveHierarchy#${ qualifier }.DrillState`,
-      `@Hierarchy.RecursiveHierarchy#${ qualifier }.LimitedRank` ].forEach(anno => checkAndReportErrorWhenAnnotationExists(def, defName, anno));
-
-    setAnnotation(def, `@Aggregation.RecursiveHierarchy#${ qualifier }.NodeProperty`, { '=': defKeyName });
-    setAnnotation(def, `@Aggregation.RecursiveHierarchy#${ qualifier }.ParentNavigationProperty`, { '=': assocName });
-    setAnnotation(def, `@Hierarchy.RecursiveHierarchy#${ qualifier }.LimitedDescendantCount`, { '=': 'LimitedDescendantCount' });
-    setAnnotation(def, `@Hierarchy.RecursiveHierarchy#${ qualifier }.DistanceFromRoot`, { '=': 'DistanceFromRoot' });
-    setAnnotation(def, `@Hierarchy.RecursiveHierarchy#${ qualifier }.DrillState`, { '=': 'DrillState' });
-    setAnnotation(def, `@Hierarchy.RecursiveHierarchy#${ qualifier }.LimitedRank`, { '=': 'LimitedRank' });
-
-    // if @Capabilities.FilterRestrictions.NonFilterableProperties or @Capabilities.SortRestrictions.NonSortableProperties
-    // are already defined, we append to the existing value the created elements
-    if (def['@Capabilities.FilterRestrictions.NonFilterableProperties'] && Array.isArray(def['@Capabilities.FilterRestrictions.NonFilterableProperties'])) {
-      def['@Capabilities.FilterRestrictions.NonFilterableProperties'].push('LimitedDescendantCount', 'DistanceFromRoot', 'DrillState', 'LimitedRank');
-    }
-    else {
-      setAnnotation(def, '@Capabilities.FilterRestrictions.NonFilterableProperties',
-                    [ 'LimitedDescendantCount', 'DistanceFromRoot', 'DrillState', 'LimitedRank' ]);
-    }
-
-    if (def['@Capabilities.SortRestrictions.NonSortableProperties'] && Array.isArray(def['@Capabilities.SortRestrictions.NonSortableProperties'])) {
-      def['@Capabilities.FilterRestrictions.NonFilterableProperties'].push('LimitedDescendantCount', 'DistanceFromRoot', 'DrillState', 'LimitedRank');
-    }
-    else {
-      setAnnotation(def, '@Capabilities.SortRestrictions.NonSortableProperties',
-                    [ 'LimitedDescendantCount', 'DistanceFromRoot', 'DrillState', 'LimitedRank' ]);
-    }
-  }
-
-  function addHierarchyFields(def, defName) {
-    const limitedDescendantCount = createScalarElement('LimitedDescendantCount', 'cds.Integer');
-    limitedDescendantCount.LimitedDescendantCount['@Core.Computed'] = true;
-    limitedDescendantCount.LimitedDescendantCount.$calc = { val: null };
-    addElement(limitedDescendantCount, def, defName);
-
-    const distanceFromRoot = createScalarElement('DistanceFromRoot', 'cds.Integer');
-    distanceFromRoot.DistanceFromRoot['@Core.Computed'] = true;
-    distanceFromRoot.DistanceFromRoot.$calc = { val: null };
-    addElement(distanceFromRoot, def, defName);
-
-    const drillState = createScalarElement('DrillState', 'cds.String');
-    drillState.DrillState['@Core.Computed'] = true;
-    drillState.DrillState.$calc = { val: null };
-    addElement(drillState, def, defName);
-
-    const limitedRank = createScalarElement('LimitedRank', 'cds.Integer');
-    limitedRank.LimitedRank['@Core.Computed'] = true;
-    limitedRank.LimitedRank.$calc = { val: null };
-    addElement(limitedRank, def, defName);
-  }
-
-  function checkAndReportErrorWhenAnnotationExists(def, defName, anno) {
-    if (def[anno])
-      error(null, [ 'definitions', defName ], { anno, name: defName }, 'Annotation $(ANNO) is already defined on the hierarchy entity $(NAME)');
-  }
-  // =====================================================================
-
   // Transform @readonly/@mandatory/@disabled into @Common.FieldControl annotation
   // with a when/then/else expression consisting of the input from the annotations.
   function processDynamicFieldControlAnnotations(node) {