@sap/cds-compiler 2.15.8 → 3.1.0

package/lib/model/csnRefs.js

@@ -210,8 +210,11 @@ const referenceSemantics = {
   ref_where: { lexical: justDollar , dynamic: 'ref-target'}, // ...using baseEnv
   on: { lexical: justDollar, dynamic: 'query' }, // assoc defs, redirected to
   // 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)
+  orderBy_ref: { lexical: query => query, dynamic: 'query' },
+  orderBy_expr: { lexical: query => query, dynamic: 'source' }, // ref in ORDER BY expression
+  orderBy_set_ref: { lexical: query => query.$next, dynamic: 'query' }, // to outer SELECT (from UNION)
+  // refs in ORDER BY expr in UNION not really allowed - only with table alias (of outer queries) or $self
+  orderBy_set_expr: { lexical: query => query.$next, dynamic: false },
   // default: { lexical: query => query, dynamic: 'source' }
 }
 
@@ -327,7 +330,7 @@ function csnRefs( csn, universalReady ) {
     // Backend bug workaround, TODO: delete next 2 lines
     if (notFound !== undefined)
       return notFound;
-    throw new ModelError( 'Undefined reference' );
+    throw new ModelError( `Unknown artifact reference: ${typeof ref !== 'string' ? JSON.stringify(ref.ref) : ref}` );
   }
 
   function artifactPathRef( ref ) {
@@ -551,37 +554,39 @@ function csnRefs( csn, universalReady ) {
       }
     }
     // now the dynamic environment: ------------------------------------------
-    if (semantics.dynamic === 'target') { // ref in keys
-      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], baseEnv, semantics.dynamic );
-    if (!query) {                // outside queries - TODO: items?
-      let art = parent.elements[head];
-      // Ref to up_ in anonymous aspect
-      if (!art && head === 'up_') {
-        const up = getCache( parent, '_parent' );
-        const target = up && typeof up.target === 'string' && csn.definitions[up.target];
-        if (target && target.elements) {
-          initDefinition( target );
-          art = target.elements.up_;
+    if (semantics.dynamic !== false) {
+      if (semantics.dynamic === 'target') { // ref in keys
+        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], baseEnv, semantics.dynamic );
+      if (!query) {                // outside queries - TODO: items?
+        let art = parent.elements[head];
+        // Ref to up_ in anonymous aspect
+        if (!art && head === 'up_') {
+          const up = getCache( parent, '_parent' );
+          const target = up && typeof up.target === 'string' && csn.definitions[up.target];
+          if (target && target.elements) {
+            initDefinition( target );
+            art = target.elements.up_;
+          }
         }
+        return resolvePath( path, art, parent, 'parent' );
       }
-      return resolvePath( path, art, parent, 'parent' );
-    }
 
-    if (semantics.dynamic === 'query')
-      // TODO: for ON condition in expand, would need to use cached _element
-      return resolvePath( path, qcache.elements[head], null, 'query' );
-    for (const name in qcache.$aliases) {
-      const alias = qcache.$aliases[name];
-      const found = alias.elements[head];
-      if (found)
-        return resolvePath( path, found, alias._ref, 'source', name )
+      if (semantics.dynamic === 'query')
+        // TODO: for ON condition in expand, would need to use cached _element
+        return resolvePath( path, qcache.elements[head], null, 'query' );
+      for (const name in qcache.$aliases) {
+        const alias = qcache.$aliases[name];
+        const found = alias.elements[head];
+        if (found)
+          return resolvePath( path, found, alias._ref, 'source', name )
+      }
     }
     // console.log(query.SELECT,qcache,qcache.$next,main)
-    throw new ModelError ( `Path item ${ 0 }=${ head } refers to nothing, refCtx: ${ refCtx }` );
+    throw new ModelError ( `Path item 0=${ head } refers to nothing, refCtx: ${ refCtx }` );
   }
 
   /**
@@ -907,6 +912,7 @@ function startCsnPath( csnPath, csn ) {
 /**
  * @param {CSN.Path} csnPath
  * @param {CSN.Model} csn
+ * @param {any} resolve
  */
 function analyseCsnPath( csnPath, csn, resolve ) {
   /** @type {object} */
@@ -932,6 +938,15 @@ function analyseCsnPath( csnPath, csn, resolve ) {
         parent = art;
         art = obj[prop];
       }
+      else if (refCtx === 'orderBy') {
+        const isSelect = isSelectQuery( query );
+        // use _query_ elements with direct refs (consider sub-optimal CSN,
+        // representation of the CAST function), otherwise source elements:
+        if (obj[prop].ref && !obj[prop].cast)
+          refCtx = (isSelect ? 'orderBy_ref' : 'orderBy_set_ref');
+        else
+          refCtx = (isSelect ? 'orderBy_expr' : 'orderBy_set_expr');
+      }
       isName = false;
     }
     else if (artifactProperties.includes( String(prop) )) {
@@ -982,7 +997,7 @@ function analyseCsnPath( csnPath, csn, resolve ) {
       refCtx = prop;
     }
     else if (prop === 'orderBy') {
-      refCtx = (query.SET ? 'orderBy_set' : 'orderBy');
+      refCtx = 'orderBy';
     }
     else if (prop !== 'xpr') {
       refCtx = prop;
@@ -995,6 +1010,18 @@ function analyseCsnPath( csnPath, csn, resolve ) {
   return resolve( obj, refCtx, main, query, parent, baseEnv );
 }
 
+// A SELECT which is (unnecessarily) put into parentheses, the CSN
+// representation uses SET without `op` and args of length 1:
+function isSelectQuery( query ) {
+  while (query.SET) {
+    const { args } = query.SET;
+    if (args.length !== 1)
+      return false;
+    query = args[0];
+  }
+  return true;
+}
+
 module.exports = {
   csnRefs,
   traverseQuery,