@sap/cds-compiler 2.7.0 → 2.11.2

package/lib/edm/edmUtils.js

@@ -1,4 +1,5 @@
 'use strict';
+const { setProp } = require('../base/model');
 const { isBuiltinType, isEdmPropertyRendered } = require('../model/csnUtils');
 
 /* eslint max-statements-per-line:off */
@@ -114,6 +115,12 @@ function isToMany(assoc) {
   return targetMax === '*' || Number(targetMax) > 1;
 }
 
+function isSingleton(entityCsn, v) {
+  const singleton = entityCsn['@odata.singleton'];
+  const hasNullable = entityCsn['@odata.singleton.nullable'] !== undefined && entityCsn['@odata.singleton.nullable'] !== null;
+  return v && singleton || ((singleton === undefined || singleton === null) && hasNullable);
+}
+
 function isEntity(artifact)
 {
   return ['entity'].includes(artifact.kind);
@@ -154,7 +161,7 @@ function resolveOnConditionAndPrepareConstraints(csn, assocCsn, messageFunctions
     getExpressionArguments(assocCsn.on);
 
     // for all $self conditions, fill constraints of partner (if any)
-    let isBacklink = assocCsn._constraints.selfs.length == 1 && assocCsn._constraints.termCount == 1;
+    let isBacklink = assocCsn._constraints.selfs.length === 1 && assocCsn._constraints.termCount === 1;
 
     /* example for _originalTarget:
     entity E (with parameters) {
@@ -172,10 +179,12 @@ function resolveOnConditionAndPrepareConstraints(csn, assocCsn, messageFunctions
       const originAssocCsn = resolveOriginAssoc(csn, (assocCsn._originalTarget || assocCsn._target), partnerPath);
       const parentName = assocCsn.$abspath[0];
       const parent = csn.definitions[parentName];
-      const originParentName = originAssocCsn.$abspath[0];
       if(originAssocCsn) {
-        if(originAssocCsn._originalTarget !== parent && originAssocCsn._target !== parent) {
+        const originParentName = originAssocCsn.$abspath[0];
+        if(parent.$mySchemaName && originAssocCsn._originalTarget !== parent && originAssocCsn._target !== parent) {
           isBacklink = false;
+          // Partnership is ambiguous
+          setProp(originAssocCsn, '$noPartner', true);
           info(null, ['definitions', parentName, 'elements', assocCsn.name],
             `"${originParentName}:${partnerPath.join('.')}" with target "${originAssocCsn._target.name}" is compared with $self which represents "${parentName}"`);
         }
@@ -183,14 +192,17 @@ function resolveOnConditionAndPrepareConstraints(csn, assocCsn, messageFunctions
           // Mark this association as backlink if $self appears exactly once
           // to surpress edm:Association generation in V2 mode
           if(isBacklink) {
-            // use first backlink as partner
+            // establish partnership with origin assoc but only if this association is the first one
             if(originAssocCsn._selfReferences.length === 0) {
               assocCsn._constraints._partnerCsn = originAssocCsn;
             }
             else {
               isBacklink = false;
             }
-            // collect all backlinks at forward association
+          }
+          // store all backlinks at forward, required to calculate rendering of foreign keys
+          // if the termCount != 1 or more than one $self compare this is not a backlink
+          if(parent.$mySchemaName && assocCsn._constraints.selfs.length === 1 && assocCsn._constraints.termCount === 1) {
             originAssocCsn._selfReferences.push(assocCsn);
           }
           assocCsn._constraints._origins.push(originAssocCsn);
@@ -512,7 +524,7 @@ function determineMultiplicity(csn)
 
 function mapCdsToEdmType(csn, messageFunctions, isV2=false, isMediaType=false)
 {
-  const { warning, error } = messageFunctions;
+  const { error } = messageFunctions || { error: ()=>true };
   let cdsType = csn.type;
   if(cdsType === undefined) {
     error(null, csn.$location, `no type found`);
@@ -581,8 +593,6 @@ function mapCdsToEdmType(csn, messageFunctions, isV2=false, isMediaType=false)
     if(['cds.hana.ST_POINT', 'cds.hana.ST_GEOMETRY'].includes(cdsType)) {
       error(null, csn.$path, { type: cdsType }, `OData V2 does not support Geometry data types, $(TYPE) can't be mapped`);
     }
-    if(cdsType === 'cds.DecimalFloat' || cdsType === 'cds.hana.SMALLDECIMAL')
-      warning(null, csn.$path, { type: cdsType }, `OData V2 does not support $(TYPE)`);
   }
   else // isV4
   {
@@ -609,13 +619,21 @@ function addTypeFacets(node, csn)
   //   node.Precision = 16;
   else if (csn.type === 'cds.Timestamp' && node.Type === 'Edm.DateTimeOffset')
     node.Precision = 7;
-  else if([ 'cds.Decimal', 'cds.DecimalFloat', 'cds.hana.SMALLDECIMAL' ].includes(csn.type) && !csn.precision && !csn.scale) {
+  if([ 'cds.Decimal', 'cds.DecimalFloat', 'cds.hana.SMALLDECIMAL' ].includes(csn.type)) {
     if(isV2) {
-      node.setXml( { 'sap:variable-scale': true } );
+      // no prec/scale or scale is 'floating'/'variable'
+      if(!(csn.precision || csn.scale) || ['floating', 'variable'].includes(csn.scale)) {
+        node.setXml( { 'sap:variable-scale': true } );
+        delete node.Scale;
+      }
     }
     else {
-      // if Decimal has no p, s set scale 'variable'
-      node.setXml( { Scale: 'variable' } ); // floating is V4.01
+      // map both floating and variable to => variable
+      if(node.Scale === 'floating')
+        node.Scale = 'variable';
+      if(!csn.precision && !csn.scale)
+        // if Decimal has no p, s set scale 'variable'
+        node.setXml( { Scale: 'variable' } ); // floating is V4.01
     }
   }
   // Unicode unused today
@@ -698,6 +716,7 @@ module.exports = {
   isComposition,
   isAssociationOrComposition,
   isToMany,
+  isSingleton,
   isEntity,
   isStructuredType,
   isStructuredArtifact,

package/lib/gen/language.checksum

@@ -1 +1 @@
-68ef41786d2cc326d5484ed44fd17f47
+e80280336eed20b6633835d33df8ec76