@sap/cds-compiler 3.0.2 → 3.1.0

package/lib/edm/edmUtils.js

@@ -27,8 +27,8 @@ function validateOptions(_options)
     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]; }
-    options.isV4 = function() { return this.v[1]; }
+    options.isV2 = () => v2;
+    options.isV4 = () => v4;
 
     options.pathDelimiter = options.isStructFormat ? '/' : '_';
 
@@ -59,8 +59,8 @@ function foreach(dictionary, filter, func) {
 // true if _containerEntity is unequal to artifact name (non-recursive containment association)
 //      or if artifact belongs to an artificial parameter entity
 function isContainee(artifact) {
-  // if _containerEntity is present, it is guaranteed that it has at least one entry
-  return (artifact._containerEntity && (artifact._containerEntity.length > 1 || artifact._containerEntity[0] != artifact.name));
+  // if $containerNames is present, it is guaranteed that it has at least one entry
+  return (artifact.$containerNames && (artifact.$containerNames.length > 1 || artifact.$containerNames[0] != artifact.name));
 }
 
 function isComposition(artifact) {
@@ -753,7 +753,86 @@ function resolveOriginAssoc(csn, env, path) {
   return env;
 }
 
+function mergeIntoNavPropRestrictions(annoPrefix, assocPath, props, navPropRestrictions) {
+  let navPropEntry;
+  let hasEntry = false;
+  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;
+  }, { });
+  // don't overwrite existing restrictions
+  if(!navPropEntry[prop]) {
+    // if dictionary has entries, add them to navPropEnty
+    if(Object.keys(o).length) {
+      // ReadRestrictions may have sub type ReadByKeyRestrictions { Description, LongDescription }
+      // chop annotations into dictionaries
+      if(annoPrefix === '@Capabilities.ReadRestrictions' &&
+                      Object.keys(o).some(k => k.startsWith('ReadByKeyRestrictions.'))) {
+        const no = {};
+        Object.entries(o).forEach(([k,v]) => {
+          const [head, ...tail] = k.split('.');
+          if(head === 'ReadByKeyRestrictions' && tail.length) {
+            if(!no['ReadByKeyRestrictions'])
+              no['ReadByKeyRestrictions'] = {};
+                        // Don't try to add entry into non object
+            if(typeof no['ReadByKeyRestrictions'] === 'object')
+              no['ReadByKeyRestrictions'][tail.join('.')] = v;
+          }
+          else {
+            no[k] = v;
+          }
+        });
+        navPropEntry[prop] = no;
+      }
+      else {
+        navPropEntry[prop] = o;
+      }
+      newEntry = true;
+    }
+  }
+  else {
+    // merge but don't overwrite into existing navprop
+    Object.entries(o).forEach(([k,v]) => {
+      if(!navPropEntry[prop][k])
+        navPropEntry[prop][k] = v;
+    });
+  }
+  if(newEntry && !hasEntry) {
+    navPropRestrictions.push(navPropEntry);
+  }
+}
+
+// Assign but not overwrite annotation
+function assignAnnotation(node, name, value) {
+  if(value !== undefined &&
+      name !== undefined && name[0] === '@' &&
+      (node[name] === undefined || node[name] === null)) {
+    node[name] = value;
+  }
+}
+
+// Set non enumerable property if it doesn't exist yet
+function assignProp(obj, prop, value) {
+  if(obj[prop] === undefined) {
+    setProp(obj, prop, value);
+  }
+}
+
+
+
 module.exports = {
+  assignAnnotation,
+  assignProp,
   validateOptions,
   intersect,
   foreach,
@@ -774,5 +853,6 @@ module.exports = {
   escapeStringForAttributeValue,
   escapeStringForText,
   getSchemaPrefix,
-  getBaseName
+  getBaseName,
+  mergeIntoNavPropRestrictions
 }

package/lib/gen/Dictionary.json

@@ -989,8 +989,7 @@
         "NavigationProperty",
         "Action",
         "Function"
-      ],
-      "$experimental": true
+      ]
     },
     "Common.DerivedDefaultValue": {
       "Type": "Edm.String",
@@ -1424,6 +1423,13 @@
       "Type": "Graph.DetailsType",
       "$experimental": true
     },
