@sap/cds-compiler 2.13.8 → 3.0.0

package/lib/base/messages.js

@@ -7,10 +7,11 @@
 const { term } = require('../utils/term');
 const { locationString } = require('./location');
 const { isDeprecatedEnabled } = require('./model');
-const { centralMessages, centralMessageTexts } = require('./message-registry');
+const { centralMessages, centralMessageTexts, oldMessageIds } = require('./message-registry');
 const { copyPropIfExist } = require('../utils/objectUtils');
 const _messageIdsWithExplanation = require('../../share/messages/message-explanations.json').messages;
 const { analyseCsnPath, traverseQuery } = require('../model/csnRefs');
+const { CompilerAssertion } = require("./error");
 
 const fs = require('fs');
 const path = require('path');
@@ -24,8 +25,9 @@ let test$severities = null;
 let test$texts = null;
 
 /**
- * Returns true if at least one of the given messages is of severity "Error"
- * @param {CSN.Message[]} messages
+ * Returns true if at least one of the given messages is of severity "Error".
+ *
+ * @param {CompileMessage[]} messages
  * @returns {boolean}
  */
 function hasErrors( messages ) {
@@ -34,9 +36,10 @@ function hasErrors( messages ) {
 
 /**
  * Returns true if at least one of the given messages is of severity "Error"
- * and *cannot* be reclassified to a warning.
+ * and *cannot* be reclassified to a warning for the given module.
+ * Won't detect already downgraded messages.
  *
- * @param {CSN.Message[]} messages
+ * @param {CompileMessage[]} messages
  * @param {string} moduleName
  * @returns {boolean}
  */
@@ -122,7 +125,7 @@ class CompileMessage {
    * Creates an instance of CompileMessage.
    * @param {any} location Location of the message
    * @param {string} msg The message text
-   * @param {CSN.MessageSeverity} [severity='Error'] Severity: Debug, Info, Warning, Error
+   * @param {MessageSeverity} [severity='Error'] Severity: Debug, Info, Warning, Error
    * @param {string} [id] The ID of the message - visible as property messageId
    * @param {any} [home]
    * @param {string} [moduleName] Name of the module that created this message
@@ -141,7 +144,7 @@ class CompileMessage {
       Object.defineProperty( this, 'messageId', { value: id } );
       // this.messageId = id;  // ids not yet finalized
     if (moduleName)
-      Object.defineProperty( this, '$module', { value: moduleName } );
+      Object.defineProperty( this, '$module', { value: moduleName, configurable: true } );
   }
 
   toString() {                  // should have no argument...
@@ -184,7 +187,7 @@ const severitySpecs = {
 };
 
 /**
- * Reclassify the given message's severity using:
+ * Get the reclassified severity of the given message using:
  *
  *  1. The specified severity: either centrally provided or via the input severity
  *     - when generally specified as 'Error', immediately return 'Error'
@@ -195,17 +198,14 @@ const severitySpecs = {
  *     been returned according to 1, return the severity according to the user wishes.
  *  3. Otherwise, use the specified severity.
  *
- * @param {string} id
- * @param {CSN.MessageSeverity} severity
- * @param {object} severities
+ * @param {object} msg The CompileMessage.
+ * @param {CSN.Options} options
  * @param {string} moduleName
- * @returns {CSN.MessageSeverity}
- *
- * TODO: we should pass options as usual
- * TODO: should be part of the returned function
+ * @param {boolean} deprecatedDowngradable
+ * @returns {MessageSeverity}
  */
-function reclassifiedSeverity( id, severity, severities, moduleName, deprecatedDowngradable ) {
-  const spec = centralMessages[id] || { severity };
+function reclassifiedSeverity(msg, options, moduleName, deprecatedDowngradable ) {
+  const spec = centralMessages[msg.messageId] || { severity: msg.severity, configurableFor: null, errorFor: null };
   if (spec.severity === 'Error') {
     const { configurableFor } = spec;
     if (!(Array.isArray( configurableFor )
@@ -218,7 +218,17 @@ function reclassifiedSeverity( id, severity, severities, moduleName, deprecatedD
     if (Array.isArray( errorFor ) && errorFor.includes( moduleName ))
       return 'Error';
   }
-  return normalizedSeverity( severities[id] ) || spec.severity;
+
+  if (!options.severities)
+    return spec.severity;
+
+  let newSeverity = options.severities[msg.messageId];
+  // The user could have specified a severity through an old message ID.
+  if (!newSeverity && spec.oldNames) {
+    const oldName = spec.oldNames.find((name => options.severities[name]))
+    newSeverity = options.severities[oldName];
+  }
+  return normalizedSeverity( newSeverity ) || spec.severity;
 }
 
 function normalizedSeverity( severity ) {
@@ -228,24 +238,6 @@ function normalizedSeverity( severity ) {
   return s ? s.name : 'Error';
 }
 
-/**
- * Reclassifies all messages according to the current module.
- * This is required because if throwWithError() throws and the message's
- * severities has `errorFor` set, then the message may still appear to be a warning.
- *
- * TODO: this actually likely needs to be called by the backend module at the beginning!
- *
- * @param {CSN.Message[]} messages
- * @param {object} severities
- * @param {string} moduleName
- */
-function reclassifyMessagesForModule(messages, severities, moduleName, deprecatedDowngradable) {
-  for (const msg of messages) {
-    if (msg.messageId && msg.severity !== 'Error')
-      msg.severity = reclassifiedSeverity(msg.messageId, msg.severity, severities, moduleName, deprecatedDowngradable);
-  }
-}
-
 /**
  * Compare two severities.  Returns 0 if they are the same, and <0 if
  * `a` has a lower `level` than `b` according to {@link severitySpecs},
@@ -253,8 +245,8 @@ function reclassifyMessagesForModule(messages, severities, moduleName, deprecate
  *
  *   compareSeverities('Error', 'Info')  =>  Error < Info  =>  -1
  *
- * @param {CSN.MessageSeverity} a
- * @param {CSN.MessageSeverity} b
+ * @param {MessageSeverity} a
+ * @param {MessageSeverity} b
  * @see severitySpecs
  */
 function compareSeverities( a, b ) {
@@ -289,10 +281,9 @@ function searchForLocation( model, csnPath ) {
 
 /**
  * Create the `message` functions to emit messages.
- * See internalDoc/ReportingMessages.md for detail
  *
  * @example
- * ```
+ * ```js
  *   const { createMessageFunctions } = require(‘../base/messages’);
  *   function module( …, options ) {
  *     const { message, info, throwWithError } = createMessageFunctions( options, moduleName );
@@ -308,14 +299,14 @@ function searchForLocation( model, csnPath ) {
  * @param {object} [model=null] the CSN or XSN model, used for convenience
  */
 function createMessageFunctions( options, moduleName, model = null ) {
-  return makeMessageFunction( model, options, moduleName, true );
+  return makeMessageFunction( model, options, moduleName );
 }
 
 /**
  * Create the `message` function to emit messages.
  *
  * @example
- * ```
+ * ```js
  *   const { makeMessageFunction } = require(‘../base/messages’);
  *   function module( …, options ) {
  *     const { message, info, throwWithError } = makeMessageFunction( model, options, moduleName );
@@ -328,28 +319,36 @@ function createMessageFunctions( options, moduleName, model = null ) {
  * ```
  * @param {object} model
  * @param {CSN.Options} [options]
- * @param {string} [moduleName]
- * @param {boolean} [throwOnlyWithNew=false] behave like createMessageFunctions
+ * @param {string|null} [moduleName]
  */
-function makeMessageFunction( model, options, moduleName = null, throwOnlyWithNew = false ) {
-  // ensure message consistency during runtime with --test-mode
-  if (options.testMode)
+function makeMessageFunction( model, options, moduleName = null ) {
+  if (options.testMode) {
+    // ensure message consistency during runtime with --test-mode
     _check$Init( options );
+    if (!options.messages)
+      throw new CompilerAssertion('makeMessageFunction() expects options.messages to exist in testMode!');
+  }
 
   const hasMessageArray = !!options.messages;
-  const severities = options.severities || {};
-  const deprecatedDowngradable = isDeprecatedEnabled( options, 'downgradableErrors' );
+  const deprecatedDowngradable = isDeprecatedEnabled( options, '_downgradableErrors' );
   /**
    * Array of collected compiler messages. Only use it for debugging. Will not
    * contain the messages created during a `callTransparently` call.
    *
-   * @type {CSN.Message[]}
+   * @type {CompileMessage[]}
    */
   let messages = options.messages || [];
+  /**
+   * Whether an error was emitted in the module. Also includes reclassified errors.
+   * @type {boolean}
+   */
   let hasNewError = false;
+
+  reclassifyMessagesForModule();
+
   return {
     message, error, warning, info, debug, messages,
-    throwWithError: (throwOnlyWithNew ? throwWithError : throwWithAnyError),
+    throwWithError, throwWithAnyError,
     callTransparently, moduleName,
   };
 
@@ -361,22 +360,23 @@ function makeMessageFunction( model, options, moduleName = null, throwOnlyWithNe
       texts = { std: textOrArguments };
       textOrArguments = {};
     }
-    if (id) {
-      if (options.testMode && !options.$recompile)
-        _check$Consistency( id, moduleName, severity, texts, options )
-      severity = reclassifiedSeverity( id, severity, severities, moduleName, deprecatedDowngradable );
-    }
 
     const [ fileLocation, semanticLocation, definition ] = _normalizeMessageLocation(location);
     const text = messageText( texts || centralMessageTexts[id], textOrArguments );
 
-    /** @type {CSN.Message} */
+    /** @type {CompileMessage} */
     const msg = new CompileMessage( fileLocation, text, severity, id, semanticLocation, moduleName );
     if (options.internalMsg)
       msg.error = new Error( 'stack' );
     if (definition)
       msg.$location.address = { definition };
 
+    if (id) {
+      if (options.testMode && !options.$recompile)
+        _check$Consistency( id, moduleName, severity, texts, options )
+      msg.severity = reclassifiedSeverity(msg, options, moduleName, deprecatedDowngradable );
+    }
+
     messages.push( msg );
     hasNewError = hasNewError || msg.severity === 'Error' &&
       !(options.testMode && msg.messageId && isDowngradable( msg.messageId, moduleName ));
@@ -406,7 +406,7 @@ function makeMessageFunction( model, options, moduleName = null, throwOnlyWithNe
 
     if (isShortSignature) {
       if (texts)
-        throw new Error('No "texts" argument expected because text was already provided as third argument.');
+        throw new CompilerAssertion('No "texts" argument expected because text was already provided as third argument.');
     } else {
       if (textArguments !== undefined && typeof textArguments !== 'object')
         _expectedType('textArguments', textArguments, 'object')
@@ -415,7 +415,7 @@ function makeMessageFunction( model, options, moduleName = null, throwOnlyWithNe
     }
 
     function _expectedType(field, value, type) {
-      throw new Error(`Invalid argument type for ${ field }! Expected ${ type } but got ${ typeof value }. Do you use the old function signature?`);
+      throw new CompilerAssertion(`Invalid argument type for ${ field }! Expected ${ type } but got ${ typeof value }. Do you use the old function signature?`);
     }
   }
 
@@ -470,9 +470,9 @@ function makeMessageFunction( model, options, moduleName = null, throwOnlyWithNe
    */
   function message(id, location, textArguments = null, texts = null) {
     if (!id)
-      throw new Error('A message id is missing!');
+      throw new CompilerAssertion('A message id is missing!');
     if (!centralMessages[id])
-      throw new Error(`Message id '${ id }' is missing an entry in the central message register!`);
+      throw new CompilerAssertion(`Message id '${ id }' is missing an entry in the central message register!`);
     return _message(id, location, textArguments, null, texts);
   }
 
@@ -524,12 +524,31 @@ function makeMessageFunction( model, options, moduleName = null, throwOnlyWithNe
   function throwWithAnyError() {
     if (!messages || !messages.length)
       return;
-    reclassifyMessagesForModule( messages, severities, moduleName ); // TODO: no, at the beginning of the module
     const hasError = options.testMode ? hasNonDowngradableErrors : hasErrors;
     if (hasError( messages, moduleName ))
       throw new CompilationError( messages, options.attachValidNames && model );
   }
 
+  /**
+   * Reclassifies all messages according to the current module.
+   * This is required because if throwWithError() throws and the message's
+   * severities has `errorFor` set, then the message may still appear to be a warning.
+   */
+  function reclassifyMessagesForModule() {
+    for (const msg of messages) {
+      if (msg.messageId && msg.severity !== 'Error') {
+        const severity = reclassifiedSeverity(msg, options, moduleName, deprecatedDowngradable);
+        if (severity !== msg.severity) {
+          msg.severity = severity;
+          // Re-set the module regardless of severity, since we reclassified it.
+          Object.defineProperty( msg, '$module', { value: moduleName, configurable: true } );
+          hasNewError = hasNewError || severity === 'Error' &&
+            !(options.testMode && msg.messageId && isDowngradable( msg.messageId, moduleName ));
+        }
+      }
+    }
+  }
+
   /**
    * Collects all messages during the call of the callback function instead of
    * storing them in the model. Returns the collected messages.
@@ -537,7 +556,7 @@ function makeMessageFunction( model, options, moduleName = null, throwOnlyWithNe
    *
    * @param {Function} callback
    * @param  {...any} args
-   * @returns {CSN.Message[]}
+   * @returns {CompileMessage[]}
    */
   function callTransparently(callback, ...args) {
     const backup = messages;
@@ -563,9 +582,25 @@ function _check$Init( options ) {
   }
 }
 
+/**
+ * Check the consistency of the given message and run some basic lint checks.  These include:
+ *
+ *  - Long message IDs must be listed centrally.
+ *  - Messages with the same ID must have the same severity (in a module).
+ *  - Messages with the same ID must have the same message texts.
+ *    This ensures that $(PLACEHOLDERS) are used and that we don't accidentally
+ *    use the same ID for different meanings, i.e. texts.
+ *
+ * @param {string} id
+ * @param {string} moduleName
+ * @param {string} severity
+ * @param {string|object} texts
+ * @param {CSN.Options} options
+ * @private
+ */
 function _check$Consistency( id, moduleName, severity, texts, options ) {
   if (id.length > 30 && !centralMessages[id])
-    throw new Error( `The message ID "${id}" has more than 30 chars and must be listed centrally` );
+    throw new CompilerAssertion( `The message ID "${id}" has more than 30 chars and must be listed centrally` );
   if (!options.severities)
     _check$Severities( id, moduleName || '?', severity );
   for (const [variant, text] of
@@ -573,6 +608,16 @@ function _check$Consistency( id, moduleName, severity, texts, options ) {
     _check$Texts( id, variant, text );
 }
 
+/**
+ * Check the consistency of the message severity for the given message ID.
+ * Messages with the same ID must have the same severity (in a module).
+ * Non-downgradable errors must never be called with a lower severity.
+ *
+ * @param {string} id
+ * @param {string} moduleName
+ * @param {string} severity
+ * @private
+ */
 function _check$Severities( id, moduleName, severity ) {
   if (!severity)                // if just used message(), we are automatically consistent
     return;
@@ -582,23 +627,34 @@ function _check$Severities( id, moduleName, severity ) {
     if (!expected)
       test$severities[id] = severity;
     else if (expected !== severity)
-      throw new Error( `Expecting severity "${expected}" from previous call, not "${severity}" for message ID "${id}"` );
+      throw new CompilerAssertion( `Inconsistent severity: Expecting "${expected}" from previous call, not "${severity}" for message ID "${id}"` );
     return;
   }
   // now try whether the message could be something less than an Error in the module due to user wishes
-  const user = reclassifiedSeverity( id, null, { [id]: 'Info' }, moduleName, false );
-  if (user === 'Error') {       // always an error in module
+  if (!isDowngradable( id, moduleName )) { // always an error in module
     if (severity !== 'Error')
-      throw new Error( `Expecting severity "Error", not "${severity}" for message ID "${id}" in module "${moduleName}"` );
+      throw new CompilerAssertion( `Inconsistent severity: Expecting "Error", not "${severity}" for message ID "${id}" in module "${moduleName}"` );
   }
   else if (spec.severity === 'Error') {
-    throw new Error( `Expecting the use of function message() when message ID "${id}" is a configurable error in module "${moduleName}"` );
+    throw new CompilerAssertion( `Inconsistent severity: Expecting the use of function message() when message ID "${id}" is a configurable error in module "${moduleName}"` );
   }
   else if (spec.severity !== severity) {
-    throw new Error( `Expecting severity "${spec.severity}", not "${severity}" for message ID "${id}" in module "${moduleName}"` );
+    throw new CompilerAssertion( `Inconsistent severity: Expecting "${spec.severity}", not "${severity}" for message ID "${id}" in module "${moduleName}"` );
   }
 }
 
+/**
+ * Check the consistency of the message text for the given message ID.
+ *
+ * Messages with the same ID must have the same message texts.
+ * This ensures that $(PLACEHOLDERS) are used and that we don't accidentally
+ * use the same ID for different meanings, i.e. texts.
+ *
+ * @param {string} id
+ * @param {string} prop
+ * @param {string} value
+ * @private
+ */
 function _check$Texts( id, prop, value ) {
   if (!test$texts[id])
     test$texts[id] = Object.create(null);
@@ -606,7 +662,7 @@ function _check$Texts( id, prop, value ) {
   if (!expected)
     test$texts[id][prop] = value;
   else if (expected !== value)
-    throw new Error( `Expecting text "${expected}", not "${value}" for message ID "${id}" and text variant "${prop}"`);
+    throw new CompilerAssertion( `Different texts for the same message ID. Expecting "${expected}", not "${value}" for ID "${id}" and text variant "${prop}"`);
 }
 
 const quote = {                 // could be an option in the future
@@ -649,6 +705,7 @@ const paramsTransform = {
   expecting: transformManyWith( tokenSymbol ),
   // msg: m => m,
   $reviewed: ignoreTextTransform,
+  version: quote.meta,
 };
 
 function ignoreTextTransform() {
@@ -803,7 +860,7 @@ function weakLocation( loc ) {
  * Example:
  *   <source>.cds:3:11: Error message-id: Can't find type `nu` in this scope (in entity:“E”/element:“e”)
  *
- * @param {CSN.Message} err
+ * @param {CompileMessage} err
  * @param {boolean} [normalizeFilename]
  * @param {boolean} [noMessageId]
  * @param {boolean} [noHome]
@@ -813,7 +870,7 @@ function messageString( err, normalizeFilename, noMessageId, noHome ) {
   return (err.$location && err.$location.file
           ? locationString( err.$location, normalizeFilename ) + ': '
           : '') +
-         (err.severity||'Error') +
+         (err.severity || 'Error') +
          // TODO: use [message-id]
          (err.messageId && !noMessageId ? ' ' + err.messageId + ': ' : ': ') +
          err.message +
@@ -825,7 +882,7 @@ function messageString( err, normalizeFilename, noMessageId, noHome ) {
  * Return message hash which is either the message string without the file location,
  * or the full message string if no semantic location is provided.
  *
- * @param {CSN.Message} msg
+ * @param {CompileMessage} msg
  * @returns {string} can be used to uniquely identify a message
  */
 function messageHash(msg) {
@@ -851,7 +908,7 @@ function messageHash(msg) {
  *   <source>.cds:3:11, at entity:“E”/element:“e”
  * ```
  *
- * @param {CSN.Message} err
+ * @param {CompileMessage} err
  * @param {object} [config = {}]
  * @param {boolean} [config.normalizeFilename] Replace windows `\` with forward slashes `/`.
  * @param {boolean} [config.noMessageId]
@@ -899,7 +956,7 @@ function messageStringMultiline( err, config = {} ) {
  *
  * @param {string[]} sourceLines The source code split up into lines, e.g. by `splitLines(src)`
  *                               from `lib/utils/file.js`
- * @param {CSN.Message} err Error object containing all details like line, message, etc.
+ * @param {CompileMessage} err Error object containing all details like line, message, etc.
  * @param {object} [config = {}]
  * @param {boolean | 'auto'} [config.color] If true, ANSI escape codes will be used for coloring the `^`.  If false, no
  *                                          coloring will be used.  If 'auto', we will decide based on certain factors such
@@ -978,8 +1035,8 @@ function messageContext(sourceLines, err, config) {
  * larger than `b`, and -1 if `a` is smaller than `b`. Messages without a location
  * are considered larger than messages with a location.
  *
- * @param {CSN.Message} a
- * @param {CSN.Message} b
+ * @param {CompileMessage} a
+ * @param {CompileMessage} b
  */
 function compareMessage( a, b ) {
   const aFile = a.$location && a.$location.file;
@@ -1013,8 +1070,8 @@ function compareMessage( a, b ) {
  * location and severity, >0 if `a` is larger than `b`, and <0 if `a` is smaller
  * than `b`. See `compareSeverities()` for how severities are compared.
  *
- * @param {CSN.Message} a
- * @param {CSN.Message} b
+ * @param {CompileMessage} a
+ * @param {CompileMessage} b
  */
 function compareMessageSeverityAware( a, b ) {
   const c = compareSeverities(a.severity, b.severity);
@@ -1026,7 +1083,7 @@ function compareMessageSeverityAware( a, b ) {
  * Messages without semantic locations are considered smaller (for syntax errors)
  * and (currently - should not happen in v2) larger for other messages.
  *
- * @param {CSN.Message} msg
+ * @param {CompileMessage} msg
  */
 function homeSortName( { home, messageId } ) {
   return (!home)
@@ -1045,7 +1102,7 @@ function homeSortName( { home, messageId } ) {
  * A message is more precise if it is contained in the other or if
  * the first does not have an endLine/endCol.
  *
- * @param {CSN.Message[]} messages
+ * @param {CompileMessage[]} messages
  */
 function deduplicateMessages( messages ) {
   const seen = new Map();
@@ -1395,6 +1452,7 @@ function _quoted( name ) {
 
 /**
  * Get the explanation string for the given message-id.
+ * Ensure to have called hasMessageExplanation() before.
  *
  * @param {string} messageId
  * @returns {string}
@@ -1402,18 +1460,22 @@ function _quoted( name ) {
  * @see hasMessageExplanation()
  */
 function explainMessage(messageId) {
+  messageId = oldMessageIds[messageId] || messageId;
   const filename = path.join(__dirname, '..', '..', 'share', 'messages', `${messageId}.md`);
   return fs.readFileSync(filename, 'utf8');
 }
 
 /**
  * Returns true if the given message has an explanation file.
+ * Takes into account changed message ids, i.e. looks up if the new
+ * message id has an explanation.
  *
  * @param {string} messageId
  * @returns {boolean}
  */
 function hasMessageExplanation(messageId) {
-  return messageId && _messageIdsWithExplanation.includes(messageId);
+  const id = oldMessageIds[messageId] || messageId || false;
+  return id && _messageIdsWithExplanation.includes(id);
 }
 
 /**

package/lib/base/model.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const { forEach } = require("../utils/objectUtils");
+
 const queryOps = {
   query: 'select',                // TODO: rename to SELECT
   union: 'union',
@@ -20,7 +22,6 @@ const queryOps = {
 const availableBetaFlags = {
   // enabled by --beta-mode
   toRename: true,
-  addTextsLanguageAssoc: true,
   assocsWithParams: true,
   hanaAssocRealCardinality: true,
   mapAssocToJoinCardinality: true,
@@ -58,16 +59,56 @@ function isBetaEnabled( options, feature ) {
  * Please do not move this function to the "option processor" code.
  *
  * @param {object} options Options
- * @param {string} [feature] Feature to check for
+ * @param {string|null} [feature] Feature to check for
  * @returns {boolean}
  */
 function isDeprecatedEnabled( options, feature = null ) {
   const { deprecated } = options;
   if (!feature)
     return !!deprecated;
+
   return deprecated && typeof deprecated === 'object' && deprecated[feature];
 }
 
+const oldDeprecatedFlags_v2 = [
+  'createLocalizedViews',
+  'downgradableErrors',
+  'generatedEntityNameWithUnderscore',
+  'longAutoexposed',
+  'noElementsExpansion',
+  'noInheritedAutoexposeViaComposition',
+  'noScopedRedirections',
+  'oldVirtualNotNullPropagation',
+  'parensAsStrings',
+  'projectionAsQuery',
+  'redirectInSubQueries',
+  'renderVirtualElements',
+  'shortAutoexposed',
+  'unmanagedUpInComponent',
+  'v1KeysForTemporal',
+];
+
+/**
+ * In cds-compiler v3, we removed old v2 deprecated flags.  That can lead to silent
+ * errors such as entity/view names changing.  To ensure that the user is forced
+ * to change their code, emit an error if one of such removed flags was used.
+ *
+ * @param {CSN.Options} options
+ * @param error Error message function returned by makeMessageFunctions().
+ */
+function checkRemovedDeprecatedFlags( options, { error } ) {
+  // Assume that we emitted these errors once if a message with this ID was found.
+  if (!options.deprecated || options.messages?.some(m => m.messageId === 'api-invalid-deprecated'))
+    return;
+
+  forEach(options.deprecated, (key, val) => {
+    if (val && oldDeprecatedFlags_v2.includes(key)) {
+      error('api-invalid-deprecated', null, { name: key },
+        'Deprecated flag $(NAME) has been removed in CDS compiler v3');
+    }
+  });
+}
+
 // Apply function `callback` to all artifacts in dictionary
 // `model.definitions`.  See function `forEachGeneric` for details.
 function forEachDefinition( model, callback ) {
@@ -129,6 +170,7 @@ module.exports = {
   isBetaEnabled,
   availableBetaFlags,
   isDeprecatedEnabled,
+  checkRemovedDeprecatedFlags,
   queryOps,
   forEachDefinition,
   forEachMember,

package/lib/base/optionProcessorHelper.js

@@ -339,7 +339,11 @@ function createOptionProcessor() {
         // No more options after '--'
         seenDashDash = true;
       }
+      else if (!seenDashDash && arg.startsWith('--')) {
+        i += processOption(i);
+      }
       else if (!seenDashDash && arg.startsWith('-')) {
+        splitSingleLetterOption(argv, i); // `-ab` -> `-a -b`
         i += processOption(i);
       }
       else {
@@ -640,6 +644,21 @@ function createOptionProcessor() {
   }
 }
 
+/**
+ * Splits `-abc` into `-a -b -c`. Does this in-place on argv.
+ *
+ * @param {string[]} argv Argument array
+ * @param {number} i Current option index.
+ */
+function splitSingleLetterOption(argv, i) {
+  const arg = argv[i];
+  if (arg.length > 2) { // must be at least `-ab`.
+    const rest = argv.slice(i + 1);
+    argv.length = i; // trim array
+    argv.push(...arg.split('').slice(1).map(a => `-${a}`), ...rest);
+  }
+}
+
 /**
  * Return a camelCase name "fooBar" for a long option "--foo-bar"
  */

package/lib/checks/actionsFunctions.js

@@ -16,8 +16,8 @@ function checkActionOrFunction(art, artName, prop, path) {
   if (!(art.kind === 'action' || art.kind === 'function') && !art.actions)
     return;
 
-  // const isMultiSchema = this.options.toOdata.odataFormat === 'structured' &&
-  //   (this.options.toOdata.odataProxies || this.options.toOdata.odataXServiceRefs);
+  // const isMultiSchema = this.options.odataFormat === 'structured' &&
+  //   (this.options.odataProxies || this.options.odataXServiceRefs);
 
   const serviceName = this.csnUtils.getServiceName(artName);
   if (!serviceName)
@@ -85,9 +85,11 @@ function checkActionOrFunction(art, artName, prop, path) {
    * @param {string} actKind 'action' or 'function'
    */
   function checkReturns(returns, currPath, actKind) {
-    const finalReturnType = returns.type ? this.csnUtils.getFinalBaseType(returns.type) : returns;
+    const finalReturnType = returns.type ? this.csnUtils.getFinalBaseTypeWithProps(returns.type) : returns;
+    if (!finalReturnType)
+      return; // no type, e.g. `type of V:calculated`; already an error in `checkTypeOfHasProperType()`
 
-    if (this.csnUtils.isAssocOrComposition(finalReturnType)) {
+    if (this.csnUtils.isAssocOrComposition(finalReturnType.type)) {
       this.error(null, currPath, { '#': actKind },
                  {
                    std: 'An association is not allowed as this artifact\'s return type', // Not used
@@ -98,7 +100,7 @@ function checkActionOrFunction(art, artName, prop, path) {
 
     if (finalReturnType.items) // check array return type
       checkReturns.bind(this)(finalReturnType.items, currPath.concat('items'), actKind);
-    else // check if return type is user definited from the current service
+    else // check if return type is user defined from the current service
       checkUserDefinedType.bind(this)(finalReturnType, returns.type, currPath);
   }