@sap/cds-compiler 5.7.4 → 5.8.2

package/lib/edm/annotations/edmJson.js

@@ -163,7 +163,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
         });
       }
     }
-    const edmTypeName = edmUtils.mapCdsToEdmType(csnType, messageFunctions, options.isV2(), false, location);
+    const edmTypeName = edmUtils.mapCdsToEdmType(csnType, messageFunctions, options, false, location);
     const typeFunc = { func: 'Type', args: [ { val: edmTypeName } ] };
     const castFunc = { func: '$Cast', args: [ typeFunc, castExpr[1] ] };
 

package/lib/edm/annotations/genericTranslation.js

@@ -367,7 +367,7 @@ function csn2annotationEdm( reqDefs, reqDefsUtils, csnVocabularies, serviceName,
 
       function mapType( p ) {
         if (isBuiltinType(p.type)) {
-          return edmUtils.mapCdsToEdmType(p, messageFunctions, false /* is only called for v4 */);
+          return edmUtils.mapCdsToEdmType(p, messageFunctions, options /* is only called for v4 */);
         }
         else if (options.whatsMySchemaName) {
           const schemaName = options.whatsMySchemaName(p._edmType || p.type);
@@ -1774,7 +1774,7 @@ function mergeOdataVocabularies( options, message ) {
             defOk = false;
           }
           else if (name === 'Alias' && !edmUtils.isODataSimpleIdentifier(def[name])) {
-            message('odata-spec-violation-id', null, { id: name, value: def[name], '#': 'vocrefalias' });
+            message('odata-spec-violation-id', null, { id: name, value: def[name], '#': 'vocRefAlias' });
             defOk = false;
           }
         });

package/lib/edm/csn2edm.js

@@ -544,7 +544,7 @@ function csn2edmAll( _csn, _options, serviceNames, messageFunctions ) {
             // FIXME: Rewrite signalIllegalIdentifier function to be more flexible
             message('odata-spec-violation-id', pLoc,
                     {
-                      prop: p._edmAttributes.Name[0], id: p._edmAttributes.Name, version: '2.0', '#': 'v2firstchar',
+                      prop: p._edmAttributes.Name[0], id: p._edmAttributes.Name, version: '2.0', '#': 'v2firstChar',
                     });
           }
         });
