@sap/cds-compiler 4.7.6 → 4.9.0

package/lib/edm/edmPreprocessor.js

@@ -5,9 +5,10 @@ const { setProp, isDeprecatedEnabled, isBetaEnabled } = require('../base/model')
 const {
   forEachDefinition, forEachGeneric, forEachMemberRecursively,
   isEdmPropertyRendered, getUtils,
-  isBuiltinType, applyTransformations, transformExpression, findAnnotationExpression,
-  cardinality2str, isMagicVariable,
+  applyTransformations, transformExpression, findAnnotationExpression,
+  cardinality2str,
 } = require('../model/csnUtils');
+const { isBuiltinType, isMagicVariable } = require('../base/builtins');
 const edmUtils = require('./edmUtils.js');
 const edmAnnoPreproc = require('./edmAnnoPreprocessor.js');
 const { inboundQualificationChecks } = require('./edmInboundChecks.js');
@@ -126,7 +127,7 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
         const mySchemaName = whatsMySchemaName(defName);
         if (mySchemaName)
           setProp(def, '$mySchemaName', mySchemaName);
-        if (isMyServiceRequested(defName) && def.kind !== 'aspect')
+        if (isMyServiceRequested(defName) && def.kind !== 'aspect' && def.kind !== 'event')
           reqDefs.definitions[defName] = def;
       },
       linkAssociationTarget,
@@ -540,7 +541,6 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
       // preserve the original target for constraint calculation
       setProp(entityCsn.$sources[n], '_originalTarget', entityCsn.$sources[n]._target);
       entityCsn.$sources[n]._target = parameterCsn;
-      entityCsn.$sources[n].target = parameterCsn.name;
     });
   }
 
@@ -1641,7 +1641,10 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
             if (art.type && !isBuiltinType(art.type))
               art = art._type || csnUtils.getCsnDef(art.type);
           }
-          keyPaths.push(...produceKeyRefPaths(art, prefix + options.pathDelimiter + k.ref.join(options.pathDelimiter), path));
+          if (art === eltCsn)
+            error('odata-key-recursive', path, { name: prefix });
+          else
+            keyPaths.push(...produceKeyRefPaths(art, prefix + options.pathDelimiter + k.ref.join(options.pathDelimiter), path));
         });
       }
       else {
@@ -1905,6 +1908,7 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
         markCollection(member.returns);
         mapCdsToEdmProp(member.returns);
         annotateAllowedValues(member.returns, [ ...location, 'returns' ]);
+        rewriteAnnotationExpressions(member.returns);
       }
     }, defLocation);
     // mark members that need to be rendered as collections
@@ -2038,11 +2042,12 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
 
           if (edmUtils.isNavigable(assoc) && isMyServiceRequested(containee.name) || containee.$proxy) {
             const localAssocPath = path.join('.');
-            let navPropEntry = localRestrictions.find(p => p.NavigationProperty && p.NavigationProperty['='] === prefix.concat(localAssocPath).join('.'));
+            const laprefix = prefix.concat(localAssocPath).join('.');
+            let navPropEntry = localRestrictions.find(p => p.NavigationProperty && p.NavigationProperty['='] === laprefix);
             const hasEntry = !!navPropEntry;
 
             if (!hasEntry)
-              navPropEntry = { NavigationProperty: { '=': prefix.concat(localAssocPath).join('.') } };
+              navPropEntry = { NavigationProperty: { '=': laprefix } };
 
 
             const props = Object.entries(containee);
@@ -2172,17 +2177,18 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
     // rewrite annotation expression paths such that they are defined against the definition
     const absPath = $path2path(carrier.$path);
     let isSubTreeSpan = true;
-    const rootPrefix = absPath.slice(1, absPath.length - 1);
 
-    const isExprAnno = (obj, pn) => isBetaEnabled(options, 'odataPathsInAnnotationExpressions') && findAnnotationExpression(obj, pn);
+    let rootPrefix = absPath.slice(1, absPath.length - 1);
 
     const subTreeSpan = {
       ref: (parent, _prop, xpr) => {
         const head = xpr[0].id || xpr[0];
         if (head === '$self' || parent.param) {
           let j = parent.param ? 0 : 1;
+          const k = parent.param ? 1 : 0;
+          isSubTreeSpan = isSubTreeSpan && (absPath.length - k <= xpr.length);
           for (let i = 1; i < absPath.length - 1 && isSubTreeSpan; i++, j++)
-            isSubTreeSpan = (xpr[j].id || xpr[j]) === absPath[i];
+            isSubTreeSpan = isSubTreeSpan && (xpr[j].id || xpr[j]) === absPath[i];
         }
       },
     };
@@ -2197,10 +2203,13 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
           for (let i = 1; i < absPath.length - 1 && absPathPrefixEqual; i++, j++)
             absPathPrefixEqual = (xpr[j].id || xpr[j]) === absPath[i];
 
-          if (absPathPrefixEqual)
+          if (absPathPrefixEqual) {
             // remove prefix between $self and leaf element name
             // or starting with the parameter name
             xpr.splice(parent.param ? 0 : 1, absPath.length - 2);
+            if (parent.param)
+              parent.param = null;
+          }
         }
       },
     };
