@sap/cds-compiler 6.3.6 → 6.4.6

package/CHANGELOG.md

@@ -4,9 +4,69 @@
 <!-- markdownlint-disable MD004 -->
 <!-- (no-duplicate-heading)-->
 
-Note: `beta` fixes, changes and features are usually not listed in this ChangeLog
-but in [doc/CHANGELOG_BETA.md](doc/CHANGELOG_BETA.md).
-The compiler behavior concerning `beta` features can change at any time without notice.
+Note: while we list new `beta` flags and their removal in this ChangeLog,
+we might not list every change in its behavior here.
+Productive code should never require a `beta` flag to be set, and
+might use a deprecated flag only for a limited period of time.
+
+## Version 6.4.6 - 2025-10-23
+
+### Fixed
+
+- compiler: a references to an element of the target in a filter for associations
+  inside an annotation expression does not lead to a compiler message requesting
+  users to provide the annotation themselves (regression with v6.4.4)
+
+## Version 6.4.4 - 2025-10-15
+
+### Fixed
+
+- compiler:
+  + properly rewrite references in arguments of associations in annotation expressions
+  + a references to a variable (`$user.id`, …) in a filter of an annotation expression
+    does not lead to a compiler message requesting users to provide the annotation themselves
+  + improve code completion in annotation expressions: the editor can display valid names
+    for references even if the expression does not properly end by `)`
+- to.sql:
+  + reject `$self` in infix filter following exists predicate instead of just ignoring the filter expression
+  + properly add comparison for the `tenant` discriminator to the `join` condition of `localized` views
+    if the non-published option for tenant support is set (regression with v6.4.0)
+
+### Removed
+
+## Version 6.4.2 - 2025-10-07
+
+### Fixed
+
+- parser:
+  + improve error recovery with empty expression as annotation value
+  + avoid clutter in message text for syntax errors: use `‹Value›` instead of listing value tokens
+- compiler: fix suppression of warnings when annotating backend-generated things
+  like draft entities or localized convenience views
+- to.sql|hdi|hdbcds: don’t report unjustified errors when projecting structured elements and
+  calculated elements had been used (regression with v6.4.0)
+
+## Version 6.4.0 - 2025-09-26
+
+### Added
+
+- compiler: `annotate … with @extension.code: [..., 'additional code']` even works
+  if no value for that annotation has been provided with the base definition.
+- to.sql: Calculated elements can now be used next to (but not in) nested projections.
+- to.edm(x): The `@cds.api.ignore` annotation can now be applied to actions, functions, and their parameters.
+
+### Changed
+
+- to.sql:
+  + generation of localized convenience views now use the ON-condition of the `localized` element
+    to create the FROM clause.
+
+### Fixed
+
+- parser: minor improvements in error reporting and error recovery
+- to.sql:
+  + columns selecting variables did not always get a column alias.
+  + when excluding a structure, the SQL backend incorrectly emits `wildcard-excluding-one`.
 
 ## Version 6.3.6 - 2025-09-19
 
@@ -205,6 +265,19 @@ The compiler behavior concerning `beta` features can change at any time without
 
 - for.odata/to.edm(x):
   + Annotating the generated `DraftAdministrativeData` artifacts and their elements is now supported.
+- beta flag `v7preview`: if set, the compiler reports those issues as errors
+  which we consider severe enough to report as error with the v7 release.
+- new deprecated flags:
+  + If the deprecated flag `noQuasiVirtualAssocs` is set, managed to-many associations
+    will get foreign keys as they got in compiler v5.  If not set, managed to-many associations
+    without explicit foreign keys don't get `keys` anymore in  cds-compiler v6.
+  + If the deprecated flag `noCompositionIncludes` is set, generated entities for compositions
+    of named aspect will not get an `includes` property.
+  + If the deprecated flag `noPersistenceJournalForGeneratedEntities` is set,
+    `@cds.persistence.journal` will _not_ be propagated to generated entities,
+    including generated `.texts` entities for localized entities, nor generated entities
+    for managed compositions of aspects. If not set, this annotation is copied to those entities
+    in compiler v6.
 
 ### Removed
 
@@ -213,11 +286,28 @@ The compiler behavior concerning `beta` features can change at any time without
   + v5 deprecated flags are removed, see [CHANGELOG_DEPRECATED.md](doc/CHANGELOG_DEPRECATED.md).
   + Option `compositionIncludes` is removed, as its default is `true`; instead, a deprecated flag was added.
 - to.hdbcds: The HDBCDS backend is deprecated and can no longer be invoked.
