@sap/cds-compiler 3.6.2 → 3.8.0

package/lib/compiler/propagator.js

@@ -14,7 +14,12 @@ const {
   forEachGeneric,
   isDeprecatedEnabled,
 } = require( '../base/model');
-const { setLink, linkToOrigin, withAssociation } = require('./utils');
+const {
+  setLink,
+  linkToOrigin,
+  withAssociation,
+  viewFromPrimary,
+} = require('./utils');
 const $inferred = Symbol.for('cds.$inferred');
 // const { refString } = require( '../base/messages')
 
@@ -81,7 +86,7 @@ function propagate( model ) {
   function run( art ) {
     if (!art)
       return;
-    if (!checkAndSetStatus( art )) {
+    if (!checkAndSetStatus( art ) || art.kind === 'select') {
       runMembers( art );
       return;
     }
@@ -94,6 +99,13 @@ function propagate( model ) {
       for (const target of targets) {
         const origin = getOrigin( target );
         if (origin) {
+          // Calculated elements that are simple references: `calc = field;`.
+          // Respect sibling properties in inheritance.
+          if (target._calcOrigin?._origin && target.value?._artifact) {
+            chain.push({ target, source: target.value._artifact });
+            if (checkAndSetStatus( target.value._artifact ))
+              news.push(target.value._artifact);
+          }
           chain.push( { target, source: origin } );
           if (checkAndSetStatus( origin ))
             news.push( origin );
@@ -173,13 +185,13 @@ function propagate( model ) {
     }
     else {
       target[prop] = Object.assign( {}, val, { $inferred: 'prop' } );
-      if ('_artifact' in val)
+      if (val._artifact !== undefined)
         setLink( target[prop], '_artifact', val._artifact );
-      if ('_outer' in val)
+      if (val._outer !== undefined)
         setLink( target[prop], '_outer', val._outer );
-      if ('_parent' in val)
+      if (val._parent !== undefined)
         setLink( target[prop], '_parent', val._parent );
-      if ('_main' in val)
+      if (val._main !== undefined)
         setLink( target[prop], '_main', val._main );
     }
   }
@@ -254,7 +266,8 @@ function propagate( model ) {
   }
 
   function onlyViaArtifact( prop, target, source ) {
-    const from = target._from && target._from[0].path;
+    const from = viewFromPrimary( target )?.path;
+    // do not propagate from member / if follow assoc in from:
     if (!(from ? from[from.length - 1]._artifact : source)._main)
       annotation( prop, target, source );
   }
@@ -280,7 +293,7 @@ function propagate( model ) {
     if (!viaType)
       always( prop, target, source );
     else if (!oldVirtualNotNullPropagation) // NULL would block strange propagation to sub element
-      target[prop] = { $inferred: 'NULL', val: undefined }; // set null value in Univeral CSN
+      target[prop] = { $inferred: 'NULL', val: undefined }; // set null value in Universal CSN
   }
 
   function checkVirtual( view ) {
@@ -331,18 +344,14 @@ function targetMinZero( art ) {
 }
 
 function getOrigin( art ) {
-  if (art._origin)
+  let origin = art._origin;
+  while (origin?.kind === 'select')
+    origin = origin._origin;
+  if (origin)
     // Do not consider _origin if due to expand of table alias ref
-    return (!art.expand || art._origin.kind === 'element') && art._origin;
+    return (!art.expand || origin.kind === 'element') && origin;
   // Remark: a column with an 'inline' is never an element -> no need to check
   // art.inline
-  if (art._from && art._from.length) { // query
-    const tabref = art._from[0]._artifact;
-    return (tabref && tabref.kind === 'element')
-      ? tabref._effectiveType && tabref._effectiveType.target &&
-        tabref._effectiveType.target._artifact
-      : tabref;
-  }
 
   return (art.type && (!art.type.$inferred || art.type.$inferred === 'cast'))
     ? art.type._artifact
@@ -357,7 +366,7 @@ function checkAndSetStatus( art ) {
 }
 
 function setEffectiveType( target, source ) {
-  if ('_effectiveType' in source)
+  if (source._effectiveType !== undefined)
     setLink( target, '_effectiveType', source._effectiveType);
 }