@sap/cds-compiler 2.10.4 → 2.12.0

package/lib/edm/annotations/genericTranslation.js

@@ -207,7 +207,7 @@ function csn2annotationEdm(csn, serviceName, Edm = undefined, options=undefined,
   // Note: we assume that all objects ly flat in the service, i.e. objName always
   //       looks like <service name, can contain dots>.<id>
   forEachDefinition(csn, (object, objName) => {
-    if(objName == serviceName || objName.startsWith(serviceName + '.')) {
+    if (objName === serviceName || objName.startsWith(serviceName + '.')) {
       if (object.kind === 'action' || object.kind === 'function') {
         handleAction(objName, object, null);
       }
@@ -505,8 +505,17 @@ function csn2annotationEdm(csn, serviceName, Edm = undefined, options=undefined,
       let testToAlternativeEdmTarget = null; // if true, assign to alternative Edm Target
 
       if (carrier.kind === 'entity' || carrier.kind === 'view') {
-      // If AppliesTo=[EntitySet/Singleton, EntityType], EntitySet/Singleton has precedence
-        testToAlternativeEdmTarget = (x => x.includes('EntitySet') || x.includes('Singleton'));
+      // If AppliesTo=[EntitySet/Singleton/Collection, EntityType], EntitySet/Singleton/Collection has precedence
+        testToAlternativeEdmTarget = (x => {
+          if(options.isV2()) {
+            return ['Singleton', 'EntitySet', 'Collection'].some(y => x.includes(y));
+          }
+          else {
+            return edmUtils.isSingleton(carrier)
+              ? x.includes('Singleton')
+              : ['EntitySet', 'Collection'].some(y => x.includes(y));
+          }
+        });
         testToStandardEdmTarget = (x => x ? x.includes('EntityType') : true);
       // if carrier has an alternate 'entitySetName' use this instead of EdmTargetName
       // (see edmPreprocessor.initializeParameterizedEntityOrView(), where parameterized artifacts
@@ -534,15 +543,21 @@ function csn2annotationEdm(csn, serviceName, Edm = undefined, options=undefined,
         alternativeEdmTargetName = edmTargetName;
         hasAlternativeCarrier = true; // EntityContainer is always available
       }
-    //element => decide if navprop or normal property
+      //element => decide if navprop or normal property
       else if(!carrier.kind) {
-      // if appliesTo is undefined, return true
+        // if appliesTo is undefined, return true
         if(carrier.target) {
-          testToStandardEdmTarget = (x=> x ? x.includes('NavigationProperty') : true);
+          testToStandardEdmTarget = (x => x
+            ? x.includes('NavigationProperty') ||
+              carrier.cardinality && carrier.cardinality.max === '*' && x.includes('Collection')
+            : true);
         }
         else {
         // this might be more precise if handleAnnotation would know more about the carrier
-          testToStandardEdmTarget = (x => x ? ['Parameter', 'Property'].some(y => x.includes(y)): true);
+          testToStandardEdmTarget = (x => x 
+            ? ['Parameter', 'Property'].some(y => x.includes(y) ||
+              carrier._isCollection && x.includes('Collection'))
+            : true);
         }
       }
       return [
@@ -851,7 +866,6 @@ function csn2annotationEdm(csn, serviceName, Edm = undefined, options=undefined,
     else if (!expectedType['Members'].includes(enumValue)) {
       message(warning, context, `enumeration type ${ dTypeName } has no value ${ enumValue }`);
     }
-    return;
   }
 
   // cAnnoValue: array
@@ -865,8 +879,9 @@ function csn2annotationEdm(csn, serviceName, Edm = undefined, options=undefined,
     }
 
     let index = 0;
-    for (let e of cAnnoValue) {
-      context.stack.push('[' + index++ + ']');
+    for (const e of cAnnoValue) {
+      context.stack.push('[' + index + ']');
+      index++;
       if (e['#']) {
         checkEnumValue(e['#'], dTypeName, context);
       }
@@ -901,7 +916,7 @@ function csn2annotationEdm(csn, serviceName, Edm = undefined, options=undefined,
     }
     else {
       // replace all occurrences of '.' by '/' up to first '@'
-      val = expr.split('@').map((o,i) => (i==0 ? o.replace(/\./g, '/') : o)).join('@');
+      val = expr.split('@').map((o,i) => (i === 0 ? o.replace(/\./g, '/') : o)).join('@');
     }
 
     return {
@@ -922,9 +937,10 @@ function csn2annotationEdm(csn, serviceName, Edm = undefined, options=undefined,
     // caller already made sure that val is neither object nor array
     dTypeName = resolveType(dTypeName);
 
-    if(isEnumType(dTypeName)) {
+    if (isEnumType(dTypeName)) {
       const type = getDictType(dTypeName);
-      message(warning, context, `found non-enum value "${val}", expected ${type.Members.map(m=>`"#${m}"`).join(', ')} for ${dTypeName}`);
+      const expected = type.Members.map(m => `"#${m}"`).join(', ');
+      message(warning, context, `found non-enum value "${val}", expected ${expected} for ${dTypeName}`);
     }
 
     let typeName = 'String';
@@ -1119,7 +1135,7 @@ function csn2annotationEdm(csn, serviceName, Edm = undefined, options=undefined,
         let dictPropertyTypeName = null;
         if (dictProperties) {
           dictPropertyTypeName = dictProperties[i];
-          if (!dictPropertyTypeName){
+          if (!dictPropertyTypeName && !getDictType(actualTypeName).OpenType){
             message(warning, context, `record type '${ actualTypeName }' doesn't have a property '${ i }'`);
           }
         }
@@ -1154,8 +1170,9 @@ function csn2annotationEdm(csn, serviceName, Edm = undefined, options=undefined,
     }
 
     let index = 0;
-    for (let value of annoValue) {
-      context.stack.push('[' + index++ + ']');
+    for (const value of annoValue) {
+      context.stack.push('[' + index + ']');
+      index++
 
       // for dealing with the single array entries we unfortunately cannot call handleValue(),
       //   as the values inside an array are represented differently from the values
@@ -1214,8 +1231,8 @@ function csn2annotationEdm(csn, serviceName, Edm = undefined, options=undefined,
       return edmNode;
     }
 
-    if(dynExprs.length === 0) {
-      if (typeof obj === 'object' && obj !== null && !Array.isArray(obj) && Object.keys(obj).length==1) {
+    if (dynExprs.length === 0) {
+      if (typeof obj === 'object' && obj !== null && !Array.isArray(obj) && Object.keys(obj).length === 1) {
         const k = Object.keys(obj)[0];
         const val = obj[k];
         edmNode = new Edm.ValueThing(v, k[0] === '$' ? k.slice(1) : k, val );

package/lib/edm/annotations/preprocessAnnotations.js

@@ -236,7 +236,7 @@ function preprocessAnnotations(csn, serviceName, options) {
             } else {
               let stringFields = Object.keys(vlEntity.elements).filter(
                 x => !vlEntity.elements[x].key && vlEntity.elements[x].type === 'cds.String')
-              if (stringFields.length == 1)
+              if (stringFields.length === 1)
                 textField = stringFields[0];
             }
 

package/lib/edm/csn2edm.js

@@ -142,7 +142,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
         definitions: Object.create(null)
       }
     };
-    
+
     if(options.isV4()) {
       // tunnel schema xref and servicename in options to edm.Typebase to rectify
       // type references that are eventually also prefixed with the service schema name.
@@ -304,6 +304,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
         warning('odata-spec-violation-namespace',
                 [ 'definitions', schema.name ], { names: reservedNames });
       }
+      /** @type {any} */
       const Schema = new Edm.Schema(v, schema.name, undefined /* unset alias */, schema._csn, /* annotations */ [], schema.container);
       const EntityContainer = Schema._ec || (LeadSchema && LeadSchema._ec);
       // now namespace and alias are used to create the fullQualified(name)
@@ -390,7 +391,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
         if(properties.length === 0) {
           warning(null, loc, { type }, 'EDM EntityType $(TYPE) has no properties');
         } else if(entityCsn.$edmKeyPaths.length === 0) {
-          warning(null, loc, { type }, 'EDM EntityType $(TYPE) has no primary key');
+          message('odata-spec-violation-no-key', loc);
         }
         properties.forEach(p => {
           const pLoc = [...loc, 'elements', p.Name];
@@ -419,7 +420,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
           /** @type {object} */
           let containerEntry;
 
-          if(edmUtils.isSingleton(entityCsn, options.isV4())) {
+          if(edmUtils.isSingleton(entityCsn) && options.isV4()) {
             containerEntry = new Edm.Singleton(v, { Name: EntitySetName, Type: fullQualified(EntityTypeName) }, entityCsn);
             if(entityCsn['@odata.singleton.nullable'])
               containerEntry.Nullable= true;

package/lib/edm/edm.js

@@ -665,7 +665,7 @@ module.exports = function (options, error) {
         json['$'+this._typeName] = this._type;
 
       edmUtils.forAll(this, (v,p) => {
-        if (p !== 'Name' && p != this._typeName
+        if (p !== 'Name' && p !== this._typeName
           // remove this line if Nullable=true becomes default
           && !(p === 'Nullable' && v == false))
         {
@@ -711,7 +711,7 @@ module.exports = function (options, error) {
             if(alias.length > 28) {
               alias = alias.substr(0, 13)+ '__' +alias.substr(alias.length-13, alias.length);
             }
-            alias = alias+'_'+c.toString().padStart(3,0);
+            alias = alias+'_'+c.toString().padStart(3, '0');
           }
           else if(alias.length > 32) {
             alias = alias.substr(0, 15)+ '__' +alias.substr(alias.length-15, alias.length);
@@ -835,7 +835,7 @@ module.exports = function (options, error) {
       // Nullable=false is default for EDM JSON representation 4.01
       // When a key explicitly (!) has 'notNull = false', it stays nullable
       return (nodeCsn._NotNullCollection !== undefined ? nodeCsn._NotNullCollection :
-        (nodeCsn.key && !(nodeCsn.notNull === false)) || nodeCsn.notNull === true);
+        (nodeCsn.key && nodeCsn.notNull !== false) || nodeCsn.notNull === true);
     }
 
     toJSONattributes(json)
@@ -1159,7 +1159,7 @@ module.exports = function (options, error) {
           /* short notation for Edm.Boolean, Edm.String and Edm.Float, see internal project:
               edmx2csn-npm/edm-converters/blob/835d92a1aa6b0be25c56cef85e260c9188187429/lib/edmxV40ToJsonV40/README.md
             */
-          case 'Edm.Boolean': 
+          case 'Edm.Boolean':
             v = (v=='true'?true:(v=='false'?false:v));
             // eslint-no-fallthrough
           case 'Edm.String':
@@ -1275,8 +1275,8 @@ module.exports = function (options, error) {
       if(this.Type)
         json['@type'] = this.Type;
       let keys = Object.keys(this).filter(k => k !== 'Type');
-      for(let i = 0; i < keys.length; i++)
-        json['$'+keys[i]] = this[keys[i]];
+      for(const key of keys)
+        json['$'+key] = this[key];
     }
 
     toJSONchildren(json)
@@ -1377,7 +1377,7 @@ module.exports = function (options, error) {
     }
 
     toJSON()
-    { 
+    {
       // toJSON: depending on number of children unary or n-ary expr
       const json = this.mergeJSONAnnotations();
       const e = this._children.filter(c=>c.kind !== 'Annotation');
@@ -1459,7 +1459,7 @@ module.exports = function (options, error) {
       return json;
     }
   }
-  // LabeledElementReference is a 
+  // LabeledElementReference is a
   class LabeledElementReference extends ValueThing {
     constructor(v, val) {
       super(v, 'LabeledElementReference', val);

package/lib/edm/edmPreprocessor.js

@@ -39,7 +39,7 @@ function initializeModel(csn, _options, messageFunctions)
   if (!_options)
     throw Error('Please debug me: initializeModel must be invoked with options');
 
-  const { info, warning, error, throwWithError } = messageFunctions;
+  const { info, warning, error, message, throwWithError } = messageFunctions;
 
   const csnUtils = getUtils(csn);
   const {
@@ -54,7 +54,7 @@ function initializeModel(csn, _options, messageFunctions)
   let options = validateOptions(_options);
 
   // Fetch service definitions
-  const serviceRoots = Object.keys(csn.definitions).reduce((serviceRoots, artName) => {
+  const serviceRoots = Object.keys(csn.definitions || {}).reduce((serviceRoots, artName) => {
     const art = csn.definitions[artName];
     if(art.kind === 'service') {
       serviceRoots[artName] = Object.assign(art, { name: artName });
@@ -67,6 +67,9 @@ function initializeModel(csn, _options, messageFunctions)
   function whatsMyServiceRootName(n, self=true) {
     return serviceRootNames.reduce((rc, sn) => !rc && n && n.startsWith(sn + '.') || (n === sn && self) ? sn : rc, undefined);
   }
+  if(serviceRootNames.length === 0) {
+    return [serviceRoots, Object.create(null), whatsMyServiceRootName, options];
+  }
 
   // Structural CSN inbound QA checks
   inboundQualificationChecks();
@@ -452,8 +455,8 @@ function initializeModel(csn, _options, messageFunctions)
     // propagate containment information, if containment is recursive, use parameterCsn.name as _containerEntity
     if(entityCsn._containerEntity) {
       setProp(parameterCsn, '_containerEntity', []);
-      for(let c of entityCsn._containerEntity) {
-        parameterCsn._containerEntity.push((c==entityCsn.name)?parameterCsn.name:c);
+      for(const c of entityCsn._containerEntity) {
+        parameterCsn._containerEntity.push((c === entityCsn.name) ? parameterCsn.name : c);
       }
     }
     entityCsn._containerEntity = [ parameterCsn ];
@@ -486,12 +489,18 @@ function initializeModel(csn, _options, messageFunctions)
         member.$path[1] = parameterEntityName;
     });
 
-
-    csn.definitions[parameterCsn.name] = parameterCsn;
+    if(csn.definitions[parameterCsn.name])
+      error('odata-definition-exists', [ 'definitions', entityName ], { '#': 'std', name: parameterCsn.name });
+    else
+      csn.definitions[parameterCsn.name] = parameterCsn;
     // modify the original parameter entity with backlink and new name
-    csn.definitions[originalEntityName] = entityCsn;
-    delete csn.definitions[entityCsn.name];
-    entityCsn.name = originalEntityName;
+    if(csn.definitions[originalEntityName])
+      error('odata-definition-exists', [ 'definitions', entityName ], {  '#': 'std', name: originalEntityName });
+    else {
+      csn.definitions[originalEntityName] = entityCsn;
+      delete csn.definitions[entityCsn.name];
+      entityCsn.name = originalEntityName;
+    }
     setProp(entityCsn, '$entitySetName', originalEntitySetName);
     // add backlink association
     if(hasBacklink) {
@@ -543,6 +552,7 @@ function initializeModel(csn, _options, messageFunctions)
   // convert $path to path starting at main artifact
   function $path2path(p) {
     const path = [];
+    /** @type {object} */
     let env = csn;
     for (let i = 0; p && env && i < p.length; i++) {
       const ps = p[i];
@@ -594,6 +604,16 @@ function initializeModel(csn, _options, messageFunctions)
       if(element['@cds.valid.from']) {
         validFrom.push(element);
       }
+      //forward annotations from managed association element to its foreign keys
+      const elements = construct.items && construct.items.elements || construct.elements;
+      forAll(elements[element['@odata.foreignKey4']], (attr, attrName) => {
+        if(attrName[0] === '@') {
+          element[attrName] = attr;
+        }
+      });
+      // and eventually remove some afterwards:)
+      if(options.isV2())
+        setSAPSpecificV2AnnotationsToAssociation(element);
 
       // initialize an association
       if(isAssociationOrComposition(element)) {
@@ -602,20 +622,6 @@ function initializeModel(csn, _options, messageFunctions)
         assignProp(element._target, '$proxies', []);
         // $abspath is used as partner path
         assignProp(element, '$abspath', $path2path(element.$path));
-
-        //forward annotations from managed association element to its foreign keys
-        if(element.keys && options.isFlatFormat) {
-          const elements = construct.items && construct.items.elements || construct.elements;
-          for(let fk of element.keys) {
-            forAll(element, (attr, attrName) => {
-              if(attrName[0] === '@' && fk.$generatedFieldName && elements && elements[fk.$generatedFieldName]) {
-                elements[fk.$generatedFieldName][attrName] = attr;
-              }
-            });
-          }
-        }
-        // and afterwards eventually remove some :)
-        setSAPSpecificV2AnnotationsToAssociation(options, element, def);
       }
 
       // Collect keys
@@ -770,7 +776,7 @@ function initializeModel(csn, _options, messageFunctions)
             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) {
+              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}"`);
               }
@@ -1269,9 +1275,8 @@ function initializeModel(csn, _options, messageFunctions)
         }
         else if(alreadyRegistered && !alreadyRegistered.$proxy &&
           !['entity', 'view'].includes(alreadyRegistered.kind)) {
-          warning(null, ['definitions', element._parent.name, 'elements', element.name],
-            { name: fqProxyName, kind: alreadyRegistered.kind },
-            'No proxy EDM entity type created due to name collision with $(NAME) of kind $(KIND)');
+          warning('odata-definition-exists', ['definitions', element._parent.name, 'elements', element.name],
+            { '#': 'proxy', name: fqProxyName, kind: alreadyRegistered.kind });
           return undefined;
         }
       }
@@ -1351,7 +1356,7 @@ function initializeModel(csn, _options, messageFunctions)
       // OData requires all elements along the path to be nullable: false (that is either key or notNull)
 
       const finalType = getFinalTypeDef(eltCsn.items && eltCsn.items.type || eltCsn.type);
-      const elements = eltCsn.elements || eltCsn.items && eltCsn.items.elements || 
+      const elements = eltCsn.elements || eltCsn.items && eltCsn.items.elements ||
       (finalType && (finalType.elements || finalType.items && finalType.items.elements));
       if(elements) {
         Object.entries(elements).forEach(([eltName, elt]) => {
@@ -1416,7 +1421,7 @@ function initializeModel(csn, _options, messageFunctions)
         if(options.isV4() && type && !isAssociationOrComposition(type) && isBuiltinType(type.type)) {
           const edmType = edmUtils.mapCdsToEdmType(type);
           const legalEdmTypes = [
-            'Edm.Boolean', 'Edm.Byte', 'Edm.Date', 'Edm.DateTimeOffset', 'Edm.Decimal', 'Edm.Duration', 
+            'Edm.Boolean', 'Edm.Byte', 'Edm.Date', 'Edm.DateTimeOffset', 'Edm.Decimal', 'Edm.Duration',
             'Edm.Guid', 'Edm.Int16', 'Edm.Int32', 'Edm.Int64', 'Edm.SByte', 'Edm.String', 'Edm.TimeOfDay' ];
           if(!legalEdmTypes.includes(edmType)) {
             warning('odata-spec-violation-key-type', location,
@@ -1518,8 +1523,8 @@ function initializeModel(csn, _options, messageFunctions)
             // end point reached but must not be an external reference nor a proxy nor a composition itself
             // last assoc step must not be to-n and target a singleton
             let p = undefined;
-            if (!elt._target.$externalRef && 
-              !(edmUtils.isToMany(elt) && edmUtils.isSingleton(elt._target, options.isV4()))) {
+            if (!elt._target.$externalRef &&
+              !(edmUtils.isToMany(elt) && edmUtils.isSingleton(elt._target) && options.isV4())) {
               if(elt._target.$edmTgtPaths && elt._target.$edmTgtPaths.length) {
                 p = elt._target.$edmTgtPaths.find(p => p[0] === edmUtils.getBaseName(struct.name)) || elt._target.$edmTgtPaths[0];
               }
@@ -1527,7 +1532,7 @@ function initializeModel(csn, _options, messageFunctions)
                 const baseName = edmUtils.getBaseName(elt._target.$entitySetName || elt._target.name);
                 // if own struct and target have a set they either are in the same $mySchemaName or not
                 // if target is in another schema, target the full qualified entity set
-                p = (elt._target.$mySchemaName === struct.$mySchemaName) ? 
+                p = (elt._target.$mySchemaName === struct.$mySchemaName) ?
                   [ baseName ] : [elt._target.$mySchemaName + '.EntityContainer', baseName];
               }
               if(p) {
@@ -1642,7 +1647,7 @@ function initializeModel(csn, _options, messageFunctions)
       !isBetaEnabled(options, 'nestedServices') && serviceRootNames.forEach(sn => {
         const parent = whatsMyServiceRootName(sn, false);
         if(parent && parent !== sn) {
-          error( 'service-nested-service', [ 'definitions', sn ], { art: parent },
+          message( 'service-nested-service', [ 'definitions', sn ], { art: parent },
                'A service can\'t be nested within a service $(ART)' );
         }
       });
@@ -1651,7 +1656,7 @@ function initializeModel(csn, _options, messageFunctions)
         if(art.kind === 'context') {
           const parent = whatsMyServiceRootName(fqName);
           if(parent) {
-            error( 'service-nested-context', [ 'definitions', fqName ], { art: parent },
+            message( 'service-nested-context', [ 'definitions', fqName ], { art: parent },
                'A context can\'t be nested within a service $(ART)' );
           }
         }
@@ -1789,8 +1794,8 @@ function initializeModel(csn, _options, messageFunctions)
         if(!navPropEntry[prop]) {
           // Filter properties with prefix and reduce them into a new dictionary
           const o = props.filter(p => p[0].startsWith(prefix+'.')).reduce((a,c) => {
-            a[c[0].replace(prefix+'.', '')] = c[1]; 
-            return a; 
+            a[c[0].replace(prefix+'.', '')] = c[1];
+            return a;
           }, { });
           // if dictionary has entries, add them to navPropEnty
           if(Object.keys(o).length) {
@@ -1926,8 +1931,9 @@ function applyAppSpecificLateCsnTransformationOnElement(options, element, struct
   // nested functions begin
   function PDMSemantics()
   {
-    let dict = Object.create(null);
     /*
+    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' ];
@@ -1941,7 +1947,7 @@ function applyAppSpecificLateCsnTransformationOnElement(options, element, struct
     // respect flattened annotation $value
     Object.keys(dict).forEach(k => dict[k+'.$value'] = dict[k]);
     */
-    return dict;
+    return Object.create(null);
   }
 
   function AnalyticalAnnotations()
@@ -2159,19 +2165,17 @@ function setSAPSpecificV2AnnotationsToEntitySet(options, carrier) {
   }
 }
 
-function setSAPSpecificV2AnnotationsToAssociation(options, carrier, struct) {
-  if(!options.isV2())
-    return;
+function setSAPSpecificV2AnnotationsToAssociation(carrier) {
   // documented in https://wiki.scn.sap.com/wiki/display/EmTech/SAP+Annotations+for+OData+Version+2.0
   const SetAttributes = {
     // Applicable to NavProp and foreign keys, add to AssociationSet
-    '@sap.creatable' : (struct, c,pn, pv) => { addToSetAttr(struct, c, pn, pv, false); },
+    '@sap.creatable' : (c, pn, pv) => { addToAssociationSet(c, pn, pv, false); },
     // Not applicable to NavProp, applicable to foreign keys, add to AssociationSet
-    '@sap.updatable' : addToSetAttr,
+    '@sap.updatable' : addToAssociationSet,
     // Not applicable to NavProp, not applicable to foreign key, add to AssociationSet
-    '@sap.deletable': (struct, c, pn, pv) => {
-      addToSetAttr(struct, c, pn, pv);
-      removeFromForeignKey(struct, c, pn);
+    '@sap.deletable': (c, pn, pv) => {
+      addToAssociationSet(c, pn, pv);
+      removeFromForeignKey(c, pn);
     },
     // applicable to NavProp, not applicable to foreign keys, not applicable to AssociationSet
     '@sap.creatable.path': removeFromForeignKey,
@@ -2179,24 +2183,22 @@ function setSAPSpecificV2AnnotationsToAssociation(options, carrier, struct) {
   };
 
   Object.entries(carrier).forEach(([p, v]) => {
-    (SetAttributes[p] || function() {/* no-op */})(struct, carrier, p, v);
+    (SetAttributes[p] || function() {/* no-op */})(carrier, p, v);
   });
 
-  function addToSetAttr(struct, carrier, propName, propValue, removeFromType=true) {
-    assignProp(carrier, '_SetAttributes', Object.create(null));
-    assignAnnotation(carrier._SetAttributes, propName, propValue);
-    if(removeFromType) {
-      delete carrier[propName];
+  function addToAssociationSet(carrier, propName, propValue, removeFromType=true) {
+    if(isAssociationOrComposition(carrier)) {
+      assignProp(carrier, '_SetAttributes', Object.create(null));
+      assignAnnotation(carrier._SetAttributes, propName, propValue);
+      if(removeFromType) {
+        delete carrier[propName];
+      }
     }
   }
 
-  function removeFromForeignKey(struct, carrier, propName) {
-    if(carrier.target && carrier.keys) {
-      struct.elements && Object.values(struct.elements).forEach(e => {
-        if(e['@odata.foreignKey4'] === carrier.name) {
-          delete e[propName];
-        }
-      });
+  function removeFromForeignKey(carrier, propName) {
+    if(carrier['@odata.foreignKey4'] && carrier[propName] !== undefined) {
+      delete carrier[propName];
     }
   }
 }

package/lib/edm/edmUtils.js

@@ -30,18 +30,18 @@ function validateOptions(_options)
 
     }
 
-    const v2 = options.version.match(/v2/i) != undefined;
-    const v4 = options.version.match(/v4/i) != undefined;
+    const v2 = options.version.match(/v2/i) !== null;
+    const v4 = options.version.match(/v4/i) !== null;
 
     options.v = [v2, v4];
     options.isStructFormat = options.odataFormat && options.odataFormat === 'structured';
     options.isFlatFormat = !options.isStructFormat;
 
-    if(options.v.filter(v=>v).length != 1)
+    if(options.v.filter(v=>v).length !== 1)
       throw Error(`Please debug me: EDM V2:${v2}, V4:${v4}`);
 
-    options.isV2 = function() { return this.v[0] == true; }
-    options.isV4 = function() { return this.v[1] == true; }
+    options.isV2 = function() { return this.v[0]; }
+    options.isV4 = function() { return this.v[1]; }
 
     options.pathDelimiter = options.isStructFormat ? '/' : '_';
 
@@ -115,10 +115,10 @@ function isToMany(assoc) {
   return targetMax === '*' || Number(targetMax) > 1;
 }
 
-function isSingleton(entityCsn, v) {
+function isSingleton(entityCsn) {
   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);
+  return singleton || ((singleton === undefined || singleton === null) && hasNullable);
 }
 
 function isEntity(artifact)
@@ -181,7 +181,7 @@ function resolveOnConditionAndPrepareConstraints(csn, assocCsn, messageFunctions
       const parent = csn.definitions[parentName];
       if(originAssocCsn) {
         const originParentName = originAssocCsn.$abspath[0];
-        if(originAssocCsn._originalTarget !== parent && originAssocCsn._target !== parent) {
+        if(parent.$mySchemaName && originAssocCsn._originalTarget !== parent && originAssocCsn._target !== parent) {
           isBacklink = false;
           // Partnership is ambiguous
           setProp(originAssocCsn, '$noPartner', true);
@@ -192,7 +192,7 @@ 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;
             }
@@ -202,7 +202,7 @@ function resolveOnConditionAndPrepareConstraints(csn, assocCsn, messageFunctions
           }
           // 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(assocCsn._constraints.selfs.length === 1 && assocCsn._constraints.termCount === 1) {
+          if(parent.$mySchemaName && assocCsn._constraints.selfs.length === 1 && assocCsn._constraints.termCount === 1) {
             originAssocCsn._selfReferences.push(assocCsn);
           }
           assocCsn._constraints._origins.push(originAssocCsn);
@@ -358,7 +358,7 @@ function finalizeReferentialConstraints(csn, assocCsn, options, info)
           // in structured mode only resolve top level element (path rewriting is done elsewhere)
           const depEltName = ( options.isFlatFormat ? c[0].join('_') : c[0][0] );
           const principalEltName = ( options.isFlatFormat ? c[1].join('_') : c[1][0] );
-          const fk = (isEntity(dependentEntity) && dependentEntity.elements[ depEltName ]) || 
+          const fk = (isEntity(dependentEntity) && dependentEntity.elements[ depEltName ]) ||
             (localDepEntity && localDepEntity.elements && localDepEntity.elements[ depEltName ]);
           const pk = principalEntity.$keys && principalEntity.$keys[ principalEltName ];
           if(isConstraintCandidate(fk) && isConstraintCandidate(pk)) {
@@ -463,12 +463,11 @@ function finalizeReferentialConstraints(csn, assocCsn, options, info)
    * The element must never be an association or composition and be renderable.
    */
   function isConstraintCandidate(elt) {
-    let rc= (elt &&
+    return (elt &&
             elt.type &&
             (!options.isFlatFormat || options.isFlatFormat && isBuiltinType(elt.type)) &&
             !['cds.Association', 'cds.Composition'].includes(elt.type) &&
             isEdmPropertyRendered(elt, options));
-    return rc;
   }
 }
 
@@ -694,10 +693,10 @@ function getBaseName(name) {
 
 // This is a poor mans path resolver for $self partner paths only
 function resolveOriginAssoc(csn, env, path) {
-  for(let i = 0; i < path.length; i++) {
+  for(const segment of path) {
     let elements = (env.items && env.items.elements || env.elements);
     if(elements)
-      env = env.elements[path[i]];
+      env = env.elements[segment];
     let type = (env.items && env.items.type || env.type);
     if(type && !isBuiltinType(type) && !(env.items && env.items.elements || env.elements))
       env = csn.definitions[env.type];