@sap/cds-compiler 4.0.2 → 4.1.2

package/CHANGELOG.md

@@ -7,6 +7,74 @@
 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.1.2 - 2023-07-31
+
+### Fixed
+
+- to.hdi.migration: Changes in constraints are not rendered as part of the .hdbmigrationtable file, as they belong in other HDI artifacts
+
+## Version 4.1.0 - 2023-07-28
+
+### Added
+
+- Calculated elements "on-read" can now reference localized elements.
+- Aliases for columns inside sub-queries are now optional, also for expressions.
+- for.odata/to.hdi/to.sql: Specified default value on a managed association is forwarded to a foreign key
+  if association has exactly one foreign key.
+- CDL: Annotation-only aspects having no `elements` and `actions` can now be defined with
+  the CDL syntax `@Anno… aspect Name;`.  They cannot be extended with elements or actions
+  in order to ensure that they can always be used to extend non-structures.
+  To allow the former but not the latter, use `@Anno… aspect Name {…};`.
+- to.sql: Support session variables for h2
+
+### Changed
+
+- api: Function `isInReservedNamespace(name)` handles name `cds` as being in a reserved namespace as well.
+- `CompilationError.messages` are now sorted severity aware. Errors are listed first.
+- Compiler:
+  + Improve the calculation of semantic code completion candidates.
+  + Some checks, like those for valid `on` conditions of associations,
+    are now already done with `compile` and not just the backends.
+  + SQL `cast()`s must always have a `type` property
+  + Type properties such as `precision` or `length` must be accompanied by a type (possibly inferred).
+- for.odata/to.hdi/to.sql: No longer reject unmanaged associations as foreign keys of a managed association.
+  Instead, ignore such references during ON-condition rewriting and foreign key generation. Referring to
+  unmanaged associations is incompatible with SAP HANA CDS naming mode 'hdbcds'.
+- to.sql: Rework session variables for postgres.
+- Update OData vocabularies: 'Common', 'HTML5', 'PersonalData', 'UI'.
+
+### Fixed
+
+- Compiler:
+  + ensure that annotations of elements in anonymous aspects of managed compositions
+    are not lost.
+  + issue error for definitions like `entity Self as projection on Base { $self.* };`
+    instead of simply concluding that the projection has zero elements.
+  + do not report a invalid cyclic dependency if associations between two entities
+    are valid cycles.
+  + Element type references can again follow associations (removed v4.0 incompatibility).
+- to.sql:
+  + `$self` references inside a nested projection using `$self` was incorrectly resolved.
+  + associations to entities marked with `@cds.persistence.skip` were not properly
+    checked inside nested projections.
+  + Select items casting `null` to an arrayed type work again, e.g. `null as ManyType`.
+- to.sql/hdi/hdbcds: Raise a nice error message for `@sql.append` on managed associations/compositions,
+  as we do for structured error messages.
+- to.cdl: Annotations with multiple qualifiers (`#`) are now rendered correctly.
+- to.edm(x): Revert change introduced with [3.9.0](#version-390---2023-04-20)
+    "Correct referential constraint calculation for `[0..1]` backlink associations".
+- for.odata: Process shortcut annotations sequence independent.
+- to.sql.migration:
+  + Respect unique and referential constraints for delta calculation.
+  + Added a configurable error for primary key additions, as those will lead to errors if the table
+    contains data. This could lead to inconsistent states if
+    some deployments succeed and others fail, so by default it is an error.
+
+### Removed
+
+- Compiler:
+  + forbid wildcards in projection extensions: `extend … with columns { * )`.
+  + forbid column references such as `$user.*`, `$user.{id}` and `$user {id}`.
 
 ## Version 4.0.2 - 2023-06-22
 
@@ -77,8 +145,6 @@ The compiler behavior concerning `beta` features can change at any time without
   + Table alias and mixin names can no longer start with `$`. Choose a different name. With this change
     we avoid unexpected name resolution effects in combination with built-in `$`-variables.
   + A semicolon is now required after a type definition like `type T : many {} null`.
-  + It is no longer possible to write `type of $self.‹elem›` to refer to the element `‹Def›.‹elem›`
-    where `‹Def›` is the main artifact where the type expression is embedded in. Replace by `type of <Def>:‹elem›`.
   + Message ID `duplicate-autoexposed` was changed to `def-duplicate-autoexposed`.
 - Update OData vocabularies 'Common', 'UI'.
 - to.sql:
@@ -96,7 +162,12 @@ The compiler behavior concerning `beta` features can change at any time without
   + `parseCdl` CSN did not include correct `...` entries for annotations containing `... up to`
   + Type references inside calculated elements were not always correctly resolved.
   + `USING` empty files were incorrectly marked as "not found".
+  + Correct the handling of `$self` references in nested projections and filters in queries.
   + If an association was inside `items`, e.g. via type chains, the compiler crashes instead of emitting proper errors.
+  + References in the user-provided `on` conditions of associations with a to be
+    auto-redirected model entity as target were not always resolved correctly.
+    Complain in error situations.
+  + Make extend code robust against prototype-polluted JS classes.
 - Localized convenience views for projections (not views) did not have references rewritten.
   This only affects CSN, the SQL result was correct.
 - Calculated elements in composition-of-aspect lost their `value` when generating composition targets.
@@ -116,9 +187,33 @@ The compiler behavior concerning `beta` features can change at any time without
 - NodeJs 14 is no longer supported.
 - `CompileMessage` no longer has property `location`, which was deprecated in v2.1.0, but `$location`,
   which is supported since v2.1.0
-- "Smart type references" such as `Entity.myElement` instead of `Entity:myElement` are removed, because since
-  compiler v2, `Entity.myElement` could also be a definition, creating ambiguities.
-- Element type references can no longer follow associations, i.e. `E:assoc.id` is not allowed.
+- compiler:
+  + It is no longer possible to write `type of $self.‹elem›` to refer to the element `‹Def›.‹elem›`
+    where `‹Def›` is the main artifact where the type expression is embedded in. Replace by `type of <Def>:‹elem›`.
+  + Element type references can no longer follow associations, i.e. `E:assoc.id` is not allowed
+    (v4.0 only, re-introduced with v4.1).
+  + "Smart type references" such as `Entity.myElement` instead of `Entity:myElement`
+    are removed, because since - `Entity.myElement` could also be a definition,
+    creating ambiguities. This did not work always, anyway.
+
+
+## Version 3.9.6 - 2023-07-27
+
+### Fixed
+
+- to.edm(x): Revert change introduced with [3.9.0](#version-390---2023-04-20)
+    "Correct referential constraint calculation for `[0..1]` backlink associations".
+- for.odata: Process shortcut annotations sequence independent.
+
+## Version 3.9.4 - 2023-06-07
+
+### Fixed
+
+- compiler: `USING` empty files were incorrectly marked as "not found".
+- Localized convenience views for projections (not views) did not have references rewritten.
+  This only affects CSN, the SQL result was correct.
+- to.edm(x): Render correct EntitySetPath and annotation target path for actions/functions
+  with explicit binding parameter.
 
 ## Version 3.9.2 - 2023-04-27
 

package/bin/cdsc.js

@@ -499,29 +499,29 @@ function executeCommandLine( command, options, args ) {
 
     sortMessages(messages);
 
+    const msgConfig = {
+      normalizeFilename,
+      noMessageId: !!options.noMessageId,
+      hintExplanation: true,
+      color: options.color,
+      module: options.testMode && 'compile', // TODO: use module name
+      sourceMap: fileCache,
+      cwd: '',
+    };
+
     if (options.internalMsg) {
       messages.map(msg => util.inspect( msg, { depth: null, maxArrayLength: null } ) )
         .forEach(msg => log(msg));
     }
     else if (options.noMessageContext) {
       messages.filter(msg => (messageLevels[msg.severity] <= options.warning))
-        .forEach(msg => log(main.messageString(msg, normalizeFilename, !!options.noMessageId, false, options.testMode && 'compile'))); // TODO: use module name
+        .forEach(msg => log(main.messageString( msg, msgConfig )));
     }
     else {
       let hasAtLeastOneExplanation = false;
-      const config = {
-        normalizeFilename,
-        noMessageId: !!options.noMessageId,
-        hintExplanation: true,
-        color: options.color,
-        module: options.testMode && 'compile', // TODO: use module name
-        sourceMap: fileCache,
-        cwd: '',
-      };
-
       messages.filter(msg => messageLevels[msg.severity] <= options.warning).forEach((msg) => {
         hasAtLeastOneExplanation = hasAtLeastOneExplanation || main.hasMessageExplanation(msg.messageId);
-        log(main.messageStringMultiline(msg, config));
+        log(main.messageStringMultiline(msg, msgConfig));
         log(); // newline
       });
       if (!options.noMessageId && hasAtLeastOneExplanation)

package/doc/CHANGELOG_BETA.md

@@ -8,6 +8,17 @@ 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.1.0 - 2023-07-28
+
+### Added `associationDefault`
+
+With this beta flag enabled, managed associations with exactly one foreign key can now
+have a default value.
+
+### Removed `aspectWithoutElements`
+
+Aspects without elements can now be defined without beta flag, e.g. `aspect A;`.
+
 ## Version 4.0.0 - 2023-06-06
 
 ### Removed `v4preview`

package/lib/api/main.js

@@ -8,7 +8,7 @@ const location = lazyload('../base/location');
 const messages = lazyload('../base/messages');
 const compiler = lazyload('../compiler/index');
 const toCsn = lazyload('../json/to-csn');
-const forOdataNew = lazyload('../transform/forOdataNew.js');
+const forOdataNew = lazyload('../transform/forOdata.js');
 const toSql = lazyload('../render/toSql');
 const toCdl = require('../render/toCdl');
 const modelCompare = lazyload('../modelCompare/compare');
@@ -95,14 +95,14 @@ function checkPreTransformedCsn( csn, options, relevantOptionNames, warnAboutMis
 
   for (const name of relevantOptionNames ) {
     if (options[name] !== csn.meta.options?.[name]) {
-      error('wrong-pretransformed-csn', null, { prop: name, value: options[name], othervalue: csn.meta.options[name] },
+      error('api-invalid-option-preprocessed', null, { prop: name, value: options[name], othervalue: csn.meta.options[name] },
             'Expected pre-processed CSN to have option $(PROP) set to $(VALUE). Found: $(OTHERVALUE)');
     }
   }
 
   for (const name of warnAboutMismatch ) {
     if (options[name] !== csn.meta.options[name]) {
-      warning('options-mismatch-pretransformed-csn', null, { prop: name, value: options[name], othervalue: csn.meta.options[name] },
+      warning('api-mismatched-option-preprocessed', null, { prop: name, value: options[name], othervalue: csn.meta.options[name] },
               'Expected pre-processed CSN to have option $(PROP) set to $(VALUE). Found: $(OTHERVALUE)');
     }
   }
@@ -242,8 +242,10 @@ function sql( csn, options = {} ) {
   const sqls = toSql.toSqlDdl(transformedCsn, internalOptions);
 
   const result = sortViews({ csn: transformedCsn, sql: sqls.sql });
-
-  return result.map(obj => obj.sql).filter(create => create);
+  return [
+    ...result.map(obj => obj.sql).filter(create => create),
+    ...Object.values(sqls.constraints || {}),
+  ];
 }
 
 /**
@@ -359,7 +361,9 @@ function remapName( key, csn, filter = () => true ) {
 function sqlMigration( csn, options, beforeImage ) {
   traceApi("Options passed into 'to.sql.migration'", options);
   const internalOptions = prepareOptions.to.sql(options);
-  const { error, throwWithError } = messages.makeMessageFunction(csn, internalOptions, 'to.sql.migration');
+  const {
+    error, warning, info, throwWithError, message,
+  } = messages.makeMessageFunction(csn, internalOptions, 'to.sql.migration');
 
   // Prepare after-image.
   const afterImage = internalOptions.filterCsn
@@ -369,8 +373,12 @@ function sqlMigration( csn, options, beforeImage ) {
   const diffFilterObj = diffFilter[internalOptions.sqlDialect];
 
   if (diffFilterObj) {
-    diff.extensions.forEach(ex => diffFilterObj.extension(ex, error));
-    diff.migrations.forEach(migration => diffFilterObj.migration(migration, error));
+    diff.extensions = diff.extensions.filter(ex => diffFilterObj.extension(ex, {
+      error, warning, info, throwWithError, message,
+    }));
+    diff.migrations.forEach(migration => diffFilterObj.migration(migration, {
+      error, warning, info, throwWithError, message,
+    }));
     Object.entries(diff.deletions).forEach(entry => diffFilterObj.deletion(entry, error));
   }
 
@@ -443,8 +451,10 @@ function sqlMigration( csn, options, beforeImage ) {
 
   internalOptions.beta.sqlExtensions = true;
 
-  // eslint-disable-next-line no-unused-vars
-  const { deletions, migrations, ...hdbkinds } = toSql.toSqlDdl(diff, internalOptions);
+  const {
+    // eslint-disable-next-line no-unused-vars
+    deletions, constraintDeletions, migrations, constraints, ...hdbkinds
+  } = toSql.toSqlDdl(diff, internalOptions);
 
   cleanup.forEach(fn => fn());
   // TODO: Handle `ADD CONSTRAINT` etc!
@@ -473,6 +483,12 @@ function sqlMigration( csn, options, beforeImage ) {
       createAndAlterSqls.push(...migrations[name].map(m => m.sql));
   }
 
+  if (constraints)
+    Object.values(constraints).forEach(constraint => createAndAlterSqls.push(constraint));
+
+  if (constraintDeletions)
+    Object.values(constraintDeletions).forEach(constraint => dropSqls.push(constraint));
+
   // We need to drop the things without dependants first - so inversely sorted
   dropSqls.reverse();
 
@@ -510,7 +526,11 @@ function hdiMigration( csn, options, beforeImage ) {
 
   internalOptions.beta.sqlExtensions = true;
 
-  const { deletions, migrations, ...hdbkinds } = toSql.toSqlDdl(diff, internalOptions);
+  // Ignore constraint drops - that is handled by .hdbconstraint et. al.
+  const {
+    // eslint-disable-next-line no-unused-vars
+    deletions, migrations, constraintDeletions, ...hdbkinds
+  } = toSql.toSqlDdl(diff, internalOptions);
 
   return {
     afterImage,

package/lib/api/validate.js

@@ -115,7 +115,7 @@ const validators = {
     found: val => `type ${ typeof val }`,
   },
   testMode: {
-    validate: val => typeof val === 'boolean' || typeof val === 'number',
+    validate: val => typeof val === 'boolean' || typeof val === 'number' || val === '$noAssertConsistency',
     expected: () => 'type boolean|number',
     found: val => `type ${ typeof val }`,
   },

package/lib/base/location.js

@@ -4,6 +4,7 @@
 // but not semantic locations (which are message-specific),
 
 const { copyPropIfExist } = require('../utils/objectUtils');
+const { CsnLocation } = require('../compiler/classes');
 
 /**
  * Create a location with properties `file`, `line` and `col` from argument
@@ -41,6 +42,7 @@ function combinedLocation( start, end ) {
  */
 function emptyLocation( filename ) {
   return {
+    __proto__: CsnLocation.prototype,
     file: filename,
     line: 1,
     col: 1,
@@ -60,9 +62,12 @@ function emptyLocation( filename ) {
  */
 function emptyWeakLocation( filename ) {
   return {
+    __proto__: CsnLocation.prototype,
     file: filename,
     line: 1,
     col: 1,
+    endLine: undefined,
+    endCol: undefined,
   };
 }
 
@@ -140,13 +145,7 @@ function dictLocation( dict, extraLocation ) {
     const lineB = (b.endLine || b.line);
     return (lineA > lineB || (lineA === lineB && (a.endCol || a.col) > (b.endCol || b.col)) ? a : b);
   });
-  return {
-    file: min.file,
-    line: min.line,
-    col: min.col,
-    endLine: max.endLine,
-    endCol: max.endCol,
-  };
+  return new CsnLocation( min.file, min.line, min.col, max.endLine, max.endCol );
 }
 
 function _objLocations( obj ) {

package/lib/base/message-registry.js

@@ -52,6 +52,7 @@ const centralMessages = {
   'anno-unstable-array': { severity: 'Warning' },
   'anno-invalid-sql-element': { severity: 'Error', configurableFor: true },  // @sql.prepend/append - configurable for "I know what I'm doing"
   'anno-invalid-sql-struct': { severity: 'Error', configurableFor: true },  // @sql.prepend/append - configurable for "I know what I'm doing"
+  'anno-invalid-sql-assoc': { severity: 'Error', configurableFor: true },  // @sql.prepend/append - configurable for "I know what I'm doing"
   'anno-invalid-sql-calc': { severity: 'Error', configurableFor: true },  // @sql.prepend/append - configurable for "I know what I'm doing"
   '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"
@@ -63,46 +64,36 @@ const centralMessages = {
   'anno-undefined-param':   { severity: 'Warning' },
   'anno-unexpected-ellipsis': { severity: 'Error', configurableFor: 'deprecated' },
 
-  'args-expecting-named':  { severity: 'Error' },
-  'args-no-params':       { severity: 'Error' },
-  'args-undefined-param': { severity: 'Error' },
-
   'name-invalid-dollar-alias': { severity: 'Error', configurableFor: true },
 
   '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', configurableFor: 'v4' },
   'def-unexpected-paramview-assoc': { severity: 'Error' },
   'def-unexpected-calcview-assoc': { severity: 'Error' },
   'chained-array-of': { severity: 'Error' },
-  'check-proper-type':    { severity: 'Error', configurableFor: [ 'compile' ] },
+  'def-missing-type':    { severity: 'Error', configurableFor: [ 'compile' ] },
   'check-proper-type-of': { severity: 'Info',  errorFor: [ 'for.odata', 'to.edmx', 'to.hdbcds', 'to.sql', 'to.hdi', 'to.rename' ] },
 
   'def-duplicate-autoexposed': { severity: 'Error' },
   'def-unexpected-default': { severity: 'Error', configurableFor: 'test' },
 
-  'expr-no-filter': { severity: 'Error' },
+  'expr-unexpected-filter': { severity: 'Error' },
 
   'empty-type':   { severity: 'Info' }, // only still an error in old transformers
 
   'ref-deprecated-orderby': { severity: 'Error', configurableFor: true },
-  'ref-expecting-type': { severity: 'Error' },
-  'ref-sloppy-type': { severity: 'Error' },
+  'ref-invalid-type': { severity: 'Error' },
   'ref-unexpected-self': { severity: 'Error' },
-  'ref-expecting-bare-aspect': { severity: 'Error' },
+  'ref-invalid-include': { severity: 'Error' },
   'type-unexpected-typeof': { severity: 'Error' },
   'type-ignoring-argument': { severity: 'Error', configurableFor: true },
   'type-expected-builtin': { severity: 'Error', configurableFor: true },
   'type-expecting-service-target': { severity: 'Error', configurableFor: true },
-  'ref-expecting-action-param-type': { severity: 'Error' },
-  'ref-sloppy-actionparam-type': { severity: 'Error' },
-  'ref-expecting-event-type': { severity: 'Error' }, // TODO: Test coverage
-  'ref-sloppy-event-type': { severity: 'Error' },
-  'ref-expecting-struct': { severity: 'Error' },
   'ref-expecting-const': { severity: 'Error' },
-  'ref-expecting-entity': { severity: 'Error' },
-  'ref-expecting-source': { severity: 'Error' },
-  'ref-expecting-target': { severity: 'Error' },
-  'ref-sloppy-target': { severity: 'Warning' },
+  'ref-invalid-source': { severity: 'Error' },
+  'ref-invalid-target': { severity: 'Error' },
+  'ref-sloppy-target': { severity: 'Error', configurableFor: 'v4' },
 
   'extend-repeated-intralayer': { severity: 'Warning' },
   'extend-unrelated-layer':     { severity: 'Info' },
@@ -166,15 +157,13 @@ const centralMessages = {
   'syntax-unexpected-sql-clause': { severity: 'Error' }, // TODO: configurableFor:'tests'?
 
   'type-managed-composition': { severity: 'Error' },
-  'type-unsupported-precision-change': { severity: 'Error'},
+  'type-unsupported-precision-change': { severity: 'Error' },
+  'type-unsupported-key-change': { severity: 'Error', configurableFor: true },
 
   'def-missing-element': { severity: 'Error' },
 
   'def-unsupported-calc-elem': { severity: 'Error', configurableFor: true },
 
-  'unexpected-keys-for-composition': { severity: 'Error' }, // TODO: more than 30 chars
-  'unmanaged-as-key': { severity: 'Error' }, // is confusing
-  'composition-as-key': { severity: 'Error' }, // is confusing and not supported
   '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' }, // more than 30 chars
@@ -213,6 +202,8 @@ const oldMessageIds = createDict({
   'old-anno-duplicate': 'anno-duplicate', // Example
   'assoc-in-array': 'type-invalid-items',
   'duplicate-autoexposed': 'def-duplicate-autoexposed',
+  'expr-no-filter': 'expr-unexpected-filter',
+  'check-proper-type': 'def-missing-type',
 });
 
 // Set up the old-to-new message ID mapping in the message registry.
@@ -511,7 +502,12 @@ const centralMessageTexts = {
   // Messages for erroneous references -----------------------------------------
   // location at erroneous reference (if possible)
   'ref-deprecated-orderby': 'Replace source element reference $(ID) by $(NEWCODE); auto-corrected',
-  'ref-unexpected-self': 'Unexpected $(ID) reference; is valid only in ON-conditions',
+  'ref-unexpected-self': {
+    std: 'Unexpected $(ID) reference; is valid only in ON-conditions of unmanaged associations',
+    on: 'Unexpected $(ID) reference; is valid only if compared to be equal to an association of the target side',
+    subQuery: 'Unexpected $(ID) reference in a sub query',
+    setQuery: 'Unexpected $(ID) reference in a query on the right side of $(OP)',
+  },
   'ref-undefined-def': {
     std: 'Artifact $(ART) has not been found',
     // TODO: proposal 'No definition of $(NAME) found',
@@ -565,7 +561,11 @@ const centralMessageTexts = {
   },
   'ref-unexpected-assoc': {
     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',
+    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',
     cast: 'Casting to an association is not supported',
   },
   'ref-unexpected-calculated': {
@@ -575,7 +575,7 @@ const centralMessageTexts = {
   },
   'ref-unexpected-localized': {
     std: 'Unexpected reference to localized element $(NAME)', // "std" currently unused
-    calc: 'Calculated elements can\'t refer to localized elements',
+    calc: 'Calculated elements "on-write" can\'t refer to localized elements',
   },
 
   'ref-unexpected-navigation': {
@@ -624,6 +624,14 @@ const centralMessageTexts = {
     comp: 'Unexpected composition inside $(PROP)',
   },
 
+  'type-unexpected-default': {
+    std: 'Unexpected $(KEYWORD) on an association/composition', // unused
+    multi: 'Unexpected $(KEYWORD); expected exactly one foreign key in combination with default value, but found $(COUNT)',
+    structured: 'Unexpected $(KEYWORD) in combination with structured foreign key $(NAME); $(KEYWORD) requires a non-structured foreign key',
+    'onCond': 'Unexpected $(KEYWORD) on an association/composition with ON-condition; $(KEYWORD) requires exactly one foreign key',
+    'targetAspect': 'Unexpected $(KEYWORD) on composition of aspect'
+  },
+
   'anno-builtin': 'Builtin types should not be annotated. Use custom type instead',
   'anno-undefined-def': 'Artifact $(ART) has not been found', // TODO: ext-
   'anno-undefined-art': 'No artifact has been found with name $(ART)',
@@ -654,14 +662,25 @@ const centralMessageTexts = {
     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',
+    composition: 'Managed aspect compositions can\'t be defined as primary key',
+  },
   'def-unexpected-key': {
     std: '$(ART) can\'t have additional keys',
-    virtual: 'Unexpected $(PROP) for virtual element $(NAME)',
+    virtual: 'Unexpected $(PROP) for virtual element $(ART)',
     // TODO: Better message?
     include: '$(ART) can\'t have additional keys (through include)',
   },
@@ -725,19 +744,27 @@ const centralMessageTexts = {
     missing: 'Expected element $(ID) to have at least all the same sub-elements as included artifacts, but it is missing $(NAME)'
   },
 
-  'ref-expecting-action-param-type': 'A type, an element, or a service entity is expected here',
-  'ref-expecting-const': 'A constant value is expected here',
-  'ref-expecting-event-type': 'A type, an element, an event, or a service entity is expected here',
-  'ref-expecting-entity': 'An entity, projection or view is expected here',
-  'ref-expecting-struct': 'A type, entity, aspect or event with direct elements is expected here',
-  'ref-expecting-type': 'A type or an element is expected here',
+  'ref-expecting-const': 'A constant expression or variable is expected here',
+  'ref-invalid-target': {
+    std: 'An entity, projection or view is expected here', // TODO: change text
+    composition: 'Expecting an entity or aspect as composition target',
+    bare: 'Expecting the target aspect to have elements',
+    aspect: 'Expecting the name of an aspect in property $(PROP)', // only CSN input
+  },
+  'ref-invalid-include': {
+    std: 'A type, entity, aspect or event with direct elements is expected here',
+    bare : 'An aspect without elements is expected here',
+  },
+  'ref-invalid-type': {
+    std: 'A type or an element is expected here',
+    param: 'A type, an element, or a service entity is expected here',
+    event: 'A type, an element, an event, or a service entity is expected here',
+  },
   // TODO: text variant if the association does not start an entity
-  'ref-expecting-source': 'A query source must be an entity or an association',
-  'ref-expecting-target': 'An entity or an aspect is expected here', // TODO: coverage
+  '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-repeated-intralayer': 'Unstable element order due to repeated extensions in same layer',
   'extend-unexpected-include': 'Can\'t extend $(META) with includes',
-  'ref-expecting-bare-aspect': 'An aspect without elements is expected here',
 
   'ext-duplicate-same-file': 'Duplicate extension with $(PROP) in same file',
   'ext-duplicate-extend-type': 'Duplicate type extension for type $(TYPE)',
@@ -787,6 +814,8 @@ const centralMessageTexts = {
     target: 'Expected target $(TARGET) of specified element $(NAME) to be the same as the inferred element\'s target $(ART)',
     foreignKeys: 'Expected foreign keys of specified element $(NAME) to be the same as the inferred element\'s foreign keys',
     prop: 'Value for $(PROP) of the specified element $(NAME) does not match the inferred element\'s value',
+    enumExtra: 'Specified element $(NAME) differs from inferred element: it has an additional enum element $(ID)',
+    enumVal: 'Specified element $(NAME) differs from inferred element: it has a different value for enum element $(ID)',
   },
 
   'query-unexpected-property': {
@@ -794,10 +823,7 @@ const centralMessageTexts = {
     calculatedElement: 'Unexpected property $(PROP) in the specified element $(NAME); calculated elements are not supported in queries',
   },
 
-  'ref-sloppy-type': 'A type or an element is expected here',
-  'ref-sloppy-actionparam-type': 'A type, an element, or a service entity is expected here',
   'ref-sloppy-target': 'An entity or an aspect (not type) is expected here',
-  'ref-sloppy-event-type': 'A type, an element, an event, or a service entity is expected here',
 
   'ref-ambiguous': {
     std: 'Replace ambiguous $(ID) by $(NAMES)',
@@ -812,6 +838,16 @@ const centralMessageTexts = {
     entity: 'Entity $(ART) with managed compositions can\'t be used in types', // yet
   },
 
+  'type-unsupported-key-change': {
+    std: 'Added element $(ID) is a primary key change and will not work if the table contains data',
+    changed: 'Changed element $(ID) is a primary key change and will not work if the table contains data'
+  },
+
+  'type-unsupported-key-sqlite': {
+    std: 'Added element $(ID) is a primary key change and will not work with dialect $(NAME)',
+    changed: 'Changed element $(ID) is a primary key change and will not work with dialect $(NAME)'
+  },
+
   // -----------------------------------------------------------------------------------
   // Expressions
   // -----------------------------------------------------------------------------------
@@ -820,6 +856,16 @@ const centralMessageTexts = {
     std: 'Expected a comparison with $(OP) when using $(ID) in an ON-condition',
   },
 
+  'type-invalid-cardinality': {
+    std: 'Invalid value $(VALUE) for cardinality', // unused variant
+    sourceMax: 'Invalid value $(PROP) for maximum source cardinality, expecting a positive number or $(OTHERPROP)',
+    targetMax: 'Invalid value $(PROP) for maximum target cardinality, expecting a positive number or $(OTHERPROP)',
+    targetMin: 'Invalid value $(PROP) for minimum target cardinality, expecting a non-negative number',
+    sourceMin: 'Invalid value $(PROP) for minimum source cardinality, expecting a non-negative number',
+    sourceVal: 'Source minimum cardinality must not be greater than source maximum cardinality',
+    targetVal: 'Target minimum cardinality must not be greater than target maximum cardinality',
+  },
+
   'i18n-different-value': 'Different translation for key $(PROP) of language $(OTHERPROP) in unrelated layers',
 
   // OData version dependent messages
@@ -948,7 +994,7 @@ const centralMessageTexts = {
  *
  * @typedef {object} MessageConfig
  * @property {MessageSeverity} severity Default severity for the message.
- * @property {string[]|'deprecated'|'v4'|true} [configurableFor]
+ * @property {string[]|'deprecated'|'v4'|'test'|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.
  *        Only has an effect if default severity is 'Error'.