@sap/cds-compiler 4.4.2 → 4.5.0

package/lib/transform/db/rewriteCalculatedElements.js

@@ -149,8 +149,11 @@ function rewriteCalculatedElementsInViews( csn, options, csnUtils, pathDelimiter
             art, env, links, scope,
           } = getRefInfo(parent, p);
 
+          // calc element publishes association, treat as regular
+          // unmanaged association
+          const calcElementIsAssoc = art?.value && art.target;
           // TODO: Calculated elements on-write
-          if (art?.value && !art.value.stored) {
+          if (art?.value && !art.value.stored && !calcElementIsAssoc) {
             const alias = parent.as || implicitAs(parent.ref);
             // TODO: What about other scopes? expand/inline?
             const value = (scope !== 'ref-target') ? absolutifyPaths(env, art, ref, links, name).value : keepAssocStepsInRef(ref, links, art).value;
@@ -446,11 +449,15 @@ function rewriteCalculatedElementsInViews( csn, options, csnUtils, pathDelimiter
             unfoldingMap[name] = [ true, [ ...columns ] ];
           }
         }
-        else if (!columnMap[name] && hasStar) { // Via * - just append
-          unfoldingMap[name] = [ true, [ { ref: [ name ] } ] ];
-        }
-        else { // just a random column - keep
-          unfoldingMap[name] = [ false, [ columnMap[name] ] ];
+        else {
+          if (usesCalcOnRead(branches))
+            containsCalcOnRead = true;
+          if (!columnMap[name] && hasStar) { // Via * - just append
+            unfoldingMap[name] = [ true, [ { ref: [ name ] } ] ];
+          }
+          else { // just a random column - keep
+            unfoldingMap[name] = [ false, [ columnMap[name] ] ];
+          }
         }
       }
     }
@@ -491,6 +498,39 @@ function rewriteCalculatedElementsInViews( csn, options, csnUtils, pathDelimiter
     return false;
   }
 
