@sap/cds-compiler 6.9.0 → 6.9.1

package/CHANGELOG.md

@@ -13,6 +13,19 @@ we might not list every change in its behavior here.
 Productive code should never require a `beta` flag to be set, and
 might use a deprecated flag only for a limited period of time.
 
+## Version 6.9.1 - 2026-05-05
+
+### Bug Fixes
+
+- **compiler:**
+  + make an element added via `extend` correctly shadow an element from an include
+  + do not issue a warning for a correct use of `$projection`
+- **odata:**
+  + do not generate wrong ReferentialConstraints for unmanaged Composition without a partner
+  + render Partner attribute on forward association correctly
+
+
+
 ## Version 6.9.0 - 2026-04-21
 
 ### Features

package/lib/base/message-registry.js

@@ -1138,7 +1138,6 @@ const centralMessageTexts = {
     'old-not-target': 'Expected element $(NAME) not to be an association, because it overrides the included element from $(ART)',
   },
 
-  'ref-expecting-$self': 'Use $(NEWCODE) instead of $(CODE) here or remove $(CODE) altogether if possible; the compiler has rewritten it to $(NEWCODE) in CSN',
   'ref-expecting-assoc': {
     std: 'Expecting path $(ELEMREF) following “EXISTS” predicate to end with association/composition',
     'with-type': 'Expecting path $(ELEMREF) following “EXISTS” predicate to end with association/composition, found $(TYPE)',

package/lib/compiler/extend.js

@@ -1173,7 +1173,8 @@ function extend( model ) {
     }
     if (art._extensions?.$add)
       extendArtifact( art._extensions.$add, art );
-    // TODO: for proper shadowing: first collect defined element & action names
+    checkRedefinitionThroughIncludes( art, 'elements' );
+    checkRedefinitionThroughIncludes( art, 'actions' );
   }
 
   /**
@@ -1497,6 +1498,9 @@ function extend( model ) {
       }
 
       const existing = parent[prop]?.[name];
+      const shadowsIncludeMember = construct !== parent &&
+        elem.$inferred !== 'include' &&
+        existing?.$inferred === 'include';
       const add = construct !== parent && (!existing || elem.$inferred !== 'include');
       if (!add && existing?.$inferred === 'include' && elem.$inferred === 'include') {
         includeCollisions.push( {
@@ -1507,9 +1511,17 @@ function extend( model ) {
       const { $duplicates } = elem;
       if ($duplicates === true && add)
         elem.$duplicates = null;
-      setMemberParent( elem, name, parent, add && prop );
-      if (!$duplicates)         // not already reported
-        checkRedefinition( elem );
+      if (add && elem.$inferred === 'include' && Array.isArray( $duplicates ))
+        elem.$duplicates = null;
+      if (shadowsIncludeMember) {
+        parent[prop][name] = elem;
+        setMemberParent( elem, name, parent );
+      }
+      else {
+        setMemberParent( elem, name, parent, add && prop );
+        if (!$duplicates)       // not already reported
+          checkRedefinition( elem );
+      }
       initMembers( elem, elem, elem._block );
       if (elem.kind === 'action' || elem.kind === 'function')
         initBoundSelfParam( elem.params, elem._main );
@@ -1740,9 +1752,6 @@ function extend( model ) {
         } );
       }
     }
-
-    checkRedefinitionThroughIncludes( parent, prop );
-
     if (!hasNewElement && members) {
       ext[prop] = members;
     }
@@ -1788,7 +1797,8 @@ function extend( model ) {
 
   /**
    * Report duplicates in parent[prop] that happen due to multiple includes having the
-   * same member.  Covers `entity G : E, G {};` but not `entity G : E {};  extend G with F;`.
+   * same member.  Run after includes and extends so shadowing members have already
+   * replaced any include-derived survivors in-place.
    */
   function checkRedefinitionThroughIncludes( parent, prop ) {
     if (!parent[prop])

package/lib/compiler/shared.js

@@ -984,8 +984,6 @@ function fns( model ) {
           art.kind === '$self' && path[0].id === '$projection') {
         // Rewrite $projection to $self
         path[0].id = '$self';
-        warning( 'ref-expecting-$self', [ path[0].location, user ],
-                 { code: '$projection', newcode: '$self' });
       }
       return art.name?.$inferred !== '$internal'; // not a compiler-generated internal alias
     }

package/lib/edm/csn2edm.js

@@ -472,8 +472,10 @@ function csn2edmAll( _csn, _options, serviceNames, messageFunctions ) {
 
       navigationProperties.forEach((np) => {
         if (options.isV4()) {
-        // V4: No referential constraints for Containment Relationships
-          if ((!np.isContainment() || (options.renderForeignKeys)) && !np.isToMany())
+        // V4: No referential constraints for Containment Relationships or
+        // unmanaged Compositions without a partner
+          const isUnmanagedCompositionWithoutPartner = np._csn.type === 'cds.Composition' && np._csn.on && !np._csn._constraints._partnerCsn;
+          if ((!np.isContainment() || (options.renderForeignKeys)) && !np.isToMany() && !isUnmanagedCompositionWithoutPartner)
             np.addReferentialConstraintNodes();
         }
         else {

package/lib/edm/edm.js

@@ -1053,11 +1053,14 @@ function getEdm( options ) {
           delete this._edmAttributes.Nullable;
         }
         // we have exactly one selfReference or the default partner
-
-        if ( !csn.$noPartner) {
+        // $noPartner can be set when a second projection creates an ambiguous backlink, but if exactly
+        // one self-reference targets the same entity as this association, that unambiguous partner still applies.
+        const selfRefsToTarget = csn._selfReferences.filter(ref => ref.$abspath[0] === csn._target?.name);
+        const isPartner = selfRefsToTarget.length === 1 && selfRefsToTarget[0]._constraints?._partnerCsn === csn;
+        if (!csn.$noPartner || isPartner) {
           const partner = csn._selfReferences.length === 1
             ? csn._selfReferences[0]
-            : csn._constraints._partnerCsn;
+            : selfRefsToTarget[0] || csn._constraints._partnerCsn;
           if (partner && partner['@odata.navigable'] !== false && this._csn._edmParentCsn.kind !== 'type') {
             // $abspath[0] is main entity
             this._edmAttributes.Partner = partner.$abspath.slice(1).join('/');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "6.9.0",
+  "version": "6.9.1",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",