@sap/cds-compiler 5.5.0 → 5.5.2

package/lib/model/cloneCsn.js

@@ -2,7 +2,7 @@
 
 const { csnPropertyOrder } = require('../json/to-csn');
 const { ModelError } = require('../base/error');
-const { setHidden } = require('../utils/objectUtils');
+const { setHidden, hasNonEnumerable } = require('../utils/objectUtils');
 const { isAnnotationExpression } = require('../base/builtins');
 
 const csnDictionaries = {
@@ -110,10 +110,6 @@ function cloneCsn( csn, options, sort ) {
   return r;
 }
 
-function hasNonEnumerable( object, property ) {
-  return Object.prototype.hasOwnProperty.call( object, property ) &&
-    !Object.prototype.propertyIsEnumerable.call( object, property );
-}
 
 /**
  * Deeply clone the given CSN dictionary and return it.

package/lib/parsers/AstBuildingParser.js

@@ -71,11 +71,14 @@ class AstBuildingParser extends BaseParser {
   }
 
   expectingArray() {
+    const savedState = this.s;
+    this.s = this.errorState;
     let array = this.expectingArray_();
+    this.s = savedState;
     // compatibility: replace true+false by Boolean - TODO: delete
     if (array.includes( 'true' ))
       array = [ 'Boolean', ...array.filter( n => n !== 'true' && n !== 'false' ) ];
-    return array.map( antlrName )
+    return array.map( tok => this.antlrName( tok ) )
       .sort( (a, b) => (tokenPrecedence(a) < tokenPrecedence(b) ? -1 : 1) );
   }
 
@@ -83,7 +86,7 @@ class AstBuildingParser extends BaseParser {
     const token = this.la();
     const expecting = this.expectingArray();
     const err = this.error( 'syntax-unexpected-token', token,
-                            { offending: antlrName( token ), expecting } );
+                            { offending: this.antlrName( token ), expecting } );
     // No 'unwanted' variant, no 'syntax-missing-token'
     err.expectedTokens = expecting;
   }
@@ -318,10 +321,6 @@ class AstBuildingParser extends BaseParser {
     return true;
   }
 
-  inExpandInline() {            // not as <cond>
-    this.dynamic_.inSelectItem = 'nested';
-  }
-
   /**
    * `;` between statements is optional only after a `}` (ex braces of structure
    * values for annotations).
@@ -355,8 +354,11 @@ class AstBuildingParser extends BaseParser {
       const { arrayAnno } = this.dynamic_;
       if (!arrayAnno[0])
         return false;
-      if (this.tokens[this.tokenIdx + 1]?.type === ',')
-        arrayAnno[0] = false;
+      arrayAnno[0] = this.tokens[this.tokenIdx + 1]?.keyword;
+    }
+    else if (arg === 'bracket') {
+      // closing bracket not allowed if last `...` in array is with `up to
+      return typeof this.dynamic_.arrayAnno[0] !== 'string';
     }
     else {                      // orNotEmpty
       return this.dynamic_.arrayAnno || this.lb().type !== '{';
@@ -788,16 +790,20 @@ class AstBuildingParser extends BaseParser {
     }
   }
 
+  // TODO: can we remove `;`/EOF from the expected-set for `annotate Foo with ⎀`?
   checkWith( keyword ) {
     if (this.lb() !== keyword)
       return;
     const tok = this.la();
-    if (this.docCommentIndex < tok.location.tokenIndex &&
-        this.docCommentIndex > this.lb().location.tokenIndex)
+    const docTokenIndex = this.docCommentIndex &&
+          this.docComments[this.docCommentIndex - 1].location.tokenIndex;
+    if (docTokenIndex < tok.location.tokenIndex &&
+        docTokenIndex > this.lb().location.tokenIndex)
       return;
-    const expecting = this.expectingArray(); // TODO: filter
+    // filter out what comes after current rule (no generic way necessary):
+    const expecting = this.expectingArray().filter( t => t !== '<EOF>' && t !== '\'}\'' );
     const msg = this.warning( 'syntax-unexpected-semicolon', tok,
-                              { offending: antlrName( tok ), expecting, keyword: 'with' },
+                              { offending: this.antlrName( tok ), expecting, keyword: 'with' },
                               // eslint-disable-next-line @stylistic/js/max-len
                               'Unexpected $(OFFENDING), expecting $(EXPECTING) - ignored previous $(KEYWORD)' );
     msg.expectedTokens = expecting;
@@ -841,14 +847,15 @@ class AstBuildingParser extends BaseParser {
   }
 
   reportExpandInline( column, isInline ) {
+    // called before matching `{`
     const { name } = column;
     if (column.value && !column.value.path) {
-      const token = this.la();
       // improve error location when using "inline" `.{…}` after ref (arguments and
       // filters not covered, not worth the effort); after an expression where
       // the last token is an identifier, not the `.` is wrong, but the `{`:
-      // if (isInline && !name && this._input.LT(-1).type >= this.constructor.Identifier)
-      //   token = this._input.LT(2); -- TODO: still valid?
+      const token = (isInline && this.tokens[this.tokenIdx - 2].type !== 'Id')
+        ? this.lb()
+        : this.la();
       this.error( 'syntax-unexpected-nested-proj', token,
                   { code: isInline ? '.{ ‹inline› }' : '{ ‹expand› }' },
                   'Unexpected $(CODE); nested projections can only be used after a reference' );
@@ -1287,6 +1294,17 @@ class AstBuildingParser extends BaseParser {
                             parent, 'elements', kind, seg );
     }
   }
+
+  // For compatibility with ANTLR-based parser:
+  antlrName( type ) {
+    if (typeof type !== 'string') {
+      type = (!type.parsedAs && this.keywords[type.keyword ?? ''] != null ||
+              type.parsedAs === 'keyword') && type.keyword || type.type;
+    }
+    if (/^[A-Z]+/.test( type ))// eslint-disable-next-line no-nested-ternary
+      return (type === 'Id') ? 'Identifier' : (type === 'EOF') ? '<EOF>' : type;
+    return (/^[a-z]+/.test( type )) ? type.toUpperCase() : `'${ type }'`;
+  }
 }
 
 function addOneForDefinition( count, ext ) {
@@ -1309,15 +1327,6 @@ function relevantDigits( val ) {
 }
 
 
-// For compatibility with ANTLR-based parser:
-function antlrName( type ) {
-  if (typeof type !== 'string')
-    type = (!type.parsedAs || type.parsedAs === 'keyword') && type.keyword || type.type;
-  if (/^[A-Z]+/.test( type ))// eslint-disable-next-line no-nested-ternary
-    return (type === 'Id') ? 'Identifier' : (type === 'EOF') ? '<EOF>' : type;
-  return (/^[a-z]+/.test( type )) ? type.toUpperCase() : `'${ type }'`;
-}
-
 // Used for sorting in messages (TODO: make it part of messages.js?)
 const token1sort = {
   // 0: Identifier, Number, ...

package/lib/parsers/CdlGrammar.g4

@@ -208,7 +208,7 @@ aspectDef[ art, outer ]
 @finally{ this.attachLocation( $art ); }
   :
     ( ASPECT
-    | <hide> ABSTRACT { this.warning( 'syntax-deprecated-abstract', this.lb().location ); }
+    | <hide> ABSTRACT { this.warning( 'syntax-deprecated-abstract', this.combineLocation( this.lb(), this.la() ) ); }
       ENTITY
     )
     name=namePath[ 'Type' ]     // TODO: Type?
@@ -418,7 +418,7 @@ elementDef[ outer, art = undefined ]
     ( KEY { $art.key = this.valueWithLocation( true ); } )?
     ( <hide> MASKED { $art.masked = this.valueWithLocation( true ); }
       { this.message( 'syntax-unsupported-masked', this.lb(), { keyword: 'masked' } ); } )?
-    ( ELEMENT { $art.$syntax = 'element'; } )?
+    ( <hide> ELEMENT { $art.$syntax = 'element'; } )?
     Id['Element'] <prepare=elementRestriction, arg=elem>
     { this.addDef( $art, $outer, 'elements', 'element', this.identAst() ); }
     { this.docComment( $art ); } annoAssignMid[ $art ]*
@@ -515,7 +515,7 @@ mixinElementDef[ outer ] locals[ art = new XsnArtifact() ]
 // Annotate and Extend: main definitions ----------------------------------------
 
 annotateArtifact[ art, outer ]
-@finally{ this.checkWith( $keyword ); this.attachLocation( $art ); }
+@finally{ this.attachLocation( $art ); }
   :
     name=namePath[ 'Ext' ]
     ( // direct element annotation:
@@ -538,10 +538,11 @@ annotateArtifact[ art, outer ]
         annotateActionsBlock[ $art ]?
       )
     )
+    { this.checkWith( $keyword ); }
   ;
 
 extendArtifact[ art, outer ]
-@finally{ this.checkWith( $keyword ); this.attachLocation( $art ); }
+@finally{ this.attachLocation( $art ); }
   :
     name=namePath[ 'Ext' ]
     ( // direct element annotation:
@@ -586,6 +587,7 @@ extendArtifact[ art, outer ]
         DEFINITIONS artifactsBlock[ $art, this.lb() ]
       )?
     )
+    { this.checkWith( $keyword ); }
   ;
 
 extendService[ art, outer ]
@@ -1115,6 +1117,8 @@ selectQuery returns[ default query = {} ]
       excludingClause[ $query ]?
     |
       ( ALL/DISTINCT { $query.quantifier = this.valueWithLocation(); } )?
+      // TODO TOOL: move <prepare> to all branches if "simple", or with special <…,attach>
+      {;} <prepare=inSelectItem, arg=sqlStyle>
       ( '*' { $query.columns = [ this.valueWithLocation() ]; }
       | selectItemDef[ ($query.columns = []) ]
       )
@@ -1692,7 +1696,7 @@ options{ minTokensMatched = 1 }
           )*
         )
       )
-      ')'
+      ')' { this.finalizeDictOrArray( $pathStep.args ); }
     )?
      // TODO: not with function!
     cardinalityAndFilter[ ...$ ]?
@@ -1972,11 +1976,19 @@ annoValue returns[ default value = {} ]
       ( sub=annoValue { $value.val.push( $sub ) }
       |
         <cond=arrayAnno, arg=ellipsis> ellipsis='...'
-        ( UP TO upTo=annoValue | { $upTo = undefined; } )
-        { $value.val.push( { literal: 'token', val: '...', location: $ellipsis.location, upTo: $upTo } ); }
+        ( UP TO upTo=annoValue
+          { $value.val.push( { literal: 'token', val: '...', location: $ellipsis.location, upTo: $upTo } ); }
+        | { $value.val.push( { literal: 'token', val: '...', location: $ellipsis.location } ); }
+        )
+        // TODO TOOL: if at last good state the command is ['g'],resume after the
+        // gotos, do not execute its actions - ?
+        // ( UP TO upTo=annoValue | { $upTo = undefined; } )
+        // { $value.val.push( { literal: 'token', val: '...', location: $ellipsis.location, upTo: $upTo } ); }
       )
       ( ',' | <exitLoop> )
     )*
+    // TODO TOOL: allow ( <cond=arrayAnno, arg=bracket> ']' )
+    { this.ec( 'arrayAnno', 'bracket' ); }<always>
     ']'
   |
     '(' $value=condition ')' { $value.$tokenTexts = this.ruleTokensText(); }

package/lib/utils/objectUtils.js

@@ -83,6 +83,18 @@ function setHidden( obj, prop, val ) {
   } );
 }
 
+/**
+ * Check if the given object has the property as non-enumerable
+ *
+ * @param {Object} object
+ * @param {string} propertyName
+ * @returns {boolean}
+ */
+function hasNonEnumerable( object, propertyName ) {
+  return Object.prototype.hasOwnProperty.call( object, propertyName ) &&
+    !Object.prototype.propertyIsEnumerable.call( object, propertyName );
+}
+
 module.exports = {
   copyPropIfExist,
   createDict,
@@ -90,4 +102,5 @@ module.exports = {
   forEachValue,
   forEachKey,
   setHidden,
+  hasNonEnumerable,
 };

package/package.json

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