@sap/cds-compiler 3.0.2 → 3.1.0

package/CHANGELOG.md

@@ -7,6 +7,55 @@
 Note: `beta` fixes, changes and features are usually not listed in this ChangeLog but [here](doc/CHANGELOG_BETA.md).
 The compiler behavior concerning `beta` features can change at any time without notice.
 
+## Version 3.1.0 - 2022-08-04
+
+### Added
+
+- Extending an artifact with multiple includes in one extend statement is now possible:
+  `extend SomeEntity with FirstInclude, SecondInclude;`
+- Aspects can now have actions and functions, similar to entities.  Aspects can be extended by actions as well.
+- `cdsc`:
+  - `toCsn` now supports `--with-locations` which adds a `$location` property to artifacts
+  - `toHana`/`toSql` now supports `--disable-hana-comments`, which disables rendering of doc-comments for HANA.
+- to.hdi/sql/hdbcds: Support FK-access in `ORDER BY` and `GROUP BY`
+- to.hdi.migration: Detect an implicit change from `not null` to `null` and render corresponding `ALTER`
+
+### Changed
+
+- compiler: If an unknown file extension is used but the file starts with
+  an opening curly brace (`{`), it will be parsed as CSN.
+- to.edm(x): In V4 containment mode, pull up `@Capabilities` annotations from the containees to the root container (set)
+  and translate them into corresponding `@Capabilities.NavigationRestrictions`. If a `NavigationRestriction` is already available
+  for that containment path, capabilities are merged into this path. Capability annotation value paths are prefixed with
+  the navigation restriction path.
+  The capability 'pull up' has an effect on entity annotations only. `@Capabilities` assignments on compositions are not pulled
+  up but rendered to the association type which is important to enable dynamic capabilities on 'to-many' relations and to avoid
+  ambiguities in entity set capabilities.
+- Update OData vocabularies 'Analytics', 'Capabilities', 'Common', 'Core', 'DataIntegration', 'Graph', 'PersonalData', 'UI', 'Validation'.
+
+### Fixed
+
+- Syntax of date/time literals are now checked against ISO 8601. If the format is invalid, a warning is emitted.
+- The code completion directly after the `(` for functions with special syntax
+  now suggests all valid keywords, like for `extract` or `locate_regexpr`.
+- compiler:
+  + `cast(elem as EnumType)` crashed the compiler.
+  + Annotations on sub-elements in query entities were lost during re-compilation.
+  + An association's cardinality was lost for associations published in projections.  
+  + Annotations on indirect action parameters were lost in CSN flavor `gensrc`.
+  + If a file's content starts with `{` and if neither file extension is known nor
+    `fallbackParser` is set, assume the source is CSN.
+- all backends: references in `order by` _expressions_ are correctly resolved.
+- to.edm(x):
+  + Allow cross service references for unmanaged associations and improve warning message for muted associations.
+  + Nested `@UI.TextArrangement` has precedence over `@TextArrangement` shortcut annotation for `@Common.Text`.
+- to.hdi.migration:
+  + Doc comments rendered the _full doc comment_ instead of only the first paragraph, as `to.hdi` does.
+  + Respect option `disableHanaComments` when rendering the `ALTER` statements
+- to.hdi/sql/hdbcds:
+  + Check for invalid usages of `$self` and give helpful errors
+  + Correctly resolve association-steps in the from-clause in conjunction with `exists`
+
 ## Version 3.0.2 - 2022-07-05
 
 ### Fixed
@@ -59,6 +108,22 @@ The compiler behavior concerning `beta` features can change at any time without
   it is now only allowed for `count`, `min`, `max`, `sum`, `avg`, `stddev`, `var`.
 - All non-SNAPI options.
 
+## Version 2.15.8 - 2022-08-02
+
+### Fixed
+
+- to.edm(x): Nested `@UI.TextArrangement` has precedence over `@TextArrangement` shortcut annotation for `@Common.Text`.
+- to.hdi.migration:
+  + Respect option `disableHanaComments` when rendering the `ALTER` statements
+  + Doc comments rendered the _full doc comment_ instead of only the first paragraph, as `to.hdi` does.
+- compiler: An association's cardinality was lost for associations published in projections.
+
+## Version 2.15.6 - 2022-07-26
+
+### Fixed
+
+- Annotations on sub-elements were lost during re-compilation.
+
 ## Version 2.15.4 - 2022-06-09
 
 ### Fixed

