@sap/cds-compiler 3.4.4 → 3.5.2

package/lib/utils/objectUtils.js

@@ -8,7 +8,7 @@
  * @param {string} property
  * @param {object} targetObj
  */
-function copyPropIfExist(sourceObj, property, targetObj) {
+function copyPropIfExist( sourceObj, property, targetObj ) {
   if (sourceObj && property in sourceObj)
     targetObj[property] = sourceObj[property];
 }
@@ -21,7 +21,7 @@ function copyPropIfExist(sourceObj, property, targetObj) {
  * @param {object} obj Object with prototype.
  * @return {object} Object without prototype, i.e. a dict.
  */
-function createDict(obj) {
+function createDict( obj ) {
   const dict = Object.create(null);
   const keys = Object.keys(obj);
   for (const key of keys)
@@ -33,9 +33,9 @@ function createDict(obj) {
  * Loops over all elements in an object and calls the specified callback(key,obj)
  *
  * @param {object} obj
- * @param {(string, object) => void} callback
+ * @param {(key: string, value: object) => void} callback
  */
-function forEach(obj, callback) {
+function forEach( obj, callback ) {
   for (const key in obj) {
     if (Object.prototype.hasOwnProperty.call(obj, key))
       callback(key, obj[key]);
@@ -49,7 +49,7 @@ function forEach(obj, callback) {
  * @param  {object} o the object which values should be iterated
  * @param  {Function} callback
  */
-function forEachValue(o, callback) {
+function forEachValue( o, callback ) {
   for (const key in o) {
     if (Object.prototype.hasOwnProperty.call(o, key))
       callback(o[key]);
@@ -63,7 +63,7 @@ function forEachValue(o, callback) {
  * @param  {object} o the object which keys should be iterated
  * @param  {Function} callback
  */
-function forEachKey(o, callback) {
+function forEachKey( o, callback ) {
   for (const key in o) {
     if (Object.prototype.hasOwnProperty.call(o, key))
       callback(key);

package/lib/utils/term.js

@@ -33,11 +33,14 @@ const t = {
   cyan: '\x1b[36m', // Foreground Cyan
 };
 
-function term(useColor = 'auto') {
+/**
+ * @param {string|boolean} [useColor]
+ */
+function term( useColor = 'auto' ) {
   let hasColor = hasColorShell;
   changeColorMode(useColor);
 
-  function changeColorMode(mode) {
+  function changeColorMode( mode ) {
     switch (mode) {
       case false:
       case 'never':

package/lib/utils/timetrace.js

@@ -1,5 +1,14 @@
 'use strict';
 
+const { CompilerAssertion } = require('../base/error');
+
+function hrtimeToSec( dt ) {
+  const sec = (dt / BigInt('1000000000')).toString().padStart(2, ' ');
+  // first, get remaining ns, then convert to ms.
+  const msec = ((dt % BigInt('1000000000')) / BigInt('1000000')).toString().padStart(3, '0');
+  return [ sec, msec ];
+}
+
 /**
  * A single StopWatch encapsulates the runtime of a selected code frame.
  *
@@ -71,6 +80,20 @@ class TimeTracer {
    */
   constructor() {
     this.traceStack = [];
+    this.lastStop = null;
+  }
+
+  /**
+   * Reset the time tracer.  Use this if an exception is thrown, because then
+   * start/end won't correctly match.
+   *
+   * @param {string} reason
+   */
+  reset(reason) {
+    // eslint-disable-next-line no-console
+    console.error(`Reset TimeTrace: Stopping all timers because: ${ reason }`);
+    while (this.traceStack.length)
+      this.stop(this.traceStack[this.traceStack.length - 1].id);
   }
 
   /**
@@ -81,46 +104,50 @@ class TimeTracer {
    * @memberOf TimeTracer
    */
   start(id) {
-    try {
-      const b = new StopWatch(id);
-      this.traceStack.push(b);
-      b.start();
+    // Get time between last stop and new start: Those sections were not tracked.
+    const [ sec, msec ] = this.lastStop ? hrtimeToSec(this.lastStop.stop()) : [ ' 0', '000' ];
+    this.lastStop = null;
+    let base = `${ ' '.repeat(this.traceStack.length * 2) }${ id } started:`;
+    base += ' '.repeat(60 - base.length);
+    if (sec !== ' 0' || msec !== '000')
       // eslint-disable-next-line no-console
-      console.error(`${ ' '.repeat((this.traceStack.length - 1) * 2) }${ id } started`);
-    }
-    catch (e) {
+      console.error( `${ base } ${ sec }s ${ msec }ms    (since last stop)` );
+    else
       // eslint-disable-next-line no-console
-      console.error(`Starting time trace with id ${ id } failed: ${ e }`);
-    }
+      console.error( `${ base }` );
+    this.traceStack.push(new StopWatch(id));
   }
 
   /**
    * Stop the current TimeTrace and log the execution time.
    *
-   *
+   * @param {string} id
    * @memberOf TimeTracer
    */
-  stop() {
-    try {
-      const current = this.traceStack.pop();
-      const dt = current.stop();
-      const base = `${ ' '.repeat(this.traceStack.length * 2) }${ current.id } took:`;
-      const sec = (dt / BigInt(1000000000)).toString();
-      // first, get remaining ns, then convert to ms.
-      const msec = ((dt % BigInt(1000000000)) / BigInt(1000000)).toString();
-      // eslint-disable-next-line no-console
-      console.error( `${ base }${ ' '.repeat(60 - base.length) } %ds %dms`, sec, msec );
-    }
-    catch (e) {
-      // eslint-disable-next-line no-console
-      console.error(`Stopping time trace failed: ${ e }`);
+  stop(id) {
+    if (this.traceStack.length === 0)
+      throw new CompilerAssertion('TimeTracer mismatch: called stop() too many times');
+    const current = this.traceStack.pop();
+    if (current.id !== id)
+      throw new CompilerAssertion(`TimeTracer mismatch; expected id: “${ id }”, was “${ current.id }”`);
+    let diff = '';
+    if (this.lastStop !== null) {
+      const [ sec, msec ] = hrtimeToSec(this.lastStop.stop());
+      if ( sec !== ' 0' || msec !== '000')
+        diff = `    (diff to last stop: ${ sec }s ${ msec }ms)`;
     }
+    const [ sec, msec ] = hrtimeToSec(current.stop());
+    const base = `${ ' '.repeat(this.traceStack.length * 2) }${ current.id } took:`;
+    // eslint-disable-next-line no-console
+    console.error( `${ base }${ ' '.repeat(60 - base.length) } ${ sec }s ${ msec }ms${ diff }` );
+    this.lastStop = new StopWatch(id);
   }
 }
 
 const ignoreTimeTrace = {
   start: () => { /* ignore */ },
   stop: () => { /* ignore */ },
+  reset: () => { /* ignore */ },
 };
 
 const doTimeTrace = process && process.env && process.env.CDSC_TIMETRACING !== undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "3.4.4",
+  "version": "3.5.2",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",
@@ -21,16 +21,14 @@
     "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/",
     "testverbose": "node scripts/verifyGrammarChecksum.js && mocha --parallel test/ test3/",
-    "test3": "node scripts/verifyGrammarChecksum.js && node scripts/linter/lintTests.js test3/ && mocha --reporter-option maxDiffSize=0 scripts/linter/lintMessages.js test3/",
-    "deployTest3SQL": "deployRefs=true mocha --reporter-option maxDiffSize=0 test3/testHANASQLDeployment.js",
+    "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",
     "deployTest3": "deployRefs=true mocha --reporter-option maxDiffSize=0 test3/testDeployment.js",
+    "deployHanaDeltaSQL": "CDS_COMPILER_DEPLOY_HANA=1 mocha test3/test.deploy.hana-sql.delta.js",
     "deployDiffs": "deployRefs=true mocha --reporter-option maxDiffSize=0 test3/deployDiffs.js",
     "gentest3": "cross-env MAKEREFS=${MAKEREFS:-'true'} mocha --reporter-option maxDiffSize=0 test3/testRefFiles.js",
-    "testdb": "node scripts/verifyGrammarChecksum.js && cross-env TESTDB='TRUE' mocha",
-    "testmigration": "npm install --no-save @sap/hana-client@2.3.123 @sap/hdi-deploy@3.10.0 && node scripts/verifyGrammarChecksum.js && cross-env TESTMIGRATION='TRUE' mocha",
-    "testall": "npm install --no-save @sap/hana-client@2.3.123 @sap/hdi-deploy@3.10.0 && node scripts/verifyGrammarChecksum.js && cross-env TESTDB='TRUE' TESTMIGRATION='TRUE' mocha",
     "coverage": "cross-env nyc mocha --reporter-option maxDiffSize=0 test/ test3/ && 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/lintMessageIdCoverage.js lib/ && markdownlint README.md CHANGELOG.md doc/ internalDoc/ && cd share/messages && markdownlint .",
+    "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",
     "generateCompilerRefs": "cross-env MAKEREFS='true' mocha test/testCompiler.js",

package/share/messages/check-proper-type-of.md

@@ -19,7 +19,7 @@ view ViewFoo as select from Foo {
 };
 entity Bar {
   // `e` has no proper type but has the annotation `@anno`.
-  e : type of ViewFoo:calculatedField;
+  e : ViewFoo:calculatedField;
 };
 ```
 

package/share/messages/message-explanations.json

@@ -11,7 +11,7 @@
     "redirected-to-complex",
     "redirected-to-unrelated",
     "rewrite-not-supported",
-    "syntax-expecting-integer",
+    "syntax-expecting-unsigned-int",
     "wildcard-excluding-one"
   ]
 }

package/share/messages/redirected-to-complex.md

@@ -3,7 +3,7 @@
 The redirected target is a complex view, for example, contains a JOIN or UNION.
 
 The message's severity is `Info` and is raised by the compiler.
-It is emitted to help developers identify possible modelling issues.
+It is emitted to help developers identify possible modeling issues.
 
 ## Example
 
@@ -33,7 +33,7 @@ The cross join in the view `CrossJoin` results in multiple rows with the same
 `id`.  Following the redirected view now returns multiple results, effectively
 making the to-one association a to-many association.
 
-Visualizing the tables with a bit of data, this issues becomes obvious:
+Visualizing the tables with a bit of data, this issue becomes obvious:
 
 ```markdown
 Main                        Secondary
@@ -54,8 +54,8 @@ CrossJoin
 ## How to Fix
 
 Ensure that the redirected association points to an entity that is a reasonable
-redirection target.  You must ensure that the redirection does not accidentally
-result in a to-one association becoming a to-many association.
+redirection target.  That means, the redirection target shouldn't accidentally
+make it a to-many association.
 
 ## Related Messages
 

package/share/messages/{syntax-expecting-integer.md → syntax-expecting-unsigned-int.md}

@@ -1,6 +1,6 @@
-# syntax-expecting-integer
+# syntax-expecting-unsigned-int
 
-The compiler expects a safe integer here.
+The compiler expects a safe non-negative integer here.
 The last safe integer is `2^53 - 1` or `9007199254740991`.
 
 A safe integer is an integer that fulfills all of the following:
@@ -34,5 +34,8 @@ type LengthIsSafe : String(9007199254740991);
 type AnInteger : String(42);
 ```
 
-If it's not feasible to use a safe integer, a string representation of the
-number needs to be used, for example, in annotation values.
+At other places, using unsafe integers (or non-integer numbers) is allowed:
+
+- Annotation values: The value is then simply a string.
+- Expressions: The `val` property in the CSN contains a string
+  having a sibling `literal: 'number'`.