@sap/cds-compiler 2.11.4 → 2.13.8

package/lib/model/csnRefs.js

@@ -4,6 +4,8 @@
 // a reference is context-dependent, especially if queries are involved.  This
 // module provides the corresponding resolve/inspect functions.
 //
+// This module should work with both client-style CSN and Universal CSN.
+//
 // See below for preconditions / things to consider – the functions in this
 // module do not issue user-friendly messages for invalid references in a CSN,
 // such messages are (hopefully) issued by the compile() function.
@@ -41,18 +43,18 @@
 //
 // 1. a well-formed CSN with valid references;
 // 2. a compiled model, i.e. a CSN with all inferred information provided by
-//    the compile() function, including the (non-)enumerable `elements`
-//    property of sub `SELECT`s in a FROM;
+//    the compile() function for the CSN flavors `client` or `universal`
+//    (including the (non-)enumerable `elements` property in `client` CSN);
 // 3. no (relevant) CSN changes between the calls of the same instance of
 //    inspectRef() - to enable caching.
 //
 // If any of these conditions are not given, our functions usually simply
 // throws an exception (which might even be a plain TypeError), but it might
-// also jsut return any value.  CSN processors can provide user-friendly error
+// also just return any value.  CSN processors can provide user-friendly error
 // messages by calling the Core Compiler in case of exceptions.  For details,
 // see internalDoc/CoreCompiler.md#use-of-the-core-compiler-for-csn-processors.
 
-// During a transformation, care must be taked to adhere to these conditions.
+// During a transformation, care must be taken to adhere to these conditions.
 // E.g. a structure flattening function cannot create an element `s_x` and
 // delete `s` and then still expects inspectRef() to be able to resolve a
 // reference `['s', 'x']`.
@@ -93,7 +95,7 @@
 //
 // The names in further path items are searched in the “navigation” environment
 // of the path so far - it does not need to depend on the reference context (as
-// we do not check the validility here):
+// we do not check the validity here):
 //
 // 1. We search in the elements of the target entity for associations and
 //    compositions, and in the elements of the current object otherwise.
@@ -157,10 +159,29 @@
 //   hierarchy, query number, table aliases and links from a column to its
 //   respective inferred element.
 
+// Properties in cache:
+//
+// - _effectiveType on def/member/items: cached result of effectiveType()
+// - _origin on def/member/items: the "prototype"
+// - $origin on def/member/items: whether implicit _origin refs have been set for direct members
+// - _parent: not yet used (for debugging)
+//
+// - _env on non-string path item: environment provided by the ref so far,
+//    next path item is element in it
+// - _ref on non-string `type` or `from` ref, or on alias: the referred def/elem
+//
+// - $queries on def: array of all queries of an entity
+// - $queryNumber: the index position +1 of a query inside the $queries array
+// - $aliases on query: dictionary of alias names to cache with _ref/_select and elements
+// - _select: value of the `SELECT` property of a query (or value of `projection`)
+// - elements: the elements of the query (original CSN elements from query or main)
+// - _element on query column: the corresponding element
+
 'use strict';
 
 const BUILTIN_TYPE = {};
 const { locationString } = require('../base/location');
+const { ModelError, CompilerAssertion } = require("../base/error");
 
 // Properties in which artifact or members are defined - next property in the
 // "csnPath" is the name or index of that property; 'args' (its value can be a