@@ -2221,9 +2230,34 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
     if (absPath.length > 2) {
       const [ xprANames, nxprANames ] = Object.keys(carrier).reduce((acc, pn) => {
         if (pn[0] === '@')
-          acc[isExprAnno(carrier, pn) ? 0 : 1].push(pn);
+          acc[findAnnotationExpression(carrier, pn) ? 0 : 1].push(pn);
         return acc;
       }, [ [], [] ]);
+
+      let scope = carrier.$path[2];
+      let def = csn.definitions[carrier.$path[1]];
+      // unbound
+      if (scope === 'returns') {
+        absPath[1] = '$ReturnType';
+        rootPrefix = absPath.slice(3, absPath.length - 1);
+      }
+      let eltPath = absPath.slice(1).join('/');
+      // bound action
+      if (scope === 'actions' && def[scope][carrier.$path[3]]) {
+        def = def[scope][carrier.$path[3]];
+        scope = carrier.$path[4];
+        if (scope === 'params') {
+          rootPrefix = absPath.slice(2, absPath.length - 1);
+          eltPath = absPath.slice(2).join('/');
+        }
+        if (scope === 'returns') {
+          absPath[2] = '$ReturnType';
+          rootPrefix = absPath.slice(3, absPath.length - 1);
+          eltPath = absPath.slice(2).join('/');
+        }
+      }
+      const proxyDict = `$${scope}AnnoProxies`;
+
       xprANames.forEach((xprAName) => {
         isSubTreeSpan = true;
         transformExpression(carrier, xprAName, subTreeSpan);
@@ -2231,18 +2265,13 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
           transformExpression(carrier, xprAName, relativize);
         }
         else {
-          const scope = carrier.$path[2];
           absolutize.scope = scope;
           transformExpression(carrier, xprAName, absolutize);
-          const def = csn.definitions[absPath[0]];
-          const eltPath = absPath.slice(1).join('/');
-          const proxyDict = scope === 'elements' ? '$eltAnnoProxies' : '$paramAnnoProxies';
-
           if (!def[proxyDict])
             setProp(def, proxyDict, Object.create(null));
-          let eltProxy = def[proxyDict][eltPath];
-          if (!eltProxy) {
-            eltProxy = Object.create(null);
+          let proxyCarrier = def[proxyDict][eltPath];
+          if (!proxyCarrier) {
+            proxyCarrier = Object.create(null);
             // these attributes are needed to test for
             // Property, Parameter, NavigationProperty, Collection
             // Applicability
@@ -2255,18 +2284,18 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
               '@cds.api.ignore',
               '@odata.navigable' ].forEach((prop) => {
               if (carrier[prop] != null)
-                setProp(eltProxy, prop, carrier[prop]);
+                setProp(proxyCarrier, prop, carrier[prop]);
             });
 
             Object.keys(carrier).filter(pn => pn[0] !== '@').forEach((pn) => {
-              eltProxy[pn] = carrier[pn];
+              proxyCarrier[pn] = carrier[pn];
             });
-            def[proxyDict][eltPath] = eltProxy;
+            def[proxyDict][eltPath] = proxyCarrier;
           }
-          eltProxy[xprAName] = carrier[xprAName];
+          proxyCarrier[xprAName] = carrier[xprAName];
           carrier[xprAName] = null;
           nxprANames.filter(an => an.startsWith(`${xprAName}.`)).forEach((nxprAName) => {
-            eltProxy[nxprAName] = carrier[nxprAName];
+            proxyCarrier[nxprAName] = carrier[nxprAName];
             carrier[nxprAName] = null;
           });
         }

package/lib/edm/edmUtils.js

@@ -1,9 +1,10 @@
 'use strict';
 
-const { setProp, isBetaEnabled } = require('../base/model');
+const { setProp } = require('../base/model');
 const {
-  isBuiltinType, isEdmPropertyRendered, applyTransformations,
+  isEdmPropertyRendered, applyTransformations,
 } = require('../model/csnUtils');
+const { isBuiltinType } = require('../base/builtins');
 const { escapeString, hasControlCharacters, hasUnpairedUnicodeSurrogate } = require('../render/utils/stringEscapes');
 const { CompilerAssertion } = require('../base/error');
 const { cloneAnnotationValue } = require('../model/cloneCsn');
@@ -31,20 +32,6 @@ function validateOptions( _options ) {
     options.isV4 = () => v4;
 
     options.pathDelimiter = options.isStructFormat ? '/' : '_';
-
-    if (isBetaEnabled(options, 'v5preview')) {
-      if (!options.severities)
-        options.severities = {};
-      options.severities['odata-spec-violation-array'] ??= 'Error';
-      options.severities['odata-spec-violation-assoc'] ??= 'Error';
-      options.severities['odata-spec-violation-namespace'] ??= 'Error';
-      options.severities['odata-spec-violation-param'] ??= 'Error';
-      options.severities['odata-spec-violation-returns'] ??= 'Error';
-      options.severities['odata-spec-violation-type-unknown'] ??= 'Error';
-      options.severities['odata-spec-violation-no-key'] ??= 'Error';
-      options.severities['odata-spec-violation-key-type'] ??= 'Error';
-      options.severities['odata-spec-violation-property-name'] ??= 'Error';
-    }
     return options;
   }
   return _options;

package/lib/gen/Dictionary.json

@@ -213,7 +213,6 @@
       "Type": "Capabilities.CountRestrictionsType",
       "AppliesTo": [
         "EntitySet",
-        "Singleton",
         "Collection"
       ]
     },
@@ -417,6 +416,12 @@
         "Property"
       ]
     },
