@sap/cds-compiler 6.1.0 → 6.3.0

package/lib/compiler/index.js

@@ -183,7 +183,7 @@ function compileX( filenames, dir = '', options = {}, fileCache = Object.create(
   return all.then( () => {
     options.abortSignal?.throwIfAborted();
     moduleLayers.setLayers( input.sources );
-    return compileDoX( model );
+    return compileDoX( model ); // also async
   } );
 
   // Read file `filename` and parse its content, return messages
@@ -303,7 +303,7 @@ function compileSyncX( filenames, dir = '', options = {}, fileCache = Object.cre
   }
 
   moduleLayers.setLayers( a.sources );
-  return compileDoX( model );
+  return compileDoXSync( model );
 
   // Read file `filename` and parse its content, return messages
   function readAndParseSync( filename, cb ) {
@@ -423,7 +423,7 @@ function compileSourcesX( sourcesDict, options = {} ) {
   }
   moduleLayers.setLayers( sources );
 
-  return compileDoX( model );
+  return compileDoXSync( model );
 }
 
 /**
@@ -457,8 +457,8 @@ function recompileX( csn, options ) {
 
   sources[file] = parseCsn.augment( csn, file, options, model.$messageFunctions );
   moduleLayers.setLayers( sources );
-  const compiled = compileDoX( model ); // calls throwWithError()
-  if (options.messages)         // does not help with exception in compileDoX()
+  const compiled = compileDoXSync( model ); // calls throwWithError()
+  if (options.messages)         // does not help with exception in compileDoXSync()
     deduplicateMessages( options.messages ); // TODO: do better
   return compiled;
 }
@@ -467,10 +467,12 @@ function recompileX( csn, options ) {
  * On the given model (AST like CSN) run the definer, resolver as well as semantic checks.
  * Creates an augmented CSN (XSN) and returns it.
  *
+ * This is the non-interruptible version of `compileDoX()` and can be used in non-`async` functions.
+ *
  * @param {object} model AST like CSN generated e.g. by `parsers.parseCdl()`
  * @returns {XSN.Model} Augmented CSN (XSN)
  */
-function compileDoX( model ) {
+function compileDoXSync( model ) {
   const { options } = model;
   const { throwWithError } = model.$messageFunctions;
   if (!options.testMode)
@@ -512,6 +514,61 @@ function compileDoX( model ) {
   return propagator.propagate( model );
 }
 
+/**
+ * On the given model (AST like CSN) run the definer, resolver as well as semantic checks.
+ * Creates an augmented CSN (XSN) and returns it.
+ *
+ * @param {object} model AST like CSN generated e.g. by `parsers.parseCdl()`
+ * @returns {XSN.Model} Augmented CSN (XSN)
+ */
+async function compileDoX( model ) {
+  const { options } = model;
+  const { throwWithError } = model.$messageFunctions;
+  if (!options.testMode)
+    model.meta = {}; // provide initial central meta object
+
+  checkRemovedDeprecatedFlags( options, model.$messageFunctions );
+
+  if (options.parseOnly) {
+    throwWithError();
+    return model;
+  }
+  model.$functions = {};
+  fns( model );                 // attach (mostly) paths functions
+  define( model );
+  await checkAsyncAbortFlag( options.abortSignal );
+
+  // do not run the resolver in parse-cdl mode or we get duplicate annotations, etc.
+  // TODO: do not use this function for parseCdl anyway…
+  if (options.parseCdl) {
+    finalizeParseCdl( model );
+    throwWithError();
+    return model;
+  }
+
+  for (const phase of [ extend, generate, kickStart, populate ]) {
+    phase( model );
+    // eslint-disable-next-line no-await-in-loop
+    await checkAsyncAbortFlag( options.abortSignal );
+  }
+
+  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
+
+  for (const phase of [ resolve, tweakAssocs, assertConsistency, check ]) {
+    phase( model );
+    // eslint-disable-next-line no-await-in-loop
+    await checkAsyncAbortFlag( options.abortSignal );
+  }
+
+  throwWithError();
+  if (options.lintMode)
+    return model;
+
+  return propagator.propagate( model );
+}
+
 /**
  * Process an array of `filenames`.  Returns an object with properties:
  *  - `sources`: dictionary which has a filename as key (value is irrelevant)
@@ -595,6 +652,31 @@ function createSourcesDict( filenames, filenameMap, dir ) {
   return { sources, files, repeated };
 }
 
+/**
+ * An `await`able function to fake a real asynchronous event.
+ *
+ * @returns {Promise<unknown>}
+ */
+async function waitForNextEventLoopIteration() {
+  return new Promise( ( r ) => {
+    setTimeout( r, 0 );
+  });
+}
+
+/**
+ * An actual async function that uses `setTimeout()` to allow the Node event loop to
+ * start its next iteration, but only if the `abortSignal` is defined.
+ *
+ * @param {AbortSignal?} abortSignal
+ * @returns {Promise<void>}
+ */
+async function checkAsyncAbortFlag( abortSignal ) {
+  if (!abortSignal)
+    return;
+  await waitForNextEventLoopIteration();
+  abortSignal.throwIfAborted();
+}
+
 module.exports = {
   parseX,
   compileX,

package/lib/compiler/lsp-api.js

@@ -397,6 +397,8 @@ function* nameAsReference( ref, hint = null ) {
 function* definitionNameTokens( name, art ) {
   if (!art.kind)
     return null; // e.g. parameter references
+  if (!name)
+    return null; // e.g. column that couldn't be populated
   if (art.kind === '$annotation')
     return null; // annotation name, e.g. in `@anno: (elem)`
 

package/lib/compiler/populate.js

@@ -813,7 +813,7 @@ function populate( model ) {
     // invent a name for code completion in expression, see also #10596
     col.name = {
       id: '',
-      location: col.value && col.value.location || col.location,
+      location: col.value?.location || col.location,
       $inferred: 'none',
     };
     return '';
@@ -979,14 +979,14 @@ function populate( model ) {
         // ID published! Used in stakeholder project; if renamed, add to oldMessageIds
         info( 'wildcard-excluding-many', [ sibling.name.location, query ],
               { id, keyword: 'excluding' },
-              // eslint-disable-next-line @stylistic/js/max-len
+              // eslint-disable-next-line @stylistic/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 @stylistic/js/max-len
+              // eslint-disable-next-line @stylistic/max-len
               'This select item replaces $(ID) from table alias $(ALIAS). Add $(ID) to $(KEYWORD) to silence this message' );
       }
     }
@@ -1112,9 +1112,9 @@ function populate( model ) {
                  // art: definitionScope( target ), - TODO extra debug info in message
                  sorted_arts: exposed,
                }, {
-                 // eslint-disable-next-line @stylistic/js/max-len
+                 // eslint-disable-next-line @stylistic/max-len
                  std: 'Replace target $(TARGET) by one of $(SORTED_ARTS); can\'t auto-redirect this association if multiple projections exist in this service',
-                 // eslint-disable-next-line @stylistic/js/max-len
+                 // eslint-disable-next-line @stylistic/max-len
                  two: 'Replace target $(TARGET) by $(SORTED_ARTS) or $(SECOND); can\'t auto-redirect this association if multiple projections exist in this service',
                } );
       // continuation semantics: no auto-redirection
@@ -1136,11 +1136,11 @@ function populate( model ) {
                    anno: 'cds.redirection.target',
                    sorted_arts: exposed,
                  }, {
-                   // eslint-disable-next-line @stylistic/js/max-len
+                   // eslint-disable-next-line @stylistic/max-len
                    std: 'Add $(ANNO) to one of $(SORTED_ARTS) to select the entity as redirection target for $(TARGET) in this service; can\'t auto-redirect $(ART) otherwise',
-                   // eslint-disable-next-line @stylistic/js/max-len
+                   // eslint-disable-next-line @stylistic/max-len
                    two: 'Add $(ANNO) to either $(SORTED_ARTS) or $(SECOND) to select the entity as redirection target for $(TARGET) in this service; can\'t auto-redirect $(ART) otherwise',
-                   // eslint-disable-next-line @stylistic/js/max-len
+                   // eslint-disable-next-line @stylistic/max-len
                    justOne: 'Remove $(ANNO) from all but one of $(SORTED_ARTS) to have a unique redirection target for $(TARGET) in this service; can\'t auto-redirect $(ART) otherwise',
                  } );
       }

package/lib/compiler/propagator.js

@@ -354,7 +354,7 @@ function propagate( model ) {
       const art = item && item._artifact;
       if (art?.virtual?.val) {
         message( 'def-missing-virtual', [ item.location, elem ], { art, keyword: 'virtual' },
-                 // eslint-disable-next-line @stylistic/js/max-len
+                 // eslint-disable-next-line @stylistic/max-len
                  'Prepend $(KEYWORD) to current select item - containing element $(ART) is virtual' );
         return;
       }

package/lib/compiler/resolve.js

@@ -326,7 +326,7 @@ function resolve( model ) {
       propagateKeys = false;
       info( 'query-from-many', [ toMany.location, query ], { art: toMany }, {
         std: 'Key properties are not propagated because a to-many association $(ART) is selected',
-        // eslint-disable-next-line @stylistic/js/max-len
+        // eslint-disable-next-line @stylistic/max-len
         element: 'Key properties are not propagated because a to-many association $(MEMBER) of $(ART) is selected',
       } );
     }
@@ -367,9 +367,9 @@ function resolve( model ) {
         // ID published! Used in stakeholder project; if renamed, add to oldMessageIds
         info( 'query-navigate-many', [ art.location, user || query ], { art }, {
           std: 'Navigating along to-many association $(ART) - key properties are not propagated',
-          // eslint-disable-next-line @stylistic/js/max-len
+          // eslint-disable-next-line @stylistic/max-len
           element: 'Navigating along to-many association $(MEMBER) of $(ART) - key properties are not propagated',
-          // eslint-disable-next-line @stylistic/js/max-len
+          // eslint-disable-next-line @stylistic/max-len
           alias: 'Navigating along to-many mixin association $(MEMBER) - key properties are not propagated',
         } );
       }
@@ -430,10 +430,7 @@ function resolve( model ) {
       }
       else if (!allowedInMain || !isTopLevelElement) {
         warning( 'def-unsupported-key', [ art.key.location, art ],
-                 { '#': allowedInMain ? 'sub' : 'std', keyword: 'key' }, {
-                   std: '$(KEYWORD) is only supported for elements in an entity or an aspect',
-                   sub: '$(KEYWORD) is only supported for top-level elements',
-                 } );
+                 { '#': allowedInMain ? 'sub' : 'kind', keyword: 'key' } );
       }
     }
 
@@ -490,9 +487,9 @@ function resolve( model ) {
         resolveTypeExpr( obj, art );
       // typeOf unmanaged assoc?  TODO: is this the right place to check this?
       // (probably better in rewriteAssociations)
-      const elemtype = obj.type._artifact;
-      if (elemtype && effectiveType( elemtype )) {
-        const assocType = getAssocSpec( elemtype ) || {};
+      const elemType = obj.type._artifact;
+      if (elemType && effectiveType( elemType )) {
+        const assocType = getAssocSpec( elemType ) || {};
         if ((assocType.on || assocType.$assocFilter) && !obj.on)
           obj.on = { $inferred: 'rewrite' }; // TODO: no extra rewrite here
         if (assocType.targetAspect) {
@@ -506,11 +503,10 @@ function resolve( model ) {
         }
 
         // Check if relational type is missing its target or if it's used directly.
-        if (elemtype.category === 'relation' &&
-            !obj.target && !obj.targetAspect) {
+        if (elemType.category === 'relation' && !obj.target && !obj.targetAspect) {
           const isCsn = (obj._block && obj._block.$frontend === 'json');
           error( 'type-missing-target', [ obj.type.location, obj ],
-                 { '#': isCsn ? 'csn' : 'std', type: elemtype }, {
+                 { '#': isCsn ? 'csn' : 'std', type: elemType }, {
                    // We don't say "use 'association to <target>" because the type could be used
                    // in action parameters, etc. as well.
                    std: 'The type $(TYPE) can\'t be used directly because it\'s compiler internal',
@@ -906,10 +902,13 @@ function resolve( model ) {
     }
     else if (effectiveType( art )?.elements && !art.$inferred) {
       // For inferred (e.g. included) calc elements, this error is already emitted at the origin.
-      if (art.type)
+      if (art.type) {
         error( 'type-unexpected-structure', [ art.type.location, art ], { '#': 'calc' } );
-      else
-        error( 'ref-unexpected-structured', [ art.value.location, art ], { '#': 'expr' } );
+      }
+      else {
+        error( 'ref-unexpected-structured', [ art.value.location, art ],
+               { '#': 'struct-expr', elemref: art.value } );
+      }
     }
     else if (effectiveType( art )?.items && !art.$inferred) {
       // For inferred (e.g. included) calc elements, this error is already emitted at the origin.
@@ -920,7 +919,7 @@ function resolve( model ) {
       } );
     }
     else {
-      const noTruthyAllowed = [ 'localized', 'key', 'virtual' ];
+      const noTruthyAllowed = [ 'key', 'virtual' ];
       for (const prop of noTruthyAllowed) {
         if (art[prop]?.val) {
           // probably better than a parse error (which is good for DEFAULT vs calc),
@@ -1274,7 +1273,7 @@ function resolve( model ) {
           const text = (item !== last) ? 'sub' : 'std';
           error( 'duplicate-key-ref', [ item.location, key ], { '#': text, name }, {
             std: 'Foreign key $(NAME) already refers to the same target element',
-            // eslint-disable-next-line @stylistic/js/max-len
+            // eslint-disable-next-line @stylistic/max-len
             sub: 'Foreign key $(NAME) already refers to the target element whose sub element is again referred to here',
             // TODO: please add ideas for a better text, e.g. to (closed) PR #11325
           } );
@@ -1594,10 +1593,12 @@ 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' && 'std' ||
-          isQuasiVirtualAssociation( type ) && 'model-only';
-    if (last.args || last.where || last.cardinality)
+    if (last.args || last.where || last.cardinality) {
+      const unexpectedFilter = (expected !== 'annotation' && expected !== 'column' &&
+          expected !== 'calc' && 'std') ||
+        isQuasiVirtualAssociation( type ) && 'model-only';
       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;

package/lib/compiler/shared.js

@@ -991,7 +991,7 @@ function fns( model ) {
         }
         else if ($extended && art.elements) {
           warning( 'ref-deprecated-in-extend', [ head.location, user ], { id: head.id },
-                   // eslint-disable-next-line @stylistic/js/max-len
+                   // eslint-disable-next-line @stylistic/max-len
                    'In an added column, do not use the table alias $(ID) to refer to source elements' );
         }
       }
@@ -1489,7 +1489,7 @@ function fns( model ) {
         // of invisible table aliases; at least one stakeholder uses this,
         // so it can't be an error (yet).
         message( 'ref-deprecated-self-element', [ ref.path[0].location, user._user ], {},
-                 // eslint-disable-next-line @stylistic/js/max-len
+                 // eslint-disable-next-line @stylistic/max-len
                  'Referring to the query\'s own elements here might lead to invalid SQL references; use source elements only' );
         return false;
       default:
@@ -1898,7 +1898,7 @@ function fns( model ) {
     else if (target._artifact && target._artifact !== user._main && user._main.kind === 'entity') {
       const last = path[path.length - 1];
       warning( 'ref-invalid-backlink', [ last.location, user ], { art: target, id: '$self' },
-               // eslint-disable-next-line @stylistic/js/max-len
+               // eslint-disable-next-line @stylistic/max-len
                'The target $(ART) of the association is not the current entity represented by $(ID)' );
     }
   }
@@ -1988,11 +1988,11 @@ function fns( model ) {
       std: 'Can follow association $(ART) only to its foreign key references, not to $(NAME)',
       keys: 'Can follow managed association $(ART) only to the keys of its target, not to $(NAME)',
       complete: 'The reference must cover a full foreign key reference of association $(ART)',
-      // eslint-disable-next-line @stylistic/js/max-len
+      // eslint-disable-next-line @stylistic/max-len
       'self-std': 'In column ref starting with $(ALIAS), we can follow association $(ART) only to its foreign key references, not to $(NAME)',
-      // eslint-disable-next-line @stylistic/js/max-len
+      // eslint-disable-next-line @stylistic/max-len
       'self-keys': 'In column ref starting with $(ALIAS), we can follow managed association $(ART) only to the keys of its target, not to $(NAME)',
-      // eslint-disable-next-line @stylistic/js/max-len
+      // eslint-disable-next-line @stylistic/max-len
       'self-complete': 'The column reference starting with $(ALIAS) must cover a full foreign key reference of association $(ART)',
     } );
     // TODO later: mention allowed ones

package/lib/compiler/tweak-assocs.js

@@ -129,7 +129,7 @@ function tweakAssocs( model ) {
       // ID published! Used in stakeholder project; if renamed, add to oldMessageIds
       info( 'assoc-outside-service', loc, { '#': text, target, service: main._service }, {
         std: 'Association target $(TARGET) is outside any service',
-        // eslint-disable-next-line @stylistic/js/max-len
+        // eslint-disable-next-line @stylistic/max-len
         exposed: 'If association is published in service $(SERVICE), its target $(TARGET) is outside any service',
       } );
     }
@@ -146,7 +146,7 @@ function tweakAssocs( model ) {
       if (assoc && assoc.foreignKeys) {
         error( 'rewrite-key-for-unmanaged', [ elem.on.location, elem ],
                { keyword: 'on', art: assocWithExplicitSpec( assoc ) },
-               // eslint-disable-next-line @stylistic/js/max-len
+               // eslint-disable-next-line @stylistic/max-len
                'Do not specify an $(KEYWORD) condition when redirecting the managed association $(ART)' );
       }
       checkIgnoredFilter( elem );
@@ -349,42 +349,46 @@ function tweakAssocs( model ) {
       setLink( fk, '_effectiveType', fk );
       fk.targetElement = copyExpr( orig.targetElement, location );
       if (elem._redirected)
-        rewriteKey( elem, fk.targetElement );
+        rewriteKey( elem, fk );
     } );
     if (elem.foreignKeys) // Possibly no fk was set
       elem.foreignKeys[$inferred] = 'rewrite';
   }
 
-  function rewriteKey( elem, targetElement ) {
+  function rewriteKey( elem, fk ) {
+    const { targetElement } = fk;
     let projectedKey = null;
     // rewrite along redirection chain
     for (const alias of elem._redirected) {
-      if (alias.kind !== '$tableAlias')
-        continue;
-
-      projectedKey = firstProjectionForPath( targetElement.path, 0, alias, null );
-      if (projectedKey.elem) {
-        const item = targetElement.path[projectedKey.index];
-        item.id = projectedKey.elem.name.id;
-        if (projectedKey.index > 0)
-          targetElement.path.splice(0, projectedKey.index);
-      }
-      else {
-        setArtifactLink( targetElement.path[0], null );
-        setArtifactLink( targetElement, null );
+      if (alias.kind === '$tableAlias') {
+        projectedKey = firstProjectionForPath( targetElement.path, 0, alias, null );
+        if (projectedKey.elem) {
+          const item = targetElement.path[projectedKey.index];
+          item.id = projectedKey.elem.name.id;
+          if (projectedKey.index > 0)
+            targetElement.path.splice(0, projectedKey.index);
+        }
+        else {
+          setArtifactLink( targetElement.path[0], null );
+          setArtifactLink( targetElement, null );
 
-        const culprit = !elem.target.$inferred && elem.target ||
+          const culprit = !elem.target.$inferred && elem.target ||
           elem.value?.path?.[elem.value.path.length - 1] ||
           elem;
-        // TODO: probably better to collect the non-projected foreign keys
-        // and have one message for all
-        error('rewrite-undefined-key', [ weakLocation( culprit.location ), elem ], {
-          '#': 'std',
-          id: targetElement.path.map(p => p.id).join('.'),
-          target: alias._main,
-          name: elem.name.id,
-        });
-        return null;
+          // TODO: probably better to collect the non-projected foreign keys
+          // and have one message for all
+          error('rewrite-undefined-key', [ weakLocation( culprit.location ), elem ], {
+            '#': 'std',
+            id: targetElement.path.map(p => p.id).join('.'),
+            target: alias._main,
+            name: elem.name.id,
+          });
+          return null;
+        }
+      }
+      else {
+        // e.g. redirection target is entity that includes original target
+        projectedKey = { elem: findTargetElement( alias, targetElement ) };
       }
     }
 
@@ -397,6 +401,24 @@ function tweakAssocs( model ) {
     return null;
   }
 
+  /**
+   * Find the target element in the given redirection target.
+   * Used to find the target element in entities that include the original
+   * target entity.
+   *
+   * @param redirected
+   * @param targetElement
+   * @returns {*|null}
+   */
+  function findTargetElement( redirected, targetElement ) {
+    for (const step of targetElement.path) {
+      redirected = redirected.elements?.[step.id];
+      if (!redirected)
+        return null;
+    }
+    return redirected;
+  }
+
   // TODO: there is no need to rewrite the on condition of non-leading queries,
   // i.e. we could just have on = {…}
   // TODO: re-check $self rewrite (with managed composition of aspects),
@@ -714,7 +736,7 @@ function tweakAssocs( model ) {
         if (assoc.$errorReported !== 'assoc-unexpected-scope') {
           error( 'assoc-unexpected-scope', [ assoc.value.location, assoc ],
                  { id: assoc.value._artifact.name.id },
-                 // eslint-disable-next-line @stylistic/js/max-len
+                 // eslint-disable-next-line @stylistic/max-len
                  'Association $(ID) can\'t be projected because its ON-condition refers to a parameter' );
           assoc.$errorReported = 'assoc-unexpected-scope';
         }
@@ -747,11 +769,11 @@ function tweakAssocs( model ) {
       if (!(elem === item._artifact ||          // redirection for explicit def
             elem._origin === item._artifact)) {
         const art = assoc._origin;
-        // eslint-disable-next-line @stylistic/js/max-len
+        // eslint-disable-next-line @stylistic/max-len
         warning( 'rewrite-shadowed', [ elem.name.location, elem ], { art: art && effectiveType( art ) }, {
-          // eslint-disable-next-line @stylistic/js/max-len
+          // eslint-disable-next-line @stylistic/max-len
           std: 'This element is not originally referred to in the ON-condition of association $(ART)',
-          // eslint-disable-next-line @stylistic/js/max-len
+          // eslint-disable-next-line @stylistic/max-len
           element: 'This element is not originally referred to in the ON-condition of association $(MEMBER) of $(ART)',
         } );
       }

package/lib/compiler/utils.js

@@ -150,7 +150,7 @@ function setMemberParent( elem, name, parent, prop ) {
       p[prop] = Object.create( null );
     dictAdd( p[prop], name, elem );
   }
-  if (parent._outer && parent._outer.items) // TODO: remove for items, too
+  if (parent._outer?.items) // TODO: remove for items, too
     parent = parent._outer;
   setLink( elem, '_parent', parent );
   setLink( elem, '_main', parent._main || parent );
@@ -484,11 +484,13 @@ function traverseQueryPost( query, simpleOnly, callback ) {
   // else: with parse error (`select from <EOF>`, `select distinct from;`)
 }
 
-// Call callback on all queries in dependency order, i.e. starting with query Q
-// 1. sub queries in FROM sources of Q
-// 2. Q itself, except if non-referred query, but with right UNION parts
-// 3. sub queries in ON in FROM of Q
-// 4. sub queries in columns, WHERE, HAVING
+/**
+ * Call callback on all queries in dependency order, i.e. starting with query Q
+ * 1. sub queries in FROM sources of Q
+ * 2. Q itself, ALSO if non-referred query
+ * 3. sub queries in ON in FROM of Q
+ * 4. sub queries in columns, WHERE, HAVING
+ */
 function traverseQueryExtra( main, callback ) {
   if (!main.$queries)
     return;
@@ -501,16 +503,7 @@ function traverseQueryExtra( main, callback ) {
     if (query._status === 'extra' || query._parent.kind === '$tableAlias')
       continue; // if parent is alias, query is FROM source -> run by traverseQueryPost
     // we are now in the top-level (parent is entity) or a non-referred query (parent is query)
-    setLink( query, '_status', 'extra' ); // do not call callback() in non-referred query
-    // console.log( 'A:', query.name,query._status)
-    traverseQueryPost( query, null, (q) => {
-      if (q._status !== 'extra') {
-        // console.log( 'T:', q.name)
-        setLink( q, '_status', 'extra' );
-        callback( q );
-      }
-      // else console.log( 'E:', q.name)
-    } );
+    traverseQueryPost( query, null, callback );
   }
 }
 

package/lib/compiler/xpr-rewrite.js

@@ -266,7 +266,7 @@ function xprRewriteFns( model ) {
       config.tokenExpr = expr;
       return traverseExpr.STOP === traverseExpr(
         expr, 'annoRewrite', config.target,
-        // eslint-disable-next-line @stylistic/js/max-len, @stylistic/js/function-paren-newline
+        // eslint-disable-next-line @stylistic/max-len, @stylistic/function-paren-newline
         (e, refCtx) => (rewriteAnnoExpr( e, config, refCtx ) ? traverseExpr.STOP : traverseExpr.SKIP) );
     }
     return false;
@@ -323,7 +323,7 @@ function xprRewriteFns( model ) {
           const filterConfig = { ...config, target: assocTarget, isInFilter: true };
           if (traverseExpr.STOP === traverseExpr(
             step.where, 'filter', step,
-            // eslint-disable-next-line @stylistic/js/max-len
+            // eslint-disable-next-line @stylistic/max-len
             (e, ctx) => expr.path && (rewriteGenericAnnoPath( e, filterConfig, ctx ) ? traverseExpr.STOP : traverseExpr.SKIP)
           ))
             return true;