@sap/cds-compiler 5.4.2 → 5.5.0

package/CHANGELOG.md

@@ -7,18 +7,41 @@
 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 5.5.0 - 2024-11-22
+
+### Added
+
+- CDL parser: when the new experimental option `newParser` is used, the compiler
+  uses a CDL parser with a significantly smaller footprint (among other things).
+- to.sql|hdi.migration: For SAP HANA, render `ALTER` statements as one big statement to improve performance.
+- to.sql.migration: Give more helpful comments when using option `script`.
+
+### Changed
+
+- Update OData vocabularies: 'Common', 'PersonalData', 'UI'.
+
+## Version 5.4.4 - 2024-11-14
+
+### Fixed
+
+- Re-allow referring to mixins (and table aliases) in added columns
+- Re-add foreign keys of named aspects to the OData CSN.
+
+
 ## Version 5.4.2 - 2024-11-06
 
 ### Fixed
 
 - to.sql: For SQLite, map `cds.Map` to `JSON_TEXT` to ensure text affinity.
 
+
 ## Version 5.4.0 - 2024-10-24
 
 ### Added
 
 - to.edm(x): `cds.Map` as empty open complex type with name `cds_Map` or if the definition
-  has been assigned `@open: false` as empty open complex type `cds_Map_closed` in OData V4.
+  has been assigned `@open: false` as empty closed complex type `cds_Map_closed` in OData V4.
 
 ### Changed
 

package/bin/cds_remove_invalid_whitespace.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // Remove whitespace where the compiler does not expect it and will
-// emit an error in the next major version.
+// emit an error in the next major version.  (Remark: not necessarily)
 //
 // This script removes whitespace where necessary.
 // It does not remove comments, even though they count as whitespace.
@@ -23,7 +23,7 @@
 
 'use strict';
 
-const parseLanguage = require('../lib/language/antlrParser');
+const parsers = require('../lib/parsers');
 const { createMessageFunctions } = require('../lib/base/messages');
 
 const fs = require('fs');