@@ -969,7 +969,7 @@ function csn2edmAll( _csn, _options, serviceNames, messageFunctions ) {
                 message('odata-spec-violation-returns', returnsLoc, { kind: action.kind, version: '2.0' });
               }
               else if (isBuiltinType(type)) {
-                type = edmUtils.mapCdsToEdmType(returns, messageFunctions, true);
+                type = edmUtils.mapCdsToEdmType(returns, messageFunctions, _options);
                 if (type) {
                   const td = EdmPrimitiveTypeMap[type];
                   if (td && !td.v2) {

package/lib/edm/edmPreprocessor.js

@@ -888,17 +888,23 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
           // if the forward association has set a src cardinality and it deviates from the backlink target cardinality raise a warning
           // in V2 only, in V4 the source cardinality is rendered implicitly at the Type property
           if (element._constraints._partnerCsn.cardinality.src) {
+            const partnerCsn = element._constraints._partnerCsn;
             // eslint-disable-next-line eqeqeq
-            const srcMult = (element._constraints._partnerCsn.cardinality.src == 1) ? '0..1' : '*';
+            const srcMult = (partnerCsn.cardinality.src == 1) ? '0..1' : '*';
             const newMult
               = (element.cardinality?.min == 1 && element.cardinality?.max == 1) // eslint-disable-line eqeqeq
-
-                ? '1'
+                ? 1
                 : (element.cardinality?.max === '*' || element.cardinality?.max > 1)
                   ? '*'
                   : '0..1';
-            if (srcMult !== newMult)
-              warning(null, element.$path, `Explicit source cardinality "${srcMult}" of "${element._constraints._partnerCsn._parent.name}/${element._constraints._partnerCsn.name}" conflicts with target cardinality "${newMult}"`);
+            if (srcMult !== newMult) {
+              // TODO: Message should probably list actual cardinalities and not "normalized" ones.
+              warning('odata-unexpected-cardinality', element.$path, {
+                value: srcMult,
+                othervalue: newMult,
+                name: `${partnerCsn._parent.name}/${partnerCsn.name}`,
+              }, 'Explicit source cardinality $(VALUE) of $(NAME) conflicts with target cardinality $(OTHERVALUE)' );
+            }
           }
           else {
             // .. but only if the original assoc hasn't set src yet
@@ -1691,7 +1697,7 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
         // check for legal scalar types, proxy exposed structured types are not resolvable in CSN
         // V2 allows any Edm.PrimitiveType (even Double and Binary), V4 is more specific:
         if (options.isV4() && type && !type.target && isBuiltinType(type.type)) {
-          const edmType = edmUtils.mapCdsToEdmType(type);
+          const edmType = edmUtils.mapCdsToEdmType(type, messageFunctions, _options);
           const legalEdmTypes = {
             'Edm.Boolean': 1,
             'Edm.Byte': 1,
@@ -2173,16 +2179,16 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
       return;
     }
     else if (obj.type && isBuiltinType(obj.type) && !obj.target && !obj.targetAspect) {
-      const edmType = edmUtils.mapCdsToEdmType(obj, messageFunctions, _options.odataVersion === 'v2', obj['@Core.MediaType']);
+      const edmType = edmUtils.mapCdsToEdmType(obj, messageFunctions, _options, obj['@Core.MediaType']);
       edmUtils.assignProp(obj, '_edmType', edmType);
     }
     else if (obj.$isCollection && (obj.items && isBuiltinType(csnUtils.getFinalTypeInfo(obj.items.type)?.type))) {
-      const edmType = edmUtils.mapCdsToEdmType(obj.items, messageFunctions, _options.odataVersion === 'v2', obj['@Core.MediaType'], obj.$path);
+      const edmType = edmUtils.mapCdsToEdmType(obj.items, messageFunctions, _options, obj['@Core.MediaType'], obj.$path);
       edmUtils.assignProp(obj, '_edmType', edmType);
     }
     // This is the special case when we have array of array, but will not be supported in the future
     else if (obj.$isCollection && obj.items && obj.items.type && obj.items.items && isBuiltinType(csnUtils.getFinalTypeInfo(obj.items.items.type)?.type)) {
-      const edmType = edmUtils.mapCdsToEdmType(obj.items.items, messageFunctions, _options.odataVersion === 'v2', obj['@Core.MediaType']);
+      const edmType = edmUtils.mapCdsToEdmType(obj.items.items, messageFunctions, _options, obj['@Core.MediaType']);
       edmUtils.assignProp(obj, '_edmType', edmType);
     }
   }

package/lib/edm/edmUtils.js

@@ -137,8 +137,12 @@ function resolveOnConditionAndPrepareConstraints( csn, assocCsn, messageFunction
           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}"`);
+          info('odata-unexpected-comparison', [ 'definitions', parentName, 'elements', assocCsn.name ], {
+            name: `${originParentName}:${partnerPath.join('.')}`,
+            target: originAssocCsn._target.name,
+            id: '$self',
+            alias: parentName,
+          }, 'Ambiguous comparison of $(NAME) with target $(TARGET) to $(ID) which represents $(ALIAS)');
         }
         if (originAssocCsn.target) {
           // Mark this association as backlink if $self appears exactly once
@@ -489,9 +493,10 @@ function getEffectiveTargetCardinality( csn ) {
   return rc;
 }
 
-function mapCdsToEdmType( csn, messageFunctions, isV2 = false, isMediaType = false, location = undefined ) {
+function mapCdsToEdmType( csn, messageFunctions, options, isMediaType = false, location = undefined ) {
   if (location === undefined)
     location = csn.$path;
+  const isV2 = options.odataVersion === 'v2';
   const { error } = messageFunctions || { error: () => true };
   const cdsType = csn.type;
   if (cdsType === undefined) {
@@ -554,8 +559,10 @@ function mapCdsToEdmType( csn, messageFunctions, isV2 = false, isMediaType = fal
     */
   }[cdsType];
   if (!edmType) {
-    error('ref-unsupported-type', location,
-          { type: cdsType, version: (isV2 ? '2.0' : '4.0'), '#': 'odata' });
+    if (isEdmPropertyRendered(csn, options)) {
+      error('ref-unsupported-type', location,
+            { type: cdsType, version: (isV2 ? '2.0' : '4.0'), '#': 'odata' });
+    }
     // return a version compatible type to avoid later compatibility failures
     edmType = isV2 ? 'Edm.String' : 'Edm.PrimitiveType';
   }

package/lib/gen/CdlGrammar.checksum

@@ -0,0 +1 @@
+f2ee15363af822d120947887515d2414