@sap/cds-compiler 3.1.0 → 3.1.2

package/CHANGELOG.md

@@ -7,6 +7,16 @@
 Note: `beta` fixes, changes and features are usually not listed in this ChangeLog but [here](doc/CHANGELOG_BETA.md).
 The compiler behavior concerning `beta` features can change at any time without notice.
 
+## Version 3.1.2 - 2022-08-19
+
+### Fixed
+
+- to.edm(x):
+  + `@Capabilities` 'pull up' for containment trees should not prefix the
+    dynamic annotation paths of the root container.
+  + Remove service namespace prefix of a parameter type for function/action annotation targets
+    in multi schema mode if the parameter type is defined in an alternative schema.
+
 ## Version 3.1.0 - 2022-08-04
 
 ### Added

package/lib/edm/annotations/genericTranslation.js

@@ -401,8 +401,6 @@ function csn2annotationEdm(csn, serviceName, Edm = undefined, options=undefined,
       params.push(action['@cds.odata.bindingparameter.collection'] ? 'Collection(' + bindingParam + ')' : bindingParam);
     }
     if (action.kind === 'function') {
-      let mapType = (p) => (isBuiltinType(p.type)) ?
-        edmUtils.mapCdsToEdmType(p, messageFunctions, false /*is only called for v4*/) : p.type;
       if(action.params) {
         action.params && Object.values(action.params).forEach(p => {
           let isArrayType = !p.type && p.items && p.items.type;
@@ -411,6 +409,18 @@ function csn2annotationEdm(csn, serviceName, Edm = undefined, options=undefined,
       }
     }
     return '(' + params.join(',') + ')';
+
+    function mapType(p) {
+      if(isBuiltinType(p.type))
+        return edmUtils.mapCdsToEdmType(p, messageFunctions, false /*is only called for v4*/)
+      else if(options.whatsMySchemaName) {
+        const schemaName = options.whatsMySchemaName(p.type);
+        // strip the service namespace of from a parameter type
+        if(schemaName && schemaName !== options.serviceName)
+          return p.type.replace(options.serviceName + '.', '');
+      }
+      return p.type;
+    }
   }
 
 

package/lib/edm/edmPreprocessor.js

@@ -4,7 +4,7 @@ const { setProp, isDeprecatedEnabled, isBetaEnabled } = require('../base/model')
 const { 
   forEachDefinition, forEachGeneric, forEachMemberRecursively,
   isEdmPropertyRendered, getUtils, cloneCsnNonDict, cloneCsnDictionary,
-  isBuiltinType, applyTransformationsOnNonDictionary 
+  isBuiltinType, applyTransformations
 } = require('../model/csnUtils');
 const edmUtils = require('./edmUtils.js');
 const edmAnnoPreproc = require('./edmAnnoPreprocessor.js');
@@ -1833,21 +1833,51 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
         // copy or create container restrictions, don't modify original
         const localRestrictions = container[NavResAnno] ?
         cloneCsnDictionary(container[NavResAnno], options) : []
-      
+
+        // prefix the existing navigation property restritictions on the container
+        if(prefix.length) {
+          localRestrictions.forEach(npe => {
+            if(npe.NavigationProperty &&
+               npe.NavigationProperty['='] &&
+               typeof npe.NavigationProperty['='] === 'string') {
+              applyTransformations({ definitions: { npe }}, {
+                "=": (parent, prop, value) => {
+                  parent[prop] = prefix.concat(value).join('.');
+                }
+              });
+            }
+          });
+        }
+
         setProp(container, '$visited', true);
+        // collect capabilities from containees
         container.$containeeAssociations.forEach(entry => {
           const { assoc, path } = entry;
           const containee = assoc._target;
 
           if(isMyServiceRequested(containee.name) || containee.$proxy) {
             const localAssocPath = path.join('.');
+            let navPropEntry;
+            const hasEntry = !!(navPropEntry = localRestrictions.find(p =>
+                p.NavigationProperty && p.NavigationProperty['='] === prefix.concat(localAssocPath).join('.')));
+
+            if(!hasEntry) {
+              navPropEntry =  { NavigationProperty: { '=': prefix.concat(localAssocPath).join('.') } };
+            }
+
             const props = Object.entries(containee);
+            let newEntry = false;
             ['@Capabilities.DeleteRestrictions',
               '@Capabilities.InsertRestrictions',
               '@Capabilities.UpdateRestrictions',
-              '@Capabilities.ReadRestrictions'].forEach(c => 
-                edmUtils.mergeIntoNavPropRestrictions(c, localAssocPath, props, localRestrictions));
+              '@Capabilities.ReadRestrictions'].forEach(c => {
+                if(edmUtils.mergeIntoNavPropEntry(c, navPropEntry, prefix.concat(path), props))
+                  newEntry = true;
+              });
 
+            if(newEntry && !hasEntry) {
+              localRestrictions.push(navPropEntry);
+            }
 
             if(!containee.$visited) {
               addContainmentAnnotationsRecursively(prefix.concat(path), containee);
@@ -1855,19 +1885,6 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
           }
         });
 
-        // prefix all paths in the navPropEntry with the NavigationPropertyPath
-        localRestrictions.forEach((p, i) => {
-          if(p.NavigationProperty && p.NavigationProperty['='] && typeof p.NavigationProperty['='] === 'string') {
-            const lp = [ ...prefix, p.NavigationProperty['=']].join('.');
-            applyTransformationsOnNonDictionary(localRestrictions, i, {
-              "=": (parent, prop, value) => {
-                parent[prop] = [lp, value].join('.');
-              }
-            });
-            // reset NavigationPropertyPath
-            p.NavigationProperty['='] = lp;
-          }
-        });
         rootRestrictions.unshift(...localRestrictions);
         delete container.$visited;
       }

package/lib/edm/edmUtils.js

@@ -1,6 +1,6 @@
 'use strict';
 const { setProp } = require('../base/model');
-const { isBuiltinType, isEdmPropertyRendered } = require('../model/csnUtils');
+const { isBuiltinType, isEdmPropertyRendered, applyTransformations } = require('../model/csnUtils');
 const { escapeString, hasControlCharacters, hasUnpairedUnicodeSurrogate } = require("../render/utils/stringEscapes");
 
 /* eslint max-statements-per-line:off */
@@ -753,24 +753,23 @@ function resolveOriginAssoc(csn, env, path) {
   return env;
 }
 
-function mergeIntoNavPropRestrictions(annoPrefix, assocPath, props, navPropRestrictions) {
-  let navPropEntry;
-  let hasEntry = false;
+function mergeIntoNavPropEntry(annoPrefix, navPropEntry, prefix, props) {
   let newEntry = false;
-  hasEntry = !!(navPropEntry = navPropRestrictions.find(p =>
-                p.NavigationProperty && p.NavigationProperty['='] === assocPath));
 
-  if(!hasEntry) {
-    navPropEntry =  { NavigationProperty: { '=': assocPath } };
-  }
-
-  const prop = annoPrefix.split('.')[1];
   // Filter properties with prefix and reduce them into a new dictionary
   const o = props.filter(p => p[0].startsWith(annoPrefix+'.')).reduce((a,c) => {
     a[c[0].replace(annoPrefix+'.', '')] = c[1];
     return a;
   }, { });
+
+  // BEFORE merging found capabilities, prefix the paths
+  applyTransformations({ definitions: { o }}, {
+    "=": (parent, prop, value) => {
+      parent[prop] = prefix.concat(value).join('.');
+    }
+  });
   // don't overwrite existing restrictions
+  const prop = annoPrefix.split('.')[1];
   if(!navPropEntry[prop]) {
     // if dictionary has entries, add them to navPropEnty
     if(Object.keys(o).length) {
@@ -807,9 +806,7 @@ function mergeIntoNavPropRestrictions(annoPrefix, assocPath, props, navPropRestr
         navPropEntry[prop][k] = v;
     });
   }
-  if(newEntry && !hasEntry) {
-    navPropRestrictions.push(navPropEntry);
-  }
+  return newEntry;
 }
 
 // Assign but not overwrite annotation
@@ -854,5 +851,5 @@ module.exports = {
   escapeStringForText,
   getSchemaPrefix,
   getBaseName,
-  mergeIntoNavPropRestrictions
+  mergeIntoNavPropEntry
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",