+    "Capabilities.DefaultCapabilities": {
+      "Type": "Capabilities.DefaultCapabilitiesType",
+      "AppliesTo": [
+        "EntityContainer"
+      ]
+    },
     "CodeList.CurrencyCodes": {
       "Type": "CodeList.CodeListSource",
       "AppliesTo": [
@@ -2553,20 +2558,34 @@
         "DocumentationUrl": "Edm.String"
       }
     },
+    "Capabilities.ChangeTrackingBase": {
+      "$kind": "ComplexType",
+      "Properties": {
+        "Supported": "Edm.Boolean"
+      }
+    },
     "Capabilities.ChangeTrackingType": {
       "$kind": "ComplexType",
+      "BaseType": "Capabilities.ChangeTrackingBase",
       "Properties": {
-        "Supported": "Edm.Boolean",
         "FilterableProperties": "Collection(Edm.PropertyPath)",
-        "ExpandableProperties": "Collection(Edm.NavigationPropertyPath)"
+        "ExpandableProperties": "Collection(Edm.NavigationPropertyPath)",
+        "Supported": "Edm.Boolean"
+      }
+    },
+    "Capabilities.CountRestrictionsBase": {
+      "$kind": "ComplexType",
+      "Properties": {
+        "Countable": "Edm.Boolean"
       }
     },
     "Capabilities.CountRestrictionsType": {
       "$kind": "ComplexType",
+      "BaseType": "Capabilities.CountRestrictionsBase",
       "Properties": {
-        "Countable": "Edm.Boolean",
         "NonCountableProperties": "Collection(Edm.PropertyPath)",
-        "NonCountableNavigationProperties": "Collection(Edm.NavigationPropertyPath)"
+        "NonCountableNavigationProperties": "Collection(Edm.NavigationPropertyPath)",
+        "Countable": "Edm.Boolean"
       }
     },
     "Capabilities.NavigationRestrictionsType": {
@@ -2625,14 +2644,23 @@
         "SupportedFormats": "Collection(Edm.String)"
       }
     },
