@sap/cds-compiler 6.3.0 → 6.3.4

package/CHANGELOG.md

@@ -8,6 +8,20 @@ Note: `beta` fixes, changes and features are usually not listed in this ChangeLo
 but in [doc/CHANGELOG_BETA.md](doc/CHANGELOG_BETA.md).
 The compiler behavior concerning `beta` features can change at any time without notice.
 
+## Version 6.3.4 - 2025-09-11
+
+### Fixed
+
+- parser: Keep parentheses around lists on the right side of an `in` operator.
+- compiler: For calculated elements using associations with filters and cardinality, CSN recompilation could
+  fail for `gensrc` CSN, as happens for MTX.
+
+## Version 6.3.2 - 2025-09-02
+
+### Fixed
+
+- to.sql: Fix internal inconsistency when handling nested projections.
+
 ## Version 6.3.0 - 2025-08-28
 
 ### Added

package/lib/checks/enricher.js

@@ -114,9 +114,19 @@ function enrichCsn( csn, options ) {
     }
   }
 
+  /**
+   * Enrich a query's columns, including nested projections.
+   *
+   * @param {object} parent
+   * @param {string} prop
+   * @param {object} node
+   */
   function columns( parent, prop, node ) {
     // Establish the link relationships
-    parent[prop].forEach((column) => {
+    parent[prop].forEach(enrichColumn);
+    standard(parent, prop, node);
+
+    function enrichColumn( column ) {
       const element = getElement(column);
       if (element) {
         setProp(column, '_element', element);
@@ -124,8 +134,10 @@ function enrichCsn( csn, options ) {
         setProp(element, '_column', column);
         cleanupCallbacks.push(() => delete element._column);
       }
-    });
-    standard(parent, prop, node);
+
+      column.inline?.forEach?.(enrichColumn);
+      column.expand?.forEach?.(enrichColumn);
+    }
   }
 
   function simpleRef( node, prop, ref ) {

package/lib/checks/validator.js

@@ -55,20 +55,20 @@ const featureFlags = require('./featureFlags');
 const { timetrace } = require('../utils/timetrace');
 
 const forRelationalDBMemberValidators
-= [
+  = [
   // For HANA CDS specifically, reject any default parameter values, as these are not supported.
-  rejectParamDefaultsInHanaCds,
-  checkTypeIsScalar,
-  checkDecimalScale,
-  checkExplicitlyNullableKeys,
-  managedWithoutKeys,
-  warnAboutDefaultOnAssociationForHanaCds,
-  // sql.prepend/append
-  checkSqlAnnotationOnElement,
-  // no temporal annotations on calc elements
-  rejectAnnotationsOnCalcElement,
-  checkElementTypeDefinitionHasType,
-];
+    rejectParamDefaultsInHanaCds,
+    checkTypeIsScalar,
+    checkDecimalScale,
+    checkExplicitlyNullableKeys,
+    managedWithoutKeys,
+    warnAboutDefaultOnAssociationForHanaCds,
+    // sql.prepend/append
+    checkSqlAnnotationOnElement,
+    // no temporal annotations on calc elements
+    rejectAnnotationsOnCalcElement,
+    checkElementTypeDefinitionHasType,
+  ];
 
 const forRelationalDBArtifactValidators = [
   checkPrimaryKey,
@@ -101,35 +101,35 @@ const forRelationalDBQueryValidators = [
 ];
 
 const forOdataMemberValidators
-= [
+  = [
   // OData allows only simple values, no expressions or functions
-  validateDefaultValues,
-  managedWithoutKeys,
-];
+    validateDefaultValues,
+    managedWithoutKeys,
+  ];
 
 const forOdataArtifactValidators
-= [
+  = [
   // actions and functions are not of interest for the database
-  checkActionOrFunction,
-  // arrays are just CLOBs/LargeString for the database,
-  // no inner for the array structure is of interest for the database
-  // NOTE: moved to the renderer for a while
-  // TODO: Re-enable this code and remove the duplicated code from the renderer.
-  //       Not possible at the moment, because running this at the beginning of
-  //       the renderer does not work because the enricher can't handle certain
-  //       OData specifics.
-  // checkChainedArray,
-  checkReadOnlyAndInsertOnly,
-];
+    checkActionOrFunction,
+    // arrays are just CLOBs/LargeString for the database,
+    // no inner for the array structure is of interest for the database
+    // NOTE: moved to the renderer for a while
+    // TODO: Re-enable this code and remove the duplicated code from the renderer.
+    //       Not possible at the moment, because running this at the beginning of
+    //       the renderer does not work because the enricher can't handle certain
+    //       OData specifics.
+    // checkChainedArray,
+    checkReadOnlyAndInsertOnly,
+  ];
 
 const forOdataCsnValidators = [ checkCdsMap ];
 
 const forOdataQueryValidators = [];
 
 const commonMemberValidators
-= [ validateOnCondition, validateForeignKeys,
-  validateAssociationsInItems, checkForInvalidTarget,
-  checkVirtualElement, checkManagedAssoc ];
+  = [ validateOnCondition, validateForeignKeys,
+    validateAssociationsInItems, checkForInvalidTarget,
+    checkVirtualElement, checkManagedAssoc ];
 
 // TODO: checkManagedAssoc is a forEachMemberRecursively!
 const commonArtifactValidators = [

package/lib/compiler/assert-consistency.js

@@ -602,7 +602,7 @@ function assertConsistency( model, stage ) {
     cardinality: {
       kind: true,
       requires: [ 'location' ],
-      optional: [ 'sourceMin', 'sourceMax', 'targetMin', 'targetMax' ],
+      optional: [ 'sourceMin', 'sourceMax', 'targetMin', 'targetMax', '$inferred' ],
     },
     sourceMin: { test: isNumberVal },
     sourceMax: { test: isNumberVal, also: [ '*' ] },

package/lib/compiler/extend.js

@@ -75,7 +75,7 @@ function extend( model ) {
   } );
 
   const includesNonShadowedFirst
-      = isDeprecatedEnabled( model.options, '_includesNonShadowedFirst' );
+    = isDeprecatedEnabled( model.options, '_includesNonShadowedFirst' );
 
   sortModelSources();
   const extensionsDict = Object.create( null ); // TODO TMP

package/lib/compiler/populate.js

@@ -92,7 +92,7 @@ function populate( model ) {
   let newAutoExposed = [];
 
   const ignoreSpecifiedElements
-        = isDeprecatedEnabled( model.options, 'ignoreSpecifiedQueryElements' );
+    = isDeprecatedEnabled( model.options, 'ignoreSpecifiedQueryElements' );
 
   forEachDefinition( model, traverseElementEnvironments );
   while (newAutoExposed.length) {

package/lib/compiler/tweak-assocs.js

@@ -527,6 +527,7 @@ function tweakAssocs( model ) {
     if (lastStep.cardinality) {
       elem.cardinality ??= { ...assoc.cardinality };
       elem.cardinality.location = location;
+      elem.cardinality.$inferred = 'rewrite';
       for (const card of [ 'sourceMin', 'targetMin', 'targetMax' ]) {
         if (lastStep.cardinality[card])
           elem.cardinality[card] = copyExpr( lastStep.cardinality[card], location );

package/lib/edm/annotations/edmJson.js

@@ -266,7 +266,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
     transformExpression(xpr, undefined, transform);
     delete parent[prop];
     parentparent[parentprop]
-    = {
+      = {
         $And: [
           { $Le: [ xpr[1], xpr[0] ] },
           { $Le: [ xpr[0], xpr[2] ] },
@@ -370,12 +370,12 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
 
       // Map Edm primitive type funcs to $Type funcs
       let [ foundTypeProps, newArgs ]
-      = parent.args
-        ? parent.args.reduce((acc, arg) => {
-          (arg.func === '$Collection' || arg.func === 'Collection' ? acc[0] : acc[1]).push(arg);
-          return acc;
-        }, [ [], [] ] )
-        : [ [], [] ];
+        = parent.args
+          ? parent.args.reduce((acc, arg) => {
+            (arg.func === '$Collection' || arg.func === 'Collection' ? acc[0] : acc[1]).push(arg);
+            return acc;
+          }, [ [], [] ] )
+          : [ [], [] ];
 
       if (foundTypeProps.length === 1) {
         const type = foundTypeProps[0];
@@ -395,7 +395,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
 
       let typePropName = isDollarFunc ? '$Type' : 'Type';
       [ foundTypeProps, newArgs ]
-      = parent.args
+        = parent.args
           ? parent.args.reduce((acc, arg) => {
             (EdmPrimitiveTypeMap[`Edm.${ arg.func }`] ? acc[0] : acc[1]).push(arg);
             return acc;
@@ -429,7 +429,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
       }
 
       [ foundTypeProps, newArgs ]
-      = parent.args
+        = parent.args
           ? parent.args.reduce((acc, arg) => {
             ((arg.func === '$Type' || arg.func === 'Type') ? acc[0] : acc[1]).push(arg);
             return acc;
@@ -448,19 +448,19 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
         typePropName = typeProp.func;
 
         const [ collTypes, newTypeArgs ]
-        = typeProp.args
-          ? typeProp.args.reduce((acc, arg) => {
-            ((arg.func === '$Collection' || arg.func === 'Collection') ? acc[0] : acc[1]).push(arg);
-            return acc;
-          }, [ [], [] ] )
-          : [ [], [] ];
+          = typeProp.args
+            ? typeProp.args.reduce((acc, arg) => {
+              ((arg.func === '$Collection' || arg.func === 'Collection') ? acc[0] : acc[1]).push(arg);
+              return acc;
+            }, [ [], [] ] )
+            : [ [], [] ];
         typeProp.args = newTypeArgs;
 
         const [ scalarTypes, typeFacets ]
-        = typeProp.args.reduce((acc, arg) => {
-          ((/* arg.ref || */ arg.val) ? acc[0] : acc[1]).push(arg);
-          return acc;
-        }, [ [], [] ] );
+          = typeProp.args.reduce((acc, arg) => {
+            ((/* arg.ref || */ arg.val) ? acc[0] : acc[1]).push(arg);
+            return acc;
+          }, [ [], [] ] );
 
         let typeOpStr = collTypes.length
           ? `${ typePropName }(${ isDollarFunc ? '$Collection' : 'Collection' }(…))`

package/lib/gen/CdlGrammar.checksum

@@ -1 +1 @@
-1f3bba2acb882f5120a55a01eb9a7bdc
+bffacbf5acb61179807cb657191c5114

package/lib/gen/CdlParser.js

@@ -3946,7 +3946,7 @@ case 681:switch(this.l()){
 case',':this.continueExpressionslist($,682);continue
 default:this.s=682;continue
 }
-case 682:if(this.m(0,')')){ this.surroundByParens( $.expr ); }continue
+case 682:if(this.m(0,')')){ if ($.expr.op?.val !== 'list' || $.expr.location) this.surroundByParens( $.expr ); else this.attachLocation( $.expr ); }continue
 default:return this.exit_()
 }
 }
@@ -3954,7 +3954,7 @@ continueExpressionslist($,$next){
 let e;let _
 this.rule_(684,$next)
 for(;;)switch(this.s){
-case 684:if(this.m(685,',')){ $.expr = { op: this.valueWithLocation( 'list' ), args: [ $.expr ], location: { ... $.expr.$parens?.at( -1 ) ?? $.expr.location } }; }continue
+case 684:if(this.m(685,',')){ $.expr = { op: this.valueWithLocation( 'list' ), args: [ $.expr ], location: null }; }continue
 case 685:switch(this.lk()){
 case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Number':case'String':case'exists':case'QuotedLiteral':this.s=686;continue
 default:this.ei();continue
@@ -3967,9 +3967,7 @@ case 687:switch(this.l()){
 case',':this.c(686);continue
 default:this.gr([')']);continue
 }
-default:
-this.attachLocation( $.expr )
-return this.exit_()
+default:return this.exit_()
 }
 }
 caseExpression($,$next){

package/lib/json/to-csn.js

@@ -31,6 +31,7 @@ const normalizedKind = {
 let gensrcFlavor = true;       // good enough here...
 let universalCsn = false;
 let strictMode = false;        // whether to dump with unknown properties (in standard)
+/** @type {boolean|string} */
 let withLocations = false;
 let withDocComments = false;
 let structXpr = false;
@@ -252,7 +253,7 @@ function compactModel( model, options = model.options || {} ) {
     const loc = srcDict[first].location;
     if (loc && loc.file) {
       Object.defineProperty( csn, '$location', {
-        value: { file: loc.file }, configurable: true, writable: true, enumerable: withLocations,
+        value: { file: loc.file }, configurable: true, writable: true, enumerable: !!withLocations,
       } );
     }
     set( '$extra', csn, srcDict[first] );
@@ -611,7 +612,7 @@ function addLocation( loc, csn ) {
       val.endCol = loc.endCol;
     }
     Object.defineProperty( csn, '$location', {
-      value: val, configurable: true, writable: true, enumerable: withLocations,
+      value: val, configurable: true, writable: true, enumerable: !!withLocations,
     } );
   }
   return csn;

package/lib/parsers/AstBuildingParser.js

@@ -867,7 +867,7 @@ class AstBuildingParser extends BaseParser {
     // if (args.length !== 1) throw new CompilerAssertion()
     const sign = ixpr.args[0];
     const nval
-          = (sign.val === '-' &&
+      = (sign.val === '-' &&
              expr && // expr may be null if `-` rule can't be parsed
              expr.literal === 'number' &&
              sign.location.endLine === expr.location.line &&
@@ -1166,10 +1166,12 @@ class AstBuildingParser extends BaseParser {
   secureParens( expr ) {
     const op = expr?.op?.val;
     const $parens = expr?.$parens;
-    if (!$parens || expr.query || op && op !== 'call' && op !== 'cast')
+    if (!$parens || expr.query || op && op !== 'call' && op !== 'cast' && op !== 'list')
       return expr;
-    // ensure that references, literals and functions keep their surrounding parentheses
-    // (is for expressions the case anyway)
+    // Ensure that references, literals, functions and lists keep their
+    // surrounding parentheses (is for expressions the case anyway).
+    // (Remark: as opposed to product types in type theory, a 1-tupel of an
+    // n-tupel in SQL is different from an n-tupel → keep parens around `list`.)
     const location = $parens.pop();
     if (!$parens.length)
       delete expr.$parens;
@@ -1355,7 +1357,7 @@ class AstBuildingParser extends BaseParser {
 
       if (def.kind !== 'annotate') {
         const numDefines
-              = def.$duplicates.reduce( addOneForDefinition, addOneForDefinition( 0, def ) );
+          = def.$duplicates.reduce( addOneForDefinition, addOneForDefinition( 0, def ) );
         this.handleDuplicateExtension( def, name, numDefines );
         for (const dup of def.$duplicates)
           this.handleDuplicateExtension( dup, name, numDefines );

package/lib/transform/odata/foreignKeyRefsInXprAnnos.js

@@ -17,9 +17,9 @@ function replaceForeignKeyRefsInExpressionAnnotations(csn, options, messageFunct
     transformAnnotationExpression(parent, prop, {
       ref: (parent, _prop, ref, path, _p, _ppn, ctx) => {
         const { art, links }
-            = (parent._art && parent._links)
-              ? { art: parent._art, links: parent._links }
-              : csnUtils.inspectRef(path);
+          = (parent._art && parent._links)
+            ? { art: parent._art, links: parent._links }
+            : csnUtils.inspectRef(path);
         // if a reference points to a structure(managed assoc or structured element), then we do not process
         // as we can't guess which specific foreign key is targeted
         if (!art || csnUtils.isManagedAssociation(art) || csnUtils.isStructured(art))

package/package.json

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