@sap/cds-compiler 5.2.0 → 5.3.2

package/CHANGELOG.md

@@ -7,6 +7,45 @@
 Note: `beta` fixes, changes and features are usually not listed in this ChangeLog but [here](doc/CHANGELOG_BETA.md).
 The compiler behavior concerning `beta` features can change at any time without notice.
 
+## Version 5.3.2 - 2024-10-08
+
+### Fixed
+
+- to.sql|hdi|hdbcds|effective: Handle subexpressions in conjunction with exists predicate.
+
+
+## Version 5.3.0 - 2024-09-25
+
+### Added
+
+- compiler:
+  - A warning is emitted if a string enum's values are longer than the specified length.
+  - ON-condition rewriting has been improved and now supports secondary associations.
+- to.edm(x): Support optional action and function parameters in OData V4. The following rules apply:
+  + A parameter declared `not null` without default value is mandatory.
+  + A **function** parameter declared `null` without default value is mandatory.
+  + An **action** parameter declared `null` without default value is optional as it is equivalent to
+    `@Core.OptionalParameter { DefaultValue: null }`.
+  + A parameter with a default value is optional and the default value is rendered as
+    `@Core.OptionalParameter { DefaultValue: <value> }` regardless of its nullability.
+  + `@Core.OptionalParameter: true` can be used to turn a mandatory parameter into an optional parameter
+    (especially function parameters) and to signal an unspecified default value in the API if the parameter
+    has no default clause.
+  + `@Core.OptionalParameter: false` turns the creation of a `@Core.OptionalParameter: { Default: ... }`
+    annotation off.
+  + A default clause or `@Core.OptionalParameter: <bool>` have no effect on an explicit binding parameter.
+  + Mandatory and optional **action** parameters may appear in any order.
+  + Optional **function** parameters must not be followed by mandatory parameters.
+- to.edm: Forward `@OpenAPI {...}` into EDM Json with option `--odata-openapi-hints`.
+- cdsc: Option `--transitive-localized-views` was added.
+
+### Fixed
+
+- CDL parser: Issue warning if annotation assignments have been written
+  at an invalid position inside a type expressions.
+- CDL parser: Issue warning for arrayed parameter with default value.
+- to.cdl: Arrayed parameters with default values were not rendered correctly.
+
 ## Version 5.2.0 - 2024-08-27
 
 ### Added

package/bin/cdsc.js

