@sap/cds-compiler 5.9.2 → 6.0.10

package/lib/json/from-csn.js

@@ -89,9 +89,6 @@
  *     of the xorGroup may be set, e.g. if target is set, elements may not.
  *     If you are looking for a `notWith` (which should be symmetric), this is your property.
  *
- * @property {string}               [xsnOp]
- *     Defines the operator to be used for XSN. Used for SET and SELECT. See queryTerm().
- *
  * @property {string}            [vZeroFor]
  *     Marks the property as a CSN 0.1.0 property. It is replaced by this CSN 1.0
  *     property (value of vZeroFor).
@@ -124,7 +121,7 @@ const { isAnnotationExpression } = require('../base/builtins');
 const { CompilerAssertion } = require('../base/error');
 const { Location } = require('../base/location');
 const { XsnSource } = require('../compiler/xsn-model');
-const { xprAsTree } = require('../parsers/XprTree');
+const { xsnAsTree, splitClauses } = require('../parsers/XprTree');
 
 const $location = Symbol.for('cds.$location');
 
@@ -202,7 +199,8 @@ const schemaClasses = {
     defaultKind: '$column',
     validKinds: [], // pseudo kind '$column'
     // A column with only as+cast.type is a new association
-    requires: [ 'ref', 'cast', 'xpr', 'val', '#', 'func', 'list', 'SELECT', 'SET', 'expand' ],
+    requires: [ 'ref', 'cast', 'xpr', 'val', '#', 'func', 'list',
+      'SELECT', 'SET', 'expand', 'virtual' ],
     schema: {
       xpr: {
         class: 'condition',
@@ -211,6 +209,13 @@ const schemaClasses = {
         inKind: [ '$column' ],
         inValue: true,
       },
+      cast: {                   // CDL-style type cast
+        // see “global” `cast` schema for SQL `cast` function
+        type: embed,
+        inValue: false,
+        optional: typeProperties,
+        inKind: [ '$column' ],
+      },
       '=': {
         // by not setting `vZeroFor`, we disallow `=` in `columns`.
         // CSN v0.1 didn't have columns, so this isn't breaking v0.1 compatibility.
@@ -524,7 +529,6 @@ const schema = compileSchema( {
   },
   projection: {
     type: queryTerm,
-    xsnOp: 'SELECT',
     requires: 'from',
     optional: [
       'from', 'all', 'distinct', 'columns', 'excluding', // no 'mixin'
@@ -534,7 +538,6 @@ const schema = compileSchema( {
   },
   SELECT: {
     type: queryTerm,
-    xsnOp: 'SELECT',
     requires: 'from',
     optional: [
       'from', 'mixin', 'all', 'distinct', 'columns', 'excluding',
@@ -553,15 +556,14 @@ const schema = compileSchema( {
     },
   },
   SET: {
-    type: queryTerm,
-    xsnOp: '$query',            // might be overwritten by 'op'
+    type: querySet,
     requires: 'args',
     optional: [ 'op', 'all', 'distinct', 'args', 'orderBy', 'limit' ],
     schema: {
       args: {
         arrayOf: embed,         // like query
         type: queryArgs,
-        minLength: 1,
+        minLength: csn => (csn.op ? 2 : 1),
         optional: [ 'SELECT', 'SET' ],
       },
     },
@@ -692,16 +694,12 @@ const schema = compileSchema( {
     type: boolOrNull,
     inKind: [ 'element', '$column' ],
   },
-  cast: {
+  cast: {                    // SQL `cast` function
+    // see `cast` sub schema inside `columns` for CDL-style type cast
     type: embed,
-    // cast can be:
-    // 1. Inside "columns" => not in value
-    // 2. Inside "xpr"     => inside expressions
-    // Because of (1) we have to set this property to false.
-    inValue: false,
-    optional: typeProperties,
-    // TODO v6: only in CDL-style cast, otherwise just length,…
-    inKind: [ '$column' ],
+    // see also call of eventualCast() for every (expression) object
+    inValue: false,             // should have no relevance
+    optional: [ 'type', 'length', 'precision', 'scale', 'srid' ],
   },
   default: {
     class: 'expression',
@@ -888,13 +886,15 @@ function arrayOf( fn, filter = undefined ) {
       ++virtualLine;
       return fn( v, spec, xsn, csn ) || { location: location() };
     } );
-    const minLength = spec.minLength || 0;
+    if (val.length)
+      ++virtualLine;          // [] in one JSON line
+    const minLength = (typeof spec.minLength === 'function')
+      ? spec.minLength( csn )
+      : spec.minLength || 0;
     if (minLength > val.length) {
       error( 'syntax-incomplete-array', location(true),
              { prop: spec.prop, n: minLength, '#': minLength === 1 ? 'one' : 'std' });
     }
-    if (val.length)
-      ++virtualLine;          // [] in one JSON line
     if (filter)
       return r.filter(filter);
     return r;
@@ -1581,7 +1581,9 @@ function xpr( exprs, spec, xsn, csn ) {
     }
     xsn.suffix = exprArgs( exprs, spec );
     if (exprs.length > 2)
-      xsn.suffix = xprAsTree( exprs, xsn.suffix, xsn.op.location ).args;
+      xsn.suffix = xsnAsTree( exprs, xsn.suffix, xsn.op.location ).args;
+    else if (exprs.length === 2 && exprs[0] === 'over' && exprs[1]?.xpr && !exprs[1].func)
+      xsn.suffix[1].args = splitClauses( xsn.suffix[1].args );
   }
   else {
     // setting $parens here would not always be correct; thus, keep distinction
@@ -1589,7 +1591,7 @@ function xpr( exprs, spec, xsn, csn ) {
     xsn.op = { val: 'xpr', location: location() };
     xsn.args = exprArgs( exprs, spec );
     if (exprs.length > 2)
-      xsn.args = xprAsTree( exprs, xsn.args, xsn.op.location ).args;
+      xsn.args = xsnAsTree( exprs, xsn.args, xsn.op.location ).args;
   }
 }
 
@@ -1612,7 +1614,13 @@ function xprInValue( exprs, spec, xsn, csn ) {
 
 function args( exprs, spec ) {
   if (Array.isArray( exprs )) {
-    return arrayOf( exprOrString )( exprs, spec );
+    const xsn = arrayOf( exprOrString )( exprs, spec );
+    if (xsn.length) {
+      const last = xsn.at( -1 );
+      if (last?.op?.val === 'xpr' && last.args.length > 4) // `order by` in last arg?
+        last.args = splitClauses( last.args );
+    }
+    return xsn;
   }
   else if (!exprs || typeof exprs !== 'object') {
     error( 'syntax-expecting-args', location(true),
@@ -1641,7 +1649,7 @@ function expr( e, spec ) {
       const xsn = exprArgs( e, spec );
       return (e.length < 3)     // optimization
         ? { op: { val: 'ixpr', location: loc }, args: xsn, location: loc }
-        : xprAsTree( e, xsn, loc );
+        : xsnAsTree( e, xsn, loc );
     }
     else if (e.length === 1) { // CSN v.0.1.0 way for parentheses
       const loc = location();
@@ -1693,33 +1701,54 @@ function condition( cond, spec ) {
   const xsn = exprArgs( cond, spec );
   // TODO sql-like backends: with the commented `return`, test3 generated sql
   // files will not have the unnecessary `(…)` around `on` anymore → extra PR
-  const tree = (cond.length < 3) ? xsn : xprAsTree( cond, xsn, loc ).args;
+  const tree = (cond.length < 3) ? xsn : xsnAsTree( cond, xsn, loc ).args;
   return { op: { val: 'xpr', location: loc }, args: tree, location: loc };
   // return (cond.length < 3)      // optimization
   //   ? { op: { val: 'ixpr', location: loc }, args: xsn, location: loc }
-  //   : xprAsTree( cond, xsn, loc );
+  //   : xsnAsTree( cond, xsn, loc );
 }
 
 // Queries (std signature) ---------------------------------------------------
 
-function queryTerm( term, spec, xsn ) { // for CSN properties 'SELECT' and 'SET'
+function queryTerm( term, spec, xsn ) { // for CSN properties 'SELECT' and 'projection'
   // TODO: re-check $location: pushLocation( term ) / popLocation( term )
   xsn.query = object( term, spec );
   if (!xsn.query)
     return;
-  // XSN TODO: remove op query and subquery?
-  if (!xsn.query.op) {
-    xsn.query.op = {
-      val: (spec.prop !== 'SET' ? 'SELECT' : '$query'),
-      location: location(),     // XSN TODO: work without location everywhere
-    };
-  }
-  if (spec.prop !== 'SET' && !xsn.query.from)
-    xsn.query.from = null;      // make it clear that SELECT is used with parse error
+  xsn.query.op = { val: 'SELECT', location: location() }; // XSN TODO: without location
+  if (!xsn.query.from)
+    xsn.query.from = null;   // make it clear that SELECT is used with parse error
   if (spec.prop === 'projection')
     xsn.$syntax = 'projection';
 }
 
+function querySet( term, spec, xsn ) { // for CSN property 'SET'
+  // TODO: re-check $location: pushLocation( term ) / popLocation( term )
+  xsn.query = object( term, spec );
+  if (!xsn.query || xsn.query.op) // TODO: check for args.length === 1 ?
+    return;
+  const setArgs = xsn.query.args;
+  if (setArgs?.length !== 1)
+    return;
+  const { orderBy, limit } = xsn.query;
+  xsn.query = setArgs[0];
+  if (!orderBy && !limit)
+    return;
+  if (xsn.query.orderBy || xsn.query.limit) {
+    // giving this error at the exact location would be far more work → not worth
+    error( 'syntax-duplicate-clause', location(true), {
+      '#': 'setForCsn',
+      prop: 'orderBy',
+      siblingprop: 'limit',
+      parentprop: 'args[]',
+    } );
+  }
+  else {
+    xsn.query.orderBy = orderBy;
+    xsn.query.limit = limit;
+  }
+}
+
 function asQuantifier( quantifier, spec, xsn ) {
   if (quantifier)
     xsn.quantifier = { val: spec.prop, location: location() };
@@ -1766,13 +1795,11 @@ function join( val, spec, xsn ) {
 
 function queryArgs( val, spec, xsn, csn ) {
   if (Array.isArray( val ) && val.length > 1 && !csn.op) {
-    // Make it error 'syntax-missing-property#sibling' in v6:
-    message( 'syntax-deprecated-auto-union', location(true),
-             { siblingprop: 'args', prop: 'op' },
-             'Object with property $(SIBLINGPROP) must also have a property $(PROP)' );
+    error( 'syntax-missing-property', location(true),
+           { '#': 'sibling', siblingprop: 'args', prop: 'op' } );
     xsn.op = { val: 'union', location: location() };
   }
-  return arrayOf( object )( val, spec ).map( q => q.query );
+  return arrayOf( object )( val, spec, xsn, csn ).map( q => q.query );
 }
 
 // i18n ------------------------------

package/lib/json/to-csn.js

@@ -12,7 +12,7 @@
 'use strict';
 
 const { locationString } = require('../base/messages');
-const { isBetaEnabled, isDeprecatedEnabled } = require('../base/model');
+const { isBetaEnabled } = require('../base/model');
 const { pathName } = require('../compiler/utils');
 const { CompilerAssertion } = require('../base/error');
 
@@ -31,7 +31,6 @@ const normalizedKind = {
 let gensrcFlavor = true;       // good enough here...
 let universalCsn = false;
 let strictMode = false;        // whether to dump with unknown properties (in standard)
-let projectionAsQuery = false;
 let withLocations = false;
 let withDocComments = false;
 let structXpr = false;
@@ -580,8 +579,6 @@ function dollarSyntax( node, csn ) {
   // eslint-disable-next-line no-prototype-builtins
   if (specialDollarValues.hasOwnProperty( node ))
     return specialDollarValues[node];
-  if (projectionAsQuery)
-    return node;
   setHidden( csn, '$syntax', node );
   return undefined;
 }
@@ -650,7 +647,9 @@ function dictionary( dict, keys, prop ) {
 }
 
 function foreignKeys( dict, csn, node ) {
-  if (universalCsn && dict[$inferred] === 'keys' || !target( node.target, csn, node ) )
+  if (!dict ||              // `Association to many Target` without specified keys
+      universalCsn && dict[$inferred] === 'keys' ||
+      !target( node.target, csn, node ) )
     return;
 
   if (gensrcFlavor) {
@@ -1286,7 +1285,7 @@ function exprInternal( node, xprParens ) {
 
 const naryOperators = {
   __proto__: null,
-  // not '.'
+  '.': true,
   '*': true,
   '/': true,
   '+': true,
@@ -1334,7 +1333,7 @@ function ternaryOperator( node ) {
 function query( node, csn, xsn, _prop, expectedParens = 0 ) {
   if (node.op.val === 'SELECT') {
     if (xsn && xsn.query === node && xsn.$syntax === 'projection' &&
-       node.from && node.from.path && !projectionAsQuery) {
+       node.from && node.from.path) {
       csn.projection = addLocation( node.location, standard( node ) );
       return undefined;
     }
@@ -1560,7 +1559,6 @@ function initModuleVars( options = { csnFlavor: 'gensrc' } ) {
   withLocations = options.withLocations;
   withDocComments = options.docComment !== false;
   structXpr = options.structXpr;
-  projectionAsQuery = isDeprecatedEnabled( options, '_projectionAsQuery' );
 }
 
 module.exports = {

package/lib/language/multiLineStringParser.js

@@ -71,8 +71,8 @@ function stripIndentation( str ) {
 }
 
 class MultiLineStringParser {
-  constructor(antlrParser, token) {
-    this.parser = antlrParser; // for message functions
+  constructor(cdsParser, token) {
+    this.parser = cdsParser; // for message functions
     this.token = token;
     this.str = token.text; // Copy because .text is a getter
 
@@ -377,6 +377,7 @@ class MultiLineStringParser {
    */
   _matchLineBreakAtCurrentChar() {
     // Only increase line number for \n, because ANTLR does the same
+    // TODO: Is this still the case with redepage?
     switch (this._current()) {
       case '\r':
         if (this._lookahead() === '\n') {

package/lib/main.d.ts

@@ -126,6 +126,18 @@ declare namespace compiler {
      * The CDL equivalent of the CSN value `doc: null`, is an empty doc comment.
      */
     docComment?: boolean
+    /**
+     * If this option is `true`, doc comments are propagated just like annotations.
+     * If `false`, they won't be propagated at all.
+     *
+     * See option 'docComment'.
+     *
+     * Until @sap/cds-compiler v6.0, doc comments were always propagated.
+     *
+     * @default `false`
+     * @since v6.0
+     */
+    propagateDocComments?: boolean
     /**
      * When set to `true`, and the model contains an entity `sap.common.Languages`
      * with an element `code`, all generated texts entities additionally contain
@@ -135,15 +147,6 @@ declare namespace compiler {
      * @since v2.8.0
      */
     addTextsLanguageAssoc?: boolean
-    /**
-     * If set to `true`, add named aspects to the list of 'includes' of the generated entity.
-     * This will cause propagation of actions from aspect to generated entity.
-     *
-     * Will become default in v6.
-     *
-     * @since v5.9.0
-     */
-    compositionIncludes?: boolean
     /**
      * An array of directory names that are used for CDS module lookups.
      * Lookup directory `node_modules/` is appended if not set explicitly.
@@ -179,12 +182,6 @@ declare namespace compiler {
      * of the _name_ of the artifact.
      */
     withLocations?: boolean|string
-    /**
-     * Use the new non-ANTLR based parser for compilation.
-     *
-     * @since v5.2.0
-     */
-    newParser?: boolean
     /**
      * Internal option for LSP only!
      * If set, each AST gets a `tokenStream` property containing all lexed tokens.
@@ -441,7 +438,7 @@ declare namespace compiler {
      * Only works with sqlDialect 'sqlite'! Otherwise, it has no effect.
      *
      * @since 3.9.0
-     * @beta
+     * @default true (since v5)
      */
     betterSqliteSessionVariables?: boolean
     /**
@@ -454,12 +451,33 @@ declare namespace compiler {
      *   three-valued logic, on databases that support it.
      * - `==` is still treated as two-valued logic operator.
      *
-     * This option will become the default in cds-compiler v6.
+     * This option is the default since cds-compiler v6.
      *
      * @since 5.9.0
-     * @default false
+     * @default true (since v6.0)
      */
     booleanEquality?: boolean
+    /**
+     * If set to true, a specified set of functions - inspired by OData and SAP HANA -
+     * are translated to database-specific variants.
+     *
+     * See <https://cap.cloud.sap/docs/guides/databases>
+     *
+     * @since 5.9.2
+     * @default true (since v6.0)
+     */
+    standardDatabaseFunctions?: boolean
+    /**
+     * If set to true, variable `$now` will be rendered as 'CURRENT_TIMESTAMP' in
+     * SQL, instead of `SESSION_CONTEXT('$now')` (or an equivalent clause in other SQL dialects).
+     *
+     * In cds-compiler <6, `$now` was always rendered as `CURRENT_TIMESTAMP`.
+     * Since v6, it is a session variable, except for DEFAULT clauses.
+     *
+     * @since 6.0
+     * @default false
+     */
+    dollarNowAsTimestamp?: boolean
   }
 
   /**
@@ -536,6 +554,17 @@ declare namespace compiler {
      * @default false
      */
     allowCsnDowngrade?: boolean
+    /**
+     * If set to true, variable `$now` will be rendered as 'CURRENT_TIMESTAMP'
+     * instead of `SESSION_CONTEXT('$now')`.
+     *
+     * In cds-compiler <6, `$now` was always rendered as `CURRENT_TIMESTAMP`.
+     * Since v6, it is a session variable, except for DEFAULT clauses.
+     *
+     * @since 6.0
+     * @default false
+     */
+    dollarNowAsTimestamp?: boolean
   }
 
   /**
@@ -579,7 +608,7 @@ declare namespace compiler {
      *   entity S.S.Base as projection on S.Base as Base;
      *   ```
      *
-     * @default false
+     * @default true (since v6)
      */
     renderCdlDefinitionNesting?: boolean
     /**
@@ -587,6 +616,8 @@ declare namespace compiler {
      * as a `namespace` statement.
      *
      * Only usable in combination with `renderCdlDefinitionNesting: true`.
+     *
+     * @default true (since v6)
      */
     renderCdlCommonNamespace?: boolean
   }
@@ -1257,6 +1288,9 @@ declare namespace compiler {
     /**
      * Renders the given CSN into HDBCDS artifacts.
      *
+     * DEPRECATED! This backend is deprecated and will be removed with cds-compiler v7!
+     *
+     * @deprecated
      * @returns A map of `{ '<artifactName>.hdbcds|hdbconstraint>': '<content>' }` entries.
      */
     function hdbcds(csn: CSN, options?: HdbcdsOptions): Record<string, string>;
@@ -1264,6 +1298,8 @@ declare namespace compiler {
       /**
        * Immutable list of SAP HANA CDS keywords, used for smart quoting in
        * {@link to.hdbcds} with option `sqlMapping: 'plain'`.
+       *
+       * @deprecated
        */
       const keywords: string[];
     }
@@ -1304,11 +1340,6 @@ declare namespace compiler {
      * Rendered model, including extensions.
      */
     model?: string
-    /**
-     * Rendered `csn.namespace` property + using directives.
-     * Useful to keep the `csn.namespace` property when re-compiling the to.cdl() result.
-     */
-    namespace?: string
   }
 
   /**
@@ -1581,6 +1612,9 @@ declare namespace compiler {
    * Columns and lines are 1-based, i.e. value `0` is an invalid value and
    * indicates absence of the property.
    *
+   * Note that the columns are UTF-16 _code unit_ offsets in a line.
+   * A column is neither the number of _graphemes_ nor _code points_!
+   *
    * All properties are optional, even `file`.
    */
   export type Location = {

package/lib/model/csnUtils.js

@@ -63,7 +63,6 @@ function getUtils( model, universalReady ) {
     getContextOfArtifact,
     addStringAnnotationTo,
     getServiceName,
-    hasAnnotationValue,
     getFinalTypeInfo,
     get$combined,
     getQueryPrimarySource,
@@ -238,7 +237,8 @@ function getUtils( model, universalReady ) {
   // Return true if 'node' is a managed association element
   // TODO: what about elements having a type, which (finally) is an assoc?
   function isManagedAssociation( node ) {
-    return node.target !== undefined && node.on === undefined && node.keys;
+    // Since v6, managed to-many associations don't get any keys, hence don't require it.
+    return node.target !== undefined && node.on === undefined;
   }
 
   /**
@@ -631,34 +631,15 @@ function traverseFrom( from, queryCallback, path = [] ) {
   }
 }
 
-
 /**
- * Compare a given annotation value with an expectation value and return
- *
- *          | Expected
- *          | true  | false | null  | arb val
- * Anno Val |-------|-------|-------|--------
- * true     | true  | false | false | false
- * false    | false | true  | false | false
- * null     | false | true  | true  | false
- * arb val  | false | false | false | true/false
+ * Returns true if the artifact should be skipped during persistence.
+ * Respects special value `if-unused` by Node runtime.
  *
- * If the annotation value is 'null', 'true' is returned for the expectation values
- * 'null' and 'false'. Expecting 'null' for an annotation value 'false' returns
- * 'false'.
- *
- * @param {CSN.Artifact} artifact
- * @param {string} annotationName Name of the annotation (including the at-sign)
- * @param {any} expected
- * @param {boolean} caseInsensitive
+ * @param {CSN.Artifact} art
  * @returns {boolean}
  */
-function hasAnnotationValue( artifact, annotationName, expected = true, caseInsensitive = false ) {
-  if (expected === false)
-    return artifact[annotationName] === expected || artifact[annotationName] === null;
-  else if (typeof artifact[annotationName] === 'string' && caseInsensitive === true)
-    return artifact[annotationName].toLowerCase() === expected.toLowerCase();
-  return artifact[annotationName] === expected;
+function hasPersistenceSkipAnnotation( art ) {
+  return art['@cds.persistence.skip'] && art['@cds.persistence.skip'] !== 'if-unused';
 }
 
 /**
@@ -682,8 +663,7 @@ function isEdmPropertyRendered( elementCsn, options ) {
   const isNotIgnored = !elementCsn.target ? !elementCsn['@cds.api.ignore'] : true;
   const isNavigable = elementCsn.target
     ? (elementCsn['@odata.navigable'] === undefined ||
-     elementCsn['@odata.navigable'] !== undefined &&
-      (elementCsn['@odata.navigable'] === null || elementCsn['@odata.navigable'] === true)) : true;
+      (elementCsn['@odata.navigable'] === null || !!elementCsn['@odata.navigable'])) : true;
   // Foreign Keys can be ignored
   if (elementCsn['@odata.foreignKey4'])
     return isNotIgnored && renderForeignKey;
@@ -920,7 +900,7 @@ function setDependencies( csn, refs = csnRefs(csn) ) {
  * @returns {boolean}
  */
 function isPersistedOnDatabase( art ) {
-  return !(art.kind === 'entity' && (art.abstract || hasAnnotationValue(art, '@cds.persistence.skip')));
+  return !(art.kind === 'entity' && (art.abstract || hasPersistenceSkipAnnotation(art)));
 }
 /**
  * Check if the given artifact will be persisted on the database via `CREATE VIEW`
@@ -932,9 +912,9 @@ function isPersistedAsView( artifact ) {
   return artifact && artifact.kind === 'entity' &&
       !artifact.$ignore &&
       !artifact.abstract &&
-      ((artifact.query || artifact.projection) && !hasAnnotationValue(artifact, '@cds.persistence.table')) &&
-      !hasAnnotationValue(artifact, '@cds.persistence.skip') &&
-      !hasAnnotationValue(artifact, '@cds.persistence.exists');
+      ((artifact.query || artifact.projection) && !artifact['@cds.persistence.table']) &&
+      !hasPersistenceSkipAnnotation(artifact) &&
+      !artifact['@cds.persistence.exists'];
 }
 /**
  * Check if the given artifact will be persisted on the database via `CREATE TABLE`
@@ -946,9 +926,9 @@ function isPersistedAsTable( artifact ) {
   return artifact.kind === 'entity' &&
       !artifact.$ignore &&
       !artifact.abstract &&
-      (!artifact.query && !artifact.projection || hasAnnotationValue(artifact, '@cds.persistence.table')) &&
-      !hasAnnotationValue(artifact, '@cds.persistence.skip') &&
-      !hasAnnotationValue(artifact, '@cds.persistence.exists');
+      (!artifact.query && !artifact.projection || artifact['@cds.persistence.table']) &&
+      !hasPersistenceSkipAnnotation(artifact) &&
+      !artifact['@cds.persistence.exists'];
 }
 
 /**
@@ -1127,8 +1107,9 @@ function moveAnnotationsAndDoc( sourceNode, targetNode, overwrite = false ) {
  *       filter:   Positive filter. If it returns true, annotations for the referenced artifact
  *                 will be applied.
  *       applyToElements: Whether to apply annotations to elements or only to artifacts
+ * @param {Function} error The error function
  */
-function applyAnnotationsFromExtensions( csn, config ) {
+function applyAnnotationsFromExtensions( csn, config, error ) {
   if (!csn.extensions)
     return;
 
@@ -1137,6 +1118,8 @@ function applyAnnotationsFromExtensions( csn, config ) {
   for (let i = 0; i < csn.extensions.length; ++i) {
     const ext = csn.extensions[i];
     const name = ext.annotate || ext.extend;
+    if (isAnnotateDraftAdminDataWithTenantIndependent(ext))
+      error(null, [ 'extensions', i ], { name }, '$(NAME) can\'t be tenant independent');
     if (name && filter(name)) {
       const def = csn.definitions[name];
       if (def) {
@@ -1153,6 +1136,8 @@ function applyAnnotationsFromExtensions( csn, config ) {
   }
 
   csn.extensions = csn.extensions.filter(ext => ext);
+  if (!csn.extensions.length)
+    delete csn.extensions;
 
   function applyAnnotationsToElements( ext, def ) {
     // Only the definition is arrayed but the extension is not since
@@ -1177,6 +1162,10 @@ function applyAnnotationsFromExtensions( csn, config ) {
     if (Object.keys(ext.elements).length === 0)
       delete ext.elements;
   }
+
+  function isAnnotateDraftAdminDataWithTenantIndependent( ext ) {
+    return ext.annotate && ext.annotate.endsWith('.DraftAdministrativeData') && ext['@cds.tenant.independent'];
+  }
 }
 
 /**
@@ -1187,8 +1176,8 @@ function applyAnnotationsFromExtensions( csn, config ) {
  */
 function hasValidSkipOrExists( artifact ) {
   return artifact.kind === 'entity' &&
-         (hasAnnotationValue(artifact, '@cds.persistence.exists', true) ||
-          hasAnnotationValue(artifact, '@cds.persistence.skip', true));
+         (artifact['@cds.persistence.exists'] ||
+           hasPersistenceSkipAnnotation(artifact));
 }
 
 /**
@@ -1419,7 +1408,7 @@ module.exports = {
   forEachMember,
   forEachMemberRecursively,
   forAllQueries,
-  hasAnnotationValue,
+  hasPersistenceSkipAnnotation,
   isEdmPropertyRendered,
   getArtifactDatabaseNameOf,
   getResultingName,