@sap/cds-compiler 5.5.0 → 5.5.2

package/CHANGELOG.md

@@ -7,6 +7,11 @@
 Note: `beta` fixes, changes and features are usually not listed in this ChangeLog but [here](doc/CHANGELOG_BETA.md).
 The compiler behavior concerning `beta` features can change at any time without notice.
 
+## Version 5.5.2 - 2024-12-02
+
+### Fixed
+
+- to.hdi|sql|edm[x]: Correctly handle `cds.Map`, ensure that it does not have `.elements` yet.
 
 ## Version 5.5.0 - 2024-11-22
 

package/lib/checks/cdsMap.js

@@ -0,0 +1,27 @@
+'use strict';
+
+const { hasNonEnumerable } = require('../utils/objectUtils');
+
+/**
+ * We don't support cds.Map in conjunction with .elements yet. To ensure that no one uses it and accidentally creates an
+ * empty structured type, we check for it and forbid it.
+ *
+ * Non-enumerable .elements are added by cds.linked - we silently remove them and proceed as usual.
+ *
+ * @param {*} parent
+ * @param {*} prop
+ * @param {*} type
+ * @param {*} path
+ */
+function checkCdsMap( parent, prop, type, path ) {
+  if (type === 'cds.Map' && parent.elements) {
+    if (hasNonEnumerable(parent, 'elements'))
+      delete parent.elements; // linked CSN sets a non-enumerable empty elements on cds.Map
+    else
+      this.error('type-unexpected-elements-for-map', path, { id: path.at(-1), type: 'cds.Map' }, 'Unexpected .elements for element $(ID) of type $(TYPE)');
+  }
+}
+
+module.exports = {
+  type: checkCdsMap,
+};

package/lib/checks/validator.js

@@ -26,6 +26,7 @@ const {
   checkTemporalAnnotationsAssignment,
 } = require('./annotationsOData');
 // both
+const checkCdsMap = require('./cdsMap');
 const { validateOnCondition, validateMixinOnCondition } = require('./onConditions');
 const validateForeignKeys = require('./foreignKeys');
 const {
@@ -80,6 +81,7 @@ const forRelationalDBArtifactValidators = [
 ];
 
 const forRelationalDBCsnValidators = [
+  checkCdsMap,
   existsMustEndInAssoc,
   forbidAssocInExists,
   nonexpandableStructuredInExpression,
@@ -118,7 +120,7 @@ const forOdataArtifactValidators
   checkReadOnlyAndInsertOnly,
 ];
 
-const forOdataCsnValidators = [ nonexpandableStructuredInExpression ];
+const forOdataCsnValidators = [ checkCdsMap, nonexpandableStructuredInExpression ];
 
 const forOdataQueryValidators = [];
 

package/lib/compiler/define.js

@@ -917,6 +917,7 @@ function define( model ) {
         else {
           // a late syntax error (this code also runs with parse-cdl), i.e.
           // no semantic loc (wouldn't be available for expand/inline anyway)
+          // TODO: why here and not in parser?
           error( 'syntax-duplicate-wildcard', [ col.location, null ], {
             '#': (wildcard.location.col ? 'col' : 'std'),
             prop: '*',