@@ -171,19 +192,24 @@ const artifactProperties = [ 'elements', 'columns', 'keys', 'mixin', 'enum',
 // Mapping the “reference context string” to the reference semantics
 // - lexical: false | Function - determines where to look first for “lexical names”
 // - dynamic: String - describes the dynamic environment (if in query)
+// - assoc: String, with dynamic: 'global' - what to do with assoc steps
+//   * 'static': visit elements of anonymous aspect if not last ref item
+//   * 'target': always follow target, including last ref item
+//   * other (& not provided) = follow target if not last ref item
 const referenceSemantics = {
-  type: { lexical: false, dynamic: 'global' },
-  includes: { lexical: false, dynamic: 'global' },
-  target: { lexical: false, dynamic: 'global' },
-  targetAspect: { lexical: false, dynamic: 'global' },
-  from: { lexical: false, dynamic: 'global' },
+  type: { lexical: false, dynamic: 'global' }, // TODO: assoc: 'static', see Issue #8458
+  includes: { lexical: false, dynamic: 'global', assoc: 'static' }, // no elem ref anyway
+  target: { lexical: false, dynamic: 'global', assoc: 'static' },   // no elem ref anyway
+  targetAspect: { lexical: false, dynamic: 'global', assoc: 'static' },
+  from: { lexical: false, dynamic: 'global', assoc: 'target' },
   keys: { lexical: false, dynamic: 'target' },
+  keys_origin: { lexical: false, dynamic: 'target' },
   excluding: { lexical: false, dynamic: 'source' },
   expand: { lexical: justDollar, dynamic: 'expand' },   // ...using baseEnv
   inline: { lexical: justDollar, dynamic: 'inline' },   // ...using baseEnv
   ref_where: { lexical: justDollar , dynamic: 'ref-target'}, // ...using baseEnv
   on: { lexical: justDollar, dynamic: 'query' }, // assoc defs, redirected to
-  // there are also 'join_on' and 'mixin_on' with default semantics
+  // there are also 'on_join' and 'on_mixin' with default semantics
   orderBy: { lexical: query => query, dynamic: 'query' },
   orderBy_set: { lexical: query => query.$next, dynamic: 'query' }, // to outer SELECT (from UNION)
   // default: { lexical: query => query, dynamic: 'source' }
@@ -195,10 +221,15 @@ function justDollar() {
 
 /**
  * @param {CSN.Model} csn
+ * @param {boolean|string} [universalReady]
  */
-function csnRefs( csn ) {
+function csnRefs( csn, universalReady ) {
   const cache = new WeakMap();
-
+  setCache( BUILTIN_TYPE, '_origin', null );
+  if (universalReady === 'init-all') {
+    for (const art of Object.values( csn.definitions || {}))
+      initDefinition( art );
+  }
   // Functions which set the new `baseEnv`:
   resolveRef.expandInline = function resolve_expandInline( ref, ...args ) {
     return cached( ref, '_env', () => navigationEnv( resolveRef( ref, ...args ).art ) );
@@ -210,7 +241,15 @@ function csnRefs( csn ) {
     } );
   }
   return {
-    effectiveType, artifactRef, getOrigin, inspectRef, queryOrMain,
+    effectiveType,
+    artifactRef,
+    getOrigin,
+    inspectRef,
+    queryOrMain,
+    getColumn: ( elem ) => getCache( elem, '_column' ),
+    getElement: ( col ) => getCache( col, '_element' ),
+    initDefinition,
+    targetAspect,
     __getCache_forEnrichCsnDebugging: obj => cache.get( obj ),
   };
 
@@ -239,7 +278,7 @@ function csnRefs( csn ) {
       return setCache( art, '_effectiveType', art );
 
     if (getCache( art, '_effectiveType' ) === 0)
-      throw new Error( 'Circular type reference');
+      throw new ModelError( 'Circular type reference');
     const type = getCache( art, '_effectiveType' ) || art;
     chain.forEach( a => setCache( a, '_effectiveType', type ) );
     return type;
@@ -248,21 +287,19 @@ function csnRefs( csn ) {
   /**
    * @param {CSN.Artifact} art
    */
-  function navigationEnv( art ) {
-    let type = effectiveType( art );
+  function navigationEnv( art, staticAssoc ) {
+    let env = effectiveType( art );
     // here, we do not care whether it is semantically ok to navigate into sub
     // elements of array items (that is the task of the core compiler /
     // semantic check)
-    while (type.items) {
-      cached( type, '$origin', _a => setImplicitOrigin( type, origin ) );
-      type = effectiveType( type.items );
-    }
-    // cannot navigate along targetAspect!
-    const env = (type.target) ? csn.definitions[type.target] : type;
-    const origin = cached( env, '_origin', getOriginRaw );
-    if (origin && origin !== BUILTIN_TYPE)
-      cached( env, '$origin', _a => setImplicitOrigin( env, origin ) );
-    return env;
+    while (env.items)
+      env = effectiveType( env.items );
+    const target = (staticAssoc ? targetAspect( env ) : env.target);
+    if (typeof target !== 'string')
+      return target || env;
+    const def = csn.definitions[target];
+    initDefinition( def );
+    return def;
   }
 
   /**
@@ -274,132 +311,158 @@ function csnRefs( csn ) {
    *                         could not be found.
    */
   function artifactRef( ref, notFound ) {
-    const art = (typeof ref === 'string')
-      ? csn.definitions[ref]
-      : cached( ref, '_ref', artifactPathRef );
-    if (art)
-      return art;
+    // TODO: what about type ref?
+    if (typeof ref === 'string') {
+      const main = csn.definitions[ref];
+      if (main)
+        return initDefinition( main );
+    }
+    else {
+      const art = cached( ref, '_ref', artifactPathRef );
+      if (art)
+        return art;
+    }
+    if (notFound !== undefined && typeof ref === 'string')
+      return notFound;          // is only meant for builtins
+    // Backend bug workaround, TODO: delete next 2 lines
     if (notFound !== undefined)
       return notFound;
-    throw new Error( 'Undefined reference' );
+    throw new ModelError( 'Undefined reference' );
   }
 
   function artifactPathRef( ref ) {
     const [ head, ...tail ] = ref.ref;
     let art = csn.definitions[pathId( head )];
+    initDefinition( art );
     for (const elem of tail) {
-      const env = navigationEnv( art );
+      const env = navigationEnv( art ); // TODO: second argument true, see Issue #8458
       art = env.elements[pathId( elem )];
     }
     return art;
   }
 
-  function getOrigin( art, alsoType ) {
-    const origin = cached( art, '_origin', getOriginRaw );
-    if (origin && origin !== BUILTIN_TYPE)
-      cached( art, '$origin', _a => setImplicitOrigin( art, origin ) );
-    return art.type && !alsoType ? undefined : origin;
+  function artifactFromRef( ref ) {
+    const [ head, ...tail ] = ref.ref;
+    let art = csn.definitions[pathId( head )];
+    initDefinition( art );
+    for (const elem of tail) {
+      const env = navigationEnv( art );
+      art = env.elements[pathId( elem )];
+    }
+    return navigationEnv( art );
+  }
+
+  // Return target when resolving references in 'keys'
+  function assocTarget( art, refCtx ) {
+    // Call contexts:
+    // 1. normal definition of association with explicit foreign keys
+    // 2. auto-redirected association with renaming of foreign keys
+    //    (currently: `keys` always available on inherited associations)
+    // 3. user-induced redirection (in 'cast') with explicit foreign keys
+    // 4. original provided association def inside $origin with explicit foreign keys
+    //    (outside $origin like 2)
+    const targetName = refCtx !== 'keys_origin' && art.target
+                    || art.$origin && art.$origin.target
+                    || art.cast.target;
+    const target = csn.definitions[targetName];
+    initDefinition( target );
+    return target;
+  }
+
+  function getOrigin( art ) {
+    return cached( art, '_origin', getOriginRaw );
   }
 
   function getOriginRaw( art ) {
     if (art.type)               // TODO: make robust against "linked" = only direct
       return artifactRef( art.type, BUILTIN_TYPE );
-    if (!art.$origin)           // implicit $origin should have been set
-      return null;
-    // art.$origin must not be a string here - shortened refs should already
-    // have been used to set the _origin cache
-    if (!Array.isArray( art.$origin )) // anonymous prototype in $origin
-      return cached( art.$origin, '_origin', getOriginRaw );
-    const [ head, ...tail ] = art.$origin;
-    let origin = csn.definitions[head];
-    // allow shorter $origin ref for actions/functions, just using a string:
-    let isAction = art.kind === 'action' || art.kind === 'function';
-    for (const elem of tail) {
-      origin = originNavigation( origin, elem, isAction );
-      isAction = false;
+    if (typeof art.$origin === 'object') // null, […], {…}
+      return getOriginExplicit( art.$origin );
+
+    const parent = getCache( art, '_parent' );
+    if (parent === undefined && universalReady) {
+      const { $location } = art;
+      const location = $location &&
+            (typeof $location === 'string' ? $location : locationString( $location ));
+      const def = Object.keys( art ).join('+') + (location ? ':' + location : '');
+      throw new Error( `Inspecting non-initialized CSN node {${def}}` );
     }
-    return origin;
+    const step = getCache( art, '$origin$step' );
+    if (!step)
+      return null;
+    const origin = cached( parent, '_origin', getOriginRaw );
+    return originNavigation( origin, step );
   }
 
-  function originNavigation( art, elem, isAction ) {
-    if (typeof elem !== 'string') {
-      if (elem.action)
-        return art.actions[elem.action];
-      if (elem.param)
-        return art.params[elem.param];
-      if (elem.returns)
-        return art.returns;
-    }
-    if (isAction)
-      return art.actions[elem];
-    // TODO: if we use effectiveType(), we might have more implicit prototypes
-    // we might then need a function like effectiveArtifact,
-    // which cares about actions/params
-    // let origin = cached( art, '_origin', getOriginRaw );
-    // while (art.items) {
-    //   cached( art, '$origin', _a => setImplicitOrigin( art, origin ) );
-    //   art = art.items;
-    //   origin = cached( art, '_origin', getOriginRaw );
-    // }
-    // if (origin)
-    //   cached( art, '$origin', _a => setImplicitOrigin( art, origin ) );
-    // console.log(art)
-    return (art.elements || art.enum || targetAspect( art ).elements)[elem];
-  }
-
-  function targetAspect( art ) {
-    const { $origin } = art;
-    return art.targetAspect ||
-      $origin && typeof $origin === 'object' && !Array.isArray( $origin ) && $origin.target ||
-      art.target;
-  }
-
-  // From the current CSN object, set implicit origin for the next navigation step
-  function setImplicitOrigin( art, origin ) {
-    setMembersImplicit( art.actions, origin.actions );
-    setMembersImplicit( art.params, origin.params );
-    if (art.returns) {
-      art = art.returns;
-      if (art.type || typeof art.$origin === 'object') // null, […], {…}
-        return true;            // not implicit or shortened
-      origin = effectiveType( origin.returns );
-      setCache( art, '_origin', origin );
-      return true;
-    }
-    while (art.items) {
-      art = art.items;
-      if (art.type || typeof art.$origin === 'object') // null, […], {…}
-        return true;            // not implicit or shortened
-      origin = effectiveType( origin.items );
-      setCache( art, '_origin', origin );
-    }
-    setMembersImplicit( art.elements, origin.elements );
-    // The enum base type is _not_ where we find the origins of the enum symbols.
-    // A derived type of an enum type with individual annotations on a symbol
-    // has both 'type' and '$origin'.
-    if (!art.type || art.$origin)
-      setMembersImplicit( art.enum, origin.enum );
-    return true;
+  function getOriginExplicit( $origin ) { // null, […], {…}
+    if (!$origin)
+      return null;
+    if (!Array.isArray( $origin )) // anonymous prototype in $origin
+      return getOriginExplicit( $origin.$origin );
+    const [ head, ...tail ] = $origin;
+    const main = csn.definitions[head];
+    initDefinition( main );
+    return tail.reduce( originNavigation, main );
   }
 
-  function setMembersImplicit( members, originMembers ) {
-    if (!members)
-      return;
-    for (const name in members) {
-      const elem = members[name];
-      if (!elem.type && typeof elem.$origin !== 'object') // undefined or string
-        setCache( elem, '_origin', originMembers[elem.$origin || name] || false );
+  function originNavigation( art, step ) {
+    if (!step)
+      return null;
+    if (!effectiveType( art ))
+      throw new TypeError( 'Cyclic type definition' );
+    if (typeof step === 'string')
+      return navigationEnv( art, true ).elements[step];
+
+    if (step.action)
+      return effectiveArtFor( art, 'actions' )[step.action];
+    if (step.param)
+      return effectiveArtFor( art, 'params' )[step.param];
+    if (step.returns)
+      return effectiveArtFor( art, 'returns' );
+    if (step.enum)
+      return navigationEnv( art, true ).enum[step.enum];
+    if (step.items)
+      return effectiveType( art ).items;
+    if (step.target)
+      return targetAspect( effectiveType( art ) );
+    throw Error( `Illegal navigation step ${ Object.keys(step)[0]}` );
+  }
+
+  function effectiveArtFor( art, property ) {
+    while (!art[property])
+      art = getOrigin( art );
+    return art[property];
+  }
+
+  function initDefinition( main ) {
+    // TODO: some --test-mode check that the argument is in ‹csn›.definitions ?
+    if (getCache( main, '$queries' ) !== undefined) // already computed
+      return main;
+    traverseDef( main, null, null, null, initNode );
+    const queries = cached( main, '$queries', allQueries );
+    for (const qcache of queries || []) {
+      const { _select } = qcache;
+      traverseType( _select, main, null, null, initNode ); // also inits elements
+      if (_select.mixin) {
+        for (const n of Object.keys( _select.mixin ))
+          setCache( _select.mixin[n], '_parent', _select ); // relevant initNode() part
+      }
     }
+    return main;
   }
 
-  /**
-   * Return the entity we select from
-   *
-   * @param {CSN.ArtifactReferencePath} ref
-   * @returns {CSN.Definition}
-   */
-  function fromRef( ref ) {
-    return navigationEnv( artifactRef( ref ));
+  function initNode( art, parent, kind, name ) {
+    setCache( art, '_parent', parent );
+    if (art.type || !kind || kind === 'target') // with type, top-level, query or mixin
+      return;
+    const { $origin } = art;
+    if (typeof $origin === 'object') // null, […], {…}
+      return;
+    const step = $origin || name;
+    if (parent.$origin ||
+        parent.type && kind !== 'enum' && parent.$origin !== null ||
+        getCache( parent, '$origin$step' ))
+      setCache( art, '$origin$step', (kind === 'element' ? step : { [kind]: step }) );
   }
 
   /**
@@ -440,111 +503,108 @@ function csnRefs( csn ) {
   function resolveRef( ref, refCtx, main, query, parent, baseEnv ) {
     const path = (typeof ref === 'string') ? [ ref ] : ref.ref;
     if (!Array.isArray( path ))
-      throw new Error( 'References must look like {ref:[...]}' );
+      throw new ModelError( 'References must look like {ref:[...]}' );
 
     const head = pathId( path[0] );
+    if (main)                   // TODO: improve, for csnpath starting with art
+      initDefinition( main );
     if (ref.param)
-      return resolvePath( path, main.params[head], 'param' );
+      return resolvePath( path, main.params[head], main, 'param' );
 
     const semantics = referenceSemantics[refCtx] || {};
     if (semantics.dynamic === 'global' || ref.global)
-      return resolvePath( path, csn.definitions[head], 'global', refCtx === 'from' );
+      return resolvePath( path, csn.definitions[head], null, 'global', semantics.assoc );
+
 
-    const origin = cached( main, '_origin', getOriginRaw )
-    if (origin)
-      cached( main, '$origin', _a => setImplicitOrigin( main, origin ) );
-    cached( main, '$queries', allQueries );
     let qcache = query && cache.get( query.projection || query );
-    // BACKEND ISSUE: you cannot call csnRefs(), inspect some refs, change the
-    // CSN and again inspect some refs without calling csnRefs() before!
-    // WORKAROUND: if no cached query, a backend has changed the CSN - re-eval cache
-    if (query && !qcache) {
-      setCache( main, '$queries', allQueries( main ) );
-      qcache = cache.get( query.projection || query );
-    }
     // first the lexical scopes (due to query hierarchy) and $magic: ---------
     if (semantics.lexical !== false) {
       const tryAlias = path.length > 1 || ref.expand || ref.inline;
-      let cache = qcache && (semantics.lexical ? semantics.lexical( qcache ) : qcache);
-      while (cache) {
-        const alias = tryAlias && cache.$aliases[head];
+      let ncache = qcache && (semantics.lexical ? semantics.lexical( qcache ) : qcache);
+      while (ncache) {
+        const alias = tryAlias && ncache.$aliases[head];
         if (alias)
-          return resolvePath( path, alias._select || alias._ref, 'alias', cache.$queryNumber );
-        const mixin = cache._select.mixin && cache._select.mixin[head];
-        if (mixin && {}.hasOwnProperty.call( cache._select.mixin, head ))
-          return resolvePath( path, mixin, 'mixin', cache.$queryNumber );
-        cache = cache.$next;
+          return resolvePath( path, alias._select || alias._ref, null,
+                              'alias', ncache.$queryNumber );
+        const mixin = ncache._select.mixin && ncache._select.mixin[head];
+        if (mixin && {}.hasOwnProperty.call( ncache._select.mixin, head )) {
+          setCache( mixin, '_parent', qcache._select );
+          return resolvePath( path, mixin, null, 'mixin', ncache.$queryNumber );
+        }
+        ncache = ncache.$next;
       }
       if (head.charAt(0) === '$') {
         if (head !== '$self' && head !== '$projection')
           return { scope: '$magic' };
         const self = qcache && qcache.$queryNumber > 1 ? qcache._select : main;
-        return resolvePath( path, self, '$self' );
+        return resolvePath( path, self, null, '$self' );
       }
     }
     // now the dynamic environment: ------------------------------------------
     if (semantics.dynamic === 'target') { // ref in keys
-      // not selecting the corresponding element for a select column works,
-      // because explicit keys can only be provided with explicit redirection
-      // target
-      const target = csn.definitions[parent.target || parent.$origin && parent.$origin.target || parent.cast.target];
-      return resolvePath( path, target.elements[head], 'target' );
+      const target = assocTarget( parent, refCtx );
+      return resolvePath( path, target.elements[head], target, 'target' );
     }
     if (baseEnv)                // ref-target (filter condition), expand, inline
-      return resolvePath( path, baseEnv.elements[head], semantics.dynamic );
+      return resolvePath( path, baseEnv.elements[head], baseEnv, semantics.dynamic );
     if (!query)                 // outside queries - TODO: items?
-      return resolvePath( path, parent.elements[head], 'parent' );
+      return resolvePath( path, parent.elements[head], parent, 'parent' );
 
     if (semantics.dynamic === 'query')
       // TODO: for ON condition in expand, would need to use cached _element
-      return resolvePath( path, qcache.elements[head], 'query' );
+      return resolvePath( path, qcache.elements[head], null, 'query' );
     for (const name in qcache.$aliases) {
-      const found = qcache.$aliases[name].elements[head];
+      const alias = qcache.$aliases[name];
+      const found = alias.elements[head];
       if (found)
-        return resolvePath( path, found, 'source', name )
+        return resolvePath( path, found, alias._ref, 'source', name )
     }
     // console.log(query.SELECT,qcache,qcache.$next,main)
-    throw new Error ( `Path item ${ 0 }=${ head } refers to nothing, refCtx: ${ refCtx }` );
+    throw new ModelError ( `Path item ${ 0 }=${ head } refers to nothing, refCtx: ${ refCtx }` );
   }
 
   /**
    * @param {CSN.Path} path
    * @param {CSN.Artifact} art
    * @param {string} [scope]
+   * @param [extraInfo]
    */
-  function resolvePath( path, art, scope, extraInfo ) {
+  function resolvePath( path, art, parent, scope, extraInfo ) {
+    const staticAssoc = extraInfo === 'static' && scope === 'global';
     /** @type {{idx, art?, env?}[]} */
     const links = path.map( (_v, idx) => ({ idx }) );
     // TODO: backends should be changed to enable uncommenting:
     // if (!art)    // does not work with test3/Associations/KeylessManagedAssociation/
-    //   throw new Error ( `Path item ${ 0 }=${ pathId( path[0] ) } refers to nothing, scope: ${ scope }`);
+    //   throw new ModelError ( `Path item ${ 0 }=${ pathId( path[0] ) } refers to nothing, scope: ${ scope }`);
     links[0].art = art;
     for (let i = 1; i < links.length; ++i) { // yes, starting at 1, links[0] is set above
-      art = navigationEnv( art );
-      links[i - 1].env = art;
+      parent = navigationEnv( art, staticAssoc );
+      links[i - 1].env = parent;
       if (typeof path[i - 1] !== 'string')
-        setCache( path[i - 1], '_env', art );
-      art = art.elements[pathId( path[i] )];
+        setCache( path[i - 1], '_env', parent );
+      art = parent.elements[pathId( path[i] )];
       if (!art) {
         const env = links[i - 1].env;
         const loc = env.name && env.name.$location || env.$location;
-        throw new Error ( `Path item ${ i }=${ pathId( path[i] ) } on ${ locationString( loc ) } refers to nothing` );
+        throw new ModelError ( `Path item ${ i }=${ pathId( path[i] ) } on ${ locationString( loc ) } refers to nothing` );
       }
       links[i].art = art;
     }
     const last = path[path.length - 1];
-    const fromRef = scope === 'global' && extraInfo;
+    const fromRef = scope === 'global' && extraInfo === 'target';
     if (fromRef || typeof last !== 'string') {
       const env = navigationEnv( art );
       links[links.length - 1].env = env;
-      if (fromRef)
+      if (fromRef) {
         art = env;
+        parent = null;
+      }
       if (typeof last !== 'string')
         setCache( last, '_env', env )
     }
-    return (extraInfo && !fromRef)
-      ? { links, art, scope, $env: extraInfo }
-      : { links, art, scope };
+    return (extraInfo && scope !== 'global')
+      ? { links, art, parent, scope, $env: extraInfo }
+      : { links, art, parent, scope };
   }
 
   /**
@@ -563,8 +623,8 @@ function csnRefs( csn ) {
       if (query.ref) {          // ref in from
         // console.log('SQ:',query,cache.get(query))
         const as = query.as || implicitAs( query.ref );
-        const _ref = fromRef( query );
-        getCache( fromSelect, '$aliases' )[as] = { _ref, elements: _ref.elements };
+        const _ref = cached( query, '_from', artifactFromRef )
+        getCache( fromSelect, '$aliases' )[as] = { _ref, elements: _ref.elements, _parent: query };
       }
       else {
         const qcache = getQueryCache( parentQuery );
@@ -577,15 +637,18 @@ function csnRefs( csn ) {
         if (select) {
           cache.set( select, qcache ); // query and query.SELECT have the same cache qcache
           qcache._select = select;
+          qcache._parent = main;
           all.push( qcache );
         }
       }
     } );
     all.forEach( function initElements( qcache, index ) {
+      qcache._parent = main;
       qcache.$queryNumber = index + 1;
-      qcache.elements = (index ? qcache._select : main).elements;
-      const columns = qcache._select.columns;
-      if (qcache.elements && columns)
+      const { elements } = (index ? qcache._select : main);
+      qcache.elements = elements;
+      const { columns } = qcache._select;
+      if (elements && columns)
         columns.map( c => initColumnElement( c, qcache ) );
     } );
     return all;
@@ -624,7 +687,8 @@ function csnRefs( csn ) {
     while (type.items)
       type = type.items;
     const elem = setCache( col, '_element', type.elements[as] );
-    // if requested, we could set a _column link in element
+    if (elem)                   // TODO to.sql: something is strange if this is not set
+      setCache( elem, '_column', col );
     if (col.expand)
       col.expand.map( c => initColumnElement( c, elem ) );
   }
@@ -666,8 +730,8 @@ function csnRefs( csn ) {
 // i.e. a value with an `elements` property.
 // TODO: only used in forHanaNew - move somewhere else
 /**
- * @param {CSN.Query} query node (object with SET or SELECT property)
- * @param {CSN.Definition} main
+ * @param {object} query node (object with SET or SELECT property)
+ * @param {object} main definition
  */
 function queryOrMain( query, main ) {
   while (query.SET)
@@ -682,7 +746,7 @@ function queryOrMain( query, main ) {
   // 'projection'), but `leading` can be its `query` property:
   if ((leading === query || leading === query.query) && main.elements)
     return main;
-  throw new Error( `Query elements not available: ${ Object.keys( query ).join('+') }`);
+  throw new ModelError( `Query elements not available: ${ Object.keys( query ).join('+') }`);
 }
 
 /**
@@ -691,7 +755,7 @@ function queryOrMain( query, main ) {
  * @param {CSN.Query} query
  * @param {CSN.QuerySelect} fromSelect
  * @param {CSN.Query} parentQuery
- * @param {(query: CSN.Query&CSN.QueryFrom, select: CSN.QuerySelectEnriched) => void} callback
+ * @param {(query: CSN.Query&CSN.QueryFrom, select: CSN.QuerySelectEnriched, parentQuery: CSN.Query) => void} callback
  */
 function traverseQuery( query, fromSelect, parentQuery, callback ) {
   const select = query.SELECT || query.projection;
@@ -746,6 +810,52 @@ function traverseExpr( expr, parentQuery, callback ) {
   }
 }
 
+function traverseDef( node, parent, kind, name, callback ) {
+  callback ( node, parent, kind, name );
+  if (node.params) {
+    for (const n of Object.keys( node.params ))
+      traverseType( node.params[n], node, 'param', n, callback );
+  }
+  if (node.returns)
+    traverseType( node.returns, node, 'returns', true, callback );
+  traverseType( node, parent, kind, name, callback );
+  if (node.actions) {
+    for (const n of Object.keys( node.actions ))
+      traverseDef( node.actions[n], node, 'action', n, callback )
+  }
+}
+
+function traverseType( node, parent, kind, name, callback ) {
+  callback ( node, parent, kind, name );
+  const target = targetAspect( node );
+  if (target && typeof target === 'object' && target.elements) {
+    callback ( target, node, 'target', true );
+    node = target;
+  }
+  else if (node.items) {
+    let items = 0;
+    while (node.items) {
+      callback ( node.items, node, 'items', ++items );
+      node = node.items;
+    }
+  }
+  if (node.elements) {
+    for (const n of Object.keys( node.elements ))
+      traverseDef( node.elements[n], node, 'element', n, callback )
+  }
+  if (node.enum) {
+    for (const n of Object.keys( node.enum ))
+      traverseDef( node.enum[n], node, 'enum', n, callback )
+  }
+}
+
+function targetAspect( art ) {
+  const { $origin } = art;
+  return art.targetAspect ||
+    $origin && typeof $origin === 'object' && !Array.isArray( $origin ) && $origin.target ||
+    art.target;
+}
+
 function pathId( item ) {
   return (typeof item === 'string') ? item : item.id;
 }
@@ -755,31 +865,43 @@ function implicitAs( ref ) {
   return id.substring( id.lastIndexOf('.') + 1 );
 }
 
+function startCsnPath( csnPath, csn ) {
+  const head = csnPath[0];
+  if (typeof head !== 'string') {
+    const { main, parent, art } = head;
+    return { index: 1, main, parent, art };
+  }
+  if (csnPath.length < 2 || csnPath[0] !== 'definitions')
+    throw new CompilerAssertion( 'References outside definitions not supported yet');
+  const art = csn.definitions[csnPath[1]];
+  return { index: 2, main: art, parent: null, art };
+}
+
 /**
  * @param {CSN.Path} csnPath
  * @param {CSN.Model} csn
  */
 function analyseCsnPath( csnPath, csn, resolve ) {
-  if (csnPath[0] !== 'definitions')
-    throw new Error( 'References outside definitions not supported yet');
-
   /** @type {object} */
-  let obj = csn;
-  let parent = null;
   let query = null;
   let refCtx = null;
-  let art = null;
   /** @type {boolean|string|number} */
   let isName = false;
   let baseRef = null;
   let baseEnv = null;
-  let main = csn.definitions[csnPath[1]];
+  let { index, main, parent, art } = startCsnPath( csnPath, csn );
+  let obj = art;
+
+  for (; index < csnPath.length; index++) {
+    if (!obj && !resolve)
+      // For the semantic location, use current object as best guess
+      break;
 
-  for (let index = 0; index < csnPath.length; index++) {
     const prop = csnPath[index];
     // array item, name/index of artifact/member, (named) argument
-    if (isName || Array.isArray( obj )) {
-      if (typeof isName === 'string') {
+    if (isName || Array.isArray( obj ) || prop === 'returns') {
+      // TODO: call some kind of resolve.setOrigin()
+      if (typeof isName === 'string' || prop === 'returns') {
         parent = art;
         art = obj[prop];
       }
@@ -791,7 +913,8 @@ function analyseCsnPath( csnPath, csn, resolve ) {
         parent = null;
       }
       isName = prop;
-      refCtx = prop;
+      // if we want to allow auto-redirect of user-provided target with renamed keys:
+      refCtx = (refCtx === '$origin' && prop === 'keys') ? 'keys_origin' : prop;
     }
     else if (prop === 'items' || prop === 'returns') {
       art = obj[prop];
@@ -807,15 +930,13 @@ function analyseCsnPath( csnPath, csn, resolve ) {
     }
     else if (prop === 'where' && refCtx === 'ref') {
       if (resolve)
-        baseEnv = resolve.ref_where( obj, baseRef, refCtx, csn.definitions[csnPath[1]],
-                                    query, parent, baseEnv );
+        baseEnv = resolve.ref_where( obj, baseRef, refCtx, main, query, parent, baseEnv );
       refCtx = 'ref_where';
     }
     else if (prop === 'expand' || prop === 'inline') {
       if (obj.ref) {
         if (resolve)
-          baseEnv = resolve.expandInline( obj, refCtx, csn.definitions[csnPath[1]],
-                                          query, parent, baseEnv );
+          baseEnv = resolve.expandInline( obj, refCtx, main, query, parent, baseEnv );
         refCtx = prop;
       }
       if (prop === 'expand')
@@ -823,9 +944,9 @@ function analyseCsnPath( csnPath, csn, resolve ) {
     }
     else if (prop === 'on') {
       if (refCtx === 'from')
-        refCtx = 'join_on';
+        refCtx = 'on_join';
       else if (refCtx === 'mixin')
-        refCtx = 'mixin_on';
+        refCtx = 'on_mixin';
       else
         refCtx = 'on';          // will use query elements with REDIRECTED TO
     }
@@ -839,11 +960,7 @@ function analyseCsnPath( csnPath, csn, resolve ) {
     else if (prop !== 'xpr') {
       refCtx = prop;
     }
-
     obj = obj[prop];
-    if (!obj && !resolve)
-      // For the semantic location, use current object as best guess
-      break;
   }
   // console.log( 'CPATH:', csnPath, refCtx, obj, parent.$location );
   if (!resolve)