@sap/cds-compiler 4.5.0 → 4.6.0

package/lib/edm/edmPreprocessor.js

@@ -5,7 +5,7 @@ const { setProp, isDeprecatedEnabled, isBetaEnabled } = require('../base/model')
 const {
   forEachDefinition, forEachGeneric, forEachMemberRecursively,
   isEdmPropertyRendered, getUtils, cloneCsnNonDict,
-  isBuiltinType, applyTransformations, cloneAnnotationValue, cardinality2str,
+  isBuiltinType, applyTransformations, cloneAnnotationValue, cardinality2str, isAnnotationExpression,
 } = require('../model/csnUtils');
 const edmUtils = require('./edmUtils.js');
 const edmAnnoPreproc = require('./edmAnnoPreprocessor.js');
@@ -97,7 +97,7 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
   */
   if (csn.meta && csn.meta.options && csn.meta.options.odataVersion === 'v4' && options.isV2()) {
     // eslint-disable-next-line global-require
-    const { toFinalBaseType } = require('../transform/transformUtils').getTransformers(csn, options);
+    const { toFinalBaseType } = require('../transform/transformUtils').getTransformers(csn, options, messageFunctions);
     expandCSNToFinalBaseType(csn, { toFinalBaseType }, csnUtils, serviceRootNames, options);
   }
 
@@ -721,11 +721,11 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
       // FK creation.
       // The FK creation already propagates the annotations from the association
       const elements = construct.items && construct.items.elements || construct.elements;
-      const fk = elements[element['@odata.foreignKey4']];
-      for (const attrName in fk) {
-        const attr = fk[attrName];
-        if (attrName[0] === '@')
-          edmUtils.assignAnnotation(element, attrName, attr);
+      const assoc = elements[element['@odata.foreignKey4']];
+      if (assoc) {
+        Object.keys(assoc).filter(pn => pn[0] === '@' && !isAnnotationExpression(assoc[pn])).forEach((pn) => {
+          edmUtils.assignAnnotation(element, pn, assoc[pn]);
+        });
       }
       // and eventually remove some afterwards
       if (options.isV2())
@@ -1074,8 +1074,10 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
 
     function muteNavProp( elt, msg = 'std' ) {
       edmUtils.assignAnnotation(elt, '@odata.navigable', false);
-      warning('odata-navigation', [ 'definitions', struct.name, 'elements', elt.name ],
-              { target: elt._target.name, service: globalSchemaPrefix, '#': msg });
+      if (elt._target['@cds.autoexpose'] !== false) {
+        warning('odata-navigation', [ 'definitions', struct.name, 'elements', elt.name ],
+                { target: elt._target.name, service: globalSchemaPrefix, '#': msg });
+      }
     }
 
     function createSchemaRefFor( targetSchemaName ) {

package/lib/edm/edmUtils.js

@@ -551,8 +551,11 @@ function mapCdsToEdmType( csn, messageFunctions, isV2 = false, isMediaType = fal
     Edm.GeometryCollection
     */
   }[cdsType];
-  if (!edmType)
-    error(null, location, { type: cdsType }, 'No EDM type available for $(TYPE)');
+  if (!edmType) {
+    error('ref-unsupported-type', location, { type: cdsType, '#': 'odata' });
+    edmType = 'Edm.PrimitiveType';
+  }
+
 
   if (isV2) {
     if (edmType === 'Edm.Date')

package/lib/gen/Dictionary.json

@@ -2076,6 +2076,8 @@
       "Type": "Validation.ConstraintType",
       "AppliesTo": [
         "Property",
+        "NavigationProperty",
+        "Parameter",
         "EntityType",
         "ComplexType"
       ]

package/lib/gen/language.checksum

@@ -1 +1 @@
-942cce045e6fb6ecaf7cbf3039001aa9
+99b88c455f59a02a22d3d2ee662b8136