@sap/cds-compiler 2.4.4 → 2.10.2

package/lib/compiler/shared.js

@@ -3,7 +3,7 @@
 
 'use strict';
 
-const { searchName, makeMessageFunction } = require('../base/messages');
+const { searchName } = require('../base/messages');
 const { dictAdd, dictAddArray, pushToDict } = require('../base/dictionaries');
 const { setProp } = require('../base/model');
 
@@ -60,7 +60,7 @@ const kindProperties = {
 
 function propExists( prop, parent ) {
   const obj = parent.returns || parent;
-  return (obj.items || obj)[prop];
+  return (obj.items || obj.targetAspect || obj)[prop];
 }
 
 function artifactsEnv( art ) {
@@ -83,7 +83,7 @@ function fns( model, environment = artifactsEnv ) {
   const options = model.options || {};
   const {
     info, warning, error, message,
-  } = makeMessageFunction( model, model.options, 'compile' );
+  } = model.$messageFunctions;
   // TODO: combine envFn and assoc ?
   const specExpected = {
     global: { // for using declaration
@@ -284,6 +284,16 @@ function fns( model, environment = artifactsEnv ) {
     return art.name.absolute;
   }
 
+  function userQuery( user ) {
+    // TODO: we need _query links set by the definer
+    while (user._main) {
+      if (user.kind === 'select' || user.kind === '$join')
+        return user;
+      user = user._parent;
+    }
+    return null;
+  }
+
   // Return artifact or element referred by the path in `ref`.  The first
   // environment we search in is `env`.  If no such artifact or element exist,
   // complain with message and return `undefined`.  Record a dependency from
@@ -325,12 +335,8 @@ function fns( model, environment = artifactsEnv ) {
     }
     else if (spec.next) {       // TODO: combine spec.next / spec.lexical to spec.lexical
       // TODO: SIMPLIFY this function
-      // eslint-disable-next-line no-nested-ternary
-      const query = (spec.lexical === 'main')
-        ? user._main      // in path filter, just $magic (and $parameters)
-        : (user.kind === 'select' || user.kind === '$join')
-          ? user
-          : user._parent && user._parent.kind === 'select' && user._parent;
+      const query = (spec.lexical === 'main') ? user._main : userQuery( user );
+      // in path filter, just $magic (and $parameters)
       env = (spec.lexical === 'from') ? query._parent : query || user._main || user;
       // queries: first tabaliases, then $magic - value refs: first $self, then $magic
       if (!extDict && !spec.noExt) {
@@ -350,7 +356,7 @@ function fns( model, environment = artifactsEnv ) {
     if (!art) {
       return setLink( ref, art );
     }
-    else if (user._pathHead) {
+    else if (!spec.envFn && user._pathHead) {
       // eslint-disable-next-line no-empty
     }
     else if (art.kind === 'using') {
@@ -397,7 +403,7 @@ function fns( model, environment = artifactsEnv ) {
       ? ref.scope || Number.MAX_SAFE_INTEGER
       : spec.artItemsCount || 1;
     // console.log(expected, ref.path.map(a=>a.id),artItemsCount)
-    art = getPathItem( path, spec, user, artItemsCount, user._pathHead && art);
+    art = getPathItem( path, spec, user, artItemsCount, !spec.envFn && user._pathHead && art);
     if (!art)
       return setLink( ref, art );
 
@@ -505,7 +511,8 @@ function fns( model, environment = artifactsEnv ) {
   // 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 ) {
-    if (user._pathHead) {         // TODO: not necessarily for explicit ON condition in expand
+    if (!spec.envFn && user._pathHead) {
+      // TODO: not necessarily for explicit ON condition in expand
       environment( user._pathHead ); // make sure _origin is set
       return user._pathHead._origin;
     }
@@ -650,13 +657,28 @@ function fns( model, environment = artifactsEnv ) {
           return false;
         continue;
       }
-      if (art && art.$uncheckedElements) {
-        // do not check any elements of the path, e.g. $session
-        return art;
-      }
+
       const fn = (spec.envFn && artItemsCount >= 0) ? spec.envFn : environment;
       const env = fn( art, item.location, user, spec.assoc );
+
+      // do not check any elements of the path, e.g. $session - but still don't return path-head
+      if (art && art.$uncheckedElements) {
+        if (env && env[item.id]) // something like $user.id/$user.locale
+          return env[item.id];
+
+        // $user.foo - build our own valid path step obj
+        // Important: Don't directly modify item!
+        const obj = {
+          location: item.location,
+          kind: 'builtin',
+          name: { id: item.id, element: path.map(p => p.id).join('.') },
+        };
+        setLink(obj, art, '_parent');
+        return obj;
+      }
+
       const sub = setLink( item, env && env[item.id] );
+
       if (!sub)
         return (sub === 0) ? 0 : errorNotFound( item, env );
       else if (Array.isArray(sub)) // redefinitions
@@ -805,7 +827,7 @@ function fns( model, environment = artifactsEnv ) {
   // * do something for extensions by CSN or Properties parsers
   // * make sure that we do not issue repeated warnings due to flattening if an
   //   annotation definition is missing
-  function defineAnnotations( construct, art, block, priority ) {
+  function defineAnnotations( construct, art, block, priority = 'define' ) {
     if (!options.parseCdl && construct.kind === 'annotate') {
       // Namespaces cannot be annotated in CSN but because they exist as XSN artifacts
       // they can still be applied. Namespace annotations are extracted in to-csn.js
@@ -826,11 +848,10 @@ function fns( model, environment = artifactsEnv ) {
     // TODO: block should be construct._block
     if (construct.$annotations && construct.$annotations.doc )
       art.doc = construct.$annotations.doc;
-    if (!construct.$annotations || !construct.$annotations.length) {
-      if (construct === art)
-        return;
-      // $annotations is set if parsed from CDL but may not be set if
-      // the input is CSN so we extract them.
+    if (!construct.$annotations) {
+      if (!block || block.$frontend !== 'json')
+        return;                 // namespace, or in CDL source without @annos:
+      // CSN input: set _block and $priority, shallow-copy from extension
       for (const annoProp in construct) {
         if (annoProp.charAt(0) === '@') {
           let annos = construct[annoProp];
@@ -838,7 +859,9 @@ function fns( model, environment = artifactsEnv ) {
             annos = [ annos ];
           for (const a of annos) {
             setProp( a, '_block', block );
-            setAnnotation(art, annoProp, a, priority);
+            a.$priority = priority;
+            if (construct !== art)
+              dictAddArray( art, annoProp, a );
           }
         }
       }
@@ -888,14 +911,10 @@ function fns( model, environment = artifactsEnv ) {
       setProp( anno, '_block', block );
       // TODO: _parent, _main is set later (if we have ElementRef), or do we
       // set _artifact?
-      setAnnotation( art, annoProp, anno, priority );
+      anno.$priority = priority;
+      dictAddArray( art, annoProp, anno );
     }
   }
-
-  function setAnnotation( art, annoProp, anno, priority = 'define') {
-    anno.$priority = priority;
-    dictAddArray( art, annoProp, anno );
-  }
 }
 
 // Return string 'A.B.C' for parsed source `A.B.C` (is vector of ids with
@@ -937,10 +956,11 @@ function linkToOrigin( origin, name, parent, prop, location, silentDep ) {
 
 function setMemberParent( elem, name, parent, prop ) {
   if (prop) {              // extension or structure include
-    // TODO: consider ARRAY OF and RETURNS, COMPOSITION OF type
-    if (!(prop in parent))
-      parent[prop] = Object.create(null);
-    dictAdd( parent[prop], name, elem );
+    // TODO: consider nested ARRAY OF and RETURNS, COMPOSITION OF type
+    const p = parent.items || parent.targetAspect || parent;
+    if (!(prop in p))
+      p[prop] = Object.create(null);
+    dictAdd( p[prop], name, elem );
   }
   if (parent._outer)
     parent = parent._outer;
@@ -996,6 +1016,10 @@ function storeExtension( elem, name, prop, parent, block ) {
   const kind = `_${ elem.kind }`; // _extend or _annotate
   if (!parent[kind])
     setProp( parent, kind, {} );
+  // if (name === '' && prop === 'params') {
+  //   pushToDict( parent[kind], 'returns', elem ); // not really a dict
+  //   return;
+  // }
   if (!parent[kind][prop])
     parent[kind][prop] = Object.create(null);
   pushToDict( parent[kind][prop], name, elem );