@sap/cds-compiler 4.6.2 → 4.7.6

package/CHANGELOG.md

@@ -8,6 +8,52 @@ Note: `beta` fixes, changes and features are usually not listed in this ChangeLo
 The compiler behavior concerning `beta` features can change at any time without notice.
 
 
+## Version 4.7.6 - 2024-02-29
+
+### Fixed
+
+- OData: Restored compatibility with the Java runtime.
+  Drafts generation was applied twice.
+
+
+## Version 4.7.4 - 2024-02-27
+
+### Fixed
+
+- OData: Fixed infinite recursion in draft handling for nested recursive compositions.
+
+
+## Version 4.7.2 - 2024-02-26
+
+### Fixed
+
+- Restored compatibility with `@sap/cds-dk` for Java runtime
+
+
+## Version 4.7.0 - 2024-02-23
+
+### Added
+
+- compiler: Virtual elements can now be referenced in expressions in annotation
+
+### Changed
+
+- Update OData vocabularies: 'Authorization', 'Common', 'Hierarchy', 'UI'.
+- to.edm(x): `@cds.odata.valuelist` renders all non-key elements of the value help list as `ValueListProperty`.
+
+### Fixed
+
+- CDL parser: a `select` after two or more `(`s in an expression or condition
+  could cause some constructs in that query, such as `virtual`, to be not properly parsed.
+- compiler: published associations with filters sometimes had the filter applied twice
+  if used in inline aspect compositions
+- to.sql|hdi|hdbcds[.migration]:
+  + With `withHanaAssociations`: `false`, remove the association elements from the final CSN in order to correctly detect them during migration scenarios and
+  with generated `hdbcds`.
+  + Skip expensive processing (for calculated elements and nested projections) if the model doesn't use it.
+  + Don't greedily set alias on subqueries if not required.
+  + Remove bound actions and turn all non-database relevant artifacts into dummies to simplify and shrink CSN.
+
 ## Version 4.6.2 - 2024-02-02
 
 ### Fixed
@@ -15,6 +61,7 @@ The compiler behavior concerning `beta` features can change at any time without
 - compiler: Fix incorrect error about type properties if deprecated flag `ignoreSpecifiedQueryElements` is set.
 - Update OData vocabularies: 'Authorization', 'Common'.
 
+
 ## Version 4.6.0 - 2024-01-26
 
 ### Added

package/bin/cds_update_identifiers.js

@@ -32,6 +32,9 @@ const path = require('path');
 const cliArgs = process.argv.slice(2);
 const filepath = cliArgs[0];
 
+if (filepath === '--help' || filepath === '-h')
+  exitError();
+
 if (cliArgs.length !== 1)
   exitError(`Expected exactly one argument, ${cliArgs.length} given`);
 
@@ -123,10 +126,11 @@ function replaceSliceInSource( source, startIndex, endIndex, replaceWith ) {
 }
 
 /**
- * @param {string} msg
+ * @param {string} [msg]
  */
 function exitError( msg ) {
-  console.error(msg);
+  if (msg)
+    console.error(msg);
   usage();
   process.exit(1);
 }

package/bin/cdsc.js

