@sap/cds-compiler 6.0.14 → 6.2.2

package/CHANGELOG.md

@@ -8,6 +8,52 @@ 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.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
+
+- for.odata:
+  + Introduce a new option `addAnnotationAddressViaNavigationPath` to annotate services
+    containing draft-enabled entities with `@Common.AddressViaNavigationPath`.
+  + Introduce a new option `draftMessages` that enhances the draft generation logic.
+
+### Changed
+
+- Update OData vocabularies: Capabilities, Common
+
+### Fixed
+
+- compiler: The ternary condition operator `…?…:…` is now right-associative as usual
+  (in v5, chaining it like in `…?…:…?…:…` was not possible without parentheses).
+
 ## Version 6.0.14 - 2025-06-18
 
 ### Fixed
@@ -117,6 +163,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;
@@ -704,7 +704,11 @@ 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`);

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,6 +36,7 @@ const publicOptionsNewAPI = [
   'booleanEquality',
   'dollarNowAsTimestamp',
   // ODATA
+  'addAnnotationAddressViaNavigationPath',
   'odataOpenapiHints',
   'edm4OpenAPI',
   'odataVersion',
@@ -48,6 +49,7 @@ const publicOptionsNewAPI = [
   'odataV2PartialConstr',
   'odataVocabularies',
   'odataNoCreator',
+  'draftMessages',
   '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';
 
@@ -1219,11 +1219,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
   },
 
   // -----------------------------------------------------------------------------------

package/lib/base/messages.js

@@ -193,7 +193,7 @@ class CompileMessage {
     this.validNames = null;
     this.home = home;  // semantic location, e.g. 'entity:"E"/element:"x"'
     this.severity = severity;
-    Object.defineProperty( this, 'messageId', { value: id } );
+    this.messageId = id;
     Object.defineProperty( this, '$module', { value: moduleName, configurable: true } );
     // Uncomment when running TypeScript linter
     // this.messageId = id;
@@ -1329,8 +1329,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 ) ||

package/lib/base/model.js

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

package/lib/base/node-helpers.js

@@ -19,9 +19,17 @@ class PromiseAllError extends Error {
  *
  * This function only works as intended if no promise in `promises` fulfill
  * with a value which is an instance of Error.
+ *
+ * @param {Promise[]} promises
+ * @param {(e: Error) => boolean} shouldImmediatelyReject
+ *          Determine on a per-promise basis whether we should immediately abort all promises.
  */
-function promiseAllDoNotRejectImmediately( promises ) {
-  return Promise.all( promises.map( p => p.catch(e => e) ) )
+function promiseAllDoNotRejectImmediately( promises, shouldImmediatelyReject = _error => false ) {
+  return Promise.all( promises.map( p => p.catch((e) => {
+    if (shouldImmediatelyReject(e))
+      throw e;
+    return e;
+  }) ) )
     .then( values => (values.some(e => e instanceof Error)
       ? Promise.reject( new PromiseAllError(
         values, 'At least one promise has been rejected'

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

@@ -21,7 +21,9 @@ function assertNoAssocUsageOutsideOfService( parent, prop, ref, path, grandparen
     return;
 
   const { _links } = parent;
-  if (_links?.length <= 1)
+  // 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 )
     return;
 
   for (let i = 0; i < _links.length - 1; i++) {

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/compiler/assert-consistency.js

@@ -647,6 +647,8 @@ function assertConsistency( model, stage ) {
         'where', 'columns', 'mixin', 'quantifier', 'offset',
         'orderBy', '$orderBy', 'groupBy', 'excludingDict', 'having',
         '$limit', 'limit', '_status', '_origin',
+        // via casts
+        'enum',
       ],
     },
     _leadingQuery: { kind: true, test: TODO },
@@ -1059,7 +1061,7 @@ function assertConsistency( model, stage ) {
     // TODO
     // else if (spec.instanceOf && spec.instanceOf !== 'ignore' &&
     //    Object.getPrototypeOf( node ) !== spec.instanceOf.prototype)
-    // eslint-disable-next-line @stylistic/js/max-len
+    // eslint-disable-next-line @stylistic/max-len
     //  throw new InternalConsistencyError( `Expected object of class ${ spec.instanceOf.name } but found ${ found }${ at( [ null, parent ], prop, name ) }` );
   }
 

package/lib/compiler/base.js

@@ -21,7 +21,7 @@ const kindProperties = {
   entity: {
     elements: true, actions: true, params: () => false, include: true,
   },
-  select: { normalized: 'select', elements: true },
+  select: { normalized: 'select', elements: propExists, enum: propExists },
   $join: { normalized: 'select' },
   $tableAlias: { normalized: 'alias' }, // table alias in select
   $self: { normalized: 'alias' }, // table alias in select

package/lib/compiler/builtins.js

@@ -222,7 +222,7 @@ const dateRegEx = /^(-?\d{4})-(\d{1,2})-(\d{1,2})$/;
 //                      YYYY -     MM  -   dd
 const timeRegEx = /^T?(\d{1,2}):(\d{1,2})(?::(\d{1,2}))?(?:Z|[+-]\d{2}(?::\d{2})?)?$/;
 //                  T     HH   :    mm      :    ss         TZD
-// eslint-disable-next-line @stylistic/js/max-len, sonarjs/regex-complexity
+// eslint-disable-next-line @stylistic/max-len, sonarjs/regex-complexity
 const timestampRegEx = /^(-?\d{4})-(\d{2})-(\d{2})[T ](\d{2}):(\d{2})(?::(\d{2})(\.\d{1,7})?)?(?:Z|[+-]\d{2}(?::\d{2})?)?$/;
 //                          YYYY  -  MM   -  dd    T    HH   :   mm     :  ss     . fraction     TZD
 // eslint-disable-next-line sonarjs/regex-complexity

package/lib/compiler/checks.js

@@ -5,7 +5,6 @@
 //  * Different ad-hoc value/type checks (associations, enum, ...) -
 //    specify a proper one and use consistently
 //  * Using name comparisons instead proper object comparisons.
-//  * effectiveType issues.
 //  * Often forgot to consider CSN input
 
 'use strict';
@@ -18,7 +17,7 @@ const {
   isDeprecatedEnabled,
 } = require('../base/model');
 const { typeParameters } = require('./builtins');
-const { propagationRules } = require('../base/builtins');
+const { propagationRules, acceptsExprValues } = require('../base/builtins');
 const { annotationVal } = require('./utils');
 
 const $location = Symbol.for( 'cds.$location' );
@@ -84,7 +83,7 @@ function check( model ) {
     checkName( art );
     checkTypeArguments( art );
 
-    if (art.value && !art.$calcDepElement && art.type)
+    if (art.value && !art.$calcDepElement && (art.type || art.elements || art.items))
       checkTypeCast( art.value, art );
 
     for (const anno of iterateAnnotations( art ))
@@ -245,25 +244,43 @@ function check( model ) {
   }
 
   function checkTypeCast( xpr, user ) {
-    const isCast = (xpr.op?.val === 'cast');
-    const elem = isCast
+    const isSqlCast = (xpr.op?.val === 'cast');
+    const elem = isSqlCast
       ? xpr.args?.[0]?._artifact
       : xpr._artifact;
-    const type = isCast ? xpr.type : user.type;
-    if (!isCast && type.$inferred)
+
+    const typeArt = isSqlCast ? xpr : user;
+    if (!elem || !isSqlCast && typeArt.type?.$inferred)
       return; // e.g. $inferred:'generated'
-    if (elem && type) { // has explicit type
-      if (type._artifact?._effectiveType?.name.id === 'cds.Map')
+
+    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)
+      }
+      else if (type._artifact?.elements) {
         error( 'type-invalid-cast', [ type.location, user ], { '#': 'to-structure' } );
-      else if (elem.elements) // TODO: calc elements
+      }
+      else if (elem.elements) { // TODO: calc elements
         error( 'type-invalid-cast', [ type.location, user ], { '#': 'from-structure' } );
-      else if (elem.target && !type._artifact?.target)
+      }
+      else if (elem.target && !type._artifact?.target) {
         error( 'type-invalid-cast', [ type.location, user ], { '#': 'from-assoc' } );
-      else if (!elem.target && type._artifact?.target && !user.type?.$inferred)
-        // $inferred already reported in resolve.js
-        error( 'type-invalid-cast', [ type.location, user ], { '#': 'assoc' } );
+      }
+      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 ||
+            // there is a target and the type is a direct `cds.Association`;
+            // other types handled by resolver already.
+            typeArt.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' });
+      }
     }
   }
 
@@ -935,16 +952,16 @@ function check( model ) {
     // One argument must be "$self" and the other an assoc
     if (xpr.op.val === '=' && xpr.args.length === 2) {
       // Tree-ish expression from the compiler (not augmented)
-      // eslint-disable-next-line @stylistic/js/max-len
+      // eslint-disable-next-line @stylistic/max-len
       return (isAssociationOperand( xpr.args[0] ) && isDollarSelfOrProjectionOperand( xpr.args[1] ) ||
-      // eslint-disable-next-line @stylistic/js/max-len
+      // eslint-disable-next-line @stylistic/max-len
               isAssociationOperand( xpr.args[1] ) && isDollarSelfOrProjectionOperand( xpr.args[0] ));
     }
     else if (xpr.args.length === 3 && xpr.args[1].val === '=') {
       // Tree-ish expression from the compiler (not augmented)
-      // eslint-disable-next-line @stylistic/js/max-len
+      // eslint-disable-next-line @stylistic/max-len
       return (isAssociationOperand( xpr.args[0] ) && isDollarSelfOrProjectionOperand( xpr.args[2] ) ||
-              // eslint-disable-next-line @stylistic/js/max-len
+              // eslint-disable-next-line @stylistic/max-len
               isAssociationOperand( xpr.args[2] ) && isDollarSelfOrProjectionOperand( xpr.args[0] ));
     }
 
@@ -963,7 +980,7 @@ function check( model ) {
     const name = anno.name?.id;
     if (!name)
       return true;
-    if (!propagationRules[`@${ name }`])
+    if (!propagationRules[`@${ name }`] || acceptsExprValues[`@${ name }`])
       return true;
     error( 'anno-unexpected-expr', [ anno.location, art ], { anno: name },
            'Unexpected expression as value for $(ANNO)' );
@@ -1165,7 +1182,7 @@ function check( model ) {
           value.literal !== 'timestamp' && value.literal !== 'string') {
         // Hm, actually date and time cannot be mixed
         warning( null, loc, { type, anno },
-          // eslint-disable-next-line @stylistic/js/max-len
+          // eslint-disable-next-line @stylistic/max-len
                  'A date/time value or a string is required for type $(TYPE) for annotation $(ANNO)' );
       }
     }

package/lib/compiler/define.js

@@ -1010,6 +1010,7 @@ function define( model ) {
       }
       // Either expression (value), expand, new virtual or new association
       else if (col.value || col.name) {
+        col.kind = 'element';
         if (!col._block)
           setLink( col, '_block', parent._block );
         if (col.inline) { // `@anno elem.{ * }` does not work
@@ -1031,8 +1032,7 @@ function define( model ) {
         initSelectItems( col, null, user ); // TODO: use col as user (i.e. remove param)
       }
 
-      initItemsLinks( col, parent._block );
-      initExprAnnoBlock( col, parent._block );
+      initCdlTypeCast( col, parent );
     }
 
     if (hasItems && !wildcard && parent.excludingDict && !options.$recompile) {
@@ -1044,6 +1044,26 @@ function define( model ) {
     }
   }
 
+  function initCdlTypeCast( col, parent ) {
+    if (col.val)
+      return; // e.g. '*' column
+
+    setMemberParent( col, col.name, parent );
+    initMembers( col, col, col._block );
+
+    // We don't allow CDL-style casts to anonymous structures.  We reject it already here
+    // and not in checks.js to ensure that it's rejected in parseCdl.
+    if (col.elements) {
+      error('type-invalid-cast', [ col.elements[$location] ?? col.location, col ],
+            { '#': 'to-inline-structure' });
+    }
+    else if (col.expand && (col.type || col.elements || col.items)) {
+      const loc = (col.type?.location || col.elements?.[$location] ||
+        col.items?.location || col.location);
+      error('type-invalid-cast', [ loc, col ], { '#': 'expand' });
+    }
+  }
+
   /**
    * If we have a valid top-level exists, exists in filters of sub-expressions can be translated,
    * since we will have a top-level subquery after exists-processing in the forRelationalDB.
@@ -1150,7 +1170,7 @@ function define( model ) {
           // We do not want to complain separately about all element properties:
           error( 'ext-unexpected-element', [ e.location, construct ],
                  { name: e.name.id, code: 'extend … with enum' },
-                 // eslint-disable-next-line @stylistic/js/max-len
+                 // eslint-disable-next-line @stylistic/max-len
                  'Unexpected elements like $(NAME) in an extension for an enum. Additionally, use $(CODE) when extending enums' );
           // Don't emit 'ext-expecting-enum' if this error is emitted.
           return;
@@ -1238,7 +1258,6 @@ function define( model ) {
       if (elem.$duplicates === true && add)
         elem.$duplicates = null;
       setMemberParent( elem, name, parent, add && prop );
-      // console.log(message( null, elem.location, elem, {}, 'Info', 'INIT').toString())
       checkRedefinition( elem );
       initMembers( elem, elem, bl, initExtensions );
       if (boundSelfParamType && (elem.kind === 'action' || elem.kind === 'function'))
@@ -1320,7 +1339,7 @@ function define( model ) {
     // - artifacts (CDL-only anyway) only inside [extend] context|service
     if (!dict)
       return false;
-    const feature = kindProperties[parent.kind][prop];
+    const feature = kindProperties[parent.kind ?? 'element'][prop];
     if (feature &&
         (feature === true || construct.kind !== 'extend' || feature( prop, parent )))
       return true;

package/lib/compiler/extend.js

@@ -561,7 +561,7 @@ function extend( model ) {
            {
              std: 'Unexpected $(CODE) value type in the assignment of $(ANNO)',
              array: 'Unexpected array as $(CODE) value in the assignment of $(ANNO)',
-             // eslint-disable-next-line @stylistic/js/max-len
+             // eslint-disable-next-line @stylistic/max-len
              struct: 'Unexpected structure as $(CODE) structure property value in the assignment of $(ANNO)',
              boolean: 'Unexpected boolean as $(CODE) value in the assignment of $(ANNO)',
              null: 'Unexpected null as $(CODE) value in the assignment of $(ANNO)',

package/lib/compiler/finalize-parse-cdl.js

@@ -117,7 +117,15 @@ function finalizeParseCdl( model ) {
     // containing it.  Otherwise some type's aren't properly resolved.
     // TODO: If resolveTypeUnchecked is reworked, we may be able to simplify this coding.
     (artifact.$queries || []).forEach( art => resolveTypesForParseCdl( art, artifact ) );
-    (artifact.columns || []).forEach( art => resolveTypesForParseCdl( art, artifact ) );
+    (artifact.columns || []).forEach( (col) => {
+      // TODO: Can we use "ensureColumnName" of populate.js? It depends on column indices
+      //  _after_ wildcards were expanded, though.
+      if (!col.name && col.value?.path) {
+        const last = col.value.path.at(-1);
+        col.name = { id: last?.id || '', location: last?.location, $inferred: 'as' };
+      }
+      resolveTypesForParseCdl( col, artifact );
+    } );
     forEachGeneric( artifact, 'mixin', art => resolveTypesForParseCdl( art, artifact ) );
 
     // For better error messages for `type of`s in `returns`, we pass the object as the new main.