@sap/cds-compiler 4.8.0 → 4.9.0

package/lib/api/options.js

@@ -52,6 +52,8 @@ const publicOptionsNewAPI = [
   // for.effective
   'resolveSimpleTypes',
   'resolveProjections',
+  'remapOdataAnnotations',
+  'keepLocalized',
 ];
 
 // Internal options used for testing/debugging etc.
@@ -214,12 +216,21 @@ module.exports = {
     effective: (options) => {
       const hardOptions = {};
       const defaultOptions = {
-        sqlMapping: 'plain', resolveSimpleTypes: true, resolveProjections: true,
+        sqlMapping: 'plain', resolveSimpleTypes: true, resolveProjections: true, remapOdataAnnotations: false, keepLocalized: false,
       };
       const processed = translateOptions(options, defaultOptions, hardOptions, null, [ 'sql-dialect-and-naming' ], 'for.effective');
 
       return Object.assign({}, processed);
     },
+    seal: (options) => {
+      const hardOptions = {
+        sqlMapping: 'plain', resolveSimpleTypes: true, resolveProjections: true, keepLocalized: false,
+      };
+      const defaultOptions = { remapOdataAnnotations: true };
+      const processed = translateOptions(options, defaultOptions, hardOptions, null, [ 'sql-dialect-and-naming' ], 'for.effective');
+
+      return Object.assign({}, processed);
+    },
     java: options => translateOptions(options, { sqlMapping: 'plain' }, {}, undefined, undefined, 'for.java'),
   },
   overallOptions, // exported for testing

package/lib/api/validate.js

@@ -140,17 +140,13 @@ const allCombinationValidators = {
     if (options.sqlDialect && options.sqlMapping && options.sqlDialect !== 'hana' && [ 'quoted', 'hdbcds' ].includes(options.sqlMapping))
       message.error('api-invalid-combination', null, { '#': 'sql-dialect-and-naming', name: options.sqlDialect, prop: options.sqlMapping });
   },
-  'sql-dialect-and-localized': (options, message) => {
-    if (options.fewerLocalizedViews && options.sqlDialect === 'hana' && (options.withHanaAssociations || options.withHanaAssociations === undefined))
-      message.error('api-invalid-combination', null, { '#': 'sql-dialect-and-localized', option: 'fewerLocalizedViews', value: 'hana' });
-  },
   'beta-no-test': (options, message) => {
     if (options.beta && !options.testMode)
       message.warning('api-unexpected-combination', null, { '#': 'beta-no-test', option: 'beta' });
   },
 };
 
