@sap/cds-compiler 5.5.2 → 5.7.0

package/lib/gen/Dictionary.json

@@ -1114,6 +1114,13 @@
       ],
       "$experimental": true
     },
+    "Common.WebSocketChannel": {
+      "Type": "Edm.String",
+      "AppliesTo": [
+        "EntityContainer"
+      ],
+      "$experimental": true
+    },
     "Communication.Contact": {
       "Type": "Communication.ContactType",
       "AppliesTo": [
@@ -1463,6 +1470,61 @@
         "EntitySet"
       ]
     },
+    "EntityRelationship.entityType": {
+      "Type": "Edm.String",
+      "AppliesTo": [
+        "EntityType"
+      ],
+      "$experimental": true
+    },
+    "EntityRelationship.propertyType": {
+      "Type": "Edm.String",
+      "AppliesTo": [
+        "Property"
+      ],
+      "$experimental": true
+    },
+    "EntityRelationship.entityIds": {
+      "Type": "Collection(EntityRelationship.entityId)",
+      "AppliesTo": [
+        "EntityType"
+      ],
+      "$experimental": true
+    },
+    "EntityRelationship.reference": {
+      "Type": "EntityRelationship.singleReference",
+      "AppliesTo": [
+        "Property"
+      ]
+    },
+    "EntityRelationship.compositeReferences": {
+      "Type": "Collection(EntityRelationship.compositeReference)",
+      "AppliesTo": [
+        "EntityType"
+      ],
+      "$experimental": true
+    },
+    "EntityRelationship.temporalIds": {
+      "Type": "Collection(EntityRelationship.temporalId)",
+      "AppliesTo": [
+        "EntityType"
+      ],
+      "$experimental": true
+    },
+    "EntityRelationship.temporalReferences": {
+      "Type": "Collection(EntityRelationship.temporalReference)",
+      "AppliesTo": [
+        "EntityType"
+      ],
+      "$experimental": true
+    },
+    "EntityRelationship.referencesWithConstantIds": {
+      "Type": "Collection(EntityRelationship.referencesWithConstantId)",
+      "AppliesTo": [
+        "EntityType"
+      ],
+      "$experimental": true
+    },
     "Graph.traceId": {
       "Type": "Edm.String",
       "$experimental": true
@@ -1719,6 +1781,7 @@
         "EntityType",
         "Action",
         "Function",
+        "ActionImport",
         "FunctionImport"
       ]
     },
@@ -1783,7 +1846,8 @@
       "Type": "Collection(UI.CriticalityLabelType)",
       "AppliesTo": [
         "Property",
-        "EntityType"
+        "EntityType",
+        "TypeDefinition"
       ],
       "$experimental": true
     },
@@ -1823,6 +1887,16 @@
         "EntityType"
       ]
     },
+    "UI.OperationParameterFacets": {
+      "Type": "Collection(UI.ReferenceFacet)",
+      "AppliesTo": [
+        "Action",
+        "Function",
+        "ActionImport",
+        "FunctionImport"
+      ],
+      "$experimental": true
+    },
     "UI.SelectionPresentationVariant": {
       "Type": "UI.SelectionPresentationVariantType",
       "AppliesTo": [
@@ -1878,14 +1952,16 @@
       "Type": "Core.Tag",
       "AppliesTo": [
         "Property",
-        "Term"
+        "Term",
+        "TypeDefinition"
       ]
     },
     "UI.IsImage": {
       "Type": "Core.Tag",
       "AppliesTo": [
         "Property",
-        "EntityType"
+        "EntityType",
+        "TypeDefinition"
       ],
       "$experimental": true
     },
@@ -1894,7 +1970,8 @@
       "AppliesTo": [
         "Property",
         "PropertyValue",
-        "Parameter"
+        "Parameter",
+        "TypeDefinition"
       ]
     },
     "UI.Placeholder": {
@@ -2070,7 +2147,8 @@
       "Type": "UI.RecommendationListType",
       "AppliesTo": [
         "Property",
-        "Parameter"
+        "Parameter",
+        "TypeDefinition"
       ]
     },
     "UI.Recommendations": {
@@ -2089,7 +2167,8 @@
     "UI.DoNotCheckScaleOfMeasuredQuantity": {
       "Type": "Edm.Boolean",
       "AppliesTo": [
-        "Property"
+        "Property",
+        "TypeDefinition"
       ],
       "$experimental": true
     },
@@ -3301,6 +3380,7 @@
       "Properties": {
         "SourceProperties": "Collection(Edm.PropertyPath)",
         "SourceEntities": "Collection(Edm.NavigationPropertyPath)",
+        "SourceEvents": "Collection(Edm.String)",
         "TargetProperties": "Collection(Edm.String)",
         "TargetEntities": "Collection(Edm.NavigationPropertyPath)",
         "EffectTypes": "Common.EffectType",
@@ -3777,6 +3857,105 @@
         "DELETE"
       ]
     },
