@sap/cds-compiler 5.1.0 → 5.2.0

package/lib/compiler/extend.js

@@ -441,8 +441,8 @@ function extend( model ) {
   function applySingleExtension( art, ext, prop ) {
     if (prop === 'includes') {
       if (ext.kind === 'extend' && art.$inferred) {
-        error( 'extend-for-generated', [ ext.name.location, ext ], { art },
-               'You can\'t use EXTEND on the generated $(ART)' );
+        error( 'extend-for-generated', [ ext.name.location, ext ], { art, keyword: 'extend' },
+               'You can\'t use $(KEYWORD) on the generated $(ART)' );
       }
       else if (art.kind !== 'annotate' && !art._outer) { // not with elem extension in targetAspect
         const { id } = art.name;
@@ -797,7 +797,7 @@ function extend( model ) {
     const dict = parent[prop];
     if (!dict) {
       // TODO: check - for each name? - better locations
-      const location = ext._parent[prop]?.[$location] || ext.name.location;
+      const location = ext._parent?.[prop]?.[$location] || ext.name.location;
       // Remark: no `elements` dict location with `annotate Main:elem`
       switch (prop) {
         // TODO: change texts, somehow similar to checkDefinitions() ?
@@ -1052,8 +1052,8 @@ function extend( model ) {
       if (ext.name._artifact === undefined) { // not already applied
         setArtifactLink( ext.name, art );
         if (noExtend && ext.kind === 'extend') {
-          error( 'extend-for-generated', [ ext.name.location, ext ], { art },
-                 'You can\'t use EXTEND on the generated $(ART)' );
+          error( 'extend-for-generated', [ ext.name.location, ext ], { art, keyword: 'extend' },
+                 'You can\'t use $(KEYWORD) on the generated $(ART)' );
           continue;
         }
         if (ext.includes) {

package/lib/compiler/populate.js

@@ -789,8 +789,8 @@ function populate( model ) {
         return col.name.id;
       }
     }
-    else if (col.expand || col.value && (col._pathHead || query._parent.kind !== 'select')) {
-      // _pathHead => inline/expand; _parent -> only allowed in sub-selects
+    else if (col.expand || col.value && (col._columnParent || query._parent.kind !== 'select')) {
+      // _columnParent => inline/expand; _parent -> only allowed in sub-selects
       error( 'query-req-name', [ col.value?.location || col.location, query ], {},
              'Alias name is required for this select item' );
     }
@@ -867,7 +867,7 @@ function populate( model ) {
     const inferred = query._main.$inferred;
     const excludingDict = (colParent || query).excludingDict || Object.create( null );
 
-    const envParent = wildcard._pathHead; // TODO: rename _pathHead to _columnParent
+    const envParent = wildcard._columnParent;
     const env = wildcardColumnEnv( wildcard, query );
     if (!env)
       return;
@@ -931,7 +931,7 @@ function populate( model ) {
       // already done in populateQuery (TODO: change that and check whether
       // `*` is allowed at all in definer)
       if (!colParent || colParent.value._artifact) {
-        // avoid "not found" messages if pathHead can't be found
+        // avoid "not found" messages if columnParent can't be found
         const user = colParent || query;
         for (const name in user.excludingDict)
           resolveExcluding( name, env, excludingDict, query );
@@ -939,9 +939,9 @@ function populate( model ) {
     }
   }
 
-  function wildcardColumnEnv( wildcard, query ) { // etc.  wildcard._pathHead;
+  function wildcardColumnEnv( wildcard, query ) { // etc.  wildcard._columnParent;
     // if (envParent) console.log( 'CE:', envParent._origin, query );
-    const colParent = wildcard._pathHead;
+    const colParent = wildcard._columnParent;
     if (!colParent)
       return userQuery( query )._combined; // see combinedSourcesOrParentElements
 
@@ -985,14 +985,14 @@ function populate( model ) {
     }
   }
 
-  function setWildcardExpandInline( queryElem, pathHead, origin, name, location ) {
-    setLink( queryElem, '_pathHead', pathHead );
+  function setWildcardExpandInline( queryElem, columnParent, origin, name, location ) {
+    setLink( queryElem, '_columnParent', columnParent );
     const path = [ { id: name, location } ];
     queryElem.value = { path, location }; // TODO: can we omit that?  We have _origin
     setArtifactLink( path[0], origin );
     setLink( queryElem, '_origin', origin );
     // set _projections when inline with table alias:
-    // const alias = pathHead?.value?.path?.[0]?._navigation;
+    // const alias = columnParent?.value?.path?.[0]?._navigation;
     // if (alias?.kind === '$tableAlias')
     //   pushLink( alias.elements[name], '_projections', queryElem );
   }

package/lib/compiler/propagator.js

@@ -66,6 +66,7 @@ function propagate( model ) {
     __proto__: null,
     never,
     onlyViaArtifact,
+    onlyViaParent,
     notWithPersistenceTable,
   };
   for (const rule in propagationRules)

package/lib/compiler/resolve.js

@@ -174,9 +174,10 @@ function resolve( model ) {
         // TODO: or should we push elems with `expand` sibling to extra list for
         //       better messages?  (Whatever that means exactly.)
 
-        if (elem._pathHead) {
-          if (elem._pathHead?.kind !== '$inline')
-            // we're traversing top-level elements of the query; other _pathHead kinds can't happen
+        if (elem._columnParent) {
+          if (elem._columnParent?.kind !== '$inline')
+            // we're traversing top-level elements of the query;
+            // other _columnParent kinds can't happen
             throw new CompilerAssertion('found unexpected "expand", but expected "inline"');
 
           if (!isPathBreakout( elem.value )) {
@@ -205,13 +206,17 @@ function resolve( model ) {
       if (!nav.item._navigation) // first non-table-alias
         setLink( nav.item, '_navigation', navItem );
 
-      if (path[index].where || path[index].args)
-        return;
+      // We consider an element only projected if the path doesn't have
+      // either arguments or filters; but we build up the navigation env
+      // nonetheless, as it makes rewriting paths later on easier.
+      let isComplexPath = !!(path[index].where || path[index].args);
+
       ++index;
       while (navItem && index < path.length) {
         const step = path[index];
-        if (!step?.id || step.where || step.args)
+        if (!step?.id)
           break;
+        isComplexPath ||= !!(step.where || step.args);
         if (!navItem.elements?.[step.id]) {
           const elements = navItem._origin?.elements ||
             navItem._origin?.target?._artifact?.elements;
@@ -228,26 +233,26 @@ function resolve( model ) {
         setLink( step, '_navigation', navItem );
         ++index;
       }
-      // Last path step, if found, is a simple projection
+      // Last path step, if found, is a projected, either complex or simple.
       if (index === path.length && navItem)
-        pushLink( navItem, '_projections', elem );
+        pushLink( navItem, isComplexPath ? '_complexProjections' : '_projections', elem );
     }
   }
 
   function columnParentPath( elem ) {
-    if (!elem._pathHead || !elem.value?.path || isPathBreakout( elem.value ))
+    if (!elem._columnParent || !elem.value?.path || isPathBreakout( elem.value ))
       return elem.value?.path;
 
     const fullPath = [ ...elem.value.path ];
-    let pathHead = elem._pathHead;
-    while (pathHead) {
-      if (pathHead.kind !== '$inline' || !pathHead.value?.path ||
-          isPathBreakout( pathHead.value )) {
+    let columnParent = elem._columnParent;
+    while (columnParent) {
+      if (columnParent.kind !== '$inline' || !columnParent.value?.path ||
+          isPathBreakout( columnParent.value )) {
         // path breakout for e.g. `$self.{ foo }`, `1 as a .{ foo }`
         return null;
       }
-      fullPath.unshift(...pathHead.value.path);
-      pathHead = pathHead._pathHead;
+      fullPath.unshift(...columnParent.value.path);
+      columnParent = columnParent._columnParent;
     }
     return fullPath;
   }
@@ -285,16 +290,16 @@ function resolve( model ) {
     return false;
   }
 
-  function inheritedSourceKeyProp( { value, _pathHead } ) {
+  function inheritedSourceKeyProp( { value, _columnParent } ) {
     if (!value || !value.path)
       return null;
-    const nav = !_pathHead && pathNavigation( value );
+    const nav = !_columnParent && pathNavigation( value );
     const item = value.path[value.path.length - 1];
     if (nav?.navigation && nav.item === item)
       return item._artifact?.key;
-    if (value.path.length !== 1 || _pathHead?.kind !== '$inline')
+    if (value.path.length !== 1 || _columnParent?.kind !== '$inline')
       return null;
-    const hpath = _pathHead.value?.path;
+    const hpath = _columnParent.value?.path;
     const head = hpath?.length === 1 && hpath[0]._navigation;
     return head?.kind === '$tableAlias' && item._artifact?.key;
   }
@@ -344,7 +349,7 @@ function resolve( model ) {
       const elem = query.elements[name];
 
       if (!elem.$inferred && elem.value?.path) {
-        const path = elem._pathHead ? columnParentPath( elem ) : elem.value.path;
+        const path = elem._columnParent ? columnParentPath( elem ) : elem.value.path;
         if (testExpr({ path }, selectTest, () => false, elem))
           propagateKeys = false;
       }
@@ -1008,7 +1013,7 @@ function resolve( model ) {
     }
     const target = resolvePath( obj.target, 'target', art );
 
-    if (obj._pathHead && obj.type && !obj.type.$inferred && art._main && art._main.query) {
+    if (obj._columnParent && obj.type && !obj.type.$inferred && art._main && art._main.query) {
       // New association inside expand/inline: The on-condition can't be properly checked,
       // so abort early. See #8797
       error( 'query-unexpected-assoc', [ obj.name.location, art ], {},
@@ -1253,18 +1258,7 @@ function resolve( model ) {
       error( 'type-invalid-cast', [ elem.type.location, elem ], { '#': 'assoc' } );
       return;
     }
-    // console.log(message( null, elem.location, elem, {target,art:assoc}, 'Info','RE')
-    //             .toString(), elem.value)
-    const nav = elem._main && elem._main.query && elem.value && pathNavigation( elem.value );
-    if (nav && nav.item !== elem.value.path[elem.value.path.length - 1]) {
-      if (!elem.on && origType.on) {
-        error( 'rewrite-not-supported', [ elem.target.location, elem ] );
-        return;
-      }
-    }
     const origTarget = origType.target._artifact;
-    // console.log(require('../model/revealInternalProperties').ref(elem),
-    //             !!origTarget,!!origType._effectiveType,!!origType.target)
     if (!origTarget || !target)
       return;
 
@@ -1377,7 +1371,7 @@ function resolve( model ) {
         if (a.path && a.kind !== '$self' && a.kind !== 'mixin')
           sources.push( a );
       }
-      if (alias.kind === '$tablealias')
+      if (alias.kind === '$tableAlias')
         news.push( { chain: [ alias, ...chain ], sources } );
       else
         news.push( { chain, sources } );
@@ -1593,7 +1587,8 @@ function pathNavigation( ref ) {
   if (root.kind === '$self')
     return { item, tableAlias: root };
   if (root.kind !== '$tableAlias' || ref.path.length < 2)
-    return {};                // should not happen
+    return {}; // should not happen
+  // table alias
   return { navigation: root.elements?.[item.id], item, tableAlias: root };
 }
 

package/lib/compiler/shared.js

@@ -1,5 +1,4 @@
 // Compiler functions and utilities shared across all phases
-// TODO: rename to paths.js and move non resolve-paths functions to somewhere else
 
 'use strict';
 
@@ -546,7 +545,7 @@ function fns( model ) {
       ruser = ruser._outer;
 
     // Handle expand/inline, `type of`, :param, global (internally for CDL):
-    if (user._pathHead && !semantics.isMainRef) { // in expand/inline
+    if (user._columnParent && !semantics.isMainRef) { // in expand/inline
       const { name } = semantics;
       semantics = semantics.nestedColumn();
       semantics.name = name;
@@ -563,7 +562,7 @@ function fns( model ) {
 
     // Search in lexical environments, including $self/$projection:
     const { isMainRef } = semantics;
-    const lexical = semantics.lexical?.( ruser ); // TODO: _pathHead?
+    const lexical = semantics.lexical?.( ruser ); // TODO: _columnParent?
     if (lexical) {
       const [ nextProp, dictProp ] = (isMainRef)
         ? [ '_block', 'artifacts' ]
@@ -608,7 +607,7 @@ function fns( model ) {
   // element item in the path)
   // TODO - think about setting _navigation for all $navElement – the
   // "ref: ['tabAlias']: inline: […]" handling might be easier
-  // (no _pathHead consultation for key prop and renaming support)
+  // (no _columnParent consultation for key prop and renaming support)
   function getPathItem( ref, semantics, user ) {
     // let art = (headArt && headArt.kind === '$tableAlias') ? headArt._origin : headArt;
     const { path } = ref;
@@ -918,7 +917,7 @@ function fns( model ) {
   }
 
   function nestedElements( user ) {
-    const colParent = user._pathHead;
+    const colParent = user._columnParent;
     Functions.effectiveType( colParent ); // set _origin
     const path = colParent?.value?.path;
     if (!path?.length)
@@ -1129,7 +1128,7 @@ function fns( model ) {
   }
 
   function undefinedNestedElement( user, head, valid, _dict, _art, path, semantics ) {
-    const art = user._pathHead._origin;
+    const art = user._columnParent._origin;
     if (!art)
       return null;              // no consequential error
     return undefinedItemElement( user, head, valid, null, art, path, semantics );
@@ -1551,7 +1550,7 @@ function fns( model ) {
     const location = (user.expand || user.inline)[$location];
     // mention `table alias` in text only with initial single path item ref,
     // but do not mention that $self { … } is allowed, shouldn't be advertised:
-    const txt = (path.length > 1 || user._pathHead) ? 'struct' : 'init';
+    const txt = (path.length > 1 || user._columnParent) ? 'struct' : 'init';
     const code = (user.expand) ? '{ ‹expand› }' : '.{ ‹inline› }';
     message( 'def-unexpected-nested-proj', [ location, user ], { '#': txt, code } );
   }
@@ -1655,7 +1654,7 @@ function fns( model ) {
 
   function checkOnlyForeignKeyNavigation( user, path, startIndex = 0, msgPrefix = '' ) {
     // has to be run after foreign-key rewrite
-    const outer = user._pathHead?._origin;
+    const outer = user._columnParent?._origin;
     let assoc = outer?.foreignKeys &&
                 pathStartsWithSelf( { path } ) == null && // not $self or CDS var like $now
                 outer;