-    "Capabilities.FilterRestrictionsType": {
+    "Capabilities.FilterRestrictionsBase": {
       "$kind": "ComplexType",
       "Properties": {
         "Filterable": "Edm.Boolean",
         "RequiresFilter": "Edm.Boolean",
+        "MaxLevels": "Edm.Int32"
+      }
+    },
+    "Capabilities.FilterRestrictionsType": {
+      "$kind": "ComplexType",
+      "BaseType": "Capabilities.FilterRestrictionsBase",
+      "Properties": {
         "RequiredProperties": "Collection(Edm.PropertyPath)",
         "NonFilterableProperties": "Collection(Edm.PropertyPath)",
         "FilterExpressionRestrictions": "Collection(Capabilities.FilterExpressionRestrictionType)",
+        "Filterable": "Edm.Boolean",
+        "RequiresFilter": "Edm.Boolean",
         "MaxLevels": "Edm.Int32"
       }
     },
@@ -2643,22 +2671,38 @@
         "AllowedExpressions": "Capabilities.FilterExpressionType"
       }
     },
+    "Capabilities.SortRestrictionsBase": {
+      "$kind": "ComplexType",
+      "Properties": {
+        "Sortable": "Edm.Boolean"
+      }
+    },
     "Capabilities.SortRestrictionsType": {
       "$kind": "ComplexType",
+      "BaseType": "Capabilities.SortRestrictionsBase",
       "Properties": {
-        "Sortable": "Edm.Boolean",
         "AscendingOnlyProperties": "Collection(Edm.PropertyPath)",
         "DescendingOnlyProperties": "Collection(Edm.PropertyPath)",
-        "NonSortableProperties": "Collection(Edm.PropertyPath)"
+        "NonSortableProperties": "Collection(Edm.PropertyPath)",
+        "Sortable": "Edm.Boolean"
       }
     },
-    "Capabilities.ExpandRestrictionsType": {
+    "Capabilities.ExpandRestrictionsBase": {
       "$kind": "ComplexType",
       "Properties": {
         "Expandable": "Edm.Boolean",
         "StreamsExpandable": "Edm.Boolean",
+        "MaxLevels": "Edm.Int32"
+      }
+    },
+    "Capabilities.ExpandRestrictionsType": {
+      "$kind": "ComplexType",
+      "BaseType": "Capabilities.ExpandRestrictionsBase",
+      "Properties": {
         "NonExpandableProperties": "Collection(Edm.NavigationPropertyPath)",
         "NonExpandableStreamProperties": "Collection(Edm.PropertyPath)",
+        "Expandable": "Edm.Boolean",
+        "StreamsExpandable": "Edm.Boolean",
         "MaxLevels": "Edm.Int32"
       }
     },
@@ -2669,16 +2713,31 @@
         "UnsupportedExpressions": "Capabilities.SearchExpressions"
       }
     },