package/bin/.eslintrc.json

@@ -11,6 +11,7 @@
     "no-process-exit": "off",
     "camelcase": "off",
     "radix": "off",
-    "no-shadow": "warn"
+    "no-shadow": "warn",
+    "global-require": "off"
   }
 }

package/bin/cdsc.js

@@ -262,6 +262,7 @@ function executeCommandLine(command, options, args) {
     toRename,
     manageConstraints,
     toSql,
+    inspect,
   };
   const commandsWithoutCompilation = {
     explain,
@@ -425,6 +426,24 @@ function executeCommandLine(command, options, args) {
       console.log(explainMessage(args.messageId));
   }
 
+  function inspect(model) {
+    const inspectModel = require('../lib/inspect');
+
+    if (options.statistics) {
+      const result = inspectModel.inspectModelStatistics(model, options);
+      if (result)
+        console.log(result);
+    }
+
+    if (options.propagation) {
+      const result = inspectModel.inspectPropagation(model, options, options.propagation);
+      if (result)
+        console.log(result);
+    }
+
+    return model;
+  }
+
   // Display error messages in `err` resulting from a compilation.  Also set
   // process.exitCode - process.exit() will force the process to exit as quickly
   // as possible = is problematic, since console.error() might be asynchronous

package/doc/API.md

@@ -0,0 +1,11 @@
+# CDS Compiler API Documentation
+
+The API of `@sap/cds-compiler` is described in a TypeScript declaration file
+[`main.d.ts`](../lib/main.d.ts).
+
+Refer to that file for documentation on option names, API calls, and more.
+
+You can use [TypeDoc] to render an HTML documentation from it.
+
+
+[TypeDoc]: https://typedoc.org/

package/doc/CHANGELOG_ARCHIVE.md

@@ -270,7 +270,7 @@ The compiler behaviour concerning `beta` features can change at any time without
 - to.sql/hdi/hdbcds:
   + Doc comments are translated into HANA comments (or into `@Comment` annotation for `to.hdbcds`).
   Such comments are possible on entities, views, elements of entities and `to.hdbcds` also supports comments on view columns.
-  Generation can be disabled via option `disableHanaComments`. Entites/views (and their elements/columns)
+  Generation can be disabled via option `disableHanaComments`. Entities/views (and their elements/columns)
   annotated with `@cds.persistence.journal` for `to.hdi`/`to.sql` will not have comments rendered.
   + Generation of temporal `WHERE` clause can be suppressed by annotating the `validFrom`/`validTo` elements of the projection with `false` or `null`.
 - to.sql/hdi/hdbcds/edm(x)/for.odata: Structure/managed association comparisons (tuple comparisons) are now

package/doc/CHANGELOG_BETA.md

@@ -8,7 +8,29 @@ Note: `beta` fixes, changes and features are listed in this ChangeLog just for i
 The compiler behavior concerning `beta` features can change at any time without notice.
 **Don't use `beta` fixes, changes and features in productive mode.**
 
-## Version 3.0.0 - 2022-XX-YY
+## Version 3.1.0 - 2022-08-04
+
+### Added `optionalActionFunctionParameters`
+
+- to.edm(x): Annotate optional function/action parameters with `@Core.OptionalParameter` for OData V4.
+  An action/function parameter is optional if
+  1) it is already annotated with `@Core.OptionalParameter` regardless of its definition.
+  2) it has a default value (including null), regardless of it's nullability
+  3) it has NO default value but is nullable (the implicit default value is null)
+
+  If a mandatory parameter (not null and no default value) appears after an optional
+  parameter, a warning is raised, Core.OptionalParameter requires that all optional
+  parameters appear rightmost.
+
+### Added `odataOpenType`
+
+- to.edm(x): Support annotation `@open` on entity and structured type level to declare the corresponding entity/complex type to
+  be `OpenType=true`. If an open structured type is declared closed (with a falsy annotation value), the corresponding EDM type
+  is closed as well and suffixed with `_closed` (or `_open` vice versa).
+  No further checks are performed on possibly open foreign or primary key types nor on eventually bucket elements to store the
+  additional data.
+
+## Version 3.0.0 - 2022-06-23
 
 ### Removed `addTextsLanguageAssoc`
 