@@ -58,9 +58,9 @@ function modernizeWhitespace( source, filename ) {
   const options = { messages: [], attachTokens: true };
   const messageFunctions = createMessageFunctions( options, 'parse', null );
 
-  // parseLanguage does not throw on CompilationError, so
+  // parseCdl does not throw on CompilationError, so
   // we do not need a try...catch block.
-  const ast = parseLanguage(source, filename, options, messageFunctions);
+  const ast = parsers.parseCdl(source, filename, options, messageFunctions);
 
   // To avoid spam, only report errors.
   // Users should use the compiler to get all messages.

package/bin/cds_update_annotations.js

@@ -22,7 +22,7 @@
 
 'use strict';
 
-const parseLanguage = require('../lib/language/antlrParser');
+const parsers = require('../lib/parsers');
 const { createMessageFunctions } = require('../lib/base/messages');
 
 const fs = require('fs');
@@ -58,9 +58,9 @@ function modernizeAnnotationExpressions( source, filename ) {
   const options = { messages: [], attachTokens: true };
   const messageFunctions = createMessageFunctions( options, 'parse', null );
 
-  // parseLanguage does not throw on CompilationError, so
+  // parseCdl does not throw on CompilationError, so
   // we do not need a try...catch block.
-  const ast = parseLanguage(source, filename, options, messageFunctions);
+  const ast = parsers.parseCdl(source, filename, options, messageFunctions);
 
   // To avoid spam, only report errors.
   // Users should use the compiler to get all messages.

package/bin/cds_update_identifiers.js

@@ -22,7 +22,7 @@
 
 'use strict';
 
-const parseLanguage = require('../lib/language/antlrParser');
+const parsers = require('../lib/parsers');
 const { createMessageFunctions } = require('../lib/base/messages');
 
 const fs = require('fs');
@@ -56,9 +56,9 @@ function modernizeIdentifierStyle( source, filename ) {
   const options = { messages: [], attachTokens: true };
   const messageFunctions = createMessageFunctions( options, 'parse', null );
 
-  // parseLanguage does not throw on CompilationError, so
+  // parseCdl does not throw on CompilationError, so
   // we do not need a try...catch block.
-  const ast = parseLanguage(source, filename, options, messageFunctions);
+  const ast = parsers.parseCdl(source, filename, options, messageFunctions);
 
   // To avoid spam, only report errors.
   // Users should use the compiler to get all messages.

package/lib/api/main.js

@@ -2,6 +2,8 @@
 
 'use strict';
 
+const lazyload = require('../base/lazyload')( module );
+
 const prepareOptions = lazyload('./options');
 const baseModel = lazyload('../base/model');
 const location = lazyload('../base/location');
@@ -470,18 +472,29 @@ function sqlMigration( csn, options, messageFunctions, beforeImage ) {
   const internalOptions = prepareOptions.to.sql(options);
 
   messageFunctions.setOptions( internalOptions );
+  if (internalOptions.script)
+    messageFunctions.setModuleName( `${ messageFunctions.moduleName }-script` );
+
   handleTenantDiscriminator(options, internalOptions, messageFunctions);
   if (!options.dry && internalOptions.script) {
     messageFunctions.error('api-invalid-combination', null, { '#': 'dry-and-script', value: options.dry || 'undefined' });
     messageFunctions.throwWithError();
   }
 
-  if (internalOptions.script && !internalOptions.severities?.['type-unsupported-key-change']) {
-    internalOptions.severities ??= {};
-    internalOptions.severities['type-unsupported-key-change'] = 'warning';
+  if (internalOptions.script && !internalOptions.severities?.['migration-unsupported-key-change']) {
+    internalOptions.severities = Object.assign({}, internalOptions.severities ?? {});
+    internalOptions.severities['migration-unsupported-key-change'] = 'Warning';
+  }
+
+  if (internalOptions.script) {
+    internalOptions.severities = Object.assign({}, internalOptions.severities ?? {});
+    const turnToWarning = [ 'migration-unsupported-element-drop', 'migration-unsupported-length-change', 'migration-unsupported-scale-change', 'migration-unsupported-precision-change', 'migration-unsupported-change', 'migration-unsupported-table-drop' ];
+    turnToWarning.forEach((id) => {
+      internalOptions.severities[id] = 'Warning';
+    });
   }
 
-  const { error, throwWithError } = messageFunctions;
+  const { throwWithError } = messageFunctions;
 
   // Prepare after-image.
   let afterImage = csnForSql(csn, internalOptions, messageFunctions);
@@ -495,7 +508,7 @@ function sqlMigration( csn, options, messageFunctions, beforeImage ) {
   if (diffFilterObj) {
     diff.extensions = diff.extensions.filter(ex => diffFilterObj.extension(ex, messageFunctions));
     diff.migrations.forEach(migration => diffFilterObj.migration(migration, messageFunctions));
-    Object.entries(diff.deletions).forEach(entry => diffFilterObj.deletion(entry, error));
+    Object.entries(diff.deletions).forEach(entry => diffFilterObj.deletion(entry, messageFunctions));
     diff.changedPrimaryKeys = diff.changedPrimaryKeys
       .filter(an => diffFilterObj.changedPrimaryKeys(an));
 
@@ -1271,31 +1284,6 @@ function ensureClientCsn( csn, options, messageFunctions, module ) {
   return csn;
 }
 
-/**
- * Load the module on-demand and not immediately.
- *
- * @param {string} moduleName Name of the module to load - like with require
- * @returns {object} A Proxy that handles the on-demand loading
- */
-function lazyload( moduleName ) {
-  let module;
-  return new Proxy(((...args) => {
-    if (!module)
-      module = require(moduleName);
-
-    if (module.apply && typeof module.apply === 'function')
-      return module.apply(this, args);
-    return module; // for destructured calls
-  }), {
-    get(target, name) {
-      if (!module)
-        module = require(moduleName);
-
-      return module[name];
-    },
-  });
-}
-
 /**
  * Error when tenantDiscriminator and withHanaAssociations is set by the user, or
  * if tenantDiscriminator is used with anything but "plain" mode.

package/lib/api/validate.js

@@ -58,7 +58,12 @@ const validators = {
     },
   },
   severities: {
-    validate: val => val !== null && typeof val === 'object' && !Array.isArray(val),
+    validate: (val) => {
+      if (val !== null && typeof val === 'object' && !Array.isArray(val))
+        return true;
+
+      return false;
+    },
     expected: () => 'type object',
     found: (val) => {
       return val === null ? val : `type ${ typeof val }`;

package/lib/base/lazyload.js

@@ -0,0 +1,28 @@
+'use strict';
+
+function createLazyload( callingModule ) {
+  /**
+   * Load the module on-demand and not immediately.
+   *
+   * @param {string} moduleName Name of the module to load - like with require
+   * @returns {object} A Proxy that handles the on-demand loading
+   */
+  return function lazyload( moduleName ) {
+    let module;
+    return new Proxy(((...args) => {
+      if (!module)
+        module = callingModule.require(moduleName);
+      if (module.apply && typeof module.apply === 'function')
+        return module.apply(this, args);
+      return module; // for destructured calls
+    }), {
+      get(target, name) {
+        if (!module)
+          module = callingModule.require(moduleName);
+        return module[name];
+      },
+    });
+  }
+}
+
+module.exports = createLazyload;

package/lib/base/location.js

@@ -11,6 +11,7 @@ class Location {
   col;
   endLine;
   endCol;
+  tokenIndex;
   constructor( file, line, col, endLine, endCol ) {
     this.file = file;
     this.line = line;

package/lib/base/message-registry.js

@@ -154,7 +154,8 @@ const centralMessages = {
   // then either issue an error or produce a CSN missing some annotations):
   'syntax-duplicate-annotate': { severity: 'Error' },
   'syntax-duplicate-clause': { severity: 'Error', configurableFor: true },
-  'syntax-duplicate-equal-clause': { severity: 'Warning' },
+  // remark: a hard syntax error in new parser for `null` together with `not null`
+  'syntax-duplicate-equal-clause': { severity: 'Warning', errorFor: [ 'v6' ] },
   'syntax-invalid-name': { severity: 'Error', configurableFor: 'deprecated' },
   'syntax-missing-as': { severity: 'Error', configurableFor: true },
   'syntax-missing-proj-semicolon': { severity: 'Warning', errorFor: [ 'v6' ] },
@@ -168,9 +169,7 @@ const centralMessages = {
   'syntax-invalid-space': { severity: 'Error', configurableFor: 'test' },
   'syntax-expecting-space': { severity: 'Error' },
   'syntax-unexpected-anno': { severity: 'Error' },
-
-  'type-unsupported-precision-change': { severity: 'Error' },
-  'type-unsupported-key-change': { severity: 'Error', configurableFor: true },
+  'migration-unsupported-key-change': { severity: 'Error', configurableFor: [ 'to.sql.migration', 'to.sql.migration-script' ] },
   'type-missing-enum-value': { severity: 'Error', configurableFor: 'test' },
 
   'def-missing-element': { severity: 'Error' },
@@ -204,7 +203,15 @@ const centralMessages = {
   'odata-anno-value': { severity: 'Warning' },
   'odata-anno-type': { severity: 'Warning' },
   'odata-anno-def': { severity: 'Info' },
-  'query-ignoring-assoc-in-union': { severity: 'Info' }
+  'query-ignoring-assoc-in-union': { severity: 'Info' },
+  // for to.sql.migration - cannot be supplied by the user!
+  'migration-unsupported-precision-change': { severity: 'Error', configurableFor: [ 'to.sql.migration-script']  },
+  'migration-unsupported-element-drop': { severity: 'Error', configurableFor: [ 'to.sql.migration-script'] },
+  'migration-unsupported-length-change': { severity: 'Error', configurableFor: [ 'to.sql.migration-script'] },
+  'migration-unsupported-scale-change': { severity: 'Error', configurableFor: [ 'to.sql.migration-script'] },
+  'migration-unsupported-change': { severity: 'Error', configurableFor: [ 'to.sql.migration-script'] },
+  'migration-unsupported-table-drop': { severity: 'Error', configurableFor: [ 'to.sql.migration-script'] }
+  // end of to.sql.migration specific
 };
 
 // Old/Deprecated message IDs that we only still use for backwards-compatibility.
@@ -416,7 +423,7 @@ const centralMessageTexts = {
   'syntax-duplicate-equal-clause': {
     std: 'You have already provided the same clause',
     cardinality: 'You have already provided the target cardinality $(CODE) at line $(LINE), column $(COL)',
-    notNull: 'You have already provided $(CODE) at line $(LINE), column $(COL) below',
+    notNull: 'You have already provided $(CODE) at line $(LINE), column $(COL)',
   },
   'syntax-duplicate-extend': {
     std: 'You can\'t define and refer to $(NAME) repeatedly in the same extend statement',
@@ -1038,6 +1045,12 @@ const centralMessageTexts = {
     none: 'Ambiguous $(ID) requires an explicit table alias, but there are none: add table aliases to all sub-queries to disambiguate $(ID)',
   },
 
+  'ref-special-in-extend': {
+    std: 'In an added column, $(ID) refers to the element of the projection source $(ART), not the table alias or mixin',
+    alias: 'In an added column, $(ID) refers to the element of the projection source $(ART), not the table alias',
+    mixin: 'In an added column, $(ID) refers to the element of the projection source $(ART), not the mixin',
+  },
+
   'type-managed-composition': {
     std: 'Managed compositions can\'t be used in types', // yet
     sub: 'Managed compositions can\'t be used in sub elements',
@@ -1045,11 +1058,6 @@ const centralMessageTexts = {
     entity: 'Entity $(ART) with managed compositions can\'t be used in types', // yet
   },
 
-  'type-unsupported-key-change': {
-    std: 'Added element $(ID) is a primary key change and will not work if the table contains data',
-    changed: 'Changed element $(ID) is a primary key change and will not work if the table contains data'
-  },
-
   'type-unsupported-key-sqlite': {
     std: 'Added element $(ID) is a primary key change and will not work with dialect $(NAME)',
     changed: 'Changed element $(ID) is a primary key change and will not work with dialect $(NAME)'
@@ -1267,6 +1275,40 @@ const centralMessageTexts = {
   // -----------------------------------------------------------------------------------
   // OData Message section ends here, no messages below this line
   // -----------------------------------------------------------------------------------
+  // -----------------------------------------------------------------------------------
+  // to.sql.migration specific error messages
+  // -----------------------------------------------------------------------------------
+  'migration-unsupported-key-change': {
+    std: 'Added element $(ID) is a primary key change and will not work if the table contains data',
+    changed: 'Changed element $(ID) is a primary key change and will not work if the table contains data'
+  },
+  'migration-unsupported-precision-change': { 
+    std: 'Changed element $(ID) is a precision change and is not supported',
+    script: 'Changed element $(ID) is a precision change and might lead to data loss'
+  },
+  'migration-unsupported-element-drop': { 
+    std: 'Dropping elements is not supported',
+    script: 'Dropping elements leads to data loss'
+  },
+  'migration-unsupported-length-change': { 
+    std: 'Changed element $(ID) is a length reduction and is not supported',
+    script: 'Changed element $(ID) is a length reduction and might lead to data loss'
+  },
+  'migration-unsupported-scale-change': { 
+    std: 'Changed element $(ID) is a scale change and is not supported',
+    script: 'Changed element $(ID) is a scale change and might lead to data loss'
+  },
+  'migration-unsupported-change': { 
+    std: 'Changed element $(ID) is a lossy type change from $(NAME) to $(TYPE) and is not supported',
+    script: 'Changed element $(ID) is a lossy type change from $(NAME) to $(TYPE) and might lead to data loss'
+  },
+  'migration-unsupported-table-drop': { 
+    std: 'Dropping tables is not supported',
+    script: 'Dropping tables leads to data loss'
+  },
+  // -----------------------------------------------------------------------------------
+  // to.sql.migration specific error messages end here
+  // -----------------------------------------------------------------------------------
 }
 
 /**

package/lib/base/messages.js

@@ -357,9 +357,11 @@ function createMessageFunctions( options, moduleName, model = null ) {
  * ```
  * @param {object} model
  * @param {CSN.Options} [options]
- * @param {string|null} [moduleName]
+ * @param {string|null} [_moduleName]
  */
-function makeMessageFunction( model, options, moduleName = null ) {
+function makeMessageFunction( model, options, _moduleName = null ) {
+  let moduleName = _moduleName;
+
   if (options.testMode) {
     // ensure message consistency during runtime with --test-mode
     _check$Init( options );
@@ -395,6 +397,7 @@ function makeMessageFunction( model, options, moduleName = null ) {
     callTransparently,
     moduleName,
     setModel,
+    setModuleName,
     setOptions,
   };
 
@@ -631,11 +634,22 @@ function makeMessageFunction( model, options, moduleName = null ) {
     model = _model;
   }
 
+  /**
+   * 
+   * Change the moduleName used for reclassifying messages.
+   * Needed for to.sql.migration + script
+   * 
+   * @param {string} __moduleName 
+   */
+  function setModuleName( __moduleName ) {
+    moduleName = __moduleName;
+  }
+
   /**
    * Change the options used to determine message severities.
    * This is necessary if you change `options.severities`, as otherwise they may not be picked up.
    *
-   * @param {CSN.Model} _model
+   * @param {CSN.Options} _options
    */
   function setOptions( _options ) {
     options = _options;

package/lib/checks/{dbFeatureFlags.js → featureFlags.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 const { setProp } = require('../base/model');
-const { featureFlags } = require('../transform/db/featureFlags');
+const { featureFlags } = require('../transform/featureFlags');
 const { isSqlService } = require('../transform/db/processSqlServices');
 
 /**

package/lib/checks/parameters.js

@@ -12,12 +12,69 @@ const { isPersistedOnDatabase } = require('../model/csnUtils.js');
  */
 function checkForParams( parent, name, params, path ) {
   const artifact = this.csn.definitions[path[1]];
-  if (artifact.kind === 'entity' && isPersistedOnDatabase(artifact) && parent.kind === 'entity') {
-    this.error('ref-unexpected-params', [ ...path, 'params' ], { value: this.options.sqlDialect },
-               'Parameterized views can\'t be used with sqlDialect $(VALUE)');
+  if (artifact.kind === 'entity' && isPersistedOnDatabase(artifact) && artifact['@cds.persistence.exists'] !== true && parent.kind === 'entity') {
+    if (artifact.query || artifact.projection) {
+      if (this.options.sqlDialect === 'hana') {
+        for (const pname in artifact.params) {
+          if (pname.match(/\W/g) || pname.match(/^\d/) || pname.match(/^_/)) { // parameter name must be regular SQL identifier
+            this.warning(null, [ ...path, 'params', pname ], 'Expecting regular SQL-Identifier');
+          }
+          else if (this.options.sqlMapping !== 'plain' && pname.toUpperCase() !== pname) { // not plain mode: param name must be all upper
+            this.warning(null, [ ...path, 'params', pname ], { name: this.options.sqlMapping },
+                         'Expecting parameter to be uppercase in naming mode $(NAME)');
+          }
+        }
+      }
+      else {
+        this.error('ref-unexpected-params', [ ...path, 'params' ], { value: this.options.sqlDialect },
+                   'Parameterized views can\'t be used with sqlDialect $(VALUE)');
+      }
+    }
+    else {
+      this.error(null, path, { '#': this.options.toSql ? 'sql' : 'std' }, {
+        std: 'Table-like entities with parameters are not supported for conversion to SAP HANA CDS',
+        sql: 'Table-like entities with parameters are not supported for conversion to SQL',
+      });
+    }
+  }
+}
+
+function checkAssocsWithParams( member, memberName, prop, path ) {
+  // Report an error on
+  // - view with parameters that has an element of type association/composition
+  // - association that points to entity with parameters
+  if (member.target && this.csnUtils.isAssocOrComposition(member)) {
+    if (this.artifact.params) {
+      // HANA does not allow 'WITH ASSOCIATIONS' on something with parameters:
+      // SAP DBTech JDBC: [7]: feature not supported: parameterized sql view cannot support association: line 1 col 1 (at pos 0)
+      this.message('def-unexpected-paramview-assoc', path, { '#': 'source' });
+    }
+    else if (this.artifact['@cds.persistence.udf'] || this.artifact['@cds.persistence.calcview']) {
+      // UDF/CVs w/o params don't support 'WITH ASSOCIATIONS'
+      const anno = this.artifact['@cds.persistence.udf'] ? '@cds.persistence.udf' : '@cds.persistence.calcview';
+      this.message('def-unexpected-calcview-assoc', path, { '#': 'source', anno });
+    }
+    if (this.csn.definitions[member.target].params) {
+      // HANA does not allow association targets with parameters or to UDFs/CVs w/o parameters:
+      // SAP DBTech JDBC: [7]: feature not supported: cannot support create association to a parameterized view
+      this.message('def-unexpected-paramview-assoc', path, { '#': 'target' });
+    }
+    else if (this.csn.definitions[member.target]['@cds.persistence.udf'] || this.csn.definitions[member.target]['@cds.persistence.calcview']) {
+      // HANA won't check the assoc target but when querying an association with target UDF, this is the error:
+      // SAP DBTech JDBC: [259]: invalid table name: target object SYSTEM.UDF does not exist: line 3 col 6 (at pos 43)
+      // CREATE TABLE F (id INTEGER NOT NULL);
+      // CREATE FUNCTION UDF RETURNS TABLE (ID INTEGER) LANGUAGE SQLSCRIPT SQL SECURITY DEFINER AS BEGIN RETURN SELECT ID FROM F; END;
+      // CREATE TABLE Y (  id INTEGER NOT NULL,  toUDF_id INTEGER) WITH ASSOCIATIONS (MANY TO ONE JOIN UDF AS toUDF ON (toUDF.id = toUDF_id));
+      // CREATE VIEW U AS SELECT  id, toUDF.a FROM Y;
+      const anno = this.csn.definitions[member.target]['@cds.persistence.udf'] ? '@cds.persistence.udf' : '@cds.persistence.calcview';
+      this.message('def-unexpected-calcview-assoc', path, { '#': 'target', anno });
+    }
   }
 }
 
 module.exports = {
-  params: checkForParams,
+  csnValidator: {
+    params: checkForParams,
+  },
+  memberValidator: checkAssocsWithParams,
 };

package/lib/checks/validator.js

@@ -49,7 +49,7 @@ const {
   checkSqlAnnotationOnArtifact,
   checkSqlAnnotationOnElement,
 } = require('./sql-snippets');
-const dbFeatureFlags = require('./dbFeatureFlags');
+const featureFlags = require('./featureFlags');
 
 const forRelationalDBMemberValidators
 = [
@@ -85,7 +85,7 @@ const forRelationalDBCsnValidators = [
   nonexpandableStructuredInExpression,
   navigationIntoMany,
   checkPathsInStoredCalcElement,
-  dbFeatureFlags,
+  featureFlags,
 ];
 /**
  * @type {Array<(query: CSN.Query, path: CSN.Path) => void>}
@@ -188,10 +188,14 @@ function _validate( csn, that,
  * @returns {any[]} Array of validator functions (or objects?)
  */
 function getDBCsnValidators( options ) {
-  if (options.sqlDialect === 'postgres' || options.sqlDialect === 'h2')
-    return [ ...forRelationalDBCsnValidators, checkForHanaTypes, checkForParams ];
+  const validations = [ ...forRelationalDBCsnValidators ];
 
-  return forRelationalDBCsnValidators;
+  if (options.transformation !== 'effective')
+    validations.push(checkForParams.csnValidator);
+  if (options.sqlDialect === 'h2' || options.sqlDialect === 'postgres')
+    validations.push(checkForHanaTypes);
+
+  return validations;
 }
 
 /**
@@ -200,9 +204,13 @@ function getDBCsnValidators( options ) {
  * @returns {Function} the validator function with the respective checks for the HANA backend
  */
 function forRelationalDB( csn, that ) {
+  const memberValidators = [ ...forRelationalDBMemberValidators, ...commonMemberValidators ];
+  if (that.options.transformation === 'hdbcds')
+    memberValidators.push(checkForParams.memberValidator);
+
   return _validate(csn, that,
                    getDBCsnValidators(that.options),
-                   forRelationalDBMemberValidators.concat(commonMemberValidators),
+                   memberValidators,
                    forRelationalDBArtifactValidators.concat(commonArtifactValidators).concat(
                      // why is this hana exclusive
                      (artifact) => {

package/lib/compiler/index.js

@@ -13,7 +13,7 @@
 'use strict';
 
 const { makeModuleResolver, makeModuleResolverSync } = require('../utils/moduleResolve');
-const parseLanguage = require('../language/antlrParser'); // TODO: should we do some lazyload here?
+const parsers = require('../parsers');
 const parseCsn = require('../json/from-csn');
 
 const assertConsistency = require('./assert-consistency');
@@ -43,10 +43,10 @@ const { XsnSource } = require('./xsn-model');
 const extensionParsers = {
   csn: parseCsn.parse,
   json: parseCsn.parse,
-  cds: parseLanguage,
-  cdl: parseLanguage,
-  hdbcds: parseLanguage,
-  hdbdd: parseLanguage,
+  cds: parsers.parseCdl,
+  cdl: parsers.parseCdl,
+  hdbcds: parsers.parseCdl,
+  hdbdd: parsers.parseCdl,
 };
 
 // Class for command invocation errors.  Additional members:
@@ -108,7 +108,7 @@ function parseX( source, filename, options = {}, messageFunctions = null ) {
 function parserForFile( source, ext, options ) {
   // 'auto!' ignores the file's extension
   if (options.fallbackParser === 'auto!')
-    return (source?.startsWith( '{' ) ? parseCsn.parse : parseLanguage);
+    return (source?.startsWith( '{' ) ? parseCsn.parse : parsers.parseCdl);
 
   if (options.fallbackParser === 'csn!')
     return parseCsn.parse;
@@ -458,7 +458,7 @@ function recompileX( csn, options ) {
  * On the given model (AST like CSN) run the definer, resolver as well as semantic checks.
  * Creates an augmented CSN (XSN) and returns it.
  *
- * @param {object} model AST like CSN generated e.g. by `parseLanguage()`
+ * @param {object} model AST like CSN generated e.g. by `parsers.parseCdl()`
  * @returns {XSN.Model} Augmented CSN (XSN)
  */
 function compileDoX( model ) {

package/lib/compiler/shared.js

@@ -174,7 +174,7 @@ function fns( model ) {
     having: 'where',
     groupBy: 'where',
     column: {
-      lexical: tableAliasesIfNotExtendAndSelf,
+      lexical: tableAliasesAndSelf,
       dollar: true,
       dynamic: combinedSourcesOrParentElements,
       notFound: undefinedSourceElement,
@@ -721,16 +721,41 @@ function fns( model ) {
         return setArtifactLink( head, def ); // we do not want to see the using
       }
       case 'mixin': {
+        // use a source element having that name if in `extend … with columns`:
+        const elem = (user._user || user).$extended &&
+          art._parent._combined[head.id];
+        if (elem) {
+          path.$prefix = elem._parent.name.id; // prepend alias name
+          info( 'ref-special-in-extend', [ head.location, user ],
+                { '#': 'mixin', id: head.id, art: elem._origin._main } );
+          setLink( head, '_navigation', elem );
+          return setArtifactLink( head, elem._origin );
+        }
         return setLink( head, '_navigation', art );
       }
       case '$navElement': {
-        if (head.id === (user._user || user).$extended)
-          path.$prefix = head.id;
         setLink( head, '_navigation', art );
         return setArtifactLink( head, art._origin );
       }
-      case '$self':             // TODO: remove $projection from CC
       case '$tableAlias': {
+        // use a source element having that name if in `extend … with columns`:
+        const { $extended } = user._user || user;
+        const elem = $extended && art.elements[head.id];
+        if (elem) {
+          path.$prefix = art.name.id; // prepend alias name
+          info( 'ref-special-in-extend', [ head.location, user ],
+                { '#': 'alias', id: head.id, art: elem._origin._main } );
+          setLink( head, '_navigation', elem );
+          return setArtifactLink( head, elem._origin );
+        }
+        else if ($extended) {
+          warning( 'ref-deprecated-in-extend', [ head.location, user ], { id: head.id },
+                   // eslint-disable-next-line @stylistic/js/max-len
+                   'In an added column, do not use the table alias $(ID) to refer to source elements' );
+        }
+      }
+      /* FALLTHROUGH */
+      case '$self': {           // TODO: remove $projection from CC
         setLink( head, '_navigation', art );
         setArtifactLink( head, art._origin ); // query source or leading query in FROM
         if (!art._origin)
@@ -842,15 +867,6 @@ function fns( model ) {
   function tableAliasesAndSelf( user ) {
     return userQuery( user ) || user._main || user;
   }
-  function tableAliasesIfNotExtendAndSelf( user ) {
-    if (!user.$extended)
-      return tableAliasesAndSelf( user );
-    if (typeof user.$extended !== 'string') {
-      const aliases = userQuery( user ).$tableAliases;
-      user.$extended = Object.keys( aliases )[0];
-    }
-    return justDollarAliases( user );
-  }
 
   // Functions called via semantics.dynamic: ------------------------------------