@sap/cds-compiler 3.4.4 → 3.5.2

package/CHANGELOG.md

@@ -7,6 +7,64 @@
 Note: `beta` fixes, changes and features are usually not listed in this ChangeLog but [here](doc/CHANGELOG_BETA.md).
 The compiler behavior concerning `beta` features can change at any time without notice.
 
+## Version 3.5.2 - 2022-12-20
+
+### Fixed
+
+- to.sql/hdi/hdbcds: Don't process references in actions, as they have no impact on the database - avoids internal errors
+
+## Version 3.5.0 - 2022-12-07
+
+### Added
+
+- grammar: `localized` is now allowed in select items as well, to force the creation of convenience views.
+- to.edm(x):
+  + Validate annotation values of OASIS/SAP vocabulary term definitions against `@Validation.AllowedValues`.
+  + Reveal dangling type references in produced EDM.
+  + `@Capabilities` 'pull up' introduced with [3.3.0](#version-330---2022-09-29) must now be switched
+    on with option `odataCapabilitiesPullup`.
+- If option `addTextsLanguageAssoc` is set but ignored by the compiler, an info message is emitted.
+  This can happen if, e.g., the `sap.common.Languages` entity is missing.
+- Add OData vocabularies 'Offline' and 'PDF'.
+
+### Changed
+
+- to.edm(x):
+  + Vocabulary references to `Common` and `Core` are added to the generated EDM by default to allow
+    usage of these vocabularies in http messages even if the terms are not being used in the EDM itself.
+  + API representation of enum types as `@Validation.AllowedValues` has been shifted from `for.odata` to
+    `to.edm(x)`. This allows to reuse imported enum types in new APIs.
+  + Messages raised from the EDM annotation renderer have been reworked with message id and enhanced message
+    position including the annotation under investigation.
+  + `@Validation.AllowedValues` annotation as introduced for enum elements with
+    [1.44.2](./doc/CHANGELOG_ARCHIVE.md#version-1442---2020-10-09)
+    are now always rendered into the API regardless of `@assert.range`.
+- to.cdl: The input CSN is no longer cloned for client-CSN and parseCdl-CSN,
+  as the renderer does not modify it.
+- A new warning is emitted if compositions of anonymous aspects are used with the `Association`
+  keyword instead of `Composition`. Replace the former with the latter to fix the warning.
+
+### Removed
+
+- to.edm(x): 'Empty Schema' warning has been removed.
+
+### Fixed
+
+- Enums with a structured base type were accidentally not warned about if used in annotation definitions.
+- for.odata/for.hana: Instead of parenthesising tuple expansion with `()`, put
+  newly created expression in a `xpr` expression, if the term has more than one expansion.
+- Annotation on indirect or inferred enum values were sometimes lost
+- to.cdl:
+  + Certain keywords of special functions no longer add superfluous parentheses.
+  + Extension rendering now supports type extensions as well as `key` for elements.
+  + Builtins that clashed names with implicit contexts were not rendered with `cds.` prefix.
+  + Unknown artifacts (as can happen in parseCdl-style CSN) are now rendered as `USING` statements.
+  + Type extensions in `csn.extensions` (e.g. for `length`) are now rendered.
+- to.edm(x):
+  + Fix a bug in type exposure when using `@cds.external` complex types.
+  + Don't remove empty `Edm.EntityContainer`.
+  + Aspects with actions outside of services are no longer warned about.
+- for.hana: Fix a foreign key replacement bug during association to join translation.
 
 ## Version 3.4.4 - 2022-11-25
 

package/README.md

@@ -24,6 +24,7 @@ Or maintain your package.json dependencies as follows:
   }
 ```
 
+
 ## Documentation
 
 Please refer to the [official CDS documentation](https://cap.cloud.sap/docs/cds/).

package/bin/cds_update_identifiers.js

@@ -50,7 +50,7 @@ process.exit(0); // success
 
 // --------------------------------------------------------
 
-function modernizeIdentifierStyle(source, filename) {
+function modernizeIdentifierStyle( source, filename ) {
   const options = { messages: [], attachTokens: true };
   const messageFunctions = createMessageFunctions( options, 'parse', null );
 
@@ -82,7 +82,7 @@ function modernizeIdentifierStyle(source, filename) {
 
   // -----------------------------------------------
 
-  function updateIdent(identToken) {
+  function updateIdent( identToken ) {
     const newIdentText = toNewIdentStyle(identToken.text);
 
     if (!identToken.stop)
@@ -96,7 +96,7 @@ function modernizeIdentifierStyle(source, filename) {
     currentOffset += (newIdentText.length - identToken.text.length);
   }
 
-  function toNewIdentStyle(oldIdentText) {
+  function toNewIdentStyle( oldIdentText ) {
     let ident = oldIdentText.slice(1, oldIdentText.length - 1);
 
     // There are only two replacement rules we need to check for:
@@ -116,7 +116,7 @@ function modernizeIdentifierStyle(source, filename) {
  * @param {string} replaceWith
  * @return {string}
  */
-function replaceSliceInSource(source, startIndex, endIndex, replaceWith) {
+function replaceSliceInSource( source, startIndex, endIndex, replaceWith ) {
   return source.substring(0, startIndex) +
           replaceWith +
           source.substring(endIndex);
@@ -125,7 +125,7 @@ function replaceSliceInSource(source, startIndex, endIndex, replaceWith) {
 /**
  * @param {string} msg
  */
-function exitError(msg) {
+function exitError( msg ) {
   console.error(msg);
   usage();
   process.exit(1);

package/bin/cdsc.js

@@ -57,7 +57,7 @@ catch (err) {
     throw err;
 }
 
-function remapCmdOptions(options, command) {
+function remapCmdOptions( options, command ) {
   if (!command || !options[command])
     return;
 
@@ -208,7 +208,7 @@ function cdsc_main() {
  * @param {CSN.Options} options
  * @param {object} args
  */
-function validateDirectBackendOption(command, options, args) {
+function validateDirectBackendOption( command, options, args ) {
   if (![ 'toCdl', 'toOdata', 'toHana', 'toCsn', 'toSql' ].includes(command)) {
     displayUsage(`Option '--direct-backend' can't be used with command '${command}'`,
                  optionProcessor.helpText, 2);
