@sap/cds-compiler 3.9.4 → 4.0.2

package/lib/transform/universalCsn/universalCsnEnricher.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { setProp, isBetaEnabled } = require('../../base/model');
+const { setProp } = require('../../base/model');
 const shuffleGen = require('../../base/shuffle');
 const { setAnnotationIfNotDefined, makeClientCompatible } = require('./utils');
 const {
@@ -23,7 +23,6 @@ const { setCoreComputedOnViewsAndCalculatedElements } = require('./coreComputed'
  * @param {CSN.Options} options
  */
 module.exports = (csn, options) => {
-  const propagateToReturns = isBetaEnabled( options, 'v4preview' );
   const csnUtils = getUtils(csn, 'init-all');
   const {
     initDefinition, getOrigin, getQueryPrimarySource, artifactRef, getColumn,
@@ -116,7 +115,7 @@ module.exports = (csn, options) => {
   // The $origin properties need to be removed separately
   // as the values are used in csnRef::getOrigin that is used during
   // the propagation above.
-  // Currently testMode-only for comparison against client CSN.
+  // Currently, testMode-only for comparison against client CSN.
   if (options.testMode)
     makeClientCompatible(csn);
 
@@ -174,10 +173,7 @@ module.exports = (csn, options) => {
 
         setTargetAspectIfRequired(parent);
       },
-      type: ( parent, prop, type, path, grandParent, parentProp ) => {
-        // annos are not propagated to `returns` (<=v3) and `items`
-        if (parentProp === 'returns' && !propagateToReturns)
-          return;
+      type: ( parent, prop, type ) => {
         const annotationsForBuiltinType = extensions[type];
         Object.assign( parent, annotationsForBuiltinType );
       },
@@ -288,13 +284,17 @@ module.exports = (csn, options) => {
       },
       params: (parent, prop, params) => {
         forEachValue(params, (param) => {
+          const propagateToParams = typeof param.type === 'string' ? csn.definitions[param.type]?.kind !== 'entity' : true;
           propagateMemberPropsFromOrigin(param, {
-            items: true, elements: true, enum: true, virtual: true,
+            '@': !propagateToParams, items: true, elements: true, enum: true, virtual: true,
           });
         });
       },
       returns: (parent, prop, returns) => {
-        propagateMemberPropsFromOrigin(returns, { items: true, '@': !propagateToReturns, elements: true });
+        // Only propagate to `returns` (return parameter) if return type is not an entity.
+        // If returns.type is an array, it is an element ref. If it's not found, it's likely builtin.
+        const propagateToParams = typeof returns.type === 'string' ? csn.definitions[returns.type]?.kind !== 'entity' : true;
+        propagateMemberPropsFromOrigin(returns, { '@': !propagateToParams, items: true, elements: true });
         if (returns.target)
           calculateForeignKeys(returns);
       },
@@ -368,7 +368,7 @@ module.exports = (csn, options) => {
        * @todo check if still necessary
        */
       function skipMemberPropagation( origin ) {
-      // For empty members (`{}`), the origin was set in a previous call to `getOrigin(definition)`.
+        // For empty members (`{}`), the origin was set in a previous call to `getOrigin(definition)`.
         return !origin;
       }
     }
@@ -519,7 +519,7 @@ module.exports = (csn, options) => {
     forEachValue(elements, (element) => {
       if (element.target) {
         const column = getColumn(element);
-        if (column) {
+        if (column?.ref) {
           const mixin = query.SELECT.mixin[implicitAs(column.ref)] || {};
           copyProperties(mixin, element, getMemberPropagationRuleFor);
         }
@@ -552,7 +552,7 @@ module.exports = (csn, options) => {
     if (!target.kind)
       return;
     const primarySourceRef = getQueryPrimarySource(target.query || target.projection);
-    const artRef = primarySourceRef ? artifactRef(primarySourceRef) : source;
+    const artRef = primarySourceRef ? artifactRef.from(primarySourceRef) : source;
     if (!artRef.target)
       target[prop] = source[prop];
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "3.9.4",
+  "version": "4.0.2",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",
@@ -59,6 +59,6 @@
     "LICENSE"
   ],
   "engines": {
-    "node": ">=14"
+    "node": ">=16"
   }
 }

package/share/messages/{duplicate-autoexposed.md → def-duplicate-autoexposed.md}

@@ -1,4 +1,4 @@
-# duplicate-autoexposed
+# def-duplicate-autoexposed
 
 Two or more entities with the same name can’t be auto-exposed in the same
 service.
@@ -76,3 +76,7 @@ auto-exposing entities.  The reason is that the resulting auto-exposed names
 could become _long_ names that don’t seem natural nor intuitive.  We chose to
 expose the entity name because that’s what most developers want to do when
 they manually expose entities.
+
+## Other Notes
+
+This message was called `duplicate-autoexposed` in cds-compiler v3 and earlier.

package/share/messages/message-explanations.json

@@ -4,7 +4,7 @@
     "anno-duplicate-unrelated-layer",
     "check-proper-type",
     "check-proper-type-of",
-    "duplicate-autoexposed",
+    "def-duplicate-autoexposed",
     "extend-repeated-intralayer",
     "extend-unrelated-layer",
     "redirected-to-ambiguous",