@sap/cds-compiler 5.7.0 → 5.7.4

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

@@ -48,7 +48,7 @@ const PRECEDENCE_OF_IN_PREDICATE = 10;
 const PRECEDENCE_OF_EQUAL = 10;
 
 class AstBuildingParser extends BaseParser {
-  leanConditions = { afterBrace: true };
+  leanConditions = { afterBrace: true, fail: true };
 
   constructor( lexer, keywords, table, options, messageFunctions ) {
     super( lexer, keywords, table ); // lexer has file
@@ -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
@@ -503,6 +510,15 @@ class AstBuildingParser extends BaseParser {
     return this.tokens[this.tokenIdx + 1]?.text !== ':';
   }
 
+  fail( mode ) {
+    // TODO TOOL: the following test belongs to the BaseParser.js:
+    if (this.conditionTokenIdx === this.tokenIdx &&        // tested on same
+        this.conditionStackLength == null && // after error recover
+        mode !== 'M')
+      return false;
+    return true; //  mode !== 'Y';
+  }
+
   // Space handling etc, locations ----------------------------------------------
 
   // Use the following method for language constructs which we (currently) do
@@ -722,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

@@ -128,7 +128,7 @@ usingDeclaration[ source ] locals[ decl = { kind: 'using' } ] // TODO: XsnArtifa
       '{' { $decl.usings = this.createArray(); }
       ( usingProxy[ $decl, { kind: 'using' } ]
         ( ',' | <exitLoop> )
-      )+
+      )*
       '}'<prepare=afterBrace>
       { this.finalizeDictOrArray( $decl.usings ); }
       ( FROM String
@@ -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
@@ -1929,6 +1932,7 @@ annoAssignParen[ art ]
   :
     '('<prepare=annoInSameLine>
     ( annoAssignBase[ $art ]
+      //( annoAssignErrorRecoveryHelper )?
       ( ',' | <exitLoop> )
     )*
     ')'
@@ -2018,7 +2022,8 @@ annoValue returns[ default value = {} ]
         if ($value.$flatten) $value.$flatten.push( $sub );
         else this.addDef( $sub, $value, 'struct', null, $sub.name );
       }
-      ( ',' | <exitLoop> )
+      ( ',' | <exitLoop> | <guard=fail, repeatLoop, restrict=Id> )
+      // <guard=fail, repeatLoop>` for better error recovery for input `foo@bar`
     )*
     // TODO TOOL: allow:
     // ( <guard=arrayAnno, …> '}' | <error> )         // TODO TOOL - workaround:

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/lib/render/utils/delta.js

@@ -74,9 +74,7 @@ class DeltaRenderer {
   alterColumns(artifactName, columnName, delta, definitionsStr, _eltName, _env) {
     if (Array.isArray(definitionsStr)) {
       const prefix = `ALTER TABLE ${this.scopedFunctions.renderArtifactName(artifactName)} ALTER (`;
-      let padding = '';
-      for (let i = 0; i < prefix.length; i++)
-        padding += ' ';
+      const padding = ' '.repeat(prefix.length);
       const body = definitionsStr.map(s => padding + s).join(',\n').slice(padding.length); // no padding for first part
       const postfix = ');';
       return [ prefix + body + postfix ];

package/package.json

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