-const alwaysRunValidators = [ 'beta-no-test', 'sql-dialect-and-localized' ];
+const alwaysRunValidators = [ 'beta-no-test' ];
 
 /**
  * Run the validations for each option.

package/lib/base/builtins.js

@@ -4,6 +4,32 @@
 // It should not contain any specific to XSN, i.e. neither XSN structures
 // nor any other XSN properties.
 
+/**
+ * Map of propagation rules for annotations.
+ * Does not include rules for standard propagation of annotations or other properties.
+ *
+ * @type {Record<string, string>}
+ */
+const propagationRules = {
+  __proto__: null,
+  '@Analytics.hidden': 'never',
+  '@Analytics.visible': 'never',
+  '@cds.autoexpose': 'onlyViaArtifact',
+  '@cds.autoexposed': 'never',
+  '@cds.external': 'never',
+  '@cds.persistence.calcview': 'never',
+  '@cds.persistence.exists': 'never',
+  '@cds.persistence.skip': 'notWithPersistenceTable',
+  '@cds.persistence.table': 'never',
+  '@cds.persistence.udf': 'never',
+  '@cds.redirection.target': 'never',
+  '@com.sap.gtt.core.CoreModel.Indexable': 'never',
+  '@fiori.draft.enabled': 'onlyViaArtifact',
+  '@sql.append': 'never',
+  '@sql.prepend': 'never',
+  '@sql.replace': 'never',
+}
+
 /**
  * Checks whether the given absolute path is inside a reserved namespace.
  *
@@ -80,6 +106,7 @@ function isAnnotationExpression( val ) {
 }
 
 module.exports = {
+  propagationRules,
   xprInAnnoProperties,
   functionsWithoutParens,
   isInReservedNamespace,

package/lib/base/message-registry.js

@@ -64,8 +64,10 @@ const centralMessages = {
   'ext-undefined-param':   { severity: 'Warning' },
   'anno-unexpected-ellipsis': { severity: 'Error', configurableFor: 'deprecated' },
   'anno-unexpected-localized-skip': { severity: 'Error', configurableFor: true },
+  'anno-unexpected-mixin': { severity: 'Warning', errorFor: [ 'v5' ] },
 
   'name-invalid-dollar-alias': { severity: 'Error', configurableFor: true },
+  'name-deprecated-$self': { severity: 'Warning', errorFor: [ 'v5' ], configurableFor: true },
 
   'type-invalid-items': { severity: 'Error' }, // not supported yet
   'assoc-as-type':  { severity: 'Error' }, // TODO: allow more, but not all
@@ -84,6 +86,7 @@ const centralMessages = {
   'empty-type':   { severity: 'Info' }, // only still an error in old transformers
 
   'ref-deprecated-orderby': { severity: 'Error', configurableFor: true },
+  'ref-deprecated-self-element': { severity: 'Warning', configurableFor: true, errorFor: [ 'v5' ] },
   'ref-invalid-type': { severity: 'Error' },
   'ref-unexpected-self': { severity: 'Error' },
   'ref-invalid-include': { severity: 'Error' },
@@ -159,6 +162,7 @@ const centralMessages = {
   'syntax-unknown-escape': { severity: 'Error', configurableFor: true },
   'syntax-unsupported-masked': { severity: 'Error', configurableFor: 'deprecated' },
   'syntax-unexpected-sql-clause': { severity: 'Error' }, // TODO: configurableFor:'tests'?
+  'syntax-ignoring-anno': { severity: 'Warning', errorFor: [ 'v5' ] },
 
   'type-unsupported-precision-change': { severity: 'Error' },
   'type-unsupported-key-change': { severity: 'Error', configurableFor: true },
@@ -230,6 +234,9 @@ for (const oldName in oldMessageIds) {
 // If you change it, keep in sync with scripts/eslint/rules/message-text.js
 
 const centralMessageTexts = {
+  'api-deprecated-v5': {
+    std: 'Support for generating hdbcds output is deprecated with @sap/cds-compiler v5 and later'
+  },
   'api-invalid-option': {
     std: 'Invalid option $(NAME)!',
     deprecated: 'Option $(NAME) is no longer supported! Use latest API options instead',
@@ -251,7 +258,6 @@ const centralMessageTexts = {
     std: 'Invalid option combination found: $(OPTION) and $(PROP)', // unused
     'valid-structured': 'Structured OData is only supported with OData version v4',
     'sql-dialect-and-naming': 'sqlDialect $(NAME) can\'t be combined with sqlMapping $(PROP)',
-    'sql-dialect-and-localized':  'Option $(OPTION) can\'t be combined with SQL dialect $(VALUE) or the to.hdi()/to.hdbcds() backend',
     'tenant-and-naming': 'Option $(OPTION) can\'t be combined with sqlMapping $(PROP) - expected sqlMapping $(VALUE)'
   },
   'api-unexpected-combination': {
@@ -284,6 +290,7 @@ const centralMessageTexts = {
   'anno-unstable-array': 'Unstable order of array items due to repeated assignments for $(ANNO)',
   'anno-mismatched-ellipsis': 'An array with $(CODE) can only be used if there is an assignment below with an array value',
   'anno-unexpected-ellipsis': 'No base annotation available to apply $(CODE)',
+  'anno-unexpected-mixin': 'Unexpected annotation on mixin definition',
 
   'anno-unexpected-localized-skip': {
     std: 'Compiler generated entity $(NAME) must not be annotated with $(ANNO) if $(ART) is not skipped',
@@ -291,8 +298,8 @@ const centralMessageTexts = {
   },
 
   'anno-missing-rewrite': {
-    std: 'Assign a value for $(ANNO), the value inherited from $(ART) would contain invalid references like $(ELEMREF)',
-    unrelated: 'Assign a value for $(ANNO), the value inherited from $(ART) would contain references like $(ELEMREF) to unrelated elements',
+    std: 'Assign a value for $(ANNO); the value inherited from $(ART) would contain invalid or unrelated references like $(ELEMREF)',
+    unsupported: 'Assign a value for $(ANNO); the value inherited from $(ART) can\'t be rewritten due to unsupported $(ELEMREF)',
   },
 
   'chained-array-of': '"Array of"/"many" must not be chained with another "array of"/"many" inside a service',
@@ -568,13 +575,17 @@ const centralMessageTexts = {
     entity: 'Entity $(ART) has no parameter $(ID)',
     action: 'Action $(ART) has no parameter $(ID)',
   },
-  'ref-undefined-art': 'No artifact has been found with name $(ART)',
+  'ref-undefined-art': {
+    std: 'No artifact has been found with name $(ART)',
+    namespace: 'No artifact has been found with name $(ART) which can be extended with annotations',
+    localized: 'Can\'t extend localized definitions, only annotate them using an $(KEYWORD) statement',
+  },
   // TODO: proposal 'No definition found for $(NAME)',
   'ref-undefined-element': {
     std: 'Element $(ART) has not been found',
     element: 'Artifact $(ART) has no element $(MEMBER)',
     target: 'Target entity $(ART) has no element $(ID)',
-    aspect: 'Element $(ID) has not been found in the anonymous target aspect', // TODO: still?
+    aspect: 'Element $(ID) has not been found in the anonymous target aspect',
     query: 'The current query has no element $(ART)',
     alias: 'Element $(ART) has not been found in the sub query for alias $(ALIAS)',
     virtual: 'Element $(ART) has not been found. Use $(CODE) to add virtual elements in queries'
@@ -585,6 +596,7 @@ const centralMessageTexts = {
     target: 'Target entity $(ART) has no element $(ID)',
     query: 'The current query has no element $(ART)',
     alias: 'Element $(ART) has not been found in the sub query for alias $(ALIAS)',
+    aspect: 'Element $(ID) has not been found in the anonymous target aspect',
   },
   'ref-undefined-var': {
     std: 'Variable $(ID) has not been found',
@@ -721,7 +733,7 @@ const centralMessageTexts = {
     'targetAspect': 'Unexpected $(KEYWORD) on composition of aspect'
   },
 
-  'anno-builtin': 'Builtin types should not be annotated. Use custom type instead',
+  '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-element': {
@@ -907,8 +919,8 @@ const centralMessageTexts = {
   },
 
   'query-undefined-element': {
-    std: 'Target $(TARGET) of $(NAME) is missing element $(ID); please use $(KEYWORD) with an explicit ON-condition',
-    redirected: 'Target $(TARGET) of $(NAME) is missing element $(ID); please add an ON-condition to $(KEYWORD)',
+    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',
   'query-unexpected-structure-hdbcds': 'Publishing a structured element in a view is not possible for “hdbcds” naming mode',
@@ -1032,10 +1044,10 @@ const centralMessageTexts = {
   'odata-spec-violation-assoc': 'Unexpected association in structured type for OData $(VERSION)',
   'odata-spec-violation-constraints': 'Partial referential constraints produced for OData $(VERSION)',
   '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',
+    std: 'Expected EDM 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 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',
-    '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'
+    'qualifier': 'Expected annotation qualifier $(ID) to start with an alphabetic character or underscore, followed by a maximum of 127 alphabetic characters, digits, or underscores',
+    'vocrefalias': 'Expected value $(VALUE) of vocabulary reference attribute $(ID) to start with an alphabetic character or underscore, followed by a maximum of 127 alphabetic characters, digits, or underscores',
   },
   // version independent messages
   'odata-spec-violation-key-array': {
@@ -1051,7 +1063,7 @@ const centralMessageTexts = {
     scalar: 'Unexpected $(TYPE) mapped to $(ID) as type for key element' // flat
   },
   'odata-spec-violation-no-key': 'Expected entity to have a primary key',
-  'odata-spec-violation-type-unknown': 'Unknown Edm Type $(TYPE)',
+  'odata-spec-violation-type-unknown': 'Unknown EDM Type $(TYPE)',
   'odata-spec-violation-type': {
     std: 'Expected element to have a type',
     incompatible: 'Unexpected EDM Type $(TYPE) for OData $(VERSION)',
@@ -1148,7 +1160,7 @@ const centralMessageTexts = {
   'odata-anno-xpr': {
     'std': 'unused',
     'notadynexpr': '$(OP) is not a renderable dynamic expression in $(ANNO)',
-    'use': 'Function $(OP) is not a renderable dynamic expression in $(ANNO), please use $(CODE) instead',
+    'use': 'Function $(OP) is not a renderable dynamic expression in $(ANNO), use $(CODE) instead',
     'canonfuncalias': 'Expected function name $(CODE) to be of the form $(META).$(OTHERMETA) for $(OP) in $(ANNO)',
     'unexpected': 'Unexpected expression in $(ANNO)',
   }
@@ -1169,14 +1181,15 @@ const centralMessageTexts = {
   'odata-anno-xpr-ref': {
     'std': '$(ANNO) can\'t be propagated to $(NAME) because path $(ELEMREF) is not resolvable via type reference $(CODE)',
     'args': 'Unexpected arguments or filters in $(ELEMREF) in $(ANNO)',
-    'flatten_builtin': 'Expected path $(ELEMREF) in $(ANNO) to end with a leaf element while flattening $(NAME)',
-    'flatten_builtin_type': 'Expected path $(ELEMREF) in $(ANNO) to end with a leaf element while flattening',
+    'flatten_builtin': 'Expected path $(ELEMREF) in $(ANNO) to end in a scalar typed leaf element while flattening $(NAME)',
+    'flatten_builtin_type': 'Expected path $(ELEMREF) in $(ANNO) to end in a scalar typed leaf element while flattening',
     'invalid': 'Invalid path $(ELEMREF) in $(ANNO)',
     // genericTranslation
-    'notaparam': 'Element path $(ELEMREF) can\'t be used in $(ANNO) which is applied to a parameter entity',
-    'notaneelement': 'Parameter path $(ELEMREF) can\'t be used in $(ANNO) which is applied to a type entity',
-    'notrendered': 'Path step $(COUNT) of $(ELEMREF) in $(ANNO) refers to an unrendered propery in the OData API',
-    'tomany': 'Unexpected to-many transition in path step $(COUNT) of $(ELEMREF) in $(ANNO)',
+    'notaparam': 'EDM Element path $(ELEMREF) can\'t be used in $(ANNO) which is applied to a parameter entity',
+    'notaneelement': 'EDM Parameter path $(ELEMREF) can\'t be used in $(ANNO) which is applied to a type entity',
+    'notrendered': 'EDM Path step $(COUNT) of $(ELEMREF) in $(ANNO) refers to an unrendered property in the OData API',
+    'magic': 'Unexpected magic variable $(ELEMREF) in $(ANNO)',
+    'bparam_v2': 'Unexpected explicit binding parameter path $(ELEMREF) for OData $(VERSION) in $(ANNO)',
   },
   // -----------------------------------------------------------------------------------
   // OData Message section ends here, no messages below this line

package/lib/base/messages.js

@@ -82,6 +82,23 @@ function isDowngradable( messageId, moduleName, options ) {
     : configurableFor && (configurableFor !== 'deprecated' || isDeprecatedEnabled( options, 'downgradableErrors' ));
 }
 
+/**
+ * Returns a marker for messages strings indicating whether the message can be downgraded
+ * or whether it will be an error in the next cds-compiler release.
+ *
+ * @returns {string}
+ */
+function severityChangeMarker(msg, config) {
+  const severity = msg.severity || 'Error';
+  if (config.moduleForMarker) {
+    if (severity === 'Error' && isDowngradable(msg.messageId, config.moduleForMarker, {}))
+      return '‹↓›';
+    if (msg.messageId && centralMessages[msg.messageId]?.errorFor?.includes('v5'))
+      return '‹↑›';
+  }
+  return '';
+}
+
 /**
  * Class for combined compiler errors.  Additional members:
  * - `messages`: array of compiler messages (CompileMessage)
@@ -100,8 +117,6 @@ class CompilationError extends Error {
     this.code = 'ERR_CDS_COMPILATION_FAILURE';
     this.messages = [ ...messages ].sort(compareMessageSeverityAware);
 
-    // TODO: remove this bin/cdsc.js specifics
-    Object.defineProperty( this, 'hasBeenReported', { value: false, configurable: true, writable: true, enumerable: false } );
     // property `model` is only set with options.attachValidNames:
     Object.defineProperty( this, 'model', { value: model || undefined, configurable: true } );
   }
@@ -176,8 +191,14 @@ class CompileMessage {
     // this.error = null;
   }
 
-  toString() {                  // should have no argument...
-    return messageString( this, undefined, true ); // no message-id before finalization!
+  toString() {
+    // Used by cds-dk in their own `toString` wrapper.
+    return messageString( this, {
+      normalizeFilename: false,
+      noMessageId: true, // no message-id before finalization!
+      noHome: false,
+      module: null,
+    });
   }
 }
 
@@ -997,12 +1018,17 @@ function replaceInString( text, params ) {
  * @param {boolean} [config.noMessageId]
  *     If true, will _not_ show the message ID (+ explanation hint) in the output.
  *
+ * @param {boolean} [config.idInBrackets]
+ *     If true, the message ID (if there is one and noMessageId is falsey) will be put in brackets.
+ *     This will be the default in cds-compiler v5.
+ *
  * @param {boolean} [config.noHome]
  *     If true, will _not_ show message's semantic location.
  *
- * @param {string} [config.module]
+ * @param {string} [config.moduleForMarker]
  *     If set, downgradable error messages will get a '‹↓›' marker, depending on whether
- *     the message can be downgraded for the given module.
+ *     the message can be downgraded for the given module.  A `‹↑›` is used if the message
+ *     will be an error in the next major cds-compiler release.
  *
  * @returns {string}
  */