+    "EntityRelationship.singleReference": {
+      "$kind": "ComplexType",
+      "Properties": {
+        "name": "Edm.String",
+        "referencedEntityType": "EntityRelationship.entityTypeID",
+        "referencedPropertyType": "EntityRelationship.propertyTypeID"
+      }
+    },
+    "EntityRelationship.entityId": {
+      "$kind": "ComplexType",
+      "Properties": {
+        "name": "Edm.String",
+        "description": "Edm.String",
+        "propertyTypes": "Collection(EntityRelationship.propertyTypeID)"
+      }
+    },
+    "EntityRelationship.compositeReference": {
+      "$kind": "ComplexType",
+      "Properties": {
+        "name": "Edm.String",
+        "referencedEntityType": "EntityRelationship.entityTypeID",
+        "referencedPropertyType": "Collection(EntityRelationship.referencedPropertyType)"
+      }
+    },
+    "EntityRelationship.referencedPropertyType": {
+      "$kind": "ComplexType",
+      "Properties": {
+        "referencedPropertyType": "EntityRelationship.propertyTypeID",
+        "localPropertyName": "Edm.PropertyPath"
+      }
+    },
+    "EntityRelationship.temporalId": {
+      "$kind": "ComplexType",
+      "Properties": {
+        "name": "Edm.String",
+        "description": "Edm.String",
+        "propertyTypes": "Collection(EntityRelationship.propertyTypeID)",
+        "temporalIntervalType": "EntityRelationship.temporalIntervalTypeEnum",
+        "temporalType": "EntityRelationship.temporalTypeEnum",
+        "temporalIntervalStartProperty": "Edm.PropertyPath",
+        "temporalIntervalEndProperty": "Edm.PropertyPath"
+      }
+    },
+    "EntityRelationship.temporalReference": {
+      "$kind": "ComplexType",
+      "Properties": {
+        "name": "Edm.String",
+        "referencedEntityType": "EntityRelationship.entityTypeID",
+        "referencedPropertyType": "Collection(EntityRelationship.referencedPropertyType)",
+        "category": "EntityRelationship.temporalCategoryEnum",
+        "selectionDateProperty": "Edm.PropertyPath"
+      }
+    },
+    "EntityRelationship.referenceWithConstantId": {
+      "$kind": "ComplexType",
+      "Properties": {
+        "name": "Edm.String",
+        "referencedEntityType": "EntityRelationship.entityTypeID",
+        "referencedPropertyType": "Collection(EntityRelationship.referencedPropertyTypeWithConstantId)"
+      }
+    },
+    "EntityRelationship.referencedPropertyTypeWithConstantId": {
+      "$kind": "ComplexType",
+      "Properties": {
+        "referencedPropertyType": "EntityRelationship.propertyTypeID",
+        "localPropertyName": "Edm.PropertyPath",
+        "constantValue": "Edm.String"
+      }
+    },
+    "EntityRelationship.temporalIntervalTypeEnum": {
+      "$kind": "EnumType",
+      "Members": [
+        "CLOSED_CLOSED",
+        "OPEN_OPEN",
+        "OPEN_CLOSED",
+        "CLOSED_OPEN"
+      ]
+    },
+    "EntityRelationship.temporalTypeEnum": {
+      "$kind": "EnumType",
+      "Members": [
+        "DATE",
+        "DATETIME"
+      ]
+    },
+    "EntityRelationship.temporalCategoryEnum": {
+      "$kind": "EnumType",
+      "Members": [
+        "TEMPORAL_DATE"
+      ]
+    },
+    "EntityRelationship.propertyTypeID": {
+      "$kind": "TypeDefinition",
+      "UnderlyingType": "Edm.String"
+    },
+    "EntityRelationship.entityTypeID": {
+      "$kind": "TypeDefinition",
+      "UnderlyingType": "Edm.String"
+    },
     "Graph.DetailsType": {
       "$kind": "ComplexType",
       "Properties": {

package/lib/json/from-csn.js

@@ -486,6 +486,7 @@ const schema = compileSchema( {
   val: {
     type: value,
     inKind: [ '$column', 'enum' ],
+    xorException: '#',          // see xorGroup :expr
     // see also extra handling for 'element' in extension, see definition()
   },
   literal: {
@@ -499,6 +500,7 @@ const schema = compileSchema( {
     // Note: We emit a warning if '#' is used in enums.  Because the compiler
     // can generate CSN like this, we need to be able to parse it.
     inKind: [ '$column', 'enum' ],
+    xorException: 'val',        // see xorGroup :expr
     // see also extra handling for 'element' in extension, see definition()
   },
   path: {                     // in CSN v0.1.0 'foreignKeys'

package/lib/json/to-csn.js

@@ -1132,7 +1132,7 @@ function value( node ) {
     return extra( { '=': node.variant ? `${ ref }#${ pathName(node.variant.path) }` : ref }, node );
   }
   if (node.literal === 'enum')
-    return extra( { '#': node.sym.id }, node );
+    return enumValue( node );
   if (node.literal === 'array')
     return node.val.map( value );
   if (node.literal === 'token' && node.val === '...')
@@ -1146,6 +1146,15 @@ function value( node ) {
   return r;
 }
 
+function enumValue( node ) {
+  const r = extra( { '#': node.sym.id }, node );
+  const sym = node.sym._artifact;
+  // add calculated `val`, but not for chained symbols:
+  if (sym && (!gensrcFlavor || gensrcFlavor === 'column') && !sym.value?.sym)
+    r.val = sym.value ? sym.value.val : sym.name.id;
+  return r;
+}
+
 function targetElement( val, csn, node ) {
   const key = addExplicitAs( { ref: val.path.map( pathItem ) },
                              node.name, neqPath( val ) );
@@ -1210,10 +1219,10 @@ function exprInternal( node, xprParens ) {
     return extra( { ref }, node );
   }
   if (node.literal) {
-    if (typeof node.val === node.literal || node.val === null)
+    if (node.literal === 'enum')
+      return enumValue( node );
+    else if (typeof node.val === node.literal || node.val === null)
       return extra( { val: node.val }, node );
-    else if (node.literal === 'enum')
-      return extra( { '#': node.sym.id }, node );
     else if (node.literal === 'token')
       return node.val;          // * in COUNT(*)
     return extra( { val: node.val, literal: node.literal }, node );

package/lib/language/docCommentParser.js

@@ -7,7 +7,6 @@ const {
 } = require('./textUtils');
 
 const fencedCommentRegEx = /^\s*[*]/;
-const footerFenceRegEx = /\s*[*]+\/$/;
 const hasContentOnFirstLineRegEx = /\/\*+\s*\S/;
 
 /**
@@ -37,9 +36,8 @@ function parseDocComment( comment ) {
   if (lines.length === 1) {
     // Special case for one-liners.
     // Remove "/***/" and trim white space and asterisks.
-    const content = lines[0]
-      .replace(/^\/[*]{2,}/, '')
-      .replace(/\**\/$/, '') // for `/*****/`, only `/` remains
+    let content = lines[0].replace(/^\/[*]{2,}/, '');
+    content = removeFooterFence(content) // for `/*****/`, only `/` remains
       .replace('*\\/', '*/') // escape sequence
       .trim();
     return isWhitespaceOrNewLineOnly(content) ? null : content;
@@ -153,7 +151,15 @@ function removeHeaderFence( line ) {
  * @returns {string} header without fence
  */
 function removeFooterFence( line ) {
-  return line.replace(footerFenceRegEx, '');
+  let trimAt = line.length - 1;
+  // '-1': remove trailing `/`
+  for (let i = trimAt - 1; i >= 0 && line[i] === '*'; --i)
+    trimAt = i;
+  // We know that trimAt is at a '*', regardless of whether the previous loop ran.
+  for (let i = trimAt - 1; i >= 0 && /^\s$/.test(line[i]); --i)
+    trimAt = i;
+  // Either trimAt is a ' ' or '*', regardless of whether any loop ran.
+  return line.slice(0, trimAt);
 }
 
 /**

package/lib/language/errorStrategy.js

@@ -235,9 +235,9 @@ function singleTokenDeletion( recognizer ) {
     return null;
 
   const nextTokenType = recognizer.getTokenStream().LA(2);
-  const { Number } = recognizer.constructor;
-  if (nextTokenType > Number && // next token is Id|Unreserved|IllegalToken
-      token.type <= Number)     // current token is not
+  const { Number: num } = recognizer.constructor;
+  if (nextTokenType > num && // next token is Id|Unreserved|IllegalToken
+      token.type <= num)     // current token is not
     return null;
 
   const expecting = this.getExpectedTokens(recognizer);

package/lib/language/genericAntlrParser.js

@@ -1059,6 +1059,8 @@ function assignAnnotationValue( anno, value ) {
 }
 
 function relevantDigits( val ) {
+  // We know the value does not contain newlines, hence the RegEx is safe.
+  // eslint-disable-next-line sonarjs/slow-regex
   val = val.replace( /e.+$/i, '' );
 
   // To avoid the super-linear RegEx `0+$`, use the non-backtracking version and

package/lib/model/csnUtils.js

@@ -1014,7 +1014,12 @@ function getRootArtifactName( artifactName, csn ) {
 //   'foo' => 'foo';
 //   'foo::bar' => 'bar'
 function getLastPartOf( name ) {
-  return name.substring(name.search(/[^.:]+$/));
+  // Not using RegEx /[^.:]+$/ to avoid ReDoS.
+  for (let i = name.length - 1; i >= 0; --i) {
+    if (name[i] === '.' || name[i] === ':')
+      return name.substring(i + 1);
+  }
+  return name;
 }
 
 // Return the last part of reference array 'ref'

package/lib/optionProcessor.js

@@ -197,6 +197,7 @@ optionProcessor.command('H, toHana')
   .option('    --assert-integrity-type <type>', { valid: ['RT', 'DB'], ignoreCase: true })
   .option('    --pre2134ReferentialConstraintNames')
   .option('    --disable-hana-comments')
+  .option('    --standard-database-functions')
   .help(`
   Usage: cdsc toHana [options] <files...>
 
@@ -233,6 +234,7 @@ optionProcessor.command('H, toHana')
                                            DB : Create database constraints for associations
    --pre2134ReferentialConstraintNames   Do not prefix the constraint identifier with "c__"
    --disable-hana-comments    Disable rendering of doc comments as SAP HANA comments.
+   --standard-database-functions Enable rendering of standard database function mappings.
 `);
 
 optionProcessor.command('O, toOdata')
@@ -340,6 +342,7 @@ optionProcessor.command('Q, toSql')
   .option('    --better-sqlite-session-variables <bool>')
   .option('    --transitive-localized-views')
   .option('    --with-hana-associations <bool>', { valid: [ 'true', 'false' ] })
+  .option('    --standard-database-functions')
   .help(`
   Usage: cdsc toSql [options] <files...>
 
@@ -399,9 +402,10 @@ optionProcessor.command('Q, toSql')
    --transitive-localized-views  If set, the backends will create localized convenience views for
                               those views, that only have an association to a localized entity/view.
    --with-hana-associations <bool>
-                              Enable and disable rendering of "WITH ASSOCIATIONS" for sqlDialect 'hana'.
+                              Enable or disable rendering of "WITH ASSOCIATIONS" for sqlDialect 'hana'.
                                 true  : (default) Render "WITH ASSOCIATIONS"
                                 false : Do not render "WITH ASSOCIATIONS"
+   --standard-database-functions Enable rendering of standard database function mappings.
 `);
 
 optionProcessor.command('toRename')