+  /**
+   * Returns true if the branch/column uses a calc-on-read,
+   * for example in a filter.
+   *
+   * TODO: Enable calculated elements next to nested projections
+   *
+   * @param {object} branches
+   * @returns {boolean}
+   */
+  function usesCalcOnRead( branches ) {
+    let returnValue = false;
+    for (const branchName in branches) {
+      const column = branches[branchName]?.steps[0]?._column;
+      if (column) {
+        applyTransformationsOnNonDictionary({ column }, 'column', {
+          // eslint-disable-next-line no-loop-func
+          ref: (parent) => {
+            if (hasOnReadValue(parent))
+              returnValue = true;
+          },
+        }, {
+          drillRef: true,
+          // skip subqueries and nested projections
+          // calculated elements and nested projections
+          // only conflict on same level
+          skipStandard: [ 'SELECT', 'expand', 'inline' ],
+        });
+      }
+    }
+
+    return returnValue;
+  }
+
   /**
    * A leaf can reference a column which in turn references a real element - that might have a .value.
    * Find such cases.

package/lib/transform/forOdata.js

@@ -82,9 +82,7 @@ function transform4odataWithCsn(inputModel, options) {
 
   const transformers = transformUtils.getTransformers(csn, options, '_');
   const {
-    addDefaultTypeFacets,
-    extractValidFromToKeyElement,
-    checkAssignment, checkMultipleAssignments,
+    addDefaultTypeFacets, checkMultipleAssignments,
     recurseElements, setAnnotation, renameAnnotation,
     expandStructsInExpression,
     csnUtils,
@@ -132,17 +130,17 @@ function transform4odataWithCsn(inputModel, options) {
   transformUtils.rewriteBuiltinTypeRef(csn);
 
   const cleanup = validate.forOdata(csn, {
-    message, error, warning, info, inspectRef, effectiveType, getFinalTypeInfo, artifactRef, csn, options, csnUtils, services, isAspect, isExternalServiceMember
+    message, error, warning, info, inspectRef, effectiveType, getFinalTypeInfo, artifactRef,
+    options, csnUtils, services, isAspect, isExternalServiceMember, recurseElements,
+    checkMultipleAssignments, csn,
   });
 
 
   // Throw exception in case of errors
   throwWithAnyError();
 
-  // Semantic checks before flattening regarding temporal data
-  // TODO: Move in the validator
+  // TODO: Refactor out the following logic
   forEachDefinition(csn, [
-    checkTemporalAnnotationsAssignment,
     (def) => {
       // Convert a projection into a query for internal processing will be re-converted
       // at the end of the OData processing
@@ -175,7 +173,6 @@ function transform4odataWithCsn(inputModel, options) {
   // If errors are detected, throwWithAnyError() will return from further processing
   expandStructsInExpression(csn, { skipArtifact: isExternalServiceMember, drillRef: true });
 
-  
   if (!structuredOData) {
     expansion.expandStructureReferences(csn, options, '_', { error, info, throwWithAnyError }, csnUtils, { skipArtifact: isExternalServiceMember });
     const resolved = new WeakMap();
@@ -272,7 +269,7 @@ function transform4odataWithCsn(inputModel, options) {
 
     // Convert a query back into a projection for CSN compliance as
     // the very last conversion step of the OData transformation
-    if (def.kind === 'entity' && def.query && def.query && def.projection) {
+    if (def.kind === 'entity' && def.query && def.projection) {
       delete def.query;
     }
   }, { skipArtifact: isExternalServiceMember })
@@ -288,29 +285,6 @@ function transform4odataWithCsn(inputModel, options) {
   timetrace.stop('OData transformation');
   return csn;
 
-  // TODO: Move this to checks?
-  // @ts-ignore
-  function checkTemporalAnnotationsAssignment(artifact, artifactName, propertyName, path) {
-    // Gather all element names with @cds.valid.from/to/key
-    let validFrom = [], validTo = [], validKey = [];
-    recurseElements(artifact, ['definitions', artifactName], (member, path) => {
-      let [f, t, k] = extractValidFromToKeyElement(member, path);
-      validFrom.push(...f);
-      validTo.push(...t);
-      validKey.push(...k);
-    });
-    // Check that @cds.valid.from/to/key is only in valid places
-    validFrom.forEach(obj => checkAssignment('@cds.valid.from', obj.element, obj.path, artifact));
-    validTo.forEach(obj => checkAssignment('@cds.valid.to', obj.element, obj.path, artifact));
-    validKey.forEach(obj => checkAssignment('@cds.valid.key', obj.element, obj.path, artifact));
-    checkMultipleAssignments(validFrom, '@cds.valid.from', artifact, artifactName);
-    checkMultipleAssignments(validTo, '@cds.valid.to', artifact, artifactName);
-    checkMultipleAssignments(validKey, '@cds.valid.key', artifact, artifactName);
-    if (validKey.length && !(validFrom.length && validTo.length)) {
-      error(null, path, 'Annotation “@cds.valid.key” was used but “@cds.valid.from” and “@cds.valid.to” are missing');
-    }
-  }
-
   // Mark elements that are annotated with @odata.on.insert/update with the annotation @Core.Computed.
   function annotateCoreComputed(node) {
     // If @Core.Computed is explicitly set, don't overwrite it!
@@ -442,25 +416,18 @@ function transform4odataWithCsn(inputModel, options) {
     }
   }
 
-  // CDXCORE-481
   // (4.5) If the member is an association whose target has @cds.odata.valuelist annotate it
   // with @Common.ValueList.viaAssociation.
-  /*
-    FIXME (HJB): Comment outdated: Anno propagation to FKs is done in EdmPreprocessor
-  */
-  // This must be done before foreign keys are calculated and the annotations are propagated
-  // to them. This will make sure that association and all its foreign keys are annotated with
-  // Common.ValueList in the final EDM.
-  // Do this only if the association is navigable and the enclosing artifact is
-  // a service member (don't pollute the CSN with unnecessary annotations).
-  // TODO: test???
+  // Do this only if the association is navigable(@odata.navigable) and the enclosing artifact is
+  // a service member (don't pollute the CSN with unnecessary annotations, that is ensured by the caller
+  // of this function).
   function addCommonValueListviaAssociation(member, memberName) {
-    let vlAnno = '@Common.ValueList.viaAssociation';
+    const vlAnno = '@Common.ValueList.viaAssociation';
     if (isAssociation(member)) {
-      let navigable = member['@odata.navigable'] !== false; // navigable disabled only if explicitly set to false
-      let targetDef = getCsnDef(member.target);
+      const navigable = member['@odata.navigable'] !== false; // navigable disabled only if explicitly set to false
+      const targetDef = getCsnDef(member.target);
       if (navigable && targetDef['@cds.odata.valuelist'] && !member[vlAnno]) {
-        member[vlAnno] = { '=': memberName };
+        setAnnotation(member, vlAnno, { '=': memberName });
       }
     }
   }

