@sap/cds-compiler 6.1.0 → 6.3.0

package/CHANGELOG.md

@@ -8,6 +8,69 @@ Note: `beta` fixes, changes and features are usually not listed in this ChangeLo
 but in [doc/CHANGELOG_BETA.md](doc/CHANGELOG_BETA.md).
 The compiler behavior concerning `beta` features can change at any time without notice.
 
+## Version 6.3.0 - 2025-08-28
+
+### Added
+
+- compiler: Column casts can now use more modifiers such as `default` directly.
+- for.odata/to.edm(x):
+  + New option `draftUserDescription` is now available. It adds the fields `CreatedByUserDescription`,
+    `LastChangedByUserDescription`, `InProcessByUserDescription` to the `DraftAdministrativeData` entity.
+- to.sql:
+  + Structures with only one element can now be compared to scalar values.
+    This also applies to associations with only one foreign key.
+  + `cds.UInt8` can now be used in SQL dialects "h2" and "postgres".
+  + Managed associations can now be used in comparisons, e.g. `assoc = struct`.
+  + Structures and managed associations with only one element can be compared with scalars, e.g. `struct = 1`.
+  + In the draft use case, the `DRAFT.DraftAdministrativeData` entity now includes the following fields by default:
+  `CreatedByUserDescription`, `LastChangedByUserDescription`, `InProcessByUserDescription`, and `DraftMessages`.
+
+### Changed
+
+- Update OData vocabularies: Common
+- cdsc: EDMX output uses XML comments as service separators instead of `//`.
+        If there is only one service, no header is printed, allowing piping the output to a file.
+- to.sql: path expressions which end in a foreign key are now always optimized to use the element of the source side.
+
+### Fixed
+
+- compiler: Redirecting associations to non-query entities was fixed.
+- to.sql/to.edm(x): References to associations can now be compared to other associations and structures.
+- to.sql: Referencing a foreign key of an `@cds.persistence.skip` entity previously caused an
+  error in queries. Now the foreign key in the source entity is resolved and rendered.
+
+### Removed
+
+- for.odata/to.edm(x): The `addAnnotationAddressViaNavigationPath` option has been removed. Its functionality is included in the `draftMessages` option.
+
+## Version 6.2.2 - 2025-07-28
+
+### Fixed
+
+- compiler: `@extension.code` was accidentally restricted to non-expression values.
+
+## Version 6.2.0 - 2025-07-25
+
+### Added
+
+- parser: CDL-casts in queries now support all type expressions, e.g. `field : many String not null`.
+- compiler: Association paths in annotation expressions can now end with a filter, e.g. `@anno: (assoc[1=1])`.
+
+### Changed
+
+- compiler: Annotation `@extension.code` is no longer propagated.
+- Update OData vocabularies: Common
+- The list of CDL keywords was updated for the latest CDL grammar.
+- to.cdl: Foreign keys of managed associations are only rendered explicitly if
+  the compiler can't infer them when recompiled.
+- cdsc: The command `parseCdl` was renamed to `parse`, since it also supports CSN input.
+
+### Fixed
+
+- compiler:
+  + Calculated elements can now have a localized type.
+  + Associations in sub-queries of an `order by` of a `UNION` are now redirected.
+
 ## Version 6.1.0 - 2025-06-27
 
 ### Added
@@ -135,6 +198,21 @@ The compiler behavior concerning `beta` features can change at any time without
 
 - to.edm(x): Fixed crash for rare case if annotation expressions were used.
 
+## Version 5.9.8 - 2025-07-14
+
+### Fixed
+
+- compiler: Calculated elements can now have a localized type
+
+## Version 5.9.6 - 2025-06-18
+
+### Fixed
+
+- to.sql: Fix error when calculated element refers to a localized element.
+- to.edm(x):
+  + Fix errors for service entities containing multiple path steps (e.g. `Service.Prefix.MyEntity`).
+  + Support enum references in annotation expressions that were resolved by the compiler.
+
 ## Version 5.9.4 - 2025-05-22
 
 ### Fixed

