@sap/cds-compiler 3.8.2 → 3.9.4

package/lib/compiler/index.js

@@ -24,6 +24,7 @@ const { fns } = require('./shared');
 const define = require('./define');
 const finalizeParseCdl = require('./finalize-parse-cdl');
 const extend = require('./extend');
+const generate = require('./generate');
 const kickStart = require('./kick-start');
 const populate = require('./populate');
 const resolve = require('./resolve');
@@ -463,6 +464,7 @@ function compileDoX( model ) {
     return model;
   }
   extend( model );
+  generate( model );
   kickStart( model );
   populate( model );
 

package/lib/compiler/populate.js

@@ -61,7 +61,7 @@ function populate( model ) {
     resolvePath,
     attachAndEmitValidNames,
     initArtifact,
-    chooseAnnotationsInArtifact,
+    extendArtifactBefore,
     extendArtifactAfter,
   } = model.$functions;
   model.$volatileFunctions.environment = environment;
@@ -213,7 +213,7 @@ function populate( model ) {
     chain.reverse();
     for (const a of chain) {
       // Without type, value.path or _origin at beginning, link to itself:
-      chooseAnnotationsInArtifact( a );
+      extendArtifactBefore( a );
       art = populateArtifact( a, art ) || a;
       if (a.elements$ || a.enum$)
         mergeSpecifiedElementsOrEnum( a );

package/lib/compiler/propagator.js

@@ -13,6 +13,7 @@ const {
   forEachMember,
   forEachGeneric,
   isDeprecatedEnabled,
+  isBetaEnabled,
 } = require( '../base/model');
 const {
   setLink,
@@ -42,9 +43,9 @@ function propagate( model ) {
     '@cds.external': never,
     '@cds.redirection.target': never,
     '@fiori.draft.enabled': onlyViaArtifact,
-    '@': annotation,            // always except in 'returns' and 'items'
-    doc: annotation,            // always except in 'returns' and 'items'
-    default: withKind,          // always except in 'returns' and 'items'
+    '@': annotation,            // always except in 'items'
+    doc: annotation,            // always except in 'items'
+    default: withKind,          // always except in 'items'
     virtual,
     notNull,
     targetElement: onlyViaParent, // in foreign keys
@@ -72,10 +73,11 @@ function propagate( model ) {
   const { options } = model;
   // eslint-disable-next-line max-len
   const oldVirtualNotNullPropagation = isDeprecatedEnabled( options, '_oldVirtualNotNullPropagation' );
+  const { warning, throwWithError } = model.$messageFunctions;
+  const propagateToReturns = isBetaEnabled( options, 'v4preview' );
 
   forEachDefinition( model, run );
 
-  const { warning, throwWithError } = model.$messageFunctions;
   // TODO: move 'virtual' handling/checks to resolver if
   //       'deprecated.oldVirtualNotNullPropagation' is gone
   if (!oldVirtualNotNullPropagation) // check would always be right, but to be ultra compatible…
@@ -105,6 +107,14 @@ function propagate( model ) {
             chain.push({ target, source: target.value._artifact });
             if (checkAndSetStatus( target.value._artifact ))
               news.push(target.value._artifact);
+
+            if (target.value?._artifact.$inferred !== 'include') {
+              // If the referred to element is not inferred, it is a new one and not the original.
+              // The new one was not originally referred to => error;
+              warning( 'ref-unexpected-override', [ target.name.location, target ],
+                       { id: target.name.id, target: target.value?._artifact },
+                       'Calculated element $(ID) does not originally refer to $(TARGET)' );
+            }
           }
           chain.push( { target, source: origin } );
           if (checkAndSetStatus( origin ))
@@ -267,14 +277,16 @@ function propagate( model ) {
 
   function onlyViaArtifact( prop, target, source ) {
     const from = viewFromPrimary( target )?.path;
-    // do not propagate from member / if follow assoc in from:
-    if (!(from ? from[from.length - 1]._artifact : source)._main)
+    // do not propagate from member / if follow assoc in from or into `returns` of actions (v4)
+    if (!(from ? from[from.length - 1]._artifact : source)._main &&
+       !(propagateToReturns && target._parent && target._parent.returns === target))
       annotation( prop, target, source );
   }
 
   function withKind( prop, target, source ) {
-    if (target.kind && (!target._parent || target._parent.returns !== target))
-      always( prop, target, source ); // not in 'returns' and 'items'
+    if (target.kind &&
+      (propagateToReturns || !target._parent || target._parent.returns !== target))
+      always(prop, target, source); // not in 'items'
   }
 
   function notNull( prop, target, source, viaType ) {

package/lib/compiler/resolve.js

@@ -81,7 +81,7 @@ function resolve( model ) {
   } = model.$messageFunctions;
   const {
     resolvePath,
-    lateExtensions,
+    createRemainingAnnotateStatements,
     effectiveType,
     getOrigin,
     resolveType,
@@ -117,7 +117,7 @@ function resolve( model ) {
     forEachDefinition( model, resolveRefs );
     forEachGeneric( model, 'vocabularies', resolveRefs );
     // create “super” ANNOTATE statements for annotations on unknown artifacts:
-    lateExtensions();
+    createRemainingAnnotateStatements();
     // report cyclic dependencies:
     detectCycles( model.definitions, ( user, art, location ) => {
       if (location) {
@@ -1128,7 +1128,7 @@ function pathNavigation( ref ) {
     return { item, tableAlias: root };
   if (root.kind !== '$tableAlias' || ref.path.length < 2)
     return {};                // should not happen
-  return { navigation: root.elements[item.id], item, tableAlias: root };
+  return { navigation: root.elements?.[item.id], item, tableAlias: root };
 }
 
 module.exports = resolve;

package/lib/compiler/shared.js

@@ -117,7 +117,9 @@ function fns( model ) {
     typeOf: { next: '_$next', dollar: true }, // TODO: disallow in var
     // TODO: dep for (explicit+implicit!) foreign keys
     targetElement: { next: '__none_', assoc: false, dollar: false },
-    filter: { next: '_$next', lexical: 'main', dollar: 'none' },
+    filter: {
+      next: '_$next', lexical: 'main', dollar: 'none', escape: 'param',
+    },
     default: {
       next: '_$next',
       dollar: true,

package/lib/edm/annotations/genericTranslation.js

@@ -416,9 +416,19 @@ function csn2annotationEdm(reqDefs, csnVocabularies, serviceName,
     function relParList() {
     // we rely on the order of params in the csn being the correct one
       const params = [];
-      if (entityNameIfBound && !(cAction.kind === 'function' && cAction.$hasBindingParam)) {
-        params.push(cAction['@cds.odata.bindingparameter.collection'] ? 'Collection(' + entityNameIfBound + ')' : entityNameIfBound);
+      if (entityNameIfBound) {
+        // If this is an action and has an explicit binding parameter add it here
+        if(cAction.$bindingParam && cAction.kind === 'action') {
+          params.push(cAction.$bindingParam.items ? 'Collection(' + entityNameIfBound + ')' : entityNameIfBound);
+        }
+        // If action/function has no explicit binding parameter add it here
+        else if (!cAction.$bindingParam) {
+          params.push(cAction['@cds.odata.bindingparameter.collection'] ? 'Collection(' + entityNameIfBound + ')' : entityNameIfBound);
+        }
       }
+      // In case this is a function the explicit binding parameter is part of
+      // the functions params dictionary. Only for functions all parameters must
+      // be listed in the annotation target
       if (cAction.kind === 'function') {
         if(cAction.params) {
           cAction.params && Object.values(cAction.params).forEach(p => {
@@ -1821,10 +1831,10 @@ function csn2annotationEdm(reqDefs, csnVocabularies, serviceName,
 
 }
 
-function mergeVocRefs(options, message) {
-  /*  Merge options.odataVocRefs into vocabularyDefinitions and
+function mergeOdataVocabularies(options, message) {
+  /*  Merge options.odataVocabularies into vocabularyDefinitions and
       create a csn2edm stack local dictionary.
-      odataVocRefs is an object, each property is the
+      odataVocabularies is an object, each property is the
       annotation prefix (as in mergedVocDefs), the value
       is an object { Alias, Namespace, Uri }, this way
       the definitions are unique and duplicate entries to address
@@ -1833,8 +1843,8 @@ function mergeVocRefs(options, message) {
   */
   const mergedVocDefs = Object.assign({}, vocabularyDefinitions);
   const reqProps = ['Alias', 'Namespace', 'Uri'];
-  if(options.odataVocRefs) {
-    const vocRefs = options.odataVocRefs;
+  if(options.odataVocabularies) {
+    const vocRefs = options.odataVocabularies;
     if (typeof vocRefs === 'object' && !Array.isArray(vocRefs)) {
       Object.entries(vocRefs).forEach(([id, def]) => {
         let defOk = true;
@@ -1881,4 +1891,4 @@ function mergeVocRefs(options, message) {
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
 
-module.exports = { vocabularyDefinitions, csn2annotationEdm, mergeVocRefs };
+module.exports = { vocabularyDefinitions, csn2annotationEdm, mergeOdataVocabularies };

package/lib/edm/csn2edm.js

@@ -52,7 +52,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
     fallBackSchemaName,
     options ] = initializeModel(csn, _options, messageFunctions, serviceNames);
     
-  const mergedVocabularies = translate.mergeVocRefs(options, message);
+  const mergedVocabularies = translate.mergeOdataVocabularies(options, message);
 
   const Edm = getEdm(options, messageFunctions);
 
@@ -687,14 +687,15 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
         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.
         */
-        setProp(actionCsn, '$hasBindingParam', false);
+
+        let bpName = 'in';
         if(actionCsn.params) {
           const entries =  Object.entries(actionCsn.params);
           const firstParam = entries[0][1];
           const type = firstParam?.items?.type || firstParam?.type;
           if(type === special$self) {
-            actionCsn.$hasBindingParam = true;
-            const bpName = entries[0][0];
+            bpName = entries[0][0];
+            setProp(actionCsn, '$bindingParam', firstParam);
             if(bpType) {
               if(firstParam.items?.type)
                 firstParam.items.type = bpType;
@@ -707,16 +708,15 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
         }
 
         // bpName is eventually used later for EntitySetPath
-        const bpNameAnno = actionCsn['@cds.odata.bindingparameter.name'];
-        let bpName = 'in';
-        if(bpNameAnno != null) {
-          if(typeof bpNameAnno === 'string')
-            bpName = bpNameAnno;
-          if(typeof bpNameAnno === 'object' && bpNameAnno['='])
-            bpName = bpNameAnno['='];
-        }
         // No explicit binding parameter, check (user defined) annotation value)
-        if(!actionCsn.$hasBindingParam) {
+        if(!actionCsn.$bindingParam) {
+          const bpNameAnno = actionCsn['@cds.odata.bindingparameter.name'];
+          if(bpNameAnno != null) {
+            if(typeof bpNameAnno === 'string')
+              bpName = bpNameAnno;
+            if(typeof bpNameAnno === 'object' && bpNameAnno['='])
+              bpName = bpNameAnno['='];
+          }
           if(!edmUtils.isODataSimpleIdentifier(bpName))
             message('odata-spec-violation-id', [...loc, '@cds.odata.bindingparameter.name'], { id: bpName });
           if(actionCsn.params && actionCsn.params[bpName]) {
@@ -726,7 +726,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
         if(entityCsn != undefined)
         {
           actionNode.setEdmAttribute('IsBound', true);
-          if(!actionCsn.$hasBindingParam) {
+          if(!actionCsn.$bindingParam) {
             // Binding Parameter: 'in' at first position in sequence, this is decisive!
             if(actionCsn['@cds.odata.bindingparameter.collection'])
               actionNode.append(new Edm.Parameter(v, { Name: bpName, Type: bpType, Collection:true/*, Nullable: false*/ } ));

package/lib/edm/edm.js

@@ -3,7 +3,6 @@
 const edmUtils = require('./edmUtils.js');
 const { isBuiltinType } = require('../model/csnUtils.js');
 const { forEach } = require('../utils/objectUtils');
-const { isBetaEnabled } = require('../base/model.js');
 
 // facet definitions, optional could either be true or array of edm types
 // remove indicates wether or not the canonic facet shall be removed when applying @odata.Type
@@ -766,7 +765,7 @@ function getEdm(options, messageFunctions) {
   class ComplexType extends TypeBase {
     constructor(v, details, csn) {
       super(v, details, csn);
-      if(this.v4 && !!csn['@open'] && isBetaEnabled(options, 'odataOpenType')) {
+      if(this.v4 && !!csn['@open']) {
         this._edmAttributes['OpenType'] = true;
       }
     }
@@ -813,6 +812,13 @@ function getEdm(options, messageFunctions) {
         this._keys = new Key(v, csn.$edmKeyPaths);
       else
         this._keys = undefined;
+
+      if(options.odataOpenapiHints) {
+        if(csn['@cds.autoexpose'])
+          this.setJSON({ '@cds.autoexpose': true });
+        if(csn['@cds.autoexposed'])
+          this.setJSON({ '@cds.autoexposed': true });
+      }
     }
 
     innerXML(indent)
@@ -826,6 +832,9 @@ function getEdm(options, messageFunctions) {
     toJSONattributes(json)
     {
       super.toJSONattributes(json);
+      this._jsonOnlyAttributes && Object.entries(this._jsonOnlyAttributes).forEach(([p, v]) => {
+        json[p[0] === '@' ? p : '$' + p] = v;
+      });
       if(this._keys)
       {
         json['$Key'] = this._keys.toJSON();
@@ -1082,7 +1091,6 @@ function getEdm(options, messageFunctions) {
 
       let [src, tgt] = edmUtils.determineMultiplicity(csn._constraints._partnerCsn || csn);
       csn._constraints._multiplicity = csn._constraints._partnerCsn ? [tgt, src] : [src, tgt];
-
       this._type = attributes.Type;
       this._isCollection = this.isToMany();
       this._targetCsn = csn._target;
@@ -1108,7 +1116,7 @@ function getEdm(options, messageFunctions) {
               ? csn._selfReferences[0]
               : csn._constraints._partnerCsn
             : undefined;
-        if(partner && partner['@odata.navigable'] !== false) {
+        if(partner && partner['@odata.navigable'] !== false && this._csn._edmParentCsn.kind !== 'type') {
           // $abspath[0] is main entity
           this._edmAttributes.Partner = partner.$abspath.slice(1).join(options.pathDelimiter);
         }
@@ -1139,6 +1147,8 @@ function getEdm(options, messageFunctions) {
           // store Nullable=false and evaluate in determineMultiplicity()
         delete this._edmAttributes.Nullable;
       }
+      // A nav prop has no default value
+      delete this._edmAttributes.DefaultValue;
 
       // store NavProp reference in the model for bidirectional $Partner tagging (done in getReferentialConstraints())
       csn._NavigationProperty = this;
@@ -1154,9 +1164,16 @@ function getEdm(options, messageFunctions) {
       let nodeCsn = csn || this._csn;
       // Set Nullable=false only if 'NOT NULL' was specified in the model
       // Do not derive Nullable=false from key attribute.
-      // If an unmanaged association has a cardinality min === max === 1 => Nullable=false
-      // If unmanaged assoc has min > 0 and max > 1 => target is 'Collection()' => Nullable is not applicable
-      return (nodeCsn.notNull === true || (nodeCsn.on && nodeCsn.cardinality && nodeCsn.cardinality.min === 1 && nodeCsn.cardinality.max === 1));
+      // OR if an association has cardinality.min > 0
+      // If this is a backlink ($self = <from>.<to>) _partnerCsn.cardinality.srcmin > 0 if available
+      // notNull is evaluated for non assoc elements only!
+      // A managed association with unspecified cardinality that is to not null
+      // is effectively a to-min-1 relationship as there must be a value for
+      // the foreign keys (they are not null as well).
+      // During the foreign key generation the minimum cardinality of such an association
+      // is set to 1 as this property is available in the OData CSN.
+      const tgtCard = edmUtils.getEffectiveTargetCardinality(nodeCsn);
+      return (nodeCsn.notNull === true && !nodeCsn.target || tgtCard.min > 0);
     }
     isToMany() {
       return (this._isCollection || this._csn._constraints._multiplicity[1] === '*');
@@ -1200,16 +1217,13 @@ function getEdm(options, messageFunctions) {
     // V4 referential constraints!
     addReferentialConstraintNodes()
     {
-      // flip the constrains if this is a $self partner
       let _constraints = this._csn._constraints;
-      let [i,j] = [0,1];
       if(this._csn._constraints._partnerCsn) {
         _constraints = this._csn._constraints._partnerCsn._constraints;
-        [i,j] = [1,0];
       }
       _constraints.constraints && Object.values(_constraints.constraints).forEach(c =>
         this.append(new ReferentialConstraint(this._v,
-          { Property: c[i].join(options.pathDelimiter), ReferencedProperty: c[j].join(options.pathDelimiter) } ) )
+          { Property: c[0].join(options.pathDelimiter), ReferencedProperty: c[1].join(options.pathDelimiter) } ) )
       );
     }
   }

package/lib/edm/edmPreprocessor.js

@@ -4,7 +4,7 @@ const { setProp, isDeprecatedEnabled, isBetaEnabled } = require('../base/model')
 const {
   forEachDefinition, forEachGeneric, forEachMemberRecursively,
   isEdmPropertyRendered, getUtils, cloneCsnNonDict,
-  isBuiltinType, applyTransformations, cloneAnnotationValue
+  isBuiltinType, applyTransformations, cloneAnnotationValue, cardinality2str,
 } = require('../model/csnUtils');
 const edmUtils = require('./edmUtils.js');
 const edmAnnoPreproc = require('./edmAnnoPreprocessor.js');
@@ -378,7 +378,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
       // in V4 tag all compositions to be containments
       if(options.odataContainment &&
          options.isV4() &&
-         edmUtils.isComposition(element) &&
+         csnUtils.isComposition(element) &&
          element['@odata.contained'] === undefined) {
         element['@odata.contained'] = true;
       }
@@ -862,28 +862,37 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     if (element.target && !element._ignore && element._constraints) {
       edmUtils.finalizeReferentialConstraints(csn, element, options, info);
 
-      if(element._constraints._partnerCsn && element.cardinality && element.cardinality.max) {
+      if(element._constraints?._partnerCsn) {
         // if this is a partnership and this assoc has a set target cardinality, assign it as source cardinality to the partner
         if(element._constraints._partnerCsn.cardinality) {
           // 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) {
-            let srcMult = (element._constraints._partnerCsn.cardinality.src == 1) ? '0..1' : '*';
-            let newMult = (element.cardinality.max > 1) ? '*' : '0..1';
-            if(options.isV2() && srcMult !== newMult) {
-              // Association 'E_toF': Multiplicity of Role='E' defined to '*', conflicting with target multiplicity '0..1' from
-              warning(null, null, `Source cardinality "${element._constraints._partnerCsn.cardinality.src}" of "${element._constraints._partnerCsn._parent.name}/${element._constraints._partnerCsn.name}" conflicts with target cardinality "${element.cardinality.max}" of association "${element._parent.name}/${element.name}"`);
+            const srcMult = (element._constraints._partnerCsn.cardinality.src == 1) ? '0..1' : '*';
+            const newMult =
+              (element.cardinality?.min == 1 && element.cardinality?.max == 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}"`);
             }
           }
           else {
             // .. but only if the original assoc hasn't set src yet
-            element._constraints._partnerCsn.cardinality.src = element.cardinality.max;
+            element._constraints._partnerCsn.cardinality.src = element.cardinality?.max ? element.cardinality.max : 1;
+            if(element.cardinality?.min !== undefined && element._constraints._partnerCsn.cardinality?.srcmin === undefined)
+              element._constraints._partnerCsn.cardinality.srcmin = element.cardinality.min;
           }
         }
         else {
-          element._constraints._partnerCsn.cardinality = { src: element.cardinality.max };
+          element._constraints._partnerCsn.cardinality = { src: element.cardinality?.max ? element.cardinality.max : 1 };
+          if(element.cardinality?.min !== undefined)
+            element._constraints._partnerCsn.cardinality.srcmin = element.cardinality.min;
         }
       }
+      setProp(element._constraints, '$finalized', true);
     }
   }
 
@@ -1111,7 +1120,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
         if (isEdmPropertyRendered(e, options)) {
           let newElt = proxy.elements[e.name];
           if(!newElt) {
-            if(csnUtils.isAssocOrComposition(e.type)) {
+            if(csnUtils.isAssocOrComposition(e)) {
               if(!e.on && e.keys) {
                 if(options.odataNoTransitiveProxies)
                   newElt = convertManagedAssocIntoStruct(e);
@@ -1264,8 +1273,16 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
               // a primary key can never be an unmanaged association
               type.elements[elemName] = createProxyOrSchemaRefForManagedAssoc(elem);
             }
-            if(forceToNotNull)
-              type.elements[elemName].notNull = true;
+            if(forceToNotNull) {
+              const newElt = type.elements[elemName];
+              if(newElt.target) {
+                if (newElt.cardinality === undefined)
+                  newElt.cardinality = {};
+                newElt.cardinality.min = 1;
+              }
+              // if odata-spec-violation-key-null is checking on min>1, this can be an else
+              newElt.notNull = true;
+            }
             setProp(type.elements[elemName], 'name', elem.name);
           });
           return type;
@@ -1556,7 +1573,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
 
       let elements = eltCsn.elements || eltCsn.items?.elements;
       if (!elements) {
-        const finalType = csnUtils.getFinalBaseTypeWithProps(eltCsn.items?.type || eltCsn.type);
+        const finalType = csnUtils.getFinalTypeInfo(eltCsn.items?.type || eltCsn.type);
         elements = finalType?.elements || finalType?.items?.elements;
       }
       if (elements) {
@@ -1612,10 +1629,11 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
 
     function checkKeySpecViolations(elt, location, pathSegment) {
       // Nullability
-      if((!elt.key && (elt.notNull === undefined || elt.notNull === false)) ||
-           elt.key && (elt.notNull !== undefined && elt.notNull === false)) {
+      const eltDef = elt.items || elt;
+      if((!elt.key && (eltDef.notNull === undefined || eltDef.notNull === false)) ||
+           elt.key && (eltDef.notNull !== undefined && eltDef.notNull === false)) {
         message('odata-spec-violation-key-null', location,
-          {name: pathSegment, '#': pathSegment ? 'std' : 'scalar'});
+          {name: pathSegment ? pathSegment : elt.name, '#': !pathSegment ? 'std' : 'scalar'});
       }
       // many is either directly on elements or on the type
       // due to added proxy types it might be that the type can't be found in definitions
@@ -1623,11 +1641,17 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
         (elt.type &&
         !isBuiltinType(elt.type) &&
         csn.definitions[elt.type] &&
-        csnUtils.getFinalBaseTypeWithProps(elt.type).items);
-      if(type) {
+        csnUtils.getFinalTypeInfo(elt.type).items);
+      if(type ||
+        (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,
-          {name: pathSegment, '#': pathSegment ? 'std' : 'scalar'});
+          {
+            name: pathSegment ? pathSegment : elt.name,
+            value: cardinality2str(elt),
+            '#': elt.target ? 'assoc' : 'std'
+          });
       }
       // type
       if(!elt.elements) {
@@ -1870,7 +1894,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
           // reset visited
           for(const es in typeDef.enum)
             delete typeDef.enum[es].$visited;
-            
+
           if(enumSymbolDef) {
             if(enumSymbolDef.val !== undefined) {
               // 'null' value is represented spec conform as empty record in AllowedValues collection
@@ -2072,12 +2096,12 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     if (obj.type && isBuiltinType(obj.type) && !obj.target && !obj.targetAspect) {
       let edmType = edmUtils.mapCdsToEdmType(obj, messageFunctions, _options.odataVersion === 'v2', obj['@Core.MediaType']);
       edmUtils.assignProp(obj, '_edmType', edmType);
-    } else if (obj._isCollection && (obj.items && isBuiltinType(csnUtils.getFinalBaseTypeWithProps(obj.items.type)?.type))) {
+    } else if (obj._isCollection && (obj.items && isBuiltinType(csnUtils.getFinalTypeInfo(obj.items.type)?.type))) {
       let edmType = edmUtils.mapCdsToEdmType(obj.items, messageFunctions, _options.odataVersion === 'v2', 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.getFinalBaseTypeWithProps(obj.items.items.type)?.type)) {
+    else if (obj._isCollection && obj.items && obj.items.type && obj.items.items && isBuiltinType(csnUtils.getFinalTypeInfo(obj.items.items.type)?.type)) {
       let edmType = edmUtils.mapCdsToEdmType(obj.items.items, messageFunctions, _options.odataVersion === 'v2', obj['@Core.MediaType']);
       edmUtils.assignProp(obj, '_edmType', edmType);
     }

package/lib/edm/edmUtils.js

@@ -61,11 +61,6 @@ function isContainee(artifact) {
   return (artifact.$containerNames && (artifact.$containerNames.length > 1 || artifact.$containerNames[0] != artifact.name));
 }
 
-function isComposition(artifact) {
-  return (artifact.type === 'cds.Composition' || artifact.type === 'Composition') &&
-    artifact.target != undefined;
-}
-
 // Return true if the association 'assoc' has cardinality 'to-many'
 function isToMany(assoc) {
   if (!assoc.cardinality) {
@@ -462,13 +457,46 @@ function determineMultiplicity(csn)
   if(!csn.cardinality.max)
     csn.cardinality.max = 1;
 
-  let  srcCardinality = (csn.cardinality.src == 1) ? (isAssoc ? '0..1' : '1') : '*';
-  let  tgtCardinality = (csn.cardinality.max > 1 || csn.cardinality.max === '*') ? '*' :
-                          (csn.cardinality.min == 1) ? '1' : '0..1';
+  const srcCardinality =
+    (csn.cardinality.src == 1)
+      ? (!isAssoc || csn.cardinality.srcmin == 1)
+          ? '1'
+          : '0..1'
+      : '*';
+  const  tgtCardinality =
+    (csn.cardinality.max > 1 || csn.cardinality.max === '*')
+      ? '*'
+      : (csn.cardinality.min == 1)
+        ? '1'
+        : '0..1';
 
   return [srcCardinality, tgtCardinality];
 }
 
+// return effective target cardinality
+// If csn is a backlink, return the source cardinality (including srcmin/src) from
+// the forward association
+// This function works only after finalizeConstraints
+function getEffectiveTargetCardinality(csn) {
+  const rc = { min: 0, max: 1 };
+  if(!csn._constraints || !csn._constraints.$finalized)
+    throw new CompilerAssertion('_constraints missing or not finalized: "' + csn.name);
+  // partner (forward) cardinality has precedence
+  if(csn._constraints._partnerCsn) {
+    if(csn._constraints._partnerCsn.cardinality?.srcmin)
+      rc.min = csn._constraints._partnerCsn.cardinality.srcmin;
+    if(csn._constraints._partnerCsn.cardinality?.src)
+      rc.max = csn._constraints._partnerCsn.cardinality.src;
+  }
+  else if(csn.cardinality) {
+    if(csn.cardinality.min)
+      rc.min = csn.cardinality.min;
+    if(csn.cardinality.max)
+      rc.max = csn.cardinality.max
+  }
+  return rc;
+}
+
 function mapCdsToEdmType(csn, messageFunctions, isV2=false, isMediaType=false, location=undefined)
 {
   if(location === undefined)
@@ -869,7 +897,6 @@ module.exports = {
   intersect,
   foreach,
   isContainee,
-  isComposition,
   isToMany,
   isSingleton,
   isStructuredType,
@@ -879,6 +906,7 @@ module.exports = {
   resolveOnConditionAndPrepareConstraints,
   finalizeReferentialConstraints,
   determineMultiplicity,
+  getEffectiveTargetCardinality,
   mapCdsToEdmType,
   addTypeFacets,
   isODataSimpleIdentifier,

package/lib/gen/Dictionary.json

@@ -1518,7 +1518,7 @@
     "ODM.root": {
       "Type": "Core.Tag",
       "AppliesTo": [
-        "EntitySet"
+        "EntityType"
       ],
       "$experimental": true
     },
@@ -1526,15 +1526,13 @@
       "Type": "Edm.PropertyPath",
       "AppliesTo": [
         "EntityType"
-      ],
-      "$experimental": true
+      ]
     },
     "ODM.entityName": {
       "Type": "Edm.String",
       "AppliesTo": [
         "EntityType"
-      ],
-      "$experimental": true
+      ]
     },
     "Offline.ClientOnly": {
       "Type": "Offline.ClientOnlyType",
@@ -2866,9 +2864,9 @@
       "BaseType": "Common.ValueListParameter",
       "Properties": {
         "Constant": "Edm.PrimitiveType",
+        "InitialValueIsSignificant": "Edm.Boolean",
         "ValueListProperty": "Edm.String"
-      },
-      "$experimental": true
+      }
     },
     "Common.ValueListParameterInOut": {
       "$kind": "ComplexType",

package/lib/gen/language.checksum

@@ -1 +1 @@
-7b8ead4c652cf564b5ba45f94d2c45af
+78bdabed1311fe8b3b0921bfc5300ece