@sap/cds-compiler 6.9.3 → 7.0.1

package/lib/api/main.js

@@ -24,7 +24,6 @@ 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 csnToEdm = lazyload('../edm/csn2edm');
 const trace = lazyload('../base/trace');
@@ -251,24 +250,6 @@ function forHdi( csn, options, messageFunctions ) {
   );
   return cloneCsn.sortCsnForTests(transformedCsn, internalOptions);
 }
-/**
- * Transform a CSN like to.hdbcds
- *
- * @param {CSN.Model} csn Plain input CSN
- * @param {HdbcdsOptions} options Options
- * @param {object} messageFunctions Message functions such as `error()`, `info()`, …
- * @returns {CSN.Model} CSN transformed like to.hdbcds
- * @private
- */
-function forHdbcds( csn, options, messageFunctions ) {
-  const internalOptions = prepareOptions.to.hdbcds(options);
-  internalOptions.transformation = 'hdbcds';
-  messageFunctions.setOptions( internalOptions );
-  const hanaCsn = forRelationalDB.transformForRelationalDBWithCsn(
-    csn, internalOptions, messageFunctions
-  );
-  return cloneCsn.sortCsnForTests(hanaCsn, internalOptions);
-}
 
 /**
  * Effective CSN transformation
@@ -769,37 +750,11 @@ hdi.migration = hdiMigration;
 
 sql.migration = sqlMigration;
 
-/**
- * Process the given CSN into HDBCDS artifacts.
- *
- * @param {any} csn A clean input CSN
- * @param {HdbcdsOptions} options Options
- * @param {object} messageFunctions Message functions such as `error()`, `info()`, …
- * @returns {HDBCDS} { <filename>:<content>, ...}
- */
-function hdbcds( csn, options, messageFunctions ) {
-  const internalOptions = prepareOptions.to.hdbcds(options);
-  internalOptions.transformation = 'hdbcds';
-  messageFunctions.setOptions( internalOptions );
-
-  // Since v5, the HDBCDS backend is considered deprecated.
-  // Since v6, it is a configurable error.
-  messageFunctions.message('api-deprecated-hdbcds', null, null);
-
-  if (options.tenantDiscriminator) {
-    messageFunctions.error('api-invalid-option', null, {
-      '#': 'forbidden',
-      option: 'tenantDiscriminator',
-      module: 'to.hdbcds',
-    });
-    messageFunctions.throwWithAnyError();
-  }
-
-  const hanaCsn = forHdbcds(csn, internalOptions, messageFunctions);
-  messageFunctions.setModel(hanaCsn);
-  const result = toHdbcds.toHdbcdsSource(hanaCsn, internalOptions, messageFunctions);
-  return flattenResultStructure(result);
+function hdbcds( _csn, _options, messageFunctions ) {
+  messageFunctions.error('api-deprecated-hdbcds', null, null);
+  messageFunctions.throwWithAnyError();
 }
+
 /**
  * Generate an edm document for the given service
  *
@@ -1138,7 +1093,6 @@ module.exports = {
   /** Internal only */
   for_sql: publishCsnProcessor(forSql, 'for.sql'),
   for_hdi: publishCsnProcessor(forHdi, 'for.hdi'),
-  for_hdbcds: publishCsnProcessor(forHdbcds, 'for.hdbcds'),
   for_effective: publishCsnProcessor(forEffective, 'for.effective'),
   for_seal: publishCsnProcessor(forSeal, 'for.seal'),
 };
@@ -1408,12 +1362,6 @@ function handleTenantDiscriminator( options, internalOptions, messageFunctions )
  * @typedef {object} CDL
  */
 
