@sap/cds-compiler 5.9.2 → 6.0.10

package/lib/compiler/checks.js

@@ -16,12 +16,10 @@ const {
   forEachMember,
   forEachMemberRecursively,
   isDeprecatedEnabled,
-  isBetaEnabled,
 } = require('../base/model');
 const { typeParameters } = require('./builtins');
 const { propagationRules } = require('../base/builtins');
 const { annotationVal } = require('./utils');
-const { functionsWithoutParentheses } = require('../parsers/identifiers');
 
 const $location = Symbol.for( 'cds.$location' );
 
@@ -95,8 +93,6 @@ function check( model ) {
     checkTypeStructure( art );
     checkAssociation( art ); // type def could be assoc
     checkDefaultValue( art );
-    if (art.kind === 'enum')
-      checkEnum( art );
     checkEnumType( art );
   }
 
@@ -332,26 +328,6 @@ function check( model ) {
     }
   }
 
-  /**
-   * The enumNode is a single enum element and not the whole type.
-   *
-   * @param {XSN.Artifact} enumNode
-   */
-  function checkEnum( enumNode ) {
-    if (!enumNode.value)
-      return;
-
-    const type = enumNode.value.literal;
-    const loc = enumNode.value.location;
-
-    // Special handling to print a more detailed error message.
-    // Other cases like `null` as enum value are handled in `checkEnumValueType()`
-    if (type === 'enum') {
-      warning( 'ref-unexpected-enum', [ loc, enumNode ], {},
-               'References to other values are not allowed as enum values' );
-    }
-  }
-
   function checkEnumType( enumNode ) {
     // Either the type is an enum or an arrayed enum.  We are only interested in
     // the enum and don't care whether the enum is arrayed.
@@ -563,8 +539,7 @@ function check( model ) {
 
     // Check that "not null" artifacts don't have `null` default values.
     // At least one property must be written explicitly to avoid reporting on inferred elements.
-    if (isBetaEnabled( model.options, 'v6preview' ) &&
-       (art.default?.val === null || art.notNull?.val)) {
+    if (art.default?.val === null || art.notNull?.val) {
       const notNullValue = getInheritedProp( art, 'notNull' );
       if (notNullValue?.val && defaultValue?.val === null) {
         const loc = (art.default || art.notNull)?.location || art.location;
@@ -585,6 +560,7 @@ function check( model ) {
       } );
     }
     else if (art._effectiveType?.elements) {
+      // TODO: error for v7
       warning( 'type-unexpected-default-struct', [ defaultValue.location, art ], {
         '#': art.kind, keyword: 'default',
       }, {
@@ -779,24 +755,29 @@ function check( model ) {
    * Let users know about it.
    *
    * @param elem
+   *
+   * TODO: simplify if the old parser is gone (query-invalid-virtual-struct stays)
    */
   function checkVirtualSelectItemChangeForV6( elem ) {
     if (
         !elem.virtual?.val || elem.virtual.$inferred || // not explicitly marked virtual
-        elem.type && !elem.type.$inferred ||            // has explicit type
-        elem.value.path?.length > 1 ||                  // multi-path step, i.e. no new definition
-        !elem.name.$inferred                            // has explicit alias
+        !elem.name.$inferred ||                         // has explicit alias
+        elem._columnParent ||   // virtual inside expand/inline is already error
+        elem._parent.kind === 'element' ||              // dito (expand without ref)
+        !elem.value?.path && !elem.value?.func ||       // neither ref nor function call
+        elem.value.args ||                              // arguments (with function call)
+        elem.value.path?.length > 1 || // multi-path step, i.e. no new definition
+        elem.value.path?.some( ps => ps.args || ps.where ) // not a simple reference
     )
       return;
 
-    if ((!elem.value.path || !elem.value._artifact) &&
-        !isFunctionWithoutParentheses( elem ))
-      return; // not a reference nor function without parentheses
-
-    if (elem.value.path?.some(ps => ps.args || ps.where))
-      return; // not a simple reference
-
-    warning('def-upcoming-virtual-change', [ elem.virtual.location, elem ], { name: elem.name.id });
+    if (elem.expand) {
+      warning( 'query-invalid-virtual-struct', [ elem.expand[$location], elem ],
+               { code: `as ${ elem.name.id }` } );
+    }
+    else {
+      error( 'def-upcoming-virtual-change', [ elem.virtual.location, elem ] );
+    }
   }
 
   function checkCalculatedElementValue( elem ) {
@@ -1385,17 +1366,4 @@ function isComplexView( art ) {
   return (!art.query.from?._artifact || art.query.from._artifact.kind === 'element');
 }
 
-/**
- * @param {XSN.Element} elem
- * @returns {boolean}
- */
-function isFunctionWithoutParentheses( elem ) {
-  const func = elem.value?.func;
-  if (!func?.path || elem.value.args)
-    return false;
-  if (func.path.length !== 1)
-    return false;
-  return functionsWithoutParentheses.includes(func.path[0].id.toUpperCase());
-}
-
 module.exports = check;

package/lib/compiler/define.js

@@ -982,11 +982,11 @@ function define( model ) {
             col: 'You have provided a $(PROP) already at line $(LINE), column $(COL)',
           } );
           // TODO: extra text variants for expand/inline? - probably not
-          col.val = null;       // do not consider it for expandWildcard()
+          col.val = '**';       // do not consider it for expandWildcard()
         }
       }
-      // Either expression (value), expand or new association (target && type)
-      else if (col.value || col.expand || (col.target && col.type)) {
+      // Either expression (value), expand, new virtual or new association
+      else if (col.value || col.name) {
         if (!col._block)
           setLink( col, '_block', parent._block );
         if (col.inline) { // `@anno elem.{ * }` does not work
@@ -1096,7 +1096,7 @@ function define( model ) {
         forEachGeneric( obj, 'enum', init );
     }
 
-    if (obj.foreignKeys)  // cannot be extended or annotated - TODO: check anyway?
+    if (obj.foreignKeys)
       forEachInOrder( obj, 'foreignKeys', init );
     if (checkDefinitions( construct, parent, 'actions' ))
       forEachGeneric( construct, 'actions', init );
@@ -1136,8 +1136,8 @@ function define( model ) {
       }
       if (hasElement) {
         // This message is similar to the one above.  In v6, we could probably
-        // turn this warning into an error, remove `$syntax: 'element' (also in
-        // language.g4), and use the above `ext-unexpected-element` only for CSN input.
+        // turn this warning into an error, remove `$syntax: 'element',
+        // and use the above `ext-unexpected-element` only for CSN input.
         warning( 'ext-expecting-enum', [ obj.elements[$location], construct ],
                  { code: 'extend … with enum' }, 'Use $(CODE) when extending enums' );
       }

package/lib/compiler/extend.js

@@ -74,7 +74,8 @@ function extend( model ) {
     applyIncludes,              // TODO: re-check
   } );
 
-  const includesNonShadowedFirst = isDeprecatedEnabled( model.options, 'includesNonShadowedFirst' );
+  const includesNonShadowedFirst
+      = isDeprecatedEnabled( model.options, '_includesNonShadowedFirst' );
 
   sortModelSources();
   const extensionsDict = Object.create( null ); // TODO TMP

package/lib/compiler/generate.js

@@ -696,7 +696,7 @@ function generate( model ) {
       $inferred: 'composition-entity',
     };
     if (target.name) {          // named target aspect
-      if (options.compositionIncludes !== false) // default is 'true'  since v5.9
+      if (!isDeprecatedEnabled( options, 'noCompositionIncludes' ))
         art.includes = [ createInclude( target.name.id, location ) ];
       setLink( art, '_origin', target );
       setLink( art, '_upperAspects', [ target, ...(elem._main._upperAspects || []) ] );
@@ -721,20 +721,11 @@ function generate( model ) {
         location,
       },
     };
-    // By default, 'up_' is a managed primary key association.
-    // If 'up_' shall be rendered unmanaged, infer the parent
-    // primary keys and add the ON condition
-    if (isDeprecatedEnabled( options, '_unmanagedUpInComponent' )) {
-      addProxyElements( art, keys, 'aspect-composition', target.name && location,
-                        'up__', '@odata.containment.ignore' );
-      up.on = augmentEqual( location, 'up_', Object.values( keys ), 'up__' );
-    }
-    else {
-      up.key = { location, val: true };
-      // managed associations must be explicitly set to not null
-      // even if target cardinality is 1..1
-      up.notNull = { location, val: true };
-    }
+
+    up.key = { location, val: true };
+    // managed associations must be explicitly set to not null
+    // even if target cardinality is 1..1
+    up.notNull = { location, val: true };
 
     dictAdd( art.elements, 'up_', up );
     // Only for named aspects, use a new location; otherwise use the origin's one.
@@ -753,7 +744,7 @@ function generate( model ) {
     // Copy persistence annotations from aspect.
     copyPersistenceAnnotations( art, target ); // after extendArtifactBefore()
 
-    if (options.compositionIncludes !== false && art.includes)
+    if (!isDeprecatedEnabled( options, 'noCompositionIncludes' ) && art.includes)
       applyIncludes( art, art ); // for actions
     return art;
   }
@@ -798,12 +789,18 @@ function generate( model ) {
     if (!source)
       return;
 
-    const copyExists = !isDeprecatedEnabled( options, 'eagerPersistenceForGeneratedEntities' );
+    // Copied since v6
+    const copyJournal = !isDeprecatedEnabled( options, 'noPersistenceJournalForGeneratedEntities' );
+    if (copyJournal)
+      copy( '@cds.persistence.journal' );
+
+    const copyExists = !isDeprecatedEnabled( options, '_eagerPersistenceForGeneratedEntities' );
     if (copyExists)
       copy( '@cds.persistence.exists' );
     copy( '@cds.persistence.skip' );
     copy( '@cds.tenant.independent' );
 
+    /** @param {string} anno */
     function copy( anno ) {
       if ( source[anno] && !target[anno] )
         target[anno] = { ...source[anno], $inferred: 'parent-origin' };

package/lib/compiler/populate.js

@@ -91,16 +91,6 @@ function populate( model ) {
   /** @type {any} may also be a boolean */
   let newAutoExposed = [];
 
-  const scopedRedirections
-        = !isDeprecatedEnabled( options, '_shortAutoexposed' ) &&
-          !isDeprecatedEnabled( options, '_longAutoexposed' ) &&
-          !isDeprecatedEnabled( options, '_noInheritedAutoexposeViaComposition' ) &&
-          !isDeprecatedEnabled( options, '_noScopedRedirections' );
-  const autoexposeViaComposition
-        = (isDeprecatedEnabled( options, '_noInheritedAutoexposeViaComposition' ))
-          ? 'Composition'
-          : true;
-  const redirectInSubQueries = isDeprecatedEnabled( options, '_redirectInSubQueries' );
   const ignoreSpecifiedElements
         = isDeprecatedEnabled( model.options, 'ignoreSpecifiedQueryElements' );
 
@@ -413,7 +403,7 @@ function populate( model ) {
     // console.log( message( null, location, art, {target:struct,art}, 'Info','EXPAND-ELEM')
     //              .toString(), Object.keys(struct.elements))
     proxyCopyMembers( art, 'elements', struct.elements, location,
-                      null, isDeprecatedEnabled( options, 'noKeyPropagationWithExpansions' ) );
+                      null, isDeprecatedEnabled( options, '_noKeyPropagationWithExpansions' ) );
     // Set elements expansion status (the if condition is always true, as no
     // elements expansion will take place on artifact with existing other
     // member property):
@@ -750,8 +740,8 @@ function populate( model ) {
         const siblings = wildcardSiblings( columns, query );
         expandWildcard( col, siblings, inlineHead, query );
       }
-      // If neither expression (value), expand nor new association.
-      if (!col.value && !col.expand && !(col.target && col.type))
+      // If neither expression (value), expand, new virtual nor new association.
+      if (!col.value && !col.name)
         continue;             // error should have been reported by parser
       if (col.inline) {
         const q = userQuery( query );
@@ -794,7 +784,7 @@ function populate( model ) {
   function ensureColumnName( col, colIndex, query, insideExpand ) {
     if (col.name)
       return col.name.id;
-    if (col.inline || col.val === '*')
+    if (col.inline || col.val === '*' || col.val === '**') // '**' = duplicate '*'
       return '';
     const path = col.value &&
         (col.value.path || !col.value.args && col.value.func?.path);
@@ -1085,7 +1075,7 @@ function populate( model ) {
     if (assoc.kind === 'mixin')
       return false;
     const query = userQuery( assoc );
-    return redirectInSubQueries || !query || query._main._leadingQuery === query;
+    return !query || query._main._leadingQuery === query;
   }
 
   function redirectImplicitlyDo( elem, assoc, target, service ) {
@@ -1096,8 +1086,7 @@ function populate( model ) {
       // the current main artifact is a suitable auto-redirection target → return it
       return elem._main;
     }
-    const elemScope = scopedRedirections && // null if no scoped redirections
-          preferredElemScope( target, service, elem, assoc._main || assoc );
+    const elemScope = preferredElemScope( target, service, elem, assoc._main || assoc );
     const exposed = minimalExposure( target, service, elemScope );
 
     if (!exposed.length) {
@@ -1304,24 +1293,12 @@ function populate( model ) {
       return false;
     }
     // no @cds.autoexpose or @cds.autoexpose:null
-    // TODO: introduce deprecated._noInheritedAutoexposeViaComposition
-    art.$autoexpose = model.$compositionTargets[art.name.id]
-      ? autoexposeViaComposition
-      : null;
+    art.$autoexpose = model.$compositionTargets[art.name.id] ? true : null;
     return true;                // still check for inherited @cds.autoexpose
   }
 
   function autoExposedName( target, service, elemScope ) {
     const absolute = target.name.id;
-    if (isDeprecatedEnabled( options, '_shortAutoexposed' )) {
-      const parent = definitionScope( target )._parent;
-      const name = (parent) ? absolute.substring( parent.name.id.length + 1 ) : absolute;
-      // no need for dedot here (as opposed to deprecated._longAutoexposed), as
-      // the name for dependent entities have already been created using `_` then
-      return `${ service.name.id }.${ name }`;
-    }
-    if (isDeprecatedEnabled( options, '_longAutoexposed' ))
-      return `${ service.name.id }.${ absolute }`;
     const base = definitionScope( target );
     if (base === target)
       return `${ service.name.id }.${ absolute.substring( absolute.lastIndexOf( '.' ) + 1 ) }`;
@@ -1338,7 +1315,7 @@ function populate( model ) {
   function createAutoExposed( target, service, elemScope ) {
     const absolute = autoExposedName( target, service, elemScope );
     const autoexposed = model.definitions[absolute];
-    if (autoexposed && (autoexposed.kind !== 'namespace' || !scopedRedirections)) {
+    if (autoexposed && (autoexposed.kind !== 'namespace')) {
       if (isDirectProjection( autoexposed, target )) {
         const anno = autoexposed['@cds.redirection.target'];
         if (annotationIsFalse( anno )) {

package/lib/compiler/propagator.js

@@ -12,7 +12,6 @@ const {
   forEachDefinition,
   forEachMember,
   forEachGeneric,
-  isDeprecatedEnabled,
 } = require( '../base/model');
 const {
   setLink,
@@ -30,7 +29,7 @@ const { xprRewriteFns } = require('./xpr-rewrite');
 function propagate( model ) {
   const props = {
     '@': annotation,            // always except in 'items' (and parameters for entity return types)
-    doc: annotation,            // always except in 'items' (and parameters for entity return types)
+    doc: docComment,            // like annotations, but guarded by option `propagateDocComments`
     default: withKind,          // always except in 'items'
     virtual,
     notNull,
@@ -72,19 +71,15 @@ function propagate( model ) {
   for (const rule in propagationRules)
     props[rule] = ruleToFunction[propagationRules[rule]];
 
-  const { options } = model;
   const { rewriteAnnotationsRefs } = xprRewriteFns( model );
-  // eslint-disable-next-line @stylistic/js/max-len
-  const oldVirtualNotNullPropagation = isDeprecatedEnabled( options, '_oldVirtualNotNullPropagation' );
-  const { warning, throwWithError } = model.$messageFunctions;
+
+  const { message, throwWithError } = model.$messageFunctions;
 
   forEachDefinition( model, run );
   forEachGeneric( model, 'vocabularies', run );
 
-  // TODO: move 'virtual' handling/checks to resolver if
-  //       'deprecated.oldVirtualNotNullPropagation' is gone
-  if (!oldVirtualNotNullPropagation) // check would always be right, but to be ultra compatible…
-    forEachDefinition( model, checkVirtual );
+  // TODO: move 'virtual' handling/checks to resolver
+  forEachDefinition( model, checkVirtual );
   throwWithError();
   return model;
 
@@ -176,22 +171,6 @@ function propagate( model ) {
       if (transformer)
         transformer( prop, target, source, viaType );
     }
-    // propagate NOT NULL and VIRTUAL from sub elements with
-    // 'deprecated.oldVirtualNotNullPropagation':
-    if (oldVirtualNotNullPropagation &&
-        target.$inferred !== 'proxy' &&
-        target.kind === 'element' && source.kind === 'element') {
-      let elem = source;        // the outer element
-      while (elem._parent.kind === 'element')
-        elem = elem._parent;
-      if (elem !== source) {
-        if (target.notNull === undefined && elem.notNull !== undefined)
-          props.notNull( 'notNull', target, elem );
-        if (target.virtual === undefined && elem.virtual !== undefined)
-          props.virtual( 'virtual', target, elem );
-      }
-    }
-    // setLink( target, '_status', 'shallow-propagated' );
   }
 
   function never() { /* no-op: don't propagate */ }
@@ -252,12 +231,14 @@ function propagate( model ) {
       return;
     if (prop === 'params' && target.$inferred !== 'proxy' && target.$inferred !== 'include')
       return;
-    if (prop === 'foreignKeys' && target.on)
-      return; // e.g. published associations with filters
+    // Remark: occurrences of `foreignKeys` which are not propagated already in
+    // tweak-assocs.js: inside `targetAspect` and parameters
+    const dict = source[prop];
+    if (prop === 'foreignKeys' && (!dict || target.on))
+      return; // e.g. published associations with filters, or `Association to many …`
     const location = target.type && !target.type.$inferred && target.type.location ||
                 target.location ||
                 target._outer && target._outer.location;
-    const dict = source[prop];
     target[prop] = Object.create( null ); // also propagate empty elements
     const propagateKey = target.kind === 'aspect'; // anonymous aspect
     for (const name in dict) {
@@ -318,6 +299,13 @@ function propagate( model ) {
       withKind( prop, target, source );
   }
 
+  function docComment( prop, target, source ) {
+    if (model.options.propagateDocComments)
+      annotation( prop, target, source );
+    else // TODO: Probably just "never"
+      onlyViaParent( prop, target, source );
+  }
+
   function onlyViaArtifact( prop, target, source ) {
     const from = viewFromPrimary( target )?.path;
     // do not propagate from member / if follow assoc in from or into `returns` of actions (v4)
@@ -333,10 +321,8 @@ function propagate( model ) {
       always( prop, target, source ); // not in 'items'
   }
 
-  function notNull( prop, target, source, viaType ) {
+  function notNull( prop, target, source, _viaType ) {
     // Really "reset" NOT NULL when ref has assoc with cardinality min: 0 (TODO: Universal CSN)
-    if (oldVirtualNotNullPropagation && viaType)
-      return;                   // strange propagation not supported with Universal CSN
     if (target.value && withAssociation( target.value, targetMinZero ))
       target[prop] = { $inferred: 'NULL', val: undefined }; // set null value in Universal CSN
     // $inferred: 'NULL' is only an issue for sub elements with a 'value' property;
@@ -348,7 +334,7 @@ function propagate( model ) {
   function virtual( prop, target, source, viaType ) {
     if (!viaType)
       always( prop, target, source );
-    else if (!oldVirtualNotNullPropagation) // NULL would block strange propagation to sub element
+    else // NULL would block strange propagation to sub element
       target[prop] = { $inferred: 'NULL', val: undefined }; // set null value in Universal CSN
   }
 
@@ -360,14 +346,14 @@ function propagate( model ) {
   function checkNonVirtualElement( elem ) {
     // Not enough at all, but so are the current checks - a complete expression
     // must be checked.  Here we just check what might have worked before.
-    // TODO: Propagate 'virtual' in resolver if 'deprecated.oldVirtualNotNullPropagation' is gone.
+    // TODO: Propagate 'virtual' in resolver.
     const path = !elem.virtual && elem.value && elem.value.path;
     if (!path || path.broken)
       return;
     for (const item of path) {
       const art = item && item._artifact;
       if (art?.virtual?.val) {
-        warning( 'def-missing-virtual', [ item.location, elem ], { art, keyword: 'virtual' },
+        message( 'def-missing-virtual', [ item.location, elem ], { art, keyword: 'virtual' },
                  // eslint-disable-next-line @stylistic/js/max-len
                  'Prepend $(KEYWORD) to current select item - containing element $(ART) is virtual' );
         return;

package/lib/compiler/resolve.js

@@ -143,10 +143,6 @@ function resolve( model ) {
         const msg = semanticLoc && 'target';
         error( 'ref-cyclic', [ location, semanticLoc || user ], {
           art, '#': msg,
-        }, {
-          std: 'Illegal circular reference to $(ART)',
-          element: 'Illegal circular reference to element $(MEMBER) of $(ART)',
-          target: 'Illegal circular reference to target $(ART)',
         } );
       }
     } );
@@ -1172,12 +1168,24 @@ function resolve( model ) {
     return [ null, '$navElement', '$tableAlias' ][path.length] === (kind || true) && elem._origin;
   }
 
-  function addImplicitForeignKeys( art, obj, target ) {
+  function isQuasiVirtualAssociation( art ) {
+    if (art.on)
+      return false;
+    if (art.foreignKeys != null)
+      return !art.foreignKeys;
     const max = art.cardinality?.targetMax;
-    if (max && (typeof max.val !== 'number' || max.val > 1) &&
-        !art.$inferred && !art.virtual?.val) {
-      warning( 'assoc-incomplete-to-many', [ max.location, art ], null,
-               'Provide an ON-condition or foreign keys to this to-many association' );
+    return max && (typeof max.val !== 'number' || max.val > 1);
+  }
+
+  function addImplicitForeignKeys( art, obj, target ) {
+    if (!art.$inferred && !art.virtual?.val && isQuasiVirtualAssociation( obj )) {
+      if (!isDeprecatedEnabled( options, 'noQuasiVirtualAssocs' )) {
+        // TODO: set `foreignKeys`, `ON` or `virtual` to false or similar to
+        // indicate that it is already handled (and that we might not be able to
+        // follow the assoc)?  Let us set foreignKeys to false
+        obj.foreignKeys = false;
+        return;               // no foreign keys for `Association to many Target`;
+      }
     }
     obj.foreignKeys = Object.create( null );
     forEachInOrder( target, 'elements', ( elem, name ) => {
@@ -1306,6 +1314,8 @@ function resolve( model ) {
             'The redirected target is the original $(ART)' );
     }
 
+    // No check with user-provided ON/fKeys (remark: compiler deduceds ON/fKeys
+    // _after_ redirecting the target = no $inferred test necessary):
     if (elem.foreignKeys || elem.on)
       return;          // TODO: or should we still bring an msg if nothing in common?
 
@@ -1562,9 +1572,10 @@ function resolve( model ) {
     const art = type && (type.kind === 'entity' ? type : type.target?._artifact);
     if (!art)
       return ref;               // error already reported via resolvePathItem()
-    const unexpectedFilter = expected !== 'column' && expected !== 'calc';
+    const unexpectedFilter = expected !== 'column' && expected !== 'calc' && 'std' ||
+          isQuasiVirtualAssociation( type ) && 'model-only';
     if (last.args || last.where || last.cardinality)
-      reportUnexpectedArgsAndFilter( last, expected, user, art, unexpectedFilter && 'std' );
+      reportUnexpectedArgsAndFilter( last, expected, user, art, unexpectedFilter );
     // TODO: we should have different message-ids for the "last" stuff: adding
     // `.item` likely corrects the ref, probably with location at end of ref
     return ref;
@@ -1622,12 +1633,12 @@ function resolve( model ) {
   function resolveEnumSymbol( expr, expected, user, type ) {
     const { sym } = expr;
     // CSN input with both '#'+val (recompilation) → do not resolve
-    if (!sym || expr.val !== undefined || !type)
+    if (!sym || expr.val !== undefined)
       return;
     // The parameter def for an argument, and the annotation def for an assignment
     // is in `type._artifact`, it is not `type` itself:
-    type = effectiveType( type.id ? type._artifact : type );
-    // Remark: do not use `?.`, type could be 0 for cyclic parameter type
+    type = type && effectiveType( type.id ? type._artifact : type );
+    // Remark: type could be 0 for cyclic parameter type
     if (type && type.foreignKeys) {
       const keys = Object.values( type.foreignKeys );
       if (keys.length === 1) {
@@ -1636,11 +1647,14 @@ function resolve( model ) {
       }
     }
     const symbols = type && type.enum;
-    if (!symbols)
-      return;
-
-    // TODO: or warning if enum symbol but non-enum type?
-    if (symbols[sym.id]) {
+    if (!symbols) {
+      if (user.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 || '' } );
+      }
+    }
+    else if (symbols[sym.id]) {
       setLink( sym, '_artifact', symbols[sym.id] );
     }
     else {
@@ -1649,8 +1663,7 @@ function resolve( model ) {
         type = getOrigin( type );
       const err = message( 'ref-undefined-enum', [ sym.location, user ],
                            { id: sym.id, type } );
-      if (options.newParser || options.newparser)
-        attachAndEmitValidNames( err, symbols );
+      attachAndEmitValidNames( err, symbols );
     }
   }
 
@@ -1662,7 +1675,7 @@ function resolve( model ) {
     if ((step.where || step.cardinality) && variant) {
       const location = combinedLocation( step.where, step.cardinality );
       // XSN TODO: filter$location including […]
-      message( 'expr-unexpected-filter', [ location, user ], { '#': variant } );
+      error( 'expr-unexpected-filter', [ location, user ], { '#': variant } );
     }
     return variant && traverseExpr.SKIP;
   }

package/lib/compiler/shared.js

@@ -1286,6 +1286,8 @@ function fns( model ) {
     if (!user.elements && !user.actions && !user.enum && !user.params &&
         couldBeDraftsEntity( item.id, valid, prev, path ))
       return;
+    if (couldBeDraftAdminDataEntity( item ) )
+      return;
     signalNotFound( (valid.length > 1 ? 'ext-undefined-art' : 'ext-undefined-def'),
                     // TODO: ext-undefined-xyz
                     [ item.location, user ], valid, { art } );
@@ -1293,11 +1295,15 @@ function fns( model ) {
 
   function couldBeDraftsEntity( id, valid, prev, path ) {
     const entity = prev
-      ? prev === path[path.length - 2]._artifact && prev
+      ? prev === path[path.length - 2]._artifact && prev // TODO: Should check for '.drafts'?
       : path.length === 1 && id.endsWith( '.drafts' ) && model.definitions[id.slice( 0, -7 )];
     return entity?.kind === 'entity' && !!entity._service;
   }
 
+  function couldBeDraftAdminDataEntity( item ) {
+    return item.id === 'DraftAdministrativeData' && !item._artifact;
+  }
+
   function undefinedParam( user, head, valid, _dict, _art, _path, semantics ) {
     // TODO: text variant if there are no parameters, or in artifactParameters()
     // TODO: use prepared message variants

package/lib/compiler/tweak-assocs.js

@@ -274,7 +274,7 @@ function tweakAssocs( model ) {
     // target -> avoid infloop ourselves with _status.
     // TODO: this should be good now
     const chain = [];
-    while (!elem.on && !elem.foreignKeys) {
+    while (!elem.on && elem.foreignKeys == null) {
       chain.push( elem );
       if (elem._status === 'rewrite') { // circular dependency (already reported)
         for (const e of chain)

package/lib/compiler/utils.js

@@ -126,7 +126,7 @@ function proxyCopyMembers( art, dictProp, originDict, location, kind, tmpDepreca
       if (kind)
         member.kind = kind;
       else if (origin.key && !tmpDeprecated)
-        // TODO(v6): remove tmpDeprecated once `noKeyPropagationWithExpansions` is removed
+        // TODO(v6): remove tmpDeprecated once `_noKeyPropagationWithExpansions` is removed
         member.key = Object.assign( { $inferred: 'expanded' }, origin.key );
       if (kind && origin.masked)  // TODO: remove!
         member.masked = Object.assign( { $inferred: 'nav' }, origin.masked );