@sap/cds-compiler 4.9.2 → 5.0.6

package/CHANGELOG.md

@@ -7,6 +7,80 @@
 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 5.0.6 - 2024-07-10
+
+### Fixed
+
+- for.seal: Don't generate DRAFT artifacts.
+
+## Version 5.0.4 - 2024-06-26
+
+### Fixed
+
+- CDL parser: an `extend entity` and `extend aspect` with an extensions for the
+  same element now correctly leads to an error, because it resulted in part of the
+  extension being simply dropped.  Remark: an `extend type` and the recommended
+  plain `extend` led to an error in that situation already before.
+- to.sql: Conditions inside filters in combination with foreign key aliases were
+          not properly translated in rare cases.
+- Update OData Vocabularies: 'PDF', 'UI'.
+
+## Version 5.0.2 - 2024-06-14
+
+### Changed
+
+- API `CompilationError` will serialize the first compiler error in `e.message`
+- cdsc: `--without-hana-associations` is changed to `--with-hana-associations`
+
+### Fixed
+
+- to.edm(x):
+  + Respect `AppliesTo` specification in term definitions for actions and functions.
+  + Make message `odata-spec-violation-namespace` a warning again.
+
+## Version 5.0.0 - Pre-release version - 2024-05-29
+
+This is a preview version for the major release and contains breaking changes. It should not be used for production.
+
+### Changed
+
+- Node 18 is now the minimum required version.
+- API `CompilationError`s will no longer serialize all compiler messages into `e.message`.
+  Use `e.messages[]` instead or `e.toString()` to serialize errors into a string.
+- CDL parser: Annotations that can't be applied are now rejected.
+- compiler:
+  + `extend` statements on "namespaces" (paths that are not definitions) are now always errors.
+  + non-structured events are rejected
+  + `$self` references in JOINs are rejected if they could lead to issues in SQL rendering.
+  + non-string enum definitions must have a value.
+  + A top-level definition `$self` is rejected. `$self` is considered a reserved name.
+  + `$at.from`/`$at.to` are deprecated; use `$valid.from`/`$valid.to` instead.
+- to.hdbcds: The HDBCDS backend is now considered deprecated.
+- to.edm(x):
+  + Set default nullability to `true` for collection like properties (was `false` before).
+  + Raise message ids `odata-spec-violation-namespace`, `odata-spec-violation-no-key` from warning to error.
+- to.sql:
+  + `@cds.persistence.exists` is _not_ propagated to generated localization views (`localized.*`)
+  + Option `fewerLocalizedViews` is now enabled by default.
+  + Option `betterSqliteSessionVariables` is now enabled by default.
+
+### Fixed
+
+- for.odata: Propagate all `@odata { Type, MaxLength, Precision, Scale, SRID }` to generated foreign keys.
+
+### Removed
+
+- API: Deprecated functions `preparedCsnToEdmx` and `preparedCsnToEdm` were removed.
+  Use `to.edm(x)` instead.
+
+## Version 4.9.4 - 2024-05-21
+
+### Fixed
+
+- to.sql:
+  + always include `tenant` column in foreign key references.
+  + reject `tenantDiscriminator` option only if sql dialect is `hana` and if  `withHanaAssociations` option is set.
+
 ## Version 4.9.2 - 2024-05-13
 
 ### Fixed

package/bin/cds_remove_invalid_whitespace.js