package/lib/transform/forRelationalDB.js

@@ -185,7 +185,8 @@ function transformForRelationalDBWithCsn(csn, options, moduleName) {
 
   if(doA2J) {
     // Expand a structured thing in: keys, columns, order by, group by
-    expansion.expandStructureReferences(csn, options, pathDelimiter, messageFunctions, csnUtils);
+    // In addition, kill all non-sql-backend relevant annotations
+    expansion.expandStructureReferences(csn, options, pathDelimiter, messageFunctions, csnUtils, { processAnnotations: true });
     bindCsnReference();
   }
 

package/lib/transform/translateAssocsToJoins.js

@@ -263,8 +263,12 @@ function translateAssocsToJoins(model, inputOptions = {})
   /*
     Substitute $self/$projection expression with its value
   */
-  function substituteDollarSelf(pathNode)
+  function substituteDollarSelf(pathNode, env)
   {
+    // do not substitute $self values for outer order by clauses
+    if (env?.location === 'UnionOuterOrderBy')
+      return;
+
     let pathValue = pathNode;
     let [head, ...tail] = pathValue.path;
     while(tail.length && head._navigation?.kind === '$self') {
@@ -311,12 +315,14 @@ function translateAssocsToJoins(model, inputOptions = {})
     {
       // Paths without _navigation in ORDER BY are select item aliases, they must
       // be rendered verbatim
-      if((env.location === 'OrderBy' && !pathNode.path[0]._navigation))
+      let [head, ...tail] = pathNode.path;
+      if((env.location === 'OrderBy' && !head._navigation)|| 
+         env.location === 'UnionOuterOrderBy' && (!head._navigation || ['$self', '$projection'].includes(head.id)))
         return;
 
       // path outside ON cond:
       // spin the crystal ball to identify the correct table alias
-      let [head, ...tail] = pathNode.path;
+
       // pop ta ps
       if(head._navigation.kind !== '$tableAlias')
         tail = pathNode.path;
@@ -1438,7 +1444,7 @@ function translateAssocsToJoins(model, inputOptions = {})
     {
       // speciality for OrderBy: If path has no _navigation don't merge it.
       // Path is alias to select item expression
-      if(env.location === 'OrderBy')
+      if(['OrderBy', 'UnionOuterOrderBy'].includes(env.location))
         return;
 
       // env.pathStep is set in walkPath for walk on filter conditions
@@ -1769,6 +1775,9 @@ function walkQuery(query, env)
       walk(query.having, env);
       env.location = 'OrderBy';
       walk(query.orderBy, env);
+      env.location = 'UnionOuterOrderBy';
+      // outer orderBy's of anonymous union
+      walk(query.$orderBy, env);
       if(query.limit) {
         env.location = 'Limit';
         walk(query.limit.rows, env);

package/lib/transform/universalCsn/coreComputed.js

@@ -157,7 +157,7 @@ function setCoreComputedOnViewsAndCalculatedElements( csn, csnUtils ) {
         (
           column.xpr || column.list || column.func || column.val !== undefined || column['#'] !== undefined || column.param ||
           column.SELECT || column.SET ||
-          column.ref && [ '$at', '$valid', '$now', '$user', '$session', '$parameters' ].includes(column.ref[0])
+          column.ref && [ '$at', '$valid', '$now', '$user', '$tenant', '$session', '$parameters' ].includes(column.ref[0])
         );
     }
 

package/lib/transform/universalCsn/universalCsnEnricher.js

@@ -328,9 +328,9 @@ module.exports = (csn, options) => {
      * passed to this function.
      *
      * @param {CSN.Element}  member
-     * @param {object}       [except=null] List of properties which should not be propagated along the origin chain
+     * @param {object}       [except] List of properties which should not be propagated along the origin chain
      *                                     of the `member`
-     * @param {object}       [force=null]  Overwrite any member propagation rules or any except and always propagate the corresponding keys
+     * @param {object}       [force]  Overwrite any member propagation rules or any except and always propagate the corresponding keys
      */
     function propagateMemberPropsFromOrigin( member, except = null, force = null ) {
       const memberChain = getOriginChain(member);
@@ -613,8 +613,8 @@ module.exports = (csn, options) => {
  * @param {object} to
  * @param {Function} getCustomRule getter for the `memberProps` or `defProps`
  *                                 which shall be used for retrieving custom rules
- * @param {object} [except=null] array of properties which should not be propagated
- * @param {object} [force=null] Force propagation of the contained keys via a custom rule.
+ * @param {object} [except] array of properties which should not be propagated
+ * @param {object} [force] Force propagation of the contained keys via a custom rule.
  */
 function copyProperties( from, to, getCustomRule, except = null, force = null ) {
   const keys = Object.keys(from);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "4.4.2",
+  "version": "4.5.0",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",
@@ -18,15 +18,16 @@
     "gen": "node ./scripts/build.js && node scripts/genGrammarChecksum.js",
     "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/",
+    "test": "npm run test:piper",
+    "test:ci": "node scripts/verifyGrammarChecksum.js && mocha --timeout 10000 --reporter-option maxDiffSize=0 scripts/testLazyLoading.js && mocha --parallel --reporter-option maxDiffSize=0 test/ test3/",
+    "test:piper": "node scripts/verifyGrammarChecksum.js && npm run coverage:piper",
     "test3": "node scripts/verifyGrammarChecksum.js && mocha --reporter-option maxDiffSize=0 test3/",
     "deployHanaSql": "CDS_COMPILER_DEPLOY_HANA=1 mocha --reporter-option maxDiffSize=0 test3/test.deploy.hana-sql.js",
     "deployHdiHdbcds": "CDS_COMPILER_DEPLOY_HANA=1 mocha --reporter-option maxDiffSize=0 test3/test.deploy.hdi.hdbcds.js",
     "deployGitDiffs": "CDS_COMPILER_DEPLOY_HANA=1 mocha --reporter-option maxDiffSize=0 test3/test.deploy.git-diffs.js",
     "gentest3": "cross-env MAKEREFS=${MAKEREFS:-'true'} mocha --reporter-option maxDiffSize=0 test3/testRefFiles.js",
-    "coverage": "cross-env nyc mocha --reporter-option maxDiffSize=0 test/ test3/ && nyc report --reporter=lcov",
+    "coverage": "cross-env nyc mocha --reporter-option maxDiffSize=0 test/ test3/testRefFiles.js && nyc report --reporter=lcov",
+    "coverage:piper": "cross-env nyc mocha --reporter mocha-junit-reporter --reporter-options mochaFile=./coverage/TEST-results.xml --reporter-option maxDiffSize=0 --timeout 10000 test/ test3/ && nyc report --reporter=cobertura && nyc report --reporter=lcov",
     "lint": "eslint bin/ benchmark/ lib/ test/ test3/ scripts/ types/ && node scripts/linter/lintGrammar.js && node scripts/linter/lintTests.js test3/ && node scripts/linter/lintMessages.js && node scripts/linter/lintMessageIdCoverage.js lib/ && markdownlint README.md CHANGELOG.md doc/ internalDoc/ && cd share/messages && markdownlint .",
     "tslint": "tsc --pretty -p .",
     "updateVocs": "node scripts/odataAnnotations/generateDictMain.js && npm run generateAllRefs",
@@ -40,7 +41,7 @@
     "generateToSqlRefs": "cross-env MAKEREFS='true' mocha test/testToSql.js",
     "generateToRenameRefs": "cross-env MAKEREFS='true' mocha test/testToRename.js",
     "generateDraftRefs": "cross-env MAKEREFS='true' mocha test/testDraft.js",
-    "generateAllRefs": "node scripts/verifyGrammarChecksum.js && cross-env MAKEREFS='true' mocha --reporter-option maxDiffSize=0 test/ test3/"
+    "generateAllRefs": "node scripts/verifyGrammarChecksum.js && cross-env MAKEREFS=force mocha --reporter-option maxDiffSize=0 test/ test3/"
   },
   "keywords": [
     "CDS"