@sap/cds-compiler 3.0.0 → 3.1.2

package/lib/base/keywords.js

@@ -190,7 +190,7 @@ module.exports = {
   // SAP HANA keywords, used for smart quoting in to-hdi.plain
   // Taken from https://help.sap.com/viewer/7c78579ce9b14a669c1f3295b0d8ca16/Cloud/en-US/28bcd6af3eb6437892719f7c27a8a285.html
   // Better use keywords in ptime/query/parser/syntax/qp_keyword.cc minus those
-  // in rule unreserved_keyword_column (=…_common - "CONSTRAINT") in
+  // in rule unreserved_keyword_column (=…_common - 'CONSTRAINT') in
   // ptime/query/parser/syntax/qp_gram.y of the HANA sources.
   hana: [
     'ABAPITAB',
@@ -209,12 +209,16 @@ module.exports = {
     'ABAP_STRING',
     'ABAP_TIME',
     'ABAP_XSTRING',
+    'ABS',
+    'ACOS',
     'ADD_DAYS',
     'ADD_MONTHS',
     'ADD_SECONDS',
     'ADD_YEARS',
+    'ADJACENCY',
     'ADOPT',
     'ALL',
+    'ALPHANUM',
     'ALTER',
     'ANALYTIC',
     'ANY',
@@ -222,7 +226,11 @@ module.exports = {
     'ARRAY',
     'ARRAY_AGG',
     'AS',
+    'ASCII',
+    'ASIN',
     'AT',
+    'ATAN',
+    'ATAN2',
     'AUTHORIZATION',
     'AUTO',
     'AVG',
@@ -240,6 +248,9 @@ module.exports = {
     'BIND_DOUBLE',
     'BIND_NCHAR',
     'BIND_REAL',
+    'BINTEXT',
+    'BINTOHEX',
+    'BITAND',
     'BLOB',
     'BOOLEAN',
     'BOTH',
@@ -249,9 +260,25 @@ module.exports = {
     'BY',
     'CASE',
     'CAST',
+    'CEIL',
+    'CEILING',
+    'CE_AGGREGATION',
     'CE_CALC',
+    'CE_CALC_VIEW',
+    'CE_COLUMN_TABLE',
+    'CE_COMM2R',
+    'CE_CONVERSION',
+    'CE_FULL_OUTER_JOIN',
     'CE_JOIN',
+    'CE_JOIN_VIEW',
+    'CE_LEFT_OUTER_JOIN',
+    'CE_MERGE',
+    'CE_OLAP_VIEW',
+    'CE_PARTITION',
     'CE_PROJECTION',
+    'CE_RIGHT_OUTER_JOIN',
+    'CE_UNION_ALL',
+    'CE_VERTICAL_UNION',
     'CHAR',
     'CHARACTER',
     'CLOB',
@@ -262,8 +289,12 @@ module.exports = {
     'CONNECT',
     'CONSTANT',
     'CONSTRAINT',
+    'COS',
+    'COSH',
+    'COT',
     'COUNT',
     'CROSS',
+    'CS_ALPHANUM',
     'CS_DATE',
     'CS_DAYDATE',
     'CS_DECIMAL_FLOAT',
@@ -285,6 +316,7 @@ module.exports = {
     'CS_TEXT',
     'CS_TEXT_AE',
     'CS_TIME',
+    'CS_ZONE',
     'CUBE',
     'CUME_DIST',
     'CURDATE',
@@ -313,6 +345,7 @@ module.exports = {
     'DAYOFWEEK',
     'DAYS_BETWEEN',
     'DDIC_ACCP',
+    'DDIC_ALNM',
     'DDIC_CDAY',
     'DDIC_CHAR',
     'DDIC_CLNT',
@@ -373,12 +406,14 @@ module.exports = {
     'EXCEPTION',
     'EXEC',
     'EXISTS',
+    'EXP',
     'EXTRACT',
     'FALSE',
     'FILTER',
     'FIRST_VALUE',
     'FLATTEN',
     'FLOAT',
+    'FLOOR',
     'FOR',
     'FORCE_FIRST_PASSWORD_CHANGE',
     'FREESTYLESEARCHATTRIBUTE',
@@ -390,6 +425,7 @@ module.exports = {
     'GROUPING',
     'GROUPING_FILTER',
     'GROUPING_ID',
+    'GROUP_SCORE',
     'HASANYPRIVILEGES',
     'HASSYSTEMPRIVILEGE',
     'HAVING',
@@ -403,6 +439,7 @@ module.exports = {
     'HIERARCHY_SIBLINGS',
     'HIERARCHY_SPANTREE',
     'HIERARCHY_TEMPORAL',
+    'HIGHLIGHTED',
     'HILBERT',
     'HOST',
     'HOUR',
@@ -426,10 +463,12 @@ module.exports = {
     'JSON_TABLE',
     'JSON_VALUE',
     'LAG',
+    'LANGUAGE',
     'LAST_DAY',
     'LAST_VALUE',
     'LATERAL',
     'LAYOUT',
+    'LCASE',
     'LEAD',
     'LEADING',
     'LEAST',
@@ -439,10 +478,13 @@ module.exports = {
     'LENGTHB',
     'LEVELS',
     'LIMIT',
+    'LN',
     'LOCATE',
     'LOCATE_REGEXPR',
+    'LOG',
     'LONGDATE',
     'LOOP',
+    'LOWER',
     'LPAD',
     'LTRIM',
     'MAP',
@@ -450,9 +492,11 @@ module.exports = {
     'MAP_REDUCE',
     'MAX',
     'MEASURES',
+    'MIMETYPE',
     'MIN',
     'MINUS',
     'MINUTE',
+    'MOD',
     'MONTH',
     'MULTIPARENT',
     'NATURAL',
@@ -486,9 +530,11 @@ module.exports = {
     'PERCENTILE_DISC',
     'PERCENT_RANK',
     'PLAIN',
+    'POWER',
     'PRIOR',
     'PRODUCT',
     'RANGE',
+    'RANGE_RESTRICTION',
     'RANK',
     'RAW',
     'RDICT',
@@ -525,11 +571,17 @@ module.exports = {
     'SESSION_CONTEXT',
     'SESSION_USER',
     'SET',
+    'SHORTTEXT',
     'SIBLING',
+    'SIGN',
+    'SIN',
+    'SINH',
     'SMALLDECIMAL',
     'SMALLINT',
+    'SNIPPETS',
     'SOME',
     'SQL',
+    'SQRT',
     'START',
     'STDDEV',
     'STRING',
@@ -537,6 +589,7 @@ module.exports = {
     'ST_ALPHASHAPEAGGR',
     'ST_ALPHASHAPEAREAAGGR',
     'ST_ALPHASHAPEEDGEAGGR',
+    'ST_ASMVT',
     'ST_ASSVGAGGR',
     'ST_CIRCULARSTRING',
     'ST_CLUSTERCELL',
@@ -552,6 +605,7 @@ module.exports = {
     'ST_FROMTEXT',
     'ST_GEOMETRY',
     'ST_GEOMETRYCOLLECTION',
+    'ST_GEOMFROMESRIJSON',
     'ST_GEOMFROMEWKB',
     'ST_GEOMFROMEWKT',
     'ST_GEOMFROMGEOHASH',
@@ -562,6 +616,8 @@ module.exports = {
     'ST_INTERSECTIONAGGR',
     'ST_LINESTRING',
     'ST_MAKELINE',
+    'ST_MAKEPOLYGON',
+    'ST_MEMORY_LOB',
     'ST_MULTILINESTRING',
     'ST_MULTIPOINT',
     'ST_MULTIPOLYGON',
@@ -586,9 +642,12 @@ module.exports = {
     'TABLE',
     'TABLES',
     'TABLESAMPLE',
+    'TAN',
+    'TANH',
     'TARGET',
     'TEMPORARY',
     'TEXT',
+    'TEXT_FILTER',
     'THEN',
     'THREAD',
     'TIME',
@@ -614,6 +673,7 @@ module.exports = {
     'TO_CHAR',
     'TO_CLOB',
     'TO_DATE',
+    'TO_DATS',
     'TO_DECIMAL',
     'TO_DOUBLE',
     'TO_INT',
@@ -642,9 +702,12 @@ module.exports = {
     'TRIGGER_UPDATE_COLUMN',
     'TRIM',
     'TRUE',
+    'UCASE',
+    'UNICODE',
     'UNION',
     'UNKNOWN',
     'UNNEST',
+    'UPPER',
     'USER',
     'USING',
     'UTCTIMESTAMP',

package/lib/base/message-registry.js

@@ -114,7 +114,7 @@ const centralMessages = {
   'ref-undefined-def':    { severity: 'Error' },
   'ref-undefined-var':    { severity: 'Error' },
   'ref-undefined-element': { severity: 'Error' },
-  'ref-unknown-var': { severity: 'Info' },
+  'ref-unknown-var': { severity: 'Info', errorFor: [ 'to.hdbcds', 'to.sql', 'to.hdi', 'to.rename' ] },
   'ref-obsolete-parameters': { severity: 'Error', configurableFor: true }, // does not hurt us
   'ref-undefined-param': { severity: 'Error' },
   'ref-rejected-on': { severity: 'Error' },
@@ -131,6 +131,10 @@ const centralMessages = {
   'service-nested-context': { severity: 'Error', configurableFor: true }, // does not hurt compile, TODO
   'service-nested-service': { severity: 'Error', configurableFor: 'deprecated' }, // not supported yet
 
+  // 'syntax-duplicate-annotate' came late with v3 - make it configurable as
+  // fallback, but then parse.cdl is not supposed to work correctly (it can
+  // then either issue an error or produce a CSN missing some annotations):
+  'syntax-duplicate-annotate': { severity: 'Error', configurableFor: true },
   'syntax-expected-cardinality': { severity: 'Error' },
   'syntax-expected-length': { severity: 'Error' },
   'syntax-expected-translation': { severity: 'Error' },
@@ -176,6 +180,15 @@ const centralMessages = {
 // The keys will be added to `oldNames` of the new message, which is used for reclassification.
 const oldMessageIds = createDict({
   'old-anno-duplicate': 'anno-duplicate', // Example
+
+  // These IDs are used by large stakeholders.  If we change them, we should
+  // be backward-compatible.
+  // 'redirected-to-complex': 'TODO',
+  // 'wildcard-excluding-one': 'TODO',
+  // 'wildcard-excluding-many': 'TODO',
+  // 'assoc-outside-service': 'TODO',
+  // 'redirected-to-same': 'TODO',
+  // 'query-navigate-many': 'TODO',
 });
 
 // Set up the old-to-new message ID mapping in the message registry.
@@ -196,8 +209,8 @@ for (const oldName in oldMessageIds) {
 // For messageIds, where no text has been provided via code (central def)
 const centralMessageTexts = {
   'api-invalid-option': {
-    std: 'Option $(NAME) is deprecated! Use SNAPI options instead',
-    magicVars: 'Option “magicVars” is deprecated! Use “variableReplacements” instead. See <https://cap.cloud.sap/docs/guides/databases#configuring-variables> for details',
+    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 “$”?'
@@ -219,6 +232,10 @@ const centralMessageTexts = {
     'flatten-fkey-exists': 'Generated foreign key element $(NAME) for association $(ART) conflicts with existing element',
   },
 
+  'syntax-anno-ignored': {
+    std: 'Annotations can\'t be used at prefix references',
+    doc: 'Doc comments can\'t be used at prefix references',
+  },
   'syntax-unexpected-ellipsis': {
     std: 'Expected no more than one $(CODE)',
     'nested-array': 'Unexpected $(CODE) in nested array'
@@ -267,6 +284,12 @@ const centralMessageTexts = {
     unknown: 'Unknown argument $(CODE)',
     duplicate: 'Duplicate argument $(CODE)',
   },
+  'syntax-duplicate-annotate': 'You can\'t refer to $(NAME) repeatedly with property $(PROP) in the same annotate statement',
+  'syntax-duplicate-extend': {
+    std: 'You can\'t define and refer to $(NAME) repeatedly in the same extend statement',
+    define: 'You can\'t refer to $(NAME) in the same extend statement where it was defined',
+    extend: 'You can\'t refer to $(NAME) repeatedly in the same extend statement',
+  },
   'syntax-invalid-literal': {
     'std': 'Invalid literal',
     'uneven-hex': 'A binary literal must have an even number of characters',
@@ -294,7 +317,7 @@ const centralMessageTexts = {
     aspect: 'Element $(ID) has not been found in the anonymous target aspect'
   },
   'ref-unknown-var': {
-    std: 'Replacement $(ID) not found'
+    std: 'No replacement found for special variable $(ID)'
   },
   'ref-unexpected-draft-enabled': 'Composition in draft-enabled entity can\'t lead to another entity with $(ANNO)',
   'ref-rejected-on': {
@@ -312,6 +335,7 @@ const centralMessageTexts = {
     event: 'Unexpected $(KEYWORD) for the type of an event',
     param: 'Unexpected $(KEYWORD) for the type of a parameter definition',
     select: 'Unexpected $(KEYWORD) for type references in queries',
+    annotation: '$(KEYWORD) can\'t be used in annotation definitions',
   },
 
   'type-missing-argument': 'Missing value for argument $(NAME) in reference to type $(ID)',
@@ -451,7 +475,11 @@ const centralMessageTexts = {
     std: 'Entity can\'t be created due to name collision with existing definition $(NAME)',
     proxy: 'No proxy entity created due to name collision with existing definition $(NAME) of kind $(KIND)'
   },
-  'odata-navigation': 'No OData navigation property generated, target $(TARGET) is outside of service $(SERVICE)'
+  'odata-navigation': {
+    std: 'No OData navigation property generated, target $(TARGET) is outside of service $(SERVICE)',
+    oncond: 'No OData navigation property generated for association with arbitrary ON condition and target $(TARGET) outside of service $(SERVICE)'
+  },
+  'odata-parameter-order': 'Unexpected mandatory after optional parameter',
 }
 
 /**

package/lib/base/messages.js

@@ -8,7 +8,6 @@ const { term } = require('../utils/term');
 const { locationString } = require('./location');
 const { isDeprecatedEnabled } = require('./model');
 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");
@@ -135,7 +134,7 @@ class CompileMessage {
   constructor(location, msg, severity = 'Error', id = null, home = null, moduleName = null) {
     this.message = msg;
     this.location = location;
-    this.$location = dollarLocation( this.location );
+    this.$location = { ...this.location, address: undefined };
     this.validNames = null;
     if (home)                   // semantic location, e.g. 'entity:"E"/element:"x"'
       this.home = home;
@@ -152,33 +151,6 @@ class CompileMessage {
   }
 }
 
-/**
- * Temporary v1 function to convert an "old-style" location to "new-style".
- *
- * @param {CSN.Location} location
- * @return {CSN.Location}
- * @todo Remove
- */
-function dollarLocation( location ) {
-  const file  = location && location.file || undefined;
-  if (!file)
-    return {};
-  const loc = {
-    file,
-    line: location.line,
-    col: location.col,
-    address: undefined,
-  };
-  copyPropIfExist(location, 'endLine', loc);
-  copyPropIfExist(location, 'endCol', loc);
-  // TODO:
-  // return {
-  //   ...location,
-  //   address: undefined,
-  // };
-  return loc;
-}
-
 const severitySpecs = {
   error: { name: 'Error', level: 0 },
   warning: { name: 'Warning', level: 1 },
@@ -257,14 +229,16 @@ function compareSeverities( a, b ) {
 }
 
 /**
- * @todo This was copied from somewhere just to make CSN paths work.
+ * Find the nearest $location for the given CSN path in the model.
+ * If the path does not exist, the parent is used, and so on.
+ *
  * @param {CSN.Model} model
  * @param {CSN.Path} csnPath
+ * @returns {CSN.Location | null}
  */
-function searchForLocation( model, csnPath ) {
+function findNearestLocationForPath( model, csnPath ) {
   if (!model)
     return null;
-  // Don't display a location if we cannot find one!
   let lastLocation = null;
   /** @type {object} */
   let currentStep = model;
@@ -435,10 +409,10 @@ function makeMessageFunction( model, options, moduleName = null ) {
       // CSN.Location (with line/endLine, col/endCol)
       return [ location, location.home || null, null ]
 
-    const isCsnPath = (typeof location[0] === 'string');
+    const isCsnPath = (typeof location[0] === 'string'); // could be `definitions`, `extensions`, ....
     if (isCsnPath) {
       return [
-        searchForLocation( model, location ),
+        findNearestLocationForPath( model, location ),
         constructSemanticLocationFromCsnPath( location, model ),
         location[1] // location[0] is 'definitions'
       ];
@@ -1086,9 +1060,10 @@ function compareMessageSeverityAware( a, b ) {
  * @param {CompileMessage} msg
  */
 function homeSortName( { home, messageId } ) {
-  return (!home)
-    ? (messageId && /^(syntax|api)-/.test( messageId ) ? ' ' + messageId : '~')
-    : home.substring( home.indexOf(':') ); // i.e. starting with the ':', is always there
+  if (!home)
+    return (messageId && /^(syntax|api)-/.test( messageId ) ? ' ' + messageId : '~')
+  else
+    return home.substring( home.indexOf(':') ); // i.e. starting with the ':', is always there
 }
 
 /**
@@ -1174,7 +1149,7 @@ function homeName( art, absoluteOnly ) {
     return null;
   else if (art.kind === 'using')
     return 'using:' + quoted( art.name.id );
-  else if (art.kind === 'extend')
+  else if (art.kind === 'extend' || art.kind === 'annotate')
     return !absoluteOnly && homeNameForExtend ( art );
   else if (art.name._artifact)             // block, extend, annotate
     return homeName( art.name._artifact, absoluteOnly ); // use corresponding definition
@@ -1189,35 +1164,41 @@ function homeName( art, absoluteOnly ) {
 // The "home" for extensions is handled differently because `_artifact` is not
 // set for unknown extensions and we could have nested extensions.
 function homeNameForExtend( art ) {
+  const kind = art.kind || 'extend';
   // TODO: fix the following - do like in collectArtifactExtensions() or
-  // basically resolveUncheckedPath()
-  const absoluteName = (art.name.id ? art.name.id :
-      art.name.path.map(s => s && s.id).join('.'));
+  //       basically resolveUncheckedPath()
+  const absoluteName = art.name.id != null ? art.name.id :
+    (!art.name.element && art.name.absolute || art.name.path && art.name.path.map(s => s && s.id).join('.'));
 
   // Surrounding parent may be another extension.
   const parent = art._parent;
   if (!parent)
-    return 'extend:' + quoted(absoluteName);
-
-  // And that extension's artifact could have been found.
-  const parentArt = parent.name && parent.name._artifact;
-  if (!parentArt)
-    return artName(parent) + '/' + quoted(absoluteName);
-
-  let extensionName;
-  if (parentArt.enum || parentArt.elements) {
-    const fakeArt = {
-      kind: parentArt.enum ? 'enum' : 'element',
-      name: { element: absoluteName }
-    };
-    extensionName = artName(fakeArt);
+    return kind + ':' + quoted(absoluteName);
+
+  if (art.name.param && parent.params) {
+    const fakeArt = { kind: 'param', name: { param: absoluteName } };
+    return homeNameForExtend(parent) + '/' + artName(fakeArt);
   }
-  else {
-    extensionName = 'extend:' + quoted(absoluteName);
+  else if (art.name.action && parent.actions) {
+    const type = art.name._artifact?.kind || 'action';
+    const fakeArt = { kind: type, name: { action: absoluteName }, _main: art.name._artifact?._main };
+    return homeNameForExtend(parent) + '/' + artName(fakeArt);
   }
-  // Even though the parent artifact was found, we use kind 'extend'
-  // to make it clear that we are inside an (element) extension.
-  return 'extend:' + artName(parentArt) + '/' + extensionName;
+  else if (parent.enum || parent.elements || parent.returns?.elements) {
+    // For enum, extensions may store them in `elements`, i.e. don't differ between enum/elements,
+    // so we need to look at the parent artifact.
+    // For `extend <art> with enum`, there is `enum`.
+    const parentArt = parent.name?._artifact;
+    const fakeKind = (parent.enum || parentArt?.enum) ? 'enum' : 'element';
+    const fakeArt = { kind: fakeKind, name: { element: art.name.element } };
+    let parentOfElementChain = parent;
+    while (parentOfElementChain.name?.element && parentOfElementChain._parent)
+      parentOfElementChain = parentOfElementChain._parent;
+
+    return homeNameForExtend(parentOfElementChain) + '/' + artName(fakeArt);
+  }
+  // This case should not happen, but just in case
+  return kind + ':' + artName(parent);
 }
 
 function constructSemanticLocationFromCsnPath(csnPath, model) {
@@ -1230,10 +1211,14 @@ function constructSemanticLocationFromCsnPath(csnPath, model) {
   ];
   const queryProps = [ 'from', 'where', 'groupBy', 'having', 'orderBy', 'limit', 'offset' ];
 
-  let { query } = analyseCsnPath(
-    csnPath,
-    model
-  );
+  if (csnPath[0] === 'extensions') {
+    const ext = model.extensions && model.extensions[csnPath[1]] || {};
+    if (ext.annotate)
+      return 'annotate:' + quoted(ext.annotate);
+    return 'extend:' + quoted(ext.extend);
+  }
+
+  let { query } = analyseCsnPath(csnPath, model, false);
 
   // remove definitions
   csnPath.shift();
@@ -1373,8 +1358,12 @@ function constructSemanticLocationFromCsnPath(csnPath, model) {
       if (typeof step === 'number') {
         if (currentThing.as)
           result += `:${ _quoted(currentThing.as) }`;
+        else if (inRef)
+          result +=  `:${ _quoted(currentThing) }`;
+        else if (currentThing.ref)
+          result += `:${ _quoted(currentThing.ref.map(r => r.id ? r.id : r).join('.')) }`;
         else
-          result += inRef ? `:${ _quoted(currentThing) }` : currentThing.ref ? `:${ _quoted(currentThing.ref.map(r => r.id ? r.id : r).join('.')) }` : '';
+          return'';
 
         break;
       }

package/lib/base/model.js

@@ -30,6 +30,8 @@ const availableBetaFlags = {
   enableUniversalCsn: true,
   // disabled by --beta-mode
   nestedServices: false,
+  odataOpenType: true,
+  optionalActionFunctionParameters: true,
 };
 
 /**

package/lib/base/optionProcessorHelper.js

@@ -153,36 +153,67 @@ function createOptionProcessor() {
    * Internal: Define a general or command option.
    * Throws if the option is already registered in the given command context.
    * or in the given command.
+   *
    * @private
    * @see option()
    */
   function _addOption(cmd, optString, validValues, options) {
-    const opt = _parseOptionString(optString, validValues);
-    Object.assign(opt, options);
+    const cliOpt = _parseOptionString(optString, validValues);
+    Object.assign(cliOpt, options);
+    _addLongOption(cmd, cliOpt.longName, cliOpt);
+    _addShortOption(cmd, cliOpt.shortName, cliOpt);
+
+    for (const alias of cliOpt.aliases || []) {
+      const aliasOpt = Object.assign({ }, cliOpt, { isAlias: true });
+      _addLongOption(cmd, alias, aliasOpt); // use same camelName, etc. for alias
+    }
+
+    return cmd;
+  }
 
-    if (cmd.options[opt.longName]) {
-      throw new Error(`Duplicate assignment for long option ${opt.longName}`);
-    } else if (optionProcessor.options[opt.longName]) {
+  /**
+   * Internal: Add longName to the list of options.
+   * Throws if the option is already registered in the given command context.
+   * or in the given command.
+   * `longName` may differ from `opt.longName`, e.g. for aliases.
+   *
+   * @private
+   * @see _addOption()
+   */
+  function _addLongOption(cmd, longName, opt) {
+    if (cmd.options[longName]) {
+      throw new Error(`Duplicate assignment for long option ${longName}`);
+    } else if (optionProcessor.options[longName]) {
       // This path is only taken if optString is for commands
       optionProcessor.optionClashes.push({
-        option: opt.longName,
-        description: `Command '${cmd.longName}' has option clash with general options for: ${opt.longName}`
+        option: longName,
+        description: `Command '${cmd.longName}' has option clash with general options for: ${longName}`
       });
     }
-    cmd.options[opt.longName] = opt;
-    if (opt.shortName) {
-      if (cmd.options[opt.shortName]) {
-        throw new Error(`Duplicate assignment for short option ${opt.shortName}`);
-      } else if (optionProcessor.options[opt.shortName]) {
-        // This path is only taken if optString is for commands
-        optionProcessor.optionClashes.push({
-          option: opt.shortName,
-          description: `Command '${cmd.longName}' has option clash with general options for: ${opt.shortName}`
-        });
-      }
-      cmd.options[opt.shortName] = opt;
+    cmd.options[longName] = opt;
+  }
+  /**
+   * Internal: Add shortName to the list of options.
+   * Throws if the option is already registered in the given command context.
+   * or in the given command.
+   * `longName` may differ from `opt.longName`, e.g. for aliases.
+   *
+   * @private
+   * @see _addOption()
+   */
+  function _addShortOption(cmd, shortName, opt) {
+    if (!shortName)
+      return;
+    if (cmd.options[shortName]) {
+      throw new Error(`Duplicate assignment for short option ${shortName}`);
+    } else if (optionProcessor.options[shortName]) {
+      // This path is only taken if optString is for commands
+      optionProcessor.optionClashes.push({
+        option: shortName,
+        description: `Command '${cmd.longName}' has option clash with general options for: ${shortName}`
+      });
     }
-    return cmd;
+    cmd.options[shortName] = opt;
   }
 
   // Internal: Parse one command string like "F, toFoo". Return an object like this
@@ -275,7 +306,8 @@ function createOptionProcessor() {
       shortName,
       camelName: camelifyLongOption(longName),
       param,
-      validValues
+      validValues,
+      isAlias: false, // default
     }
   }