@@ -1013,19 +1039,22 @@ function messageString( err,  config ) {
       normalizeFilename: arguments[1],
       noMessageId: arguments[2],
       noHome: arguments[3],
-      module: arguments[4],
+      moduleForMarker: arguments[4],
     };
   }
+  config.moduleForMarker ??= config.module; // v4.8.0 or earlier compatibility
 
   const location = (err.$location?.file ? `${ locationString( err.$location, config.normalizeFilename ) }: ` : '');
   const severity = err.severity || 'Error';
-  const downgradable = severity === 'Error' && config.module &&
-    isDowngradable(err.messageId, config.module, {}) ? '‹↓›' : '';
+  const downgradable = severityChangeMarker(err, config);
   // even with noHome, print err.home if the location is weak
   const home = !err.home || config.noHome && err.$location?.endLine ? '' : ` (in ${ err.home })`;
-  // TODO: the plan was with brackets = `Error[ref-undefined-def]`
-  const id = err.messageId && !config.noMessageId ? ` ${ err.messageId }` : '';
-  return `${ location }${ severity }${ downgradable }${ id }: ${ err.message }${ home }`;
+
+  let msgId = ''; // TODO(v5): Use brackets only
+  if (err.messageId && !config.noMessageId)
+    msgId = (config.idInBrackets) ? `[${err.messageId}]` : ` ${err.messageId}`;
+
+  return `${ location }${ severity }${ downgradable }${ msgId }: ${ err.message }${ home }`;
 }
 
 /**
@@ -1065,9 +1094,10 @@ function messageHash( msg ) {
  * @param {boolean} [config.hintExplanation]
  *     If true, messages with explanations will get a "…" marker.
  *
- * @param {string} [config.module]
+ * @param {string} [config.moduleForMarker]
  *     If set, downgradable error messages will get a '‹↓›' marker, depending on whether
- *     the message can be downgraded for the given module.
+ *     the message can be downgraded for the given module.  A `‹↑›` is used if the message
+ *     will be an error in the next major cds-compiler release.
  *
  * @param {Record<string, string>} [config.sourceMap]
  *     A dictionary of filename<->source-code entries.  You can pass the `fileCache` that is used
@@ -1095,12 +1125,13 @@ function messageHash( msg ) {
 function messageStringMultiline( err, config = {} ) {
   colorTerm.changeColorMode(config ? config.color : 'auto');
 
+  config.moduleForMarker ??= config.module; // v4.8.0 or earlier compatibility
+
   const explainHelp = (config.hintExplanation && hasMessageExplanation(err.messageId)) ? '…' : '';
   const home = !err.home ? '' : (`at ${ err.home }`);
   const severity = err.severity || 'Error';
-  const downgradable = config.module && severity === 'Error' &&
-    isDowngradable(err.messageId, config.module, {}) ? '‹↓›' : '';
-  const msgId = (err.messageId && !config.noMessageId) ? `[${ err.messageId }${downgradable}${ explainHelp }]` : '';
+  const downgradable = severityChangeMarker(err, config);
+  const msgId = (err.messageId && !config.noMessageId) ? `${downgradable}[${ err.messageId }${ explainHelp }]` : '';
 
   let location = '';
   let context = '';
@@ -1590,7 +1621,7 @@ function constructSemanticLocationFromCsnPath( model, options, csnPath ) {
   if (!currentThing)
     return result;
 
-  let selectDepth = (csnPath[0] !== 'extensions') ? queryDepthForMessage(csnPath, model, currentThing) : null;
+  const selectDepth = (csnPath[0] !== 'extensions') ? queryDepthForMessage(csnPath, model, currentThing) : null;
 
   // Artifact ref -------------------------------------
 
@@ -1759,7 +1790,7 @@ function constructSemanticLocationFromCsnPath( model, options, csnPath ) {
         if (index >= csnPath.length)
           continue; // no column name
 
-        let elementHierarchy = [];
+        const elementHierarchy = [];
 
         // Concat column+expand/inline to get a name similar to elements.
         do {

package/lib/base/model.js

@@ -26,9 +26,6 @@ const queryOps = {
  */
 const availableBetaFlags = {
   // enabled by --beta-mode
-  annotationExpressions: true,
-  odataPathsInAnnotationExpressions: true,
-  odataAnnotationExpressions: true,
   hanaAssocRealCardinality: true,
   mapAssocToJoinCardinality: true, // only SAP HANA HEX engine supports it
   enableUniversalCsn: true,
@@ -39,8 +36,10 @@ const availableBetaFlags = {
   tenantVariable: true,
   calcAssoc: true,
   v5preview: true,
+  temporalRawProjection: true,
   // disabled by --beta-mode
   nestedServices: false,
+  rewriteAnnotationExpressionsViaType: false,
 };
 
 // Used by isDeprecatedEnabled() to check if any flag ist set.
@@ -81,7 +80,7 @@ const oldDeprecatedFlags_v2 = [
  *
  * A feature always needs to be provided - otherwise false will be returned.
  *
- * Please do not move this function to the "option processor" code.
+ * Do not move this function to the "option processor" code.
  *
  * @param {object} options Options
  * @param {string} feature Feature to check for
@@ -101,7 +100,7 @@ function isBetaEnabled( options, feature ) {
  * Useful for newer functionality which might not work with some
  * deprecated feature turned on.
  *
- * Please do not move this function to the "option processor" code.
+ * Do not move this function to the "option processor" code.
  *
  * @param {object} options Options
  * @param {string|null} [feature] Feature to check for

package/lib/checks/actionsFunctions.js

@@ -53,8 +53,8 @@ function checkActionOrFunction( art, artName, prop, path ) {
     Object.entries(params).forEach(([ pn, p ], i) => {
       const type = p.items?.type || p.type;
       if (type === '$self' && !this.csn.definitions.$self && i > 0) {
-        this.error(null, currPath.concat(pn),
-                   'Binding parameter is expected to appear on first position only');
+        this.error('def-invalid-param', currPath.concat(pn),
+                   'Binding parameter is expected to appear in first position only');
       }
     });
   }

package/lib/checks/annotationsOData.js

@@ -37,6 +37,7 @@ function checkCoreMediaTypeAllowance( member ) {
 function checkAnalytics( member ) {
   if (member['@Analytics.Measure'] && !member['@Aggregation.default']) {
     this.info(null, member.$path, {},
+              // eslint-disable-next-line cds-compiler/message-no-quotes
               'Annotation “@Analytics.Measure” expects “@Aggregation.default” to be assigned for the same element as well');
   }
 }
@@ -63,6 +64,7 @@ function checkReadOnlyAndInsertOnly( artifact, artifactName ) {
   if (!this.csnUtils.getServiceName(artifactName))
     return;
   if (artifact.kind === 'entity' && artifact['@readonly'] && artifact['@insertonly'])
+    // eslint-disable-next-line cds-compiler/message-no-quotes
     this.warning(null, artifact.$path, {}, 'Annotations “@readonly” and “@insertonly” can\'t be assigned in combination');
 }
 
@@ -93,6 +95,7 @@ function checkTemporalAnnotationsAssignment( artifact, artifactName ) {
 
   // if @cds.valid.key is defined, check whether @cds.valid.from and @cds.valid.to are also there
   if (valid.key.length && !(valid.from.length && valid.to.length))
+    // eslint-disable-next-line cds-compiler/message-no-quotes
     this.error(null, [ 'definitions', artifactName ], 'Annotation “@cds.valid.key” was used but “@cds.valid.from” and “@cds.valid.to” are missing');
 
   /**

package/lib/checks/defaultValues.js

@@ -23,6 +23,7 @@ function validateDefaultValues( member, memberName, prop, path ) {
       // TODO: This check only counts the number of leading signs, not inbetween (e.g. 1 - - 1).
       //       The message also needs to be improved.
       if (i > 1)
+        // eslint-disable-next-line cds-compiler/message-no-quotes
         this.error(null, path, {}, 'Illegal number of unary ‘+’/‘-’ operators');
     }
   }
@@ -37,8 +38,10 @@ function validateDefaultValues( member, memberName, prop, path ) {
  * @param {CSN.Path} path Path to the member
  */
 function rejectParamDefaultsInHanaCds( member, memberName, prop, path ) {
-  if (member.default && prop === 'params' && this.options.transformation === 'hdbcds')
-    this.error(null, path, {}, 'Parameter default values are not supported in SAP HANA CDS');
+  if (member.default && prop === 'params' && this.options.transformation === 'hdbcds') {
+    this.error('def-unsupported-param', path, {},
+               'Parameter default values are not supported in SAP HANA CDS');
+  }
 }
 
 /**

package/lib/checks/queryNoDbArtifacts.js

@@ -167,12 +167,13 @@ function _checkRef( ref, _links, $path, inColumns ) {
         const cdsPersistenceSkipped = hasAnnotationValue(targetArt, '@cds.persistence.skip');
         this.error( null, $path, {
           '#': cdsPersistenceSkipped ? 'std' : 'abstract',
+          anno: '@cds.persistence.skip',
           id: nonPersistedTarget.pathStep,
           elemref: { ref },
           name: nonPersistedTarget.name,
         }, {
-          std: 'Unexpected “@cds.persistence.skip” annotation on association target $(NAME) of $(ID) in path $(ELEMREF)',
-          abstract: 'Unexpected “abstract” association target $(NAME) of $(ID) in path $(ELEMREF)',
+          std: 'Unexpected $(ANNO) annotation on association target $(NAME) of $(ID) in path $(ELEMREF)',
+          abstract: 'Unexpected abstract association target $(NAME) of $(ID) in path $(ELEMREF)',
         } );
         break; // only one error per path
       }

package/lib/checks/validator.js

@@ -3,7 +3,7 @@
 const {
   forEachDefinition, forEachMemberRecursively, forAllQueries,
   forEachMember, getNormalizedQuery, hasAnnotationValue,
-  applyTransformations, functionList,
+  applyTransformations, functionList, mergeTransformers,
 } = require('../model/csnUtils');
 const enrichCsn = require('./enricher');
 
@@ -156,7 +156,7 @@ function _validate( csn, that,
   // TODO: Don't know if that's feasible? Do we really need to enrich annotations always?
   // const { cleanup } = enrich(csn, { processAnnotations: that.options.tranformation === 'odata' });
 
-  applyTransformations(csn, mergeCsnValidators(csnValidators, that), [], { drillRef: true });
+  applyTransformations(csn, mergeTransformers(csnValidators, that), [], { drillRef: true });
 
   forEachDefinition(csn, (artifact, artifactName, prop, path) => {
     artifactValidators.forEach((artifactValidator) => {
@@ -180,38 +180,6 @@ function _validate( csn, that,
   return cleanup;
 }
 
-/**
- * Ensure the CSN validators adhere to the applyTransformation format - also, supply correct this value for each subfunction
- *
- * @param {object[]} csnValidators Validators
- * @param {object} that Value for this
- * @returns {object} Remapped validators.
- */
-function mergeCsnValidators( csnValidators, that ) {
-  const remapped = {};
-  for (const validator of csnValidators) {
-    for (const [ n, fns ] of Object.entries(validator)) {
-      if (!remapped[n])
-        remapped[n] = [];
-
-      if (Array.isArray(fns)) {
-        remapped[n].push((parent, name, prop, path) => fns.forEach(
-          fn => fn.bind(that)(parent, name, prop, path)
-        ));
-      }
-      else {
-        remapped[n].push((parent, name, prop, path) => fns.bind(that)(parent, name, prop, path));
-      }
-    }
-  }
-
-  for (const [ n, fns ] of Object.entries(remapped))
-    remapped[n] = (parent, name, prop, path) => fns.forEach(fn => fn.bind(that)(parent, name, prop, path));
-
-
-  return remapped;
-}
-
 /**
  * Depending on the dialect we need to run different validations.
  *

package/lib/compiler/assert-consistency.js

@@ -129,6 +129,7 @@ function assertConsistency( model, stage ) {
       ],
       instanceOf: XsnSource,
     },
+    tokenIndex: { test: isNumber },
     location: {
       // every thing with a $location in CSN must have a XSN location even
       // with syntax errors (currently even internal artifacts like $using):
@@ -136,7 +137,10 @@ function assertConsistency( model, stage ) {
       kind: true,
       instanceOf: Location,
       requires: [ 'file' ],     // line is optional in top-level location
-      optional: [ 'line', 'col', 'endLine', 'endCol', '$notFound' ],
+      optional: [
+        'line', 'col', 'endLine', 'endCol', '$notFound',
+        'tokenIndex', // in parser for $lsp
+      ],
       schema: {
         line: { test: isNumber },
         col: { test: isNumber },
@@ -232,7 +236,7 @@ function assertConsistency( model, stage ) {
       test: (model.$frontend !== 'json') ? standard : TODO,
       // TODO: the JSON parser should augment 'namespace' correctly or better: hide it
       requires: [ 'location' ],
-      optional: [ 'path' ],
+      optional: [ 'kind', 'name' ],
     },
     usings: {
       test: isArray(),
@@ -515,11 +519,13 @@ function assertConsistency( model, stage ) {
         '_effectiveType', '$effectiveSeqNo', '_origin', '_deps',
         // CSN parser may let these properties slip through to XSN, even if input is invalid.
         'args', 'op', 'func', 'suffix',
+        '$invalidPaths',
       ],
       // TODO: name requires if not in parser?
     },
     $priority: { test: isOneOf( [ undefined, false, 'extend', 'annotate' ] ) },
     $annotations: { parser: true, kind: true, test: TODO }, // deprecated, still there for cds-lsp
+    $invalidPaths: { test: isBoolean },
     name: {
       isRequired: stageParser && (() => false), // not required in parser
       kind: true,