@sap/cds-compiler 3.9.4 → 4.0.0

package/lib/compiler/tweak-assocs.js

@@ -17,6 +17,7 @@ const {
   traverseQueryPost,
   traverseQueryExtra,
   setExpandStatus,
+  traverseExpr,
 } = require('./utils');
 
 const $location = Symbol.for('cds.$location');
@@ -31,13 +32,12 @@ function tweakAssocs( model ) {
   const {
     effectiveType,
     getOrigin,
-    resolveExpr,
+    navigationEnv,
   } = model.$functions;
-  const { environment } = model.$volatileFunctions;
 
   // Phase 5: rewrite associations
   model._entities.forEach( rewriteArtifact );
-  // Think hard whether an on condition rewrite can lead to a new cylcic
+  // Think hard whether an on condition rewrite can lead to a new cyclic
   // dependency.  If so, we need other messages anyway.  TODO: probably do
   // another cyclic check with testMode.js
   return;
@@ -313,7 +313,8 @@ function tweakAssocs( model ) {
       return;
     }
     if (!nav.tableAlias || nav.tableAlias.path) {
-      resolveExpr( cond, rewriteExpr, elem, nav.tableAlias );
+      traverseExpr( cond, 'rewrite-on', elem,
+                    expr => rewriteExpr( expr, elem, nav.tableAlias ) );
     }
     else {
       // TODO: support that, now that the ON condition is rewritten in the right order
@@ -452,6 +453,7 @@ function tweakAssocs( model ) {
   function rewriteItem( elem, item, name, assoc, forKeys ) {
     // TODO: for rewriting ON conditions of explicitly provided model targets,
     // we need to only rewrite the current element, not all sibling elements
+    // TODO: this will be different in v4
     if (!elem._redirected)
       return true;
     for (const alias of elem._redirected) {
@@ -480,8 +482,8 @@ function tweakAssocs( model ) {
         item.id = name;
       }
     }
-    const env = name && environment(elem);
-    elem = setArtifactLink( item, env && env[name] );
+    const env = name && navigationEnv(elem);
+    elem = setArtifactLink( item, env?.elements?.[name] );
     if (elem && !Array.isArray(elem))
       return elem;
     // TODO: better (extra message), TODO: do it

package/lib/compiler/utils.js

@@ -442,6 +442,47 @@ function isDirectComposition( art ) {
   return type && type[0] && type[0].id === 'cds.Composition';
 }
 
+function traverseExpr( expr, exprCtx, user, callback ) {
+  if (!expr || typeof expr === 'string') // parse error or keywords in {xpr:...}
+    return;
+
+  if (expr.path) {
+    callback( expr, exprCtx, user );
+    // TODO: move arguments and filter traversal to here
+    return;
+  }
+  else if (expr.type || expr.query) {
+    callback( expr, exprCtx, user );
+  }
+
+  if (expr.args) {
+    const args = Array.isArray(expr.args) ? expr.args : Object.values( expr.args );
+    // TODO: re-think $expected
+    args.forEach( e => traverseExpr( e, exprCtx, user, callback ) );
+  }
+  if (expr.suffix)              // fn( … ) OVER …
+    expr.suffix.forEach( e => traverseExpr( e, exprCtx, user, callback ) );
+}
+
+function userQuery( user ) {
+  // TODO: we need _query links set by the definer
+  while (user._main) {
+    if (user.kind === 'select' || user.kind === '$join')
+      return user;
+    user = user._parent;
+  }
+  return null;
+}
+
+function definedViaCdl( art ) {
+  // return !!art._block?.artifacts;
+  // TODO: the above code would work when _block links are correctly set on
+  // members of duplicate extensions, see test3/Extensions/DuplicateExtend/.  The
+  // following is a workaround to make at least ref to builtins work:
+  const { $frontend } = art._block || art;
+  return $frontend !== 'json' && $frontend !== '$internal';
+}
+
 module.exports = {
   pushLink,
   annotationVal,
@@ -470,4 +511,7 @@ module.exports = {
   setExpandStatus,
   setExpandStatusAnnotate,
   isDirectComposition,
+  traverseExpr,
+  userQuery,
+  definedViaCdl,
 };

package/lib/edm/annotations/genericTranslation.js

@@ -412,6 +412,12 @@ function csn2annotationEdm(reqDefs, csnVocabularies, serviceName,
         handleAnnotations(edmTargetName, p, [ ...location, 'params', n ]);
       });
     }
+    if(cAction.returns) {
+      const edmTargetName = actionName + '/$ReturnType';
+      setProp(cAction.returns, '$appliesToReturnType', true);
+      handleAnnotations(edmTargetName, cAction.returns, [ ...location, 'returns' ]);
+      delete cAction.returns['$appliesToReturnType'];
+    }
 
     function relParList() {
     // we rely on the order of params in the csn being the correct one
@@ -464,7 +470,7 @@ function csn2annotationEdm(reqDefs, csnVocabularies, serviceName,
     // keep only those annotations that - start with a known vocabulary name
     //                                  - have a value other than null
 
-    // if the carier is an element that is not rendered or
+    // if the carrier is an element that is not rendered or
     // if the carrier is a derived type of a primitive type which is not rendered in V2
     // if the carrier is a media stream element in V2
     // do nothing
@@ -656,8 +662,10 @@ function csn2annotationEdm(reqDefs, csnVocabularies, serviceName,
               carrier.cardinality && carrier.cardinality.max === '*' && x.includes('Collection')
             : true);
         }
+        else if(carrier.$appliesToReturnType)
+          testToStandardEdmTarget = (x => x ? x.includes('ReturnType') : true);
         else {
-        // this might be more precise if handleAnnotation would know more about the carrier
+          // this might be more precise if handleAnnotation would know more about the carrier
           testToStandardEdmTarget = (x => x
             ? ['Parameter', 'Property'].some(y => x.includes(y) ||
               carrier._isCollection && x.includes('Collection'))
@@ -1116,11 +1124,11 @@ function csn2annotationEdm(reqDefs, csnVocabularies, serviceName,
 
   // found a simple value "val"
   //  expected type is dTypeName
-  //  mappping rule for values:
+  //  mapping rule for values:
   //    if expected type is ... the expression to be generated is ...
   //      floating point type except Edm.Decimal -> Float
   //      Edm.Decimal -> Decimal
-  //      integer tpye -> Int
+  //      integer type -> Int
   function handleSimpleValue(value, dTypeName, msg) {
     // these types must be represented as "String" values in XML:
     const castToXmlString = [ 'Edm.PrimitiveType', 'Edm.Stream', 'Edm.Untyped' ];

package/lib/edm/csn2edm.js

@@ -51,7 +51,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
     whatsMyServiceRootName,
     fallBackSchemaName,
     options ] = initializeModel(csn, _options, messageFunctions, serviceNames);
-    
+
   const mergedVocabularies = translate.mergeOdataVocabularies(options, message);
 
   const Edm = getEdm(options, messageFunctions);
@@ -404,7 +404,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
       createTerm);
       }
 
-      // fetch all exising children names in a map
+      // fetch all existing children names in a map
       const NamesInSchemaXRef = Schema._children.reduce((acc, cur) => {
         const name = cur._edmAttributes.Name;
         if(acc[name] === undefined) {
@@ -436,7 +436,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
 
         The first sentence in chapter 13 is:
           Each metadata document used to describe an OData service MUST define exactly one entity container.
-        
+
         This sentence expresses that an OData SERVICE must contain an entity container, but an EDMX is not required to have a container.
         Therefore it is absolutely legal and necessary to remove an empty container from the IR!
       */
@@ -683,7 +683,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
         const bpType = entityCsn ? fullQualified(entityCsn.name) : undefined;
         /*
         Check for binding $self parameter. If available, use this parameter
-        instead of artifically created binding parameter (hasBindingParameter).
+        instead of artificially created binding parameter (hasBindingParameter).
         The binding parameter remains in the CSN and is rendered as any other
         parameter (including default value/not null/ etc) and acts as annotation carrier.
         */
@@ -805,8 +805,8 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
         const rt = actionCsn.returns && ((actionCsn.returns.items && actionCsn.returns.items.type) || actionCsn.returns.type);
         if(rt) // add EntitySet attribute only if return type is an entity
         {
-          const defintion = schemaCsn.definitions[rt];
-          if(defintion && defintion.kind === 'entity')
+          const definition = schemaCsn.definitions[rt];
+          if(definition && definition.kind === 'entity')
           {
             functionImport.setEdmAttribute('EntitySet', rt.replace(schemaNamePrefix, ''));
           }
@@ -883,31 +883,34 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
           // it is safe to assume that either type or items.type are set
           const returnsLoc = [ ...loc, 'returns'];
           const returns = action.returns.items || action.returns;
-          let type = returns.type;
-          if (type) {
-            collectUsedType(action.returns);
-            if (!isBuiltinType(type) && csn.definitions[type].kind !== 'entity' && csn.definitions[type].kind !== 'type') {
-              message('odata-spec-violation-returns', returnsLoc, { kind: action.kind, version: '2.0' });
-            }
-            else if(isBuiltinType(type)) {
-              type = edmUtils.mapCdsToEdmType(returns, messageFunctions, true);
-              if(type) {
-                const td = EdmPrimitiveTypeMap[type];
-                if(td && !td.v2) {
-                  message('odata-spec-violation-type', returnsLoc,
+          let type = returns['@odata.Type'];
+          if(!type) {
+            type = returns.type;
+            if (type) {
+              collectUsedType(action.returns);
+              if (!isBuiltinType(type) && csn.definitions[type].kind !== 'entity' && csn.definitions[type].kind !== 'type') {
+                message('odata-spec-violation-returns', returnsLoc, { kind: action.kind, version: '2.0' });
+              }
+              else if(isBuiltinType(type)) {
+                type = edmUtils.mapCdsToEdmType(returns, messageFunctions, true);
+                if(type) {
+                  const td = EdmPrimitiveTypeMap[type];
+                  if(td && !td.v2) {
+                    message('odata-spec-violation-type', returnsLoc,
                     { type, version: '2.0', '#': 'incompatible' });
+                  }
+                }
+                else {
+                  message('odata-spec-violation-type-unknown', returnsLoc, { type });
                 }
               }
-              else {
-                message('odata-spec-violation-type-unknown', returnsLoc, { type });
-              }
+              if(action.returns._isCollection)
+                type = `Collection(${type})`
+            }
+            else {
+              // type is missing
+              message('odata-spec-violation-type', returnsLoc);
             }
-            if(action.returns._isCollection)
-              type = `Collection(${type})`
-          }
-          else {
-            // type is missing
-            message('odata-spec-violation-type', returnsLoc);
           }
           return type;
         }
@@ -916,7 +919,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
       /*
         addAssociation() constructs a V2 association.
         In V4 all this has been simplified very much, the only thing actually left over is
-        <ReferentialConstriant> that is then a sub element to <NavigationProperty>.
+        <ReferentialConstraint> that is then a sub element to <NavigationProperty>.
         However, referential constraints are substantially different to its V2 counterpart,
         so it is better to reimplement proper V4 construction of<NavigationProperty> in a separate
         function.
@@ -1086,7 +1089,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
           // Only the unknown type warning may be triggered by an unknown @odata.Type override.
           if(td.v2 !== p.v2 && td.v4 !== p.v4)
             message('odata-spec-violation-type', pLoc,
-            { type:edmType, version: (p.v4 ? '4.0' : '2.0'), '#': 'incompatible' });
+            { type: edmType, version: (p.v4 ? '4.0' : '2.0'), '#': 'incompatible' });
           EdmTypeFacetNames.forEach(name => {
             const facet = EdmTypeFacetMap[name];
             const optional =
@@ -1101,13 +1104,12 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
             // node and facet version match
             if(!p._edmAttributes[name] && td[name] && !optional && (p.v2 === facet.v2 || p.v4 === facet.v4)) {
               message('odata-spec-violation-type', pLoc,
-                { type:edmType, name, version: (p.v4 ? '4.0' : '2.0'), '#': 'facet' });
+                { type: edmType, name, version: (p.v4 ? '4.0' : '2.0'), '#': 'facet' });
             }
           });
         }
         else {
-          message('odata-spec-violation-type-unknown', pLoc,
-          { type:edmType });
+          message('odata-spec-violation-type-unknown', pLoc, { type: edmType });
         }
       }
     }

package/lib/edm/edm.js

@@ -683,41 +683,44 @@ function getEdm(options, messageFunctions) {
             if(!(this._edmAttributes[typeName] === 'Edm.Stream' &&
                !( /*scalarType.type === 'cds.String' ||*/ this._scalarType.type === 'cds.Binary')))
               edmUtils.addTypeFacets(this, this._scalarType);
-            // CDXCORE-245:
-            // map type to @odata.Type
-            // optionally add @odata { MaxLength, Precision, Scale, SRID } but only in combination with @odata.Type
-            const odataType = csn['@odata.Type'];
-            if(odataType)
-            {
-              const td = EdmPrimitiveTypeMap[odataType];
-              // If type is known, it must be available in the current version
-              // Reason: EDMX Importer may set `@odata.Type: 'Edm.DateTime'` on imported V2 services
-              // Not filtering out this incompatible type here in case of a V4 rendering would
-              // produce an unrecoverable error.
-              if(td && (td.v2 === this.v2 || td.v4 === this.v4)) {
-                this.setEdmAttribute(typeName, odataType);
-                EdmTypeFacetNames.forEach(facetName => {
-                  const facet = EdmTypeFacetMap[facetName];
-                  if(facet.remove) {
-                    this.removeEdmAttribute(facetName);
-                    this.removeEdmAttribute(facet.extra);
-                  }
-                  if(td[facetName] !== undefined &&
+          }
+          else {
+            this._edmAttributes[typeName] = typecsn.type;
+          }
+        }
+        // CDXCORE-245:
+        // map type to @odata.Type
+        // optionally add @odata { MaxLength, Precision, Scale, SRID }
+        // but only in combination with @odata.Type
+        // Allow to override type only on scalar and undefined types
+        if((this._scalarType || typecsn.type == null) && !csn.elements) {
+          const odataType = csn['@odata.Type'];
+          if(odataType) {
+            const td = EdmPrimitiveTypeMap[odataType];
+            // If type is known, it must be available in the current version
+            // Reason: EDMX Importer may set `@odata.Type: 'Edm.DateTime'` on imported V2 services
+            // Not filtering out this incompatible type here in case of a V4 rendering would
+            // produce an unrecoverable error.
+            if(td && (td.v2 === this.v2 || td.v4 === this.v4)) {
+              this.setEdmAttribute(typeName, odataType);
+              EdmTypeFacetNames.forEach(facetName => {
+                const facet = EdmTypeFacetMap[facetName];
+                if(facet.remove) {
+                  this.removeEdmAttribute(facetName);
+                  this.removeEdmAttribute(facet.extra);
+                }
+                if(td[facetName] !== undefined &&
                       (facet.v2 === this.v2 ||
                       facet.v4 === this.v4))
                   {
-                    if(this.v2 && facetName === 'Scale' && csn['@odata.'+facetName] === 'variable')
-                      this.setXml({ [facet.extra]: true });
-                    else
+                  if(this.v2 && facetName === 'Scale' && csn['@odata.'+facetName] === 'variable')
+                    this.setXml({ [facet.extra]: true });
+                  else
                       this.setEdmAttribute(facetName, csn['@odata.'+facetName]);
-                  }
-                });
-              }
+                }
+              });
             }
           }
-          else {
-            this._edmAttributes[typeName] = typecsn.type;
-          }
         }
       }
 
@@ -734,7 +737,7 @@ function getEdm(options, messageFunctions) {
       // store undecorated type for JSON
       this._type = this._edmAttributes[typeName];
       // decorate for XML (not for Complex/EntityType)
-      if(this._isCollection)
+      if(this._isCollection && this._edmAttributes[typeName])
         this._edmAttributes[typeName] = `Collection(${this._edmAttributes[typeName]})`
     }
 
@@ -1127,7 +1130,7 @@ function getEdm(options, messageFunctions) {
           and if the csn.containsTarget for this NavigationProperty is true,
           then this is the generated 'Results' association to the underlying entityType.
           Only this special association may have an explicit ContainsTarget attribute.
-          See csn2edm.createParmeterizedEntityTypeAndSet() for details
+          See csn2edm.createEntityTypeAndSet() for details
           2) ContainsTarget stems from the @odata.contained annotation
         */
         // eslint-disable-next-line sonarjs/no-redundant-boolean

package/lib/edm/edmAnnoPreprocessor.js

@@ -59,7 +59,6 @@ function applyAppSpecificLateCsnTransformationOnElement(options, element, struct
     {
       mapAnnotationAssignment(element, struct, AnalyticalAnnotations());
     }
-    mapAnnotationAssignment(element, struct, PDMSemantics());
   }
 
   // etag requires Core.OptimisticConcurrency to be set in V4 (cap/issues#2641)
@@ -80,28 +79,6 @@ function applyAppSpecificLateCsnTransformationOnElement(options, element, struct
     }
   }
 
-  // nested functions begin
-  function PDMSemantics()
-  {
-    /*
-    let dict = Object.create(null);
-
-    dict['@PDM.xxx1'] = [ '@sap.pdm-semantics' ];
-    dict['@PDM.xxx2'] = [ '@sap.pdm-propery' ];
-    dict['@PDM.xxx3'] = [ '@sap.pdm-display-sq-no' ];
-    dict['@PDM.xxx4'] = [ '@sap.pdm-record-identifier' ];
-    dict['@PDM.xxx5'] = [ '@sap.pdm-field-group' ];
-    dict['@PDM.xxx6'] = [ '@sap.pdm-mask-find-pattern' ];
-    dict['@PDM.xxx7'] = [ '@sap.pdm-mask-replacement-pattern' ];
-    dict['@PDM.xxx8'] = [ '@sap.deletable' ];
-    dict['@PDM.xxx8'] = [ '@sap.updatable' ];
-
-    // respect flattened annotation $value
-    Object.keys(dict).forEach(k => dict[k+'.$value'] = dict[k]);
-    */
-    return Object.create(null);
-  }
-
   function AnalyticalAnnotations()
   {
     function mapCommonAttributes(element, struct, prop)

package/lib/edm/edmInboundChecks.js

@@ -24,7 +24,7 @@ function inboundQualificationChecks(csn, options, messageFunctions,
   serviceRootNames, requestedServiceNames, isMyServiceRequested, whatsMyServiceRootName, csnUtils) {
   const { message, throwWithError } = messageFunctions;
 
-  forEachDefinition(csn, [ attach$path, checkChainedArray ]);
+  forEachDefinition(csn, [ attach$path, checkProperArrayUsage ]);
   checkNestedContextsAndServices();
   throwWithError();
 
@@ -37,7 +37,7 @@ function inboundQualificationChecks(csn, options, messageFunctions,
         }, [ 'definitions', defName ]);
   }
 
-  function checkChainedArray(def, defName) {
+  function checkProperArrayUsage(def, defName) {
     if (!isMyServiceRequested(defName))
       return;
     let currPath = ['definitions', defName];
@@ -47,6 +47,11 @@ function inboundQualificationChecks(csn, options, messageFunctions,
     function checkIfItemsOfItems(construct, _constructName, _prop, path) {
       const constructType = csnUtils.effectiveType(construct);
       if (constructType.items) {
+        if(constructType.items.target) {
+          const isComp = constructType.items.type === 'cds.Composition';
+          message('type-invalid-items', path, { '#': isComp ? 'comp' : 'assoc', prop: 'items' });
+          return;
+        }
         if (constructType.items.items) {
           message('chained-array-of', path);
           return;

package/lib/edm/edmPreprocessor.js

@@ -38,7 +38,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
 
   // proxies are merged into the final model after all proxy elements are collected
   const proxyCache = [];
-  // iterarte only over those definitions that need to be preprocessed
+  // iterate only over those definitions that need to be preprocessed
   // instead of mangling through the whole model each time
   // preprocess steps removing adding to the model must co-modify this map
   const reqDefs = { definitions: Object.create(null) };
@@ -398,7 +398,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
   //   non-containment rendering. If containment rendering is active, the containee has no
   //   entity set. Instead try to rewrite the annotation in such a way that it is effective
   //   on the containment navigation property.
-  // $containeeAssoications stores the containees (children/outbound edges)
+  // $containeeAssociations stores the containees (children/outbound edges)
   // $containerNames stores the containers (parents/inbound edges)
 
   function initContainments(container) {
@@ -410,7 +410,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     }
 
     function initContainments(elt, _memberName, _prop, path) {
-      if(elt.target && elt['@odata.contained'] && !elt._ignore) {
+      if(elt.target && elt['@odata.contained']) {
         // store all containment associations, required to create the containment paths later on
         container.$containeeAssociations.push( { assoc: elt, path });
         // Let the containee know its container
@@ -829,7 +829,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
           }
         }
         // Only in containment:
-        // Ignore this (foreign key) elment if renderForeignKeys is false
+        // Ignore this (foreign key) element if renderForeignKeys is false
         if(options.odataContainment && element['@odata.containment.ignore']) {
           if(!options.renderForeignKeys)
             edmUtils.assignAnnotation(element, '@cds.api.ignore', true);
@@ -859,7 +859,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     forEachMemberRecursively(def.items || def, finalizeConstraintsOnAssoc, [], true, { elementsOnly: true });
   }
   function finalizeConstraintsOnAssoc(element) {
-    if (element.target && !element._ignore && element._constraints) {
+    if (element.target && element._constraints) {
       edmUtils.finalizeReferentialConstraints(csn, element, options, info);
 
       if(element._constraints?._partnerCsn) {
@@ -958,14 +958,14 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     // if this artifact is a service member check its associations
     if(globalSchemaPrefix) {
       forEachGeneric(struct.items || struct, 'elements', element => {
-        if(!element.target || element['@odata.navigable'] === false)
+        if(!edmUtils.isNavigable(element))
           return;
         /*
          * Consider everything @cds.autoexpose: falsy to be a proxy candidate for now
          */
         /*
         if(element._target['@cds.autoexpose'] === false) {
-          // :TODO: Also _ignore foreign keys to association?
+          // :TODO: Also ignore foreign keys to association?
           edmUtils.foreach(struct.elements,
             e =>
               e['@odata.foreignKey4'] === element.name,
@@ -985,7 +985,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
         // proxy required.
         // association must be managed and not unmanaged
 
-        // odataProxies (P) and odataXServiceRefs (X) are evalutated as follows:
+        // odataProxies (P) and odataXServiceRefs (X) are evaluated as follows:
         // P | X | Action
         // 0 | 0 | No out bound navigation
         // 0 | 1 | Cross service references are generated
@@ -1211,7 +1211,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
               if(typeClone) {
                 // Recurse into elements of 'type' (if any)
                 typeClone.elements && Object.entries(typeClone.elements).forEach(([elemName, elem]) => {
-                  // if this is a foreign key elment, we must check whether or not the association
+                  // if this is a foreign key element, we must check whether or not the association
                   // has been exposed as proxy. If it has not been exposed, no further structured
                   // types must be exposed as 'Proxy_' types.
 
@@ -1494,7 +1494,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
 
     function finalizeProxyContainments(proxy) {
       // initialise containments after all exposed types are collected
-      // AND remove unfullfillable NavRestrictions
+      // AND remove unfulfillable NavRestrictions
       initContainments(proxy);
       const assocPaths = proxy.$containeeAssociations.map(entry => entry.path.join('.'));
       const newNpr = [];
@@ -1643,7 +1643,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
         csn.definitions[elt.type] &&
         csnUtils.getFinalTypeInfo(elt.type).items);
       if(type ||
-        (options.odataFormat !== 'flat' && !options.odataForeignKeys) && 
+        (options.odataFormat !== 'flat' && !options.odataForeignKeys) &&
          elt.cardinality?.max && elt.cardinality.max !== 1) {
         // many primary key can be induced by a many parameter of a view
         message('odata-spec-violation-key-array', location,
@@ -1857,6 +1857,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
       annotateAllowedValues(member, path);
       ComputedDefaultValue(member);
       if (member.returns) {
+        edmUtils.assignAnnotation(member.returns, '@Core.Description', member.returns.doc);
         markCollection(member.returns);
         mapCdsToEdmProp(member.returns);
         annotateAllowedValues(member.returns, [...path, 'returns']);
@@ -1910,7 +1911,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
               else if(node.kind !== 'annotation') {
                 // omit the entry and warn
                 warning('odata-enum-missing-value', path,
-                  { name: enumSymbol, anno: '@Valiation.AllowedValues', type: typeDef.type },
+                  { name: enumSymbol, anno: '@Validation.AllowedValues', type: typeDef.type },
                   'Expected enum element $(NAME) of type $(TYPE) to have a value, not added to $(ANNO)');
               }
             }
@@ -1918,13 +1919,13 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
           else { // enumSymbolDef not found
             // omit the entry and warn
             warning('odata-enum-missing-value', path,
-              { name: enumSymbol, anno: '@Valiation.AllowedValues', type: typeDef.type },
+              { name: enumSymbol, anno: '@Validation.AllowedValues', type: typeDef.type },
               'Expected enum element $(NAME) of type $(TYPE) to have a value, not added to $(ANNO)');
           }
 
           // Can't rely that @description has already been renamed to @Core.Description
           // Eval description according to precedence (doc comment must be considered already in Odata transformer
-          // as in contrast to the other doc commments as it is used to annotate the @Validation.AllowedValues)
+          // as in contrast to the other doc comments as it is used to annotate the @Validation.AllowedValues)
           const desc = enumSymbolDef ? enumSymbolDef['@Core.Description'] || enumSymbolDef['@description'] || enumSymbolDef.doc : undefined;
           if (desc)
             result['@Core.Description'] = desc;
@@ -1945,8 +1946,8 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
 
     if(!options.odataCapabilitiesPullup)
       return;
-    // meaningless for non-entities and proxies
-    if(rootContainer.kind !== 'entity' || rootContainer.$proxy)
+    // @Capabilities is applicable to EntitySet/Collection only
+    if(!rootContainer.$hasEntitySet)
       return;
 
     const isRecursiveContainment =
@@ -1994,7 +1995,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
           const { assoc, path } = entry;
           const containee = assoc._target;
 
-          if(isMyServiceRequested(containee.name) || containee.$proxy) {
+          if(edmUtils.isNavigable(assoc) && isMyServiceRequested(containee.name) || containee.$proxy) {
             const localAssocPath = path.join('.');
             let navPropEntry= localRestrictions.find(p =>
                 p.NavigationProperty && p.NavigationProperty['='] === prefix.concat(localAssocPath).join('.'));

package/lib/edm/edmUtils.js

@@ -74,10 +74,13 @@ function isToMany(assoc) {
   return targetMax === '*' || Number(targetMax) > 1;
 }
 
+function isNavigable(assoc) {
+  return (assoc.target && (assoc['@odata.navigable'] == null || assoc['@odata.navigable']));
+}
 function isSingleton(entityCsn) {
   const singleton = entityCsn['@odata.singleton'];
-  const hasNullable = entityCsn['@odata.singleton.nullable'] !== undefined && entityCsn['@odata.singleton.nullable'] !== null;
-  return singleton || ((singleton === undefined || singleton === null) && hasNullable);
+  const hasNullable = entityCsn['@odata.singleton.nullable'] != null;
+  return singleton || (singleton == null && hasNullable);
 }
 
 function isParameterizedEntity(artifact) {
@@ -137,7 +140,7 @@ function resolveOnConditionAndPrepareConstraints(csn, assocCsn, messageFunctions
         }
         if(originAssocCsn.target) {
           // Mark this association as backlink if $self appears exactly once
-          // to surpress edm:Association generation in V2 mode
+          // to suppress edm:Association generation in V2 mode
           if(isBacklink) {
             // establish partnership with origin assoc but only if this association is the first one
             if(originAssocCsn._selfReferences.length === 0) {
@@ -639,7 +642,7 @@ function addTypeFacets(node, csn)
    * @param {string} identifier
    */
 function isODataSimpleIdentifier(identifier){
-  // this regular expression reflects the specifiation from above
+  // this regular expression reflects the specification from above
   const regex = /^[\p{Letter}\p{Nl}_][_\p{Letter}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,127}$/gu
   return identifier && identifier.match(regex);
 }
@@ -898,6 +901,7 @@ module.exports = {
   foreach,
   isContainee,
   isToMany,
+  isNavigable,
   isSingleton,
   isStructuredType,
   isStructuredArtifact,