-    "Capabilities.InsertRestrictionsType": {
+    "Capabilities.InsertRestrictionsBase": {
       "$kind": "ComplexType",
       "Properties": {
         "Insertable": "Edm.Boolean",
+        "MaxLevels": "Edm.Int32",
+        "TypecastSegmentSupported": "Edm.Boolean",
+        "QueryOptions": "Capabilities.ModificationQueryOptionsType",
+        "CustomHeaders": "Collection(Capabilities.CustomParameter)",
+        "CustomQueryOptions": "Collection(Capabilities.CustomParameter)",
+        "Description": "Edm.String",
+        "LongDescription": "Edm.String",
+        "ErrorResponses": "Collection(Capabilities.HttpResponse)"
+      }
+    },
+    "Capabilities.InsertRestrictionsType": {
+      "$kind": "ComplexType",
+      "BaseType": "Capabilities.InsertRestrictionsBase",
+      "Properties": {
         "NonInsertableProperties": "Collection(Edm.PropertyPath)",
         "NonInsertableNavigationProperties": "Collection(Edm.NavigationPropertyPath)",
         "RequiredProperties": "Collection(Edm.PropertyPath)",
+        "Permissions": "Collection(Capabilities.PermissionType)",
+        "Insertable": "Edm.Boolean",
         "MaxLevels": "Edm.Int32",
         "TypecastSegmentSupported": "Edm.Boolean",
-        "Permissions": "Collection(Capabilities.PermissionType)",
         "QueryOptions": "Capabilities.ModificationQueryOptionsType",
         "CustomHeaders": "Collection(Capabilities.CustomParameter)",
         "CustomQueryOptions": "Collection(Capabilities.CustomParameter)",
@@ -2708,7 +2767,7 @@
         "ContentIDSupported": "Edm.Boolean"
       }
     },
-    "Capabilities.UpdateRestrictionsType": {
+    "Capabilities.UpdateRestrictionsBase": {
       "$kind": "ComplexType",
       "Properties": {
         "Updatable": "Edm.Boolean",
@@ -2717,9 +2776,29 @@
         "UpdateMethod": "Capabilities.HttpMethod",
         "FilterSegmentSupported": "Edm.Boolean",
         "TypecastSegmentSupported": "Edm.Boolean",
+        "MaxLevels": "Edm.Int32",
+        "Permissions": "Collection(Capabilities.PermissionType)",
+        "QueryOptions": "Capabilities.ModificationQueryOptionsType",
+        "CustomHeaders": "Collection(Capabilities.CustomParameter)",
+        "CustomQueryOptions": "Collection(Capabilities.CustomParameter)",
+        "Description": "Edm.String",
+        "LongDescription": "Edm.String",
+        "ErrorResponses": "Collection(Capabilities.HttpResponse)"
+      }
+    },
+    "Capabilities.UpdateRestrictionsType": {
+      "$kind": "ComplexType",
+      "BaseType": "Capabilities.UpdateRestrictionsBase",
+      "Properties": {
         "NonUpdatableProperties": "Collection(Edm.PropertyPath)",
         "NonUpdatableNavigationProperties": "Collection(Edm.NavigationPropertyPath)",
         "RequiredProperties": "Collection(Edm.PropertyPath)",
+        "Updatable": "Edm.Boolean",
+        "Upsertable": "Edm.Boolean",
+        "DeltaUpdateSupported": "Edm.Boolean",
+        "UpdateMethod": "Capabilities.HttpMethod",
+        "FilterSegmentSupported": "Edm.Boolean",
+        "TypecastSegmentSupported": "Edm.Boolean",
         "MaxLevels": "Edm.Int32",
         "Permissions": "Collection(Capabilities.PermissionType)",
         "QueryOptions": "Capabilities.ModificationQueryOptionsType",
@@ -2737,11 +2816,27 @@
         "ContentIDSupported": "Edm.Boolean"
       }
     },
-    "Capabilities.DeleteRestrictionsType": {
+    "Capabilities.DeleteRestrictionsBase": {
       "$kind": "ComplexType",
       "Properties": {
         "Deletable": "Edm.Boolean",
+        "MaxLevels": "Edm.Int32",
+        "FilterSegmentSupported": "Edm.Boolean",
+        "TypecastSegmentSupported": "Edm.Boolean",
+        "Permissions": "Collection(Capabilities.PermissionType)",
+        "CustomHeaders": "Collection(Capabilities.CustomParameter)",
+        "CustomQueryOptions": "Collection(Capabilities.CustomParameter)",
+        "Description": "Edm.String",
+        "LongDescription": "Edm.String",
+        "ErrorResponses": "Collection(Capabilities.HttpResponse)"
+      }
+    },
+    "Capabilities.DeleteRestrictionsType": {
+      "$kind": "ComplexType",
+      "BaseType": "Capabilities.DeleteRestrictionsBase",
+      "Properties": {
         "NonDeletableNavigationProperties": "Collection(Edm.NavigationPropertyPath)",
+        "Deletable": "Edm.Boolean",
         "MaxLevels": "Edm.Int32",
         "FilterSegmentSupported": "Edm.Boolean",
         "TypecastSegmentSupported": "Edm.Boolean",
@@ -2841,6 +2936,27 @@
         "ExampleValues": "Collection(Core.PrimitiveExampleValue)"
       }
     },
+    "Capabilities.DefaultCapabilitiesType": {
+      "$kind": "ComplexType",
+      "Properties": {
+        "ChangeTracking": "Capabilities.ChangeTrackingBase",
+        "CountRestrictions": "Capabilities.CountRestrictionsBase",
+        "IndexableByKey": "Core.Tag",
+        "TopSupported": "Core.Tag",
+        "SkipSupported": "Core.Tag",
+        "ComputeSupported": "Core.Tag",
+        "SelectSupport": "Capabilities.SelectSupportType",
+        "FilterRestrictions": "Capabilities.FilterRestrictionsBase",
+        "SortRestrictions": "Capabilities.SortRestrictionsBase",
+        "ExpandRestrictions": "Capabilities.ExpandRestrictionsBase",
+        "SearchRestrictions": "Capabilities.SearchRestrictionsType",
+        "InsertRestrictions": "Capabilities.InsertRestrictionsBase",
+        "UpdateRestrictions": "Capabilities.UpdateRestrictionsBase",
+        "DeleteRestrictions": "Capabilities.DeleteRestrictionsBase",
+        "OperationRestrictions": "Capabilities.OperationRestrictionsType",
+        "ReadRestrictions": "Capabilities.ReadRestrictionsType"
+      }
+    },
     "Capabilities.HttpResponse": {
       "$kind": "ComplexType",
       "Properties": {
@@ -3030,6 +3146,15 @@
         "ValueListProperty": "Edm.String"
       }
     },
+    "Common.ValueListParameterConstants": {
+      "$kind": "ComplexType",
+      "BaseType": "Common.ValueListParameter",
+      "Properties": {
+        "Constants": "Collection(Edm.PrimitiveType)",
+        "ValueListProperty": "Edm.String"
+      },
+      "$experimental": true
+    },
     "Common.ValueListParameterInOut": {
       "$kind": "ComplexType",
       "BaseType": "Common.ValueListParameter",
@@ -3093,7 +3218,6 @@
         "TargetEntities": "Collection(Edm.NavigationPropertyPath)",
         "EffectTypes": "Common.EffectType",
         "TriggerAction": "Common.QualifiedName",
-        "TriggeredIndicator": "Edm.Boolean",
         "Discretionary": "Edm.Boolean"
       }
     },

package/lib/gen/language.checksum

@@ -1 +1 @@
-37b3697769a5035b6409cd959ebdf610
+0c76b255e5fe55c0f8527a4d9f1b563f