@sap/cds-compiler 5.6.0 → 5.7.0

package/lib/base/messages.js

@@ -17,7 +17,7 @@ const meta = require('./meta');
 
 const fs = require('fs');
 const path = require('path');
-const { inspect } = require('util')
+const { inspect } = require('util');
 
 // term instance for messages
 const colorTerm = term();
@@ -89,7 +89,7 @@ function isDowngradable( messageId, moduleName, options ) {
  *
  * @returns {string}
  */
-function severityChangeMarker(msg, config) {
+function severityChangeMarker( msg, config ) {
   const severity = msg.severity || 'Error';
   if (config.moduleForMarker) {
     if (severity === 'Error' &&
@@ -118,7 +118,7 @@ class CompilationError extends Error {
     // no proper message about _what_ the root cause of the exception was.
     // To mitigate that, we serialize the first error in the message as well.
     const firstError = messages.find( m => m.severity === 'Error' )?.toString() || '';
-    super( `CDS compilation failed (@sap/cds-compiler v${ meta.version() })\n${firstError}` );
+    super( `CDS compilation failed (@sap/cds-compiler v${ meta.version() })\n${ firstError }` );
 
     /** @since v4.0.0 */
     this.code = 'ERR_CDS_COMPILATION_FAILURE';
@@ -153,8 +153,7 @@ class CompilationError extends Error {
     if (this.messages) {
       messages = messages.concat(this.messages
         .filter(msg => msg.severity === 'Error')
-        .map( m => m.toString())
-      );
+        .map( m => m.toString()));
     }
     return messages.join('\n');
   }
@@ -235,7 +234,7 @@ const severitySpecs = {
  */
 function reclassifiedSeverity( msg, options, moduleName ) {
   const spec = centralMessages[msg.messageId] || { severity: msg.severity, configurableFor: null, errorFor: null };
-  let severity = spec.severity;
+  let { severity } = spec;
 
   if (spec.severity === 'Error') {
     if (!isDowngradable(msg.messageId, moduleName, options))
@@ -430,7 +429,7 @@ function makeMessageFunction( model, options, _moduleName = null ) {
     hasNewError = hasNewError || msg.severity === 'Error' &&
       !(options.testMode && isDowngradable( msg.messageId, moduleName, options ));
     if (!hasMessageArray)
-      console.error( messageString( msg ) );
+      console.error( messageString( msg ) ); // eslint-disable-line no-console
     return msg;
   }
 
@@ -500,7 +499,7 @@ function makeMessageFunction( model, options, _moduleName = null ) {
 
     let semanticLocation = location[1] ? homeName( location[1], false ) : null;
     if (location[2]) { // optional suffix, e.g. annotation
-      semanticLocation += `/${ (typeof location[2] === 'string') ? location[2]: homeName(location[2]) }`;
+      semanticLocation += `/${ (typeof location[2] === 'string') ? location[2] : homeName(location[2]) }`;
     }
 
     const definition = location[1] ? homeName( location[1], true ) : null;
@@ -564,9 +563,8 @@ function makeMessageFunction( model, options, _moduleName = null ) {
   }
 
   function throwWithError() {
-    if (hasNewError) {
+    if (hasNewError)
       throw new CompilationError(messages, options.attachValidNames && model);
-    }
   }
 
   /**
@@ -581,9 +579,8 @@ function makeMessageFunction( model, options, _moduleName = null ) {
     if (!messages || !messages.length)
       return;
     const hasError = options.testMode ? hasNonDowngradableErrors : hasErrors;
-    if (hasError( messages, moduleName, options )) {
+    if (hasError( messages, moduleName, options ))
       throw new CompilationError(messages, options.attachValidNames && model);
-    }
   }
 
   /**
@@ -635,11 +632,10 @@ function makeMessageFunction( model, options, _moduleName = null ) {
   }
 
   /**
-   * 
    * Change the moduleName used for reclassifying messages.
    * Needed for to.sql.migration + script
-   * 
-   * @param {string} __moduleName 
+   *
+   * @param {string} __moduleName
    */
   function setModuleName( __moduleName ) {
     moduleName = __moduleName;
@@ -654,8 +650,6 @@ function makeMessageFunction( model, options, _moduleName = null ) {
   function setOptions( _options ) {
     options = _options;
   }
-
-
 }
 
 /**
@@ -789,9 +783,13 @@ const paramsTransform = {
   // more complex convenience:
   names: transformManyWith( quoted ),
   number: quote.single,         // number cited from source or expected in source
+  location: ({ line, col }) => `${ line }:${ col }`,
   count: quote.direct,
   line: quote.direct,
   col: quote.direct,
+  literal: quote.direct,
+  n: quote.direct,
+  m: quote.direct,
   value,
   rawvalue: quote.single,
   rawvalues: transformManyWith( quote.single ),  // no 'double' quotes for strings
@@ -812,9 +810,9 @@ const paramsTransform = {
   version: quote.single, // TODO delete: just use for OData $(VERSION), with version: 2.0
 };
 
-function asDelimitedId(id) {
+function asDelimitedId( id ) {
   // Same as in toCdl, but we don't want cyclic dependencies to toCdl.
-  return `![${id.replace(/]/g, ']]')}]`;
+  return `![${ id.replace(/]/g, ']]') }]`;
 }
 
 function anno( name ) {
@@ -912,9 +910,10 @@ function transformElementRef( arg ) {
     ((arg.scope === 'param' || arg.param) ? ':' : '') +
     ref.map(
       item => (typeof item !== 'string'
-               ? `${ item.id }${item.args ? '(…)' : ''}${item.where ? '[…]' : ''}`
-               : item) )
-      .join('.') );
+        ? `${ item.id }${ item.args ? '(…)' : '' }${ item.where ? '[…]' : '' }`
+        : item)
+    ).join('.')
+  );
 }
 
 function transformArg( arg, r, args, texts ) {
@@ -936,7 +935,7 @@ function transformArg( arg, r, args, texts ) {
     return quoted( arg.name );
   const name = getArtifactName( arg );
   const prop = [ 'element', 'param', 'action', 'alias' ].find( p => name[p] );
-  //if (!prop) throw Error()
+  // if (!prop) throw Error()
   if (!prop || !texts[prop] )
     return shortArtName( arg );
   r['#'] = texts[name.$variant] && name.$variant || prop; // text variant (set by searchName)
@@ -1047,14 +1046,16 @@ function replaceInString( text, params ) {
  *
  * @returns {string}
  */
-function messageString( err,  config ) {
+function messageString( err, config ) {
   // backwards compatibility <v4
   if (!config || typeof config === 'boolean' || arguments.length > 2) {
     config = {
+      /* eslint-disable prefer-rest-params */
       normalizeFilename: arguments[1],
       noMessageId: arguments[2],
       noHome: arguments[3],
       moduleForMarker: arguments[4],
+      /* eslint-enable prefer-rest-params */
     };
   }
   config.moduleForMarker ??= config.module; // v4.8.0 or earlier compatibility
@@ -1064,7 +1065,7 @@ function messageString( err,  config ) {
   const downgradable = severityChangeMarker(err, config);
   // even with noHome, print err.home if the location is weak
   const home = !err.home || config.noHome && err.$location?.endLine ? '' : ` (in ${ err.home })`;
-  const msgId = (err.messageId && !config.noMessageId) ? `[${err.messageId}]` : '';
+  const msgId = (err.messageId && !config.noMessageId) ? `[${ err.messageId }]` : '';
   return `${ location }${ severity }${ downgradable }${ msgId }: ${ err.message }${ home }`;
 }
 
@@ -1142,7 +1143,7 @@ function messageStringMultiline( err, config = {} ) {
   const home = !err.home ? '' : (`at ${ err.home }`);
   const severity = err.severity || 'Error';
   const downgradable = severityChangeMarker(err, config);
-  const msgId = (err.messageId && !config.noMessageId) ? `${downgradable}[${ err.messageId }${ explainHelp }]` : '';
+  const msgId = (err.messageId && !config.noMessageId) ? `${ downgradable }[${ err.messageId }${ explainHelp }]` : '';
 
   let location = '';
   let context = '';
@@ -1152,7 +1153,7 @@ function messageStringMultiline( err, config = {} ) {
       location += ', ';
     context = _messageContext(err, config);
     if (context !== '')
-      context = `\n${context}`;
+      context = `\n${ context }`;
   }
   else if (!home) {
     return `${ colorTerm.severity(severity, severity + msgId) } ${ err.message }`;
@@ -1161,7 +1162,7 @@ function messageStringMultiline( err, config = {} ) {
   const additionalIndent = err.$location ? `${ err.$location.endLine || err.$location.line || 1 }`.length : 1;
   const lineSpacer = `\n  ${ ' '.repeat( additionalIndent ) }|`;
 
-  return `${ colorTerm.severity(severity, severity + msgId) }: ${ err.message }${ lineSpacer }\n  ${ location }${ home }${context}`;
+  return `${ colorTerm.severity(severity, severity + msgId) }: ${ err.message }${ lineSpacer }\n  ${ location }${ home }${ context }`;
 }
 
 /**
@@ -1173,14 +1174,14 @@ function messageStringMultiline( err, config = {} ) {
  * @return {number[]}
  * @private
  */
-function _createSourceLineMap(source) {
+function _createSourceLineMap( source ) {
   const newlines = [ 0 ];
 
   const re = new RegExp(cdlNewLineRegEx, 'g');
   let line;
-  while((line = re.exec(source)) !== null) {
+  while ((line = re.exec(source)) !== null)
     newlines.push(line.index + line[0].length);
-  }
+
   newlines.push(source.length); // EOF marker
 
   return newlines;
@@ -1252,7 +1253,7 @@ function _messageContext( err, config ) {
   // print source line(s)
   for (let line = startLine; line <= maxLine; line++) {
     // Replaces tabs with 1 space
-    let sourceCode = source.substring(sourceLines[line], sourceLines[line+1] || source.length).trimEnd();
+    let sourceCode = source.substring(sourceLines[line], sourceLines[line + 1] || source.length).trimEnd();
     sourceCode = sourceCode.replace(/\t/g, ' ');
     if (sourceCode.length >= MAX_COL_LENGTH)
       sourceCode = sourceCode.slice(0, MAX_COL_LENGTH);
@@ -1303,7 +1304,7 @@ function _messageContext( err, config ) {
  */
 function messageContext( sourceLines, err, config ) {
   const loc = err.$location;
-  if (!loc || !loc.line|| !loc.file)
+  if (!loc || !loc.line || !loc.file)
     return '';
 
   colorTerm.changeColorMode(config ? config.color : 'auto');
@@ -1323,8 +1324,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 };
-    const bEnd = b.$location.endLine && b.$location.endCol && b.$location || { endLine: Number.MAX_SAFE_INTEGER, endCol: Number.MAX_SAFE_INTEGER };
+    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
     return ( c( aFile, bFile ) ||
              c( a.$location.line, b.$location.line ) ||
              c( a.$location.col, b.$location.col ) ||
@@ -1344,7 +1345,9 @@ function compareMessage( a, b ) {
   return (b.messageId && b.messageId.startsWith( 'api-' )) ? 1 : -1;
 
   function c( x, y ) {
-    return (x === y) ? 0 : (x > y) ? 1 : -1;
+    if (x === y)
+      return 0;
+    return (x > y) ? 1 : -1;
   }
 }
 
@@ -1435,8 +1438,9 @@ function artName( art, omit ) {
     const loc = art.location ? ` at ${ locationString( art.location ) }` : '';
     throw new CompilerAssertion(
       art.path
-        ? `No artifact for ${ art.path.map( i => i.id ).join( '.' )}${ loc }`
-        : `No name found in ${ Object.keys( art ).join( '+' )}${ loc }` );
+        ? `No artifact for ${ art.path.map( i => i.id ).join( '.' ) }${ loc }`
+        : `No name found in ${ Object.keys( art ).join( '+' ) }${ loc }`
+    );
   }
 
   const r = (name.absolute) ? [ quoted( name.absolute ) ] : [];
@@ -1451,7 +1455,7 @@ function artName( art, omit ) {
 
   if (name.element != null && omit !== 'element') {
     if (name.select != null && !art.$inferred)
-      r.push( 'column:' + quoted( name.element ) );
+      r.push( `column:${ quoted( name.element ) }` );
     else if (art.kind === 'builtin')
       return `$var:${ quoted( name.element ) }`;
     else
@@ -1484,20 +1488,25 @@ function homeName( art, absoluteOnly ) {
     return homeName( art._user, absoluteOnly );
   if (art._outer) {              // in items property, or annotation with path
     const outer = homeName( art._outer, absoluteOnly );
-    return (art.kind === '$annotation')
-      ? `${ outer }/${ quoted( '@' + art.name.id ) }`
-      : outer;
+    if (art.kind === '$annotation') // eslint-disable-next-line sonarjs/no-nested-template-literals
+      return `${ outer }/${ quoted( `@${ art.name.id }` ) }`;
+    return outer;
   }
-  else if (art.kind === 'source' || !art.name) // error reported in parser or on source level
+  else if (art.kind === 'source' || !art.name) { // error reported in parser or on source level
     return null;
-  else if (art.kind === 'using')
+  }
+  else if (art.kind === 'using') {
     return `using:${ quoted( art.name.id ) }`;
-  else if (art.kind === 'extend' || art.kind === 'annotate')
+  }
+  else if (art.kind === 'extend' || art.kind === 'annotate') {
     return !absoluteOnly && homeNameForExtend( art );
-  else if (!art.kind)           // annotation assignments are not really supported
+  }
+  else if (!art.kind) {          // annotation assignments are not really supported
     return (absoluteOnly) ? art.name.id : quoted( `@${ art.name.id }` );
-  else if (art.name._artifact)             // block, extend, annotate
+  }
+  else if (art.name._artifact) {            // block, extend, annotate
     return homeName( art.name._artifact, absoluteOnly ); // use corresponding definition
+  }
   let main = art._main || art;
   while (main._outer)           // anonymous aspect
     main = main._outer._main || main._outer; // w/o `_main` if wrongly in `type`
@@ -1591,7 +1600,7 @@ function constructSemanticLocationFromCsnPath( model, options, csnPath ) {
   let step = csnPath[index];
   let currentThing = model?.[step];
 
-  function next(steps = 1) {
+  function next( steps = 1 ) {
     for (; steps > 0; --steps) {
       ++index;
       step = csnPath[index];
@@ -1599,7 +1608,7 @@ function constructSemanticLocationFromCsnPath( model, options, csnPath ) {
     }
   }
 
-  function peek(steps = 1) {
+  function peek( steps = 1 ) {
     return csnPath[index + steps];
   }
 
@@ -1674,13 +1683,12 @@ function constructSemanticLocationFromCsnPath( model, options, csnPath ) {
     else if (step === 'cast') {
       // To shorten the location, only print 'cast' if it's not a
       // redirection target.
-      if (csnPath[index+1] !== 'on' && csnPath[index+1] !== 'target') {
+      if (csnPath[index + 1] !== 'on' && csnPath[index + 1] !== 'target')
         result += '/cast';
-      }
     }
     // @ts-ignore
     else if (queryPropsLast.includes(step)) {
-      result += '/' + step;
+      result += `/${ step }`;
       break; // always last step
     }
     else if (step === 'on') {
@@ -1689,7 +1697,7 @@ function constructSemanticLocationFromCsnPath( model, options, csnPath ) {
     }
     else if (step === 'target') {
       if (currentThing)
-        result += '/target:' + _quoted(currentThing);
+        result += `/target:${ _quoted(currentThing) }`;
       else
         result += '/target';
       break;
@@ -1782,13 +1790,14 @@ function constructSemanticLocationFromCsnPath( model, options, csnPath ) {
           // the last SELECT, e.g. "columns".
           for (let j = csnPath.length - 1; j > index; --j) {
             // @ts-ignore
-            if (csnPath[j] === 'SELECT' && !csnDictionaries.includes(csnPath[j-1])) {
+            if (csnPath[j] === 'SELECT' && !csnDictionaries.includes(csnPath[j - 1])) {
               next(j - index); // found last SELECT
               break;
             }
           }
           result += `/select:${ selectDepth }`;
-        } else {
+        }
+        else {
           result += '/select';
         }
       }
@@ -1815,7 +1824,8 @@ function constructSemanticLocationFromCsnPath( model, options, csnPath ) {
           if (peek() === 'expand' || peek() === 'inline') {
             next(); // skip expand/inline
             next(); // go to next column
-          } else {
+          }
+          else {
             break;
           }
         } while (index < csnPath.length);
@@ -1823,7 +1833,7 @@ function constructSemanticLocationFromCsnPath( model, options, csnPath ) {
         if (elementHierarchy.length > 0)
           result += `/column:${ _quoted(elementHierarchy.join('.')) }`;
       }
-      else if(step === 'args') {
+      else if (step === 'args') {
         // Should only be reached for cases, where no SELECT in a union is picked.
         next(); // skip index
       }
@@ -1868,10 +1878,10 @@ function queryDepthForMessage( csnPath, model, view ) {
   return 0;
 }
 
-function sanitizeCsnPath(csnPath) {
+function sanitizeCsnPath( csnPath ) {
   for (const step of csnPath) {
     if (typeof step !== 'string' && typeof step !== 'number')
-      throw new CompilerAssertion(`Found CSN path step that is neither string nor number: ${step} ${ JSON.stringify(csnPath) }`)
+      throw new CompilerAssertion(`Found CSN path step that is neither string nor number: ${ step } ${ JSON.stringify(csnPath) }`);
   }
 }
 

package/lib/base/model.js

@@ -38,9 +38,9 @@ const availableDeprecatedFlags = {
   eagerPersistenceForGeneratedEntities: true,
   noKeyPropagationWithExpansions: true,
   ignoreSpecifiedQueryElements: true,
-}
+};
 
-const oldDeprecatedFlags_v2 = [
+const oldDeprecatedFlagsV2 = [
   'createLocalizedViews',
   // 'downgradableErrors', // re-added in v4
   'generatedEntityNameWithUnderscore',
@@ -117,7 +117,7 @@ function checkRemovedDeprecatedFlags( options, { error } ) {
     return;
 
   forEach(options.deprecated, (key, val) => {
-    if (val && oldDeprecatedFlags_v2.includes(key)) {
+    if (val && oldDeprecatedFlagsV2.includes(key)) {
       error('api-invalid-deprecated', null, { name: key },
             'Deprecated flag $(NAME) has been removed in CDS compiler v3');
     }

package/lib/base/node-helpers.js

@@ -2,16 +2,24 @@
 
 'use strict';
 
-// Version of Promise.all() which does not reject immediately, i.e. after one
-// promise rejects, the others are still resolved.
+class PromiseAllError extends Error {
+  constructor(subs, ...args) {
+    super(...args);
+    this.valuesOrErrors = subs;
+  }
+}
 
-// If rejected, we reject with a PromiseAllError containing all promise values
-// (is Error in case of rejection).  Compare that with Promise.all() which
-// rejects with the result of the first rejected promise.
-//
-// This function only works as intended if no promise in `promises` fulfill
-// with a value which is an instance of Error.
-//
+/**
+ * Version of Promise.all() which does not reject immediately, i.e. after one
+ * promise rejects, the others are still resolved.
+ *
+ * If rejected, we reject with a PromiseAllError containing all promise values
+ * (is Error in case of rejection).  Compare that with Promise.all() which
+ * rejects with the result of the first rejected promise.
+ *
+ * This function only works as intended if no promise in `promises` fulfill
+ * with a value which is an instance of Error.
+ */
 function promiseAllDoNotRejectImmediately( promises ) {
   return Promise.all( promises.map( p => p.catch(e => e) ) )
     .then( values => (values.some(e => e instanceof Error)
@@ -21,13 +29,6 @@ function promiseAllDoNotRejectImmediately( promises ) {
       : values));
 }
 
-class PromiseAllError extends Error {
-  constructor(subs, ...args) {
-    super(...args);
-    this.valuesOrErrors = subs;
-  }
-}
-
 module.exports = {
   promiseAllDoNotRejectImmediately,
 };

package/lib/base/optionProcessorHelper.js

@@ -369,24 +369,21 @@ function createOptionProcessor() {
         splitSingleLetterOption(argv, i); // `-ab` -> `-a -b`
         i += processOption(i);
       }
-      else {
-        // Command or arg
-        if (result.command === undefined) {
-          if (optionProcessor.commands[arg]) {
-            // Found as command
-            result.command = optionProcessor.commands[arg].longName;
-            result.options[result.command] = {};
-          }
-          else {
-            // Not found as command, take as arg and stop looking for commands
-            processPositionalArgument(arg);
-            result.command = null;
-          }
+      else if (result.command === undefined) { // Command or arg
+        if (optionProcessor.commands[arg]) {
+          // Found as command
+          result.command = optionProcessor.commands[arg].longName;
+          result.options[result.command] = {};
         }
         else {
+          // Not found as command, take as arg and stop looking for commands
           processPositionalArgument(arg);
+          result.command = null;
         }
       }
+      else {
+        processPositionalArgument(arg);
+      }
     }
     // Avoid 'toXyz: {}' for command without options
     if (result.command && Object.keys(result.options[result.command]).length === 0)
@@ -414,7 +411,9 @@ function createOptionProcessor() {
      */
     function getCurrentPositionArguments() {
       const cmd = optionProcessor.commands[result.command];
-      return ( cmd && cmd.positionalArguments && cmd.positionalArguments.length ) ? cmd.positionalArguments : optionProcessor.positionalArguments;
+      return ( cmd && cmd.positionalArguments && cmd.positionalArguments.length )
+        ? cmd.positionalArguments
+        : optionProcessor.positionalArguments;
     }
 
     function processPositionalArgument( argumentValue ) {

package/lib/base/shuffle.js

@@ -1,7 +1,10 @@
-// Return shuffle functions using pseudo random functions
+'use strict';
 
+// Return shuffle functions using pseudo random functions
 // By <https://github.com/bryc/code/blob/c97a26ad27a9f9d4f48cd3307fd8ee6f1772d4eb/jshash/PRNGs.md>:
 
+/* eslint no-bitwise: 0, operator-assignment: 0 */
+
 // The random seed must be an integer between 1 and 4294967296 (= 2**32),
 // otherwise no shuffling takes place.
 function shuffleGen( seed ) {

package/lib/checks/structuredAnnoExpressions.js

@@ -13,7 +13,7 @@ function checkAnnotationExpression( member, _memberName, _prop, path ) {
         const { art, scope } = this.csnUtils.inspectRef(refPath);
         if (scope !== '$magic' && art) {
           const ft = this.csnUtils.getFinalTypeInfo(art.type);
-          if (!isBuiltinType(ft?.type))
+          if (!isBuiltinType(ft?.type) && !ft?.items)
             this.error('odata-anno-xpr-ref', refPath, { anno, elemref, '#': 'flatten_builtin_type' });
         }
       },

package/lib/compiler/assert-consistency.js

@@ -485,7 +485,7 @@ function assertConsistency( model, stage ) {
         'struct', 'array', 'enum', 'null', 'token',
       ],
     },
-    sym: { requires: [ 'location', 'id' ], optional: [ '$delimited' ] },
+    sym: { requires: [ 'location', 'id' ], optional: [ '$delimited', '_artifact' ] },
     val: {
       test: isVal,              // the following for array/struct value
       requires: [ 'location' ],

package/lib/compiler/builtins.js

@@ -222,9 +222,10 @@ 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
+// eslint-disable-next-line @stylistic/js/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
 const numberRegEx = /^[ \t]*[-+]?(\d+(\.\d*)?|\.\d+)(e[-+]?\d+)?[ \t]*$/i;
 
 /**

package/lib/compiler/extend.js

@@ -487,14 +487,24 @@ function extend( model ) {
       return anno;
     const hasBase = previousAnno?.literal === 'array';
     if (!previousAnno) {
-      const loc = firstEllipsis.location || anno.name.location;
-      message( 'anno-unexpected-ellipsis', [ loc, art ], { code: '...' } );
-      previousAnno = { val: [] };
+      const location = firstEllipsis.location || anno.name.location;
+      message( 'anno-unexpected-ellipsis', [ location, art ], { code: '...' } );
+      previousAnno = {
+        val: [],
+        literal: 'array',
+        name: { id: annoName.slice( 1 ) },
+        location,
+      };
     }
     else if (previousAnno.literal !== 'array') {
       // TODO: If we introduce sub-messages, point to the non-array base value.
       error( 'anno-mismatched-ellipsis', [ anno.name.location, art ], { code: '...' } );
-      previousAnno = { val: [] };
+      previousAnno = {
+        val: [],
+        literal: 'array',
+        name: previousAnno.name,
+        location: previousAnno.location,
+      };
     }
     const previousValue = previousAnno.val;
     let prevPos = 0;
@@ -522,7 +532,12 @@ function extend( model ) {
       }
     }
     // console.log('TP:',previousValue.map(se),anno.val.map(se),'->',result.map(se))
-    return { val: result, literal: 'array' };
+    return {
+      val: result,
+      literal: 'array',
+      name: previousAnno.name,
+      location: previousAnno.location,
+    };
   }
   // function se(a) { return a.upTo ? [a.val,a.upTo.val] : a.val ; }