@sap/cds-compiler 3.8.0 → 3.8.2

package/lib/json/from-csn.js

@@ -1409,8 +1409,7 @@ function annotation( val, spec, xsn, csn, name ) {
     return undefined;
   n.absolute = absolute;
   if (variantIndex < absolute.length)
-    n.variant = { id: name.substring( variantIndex ), location: location() };
-
+    n.variant = refSplit( name.substring( variantIndex ), null );
   const r = annoValue( val, spec );
   r.name = n;
   return r;

package/lib/language/genericAntlrParser.js

@@ -974,7 +974,8 @@ function pushIdent( path, ident, prefix ) {
 }
 
 // For :param, #variant, #symbol, @(…) and @Begin and `@` inside annotation paths
-function reportUnexpectedSpace( prefix, location = this.tokenLocation( this._input.LT(1) ) ) {
+function reportUnexpectedSpace( prefix = this._input.LT(-1),
+                                location = this.tokenLocation( this._input.LT(1) ) ) {
   const prefixLoc = this.tokenLocation( prefix );
   if (prefixLoc.endLine !== location.line ||
       prefixLoc.endCol !== location.col) {

package/lib/language/language.g4

@@ -2583,7 +2583,7 @@ annotationAssignment_fix[ art ] locals[ assignment ]
     |
       { $assignment = { name: {} }; }
       annotationPath[ $assignment.name, 'anno' ]
-      annotationPathVariant[ $assignment.name ]?
+      ( '#' annotationPathVariant[ $assignment.name ] )?
       { this.warnIfColonFollows( $assignment ); }
     )
   ;
@@ -2601,7 +2601,7 @@ annotationAssignment_ll1[ art ] locals[ assignment ]
     |
       { $assignment = { name: {} }; }
       annotationPath[ $assignment.name, 'anno' ]
-      annotationPathVariant[ $assignment.name ]?
+      ( '#' annotationPathVariant[ $assignment.name ] )?
       (
         ':' { this.meltKeywordToIdentifier(true); } // allow path as anno value start with reserved
         val=annoValue[ $assignment ]
@@ -2627,11 +2627,7 @@ annotationAssignment_atn[ art ] locals[ assignment ]
       // before an "expression" which can start with a '#' for an enum value
       // -> used to introduce variant name if and only if in same line as previous token
       { this.setLocalToken( '#', 'HelperToken1', null, true ); }
-      (
-        hash=HelperToken1
-        { this.meltKeywordToIdentifier();; this.reportUnexpectedSpace( $hash ); }
-        variant=ident['variant'] { $assignment.name.variant = $variant.id; }
-      )?
+      ( hash=HelperToken1 annotationPathVariant[ $assignment.name ] )?
       // ':' is in the follow set of this rule, as it is used in rule "selectItemDef"
       // before an "expression" which can start with a ':' for a parameter reference
       // -> used to introduce assignment value if and only if in same line as previous token
@@ -2643,11 +2639,7 @@ annotationAssignment_atn[ art ] locals[ assignment ]
         |
           atv='@'? annotationPath[ $assignment, 'ref', $atv ]
           { this.setLocalToken( '#', 'HelperToken1', null, true ); } // see above
-          (
-            hash=HelperToken1
-            { this.meltKeywordToIdentifier();; this.reportUnexpectedSpace( $hash ); }
-            variant=ident['variant'] { $assignment.variant = $variant.id; }
-          )?
+          ( hash=HelperToken1 annotationPathVariant[ $assignment ] )?
         )
       )?
     )
@@ -2658,11 +2650,11 @@ annotationAssignment_paren[ art ]
     '('
     // allow completely useless `@()`; no warning anymore - who cares?
     {
-      this.meltKeywordToIdentifier();
       if (this.isStraightBefore(')')) {
         this.matchWildcard();   // we know it is the ')' - we do not reach the final match
         return $ctx;
       }
+      this.meltKeywordToIdentifier();
     }
     annotationAssignment_1[ $art ]
     ( ','
@@ -2679,7 +2671,7 @@ annotationAssignment_1[ art ] locals[ assignment = { name: {} } ]
 @after { this.assignAnnotation( $art, $assignment ); }
   :
     annotationPath[ $assignment.name, 'anno' ]
-    annotationPathVariant[ $assignment.name ]?
+    ( '#' annotationPathVariant[ $assignment.name ] )?
     (
       ':' { this.meltKeywordToIdentifier(true); } // allow path as anno value start with reserved
       val=annoValue[ $assignment ]
@@ -2704,11 +2696,11 @@ annotationPath[ art, category, headat = null ] locals[ _sync = 'nop' ]
     )*
   ;
 
+// Before calling this rule, match '#'
 annotationPathVariant[ art ] locals[ variant = {} ]
 @after { this.attachLocation($art); }
   :
-    // TODO: warning for space after '#'
-    hash='#' { this.meltKeywordToIdentifier();; this.reportUnexpectedSpace( $hash ); }
+    { this.reportUnexpectedSpace();; this.meltKeywordToIdentifier(); }
     simplePath[ $variant, 'variant' ] { $art.variant = $variant; }
   ;
 
@@ -2719,7 +2711,7 @@ annoValue[ assignment ]
     // no docComment() here
     // this alternative is done with token rewrite in rule "annotationAssignment_atn"
     at='@'? annotationPath[ $assignment, 'ref', $at ]
-    annotationPathVariant[ $assignment ]?
+    ( '#' annotationPathVariant[ $assignment ] )?
   ;
 
 annoValueBase[ assignment ] locals [ seenEllipsis = false ]
@@ -2739,6 +2731,7 @@ annoValueBase[ assignment ] locals [ seenEllipsis = false ]
   |
     '['                 // no need for createArray() here, $assignment.location is set
     { $assignment.val = []; $assignment.literal = 'array'; }
+    { this.meltKeywordToIdentifier(true); }
     (
       (
         head=annoSubValue  { $assignment.val.push( $head.val ); }
@@ -2753,6 +2746,7 @@ annoValueBase[ assignment ] locals [ seenEllipsis = false ]
       )
       (
         ',' { if (this.isStraightBefore(']')) break; } // allow ',' before ']'
+        { this.meltKeywordToIdentifier(true); }
         (
           tail=annoSubValue { $assignment.val.push( $tail.val ); }
         |
@@ -2794,7 +2788,7 @@ annoValueBase[ assignment ] locals [ seenEllipsis = false ]
 flattenedValue[ assignment ] locals[ val = { name: {} } ]
   :
     at='@'? annotationPath[ $val.name, 'name', $at ]
-    ( annotationPathVariant[ $val.name ] )?
+    ( '#' annotationPathVariant[ $val.name ] )?
     (
       ':' { this.meltKeywordToIdentifier(true); } // allow path as anno value start with reserved
       annoValue[ $val ]
@@ -2805,7 +2799,8 @@ flattenedValue[ assignment ] locals[ val = { name: {} } ]
 namedValue[ struct ] locals[ val = { name: {} } ]
   :
     at='@'? annotationPath[ $val.name, 'name', $at ]
-    ( ':' sub=annoSubValue { Object.assign( $val, $sub.val ); } )?
+    ( ':' { this.meltKeywordToIdentifier(true); }
+      sub=annoSubValue { Object.assign( $val, $sub.val ); } )?
     {
       if (!$val.location) $val.location = $val.name.location;
       this.addDef( $val, $struct, 'struct', null, $val.name ); // TODO: re-check name
@@ -2830,8 +2825,10 @@ annoSubValue returns[ val = {} ]
   |
     '['                 // no need for createArray() here, $val.location is set
     { $val.val = []; $val.literal = 'array'; }
+    { this.meltKeywordToIdentifier(true); }
     ( head=annoSubValue { $val.val.push( $head.val ); }
       ( ',' { if (this.isStraightBefore(']')) break; } // allow ',' before ']'
+        { this.meltKeywordToIdentifier(true); }
         tail=annoSubValue { $val.val.push( $tail.val ); }
       )*
     )?
@@ -2843,7 +2840,7 @@ annoSubValue returns[ val = {} ]
     { Object.assign( $val, this.numberLiteral( $num, $plus||$min ) ); }
   |
     at='@'? annotationPath[ $val, 'ref', $at ]
-    ( annotationPathVariant[ $val ] )?
+    ( '#' annotationPathVariant[ $val ] )?
   |
     '('
       cond=condition
@@ -2857,7 +2854,7 @@ literalValue returns[ val ] locals[ tok ]
 @init{ $tok = this.getCurrentToken(); }
 @after { this.attachLocation($val); }
   :
-    hash='#' { this.meltKeywordToIdentifier();; this.reportUnexpectedSpace( $hash ); }
+    hash='#' { this.reportUnexpectedSpace( $hash );; this.meltKeywordToIdentifier(); }
     name=ident['enumref']   // TODO v4: remove from this rule (not in enum!)
     { $val = { literal: 'enum', sym: $name.id } }
   |

package/lib/model/csnRefs.js

@@ -620,6 +620,9 @@ function csnRefs( csn, universalReady ) {
         return resolvePath( path, art, parent, 'parent' );
       }
 
+      if (!qcache)
+        throw new CompilerAssertion( `Query not in cache at: ${ locationString(query.$location) }` );
+
       if (semantics.dynamic === 'query')
         // TODO: for ON condition in expand, would need to use cached _element
         return resolvePath( path, qcache.elements[head], null, 'query' );
@@ -882,8 +885,8 @@ function traverseFrom( from, fromSelect, parentQuery, callback ) {
   }
   else if (from.args) {         // join
     from.args.forEach( arg => traverseFrom( arg, fromSelect, parentQuery, callback ) );
-    if (from.on)                // join-on, potentially having a sub query
-      from.on.forEach( arg => traverseQuery( arg, null, fromSelect, callback ) );
+    if (from.on)                // join-on, potentially having a sub query (in xpr)
+      from.on.forEach(arg => traverseExpr(arg, fromSelect, callback));
   }
   else {                        // sub query in FROM
     traverseQuery( from, fromSelect, parentQuery, callback );

package/package.json

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