@sap/cds-compiler 3.4.2 → 3.5.0

package/lib/compiler/shared.js

@@ -528,7 +528,7 @@ function fns( model ) {
    * @param {object} typeArtifact
    * @param {CSN.Artifact} user
    */
-  function resolveTypeArgumentsUnchecked(artifact, typeArtifact, user) {
+  function resolveTypeArgumentsUnchecked( artifact, typeArtifact, user ) {
     let args = artifact.$typeArgs || [];
     const parameters = typeArtifact.parameters || [];
 
@@ -572,10 +572,12 @@ function fns( model ) {
     artifact.$typeArgs = undefined;
   }
 
-  // Return artifact or element referred by name `head`.  The first environment
-  // we search in is `env`.  If `unchecked` is equal to `true`, do not report an error
-  // if the artifact does not exist.  Return a "fresh" artifact for
-  // non-existing external using references if `unchecked` is truthy.
+  /**
+   * Return artifact or element referred by name `head`.  The first environment
+   * we search in is `env`.  If `unchecked` is equal to `true`, do not report an error
+   * if the artifact does not exist.  Return a "fresh" artifact for
+   * non-existing external using references if `unchecked` is truthy.
+   */
   function getPathRoot( path, spec, user, env, extDict, msgArt ) {
     const head = path[0];
     if (!head || !head.id || !env)
@@ -689,14 +691,13 @@ function fns( model ) {
       // navigation elements (for which you should use a table alias)
       if (extDict !== model.definitions) {
         for (const name in extDict) {
-          const def = extDict[name];
-          if (!(Array.isArray(def) && def[0].kind === '$navElement'))
-            e[name] = def;
+          if (!spec.dollar || name[0] !== '$')
+            e[name] = extDict[name];
         }
       }
       else {
         for (const name in extDict) {
-          if (!name.includes('.') && (spec.nodollar || name[0] !== '$'))
+          if (!name.includes('.') && (!spec.dollar || name[0] !== '$'))
             e[name] = extDict[name];
         }
       }
@@ -712,8 +713,18 @@ function fns( model ) {
         signalNotFound( 'ref-undefined-element', [ head.location, user ], valid,
                         { art: searchName( msgArt, head.id, 'element' ) } );
       }
+      else if (head.id[0] === '$') {
+        const tableAlias = extDict[head.id]?._parent;
+        const alias = tableAlias?.kind === '$tableAlias' ? tableAlias.name?.alias : null;
+        signalNotFound( 'ref-undefined-var', [ head.location, user ], valid, {
+          '#': alias ? 'alias' : 'std',
+          alias,
+          id: head.id,
+        } );
+      }
       else {
-        signalNotFound( 'ref-undefined-var', [ head.location, user ], valid, { id: head.id } );
+        signalNotFound( 'ref-undefined-element', [ head.location, user ], valid,
+                        { art: head.id, '#': 'std' } );
       }
     }
     else if (env.$frontend && env.$frontend !== 'cdl' || spec.global) {
@@ -764,7 +775,7 @@ function fns( model ) {
           return 0;
         if (art.$uncheckedElements) { // magic variable / replacement variable
           signalNotFound( 'ref-unknown-var', [ item.location, user ], [ env ],
-                          { id: path.map(n => n.id).join('.') } );
+                          { id: pathName( path ) } );
         }
         else {
           errorNotFound( item, env );
@@ -873,7 +884,7 @@ function fns( model ) {
    * @param {object[]} valid
    * @param  {object} [textParams]
    */
-  function signalNotFound(msgId, location, valid, textParams ) {
+  function signalNotFound( msgId, location, valid, textParams ) {
     if (location.$notFound)
       return;
     location.$notFound = true;
@@ -891,7 +902,7 @@ function fns( model ) {
    * @param {object} art
    * @param {any} location
    */
-  function signalMissingElementAccess(art, location) {
+  function signalMissingElementAccess( art, location ) {
     const err = message( 'ref-expected-element', location,
                          { '#': 'magicVar', id: art.name.id } );
     // Mapping for better valid names: from -> $at.from
@@ -909,7 +920,7 @@ function fns( model ) {
    * @param {CompileMessage} msg CDS Compiler message
    * @param  {...object} validDicts One ore more artifact dictionaries such as in `_block`.
    */
-  function attachAndEmitValidNames(msg, ...validDicts) {
+  function attachAndEmitValidNames( msg, ...validDicts ) {
     if (!options.testMode && !options.attachValidNames)
       return;
 
@@ -922,7 +933,7 @@ function fns( model ) {
       msg.validNames[name] = valid[name];
     }
 
-    if (options.testMode) {
+    if (options.testMode && !options.$recompile) {
       // no semantic location => either first of [loc, semantic loc] pair or just location.
       const loc = msg.location[0] || msg.location;
       const names = Object.keys(msg.validNames);
@@ -959,7 +970,7 @@ function fns( model ) {
       // for non-actions.  We can't only check for !art.returns, because `action A();` is valid.
       // `art._block` ensures that `art` is a defined def.
       warning('anno-unexpected-returns', [ construct.name.location, construct ],
-              { keyword: 'returns', kind: art.kind }, 'Unexpected $(KEYWORD) for $(KIND)');
+              { keyword: 'returns', meta: art.kind }, 'Unexpected $(KEYWORD) for $(META)');
     }
   }
 

package/lib/compiler/tweak-assocs.js

@@ -21,7 +21,7 @@ const {
 } = require('./utils');
 
 const $location = Symbol.for('cds.$location');
-
+const $inferred = Symbol.for('cds.$inferred');
 
 // Export function of this file.
 function tweakAssocs( model ) {
@@ -242,10 +242,7 @@ function tweakAssocs( model ) {
   }
 
   function inferredForeignKeys( foreignKeys, ignore ) {
-    // TODO: better use a symbol $inferred for dictionaries later
-    for (const name in foreignKeys)
-      return foreignKeys[name].$inferred && foreignKeys[name].$inferred !== ignore;
-    return false;
+    return foreignKeys[$inferred] && foreignKeys[$inferred] !== ignore;
   }
 
   function rewriteKeys( elem, assoc ) {
@@ -255,7 +252,7 @@ function tweakAssocs( model ) {
     //  'Info','FK').toString())
     forEachInOrder( assoc, 'foreignKeys', ( orig, name ) => {
       const fk = linkToOrigin( orig, name, elem, 'foreignKeys', elem.location );
-      fk.$inferred = 'rewrite'; // TODO: other $inferred value?
+      fk.$inferred = 'rewrite'; // Override existing value; TODO: other $inferred value?
       // TODO: re-check for case that foreign key is managed association
       if ('_effectiveType' in orig)
         setLink( fk, '_effectiveType', orig._effectiveType);
@@ -268,6 +265,8 @@ function tweakAssocs( model ) {
       }
       fk.targetElement = te;
     });
+    if (elem.foreignKeys) // Possibly no fk was set
+      elem.foreignKeys[$inferred] = 'rewrite';
   }
 
   // TODO: there is no need to rewrite the on condition of non-leading queries,

package/lib/compiler/utils.js

@@ -400,6 +400,24 @@ function setExpandStatus( elem, status ) {
   }
 }
 
+function setExpandStatusAnnotate( elem, status ) {
+  for (;;) {
+    if (elem.$expand === status)
+      return;                 // already set
+    elem.$expand = status;    // meaning: expanded, containing annos
+    for (let line = elem.items; line; line = line.items)
+      line.$expand = status; // to-csn just uses the innermost $expand
+    if (!elem._main)
+      return;
+    elem = elem._parent;
+  }
+}
+
+function isDirectComposition( art ) {
+  const type = art.type && art.type.path;
+  return type && type[0] && type[0].id === 'cds.Composition';
+}
+
 module.exports = {
   pushLink,
   annotationVal,
@@ -424,4 +442,6 @@ module.exports = {
   traverseQueryPost,
   traverseQueryExtra,
   setExpandStatus,
+  setExpandStatusAnnotate,
+  isDirectComposition,
 };