@@ -559,7 +559,7 @@ function executeCommandLine( command, options, args ) {
     }
     else if (!options.parseOnly) { // no output if parseOnly but not rawOutput
       const csn = compactModel(xsn, options);
-      if (command === 'toCsn' && options.tenantAsColumn)
+      if (command === 'toCsn' && options.tenantDiscriminator)
         addTenantFields(csn, options);
       if (command === 'toCsn' && options.withLocalized)
         addLocalizationViews(csn, options);

package/doc/CHANGELOG_ARCHIVE.md

@@ -104,7 +104,7 @@ The compiler behaviour concerning `beta` features can change at any time without
 ### Added
 
 - Support arbitrary paths after `$user` - similar to `$session`.
-- Support scale `floating` and `variable` for `cds.Decimal` in CDL and CSN. Backend specific handling is descibed in their sections.
+- Support scale `floating` and `variable` for `cds.Decimal` in CDL and CSN. Backend specific handling is described in their sections.
 - Allow select item wildcard (`*`) in a `select`/`projection` at any position, not just the first.
 
 - to.edm(x):
@@ -585,7 +585,7 @@ synchronously.
   + Localized convenience views are no longer generated by the core compiler but added by the `for.odata`
     and `to.sql/hdi/hdbcds` processing on demand.
   + Minimize name clashes when calculating names for auto-exposed entities,
-    extends the v1 option `dependentAutoexposed` to sub artifacts of entites (see “Added”).
+    extends the v1 option `dependentAutoexposed` to sub artifacts of entities (see “Added”).
   + Ambiguities when redirecting associations now always lead to compile errors;
     you might want to use the new annotation `@cds.redirection.target` to solve them.
   + The association `up_` in the calculated entity for managed compositions is now managed.  
@@ -1046,7 +1046,7 @@ synchronously.
 
 - OData: Allow the relational comparison of structures or managed associations in an ON condition as described in
   version 1.32.0 - 2020-07-10 (forHana).
-- Allow `Struct:elem` with and without preceeding `type of` as type reference.
+- Allow `Struct:elem` with and without preceding `type of` as type reference.
 
 ### Fixed
 
@@ -2426,7 +2426,7 @@ Fixes
 
 Features
 * Allow entities to have parameters. They can be referred to inside the query with
-  `:Param`. Entites with parameters are not allowed in `toSql` for dialect "sqlite".
+  `:Param`. Entities with parameters are not allowed in `toSql` for dialect "sqlite".
   When generating for HANA, parameters cannot be used in combination with associations:
   an entity with parameters cannot have associations, and an association must not point
   to an entity with parameters.
@@ -2446,7 +2446,7 @@ Changes
   _The severity of these messages will be increased if implicit redirections
   will have been performed by the core compiler._
 * `toHana` and `toSql` now reject entities that only contain unmanaged associations.
-  Such entites would lead to a deployment error later.
+  Such entities would lead to a deployment error later.
 * SQL name mapping modes `quoted` and `hdbcds` are only allowed when generating for HANA.
 * In the csn, the csn language version is now stored in the top level attribute `$version`.
   The version information via `version.csn` is deprecated and will be removed in a future
@@ -2685,7 +2685,7 @@ Fixes
 ## Version 1.0.33
 
 Features
-* Allow to extend query entites with actions.
+* Allow to extend query entities with actions.
 * Allow `select distinct`.
 * With `--tnt-flavor` only: allow to specify (a restricted version of) service include via syntax.
 * (Work in progress): New option `{ dialect: 'hana'|'sqlite' }` for `toSql()`, allowing generation
@@ -2874,7 +2874,7 @@ Fixes
   recognized and led to the generation of incorrect HANA CDS models.
 * We now also allow query entities and their elements to use as type, relaxing
   a check introduces with v1.0.26.
-  It needs to be seen whether we allow entites as type only for actions.
+  It needs to be seen whether we allow entities as type only for actions.
 
 ## Version 1.0.27
 
@@ -2972,7 +2972,7 @@ Fixes
 
 Changes
 * The CSN element property `notNull` is not inherited anymore
-  if the `select`/`projection` items whose path refering the source element
+  if the `select`/`projection` items whose path referring the source element
   navigates along associations or compositions.
 * Annotation assignments which are placed after the name of `context` or `service` definitions
   must now use the `@(...)` syntax variant if a value is supplied,
@@ -3197,7 +3197,7 @@ Features
 
 Fixes
 * Views are now rendered as EntitySet/EntityType in edmx
-* Abstract entites do not appear as EntitySet/EntityType in the generated edmx
+* Abstract entities do not appear as EntitySet/EntityType in the generated edmx
 * `--to-hana` now correctly handles type casts in view definitions
 * In the generated edmx for OData V2, inside a `ReferentialConstraint`, the elements `Dependent` and `Principal` now have the correct order
 * Remove attribute `nullable` for function import parameters in edmx generation for OData V2

package/doc/CHANGELOG_BETA.md

@@ -8,6 +8,12 @@ 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 4.x.x - 2024-mm-dd
+
+### Added `v5preview`
+
+Sneak preview into incompatible changes that are about to be shipped with compiler version 5.
+
 ## Version 4.6.0 - 2024-01-26
 
 ### Added `vectorType`

package/lib/api/main.js

@@ -23,10 +23,11 @@ const toHdbcds = lazyload('../render/toHdbcds');
 const baseError = lazyload('../base/error');
 const csnToEdm = lazyload('../edm/csn2edm');
 const trace = lazyload('./trace');
+const cloneCsn = lazyload('../model/cloneCsn');
 
 const { forEach, forEachKey } = require('../utils/objectUtils');
-const { checkRemovedDeprecatedFlags } = require('../base/model');
 const { makeMessageFunction } = require('../base/messages');
+const { sortCsnForTests } = require('../model/cloneCsn');
 
 /**
  * Return the artifact name for use for the hdbresult object
@@ -138,7 +139,8 @@ function isPreTransformed( csn, transformation ) {
  */
 function odataInternal( csn, internalOptions, messageFunctions ) {
   internalOptions.transformation = 'odata';
-  const oDataCsn = forOdataNew.transform4odataWithCsn(csn, internalOptions, messageFunctions);
+  let oDataCsn = forOdataNew.transform4odataWithCsn(csn, internalOptions, messageFunctions);
+  oDataCsn = sortCsnForTests(oDataCsn, internalOptions);
   messageFunctions.setModel(oDataCsn);
   attachTransformerCharacteristics(oDataCsn, 'odata', internalOptions, relevantOdataOptions, warnAboutMismatchOdata);
   return oDataCsn;
@@ -187,7 +189,7 @@ function csnForSql( csn, internalOptions, messageFunctions ) {
   const transformedCsn = forRelationalDB.transformForRelationalDBWithCsn(
     csn, internalOptions, messageFunctions
   );
-  return internalOptions.testMode ? toCsn.sortCsn(transformedCsn, internalOptions) : transformedCsn;
+  return cloneCsn.sortCsnForTests(transformedCsn, internalOptions);
 }
 
 /**
@@ -202,7 +204,7 @@ function csnForSql( csn, internalOptions, messageFunctions ) {
  */
 function forSql( csn, options, messageFunctions ) {
   const internalOptions = prepareOptions.to.sql(options);
-  return csnForSql(csn, internalOptions, messageFunctions);
+  return csnForSql(csn, internalOptions, messageFunctions); // already sorted for test mode
 }
 
 /**
@@ -220,7 +222,7 @@ function forHdi( csn, options, messageFunctions ) {
   const transformedCsn = forRelationalDB.transformForRelationalDBWithCsn(
     csn, internalOptions, messageFunctions
   );
-  return internalOptions.testMode ? toCsn.sortCsn(transformedCsn, internalOptions) : transformedCsn;
+  return cloneCsn.sortCsnForTests(transformedCsn, internalOptions);
 }
 /**
  * Transform a CSN like to.hdbcds
@@ -237,7 +239,7 @@ function forHdbcds( csn, options, messageFunctions ) {
   const hanaCsn = forRelationalDB.transformForRelationalDBWithCsn(
     csn, internalOptions, messageFunctions
   );
-  return internalOptions.testMode ? toCsn.sortCsn(hanaCsn, internalOptions) : hanaCsn;
+  return cloneCsn.sortCsnForTests(hanaCsn, internalOptions);
 }
 
 /**
@@ -252,9 +254,17 @@ function forHdbcds( csn, options, messageFunctions ) {
 function forEffective( csn, options, messageFunctions ) {
   const internalOptions = prepareOptions.to.sql(options);
   internalOptions.transformation = 'effective';
+  if (options.tenantDiscriminator) {
+    messageFunctions.error('api-invalid-option', null, {
+      '#': 'forbidden',
+      option: 'tenantDiscriminator',
+      module: 'for.effective',
+    });
+    messageFunctions.throwWithAnyError();
+  }
 
   const eCsn = effective.effectiveCsn(csn, internalOptions, messageFunctions);
-  return internalOptions.testMode ? toCsn.sortCsn(eCsn, internalOptions) : eCsn;
+  return cloneCsn.sortCsnForTests(eCsn, internalOptions);
 }
 
 /**
@@ -270,6 +280,8 @@ function sql( csn, options, messageFunctions ) {
   const internalOptions = prepareOptions.to.sql(options);
   internalOptions.transformation = 'sql';
 
+  handleTenantDiscriminator(options, internalOptions, messageFunctions);
+
   // we need the CSN for view sorting
   const transformedCsn = csnForSql(csn, internalOptions, messageFunctions);
   messageFunctions.setModel(transformedCsn);
@@ -294,6 +306,8 @@ function hdi( csn, options, messageFunctions ) {
   trace.traceApi('to.hdi', options);
   const internalOptions = prepareOptions.to.hdi(options);
 
+  handleTenantDiscriminator(options, internalOptions, messageFunctions);
+
   // we need the CSN for view sorting
   const sqlCSN = forHdi(csn, options, messageFunctions);
   messageFunctions.setModel(sqlCSN);
@@ -398,6 +412,7 @@ function remapName( key, csn, filter = () => true ) {
 function sqlMigration( csn, options, messageFunctions, beforeImage ) {
   trace.traceApi('to.sql.migration', options);
   const internalOptions = prepareOptions.to.sql(options);
+  handleTenantDiscriminator(options, internalOptions, messageFunctions);
   const { error, throwWithError } = messageFunctions;
 
   // Prepare after-image.
@@ -550,6 +565,7 @@ function sqlMigration( csn, options, messageFunctions, beforeImage ) {
 function hdiMigration( csn, options, messageFunctions, beforeImage ) {
   trace.traceApi('to.hdi.migration', options);
   const internalOptions = prepareOptions.to.hdi(options);
+  handleTenantDiscriminator(options, internalOptions, messageFunctions);
 
   // Prepare after-image.
   const afterImage = forHdi(csn, options, messageFunctions);
@@ -639,6 +655,15 @@ function hdbcds( csn, options, messageFunctions ) {
   const internalOptions = prepareOptions.to.hdbcds(options);
   internalOptions.transformation = 'hdbcds';
 
+  if (options.tenantDiscriminator) {
+    messageFunctions.error('api-invalid-option', null, {
+      '#': 'forbidden',
+      option: 'tenantDiscriminator',
+      module: 'to.hdbcds',
+    });
+    messageFunctions.throwWithAnyError();
+  }
+
   const hanaCsn = forHdbcds(csn, internalOptions, messageFunctions);
   messageFunctions.setModel(hanaCsn);
   const result = toHdbcds.toHdbcdsSource(hanaCsn, internalOptions, messageFunctions);
@@ -838,7 +863,6 @@ odata2.all = odataall;
  * @param {object} messageFunctions Message functions such as `error()`, `info()`, …
  * @returns {object} { <protocol>: { <serviceName>: { edmx: <XML representation>, edm: <JSON representation> } } }
  */
-// @ts-ignore
 function odataall( csn, options = {}, messageFunctions ) {
   trace.traceApi('to.odata.all', options);
   const internalOptions = prepareOptions.to.odata(options);
@@ -1028,7 +1052,7 @@ function publishCsnProcessor( processor, _name ) {
     try {
       const messageFunctions = messages.makeMessageFunction(csn, options, _name);
       if (options.deprecated)
-        checkRemovedDeprecatedFlags( options, messageFunctions );
+        baseModel.checkRemovedDeprecatedFlags( options, messageFunctions );
 
       checkOutdatedOptions( options, messageFunctions );
       csn = ensureClientCsn( csn, options, messageFunctions, _name );
@@ -1195,6 +1219,29 @@ function lazyload( moduleName ) {
   });
 }
 
+/**
+ * Error when tenantDiscriminator and withHanaAssociations is set by the user.
+ *
+ * Set withHanaAssociations to false when tenantDiscriminator is used.
+ *
+ * @param {object} options Options set by the user
+ * @param {object} internalOptions Options clone after we processed it
+ * @param {object} messageFunctions Message functions
+ */
+function handleTenantDiscriminator( options, internalOptions, messageFunctions ) {
+  if (options.tenantDiscriminator && options.withHanaAssociations) {
+    messageFunctions.error('api-invalid-combination', null, {
+      option: 'tenantDiscriminator',
+      prop: 'withHanaAssociations',
+    });
+
+    messageFunctions.throwWithAnyError();
+  }
+  else if (internalOptions.tenantDiscriminator) {
+    internalOptions.withHanaAssociations = false;
+  }
+}
+
 
 /**
  * Option format used by the old API, where they are grouped thematically.

package/lib/api/options.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { validate, generateStringValidator } = require('./validate');
+const { makeMessageFunction } = require('../base/messages');
 
 // TODO: there should be just one place where the options are defined with
 // their types (not also in validate.js or whatever).
@@ -67,7 +68,7 @@ const privateOptions = [
   'noRecompile',
   'internalMsg',
   'disableHanaComments',      // in case of issues with hana comment rendering
-  'tenantAsColumn',           // not published yet
+  'tenantDiscriminator',      // not published yet
   'localizedWithoutCoalesce', // deprecated version of 'localizedLanguageFallback', TODO(v5): Remove option
 ];
 
@@ -104,14 +105,16 @@ function translateOptions( input = {}, defaults = {}, hardRequire = {},
 
   // Validate the filtered input options
   // only "new-style" options are here
+  const messageFunctions = makeMessageFunction(null, options, moduleName);
   validate(options,
-           moduleName,
+           messageFunctions,
            // TODO: is there a better place to specify the type of option values?
            Object.assign( {
              localizedLanguageFallback: generateStringValidator([ 'none', 'coalesce' ]),
              sqlChangeMode: generateStringValidator([ 'alter', 'drop' ]),
            }, customValidators ),
-           combinationValidators);
+           combinationValidators,
+           moduleName);
 
   // Overwrite with the hardRequire options - like src: sql in to.sql()
   Object.assign(options, hardRequire);

package/lib/api/validate.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const { makeMessageFunction } = require('../base/messages');
 const { forEach } = require('../utils/objectUtils');
 
 /* eslint-disable arrow-body-style */
@@ -128,6 +127,7 @@ const validators = {
     found: val => (typeof val === 'string' ? val : `type ${ typeof val }`),
   },
   assertIntegrityType: generateStringValidator([ 'DB', 'RT' ]),
+  tenantDiscriminator: { validate: () => true }, // do it ourselves
 };
 
 // Note: if `validate()` returns true, it means the option is _invalid_!
@@ -152,47 +152,38 @@ const allCombinationValidators = {
 
 const alwaysRunValidators = [ 'beta-no-test', 'sql-dialect-and-localized' ];
 
-/* eslint-disable jsdoc/no-undefined-types */
 /**
  * Run the validations for each option.
  * Use a custom validator or "default" custom validator, fallback to Boolean validator.
  *
  * @param {object} options Flat options object to validate
- * @param {string} moduleName The called module, e.g. 'for.odata', 'to.hdi'. Needed to initialize the message functions
+ * @param {object} messageFunctions Message functions such as `error()`, `info()`, …
  * @param {object} [customValidators] Map of custom validators to use
  * @param {string[]} [combinationValidators] Validate option combinations
  * @returns {void}
  * @throws {CompilationError} Throws in case of invalid option usage
  */
-function validate( options, moduleName, customValidators = {}, combinationValidators = [] ) {
-  // TODO: issuing messages in this function looks very strange...
-  {
-    const messageCollector = { messages: [] };
-    const { error, throwWithAnyError } = makeMessageFunction(null, messageCollector, moduleName);
-
-    forEach(options, (optionName, optionValue) => {
-      const validator = customValidators[optionName] || validators[optionName] || booleanValidator;
-
-      if (!validator.validate(optionValue)) {
-        error('api-invalid-option', null, {
-          '#': 'value',
-          prop: optionName,
-          value: validator.expected(optionValue),
-          othervalue: validator.found(optionValue),
-        });
-      }
-    });
-    throwWithAnyError();
-  }
-
-  const message = makeMessageFunction(null, options, moduleName);
+function validate( options, messageFunctions, customValidators = {}, combinationValidators = [] ) {
+  const { error, throwWithError } = messageFunctions;
+
+  forEach(options, (optionName, optionValue) => {
+    const validator = customValidators[optionName] || validators[optionName] || booleanValidator;
+
+    if (!validator.validate(optionValue)) {
+      error('api-invalid-option', null, {
+        '#': 'value',
+        prop: optionName,
+        value: validator.expected(optionValue),
+        othervalue: validator.found(optionValue),
+      });
+    }
+  });
+  throwWithError();
 
   for (const combinationValidatorName of combinationValidators.concat(alwaysRunValidators))
-    allCombinationValidators[combinationValidatorName](options, message);
-
-  message.throwWithAnyError();
+    allCombinationValidators[combinationValidatorName](options, messageFunctions);
+  throwWithError();
 }
-/* eslint-enable jsdoc/no-undefined-types */
 
 
 module.exports = { validate, generateStringValidator };

package/lib/base/message-registry.js

@@ -234,7 +234,9 @@ const centralMessageTexts = {
     deprecated: 'Option $(NAME) is no longer supported! Use latest API options instead',
     magicVars: 'Option $(PROP) is no longer supported! Use $(OTHERPROP) instead. See <https://cap.cloud.sap/docs/guides/databases#configuring-variables> for details',
     value: 'Expected option $(PROP) to have $(VALUE). Found: $(OTHERVALUE)',
+    value2: 'Expected option $(OPTION) to have value $(VALUE) or $(RAWVALUE); found: $(OTHERVALUE)',
     type: 'Expected option $(OPTION) to be of type $(VALUE). Found: $(OTHERVALUE)',
+    forbidden: 'Option $(OPTION) can\'t be used with API function $(MODULE)'
   },
 
   'api-invalid-variable-replacement': {
@@ -674,6 +676,7 @@ const centralMessageTexts = {
     std:  'Rewriting the ON-condition not supported here', // unused: merge with 'rewrite-not-supported'
     'sub-element': 'Rewriting the ON-condition of unmanaged association in sub element is not supported'
   },
+  'rewrite-undefined-key': 'Expected element $(ID) to be available in $(TARGET), as it is required to match the foreign key of $(NAME)',
 
   'type-unexpected-typeof': {
     std: 'Unexpected $(KEYWORD) for the type reference here',
@@ -854,6 +857,7 @@ const centralMessageTexts = {
   'ref-invalid-include': {
     std: 'A type, entity, aspect or event with direct elements is expected here',
     bare : 'An aspect without elements is expected here',
+    param: 'A type, entity, aspect or event without parameters is expected here',
   },
   'ref-invalid-type': {
     std: 'A type or an element is expected here',
@@ -894,8 +898,8 @@ const centralMessageTexts = {
   },
 
   'query-undefined-element': {
-    std: 'Element $(ID) has not been found in the elements of the query',
-    redirected: 'Element $(ID) has not been found in the elements of the query; please use REDIRECTED TO with an explicit ON-condition',
+    std: 'Target $(TARGET) of $(NAME) is missing element $(ID); please use $(KEYWORD) with an explicit ON-condition',
+    redirected: 'Target $(TARGET) of $(NAME) is missing element $(ID); please add an ON-condition to $(KEYWORD)',
   },
   'query-unexpected-assoc-hdbcds': 'Publishing a managed association in a view is not possible for “hdbcds” naming mode',
   'query-unexpected-structure-hdbcds': 'Publishing a structured element in a view is not possible for “hdbcds” naming mode',
@@ -1136,7 +1140,27 @@ const centralMessageTexts = {
     'wrongval': 'Unexpected value for $(OP) in $(ANNO)',
     'wrongval_meta': 'Expected value for $(OP) to be a $(META) in $(ANNO)',
     'wrongval_meta_list': 'Expected value for $(OP) to be a $(META) or $(RAWVALUES) in $(ANNO)',
-  }
+  },
+  'odata-anno-xpr-ref': {
+    'std': '$(ANNO) can\'t be propagated to $(NAME) because path $(ELEMREF) is not resolvable via type reference $(CODE)',
+    'flatten_builtin': 'Expected path $(ELEMREF) in $(ANNO) to resolve to a builtin type while flattening $(NAME)',
+    'notaparam': 'Unexpected path $(ELEMREF) for parameter entity in $(ANNO)',
+    'notaneelement': 'Unexpected path $(ELEMREF) for type entity in $(ANNO)'
+  },
+  // tenenat 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)',
+    mixin: 'Can\'t define a mixin named $(NAME) in a tenant-dependent entity',
+  },
+  'tenant-invalid-composition': {
+    std: 'Can\'t define a composition of a tenant-independent entity $(TARGET) in a tenant-dependent entity',
+    type: 'Can\'t use type $(TYPE) with a composition of a tenant-independent entity in a tenant-dependent entity',
+  },
+  'tenant-invalid-target': {
+    std: 'Can\'t define an association to a tenant-dependent entity $(TARGET) in a tenant-independent entity',
+    type: 'Can\'t use type $(TYPE) with an association to a tenant-dependent entity in a tenant-independent entity',
+  },
   // -----------------------------------------------------------------------------------
   // OData Message section ends here, no messages below this line
   // -----------------------------------------------------------------------------------

package/lib/base/messages.js

@@ -814,6 +814,7 @@ function transformElementRef( arg ) {
     return quoted( arg );
   // Can be used by CSN backends or compiler to create a simple path such as E:elem
   return quoted(
+    (arg.param ? ':' : '') +
     ref.map(
       item => (typeof item !== 'string'
                ? `${ item.id }${item.args ? '(…)' : ''}${item.where ? '[…]' : ''}`
@@ -833,8 +834,8 @@ function transformArg( arg, r, args, texts ) {
   if (arg.ref) {
     // Can be used by CSN backends to create a simple path such as E:elem
     if (arg.ref.length > 1)
-      return quoted(`${ arg.ref[0] }:${ arg.ref.slice(1).join('.') }`);
-    return quoted(arg.ref);
+      return quoted(`${ pathId(arg.ref[0]) }:${ arg.ref.slice(1).map(pathId).join('.') }`);
+    return quoted(pathId(arg.ref[0]));
   }
   if (!arg.name)
     return quoted( arg.name );
@@ -848,6 +849,10 @@ function transformArg( arg, r, args, texts ) {
   return artName( arg, prop );
 }
 
+function pathId( item ) {
+  return (typeof item === 'string') ? item : item.id;
+}
+
 // TODO: very likely delete this function
 function searchName( art, id, variant ) {
   if (!variant) {
@@ -1479,7 +1484,7 @@ function constructSemanticLocationFromCsnPath( model, options, csnPath ) {
 
   let result = '';
   const csnDictionaries = [
-    'args', 'params', 'enum', 'mixin', 'elements', 'actions', 'definitions',
+    'args', 'params', 'enum', 'mixin', 'elements', 'actions', 'definitions', 'vocabularies',
   ];
   // Properties that (currently) end the semantic location.
   const queryPropsLast = [ 'where', 'groupBy', 'having', 'orderBy', 'limit', 'offset' ];

package/lib/base/model.js

@@ -27,6 +27,7 @@ const queryOps = {
 const availableBetaFlags = {
   // enabled by --beta-mode
   annotationExpressions: true,
+  odataPathsInAnnotationExpressions: true,
   odataAnnotationExpressions: true,
   assocsWithParams: true, // beta, because runtimes don't support it, yet.
   hanaAssocRealCardinality: true,
@@ -39,6 +40,7 @@ const availableBetaFlags = {
   tenantVariable: true,
   calcAssoc: true,
   vectorType: true,
+  v5preview: true,
   // disabled by --beta-mode
   nestedServices: false,
 };

package/lib/checks/dbFeatureFlags.js

@@ -0,0 +1,28 @@
+'use strict';
+
+const { setProp } = require('../base/model');
+const { featureFlags } = require('../transform/db/featureFlags');
+
+/**
+ *
+ * @param {string} flag
+ *
+ * @returns {Function} Function to correctly set the given flag
+ */
+function setFeatureFlag( flag ) {
+  return function setFlag() {
+    if (!this.csn.meta)
+      setProp(this.csn, 'meta', {});
+    if (!this.csn.meta[featureFlags])
+      this.csn.meta[featureFlags] = {};
+
+    this.csn.meta[featureFlags][flag] = true;
+  };
+}
+
+// Export a applyTransformations callback object that sets the feature flags if certain properties are present
+module.exports = {
+  value: setFeatureFlag('$calculatedElements'),
+  expand: setFeatureFlag('$expandInline'),
+  inline: setFeatureFlag('$expandInline'),
+};