@sap/cds-compiler 5.7.0 → 5.7.2

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
@@ -503,6 +503,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

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
@@ -1929,6 +1929,7 @@ annoAssignParen[ art ]
   :
     '('<prepare=annoInSameLine>
     ( annoAssignBase[ $art ]
+      //( annoAssignErrorRecoveryHelper )?
       ( ',' | <exitLoop> )
     )*
     ')'
@@ -2018,7 +2019,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/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.2",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",