@sap/cds-compiler 2.13.8 → 3.0.0

package/lib/edm/edmUtils.js

@@ -8,31 +8,17 @@ function validateOptions(_options)
 {
   if(!_options.isV2 && !_options.isV4)
   {
-    // csn2edm expects "version" to be a top-level property of options
+    // csn2edm expects "odataVersion" to be a top-level property of options
     // set to 'v4' as default, override with value from incoming options
-    // (here version comes inside "toOdata")
-    const options = Object.assign({ version: 'v4'}, _options);
-    if (options.toOdata) {
-      if(options.toOdata.version)
-        options.version = options.toOdata.version;
-      if(options.toOdata.odataFormat)
-        options.odataFormat = options.toOdata.odataFormat;
-      if(options.toOdata.odataContainment)
-        options.odataContainment = options.toOdata.odataContainment;
-      if(options.toOdata.odataForeignKeys)
-        options.odataForeignKeys = options.toOdata.odataForeignKeys;
-      if(options.toOdata.odataV2PartialConstr)
-        options.odataV2PartialConstr = options.toOdata.odataV2PartialConstr;
-      // global flag that indicates whether or not FKs shall be rendered in general
-      // V2/V4 flat: yes
-      // V4/struct: depending on odataForeignKeys
-      options.renderForeignKeys =
-        options.version === 'v4' ? options.odataFormat === 'structured' &&  !!options.odataForeignKeys : true;
+    const options = Object.assign({ odataVersion: 'v4'}, _options);
+    // global flag that indicates whether or not FKs shall be rendered in general
+    // V2/V4 flat: yes
+    // V4/struct: depending on odataForeignKeys
+    options.renderForeignKeys =
+      options.odataVersion === 'v4' ? options.odataFormat === 'structured' &&  !!options.odataForeignKeys : true;
 
-    }
-
-    const v2 = options.version.match(/v2/i) !== null;
-    const v4 = options.version.match(/v4/i) !== null;
+    const v2 = options.odataVersion.match(/v2/i) !== null;
+    const v4 = options.odataVersion.match(/v4/i) !== null;
 
     options.v = [v2, v4];
     options.isStructFormat = options.odataFormat && options.odataFormat === 'structured';
@@ -401,7 +387,7 @@ function finalizeReferentialConstraints(csn, assocCsn, options, info)
         if(options.isV2() && intersect(renderedKeys, remainingPrincipalRefs).length !== renderedKeys.length)
           if(options.odataV2PartialConstr) {
             info('odata-spec-violation-constraints',
-                    ['definitions', assocCsn._parent.name, 'elements', assocCsn.name], { api: 'OData V2' });
+                    ['definitions', assocCsn._parent.name, 'elements', assocCsn.name], { version: '2.0' });
           }
           else {
             assocCsn._constraints.constraints = {};
@@ -439,7 +425,7 @@ function finalizeReferentialConstraints(csn, assocCsn, options, info)
       if(options.isV2() && intersect(renderedKeys, remainingPrincipalRefs).length !== renderedKeys.length) {
         if(options.odataV2PartialConstr) {
           info('odata-spec-violation-constraints',
-                  ['definitions', assocCsn._parent.name, 'elements', assocCsn.name], { api: 'OData V2' } );
+                  ['definitions', assocCsn._parent.name, 'elements', assocCsn.name], { version: '2.0' } );
         }
         else {
           assocCsn._constraints.constraints = {};
@@ -467,7 +453,7 @@ function finalizeReferentialConstraints(csn, assocCsn, options, info)
     return (elt &&
             elt.type &&
             (!options.isFlatFormat || options.isFlatFormat && isBuiltinType(elt.type)) &&
-            !['cds.Association', 'cds.Composition'].includes(elt.type) &&
+            !(elt.type === 'cds.Association' || elt.type === 'cds.Composition') &&
             isEdmPropertyRendered(elt, options));
   }
 }
@@ -522,12 +508,14 @@ function determineMultiplicity(csn)
   return [srcCardinality, tgtCardinality];
 }
 