+- beta feature `v6preview`
+- deprecated flags `includesNonShadowedFirst`, `eagerPersistenceForGeneratedEntities` and
+  noKeyPropagationWithExpansions`
 
 ### Fixed
 
 - to.edm(x): Fixed crash for rare case if annotation expressions were used.
 
+## Version 5.9.12 - 2025-09-19
+
+### Fixed
+
+- to.sql: Topological ordering of views did not always account for subqueries (fixes regression from v5.9.0)
+
+## Version 5.9.10 - 2025-09-11
+
+### Fixed
+
+- parser: Keep parentheses around lists on the right side of an `in` operator.
+- compiler: For calculated elements using associations with filters and cardinality, CSN recompilation could
+            fail for `gensrc` CSN, as happens for MTX.
+
 ## Version 5.9.8 - 2025-07-14
 
 ### Fixed
@@ -310,6 +400,8 @@ The compiler behavior concerning `beta` features can change at any time without
   in parentheses such as `[ (1), (2) ]`, as well as "infinite" by using `[ _, _ ]`.
 - for.odata/to.edm(x)/for.seal: Propagate annotation expressions from managed associations
   to the foreign keys
+- beta feature `v6preview`: if set, the compiler reports those issues as errors
+  which we consider severe enough to report as error with the v6 release.
 
 ### Changed
 
@@ -482,6 +574,11 @@ The compiler behavior concerning `beta` features can change at any time without
 - CDL parser: Issue warning for arrayed parameter with default value.
 - to.cdl: Arrayed parameters with default values were not rendered correctly.
 
+### Removed
+
+- beta flag `optionalActionFunctionParameters`: in v5, action and function parameters
+  can be specified as optional without setting this beta flag.
+
 ## Version 5.2.0 - 2024-08-27
 
 ### Added
@@ -597,6 +694,7 @@ This is a preview version for the major release and contains breaking changes. I
 
 - API: Deprecated functions `preparedCsnToEdmx` and `preparedCsnToEdm` were removed.
   Use `to.edm(x)` instead.
+- beta feature `v5preview`
 
 ## Version 4.9.10 - 2025-04-29
 

package/LICENSE

@@ -0,0 +1,32 @@
+SAP DEVELOPER LICENSE AGREEMENT
+
+Version 3.2 CAP
+
+Please scroll down and read the following Developer License Agreement carefully ("Developer Agreement").  By clicking "I Accept" or by attempting to download, or install, or use the SAP software and other materials that accompany this Developer Agreement ("SAP Materials"), You agree that this Developer Agreement forms a legally binding agreement between You ("You" or "Your") and SAP SE, for and on behalf of itself and its subsidiaries and affiliates (as defined in Section 15 of the German Stock Corporation Act) and You agree to be bound by all of the terms and conditions stated in this Developer Agreement. If You are trying to access or download the SAP Materials on behalf of Your employer or as a consultant or agent of a third party (either "Your Company"), You represent and warrant that You have the authority to act on behalf of and bind Your Company to the terms of this Developer Agreement and everywhere in this Developer Agreement that refers to 'You' or 'Your' shall also include Your Company. If You do not agree to these terms, do not click "I Accept", and do not attempt to access or use the SAP Materials.
+
+1. LICENSE: SAP grants You a non-exclusive, non-transferable, non-sublicensable, revocable, limited use license to copy and reproduce the application programming interfaces ("API"), documentation, plug-ins, templates, scripts and sample code, libraries, software development kits ("Tools") to create new applications ("Customer Applications") being developed either for (a) testing and only non-productive use (“Customer Test Applications”) or (b) for productive use deployed and operated exclusively on  “SAP Business Technology Platform (BTP)” or any other platform licensed from SAP (“Customer Productive Applications”). Only under this prerequisite SAP will grant You a non-exclusive, non-transferable, revocable, limited use license to copy, reproduce and distribute SAP’s underlying rights in the Customer Productive Application. You agree that any Customer Applications will not: (a) unreasonably impair, degrade or reduce the performance or security of any SAP software applications, services or related technology ("Software"); (b) enable the bypassing or circumventing of SAP's license restrictions and/or provide users with access to the Software to which such users are not licensed; (c) render or provide, without prior written consent from SAP, any information concerning SAP software license terms, Software, or any other information related to SAP products; or (d) permit mass data extraction from an SAP product to a non-SAP product, including use, modification, saving or other processing of such data in the non-SAP product, except and only to the extent that the extraction is solely used for and required for interoperability with an SAP product. In exchange for the right to develop any Customer Applications under this Agreement, You covenant not to assert any Intellectual Property Rights in Customer Applications created by You against any SAP product, service, or future SAP development.
+
+2. INTELLECTUAL PROPERTY: (a) SAP or its licensors retain all ownership and intellectual property rights in the APIs, Tools and Software. You may not: a) remove or modify any marks or proprietary notices of SAP, b) provide or make the APIs, Tools or Software available to any third party, except in cases APIs and Tools have been made part of the overall Customer Productive Application to function, c) assign this Developer Agreement or give or transfer the APIs, Tools or Software or an interest in them to another individual or entity, d) decompile, disassemble or reverse engineer (except to the extent permitted by applicable law) the APIs Tools or Software, e) create derivative works of or based on the APIs, Tools or Software, subject to Customer Productive Applications, being exclusively deployed and operated on “SAP Business Technology Platform (BTP)” or on any other platform licensed from SAP, f) use any SAP name, trademark or logo, or g) use the APIs or Tools to modify existing Software or other SAP product functionality or to access the Software or other SAP products' source code or metadata. (b) Subject to SAP's underlying rights in any part of the APIs, Tools or Software, You retain all ownership and intellectual property rights in Your Customer Applications.
+
+3. ARTIFICIAL INTELLIGENCE TRAINING: You are expressly prohibited from using the Software, Tools or APIs as well as any Customer Applications or any part thereof for the purpose of training (developing) artificial intelligence models or systems (“AI Training”). Prohibition of AI Training includes, but is not limited to, using the Software, Tools, APIs and/or Customer Applications or part thereof in any training data set, algorithm development, model development or refinement (including language learning models) related to artificial intelligence, as well as text and data mining in accordance with §44b UrhG and Art. 4 of EU Directive 2019/790. For the avoidance of doubt, by accepting this Developer Agreement You agree that Your ownership of Customer Applications shall not create nor encompass any right to use Customer Applications for AI Training and, hence, You will not use Customer Applications or any part of it for AI Training.
+
+4. FREE AND OPEN SOURCE COMPONENTS: The SAP Materials may include certain third party free or open source components ("FOSS Components"). You may have additional rights in such FOSS Components that are provided by the third party licensors of those components.
+
+5. THIRD PARTY DEPENDENCIES: The SAP Materials may require certain third party software dependencies ("Dependencies") for the use or operation of such SAP Materials. These dependencies may be identified by SAP in Maven POM files, product documentation or by other means. SAP does not grant You any rights in or to such Dependencies under this Developer Agreement. You are solely responsible for the acquisition, installation and use of Dependencies. SAP DOES NOT MAKE ANY REPRESENTATIONS OR WARRANTIES IN RESPECT OF DEPENDENCIES, INCLUDING BUT NOT LIMITED TO IMPLIED WARRANTIES OF MERCHANTABILITY AND OF FITNESS FOR A PARTICULAR PURPOSE. IN PARTICULAR, SAP DOES NOT WARRANT THAT DEPENDENCIES WILL BE AVAILABLE, ERROR FREE, INTEROPERABLE WITH THE SAP MATERIALS, SUITABLE FOR ANY PARTICULAR PURPOSE OR NON-INFRINGING.  YOU ASSUME ALL RISKS ASSOCIATED WITH THE USE OF DEPENDENCIES, INCLUDING WITHOUT LIMITATION RISKS RELATING TO QUALITY, AVAILABILITY, PERFORMANCE, DATA LOSS, UTILITY IN A PRODUCTION ENVIRONMENT, AND NON-INFRINGEMENT. IN NO EVENT WILL SAP BE LIABLE DIRECTLY OR INDIRECTLY IN RESPECT OF ANY USE OF DEPENDENCIES BY YOU.
+
+6. WARRANTY: a)  If You are located outside the US or Canada: AS THE API AND TOOLS ARE PROVIDED TO YOU FREE OF CHARGE, SAP DOES NOT GUARANTEE OR WARRANT ANY FEATURES OR QUALITIES OF THE TOOLS OR API OR GIVE ANY UNDERTAKING WITH REGARD TO ANY OTHER QUALITY OR TO YOUR CUSTOMERS. NO SUCH WARRANTY OR UNDERTAKING SHALL BE IMPLIED BY YOU FROM ANY DESCRIPTION IN THE API OR TOOLS OR ANY AVAILABLE DOCUMENTATION OR ANY OTHER COMMUNICATION OR ADVERTISEMENT. IN PARTICULAR, SAP DOES NOT WARRANT THAT THE SOFTWARE WILL BE AVAILABLE UNINTERRUPTED, ERROR FREE, OR PERMANENTLY AVAILABLE.  FOR THE TOOLS AND API ALL WARRANTY CLAIMS ARE SUBJECT TO THE LIMITATION OF LIABILITY STIPULATED IN SECTION 4 BELOW. b)  If You are located in the US or Canada: THE API AND TOOLS ARE LICENSED TO YOU "AS IS", WITHOUT ANY WARRANTY, ESCROW, TRAINING, MAINTENANCE, OR SERVICE OBLIGATIONS WHATSOEVER ON THE PART OF SAP. SAP MAKES NO EXPRESS OR IMPLIED WARRANTIES OR CONDITIONS OF SALE OF ANY TYPE WHATSOEVER, INCLUDING BUT NOT LIMITED TO IMPLIED WARRANTIES OF MERCHANTABILITY AND OF FITNESS FOR A PARTICULAR PURPOSE. IN PARTICULAR, SAP DOES NOT WARRANT THAT THE SOFTWARE WILL BE AVAILABLE UNINTERRUPTED, ERROR FREE, OR PERMANENTLY AVAILABLE.  YOU ASSUME ALL RISKS ASSOCIATED WITH THE USE AND DISTRIBUTION (IF ANY) OF THE API AND TOOLS, INCLUDING WITHOUT LIMITATION RISKS RELATING TO QUALITY, AVAILABILITY, PERFORMANCE, DATA LOSS, AND UTILITY IN A PRODUCTION ENVIRONMENT.
+
+7.  LIMITATION OF LIABILITY: a)  If You are located outside the US or Canada: IRRESPECTIVE OF THE LEGAL REASONS, SAP SHALL ONLY BE LIABLE FOR DAMAGES UNDER THIS AGREEMENT IF SUCH DAMAGE (I) CAN BE CLAIMED UNDER THE GERMAN PRODUCT LIABILITY ACT OR (II) IS CAUSED BY INTENTIONAL MISCONDUCT OF SAP OR (III) CONSISTS OF PERSONAL INJURY. IN ALL OTHER CASES, NEITHER SAP NOR ITS EMPLOYEES, AGENTS AND SUBCONTRACTORS SHALL BE LIABLE FOR ANY KIND OF DAMAGE OR CLAIMS HEREUNDER.
+b)  If You are located in the US or Canada: IN NO EVENT SHALL SAP BE LIABLE TO YOU, YOUR COMPANY, YOUR CUSTOMERS OR TO ANY THIRD PARTY FOR ANY DAMAGES IN AN AMOUNT IN EXCESS OF $100 ARISING IN CONNECTION WITH YOUR USE OF OR INABILITY TO USE THE TOOLS OR API OR IN CONNECTION WITH SAP'S PROVISION OF OR FAILURE TO PROVIDE SERVICES PERTAINING TO THE TOOLS OR API, OR AS A RESULT OF ANY DEFECT IN THE API OR TOOLS OR ANY THIRD PARTY RIGHTS INFRINGEMENT BY THE APIs, TOOLS OR SOFTWARE. THIS DISCLAIMER OF LIABILITY SHALL APPLY REGARDLESS OF THE FORM OF ACTION THAT MAY BE BROUGHT AGAINST SAP, WHETHER IN CONTRACT OR TORT, INCLUDING WITHOUT LIMITATION ANY ACTION FOR NEGLIGENCE. YOUR SOLE REMEDY IN THE EVENT OF BREACH OF THIS DEVELOPER AGREEMENT BY SAP OR FOR ANY OTHER CLAIM RELATED TO THE API OR TOOLS SHALL BE TERMINATION OF THIS AGREEMENT. NOTWITHSTANDING ANYTHING TO THE CONTRARY HEREIN, UNDER NO CIRCUMSTANCES SHALL SAP AND ITS LICENSORS BE LIABLE TO YOU OR ANY OTHER PERSON IN PARTICULAR COMPANY AND YOUR CUSTOMERS  OR ENTITY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, OR INDIRECT DAMAGES, LOSS OF GOOD WILL OR BUSINESS PROFITS, WORK STOPPAGE, DATA LOSS, COMPUTER FAILURE OR MALFUNCTION, ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSS, OR EXEMPLARY OR PUNITIVE DAMAGES.
+
+8.  INDEMNITY: You will fully indemnify, hold harmless and defend SAP against law suits based on any claim: (a) that any Customer Application created by You infringes or misappropriates any patent, copyright, trademark, trade secrets, or other proprietary rights of a third party, or (b) related to Your alleged violation of the terms of this Developer Agreement
+
+9.  EXPORT: The Tools and API are subject to German, EU and US export control regulations. You confirm that: a) You will not use the Tools or API for, and will not allow the Tools or API to be used for, any purposes prohibited by German, EU and US law, including, without limitation, for the development, design, manufacture or production of nuclear, chemical or biological weapons of mass destruction; b) You are not located in and/or will not download or otherwise export or re-export the API or Tools, directly or indirectly, to  Cuba, Iran, North Korea, Syria, Crimea/Sevastopol or the so-called Donetsk People’s Republic (DNR) / Luhansk People’s Republic (LNR)nor any other country to which Germany, the European Union and/or the United States has prohibited export; c)  You are not listed on any applicable sanctioned party lists (e.g., European Union Sanctions List, U.S. Specially Designated National (SDN) lists, U.S. Denied Persons List, BIS Entity List, United Nations Security Council Sanctions); d) You will not download or otherwise export or re-export the API or Tools , directly or indirectly, to persons on the above-mentioned lists.
+
+10.  SUPPORT: Other than what is made available on the SAP Community Website (SCN) by SAP at its sole discretion and by SCN members, SAP does not offer support for the API or Tools which are the subject of this Developer Agreement. In case of Customer Productive Applications developed and made available by You in accordance with this Developer Agreement, You and third parties may request support in line with Your licensing agreement for SAP.
+
+11.  TERM AND TERMINATION: You may terminate this Developer Agreement by destroying all copies of the API and Tools on Your Computer(s). SAP may terminate Your license to use the API and Tools immediately if You fail to comply with any of the terms of this Developer Agreement, or, for SAP's convenience by providing you with ten (10) day's written notice of termination (including email). In case of termination or expiration of this Developer Agreement, You must destroy all copies of the API and Tools immediately.  In the event Your Company or any of the intellectual property you create using the API, Tools or Software are acquired (by merger, purchase of stock, assets or intellectual property or exclusive license), or You become employed, by a direct competitor of SAP, then this Development Agreement and all licenses granted in this Developer Agreement shall immediately terminate upon the date of such acquisition.
+
+12.  LAW/VENUE: a)  If You are located outside the US or Canada: This Developer Agreement is governed by and construed in accordance with the laws of the Germany. You and SAP agree to submit to the exclusive jurisdiction of, and venue in, the courts of Karlsruhe in Germany in any dispute arising out of or relating to this Developer Agreement. b)  If You are located in the US or Canada: This Developer Agreement shall be governed by and construed under the Commonwealth of Pennsylvania law without reference to its conflicts of law principles. In the event of any conflicts between foreign law, rules, and regulations, and United States of America law, rules, and regulations, United States of America law, rules, and regulations shall prevail and govern. The United Nations Convention on Contracts for the International Sale of Goods shall not apply to this Developer Agreement. The Uniform Computer Information Transactions Act as enacted shall not apply.
+
+13. MISCELLANEOUS: This Developer Agreement is the complete agreement for the API and Tools licensed (including reference to information/documentation contained in a URL). This Developer Agreement supersedes all prior or contemporaneous agreements or representations with regards to the subject matter of this Developer Agreement. If any term of this Developer Agreement is found to be invalid or unenforceable, the surviving provisions shall remain effective. SAP's failure to enforce any right or provisions stipulated in this Developer Agreement will not constitute a waiver of such provision, or any other provision of this Developer Agreement.

package/README.md

@@ -6,6 +6,8 @@
 
 [Installation and Usage](#installation-and-usage)  
 [Documentation](#documentation)
+[How to Obtain Support](#how-to-obtain-support)
+[History and License](#history-and-license)
 
 ## Installation and Usage
 
@@ -23,15 +25,25 @@ Or maintain your package.json dependencies as follows:
   }
 ```
 
