@sap/cds-compiler 3.4.4 → 3.5.0

package/lib/transform/universalCsn/universalCsnEnricher.js

@@ -206,7 +206,7 @@ module.exports = (csn, options) => {
      * @param {object} root
      * @returns {object|string|null}
      */
-    function getTargetAspectBase(root) {
+    function getTargetAspectBase( root ) {
       if (root.target && root.target.elements) {
         return root.target;
       }
@@ -229,7 +229,7 @@ module.exports = (csn, options) => {
      * @see getTargetAspectBase for details on how we find our "start"
      * @param {object} root
      */
-    function setTargetAspectIfRequired(root) {
+    function setTargetAspectIfRequired( root ) {
       if (root.$origin || root.target && root.target.elements) {
         const base = getTargetAspectBase(root);
         if (base && (base.elements || typeof base === 'string' && csn.definitions[base].kind === 'aspect')) {
@@ -324,7 +324,7 @@ module.exports = (csn, options) => {
      *                                     of the `member`
      * @param {object}       [force=null]  Overwrite any member propagation rules or any except and always propagate the corresponding keys
      */
-    function propagateMemberPropsFromOrigin(member, except = null, force = null) {
+    function propagateMemberPropsFromOrigin( member, except = null, force = null ) {
       const memberChain = getOriginChain(member);
       const virtualOrigin = Object.create(null); // To collect stuff across the origin chain - currently only for .items via type-of
 
@@ -359,7 +359,7 @@ module.exports = (csn, options) => {
        * @returns {boolean} whether props from the members origin should be propagated
        * @todo check if still necessary
        */
-      function skipMemberPropagation(origin) {
+      function skipMemberPropagation( origin ) {
       // For empty members (`{}`), the origin was set in a previous call to `getOrigin(definition)`.
         return !origin;
       }
@@ -374,7 +374,7 @@ module.exports = (csn, options) => {
      * @param {CSN.Element} target
      * @param {CSN.Element} source
      */
-    function onlyWithTypeRef(prop, target, source) {
+    function onlyWithTypeRef( prop, target, source ) {
       const typeIsTypeRef = Boolean(typeof target.type === 'object' && target.type.ref);
       if (typeIsTypeRef) {
         const referencedArtifact = csn.definitions[target.type.ref[0]];
@@ -390,7 +390,7 @@ module.exports = (csn, options) => {
    *
    * @param {object} art Target object for propagation
    */
-  function propagateOnArtifactLevel(art) {
+  function propagateOnArtifactLevel( art ) {
     // check if art was already processed by the status flag
     // TODO: clean up later on, together with validator clean up probably or
     //       when this module is meant to be used standalone -> use internal cache to store already processed definitions?
@@ -407,7 +407,7 @@ module.exports = (csn, options) => {
      * @param {CSN.Element} targetsOrigin
      * @param {CSN.Element} rootOrigin
      */
-    function definitionPropagation(targetDefinition, targetsOrigin, rootOrigin) {
+    function definitionPropagation( targetDefinition, targetsOrigin, rootOrigin ) {
       // if target was already processed -> continue
       if (targetDefinition._status === 'propagated')
         return;
@@ -430,7 +430,7 @@ module.exports = (csn, options) => {
        * @param {CSN.Definition|CSN.Element} source
        * @param {CSN.Definition|CSN.Element} root
        */
-      function propagateDefProps(definition, source, root) {
+      function propagateDefProps( definition, source, root ) {
         copyProperties(source, definition, getDefinitionPropagationRuleFor);
         // If $origin is an object, it is the anonymous prototype of `definition`
         // e.g. for structure includes annotations are part of the $origin object and must be copied over to the `definition`
@@ -454,7 +454,7 @@ module.exports = (csn, options) => {
      * @param {CSN.Artifact|CSN.Element} start
      * @returns {CSN.Artifact|CSN.Element|null} Null if no origin with .elements was found
      */
-    function getFirstOriginWithElements(start) {
+    function getFirstOriginWithElements( start ) {
       let target = start;
       let firstOriginWithElements;
       do {
@@ -479,7 +479,7 @@ module.exports = (csn, options) => {
    * @returns {object[]} chain of origin - target
    * @todo Optimize: Only return the chain until the first propagated thing?
    */
-  function getOriginChain(start) {
+  function getOriginChain( start ) {
     const chain = [];
     let target = start;
     let origin;
@@ -504,7 +504,7 @@ module.exports = (csn, options) => {
    * @param {CSN.Query} query
    * @param {CSN.Artifact} artifact
    */
-  function propagateToPublishedMixin(query, artifact) {
+  function propagateToPublishedMixin( query, artifact ) {
     const elements = query.SELECT.elements || artifact.elements;
     forEachValue(elements, (element) => {
       if (element.target) {
@@ -520,7 +520,7 @@ module.exports = (csn, options) => {
   /**
    * @param {CSN.Element} member
    */
-  function calculateForeignKeys(member) {
+  function calculateForeignKeys( member ) {
     // managed assocs in universal CSN have no longer keys
     // if they are not explicitly defined - PR#8064
     const target = artifactRef(member.target);
@@ -538,7 +538,7 @@ module.exports = (csn, options) => {
    * @param {CSN.Definition} target
    * @param {CSN.Definition} source
    */
-  function onlyViaArtifact(prop, target, source) {
+  function onlyViaArtifact( prop, target, source ) {
     if (!target.kind)
       return;
     const primarySourceRef = getQueryPrimarySource(target.query || target.projection);
@@ -553,7 +553,7 @@ module.exports = (csn, options) => {
    * @param {string} key identifier of the csn prop we are looking for
    * @returns {Function} which can be used to apply custom propagation rules for certain props
    */
-  function getMemberPropagationRuleFor(key) {
+  function getMemberPropagationRuleFor( key ) {
     return memberPropagationRules[key] || memberPropagationRules[key.charAt(0)] || getDefinitionPropagationRuleFor(key);
   }
 
@@ -563,7 +563,7 @@ module.exports = (csn, options) => {
    * @param {string} key identifier of the csn prop we are looking for
    * @returns {Function} which can be used to apply custom propagation rules for certain props
    */
-  function getDefinitionPropagationRuleFor(key) {
+  function getDefinitionPropagationRuleFor( key ) {
     return definitionPropagationRules[key] || definitionPropagationRules[key.charAt(0)];
   }
 
@@ -573,7 +573,7 @@ module.exports = (csn, options) => {
    * @param {CSN.Artifact} parent
    * @param {CSN.Artifact} rootArtifact The artifact that had the localized
    */
-  function attachAnnosForTextsTable(parent, rootArtifact) {
+  function attachAnnosForTextsTable( parent, rootArtifact ) {
     const isFioriDraftEnabled = rootArtifact && (rootArtifact['@fiori.draft.enabled'] === true || getOriginChain(rootArtifact).some(({ origin }) => origin['@fiori.draft.enabled'] === true));
     if (isFioriDraftEnabled) {
       setAnnotationIfNotDefined(parent, '@assert.unique.locale', [ { '=': 'locale' } ]);
@@ -606,7 +606,7 @@ module.exports = (csn, options) => {
  * @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.
  */
-function copyProperties(from, to, getCustomRule, except = null, force = null) {
+function copyProperties( from, to, getCustomRule, except = null, force = null ) {
   const keys = Object.keys(from);
   // Copy over properties from the origin element to the target.
   for (const key of keys) {
@@ -626,7 +626,7 @@ function copyProperties(from, to, getCustomRule, except = null, force = null) {
  * @param {object} elements
  * @returns {boolean} whether some element in the elements has an annotation
  */
-function hasAnnotationOnSubelement(elements) {
+function hasAnnotationOnSubelement( elements ) {
   for (const element of Object.values(elements)) {
     if (Object.keys(element).some(key => key.startsWith('@')))
       return true;
@@ -654,7 +654,7 @@ function skip() {
  * @param {object} target
  * @param {object} source
  */
-function always(prop, target, source) {
+function always( prop, target, source ) {
   const val = source[prop];
   if (Array.isArray(val))
     target[prop] = [ ...val ];
@@ -669,7 +669,7 @@ function always(prop, target, source) {
  * @param {CSN.Definition} target
  * @param {CSN.Definition} source
  */
-function onlyTypeDef(prop, target, source) {
+function onlyTypeDef( prop, target, source ) {
   if (target.kind !== 'type')
     return;
   target[prop] = source[prop];
@@ -684,7 +684,7 @@ function onlyTypeDef(prop, target, source) {
  * @param {object} target
  * @param {object} source
  */
-function notWithPersistenceTable(prop, target, source) {
+function notWithPersistenceTable( prop, target, source ) {
   const tableAnno = target['@cds.persistence.table'];
   if (tableAnno === undefined || tableAnno === null)
     target[prop] = source[prop];
@@ -699,7 +699,7 @@ function notWithPersistenceTable(prop, target, source) {
  * @param {CSN.Element} target
  * @param {CSN.Element} source
  */
-function notWithTypeOrigin(prop, target, source) {
+function notWithTypeOrigin( prop, target, source ) {
   if (source.kind !== 'type')
     target[prop] = source[prop];
 }
@@ -712,7 +712,7 @@ function notWithTypeOrigin(prop, target, source) {
  * @param {CSN.Element} target
  * @param {CSN.Element} source
  */
-function nullStopsPropagation(prop, target, source) {
+function nullStopsPropagation( prop, target, source ) {
   if (source[prop] !== null)
     target[prop] = source[prop];
 }
@@ -732,7 +732,7 @@ function nullStopsPropagation(prop, target, source) {
  * @param {CSN.Element} target
  * @param {CSN.Element} source
  */
-function specialItemsRules(prop, target, source) {
+function specialItemsRules( prop, target, source ) {
   if (source.kind !== 'type' && ((!source.type && !target.type) || !(source[prop].type && source[prop].type.ref || !isBuiltinType(source[prop].type))))
     target[prop] = source[prop];
 }
@@ -746,7 +746,7 @@ function specialItemsRules(prop, target, source) {
  * @param {CSN.Element} target
  * @param {CSN.Element} source
  */
-function notWithItemsOrElements(prop, target, source) {
+function notWithItemsOrElements( prop, target, source ) {
   if (!target.items && !target.elements || !source.target)
     target[prop] = source[prop];
 }
@@ -759,7 +759,7 @@ function notWithItemsOrElements(prop, target, source) {
  * @param {CSN.Element} target
  * @param {CSN.Element} source
  */
-function notWithTypeRef(prop, target, source) {
+function notWithTypeRef( prop, target, source ) {
   const typeIsTypeRef = Boolean(typeof target.type === 'object' && target.type.ref);
   if (!typeIsTypeRef)
     target[prop] = source[prop];

package/lib/transform/universalCsn/utils.js

@@ -12,7 +12,7 @@ const { setProp } = require('../../base/model');
  * @param {string} name Name of the annotations
  * @param {any} value Value of the annotation
  */
-function setAnnotationIfNotDefined(carrier, name, value) {
+function setAnnotationIfNotDefined( carrier, name, value ) {
   if (carrier[name] === undefined)
     carrier[name] = value;
 }
@@ -26,7 +26,7 @@ function setAnnotationIfNotDefined(carrier, name, value) {
  *
  * @param {CSN.Model} csn
  */
-function makeClientCompatible(csn) {
+function makeClientCompatible( csn ) {
   applyTransformations(csn, {
     actions: removeNullProperty,
     notNull: removeNullProperty,
@@ -52,7 +52,7 @@ function makeClientCompatible(csn) {
  * @param {object} node
  * @param {string} prop
  */
-function removeNullProperty(node, prop) {
+function removeNullProperty( node, prop ) {
   if (node[prop] === null)
     delete node[prop];
 }

package/lib/utils/file.js

@@ -12,7 +12,7 @@ const util = require('util');
  * @param {string} src
  * @returns {string[]}
  */
-function splitLines(src) {
+function splitLines( src ) {
   return src.split(/\r\n?|\n/);
 }
 
@@ -27,7 +27,7 @@ function splitLines(src) {
  * @param {object} fileCache
  * @param {boolean} enableTrace
  */
-function cdsFs(fileCache, enableTrace) {
+function cdsFs( fileCache, enableTrace ) {
   const readFile = _wrapReadFileCached(fs.readFile);
   const readFileSync = _wrapReadFileCached((filename, enc, cb) => {
     try {
@@ -60,11 +60,11 @@ function cdsFs(fileCache, enableTrace) {
     realpathSync,
   };
 
-  function realpath(path, cb) {
+  function realpath( path, cb ) {
     return fs.realpath.native(path, cb);
   }
 
-  function realpathSync(path, cb) {
+  function realpathSync( path, cb ) {
     try {
       cb(null, fs.realpathSync.native(path));
     }
@@ -133,7 +133,7 @@ function cdsFs(fileCache, enableTrace) {
    *
    * @param {(filename: string, cb: (err, data) => void) => void} fsStat
    */
-  function _wrapIsFileCached(fsStat) {
+  function _wrapIsFileCached( fsStat ) {
     return ( filename, cb ) => {
       let body = fileCache[filename];
       if (body !== undefined) {

package/lib/utils/moduleResolve.js

@@ -30,7 +30,7 @@ const extensions = [ '.cds', '.csn', '.json' ];
  * @param {CSN.Options} options
  * @returns {string}
  */
-function adaptCdsModule(modulePath, options = {}) {
+function adaptCdsModule( modulePath, options = {} ) {
   if (modulePath.startsWith( '@sap/cds/' )) {
     if (options.cdsHome)
       return options.cdsHome + modulePath.slice(8);
@@ -166,7 +166,7 @@ function resolveModuleSync( dep, fileCache, options, messageFunctions ) {
   return result;
 }
 
-function _errorFileNotFound(dep, options, { error }) {
+function _errorFileNotFound( dep, options, { error } ) {
   if (dep.resolved) {
     let resolved = path.relative( dep.basedir, dep.resolved );
     if (options.testMode)
@@ -204,7 +204,7 @@ function _errorFileNotFound(dep, options, { error }) {
  * @param {ResolveOptions} options
  * @param {(err, result) => void} callback
  */
-function resolveCDS(moduleName, options, callback) {
+function resolveCDS( moduleName, options, callback ) {
   const isWindows = (process.platform === 'win32');
   let resolvedBaseDir = path.resolve(options.basedir);
 
@@ -252,7 +252,7 @@ function resolveCDS(moduleName, options, callback) {
    * @param {string} absoluteModulePath
    * @param {(err, filepath: string|null) => void} cb
    */
-  function loadAsLocalFileOrDirectory(absoluteModulePath, cb) {
+  function loadAsLocalFileOrDirectory( absoluteModulePath, cb ) {
     loadAsFile(absoluteModulePath, (err, filepath) => {
       if (!err && filepath)
         cb(null, filepath);
@@ -268,7 +268,7 @@ function resolveCDS(moduleName, options, callback) {
    * @param {string} absoluteModulePath
    * @param {(err, filepath: string|null) => void} cb
    */
-  function loadAsFile(absoluteModulePath, cb) {
+  function loadAsFile( absoluteModulePath, cb ) {
     const extensionsToTry = [ '' ].concat(options.extensions);
     loadFileWithExtensions(extensionsToTry);
 
@@ -277,7 +277,7 @@ function resolveCDS(moduleName, options, callback) {
      *
      * @param {string[]} exts The extensions to try. Loaded in the order of the array.
      */
-    function loadFileWithExtensions(exts) {
+    function loadFileWithExtensions( exts ) {
       if (exts.length === 0) {
         // If we reach this point then no file with the given extensions could be found.
         cb(makeNotFoundError(), null);
@@ -300,7 +300,7 @@ function resolveCDS(moduleName, options, callback) {
    * @param {string} absoluteModulePath
    * @param {(err, filepath: string|null) => void} cb
    */
-  function loadAsDirectory(absoluteModulePath, cb) {
+  function loadAsDirectory( absoluteModulePath, cb ) {
     loadAndParsePackageJsonInDirectory(absoluteModulePath, (packageErr, packageJson) => {
       const main = packageCdsMain(packageJson);
       if (!packageErr && main)
@@ -309,7 +309,7 @@ function resolveCDS(moduleName, options, callback) {
         loadIndex();
     });
 
-    function loadMain(main) {
+    function loadMain( main ) {
       const file = path.join(absoluteModulePath, main);
       loadAsFile(file, (fileErr, filePath) => {
         if (!fileErr && filePath)
@@ -337,11 +337,11 @@ function resolveCDS(moduleName, options, callback) {
    *
    * @param {string} absoluteDir
    */
-  function loadNodeModules(absoluteDir) {
+  function loadNodeModules( absoluteDir ) {
     const dirs = nodeModulesPaths(absoluteDir);
     loadFromNodeDirs(dirs);
 
-    function loadFromNodeDirs(nodeDirs) {
+    function loadFromNodeDirs( nodeDirs ) {
       const dir = nodeDirs.shift();
       if (!dir) {
         // We're at root
@@ -365,7 +365,7 @@ function resolveCDS(moduleName, options, callback) {
    * @param {string} packageDir
    * @param {(err, json) => void} cb
    */
-  function loadAndParsePackageJsonInDirectory(packageDir, cb) {
+  function loadAndParsePackageJsonInDirectory( packageDir, cb ) {
     const file = path.join(packageDir, 'package.json');
 
     options.readFile(file, DEFAULT_ENCODING, (err, content) => {
@@ -390,7 +390,7 @@ function resolveCDS(moduleName, options, callback) {
    * @param {string} absoluteStart
    * @returns {string[]} Array of possible "node_modules" folders for the given path.
    */
-  function nodeModulesPaths(absoluteStart) {
+  function nodeModulesPaths( absoluteStart ) {
     // Use platform-dependent separator.  All NodeJS `path` methods use the system's path separator.
     const parts = absoluteStart.split(path.sep);
     // Do NOT use global node_modules directories.
@@ -429,7 +429,7 @@ function resolveCDS(moduleName, options, callback) {
  *
  * @param {string} moduleName
  */
-function isLocalFile(moduleName) {
+function isLocalFile( moduleName ) {
   // Starts with or is equal to '..'
   // Starts with '/'
   // Starts with 'C:/' or 'C:\'

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.0",
   "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