@sap/cds-compiler 2.10.2 → 2.11.4

package/lib/edm/edmPreprocessor.js

@@ -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();
@@ -594,6 +597,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 +615,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
@@ -1351,7 +1350,8 @@ 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|| finalType.elements || finalType.items && finalType.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]) => {
           const newRefs = produceKeyRefPaths(elt, prefix + options.pathDelimiter + eltName);
@@ -1400,7 +1400,7 @@ function initializeModel(csn, _options, messageFunctions)
           {name: pathSegment, '#': pathSegment ? 'std' : 'scalar'});
       }
       // many
-      let type = elt.items || getFinalTypeDef(elt.type).items;
+      let type = elt.items || elt.type && !isBuiltinType(elt.type) && getFinalTypeDef(elt.type).items;
       if(type) {
         error('odata-spec-violation-key-array', location,
           {name: pathSegment, '#': pathSegment ? 'std' : 'scalar'});
@@ -2158,19 +2158,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,
@@ -2178,24 +2176,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

@@ -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);

package/lib/gen/language.checksum

@@ -1 +1 @@
-1bb596306f100150c345f169744f5170
+cde5224056abde61cc2eb0b1b30bf694