@sap/cds-compiler 5.1.2 → 5.3.0

package/lib/compiler/assert-consistency.js

@@ -122,7 +122,6 @@ function assertConsistency( model, stage ) {
         'dependencies',         // for USING..FROM
         'kind',                 // TODO: remove from parser
         'meta',
-        '@sql_mapping',         // TODO: it is time that a 'header' attribute replaces 'version'
         '$withLocalized',
         '$sources',
         'tokenStream',
@@ -289,7 +288,8 @@ function assertConsistency( model, stage ) {
           '$calcDepElement',
           'where', 'groupBy', 'having', 'orderBy', '$orderBy', 'limit', '$limit',
           '_origin', '_block', '$contains',
-          '_projections', '_parent', '_main', '_effectiveType', '$effectiveSeqNo', '$expand',
+          '_projections', '_complexProjections',
+          '_parent', '_main', '_effectiveType', '$effectiveSeqNo', '$expand',
           '$tableAliases', 'kind', '_$next', '_combined', '$inlines', '_status',
         ],
       },
@@ -313,7 +313,7 @@ function assertConsistency( model, stage ) {
           'kind', 'name', '$syntax', '_block', '_parent', '_main',
           'elements', '_origin', '_joinParent', '$joinArgsIndex', '$syntax',
           '$parens', '_status', // TODO: only in from
-          'scope', '_artifact', '$inferred', 'kind',
+          'scope', '_artifact', '_originalArtifact', '$inferred', 'kind',
           '_effectiveType', '$effectiveSeqNo',         // TODO:check this
           '$duplicates', // In JOIN if both sides are the same.
         ],
@@ -370,7 +370,8 @@ function assertConsistency( model, stage ) {
       requires: [ 'location' ],
       optional: [
         'path', 'elements', '_outer', '_parent', '_main', '_block', 'kind',
-        'scope', '_artifact', '$inferred', '$expand', '$inCycle', '$tableAliases', '_$next',
+        'scope', '_artifact', '$inferred', '$expand', '$inCycle',
+        '$tableAliases', '_$next',
         '_origin', '_effectiveType', '$effectiveSeqNo', '_extensions', '$contains',
       ],
     },
@@ -390,7 +391,8 @@ function assertConsistency( model, stage ) {
         'args', '$syntax',
         'where', 'groupBy', 'limit', 'orderBy', 'having',
         'cardinality',
-        '_artifact', '_navigation', '_user',
+        '_artifact', '_originalArtifact',
+        '_navigation', '_user',
         '$inferred',
       ],
     },
@@ -443,7 +445,10 @@ function assertConsistency( model, stage ) {
       test: expression,         // properties below are "sub specifications"
       ref: {
         requires: [ 'location', 'path' ],
-        optional: [ 'scope', 'variant', '_artifact', '$inferred', '$parens', 'sort', 'nulls' ],
+        optional: [
+          'scope', 'variant', '_artifact', '_originalArtifact',
+          '$inferred', '$parens', 'sort', 'nulls',
+        ],
       },
       none: { optional: () => true }, // parse error
       // TODO: why optional / enough in name?
@@ -488,7 +493,7 @@ function assertConsistency( model, stage ) {
         'literal', 'val', 'sym', 'struct', 'variant', 'path', 'name', '$duplicates', 'upTo',
         // expressions as annotation values
         '$tokenTexts', 'op', 'args', 'func', '_artifact', 'type', '$typeArgs',
-        'scale', 'srid', 'length', 'precision', 'scope',
+        'scale', 'srid', 'length', 'precision', 'scope', '$parens',
       ],
       // TODO: restrict path to #simplePath
     },
@@ -524,7 +529,7 @@ function assertConsistency( model, stage ) {
         '_effectiveType', '$effectiveSeqNo', '_origin', '_deps',
         // CSN parser may let these properties slip through to XSN, even if input is invalid.
         'args', 'op', 'func', 'suffix',
-        '$invalidPaths',
+        '$invalidPaths', '$parens',
       ],
       // TODO: name requires if not in parser?
     },
