@sap/cds-compiler 3.6.2 → 3.8.0

package/lib/transform/translateAssocsToJoins.js

@@ -17,6 +17,7 @@ function translateAssocsToJoinsCSN(csn, options){
   // Do not re-complain about localized
   const compileOptions = { ...options, $skipNameCheck: true };
   delete compileOptions.csnFlavor;
+  // console.log('CSN passed by A2J to compiler:',JSON.stringify(csn,null,2))
   const model = recompileX(csn, compileOptions);
   timetrace.stop('A2J: Recompiling model');
   timetrace.start('A2J: Translating associations to joins');
@@ -195,7 +196,7 @@ function translateAssocsToJoins(model, inputOptions = {})
     'leaf' QAT and to the respective $tableAlias which is used to link paths to the correct
     table alias. Subqueries are not considered in the mergePathIntoQat(), so a subquery QA
     must be created and added separately to the lead query $tableAlias'es.
-    Also the name of the subquery (the alias) needs to be set to the final QA alias name.
+    Also, the name of the subquery (the alias) needs to be set to the final QA alias name.
   */
   function createQAForFromClauseSubQuery(query, env)
   {
@@ -203,7 +204,14 @@ function translateAssocsToJoins(model, inputOptions = {})
       if (query.$tableAliases[taName].kind !== '$self') {
         let ta = query.$tableAliases[taName];
         if(!ta.$QA) {
-          ta.$QA = createQA(env, ta._origin, taName, undefined);
+          let alias = taName;
+          if (ta.name.$inferred === '$internal') {
+            // query has no explicit table alias, i.e. is internal: make it visible and remove `$`
+            alias = ta.name.alias.replace(/^[$]/, '_');
+            ta.$inferred = undefined;
+            ta.name.$inferred = undefined;
+          }
+          ta.$QA = createQA(env, ta._origin, alias, undefined);
           incAliasCount(env, ta.$QA);
           if(ta.name && ta.name.id) {
             ta.name.id = ta.$QA.name.id;
@@ -251,22 +259,24 @@ function translateAssocsToJoins(model, inputOptions = {})
   */
   function substituteDollarSelf(pathNode)
   {
-    let [head, ...tail] = pathNode.path;
-    if(['$projection', '$self'].includes(head.id) && tail.length) {
+    let pathValue = pathNode;
+    let [head, ...tail] = pathValue.path;
+    while(tail.length && head._navigation?.kind === '$self') {
       const self = head;
-      if(self._navigation && self._navigation.kind === '$self') {
-        [head, ...tail] = tail;
-        if(head) {
-          let pathValue = self._navigation._origin.elements[head.id].value;
-          // core compiler has already caught $self.<assoc>.<postfix> and
-          // non-path $self expressions with postfix path
-          if(pathValue.path && tail.length) {
+      [head, ...tail] = tail;
+      if(head) {
+        pathValue = self._navigation._origin.elements[head.id].value;
+        // core compiler has already caught $self.<assoc>.<postfix> and
+        // non-path $self expressions with postfix path
+        if(pathValue.path) {
+          if(tail.length)
             pathValue = constructPathNode([...pathValue.path, ...tail], pathValue.alias, false);
-          }
-          replaceNodeContent(pathNode, pathValue);
+          [head, ...tail] = pathValue.path;
         }
       }
     }
+    if(head)
+      replaceNodeContent(pathNode, pathValue);
   }
 
   /*
@@ -304,7 +314,7 @@ function translateAssocsToJoins(model, inputOptions = {})
       // pop ta ps
       if(head._navigation.kind !== '$tableAlias')
         tail = pathNode.path;
-      // if tail.lenth > 1, search bottom up for QA
+      // if tail.length > 1, search bottom up for QA
       // default to rootQA, _parent.$QA has precedence
       let [QA, ps] = rightMostQA(tail, head._navigation._parent.$QA || head._navigation.$QA);
       if(!QA) {
@@ -636,7 +646,7 @@ function translateAssocsToJoins(model, inputOptions = {})
         }
 
         env.assocStack.push(assoc);
-        let onCond = cloneOnCondition(assoc.on);
+        const onCond = cloneOnCondition(assoc.on);
         env.assocStack.pop();
         return onCond;
       }
@@ -655,8 +665,8 @@ function translateAssocsToJoins(model, inputOptions = {})
       }
 
       function cloneOnCondExprStream(expr) {
-        let args = expr.args;
-        let result = { op: { val: expr.op.val }, args: [ ] };
+        const args = expr.args;
+        const result = { op: { val: expr.op.val }, args: [ ] };
         for(let i = 0; i < args.length; i++)
         {
           if(args[i].op && args[i].op.val === 'xpr')
@@ -668,7 +678,7 @@ function translateAssocsToJoins(model, inputOptions = {})
           else if(i < args.length-2 && args[i].path &&
                   args[i+1]?.literal === 'token' && args[i+1]?.val === '=' && args[i+2].path)
           {
-            let fwdAssoc = getForwardAssociation(args[i].path, args[i+2].path);
+            const fwdAssoc = getForwardAssociation(args[i].path, args[i+2].path);
             if(fwdAssoc)
             {
               //env.assocStack.includes(fwdAssoc) => recursion
@@ -702,7 +712,7 @@ function translateAssocsToJoins(model, inputOptions = {})
 
         // If this is a backlink condition, produce the
         // ON cond of the forward assoc with swapped src/tgt aliases
-        let fwdAssoc = getForwardAssociationExpr(expr);
+        const fwdAssoc = getForwardAssociationExpr(expr);
         if(fwdAssoc) {
           if(env.assocStack.length === 2) {
             // reuse (ugly) error message from forHana
@@ -729,25 +739,38 @@ function translateAssocsToJoins(model, inputOptions = {})
       }
 
       // The src/tgtAliases need to be swapped for ON Condition of the forward assoc.
-      // The correct table alias is the QA of the original target. If this target
-      // has been redirected, use the QA of the redirected target.
-      // As last resort use the source alias information.
-      // TODO Discuss: Huh, why do you need to care about redirections?
-      // Probably only with to-be-rewritten ON conditions (should be error in v2).
+      // If the QAT assoc is a mixin and forward assoc was propagated, the original
+      // forward definition must have a target in the query source otherwise the ON cond
+      // is not resolvable (exception propagated mixins, as these are defined against the
+      // view signature and not a query source). If the target is not part of the query source,
+      // raise an error. Swap source and target otherwise.
       function swapTableAliasesForFwdAssoc(fwdAssoc, srcAlias, tgtAlias) {
-        let newSrcAlias = tgtAlias;
+        const newSrcAlias = tgtAlias;
         let newTgtAlias = {};
-        // first try to identify table alias for complex views or redirected associations
-        if(fwdAssoc._redirected && fwdAssoc._redirected.length &&
-           // redirected target must have a $QA
-           fwdAssoc._redirected[fwdAssoc._redirected.length-1].$QA &&
-           // $QA's artifact must either be same srcAlias artifact
-           (fwdAssoc._redirected[fwdAssoc._redirected.length-1].$QA._artifact === srcAlias._artifact ||
-           // OR original assoc is a mixin (then just use the $QA)
-           assoc.kind === 'mixin')) {
-          newTgtAlias.id = fwdAssoc._redirected[fwdAssoc._redirected.length-1].$QA.name.id;
-          newTgtAlias._artifact = fwdAssoc._redirected[fwdAssoc._redirected.length-1]._effectiveType;
-          newTgtAlias._navigation = fwdAssoc._redirected[fwdAssoc._redirected.length-1].$QA.path[0]._navigation;
+
+        let i = 0;
+        let fwdOrigin = fwdAssoc;
+        while(fwdOrigin._origin) {
+          fwdOrigin = fwdOrigin._origin;
+          i++;
+        }
+        // If fwdAssoc was propagated and the origin is not a mixin itself (which always
+        // points to the signature of the current view and ensures that the ON cond is
+        // resolvable) make sure that the original assoc target is contained in the local
+        // query source
+        if(assoc.kind === 'mixin' && i > 0 && fwdOrigin.kind !== 'mixin') {
+          const tas = Object.values(env.lead.$tableAliases);
+          const i = tas.findIndex(ta => ta._artifact === fwdOrigin.target._artifact);
+          if(i >= 0 && tas[i].$QA) {
+            newTgtAlias.id = tas[i].$QA.name.id;
+            newTgtAlias._artifact = tas[i]._effectiveType;
+            newTgtAlias._navigation = tas[i].$QA.path[0]._navigation;
+          }
+          else {
+            error(null, [ assocQAT._origin.location, assocQAT._origin ], { name: fwdOrigin.target._artifact.name.id, art: assoc.name.id },
+                    'Expected association target $(NAME) of association $(ART) to be a query source');
+            newTgtAlias = Object.assign(newTgtAlias, srcAlias);
+          }
         }
         else {
           newTgtAlias = Object.assign(newTgtAlias, srcAlias);
@@ -989,7 +1012,7 @@ function translateAssocsToJoins(model, inputOptions = {})
     A QA (QueryArtifact) is a representative for a table/view that must appear
     in the FROM clause either named directly or indirectly through an association.
    */
-  function createQA(env, artifact, alias=undefined, namedArgs=undefined)
+  function createQA(env, artifact, alias, namedArgs=undefined)
   {
     if(alias === undefined) {
       throw new CompilerAssertion('no alias provided');

package/lib/transform/universalCsn/coreComputed.js

@@ -1,18 +1,19 @@
 'use strict';
 
 const {
-  forEachDefinition, forAllQueries, getNormalizedQuery,
+  forEachDefinition, forAllQueries, getNormalizedQuery, forEachMemberRecursively,
 } = require('../../model/csnUtils');
 const { setAnnotationIfNotDefined } = require('./utils');
 const { CompilerAssertion } = require('../../base/error');
 
 /**
- * Set @Core.Computed on the elements of views (and projections).
+ * Set @Core.Computed on the elements of views (and projections) as well
+ * as on calculated elements of entities and aspects.
  *
  * @param {CSN.Model} csn
  * @param {object} csnUtils
  */
-function setCoreComputedOnViews( csn, csnUtils ) {
+function setCoreComputedOnViewsAndCalculatedElements( csn, csnUtils ) {
   const {
     artifactRef, getColumn, getElement, getOrigin,
   } = csnUtils;
@@ -24,6 +25,12 @@ function setCoreComputedOnViews( csn, csnUtils ) {
           traverseQueryAndAttachCoreComputed(query, query.SELECT.elements || artifact.elements);
       }, path);
     }
+    else if (artifact.kind === 'entity' || artifact.kind === 'aspect') {
+      forEachMemberRecursively(artifact, (element) => {
+        if (element.value && !element.value?.ref) // calculated elements, but simple references are ignored
+          setAnnotationIfNotDefined(element, '@Core.Computed', true);
+      }, path);
+    }
   });
   /**
    * Attach @Core.Computed to elements resulting from calculated fields
@@ -84,7 +91,7 @@ function setCoreComputedOnViews( csn, csnUtils ) {
      * @todo cleanup throw(s) - but leave in during dev
      */
     function getElementFromFrom( name, base ) {
-      if (base.SELECT && base.SELECT.elements) {
+      if (base.SELECT?.elements?.[name]) {
         return getAncestor(base.SELECT.elements[name], name, base.SELECT);
       }
       else if (base.ref) {
@@ -100,7 +107,7 @@ function setCoreComputedOnViews( csn, csnUtils ) {
         return checkJoinSources(base.args, name);
       }
 
-      throw new CompilerAssertion(JSON.stringify(base));
+      throw new CompilerAssertion(`Element “${name}” not found in: ${JSON.stringify(base)}`);
     }
 
     /**
@@ -146,7 +153,8 @@ function setCoreComputedOnViews( csn, csnUtils ) {
     function needsCoreComputed( column ) {
       return column &&
         (
-          column.xpr || column.func || column.val !== undefined || column.param || column.SELECT || column.SET ||
+          column.xpr || column.list || column.func || column.val !== undefined || column.param ||
+          column.SELECT || column.SET ||
           column.ref && [ '$at', '$now', '$user', '$session' ].includes(column.ref[0])
         );
     }
@@ -175,5 +183,5 @@ function setCoreComputedOnViews( csn, csnUtils ) {
 }
 
 module.exports = {
-  setCoreComputedOnViews,
+  setCoreComputedOnViewsAndCalculatedElements,
 };

package/lib/transform/universalCsn/universalCsnEnricher.js

@@ -13,7 +13,7 @@ const {
 const {
   forEachValue, forEach,
 } = require('../../utils/objectUtils');
-const { setCoreComputedOnViews } = require('./coreComputed');
+const { setCoreComputedOnViewsAndCalculatedElements } = require('./coreComputed');
 
 /**
  * Loop through a universal CSN and enrich it with the properties/annotations
@@ -134,7 +134,7 @@ module.exports = (csn, options) => {
      * `@Core.Computed' must be calculated manually as this annotation
      * is not set in the universal csn flavor.
      */
-    setCoreComputedOnViews( csn, csnUtils );
+    setCoreComputedOnViewsAndCalculatedElements( csn, csnUtils );
     /**
      * Construct an extensions object which maps a built-in type to it's annotations
      */
@@ -273,7 +273,7 @@ module.exports = (csn, options) => {
 
   /**
    * Walk over properties on member level and propagate all relevant properties
-   * from it's prototype.
+   * from its prototype.
    */
   function propagateOnMemberLevel() {
     applyTransformations(csn, {
@@ -320,7 +320,7 @@ module.exports = (csn, options) => {
     }, []);
 
     /**
-     * Propagate properties to the `member` from it's prototype.
+     * Propagate properties to the `member` from its prototype.
      * For that to work we calculate the prototype chain of the member and
      * propagate properties along this prototype chain until we reach the `member`
      * passed to this function.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "3.6.2",
+  "version": "3.8.0",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",
@@ -19,6 +19,7 @@
     "xmakeAfterInstall": "npm run gen",
     "xmakePrepareRelease": "echo \"$(node scripts/stripReadme.js README.md)\" > README.md && node scripts/assertSnapshotVersioning.js && node scripts/assertChangelog.js && node scripts/cleanup.js --remove-dev",
     "test": "node scripts/verifyGrammarChecksum.js && mocha --reporter min --reporter-option maxDiffSize=0 scripts/testLazyLoading.js && mocha --parallel --reporter min --reporter-option maxDiffSize=0 test/ test3/",
+    "testci": "node scripts/verifyGrammarChecksum.js && mocha --reporter-option maxDiffSize=0 scripts/testLazyLoading.js && mocha --parallel --reporter-option maxDiffSize=0 test/ test3/",
     "testverbose": "node scripts/verifyGrammarChecksum.js && mocha --parallel test/ test3/",
     "test3": "node scripts/verifyGrammarChecksum.js && mocha --reporter-option maxDiffSize=0 test3/",
     "deployTest3SQL": "deployRefs=true mocha --reporter-option maxDiffSize=0 test3/test.deploy.hana-sql.js",