@sap/cds-compiler 5.7.2 → 5.7.4

package/CHANGELOG.md

@@ -7,6 +7,14 @@
 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.7.4 - 2025-02-05
+
+### Fixed
+
+- New CDL Parser (option `newParser: true`)
+  + Improve code completion
+  + Fix further edge cases in error recovery
+
 ## Version 5.7.2 - 2025-01-30
 
 ### Fixed

package/lib/base/location.js

@@ -98,7 +98,7 @@ function stringOrRaw( val ) {
  */
 function combinedLocation( start, end ) {
   if (!start || !start.location)
-    return end.location;
+    return end?.location;
   else if (!end || !end.location)
     return start.location;
   const loc = {

package/lib/base/model.js

@@ -168,8 +168,6 @@ function forEachMember( construct, callback, target ) {
 function forEachMemberRecursively( construct, callback, target ) {
   forEachMember( construct, ( member, memberName, prop ) => {
     callback( member, memberName, prop );
-    if (Array.isArray(member.$duplicates)) // redefinitions
-      member.$duplicates.forEach( o => callback( o, memberName, prop ) );
     // Descend into nested members, too
     forEachMemberRecursively( member, callback );
   }, target);
@@ -177,15 +175,16 @@ function forEachMemberRecursively( construct, callback, target ) {
 
 // Apply function `callback` to all objects in dictionary `dict`, including all
 // duplicates (found under the same name).  Function `callback` is called with
-// the following arguments: the object, the name, and -if it is a duplicate-
+// the following arguments: the object, the name, and - if it is a duplicate -
 // the array index and the array containing all duplicates.
 function forEachGeneric( obj, prop, callback ) {
   const dict = obj[prop];
   for (const name in dict) {
     obj = dict[name];
+    const { $duplicates } = obj;
     callback( obj, name, prop );
-    if (Array.isArray(obj.$duplicates)) // redefinitions
-      obj.$duplicates.forEach( o => callback( o, name, prop ) );
+    if (Array.isArray($duplicates)) // redefinitions
+      $duplicates.forEach( o => callback( o, name, prop ) );
   }
 }
 

package/lib/compiler/define.js

@@ -1155,6 +1155,9 @@ function define( model ) {
       setLink( elem, '_block', bl );
       const existing = parent[prop]?.[name];
       const add = construct !== parent && (!existing || elem.$inferred !== 'include');
+      // don't dump with `entity T {}; extend T with { extend e {}; e {}; e {} };`:
+      if (elem.$duplicates === true && add)
+        elem.$duplicates = null;
       setMemberParent( elem, name, parent, add && prop );
       // console.log(message( null, elem.location, elem, {}, 'Info', 'INIT').toString())
       checkRedefinition( elem );

package/lib/compiler/resolve.js

@@ -1459,7 +1459,7 @@ function resolve( model ) {
         type = getOrigin( type );
       const err = message( 'ref-undefined-enum', [ sym.location, assignment ],
                            { id: sym.id, type } );
-      if (options.newParser)
+      if (options.newParser || options.newparser)
         attachAndEmitValidNames( err, symbols );
     }
   }

package/lib/gen/CdlParser.js

@@ -1239,10 +1239,15 @@ limit:[683,455,,'queryOnLeft'],minus:'limit',order:'limit',union:'limit',except:
 'argumentsAndFilter',
 {'(':['c',712,,,,'prepareSpecialFunction'],'':731},
 {Id:['ciA',719,,'isNamedArg'],'':713},
-{Id:[714,733],'#':'Id','(':'Id','*':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Id_all:'Id',Number:'Id',String:'Id',QuotedLiteral:'Id','':730},
+{
+Id:[714,733],'#':'Id','(':'Id','*':'Id','+':'Id','-':'Id',':':'Id','?':'Id',Id_all:'Id',Number:'Id',String:'Id',QuotedLiteral:'Id',
+DeleteStarFromSet:['c',730],
+'':730
+},
 {',':['c',715,,,,'nextFunctionArgument'],'':716},
 {
 Id:[714,733],'#':'Id','(':'Id','*':'Id','+':'Id','-':'Id',':':'Id','?':'Id',not:'Id',case:'Id',cast:'Id',null:'Id',true:'Id',false:'Id',Id_all:'Id',Number:'Id',String:'Id',exists:'Id',QuotedLiteral:'Id',
+DeleteStarFromSet:['c',714],
 ')':['g',716,1],order:')',
 },
 {order:['ck',717],'':730},
@@ -3176,7 +3181,7 @@ case 457:switch(this.lk()){
 case'all':case'distinct':if(this.ck(458)){ quantifier = this.valueWithLocation(); }continue
 default:this.s=458;continue
 }
-case 458:if(this.queryExpression(_={},455)){query=_.expr; if ($.expr.$parens || op.val !== $.expr.op.val || quantifier?.val !== $.expr.quantifier?.val) $.expr = { op, args: [$.expr], quantifier, location: { ...$.expr.location } };
+case 458:if(this.queryExpression(_={},455)){query=_.expr; if ($.expr.$parens || op.val !== $.expr.op?.val || quantifier?.val !== $.expr.quantifier?.val) $.expr = { op, args: [$.expr], quantifier, location: { ...$.expr.location } };
 quantifier = undefined;
 $.expr.args.push( query ); this.attachLocation( $.expr ); }continue
 case 459:switch(this.lk()){
@@ -3295,9 +3300,9 @@ default:this.gr([]);continue
 }
 case 490:if(this.mk(491,'join')){ if ($.expr?.join?.val !== 'cross' || $.expr.$parens) $.expr = { op: this.valueWithLocation(), join: this.valueWithLocation( undefined, join ), args: [ $.expr ] }; }continue
 case 491:switch(this.l()){
-case'(':if(this.tableOrQueryParens(_={},489)){tab=_.expr; $.expr.args.push( this.taggedIfQuery( tab ) );
+case'(':if(this.tableOrQueryParens(_={},489)){tab=_.expr; const r = this.taggedIfQuery( tab ); if (r) $.expr.args.push( r );
 this.attachLocation( $.expr ); }continue
-case'Id':if(this.fromRefWithOptAlias(_={},489)){tab=_.expr; $.expr.args.push( tab );
+case'Id':if(this.fromRefWithOptAlias(_={},489)){tab=_.expr; if (tab) $.expr.args.push( tab );
 this.attachLocation( $.expr ); }continue
 default:this.e();continue
 }
@@ -3594,7 +3599,7 @@ default:this.gi(584);continue
 case 575:if(this.mi(584,'ItemAlias')){ art.name = this.identAst(); }continue
 case 576:switch(this.lk()){
 case'over':if(this.ck(577)){ this.pushXprToken( expr.suffix = [] ); }continue
-case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression(_={ expr: expr },579,651)){e=_.expr; Object.assign( e.location, expr.location ); art.value = this.attachLocation( e ) }continue
+case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression(_={ expr: expr },579,651)){e=_.expr; Object.assign( e.location || {}, expr.location ); art.value = this.attachLocation( e ) }continue
 case'as':this.ck(581);continue
 case'Id':if(this.ci(584,'ItemAlias')){this.nestedExpand(); art.name = this.fragileAlias( true ); }continue
 case'.':if(this.c(582)){ this.reportUnexpectedSpace( this.lb(), this.la().location, true );
@@ -3603,7 +3608,7 @@ default:if(this.gi(584)){this.nestedExpand(); this.classifyImplicitName( 'ItemIm
 }
 case 577:this.overClause({outer:expr.suffix},578);continue
 case 578:switch(this.lk()){
-case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression(_={ expr: expr },579,651)){e=_.expr; Object.assign( e.location, expr.location ); art.value = this.attachLocation( e ) }continue
+case'*':case'+':case'-':case'/':case'<':case'=':case'>':case'?':case'!=':case'<=':case'<>':case'>=':case'in':case'is':case'or':case'||':case'and':case'not':case'like':case'between':if(this.expression(_={ expr: expr },579,651)){e=_.expr; Object.assign( e.location || {}, expr.location ); art.value = this.attachLocation( e ) }continue
 default:this.s=579;continue
 }
 case 579:switch(this.lk()){
@@ -3916,7 +3921,9 @@ default:this.s=676;continue
 }
 case 675:if(this.expression(_={},676)){e=_.expr; $.expr.args?.push( e ); }continue
 case 676:this.s=661;{ this.attachLocation( $.expr ); }continue
-default:return this.exit_()
+default:
+if (this.s == null) this.attachLocation( $.expr )
+return this.exit_()
 }
 }
 expressionOrQueryParens($,$next){
@@ -4046,6 +4053,7 @@ default:this.s=713;continue
 }
 case 713:switch(this.l()){
 case'Id':case'#':case'(':case'*':case'+':case'-':case':':case'?':case'Id_all':case'Number':case'String':case'QuotedLiteral':if(this.funcExpression(_={},714)){expr=_.expr; $.pathStep.args.push( expr ); }continue
+case'DeleteStarFromSet':this.c(730);continue
 default:this.s=730;continue
 }
 case 714:switch(this.l()){
@@ -4054,6 +4062,7 @@ default:this.s=716;continue
 }
 case 715:switch(this.lk()){
 case'Id':case'#':case'(':case'*':case'+':case'-':case':':case'?':case'not':case'case':case'cast':case'null':case'true':case'false':case'Id_all':case'Number':case'String':case'exists':case'QuotedLiteral':if(this.funcExpression(_={},714)){expr=_.expr; $.pathStep.args.push( expr ); }continue
+case'DeleteStarFromSet':this.c(714);continue
 case')':case'order':this.gP(716);continue
 default:this.ei();continue
 }

package/lib/main.d.ts

@@ -172,7 +172,6 @@ declare namespace compiler {
     withLocations?: boolean|string
     /**
      * Use the new non-ANTLR based parser for compilation.
-     * Experimental flag!
      *
      * @since v5.2.0
      */

package/lib/parsers/AstBuildingParser.js

@@ -171,7 +171,7 @@ class AstBuildingParser extends BaseParser {
     this.dynamic_.generic = spec ? spec[call.argPos] : specialFunctions[''][1];
   }
 
-  lGenericIntroOrExpr( tryGenericIntro = true ) {
+  lGenericIntroOrExpr( _mode, tryGenericIntro = true ) {
     const { keyword, type } = this.la();
     // TODO: use lower-case in specialFunctions
     const text = typeof keyword === 'string' ? keyword.toUpperCase() : type;
@@ -180,37 +180,44 @@ class AstBuildingParser extends BaseParser {
       if (this.dynamic_.generic?.IN === 'separator')
         this.prec_ = PRECEDENCE_OF_IN_PREDICATE; // only expressions if `in` is separator
       if (generic !== 'expr')
-        return (generic === 'intro') ? 'GenericIntro' : 'Id';
+        return (generic === 'intro') ? 'GenericIntro' : type;
+      // if both intro and expr: specialFunctions[fn][argPos][token] = 'expr'
       const next = this.tokens[this.tokenIdx + 1];
-      if (next.type !== ',' && next.type !== ')' &&
+      if (next && next.type !== ',' && next.type !== ')' &&
           this.dynamic_.generic[next.keyword?.toUpperCase?.()] !== 'separator')
         return 'GenericIntro';
     }
-    return (generic === 'expr') ? 'GenericExpr' : 'Id';
+    return (generic === 'expr') ? 'GenericExpr' : type;
   }
 
   lGenericExpr() {
-    return this.lGenericIntroOrExpr( false );
+    return this.lGenericIntroOrExpr( null, false );
   }
 
-  lGenericSeparator() {         // TODO: { keyword, type } as arg ?
+  lGenericSeparator() {
     const { keyword, type } = this.la();
     // TODO: use lower-case in specialFunctions
     const text = typeof keyword === 'string' ? keyword.toUpperCase() : type;
     const generic = this.dynamic_.generic?.[text];
-    return (generic === 'separator') ? 'GenericSeparator' : ',';
+    return (generic === 'separator') ? 'GenericSeparator' : type;
   }
 
   addTokenToSet_( set, tokenName, val, collectKeywordsOnly ) {
-    const realTokens = parserTokens[tokenName] && this.dynamic_.generic?.[parserTokens[tokenName]];
-    // TODO: avoid 2nd parserTokens dict use, use lower-case in specialFunctions
-    if (!realTokens) {
-      super.addTokenToSet_( set, tokenName, val, collectKeywordsOnly );
-    }
-    else {
+    const token = parserTokens[tokenName];
+    // TODO: use lower-case in specialFunctions
+    const realTokens = token && this.dynamic_.generic?.[token];
+    if (realTokens) {
       for (const t of realTokens)
         super.addTokenToSet_( set, t.toLowerCase(), val, collectKeywordsOnly );
     }
+    else if (tokenName === 'DeleteStarFromSet') { // in rule `argumentsAndFilter`
+      // TODO: workaround for (`GenericExpr : Id_all | '*'`), see #13485.
+      // Works, since `DeleteStarFromSet` comes after `*` (length-sorted):
+      delete set['*'];
+    }
+    else {
+      super.addTokenToSet_( set, tokenName, val, collectKeywordsOnly );
+    }
   }
 
   inSelectItem( _test, arg ) {  // only as action
@@ -731,14 +738,15 @@ class AstBuildingParser extends BaseParser {
   }
 
   taggedIfQuery( query ) {
-    return (query.op && queryOps[query.op.val])
+    // attached actions are run even if rules ends prematurely → query can be
+    // undefined
+    return (query?.op && queryOps[query.op.val])
       ? { query, location: query.$parens?.at( -1 ) ?? query.location }
       : query;
   }
 
-  addNamedArg( args, idToken, expr ) {
-    expr.name = this.identAst( idToken );
-    (args.args ?? args)[expr.name.id] = expr;
+  addNamedArg( pathItem, idToken, expr ) {
+    this.addDef( expr, pathItem, 'args', 0, this.identAst( idToken ) );
   }
 
   ixprAst( args ) {

package/lib/parsers/CdlGrammar.g4

@@ -1100,7 +1100,7 @@ queryExpression returns[ default expr = {} ] locals[ op, quantifier ]
       )
       query=queryExpression
       // with same op/quantifier: make left-assoc binary to nary:
-      { if ($expr.$parens || $op.val !== $expr.op.val || $quantifier?.val !== $expr.quantifier?.val) $expr = { op, args: [$expr], quantifier, location: { ...$.expr.location } }; } // TODO: ...$
+      { if ($expr.$parens || $op.val !== $expr.op?.val || $quantifier?.val !== $expr.quantifier?.val) $expr = { op, args: [$expr], quantifier, location: { ...$.expr.location } }; } // TODO: ...$
       { $quantifier = undefined; }
       { $expr.args.push( $query ); this.attachLocation( $expr ); }
     )*
@@ -1169,9 +1169,9 @@ tableExpression returns[ default expr = {} ] // TableOrJoin
     (
       join=CROSS JOIN
       { if ($expr?.join?.val !== 'cross' || $expr.$parens) $expr = { op: this.valueWithLocation(), join: this.valueWithLocation( undefined, $join ), args: [ $expr ] }; }
-      ( tab=tableOrQueryParens { $expr.args.push( this.taggedIfQuery( $tab ) ); }
+      ( tab=tableOrQueryParens { const r = this.taggedIfQuery( $tab ); if (r) $expr.args.push( r ); }
         { this.attachLocation( $expr ); }
-      | tab=fromRefWithOptAlias { $expr.args.push( $tab ); }
+      | tab=fromRefWithOptAlias { if ($tab) $expr.args.push( $tab ); }
         { this.attachLocation( $expr ); }
       )
     |
@@ -1393,11 +1393,11 @@ selectItemDef[ columns ] locals[ art = new XsnArtifact() ]
             OVER { this.pushXprToken( $expr.suffix = [] ); }
             overClause[ $expr.suffix ]
             ( e=expression[ ...{ expr: $expr } ]<atAltStart>
-              { Object.assign( $e.location, $expr.location ); $art.value = this.attachLocation( $e )}
+              { Object.assign( $e.location || {}, $expr.location ); $art.value = this.attachLocation( $e )}
             )?
           |
             e=expression[ ...{ expr: $expr } ]<atAltStart>
-            { Object.assign( $e.location, $expr.location ); $art.value = this.attachLocation( $e )}
+            { Object.assign( $e.location || {}, $expr.location ); $art.value = this.attachLocation( $e )}
           )
           ( AS Id['ItemAlias'] { $art.name = this.identAst(); }
           | Id_restricted['ItemAlias'] { $art.name = this.fragileAlias( true ); }
@@ -1533,9 +1533,8 @@ valuePath returns[ default expr = { path: [] } ] locals[ pathItem ]
     )*
   ;
 
-// TODO: ? params
 expression returns[ default expr = {} ]
-//@finally{ if (!$expr?.$parens) this.attachLocation( $expr ); }
+@finally{ if (this.s == null) this.attachLocation( $expr ); }
   :
     (
       expressionOrQueryParens[ ...$ ]
@@ -1716,7 +1715,8 @@ options{ minTokensMatched = 1 }
           (
             ','<prepare=nextFunctionArgument>
             ( expr=funcExpression { $pathStep.args.push( $expr ); }
-            | <exitLoop>          // <cond>: only before `)`
+            | DeleteStarFromSet // Workaround for missing feature, see #13485, TODO
+            | <exitLoop>          // TODO <cond>: only before `)`
             )
           )*
           (   // ORDER BY in generic functions, e.g. `first_value(id order by name)`
@@ -1725,6 +1725,8 @@ options{ minTokensMatched = 1 }
             orderByClauseAsXpr[ $expr.args ]
             { this.attachLocation( $expr ); }
           )?
+        |
+          DeleteStarFromSet     // Workaround for missing feature, see #13485, TODO
         )?
       |
         // TODO: if we want perfect CC and error recovery, `isNamedArg` would work
@@ -1772,6 +1774,7 @@ funcExpression returns[ default expr ] locals[ args ]
       { $expr = this.applyOpToken(); $args = $expr.args; }
       e=expression { $expr.args.push( $e ); }
     )
+    // TODO: some <restrict=Id> here?
     ( options{ lookahead = lGenericSeparator; }
     :
       GenericSeparator

package/lib/parsers/index.js

@@ -21,7 +21,7 @@ function parseCdl( source, filename = '<undefined>.cds',
                    options = {}, messageFunctions = null,
                    rule = 'cdl' ) {
   const rulespec = rules[rule];
-  if (!options.newParser)       // TODO: (options.newParser === false)
+  if (!options.newParser && !options.newparser)
     return parseWithAntlr( source, filename, options, messageFunctions, rulespec );
   const { CdlParser } = gen;
   if (CdlParser.tracingParser)  // tracing → direct console output of message

package/package.json

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