-/**
- * A map of { <file.hdbcds|hdbconstraint>:<content> }.
- *
- * @typedef {object} HDBCDS
- */
-
 /**
  * A map of { <file.hdbtable|hdbview|hdbprojectionview|hdbconstraint...>:<content> }.
  *

package/lib/api/options.js

@@ -27,7 +27,7 @@ const publicOptionsNewAPI = [
   'defaultStringLength',
   'csnFlavor',
   'noDollarCalc',
-  'v7KeyPropagation',
+  'v6KeyPropagation',
   // DB
   'sqlDialect',
   'sqlMapping',
@@ -38,8 +38,7 @@ const publicOptionsNewAPI = [
   'variableReplacements',
   'pre2134ReferentialConstraintNames',
   'betterSqliteSessionVariables',
-  'fewerLocalizedViews',
-  'sqliteRealAffinityForDecimal',
+  'decimal_affinity',
   'withHanaAssociations',
   'standardDatabaseFunctions',
   'booleanEquality',
@@ -98,6 +97,7 @@ const privateOptions = [
   'disableHanaComments',      // in case of issues with hana comment rendering
   'tenantDiscriminator',      // not published yet
   'localizedWithoutCoalesce', // deprecated version of 'localizedLanguageFallback', TODO(v7): Remove option
+  'sqliteRealAffinityForDecimal', // deprecated in favor of decimal_affinity, TODO(v7): Remove option
 ];
 
 const overallOptions = publicOptionsNewAPI.concat(privateOptions);
@@ -189,8 +189,9 @@ module.exports = {
         withHanaAssociations: false,
         booleanEquality: true,
         dollarNowAsTimestamp: false,
+        decimal_affinity: 'real',
       };
-      const processed = translateOptions(options, defaultOptions, hardOptions, undefined, [ 'sql-dialect-and-naming' ], 'to.sql');
+      const processed = translateOptions(options, defaultOptions, hardOptions, {}, [ 'sql-dialect-and-naming' ], 'to.sql');
 
       return Object.assign({}, processed);
     },
@@ -206,17 +207,6 @@ module.exports = {
       };
       return translateOptions(options, defaultOptions, hardOptions, { sqlDialect: generateStringValidator([ 'hana' ]) }, undefined, 'to.hdi');
     },
-    hdbcds: (options) => {
-      const hardOptions = { forHana: true };
-      // TODO: sqlDialect should be a hard option!
-      const defaultOptions = {
-        sqlMapping: 'plain',
-        sqlDialect: 'hana',
-        booleanEquality: false,
-        dollarNowAsTimestamp: true, // Keep v5 behavior; backend is deprecated
-      };
-      return translateOptions(options, defaultOptions, hardOptions, { sqlDialect: generateStringValidator([ 'hana' ]) }, undefined, 'to.hdbcds');
-    },
     edm: (options) => {
       const hardOptions = { json: true, combined: true, toOdata: true };
       const defaultOptions = { odataVersion: 'v4', odataFormat: 'flat' };

package/lib/api/validate.js

@@ -146,6 +146,7 @@ const validators = {
   },
   assertIntegrityType: generateStringValidator([ 'DB', 'RT' ]),
   tenantDiscriminator: { validate: () => true }, // do it ourselves
+  decimal_affinity: generateStringValidator([ 'numeric', 'real' ]),
 };
 
 // Note: if `validate()` returns true, it means the option is _invalid_!

package/lib/base/builtins.js

@@ -107,8 +107,7 @@ const exprProperties = [
  * Return whether JSON object `val` is a representation for an annotation expression
  */
 function isAnnotationExpression( val ) {
-  return val?.['='] !== undefined && // TODO: truthy
-    primaryExprProperties.some( prop => val[prop] !== undefined );
+  return val && primaryExprProperties.some( prop => val[prop] !== undefined );
 }
 
 module.exports = {

package/lib/base/csnRefs.js

@@ -617,13 +617,9 @@ function csnRefs( csn, universalReady ) {
     if (art.type) {               // TODO: make robust against "linked" = only direct
       if (art.type !== '$self')
         return artifactRef( art.type, BUILTIN_TYPE );
+      // binding parameter is typed with `$self` or `many $self`:
       const action = boundActionOrMain( art );
-      const binding = action?.params && Object.values( action.params )[0];
-      // binding parameter must be typed with `$self` or `many $self`:
-      const entity = binding && (art === binding || art === binding.items) &&
-        getCache( action, '_parent' );
-      // if name-deprecated-$self is a non-config error, this could be simplified to:
-      // const entity = action?.params && getCache( action, '_parent' );
+      const entity = action?.params && getCache( action, '_parent' );
       return entity || artifactRef( art.type, BUILTIN_TYPE );
     }
     if (typeof art.$origin === 'object') // null, […], {…}

package/lib/base/message-registry.js

@@ -38,24 +38,26 @@
 const { CompilerAssertion } = require( './error' );
 const { isDeprecatedEnabled } = require( './specialOptions' );
 
-const configurableForValidValues = {
+const configurableForValidValues = { // for configurableFor: …
   __proto__: null,
   // can always be downgraded, we do not really care:
   true: () => true,
-  // like `true`, but is intended to be removed or made 'deprecated' with v7:
-  v7: () => true,
+  // like `true`, but is intended to be removed or made 'deprecated' with v8:
+  before_v8: () => true,
   // only configurable if option deprecated.downgradableErrors is set:
   deprecated: options => isDeprecatedEnabled( options, 'downgradableErrors' ),
+  // only with option deprecated.downgradableErrors, intended to be removed with v8:
+  deprecated_before_v8: options => isDeprecatedEnabled( options, 'downgradableErrors' ),
   // still allow to produce output in tests:
   test: options => options.testMode != null,
 };
 
-const validModules = [          // for configurableFor and errorFor
-  'v7',               // pseudo module in errorFor: planned as error
+const validModules = [          // for errorFor: …
+  'v8',                         // pseudo module in errorFor: planned as error
+  // ./messages.js test for 'v8' to write `Warning‹↑›…` into test3/**/*.err
   'compile',
   'for.odata',
   'to.edmx',
-  'to.hdbcds',
   'to.hdi',
   'to.sql',
   'to.sql.migration',
@@ -77,7 +79,7 @@ const validModules = [          // for configurableFor and errorFor
  * @type {Object<string, MessageConfig>}
  */
 const centralMessages = {
-  'api-deprecated-hdbcds': { severity: 'Error', configurableFor: true },
+  'api-deprecated-hdbcds': { severity: 'Error' },
   'anno-definition':        { severity: 'Warning' },
   'anno-duplicate':         { severity: 'Error', configurableFor: true }, // does not hurt us
   'anno-duplicate-unrelated-layer': { severity: 'Error', configurableFor: true }, // does not hurt us
@@ -89,11 +91,9 @@ const centralMessages = {
   'anno-invalid-sql-kind': { severity: 'Error', configurableFor: true  },  // @sql.prepend/append - configurable for "I know what I'm doing"
   'anno-invalid-sql-view': { severity: 'Error', configurableFor: true  },  // @sql.prepend/append - configurable for "I know what I'm doing"
   'anno-invalid-sql-view-element': { severity: 'Error', configurableFor: true },  // @sql.prepend/append - configurable for "I know what I'm doing"
-  'ext-duplicate-include': { severity: 'Warning', errorFor: [ 'v7' ] },
+  'ext-duplicate-include': { severity: 'Error', configurableFor: 'deprecated_before_v8' },
   'ext-undefined-action':  { severity: 'Warning' },
-  '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-art-sec': { severity: 'Error', configurableFor: true }, // for security-relevant…
+  'ext-undefined-def':     { severity: 'Warning' }, // for annotate statement
   'ext-undefined-def-sec': { severity: 'Error', configurableFor: true }, // … annotate statement
   'ext-undefined-element': { severity: 'Warning' },
   'ext-undefined-key':     { severity: 'Warning' },
@@ -101,23 +101,21 @@ const centralMessages = {
   'ext-undefined-element-sec': { severity: 'Error', configurableFor: true }, // for security-relevant…
   'ext-undefined-action-sec': { severity: 'Error', configurableFor: true }, // for security-relevant…
   'ext-undefined-param-sec': { severity: 'Error', configurableFor: true }, // … annotate statement
-  'ext-unexpected-type-property': { severity: 'Warning', errorFor: [ 'v7' ] },
+  'ext-unexpected-type-property': { severity: 'Error', configurableFor: 'before_v8' },
   'ext-unexpected-returns': { severity: 'Warning' },
   'ext-unexpected-returns-sec': { severity: 'Error', configurableFor: true }, // … annotate statement
-  'anno-unexpected-ellipsis': { severity: 'Error', configurableFor: 'deprecated' },
+  'anno-unexpected-ellipsis': { severity: 'Error', configurableFor: 'deprecated' }, // or ok?
   'anno-unexpected-localized-skip': { severity: 'Error', configurableFor: true },
 
   'name-invalid-dollar-alias': { severity: 'Error', configurableFor: true },
-  'name-deprecated-$self': { severity: 'Error', configurableFor: true },
+  'name-deprecated-$self': { severity: 'Error' },
 
   'type-invalid-items': { severity: 'Error' }, // not supported yet
   'assoc-as-type':  { severity: 'Error' }, // TODO: allow more, but not all
   'def-unexpected-nested-proj': { severity: 'Error' },
-  'def-unexpected-paramview-assoc': { severity: 'Error' },
-  'def-unexpected-calcview-assoc': { severity: 'Error' },
   'def-missing-type':    { severity: 'Error', configurableFor: [ 'compile' ] },
   'def-missing-argument':    { severity: 'Error' },
-  'check-proper-type-of': { severity: 'Info',  errorFor: [ 'for.odata', 'to.edmx', 'to.hdbcds', 'to.sql', 'to.hdi', 'to.rename', 'for.effective' ] },
+  'check-proper-type-of': { severity: 'Info',  errorFor: [ 'for.odata', 'to.edmx', 'to.sql', 'to.hdi', 'to.rename', 'for.effective' ] },
 
   'def-duplicate-autoexposed': { severity: 'Error' },
   'def-unexpected-default': { severity: 'Error', configurableFor: 'test' },
@@ -127,15 +125,18 @@ 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: 'Error', configurableFor: 'v7' },
+  'ref-deprecated-self-element': { severity: 'Error', configurableFor: 'before_v8' },
   'ref-deprecated-variable': { severity: 'Warning' },
   'ref-deprecated-in-extend': { severity: 'Warning' },
   'ref-special-in-extend': { severity: 'Warning' },
   'ref-unexpected-in-extend': { severity: 'Error' },
   'ref-invalid-type': { severity: 'Error' },
   'ref-unexpected-self': { severity: 'Error' },
+  'ref-duplicate-self-comparison': { severity: 'Error', configurableFor: 'before_v8' },
   'ref-invalid-include': { severity: 'Error' },
   'type-unexpected-typeof': { severity: 'Error' },
+  'type-unexpected-default-struct': { severity: 'Error', configurableFor: true },
+  'type-unexpected-default-array': { severity: 'Error', configurableFor: true },
   'type-unexpected-null': { severity: 'Error', configurableFor: true },
   'type-ignoring-argument': { severity: 'Error', configurableFor: true },
   'type-expected-builtin': { severity: 'Error', configurableFor: true },
@@ -145,8 +146,9 @@ const centralMessages = {
   'ref-expecting-foreign-key': { severity: 'Error' },
   'ref-invalid-source': { severity: 'Error' },
   'ref-invalid-target': { severity: 'Error' },
+  'ref-invalid-backlink': { severity: 'Error', configurableFor: 'before_v8' },
   'ref-missing-self-counterpart': { severity: 'Error', configurableFor: true },
-  'ref-sloppy-target': { severity: 'Error', configurableFor: 'deprecated' },
+  'ref-sloppy-target': { severity: 'Error', configurableFor: 'deprecated_before_v8' },
 
   'extend-repeated-intralayer': { severity: 'Warning' },
   'extend-unrelated-layer':     { severity: 'Info' },
@@ -156,8 +158,6 @@ const centralMessages = {
 
   'param-default': { severity: 'Error' }, // not supported yet
 
-  'query-unexpected-assoc-hdbcds': { severity: 'Error' },
-  'query-unexpected-structure-hdbcds': { severity: 'Error' },
   'query-ignoring-param-nullability': { severity: 'Info' },
   'query-expected-identifier': { severity: 'Error' },
   'query-invalid-identifier': { severity: 'Warning' },
@@ -170,7 +170,6 @@ const centralMessages = {
   'ref-unexpected-many-expand': { severity: 'Error' },
   'ref-unexpected-many-navigation': { severity: 'Error' },
   // Published! Used in @sap/cds-lsp; if renamed, add to oldMessageIds and contact colleagues
-  'ref-undefined-art':    { severity: 'Error' },
   'ref-undefined-def':    { severity: 'Error' },
   'ref-undefined-using':  { severity: 'Warning' },
   'ref-undefined-var':    { severity: 'Error' },
@@ -178,10 +177,10 @@ const centralMessages = {
   'anno-undefined-element': { severity: 'Error' },
   'ref-unknown-var': { severity: 'Info' },
   'ref-obsolete-parameters': { severity: 'Error', configurableFor: 'deprecated' },
-  // does not hurt us, but makes it tedious to detect parameter refs
+  // does not hurt us, but makes it tedious to detect parameter refs (unchecked by csn-refs)
   'ref-undefined-param': { severity: 'Error' },
-  'ref-undefined-enum': { severity: 'Warning', errorFor: [ 'to.sql', 'to.hdbcds', 'to.hdi' ] },
-  'ref-unexpected-enum': { severity: 'Warning', errorFor: [ 'to.sql', 'to.hdbcds', 'to.hdi' ] },
+  'ref-undefined-enum': { severity: 'Warning', errorFor: [ 'to.sql', 'to.hdi' ] },
+  'ref-unexpected-enum': { severity: 'Warning', errorFor: [ 'v8', 'to.sql', 'to.hdi' ] },
   'anno-undefined-param': { severity: 'Error' },
   'ref-rejected-on': { severity: 'Error' },
   'ref-expected-element': { severity: 'Error' },
@@ -197,8 +196,8 @@ const centralMessages = {
   'expr-unexpected-operator': { severity: 'Error' },
 
   // Published! Used in @sap/cds-lsp; if renamed, add to oldMessageIds and contact colleagues
-  // Also used by other projects that rely on double-quotes for delimited identifiers.
-  'syntax-deprecated-ident': { severity: 'Error', configurableFor: true },
+  // Also used by other projects that rely on double-quotes for delimited identifiers:
+  'syntax-deprecated-ident': { severity: 'Error', configurableFor: true }, // ok for us
   'syntax-deprecated-property': { severity: 'Error', configurableFor: 'test' }, // v0 prop
   'syntax-deprecated-value': { severity: 'Error', configurableFor: 'test' }, // v0 prop
   // 'syntax-duplicate-annotate' came late with v3 - make it configurable as
@@ -209,24 +208,23 @@ const centralMessages = {
   // remark: a hard syntax error in new parser for `null` together with `not null`
   'syntax-duplicate-equal-clause': { severity: 'Warning' },
   'syntax-invalid-name': { severity: 'Error' },
-  'syntax-invalid-anno-struct': { severity: 'Warning', errorFor: [ 'v7' ] },
-  'syntax-invalid-nested-proj': { severity: 'Warning', errorFor: [ 'v7' ] },
-  'syntax-missing-as': { severity: 'Error', configurableFor: true },
+  'syntax-invalid-anno-struct': { severity: 'Error' }, // not configurable with v7
+  'syntax-invalid-nested-proj': { severity: 'Warning', errorFor: [ 'v8' ] },
+  'syntax-missing-as': { severity: 'Error', configurableFor: true }, // ok for us
   'syntax-missing-proj-semicolon': { severity: 'Warning' },
   'syntax-unexpected-after': { severity: 'Error' },
-  'syntax-unexpected-filter': { severity: 'Error', configurableFor: 'v7' },
+  'syntax-unexpected-filter': { severity: 'Error' }, // TODO v8 - via grammar
   'syntax-unexpected-many-one': { severity: 'Error' },
   'syntax-deprecated-ref-virtual': { severity: 'Error' },
-  'syntax-unexpected-reserved-word': { severity: 'Error', configurableFor: true },
-  'syntax-unexpected-with-returns': { severity: 'Warning' },   // errorFor: [ 'v8' ] }, or v7?
-  'syntax-unknown-escape': { severity: 'Error', configurableFor: true },
-  'syntax-unsupported-masked': { severity: 'Error', configurableFor: 'deprecated' },
+  'syntax-unexpected-reserved-word': { severity: 'Error', configurableFor: true }, // ok for us
+  'syntax-unexpected-with-returns': { severity: 'Warning', errorFor: [ 'v8' ] },
+  'syntax-unknown-escape': { severity: 'Error', configurableFor: true }, // ok for us
   'syntax-unexpected-sql-clause': { severity: 'Error' }, // TODO: configurableFor:'tests'?
-  'syntax-invalid-space': { severity: 'Error', configurableFor: true },
+  'syntax-invalid-space': { severity: 'Error', configurableFor: true }, // TODO: no error
   'syntax-expecting-space': { severity: 'Error' },
   'syntax-unexpected-anno': { severity: 'Error' },
   'migration-unsupported-key-change': { severity: 'Error', configurableFor: [ 'to.sql.migration', 'to.sql.migration-script' ] },
-  'type-missing-enum-value': { severity: 'Error', configurableFor: 'deprecated' },
+  'type-missing-enum-value': { severity: 'Error', configurableFor: 'deprecated_before_v8' },
 
   'def-missing-element': { severity: 'Error' },
   'def-missing-virtual': { severity: 'Error', configurableFor: true },
@@ -239,6 +237,7 @@ const centralMessages = {
   'odata-unexpected-assoc': { severity: 'Warning' },
   'odata-incomplete-constraints': { severity: 'Info' },
   'odata-invalid-name': { severity: 'Error', configurableFor: true },
+  'odata-invalid-name-v2': { severity: 'Warning' },
   'odata-invalid-vocabulary-alias': { severity: 'Error', configurableFor: true },
   'odata-invalid-qualifier': { severity: 'Error', configurableFor: true },
   'odata-invalid-service-name': { severity: 'Warning' },
@@ -330,7 +329,8 @@ for (const oldName in oldMessageIds) {
 // If you change it, keep in sync with scripts/eslint/rules/message-text.js
 
 const centralMessageTexts = {
-  'api-deprecated-hdbcds': 'Support for generating hdbcds output is deprecated with @sap/cds-compiler v5 and later',
+  'api-invalid-deprecated': 'Deprecated flag $(NAME) has been removed in CDS compiler $(COMPILER)',
+  'api-deprecated-hdbcds': 'to.hdbcds() has been removed; use to.hdi() instead — see https://cap.cloud.sap/docs/cds/compiler/hdbcds-to-hdbtable',
   'api-invalid-option': {
     std: 'Invalid option $(NAME)!',
     deprecated: 'Option $(NAME) is no longer supported! Use latest API options instead',
@@ -433,7 +433,6 @@ const centralMessageTexts = {
   'name-missing-alias': {
     std: 'Missing table alias for this subquery',
     duplicate: 'Missing table alias for this subquery; add $(CODE) to fix name clash of internal and explicit table alias',
-    hdbcds: 'Missing table alias for a subquery; SAP HANA CDS requires table aliases',
   },
 
   // Syntax messages, both CDL and CSN parser: ----------------------------------
@@ -504,12 +503,15 @@ const centralMessageTexts = {
   'syntax-invalid-anno': {
     std: 'Unexpected $(OFFENDING), invalid annotation value, expecting $(EXPECTING)',
     empty: 'Unexpected $(OFFENDING), empty structure flattens to nothing, expecting $(EXPECTING)',
+    // empty could be part of syntax-invalid-struct
+    // rename "rest" to syntax-invalid-ellipsis
     ellipsis: 'Unexpected $(OFFENDING) in inner array value, expecting $(EXPECTING)',
     bracket: 'Missing array item $(CODE) before $(OFFENDING), expecting $(EXPECTING)',
   },
-  'syntax-unsupported-masked': { // configurable Error
-    std: 'The keyword $(KEYWORD) is not supported',
-    csn: 'The property $(PROP) is not supported',
+  'syntax-invalid-special': {   // -> invalid-array
+    std: 'Invalid value in property $(PROP)',
+    long: 'Too many array items in property $(PROP)',
+    sum: 'Sum of numbers in property $(PROP) exceeds number of elements',
   },
 
   // Syntax messages, CDL parser  -----------------------------------------------
@@ -545,7 +547,7 @@ const centralMessageTexts = {
   },
   'syntax-invalid-anno-struct': {
     std: 'Most CSN processors interpret a structure with property $(PROP) as expression',
-    ref: 'Most CSN processors interpret a structure with property $(PROP) as reference',
+    ref: 'The value of property $(PROP) must be a non-empty string, which most CSN processors interpret as reference',
   },
   // 'syntax-ignoring-doc-comment' (Info)
   'syntax-unexpected-reserved-word': '$(CODE) is a reserved word - write $(DELIMITED) instead if you want to use it as name',
@@ -609,7 +611,7 @@ const centralMessageTexts = {
   'syntax-expecting-string': {
     std: 'Expecting non-empty string for property $(PROP)',
     'or-object': 'Expecting non-empty string or object for property $(PROP)',
-    'or-bool': 'Expecting non-empty string or boolean for property $(PROP)',
+    'or-true': 'Expecting non-empty string or true for property $(PROP)',
     'or-null': 'Expecting non-empty string or null for property $(PROP)',
   },
   // 'syntax-expecting-boolean' (Warning), 'syntax-expecting-scalar',
@@ -675,7 +677,6 @@ const centralMessageTexts = {
     std: 'Calculated elements are not supported, yet',
     nested: 'Calculated elements in structures are not supported, yet',
     'on-write': 'Calculated elements on-write are not supported, yet',
-    hdbcds: 'Calculated elements on-write are not supported for HDBCDS',
   },
   // 'syntax-unknown-property' (Warning? Better configurable Error)
 
@@ -749,7 +750,8 @@ const centralMessageTexts = {
   },
   'ref-undefined-def': {
     std: 'Artifact $(ART) has not been found',
-    // TODO: proposal 'No definition of $(NAME) found',
+    using: 'Artifact $(ART) can\'t be referred to without a $(KEYWORD) declaration',
+    localized: 'Artifact $(ART) has not been found, or it might be a localization view which can\'t be extended',
     hint: 'Artifact $(ART) has not been found. Did you mean to write $(CODE)?',
     element: 'Artifact $(ART) has no element $(MEMBER)',
   },
@@ -759,12 +761,7 @@ const centralMessageTexts = {
     entity: 'Entity $(ART) has no parameter $(ID)',
     action: 'Action $(ART) has no parameter $(ID)',
   },
-  'ref-undefined-art': {
-    std: 'No artifact has been found with name $(ART)',
-    localized: 'Can\'t extend localized definitions, only annotate them using an $(KEYWORD) statement',
-  },
   'ref-undefined-using': 'There is no definition in the model whose name starts with $(ART)',
-  // TODO: proposal 'No definition found for $(NAME)',
   'ref-undefined-element': {
     std: 'Element $(ART) has not been found',
     element: 'Artifact $(ART) has no element $(MEMBER)',
@@ -895,7 +892,6 @@ const centralMessageTexts = {
     std: 'Type $(TYPE) is not supported',
     dialect: 'Type $(TYPE) is not supported for SQL dialect $(VALUE)',
     hana: 'Type $(TYPE) is only supported for SQL dialect $(VALUE), not $(OTHERVALUE)',
-    hdbcds:'Type $(TYPE) is not supported in HDBCDS',
     odata: 'Type $(TYPE) is not supported for OData $(VERSION)',
     key: 'Type $(TYPE) can\'t be used as primary key in element $(NAME)',
   },
@@ -918,8 +914,10 @@ const centralMessageTexts = {
     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',
   },
-  'rewrite-undefined-key': 'Can\'t redirect association $(NAME), as redirection target $(TARGET) does not project element $(ID), which is required to match foreign key of $(NAME)',
-
+  'rewrite-undefined-key': {
+    std: 'Can\'t redirect association $(NAME), as redirection target $(TARGET) does not project element $(ID), which is required to match foreign key of $(NAME)',
+    backlink: 'Can\'t project association, as the current entity does not project element $(ID), which is required to match foreign key of the backlink association',
+  },
   'type-unexpected-typeof': {
     std: 'Unexpected $(KEYWORD) for the type reference here',
     type: 'Unexpected $(KEYWORD) for the type of a type definition',
@@ -934,7 +932,6 @@ const centralMessageTexts = {
     std: 'Missing value for non-string enum element $(NAME)',
     numeric: 'Missing value for numeric enum element $(NAME)',
   },
-  'type-missing-argument': 'Missing value for argument $(NAME) in reference to type $(ID)',
   'type-ignoring-argument': 'Too many arguments for type $(ART)',
   'type-unexpected-argument': {
     std: 'Too many arguments for type $(ART)', // we use config 'type-ignoring-argument' instead
@@ -983,9 +980,7 @@ const centralMessageTexts = {
 
   'anno-builtin': 'Builtin types should not be annotated nor extended. Use custom type instead',
   'ext-undefined-def': 'Artifact $(ART) has not been found',
-  'ext-undefined-art': 'No artifact has been found with name $(ART)',
   'ext-undefined-def-sec': 'Artifact $(ART) has not been found',
-  'ext-undefined-art-sec': 'No artifact has been found with name $(ART)',
   'ext-undefined-element': {
     std: 'Element $(NAME) has not been found',
     enum: 'Enum symbol $(NAME) has not been found',
@@ -1011,6 +1006,18 @@ const centralMessageTexts = {
   'ext-undefined-param-sec': {
     std: 'Parameter $(NAME) has not been found',
   },
+  'ext-unexpected-returns': {
+    std: 'Unexpected $(KEYWORD); only actions and functions have return parameters',
+    action: 'Unexpected $(KEYWORD) for action without return parameter',
+    // function without `returns` can happen via CSN input! TODO: check in parser
+    function: 'Unexpected $(KEYWORD) for function without return parameter',
+  },
+  'ext-unexpected-returns-sec': {
+    std: 'Unexpected $(KEYWORD); only actions and functions have return parameters',
+    action: 'Unexpected $(KEYWORD) for action without return parameter',
+    // function without `returns` can happen via CSN input! TODO: check in parser
+    function: 'Unexpected $(KEYWORD) for function without return parameter',
+  },
 
   // annotation checks against their definition
   'anno-expecting-value': {
@@ -1018,22 +1025,12 @@ const centralMessageTexts = {
     type:  'Expecting a value of type $(TYPE) for the annotation',
   },
 
-  'def-unexpected-paramview-assoc': {
-    std: 'unused',
-    source: 'Unexpected definition of an association in an entity with parameters',
-    target: 'Expected association target to have no parameters',
-  },
   'def-unexpected-nested-proj': {
     std: 'Unexpected $(CODE)',
     var: 'Unexpected $(CODE) after reference to CDS variable',
     struct: 'Unexpected $(CODE); can only be used after a reference to a structure or association',
     init: 'Unexpected $(CODE); can only be used after a reference to a structure, association or table alias',
   },
-  'def-unexpected-calcview-assoc': {
-    std: 'unused',
-    source: 'Unexpected definition of an association in an entity annotated with $(ANNO)',
-    target: 'Expected association target not to be annotated with $(ANNO)',
-  },
   'def-invalid-key': {
     std: 'The current element can\'t be defined as primary key', // (unused)
     unmanaged: 'Unmanaged associations/compositions can\'t be defined as primary key',
@@ -1177,6 +1174,12 @@ const centralMessageTexts = {
     event: 'An event\'s projection source must be an entity, structured type, aspect, event, or an association element',
     type: 'A type\'s projection source must be an entity, structured type, aspect, event, or an association element',
   },
+  'ref-invalid-backlink': {
+    std: 'The target $(TARGET) of the backlink association is unrelated to the current entity',
+    aspect: 'The target $(TARGET) of the backlink association is unrelated to the current aspect',
+    include: 'The open backlink target $(TARGET) of the aspect is unrelated to the current entity',
+    backlink: 'Can\'t use $(ART) as backlink association, because its ON-condition contains a backlink comparison',
+  },
   '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',
@@ -1234,13 +1237,11 @@ const centralMessageTexts = {
     std: 'Target $(TARGET) of $(NAME) is missing element $(ID); use $(KEYWORD) with an explicit ON-condition',
     redirected: 'Target $(TARGET) of $(NAME) is missing element $(ID); add an ON-condition to $(KEYWORD)',
   },
-  'query-unexpected-assoc-hdbcds': 'Publishing a managed association in a view is not possible for “hdbcds” naming mode',    // eslint-disable-line cds-compiler/message-no-quotes
   'query-unexpected-exists': {
     std: 'Unexpected $(PROP) predicate',
     groupBy: 'Unexpected $(PROP) predicate in GROUP BY clause',
     orderBy: 'Unexpected $(PROP) predicate in ORDER BY clause',
   },
-  'query-unexpected-structure-hdbcds': 'Publishing a structured element in a view is not possible for “hdbcds” naming mode', // eslint-disable-line cds-compiler/message-no-quotes
   'query-ignoring-param-nullability': {
     std: 'Ignoring nullability constraint on parameter when generating SAP HANA CDS view',
     sql: 'Ignoring nullability constraint on parameter when generating SQL view',
@@ -1403,10 +1404,8 @@ const centralMessageTexts = {
   'odata-invalid-return-type': 'Expected $(KIND) to return one or many values of scalar, complex, entity or view type for OData $(VERSION)',
   'odata-unexpected-assoc': 'Unexpected association in structured type for OData $(VERSION)',
   'odata-incomplete-constraints': 'Partial referential constraints produced for OData $(VERSION)',
-  'odata-invalid-name': {
-    std: 'Expected OData name $(ID) to start with an alphabetic character or underscore, followed by a maximum of 127 alphabetic characters, digits, or underscores',
-    v2firstChar: 'Unexpected first character $(PROP) of OData name $(ID) for OData $(VERSION)',
-  },
+  'odata-invalid-name': 'Expected OData name $(ID) to start with an alphabetic character or underscore, followed by a maximum of 127 alphabetic characters, digits, or underscores',
+  'odata-invalid-name-v2': 'Expected OData V2 name $(ID) to start with an alphabetic character, followed by a maximum of 479 alphabetic characters, digits, or underscores',
   'odata-invalid-vocabulary-alias': 'Expected value $(VALUE) of OData vocabulary reference attribute $(ID) to start with an alphabetic character or underscore, followed by a maximum of 127 alphabetic characters, digits, or underscores',
   'odata-invalid-qualifier': 'Expected OData annotation qualifier $(ID) to start with an alphabetic character or underscore, followed by a maximum of 127 alphabetic characters, digits, or underscores',
   // version independent messages
@@ -1458,6 +1457,10 @@ const centralMessageTexts = {
     xpr: 'Ignoring unexpected expression as default value',
     colitem: 'Ignoring unexpected default value for a structured or collection like parameter',
   },
+  'odata-unexpected-default-struct': 'Default value for structured element $(NAME) is not allowed',
+  'type-default-ignored-for-struct': {
+    std: 'Ignoring default value for structured element $(NAME) with multiple fields; default values are only supported for single-field structures',
+  },
   'odata-unexpected-xpr-anno': 'Annotation $(ANNO) with expression value is not allowed for kind $(KIND)',
   // -----------------------------------------------------------------------------------
   // All odata-anno MUST have a '$(ANNO)' parameter to indicate error location
@@ -1605,11 +1608,14 @@ const centralMessageTexts = {
  *
  * @typedef {object} MessageConfig
  * @property {MessageSeverity} severity Default severity for the message.
- * @property {string[]|'deprecated'|'v4'|'test'|true} [configurableFor]
+ * @property {string[]|(keyof configurableForValidValues)|true} [configurableFor]
  *        Whether the error can be reclassified to a warning or lower.
- *        If not `true` then an array is expected with specified modules in which the error is downgradable.
+ *        If an array, it contains module names (see validModules) in which the error is downgradable.
+ *        If a string, it must be a key of `configurableForValidValues` (e.g. 'deprecated', 'before_v8').
+ *        If `true`, always allow downgrade.
+
+
  *        Only has an effect if default severity is 'Error'.
- *        'deprecated': severity can only be changed with deprecated.downgradableErrors.
  * @property {string[]} [errorFor] Array of module names where the message shall be reclassified to an error.
  * @property {boolean} [throughMessageCall]
  *        If set, it means that a message-id was added to the registry in test-mode through a `message.<severity>()`