@sap/cds-compiler 3.5.2 → 3.6.0

package/lib/compiler/extend.js

@@ -54,7 +54,7 @@ function extend( model ) {
   applyExtensions();
 
   const addTextsLanguageAssoc = checkTextsLanguageAssocOption(model, options);
-  const useTextsAspects = checkTextsAspects();
+  const useTextsAspect = checkTextsAspect();
 
   Object.keys( model.definitions ).forEach( processArtifact );
 
@@ -301,38 +301,24 @@ function extend( model ) {
    *
    * @return {boolean}
    */
-  function checkTextsAspects() {
+  function checkTextsAspect() {
     const textsAspect = model.definitions['sap.common.TextsAspect'];
-    const fioriTextsAspect = model.definitions['sap.common.FioriTextsAspect'];
-
-    let hasError = false;
-
-    if (textsAspect) {
-      const specialElements = { locale: { key: true } };
-      if (!checkTextsAspect(textsAspect, specialElements))
-        hasError = true;
-    }
-
-    if (fioriTextsAspect) {
-      const specialElements = { ID_texts: { key: true }, locale: { key: false } };
-      if (!checkTextsAspect(fioriTextsAspect, specialElements))
-        hasError = true;
-    }
+    if (!textsAspect)
+      return false;
 
-    return !hasError;
-  }
+    const specialElements = { locale: { key: true } };
 
-  function checkTextsAspect( art, specialElements ) {
-    if (art.kind !== 'aspect' || !art.elements) {
-      error('def-invalid-texts-aspect', [ art.name.location, art ], { '#': 'no-aspect', art });
+    if (textsAspect.kind !== 'aspect' || !textsAspect.elements) {
+      error('def-invalid-texts-aspect', [ textsAspect.name.location, textsAspect ],
+            { '#': 'no-aspect', art: textsAspect });
       return false;
     }
 
     let hasError = false;
-    if (addTextsLanguageAssoc && art.elements.language) {
-      const lang = art.elements.language;
+    if (addTextsLanguageAssoc && textsAspect.elements.language) {
+      const lang = textsAspect.elements.language;
       error('def-unexpected-element', [ lang.name.location, lang ],
-            { option: 'addTextsLanguageAssoc', art, name: 'language' },
+            { option: 'addTextsLanguageAssoc', art: textsAspect, name: 'language' },
             // eslint-disable-next-line max-len
             '$(ART) is not used because option $(OPTION) conflicts with existing element $(NAME); remove either option or element' );
       hasError = true;
@@ -340,14 +326,14 @@ function extend( model ) {
 
     for (const name in specialElements) {
       const expected = specialElements[name];
-      const elem = art.elements[name];
+      const elem = textsAspect.elements[name];
       if (!elem) {
-        error('def-invalid-texts-aspect', [ art.name.location, art ],
-              { '#': 'missing', art, name });
+        error('def-invalid-texts-aspect', [ textsAspect.name.location, textsAspect ],
+              { '#': 'missing', art: textsAspect, name });
         hasError = true;
       }
       else if (expected.key !== undefined && !!elem.key?.val !== expected.key) {
-        const loc = elem.key?.location || elem.name?.location || art.name.location;
+        const loc = elem.key?.location || elem.name?.location || textsAspect.name.location;
         error('def-invalid-texts-aspect', [ loc, elem ],
               { '#': expected.key ? 'key' : 'no-key', art: elem });
         hasError = true;
@@ -357,13 +343,13 @@ function extend( model ) {
     if (hasError) // avoid subsequent errors, if the special elements are already wrong
       return false;
 
-    for (const name in art.elements) {
-      const elem = art.elements[name];
+    for (const name in textsAspect.elements) {
+      const elem = textsAspect.elements[name];
       const include = elem.$inferred === 'include';
       if (!specialElements[name] && elem.key) {
         const loc = include ? elem.location : elem.key.location;
         error( 'def-unexpected-key', [ loc, elem ],
-               { '#': !include ? 'std' : 'include', art } );
+               { '#': !include ? 'std' : 'include', art: textsAspect } );
         hasError = true;
       }
       else if (hasTruthyProp( elem, 'localized' )) {
@@ -371,11 +357,12 @@ function extend( model ) {
         //       Not supported anyway, but important for recompilation (which fails correctly).
         const loc = elem.localized?.location || elem.location;
         error( 'def-unexpected-localized', [ loc, elem ],
-               { '#': !include ? 'std' : 'include', art } );
+               { '#': !include ? 'std' : 'include', art: textsAspect } );
         hasError = true;
       }
       else if (elem.targetAspect) {
-        error( 'def-unexpected-composition', [ elem.targetAspect.location, elem ], { art },
+        error( 'def-unexpected-composition', [ elem.targetAspect.location, elem ],
+               { art: textsAspect },
                '$(ART) can\'t have composition of aspects' );
         hasError = true;
       }
@@ -607,7 +594,7 @@ function extend( model ) {
           for (const ext of exts)
             info( 'anno-builtin', [ ext.name.location, ext ] );
         }
-        // created texts entity, autoexposed entity
+        // created texts entity, auto-exposed entity
         if (exts) {
           extendArtifact( exts, art, 'gen' );
           if (veryLate)
@@ -728,13 +715,12 @@ function extend( model ) {
   }
 
   /**
-   * Add all members (e.g. elements or actions) of `ext.includes` to `ext[prop]`
-   * if `parent` is `false` or to `parent` with appropriate _origin links otherwise.
-   * Included members are prepended to existing ones.
+   * Add all members (e.g. elements or actions) of `ext.includes` to `ext[prop]`.
+   * If `art` is `ext`, set the parent link accordingly.
    *
    * @param {XSN.Extension} ext
    * @param {XSN.Artifact} art
-   * @param {string} prop
+   * @param {string} prop: 'elements' or 'actions'
    */
   function includeMembers( ext, art, prop ) {
     // TODO two kind of messages:
@@ -892,10 +878,7 @@ function extend( model ) {
    * @param {boolean} fioriEnabled
    */
   function createTextsEntity( base, absolute, textElems, fioriEnabled ) {
-    const name = (fioriEnabled ? 'sap.common.FioriTextsAspect' : 'sap.common.TextsAspect');
-    const withTextsAspect = useTextsAspects && model.definitions[name];
-
-    const art = withTextsAspect
+    const art = useTextsAspect
       ? createTextsEntityWithInclude( base, absolute, fioriEnabled )
       : createTextsEntityWithDefaultElements( base, absolute, fioriEnabled );
 
@@ -955,7 +938,16 @@ function extend( model ) {
       applyIncludes(art, art);
     }
 
-    if (fioriEnabled ) {
+    if (fioriEnabled) {
+      // The includes mechanism puts TextsAspect's elements before .texts' elements.
+      // Because ID_texts is not copied from TextsAspect, the order is messed
+      // up.  Fix it.
+      const { elements } = art;
+      art.elements = Object.create(null);
+      const names = [ 'ID_texts', 'locale', ...Object.keys(elements) ];
+      for (const name of names)
+        art.elements[name] = elements[name];
+
       const { locale } = art.elements;
       assertUniqueValue.unshift({
         path: [ { id: locale.name.id, location: locale.location } ],
@@ -975,21 +967,19 @@ function extend( model ) {
    *
    * Does NOT apply the include!
    *
-   * TODO: When beta flag textsAspect is removed, update caller-site and remove old coding.
-   *
    * @param {XSN.Artifact} base
    * @param {string} absolute
    * @param {boolean} fioriEnabled
    */
   function createTextsEntityWithInclude( base, absolute, fioriEnabled ) {
+    const textsAspectName = 'sap.common.TextsAspect';
+    const textsAspect = model.definitions['sap.common.TextsAspect'];
     const elements = Object.create(null);
     const { location } = base.name;
-
-    const include = fioriEnabled ? 'sap.common.FioriTextsAspect' : 'sap.common.TextsAspect';
     const art = {
       kind: 'entity',
       name: { path: splitIntoPath( location, absolute ), absolute, location },
-      includes: [ createInclude( include, base.location ) ],
+      includes: [ createInclude( textsAspectName, base.location ) ],
       location: base.location,
       elements,
       $inferred: 'localized-entity',
@@ -1000,6 +990,22 @@ function extend( model ) {
       // TODO (next major version): remove?
       annotateWith( art, '@odata.draft.enabled', art.location, false );
     }
+    else {
+      // @fiori.draft.enabled artifacts need default elements ID_texts and locale.
+      // `locale` is copied from `sap.common.TextsAspect`, but without "key".
+      const textId = {
+        name: { location, id: 'ID_texts' },
+        kind: 'element',
+        key: { val: true, location },
+        type: augmentPath( location, 'cds.UUID' ),
+        location,
+      };
+      dictAdd( art.elements, 'ID_texts', textId );
+
+      // "Early" include; only for element `locale`, which has its `key` property
+      // removed (or rather: it is not copied).
+      linkToOrigin( textsAspect.elements.locale, 'locale', art, 'elements', location );
+    }
 
     if (addTextsLanguageAssoc && art.elements.language)
       art.elements.language = undefined; // TODO: Message? Ignore?

package/lib/compiler/index.js

@@ -465,6 +465,11 @@ function compileDoX( model ) {
   extend( model );
   kickStart( model );
   populate( model );
+
+  model.definitions = model.$functions.shuffleDict( model.definitions );
+  // Shuffling extensions is more difficult due to intra-file extensions of same artifact
+  // TODO: think about making this work
+
   resolve( model );
   tweakAssocs( model );
   assertConsistency( model );

package/lib/compiler/populate.js

@@ -219,7 +219,7 @@ function populate( model ) {
     // console.log( 'EXPR-IN', art.kind, refString(art.name) )
     if (!art._main || !art.value || !art.value.path)
       return undefined;
-    if (art._pathHead && art.value.path) {
+    if (art.value.path) {
       setLink( art, '_origin', resolvePath( art.value, 'expr', art, null ) );
       return art._origin;
     }
@@ -432,7 +432,8 @@ function populate( model ) {
       }
     }
     // console.log( resolveChain.map( v => msgName(v)+v._status ) );
-    for (const view of resolveChain.reverse()) {
+    resolveChain.reverse();
+    for (const view of resolveChain) {
       if (view._status !== '_query' ) { // not already resolved
         setLink( view, '_status', '_query' );
         // must be run in order “sub query in FROM first”:
@@ -454,11 +455,11 @@ function populate( model ) {
    *
    * This is important to ensure re-compilability.
    *
+   * TODO: make this part of a revamped on-demand 'extend' functionality.
+   *
    * @param art
    */
   function mergeSpecifiedElementsOrEnum( art ) {
-    // Later we use specified elements as proxies to inferred of leading query
-    // (No, we probably do not.)
     for (const id in (art.elements || art.enum)) {
       const ielem = art.elements ? art.elements[id] : art.enum[id];  // inferred element
       const selem = art.elements$ ? art.elements$[id] : art.enum$[id]; // specified element
@@ -807,15 +808,16 @@ function populate( model ) {
       const { id } = sibling.name;
       if (Array.isArray(navElem)) {
         // ID published! Used in stakeholder project; if renamed, add to oldMessageIds
-        info( 'wildcard-excluding-many', [ sibling.name.location, query ], { id },
-          // eslint-disable-next-line max-len
+        info( 'wildcard-excluding-many', [ sibling.name.location, query ],
+              { id, keyword: 'excluding' },
+              // eslint-disable-next-line max-len
               'This select item replaces $(ID) from two or more sources. Add $(ID) to $(KEYWORD) to silence this message' );
       }
       else {
         // ID published! Used in stakeholder project; if renamed, add to oldMessageIds
         info( 'wildcard-excluding-one', [ sibling.name.location, query ],
               { id, alias: navElem._parent.name.id, keyword: 'excluding' },
-          // eslint-disable-next-line max-len
+              // eslint-disable-next-line max-len
               'This select item replaces $(ID) from table alias $(ALIAS). Add $(ID) to $(KEYWORD) to silence this message' );
       }
     }
@@ -1001,7 +1003,7 @@ function populate( model ) {
   // - exclude all indirect projections, i.e. those which are projection on others in list
   //
   // To avoid repeated messages: if already tried to do autoexposure, return
-  // autoexposed entity when successful, or `target` otherwise (no/failed autoexposure)
+  // 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.absolute] ||
@@ -1175,7 +1177,7 @@ function populate( model ) {
         if (annotationIsFalse( anno )) {
           // It would probably be cleaner to ignore a dubious
           // `@cds.redirection.target: false` earlier, but that is not easy to detect
-          // due to the name of the autoexposed entity with scoped redirections
+          // due to the name of the auto-exposed entity with scoped redirections
           if (!anno.$errorReported) {
             info( 'anno-redirecting-anyway',
                   [ annotationLocation( anno ), autoexposed ],
@@ -1194,7 +1196,7 @@ function populate( model ) {
       }
       error( 'duplicate-autoexposed', [ service.name.location, service ],
              { target, art: absolute },
-             'Name $(ART) of autoexposed entity for $(TARGET) collides with other definition' );
+             'Name $(ART) of auto-exposed entity for $(TARGET) collides with other definition' );
       info( null, [ target.name.location, target ],
             { art: service },
             'Expose this (or the competing) entity explicitly in service $(ART)' );
@@ -1203,7 +1205,7 @@ function populate( model ) {
       const firstTarget = autoexposed.query.from._artifact;
       error( 'duplicate-autoexposed', [ service.name.location, service ],
              { target: firstTarget, art: absolute },
-             'Name $(ART) of autoexposed entity for $(TARGET) collides with other definition' );
+             'Name $(ART) of auto-exposed entity for $(TARGET) collides with other definition' );
       info( null, [ firstTarget.name.location, firstTarget ],
             { art: service },
             'Expose this (or the competing) entity explicitly in service $(ART)' );
@@ -1225,6 +1227,21 @@ function populate( model ) {
         $inferred: '$generated',
       },
     };
+    // forward target parameters to projection
+    if (target.params) {
+      art.params = Object.create(null);
+      // is art.query.from.path[0].$syntax: ':' required?
+      art.query.from.path[0].args = Object.create(null);
+      forEachGeneric(target, 'params', (p, pn) => {
+        art.params[pn] = linkToOrigin(p, pn, art, 'params', p.location);
+        art.query.from.path[0].args[pn] = {
+          name: { id: p.name.id, location: p.location },
+          location: p.location,
+          scope: 'param',
+          path: [ { id: pn, location: p.location } ],
+        };
+      });
+    }
     // TODO: do we need to tag the generated entity with elemScope = 'auto'?
     if (autoexposed) {
       Object.assign( autoexposed, art );

package/lib/compiler/propagator.js

@@ -111,7 +111,8 @@ function propagate( model ) {
       targets = news;
     }
 
-    chain.reverse().forEach( step );
+    chain.reverse();
+    chain.forEach( step );
     runMembers( art );
     // console.log('DONE:', art.name, art.elements ? Object.keys(art.elements) : 0);
   }

package/lib/compiler/resolve.js

@@ -39,7 +39,6 @@
 'use strict';
 
 const {
-  isDeprecatedEnabled,
   forEachDefinition,
   forEachMember,
   forEachGeneric,
@@ -70,6 +69,7 @@ const {
 } = require('./utils');
 
 const detectCycles = require('./cycle-detector');
+const { CompilerAssertion } = require('../base/error');
 
 const $location = Symbol.for('cds.$location');
 
@@ -80,7 +80,7 @@ const $inferred = Symbol.for('cds.$inferred');
 // exception in case of an error, but push the corresponding error object to
 // that property (should be a vector).
 function resolve( model ) {
-  const { options } = model;
+  // const { options } = model;
   // Get shared functionality and the message function:
   const {
     info, warning, error, message,
@@ -129,7 +129,7 @@ function resolve( model ) {
     // for builtin types
     forEachGeneric( model.definitions.cds, '_subArtifacts', chooseAnnotationsInArtifact);
     forEachGeneric( model.definitions['cds.hana'], '_subArtifacts', chooseAnnotationsInArtifact);
-    // Phase 6: apply ANNOTATE on autoexposed entities and unknown artifacts:
+    // Phase 6: apply ANNOTATE on auto-exposed entities and unknown artifacts:
     lateExtensions( annotateMembers );
     if (model.extensions)
       model.extensions.map( annotateUnknown );
@@ -242,16 +242,16 @@ function resolve( model ) {
     for (const name in query.elements) {
       const elem = query.elements[name];
       if (!elem.$inferred && elem.value &&
-          testExpr( elem.value, selectTest, () => false ))
+          testExpr( elem.value, selectTest, () => false, elem ))
         propagateKeys = false;
     }
     return propagateKeys;
 
-    function selectTest( expr ) {
+    function selectTest( expr, user ) {
       const art = withAssociation( expr, targetMaxNotOne );
       if (art) {
         // ID published! Used in stakeholder project; if renamed, add to oldMessageIds
-        info( 'query-navigate-many', [ art.location, query ], { art },
+        info( 'query-navigate-many', [ art.location, user || query ], { art },
               {
                 // eslint-disable-next-line max-len
                 std: 'Navigating along to-many association $(ART) - key properties are not propagated',
@@ -291,10 +291,12 @@ function resolve( model ) {
   // all sub elements.
   // TODO: make this function smaller
   function resolveRefs( art ) {
+    if (art.builtin)
+      return;
     // console.log(message( null, art.location, art, {}, 'Info','REFS').toString())
     // console.log(message( null, art.location, art, {target:art.target}, 'Info','RR').toString())
     const parent = art._parent;
-    const allowedInMain = [ 'entity', 'aspect' ].includes( adHocOrMainKind( art ) );
+    const allowedInMain = [ 'entity', 'aspect', 'event' ].includes( adHocOrMainKind( art ) );
     const isTopLevelElement = parent && (parent.kind !== 'element' || parent.targetAspect);
     if (art.key && art.key.val && !art.key.$inferred && !(allowedInMain && isTopLevelElement)) {
       warning( 'unexpected-key', [ art.key.location, art ],
@@ -385,6 +387,7 @@ function resolve( model ) {
         resolveRedirected( obj, obj.target._artifact );
     }
     else if (obj.kind === 'mixin') {
+      // TODO: also check that the type is cds.Association or cds.Composition
       error( 'non-assoc-in-mixin', [ (obj.type || obj.name).location, art ], {},
              'Only unmanaged associations are allowed in mixin clauses' );
     }
@@ -540,8 +543,14 @@ function resolve( model ) {
                      'Elements only exist in entities, types or typed constructs' );
           }
           else {
+            const isEntity = (parent.returns?.type || parent.type)?._artifact?.kind === 'entity';
+            let variant = parent.enum ? 'enum' : 'element';
+            if (isEntity)
+              variant = 'entity-element';
+            else if (parent.returns)
+              variant = 'returns';
             notFound( 'anno-undefined-element', ext.name.location, art,
-                      { art: searchName( parent, name, parent.enum ? 'enum' : 'element' ) },
+                      { '#': variant, art: parent, name },
                       parent.elements || parent.enum );
           }
         }
@@ -689,7 +698,7 @@ function resolve( model ) {
       // enums would be first in elements
       if ( parent[kindProperties[kind].dict] &&
            parent[kindProperties[kind].dict][art.name.id] )
-        throw new Error(art.name.id);
+        throw new CompilerAssertion(art.name.id);
       setMemberParent( ext, art.name.id, parent, kindProperties[kind].dict );
     }
     ext.kind = 'annotate';    // after setMemberParent()!
@@ -711,6 +720,8 @@ function resolve( model ) {
       if (prop.charAt(0) === '@')
         chooseAssignment( prop, art );
     }
+    if (art.doc)
+      chooseAssignment( 'doc', art );
   }
 
   function chooseAssignment( annoName, art ) {
@@ -742,9 +753,12 @@ function resolve( model ) {
         const msg = (issue === true)
           ? 'anno-duplicate'
           : (index >= 0) ? 'anno-duplicate-unrelated-layer' : 'anno-unstable-array';
+        const variant = annoName === 'doc' ? 'doc' : 'std';
         for (const a of assignments) {
-          if (!a.$errorReported)
-            message( msg, [ a.name.location, art ], { anno: annoName } );
+          if (!a.$errorReported) {
+            message( msg, [ a.name?.location || a.location, art ],
+                     { '#': variant, anno: annoName } );
+          }
         }
       }
       // else if (index > 0)  -- if we allow multiple assignments in one file - the last wins
@@ -878,7 +892,7 @@ function resolve( model ) {
     for (const col of query.$inlines)
       resolveExpr( col.value, 'expr', col, undefined, true );
     // for (const col of query.$inlines)
-    //   if (!col.value.path) throw Error(col.name.element)
+    //   if (!col.value.path) throw new CompilerAssertion(col.name.element)
     if (query !== query._main._leadingQuery) // will be done later
       forEachGeneric( query, 'elements', resolveRefs );
     if (query.from)
@@ -1068,8 +1082,7 @@ function resolve( model ) {
       return;
     }
     else if ((elem.value || elem.expand) && elem.type && !elem.type.$inferred) {
-      error( 'ref-unexpected-assoc', [ elem.type.location, elem ], {},
-             'Casting to an association is not supported' );
+      error( 'ref-unexpected-assoc', [ elem.type.location, elem ], { '#': 'cast' } );
       return;
     }
     // console.log(message( null, elem.location, elem, {target,art:assoc}, 'Info','RE')
@@ -1131,7 +1144,8 @@ function resolve( model ) {
       }
     }
     let redirected = null;
-    let news = [ { chain: chain.reverse(), sources: [ target ] } ];
+    chain.reverse();
+    let news = [ { chain, sources: [ target ] } ];
     const dict = Object.create(null);
     while (news.length) {
       const outer = news;
@@ -1328,11 +1342,6 @@ function resolve( model ) {
       const args = Array.isArray(expr.args) ? expr.args : Object.values( expr.args );
       args.forEach( e => e && resolveExpr( e, e.$expected || expected, user, extDict ) );
     }
-    if (expr.suffix && isDeprecatedEnabled( options )) {
-      const { location } = expr.suffix[0] || expr;
-      error( null, [ location, user ], { prop: 'deprecated' },
-             'Window functions are not supported if $(PROP) options are set' );
-    }
     if (expr.suffix)
       expr.suffix.forEach( s => s && resolveExpr( s, expected, user, extDict ) );
   }

package/lib/compiler/shared.js

@@ -274,6 +274,8 @@ function fns( model ) {
   function resolveUncheckedPath( ref, expected, user ) {
     if (!ref.path || ref.path.broken) // incomplete type AST
       return undefined;
+    if (ref._artifact)
+      return ref._artifact.name.absolute;
     const spec = specExpected[expected];
     let art = (ref.scope === 'global' || spec.global)
       ? getPathRoot( ref.path, spec, user, {}, model[spec.global || 'definitions'] )
@@ -594,7 +596,8 @@ function fns( model ) {
       // const { _origin } = user._pathHead;
       // return (_origin && _origin.kind === '$tableAlias') ? _origin._origin : _origin;
     }
-    // if (head.id === 'k') {console.log(Object.keys(user));throw Error(JSON.stringify(user.name))}
+    // if (head.id === 'k') {console.log(Object.keys(user));
+    // throw new CompilerAssertion(JSON.stringify(user.name))}
     // if head._artifact is set or is null then it was already computed once
     if ('_artifact' in head)
       return Array.isArray(head._artifact) ? false : head._artifact;
@@ -723,8 +726,10 @@ function fns( model ) {
         } );
       }
       else {
+        const isVirtual = (user.name?.id === head.id && user.virtual?.val);
+        const code = isVirtual ? 'virtual null as ‹name›' : '';
         signalNotFound( 'ref-undefined-element', [ head.location, user ], valid,
-                        { art: head.id, '#': 'std' } );
+                        { art: head.id, '#': isVirtual ? 'virtual' : 'std', code } );
       }
     }
     else if (env.$frontend && env.$frontend !== 'cdl' || spec.global) {
@@ -817,7 +822,7 @@ function fns( model ) {
         // could "change" to this message at the end of compile():
         message( 'ref-autoexposed', [ item.location, user ], { art },
                  // eslint-disable-next-line max-len
-                 'An autoexposed entity can\'t be referred to - expose entity $(ART) explicitly' );
+                 'An auto-exposed entity can\'t be referred to - expose entity $(ART) explicitly' );
       }
     }
     return art;
@@ -844,8 +849,8 @@ function fns( model ) {
     }
 
     function errorNotFound( item, env ) {
-      if (!spec.next) {         // artifact ref
-        // TODO: better for TYPE OF, FROM e.Assoc (even disallow for other refs)
+      if (!spec.next && artItemsCount >= 0) {         // artifact ref
+        // TODO: better for FROM e.Assoc (even disallow for other refs)
         const a = searchName( art, item.id, (spec.envFn || art._subArtifacts) && 'absolute' );
         signalNotFound( spec.undefinedDef || 'ref-undefined-def', [ item.location, user ],
                         [ env ], { art: a } );
@@ -890,8 +895,10 @@ function fns( model ) {
     location.$notFound = true;
     /** @type {object} */
     const err = message( msgId, location, textParams );
-    if (valid)
-      attachAndEmitValidNames(err, ...valid.reverse());
+    if (valid) {
+      valid.reverse();
+      attachAndEmitValidNames(err, ...valid);
+    }
   }
 
   /**
@@ -977,10 +984,8 @@ function fns( model ) {
   // Copy annotations from `ext` to `art`, overwriting inferred ones.
   // TODO: move to extend.js if not used anymore in define.js
   function copyAnnotationsForExtensions( ext, art ) {
-    if (ext.doc)
-      art.doc = ext.doc; // e.g. through `extensions` array in CSN
     for (const annoProp in ext) {
-      if (annoProp.charAt(0) === '@') {
+      if (annoProp.charAt(0) === '@' || annoProp === 'doc') {
         const extAnno = ext[annoProp];
         if (art[annoProp]?.$inferred)
           art[annoProp] = extAnno; // overwrite $inferred annos

package/lib/compiler/utils.js

@@ -141,7 +141,7 @@ function setMemberParent( elem, name, parent, prop ) {
     else
       delete elem.name[kind];
   });
-  // try { throw new Error('Foo') } catch (e) { elem.name.stack = e; };
+  // try { throw new CompilerAssertion('Foo') } catch (e) { elem.name.stack = e; };
 }
 
 /**
@@ -264,27 +264,27 @@ function copyExpr( expr, location, skipUnderscored, rewritePath ) {
   return r;
 }
 
-function testExpr( expr, pathTest, queryTest ) {
+function testExpr( expr, pathTest, queryTest, user ) {
   // TODO: also check path arguments/filters
   if (!expr || typeof expr === 'string') { // parse error or keywords in {xpr:...}
     return false;
   }
   else if (Array.isArray(expr)) {
-    return expr.some( e => testExpr( e, pathTest, queryTest ) );
+    return expr.some( e => testExpr( e, pathTest, queryTest, user ) );
   }
   else if (expr.path) {
-    return pathTest( expr );
+    return pathTest( expr, user );
   }
   else if (expr.query) {
-    return queryTest( expr.query );
+    return queryTest( expr.query, user );
   }
   else if (expr.op && expr.args) {
     // unnamed args => array
     if (Array.isArray(expr.args))
-      return expr.args.some( e => testExpr( e, pathTest, queryTest ) );
+      return expr.args.some( e => testExpr( e, pathTest, queryTest, user ) );
     // named args => dictionary
     for (const namedArg of Object.keys(expr.args)) {
-      if (testExpr(expr.args[namedArg], pathTest, queryTest))
+      if (testExpr(expr.args[namedArg], pathTest, queryTest, user))
         return true;
     }
   }