@sap/cds-compiler 5.9.8 → 5.9.10

package/CHANGELOG.md

@@ -7,6 +7,11 @@
 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.9.10 - 2025-09-11
+
+- 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 5.9.8 - 2025-07-14
 

package/lib/compiler/assert-consistency.js

@@ -601,7 +601,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/tweak-assocs.js

@@ -505,6 +505,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/gen/CdlGrammar.checksum

@@ -1 +1 @@
-226c8854e08665b3eaae3ae1a1276db7
+6012ce87566963a5c785b624177ac737

package/lib/gen/CdlParser.js

@@ -3950,7 +3950,7 @@ case 683:switch(this.l()){
 case',':this.continueExpressionslist($,684);continue
 default:this.s=684;continue
 }
-case 684:if(this.m(0,')')){ this.surroundByParens( $.expr ); }continue
+case 684:if(this.m(0,')')){ if ($.expr.op?.val !== 'list' || $.expr.location) this.surroundByParens( $.expr ); else this.attachLocation( $.expr ); }continue
 default:return this.exit_()
 }
 }
@@ -3958,7 +3958,7 @@ continueExpressionslist($,$next){
 let e;let _
 this.rule_(686,$next)
 for(;;)switch(this.s){
-case 686:if(this.m(687,',')){ $.expr = { op: this.valueWithLocation( 'list' ), args: [ $.expr ], location: { ... $.expr.$parens?.at( -1 ) ?? $.expr.location } }; }continue
+case 686:if(this.m(687,',')){ $.expr = { op: this.valueWithLocation( 'list' ), args: [ $.expr ], location: null }; }continue
 case 687: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=688;continue
 default:this.ei();continue
@@ -3971,10 +3971,7 @@ case 689:switch(this.l()){
 case',':this.c(688);continue
 default:this.gr([')']);continue
 }
-case 0:{ this.attachLocation( $.expr ); }
-default:
-this.attachLocation( $.expr )
-return this.exit_()
+default:return this.exit_()
 }
 }
 newAndValuePath($,$next){

package/lib/language/genericAntlrParser.js

@@ -629,7 +629,7 @@ function combinedLocation( start, end ) {
 function 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)

package/lib/parsers/AstBuildingParser.js

@@ -1129,7 +1129,7 @@ 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)

package/lib/parsers/CdlGrammar.g4

@@ -1650,18 +1650,16 @@ expressionOrQueryParens returns[ default expr ]
     | queryExpression[ ...$ ]
     )
     ')'
-    { this.surroundByParens( $expr ); }
+    { if ($expr.op?.val !== 'list' || $expr.location) this.surroundByParens( $expr ); else this.attachLocation( $expr ); }
   ;
 
 continueExpressionslist[ expr ]
-@finally{ this.attachLocation( $expr ); }
   :
-    ',' { $expr = { op: this.valueWithLocation( 'list' ), args: [ $expr ], location: { ... $expr.$parens?.at( -1 ) ?? $expr.location } }; }
+    ',' { $expr = { op: this.valueWithLocation( 'list' ), args: [ $expr ], location: null }; }
     (
       e=expression { $expr.args.push( $e ); }
       ( ',' | <exitLoop> )
     )+
-    { this.attachLocation( $expr ); }
   ;
 
 newAndValuePath returns[ default expr ]

package/package.json

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