@sap/cds-compiler 5.7.0 → 5.7.4

package/CHANGELOG.md

@@ -7,6 +7,21 @@
 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.7.4 - 2025-02-05
+
+### Fixed
+
+- New CDL Parser (option `newParser: true`)
+  + Improve code completion
+  + Fix further edge cases in error recovery
+
+## Version 5.7.2 - 2025-01-30
+
+### Fixed
+
+- Fix edge case in error recovery of the new CDL parser (option `newParser: true`)
+
+
 ## Version 5.7.0 - 2025-01-24
 
 ### Added

package/lib/base/location.js

@@ -98,7 +98,7 @@ function stringOrRaw( val ) {
  */
 function combinedLocation( start, end ) {
   if (!start || !start.location)
-    return end.location;
+    return end?.location;
   else if (!end || !end.location)
     return start.location;
   const loc = {

package/lib/base/model.js

@@ -168,8 +168,6 @@ function forEachMember( construct, callback, target ) {
 function forEachMemberRecursively( construct, callback, target ) {
   forEachMember( construct, ( member, memberName, prop ) => {
     callback( member, memberName, prop );
-    if (Array.isArray(member.$duplicates)) // redefinitions
-      member.$duplicates.forEach( o => callback( o, memberName, prop ) );
     // Descend into nested members, too
     forEachMemberRecursively( member, callback );
   }, target);
@@ -177,15 +175,16 @@ function forEachMemberRecursively( construct, callback, target ) {
 
 // Apply function `callback` to all objects in dictionary `dict`, including all
 // duplicates (found under the same name).  Function `callback` is called with
-// the following arguments: the object, the name, and -if it is a duplicate-
+// the following arguments: the object, the name, and - if it is a duplicate -
 // the array index and the array containing all duplicates.
 function forEachGeneric( obj, prop, callback ) {
   const dict = obj[prop];
   for (const name in dict) {
     obj = dict[name];
+    const { $duplicates } = obj;
     callback( obj, name, prop );
-    if (Array.isArray(obj.$duplicates)) // redefinitions
-      obj.$duplicates.forEach( o => callback( o, name, prop ) );
+    if (Array.isArray($duplicates)) // redefinitions
+      $duplicates.forEach( o => callback( o, name, prop ) );
   }
 }
 

package/lib/compiler/define.js

@@ -1155,6 +1155,9 @@ function define( model ) {
       setLink( elem, '_block', bl );
       const existing = parent[prop]?.[name];
       const add = construct !== parent && (!existing || elem.$inferred !== 'include');
+      // don't dump with `entity T {}; extend T with { extend e {}; e {}; e {} };`:
+      if (elem.$duplicates === true && add)
+        elem.$duplicates = null;
       setMemberParent( elem, name, parent, add && prop );
       // console.log(message( null, elem.location, elem, {}, 'Info', 'INIT').toString())
       checkRedefinition( elem );

package/lib/compiler/resolve.js

@@ -1459,7 +1459,7 @@ function resolve( model ) {
         type = getOrigin( type );
       const err = message( 'ref-undefined-enum', [ sym.location, assignment ],
                            { id: sym.id, type } );
-      if (options.newParser)
+      if (options.newParser || options.newparser)
         attachAndEmitValidNames( err, symbols );
     }
   }