@@ -538,7 +543,7 @@ function assertConsistency( model, stage ) {
       schema: {
         id: { test: isStringOrNumber },
         select: { test: TODO }, // TODO: remove
-      }, // TODO: rename query prop in name
+      },
       requires: [ 'location' ],
       optional: [
         'path', 'id', '$delimited', 'variant', // TODO: req path, opt id for main, req id for member
@@ -572,6 +577,7 @@ function assertConsistency( model, stage ) {
         'elements', 'cardinality', 'target', 'on', 'foreignKeys', 'items',
         '_outer', '_effectiveType', '$effectiveSeqNo', 'notNull', '_parent',
         '_origin', '_block', '$inferred', '$expand', '$inCycle', '_deps',
+        'localized',            // really? see #13135
         '$calcDepElement',
         '$syntax', '_extensions',
         '_status', '_redirected',
@@ -607,6 +613,7 @@ function assertConsistency( model, stage ) {
     // - on a path item with a filter condition to the user of the ref (not nested)
     // - on a JOIN node to the query (TODO: _outer?)
     _artifact: { test: TODO },
+    _originalArtifact: { test: TODO },
     _navigation: { test: TODO },
     _effectiveType: { kind: true, test: TODO },
     $effectiveSeqNo: { kind: true, test: isNumber },
@@ -641,7 +648,7 @@ function assertConsistency( model, stage ) {
     $replacement: { kind: true, test: TODO }, // for smart * in queries
     _origin: { kind: true, test: TODO },
     _calcOrigin: { kind: true, test: TODO },
-    _pathHead: { kind: [ 'element', undefined ], test: TODO }, // column or * (wildcard)
+    _columnParent: { kind: [ 'element', undefined ], test: TODO }, // column or * (wildcard)
     _from: { kind: true, test: TODO }, // TODO: not necessary anymore ?
     // array of $tableAlias (or includes) for explicit and implicit redirection:
     _redirected: { kind: true, test: TODO },
@@ -658,7 +665,8 @@ function assertConsistency( model, stage ) {
     _scc: { kind: true, test: TODO },       // for cyclic calculation
     _sccCaller: { kind: true, test: TODO }, // for cyclic calculation
     _status: { kind: true, test: TODO },    // TODO: $status
-    _projections: { kind: true, test: TODO }, // for mixin definitions
+    _projections: { kind: true, test: TODO },
+    _complexProjections: { kind: true, test: TODO }, // for projected paths with filters
     $entity: { kind: true, test: TODO },
     _entities: { test: TODO },
     $compositionTargets: { test: isDictionary( isBoolean ) },
@@ -972,7 +980,7 @@ function assertConsistency( model, stage ) {
     return function valWithLocation( node, parent, prop, spec, name ) {
       const valSchema = { val: Object.assign( {}, spec, { test: func } ) };
       const requires = [ 'val', 'location' ];
-      const optional = [ 'literal', '$inferred', '$priority', '_pathHead' ];
+      const optional = [ 'literal', '$inferred', '$priority', '_columnParent' ];
       standard( node, parent, prop, {
         schema: valSchema, requires, optional, instanceOf: spec.instanceOf,
       }, name );
@@ -1033,7 +1041,7 @@ function assertConsistency( model, stage ) {
     // TODO
     // else if (spec.instanceOf && spec.instanceOf !== 'ignore' &&
     //    Object.getPrototypeOf( node ) !== spec.instanceOf.prototype)
-    // eslint-disable-next-line max-len
+    // eslint-disable-next-line @stylistic/js/max-len
     //  throw new InternalConsistencyError( `Expected object of class ${ spec.instanceOf.name } but found ${ found }${ at( [ null, parent ], prop, name ) }` );
   }
 

package/lib/compiler/builtins.js

@@ -77,6 +77,7 @@ typeParameters.list = Object.keys( typeParameters.expectedLiteralsFor );
 
 
 const specialFunctions = compileFunctions( {
+  // TODO: use lower-case
   '': [                         // the default
     {
       intro: [ 'ALL', 'DISTINCT' ],
@@ -218,7 +219,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 max-len
+// eslint-disable-next-line @stylistic/js/max-len
 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
 const numberRegEx = /^[ \t]*[-+]?(\d+(\.\d*)?|\.\d+)(e[-+]?\d+)?[ \t]*$/i;
@@ -231,7 +232,6 @@ const numberRegEx = /^[ \t]*[-+]?(\d+(\.\d*)?|\.\d+)(e[-+]?\d+)?[ \t]*$/i;
  *  - `unexpected_msg`: error message which is issued if `unexpected_char` matches
  *  - `unexpected_char`: regular expression matching an illegal character in `value`,
  *    the error location is only correct for a literal <prefix>'<value>'
- *  - `literal`: the value which is used instead of `prefix` in the AST
  * TODO: we might do a range check (consider leap seconds, i.e. max value 60),
  *       but always allow Feb 29 (no leap year computation)
  * Notes:

package/lib/compiler/checks.js

@@ -33,6 +33,8 @@ function check( model ) {
     error, warning, info, message,
   } = model.$messageFunctions;
 
+  const { getOrigin } = model.$functions;
+
   checkSapCommonLocale( model );
   checkSapCommonTextsAspects( model );
 
@@ -400,13 +402,18 @@ function check( model ) {
 
     const expectedType = isNumeric ? 'number' : 'string';
 
+    let art = enumNode;
+    while (art?._effectiveType && art.length === undefined)
+      art = getOrigin( art );
+    const maxLength = art.length?.val ?? model.options.defaultStringLength;
+
     // Do not check elements that don't have a value at all or are
     // references to other enum elements.  There are other checks for that.
     const hasWrongType = element => element.value &&
           (element.value.literal !== expectedType) &&
           (element.value.literal !== 'enum');
 
-    for (const key of Object.keys( enumNode.enum )) {
+    for (const key in enumNode.enum) {
       const element = enumNode.enum[key];
       if (hasWrongType( element )) {
         const actualType = element.value.literal;
@@ -418,6 +425,18 @@ function check( model ) {
           string: 'Expected string value for enum element $(NAME) but was $(PROP)',
         } );
       }
+      else if (isString && maxLength !== undefined) {
+        const value = element.value?.val ?? element.name.id;
+        if (value.length > maxLength) {
+          const loc = element.value?.location ?? element.name.location;
+          warning( 'def-invalid-value', [ loc, element ], {
+            '#': element.value ? 'std' : 'implicit', name: element.name.id, value: maxLength,
+          }, {
+            std: 'Enum value $(NAME) exceeds specified length $(VALUE)',
+            implicit: 'Implicit enum value $(NAME) exceeds specified length $(VALUE)',
+          } );
+        }
+      }
     }
   }
 
@@ -850,16 +869,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 max-len
+      // eslint-disable-next-line @stylistic/js/max-len
       return (isAssociationOperand( xpr.args[0] ) && isDollarSelfOrProjectionOperand( xpr.args[1] ) ||
-      // eslint-disable-next-line max-len
+      // eslint-disable-next-line @stylistic/js/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 max-len
+      // eslint-disable-next-line @stylistic/js/max-len
       return (isAssociationOperand( xpr.args[0] ) && isDollarSelfOrProjectionOperand( xpr.args[2] ) ||
-              // eslint-disable-next-line max-len
+              // eslint-disable-next-line @stylistic/js/max-len
               isAssociationOperand( xpr.args[2] ) && isDollarSelfOrProjectionOperand( xpr.args[0] ));
     }
 
@@ -1054,7 +1073,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 max-len
+          // eslint-disable-next-line @stylistic/js/max-len
                  'A date/time value or a string is required for type $(TYPE) for annotation $(ANNO)' );
       }
     }

package/lib/compiler/define.js

@@ -174,7 +174,6 @@ function define( model ) {
     shuffleArray,
     initArtifact,
     initMembers,
-    checkDefinitions,           // TODO: remove
     initSelectItems,
   } );
 
@@ -188,13 +187,12 @@ function define( model ) {
   function doDefine() {
     if (options.deprecated &&
         messages.every( m => m.messageId !== 'api-deprecated-option' )) {
-      warning( 'api-deprecated-option', {},
-               { prop: 'deprecated', '#': (options.beta ? 'beta' : 'std') }, {
-               // TODO: make the text scarier in future versions
-                 std: 'With option $(PROP), many newer features are disabled',
-                 // eslint-disable-next-line max-len
-                 beta: 'With option $(PROP), beta features and many other newer features are disabled',
-               } );
+      warning( 'api-deprecated-option', {}, {
+        prop: 'deprecated', '#': (options.beta ? 'beta' : 'std'),
+      }, {
+        std: 'With option $(PROP), recent features are disabled',
+        beta: 'With option $(PROP), beta features and other recent features are disabled',
+      } );
     }
     model.definitions = Object.create( null );
     setLink( model, '_entities', [] ); // for entities with includes
@@ -317,7 +315,7 @@ function define( model ) {
       if (artifacts[using])
         continue;
       // TODO: enable optional locations
-      const location = a.name.path && a.name.path[0].location || a.location;
+      const location = a.name.path?.[0]?.location || a.location;
       const absolute = prefix + using;
       artifacts[using] = {
         kind: 'using',          // !, not namespace - we do not know artifact yet
@@ -350,7 +348,7 @@ function define( model ) {
       return;
     decl.extern.id = pathName( path );
     if (!decl.name)
-      decl.name = { ...path[path.length - 1], $inferred: 'as' };
+      decl.name = { ...path.at(-1), $inferred: 'as' };
     const name = decl.name.id;
     // TODO: check name: no "."
     const found = src.artifacts[name];
@@ -365,7 +363,7 @@ function define( model ) {
   function addNamespace( namespace, src ) {
     // create using for own namespace:
     // TODO: should we really do that (in v6)?  See also initNamespaceAndUsing().
-    const last = namespace.path[namespace.path.length - 1];
+    const last = namespace.path.at(-1);
     const { id } = last;
     if (src.artifacts[id] || last.id.includes( '.' ))
       // not used as we have a definition/using with that name, or dotted last path id
@@ -437,8 +435,8 @@ function define( model ) {
     } );
     if (parent.kind !== 'extend')
       return;
-    if (parent.columns)            // TODO: sub queries? expand/inline?
-      parent.columns.forEach( c => setLink( c, '_block', parent._block ) );
+    // TODO: sub queries? expand/inline?
+    parent.columns?.forEach( c => setLink( c, '_block', parent._block ) );
     if (parent.scale && !parent.precision) {
       // TODO: where could we store the location of the name?
       error( 'syntax-missing-type-property', [ parent.scale.location ],
@@ -794,7 +792,7 @@ function define( model ) {
         setMemberParent( table, query.name.id, query ); // sets _parent,_main
         initSubQuery( table );  // init sub queries in ON
         const aliases = Object.keys( table.$tableAliases || {} );
-        // Use first tabalias name on the right side of the join to name the
+        // Use first table alias name on the right side of the join to name the
         // (internal) query, should only be relevant for --raw-output, not for
         // user messages or references - TODO: correct if join on left?
         table.name.id = aliases[1] || aliases[0] || '<unknown>';
@@ -903,9 +901,9 @@ function define( model ) {
       hasItems = true;
       if (!columns) {           // expand or inline
         if (parent.value)
-          setLink( col, '_pathHead', parent ); // also set for '*' in expand/inline
-        else if (parent._pathHead)
-          setLink( col, '_pathHead', parent._pathHead );
+          setLink( col, '_columnParent', parent ); // also set for '*' in expand/inline
+        else if (parent._columnParent)
+          setLink( col, '_columnParent', parent._columnParent );
       }
       if (col.val === '*') {
         if (!wildcard) {
@@ -919,16 +917,15 @@ function define( model ) {
         else {
           // a late syntax error (this code also runs with parse-cdl), i.e.
           // no semantic loc (wouldn't be available for expand/inline anyway)
-          error( 'syntax-duplicate-wildcard', [ col.location, null ],
-                 {
-                   '#': (wildcard.location.col ? 'col' : 'std'),
-                   prop: '*',
-                   line: wildcard.location.line,
-                   col: wildcard.location.col,
-                 }, {
-                   std: 'You have provided a $(PROP) already in line $(LINE)',
-                   col: 'You have provided a $(PROP) already at line $(LINE), column $(COL)',
-                 } );
+          error( 'syntax-duplicate-wildcard', [ col.location, null ], {
+            '#': (wildcard.location.col ? 'col' : 'std'),
+            prop: '*',
+            line: wildcard.location.line,
+            col: wildcard.location.col,
+          }, {
+            std: 'You have provided a $(PROP) already in line $(LINE)',
+            col: 'You have provided a $(PROP) already at line $(LINE), column $(COL)',
+          } );
           // TODO: extra text variants for expand/inline? - probably not
           col.val = null;       // do not consider it for expandWildcard()
         }
@@ -1073,7 +1070,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 max-len
+                 // eslint-disable-next-line @stylistic/js/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;
@@ -1094,7 +1091,7 @@ function define( model ) {
 
     function initAnonymousAspect() {
       // TODO: main?
-      const inEntity = parent._main && parent._main.kind === 'entity';
+      const inEntity = parent._main?.kind === 'entity';
       // TODO: also allow indirectly (component in component in entity)?
       setLink( targetAspect, '_outer', obj );
       setLink( targetAspect, '_parent', parent._parent );
@@ -1205,7 +1202,7 @@ function define( model ) {
     if (path?.length === 1 && path[0]?.id === '$self') { // TODO: no where: ?
       const $self = main.$tableAliases?.$self ||
                     main.kind === 'extend' && { name: { id: '$self' } };
-      // remark: an extend has no "table alias" `$self` (relevant for parse-cdl)
+      // remark: an 'extend' has no "table alias" `$self` (relevant for parse-cdl)
       setLink( type, '_artifact', $self );
       setLink( path[0], '_artifact', $self );
     }
@@ -1258,7 +1255,6 @@ function define( model ) {
         return false;
       }
     }
-    //
     else if (parent.kind === 'action' || parent.kind === 'function') {
       error( 'ext-unexpected-action', [ construct.location, construct ], { '#': parent.kind }, {
         std: 'Actions and functions can\'t be extended, only annotated', // TODO: → ext-unsupported

package/lib/compiler/extend.js

@@ -441,8 +441,8 @@ function extend( model ) {
   function applySingleExtension( art, ext, prop ) {
     if (prop === 'includes') {
       if (ext.kind === 'extend' && art.$inferred) {
-        error( 'extend-for-generated', [ ext.name.location, ext ], { art },
-               'You can\'t use EXTEND on the generated $(ART)' );
+        error( 'extend-for-generated', [ ext.name.location, ext ], { art, keyword: 'extend' },
+               'You can\'t use $(KEYWORD) on the generated $(ART)' );
       }
       else if (art.kind !== 'annotate' && !art._outer) { // not with elem extension in targetAspect
         const { id } = art.name;
@@ -543,7 +543,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 max-len
+             // eslint-disable-next-line @stylistic/js/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)',
@@ -640,9 +640,9 @@ function extend( model ) {
     }
     else if (extVal < artVal + (scaleDiff || 0)) {
       const number = artVal + (scaleDiff || 0);
-      error( 'ext-invalid-type-property', [ ext[prop].location, ext ],
-             // eslint-disable-next-line object-curly-newline
-             { '#': (scaleDiff ? 'scale' : 'number'), prop, number, otherprop: 'scale' } );
+      error( 'ext-invalid-type-property', [ ext[prop].location, ext ], {
+        '#': (scaleDiff ? 'scale' : 'number'), prop, number, otherprop: 'scale',
+      } );
     }
     else {
       art[prop] = ext[prop];
@@ -797,7 +797,7 @@ function extend( model ) {
     const dict = parent[prop];
     if (!dict) {
       // TODO: check - for each name? - better locations
-      const location = ext._parent[prop]?.[$location] || ext.name.location;
+      const location = ext._parent?.[prop]?.[$location] || ext.name.location;
       // Remark: no `elements` dict location with `annotate Main:elem`
       switch (prop) {
         // TODO: change texts, somehow similar to checkDefinitions() ?
@@ -1052,8 +1052,8 @@ function extend( model ) {
       if (ext.name._artifact === undefined) { // not already applied
         setArtifactLink( ext.name, art );
         if (noExtend && ext.kind === 'extend') {
-          error( 'extend-for-generated', [ ext.name.location, ext ], { art },
-                 'You can\'t use EXTEND on the generated $(ART)' );
+          error( 'extend-for-generated', [ ext.name.location, ext ], { art, keyword: 'extend' },
+                 'You can\'t use $(KEYWORD) on the generated $(ART)' );
           continue;
         }
         if (ext.includes) {
@@ -1170,14 +1170,11 @@ function extend( model ) {
       // TODO: use shared functionality with notFound in resolver.js
       const { location } = ext.name;
       extMain.kind = ext.kind;
-      const msg
-        = error( 'extend-undefined', [ location, artName ],
-                 { art: artName },
-                 {
-                   std: 'Unknown $(ART) - nothing to extend',
-                   element: 'Artifact $(ART) has no element or enum $(MEMBER) - nothing to extend',
-                   action: 'Artifact $(ART) has no action $(MEMBER) - nothing to extend',
-                 } );
+      const msg = error( 'extend-undefined', [ location, artName ], { art: artName }, {
+        std: 'Unknown $(ART) - nothing to extend',
+        element: 'Artifact $(ART) has no element or enum $(MEMBER) - nothing to extend',
+        action: 'Artifact $(ART) has no action $(MEMBER) - nothing to extend',
+      } );
       attachAndEmitValidNames( msg, validDict );
     }
   }
@@ -1192,6 +1189,7 @@ function extend( model ) {
    *
    * @param {XSN.Definition} art
    * @param {XSN.Artifact} target
+   * @param {string[]} [justResolveCyclic]
    * @returns {boolean}
    */
   function canApplyIncludes( art, target, justResolveCyclic ) {
@@ -1272,7 +1270,7 @@ function extend( model ) {
    *
    * @param {XSN.Extension} ext
    * @param {XSN.Artifact} art
-   * @param {string} prop: 'elements' or 'actions'
+   * @param {string} prop 'elements' or 'actions'
    */
   function includeMembers( ext, art, prop ) {
     // TODO two kind of messages:

package/lib/compiler/generate.js

@@ -103,7 +103,7 @@ function generate( model ) {
       const lang = textsAspect.elements.language;
       error( 'def-unexpected-element', [ lang.name.location, lang ],
              { option: 'addTextsLanguageAssoc', art: textsAspect, name: 'language' },
-        // eslint-disable-next-line max-len
+        // eslint-disable-next-line @stylistic/js/max-len
              '$(ART) is not used because option $(OPTION) conflicts with existing element $(NAME); remove either option or element' );
       hasError = true;
     }
@@ -244,7 +244,7 @@ function generate( model ) {
           (fioriEnabled && art.elements.ID_texts)) {
         // TODO if we have too much time: check all elements of texts entity for safety
         warning( null, [ art.name.location, art ], { art: textsEntity },
-                 // eslint-disable-next-line max-len
+                 // eslint-disable-next-line @stylistic/js/max-len
                  'Texts entity $(ART) can\'t be created as there is another definition with that name' );
         info( null, [ textsEntity.name.location, textsEntity ], { art },
               'Texts entity for $(ART) can\'t be created with this definition' );
@@ -639,7 +639,7 @@ function generate( model ) {
     }
     if (model.definitions[entityName]) {
       error( null, [ location, elem ], { art: entityName },
-             // eslint-disable-next-line max-len
+             // eslint-disable-next-line @stylistic/js/max-len
              'Target entity $(ART) can\'t be created as there is another definition with this name' );
       return false;
     }

package/lib/compiler/populate.js

@@ -632,6 +632,12 @@ function populate( model ) {
     }
   }
 
+  /**
+   * Set type properties of specified elements on the inferred artifact, but only
+   * assign them if their values differs from the inferred ones (for better locations).
+   *
+   * @param {XSN.Artifact} art
+   */
   function setSpecifiedElementTypeProperties( art ) {
     for (const prop in art.typeProps$) {
       let o = art;
@@ -789,8 +795,8 @@ function populate( model ) {
         return col.name.id;
       }
     }
-    else if (col.expand || col.value && (col._pathHead || query._parent.kind !== 'select')) {
-      // _pathHead => inline/expand; _parent -> only allowed in sub-selects
+    else if (col.expand || col.value && (col._columnParent || query._parent.kind !== 'select')) {
+      // _columnParent => inline/expand; _parent -> only allowed in sub-selects
       error( 'query-req-name', [ col.value?.location || col.location, query ], {},
              'Alias name is required for this select item' );
     }
@@ -867,7 +873,7 @@ function populate( model ) {
     const inferred = query._main.$inferred;
     const excludingDict = (colParent || query).excludingDict || Object.create( null );
 
-    const envParent = wildcard._pathHead; // TODO: rename _pathHead to _columnParent
+    const envParent = wildcard._columnParent;
     const env = wildcardColumnEnv( wildcard, query );
     if (!env)
       return;
@@ -931,7 +937,7 @@ function populate( model ) {
       // already done in populateQuery (TODO: change that and check whether
       // `*` is allowed at all in definer)
       if (!colParent || colParent.value._artifact) {
-        // avoid "not found" messages if pathHead can't be found
+        // avoid "not found" messages if columnParent can't be found
         const user = colParent || query;
         for (const name in user.excludingDict)
           resolveExcluding( name, env, excludingDict, query );
@@ -939,9 +945,9 @@ function populate( model ) {
     }
   }
 
-  function wildcardColumnEnv( wildcard, query ) { // etc.  wildcard._pathHead;
+  function wildcardColumnEnv( wildcard, query ) { // etc.  wildcard._columnParent;
     // if (envParent) console.log( 'CE:', envParent._origin, query );
-    const colParent = wildcard._pathHead;
+    const colParent = wildcard._columnParent;
     if (!colParent)
       return userQuery( query )._combined; // see combinedSourcesOrParentElements
 
@@ -972,27 +978,27 @@ function populate( model ) {
         // ID published! Used in stakeholder project; if renamed, add to oldMessageIds
         info( 'wildcard-excluding-many', [ sibling.name.location, query ],
               { id, keyword: 'excluding' },
-              // eslint-disable-next-line max-len
+              // eslint-disable-next-line @stylistic/js/max-len
               'This select item replaces $(ID) from two or more sources. Add $(ID) to $(KEYWORD) to silence this message' );
       }
       else {
         // ID published! Used in stakeholder project; if renamed, add to oldMessageIds
         info( 'wildcard-excluding-one', [ sibling.name.location, query ],
               { id, alias: navElem._parent.name.id, keyword: 'excluding' },
-              // eslint-disable-next-line max-len
+              // eslint-disable-next-line @stylistic/js/max-len
               'This select item replaces $(ID) from table alias $(ALIAS). Add $(ID) to $(KEYWORD) to silence this message' );
       }
     }
   }
 
-  function setWildcardExpandInline( queryElem, pathHead, origin, name, location ) {
-    setLink( queryElem, '_pathHead', pathHead );
+  function setWildcardExpandInline( queryElem, columnParent, origin, name, location ) {
+    setLink( queryElem, '_columnParent', columnParent );
     const path = [ { id: name, location } ];
     queryElem.value = { path, location }; // TODO: can we omit that?  We have _origin
     setArtifactLink( path[0], origin );
     setLink( queryElem, '_origin', origin );
     // set _projections when inline with table alias:
-    // const alias = pathHead?.value?.path?.[0]?._navigation;
+    // const alias = columnParent?.value?.path?.[0]?._navigation;
     // if (alias?.kind === '$tableAlias')
     //   pushLink( alias.elements[name], '_projections', queryElem );
   }
@@ -1106,9 +1112,9 @@ function populate( model ) {
                  // art: definitionScope( target ), - TODO extra debug info in message
                  sorted_arts: exposed,
                }, {
-                 // eslint-disable-next-line max-len
+                 // eslint-disable-next-line @stylistic/js/max-len
                  std: 'Replace target $(TARGET) by one of $(SORTED_ARTS); can\'t auto-redirect this association if multiple projections exist in this service',
-                 // eslint-disable-next-line max-len
+                 // eslint-disable-next-line @stylistic/js/max-len
                  two: 'Replace target $(TARGET) by $(SORTED_ARTS) or $(SECOND); can\'t auto-redirect this association if multiple projections exist in this service',
                } );
       // continuation semantics: no auto-redirection
@@ -1130,11 +1136,11 @@ function populate( model ) {
                    anno: 'cds.redirection.target',
                    sorted_arts: exposed,
                  }, {
-                   // eslint-disable-next-line max-len
+                   // eslint-disable-next-line @stylistic/js/max-len
                    std: 'Add $(ANNO) to one of $(SORTED_ARTS) to select the entity as redirection target for $(TARGET) in this service; can\'t auto-redirect $(ART) otherwise',
-                   // eslint-disable-next-line max-len
+                   // eslint-disable-next-line @stylistic/js/max-len
                    two: 'Add $(ANNO) to either $(SORTED_ARTS) or $(SECOND) to select the entity as redirection target for $(TARGET) in this service; can\'t auto-redirect $(ART) otherwise',
-                   // eslint-disable-next-line max-len
+                   // eslint-disable-next-line @stylistic/js/max-len
                    justOne: 'Remove $(ANNO) from all but one of $(SORTED_ARTS) to have a unique redirection target for $(TARGET) in this service; can\'t auto-redirect $(ART) otherwise',
                  } );
       }

package/lib/compiler/propagator.js

@@ -66,6 +66,7 @@ function propagate( model ) {
     __proto__: null,
     never,
     onlyViaArtifact,
+    onlyViaParent,
     notWithPersistenceTable,
   };
   for (const rule in propagationRules)
@@ -73,7 +74,7 @@ function propagate( model ) {
 
   const { options } = model;
   const { rewriteAnnotationsRefs } = xprRewriteFns( model );
-  // eslint-disable-next-line max-len
+  // eslint-disable-next-line @stylistic/js/max-len
   const oldVirtualNotNullPropagation = isDeprecatedEnabled( options, '_oldVirtualNotNullPropagation' );
   const { warning, throwWithError } = model.$messageFunctions;
 
@@ -367,7 +368,7 @@ function propagate( model ) {
       const art = item && item._artifact;
       if (art && art.virtual && art.virtual.val) {
         warning( 'def-missing-virtual', [ item.location, elem ], { art, keyword: 'virtual' },
-                 // eslint-disable-next-line max-len
+                 // eslint-disable-next-line @stylistic/js/max-len
                  'Prepend $(KEYWORD) to current select item - referred element $(ART) is virtual which is not inherited' );
         return;
       }