@sap/cds-compiler 3.1.0 → 3.3.2

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, cloneAnnotationValue } = require('../model/csnUtils');
 const { escapeString, hasControlCharacters, hasUnpairedUnicodeSurrogate } = require("../render/utils/stringEscapes");
 
 /* eslint max-statements-per-line:off */
@@ -508,6 +508,10 @@ function mapCdsToEdmType(csn, messageFunctions, isV2=false, isMediaType=false, l
     'cds.hana.SMALLDECIMAL': 'Edm.Decimal', // V4: Scale="floating" Precision="16"
     'cds.Integer64': 'Edm.Int64',
     'cds.Integer': 'Edm.Int32',
+    'cds.Int64': 'Edm.Int64',
+    'cds.Int32': 'Edm.Int32',
+    'cds.Int16': 'Edm.Int16',
+    'cds.UInt8': 'Edm.Byte',
     'cds.hana.SMALLINT': 'Edm.Int16',
     'cds.hana.TINYINT': 'Edm.Byte',
     'cds.Double': 'Edm.Double',
@@ -753,24 +757,24 @@ 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];
+    // clone the annotation value to avoid side effects with rewritten paths
+    a[c[0].replace(annoPrefix+'.', '')] = cloneAnnotationValue(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 +811,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 +856,5 @@ module.exports = {
   escapeStringForText,
   getSchemaPrefix,
   getBaseName,
-  mergeIntoNavPropRestrictions
+  mergeIntoNavPropEntry
 }

package/lib/gen/Dictionary.json

@@ -1808,6 +1808,13 @@
         "Parameter"
       ]
     },
+    "UI.IsCopyAction": {
+      "Type": "Core.Tag",
+      "AppliesTo": [
+        "Record"
+      ],
+      "$experimental": true
+    },
     "UI.CreateHidden": {
       "Type": "Core.Tag",
       "AppliesTo": [
@@ -1897,6 +1904,13 @@
       ],
       "$experimental": true
     },
+    "UI.LeadingEntitySet": {
+      "Type": "Edm.String",
+      "AppliesTo": [
+        "EntityContainer"
+      ],
+      "$experimental": true
+    },
     "Validation.Pattern": {
       "Type": "Edm.String",
       "AppliesTo": [

package/lib/gen/language.checksum

@@ -1 +1 @@
-2067e213918678e2d85713a46e69d9cc
+d054015b5c1bda3f92422cb3f44733bb