+If your project already has a dependency to `@sap/cds`, nothing has to be done.
+
 
 ## Documentation
 
 Please refer to the [official CDS documentation](https://cap.cloud.sap/docs/cds/).
 
+
 ## How to Obtain Support
 
 In case you find a bug, please report an [incident](https://cap.cloud.sap/docs/resources/#reporting-incidents) on SAP Support Portal.
 
-## License
 
-This package is provided under the terms of the [SAP Developer License Agreement](https://cap.cloud.sap/resources/license/developer-license-3_2_CAP.txt).
+## History and License
+
+The cds-compiler uses [Semantic Versioning](./doc/Versioning.md) for its version numbers.
+
+Our [changelog](./CHANGELOG.md) lists recent changes.
+<!-- If you upgrade from a previous version, TODO: incompatible changes -->
+
+This package is provided under the terms of the [SAP Developer License Agreement, Version 3.2 CAP](LICENSE).
+<!-- https://cap.cloud.sap/resources/license/developer-license-3_2_CAP.txt -->

package/bin/cdsse.js

@@ -174,9 +174,6 @@ function tokensAt( buf, _offset, col, symbol ) {
     else if (/^[A-Z_]+$/.test( n )) {
       console.log( n.toLowerCase(), 'keyword' );
     }
-    else if (n === 'Boolean') {
-      console.log( 'true keyword\nfalse keyword' );
-    }
     else if (n !== 'Identifier') {
       console.log( n, 'unknown' );
     }

package/doc/CHANGELOG_BETA.md

@@ -1,4 +1,4 @@
-# ChangeLog of Beta Features for cdx compiler and backends
+# ChangeLog of beta Features for CDS compiler and backends
 
 <!-- markdownlint-disable MD024 -->
 <!-- markdownlint-disable MD004 -->

package/doc/CHANGELOG_DEPRECATED.md

@@ -1,4 +1,4 @@
-# ChangeLog of deprecated Features for cdx compiler and backends
+# ChangeLog of deprecated features for CDS compiler and backends
 
 <!-- markdownlint-disable MD024 -->
 <!-- (no-duplicate-heading)-->

package/lib/base/message-registry.js

@@ -669,6 +669,7 @@ const centralMessageTexts = {
     tableAlias: 'A filter can only be provided when navigating along associations, but found table alias',
     from: 'A filter can only be provided for the source entity or associations',
     'model-only': 'A filter can\'t be provided for a to-many association without ON-condition',
+    'last-empty-filter': 'Unexpected empty filter in last path step',
   },
 
   // multi-line strings: --------------------------------------------------------
@@ -706,8 +707,8 @@ const centralMessageTexts = {
     on: 'Unexpected $(ID) reference; is valid only if compared to be equal to an association of the target side',
     subQuery: 'Unexpected $(ID) reference in a sub query',
     setQuery: 'Unexpected $(ID) reference in a query on the right side of $(OP)',
-    exists: 'With $(NAME), path steps must not start with $(ID)',
-    'exists-filter': 'Unexpected $(ID) reference in filter of path $(ELEMREF) following “EXISTS” predicate',
+    exists: 'Paths following $(NAME) must not start with $(ID)',
+    'exists-filter': 'Unexpected $(ID) reference in filter of assoc $(ELEMREF) following “EXISTS” predicate',
   },
   'ref-unexpected-map': {
     std: 'Unexpected reference to an element of type $(TYPE)', // unused
@@ -1011,6 +1012,11 @@ const centralMessageTexts = {
     // TODO: Better message?
     include:  '$(ART) can\'t have localized elements (through include)',
   },
+  'def-expected-localized': {
+    std: 'Skipped creation of convenience view for $(NAME)', // unused
+    'non-assoc': 'Skipped creation of convenience view for $(NAME) because element $(ALIAS) is not an association',
+    missing: 'Skipped creation of convenience view for $(NAME) because element $(ALIAS) is missing',
+  },
   'def-unexpected-localized-struct': '$(KEYWORD) is not fully supported for structures',
   'def-unexpected-localized-anno': 'Annotations can\'t have localized elements',
   'def-unexpected-virtual': 'Unexpected $(KEYWORD): an element can\'t be virtual and an association/composition',
@@ -1428,6 +1434,7 @@ const centralMessageTexts = {
   },
   'odata-anno-xpr': {
     std: 'unused',
+    invalid: 'Invalid expression around $(OP) in $(ANNO); can\'t be rendered as a dynamic expression',
     notadynexpr: '$(OP) is not a renderable dynamic expression in $(ANNO)',
     use: 'Function $(OP) is not a renderable dynamic expression in $(ANNO), use $(CODE) instead',
     canonfuncalias: 'Expected function name $(CODE) to be of the form $(META).$(OTHERMETA) for $(OP) in $(ANNO)',

package/lib/base/messages.js

@@ -1724,7 +1724,7 @@ function constructSemanticLocationFromCsnPath( model, options, csnPath ) {
     else if (step === 'targetAspect') {
       // skip
     }
-    else if (step === 'xpr' || step === 'default' || step === 'ref' || step === 'as' || step === 'value') {
+    else if (step === 'xpr' || step === 'list' || step === 'default' || step === 'ref' || step === 'as' || step === 'value') {
       break; // don't go into xprs, refs, aliases, values, etc.
     }
     else if (step === 'returns') {

package/lib/base/model.js

@@ -29,6 +29,8 @@ const availableBetaFlags = {
   rewriteAnnotationExpressionsViaType: true,
   sqlServiceDummies: true,
   projectionViews: true,
+  draftAdminDataHiddenFilter: true,
+  $calcForDraft: true,
   // disabled by --beta-mode
   nestedServices: false,
 };

package/lib/checks/existsExpressionsOnlyForeignKeys.js

@@ -3,39 +3,45 @@
 const { requireForeignKeyAccess } = require('../checks/onConditions');
 
 /**
- * Check that associations in filters (in an exists expression) are only fk-accesses. Everything else is forbidden.
+ * Filter expressions in an exists path must:
+ * - only contain fk-accesses for assocs. Unmanaged traversal / non-fk access is forbidden.
+ * - not contain a ref starting with $self
  *
  * @param {CSN.Artifact} parent
  * @param {string} name
  * @param {Array} expr
  */
-function forbidAssocInExists( parent, name, expr ) {
+function assertFilterOfExists( parent, name, expr ) {
   for (let i = 0; i < expr.length - 1; i++) {
     if (expr[i] === 'exists' && expr[i + 1].ref) {
       i++;
       const current = expr[i];
 
-      const { _links } = expr[i];
+      const { _links } = current;
 
       const assocs = _links.filter(link => link.art?.target).map(link => current.ref[link.idx]);
 
-      checkForInvalidAssoc.call(this, assocs);
+      ensureValidFilters.call(this, assocs);
     }
   }
 }
 
 /**
- * Check that associations in filters (in an exists expression) are only fk-accesses. Everything else is forbidden.
+ * Reject:
+ * - Unmanaged traversal / non-fk access.
+ * - ref's starting with $self
  *
  * @param {object[]} assocs Array of refs of assocs - possibly with a .where to check
  */
-function checkForInvalidAssoc( assocs ) {
+function ensureValidFilters( assocs ) {
   for (const assoc of assocs) {
     if (assoc.where) {
       for (let i = 0; i < assoc.where.length; i++) {
         const part = assoc.where[i];
 
         if (part._links && !(assoc.where[i - 1] && assoc.where[i - 1] === 'exists')) {
+          if (part.$scope === '$self')
+            this.error('ref-unexpected-self', part.$path, { '#': 'exists-filter', elemref: assoc.id, id: part.ref[0] });
           for (const link of part._links) {
             if (link.art && link.art.target) {
               if (link.art.keys) { // managed - allow FK access
@@ -55,7 +61,7 @@ function checkForInvalidAssoc( assocs ) {
               }
               // Recursively drill down if the assoc-step has a filter
               if (part.ref[link.idx].where)
-                checkForInvalidAssoc.call(this, [ part.ref[link.idx] ]);
+                ensureValidFilters.call(this, [ part.ref[link.idx] ]);
             }
           }
         }
@@ -65,7 +71,7 @@ function checkForInvalidAssoc( assocs ) {
 }
 
 module.exports = {
-  having: forbidAssocInExists,
-  where: forbidAssocInExists,
-  xpr: forbidAssocInExists,
+  having: assertFilterOfExists,
+  where: assertFilterOfExists,
+  xpr: assertFilterOfExists,
 };

package/lib/checks/existsMustEndInAssoc.js

@@ -13,8 +13,8 @@ function existsMustEndInAssoc( parent, prop, expression, path ) {
     if (expression[i] === 'exists') {
       const next = expression[i + 1];
       const { _art } = next;
-      const errorPath = path.concat([ prop, i ]);
       if (!next.SELECT && !_art?.target) {
+        const errorPath = path.concat([ prop, i ]);
         this.error('ref-expecting-assoc', errorPath, {
           '#': _art.type ? 'with-type' : 'std',
           elemref: next,

package/lib/checks/existsMustNotStartWithDollarSelf.js

@@ -0,0 +1,31 @@
+'use strict';
+
+/**
+ * A path following an “exists” predicate must always end in an association.
+ *
+ * @param {object} parent
+ * @param {string} prop
+ * @param {Array} expression
+ * @param {CSN.Path} path
+ */
+function existsMustNotStartWithDollarSelf( parent, prop, expression, path ) {
+  for (let i = 0; i < expression?.length - 1; i++) {
+    if (expression[i] === 'exists') {
+      const next = expression[i + 1];
+      if (next.$scope === '$self') {
+        const errorPath = path.concat([ prop, i ]);
+        this.error('ref-unexpected-self', errorPath, {
+          '#': 'exists',
+          id: next.ref[0],
+          name: 'exists',
+        });
+      }
+    }
+  }
+}
+
+module.exports = {
+  having: existsMustNotStartWithDollarSelf,
+  where: existsMustNotStartWithDollarSelf,
+  xpr: existsMustNotStartWithDollarSelf,
+};

package/lib/checks/validator.js

@@ -43,7 +43,8 @@ const { validateAssociationsInItems } = require('./arrayOfs');
 const checkQueryForNoDBArtifacts = require('./queryNoDbArtifacts');
 const checkExplicitlyNullableKeys = require('./nullableKeys');
 const existsMustEndInAssoc = require('./existsMustEndInAssoc');
-const forbidAssocInExists = require('./existsExpressionsOnlyForeignKeys');
+const existsMustNotStartWithDollarSelf = require('./existsMustNotStartWithDollarSelf');
+const assertFilterOfExists = require('./existsExpressionsOnlyForeignKeys');
 const checkPathsInStoredCalcElement = require('./checkPathsInStoredCalcElement');
 const managedWithoutKeys = require('./managedWithoutKeys');
 const {
@@ -85,7 +86,8 @@ const forRelationalDBArtifactValidators = [
 const forRelationalDBCsnValidators = [
   checkCdsMap,
   existsMustEndInAssoc,
-  forbidAssocInExists,
+  existsMustNotStartWithDollarSelf,
+  assertFilterOfExists,
   navigationIntoMany,
   checkPathsInStoredCalcElement,
   featureFlags,

package/lib/compiler/assert-consistency.js

@@ -207,7 +207,7 @@ function assertConsistency( model, stage ) {
             'elements', '$autoElement', '$uncheckedElements', '_origin', '_extensions',
             '$requireElementAccess', '_effectiveType', '$effectiveSeqNo', '_deps',
             '$calcDepElement', '$filtered', '$enclosed', '_parent',
-            'deprecated', '$onlyInExprCtx',
+            'deprecated', '$restricted',
           ],
           schema: {
             kind: { test: isString, enum: [ 'builtin' ] },
@@ -216,7 +216,7 @@ function assertConsistency( model, stage ) {
             $uncheckedElements: { test: isBoolean },
             $requireElementAccess: { test: isBoolean },
             deprecated: { test: isBoolean },
-            $onlyInExprCtx: { test: TODO },
+            $restricted: { test: TODO },
             // missing location for normal "elements"
             elements: { test: TODO },
           },
@@ -480,6 +480,7 @@ function assertConsistency( model, stage ) {
       },
       query: { requires: [ 'query', 'location' ], optional: [ 'stored', '$parens' ] },
     },
+    $calc: { kind: true, test: TODO }, // TODO: rename to `value`?
     literal: {                  // TODO: check value against literal
       test: isString,
       enum: [

package/lib/compiler/builtins.js

@@ -211,8 +211,7 @@ const magicVariables = {
     },
     // Require that elements are accessed, i.e. no $draft, only $draft.<element>.
     $requireElementAccess: true,
-    // See reference semantics in shared.js
-    $onlyInExprCtx: [ 'annotation', 'annoRewrite' ],
+    $restricted: true,          // only in annotation expression, see shared.js
   },
 };
 
@@ -454,8 +453,8 @@ function initBuiltins( model ) {
         art.$requireElementAccess = magic.$requireElementAccess;
       if (magic.deprecated)
         art.deprecated = magic.deprecated;
-      if (magic.$onlyInExprCtx)
-        art.$onlyInExprCtx = magic.$onlyInExprCtx;
+      if (magic.$restricted)
+        art.$restricted = magic.$restricted;
 
       createMagicElements( art, magic.elements );
       if (options.variableReplacements?.[id])
@@ -480,8 +479,8 @@ function initBuiltins( model ) {
       // Propagate this property so that it is available for sub-elements.
       if (art.$uncheckedElements)
         magic.$uncheckedElements = art.$uncheckedElements;
-      if (art.$onlyInExprCtx)
-        magic.$onlyInExprCtx = art.$onlyInExprCtx;
+      if (art.$restricted)
+        magic.$restricted = art.$restricted;
       setProp( magic, '_parent', art );
       // setProp( magic, '_effectiveType', magic );
       if (elements[id] && typeof elements[id] === 'object')

package/lib/compiler/checks.js

@@ -258,37 +258,46 @@ function check( model ) {
       : xpr._artifact;
 
     const typeArt = isSqlCast ? xpr : user;
-    if (!elem || !isSqlCast && typeArt.type?.$inferred)
-      return; // e.g. $inferred:'generated'
+    if (!elem || typeArt.$inferred || !isSqlCast && typeArt.type?.$inferred)
+      return; // e.g. $inferred: 'generated'
 
-    const { type } = typeArt;
-    if (type) { // has explicit type
-      if (type._artifact?._effectiveType?.name.id === 'cds.Map') {
-        error( 'type-invalid-cast', [ type.location, user ], { '#': 'std', type: 'cds.Map' } );
-      }
-      else if (type._artifact?.elements) {
-        error( 'type-invalid-cast', [ type.location, user ], { '#': 'to-structure' } );
-      }
-      else if (elem.elements) { // TODO: calc elements
-        error( 'type-invalid-cast', [ type.location, user ], { '#': 'from-structure' } );
-      }
-      else if (elem.target && !type._artifact?.target) {
-        error( 'type-invalid-cast', [ type.location, user ], { '#': 'from-assoc' } );
-      }
-      else if (!elem.target &&     // referenced element is not association
+    const typeItems = typeArt.items ?? typeArt;
+
+    // explicit type, elements, or items -> has type cast
+    const hasCast = typeItems.type ||
+      (typeItems.elements && !typeArt.expand && !typeArt.$expand && !elem.$expand);
+
+    if (!hasCast)
+      return;
+
+    const { type } = typeItems;
+    const loc = [ (type || typeItems).location, user ];
+
+    if (type?._artifact?._effectiveType?.name.id === 'cds.Map') {
+      error( 'type-invalid-cast', loc, { '#': 'std', type: 'cds.Map' } );
+    }
+    else if (elem.elements && !typeArt.$expand) { // TODO: calc elements
+      error( 'type-invalid-cast', loc, { '#': 'from-structure' } );
+    }
+    else if (elem.target && (typeArt.items || !type?._artifact?.target)) {
+      error( 'type-invalid-cast', loc, { '#': 'from-assoc' } );
+    }
+    else if ((typeArt.elements && !typeArt.$expand) || type?._artifact?.elements) {
+      error( 'type-invalid-cast', loc, { '#': 'to-structure' } );
+    }
+    else if (!elem.target &&       // referenced element is not association
           !user.type?.$inferred && // $inferred types already reported in resolve.js.
           (
             // assoc used in SQL cast
-            type._artifact?.target && isSqlCast ||
+            type?._artifact?.target && isSqlCast ||
             // there is a target and the type is a direct `cds.Association`;
             // other types handled by resolver already.
-            typeArt.target && type._artifact?.category === 'relation'
+            typeItems.target && type?._artifact?.category === 'relation'
           )
-      ) {
-        // - redirection-check in resolve.js already checks this for CDL-casts
-        // - `"cast": { "target": "…", "type": "cds.Association", … }` via CSN input.
-        error('type-invalid-cast', [ type.location, user ], { '#': 'assoc' });
-      }
+    ) {
+      // - redirection-check in resolve.js already checks this for CDL-casts
+      // - `"cast": { "target": "…", "type": "cds.Association", … }` via CSN input.
+      error('type-invalid-cast', loc, { '#': 'assoc' });
     }
   }
 
@@ -827,8 +836,10 @@ function check( model ) {
           error( 'ref-unexpected-structured', [ sourceLoc, elem ],
                  { '#': 'struct-expr', elemref: xpr } );
         }
-        else if (xpr._artifact.target !== undefined && (!lastStep.where || isStored)) {
-          // Allow using an association _with filter_, but only for on-read calculated elements.
+        else if (xpr._artifact.target !== undefined &&
+            (!lastStep.where || lastStep.where.args?.length === 0 || isStored)) {
+          // Allow using an association _with non-empty filter_, but only for on-read
+          // calculated elements.
           // TODO: Also allow bare unmanaged association references and remove beta.
           const variant = (isStored && lastStep.where && 'assoc-stored') ||
             (isComposition( model, xpr._artifact ) && 'expr-comp') ||

package/lib/compiler/define.js

@@ -395,7 +395,7 @@ function define( model ) {
   function addExtension( ext, block ) {
     setLink( ext, '_block', block );
     initExprAnnoBlock( ext, block );
-    const absolute = ext.name && resolveUncheckedPath( ext.name, '_extensions', ext );
+    const absolute = ext.name && resolveUncheckedPath( ext.name, '_uncheckedExtension', ext );
     if (!absolute)                    // broken path
       return;
     delete ext.name.path[0]._artifact; // might point to wrong JS object in phase 1