@@ -217,6 +217,11 @@ function cdsc_main() {
   if (cmdLine.options.stdin)
     cmdLine.options.fallbackParser ??= 'auto!';
 
+  if (cmdLine.options[cmdLine.command]?.transitiveLocalizedViews) {
+    cmdLine.options.fewerLocalizedViews = !cmdLine.options[cmdLine.command].transitiveLocalizedViews
+    delete cmdLine.options[cmdLine.command].transitiveLocalizedViews;
+  }
+
   parseSeverityOptions(cmdLine);
 
   // Do the work for the selected command

package/bin/cdshi.js

@@ -47,20 +47,20 @@ function highlight( err, buf ) {
     console.error( 'ERROR:', err.toString() );
     return;
   }
-  const parser = compiler.parseX( buf, 'hi.cds', options ).tokenStream;
-  // ts is parser with new parser
-  const { tokens, lexer } = parser;
+  const { tokenStream } = compiler.parseX( buf, 'hi.cds', options );
+  const { tokens, lexer } = tokenStream;
   if (!buf.length || !tokens || !tokens.length)
     return;
+
   const chars = [ ...buf ];
   for (const tok of tokens) {
-    const { location } = tok;
-    const start = lexer.characterPos( location.line, location.col );
+    if (tok.type === 'Comment') // but interpret DocComment!
+      continue;
+    const { location, start } = tok;
     if (start < 0)
       continue;
     const stop = lexer.characterPos( location.endLine, location.endCol ) - 1;
-    const cat = tok.parsed;
-    // console.log(tok.location.toString(),tok.text,tok.parsed,stop > start)
+    const cat = tok.parsedAs;
     if (!cat) {
       if (stop > start) {
         chars[start] = (cat !== 0 ? '\x0f' : '\x16'); // ^O / ^V (ERROR)
@@ -73,7 +73,7 @@ function highlight( err, buf ) {
     else if (cat !== 'keyword' && cat !== 'token') {
       if (cat !== 'ref' || chars[start] !== '$')
         chars[start] = categoryChars[cat] || cat.charAt(0);
-      if (stop > start) // stop in ANTLR at last char, not behind
+      if (stop > start)
         chars[start + 1] = '_';
     }
   }

package/doc/CHANGELOG_BETA.md

@@ -8,6 +8,11 @@ Note: `beta` fixes, changes and features are listed in this ChangeLog just for i
 The compiler behavior concerning `beta` features can change at any time without notice.
 **Don't use `beta` fixes, changes and features in productive mode.**
 
+## Version 5.3.0 - 2024-09-25
+
+### Removed `optionalActionFunctionParameters`
+
+It is now enabled by default.
 
 ## Version 5.0.0 - 2024-05-29
 
@@ -17,19 +22,19 @@ It is now enabled by default.
 
 ## Version 4.9.0 - 2024-04-25
 
-## Removed `odataAnnotationExpressions`
+### Removed `odataAnnotationExpressions`
 
 It is now enabled by default.
 
-## Removed `odataPathsInAnnotationExpressions`
+### Removed `odataPathsInAnnotationExpressions`
 
 It is now enabled by default.
 
-## Removed `annotationExpressions`
+### Removed `annotationExpressions`
 
 It is now enabled by default.
 
-## Added `temporalRawProjection`
+### Added `temporalRawProjection`
 
 Enables revocation of temporal where clause in projections of temporal entities if the
 `@cds.valid { from, to }` annotations on the projection elements have falsy values.

package/lib/api/validate.js

@@ -118,6 +118,11 @@ const validators = {
     expected: () => 'type boolean|number',
     found: val => `type ${ typeof val }`,
   },
+  withLocations: {
+    validate: val => typeof val === 'boolean' || val === 'withEndPosition',
+    expected: () => 'type boolean|"withEndPosition"',
+    found: val => `type ${ typeof val }`,
+  },
   dictionaryPrototype: {
     validate: () => true,
   },

package/lib/base/message-registry.js

@@ -158,6 +158,7 @@ const centralMessages = {
   'syntax-invalid-name': { severity: 'Error', configurableFor: 'deprecated' },
   'syntax-missing-as': { severity: 'Error', configurableFor: true },
   'syntax-missing-proj-semicolon': { severity: 'Warning', errorFor: [ 'v6' ] },
+  'syntax-unexpected-after': { severity: 'Warning', errorFor: [ 'v6' ] },
   'syntax-unexpected-many-one': { severity: 'Error', configurableFor: true }, // TODO: remove `configurableFor` soon, latest v6
   'syntax-unexpected-null': { severity: 'Error', configurableFor: true },
   'syntax-unexpected-reserved-word': { severity: 'Error', configurableFor: true },
@@ -359,6 +360,11 @@ const centralMessageTexts = {
     std: 'Annotations can\'t be used in a column with $(CODE)',
     doc: 'Doc comments can\'t be used in a column with $(CODE)',
   },
+  'syntax-unexpected-after': {
+    std: 'Unexpected $(KEYWORD) after annotation assignment',
+    many: 'Unexpected $(KEYWORD) after array type',
+    enum: 'Unexpected annotation assignment after enum type',
+  },
   'syntax-unexpected-many-one': 'Replace $(CODE) with $(DELIMITED) to avoid an ambiguity with managed compositions of anonymous aspects',
   'syntax-invalid-name': {
     std: 'Identifier must consist of at least one character', // only via delimited id
@@ -704,6 +710,10 @@ const centralMessageTexts = {
     'inline-expand': 'The ON-condition is not rewritten in nested projections - provide an explicit ON-condition',
     'secondary': 'The ON-condition is not rewritten due to multiple associations in this path - provide an explicit ON-condition',
   },
+  'rewrite-not-projected': {
+    std: 'Projected association $(NAME) uses non-projected element $(ELEMREF)',
+    element: 'Projected association $(NAME) uses non-projected element $(ELEMREF) of $(ART)',
+  },
   'type-unsupported-rewrite': {
     std:  'Rewriting the ON-condition not supported here', // unused: merge with 'rewrite-not-supported'
     'sub-element': 'Rewriting the ON-condition of unmanaged association in sub element is not supported'
@@ -753,6 +763,13 @@ const centralMessageTexts = {
     'onCond': 'Unexpected $(KEYWORD) on an association/composition with ON-condition; $(KEYWORD) requires exactly one foreign key',
     'targetAspect': 'Unexpected $(KEYWORD) on composition of aspect'
   },
+  'type-expecting-service-target': {
+    std: 'Expecting service entity $(TARGET)',
+    ref: 'Expecting service entity $(TARGET); its element $(ID) referred to at line $(LINE), column $(COL) is not from an element with the same name in the provided model target',
+    key: 'Expecting service entity $(TARGET); its key element $(ID) is not from a key element with the same name in the provided model target',
+    missing: 'Expecting service entity $(TARGET); it does not have the key element $(ID) of the provided model target',
+    order: 'Expecting service entity $(TARGET); its key elements are in a different order than those of the provided model target',
+  },
 
   'anno-builtin': 'Builtin types should not be annotated nor extended. Use custom type instead',
   'ext-undefined-def': 'Artifact $(ART) has not been found',
@@ -988,6 +1005,13 @@ const centralMessageTexts = {
     foreignKeys: 'Foreign key $(ID) does not result from the query',
   },
 
+  // ID published! Used in stakeholder project; if renamed, add to oldMessageIds
+  'redirected-to-complex': {
+    std: 'Redirection involves the complex view $(ART); add an explicit ON-condition/foreign keys to redirection',
+    target: 'The redirected target $(ART) is a complex view; add an explicit ON-condition/foreign keys to redirection',
+    targetOp: 'The redirected target $(ART) is a complex view with $(KEYWORD); add an explicit ON-condition/foreign keys to redirection',
+  },
+
   'ref-sloppy-target': 'An entity or an aspect (not type) is expected here',
 
   'ref-ambiguous': {
@@ -1118,7 +1142,7 @@ const centralMessageTexts = {
   'odata-key-recursive': 'Unexpected recursive key $(NAME)',
   'odata-key-uuid-default-anno': 'Expected element of type $(TYPE) to be annotated with $(ANNO) when used as primary key in $(ID)',
   'odata-ignoring-param-default': {
-    'std': 'Ignoring default value on parameter',
+    'std': 'Ignoring default value',
     'xpr': 'Ignoring unexpected expression as default value',
     'colitem': 'Ignoring unexpected default value for a structured or collection like parameter',
   },

package/lib/base/messages.js

@@ -908,7 +908,7 @@ function transformArg( arg, r, args, texts ) {
     return quoted( arg );
   if (arg._artifact)
     arg = arg._artifact;
-  if (arg._outer)
+  while (arg._outer) // nested 'items'
     arg = arg._outer;
   if (args['#'] || args.member )
     return shortArtName( arg );

package/lib/base/model.js

@@ -21,7 +21,6 @@ const availableBetaFlags = {
   mapAssocToJoinCardinality: true, // only SAP HANA HEX engine supports it
   enableUniversalCsn: true,
   odataTerms: true,
-  optionalActionFunctionParameters: true, // not supported by runtime, yet.
   effectiveCsn: true,
   tenantVariable: true,
   calcAssoc: true,

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',
@@ -578,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',
@@ -1041,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

@@ -219,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;

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>';
@@ -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

@@ -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];
@@ -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;
@@ -972,14 +978,14 @@ 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' );
       }
     }
@@ -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

@@ -74,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;
 
@@ -368,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;
       }