@@ -134,7 +156,7 @@ When the beta option `subElemRedirections` is set to true,
 _all_ array (new!) and structure types are expanded when referenced:
 managed associations (and compositions to entities) in that array are
 implicitly redirected when necessary.
-See [below for details](#version-1300---20200612).
+See [below for details](#version-1300---2020-06-12).
 
 Nested array types (without intermediate structure types) are not supported.
 

package/doc/CHANGELOG_DEPRECATED.md

@@ -11,10 +11,28 @@ Note: `deprecated` features are listed in this ChangeLog just for information.
 **When the `deprecated` option is set, the `beta` option is ignored,
 and several new features are not available.**
 
-## Version 3.0.0 - 2022-XX-YY
+## Version 3.1.0 - 2022-08-04
+
+### Added `autoCorrectOrderBySourceRefs`
+
+When this option is set, calling `compile` auto-corrects direct `order by`
+source element references without table alias for SELECT queries by adding the
+table alias to the `ref`.
+
+Using this option might lead to surprising results when elements are added to
+existing models: `order by` specifications might change their semantics without
+any extra messages.
+
+## Version 3.0.0 - 2022-06-23
 
 Version 3 of the cds-compiler removes all v2 deprecated flags.
 
+### Add `eagerPersistenceForGeneratedEntities`
+
+If enabled, the old behavior regarding `@cds.persistence.skip` and `@cds.persistence.exists`
+is restored, i.e. these annotations are not copied from parent to generated child entities, nor
+is `@cds.persistence.exists` copied to localized convenience views.
+
 ### Removed `createLocalizedViews`
 
 ### Removed `downgradableErrors`
@@ -25,6 +43,8 @@ Version 3 of the cds-compiler removes all v2 deprecated flags.
 
 ### Removed `noElementsExpansion`
 
+<!-- fully removed with 3.1.0 -->
+
 ### Removed `noInheritedAutoexposeViaComposition`
 
 ### Removed `noScopedRedirections`

package/lib/api/main.js

@@ -408,10 +408,10 @@ function hdiMigration(csn, options, beforeImage) {
 }
 
 /**
- * From the given SQLs, create the the correct result structure.
+ * From the given SQLs, create the correct result structure.
  *
- * @param {object} hdbkinds
- * @param {CSN.Model} afterImage
+ * @param {object} hdbkinds Object of hdbkinds (such as `hdbindex`) mapped to dictionary of artifacts.
+ * @param {CSN.Model} afterImage CSN, used to create correct file names in result structure.
  * @returns {object[]} Array of objects, each having: name, suffix and sql
  */
 function createSqlDefinitions(hdbkinds, afterImage) {
@@ -430,8 +430,8 @@ function createSqlDefinitions(hdbkinds, afterImage) {
 /**
  * From the given deletions, create the correct result structure.
  *
- * @param {object} deletions
- * @param {CSN.Model} beforeImage
+ * @param {object} deletions Dictionary of deletions, only keys are used.
+ * @param {CSN.Model} beforeImage CSN used to create correct file names in result structure.
  * @returns {object[]} Array of objects, each having: name and suffix - only .hdbtable as suffix for now
  */
 function createSqlDeletions(deletions, beforeImage) {
@@ -442,8 +442,8 @@ function createSqlDeletions(deletions, beforeImage) {
 /**
  * From the given migrations, create the correct result structure.
  *
- * @param {object} migrations
- * @param {CSN.Model} afterImage
+ * @param {object} migrations Dictionary of changesets (migrations).
+ * @param {CSN.Model} afterImage CSN used to create correct file names in result structure.
  * @returns {object[]} Array of objects, each having: name, suffix and changeset.
  */
 function createSqlMigrations(migrations, afterImage) {

package/lib/api/options.js

@@ -57,9 +57,7 @@ const privateOptions = [
   'noRecompile',
   'internalMsg',
   'disableHanaComments',      // in case of issues with hana comment rendering
-  'dependentAutoexposed',     // deprecated, no effect - TODO: safe to remove?
-  'longAutoexposed',          // deprecated, no effect - TODO: safe to remove?
-  'localizedWithoutCoalesce', // deprecated version of 'localizedLanguageFallback',
+  'localizedWithoutCoalesce', // deprecated version of 'localizedLanguageFallback', TODO(v4): Remove option
 ];
 
 const overallOptions = publicOptionsNewAPI.concat(privateOptions);
@@ -159,6 +157,7 @@ module.exports = {
       return translateOptions(options, defaultOptions, hardOptions, undefined, undefined, 'for.hana');
     },
   },
+  overallOptions, // exported for testing
 };
 
 

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' },
@@ -205,7 +209,7 @@ 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',
+    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',
@@ -228,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'
@@ -276,7 +284,7 @@ const centralMessageTexts = {
     unknown: 'Unknown argument $(CODE)',
     duplicate: 'Duplicate argument $(CODE)',
   },
-  'syntax-duplicate-annotate': 'You shouldn\'t refer to $(NAME) repeatedly in the same annotate statement',
+  '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',
@@ -309,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': {
@@ -467,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;
@@ -438,7 +412,7 @@ function makeMessageFunction( model, options, moduleName = null ) {
     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
 }
 
 /**
@@ -1192,8 +1167,8 @@ 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.element && art.name.absolute ||  art.name.path.map(s => s && s.id).join('.'));
+  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;
@@ -1383,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/checks/actionsFunctions.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { isBuiltinType } = require('../model/csnUtils');
+const { isBetaEnabled } = require('../base/model');
 
 // Only to be used with validator.js - a correct this value needs to be provided!
 
@@ -52,13 +53,13 @@ function checkActionOrFunction(art, artName, prop, path) {
   function checkActionOrFunctionParameter(param, currPath, actKind) {
     const paramType = param.type ? this.csnUtils.getFinalTypeDef(param.type) : param;
 
-    if (param.default || paramType.default) {
-      this.error('param-default', currPath, { '#': actKind },
-                 {
-                   std: 'Artifact parameters can\'t have a default value', // Not used
-                   action: 'Action parameters can\'t have a default value',
-                   function: 'Function parameters can\'t have a default value',
-                 });
+    if (!isBetaEnabled(this.options, 'optionalActionFunctionParameters') && (param.default || paramType.default)) {
+      this.message('param-default', currPath, { '#': actKind },
+                   {
+                     std: 'Artifact parameters can\'t have a default value', // Not used
+                     action: 'Action parameters can\'t have a default value',
+                     function: 'Function parameters can\'t have a default value',
+                   });
     }
 
     if (paramType.type && this.csnUtils.isAssocOrComposition(param.type)) {

package/lib/checks/selectItems.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { forEachGeneric } = require('../model/csnUtils');
+const { forEachGeneric, applyTransformationsOnNonDictionary } = require('../model/csnUtils');
 
 // Only to be used with validator.js - a correct this value needs to be provided!
 
@@ -17,21 +17,103 @@ function validateSelectItems(query) {
   const { SELECT } = query;
   if (!SELECT)
     return;
+  /**
+   * Check for a $self.<assoc> in columns etc. - since the $self.<assoc> references the "outside" view
+   * of the association, this is not allowed.
+   *
+   * @param {string} queryPart Part of the query that is being checked
+   * @returns {Function} Function as callback for applyTransformations
+   */
+  function checkRefForInvalid$Self(queryPart) {
+    const signalError = (error, parent, type) => {
+      if (queryPart === 'columns') {
+        error(null, parent.$path,
+              { name: parent.ref[0], type },
+              'Select items starting with $(NAME) must not contain path steps of type $(TYPE)');
+      }
+      else if (queryPart === 'orderBy') {
+        error(null, parent.$path,
+              { id: queryPart, type },
+              'Items of the $(ID)-clause must not contain path steps of type $(TYPE)');
+      }
+      else {
+        error(null, parent.$path,
+              { id: queryPart, name: parent.ref[0], type },
+              'Items of the $(ID)-clause starting with $(NAME) must not contain path steps of type $(TYPE)');
+      }
+    };
+    return function checkForInvalid$SelfInRef(parent) {
+      if (parent.ref && (parent.$scope === '$self' || parent.$scope === '$query')) {
+        const { _links } = parent;
+        for (let j = parent.$scope === '$self' ? 1 : 0; j < _links.length - 1; j++) {
+          if (_links[j].art.target) {
+            if (_links[j].art.on) {
+              // It's an unmanaged association - traversal is always forbidden
+              signalError(this.error, parent, _links[j].art.type);
+            }
+            else {
+              // It's a managed association - access of the foreign keys is allowed
+              const nextRef = parent.ref[j + 1].id || parent.ref[j + 1];
+              if (!_links[j].art.keys.some(r => r.ref[0] === nextRef))
+                signalError(this.error, parent, _links[j].art.type);
+            }
+          }
+        }
+
+        const last = _links[_links.length - 1];
 
-  forEachGeneric(SELECT, 'columns', (selectItem) => {
-    if (selectItem.ref && (selectItem.ref[0] === '$self' || selectItem.ref[0] === '$projection')) {
-      const pathStepWithTarget = selectItem._links.slice(1).find(link => link.art.target);
-      if (pathStepWithTarget) {
-        this.error(null, selectItem.$path,
-                   { name: selectItem.ref[0], type: pathStepWithTarget.art.type },
-                   'Select items starting with $(NAME) must not contain path steps of type $(TYPE)');
+        if (last.art.target && last.art.on) {
+          // It's an unmanaged association - traversal is always forbidden
+          signalError(this.error, parent, last.art.type);
+        } // managed is okay, can be handled via tuple expansion
       }
-    }
-    else if (this.options.transformation === 'hdbcds' && selectItem.xpr && selectItem.func) {
-      this.error(null, selectItem.$path,
-                 'Window functions are not supported by SAP HANA CDS');
-    }
-  });
+    };
+  }
+
+  /**
+   * Check the given assoc filter for usage of $self - in an assoc-filter, you must only
+   * address things on the target side of the association, not from global scope.
+   *
+   * @param {object} parent
+   * @param {string} prop
+   * @param {Array} where
+   */
+  function checkFilterForInvalid$Self(parent, prop, where) {
+    where.forEach((whereStep) => {
+      if (whereStep.ref && ( whereStep.ref[0] === '$projection' || whereStep.ref[0] === '$self')) {
+        this.error('expr-where-unexpected-self', whereStep.$path,
+                   { name: whereStep.ref[0] },
+                   'Path steps inside of filters must not start with $(NAME)');
+      }
+    });
+  }
+
+  const aTCB = (parent, prop) => {
+    applyTransformationsOnNonDictionary(parent, prop, {
+      ref: checkRefForInvalid$Self(prop).bind(this),
+      where: checkFilterForInvalid$Self.bind(this),
+    }, { skipStandard: { on: true }, drillRef: true });
+  };
+
+  const transformers = {
+    columns: aTCB,
+    groupBy: aTCB,
+    orderBy: aTCB,
+    having: aTCB,
+    where: aTCB,
+  };
+
+  if (this.options.transformation === 'hdbcds') {
+    transformers.xpr = (parent) => {
+      if (parent.func) {
+        this.error(null, parent.$path,
+                   'Window functions are not supported by SAP HANA CDS');
+      }
+    };
+  }
+
+  applyTransformationsOnNonDictionary(query, 'SELECT', transformers );
+
   // .call() with 'this' to ensure we have access to the options
   rejectManagedAssociationsAndStructuresForHdbcdsNames.call(this, SELECT, SELECT.$path);
 }