@sap/cds-compiler 5.4.2 → 5.4.4

package/CHANGELOG.md

@@ -7,6 +7,13 @@
 Note: `beta` fixes, changes and features are usually not listed in this ChangeLog but [here](doc/CHANGELOG_BETA.md).
 The compiler behavior concerning `beta` features can change at any time without notice.
 
+## Version 5.4.4 - 2024-11-14
+
+### Fixed
+
+- Re-allow referring to mixins (and table aliases) in added columns
+- Re-add foreign keys of named aspects to the OData CSN.
+
 ## Version 5.4.2 - 2024-11-06
 
 ### Fixed

package/lib/base/message-registry.js

@@ -1038,6 +1038,12 @@ const centralMessageTexts = {
     none: 'Ambiguous $(ID) requires an explicit table alias, but there are none: add table aliases to all sub-queries to disambiguate $(ID)',
   },
 
+  'ref-special-in-extend': {
+    std: 'In an added column, $(ID) refers to the element of the projection source $(ART), not the table alias or mixin',
+    alias: 'In an added column, $(ID) refers to the element of the projection source $(ART), not the table alias',
+    mixin: 'In an added column, $(ID) refers to the element of the projection source $(ART), not the mixin',
+  },
+
   'type-managed-composition': {
     std: 'Managed compositions can\'t be used in types', // yet
     sub: 'Managed compositions can\'t be used in sub elements',

package/lib/compiler/shared.js

@@ -174,7 +174,7 @@ function fns( model ) {
     having: 'where',
     groupBy: 'where',
     column: {
-      lexical: tableAliasesIfNotExtendAndSelf,
+      lexical: tableAliasesAndSelf,
       dollar: true,
       dynamic: combinedSourcesOrParentElements,
       notFound: undefinedSourceElement,
@@ -721,16 +721,41 @@ function fns( model ) {
         return setArtifactLink( head, def ); // we do not want to see the using
       }
       case 'mixin': {
+        // use a source element having that name if in `extend … with columns`:
+        const elem = (user._user || user).$extended &&
+          art._parent._combined[head.id];
+        if (elem) {
+          path.$prefix = elem._parent.name.id; // prepend alias name
+          info( 'ref-special-in-extend', [ head.location, user ],
+                { '#': 'mixin', id: head.id, art: elem._origin._main } );
+          setLink( head, '_navigation', elem );
+          return setArtifactLink( head, elem._origin );
+        }
         return setLink( head, '_navigation', art );
       }
       case '$navElement': {
-        if (head.id === (user._user || user).$extended)
-          path.$prefix = head.id;
         setLink( head, '_navigation', art );
         return setArtifactLink( head, art._origin );
       }
-      case '$self':             // TODO: remove $projection from CC
       case '$tableAlias': {
+        // use a source element having that name if in `extend … with columns`:
+        const { $extended } = user._user || user;
+        const elem = $extended && art.elements[head.id];
+        if (elem) {
+          path.$prefix = art.name.id; // prepend alias name
+          info( 'ref-special-in-extend', [ head.location, user ],
+                { '#': 'alias', id: head.id, art: elem._origin._main } );
+          setLink( head, '_navigation', elem );
+          return setArtifactLink( head, elem._origin );
+        }
+        else if ($extended) {
+          warning( 'ref-deprecated-in-extend', [ head.location, user ], { id: head.id },
+                   // eslint-disable-next-line @stylistic/js/max-len
+                   'In an added column, do not use the table alias $(ID) to refer to source elements' );
+        }
+      }
+      /* FALLTHROUGH */
+      case '$self': {           // TODO: remove $projection from CC
         setLink( head, '_navigation', art );
         setArtifactLink( head, art._origin ); // query source or leading query in FROM
         if (!art._origin)
@@ -842,15 +867,6 @@ function fns( model ) {
   function tableAliasesAndSelf( user ) {
     return userQuery( user ) || user._main || user;
   }
-  function tableAliasesIfNotExtendAndSelf( user ) {
-    if (!user.$extended)
-      return tableAliasesAndSelf( user );
-    if (typeof user.$extended !== 'string') {
-      const aliases = userQuery( user ).$tableAliases;
-      user.$extended = Object.keys( aliases )[0];
-    }
-    return justDollarAliases( user );
-  }
 
   // Functions called via semantics.dynamic: ------------------------------------
 

package/lib/json/to-csn.js

@@ -1202,7 +1202,9 @@ function exprInternal( node, xprParens ) {
   }
   if (node.path) {
     const ref = node.path.map( pathItem );
-    if (node.path.$prefix)      // auto-corrected ORDER BY refs without table alias
+    // auto-corrected ORDER BY refs without table alias, or EXTEND … WITH COLUMN
+    // refs to source element shadowed by alias name:
+    if (node.path.$prefix)
       ref.unshift( node.path.$prefix );
     // we would need to consider node.global here if we introduce that
     return extra( { ref }, node );

package/lib/transform/odata/createForeignKeys.js

@@ -10,7 +10,7 @@ function createForeignKeyElements(csn, options, messageFunctions, csnUtils, iter
     const { error } = messageFunctions;
 
     applyTransformations(csn, { elements: createForeignKeysInCsn, params: createForeignKeysInCsn},
-                         [], Object.assign(iterateOptions, { skip: ['aspect', 'event'], skipStandard: { targetAspect: true } }));
+                         [], Object.assign(iterateOptions, { skip: ['event'], skipStandard: { targetAspect: true } }));
 
     /**
      * Process a given elements or params dictionary and create foreign key elements.

package/lib/transform/odata/flattening.js

@@ -142,7 +142,7 @@ function allInOneFlattening(csn, refFlattener, adaptRefs, inspectRef, getFinalTy
     }
     // loop through types as well in order to collect the managaed associations
     // that reside in types definitions
-    if ((def.kind === 'action' || def.kind === 'function' || def.kind === 'type') && !isExternalServiceMember(def, defName)) {
+    if ((def.kind === 'action' || def.kind === 'function' || def.kind === 'type' || def.kind === 'aspect') && !isExternalServiceMember(def, defName)) {
       if (def.kind === 'type' && csnUtils.isManagedAssociation(def))
         allMgdAssocDefs.push(def);
       else

package/package.json

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