@sap/cds-compiler 6.3.6 → 6.4.6

package/lib/compiler/tweak-assocs.js

@@ -5,6 +5,7 @@
 const {
   forEachGeneric,
   forEachInOrder,
+  isBetaEnabled,
 } = require('../base/model');
 const { dictLocation, weakLocation, weakRefLocation } = require('../base/location');
 
@@ -90,7 +91,7 @@ function tweakAssocs( model ) {
 
     if (art.query) {
       traverseQueryPost(art.query, false, (query) => {
-        forEachGeneric( query, 'elements', rewriteAssociationCheck );
+        forEachGeneric( query, 'elements', handleQueryElements );
       });
     }
   }
@@ -116,10 +117,10 @@ function tweakAssocs( model ) {
       return;
     const loc = [ elem.target.location, elem ];
     const main = elem._main || elem;
-    if (!elem.$inferred && !main.$inferred) {
+    if (!elem.$inferred && !main.$inferred && !model.options.$recompile) {
       info( 'assoc-target-not-in-service', loc,
             { target, '#': (elem._main.query ? 'select' : 'define') }, {
-              std: 'Target $(TARGET) of association is outside any service', // not used
+              std: 'Association target $(TARGET) is outside any service', // not used
               define: 'Target $(TARGET) of explicitly defined association is outside any service',
               select: 'Target $(TARGET) of explicitly selected association is outside any service',
             } );
@@ -135,6 +136,26 @@ function tweakAssocs( model ) {
     }
   }
 
+  function handleQueryElements( column ) {
+    rewriteAssociationCheck( column );
+    if (!isBetaEnabled( model.options, '$calcForDraft' ))
+      return;
+    const { value } = column;  // `value` = column expression
+    if (!value || !value.args && !value.suffix)
+      return;
+    // TODO: what about non-simple refs (assocs, even with filter/args)?
+
+    // with “real” expressions, set $calc according to these
+    // (with references, $calc might be inherited from the source element)
+    column.$calc = copyExpr( column.value, null ); // copy while keeping location
+
+    if (traverseExpr.STOP ===
+        traverseExpr( column.$calc, 'rewrite-on', column,
+                      ref => rewriteColumnPath( ref, column ) ))
+      column.$calc = true;
+  }
+
+  // Check explicit ON / keys with REDIRECTED TO
   function rewriteAssociationCheck( element ) {
     const elem = element.items || element; // TODO v6: nested items
     if (elem.elements)
@@ -436,7 +457,7 @@ function tweakAssocs( model ) {
       return;
 
     if (elem._parent?.kind === 'element') {
-      // managed association as sub element not supported yet
+      // unmanaged association as sub element not supported yet
       // TODO: Only report once for multi-include chains, see
       //       Associations/SubElements/UnmanagedInSubElement.err.cds
       error( 'type-unsupported-rewrite', [ elem.location, elem ], { '#': 'sub-element' } );
@@ -732,6 +753,7 @@ function tweakAssocs( model ) {
       rewritePathForEnv( expr, navEnv, assoc );
     }
     else if (assoc._main.query) { // from ON cond of mixin element in query
+      // here also $calc
       const root = expr.path[0]._navigation || expr.path[0]._artifact;
       if (expr.scope === 'param' || root?.kind === '$parameters') {
         if (assoc.$errorReported !== 'assoc-unexpected-scope') {
@@ -743,7 +765,8 @@ function tweakAssocs( model ) {
         }
         return;
       }
-      if (expr.path[0]._navigation) { // rewrite src elem, mixin, $self[.elem]
+
+      if (expr.path[0]._navigation) { // rewrite: src elem, mixin, $self[.elem]
         const nav = pathNavigation( expr );
         const elem = (assoc._origin === root) ? assoc : navProjection( nav.navigation, assoc );
         // TODO: Use rewritePathForEnv(); make it handle mixins
@@ -823,8 +846,11 @@ function tweakAssocs( model ) {
 
     for (let i = startIndex; i < ref.path.length; ++i) {
       if (i > startIndex && art.target) {
-        // if the current artifact is an association, we need to respect the redirection
-        // chain from original target to new one.
+        // TODO: Can we combine this with the code from xpr-rewrite.js
+        // If the current artifact is an association, we need to respect the redirection
+        // chain from original target to new one.  We need to use '_originalArtifact' due
+        // to secondary associations and their redirection chains. See comment in
+        // test3/Redirections/SecondaryAssocs/RedirectedPathRewriteOne.cds
         // FIXME: Won't work with associations in projected structures.
         const origTarget = ref.path[i - 1]?._originalArtifact?.target?._artifact;
         const chain = cachedRedirectionChain( art, origTarget );
@@ -914,6 +940,33 @@ function tweakAssocs( model ) {
     }
   }
 
+  /**
+   * Rewrite the reference `ref` with first elem/mixin ref item `item` for user
+   * `assoc` (the query element), `elem` is the first (or preferred) query element
+   * for item.
+   */
+  function rewriteColumnPath( ref, column ) {
+    if (!ref._artifact)
+      return null;
+    const root = ref.path?.[0];
+    const nav = pathNavigation( ref );
+    if (nav.navigation) {       // TabAlias.elem, elem, mixin
+      const elem = navProjection( nav.navigation, null );
+      // TODO?: Use rewritePathForEnv(); make it handle mixins?
+      if (rewritePath( ref, nav.item, column, elem, null ))
+        return traverseExpr.STOP;
+    }
+    else if (ref.scope === 'param' || root?.kind === '$parameters') {
+      return traverseExpr.STOP;
+    }
+    return null;
+  }
+
+  /**
+   * Rewrite the reference `ref` with first elem/mixin ref item `item` for user
+   * `assoc` (the query element), `elem` is the first (or preferred) query element
+   * for item.
+   */
   function rewritePath( ref, item, assoc, elem, location ) {
     const { path } = ref;
     const root = path[0];
@@ -928,9 +981,9 @@ function tweakAssocs( model ) {
       delete root._navigation;
       setArtifactLink( root, elem );
       setArtifactLink( ref, elem );
-      return;
+      return true;              // ERROR
     }
-    if (item !== root) {
+    if (item !== root) {        // TableAlias.item, $self.item
       // e.g. mixin ON-condition: Base.foo -> $self.foo or multi-path projection,
       // $projection -> $self
       root.id = '$self';
@@ -948,7 +1001,7 @@ function tweakAssocs( model ) {
       setLink( root, '_navigation', elem );
     }
     if (!elem.name)      // nothing to do for own $projection, $projection.elem
-      return;            // (except having it renamed to $self)
+      return false;      // (except having it renamed to $self)
     item.id = elem.name.id;
     let state = null;
     for (const i of path) {
@@ -964,6 +1017,7 @@ function tweakAssocs( model ) {
     }
     if (state !== true)
       setArtifactLink( ref, state );
+    return false;
   }
 
   function prependSelfToPath( path, elem ) {
@@ -1049,24 +1103,6 @@ function tweakAssocs( model ) {
   }
 }
 
-function navProjection( navigation, preferred ) {
-  // TODO: Info if more than one possibility?
-  if (!navigation)
-    return {};
-
-  if (!navigation._projections && !navigation._complexProjections)
-    return null;
-
-  // _complexProjections contains projections that are not "simple",
-  // i.e. contain a filter or arguments. Only used if it contains our
-  // preferred association.
-  if (preferred && ( navigation._complexProjections?.includes( preferred ) ||
-    navigation._projections?.includes( preferred )))
-    return preferred;
-
-  return navigation._projections?.[0] || null;
-}
-
 function findRewriteTarget( expr, index, env, user ) {
   if (env.kind === '$navElement' || env.kind === '$tableAlias') {
     const r = firstProjectionForPath( expr.path, index, env, user );
@@ -1216,7 +1252,7 @@ function followNavigationPath( path, nav ) {
  * - $projection.elem      -> also $self.item -> { item: path[1], tableAlias: $self }
  * - $self                 -> { item: undefined, tableAlias: $self }
  * - $parameters.P, :P     -> {}
- * - $now, current_date    -> {}
+ * - $now                  -> {}
  * - undef, redef          -> {}
  * With 'navigation': store that navigation._artifact is projected
  * With 'navigation': rewrite its ON condition
@@ -1245,4 +1281,26 @@ function pathNavigation( ref ) {
   return { navigation: root.elements[item.id], item, tableAlias: root };
 }
 
+/**
+ * Return the first (or preferred) query elements which projections the navigation
+ * element `navigation` (i.e. source element belonging to a specific table alias).
+ */
+function navProjection( navigation, preferred ) {
+  // TODO: Info if more than one possibility?
+  if (!navigation)
+    return {};
+
+  if (!navigation._projections && !navigation._complexProjections)
+    return null;
+
+  // _complexProjections contains projections that are not "simple",
+  // i.e. contain a filter or arguments. Only used if it contains our
+  // preferred association.
+  if (preferred && ( navigation._complexProjections?.includes( preferred ) ||
+    navigation._projections?.includes( preferred )))
+    return preferred;
+
+  return navigation._projections?.[0] || null;
+}
+
 module.exports = tweakAssocs;