@@ -225,7 +225,7 @@ function validateDirectBackendOption(command, options, args) {
 }
 
 // Display help text 'helpText' and 'error' (if any), then exit with exit code <code>
-function displayUsage(error, helpText, code) {
+function displayUsage( error, helpText, code ) {
   // Display non-error output (like help) to stdout
   const out = (code === 0 && !error) ? process.stdout : process.stderr;
   // Display help text first, error at the end (more readable, no scrolling)
@@ -240,7 +240,7 @@ function displayUsage(error, helpText, code) {
 }
 
 // Executes a command line that has been translated to 'command' (what to do), 'options' (how) and 'args' (which files)
-function executeCommandLine(command, options, args) {
+function executeCommandLine( command, options, args ) {
   const normalizeFilename = options.testMode && process.platform === 'win32';
   const messageLevels = {
     Error: 0, Warning: 1, Info: 2, Debug: 3,
@@ -428,7 +428,7 @@ function executeCommandLine(command, options, args) {
       console.log(explainMessage(args.messageId));
   }
 
-  function inspect(model) {
+  function inspect( model ) {
     const inspectModel = require('../lib/inspect');
 
     if (options.statistics) {
@@ -449,7 +449,7 @@ function executeCommandLine(command, options, args) {
   // Display error messages in `err` resulting from a compilation.  Also set
   // process.exitCode - process.exit() will force the process to exit as quickly
   // as possible = is problematic, since console.error() might be asynchronous
-  function displayErrors(err) {
+  function displayErrors( err ) {
     if (err instanceof main.CompilationError) {
       if (options.rawOutput)
         console.error( util.inspect( reveal( err.model, options.rawOutput ), false, null ));
@@ -531,7 +531,7 @@ function executeCommandLine(command, options, args) {
   // or display it to stdout if 'options.out' is '-'.
   // Depending on 'options.rawOutput', the model is either compacted to 'name.json' or
   // written in raw form to '<name>_raw.txt'.
-  function displayNamedXsn(xsn, name) {
+  function displayNamedXsn( xsn, name ) {
     if (options.rawOutput) {
       writeToFileOrDisplay(options.out, `${name}_raw.txt`, util.inspect(reveal(xsn, options.rawOutput), false, null), true);
     }
@@ -552,7 +552,7 @@ function executeCommandLine(command, options, args) {
    * @param {CSN.Model} csn
    * @param {string} name
    */
-  function displayNamedCsn(csn, name) {
+  function displayNamedCsn( csn, name ) {
     if (!csn) // only print CSN if it is set.
       return;
     if (options.internalMsg) {
@@ -570,7 +570,7 @@ function executeCommandLine(command, options, args) {
   // If 'content' is not a string, JSON-stringify it
   // If displaying to stdout, prepend a headline containing 'filename', unless 'omitHeadline' is set.
   // For filenames, illegal characters (slash, backslash, colon) are replaced by '_'.
-  function writeToFileOrDisplay(dir, fileName, content, omitHeadline = false) {
+  function writeToFileOrDisplay( dir, fileName, content, omitHeadline = false ) {
     if (options.internalMsg)
       return;
     fileName = fileName.replace(/[:/\\]/g, '_');
@@ -604,7 +604,7 @@ function executeCommandLine(command, options, args) {
   }
 }
 
-function loadOptionsFromJson(cmdLine) {
+function loadOptionsFromJson( cmdLine ) {
   try {
     let opt = JSON.parse(fs.readFileSync(cmdLine.options.options, 'utf-8'));
     if (opt.cds)
@@ -620,7 +620,7 @@ function loadOptionsFromJson(cmdLine) {
   }
 }
 
-function catchErrors(err) {
+function catchErrors( err ) {
   // @ts-ignore
   if (err instanceof Error && err.hasBeenReported)
     return;
@@ -663,7 +663,7 @@ function parseSeverityOptions({ options }) {
     }
   }
 
-  function parseSeverityOption(list, severity) {
+  function parseSeverityOption( list, severity ) {
     const ids = list.split(',');
     for (let id of ids) {
       id = id.trim();

package/doc/CHANGELOG_ARCHIVE.md

@@ -2870,7 +2870,7 @@ Features
 
 Fixes
 * Issue an error, if an association element that is defined in a mixin of the
-  same view is explicitly redirected. Up to now this modelling error was not
+  same view is explicitly redirected. Up to now this modeling error was not
   recognized and led to the generation of incorrect HANA CDS models.
 * We now also allow query entities and their elements to use as type, relaxing
   a check introduces with v1.0.26.

package/doc/CHANGELOG_BETA.md

@@ -8,7 +8,15 @@ Note: `beta` fixes, changes and features are listed in this ChangeLog just for i
 The compiler behavior concerning `beta` features can change at any time without notice.
 **Don't use `beta` fixes, changes and features in productive mode.**
 
-## Version 3.4.0 - 2022-MM-DD
+## Version 3.5.0 - 2022-12-07
+
+### Added `odataTerms`
+
+Allows to introduce and use new `Edm.Term`s in an OData API
+based on CDS annotations. Annotations must be service members,
+they can't be autoexposed.
+
+## Version 3.4.0 - 2022-10-26
 
 ### Added `aspectWithoutElements`
 

package/doc/CHANGELOG_DEPRECATED.md

@@ -53,6 +53,8 @@ is `@cds.persistence.exists` copied to localized convenience views.
 
 ### Removed `parensAsStrings`
 
+<!-- fully removed with 3.5.0 -->
+
 ### Removed `projectionAsQuery`
 
 ### Removed `redirectInSubQueries`

package/lib/api/main.js

@@ -27,15 +27,14 @@ const sqlUtils = lazyload('../render/utils/sql');
  * @param {CSN.Model} csn SQL transformed model
  * @returns {string} Name with . replaced as _ in some places
  */
-function getFileName(artifactName, csn) {
+function getFileName( artifactName, csn ) {
   return csnUtils.getResultingName(csn, 'quoted', artifactName);
 }
 
-const { cloneCsnNonDict } = require('../model/csnUtils');
 const { toHdbcdsSource } = require('../render/toHdbcds');
 const { ModelError } = require('../base/error');
 const { forEach, forEachKey } = require('../utils/objectUtils');
-const { checkRemovedDeprecatedFlags, isBetaEnabled } = require('../base/model');
+const { checkRemovedDeprecatedFlags } = require('../base/model');
 const { csn2edm, csn2edmAll } = require('../edm/csn2edm');
 
 const relevantGeneralOptions = [ /* for future generic options */ ];
@@ -51,8 +50,8 @@ const warnAboutMismatchOdata = [ 'odataVersion' ];
  * @param {string[]} relevantOptionNames Option names that are defining characteristics
  * @param {string[]} [optionalOptionNames=[]] Option names that should be attached as a fyi
  */
-function attachTransformerCharacteristics(csn, transformation, options,
-                                          relevantOptionNames, optionalOptionNames = []) {
+function attachTransformerCharacteristics( csn, transformation, options,
+                                           relevantOptionNames, optionalOptionNames = [] ) {
   const relevant = {};
   for (const name of relevantOptionNames ) {
     if (options[name] !== undefined)
@@ -86,7 +85,7 @@ function attachTransformerCharacteristics(csn, transformation, options,
  * @param {string[]} warnAboutMismatch Option names to warn about, but not error on
  * @param {string} module Name of the module that calls this function, e.g. `for.odata`
  */
-function checkPreTransformedCsn(csn, options, relevantOptionNames, warnAboutMismatch, module) {
+function checkPreTransformedCsn( csn, options, relevantOptionNames, warnAboutMismatch, module ) {
   if (!csn.meta) {
     // Not able to check
     return;
@@ -94,7 +93,7 @@ function checkPreTransformedCsn(csn, options, relevantOptionNames, warnAboutMism
   const { error, warning, throwWithAnyError } = messages.makeMessageFunction(csn, options, module);
 
   for (const name of relevantOptionNames ) {
-    if (options[name] !== csn.meta.options[name]) {
+    if (options[name] !== csn.meta.options?.[name]) {
       error('wrong-pretransformed-csn', null, { prop: name, value: options[name], othervalue: csn.meta.options[name] },
             'Expected pre-processed CSN to have option $(PROP) set to $(VALUE). Found: $(OTHERVALUE)');
     }
@@ -119,7 +118,7 @@ function checkPreTransformedCsn(csn, options, relevantOptionNames, warnAboutMism
  * @param {string} transformation Name of the transformation
  * @returns {boolean} Return true if it is pre-transformed
  */
-function isPreTransformed(csn, transformation) {
+function isPreTransformed( csn, transformation ) {
   return csn && csn.meta && csn.meta.transformation === transformation;
 }
 
@@ -130,7 +129,7 @@ function isPreTransformed(csn, transformation) {
  * @param {object} internalOptions processed options
  * @returns {object} Return an oData-pre-processed CSN
  */
-function odataInternal(csn, internalOptions) {
+function odataInternal( csn, internalOptions ) {
   const oDataCsn = forOdataNew.transform4odataWithCsn(csn, internalOptions);
   attachTransformerCharacteristics(oDataCsn, 'odata', internalOptions, relevantOdataOptions, warnAboutMismatchOdata);
   return oDataCsn;
@@ -143,7 +142,7 @@ function odataInternal(csn, internalOptions) {
  * @param {ODataOptions} [options={}] Options
  * @returns {oDataCSN} Return an oData-pre-processed CSN
  */
-function odata(csn, options = {}) {
+function odata( csn, options = {} ) {
   const internalOptions = prepareOptions.for.odata(options);
   return odataInternal(csn, internalOptions);
 }
@@ -155,9 +154,9 @@ function odata(csn, options = {}) {
  * @param {object} [externalOptions={}] Options
  * @returns {object} { model: string, namespace: string }
  */
-function cdl(csn, externalOptions = {}) {
+function cdl( csn, externalOptions = {} ) {
   const internalOptions = prepareOptions.to.cdl(externalOptions);
-  return toCdl.csnToCdl(cloneCsnNonDict(csn, internalOptions), internalOptions);
+  return toCdl.csnToCdl(csn, internalOptions);
 }
 
 /**
@@ -168,7 +167,7 @@ function cdl(csn, externalOptions = {}) {
  * @returns {CSN.Model} CSN transformed like to.sql
  * @private
  */
-function forSql(csn, options = {}) {
+function forSql( csn, options = {} ) {
   const internalOptions = prepareOptions.to.sql(options);
   internalOptions.transformation = 'sql';
   const transformedCsn = forRelationalDB.transformForRelationalDBWithCsn(csn, internalOptions, 'to.sql');
@@ -183,7 +182,7 @@ function forSql(csn, options = {}) {
  * @returns {CSN.Model} CSN transformed like to.hdi
  * @private
  */
-function forHdi(csn, options = {}) {
+function forHdi( csn, options = {} ) {
   const internalOptions = prepareOptions.to.hdi(options);
   internalOptions.transformation = 'sql';
   const transformedCsn = forRelationalDB.transformForRelationalDBWithCsn(csn, internalOptions, 'to.hdi');
@@ -198,7 +197,7 @@ function forHdi(csn, options = {}) {
  * @returns {CSN.Model} CSN transformed like to.hdbcds
  * @private
  */
-function forHdbcds(csn, options = {}) {
+function forHdbcds( csn, options = {} ) {
   const internalOptions = prepareOptions.to.hdbcds(options);
   internalOptions.transformation = 'hdbcds';
 
@@ -214,7 +213,7 @@ function forHdbcds(csn, options = {}) {
  * @param {SqlOptions} [options={}] Options
  * @returns {SQL[]} Array of SQL statements, tables first, views second
  */
-function sql(csn, options = {}) {
+function sql( csn, options = {} ) {
   const internalOptions = prepareOptions.to.sql(options);
   internalOptions.transformation = 'sql';
 
@@ -244,7 +243,7 @@ function sql(csn, options = {}) {
  *                                  multiple statements concatenated as a multi-line string in case the change e.g.
  *                                  consists of a column drop and add).
  */
-function mtx(csn, deltaCsn, options = {}) {
+function mtx( csn, deltaCsn, options = {} ) {
   if (!baseModel.isBetaEnabled(options, 'to.mtx'))
     throw new Error('to.mtx is only available with beta flag `to.mtx`');
 
@@ -278,7 +277,7 @@ function mtx(csn, deltaCsn, options = {}) {
  * @param {HdiOptions} [options={}] Options
  * @returns {HDIArtifacts} { <filename>:<content>, ...}
  */
-function hdi(csn, options = {}) {
+function hdi( csn, options = {} ) {
   const internalOptions = prepareOptions.to.hdi(options);
 
   // we need the CSN for view sorting
@@ -334,7 +333,7 @@ function hdi(csn, options = {}) {
  * @param {Function} filter Filter for keys not to remap
  * @returns {object} New result structure
  */
-function remapNames(dict, csn, filter) {
+function remapNames( dict, csn, filter ) {
   const result = Object.create(null);
 
   forEach(dict, (key, value) => {
@@ -354,7 +353,7 @@ function remapNames(dict, csn, filter) {
  * @param {Function} filter Filter for keys not to remap
  * @returns {string} Remapped filename
  */
-function remapName(key, csn, filter = () => true) {
+function remapName( key, csn, filter = () => true ) {
   if (filter(key)) {
     const lastDot = key.lastIndexOf('.');
     const prefix = key.slice(0, lastDot);
@@ -380,13 +379,10 @@ function remapName(key, csn, filter = () => true) {
  *                                  - drops: An array of SQL statements to drop views/tables
  *                                  - createsAndAlters: An array of SQL statements to ALTER/CREATE tables/views
  */
-function sqlMigration(csn, options, beforeImage) {
+function sqlMigration( csn, options, beforeImage ) {
   const internalOptions = prepareOptions.to.sql(options);
   const { error, throwWithError } = messages.makeMessageFunction(csn, options, 'to.sql.migration');
 
-  if (!isBetaEnabled(internalOptions, 'sqlMigration'))
-    throw new Error('Function `to.sql.migration` requires beta-flag `sqlMigration`');
-
   // Prepare after-image.
   const afterImage = forSql(csn, options);
   // Compare both images.
@@ -399,12 +395,12 @@ function sqlMigration(csn, options, beforeImage) {
     Object.entries(diff.deletions).forEach(entry => diffFilterObj.deletion(entry, error));
   }
 
-  const identifierUtils = sqlUtils.getIdentifierUtils(internalOptions);
+  const identifierUtils = sqlUtils.getIdentifierUtils(csn, internalOptions);
 
   const drops = {
     creates: {},
     final: Object.entries(diff.deletions).reduce((previous, [ name, artifact ]) => {
-      previous[name] = `DROP ${ (artifact.query || artifact.projection) ? 'VIEW' : 'TABLE' } ${ identifierUtils.quoteSqlId(artifact['@cds.persistence.name']) };`;
+      previous[name] = `DROP ${ (artifact.query || artifact.projection) ? 'VIEW' : 'TABLE' } ${ identifierUtils.renderArtifactName(name) };`;
       return previous;
     }, {}),
   };
@@ -420,7 +416,7 @@ function sqlMigration(csn, options, beforeImage) {
         (diffArtifact.query || diffArtifact.projection) &&
         (diffArtifact[modelCompare.isChanged] === true || // we know it changed because we compared two views
           diffArtifact[modelCompare.isChanged] === undefined)) { // if it was removed in the after, then we don't have the flag
-        drops.creates[artifactName] = `DROP VIEW ${ identifierUtils.quoteSqlId(diffArtifact['@cds.persistence.name']) };`;
+        drops.creates[artifactName] = `DROP VIEW ${ identifierUtils.renderArtifactName(artifactName) };`;
       } // TODO: What happens with a changed kind -> entity becomes a view?
       else if (diffArtifact &&
         diffArtifact['@cds.persistence.skip'] !== true &&
@@ -492,7 +488,7 @@ function sqlMigration(csn, options, beforeImage) {
  *                                  is known, i.e. for the very first migration step
  * @returns {migration} The migration result
  */
-function hdiMigration(csn, options, beforeImage) {
+function hdiMigration( csn, options, beforeImage ) {
   const internalOptions = prepareOptions.to.hdi(options);
 
   // Prepare after-image.
@@ -523,7 +519,7 @@ function hdiMigration(csn, options, beforeImage) {
  * @param {CSN.Model} afterImage CSN, used to create correct file names in result structure.
  * @returns {object[]} Array of objects, each having: name, suffix and sql
  */
-function createSqlDefinitions(hdbkinds, afterImage) {
+function createSqlDefinitions( hdbkinds, afterImage ) {
   const result = [];
   forEach(hdbkinds, (kind, artifacts) => {
     const suffix = `.${ kind }`;
@@ -543,7 +539,7 @@ function createSqlDefinitions(hdbkinds, afterImage) {
  * @param {CSN.Model} beforeImage CSN used to create correct file names in result structure.
  * @returns {object[]} Array of objects, each having: name and suffix - only .hdbtable as suffix for now
  */
-function createSqlDeletions(deletions, beforeImage) {
+function createSqlDeletions( deletions, beforeImage ) {
   const result = [];
   forEach(deletions, name => result.push({ name: getFileName(name, beforeImage), suffix: '.hdbtable' }));
   return result;
@@ -555,7 +551,7 @@ function createSqlDeletions(deletions, beforeImage) {
  * @param {CSN.Model} afterImage CSN used to create correct file names in result structure.
  * @returns {object[]} Array of objects, each having: name, suffix and changeset.
  */
-function createSqlMigrations(migrations, afterImage) {
+function createSqlMigrations( migrations, afterImage ) {
   const result = [];
   forEach(migrations, (name, changeset) => result.push({ name: getFileName(name, afterImage), suffix: '.hdbmigrationtable', changeset }));
   return result;
@@ -572,15 +568,13 @@ sql.migration = sqlMigration;
  * @param {HdbcdsOptions} [options={}] Options
  * @returns {HDBCDS} { <filename>:<content>, ...}
  */
-function hdbcds(csn, options = {}) {
-  timetrace.timetrace.start('to.hdbcds');
+function hdbcds( csn, options = {} ) {
   const internalOptions = prepareOptions.to.hdbcds(options);
   internalOptions.transformation = 'hdbcds';
 
   const hanaCsn = forHdbcds(csn, internalOptions);
 
   const result = flattenResultStructure(toHdbcdsSource(hanaCsn, internalOptions));
-  timetrace.timetrace.stop();
   return result;
 }
 /**
@@ -590,7 +584,7 @@ function hdbcds(csn, options = {}) {
  * @param {ODataOptions} [options={}] Options
  * @returns {edm} The JSON representation of the service
  */
-function edm(csn, options = {}) {
+function edm( csn, options = {} ) {
   // If not provided at all, set service to undefined to trigger validation
   const internalOptions = prepareOptions.to.edm(
     // eslint-disable-next-line comma-dangle
@@ -620,7 +614,7 @@ edm.all = edmall;
  * @param {ODataOptions} [options={}] Options
  * @returns {edms} { <service>:<JSON representation>, ...}
  */
-function edmall(csn, options = {}) {
+function edmall( csn, options = {} ) {
   const internalOptions = prepareOptions.to.edm(options);
   const { error } = messages.makeMessageFunction(csn, internalOptions, 'for.odata');
 
@@ -650,7 +644,7 @@ function edmall(csn, options = {}) {
  * @param {ODataOptions} [options={}] Options
  * @returns {edmx} The XML representation of the service
  */
-function edmx(csn, options = {}) {
+function edmx( csn, options = {} ) {
   // If not provided at all, set service to undefined to trigger validation
   const internalOptions = prepareOptions.to.edmx(
     // eslint-disable-next-line comma-dangle
@@ -681,7 +675,7 @@ edmx.all = edmxall;
  * @param {ODataOptions} [options={}] Options
  * @returns {edmxs} { <service>:<XML representation>, ...}
  */
-function edmxall(csn, options = {}) {
+function edmxall( csn, options = {} ) {
   const internalOptions = prepareOptions.to.edmx(options);
 
   const result = {};
@@ -713,11 +707,11 @@ function edmxall(csn, options = {}) {
  * @param {ODataOptions} options OData / EDMX specific options.
  * @returns {object} Rendered EDMX string for the given service.
  */
-function preparedCsnToEdmx(csn, service, options) {
-  const e = csn2edm(csn, service, options);
-  return {
-    edmx: (e ? e.toXML('all') : undefined),
-  };
+function preparedCsnToEdmx( csn, service, options ) {
+  timetrace.timetrace.start('EDMX rendering');
+  const e = csn2edm(csn, service, options)?.toXML('all');
+  timetrace.timetrace.stop('EDMX rendering');
+  return { edmx: e };
 }
 
 /**
@@ -728,14 +722,13 @@ function preparedCsnToEdmx(csn, service, options) {
  * @param {ODataOptions} options OData / EDMX specific options.
  * @returns {object} Dictionary of rendered EDMX strings for each service.
  */
-function preparedCsnToEdmxAll(csn, options) {
+function preparedCsnToEdmxAll( csn, options ) {
+  timetrace.timetrace.start('EDMX all rendering');
   const edmxResult = csn2edmAll(csn, options);
   for (const service in edmxResult)
     edmxResult[service] = edmxResult[service].toXML('all');
-
-  return {
-    edmx: edmxResult,
-  };
+  timetrace.timetrace.stop('EDMX all rendering');
+  return { edmx: edmxResult };
 }
 
 /**
@@ -747,13 +740,13 @@ function preparedCsnToEdmxAll(csn, options) {
  * @param {ODataOptions} options OData / EDMX specific options.
  * @returns {object} Rendered EDM JSON object for of the given service.
  */
-function preparedCsnToEdm(csn, service, options) {
+function preparedCsnToEdm( csn, service, options ) {
+  timetrace.timetrace.start('EDM rendering');
   // Override OData version as edm json is always v4
   options.odataVersion = 'v4';
-  const e = csn2edm(csn, service, options);
-  return {
-    edmj: (e ? e.toJSON() : undefined),
-  };
+  const e = csn2edm(csn, service, options)?.toJSON();
+  timetrace.timetrace.stop('EDM rendering');
+  return { edmj: e };
 }
 
 /**
@@ -764,13 +757,14 @@ function preparedCsnToEdm(csn, service, options) {
  * @param {ODataOptions} options OData / EDMX specific options.
  * @returns {object} Dictionary of rendered EDM JSON objects for each service.
  */
-function preparedCsnToEdmAll(csn, options) {
+function preparedCsnToEdmAll( csn, options ) {
+  timetrace.timetrace.start('EDM all rendering');
   // Override OData version as edm json is always v4
   options.odataVersion = 'v4';
   const edmj = csn2edmAll(csn, options);
   for (const service in edmj)
     edmj[service] = edmj[service].toJSON();
-
+  timetrace.timetrace.stop('EDM all rendering');
   return {
     edmj,
   };
@@ -785,7 +779,7 @@ function preparedCsnToEdmAll(csn, options) {
  * @param {object} toProcess { <type>: { <name>:<content>, ...}, <type>: ...}
  * @returns {object} { <name.type>:<content> }
  */
-function flattenResultStructure(toProcess) {
+function flattenResultStructure( toProcess ) {
   const result = {};
   forEach(toProcess, (fileType, artifacts) => {
     if (fileType === 'messages')
@@ -852,9 +846,14 @@ function publishCsnProcessor( processor, _name ) {
         checkRemovedDeprecatedFlags( options, messageFunctions );
       }
       checkOutdatedOptions( options );
-      return processor( csn, options, ...args );
+
+      timetrace.timetrace.start(_name);
+      const result = processor( csn, options, ...args );
+      timetrace.timetrace.stop(_name);
+      return result;
     }
     catch (err) {
+      timetrace.timetrace.reset('Exception in backend triggered');
       if (err instanceof messages.CompilationError || options.noRecompile || isPreTransformed(csn, 'odata')) // we cannot recompile a pre-transformed CSN
         throw err;
 
@@ -885,7 +884,7 @@ const oldBackendOptionNames = [ 'toSql', 'toOdata', 'toHana', 'forHana' ];
  *
  * @param {CSN.Options} options Backend options
  */
-function checkOutdatedOptions(options) {
+function checkOutdatedOptions( options ) {
   const { error, throwWithError } = messages.makeMessageFunction(null, options, 'api');
 
   // This error has been emitted once, we don't need to emit it again.
@@ -923,7 +922,7 @@ function checkOutdatedOptions(options) {
  * @param {string} moduleName Name of the module to load - like with require
  * @returns {object} A Proxy that handles the on-demand loading
  */
-function lazyload(moduleName) {
+function lazyload( moduleName ) {
   let module;
   return new Proxy(((...args) => {
     if (!module) // eslint-disable-next-line global-require