@sap/cds-compiler 3.8.0 → 3.8.2

package/CHANGELOG.md

@@ -7,6 +7,14 @@
 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 3.8.2 - 2023-03-30
+
+### Fixed
+
+- parser: Identifiers that are keywords were not allowed in annotation values inside arrays
+- compiler: Compatibility against cds-lsp was restored.
+- to.sql/hdbcds/hdi/edm(x): Fix a crash for sub-queries inside nested expressions of on-conditions of JOINs.
+
 ## Version 3.8.0 - 2023-03-27
 
 ### Added

package/lib/compiler/assert-consistency.js

@@ -504,7 +504,7 @@ function assertConsistency( model, stage ) {
       ],
     },
     absolute: { test: isString },
-    variant: { test: TODO }, // TODO: not set in CDL parser
+    variant: { requires: [ 'location', 'path' ] },
     element: { test: TODO }, // TODO: { test: isString },
     action: { test: isString },
     param: { test: TODO },

package/lib/compiler/base.js

@@ -2,6 +2,8 @@
 
 'use strict';
 
+const { CompilerAssertion } = require( '../base/error' );
+
 const dictKinds = {
   definitions: 'absolute',
   elements: 'element',
@@ -65,26 +67,26 @@ function propExists( prop, parent ) {
 }
 
 // Return the "old style" name structure with `absolute`, `action`, `param`,
-// `element`. Later we also need to add `select` and `alias`.
-// (Currently not needed, as only used for extend and annotate statements.)
+// `element`.  The following code makes use of the fact that only member extensions
+// have a "sparse" name structure.
 function getArtifactName( art ) {
-  if (!art.name || art.name.absolute)
+  if (!art.name || art.name.absolute) // no name or “old style”
     return art.name;
-  // extend and annotate statement already have "sparse" names → calculate old one
-  const link = art.name._artifact;
+  // extend and annotate statements as members already have "sparse" names → calculate old one
   const namePath = [];
-  while (art._main && !art.name.absolute) { // until we hit an old-style name or the main artifact
-    namePath.push( art );
-    art = art._parent;
+  let parent = art;
+  while (parent._main) { // until we hit the main artifact
+    namePath.push( parent );
+    parent = parent._parent;
   }
   namePath.reverse();
-  const name = { ...art.name };
+  // start with id/location of art.name, and absolute of art._main
+  const name = { id: art.name.id, location: art.name.location, absolute: parent.name.absolute };
   for (const np of namePath) {
     const prop = getMemberNameProp( np, np.kind );
     name[prop] = (name[prop]) ? `${ name[prop] }.${ np.name.id }` : np.name.id;
-    name.id = np.name.id;
-    name.location = np.name.location;
   }
+  const link = art.name._artifact;
   if (link !== undefined)
     Object.defineProperty( name, '_artifact', { value: link, configurable: true, writable: true } );
   return name;
@@ -103,7 +105,7 @@ function getMemberNameProp( elem, kind ) {
     obj = obj.items;
   if (obj.elements || obj.enum)
     return 'element';
-  return 'id';
+  throw CompilerAssertion( `Member not found in parent properties ${ Object.keys( obj ).join('+') }` );
 }
 
 module.exports = {

package/lib/compiler/extend.js

@@ -188,6 +188,22 @@ function extend( model ) {
     model.extensions = Object.values( model.$lateExtensions );
     // TODO: testMode sort?
     model.extensions.forEach( createSuperAnnotate );
+    // set _artifact links for “main extensions” late as it would disturb the
+    // still existing old extend mechanism, see chooseAnnotationsInArtifact(),
+    // needed for LSP and friends:
+    Object.values( model.sources ).forEach( setArtifactLinkForExtensions );
+    Object.values( model.definitions ).forEach( setArtifactLinkForExtensions );
+  }
+
+  // TODO: delete again
+  function setArtifactLinkForExtensions( source ) {
+    if (!source.extensions)
+      return;
+    for (const ext of source.extensions ) {
+      const { name } = ext;
+      if (name?.absolute && name._artifact === undefined) // no link set yet
+        resolvePath( name, ext.kind, ext ); // for LSP
+    }
   }
 
   // For extendArtifactAfter(): -------------------------------------------------
@@ -1604,7 +1620,7 @@ function extend( model ) {
         delete model.$lateExtensions[absolute];
         // TODO: if the extension mechanism has been completed, we could uncomment:
         // art._extensions.forEach( ext => resolvePath( ext.name, ext.kind, ext )); // for LSP
-        // (if we do it now, the old extend functionality might think “already applied”)
+        // for now, we do that at the end of lateExtensions()
       }
     }
     if (art._extensions) {

package/lib/compiler/shared.js

@@ -57,7 +57,8 @@ function fns( model ) {
       artItemsCount: Number.MAX_SAFE_INTEGER,
       undefinedDef: 'anno-undefined-def',
       undefinedArt: 'anno-undefined-art',
-      allowAutoexposed: true,
+      allowAutoexposed: true,   // TODO: think about Info/Warning
+      noMessageForLocalized: true, // TODO: should we issue a Debug message for code completion?
     },
     type: { // TODO: more detailed later (e.g. for enum base type?)
       envFn: artifactsEnv,
@@ -735,10 +736,12 @@ function fns( model ) {
     }
     else if (env.$frontend && env.$frontend !== 'cdl' || spec.global) {
       // IDE can inspect <model>.definitions - provide null for valid
-      signalNotFound( spec.undefinedDef || 'ref-undefined-def', [ head.location, user ],
-                      valid, { art: head.id } );
+      if (!spec.noMessageForLocalized || !head.id.startsWith( 'localized.' )) {
+        signalNotFound( spec.undefinedDef || 'ref-undefined-def', [ head.location, user ],
+                        valid, { art: head.id } );
+      }
     }
-    else {
+    else if (!spec.noMessageForLocalized || head.id !== 'localized') {
       signalNotFound( spec.undefinedArt || 'ref-undefined-art', [ head.location, user ],
                       valid, { name: head.id } );
     }
@@ -817,7 +820,7 @@ function fns( model ) {
         setTargetReferenceKey( orig.name.id, item );
       }
       art = sub;
-      if (spec.envFn && (!artItemsCount || item === last) &&
+      if (spec.envFn && !spec.allowAutoexposed && (!artItemsCount || item === last) &&
           art && art.$inferred === 'autoexposed' && !user.$inferred) {
         // Depending on the processing sequence, the following could be a
         // simple 'ref-undefined-art'/'ref-undefined-def' - TODO: which we

package/lib/gen/language.checksum

@@ -1 +1 @@
-371decdc6899d80e3420038878ed211c
+7b8ead4c652cf564b5ba45f94d2c45af