@sap/cds-compiler 3.5.4 → 3.6.0

package/lib/transform/transformUtilsNew.js

@@ -10,7 +10,7 @@ const { setProp } = require('../base/model');
 const { copyAnnotations, applyTransformations } = require('../model/csnUtils');
 const { cloneCsnNonDict, cloneCsnDictionary, getUtils } = require('../model/csnUtils');
 const { typeParameters, isBuiltinType } = require('../compiler/builtins');
-const { ModelError } = require('../base/error');
+const { ModelError, CompilerAssertion} = require('../base/error');
 const { forEach } = require('../utils/objectUtils');
 const { pathName } = require('../compiler/utils');
 
@@ -185,7 +185,7 @@ function getTransformers(model, options, pathDelimiter = '_') {
           return;
         }
         if(iKey.ref.length>1)
-          throw Error(`createForeignKeyElement(${artifactName},${assocName},${iKey.$path.join('/')}) unexpected reference: `+ iKey.ref)
+          throw new CompilerAssertion(`createForeignKeyElement(${artifactName},${assocName},${iKey.$path.join('/')}) unexpected reference: `+ iKey.ref)
         newForeignKey(iKeyArtifact,foreignKeyElementName+'_'+iKey.ref[0])
       })
     }
@@ -899,13 +899,13 @@ function getTransformers(model, options, pathDelimiter = '_') {
     let annotation = node && node[fromName];
     // Sanity checks
     if (!fromName.startsWith('@')) {
-      throw Error('Annotation name should start with "@": ' + fromName);
+      throw new CompilerAssertion('Annotation name should start with "@": ' + fromName);
     }
     if (!toName.startsWith('@')) {
-      throw Error('Annotation name should start with "@": ' + toName);
+      throw new CompilerAssertion('Annotation name should start with "@": ' + toName);
     }
     if (annotation === undefined) {
-      throw Error('Annotation ' + fromName + ' not found in ' + JSON.stringify(node));
+      throw new CompilerAssertion('Annotation ' + fromName + ' not found in ' + JSON.stringify(node));
     }
     if(node[toName] === undefined || node[toName] === null) {
       delete node[fromName];
@@ -924,10 +924,10 @@ function getTransformers(model, options, pathDelimiter = '_') {
    */
   function setAnnotation(node, name, value) {
     if (!name.startsWith('@')) {
-      throw Error('Annotation name should start with "@": ' + name);
+      throw new CompilerAssertion('Annotation name should start with "@": ' + name);
     }
     if (value === undefined) {
-      throw Error('Annotation value must not be undefined');
+      throw new CompilerAssertion('Annotation value must not be undefined');
     }
 
     if(node[name] === undefined || node[name] === null)
@@ -948,10 +948,10 @@ function getTransformers(model, options, pathDelimiter = '_') {
    */
   function resetAnnotation(node, name, value, info, path) {
     if (!name.startsWith('@')) {
-      throw Error('Annotation name should start with "@": ' + name);
+      throw new CompilerAssertion('Annotation name should start with "@": ' + name);
     }
     if (value === undefined) {
-      throw Error('Annotation value must not be undefined');
+      throw new CompilerAssertion('Annotation value must not be undefined');
     }
 
     const wasOverwritten = node[name] !== undefined && node[name] !== null && node[name] !== value;
@@ -1406,10 +1406,33 @@ function transformModel(csn, customTransformations, transformNonEnumerableElemen
   }
 }
 
+/**
+ * Mandatory input transformation for all backends:
+ * Replace
+ *     type: { ref: [ 'cds.<type>' ] }
+ * with the direct type
+ *     type: 'cds.<type>'
+ *
+ * @param {CSN.Model} csn
+ */
+function rewriteBuiltinTypeRef(csn) {
+  const special$self = !csn?.definitions?.$self && '$self';
+  applyTransformations(csn, {
+    type: (parent, _prop, type) => {
+      if(type.ref && (
+        isBuiltinType(type.ref[0]) ||
+        type.ref[0] === special$self)
+      ) {
+        parent.type = type.ref[0];
+      }
+    }
+  });
+}
 
 module.exports = {
   // This function retrieves the actual exports
   getTransformers,
   transformModel,
-  RelationalOperators
+  RelationalOperators,
+  rewriteBuiltinTypeRef,
 };

package/lib/transform/translateAssocsToJoins.js

@@ -7,6 +7,7 @@ const { linkToOrigin, pathName } = require('../compiler/utils');
 const  {compactModel, compactExpr} = require('../json/to-csn');
 const { deduplicateMessages } = require('../base/messages');
 const { timetrace } = require('../utils/timetrace');
+const {CompilerAssertion} = require('../base/error');
 // Paths that start with an artifact of protected kind are special
 // either ignore them in QAT building or in path rewriting
 const internalArtifactKinds = ['builtin', '$parameters', 'param'];
@@ -336,7 +337,7 @@ function translateAssocsToJoins(model, inputOptions = {})
             // const revealInternalProperties = require('../model/revealInternalProperties.js');
             // console.log('++++++++ Path tail: ', revealInternalProperties(tail[tail.length-1]._artifact));
             // console.log('******** Flat FKs\n', tail[i]._artifact.$flatSrcFKs.map(f => revealInternalProperties(f._artifact)));
-            throw Error('Please debug me: No flat FK found for FK rewriting');
+            throw new CompilerAssertion('Please debug me: No flat FK found for FK rewriting');
           }
           // replace tail path with flattened foreign key including prefix
           tail.splice(i, tail.length, fk);
@@ -444,7 +445,7 @@ function translateAssocsToJoins(model, inputOptions = {})
         }
         else if(art.target) { // it's not an artifact, so it should be an assoc step
           if(joinTree === undefined)
-            throw Error('Can\'t follow Associations without starting Entity');
+            throw new CompilerAssertion('Can\'t follow Associations without starting Entity');
 
           if(!childQat.$QA)
             childQat.$QA = createQA(env, art.target._artifact, art.name.id, childQat._namedArgs);
@@ -570,7 +571,7 @@ function translateAssocsToJoins(model, inputOptions = {})
           setProp(assoc, '$flatTgtFKs', flattenElement(assoc, false));
 
         if(assoc.$flatSrcFKs.length != assoc.$flatTgtFKs.length)
-          throw Error('srcPaths length ['+assoc.$flatSrcFKs.length+'] != tgtPaths length ['+assoc.$flatTgtFKs.length+']');
+          throw new CompilerAssertion('srcPaths length ['+assoc.$flatSrcFKs.length+'] != tgtPaths length ['+assoc.$flatTgtFKs.length+']');
 
         /*
           Put all src/tgt path siblings into the EQ term and create the proper path objects
@@ -991,7 +992,7 @@ function translateAssocsToJoins(model, inputOptions = {})
   function createQA(env, artifact, alias=undefined, namedArgs=undefined)
   {
     if(alias === undefined) {
-      throw Error('no alias provided');
+      throw new CompilerAssertion('no alias provided');
     }
 
     const pathStep = {
@@ -1129,7 +1130,7 @@ function translateAssocsToJoins(model, inputOptions = {})
     }
     return paths.map(p => {
       return {
-        id: (prefix ? prefix + pathDelimiter : '' ) + p.id, 
+        id: (prefix ? prefix + pathDelimiter : '' ) + p.id,
         acc: (acc ? acc + pathDelimiter : '') + p.acc,
         _artifact: p._artifact
       }
@@ -1455,7 +1456,7 @@ function translateAssocsToJoins(model, inputOptions = {})
     }
 
     if(qatParent == undefined)
-      throw Error('table alias/qathost not found for path: ' +  pathAsStr(path));
+      throw new CompilerAssertion('table alias/qathost not found for path: ' +  pathAsStr(path));
 
     let rootQat = qatParent;
 
@@ -1578,7 +1579,7 @@ function translateAssocsToJoins(model, inputOptions = {})
     });
 
     if(!qat)
-      throw Error('No leaf qat for head: ' + head + ' tail: ' + pathAsStr(tail, '"') + ' produced');
+      throw new CompilerAssertion('No leaf qat for head: ' + head + ' tail: ' + pathAsStr(tail, '"') + ' produced');
 
     /*
       If path terminates on an entity or an association (from clause,

package/lib/transform/universalCsn/coreComputed.js

@@ -1,19 +1,21 @@
 'use strict';
 
 const {
-  getUtils, forEachDefinition, forAllQueries, getNormalizedQuery,
+  forEachDefinition, forAllQueries, getNormalizedQuery,
 } = require('../../model/csnUtils');
 const { setAnnotationIfNotDefined } = require('./utils');
+const { CompilerAssertion } = require('../../base/error');
 
 /**
  * Set @Core.Computed on the elements of views (and projections).
  *
  * @param {CSN.Model} csn
+ * @param {object} csnUtils
  */
-function setCoreComputedOnViews( csn ) {
+function setCoreComputedOnViews( csn, csnUtils ) {
   const {
     artifactRef, getColumn, getElement, getOrigin,
-  } = getUtils(csn, 'init-all');
+  } = csnUtils;
 
   forEachDefinition(csn, (artifact, name, prop, path) => {
     if (artifact.query || artifact.projection) {
@@ -65,7 +67,7 @@ function setCoreComputedOnViews( csn ) {
       const origin = getOrigin(element);
       if (origin)
         return origin;
-      throw new Error(`Could not find ancestor for ${JSON.stringify(element)} named ${name}`);
+      throw new CompilerAssertion(`Could not find ancestor for ${JSON.stringify(element)} named ${name}`);
     }
 
     /**
@@ -98,7 +100,7 @@ function setCoreComputedOnViews( csn ) {
         return checkJoinSources(base.args, name);
       }
 
-      throw new Error(JSON.stringify(base));
+      throw new CompilerAssertion(JSON.stringify(base));
     }
 
     /**

package/lib/transform/universalCsn/universalCsnEnricher.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { setProp } = require('../../base/model');
+const shuffleGen = require('../../base/shuffle');
 const { setAnnotationIfNotDefined, makeClientCompatible } = require('./utils');
 const {
   forEachDefinition,
@@ -22,9 +23,10 @@ const { setCoreComputedOnViews } = require('./coreComputed');
  * @param {CSN.Options} options
  */
 module.exports = (csn, options) => {
+  const csnUtils = getUtils(csn, 'init-all');
   const {
     initDefinition, getOrigin, getQueryPrimarySource, artifactRef, getColumn,
-  } = getUtils(csn, 'init-all');
+  } = csnUtils;
     // Properties on definition level that we treat specially.
   const definitionPropagationRules = {
     '@cds.autoexpose': onlyViaArtifact,
@@ -98,6 +100,10 @@ module.exports = (csn, options) => {
     cardinality: notWithItemsOrElements,
   };
 
+  if (options.testMode) {
+    const { shuffleDict } = shuffleGen( options.testMode );
+    csn.definitions = shuffleDict( csn.definitions );
+  }
   generate();
 
   propagateOnMemberLevel();
@@ -128,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 );
+    setCoreComputedOnViews( csn, csnUtils );
     /**
      * Construct an extensions object which maps a built-in type to it's annotations
      */
@@ -399,8 +405,10 @@ module.exports = (csn, options) => {
 
     const chain = getOriginChain(art);
 
-    if (chain.length)
-      chain.reverse().forEach(chainLink => definitionPropagation(chainLink.target, chainLink.origin, chain[0].origin));
+    if (chain.length) {
+      chain.reverse();
+      chain.forEach(chainLink => definitionPropagation(chainLink.target, chainLink.origin, chain[0].origin));
+    }
 
     /**
      * @param {CSN.Element} targetDefinition

package/lib/utils/timetrace.js

@@ -68,7 +68,7 @@ class StopWatch {
  *
  * Results are logged to stderr
  *
- * To enable time tracing, set CDSC_TIMETRACING to true in the environment
+ * To enable time tracing, set CDSC_TRACE_TIME to true in the environment
  *
  * @class TimeTracer
  */
@@ -150,7 +150,7 @@ const ignoreTimeTrace = {
   reset: () => { /* ignore */ },
 };
 
-const doTimeTrace = process && process.env && process.env.CDSC_TIMETRACING !== undefined;
+const doTimeTrace = process?.env?.CDSC_TRACE_TIME !== undefined;
 module.exports = {
   timetrace: (doTimeTrace ? new TimeTracer() : ignoreTimeTrace),
   TimeTracer,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "3.5.4",
+  "version": "3.6.0",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",
@@ -16,7 +16,6 @@
   "scripts": {
     "download": "node scripts/downloadANTLR.js",
     "gen": "node ./scripts/build.js && node scripts/genGrammarChecksum.js",
-    "xmakeBeforeInstall": "echo \"Due to binary mirror, use sqlite 5.1.2 explicitly\" && npm install --save --save-exact --no-package-lock sqlite3@5.1.2",
     "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/",