+    "Graph.CompositionRoot": {
+      "Type": "Core.Tag",
+      "AppliesTo": [
+        "EntityType"
+      ],
+      "$experimental": true
+    },
     "Hierarchy.RecursiveHierarchy": {
       "Type": "Hierarchy.RecursiveHierarchyType",
       "AppliesTo": [
@@ -2413,7 +2419,8 @@
         "CustomHeaders": "Collection(Capabilities.CustomParameter)",
         "CustomQueryOptions": "Collection(Capabilities.CustomParameter)",
         "Description": "Edm.String",
-        "LongDescription": "Edm.String"
+        "LongDescription": "Edm.String",
+        "ErrorResponses": "Collection(Capabilities.HttpResponse)"
       }
     },
     "Capabilities.PermissionType": {
@@ -2455,7 +2462,8 @@
         "CustomHeaders": "Collection(Capabilities.CustomParameter)",
         "CustomQueryOptions": "Collection(Capabilities.CustomParameter)",
         "Description": "Edm.String",
-        "LongDescription": "Edm.String"
+        "LongDescription": "Edm.String",
+        "ErrorResponses": "Collection(Capabilities.HttpResponse)"
       }
     },
     "Capabilities.DeepUpdateSupportType": {
@@ -2477,7 +2485,8 @@
         "CustomHeaders": "Collection(Capabilities.CustomParameter)",
         "CustomQueryOptions": "Collection(Capabilities.CustomParameter)",
         "Description": "Edm.String",
-        "LongDescription": "Edm.String"
+        "LongDescription": "Edm.String",
+        "ErrorResponses": "Collection(Capabilities.HttpResponse)"
       }
     },
     "Capabilities.CollectionPropertyRestrictionsType": {
@@ -2502,7 +2511,8 @@
         "FilterSegmentSupported": "Edm.Boolean",
         "Permissions": "Collection(Capabilities.PermissionType)",
         "CustomHeaders": "Collection(Capabilities.CustomParameter)",
-        "CustomQueryOptions": "Collection(Capabilities.CustomParameter)"
+        "CustomQueryOptions": "Collection(Capabilities.CustomParameter)",
+        "ErrorResponses": "Collection(Capabilities.HttpResponse)"
       }
     },
     "Capabilities.ModificationQueryOptionsType": {
@@ -2525,7 +2535,8 @@
         "CustomHeaders": "Collection(Capabilities.CustomParameter)",
         "CustomQueryOptions": "Collection(Capabilities.CustomParameter)",
         "Description": "Edm.String",
-        "LongDescription": "Edm.String"
+        "LongDescription": "Edm.String",
+        "ErrorResponses": "Collection(Capabilities.HttpResponse)"
       }
     },
     "Capabilities.ReadByKeyRestrictionsType": {
@@ -2537,7 +2548,8 @@
         "CustomHeaders": "Collection(Capabilities.CustomParameter)",
         "CustomQueryOptions": "Collection(Capabilities.CustomParameter)",
         "Description": "Edm.String",
-        "LongDescription": "Edm.String"
+        "LongDescription": "Edm.String",
+        "ErrorResponses": "Collection(Capabilities.HttpResponse)"
       }
     },
     "Capabilities.ReadRestrictionsType": {
@@ -2550,7 +2562,8 @@
         "CustomHeaders": "Collection(Capabilities.CustomParameter)",
         "CustomQueryOptions": "Collection(Capabilities.CustomParameter)",
         "Description": "Edm.String",
-        "LongDescription": "Edm.String"
+        "LongDescription": "Edm.String",
+        "ErrorResponses": "Collection(Capabilities.HttpResponse)"
       }
     },
     "Capabilities.CustomParameter": {
@@ -2563,6 +2576,13 @@
         "ExampleValues": "Collection(Core.PrimitiveExampleValue)"
       }
     },
+    "Capabilities.HttpResponse": {
+      "$kind": "ComplexType",
+      "Properties": {
+        "StatusCode": "Edm.String",
+        "Description": "Edm.String"
+      }
+    },
     "Capabilities.FilterExpressionType": {
       "$kind": "TypeDefinition",
       "UnderlyingType": "Edm.String"

package/lib/gen/language.checksum

@@ -1 +1 @@
-ca4caa65192cebc39f35cd598958dbb0
+2067e213918678e2d85713a46e69d9cc