@@ -64,7 +64,8 @@ function modernizeWhitespace( source, filename ) {
 
   // To avoid spam, only report errors.
   // Users should use the compiler to get all messages.
-  const errors = options.messages.filter(msg => (msg.severity === 'Error'));
+  const errors = options.messages
+    .filter(msg => (msg.severity === 'Error' && msg.messageId !== 'syntax-invalid-space'));
   if (errors.length > 0) {
     errors.forEach((msg) => {
       console.error(msg.toString());

package/bin/cdsc.js

@@ -145,6 +145,7 @@ function cdsc_main() {
   // Internally, parseCdl/parseOnly are options, so we map the command to it.
   if (cmdLine.command === 'parseCdl') {
     cmdLine.command = 'toCsn';
+    cmdLine.options.toCsn = cmdLine.options.parseCdl;
     cmdLine.options.parseCdl = true;
     cmdLine.args.files = [ cmdLine.args.file ];
   }
@@ -169,12 +170,20 @@ function cdsc_main() {
   }
 
   const to = cmdLine.options.toSql ? 'toSql' : 'toHana';
-  // remap string values for `assertIntegrity` option to boolean
-  if (cmdLine.options[to] && cmdLine.options[to].assertIntegrity &&
-     (cmdLine.options[to].assertIntegrity === 'true' ||
-      cmdLine.options[to].assertIntegrity === 'false')
-  )
-    cmdLine.options[to].assertIntegrity = cmdLine.options[to].assertIntegrity === 'true';
+  if (cmdLine.options[to]) {
+    // remap string values in options to boolean
+    if (cmdLine.options[to].assertIntegrity &&
+        (cmdLine.options[to].assertIntegrity === 'true' ||
+         cmdLine.options[to].assertIntegrity === 'false')
+    )
+      cmdLine.options[to].assertIntegrity = cmdLine.options[to].assertIntegrity === 'true';
+
+    if (cmdLine.options[to].withHanaAssociations)
+      cmdLine.options[to].withHanaAssociations = cmdLine.options[to].withHanaAssociations !== 'false';
+
+    if (cmdLine.options[to].betterSqliteSessionVariables)
+      cmdLine.options[to].betterSqliteSessionVariables = cmdLine.options[to].betterSqliteSessionVariables === 'true';
+  }
 
   // Enable all beta-flags if betaMode is set to true
   if (cmdLine.options.betaMode)
@@ -446,11 +455,6 @@ 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/cdshi.js

@@ -34,6 +34,7 @@ const categoryChars = {         // default: first char of category name
   ExtBoundAction: 'B',      // highlight like bound action definition
   ExtParam: 'P',            // highlight like entity/action parameter definition
   Event: 'Y',
+  KeyImplicit: 'r',         // handle as normal ref
   // Remark: do not use `x`/`X` (hex literal `x'1e3d'`)
 };
 

package/doc/CHANGELOG_BETA.md

@@ -8,6 +8,13 @@ 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 5.0.0 - 2024-05-29
+
+## Removed `v5preview`
+
+It is now enabled by default.
+
 ## Version 4.9.0 - 2024-04-25
 
 ## Removed `odataAnnotationExpressions`

package/lib/api/main.js

@@ -712,9 +712,9 @@ function hdbcds( csn, options, messageFunctions ) {
   internalOptions.transformation = 'hdbcds';
   messageFunctions.setOptions( internalOptions );
 
-  // no "isBetaEnabled", because this warning must also appear with "deprecated" flags
-  if (internalOptions.betaMode || internalOptions.beta?.v5preview)
-    messageFunctions.warning('api-deprecated-v5', null, null);
+  // Since v5, the HDBCDS backend is considered deprecated.
+  // TODO(v6): Make this a configurable error
+  messageFunctions.warning('api-deprecated-v5', null, null);
 
   if (options.tenantDiscriminator) {
     messageFunctions.error('api-invalid-option', null, {
@@ -741,7 +741,6 @@ function hdbcds( csn, options, messageFunctions ) {
 function edm( csn, options, messageFunctions ) {
   // If not provided at all, set service to 'undefined' to trigger validation
   const internalOptions = prepareOptions.to.edm(
-    // eslint-disable-next-line comma-dangle
     options.service ? options : Object.assign({ service: undefined }, options)
   );
   messageFunctions.setOptions( internalOptions );
@@ -810,7 +809,6 @@ function edmall( csn, options, messageFunctions ) {
 function edmx( csn, options, messageFunctions ) {
   // If not provided at all, set service to 'undefined' to trigger validation
   const internalOptions = prepareOptions.to.edmx(
-    // eslint-disable-next-line comma-dangle
     options.service ? options : Object.assign({ service: undefined }, options)
   );
   messageFunctions.setOptions( internalOptions );
@@ -880,9 +878,8 @@ function edmxall( csn, options, messageFunctions ) {
  */
 // @ts-ignore
 function odata2( csn, options, messageFunctions ) {
-  // If not provided at all, set service to undefined to trigger validation
+  // If not provided at all, set service to 'undefined' to trigger validation
   const internalOptions = prepareOptions.to.odata(
-    // eslint-disable-next-line comma-dangle
     options.service ? options : Object.assign({ service: undefined }, options)
   );
   messageFunctions.setOptions( internalOptions );
@@ -1074,15 +1071,6 @@ module.exports = {
   for_hdbcds: publishCsnProcessor(forHdbcds, 'for.hdbcds'),
   for_effective: publishCsnProcessor(forEffective, 'for.effective'),
   for_seal: publishCsnProcessor(forSeal, 'for.seal'),
-
-  /* Deprecated, will be removed in cds-compiler@v5 */ // TODO(v5): Remove
-  preparedCsnToEdmx(csn, service, options) {
-    preparedCsnToEdmx(csn, service, options, messages.makeMessageFunction( csn, options, 'to.edmx' ));
-  },
-  /* Deprecated, will be removed in cds-compiler@v5 */ // TODO(v5): Remove
-  preparedCsnToEdm(csn, service, options) {
-    preparedCsnToEdm(csn, service, options, messages.makeMessageFunction( csn, options, 'to.edm' ));
-  },
 };
 
 
@@ -1266,7 +1254,7 @@ function ensureClientCsn( csn, options, messageFunctions, module ) {
 function lazyload( moduleName ) {
   let module;
   return new Proxy(((...args) => {
-    if (!module) // eslint-disable-next-line global-require
+    if (!module)
       module = require(moduleName);
 
     if (module.apply && typeof module.apply === 'function')
@@ -1274,7 +1262,7 @@ function lazyload( moduleName ) {
     return module; // for destructured calls
   }), {
     get(target, name) {
-      if (!module) // eslint-disable-next-line global-require
+      if (!module)
         module = require(moduleName);
 
       return module[name];
@@ -1293,7 +1281,7 @@ function lazyload( moduleName ) {
  * @param {object} messageFunctions Message functions
  */
 function handleTenantDiscriminator( options, internalOptions, messageFunctions ) {
-  if (options.tenantDiscriminator && options.withHanaAssociations) {
+  if (options.tenantDiscriminator && options.withHanaAssociations && internalOptions.sqlDialect === 'hana') {
     messageFunctions.error('api-invalid-combination', null, {
       option: 'tenantDiscriminator',
       prop: 'withHanaAssociations',

package/lib/api/options.js

@@ -75,7 +75,7 @@ const privateOptions = [
   'internalMsg',
   'disableHanaComments',      // in case of issues with hana comment rendering
   'tenantDiscriminator',      // not published yet
-  'localizedWithoutCoalesce', // deprecated version of 'localizedLanguageFallback', TODO(v5): Remove option
+  'localizedWithoutCoalesce', // deprecated version of 'localizedLanguageFallback', TODO(v6): Remove option
 ];
 
 const overallOptions = publicOptionsNewAPI.concat(privateOptions);
@@ -145,15 +145,7 @@ function reclassifyErrorsForOpenApi( options ) {
     // shallow clone, so that we can modify severities without changing the user's.
     options.severities = Object.assign({}, options.severities ?? {});
 
-    options.severities['odata-spec-violation-array'] = 'Warning';
-    options.severities['odata-spec-violation-assoc'] = 'Warning';
-    options.severities['odata-spec-violation-namespace'] = 'Warning';
-    options.severities['odata-spec-violation-param'] = 'Warning';
-    options.severities['odata-spec-violation-returns'] = 'Warning';
-    options.severities['odata-spec-violation-type-unknown'] = 'Warning';
     options.severities['odata-spec-violation-no-key'] = 'Warning';
-    options.severities['odata-spec-violation-key-type'] = 'Warning';
-    options.severities['odata-spec-violation-property-name'] = 'Warning';
   }
 }
 
@@ -172,6 +164,7 @@ module.exports = {
     },
     hdi: (options) => {
       const hardOptions = { src: 'hdi', toSql: true, forHana: true };
+      // TODO: sqlDialect should be a hard option!
       const defaultOptions = {
         sqlMapping: 'plain', sqlDialect: 'hana', generatedByComment: false, withHanaAssociations: true,
       };
@@ -179,6 +172,7 @@ module.exports = {
     },
     hdbcds: (options) => {
       const hardOptions = { forHana: true };
+      // TODO: sqlDialect should be a hard option!
       const defaultOptions = { sqlMapping: 'plain', sqlDialect: 'hana' };
       return translateOptions(options, defaultOptions, hardOptions, { sqlDialect: generateStringValidator([ 'hana' ]) }, undefined, 'to.hdbcds');
     },
@@ -214,7 +208,7 @@ module.exports = {
       return translateOptions(options, defaultOptions, hardOptions, undefined, undefined, 'for.hana');
     },
     effective: (options) => {
-      const hardOptions = {};
+      const hardOptions = { addCdsPersistenceName: false };
       const defaultOptions = {
         sqlMapping: 'plain', resolveSimpleTypes: true, resolveProjections: true, remapOdataAnnotations: false, keepLocalized: false,
       };
@@ -224,7 +218,7 @@ module.exports = {
     },
     seal: (options) => {
       const hardOptions = {
-        sqlMapping: 'plain', resolveSimpleTypes: true, resolveProjections: true, keepLocalized: false,
+        sqlMapping: 'plain', resolveSimpleTypes: true, resolveProjections: true, keepLocalized: false, addCdsPersistenceName: true,
       };
       const defaultOptions = { remapOdataAnnotations: true };
       const processed = translateOptions(options, defaultOptions, hardOptions, null, [ 'sql-dialect-and-naming' ], 'for.effective');

package/lib/api/trace.js

@@ -27,7 +27,6 @@ function traceApi( apiName, options, ...args ) {
   const argsStr = args.map(val => JSON.stringify(val)).join(', ');
   const rest = args.length > 0 ? ` | ${ argsStr }` : '';
   // Local require: Only load on-demand, not when tracing is disabled.
-  // eslint-disable-next-line global-require
   const { version } = require('../../package.json');
   // eslint-disable-next-line no-console
   console.error( `CDSC_TRACE_API | ${ version } | ${ apiName }(…) | options: ${ optStr }${ rest }`);

package/lib/base/builtins.js

@@ -64,6 +64,7 @@ const magicVariables = [
   '$now',
   '$tenant',
   '$session',
+  '$draft',
 ];
 
 /**

package/lib/base/location.js

@@ -11,13 +11,16 @@ class Location {
   col;
   endLine;
   endCol;
-  constructor(file, line, col, endLine, endCol) {
+  constructor( file, line, col, endLine, endCol ) {
     this.file = file;
     this.line = line;
     this.col = col;
     this.endLine = endLine;
     this.endCol = endCol;
   }
+  toString() {
+    return locationString( this );
+  }
 }
 
 class SemanticLocation {

package/lib/base/message-registry.js

@@ -41,7 +41,6 @@ const { createDict } = require('../utils/objectUtils');
  *  - true = can always be downgraded, we do not really care
  *  - [‹module›, …] = can be downgraded in compiler function ‹module›
  *  - 'deprecated' = severity can only be changed with deprecated.downgradableErrors
- *  - 'v4' = currently like true, but should be 'deprecated' in v5
  *
  * @type {Object<string, MessageConfig>}
  */
@@ -61,13 +60,13 @@ const centralMessages = {
   'ext-undefined-art':     { severity: 'Warning' }, // for annotate statement (for CDL path root)
   'ext-undefined-def':     { severity: 'Warning' }, // for annotate statement (for CSN or CDL path cont)
   'ext-undefined-element': { severity: 'Warning' },
+  'ext-undefined-key':     { severity: 'Warning' },
   'ext-undefined-param':   { severity: 'Warning' },
   'anno-unexpected-ellipsis': { severity: 'Error', configurableFor: 'deprecated' },
   'anno-unexpected-localized-skip': { severity: 'Error', configurableFor: true },
-  'anno-unexpected-mixin': { severity: 'Warning', errorFor: [ 'v5' ] },
 
   'name-invalid-dollar-alias': { severity: 'Error', configurableFor: true },
-  'name-deprecated-$self': { severity: 'Warning', errorFor: [ 'v5' ], configurableFor: true },
+  'name-deprecated-$self': { severity: 'Error', configurableFor: true },
 
   'type-invalid-items': { severity: 'Error' }, // not supported yet
   'assoc-as-type':  { severity: 'Error' }, // TODO: allow more, but not all
@@ -86,7 +85,7 @@ const centralMessages = {
   'empty-type':   { severity: 'Info' }, // only still an error in old transformers
 
   'ref-deprecated-orderby': { severity: 'Error', configurableFor: true },
-  'ref-deprecated-self-element': { severity: 'Warning', configurableFor: true, errorFor: [ 'v5' ] },
+  'ref-deprecated-self-element': { severity: 'Error', configurableFor: true },
   'ref-invalid-type': { severity: 'Error' },
   'ref-unexpected-self': { severity: 'Error' },
   'ref-invalid-include': { severity: 'Error' },
@@ -152,7 +151,7 @@ const centralMessages = {
   // 'syntax-duplicate-annotate' came late with v3 - make it configurable as
   // fallback, but then parse.cdl is not supposed to work correctly (it can
   // then either issue an error or produce a CSN missing some annotations):
-  'syntax-duplicate-annotate': { severity: 'Error', configurableFor: 'deprecated' },
+  'syntax-duplicate-annotate': { severity: 'Error' },
   'syntax-duplicate-clause': { severity: 'Error', configurableFor: true },
   'syntax-duplicate-equal-clause': { severity: 'Warning' },
   'syntax-invalid-name': { severity: 'Error', configurableFor: 'deprecated' },
@@ -162,36 +161,38 @@ const centralMessages = {
   'syntax-unknown-escape': { severity: 'Error', configurableFor: true },
   'syntax-unsupported-masked': { severity: 'Error', configurableFor: 'deprecated' },
   'syntax-unexpected-sql-clause': { severity: 'Error' }, // TODO: configurableFor:'tests'?
-  'syntax-ignoring-anno': { severity: 'Warning', errorFor: [ 'v5' ] },
+  'syntax-invalid-space': { severity: 'Error', configurableFor: 'test' },
+  'syntax-expecting-space': { severity: 'Error' },
+  'syntax-unexpected-anno': { severity: 'Error' },
 
   'type-unsupported-precision-change': { severity: 'Error' },
   'type-unsupported-key-change': { severity: 'Error', configurableFor: true },
-  'type-missing-enum-value': { severity: 'Warning', errorFor: [ 'v5' ] },
+  'type-missing-enum-value': { severity: 'Error', configurableFor: 'test' },
 
   'def-missing-element': { severity: 'Error' },
-  'def-expected-structured': { severity: 'Warning', configurableFor: true, errorFor: [ 'v5' ] },
+  'def-expected-structured': { severity: 'Error', configurableFor: true },
   'def-unsupported-calc-elem': { severity: 'Error', configurableFor: true },
 
   'def-invalid-key-cardinality': { severity: 'Error' },
   // Published! Used in @cap-js-community/odata-v2-adapter; if renamed, add to oldMessageIds
-  'odata-spec-violation-array': { severity: 'Warning', configurableFor: true, errorFor: ['v5'] }, // more than 30 chars
+  'odata-spec-violation-array': { severity: 'Warning' }, // more than 30 chars
   // Published! Used in @cap-js-community/odata-v2-adapter; if renamed, add to oldMessageIds
-  'odata-spec-violation-assoc': { severity: 'Warning', configurableFor: true, errorFor: ['v5'] }, // more than 30 chars
+  'odata-spec-violation-assoc': { severity: 'Warning' }, // more than 30 chars
   // Published! Used in @cap-js-community/odata-v2-adapter; if renamed, add to oldMessageIds
   'odata-spec-violation-constraints': { severity: 'Info' }, // more than 30 chars
   'odata-spec-violation-id': { severity: 'Error', configurableFor: true },
-  'odata-spec-violation-namespace': { severity: 'Warning', configurableFor: true, errorFor: ['v5'] }, // more than 30 chars
+  'odata-spec-violation-namespace': { severity: 'Warning' }, // more than 30 chars
   // Published! Used in @cap-js-community/odata-v2-adapter; if renamed, add to oldMessageIds
-  'odata-spec-violation-param': { severity: 'Warning', configurableFor: true, errorFor: ['v5'] }, // more than 30 chars
+  'odata-spec-violation-param': { severity: 'Warning' }, // more than 30 chars
   // Published! Used in @cap-js-community/odata-v2-adapter; if renamed, add to oldMessageIds
-  'odata-spec-violation-returns': { severity: 'Warning', configurableFor: true, errorFor: ['v5'] }, // more than 30 chars
+  'odata-spec-violation-returns': { severity: 'Warning' }, // more than 30 chars
   'odata-spec-violation-type': { severity: 'Error', configurableFor: true },
-  'odata-spec-violation-type-unknown': { severity: 'Warning', configurableFor: true, errorFor: ['v5'] },
-  'odata-spec-violation-no-key':  { severity: 'Warning', configurableFor: true, errorFor: ['v5'] },
+  'odata-spec-violation-type-unknown': { severity: 'Error', configurableFor: true },
+  'odata-spec-violation-no-key':  { severity: 'Error', configurableFor: true },
   'odata-spec-violation-key-array':  { severity: 'Error', configurableFor: true }, // more than 30 chars
   'odata-spec-violation-key-null': { severity: 'Error', configurableFor: true }, // more than 30 chars
-  'odata-spec-violation-key-type': { severity: 'Warning', configurableFor: true, errorFor: ['v5'] }, // more than 30 chars
-  'odata-spec-violation-property-name': { severity: 'Warning', configurableFor: true, errorFor: ['v5'] }, // more than 30 chars
+  'odata-spec-violation-key-type': { severity: 'Warning' }, // more than 30 chars
+  'odata-spec-violation-property-name': { severity: 'Warning' }, // more than 30 chars
   'odata-anno-preproc': { severity: 'Warning' },
   'odata-anno-dict': { severity: 'Warning' },
   'odata-anno-vocref': { severity: 'Warning' },
@@ -290,7 +291,6 @@ const centralMessageTexts = {
   'anno-unstable-array': 'Unstable order of array items due to repeated assignments for $(ANNO)',
   'anno-mismatched-ellipsis': 'An array with $(CODE) can only be used if there is an assignment below with an array value',
   'anno-unexpected-ellipsis': 'No base annotation available to apply $(CODE)',
-  'anno-unexpected-mixin': 'Unexpected annotation on mixin definition',
 
   'anno-unexpected-localized-skip': {
     std: 'Compiler generated entity $(NAME) must not be annotated with $(ANNO) if $(ART) is not skipped',
@@ -351,7 +351,7 @@ const centralMessageTexts = {
   'syntax-ignoring-decimal': {
     std: 'Ignoring decimal places, because an integer was expected'
   },
-  'syntax-ignoring-anno': {
+  'syntax-unexpected-anno': {
     std: 'Annotations can\'t be used in a column with $(CODE)',
     doc: 'Doc comments can\'t be used in a column with $(CODE)',
   },
@@ -435,7 +435,6 @@ const centralMessageTexts = {
     service: 'Annotations can\'t be defined inside services',
     context: 'Annotations can\'t be defined inside contexts',
   },
-  // 'syntax-unexpected-space' (TODO: also use for :param, #variant, @(…) and @Begin),
   // 'syntax-unexpected-alias' (is 'syntax-unexpected-property' in CSN)
   'syntax-unsupported-param': {
     std: 'Parameter not supported', // unused
@@ -642,6 +641,8 @@ const centralMessageTexts = {
     std: 'Unexpected reference to association $(NAME)', // "std" currently unused
     unmanaged: 'Unexpected reference to an unmanaged association',
     'self-unmanaged': 'Unexpected column reference starting with $(ALIAS) to an unmanaged association',
+    'with-filter': 'Unexpected reference to an association with filter',
+    'self-with-filter': 'Unexpected column reference starting with $(ALIAS) to an association with filter',
     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',
@@ -683,6 +684,10 @@ const centralMessageTexts = {
     hdbcds:'Type $(TYPE) is not supported in HDBCDS',
     odata: 'Type $(TYPE) is not supported for OData'
   },
+  'ref-unexpected-var': {
+    std: 'Variable $(NAME) can\'t be used here',
+    'annotation': 'Variable $(NAME) can only be used in annotation values',
+  },
 
   // TODO: Better text ?
   'rewrite-not-supported': 'The ON-condition is not rewritten here - provide an explicit ON-condition',
@@ -746,6 +751,7 @@ const centralMessageTexts = {
     returns: 'Return value of $(ART) has no element $(NAME)',
     'enum-returns': 'Return value of $(ART) has no enum $(NAME)',
   },
+  'ext-undefined-key': 'Foreign key $(NAME) has not been found',
   'ext-undefined-action': {
     std: 'Action $(ART) has not been found',
     action: 'Artifact $(ART) has no action $(NAME)'
@@ -837,12 +843,6 @@ const centralMessageTexts = {
     'include-elements': 'Duplicate element $(NAME) through multiple includes $(SORTED_ARTS)',
     'include-actions': 'Duplicate action or function $(NAME) through multiple includes $(SORTED_ARTS)',
   },
-  // TODO: Remove in v5, use duplicate-definition (or another ID?)
-  'ref-duplicate-include-member': {
-    std: 'Duplicate member $(NAME) through multiple includes $(SORTED_ARTS)',
-    elements: 'Duplicate element $(NAME) through multiple includes $(SORTED_ARTS)',
-    actions: 'Duplicate action or function $(NAME) through multiple includes $(SORTED_ARTS)',
-  },
   'ref-invalid-element': {
     std: 'Invalid element reference',
     $tableAlias: 'Can\'t refer to source elements of table alias $(ID)',
@@ -859,6 +859,7 @@ const centralMessageTexts = {
     'old-not-target': 'Expected element $(NAME) not to be an association, because it overrides the included element from $(ART)',
   },
 
+  'ref-expecting-$self': 'Use $(NEWCODE) instead of $(CODE) here or remove $(CODE) altogether if possible; the compiler has rewritten it to $(NEWCODE) in CSN',
   'ref-expecting-assoc': 'Expecting path $(ELEMREF) following “EXISTS” predicate to end with association/composition, found $(TYPE)',
   'ref-expecting-const': 'A constant expression or variable is expected here',
   'ref-expecting-foreign-key': 'Expecting foreign key access after managed association $(NAME) in filter expression of $(ID), but found $(ALIAS)',
@@ -908,9 +909,7 @@ const centralMessageTexts = {
     'indirect': 'Type property $(PROP) can only be extended if directly provided at the definition',
     'new-prop': 'Type property $(PROP) can only be extended, not added',
     string: 'Only numerical properties can be extended, but found string for $(PROP)',
-    // eslint-disable-next-line max-len
     number: 'Value of type property $(PROP) must be $(NUMBER) or higher, it can\'t be smaller than originally provided',
-    // eslint-disable-next-line max-len
     scale: 'With the extension for type property $(OTHERPROP), the value of $(PROP) must be $(NUMBER) or higher',
   },
   'ext-missing-type-property': 'Type extension with property $(PROP) must also have property $(OTHERPROP) because $(ART) has both',
@@ -1193,7 +1192,8 @@ const centralMessageTexts = {
     'notaneelement': 'EDM Parameter path $(ELEMREF) can\'t be used in $(ANNO) which is applied to a type entity',
     'notrendered': 'EDM Path step $(COUNT) of $(ELEMREF) in $(ANNO) refers to an unrendered property in the OData API',
     'magic': 'Unexpected magic variable $(ELEMREF) in $(ANNO)',
-    'bparam_v2': 'Unexpected explicit binding parameter path $(ELEMREF) for OData $(VERSION) in $(ANNO)',
+    'bparam_v2_expl': 'Unexpected explicit binding parameter path $(ELEMREF) for OData $(VERSION) in $(ANNO)',
+    'bparam_v2_impl': 'Unexpected implicit binding parameter path $(ELEMREF) for OData $(VERSION) in $(ANNO)',
   },
   // -----------------------------------------------------------------------------------
   // OData Message section ends here, no messages below this line