@sap/cds-compiler 3.7.2 → 3.8.2

package/CHANGELOG.md

@@ -7,6 +7,75 @@
 Note: `beta` fixes, changes and features are usually not listed in this ChangeLog but [here](doc/CHANGELOG_BETA.md).
 The compiler behavior concerning `beta` features can change at any time without notice.
 
+## Version 3.8.2 - 2023-03-30
+
+### Fixed
+
+- parser: Identifiers that are keywords were not allowed in annotation values inside arrays
+- compiler: Compatibility against cds-lsp was restored.
+- to.sql/hdbcds/hdi/edm(x): Fix a crash for sub-queries inside nested expressions of on-conditions of JOINs.
+
+## Version 3.8.0 - 2023-03-27
+
+### Added
+
+- compiler:
+  + Table aliases for sub-queries are no longer required.
+  + A time zone designator can now be used in time literals, e.g. `time'16:41:01+01:30'`or `time'16:41:01Z'`.
+- Calculated elements ("on-read") are now enabled per default.  
+  When used in views, they are replaced by their value, for example:
+  ```cds
+  entity E { one: Integer; two = one + 1; };
+  entity P as projection on E { two };
+  // P is the same as:
+  entity P as projection on E { one + 1 as two };
+  ```
+  This allows to define calculations centrally at the entity, which can be used by
+  other views.
+- In CDL, a ternary operator was added as a shortcut for `CASE` expressions:  
+  `a ? b : c` is a shortcut for `CASE WHEN a THEN b ELSE c END`.  There is no CSN
+  representation. The ternary operator is rendered as a `CASE` expression in CSN.
+- In CDL and CSN, `not null` can now also be used in type definitions.
+- In CDL (and CSN as before), elements can be defined without specifying a type.
+
+### Changed
+
+- API: We now report an error for most backends, if the input CSN has
+  `meta.flavor == 'xtended'`, because only client/inferred CSN is supported.
+- Update OData vocabularies 'PersonalData', 'UI'
+- for.odata: Shortcut annotations `@label`, `@title`, `@description`, `@readonly` are no longer
+  removed from the OData processed CSN.
+- to.cdl:
+  + Annotation arrays are split into multiple lines, if a single line would be too long.
+  + Nested `SELECT`s are put into separate lines to make them more readable.
+  + (Annotation) paths are quoted less often.
+- to.sql: The list of reserved SAP HANA identifiers was updated (for smart quoting).
+
+### Fixed
+
+- The CSN parser now accepts bare `list`s in `columns[]`, similar to the CDL parser.
+- to.cdl:
+  + Delimited identifiers in filters are now surrounded by spaces if necessary, to avoid `]]`
+    being interpreted as an escaped bracket.
+- to.edm(x):
+  + Remove empty `Edm.EntityContainer` again. Removal of an empty entity container has been
+    revoked with [3.5.0](#fixed-7) which was wrong. An empty container must not be rendered
+    as it is not spec compliant.
+  + Correctly resolve chained enum symbols.
+  + Fix a program abort during structured rendering in combination with `--odata-foreign-keys`
+    and foreign keys in structured types.
+  + Correctly render paths to nested foreign keys as primary key in structured mode with
+    `--odata-foreign-keys`.
+- to.hdi/to.sql/to.edm(x):
+  + Reject unmanaged associations as ON-condition path end points.
+  + Fix bug in message rendering for tuple expansion.
+  + Correctly detect invalid @sql.append/prepend in projections.
+- to.hdi/to.sql: The list of SAP HANA keywords was updated to the latest version.
+
+### Removed
+
+- for.odata: Undocumented shortcut annotation `@important` has been removed.
+
 
 ## Version 3.7.2 - 2023-02-24
 
@@ -15,6 +84,7 @@ The compiler behavior concerning `beta` features can change at any time without
 - CSN parser: Structured annotations containing `=` were accidentally interpreted as expressions,
   even though the corresponding beta flag was not set.
 
+
 ## Version 3.7.0 - 2023-02-22
 
 ### Added
@@ -44,9 +114,6 @@ The compiler behavior concerning `beta` features can change at any time without
     explicit redirection.
 - to.edm(x): Process value help list convenience annotations on unbound action parameters.
 
-### Removed
-
-- tbd
 
 ## Version 3.6.2 - 2023-02-06
 
@@ -455,7 +522,7 @@ The compiler behavior concerning `beta` features can change at any time without
   + Enforce `odata-spec-violation-key-null` on explicit foreign keys of managed primary key associations.
   + Proxies/service cross references are no longer created for associations with arbitrary ON conditions.
     Only managed or `$self` backlink association targets are proxy/service cross reference candidates.
-  + Explicit foreign keys of a managed association that are not a primary key in the target are exposed in the the proxy.
+  + Explicit foreign keys of a managed association that are not a primary key in the target are exposed in the proxy.
   + If an association is primary key, the resulting navigation property is set to `Nullable:false` in structured mode.
 
 ## Version 2.15.0 - 2022-05-06

package/bin/cdsc.js

@@ -353,6 +353,9 @@ function executeCommandLine( command, options, args ) {
       options.odataFormat = 'structured';
       options.odataContainment = true;
     }
+    if (options.odataVocRefs && typeof options.odataVocRefs === 'string')
+      options.odataVocRefs = JSON.parse(options.odataVocRefs);
+
     const csn = options.directBackend ? model : compactModel(model, options);
     if (options.csn) {
       const odataCsn = main.for.odata(csn, options);

package/doc/CHANGELOG_ARCHIVE.md

@@ -777,7 +777,7 @@ synchronously.
 
 - Introduce annotation `@cds.redirection.target`.
   With value `false`, the projection is not considered an implicit redirection target;
-  with value `true`, is is considered a “preferred” redirection target.
+  with value `true`, is considered a “preferred” redirection target.
 
 ## Version 1.49.2 - 2021-02-16
 
@@ -1313,7 +1313,7 @@ synchronously.
 
 - HANA/SQL: Validate ON conditions of mixin association definitions in all subqueries
 
-- OData V2: Assign various `@sap` annotations to the `<edmx:EnitySet>` and `<edmx:AssociationSet>`
+- OData V2: Assign various `@sap` annotations to the `<edmx:entitySet>` and `<edmx:AssociationSet>`
   if such annotations are assigned to CDS entities or associations.
 
 - OData V4 Structured: Omit foreign keys of managed associations that establish the containment relationship to
@@ -1445,7 +1445,7 @@ synchronously.
 
 ### Fixed
 
-- Compiler: `type of <unmanaged assocation>` is now handled correctly by raising an error.
+- Compiler: `type of <unmanaged association>` is now handled correctly by raising an error.
 
 ## Version 1.25.0 - 2020-04-09
 
@@ -1629,7 +1629,7 @@ Fixes
 * In the Hana/Sql backend, correctly resolve forward `on` condition when using
   mixin association that backlinks to an unrelated 3rd party entity and association.
 * Raise a warning if the element of the forward association and the element of
-  the query source do not not originate from the same defining entity. Raise an
+  the query source do not originate from the same defining entity. Raise an
   error if the element of the forward association cannot be found in the query
   source or is ambiguous.
 * Correctly create localization views with compiled model as input;
@@ -2267,7 +2267,7 @@ Changes
   _Update to v1.12.1_ if you experience problems – an inherited `@cds.autoexpose` had not been considered.
 * In `toSql` and `toHana` errors are raised
   + for duplicate definitions of elements that differ only in spelling,
-  + if the the entity is not `abstract` or annotated with any `@cds.persistence` set to true and
+  + if the entity is not `abstract` or annotated with any `@cds.persistence` set to true and
     - an element is typed to be an `array of` a `type`,
     - an implicit managed composition has cardinality to many.
 * Raise a warning if an element is to be `localized` which is not of type `cds.String`.
@@ -2489,7 +2489,7 @@ Fixes
   while rewriting the `on` conditition of a projected association.
 * Apply OData specific checks (e.g. that all elements of an entity must have a type)
   applied only to objects that are exposed in a service.
-* When generating SQL for SQLite, replace the the special variables `$now`, `$user.id`
+* When generating SQL for SQLite, replace the special variables `$now`, `$user.id`
   and `$user.locale` by `CURRENT_TIMESTAMP`, `'$user.id'`, and `'EN'`, respectively.
 * Issue a warning for conflicting cardinality declarations (e.g. `association[1] to many ...`).
 * Handle filters with cardinality correctly when translating associations to joins.

package/doc/CHANGELOG_BETA.md

@@ -8,6 +8,21 @@ Note: `beta` fixes, changes and features are listed in this ChangeLog just for i
 The compiler behavior concerning `beta` features can change at any time without notice.
 **Don't use `beta` fixes, changes and features in productive mode.**
 
+## Version 3.8.0 - 2023-03-27
+
+### Added `v4preview`
+
+This beta flags tries to imitate cds-compiler v4 behavior.
+This includes new compiler messages as well as potentially breaking changes.
+
+Enable this beta flag to ease upgrading to cds-compiler v4.
+
+This flag does not guarantee full compatibility with v4, but only
+helps to identify potential issues as soon as possible.
+
+### Removed `calculatedElements`
+
+Now enabled per default.
 
 ## Version 3.7.0 - 2023-02-22
 

package/doc/DeprecatedOptions_v2.md

@@ -51,7 +51,7 @@ The compiled model contains the following generated entities:
 * the auto-exposed projection `our.Service.Proj.texts`
   which is a composition target of `our.Service.Proj:texts`
 
-For the following sub sections (and in general), is is important to understand that
+For the following subsections (and in general), it is important to understand that
 you can define all auto-exposed entities yourself (well, they are not
 _auto_-exposed anymore)
 _without_ any difference in the compiled model

package/doc/NameResolution.md

@@ -600,7 +600,7 @@ The list of search environments is created as follows:
 
 The above mentioned `:`-escape mechanism leads to the following name resolution:
 
-* The first lexical search environment is the the environment containing all parameter names of the current view.
+* The first lexical search environment is the environment containing all parameter names of the current view.
 * The following search environments are the usual ones from the "main artifact name resolution";
   constant values can be accessed this way (_TODO_: probably not now).
 

package/lib/api/main.js

@@ -335,7 +335,7 @@ function remapName( key, csn, filter = () => true ) {
  * @param {CSN.Model}  csn          A clean input CSN representing the desired "after-image"
  * @param {HdiOptions} options      Options
  * @param {CSN.Model}  beforeImage  A db-transformed CSN representing the "before-image", or null in case no such image
- *                                  is known, i.e. for the very first migration step
+ *                                  is known, i.e. for the very first migration step.
  * @returns {object}                An object with three properties:
  *                                  - afterImage: A db-transformed CSN representing the "after-image"
  *                                  - drops: An array of SQL statements to drop views/tables
@@ -812,18 +812,21 @@ function publishCsnProcessor( processor, _name ) {
   /**
    * Function that calls the processor and re-compiles in case of internal errors
    *
-   * @param {object} csn CSN
-   * @param {object} options Options
+   * @param {CSN.Model} csn CSN
+   * @param {CSN.Options} options Options
    * @param {any} args Any additional arguments
    * @returns {any} What ever the processor returns
    */
   function api( csn, options = {}, ...args ) {
     try {
-      if (options.deprecated) {
-        const messageFunctions = messages.makeMessageFunction(csn, options, 'api');
+      const messageFunctions = messages.makeMessageFunction(csn, options, 'api');
+      if (options.deprecated)
         checkRemovedDeprecatedFlags( options, messageFunctions );
-      }
-      checkOutdatedOptions( options );
+
+      checkOutdatedOptions( options, messageFunctions );
+      checkCsnFlavor( csn, options, messageFunctions, _name );
+
+      messageFunctions.throwWithError();
 
       timetrace.timetrace.start(_name);
       const result = processor( csn, options, ...args );
@@ -861,37 +864,73 @@ const oldBackendOptionNames = [ 'toSql', 'toOdata', 'toHana', 'forHana' ];
  *  - toOdata/toSql/toHana/forHana -> now flat options
  *
  * @param {CSN.Options} options Backend options
+ * @param {object} messageFunctions Functions returned by makeMessageFunction()
  */
-function checkOutdatedOptions( options ) {
-  const { error, throwWithError } = messages.makeMessageFunction(null, options, 'api');
-
+function checkOutdatedOptions( options, messageFunctions ) {
   // This error has been emitted once, we don't need to emit it again.
-  if (options.messages?.some(m => m.messageId === 'api-invalid-option')) {
-    throwWithError();
+  if (options.messages?.some(m => m.messageId === 'api-invalid-option' || m.messageId === 'api-invalid-variable-replacement'))
     return;
-  }
+
 
   for (const name of oldBackendOptionNames) {
     if (typeof options[name] === 'object') // may be a boolean due to internal options
-      error('api-invalid-option', null, { '#': 'std', name });
+      messageFunctions.error('api-invalid-option', null, { '#': 'deprecated', name });
   }
 
   if (options.magicVars)
-    error('api-invalid-option', null, { '#': 'magicVars' });
+    messageFunctions.error('api-invalid-option', null, { '#': 'magicVars', prop: 'magicVars', otherprop: 'variableReplacements' });
 
   // Don't check `options.magicVars`.  It's likely that the user renamed `magicVars` but
   // forgot about user -> $user and locale -> $user.locale
-  if (options.variableReplacements?.user)
-    error('api-invalid-option', null, { '#': 'user' });
-  if (options.variableReplacements?.locale)
-    error('api-invalid-option', null, { '#': 'locale' });
+  if (options.variableReplacements?.user) {
+    messageFunctions.error('api-invalid-variable-replacement', null, {
+      '#': 'user', option: 'variableReplacements', prop: '$user', otherprop: 'user',
+    });
+  }
+  if (options.variableReplacements?.locale) {
+    messageFunctions.error('api-invalid-variable-replacement', null, {
+      '#': 'locale', option: 'variableReplacements', prop: '$user.locale', otherprop: 'locale',
+    });
+  }
 
   forEachKey(options.variableReplacements || {}, (name) => {
-    if (!name.startsWith('$') && name !== 'user' && name !== 'locale')
-      error('api-invalid-option', null, { '#': 'noDollar', name });
+    if (!name.startsWith('$') && name !== 'user' && name !== 'locale') {
+      messageFunctions.error('api-invalid-variable-replacement', null, {
+        '#': 'noDollar', option: 'variableReplacements', code: '$', name,
+      });
+    }
   });
+}
 
-  throwWithError();
+/**
+ * Checks that the given CSN is usable by our backends, e.g. that
+ * the CSN is not a gensrc (a.k.a. xtended) for most backends.
+ *
+ * For reference, cds-compiler/cds-dk CSN flavor map:
+ *  - client -> inferred
+ *  - gensrc -> xtended
+ *  - parseCdl -> parsed
+ *
+ * If this function becomes more complex (e.g. more module conditions),
+ * move it from then generic api wrapper to the individual module.
+ *
+ * TODO: The compiler does not set any marker in `meta`; we use the umbrella one
+ *       for easier debugging.
+ *
+ * @param {CSN.Model} csn User CSN
+ * @param {CSN.Options} options User options
+ * @param {object} messageFunctions Functions returned by makeMessageFunction()
+ * @param {string} module Backend module, e.g. to.cdl or to.sql
+ */
+function checkCsnFlavor( csn, options, messageFunctions, module ) {
+  if (module === 'to.cdl' || !csn)
+    return; // to.cdl allows every CSN flavor
+
+  if (csn.meta?.flavor === 'xtended') {
+    // TODO: csn.meta?.flavor === 'parsed'; currently used by `@sap/cds` tests.
+    messageFunctions.error('api-unsupported-csn-flavor', null, { name: module, option: csn.meta?.flavor },
+                           'Module $(NAME) expects a client/inferred CSN, not $(OPTION)');
+  }
 }
 
 /**

package/lib/api/options.js

@@ -38,6 +38,7 @@ const publicOptionsNewAPI = [
   'odataProxies',
   'odataXServiceRefs',
   'odataV2PartialConstr',
+  'odataVocRefs',
   'service',
   'serviceNames',
   //

package/lib/api/validate.js

@@ -82,6 +82,11 @@ const validators = {
   sqlMapping: generateStringValidator([ 'plain', 'quoted', 'hdbcds' ]),
   odataVersion: generateStringValidator([ 'v2', 'v4' ]),
   odataFormat: generateStringValidator([ 'flat', 'structured' ]),
+  odataVocRefs: {
+    validate: val => (typeof val === 'object' && !Array.isArray(val)),
+    expected: () => 'type JSON object',
+    found: val => `type ${ Array.isArray(val) ? 'JSON array' : typeof val }`,
+  },
   service: {
     validate: val => typeof val === 'string',
     expected: () => 'type string',

package/lib/base/dictionaries.js

@@ -91,11 +91,13 @@ function dictFirst( dict ) {
 }
 
 // Push `entry` to the array value with key `name` in the dictionary `dict`.
-function pushToDict( dict, name, entry ) {
+function pushToDict( dict, name, ...entries ) {
   if (dict[name])
-    dict[name].push( entry );
+    dict[name].push( ...entries );
+  else if (name.charAt(0) !== '_')
+    dict[name] = entries;
   else
-    dict[name] = [ entry ];
+    Object.defineProperty( dict, name, { value: entries, configurable: true, writable: true } );
 }
 
 module.exports = {

package/lib/base/keywords.js

@@ -579,6 +579,7 @@ module.exports = {
     'ST_ALPHASHAPEAGGR',
     'ST_ALPHASHAPEAREAAGGR',
     'ST_ALPHASHAPEEDGEAGGR',
+    'ST_ASGEOJSON',
     'ST_ASMVT',
     'ST_ASSVGAGGR',
     'ST_CIRCULARSTRING',
@@ -606,6 +607,7 @@ module.exports = {
     'ST_INTERSECTIONAGGR',
     'ST_LINESTRING',
     'ST_MAKELINE',
+    'ST_MAKELINEAGGR',
     'ST_MAKEPOLYGON',
     'ST_MEMORY_LOB',
     'ST_MULTILINESTRING',

package/lib/base/message-registry.js

@@ -60,7 +60,7 @@ const centralMessages = {
   'anno-undefined-def':     { severity: 'Warning' }, // for annotate statement (for CSN or CDL path cont)
   'anno-undefined-element': { severity: 'Warning' },
   'anno-undefined-param':   { severity: 'Warning' },
-  'anno-unexpected-ellipsis-layers': { severity: 'Error', configurableFor: true }, // TODO(v3): Merge with anno-unexpected-ellipsis and make non-configurable
+  'anno-unexpected-ellipsis': { severity: 'Error', configurableFor: 'v3' },
 
   'args-expected-named':  { severity: 'Error', configurableFor: 'deprecated' }, // future --sloppy
   'args-no-params':       { severity: 'Error', configurableFor: 'deprecated' }, // future --sloppy
@@ -185,6 +185,7 @@ const centralMessages = {
   'odata-spec-violation-property-name': { severity: 'Warning' }, // more than 30 chars
   'odata-anno-preproc': { severity: 'Warning', configurableFor: true },
   'odata-anno-dict': { severity: 'Warning', configurableFor: true },
+  'odata-anno-vocref': { severity: 'Warning', configurableFor: true },
   'odata-anno-dict-enum': { severity: 'Error' },
   'odata-anno-value': { severity: 'Warning', configurableFor: true },
   'odata-anno-type': { severity: 'Warning', configurableFor: true },
@@ -220,13 +221,16 @@ for (const oldName in oldMessageIds) {
 
 const centralMessageTexts = {
   'api-invalid-option': {
-    // TODO: too many different error situations for one message id,
-    // TODO: use message parameter - do not use quotes in message texts
-    std: 'Option $(NAME) is no longer supported! Use SNAPI options instead',
-    magicVars: 'Option “magicVars” is no longer supported! Use “variableReplacements” instead. See <https://cap.cloud.sap/docs/guides/databases#configuring-variables> for details',
-    user: 'Option “variableReplacements” expects “$user” instead of “user”. See <https://cap.cloud.sap/docs/guides/databases#configuring-variables> for details',
-    locale: 'Option “variableReplacements” expects “$user.locale” instead of “locale”. See <https://cap.cloud.sap/docs/guides/databases#configuring-variables> for details',
-    'noDollar': 'Option “variableReplacements” does not know $(NAME). Did you forget a leading “$”?'
+    std: 'Invalid option $(NAME)!',
+    deprecated: 'Option $(NAME) is no longer supported! Use latest API options instead',
+    magicVars: 'Option $(PROP) is no longer supported! Use $(OTHERPROP) instead. See <https://cap.cloud.sap/docs/guides/databases#configuring-variables> for details',
+  },
+
+  'api-invalid-variable-replacement': {
+    std: 'Option $(OPTION) does not support $(NAME)',
+    user: 'Option $(OPTION) expects $(PROP) instead of $(OTHERPROP). See <https://cap.cloud.sap/docs/guides/databases#configuring-variables> for details',
+    locale: 'Option $(OPTION) expects $(PROP) instead of $(OTHERPROP). See <https://cap.cloud.sap/docs/guides/databases#configuring-variables> for details',
+    'noDollar': 'Option $(OPTION) does not know $(NAME). Did you forget a leading $(CODE)?'
   },
 
   'anno-duplicate': {
@@ -244,7 +248,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-ellipsis-layers': 'No base annotation available to apply $(CODE)',
   'chained-array-of': '"Array of"/"many" must not be chained with another "array of"/"many" inside a service',
 
   'check-proper-type-of': {
@@ -268,6 +271,12 @@ const centralMessageTexts = {
     mixin: 'A mixin name starting with $(NAME) might shadow a special variable - replace by another name',
   },
 
+  '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: ----------------------------------
   'syntax-deprecated-abstract': {
     std: 'Abstract entity definitions are deprecated; use aspect definitions instead',
@@ -300,9 +309,9 @@ const centralMessageTexts = {
     'std': 'Invalid literal value',
     'uneven-hex': 'A binary literal must have an even number of characters',
     'invalid-hex': 'A binary literal must only contain characters ‹0-9›, ‹a-f› and ‹A-F›',
-    'time': 'A time literal must look like ‹hh:mm:ss› or ‹hh:mm› where each letter represents a digit',
+    'time': 'A time literal must look like ‹hh:mm:ss› or ‹hh:mm› where each letter represents a digit. A timezone is optional',
     'date': 'A date literal must look like ‹YYYY-MM-DD› where each letter represents a digit',
-    'timestamp': 'A timestamp literal must look like ‹YYYY-MM-DD hh:mm:ss.u…u› or ‹YYYY-MM-DD hh:mm› where each letter represents a digit, ‹u…u› represents 1 to 7 digits',
+    'timestamp': 'A timestamp literal must look like ‹YYYY-MM-DD hh:mm:ss.u…u› or ‹YYYY-MM-DD hh:mm› where each letter represents a digit, ‹u…u› represents 1 to 7 digits. A timezone is optional',
     'number': 'The string value in property $(PROP) does not represent a number',
     'expecting': 'Expecting literal type $(OP) for the value in property $(OTHERPROP)',
     'typeof': 'String $(RAWVALUE) is no valid literal type for the string value in property $(OTHERPROP)',
@@ -384,6 +393,10 @@ const centralMessageTexts = {
     'zero-parens': 'Deprecated CSN v.0.1.0 representation of expressions in parentheses',
     'zero-replace': 'Replace CSN v0.1.0 value in $(PROP) by $(VALUE)',
   },
+  'syntax-deprecated-type-ref': {
+    std: 'Expecting a string as value for property $(PROP) for a reference to a definition',
+    'ref-item': 'Expecting a string as value for property $(PROP) for a type reference to an element',
+  },
 
   'syntax-expecting-object': {
     std: 'Expecting object for property $(PROP)',
@@ -438,6 +451,12 @@ const centralMessageTexts = {
     annotation: 'Annotation definitions can\'t have calculated elements',
     param: 'Parameters can\'t have calculated elements',
   },
+  'ref-invalid-calc-elem': {
+    std: 'Can\'t include artifact with calculated element',
+    event: 'An event can\'t include an entity with calculated elements',
+    type: 'A type can\'t include an entity with calculated elements',
+    annotation: 'An annotation can\'t include an entity with calculated elements',
+  },
   'def-unsupported-calc-elem': {
     std: 'Calculated elements are not supported',
     nested: 'Calculated elements in structures are not supported, yet'
@@ -526,6 +545,7 @@ const centralMessageTexts = {
   'ref-unexpected-navigation': {
     std: 'Can\'t follow association $(ID) of path $(ELEMREF) in an ON-condition; only foreign keys can be referred to, but not $(NAME)',
     unmanaged: 'Can\'t follow unmanaged association $(ID) of path $(ELEMREF) in an ON-condition; only foreign keys can be referred to',
+    unmanagedleaf: 'Unexpected unmanged association as final path step of $(ELEMREF) in an ON-condition',
   },
 
   'type-unexpected-typeof': {
@@ -557,15 +577,21 @@ const centralMessageTexts = {
     element: 'Artifact $(ART) has no element $(NAME)',
     enum: 'Artifact $(ART) has no enum $(NAME)',
     returns: 'Return value of $(ART) has no element $(NAME)',
-    'entity-element': 'Elements of entity types can\'t be annotated',
+    'enum-returns': 'Return value of $(ART) has no enum $(NAME)',
   },
   'anno-undefined-action': {
     std: 'Action $(ART) has not been found',
-    action: 'Artifact $(ART) has no action $(MEMBER)'
+    action: 'Artifact $(ART) has no action $(NAME)'
   },
   'anno-undefined-param': {
     std: 'Parameter $(ART) has not been found',
-    param: 'Artifact $(ART) has no parameter $(MEMBER)'
+    param: 'Artifact $(ART) has no parameter $(NAME)'
+  },
+
+  // annotation checks against their definition
+  'anno-expecting-value': {
+    'std':  'Expecting a value for the annotation; see annotation definition for $(ANNO)',
+    'type':  'Expecting a value of type $(TYPE) for the annotation'
   },
 
   'def-unexpected-paramview-assoc': {
@@ -622,7 +648,10 @@ const centralMessageTexts = {
     action: 'Duplicate definition of action or function $(NAME)',
     param: 'Duplicate definition of parameter $(NAME)',
     alias: 'Duplicate definition of table alias or mixin $(NAME)',
+    '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 v4, use duplicate-definition
   'ref-duplicate-include-member': {
     std: 'Duplicate member $(NAME) through multiple includes $(SORTED_ARTS)',
     elements: 'Duplicate element $(NAME) through multiple includes $(SORTED_ARTS)',
@@ -645,18 +674,18 @@ const centralMessageTexts = {
   '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)',
   'ext-duplicate-extend-type-unrelated-layer': 'Duplicate type extension for type $(TYPE)',
   'ext-invalid-type-property':  {
-    std: 'Property $(PROP) can only be extended',
-    'new-prop': 'Property $(PROP) can only be extended, not added',
+    std: 'Type property $(PROP) can only be extended',
+    '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
-    smaller: 'Property $(PROP) can only be extended, but $(VALUE) is smaller than $(NUMBER) of type definition',
+    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
-    'ext-smaller': 'Property $(PROP) can only be extended, but extended value $(VALUE) is smaller than $(NUMBER) from previous type extension',
-    prop: 'Type property $(PROP) can\'t be extended',
-    scale: 'If property $(PROP) is increased, then so must $(OTHERPROP)',
-    string: 'Only numerical properties can be extended, but found string for $(PROP)',
+    scale: 'With the extension for type property $(OTHERPROP), the value of $(PROP) must be $(NUMBER) or higher',
   },
   'ref-expected-scalar-type': {
     std: 'Only scalar type definitions can be extended with type properties',
@@ -687,6 +716,12 @@ const centralMessageTexts = {
   '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)',
+    few: 'Replace ambiguous $(ID) by $(NAMES) or a new table alias for sub-queries that don\'t have one',
+    none: 'Ambiguous $(ID) requires an explicit table alias, but there are none: add table aliases to all sub-queries to disambiguate $(ID)',
+  },
+
   'type-managed-composition': {
     std: 'Managed compositions can\'t be used in types', // yet
     sub: 'Managed compositions can\'t be used in sub elements',
@@ -713,7 +748,8 @@ const centralMessageTexts = {
   'odata-spec-violation-id': {
     std: 'Expected EDM name $(ID) to start with a letter or underscore, followed by at most 127 letters, underscores or digits',
     'v2firstchar': 'Unexpected first character $(PROP) of EDM Name $(ID) for OData $(VERSION)',
-    'qualifier': 'Expected annotation qualifier $(ID) to start with a letter or underscore, followed by at most 127 letters, underscores or digits'
+    'qualifier': 'Expected annotation qualifier $(ID) to start with a letter or underscore, followed by at most 127 letters, underscores or digits',
+    'vocrefalias': 'Expected value $(VALUE) of vocabulary reference attribute $(ID) to start with a letter or underscore, followed by at most 127 letters, underscores or digits'
   },
   // version independent messages
   'odata-spec-violation-key-array': {
@@ -782,6 +818,12 @@ const centralMessageTexts = {
     'experimental': '$(ANNO) is experimental and can be changed or removed at any time, do not use productively!',
     'redefinition': '$(ANNO) is an official OASIS/SAP annotation and can\'t be redefined'
   },
+  'odata-anno-vocref': {
+    'std': 'Vocabulary reference $(ID) doesn\'t match alias $(NAME), reference is ignored',
+    'redef': 'Vocabulary reference $(ID) is the alias of the official OASIS/SAP vocabulary $(TYPE) which can\'t be redefined, reference is ignored',
+    'service': 'Vocabulary reference collides with service $(NAME), reference is ignored',
+    'malformed': 'Vocabulary reference $(ID) has invalid or missing value for attribute $(NAME), reference is ignored'
+  },
   'odata-anno-dict-enum': {
     'std' : 'Unexpected annotation definition $(NAME) with many enum type',
     'type': 'Unexpected annotation definition $(NAME) with many enum type $(TYPE)',