-function mapCdsToEdmType(csn, messageFunctions, isV2=false, isMediaType=false)
+function mapCdsToEdmType(csn, messageFunctions, isV2=false, isMediaType=false, location=undefined)
 {
+  if(location === undefined)
+    location = csn.$path;
   const { error } = messageFunctions || { error: ()=>true };
   let cdsType = csn.type;
   if(cdsType === undefined) {
-    error(null, csn.$location, `no type found`);
+    error(null, location, `no type found`);
     return '<NOTYPE>';
   }
   if(!isBuiltinType(cdsType))
@@ -582,7 +570,7 @@ function mapCdsToEdmType(csn, messageFunctions, isV2=false, isMediaType=false)
     */
   }[cdsType];
   if (edmType == undefined) {
-    error(null, csn.$path, { type: cdsType }, `No EDM type available for $(TYPE)`);
+    error(null, location, { type: cdsType }, `No EDM type available for $(TYPE)`);
   }
   if(isV2)
   {
@@ -590,9 +578,6 @@ function mapCdsToEdmType(csn, messageFunctions, isV2=false, isMediaType=false)
       edmType = 'Edm.DateTime';
     if (edmType === 'Edm.TimeOfDay')
       edmType = 'Edm.Time';
-    if(['cds.hana.ST_POINT', 'cds.hana.ST_GEOMETRY'].includes(cdsType)) {
-      error(null, csn.$path, { type: cdsType }, `OData V2 does not support Geometry data types, $(TYPE) can't be mapped`);
-    }
   }
   else // isV4
   {
@@ -606,31 +591,32 @@ function mapCdsToEdmType(csn, messageFunctions, isV2=false, isMediaType=false)
 function addTypeFacets(node, csn)
 {
   const isV2 = node.v2;
+  const decimalTypes = {'cds.Decimal':1, 'cds.DecimalFloat':1, 'cds.hana.SMALLDECIMAL':1};
   if (csn.length != null)
-    node.MaxLength = csn.length;
+    node.setEdmAttribute('MaxLength', csn.length);
   if (csn.scale !== undefined)
-    node.Scale = csn.scale;
+    node.setEdmAttribute('Scale', csn.scale);
   // else if (csn.type === 'cds.hana.SMALLDECIMAL' && !isV2)
-  //   node.Scale = 'floating';
+  //   node._edmAttributes.Scale = 'floating';
 
   if (csn.precision != null)
-    node.Precision = csn.precision;
+    node.setEdmAttribute('Precision', csn.precision);
   // else if (csn.type === 'cds.hana.SMALLDECIMAL' && !isV2)
   //   node.Precision = 16;
-  else if (csn.type === 'cds.Timestamp' && node.Type === 'Edm.DateTimeOffset')
-    node.Precision = 7;
-  if([ 'cds.Decimal', 'cds.DecimalFloat', 'cds.hana.SMALLDECIMAL' ].includes(csn.type)) {
+  else if (csn.type === 'cds.Timestamp' && node._edmAttributes.Type === 'Edm.DateTimeOffset')
+    node.setEdmAttribute('Precision', 7);
+  if(csn.type in decimalTypes) {
     if(isV2) {
       // no prec/scale or scale is 'floating'/'variable'
-      if(!(csn.precision || csn.scale) || ['floating', 'variable'].includes(csn.scale)) {
+      if(!(csn.precision || csn.scale) || (csn.scale === 'floating' || csn.scale === 'variable')) {
         node.setXml( { 'sap:variable-scale': true } );
-        delete node.Scale;
+        node.removeEdmAttribute('Scale');
       }
     }
     else {
       // map both floating and variable to => variable
-      if(node.Scale === 'floating')
-        node.Scale = 'variable';
+      if(node._edmAttributes.Scale === 'floating')
+        node.setEdmAttribute('Scale', 'variable');
       if(!csn.precision && !csn.scale)
         // if Decimal has no p, s set scale 'variable'
         node.setXml( { Scale: 'variable' } ); // floating is V4.01
@@ -638,9 +624,9 @@ function addTypeFacets(node, csn)
   }
   // Unicode unused today
   if(csn.unicode)
-    node.Unicode = csn.unicode;
+    node.setEdmAttribute('Unicode', csn.unicode);
   if(csn.srid)
-    node.SRID = csn.srid;
+    node.setEdmAttribute('SRID', csn.srid);
 }
 
 

package/lib/gen/Dictionary.json

@@ -658,6 +658,7 @@
       "Type": "Common.FieldControlType",
       "AppliesTo": [
         "Property",
+        "Parameter",
         "Record",
         "EntityType"
       ]
@@ -1026,7 +1027,9 @@
       ]
     },
     "Common.RecursiveHierarchy": {
-      "Type": "Common.RecursiveHierarchyType"
+      "Type": "Common.RecursiveHierarchyType",
+      "$deprecated": true,
+      "$deprecationText": "Use terms [Aggregation.RecursiveHierarchy](https://github.com/oasis-tcs/odata-vocabularies/blob/main/vocabularies/Org.OData.Aggregation.V1.md#RecursiveHierarchy) and [Hierarchy.RecursiveHierarchy](https://github.com/SAP/odata-vocabularies/blob/main/vocabularies/Hierarchy.md#RecursiveHierarchy) instead"
     },
     "Common.CreatedAt": {
       "Type": "Edm.DateTimeOffset",
@@ -1380,8 +1383,49 @@
     "Core.GeometryFeature": {
       "Type": "Core.GeometryFeatureType"
     },
-    "Graph.links": {
-      "Type": "Collection(Graph.link)",
+    "DataIntegration.Extractable": {
+      "Type": "Edm.Boolean",
+      "AppliesTo": [
+        "EntitySet"
+      ]
+    },
+    "DataIntegration.OriginalDataType": {
+      "Type": "Edm.String",
+      "AppliesTo": [
+        "Property"
+      ]
+    },
+    "DataIntegration.OriginalName": {
+      "Type": "Edm.String"
+    },
+    "DataIntegration.ConversionExit": {
+      "Type": "Edm.String",
+      "AppliesTo": [
+        "Property"
+      ]
+    },
+    "DataIntegration.SourceSystem": {
+      "Type": "Edm.String",
+      "AppliesTo": [
+        "Container"
+      ]
+    },
+    "DataIntegration.DeltaMethod": {
+      "Type": "DataIntegration.DeltaMethodType",
+      "AppliesTo": [
+        "EntitySet"
+      ]
+    },
+    "Graph.traceId": {
+      "Type": "Edm.String",
+      "$experimental": true
+    },
+    "Graph.Details": {
+      "Type": "Graph.DetailsType",
+      "$experimental": true
+    },
+    "Hierarchy.RecursiveHierarchy": {
+      "Type": "Hierarchy.RecursiveHierarchyType",
       "AppliesTo": [
         "EntityType"
       ],
@@ -1393,6 +1437,17 @@
         "Record"
       ]
     },
+    "JSON.Schema": {
+      "Type": "JSON.JSON",
+      "AppliesTo": [
+        "EntityType",
+        "Parameter",
+        "Property",
+        "ReturnType",
+        "Term",
+        "TypeDefinition"
+      ]
+    },
     "Measures.ISOCurrency": {
       "Type": "Edm.String",
       "AppliesTo": [
@@ -1713,7 +1768,8 @@
       "Type": "Core.Tag",
       "AppliesTo": [
         "Property",
-        "PropertyValue"
+        "PropertyValue",
+        "Parameter"
       ]
     },
     "UI.Placeholder": {
@@ -1898,14 +1954,14 @@
       ]
     },
     "Validation.OpenPropertyTypeConstraint": {
-      "Type": "Collection(Core.QualifiedTypeName)",
+      "Type": "Collection(Validation.SingleOrCollectionType)",
       "AppliesTo": [
         "ComplexType",
         "EntityType"
       ]
     },
     "Validation.DerivedTypeConstraint": {
-      "Type": "Collection(Core.QualifiedTypeName)",
+      "Type": "Collection(Validation.SingleOrCollectionType)",
       "AppliesTo": [
         "EntitySet",
         "Singleton",
@@ -2740,7 +2796,9 @@
         "ExternalNodeKeyProperty": "Edm.PropertyPath",
         "NodeDescendantCountProperty": "Edm.PropertyPath",
         "NodeDrillStateProperty": "Edm.PropertyPath"
-      }
+      },
+      "$deprecated": true,
+      "$deprecationText": "Use terms [Aggregation.RecursiveHierarchy](https://github.com/oasis-tcs/odata-vocabularies/blob/main/vocabularies/Org.OData.Aggregation.V1.md#RecursiveHierarchy) and [Hierarchy.RecursiveHierarchy](https://github.com/SAP/odata-vocabularies/blob/main/vocabularies/Hierarchy.md#RecursiveHierarchy) instead"
     },
     "Common.NumericMessageSeverityType": {
       "$kind": "TypeDefinition",
@@ -3122,22 +3180,31 @@
       "UnderlyingType": "Edm.String",
       "MaxLength": "128"
     },
-    "Graph.link": {
+    "DataIntegration.DeltaMethodType": {
+      "$kind": "EnumType",
+      "IsFlags": "true",
+      "Members": [
+        "INSERT",
+        "UPDATE",
+        "DELETE"
+      ]
+    },
+    "Graph.DetailsType": {
       "$kind": "ComplexType",
       "Properties": {
-        "title": "Edm.String",
-        "alias": "Edm.String",
-        "target": "Edm.String",
-        "parameters": "Collection(Graph.binding)",
-        "filter": "Collection(Graph.binding)"
+        "url": "Edm.String",
+        "body": "JSON.JSON"
       },
       "$experimental": true
     },
-    "Graph.binding": {
+    "Hierarchy.RecursiveHierarchyType": {
       "$kind": "ComplexType",
       "Properties": {
-        "source": "Edm.PropertyPath",
-        "target": "Edm.PropertyPath"
+        "ExternalKeyProperty": "Edm.PropertyPath",
+        "DescendantCountProperty": "Edm.PropertyPath",
+        "DrillStateProperty": "Edm.PropertyPath",
+        "SiblingRankProperty": "Edm.PropertyPath",
+        "PreorderRankProperty": "Edm.PropertyPath"
       },
       "$experimental": true
     },
@@ -3147,6 +3214,10 @@
         "width": "Edm.String"
       }
     },
+    "JSON.JSON": {
+      "$kind": "TypeDefinition",
+      "UnderlyingType": "Edm.Stream"
+    },
     "Measures.DurationGranularityType": {
       "$kind": "TypeDefinition",
       "UnderlyingType": "Edm.String"
@@ -3176,6 +3247,7 @@
         "TypeNamePlural": "Edm.String",
         "Title": "UI.DataFieldAbstract",
         "Description": "UI.DataFieldAbstract",
+        "Image": "Edm.Stream",
         "ImageUrl": "Edm.String",
         "TypeImageUrl": "Edm.String",
         "Initials": "Edm.String"
@@ -3623,7 +3695,7 @@
       "$kind": "ComplexType",
       "BaseType": "UI.DataFieldAbstract",
       "Properties": {
-        "Value": "Edm.PrimitiveType",
+        "Value": "Edm.Untyped",
         "Label": "Edm.String",
         "Criticality": "UI.CriticalityType",
         "CriticalityRepresentation": "UI.CriticalityRepresentationType",
@@ -3634,8 +3706,8 @@
       "$kind": "ComplexType",
       "BaseType": "UI.DataField",
       "Properties": {
-        "Action": "Common.QualifiedName",
         "Value": "Edm.PrimitiveType",
+        "Action": "Common.QualifiedName",
         "Label": "Edm.String",
         "Criticality": "UI.CriticalityType",
         "CriticalityRepresentation": "UI.CriticalityRepresentationType",
@@ -3646,10 +3718,10 @@
       "$kind": "ComplexType",
       "BaseType": "UI.DataField",
       "Properties": {
+        "Value": "Edm.PrimitiveType",
         "SemanticObject": "Edm.String",
         "Action": "Edm.String",
         "Mapping": "Collection(Common.SemanticObjectMappingType)",
-        "Value": "Edm.PrimitiveType",
         "Label": "Edm.String",
         "Criticality": "UI.CriticalityType",
         "CriticalityRepresentation": "UI.CriticalityRepresentationType",
@@ -3660,8 +3732,8 @@
       "$kind": "ComplexType",
       "BaseType": "UI.DataField",
       "Properties": {
-        "Target": "Edm.NavigationPropertyPath",
         "Value": "Edm.PrimitiveType",
+        "Target": "Edm.NavigationPropertyPath",
         "Label": "Edm.String",
         "Criticality": "UI.CriticalityType",
         "CriticalityRepresentation": "UI.CriticalityRepresentationType",
@@ -3672,9 +3744,9 @@
       "$kind": "ComplexType",
       "BaseType": "UI.DataField",
       "Properties": {
+        "Value": "Edm.PrimitiveType",
         "Url": "Edm.String",
         "UrlContentType": "Edm.String",
-        "Value": "Edm.PrimitiveType",
         "Label": "Edm.String",
         "Criticality": "UI.CriticalityType",
         "CriticalityRepresentation": "UI.CriticalityRepresentationType",
@@ -3685,8 +3757,8 @@
       "$kind": "ComplexType",
       "BaseType": "UI.DataField",
       "Properties": {
-        "Actions": "Collection(UI.DataField)",
         "Value": "Edm.PrimitiveType",
+        "Actions": "Collection(UI.DataField)",
         "Label": "Edm.String",
         "Criticality": "UI.CriticalityType",
         "CriticalityRepresentation": "UI.CriticalityRepresentationType",
@@ -3901,6 +3973,10 @@
         "path": "Edm.NavigationPropertyPath",
         "target": "Edm.NavigationPropertyPath"
       }
+    },
+    "Validation.SingleOrCollectionType": {
+      "$kind": "TypeDefinition",
+      "UnderlyingType": "Edm.String"
     }
   }
 }

package/lib/gen/language.checksum

@@ -1 +1 @@
-78ff41e0af1a8064856dea9850968eb6
+dd18d05cabbe93eabf1bd17b83add5ee