@sap/cds-compiler 4.4.2 → 4.5.0

package/CHANGELOG.md

@@ -7,6 +7,50 @@
 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 4.5.0 - 2023-12-08
+
+### Added
+
+- parser: `annotate` can now annotate entity parameters, elements and bound actions in one statement.
+- compiler: A single `annotate` statement can now be used to annotate parameters, elements and
+  bound actions in one statement.
+- to.edm(x): Key elements of type `cds.UUID` are annotated with `@Core.ComputedDefaultValue` if they are
+  defined directly in the entity. Elements of type `cds.UUID` that are defined in a named structured type
+  and used to define a key element are not annotated, instead a warning is raised if such elements are
+  not annotated with `@Core.ComputedDefaultValue`.
+- to.sql|hdi: Add option `withHanaAssociations` which, for sqlDialect `hana`, allows suppressing
+  the generation of the `WITH ASSOCIATIONS`.
+
+### Changed
+
+- Update OData Vocabulary: 'Common'.
+- api: Reject CSN as input in backends, if it is a CSN in flavor `parsed` with a non-empty `requires` array.
+  Reason being that the model is not considered a "full" CSN, as dependencies were not resolved.
+
+### Fixed
+
+- compiler:
+  - Fix false positives of cyclic dependencies for calculated elements.
+  - Fix cardinality on source associations when publishing them with a filter (+ different cardinality)
+    in a projection.  The cardinality was incorrectly changed on the source as well.
+- CDL parser:
+  - More numbers that would lose relevant digits due to precision loss are
+    stored as strings in CSN (i.e. `{ "literal":"number", "val": "1.0000000000000001" }`).
+  - Nested table expressions and queries in the FROM clause (with surrounding parentheses)
+    could cause some constructs such as `virtual` to be not properly parsed.
+- to.hdi.migration: Don't drop-create the primary key when only a doc-comment has changed.
+- to.cdl: Fix edge case where `@A.![B#]` was not rendered correctly.
+
+### Removed
+
+- to.edm(x): Remove option `--odata-open-type` introduced with [4.4.0](#version-440---2023-11-09).
+
+## Version 4.4.4 - 2023-11-24
+
+### Fixed
+
+- to.hdi.migration: Changes in only `doc`-comments should not result in a drop-create of the primary key.
+
 ## Version 4.4.2 - 2023-11-17
 
 ### Fixed
@@ -355,6 +399,20 @@ The compiler behavior concerning `beta` features can change at any time without
     are removed, because since - `Entity.myElement` could also be a definition,
     creating ambiguities. This did not work always, anyway.
 
+## Version 3.9.12 - 2023-12-06
+
+### Fixed
+
+- compiler:
+  + SQL function `STDDEV(*)` was not parsable.
+  + Numbers in scientific notation `-1e1` were sometimes not recognized via CSN input.
+- for.odata: Fix crash when using a projection with associations as action parameter type.
+- for.hana: Fix a bug in association to join translation, expect ON condition operand to be a function without arguments.
+- to.edm(x):
+  + Omit `EntitySet` attribute on `Edm.FunctionImport` and `Edm.ActionImport` that return a singleton.
+  + Don't render `Scale: variable` for `cds.Decimal(scale:0)`.
+- to.sql/hdi/hdbcds: consider `having` predicate for `exists` expansion
+
 ## Version 3.9.10 - 2023-08-25
 
 ### Fixed

package/bin/cdsc.js

@@ -419,6 +419,11 @@ function executeCommandLine( command, options, args ) {
   // Execute the command line option '--to-sql' and display the results.
   // Return the original model (for chaining)
   function toSql( model ) {
+    if (options.withoutHanaAssociations) {
+      options.withHanaAssociations = false;
+      delete options.withoutHanaAssociations;
+    }
+
     const csn = options.directBackend ? model : compactModel(model, options);
     if (options.src === 'hdi') {
       if (options.csn) {

package/bin/cdsv2m.js

@@ -2,14 +2,14 @@
 
 'use strict';
 
-// Very simple command-line interface to support model migration from compiler
-// v1 to v2.  (If our client command processor would have been not as difficult
-// as after #2629, we could have a cdsc commend "migrate...)
+// Very simple command-line interface to support model migration
+// from compiler v1 to v2.
 
 const commands = {
   ria,
 };
 const compiler = require('../lib/compiler');
+const { smartId } = require('../lib/render/toCdl');
 
 const { argv } = process;
 const cmd = commands[argv[2]];
@@ -42,6 +42,8 @@ function ria() {
       annotates[name.slice( 1, -1 )] = true;
     } );
   }
-  for (const name in annotates)
-    console.log( `annotate ${name} with @cds.redirection.target: false;`);
+  for (const name in annotates) {
+    const escaped = name.split('.').map(part => smartId(part)).join('.');
+    console.log(`annotate ${escaped} with @cds.redirection.target: false;`);
+  }
 }

package/doc/CHANGELOG_BETA.md

@@ -8,6 +8,22 @@ 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 4.5.0 - 2023-12-08
+
+### Added `odataAnnotationExpressions`
+
+This flag allows to use expressions as annotation values, e.g.
+`@anno: (1+2)` and to enable OData specific transformations on those expressions.
+
+### Added `tenantVariable`
+
+If this beta flag is enabled, variable `$tenant` can be used without explicit replacement value.
+
+### Added feature "associations as direct calculated element values"
+
+This beta feature does not require a flag.  It is now possible to use associations with
+filters as direct values of calculated elements (on-read), e.g. `calc = assoc[ID = 1]`.
+
 ## Version 4.3.0 - 2023-09-29
 
 ### Removed `associationDefault`

package/lib/api/main.js

@@ -19,6 +19,13 @@ const timetrace = lazyload('../utils/timetrace');
 const forRelationalDB = lazyload('../transform/forRelationalDB');
 const sqlUtils = lazyload('../render/utils/sql');
 const effective = lazyload('../transform/effective/main');
+const toHdbcds = lazyload('../render/toHdbcds');
+const baseError = lazyload('../base/error');
+const edmToCsn = lazyload('../edm/csn2edm');
+const trace = lazyload('./trace');
+
+const { forEach, forEachKey } = require('../utils/objectUtils');
+const { checkRemovedDeprecatedFlags } = require('../base/model');
 
 /**
  * Return the artifact name for use for the hdbresult object
@@ -32,13 +39,6 @@ function getFileName( artifactName, csn ) {
   return csnUtils.getResultingName(csn, 'quoted', artifactName);
 }
 
-const { toHdbcdsSource } = require('../render/toHdbcds');
-const { ModelError } = require('../base/error');
-const { forEach, forEachKey } = require('../utils/objectUtils');
-const { checkRemovedDeprecatedFlags } = require('../base/model');
-const { csn2edm, csn2edmAll } = require('../edm/csn2edm');
-const { traceApi } = require('./trace');
-
 const relevantGeneralOptions = [ /* for future generic options */ ];
 const relevantOdataOptions = [ 'sqlMapping', 'odataFormat' ];
 const warnAboutMismatchOdata = [ 'odataVersion' ];
@@ -50,7 +50,7 @@ const warnAboutMismatchOdata = [ 'odataVersion' ];
  * @param {string} transformation Name of the transformation - odata or hana
  * @param {NestedOptions} options Options used for the transformation
  * @param {string[]} relevantOptionNames Option names that are defining characteristics
- * @param {string[]} [optionalOptionNames=[]] Option names that should be attached as a fyi
+ * @param {string[]} [optionalOptionNames] Option names that should be attached as a fyi
  */
 function attachTransformerCharacteristics( csn, transformation, options,
                                            relevantOptionNames, optionalOptionNames = [] ) {
@@ -143,11 +143,11 @@ function odataInternal( csn, internalOptions ) {
  * Return a odata-transformed CSN
  *
  * @param {CSN.Model} csn Clean input CSN
- * @param {ODataOptions} [options={}] Options
+ * @param {ODataOptions} [options] Options
  * @returns {oDataCSN} Return an oData-pre-processed CSN
  */
 function odata( csn, options = {} ) {
-  traceApi('for.odata', options);
+  trace.traceApi('for.odata', options);
   const internalOptions = prepareOptions.for.odata(options);
   return odataInternal(csn, internalOptions);
 }
@@ -156,11 +156,11 @@ function odata( csn, options = {} ) {
  * Process the given csn back to cdl.
  *
  * @param {object} csn CSN to process
- * @param {object} [options={}] Options
+ * @param {object} [options] Options
  * @returns {object} { model: string, namespace: string }
  */
 function cdl( csn, options = {} ) {
-  traceApi('to.cdl', options);
+  trace.traceApi('to.cdl', options);
   const internalOptions = prepareOptions.to.cdl(options);
   return toCdl.csnToCdl(csn, internalOptions);
 }
@@ -186,7 +186,7 @@ function csnForSql( csn, internalOptions ) {
  * Pseudo-public version of csnForSql().
  *
  * @param {CSN.Model} csn Plain input CSN
- * @param {SqlOptions} [options={}] Options
+ * @param {SqlOptions} [options] Options
  * @returns {CSN.Model} CSN transformed like to.sql
  * @private
  */
@@ -199,7 +199,7 @@ function forSql( csn, options = {} ) {
  * Transform a CSN like to.hdi
  *
  * @param {CSN.Model} csn Plain input CSN
- * @param {HdiOptions} [options={}] Options
+ * @param {HdiOptions} [options] Options
  * @returns {CSN.Model} CSN transformed like to.hdi
  * @private
  */
@@ -214,7 +214,7 @@ function forHdi( csn, options = {} ) {
  * Transform a CSN like to.hdbcds
  *
  * @param {CSN.Model} csn Plain input CSN
- * @param {HdbcdsOptions} [options={}] Options
+ * @param {HdbcdsOptions} [options] Options
  * @returns {CSN.Model} CSN transformed like to.hdbcds
  * @private
  */
@@ -248,11 +248,11 @@ function forEffective( csn, options = {} ) {
  * Process the given CSN into SQL.
  *
  * @param {CSN.Model} csn A clean input CSN
- * @param {SqlOptions} [options={}] Options
+ * @param {SqlOptions} [options] Options
  * @returns {SQL[]} Array of SQL statements, tables first, views second
  */
 function sql( csn, options = {} ) {
-  traceApi('to.sql', options);
+  trace.traceApi('to.sql', options);
   const internalOptions = prepareOptions.to.sql(options);
   internalOptions.transformation = 'sql';
 
@@ -271,11 +271,11 @@ function sql( csn, options = {} ) {
  * Process the given CSN into HDI artifacts.
  *
  * @param {CSN.Model} csn A clean input CSN
- * @param {HdiOptions} [options={}] Options
+ * @param {HdiOptions} [options] Options
  * @returns {HDIArtifacts} { <filename>:<content>, ...}
  */
 function hdi( csn, options = {} ) {
-  traceApi('to.hdi', options);
+  trace.traceApi('to.hdi', options);
   const internalOptions = prepareOptions.to.hdi(options);
 
   // we need the CSN for view sorting
@@ -378,7 +378,7 @@ function remapName( key, csn, filter = () => true ) {
  *                                  - createsAndAlters: An array of SQL statements to ALTER/CREATE tables/views
  */
 function sqlMigration( csn, options, beforeImage ) {
-  traceApi('to.sql.migration', options);
+  trace.traceApi('to.sql.migration', options);
   const internalOptions = prepareOptions.to.sql(options);
   const {
     error, warning, info, throwWithError, message,
@@ -533,7 +533,7 @@ function sqlMigration( csn, options, beforeImage ) {
  * @returns {migration} The migration result
  */
 function hdiMigration( csn, options, beforeImage ) {
-  traceApi('to.hdi.migration', options);
+  trace.traceApi('to.hdi.migration', options);
   const internalOptions = prepareOptions.to.hdi(options);
 
   // Prepare after-image.
@@ -614,28 +614,28 @@ sql.migration = sqlMigration;
  * Process the given CSN into HDBCDS artifacts.
  *
  * @param {any} csn A clean input CSN
- * @param {HdbcdsOptions} [options={}] Options
+ * @param {HdbcdsOptions} [options] Options
  * @returns {HDBCDS} { <filename>:<content>, ...}
  */
 function hdbcds( csn, options = {} ) {
-  traceApi('to.hdbcds', options);
+  trace.traceApi('to.hdbcds', options);
   const internalOptions = prepareOptions.to.hdbcds(options);
   internalOptions.transformation = 'hdbcds';
 
   const hanaCsn = forHdbcds(csn, internalOptions);
 
-  const result = flattenResultStructure(toHdbcdsSource(hanaCsn, internalOptions));
+  const result = flattenResultStructure(toHdbcds.toHdbcdsSource(hanaCsn, internalOptions));
   return result;
 }
 /**
  * Generate a edm document for the given service
  *
  * @param {CSN|oDataCSN} csn Clean input CSN or a pre-transformed CSN
- * @param {ODataOptions} [options={}] Options
+ * @param {ODataOptions} [options] Options
  * @returns {edm} The JSON representation of the service
  */
 function edm( csn, options = {} ) {
-  traceApi('to.edm', options);
+  trace.traceApi('to.edm', options);
   // If not provided at all, set service to undefined to trigger validation
   const internalOptions = prepareOptions.to.edm(
     // eslint-disable-next-line comma-dangle
@@ -662,11 +662,11 @@ edm.all = edmall;
  * Generate edm documents for all services
  *
  * @param {CSN|oDataCSN} csn Clean input CSN or a pre-transformed CSN
- * @param {ODataOptions} [options={}] Options
+ * @param {ODataOptions} [options] Options
  * @returns {edms} { <service>:<JSON representation>, ...}
  */
 function edmall( csn, options = {} ) {
-  traceApi('to.edm.all', options);
+  trace.traceApi('to.edm.all', options);
   const internalOptions = prepareOptions.to.edm(options);
   const { error } = messages.makeMessageFunction(csn, internalOptions, 'for.odata');
 
@@ -693,11 +693,11 @@ function edmall( csn, options = {} ) {
  * Generate a edmx document for the given service
  *
  * @param {CSN|oDataCSN} csn Clean input CSN or a pre-transformed CSN
- * @param {ODataOptions} [options={}] Options
+ * @param {ODataOptions} [options] Options
  * @returns {edmx} The XML representation of the service
  */
 function edmx( csn, options = {} ) {
-  traceApi('to.edmx', options);
+  trace.traceApi('to.edmx', options);
   // If not provided at all, set service to undefined to trigger validation
   const internalOptions = prepareOptions.to.edmx(
     // eslint-disable-next-line comma-dangle
@@ -725,11 +725,11 @@ edmx.all = edmxall;
  * Generate edmx documents for all services
  *
  * @param {CSN|oDataCSN} csn Clean input CSN or a pre-transformed CSN
- * @param {ODataOptions} [options={}] Options
+ * @param {ODataOptions} [options] Options
  * @returns {edmxs} { <service>:<XML representation>, ...}
  */
 function edmxall( csn, options = {} ) {
-  traceApi('to.edmx.all', options);
+  trace.traceApi('to.edmx.all', options);
   const internalOptions = prepareOptions.to.edmx(options);
 
   const result = {};
@@ -763,7 +763,7 @@ function edmxall( csn, options = {} ) {
  */
 function preparedCsnToEdmx( csn, service, options ) {
   timetrace.timetrace.start('EDMX rendering');
-  const e = csn2edm(csn, service, options)?.toXML('all');
+  const e = edmToCsn.csn2edm(csn, service, options)?.toXML('all');
   timetrace.timetrace.stop('EDMX rendering');
   return { edmx: e };
 }
@@ -778,7 +778,7 @@ function preparedCsnToEdmx( csn, service, options ) {
  */
 function preparedCsnToEdmxAll( csn, options ) {
   timetrace.timetrace.start('EDMX all rendering');
-  const edmxResult = csn2edmAll(csn, options);
+  const edmxResult = edmToCsn.csn2edmAll(csn, options);
   for (const service in edmxResult)
     edmxResult[service] = edmxResult[service].toXML('all');
   timetrace.timetrace.stop('EDMX all rendering');
@@ -798,7 +798,7 @@ 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)?.toJSON();
+  const e = edmToCsn.csn2edm(csn, service, options)?.toJSON();
   timetrace.timetrace.stop('EDM rendering');
   return { edmj: e };
 }
@@ -815,7 +815,7 @@ 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);
+  const edmj = edmToCsn.csn2edmAll(csn, options);
   for (const service in edmj)
     edmj[service] = edmj[service].toJSON();
   timetrace.timetrace.stop('EDM all rendering');
@@ -897,8 +897,7 @@ function publishCsnProcessor( processor, _name ) {
         checkRemovedDeprecatedFlags( options, messageFunctions );
 
       checkOutdatedOptions( options, messageFunctions );
-      checkCsnFlavor( csn, options, messageFunctions, _name );
-
+      csn = ensureClientCsn( csn, options, messageFunctions, _name );
       messageFunctions.throwWithError();
 
       timetrace.timetrace.start(_name);
@@ -912,7 +911,7 @@ function publishCsnProcessor( processor, _name ) {
         throw err;
 
       if (options.testMode && !(err instanceof TypeError) &&
-        !(err instanceof ModelError))
+        !(err instanceof baseError.ModelError))
         throw err;
 
       const { info } = messages.makeMessageFunction( csn, options, 'compile' );
@@ -981,6 +980,12 @@ function checkOutdatedOptions( options, messageFunctions ) {
  * Checks that the given CSN is usable by our backends, e.g. that
  * the CSN is not a gensrc (a.k.a. xtended) for most backends.
  *
+ * Returns the input CSN if it is acceptable or compiles the input CSN if it does not
+ * have the expected CSN flavor.
+ *
+ * The compiler does not set any marker in `meta`; we use the umbrella one
+ * for easier debugging.
+ *
  * For reference, cds-compiler/cds-dk CSN flavor map:
  *  - client -> inferred
  *  - gensrc -> xtended
@@ -989,23 +994,39 @@ function checkOutdatedOptions( options, messageFunctions ) {
  * If this function becomes more complex (e.g. more module conditions),
  * move it from then generic api wrapper to the individual module.
  *
- * TODO: The compiler does not set any marker in `meta`; we use the umbrella one
- *       for easier debugging.
- *
  * @param {CSN.Model} csn User CSN
  * @param {CSN.Options} options User options
  * @param {object} messageFunctions Functions returned by makeMessageFunction()
  * @param {string} module Backend module, e.g. to.cdl or to.sql
+ * @returns {CSN.Model} CSN that works for backends.
  */
-function checkCsnFlavor( csn, options, messageFunctions, module ) {
+function ensureClientCsn( csn, options, messageFunctions, module ) {
   if (module === 'to.cdl' || !csn)
-    return; // to.cdl allows every CSN flavor
+    return csn; // to.cdl allows every CSN flavor
 
   if (csn.meta?.flavor === 'xtended') {
-    // TODO: csn.meta?.flavor === 'parsed'; currently used by `@sap/cds` tests.
-    messageFunctions.error('api-unsupported-csn-flavor', null, { name: module, option: csn.meta?.flavor },
-                           'Module $(NAME) expects a client/inferred CSN, not $(OPTION)');
+    messageFunctions.error('api-unsupported-csn-flavor', null, { name: module, option: csn.meta?.flavor });
+    return csn;
+  }
+
+  // `parsed` CSN is allowed if it can be compiled (i.e. no `requires`).
+  // Still return false, because it's not client CSN. The caller must handle it.
+  if (csn.meta?.flavor === 'parsed') {
+    if (csn.requires?.length > 0) {
+      messageFunctions.error('api-unsupported-csn-flavor', null, {
+        '#': 'parsed-requires',
+        name: module,
+        prop: 'requires',
+      });
+      return csn;
+    }
+
+    // TODO: next line to be replaced by CSN parser call which reads the CSN object once the two API files are merged.
+    const xsn = compiler.recompileX(csn, options);
+    return toCsn.compactModel(xsn);
   }
+
+  return csn;
 }
 
 /**

package/lib/api/options.js

@@ -31,6 +31,7 @@ const publicOptionsNewAPI = [
   'generatedByComment',
   'betterSqliteSessionVariables',
   'fewerLocalizedViews',
+  'withHanaAssociations',
   // ODATA
   'odataOpenapiHints',
   'odataVersion',
@@ -42,7 +43,6 @@ const publicOptionsNewAPI = [
   'odataXServiceRefs',
   'odataV2PartialConstr',
   'odataVocabularies',
-  'odataOpenType',
   'service',
   'serviceNames',
   //
@@ -77,9 +77,9 @@ const overallOptions = publicOptionsNewAPI.concat(privateOptions);
  * Apply defaults and make sure that the "hard requirements" are met,
  * i.e. src: sql if to.sql() was called.
  *
- * @param {FlatOptions} [input={}] Input options
- * @param {FlatOptions} [defaults={}] Default options to apply
- * @param {FlatOptions} [hardRequire={}] Hard requirements to enforce
+ * @param {FlatOptions} [input] Input options
+ * @param {FlatOptions} [defaults] Default options to apply
+ * @param {FlatOptions} [hardRequire] Hard requirements to enforce
  * @param {object} [customValidators] Custom validations to run instead of defaults
  * @param {string[]} [combinationValidators] Option combinations to validate
  * @param {string} moduleName The called module, e.g. 'for.odata', 'to.hdi'. Needed to initialize the message functions
@@ -127,14 +127,18 @@ module.exports = {
     cdl: options => translateOptions(options, undefined, undefined, undefined, undefined, 'to.cdl'),
     sql: (options) => {
       const hardOptions = { src: 'sql', toSql: true, forHana: true };
-      const defaultOptions = { sqlMapping: 'plain', sqlDialect: 'plain', generatedByComment: true };
+      const defaultOptions = {
+        sqlMapping: 'plain', sqlDialect: 'plain', generatedByComment: true, withHanaAssociations: true,
+      };
       const processed = translateOptions(options, defaultOptions, hardOptions, undefined, [ 'sql-dialect-and-naming' ], 'to.sql');
 
       return Object.assign({}, processed);
     },
     hdi: (options) => {
       const hardOptions = { src: 'hdi', toSql: true, forHana: true };
-      const defaultOptions = { sqlMapping: 'plain', sqlDialect: 'hana', generatedByComment: false };
+      const defaultOptions = {
+        sqlMapping: 'plain', sqlDialect: 'hana', generatedByComment: false, withHanaAssociations: true,
+      };
       return translateOptions(options, defaultOptions, hardOptions, { sqlDialect: generateStringValidator([ 'hana' ]) }, undefined, 'to.hdi');
     },
     hdbcds: (options) => {

package/lib/api/validate.js

@@ -141,7 +141,7 @@ const allCombinationValidators = {
       message.error('api-invalid-combination', null, { '#': 'sql-dialect-and-naming', name: options.sqlDialect, prop: options.sqlMapping });
   },
   'sql-dialect-and-localized': (options, message) => {
-    if (options.fewerLocalizedViews && options.sqlDialect === 'hana')
+    if (options.fewerLocalizedViews && options.sqlDialect === 'hana' && (options.withHanaAssociations || options.withHanaAssociations === undefined))
       message.error('api-invalid-combination', null, { '#': 'sql-dialect-and-localized', option: 'fewerLocalizedViews', value: 'hana' });
   },
   'beta-no-test': (options, message) => {

package/lib/base/message-registry.js

@@ -121,12 +121,12 @@ const centralMessages = {
   'ref-undefined-def':    { severity: 'Error' },
   'ref-undefined-var':    { severity: 'Error' },
   'ref-undefined-element': { severity: 'Error' },
-  'anno-undefined-element': { severity: 'Warning' },
+  'anno-undefined-element': { severity: 'Error' },
   'ref-unknown-var': { severity: 'Info', errorFor: [ 'to.hdbcds', 'to.sql', 'to.hdi', 'to.rename' ] },
   'ref-obsolete-parameters': { severity: 'Error', configurableFor: 'v4' },
            // does not hurt us, but makes it tedious to detect parameter refs
   'ref-undefined-param': { severity: 'Error' },
-  'anno-undefined-param': { severity: 'Warning' },
+  'anno-undefined-param': { severity: 'Error' },
   'ref-rejected-on': { severity: 'Error' },
   'ref-expected-element': { severity: 'Error' },
 
@@ -259,6 +259,10 @@ const centralMessageTexts = {
     slash: 'Expected directory $(VALUE) in option $(OPTION) to end with $(OTHERVALUE)',
     relative: 'Expected directory $(VALUE) in option $(OPTION) to not start with $(OTHERVALUE)',
   },
+  'api-unsupported-csn-flavor': {
+    std: 'Module $(NAME) expects a client/inferred CSN, not $(OPTION)',
+    'parsed-requires': 'Module $(NAME) expects a client/inferred CSN, or a parsed CSN without dependencies, but found $(PROP) property',
+  },
 
   'anno-duplicate': {
     std: 'Duplicate assignment with $(ANNO)',
@@ -281,6 +285,11 @@ const centralMessageTexts = {
     view: 'Compiler generated view $(NAME) must not be annotated with $(ANNO) if $(ART) is not skipped',
   },
 
+  'anno-missing-rewrite': {
+    std: 'Assign a value for $(ANNO), the value inherited from $(ART) would contain invalid references like $(ELEMREF)',
+    unrelated: 'Assign a value for $(ANNO), the value inherited from $(ART) would contain references like $(ELEMREF) to unrelated elements',
+  },
+
   'chained-array-of': '"Array of"/"many" must not be chained with another "array of"/"many" inside a service',
 
   'check-proper-type-of': {
@@ -326,6 +335,9 @@ const centralMessageTexts = {
     csn: 'Expecting a non-negative integer for property $(PROP)',
     'or-asterisk': 'Expecting a non-negative integer or string $(OP) for property $(PROP)',
   },
+  'syntax-ignoring-decimal': {
+    std: 'Ignoring decimal places, because an integer was expected'
+  },
   'syntax-ignoring-anno': {
     std: 'Annotations can\'t be used in a column with $(CODE)',
     doc: 'Doc comments can\'t be used in a column with $(CODE)',
@@ -614,6 +626,7 @@ const centralMessageTexts = {
     self: 'A reference to an unmanaged association is only valid when compared via $(CODE)',
     expr: 'Associations can\'t be used as values in expressions',
     'expr-comp': 'Compositions can\'t be used as values in expressions',
+    'assoc-stored': 'Associations and compositions can\'t be used as values in stored calculated elements',
     cast: 'Casting to an association is not supported',
 
     'managed-filter': 'Unexpected managed association $(NAME) in filter expression of $(ID)',
@@ -649,6 +662,10 @@ const centralMessageTexts = {
 
   // TODO: Better text ?
   'rewrite-not-supported': 'The ON-condition is not rewritten here - provide an explicit ON-condition',
+  'type-unsupported-rewrite': {
+    std:  'Rewriting the ON-condition not supported here', // unused: merge with 'rewrite-not-supported'
+    'sub-element': 'Rewriting the ON-condition of unmanaged association in sub element is not supported'
+  },
 
   'type-unexpected-typeof': {
     std: 'Unexpected $(KEYWORD) for the type reference here',
@@ -837,7 +854,11 @@ const centralMessageTexts = {
   },
   // TODO: text variant if the association does not start an entity
   'ref-invalid-source': 'A query source must be an entity or an association',
-  'extend-columns': 'Artifact $(ART) can\'t be extended with columns, only projections can',
+  'extend-columns': {
+    std: 'Artifact $(ART) can\'t be extended with columns, only simple views/projections without JOINs and UNIONs can',
+    join: 'Artifact $(ART) can\'t be extended with columns, because it contains a JOIN',
+    union: 'Artifact $(ART) can\'t be extended with columns, because it contains a UNION',
+  },
   'extend-repeated-intralayer': 'Unstable element order due to repeated extensions in same layer',
   'extend-unexpected-include': 'Can\'t extend $(META) with includes',
 
@@ -1018,6 +1039,7 @@ const centralMessageTexts = {
   },
   'odata-parameter-order': 'Unexpected mandatory after optional parameter',
   'odata-key-recursive': 'Unexpected recursive key $(NAME)',
+  'odata-key-uuid-default-anno': 'Expected element of type $(TYPE) to be annotated with $(ANNO) when used as primary key in $(ID)',
   // -----------------------------------------------------------------------------------
   // All odata-anno MUST have a '$(ANNO)' parameter to indicate error location
   // -----------------------------------------------------------------------------------
@@ -1026,7 +1048,7 @@ const centralMessageTexts = {
   'odata-anno-preproc': {
     'std': 'unused message text',
     'nokey': 'Expected target $(NAME) to have a key element for $(ANNO)',
-    'multkeys': 'Expected target $(NAME) to have only one key element',
+    'multkeys': 'Expected target $(NAME) to have only one key element for $(ANNO)',
     'vhlnokey': 'Expected value help list entity $(NAME) to have a key element for $(ANNO)',
     'vhlmultkeys': 'Expected value help list entity $(NAME) to have only one key element for $(ANNO)',
     'notforentity': 'Unexpected usage of $(ANNO) for an entity',
@@ -1034,8 +1056,8 @@ const centralMessageTexts = {
     'noassoc': 'Expected association $(ID) to exist for $(ANNO)',
     'vallistignored': '$(NAME) is ignored for $(ANNO) as $(CODE) is present',
     'notastring': 'Expected value to be a string for $(ANNO)',
-    'notexist': 'Expect entity $(ID) to exist for $(ANNO)',
-    'txtarr': 'Expect $(ANNO) shortcut to have a $(NAME) annotation'
+    'notexist': 'Expected entity $(ID) to exist for $(ANNO)',
+    'txtarr': 'Expected $(ANNO) shortcut to have a $(NAME) annotation'
   },
   // -----------------------------------------------------------------------------------
   // GenericTranslation: