@sap/cds-compiler 3.3.2 → 3.4.2

package/lib/edm/annotations/genericTranslation.js

@@ -6,7 +6,6 @@ const oDataDictionary = require('../../gen/Dictionary.json');
 const { forEachDefinition } = require('../../model/csnUtils');
 const { forEach } = require("../../utils/objectUtils");
 
-
 /*
    OASIS: https://github.com/oasis-tcs/odata-vocabularies/tree/master/vocabularies
    Aggregation (published)
@@ -562,6 +561,9 @@ function csn2annotationEdm(csn, serviceName, Edm = undefined, options=undefined,
           alternativeEdmTargetName = serviceName + '.EntityContainer/' + alternativeEdmTargetName.substr(lastDotIndex + 1);
         hasAlternativeCarrier = carrier.$hasEntitySet;
       }
+      else if(carrier.kind === 'type') {
+        testToStandardEdmTarget = (x => x ? x.includes(carrier.elements ? 'ComplexType' : 'TypeDefinition') : true);
+      }
       else if (carrier.kind === 'service') {
       // if annotated object is a service, annotation goes to EntityContainer,
       //   except if AppliesTo contains Schema but not EntityContainer, then annotation goes to Schema
@@ -653,14 +655,15 @@ function csn2annotationEdm(csn, serviceName, Edm = undefined, options=undefined,
           Insert $value into $edmJson with inner annotation as well.
         */
         if(innerAnnotation) {
-          if(carrier[prefix]) {
+          // != null => also != undefined
+          if(carrier[prefix] != null) {
             const valPrefix = prefix + '.$value';
             carrier[valPrefix] = carrier[prefix];
             delete carrier[prefix];
             rc = true;
           }
           const edmJsonPrefix = prefix + '.$edmJson';
-          if(carrier[edmJsonPrefix]) {
+          if(carrier[edmJsonPrefix] != null) {
             const valPrefix = prefix + '.$value.$edmJson';
             carrier[valPrefix] = carrier[edmJsonPrefix];
             delete carrier[edmJsonPrefix];
@@ -908,7 +911,7 @@ function csn2annotationEdm(csn, serviceName, Edm = undefined, options=undefined,
         oTarget.append(handleEdmJson(cAnnoValue['$edmJson'], context));
       }
       else if ( Object.keys(cAnnoValue).filter( x => x[0] !== '@' ).length === 0) {
-        // object consists only of properties starting with "@"
+        // object consists only of properties starting with "@", no $value
         message(warning, context, 'nested annotations without corresponding base annotation');
       }
       else {

package/lib/edm/csn2edm.js

@@ -731,7 +731,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
 
         });
         if(options.isV2()) {
-          if(streamProps.length > 1) {
+          if(streamProps.length > 1) { // TODO: why not mention 2.0 in text?
             error(null, ['definitions', elementsCsn.name], { names: streamProps, version: '2.0', anno: '@Core.MediaType' },
                  `Expected only one element to be annotated with $(ANNO) for OData $(VERSION) but found $(NAMES)`);
           }

package/lib/gen/language.checksum

@@ -1 +1 @@
-d054015b5c1bda3f92422cb3f44733bb
+5a5c0432924af9c8833ad5aa6b94724f