@sap/cds-compiler 5.9.4 → 6.0.12

package/lib/model/csnUtils.js

@@ -63,7 +63,6 @@ function getUtils( model, universalReady ) {
     getContextOfArtifact,
     addStringAnnotationTo,
     getServiceName,
-    hasAnnotationValue,
     getFinalTypeInfo,
     get$combined,
     getQueryPrimarySource,
@@ -238,7 +237,8 @@ function getUtils( model, universalReady ) {
   // Return true if 'node' is a managed association element
   // TODO: what about elements having a type, which (finally) is an assoc?
   function isManagedAssociation( node ) {
-    return node.target !== undefined && node.on === undefined && node.keys;
+    // Since v6, managed to-many associations don't get any keys, hence don't require it.
+    return node.target !== undefined && node.on === undefined;
   }
 
   /**
@@ -631,34 +631,15 @@ function traverseFrom( from, queryCallback, path = [] ) {
   }
 }
 
-
 /**
- * Compare a given annotation value with an expectation value and return
- *
- *          | Expected
- *          | true  | false | null  | arb val
- * Anno Val |-------|-------|-------|--------
- * true     | true  | false | false | false
- * false    | false | true  | false | false
- * null     | false | true  | true  | false
- * arb val  | false | false | false | true/false
+ * Returns true if the artifact should be skipped during persistence.
+ * Respects special value `if-unused` by Node runtime.
  *
- * If the annotation value is 'null', 'true' is returned for the expectation values
- * 'null' and 'false'. Expecting 'null' for an annotation value 'false' returns
- * 'false'.
- *
- * @param {CSN.Artifact} artifact
- * @param {string} annotationName Name of the annotation (including the at-sign)
- * @param {any} expected
- * @param {boolean} caseInsensitive
+ * @param {CSN.Artifact} art
  * @returns {boolean}
  */
-function hasAnnotationValue( artifact, annotationName, expected = true, caseInsensitive = false ) {
-  if (expected === false)
-    return artifact[annotationName] === expected || artifact[annotationName] === null;
-  else if (typeof artifact[annotationName] === 'string' && caseInsensitive === true)
-    return artifact[annotationName].toLowerCase() === expected.toLowerCase();
-  return artifact[annotationName] === expected;
+function hasPersistenceSkipAnnotation( art ) {
+  return art['@cds.persistence.skip'] && art['@cds.persistence.skip'] !== 'if-unused';
 }
 
 /**
@@ -682,8 +663,7 @@ function isEdmPropertyRendered( elementCsn, options ) {
   const isNotIgnored = !elementCsn.target ? !elementCsn['@cds.api.ignore'] : true;
   const isNavigable = elementCsn.target
     ? (elementCsn['@odata.navigable'] === undefined ||
-     elementCsn['@odata.navigable'] !== undefined &&
-      (elementCsn['@odata.navigable'] === null || elementCsn['@odata.navigable'] === true)) : true;
+      (elementCsn['@odata.navigable'] === null || !!elementCsn['@odata.navigable'])) : true;
   // Foreign Keys can be ignored
   if (elementCsn['@odata.foreignKey4'])
     return isNotIgnored && renderForeignKey;
@@ -920,7 +900,7 @@ function setDependencies( csn, refs = csnRefs(csn) ) {
  * @returns {boolean}
  */
 function isPersistedOnDatabase( art ) {
-  return !(art.kind === 'entity' && (art.abstract || hasAnnotationValue(art, '@cds.persistence.skip')));
+  return !(art.kind === 'entity' && (art.abstract || hasPersistenceSkipAnnotation(art)));
 }
 /**
  * Check if the given artifact will be persisted on the database via `CREATE VIEW`
@@ -932,9 +912,9 @@ function isPersistedAsView( artifact ) {
   return artifact && artifact.kind === 'entity' &&
       !artifact.$ignore &&
       !artifact.abstract &&
-      ((artifact.query || artifact.projection) && !hasAnnotationValue(artifact, '@cds.persistence.table')) &&
-      !hasAnnotationValue(artifact, '@cds.persistence.skip') &&
-      !hasAnnotationValue(artifact, '@cds.persistence.exists');
+      ((artifact.query || artifact.projection) && !artifact['@cds.persistence.table']) &&
+      !hasPersistenceSkipAnnotation(artifact) &&
+      !artifact['@cds.persistence.exists'];
 }
 /**
  * Check if the given artifact will be persisted on the database via `CREATE TABLE`
@@ -946,9 +926,9 @@ function isPersistedAsTable( artifact ) {
   return artifact.kind === 'entity' &&
       !artifact.$ignore &&
       !artifact.abstract &&
-      (!artifact.query && !artifact.projection || hasAnnotationValue(artifact, '@cds.persistence.table')) &&
-      !hasAnnotationValue(artifact, '@cds.persistence.skip') &&
-      !hasAnnotationValue(artifact, '@cds.persistence.exists');
+      (!artifact.query && !artifact.projection || artifact['@cds.persistence.table']) &&
+      !hasPersistenceSkipAnnotation(artifact) &&
+      !artifact['@cds.persistence.exists'];
 }
 
 /**
@@ -1127,8 +1107,9 @@ function moveAnnotationsAndDoc( sourceNode, targetNode, overwrite = false ) {
  *       filter:   Positive filter. If it returns true, annotations for the referenced artifact
  *                 will be applied.
  *       applyToElements: Whether to apply annotations to elements or only to artifacts
+ * @param {Function} error The error function
  */
-function applyAnnotationsFromExtensions( csn, config ) {
+function applyAnnotationsFromExtensions( csn, config, error ) {
   if (!csn.extensions)
     return;
 
@@ -1137,6 +1118,8 @@ function applyAnnotationsFromExtensions( csn, config ) {
   for (let i = 0; i < csn.extensions.length; ++i) {
     const ext = csn.extensions[i];
     const name = ext.annotate || ext.extend;
+    if (isAnnotateDraftAdminDataWithTenantIndependent(ext))
+      error(null, [ 'extensions', i ], { name }, '$(NAME) can\'t be tenant independent');
     if (name && filter(name)) {
       const def = csn.definitions[name];
       if (def) {
@@ -1153,6 +1136,8 @@ function applyAnnotationsFromExtensions( csn, config ) {
   }
 
   csn.extensions = csn.extensions.filter(ext => ext);
+  if (!csn.extensions.length)
+    delete csn.extensions;
 
   function applyAnnotationsToElements( ext, def ) {
     // Only the definition is arrayed but the extension is not since
@@ -1177,6 +1162,10 @@ function applyAnnotationsFromExtensions( csn, config ) {
     if (Object.keys(ext.elements).length === 0)
       delete ext.elements;
   }
+
+  function isAnnotateDraftAdminDataWithTenantIndependent( ext ) {
+    return ext.annotate && ext.annotate.endsWith('.DraftAdministrativeData') && ext['@cds.tenant.independent'];
+  }
 }
 
 /**
@@ -1187,8 +1176,8 @@ function applyAnnotationsFromExtensions( csn, config ) {
  */
 function hasValidSkipOrExists( artifact ) {
   return artifact.kind === 'entity' &&
-         (hasAnnotationValue(artifact, '@cds.persistence.exists', true) ||
-          hasAnnotationValue(artifact, '@cds.persistence.skip', true));
+         (artifact['@cds.persistence.exists'] ||
+           hasPersistenceSkipAnnotation(artifact));
 }
 
 /**
@@ -1419,7 +1408,7 @@ module.exports = {
   forEachMember,
   forEachMemberRecursively,
   forAllQueries,
-  hasAnnotationValue,
+  hasPersistenceSkipAnnotation,
   isEdmPropertyRendered,
   getArtifactDatabaseNameOf,
   getResultingName,

package/lib/model/xprAsTree.js

@@ -7,19 +7,26 @@
 //
 // Function/assoc arguments and filter conditions are
 //  - traversed with expressionAsTree() and conditionAsTree(),
-//  - not traversed with exprAsTree() and condAsTree()
+//  - not traversed with exprAsTree() and condAsTree(), you might need to call
+//    splitClauses() to cover `order by` in the last function argument
 
 'use strict';
 
-const xprParser = require( '../parsers/XprTree' );
+const { csnAsTree, splitClauses } = require( '../parsers/XprTree' );
 
 function conditionAsTree( args ) {
   args.forEach( expressionAsTree );
-  return xprParser.xprAsTree( args, args, true );
+  return asTree( args );
 }
 function condAsTree( args ) {
   args.forEach( exprAsTree );
-  return xprParser.xprAsTree( args, args, true );
+  return asTree( args );
+}
+
+function asTree( args ) {
+  return (args.length === 2 && args[0] === 'over' && args[1]?.xpr && !args[1].func)
+    ? [ 'over', { xpr: splitClauses( args[1].xpr, true ) } ]
+    : csnAsTree( args );
 }
 
 function expressionAsTree( expr ) {
@@ -31,11 +38,17 @@ function expressionAsTree( expr ) {
   }
   if (expr.list)                // expression, ref
     expr.list.forEach( expressionAsTree );
-  if (expr.args) {               // expression, ref
-    if (Array.isArray( expr.args ) )
-      expr.args.forEach(expressionAsTree);
-    else
-      Object.values(expr.args).forEach(expressionAsTree);
+  const { args } = expr;
+  if (args) {               // expression, ref
+    if (!Array.isArray( args )) {
+      Object.values( args ).forEach( expressionAsTree );
+    }
+    else if (args.length) {
+      args.forEach( expressionAsTree );
+      const last = args.at( -1 );
+      if (last?.xpr && last.xpr.length > 4) // order by in last argument
+        last.xpr = splitClauses( last.xpr, true );
+    }
   }
   if (expr.ref)                 // expression
     expr.ref.forEach( expressionAsTree );
@@ -68,4 +81,5 @@ module.exports = {
   condAsTree,
   expressionAsTree,
   exprAsTree,
+  splitClauses: nodes => splitClauses( nodes, true ),
 };

package/lib/modelCompare/compare.js

@@ -57,20 +57,21 @@ function validateCsnVersions(beforeModel, afterModel, options) {
 
   if (!beforeVersionParts || beforeVersionParts.length < 2) {
     const { error, throwWithAnyError } = makeMessageFunction(beforeModel, options, 'modelCompare');
-    error(null, null, { version: beforeVersion || 'undefined' }, 'Invalid CSN version: $(VERSION)');
+    error('api-invalid-version', null, { version: beforeVersion || 'unknown' });
     throwWithAnyError();
   }
   if (!afterVersionParts || afterVersionParts.length < 2) {
     const { error, throwWithAnyError } = makeMessageFunction(afterModel, options, 'modelCompare');
-    error(null, null, { version: afterVersion || 'undefined' }, 'Invalid CSN version: $(VERSION)');
+    error('api-invalid-version', null, { version: afterVersion || 'unknown' });
     throwWithAnyError();
   }
   if (beforeVersionParts[0] > afterVersionParts[0] && !(options && options.allowCsnDowngrade)) {
     const { error, throwWithAnyError } = makeMessageFunction(afterModel, options, 'modelCompare');
 
     const { version } = require('../../package.json');
-    error(null, null, { value: afterVersion, othervalue: beforeVersion, version },
-          'Incompatible CSN versions: $(VALUE) is a major downgrade from $(OTHERVALUE). Is @sap/cds-compiler version $(VERSION) outdated?');
+    error('api-invalid-version', null, {
+      '#': 'migrationComparison', value: afterVersion, othervalue: beforeVersion, version,
+    });
     throwWithAnyError();
   }
 }

package/lib/optionProcessor.js

@@ -18,7 +18,6 @@ const { availableBetaFlags } = require('./base/model');
 const optionProcessor = createOptionProcessor();
 
 // General options
-// FIXME: Since they mainly affect the compiler, they could also live near main.compile
 optionProcessor
   .option('-h, --help')
   .option('-v, --version')
@@ -40,17 +39,18 @@ optionProcessor
   .option('    --debug <id-list>')
   .option('-E, --enrich-csn')
   .option('-R, --raw-output <name>')
-  .option('    --new-parser')
   .option('    --internal-msg')
   .option('    --beta-mode')
   .option('    --beta <list>')
   .option('    --deprecated <list>')
   .option('    --direct-backend')
+  .option('    --direct-messages')
   .option('    --fallback-parser <type>', { valid: [ 'auto!', 'cdl', 'csn', 'csn!' ] })
   .option('    --shuffle <seed>') // 0 | 1..4294967296
   .option('    --test-mode')
   .option('    --test-sort-csn')
   .option('    --doc-comment')
+  .option('    --propagate-doc-comments')
   .option('    --add-texts-language-assoc')
   .option('    --localized-without-coalesce')
   .option('    --tenant-discriminator')
@@ -119,7 +119,6 @@ optionProcessor
                             with name = "+", write complete XSN, long!
        --tenant-discriminator  Add tenant fields to entities
        --internal-msg       Write raw messages with call stack to <stdout>/<stderr>
-       --new-parser         Use the new CDL parser
        --beta-mode          Enable all unsupported, incomplete (beta) features
        --beta <list>        Comma separated list of unsupported, incomplete (beta) features to use.
                             Valid values are:
@@ -130,8 +129,6 @@ optionProcessor
                                   .join(`\n${ ' '.repeat(30) }`)
                               }
        --deprecated <list>  Comma separated list of deprecated options.
-                            Valid values are:
-                              eagerPersistenceForGeneratedEntities
        --fallback-parser <type>  If the language cannot be deduced by the file's extensions, use this
                                  parser as a fallback. Valid values are:
                                    cdl   : Use CDL parser
@@ -142,6 +139,8 @@ optionProcessor
                             Can only be used with certain new CSN based backends. Combination with
                             other flags is limited, e.g. --test-mode will not run a consistency check.
                             No recompilation is triggered in case of errors. cdsc will dump.
+       --direct-messages    Messages are written directly to console.error when an error/warning/… is detected.
+                            Useful to see some messages before a compiler dump.
        --shuffle <seed>     If provided, some internal processing sequences are changed, most notably by
                             using a shuffled version of ‹model›.definitions. <seed> should be a number
                             between 1 and 4294967296, the compiler uses a random number in that range if the
@@ -153,6 +152,7 @@ optionProcessor
                             OData CSN, CDL order and more.  When --test-mode is enabled, this
                             option is implicitly enabled as well.
        --doc-comment        Preserve /** */ comments at annotation positions as doc property in CSN
+       --propagate-doc-comments     Propagate doc comments ('--doc-comment')
        --add-texts-language-assoc   In generated texts entities, add association "language"
                                     to "sap.common.Languages" if it exists
        --localized-without-coalesce Omit coalesce in localized convenience views
@@ -163,7 +163,7 @@ optionProcessor
        --skip-name-check    Skip certain name checks, e.g. that there must be no '.' in element names.
 
   Commands
-    H, toHana [options] <files...>              Generate HANA CDS source files
+    H, toHana [options] <files...>              (deprecated) Generate HANA CDS source files
     O, toOdata [options] <files...>             Generate ODATA metadata and annotations
     C, toCdl <files...>                         Generate CDS source files
     Q, toSql [options] <files...>               Generate SQL DDL statements
@@ -204,10 +204,14 @@ optionProcessor.command('H, toHana')
   .option('    --assert-integrity-type <type>', { valid: [ 'RT', 'DB' ], ignoreCase: true })
   .option('    --pre2134ReferentialConstraintNames')
   .option('    --disable-hana-comments')
-  .option('    --standard-database-functions')
+  .option('    --no-standard-database-functions')
   .help(`
   Usage: cdsc toHana [options] <files...>
 
+  ====================================================
+  DEPRECATED! Since v5, this backend is deprecated!
+  ====================================================
+
   Generate HANA CDS source files, or CSN.
 
   Options
@@ -241,7 +245,7 @@ optionProcessor.command('H, toHana')
                                            DB : Create database constraints for associations
    --pre2134ReferentialConstraintNames   Do not prefix the constraint identifier with "c__"
    --disable-hana-comments    Disable rendering of doc comments as SAP HANA comments.
-   --standard-database-functions Enable rendering of standard database function mappings.
+   --no-standard-database-functions Disable rendering of standard database function mappings.
 `);
 
 optionProcessor.command('O, toOdata')
@@ -294,7 +298,7 @@ optionProcessor.command('O, toOdata')
                                    { prefix: { alias, ns, uri }, ... }
        --odata-no-creator          Omit creator identification in API
    -n, --sql-mapping <style> Annotate artifacts and elements with "@cds.persistence.name", which is
-                             the corresponding database name (see "--sql-mapping" for "toHana or "toSql")
+                             the corresponding database name (see "--sql-mapping" for "toSql")
                                plain   : (default) Names in uppercase and flattened with underscores
                                quoted  : Names in original case as in CDL. Entity names with dots,
                                          but element names flattened with underscores
@@ -319,8 +323,8 @@ optionProcessor.command('J, forJava')
 
 optionProcessor.command('C, toCdl')
   .option('-h, --help')
-  .option('    --render-cdl-definition-nesting')
-  .option('    --render-cdl-common-namespace')
+  .option('    --no-render-cdl-definition-nesting')
+  .option('    --no-render-cdl-common-namespace')
   .help(`
   Usage: cdsc toCdl [options] <files...>
 
@@ -328,10 +332,10 @@ optionProcessor.command('C, toCdl')
 
   Options
    -h, --help      Show this help text
-       --render-cdl-definition-nesting   If set, definitions will be nested
+       --no-render-cdl-definition-nesting   If set, definitions will be nested
                    inside services/contexts instead of having only top-level
                    definitions.
-       --render-cdl-common-namespace  If true and render-cdl-definition-nesting
+       --no-render-cdl-common-namespace  If true and render-cdl-definition-nesting
                    is set, a common namespace will be extracted and rendered.
 `);
 
@@ -355,9 +359,10 @@ optionProcessor.command('Q, toSql')
   .option('    --generated-by-comment')
   .option('    --better-sqlite-session-variables <bool>')
   .option('    --transitive-localized-views')
-  .option('    --boolean-equality')
+  .option('    --no-boolean-equality')
   .option('    --with-hana-associations <bool>', { valid: [ 'true', 'false' ] })
-  .option('    --standard-database-functions')
+  .option('    --no-standard-database-functions')
+  .option('    --dollar-now-as-timestamp')
   .help(`
   Usage: cdsc toSql [options] <files...>
 
@@ -420,8 +425,10 @@ optionProcessor.command('Q, toSql')
                               Enable or disable rendering of "WITH ASSOCIATIONS" for sqlDialect 'hana'.
                                 true  : (default) Render "WITH ASSOCIATIONS"
                                 false : Do not render "WITH ASSOCIATIONS"
-   --standard-database-functions Enable rendering of standard database function mappings.
-   --boolean-equality            Enable support for boolean logic '!=' operator.
+   --no-standard-database-functions Disable rendering of standard database function mappings.
+   --no-boolean-equality      Enable support for boolean logic '!=' operator.
+   --dollar-now-as-timestamp  Render '$now' variable as 'CURRENT_TIMESTAMP' instead of 'SESSION_CONTEXT(…)'
+                              for SQL dialect 'hana'.
 `);
 
 optionProcessor.command('toRename')

package/lib/parsers/AstBuildingParser.js

@@ -44,7 +44,6 @@ const extensionsCode = {
   service: 'extend service',
 };
 
-const PRECEDENCE_OF_IN_PREDICATE = 10;
 const PRECEDENCE_OF_EQUAL = 10;
 
 class AstBuildingParser extends BaseParser {
@@ -114,6 +113,8 @@ class AstBuildingParser extends BaseParser {
     err.expectedTokens = this.expectingArray();
   }
 
+  // Guards, Prepare Commands and Lookahead Methods -----------------------------
+
   tableWithoutAs() {            // not used in <guard=…>, only called by other guard
     // TODO TOOL: if the tool properly creates `default: this.giR()`, this
     // condition method is most likely not necessary
@@ -136,7 +137,7 @@ class AstBuildingParser extends BaseParser {
    * - <guard=queryOnLeft, arg=tableWithoutAs>: …after having checked
    *   whether the next token is no (reserved or unreserved) keyword
    */
-  queryOnLeft( test, arg ) {
+  queryOnLeft( arg, test ) {
     if (arg === 'tableWithoutAs') {
       if (this.tableWithoutAs())
         return true;
@@ -177,8 +178,6 @@ class AstBuildingParser extends BaseParser {
     const text = typeof keyword === 'string' ? keyword.toUpperCase() : type;
     const generic = this.dynamic_.generic?.[text];
     if (tryGenericIntro) {
-      if (this.dynamic_.generic?.IN === 'separator')
-        this.prec_ = PRECEDENCE_OF_IN_PREDICATE; // only expressions if `in` is separator
       if (generic !== 'expr')
         return (generic === 'intro') ? 'GenericIntro' : type;
       // if both intro and expr: specialFunctions[fn][argPos][token] = 'expr'
@@ -220,7 +219,7 @@ class AstBuildingParser extends BaseParser {
     }
   }
 
-  inSelectItem( _test, arg ) {  // only as action
+  inSelectItem( arg ) {         // <prepare=…>
     this.dynamic_.inSelectItem = arg ||
       (this.tokens[this.tokenIdx - 2].type === '.' ? 'inline' : 'expand');
   }
@@ -251,7 +250,7 @@ class AstBuildingParser extends BaseParser {
     return next === '*' || next === '{';
   }
 
-  notAfterEntityArgOrFilter( mode ) { // TODO: for <hide>
+  notAfterEntityArgOrFilter( _arg, mode ) { // TODO: for <hide>
     if (mode !== 'M')
       return false;
     const { type } = this.lb();
@@ -263,9 +262,18 @@ class AstBuildingParser extends BaseParser {
 
   // <prec=10, postfix=once> + test that the next token is not `null`; TODO: code
   // completion for `… default 3 not ~;` → currently just `null` but hey
-  isNegatedRelation( _test, prec ) {
+  isNegatedRelation( prec ) {
     return this.tokens[this.tokenIdx + 1]?.keyword === 'null' ||
-      this.precNone_( _test, prec );
+      this.precNone_( prec );
+  }
+
+  // TODO: as leanCondition ?  `order` should probably appear in the message for
+  // test3/Compiler/GrammarRobustness/InvalidSelectInWhere.err.cds
+  orderByLimitRestriction( _arg, mode ) {
+    if (mode && (!this.$allowOrderByLimit || this.precPost_( mode, 0 )))
+      return true;
+    this.$allowOrderByLimit = !mode;
+    return false;
   }
 
   isNamedArg() {
@@ -303,7 +311,7 @@ class AstBuildingParser extends BaseParser {
   /**
    * `annotation` def is only allowed top-level. TODO: combine with `extensionRestriction`
    */
-  vocabularyRestriction( test ) {
+  vocabularyRestriction( _arg, test ) {
     if (!test)
       this.dynamic_.inBlock = this.tokenIdx;
     return this.dynamic_.inBlock ?? this.dynamic_.inExtension;
@@ -319,7 +327,7 @@ class AstBuildingParser extends BaseParser {
    * Currently only to restrict it to a single `Id` for published associations.
    * No extra syntax-unexpected-assoc for failure.
    */
-  columnExpr( mode, arg ) {
+  columnExpr( arg, mode ) {
     if (mode)
       return !this.columnExpr$;
     if (arg)
@@ -331,7 +339,7 @@ class AstBuildingParser extends BaseParser {
     return true;
   }
 
-  nestedExpand( mode ) {
+  nestedExpand( _arg, mode ) {
     if (!mode)
       this.nestedExpand$ = this.tokenIdx;
     return this.nestedExpand$ !== this.tokenIdx;
@@ -375,7 +383,7 @@ class AstBuildingParser extends BaseParser {
    * - DEFAULT: true if `default` had been provided
    * - NOTNULL: true if `null` or `not null` had been provided
    */
-  elementRestriction( test, arg ) {
+  elementRestriction( arg, test ) {
     let { elementCtx } = this.dynamic_;
     if (test) {
       if (elementCtx?.[0] === arg)
@@ -418,7 +426,7 @@ class AstBuildingParser extends BaseParser {
                        'Unexpected $(OFFENDING) after $(KEYWORD) clause, expecting $(EXPECTING)' );
   }
 
-  noRepeatedCardinality( mode ) {
+  noRepeatedCardinality( _arg, mode ) {
     if (this.tokens[this.tokenIdx - 2]?.type !== ']')
       return false;
     if (mode === 'M')
@@ -443,7 +451,7 @@ class AstBuildingParser extends BaseParser {
    *
    * Beware: mentioned in leanConditions, i.e. executed in predictions!
    */
-  afterBrace( test, arg ) {
+  afterBrace( arg, test ) {
     if (!test) {
       if (arg === 'normal' && this.lb().type !== '}') {
         const { type, keyword } = this.la();
@@ -487,7 +495,7 @@ class AstBuildingParser extends BaseParser {
   /**
    * For annotations at the beginning of columns outside parentheses
    */
-  annoInSameLine( test ) {
+  annoInSameLine( _arg, test ) {
     if (!test)
       this.dynamic_.safeAnno = true;
     return !this.dynamic_.safeAnno &&
@@ -499,7 +507,7 @@ class AstBuildingParser extends BaseParser {
    * - `...` can appear in the top-level array value only and not after `...`
    *   without `up to`.
    */
-  arrayAnno( test, arg ) {
+  arrayAnno( arg, test ) {
     if (!test) {
       this.dynamic_.arrayAnno = [ !this.dynamic_.arrayAnno ];
     }
@@ -532,7 +540,7 @@ class AstBuildingParser extends BaseParser {
     return this.tokens[this.tokenIdx + 1]?.text !== ':';
   }
 
-  fail( mode ) {
+  fail( _arg, mode ) {
     // TODO TOOL: the following test belongs to the BaseParser.js:
     if (this.conditionTokenIdx === this.tokenIdx &&        // tested on same
         this.conditionStackLength == null && // after error recover
@@ -569,13 +577,27 @@ class AstBuildingParser extends BaseParser {
 
   noAssignmentInSameLine() {
     const next = this.la();
-    if (next.text === '@' && next.line <= this.lb().endLine) {
+    if (next.text === '@' && next.location.line <= this.lb().location.endLine &&
+        // TODO Tool Runtime: it is probably better to skip tokens directly
+        // do not report error if the '@' is not correct:
+        this.s !== null && this.tokenIdx > this.recoverTokenIdx) {
       this.warning( 'syntax-missing-semicolon', next, { code: ';' },
                     // eslint-disable-next-line @stylistic/js/max-len
                     'Add a $(CODE) and/or newline before the annotation assignment to indicate that it belongs to the next statement' );
     }
   }
 
+  reportDubiousAnnoSpacing() {
+    const at = this.lb();
+    const before = this.tokens[this.tokenIdx - 2];
+    if (before?.type === 'Id' && before.location.endLine === at.location.line &&
+        before.location.endCol === at.location.col) {
+      this.warning( 'syntax-expecting-anno-space', at.location, { code: '@' },
+                    'Expecting a space before the $(CODE) starting an annotation assignment' );
+    }
+    this.reportUnexpectedSpace( at );
+  }
+
   // For :param, #variant, #symbol, @(…) and @Begin and `@` inside annotation paths,
   // inside `.*` and `.{`
   reportUnexpectedSpace( prefix = this.lb(),
@@ -604,6 +626,8 @@ class AstBuildingParser extends BaseParser {
     return prefixLoc;
   }
 
+  // Locations for ASTs ---------------------------------------------------------
+
   startLocation( { location } = this.lr() ) {
     return {
       __proto__: Location.prototype,
@@ -749,8 +773,23 @@ class AstBuildingParser extends BaseParser {
     return ast;
   }
 
+  virtualOrImplicit( art ) {
+    const token = this.lb();
+    const ref = art.value.func || art.value;
+    if (!art.virtual ||
+        ref.path[0].location.tokenIndex < token.location.tokenIndex ||
+        this.la().text === '{') {
+      this.classifyImplicitName( 'ItemImplicit', ref );
+    }
+    else {
+      token.parsedAs = 'ItemAlias';
+      art.name = ref.path[0];
+      art.value = undefined;
+    }
+  }
+
   classifyImplicitName( category, ref ) {
-    if (!ref || ref.path) {
+    if (!ref || ref.path) {     // TODO: func
       const tokenIndex = ref?.path.at(-1)?.location.tokenIndex;
       const token = this.prevTokenWithIndex( tokenIndex ) ?? this.tokens[this.tokenIdx - 1];
       const { parsedAs } = token;
@@ -1043,10 +1082,8 @@ class AstBuildingParser extends BaseParser {
       line: chosen.location.line,
       col: chosen.location.col,
     };
-    if (erroneous.val === chosen.val) {
-      // TODO v6: duplicate clause = error, independently whether it is the same
-      this.warning( 'syntax-duplicate-equal-clause', erroneous.location, args );
-    }
+    if (erroneous.val === chosen.val)
+      this.message( 'syntax-duplicate-equal-clause', erroneous.location, args );
     // TODO extra msg text 'syntax-duplicate-clause' for noRepeatedCardinality()
   }
 
@@ -1169,6 +1206,21 @@ class AstBuildingParser extends BaseParser {
     };
   }
 
+  valuePathAstWithNew( expr, path ) {
+    path = this.valuePathAst( path );
+    if (path.op?.val !== 'ixpr') {
+      expr.args.push( path );
+    }
+    else {
+      const ref = path.args[0];
+      const op = { val: 'ixpr', location: expr.args[0].location };
+      const location = this.combineLocation( expr.args[0], ref );
+      path.args[0] = { op, args: [ expr.args[0], ref ], location };
+      expr.args = path.args;
+    }
+    this.attachLocation( expr );
+  }
+
   valuePathAst( ref ) {
     // TODO: XSN representation of functions is a bit strange - rework
     // TODO: rework this function
@@ -1189,8 +1241,12 @@ class AstBuildingParser extends BaseParser {
       if (filter) // TODO v7: make this be reported via guard, as error
         this.message( 'syntax-unexpected-filter', filter.location, {} );
       // TODO: XSN representation of functions is a bit strange - rework
-      const op = { location, val: 'call' };
-      return this.attachLocation( { op, func: ref, args } );
+      return this.attachLocation( {
+        op: { location, val: 'call' },
+        func: ref,
+        args,
+        location: ref.location,
+      } );
     }
 
     // $syntax === ':' => path(P: 1)