package/bin/cdsc.js

@@ -151,7 +151,7 @@ function cdscMain() {
     cmdLine.options.attachValidNames = true;
 
   // Internally, parseCdl/parseOnly are options, so we map the command to it.
-  if (cmdLine.command === 'parseCdl') {
+  if (cmdLine.command === 'parse') {
     cmdLine.command = 'toCsn';
     cmdLine.options.toCsn = cmdLine.options.parseCdl;
     cmdLine.options.parseCdl = true;
@@ -462,13 +462,15 @@ async function executeCommandLine( command, options, args ) {
     }
     else if (options.json) {
       const result = main.to.edm.all(csn, options);
+      const omitHeadline = Object.keys(result).length === 1;
       for (const serviceName in result)
-        writeToFileOrDisplay(options.out, `${ serviceName }.json`, result[serviceName]);
+        writeToFileOrDisplay(options.out, `${ serviceName }.json`, result[serviceName], omitHeadline);
     }
     else {
       const result = main.to.edmx.all(csn, options);
+      const omitHeadline = Object.keys(result).length === 1;
       for (const serviceName in result)
-        writeToFileOrDisplay(options.out, `${ serviceName }.xml`, result[serviceName]);
+        writeToFileOrDisplay(options.out, `${ serviceName }.xml`, result[serviceName], omitHeadline);
     }
     return model;
   }
@@ -704,10 +706,19 @@ async function executeCommandLine( command, options, args ) {
         return;
       if (!omitHeadline) {
         const sqlTypes = {
-          sql: true, hdbconstraint: true, hdbtable: true, hdbview: true,
+          sql: true,
+          hdbconstraint: true,
+          hdbtable: true,
+          hdbview: true,
+          hdbprojectionview: true,
         };
-        const commentStarter = fileName.split('.').pop() in sqlTypes ? '--$' : '//';
-        process.stdout.write(`${ commentStarter } ------------------- ${ fileName } -------------------\n`);
+        if (fileName.endsWith('.xml')) {
+          process.stdout.write(`<!-- ------------------- ${ fileName.replaceAll('-->', '-- >') } ------------------- -->\n`);
+        }
+        else {
+          const commentStarter = fileName.split('.').pop() in sqlTypes ? '--$' : '//';
+          process.stdout.write(`${ commentStarter } ------------------- ${ fileName } -------------------\n`);
+        }
       }
 
       process.stdout.write(`${ content }\n`);

package/bin/cdsse.js

@@ -10,7 +10,7 @@
 // capabilities supported at the moments is: complete, find, lint.
 // Syntax highlighting is supported by ./cdshi.js.
 
-/* eslint @stylistic/js/max-len: 0, no-console: 0 */
+/* eslint @stylistic/max-len: 0, no-console: 0 */
 
 // @ts-nocheck
 

package/bin/cdsv2m.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-/* eslint @stylistic/js/max-len: 0, no-console: 0 */
+/* eslint @stylistic/max-len: 0, no-console: 0 */
 
 'use strict';
 

package/lib/api/main.js

@@ -15,6 +15,7 @@ const generateDrafts = lazyload('../transform/draft/odata');
 const tenant = lazyload('../transform/addTenantFields');
 const toSql = lazyload('../render/toSql');
 const toCdl = require('../render/toCdl');
+const sqlRenderUtils = lazyload('../render/utils/sql');
 const modelCompare = lazyload('../modelCompare/compare');
 const diffFilter = lazyload('../modelCompare/utils/filter');
 const sortViews = lazyload('../model/sortViews');
@@ -386,11 +387,13 @@ function hdi( csn, options, messageFunctions ) {
 
     objectUtils.forEach(flat, (key) => {
       const artifactNameLikeInCsn = key.replace(/\.[^/.]+$/, '');
-      nameMapping[artifactNameLikeInCsn] = key;
-      if (key.endsWith('.hdbtable') || key.endsWith('.hdbview'))
+      if (key.endsWith('.hdbtable') || key.endsWith('.hdbview') || key.endsWith('.hdbprojectionview')) {
+        nameMapping[artifactNameLikeInCsn] = key;
         sqlArtifactsWithCSNNamesToSort[artifactNameLikeInCsn] = flat[key];
-      else
+      }
+      else {
         sqlArtifactsNotToSort[key] = flat[key];
+      }
     });
 
     const sorted = sortViews({ sql: sqlArtifactsWithCSNNamesToSort, csn: sqlCSN })
@@ -687,7 +690,7 @@ function hdiMigration( csn, options, messageFunctions, beforeImage ) {
   return {
     afterImage,
     definitions: createSqlDefinitions(hdbkinds, afterImage),
-    deletions: createSqlDeletions(deletions, beforeImage),
+    deletions: createSqlDeletions(deletions, beforeImage, options),
     migrations: createSqlMigrations(migrations, afterImage),
   };
 }
@@ -719,11 +722,30 @@ function createSqlDefinitions( hdbkinds, afterImage ) {
  * @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 ) {
+function createSqlDeletions( deletions, beforeImage, options ) {
   const result = [];
-  objectUtils.forEach(deletions, name => result.push({ name: getFileName(name, beforeImage), suffix: beforeImage.definitions[name].query ? '.hdbview' : '.hdbtable' }));
+  objectUtils.forEach(deletions, name => result.push({
+    name: getFileName(name, beforeImage), suffix: getSuffix(beforeImage, beforeImage.definitions[name], options),
+  }));
   return result;
 }
+
+/**
+ * Determines the appropriate file suffix based on the type of the provided artifact.
+ *
+ * @param {CSN.Artifact} artifact - The artifact object to evaluate.
+ * @returns {string} The file suffix corresponding to the artifact type:
+ *                   - '.hdbview' for query artifacts
+ *                   - '.hdbprojectionview' for projection artifacts
+ *                   - '.hdbtable' for other artifacts
+ */
+function getSuffix( csn, artifact, options ) {
+  if (artifact.query || artifact.projection)
+    return sqlRenderUtils.isProjectionView(csn, artifact, options) ? '.hdbprojectionview' : '.hdbview';
+
+  return '.hdbtable';
+}
+
 /**
  * From the given migrations, create the correct result structure.
  *
@@ -1382,7 +1404,7 @@ function handleTenantDiscriminator( options, internalOptions, messageFunctions )
  */
 
 /**
- * A map of { <file.hdbtable|hdbview|hdbconstraint...>:<content> }.
+ * A map of { <file.hdbtable|hdbview|hdbprojectionview|hdbconstraint...>:<content> }.
  *
  * @typedef {object} HDIArtifacts
  */

package/lib/api/options.js

@@ -36,7 +36,6 @@ const publicOptionsNewAPI = [
   'booleanEquality',
   'dollarNowAsTimestamp',
   // ODATA
-  'addAnnotationAddressViaNavigationPath',
   'odataOpenapiHints',
   'edm4OpenAPI',
   'odataVersion',
@@ -50,6 +49,7 @@ const publicOptionsNewAPI = [
   'odataVocabularies',
   'odataNoCreator',
   'draftMessages',
+  'draftUserDescription',
   'service',
   'serviceNames',
   // to.cdl

package/lib/base/builtins.js

@@ -29,6 +29,14 @@ const propagationRules = {
   '@sql.append': 'never',
   '@sql.prepend': 'never',
   '@sql.replace': 'never',
+  '@extension.code': 'never', // for cds-oyster, not security relevant, but convenience
+};
+/**
+ * Of the annotations above, only these accept expressions as annotation values.
+ */
+const acceptsExprValues = {
+  __proto__: null,
+  '@extension.code': true,
 };
 
 /**
@@ -101,6 +109,7 @@ function isAnnotationExpression( val ) {
 
 module.exports = {
   propagationRules,
+  acceptsExprValues,
   xprInAnnoProperties,
   isInReservedNamespace,
   isBuiltinType,

package/lib/base/keywords.js

@@ -1,6 +1,6 @@
 'use strict';
 
-/* eslint @stylistic/js/no-multi-spaces: 0 */
+/* eslint @stylistic/no-multi-spaces: 0 */
 
 const { functionsWithoutParentheses, cdlKeywords } = require('../parsers/identifiers');
 

package/lib/base/message-registry.js

@@ -29,9 +29,9 @@
 // "sloppy": with an upcoming _minor_ version of the compiler, the compilation
 // might lead to an error anyway or the compiled CSN might look different.
 
-/* eslint @stylistic/js/no-multi-spaces: 0 */
-/* eslint @stylistic/js/max-len: 0 */
-/* eslint @stylistic/js/key-spacing: 0 */
+/* eslint @stylistic/no-multi-spaces: 0 */
+/* eslint @stylistic/max-len: 0 */
+/* eslint @stylistic/key-spacing: 0 */
 
 'use strict';
 
@@ -178,7 +178,7 @@ const centralMessages = {
   'service-nested-context': { severity: 'Error', configurableFor: true }, // does not hurt compile, TODO
   'service-nested-service': { severity: 'Error' }, // not supported yet; TODO: configurableFor:'test'?
 
-  'expr-unexpected-operator': { severity: 'Error', configurableFor: true },
+  'expr-unexpected-operator': { severity: 'Error' },
 
   // Published! Used in @sap/cds-lsp; if renamed, add to oldMessageIds and contact colleagues
   // Also used by other projects that rely on double-quotes for delimited identifiers.
@@ -196,7 +196,7 @@ const centralMessages = {
   'syntax-missing-as': { severity: 'Error', configurableFor: true },
   'syntax-missing-proj-semicolon': { severity: 'Warning' },
   'syntax-unexpected-after': { severity: 'Error' },
-  'syntax-unexpected-filter': { severity: 'Error', configurableFor: true },
+  'syntax-unexpected-filter': { severity: 'Error', configurableFor: 'v7' },
   'syntax-unexpected-many-one': { severity: 'Error' },
   'syntax-deprecated-ref-virtual': { severity: 'Error' },
   'syntax-unexpected-reserved-word': { severity: 'Error', configurableFor: true },
@@ -786,8 +786,11 @@ const centralMessageTexts = {
     calc: 'Calculated elements can\'t use parameter references',
   },
   'ref-unexpected-structured': {
-    std: 'Unexpected usage of structured type $(ELEMREF)',
-    expr: 'Structured elements can\'t be used in expressions',
+    std: 'Unexpected usage of structured element $(ELEMREF)',
+    assoc: 'Unexpected usage of managed association $(ELEMREF)',
+    'struct-expr': 'Structured element $(ELEMREF) can\'t be used in expressions with scalars; only possible for structures with one leaf-element',
+    'assoc-expr': 'Associations $(ELEMREF) can\'t be used in expressions with scalars; only possible for association with one foreign key',
+    complexExpr: 'Unexpected reference to a structured element $(ELEMREF) in expression $(VALUE)',
   },
   'ref-unexpected-virtual': {
     std: 'Unexpected reference to virtual element $(NAME)', // "std" currently unused
@@ -801,8 +804,14 @@ const centralMessageTexts = {
     'with-filter': 'Unexpected reference to an association with filter',
     'self-with-filter': 'Unexpected column reference starting with $(ALIAS) to an association with filter',
     self: 'A reference to an unmanaged association is only valid when compared via $(CODE)',
+
     expr: 'Associations can\'t be used as values in expressions',
     'expr-comp': 'Compositions can\'t be used as values in expressions',
+    'anno-expr': 'Associations can\'t be used in expressions for annotation values',
+    'anno-expr-comp': 'Compositions can\'t be used in expressions for annotation values',
+    'query-expr': 'Unmanaged associations can\'t be used in expressions in queries',
+    'query-expr-comp': 'Unmanaged compositions can\'t be used in expressions in queries',
+
     'assoc-stored': 'Associations and compositions can\'t be used as values in stored calculated elements',
 
     'managed-filter': 'Unexpected managed association $(NAME) in filter expression of $(ID)',
@@ -831,6 +840,7 @@ const centralMessageTexts = {
     unmanagedleaf: 'Unexpected unmanaged association as final path step of $(ELEMREF) in an ON-condition',
     'calc-non-fk':    'Can\'t follow association $(ID) in path $(ELEMREF) in a stored calculated element; only foreign keys can be referred to, but not $(NAME)',
     'calc-unmanaged': 'Can\'t follow association $(ID) in path $(ELEMREF) in a stored calculated element',
+    'calc-missing': 'Missing foreign key access for association $(ID) in path $(ELEMREF) in a stored calculated element',
   },
   'ref-unexpected-filter': {
     std: 'Unexpected filter in path $(ELEMREF)', // unused
@@ -983,10 +993,16 @@ const centralMessageTexts = {
   },
   'def-unexpected-key': {
     std: '$(ART) can\'t have additional keys',
-    virtual: 'Unexpected $(PROP) for virtual element',
+    virtual: 'Unexpected $(KEYWORD) for virtual element',
     // TODO: Better message?
     include: '$(ART) can\'t have additional keys (through include)',
-    invalidType: 'Unexpected $(PROP) for element of type $(TYPE)',
+    invalidType: 'Unexpected $(KEYWORD) for element of type $(TYPE)',
+  },
+  'def-unsupported-key': {
+    std: '$(KEYWORD) is not supported here', // unused variant
+    kind: '$(KEYWORD) is only supported for elements in an entity or an aspect',
+    sub: '$(KEYWORD) is only supported for top-level elements',
+    type: '$(KEYWORD) is not supported for elements of type $(TYPE)',
   },
   'def-unexpected-localized': {
     std: 'Unexpected $(KEYWORD)',
@@ -1046,6 +1062,9 @@ const centralMessageTexts = {
     'include-elements': 'Duplicate element $(NAME) through multiple includes $(SORTED_ARTS)',
     'include-actions': 'Duplicate action or function $(NAME) through multiple includes $(SORTED_ARTS)',
   },
+  'ref-invalid-assoc-navigation': {
+    std: 'Invalid navigation along association $(ID) in path $(ELEMREF) to target $(NAME) having annotation $(ANNO)',
+  },
   'ref-invalid-element': {
     std: 'Invalid element reference',
     $tableAlias: 'Can\'t refer to source elements of table alias $(ID)',
@@ -1219,11 +1238,13 @@ const centralMessageTexts = {
   'type-invalid-cast': {
     std: 'Can\'t cast to $(TYPE)',
     'to-structure': 'Can\'t cast to a structured type',
+    'to-inline-structure': 'Can\'t cast to a structure',
     'from-structure':  'Structured elements can\'t be cast to a different type',
     'expr-to-structure': 'Can\'t cast an expression to a structured type',
     'val-to-structure': 'Can\'t cast $(VALUE) to a structured type',
     'from-assoc': 'Invalid type cast on an association',
     assoc: 'Can\'t cast to an association',
+    expand:  'Expands can\'t have a type cast', // TODO: Improve
   },
 
   // -----------------------------------------------------------------------------------
@@ -1252,7 +1273,17 @@ const centralMessageTexts = {
     publishingFilter: 'Can\'t publish managed association $(ID) with filter, as it must have at least one foreign key',
   },
 
-  // tenenat isolation via discriminator column:
+  'expr-invalid-expansion': {
+    std: 'Path $(NAME) in expression $(VALUE) can\'t be expanded',
+    'path-mismatch': 'Missing sub path $(NAME) in $(ALIAS) for tuple expansion of $(VALUE); both sides must expand to the same sub paths',
+    'non-scalar': 'Path $(NAME) in expression $(VALUE) can\'t be expanded as it does not contain any scalar element',
+  },
+  'expr-unsupported-expansion': {
+    std: 'Unsupported $(ELEMREF) in structural expression $(VALUE)',
+    scalarRef: 'Unsupported scalar reference $(ELEMREF) in structural expression $(VALUE)',
+  },
+
+  // tenant isolation via discriminator column:
   'tenant-invalid-alias-name': {
     std: 'Can\'t have a table alias named $(NAME) in a tenant-dependent entity',
     implicit: 'Provide an explicit table alias name; do not use $(NAME)',

package/lib/base/messages.js

@@ -911,14 +911,20 @@ function transformElementRef( arg ) {
   if (!ref)
     return quoted( arg );
   // Can be used by CSN backends or compiler to create a simple path such as E:elem
-  return quoted(
-    ((arg.scope === 'param' || arg.param) ? ':' : '') +
+  return quoted( pathToMessageString( arg ) );
+}
+
+function pathToMessageString( arg ) {
+  const ref = arg?.ref || arg?.path || arg; // support CSN and XSN
+  if (!ref)
+    return null;
+
+  return ((arg.scope === 'param' || arg.param) ? ':' : '') +
     ref.map(
       item => (typeof item !== 'string'
         ? `${ item.id }${ item.args ? '(…)' : '' }${ item.where ? '[…]' : '' }`
         : item)
-    ).join('.')
-  );
+    ).join('.');
 }
 
 function transformArg( arg, r, args, texts ) {
@@ -1329,8 +1335,8 @@ function compareMessage( a, b ) {
   const aFile = a.$location && a.$location.file;
   const bFile = b.$location && b.$location.file;
   if (aFile && bFile) {
-    const aEnd = a.$location.endLine && a.$location.endCol && a.$location || { endLine: Number.MAX_SAFE_INTEGER, endCol: Number.MAX_SAFE_INTEGER }; // eslint-disable-line @stylistic/js/max-len
-    const bEnd = b.$location.endLine && b.$location.endCol && b.$location || { endLine: Number.MAX_SAFE_INTEGER, endCol: Number.MAX_SAFE_INTEGER }; // eslint-disable-line @stylistic/js/max-len
+    const aEnd = a.$location.endLine && a.$location.endCol && a.$location || { endLine: Number.MAX_SAFE_INTEGER, endCol: Number.MAX_SAFE_INTEGER }; // eslint-disable-line @stylistic/max-len
+    const bEnd = b.$location.endLine && b.$location.endCol && b.$location || { endLine: Number.MAX_SAFE_INTEGER, endCol: Number.MAX_SAFE_INTEGER }; // eslint-disable-line @stylistic/max-len
     return ( c( aFile, bFile ) ||
              c( a.$location.line, b.$location.line ) ||
              c( a.$location.col, b.$location.col ) ||
@@ -1958,4 +1964,5 @@ module.exports = {
   // for tests only
   constructSemanticLocationFromCsnPath,
   homeName,
+  pathToMessageString,
 };

package/lib/base/model.js

@@ -26,9 +26,9 @@ const availableBetaFlags = {
   calcAssoc: true,
   temporalRawProjection: true,
   v7preview: true,
-  draftMessages: true,
   rewriteAnnotationExpressionsViaType: true,
   sqlServiceDummies: true,
+  projectionViews: true,
   // disabled by --beta-mode
   nestedServices: false,
 };

package/lib/base/optionProcessorHelper.js

@@ -71,8 +71,9 @@ function createOptionProcessor() {
   /**
    * API: Define a command
    * @param {string} cmdString Command name, short and long form, e.g. 'S, toSql'
+   * @param {object} [cmdOptions] Optional options, e.g. `aliases`.
    */
-  function command( cmdString ) {
+  function command( cmdString, cmdOptions = null ) {
     /** @type {object} */
     const cmd = {
       options: {},
@@ -83,6 +84,7 @@ function createOptionProcessor() {
         return cmd;
       },
       help: commandHelp,
+      aliases: cmdOptions?.aliases,
       ..._parseCommandString(cmdString),
     };
     if (optionProcessor.commands[cmd.longName])
@@ -96,6 +98,10 @@ function createOptionProcessor() {
 
       optionProcessor.commands[cmd.shortName] = cmd;
     }
+
+    for (const alias of cmdOptions?.aliases ?? [])
+      optionProcessor.commands[alias] = cmd;
+
     return cmd;
 
     // Command API: Define a command option
@@ -400,7 +406,6 @@ function createOptionProcessor() {
       else
         result.errors.push(errorMsg);
     }
-
     return result;
 
     /**

package/lib/checks/assocOutsideService.js

@@ -1,42 +1,29 @@
 'use strict';
 
+// Only to be used with validator.js - a correct this value needs to be provided!
+const { forEachMemberRecursively } = require('../model/csnUtils');
+
 /**
  * Asserts that there is no association usage outside of the specified service.
  * We do not check in type-ofs - we resolve them, so they are not a problem.
  *
- * @param {object} parent - The parent object in the CSN (Core Schema Notation).
- * @param {string} prop - The property name of the parent object.
- * @param {object} ref - The reference object.
- * @param {Array} path - The path array indicating the location in the CSN.
- * @param {object} grandparent - The grandparent object in the CSN.
- * @param {string} parentProp - The property name of the grandparent object.
+ * @param {CSN.Artifact} artifact Artifact to validate
+ * @param {string} artifactName Name of the artifact
  */
-function assertNoAssocUsageOutsideOfService( parent, prop, ref, path, grandparent, parentProp ) {
-  const artifactName = path[1];
-  if (parentProp === 'type')
-    return;
-
-  if (this.csn.definitions[this.options.effectiveServiceName]?.kind !== 'service' ||
-      !artifactName.startsWith(`${ this.options.effectiveServiceName }.`))
-    return;
-
-  const { _links } = parent;
-  // session variables can't have assoc steps, _links of 1 can't have assoc steps
-  // TODO: (typeof parentProp === 'number' && path[path.length - 2] === 'on') - ignore on-conditions, as they are cut off anyway
-  if (parent.$scope === '$magic' || _links?.length <= 1 )
+function assertNoAssocUsageOutsideOfService( artifact, artifactName ) {
+  if (artifact.kind !== 'entity' || this.csn.definitions[this.options.effectiveServiceName]?.kind !== 'service' ||
+    !artifactName.startsWith(`${ this.options.effectiveServiceName }.`))
     return;
 
-  for (let i = 0; i < _links.length - 1; i++) {
-    const { art } = _links[i];
-    if (art.target && !art.target.startsWith(`${ this.options.effectiveServiceName }.`)) {
-      this.error('assoc-invalid-outside-service', path.concat('ref', i),
-                 { name: this.options.effectiveServiceName, id: ref[i].id || ref[i] },
-                 'Association $(ID) pointing outside of service $(NAME) must not be used');
-      return;
-    }
+  if (artifact.kind === 'entity' && (artifact.query || artifact.projection)) {
+    forEachMemberRecursively(artifact, (element, elementName, prop, path) => {
+      if (element && element.target && !element.target.startsWith(`${ this.options.effectiveServiceName }.`)) {
+        this.error('assoc-invalid-outside-service', path,
+                   { name: this.options.effectiveServiceName, id: elementName },
+                   'Association $(ID) pointing outside of service $(NAME) must not be published');
+      }
+    }, [ 'definitions', artifactName ], true, { elementsOnly: true });
   }
 }
 
-module.exports = {
-  ref: assertNoAssocUsageOutsideOfService,
-};
+module.exports = assertNoAssocUsageOutsideOfService;

package/lib/checks/checkForTypes.js

@@ -18,22 +18,6 @@ function checkForHanaTypes( parent, name, type, path ) {
   }
 }
 
-/**
- * Check that `cds.UInt8` is not used - we don't have a clear idea how to represent it on postgres and h2
- *
- * @param {object} parent Object with a type
- * @param {string} name Name of the type property on parent
- * @param {Array} type type to check
- * @param {CSN.Path} path
- */
-function CheckForUInt8( parent, name, type, path ) {
-  const artifact = this.csn.definitions[path[1]];
-  if (artifact.kind === 'entity' && isPersistedOnDatabase(artifact) && parent.type === 'cds.UInt8') {
-    this.error('ref-unexpected-type', [ ...path, 'type' ], { type: 'cds.UInt8', value: this.options.sqlDialect },
-               'Type $(TYPE) can\'t be used with sqlDialect $(VALUE)');
-  }
-}
-
 /**
  * Check types - specifically for postgres and h2
  *
@@ -44,8 +28,6 @@ function CheckForUInt8( parent, name, type, path ) {
  */
 function checkTypes( parent, name, type, path ) {
   checkForHanaTypes.bind(this)(parent, name, type, path);
-  if (this.options.sqlDialect === 'postgres' || this.options.sqlDialect === 'h2')
-    CheckForUInt8.bind(this)(parent, name, type, path);
 }
 
 module.exports = {

package/lib/checks/checkPathsInStoredCalcElement.js

@@ -56,8 +56,9 @@ function _checkPathsInStoredCalcElement( parent, value, csnPath ) {
       else {
         // It's a managed association - access of the foreign keys is allowed
         requireForeignKeyAccess(parent, i, (errorIndex) => {
+          const variant = errorIndex >= value.length ? 'calc-missing' : 'calc-non-fk';
           this.error('ref-unexpected-navigation', csnPath, {
-            '#': 'calc-non-fk', id, elemref: parent, name: value[errorIndex].id || value[errorIndex],
+            '#': variant, id, elemref: parent, name: value[errorIndex]?.id || value[errorIndex],
           });
           hasPathError = true;
         });

package/lib/checks/featureFlags.js

@@ -2,7 +2,7 @@
 
 const { setProp } = require('../base/model');
 const { featureFlags } = require('../transform/featureFlags');
-const { isSqlService, isDummyService } = require('../transform/db/processSqlServices');
+const { isSqlService, isDummyService, isDataProductService } = require('../transform/db/processSqlServices');
 
 /**
  *
@@ -32,5 +32,8 @@ module.exports = {
 
     if (isDummyService(artifact, this.options))
       setFeatureFlag( '$dummyService' ).call(this);
+
+    if (isDataProductService(artifact, this.options))
+      setFeatureFlag( '$dataProductService' ).call(this);
   },
 };

package/lib/checks/onConditions.js

@@ -135,7 +135,7 @@ function validateOnCondition( member, memberName, property, path ) {
               ((type.target && type.keys || type.elements) && validStructuredElement ||
               (type.target && validDollarSelf)) && !type.virtual
             ) {
-              // Do nothing - handled by lib/checks/nonexpandableStructured.js
+              // Do nothing - handled by tuple expansion
             }
             else if (type.items && !type.virtual) {
               this.error(null, onPath, { elemref: { ref } },
@@ -183,7 +183,7 @@ function requireForeignKeyAccess( parent, refIndex, noForeignKeyCallback ) {
       ref.splice(refIndex + 1, 1, ...resolved);
   }
 
-  const next = pathId(ref[refIndex + 1]);
+  const next = ref[refIndex + 1] && pathId(ref[refIndex + 1]);
   let possibleKeys = next && assoc.keys.filter(r => r.ref[0] === next);
   if (!possibleKeys || possibleKeys.length === 0) {
     noForeignKeyCallback(refIndex + 1);