@sap/cds-compiler 5.8.2 → 5.9.0

package/CHANGELOG.md

@@ -7,12 +7,43 @@
 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.9.0 - 2025-03-28
+
+### Added
+
+- compiler:
+  + Generated entities for compositions of named aspects now have an `include` on the named aspect,
+    inheriting actions from the aspect.  This can be disabled via option `compositionIncludes: false`.
+  + A warning is emitted for selected elements that are explicitly `virtual`, whose
+    behavior will change in cds-compiler v6.
+  + New warning for structures having a scalar default value.
+  + New warning for localized structures, as they are not fully supported by the compiler.
+  + The new parser (`newParser: true`) now supports operator `==`.
+- to.cdl:
+  + Definitions can now be rendered nested in services. A common namespace can be extracted, too.
+    To use it, enabled options `renderCdlDefinitionNesting` and `renderCdlCommonNamespace`.
+  + Annotation array values are pretty-printed to reduce whitespace.
+- for.effective: Property `namespace` is no longer part of effective CSN.
+- for.sql/hdi:
+  - The new operator `==` is rendered as `IS NOT DISTINCT FROM` or an equivalent expression.
+  - Using option `booleanEquality`, operator `!=` is rendered as `IS DISTINCT FROM` or an equivalent expression.
+
+### Changed
+
+- Update OData vocabularies: 'Common', 'Hierarchy'
+
+### Fixed
+
+- to.odata: Annotation expressions using `LabeledElement` were not correctly rendered into EDMX.
+
+
 ## Version 5.8.2 - 2025-03-07
 
 ### Fixed
 
 - for.odata: Generate foreign key elements for events again.
 
+
 ## Version 5.8.0 - 2025-02-27
 
 ### Added

package/bin/cds_remove_invalid_whitespace.js

@@ -21,6 +21,8 @@
 // Note that you need to update the path to this script in the commands above.
 //
 
+/* eslint no-process-exit: 0, no-console: 0 */
+
 'use strict';
 
 const parsers = require('../lib/parsers');
@@ -36,7 +38,7 @@ if (filepath === '--help' || filepath === '-h')
   exitError();
 
 if (cliArgs.length !== 1)
-  exitError(`Expected exactly one argument, ${cliArgs.length} given`);
+  exitError(`Expected exactly one argument, ${ cliArgs.length } given`);
 
 if (!filepath)
   exitError('Expected non-empty filepath as argument!');
@@ -70,7 +72,7 @@ function modernizeWhitespace( source, filename ) {
     errors.forEach((msg) => {
       console.error(msg.toString());
     });
-    console.error(`Found ${errors.length} errors! \n`);
+    console.error(`Found ${ errors.length } errors! \n`);
     exitError('The CDS parser emitted errors. Fix them first and try again.');
   }
 
@@ -132,5 +134,5 @@ function exitError( msg ) {
 
 function usage() {
   console.error('');
-  console.error(`usage: ${path.basename(process.argv[1])} <filename>`);
+  console.error(`usage: ${ path.basename(process.argv[1]) } <filename>`);
 }

package/bin/cds_update_identifiers.js

@@ -20,6 +20,8 @@
 // Note that you need to update the path to this script in the commands above.
 //
 
+/* eslint no-process-exit: 0, no-console: 0 */
+
 'use strict';
 
 const parsers = require('../lib/parsers');
@@ -35,7 +37,7 @@ if (filepath === '--help' || filepath === '-h')
   exitError();
 
 if (cliArgs.length !== 1)
-  exitError(`Expected exactly one argument, ${cliArgs.length} given`);
+  exitError(`Expected exactly one argument, ${ cliArgs.length } given`);
 
 if (!filepath)
   exitError('Expected non-empty filepath as argument!');
@@ -68,7 +70,7 @@ function modernizeIdentifierStyle( source, filename ) {
     errors.forEach((msg) => {
       console.error(msg.toString());
     });
-    console.error(`Found ${errors.length} errors! \n`);
+    console.error(`Found ${ errors.length } errors! \n`);
     exitError('The CDS parser emitted errors. Fix them first and try again.');
   }
 
@@ -88,10 +90,11 @@ function modernizeIdentifierStyle( source, filename ) {
     const newIdentText = toNewIdentStyle(identToken.text);
 
     if (!identToken.stop)
-      throw new Error(`INTERNAL ERROR: Identifier at ${identToken.start} has no end!`);
+      throw new Error(`INTERNAL ERROR: Identifier at ${ identToken.start } has no end!`);
 
     const start = identToken.start + currentOffset;
-    const end = identToken.stop + currentOffset + 1; // end points at the position *before* the character
+    // 'end' points at the position *before* the character
+    const end = identToken.stop + currentOffset + 1;
 
     source = replaceSliceInSource(source, start, end, newIdentText);
 
@@ -105,7 +108,7 @@ function modernizeIdentifierStyle( source, filename ) {
     ident = ident.replace(/""/g, '"');
     ident = ident.replace(/]/g, ']]');
 
-    return `![${ident}]`;
+    return `![${ ident }]`;
   }
 }
 
@@ -136,5 +139,5 @@ function exitError( msg ) {
 
 function usage() {
   console.error('');
-  console.error(`usage: ${path.basename(process.argv[1])} <filename>`);
+  console.error(`usage: ${ path.basename(process.argv[1]) } <filename>`);
 }

package/bin/cdsc.js

@@ -17,7 +17,7 @@
 
 const compiler = require('../lib/compiler');
 const main = require('../lib/main');
-const { for_sql, for_hdi, for_hdbcds } = require('../lib/api/main');
+const { for_sql: forSql, for_hdi: forHdi, for_hdbcds: forHdbcds } = require('../lib/api/main');
 const { compactModel } = require('../lib/json/to-csn');
 const { toRename: _toRename } = require('../lib/render/toRename');
 const util = require('util');
@@ -48,7 +48,7 @@ class ProcessExitError extends Error {
 }
 
 try {
-  cdsc_main();
+  cdscMain();
 }
 catch (err) {
   // This whole try/catch is only here because process.exit does not work in combination with
@@ -85,7 +85,7 @@ function remapCmdOptions( options, command ) {
   delete options[command];
 }
 
-function cdsc_main() {
+function cdscMain() {
   if (process.argv.some(arg => arg === '-i' || arg === '--stdin'))
     optionProcessor.makePositionalArgumentsOptional();
 
@@ -94,13 +94,13 @@ function cdsc_main() {
 
   // Deal with '--version' explicitly
   if (cmdLine.options.version) {
-    process.stdout.write(`${main.version()}\n`);
+    process.stdout.write(`${ main.version() }\n`);
     throw new ProcessExitError(0);
   }
   // Deal with '--help' explicitly
   if (cmdLine.command) {
     // Command specific help
-    if (cmdLine.options.help || cmdLine.options[cmdLine.command] && cmdLine.options[cmdLine.command].help)
+    if (cmdLine.options.help || cmdLine.options[cmdLine.command]?.help)
       displayUsage(null, optionProcessor.commands[cmdLine.command].helpText, 0);
   }
   else if (cmdLine.options.help) {
@@ -111,7 +111,7 @@ function cdsc_main() {
   if (cmdLine.unknownOptions.length > 0) {
     // Print an INFO message about unknown options but
     // continue with defaults and do not abort execution.
-    cmdLine.unknownOptions.forEach(msg => process.stderr.write(`cdsc: INFO: ${msg}\n`));
+    cmdLine.unknownOptions.forEach(msg => process.stderr.write(`cdsc: INFO: ${ msg }\n`));
   }
 
   // Report complaints if any
@@ -175,18 +175,19 @@ function cdsc_main() {
 
   const to = cmdLine.options.toSql ? 'toSql' : 'toHana';
   if (cmdLine.options[to]) {
+    const opt = cmdLine.options[to];
     // remap string values in options to boolean
-    if (cmdLine.options[to].assertIntegrity &&
-        (cmdLine.options[to].assertIntegrity === 'true' ||
-         cmdLine.options[to].assertIntegrity === 'false')
+    if (opt.assertIntegrity &&
+        (opt.assertIntegrity === 'true' ||
+         opt.assertIntegrity === 'false')
     )
-      cmdLine.options[to].assertIntegrity = cmdLine.options[to].assertIntegrity === 'true';
+      opt.assertIntegrity = opt.assertIntegrity === 'true';
 
-    if (cmdLine.options[to].withHanaAssociations)
-      cmdLine.options[to].withHanaAssociations = cmdLine.options[to].withHanaAssociations !== 'false';
+    if (opt.withHanaAssociations)
+      opt.withHanaAssociations = opt.withHanaAssociations !== 'false';
 
-    if (cmdLine.options[to].betterSqliteSessionVariables)
-      cmdLine.options[to].betterSqliteSessionVariables = cmdLine.options[to].betterSqliteSessionVariables === 'true';
+    if (opt.betterSqliteSessionVariables)
+      opt.betterSqliteSessionVariables = opt.betterSqliteSessionVariables === 'true';
   }
 
   // Enable all beta-flags if betaMode is set to true
@@ -199,7 +200,7 @@ function cdsc_main() {
     cmdLine.options.testMode = (num > 0)
       ? num
       : Math.floor( Math.random() * 4294967296 ) + 1;
-    console.error( `Running ‘${cmdLine.command}’ with test-mode shuffle ${cmdLine.options.testMode} …` );
+    console.error( `Running ‘${ cmdLine.command }’ with test-mode shuffle ${ cmdLine.options.testMode } …` );
   }
 
   // If set through CLI (and not options file), `deprecated` and `moduleLookupDirectories`
@@ -218,10 +219,16 @@ function cdsc_main() {
     cmdLine.options.fallbackParser ??= 'auto!';
 
   if (cmdLine.options[cmdLine.command]?.transitiveLocalizedViews) {
-    cmdLine.options.fewerLocalizedViews = !cmdLine.options[cmdLine.command].transitiveLocalizedViews
+    cmdLine.options.fewerLocalizedViews
+      = !cmdLine.options[cmdLine.command].transitiveLocalizedViews;
     delete cmdLine.options[cmdLine.command].transitiveLocalizedViews;
   }
 
+  if (cmdLine.options.noCompositionIncludes) {
+    cmdLine.options.compositionIncludes = false;
+    delete cmdLine.options.noCompositionIncludes;
+  }
+
   parseSeverityOptions(cmdLine);
 
   // Do the work for the selected command
@@ -239,11 +246,11 @@ function cdsc_main() {
  */
 function validateDirectBackendOption( command, options, args ) {
   if (![ 'toCdl', 'toOdata', 'toHana', 'toCsn', 'toSql', 'forJava' ].includes(command)) {
-    displayUsage(`Option '--direct-backend' can't be used with command '${command}'`,
+    displayUsage(`Option '--direct-backend' can't be used with command '${ command }'`,
                  optionProcessor.helpText, 2);
   }
   if (!options.stdin && (!args.files || args.files.length !== 1)) {
-    displayUsage(`Option '--direct-backend' expects exactly one JSON file, but ${args.files?.length || 'none'} given`,
+    displayUsage(`Option '--direct-backend' expects exactly one JSON file, but ${ args.files?.length || 'none' } given`,
                  optionProcessor.helpText, 2);
   }
   const filename = args.files?.[0];
@@ -258,14 +265,14 @@ function displayUsage( error, helpText, code ) {
   // Display non-error output (like help) to stdout
   const out = (code === 0 && !error) ? process.stdout : process.stderr;
   // Display help text first, error at the end (more readable, no scrolling)
-  out.write(`${helpText}\n`);
+  out.write(`${ helpText }\n`);
   if (error) {
     if (error instanceof Array) {
-      const errors = error.map(err => `cdsc: ERROR: ${err}`).join('\n');
-      out.write(`${errors}\n`);
+      const errors = error.map(err => `cdsc: ERROR: ${ err }`).join('\n');
+      out.write(`${ errors }\n`);
     }
     else {
-      out.write(`cdsc: ERROR: ${error}\n`);
+      out.write(`cdsc: ERROR: ${ error }\n`);
     }
   }
   throw new ProcessExitError(code);
@@ -284,7 +291,8 @@ async function createTemporaryFileFromStdin() {
   return file;
 }
 
-// Executes a command line that has been translated to 'command' (what to do), 'options' (how) and 'args' (which files)
+// Executes a command line that has been translated to 'command' (what to do),
+// 'options' (how) and 'args' (which files)
 async function executeCommandLine( command, options, args ) {
   const normalizeFilename = options.testMode && process.platform === 'win32';
   const messageLevels = {
@@ -319,7 +327,7 @@ async function executeCommandLine( command, options, args ) {
   };
 
   if (!commands[command] && !commandsWithoutCompilation[command])
-    throw new Error(`Missing implementation for command ${command}`);
+    throw new Error(`Missing implementation for command ${ command }`);
 
   remapCmdOptions( options, command );
 
@@ -352,13 +360,16 @@ async function executeCommandLine( command, options, args ) {
     const csn = options.directBackend ? model : compactModel(model, options);
     const cdlResult = main.to.cdl(csn, options);
     for (const name in cdlResult)
-      writeToFileOrDisplay(options.out, `${name}.cds`, cdlResult[name]);
+      writeToFileOrDisplay(options.out, `${ name }.cds`, cdlResult[name]);
 
     return model;
   }
 
   function forEffective( model ) {
-    const features = [ 'resolveSimpleTypes', 'resolveProjections', 'remapOdataAnnotations', 'keepLocalized' ];
+    const features = [
+      'resolveSimpleTypes', 'resolveProjections',
+      'remapOdataAnnotations', 'keepLocalized',
+    ];
     for (const feature of features) {
       if (options[feature]) // map to boolean equivalent
         options[feature] = options[feature] === 'true';
@@ -408,7 +419,7 @@ async function executeCommandLine( command, options, args ) {
     const csn = options.directBackend ? model : compactModel(model, options);
 
     if (options.csn) {
-      displayNamedCsn(for_hdbcds(csn, options), 'hana_csn');
+      displayNamedCsn(forHdbcds(csn, options), 'hana_csn');
     }
     else {
       const hanaResult = main.to.hdbcds(csn, options);
@@ -438,12 +449,12 @@ async function executeCommandLine( command, options, args ) {
     else if (options.json) {
       const result = main.to.edm.all(csn, options);
       for (const serviceName in result)
-        writeToFileOrDisplay(options.out, `${serviceName}.json`, result[serviceName]);
+        writeToFileOrDisplay(options.out, `${ serviceName }.json`, result[serviceName]);
     }
     else {
       const result = main.to.edmx.all(csn, options);
       for (const serviceName in result)
-        writeToFileOrDisplay(options.out, `${serviceName}.xml`, result[serviceName]);
+        writeToFileOrDisplay(options.out, `${ serviceName }.xml`, result[serviceName]);
     }
     return model;
   }
@@ -457,13 +468,13 @@ async function executeCommandLine( command, options, args ) {
     const csn = options.directBackend ? model : compactModel(model, options);
     const messageFunctions = makeMessageFunction(csn, options, 'to.rename');
     const renameResult = _toRename(csn, options, messageFunctions);
-    let storedProcedure = `PROCEDURE RENAME_${renameResult.options.sqlMapping.toUpperCase()}_TO_PLAIN LANGUAGE SQLSCRIPT AS BEGIN\n`;
+    let storedProcedure = `PROCEDURE RENAME_${ renameResult.options.sqlMapping.toUpperCase() }_TO_PLAIN LANGUAGE SQLSCRIPT AS BEGIN\n`;
     for (const name in renameResult.rename) {
-      storedProcedure += `  --\n  -- ${name}\n  --\n`;
+      storedProcedure += `  --\n  -- ${ name }\n  --\n`;
       storedProcedure += renameResult.rename[name];
     }
     storedProcedure += 'END;\n';
-    writeToFileOrDisplay(options.out, `storedProcedure_${renameResult.options.sqlMapping}_to_plain.sql`, storedProcedure, true);
+    writeToFileOrDisplay(options.out, `storedProcedure_${ renameResult.options.sqlMapping }_to_plain.sql`, storedProcedure, true);
     return model;
   }
 
@@ -476,9 +487,9 @@ async function executeCommandLine( command, options, args ) {
     Object.keys(alterConstraintsResult).forEach((id) => {
       const renderedConstraintStatement = alterConstraintsResult[id];
       if (src === 'hdi')
-        writeToFileOrDisplay(options.out, `${id}.hdbconstraint`, renderedConstraintStatement);
+        writeToFileOrDisplay(options.out, `${ id }.hdbconstraint`, renderedConstraintStatement);
       else
-        writeToFileOrDisplay(options.out, `${id}.sql`, renderedConstraintStatement);
+        writeToFileOrDisplay(options.out, `${ id }.sql`, renderedConstraintStatement);
     });
   }
 
@@ -488,7 +499,7 @@ async function executeCommandLine( command, options, args ) {
     const csn = options.directBackend ? model : compactModel(model, options);
     if (options.src === 'hdi') {
       if (options.csn) {
-        displayNamedCsn(for_hdi(csn, options), 'hdi_csn');
+        displayNamedCsn(forHdi(csn, options), 'hdi_csn');
       }
       else {
         const hdiResult = main.to.hdi(csn, options);
@@ -497,7 +508,7 @@ async function executeCommandLine( command, options, args ) {
       }
     }
     else if (options.csn) {
-      displayNamedCsn(for_sql(csn, options), 'sql_csn');
+      displayNamedCsn(forSql(csn, options), 'sql_csn');
     }
     else {
       const sqlResult = main.to.sql(csn, options);
@@ -513,7 +524,7 @@ async function executeCommandLine( command, options, args ) {
     }
 
     if (!hasMessageExplanation(args.messageId))
-      console.error(`Message '${args.messageId}' does not have an explanation!`);
+      console.error(`Message '${ args.messageId }' does not have an explanation!`);
     else
       console.log(explainMessage(args.messageId));
   }
@@ -597,12 +608,13 @@ async function executeCommandLine( command, options, args ) {
     else {
       let hasAtLeastOneExplanation = false;
       messages.filter(msg => messageLevels[msg.severity] <= options.warning).forEach((msg) => {
-        hasAtLeastOneExplanation = hasAtLeastOneExplanation || main.hasMessageExplanation(msg.messageId);
+        hasAtLeastOneExplanation = hasAtLeastOneExplanation ||
+          main.hasMessageExplanation(msg.messageId);
         log(main.messageStringMultiline(msg, msgConfig));
         log(); // newline
       });
       if (!options.noMessageId && hasAtLeastOneExplanation)
-        log(`${colorTerm.asHelp('help')}: Messages marked with '…' have an explanation text. Use \`cdsc explain <message-id>\` for a more detailed error description.`);
+        log(`${ colorTerm.asHelp('help') }: Messages marked with '…' have an explanation text. Use \`cdsc explain <message-id>\` for a more detailed error description.`);
     }
     return model;
   }
@@ -613,9 +625,9 @@ async function executeCommandLine( command, options, args ) {
   // written in raw form to '<name>_raw.txt'.
   function displayNamedXsn( xsn, name ) {
     if (options.rawOutput)
-      writeToFileOrDisplay(options.out, `${name}_raw.txt`, util.inspect(reveal(xsn, options.rawOutput), false, null), true);
+      writeToFileOrDisplay(options.out, `${ name }_raw.txt`, util.inspect(reveal(xsn, options.rawOutput), false, null), true);
     else if (options.internalMsg)
-      writeToFileOrDisplay(options.out, `${name}_raw.txt`, util.inspect(reveal(xsn).messages, { depth: null, maxArrayLength: null }), true);
+      writeToFileOrDisplay(options.out, `${ name }_raw.txt`, util.inspect(reveal(xsn).messages, { depth: null, maxArrayLength: null }), true);
     else if (!options.parseOnly) // no output if parseOnly but not rawOutput
       displayNamedCsn(compactModel(xsn, options), name);
   }
@@ -639,29 +651,37 @@ async function executeCommandLine( command, options, args ) {
     if (options.enrichCsn)
       enrichCsn( csn, options );
 
-    if (options.internalMsg) {
-      writeToFileOrDisplay(options.out, `${name}_raw.txt`, options.messages, true);
-    }
-    else if (!options.internalMsg) {
-      writeToFileOrDisplay(options.out, `${name}.json`, csn, true);
-    }
+    if (options.internalMsg)
+      writeToFileOrDisplay(options.out, `${ name }_raw.txt`, options.messages, true);
+
+    else if (!options.internalMsg)
+      writeToFileOrDisplay(options.out, `${ name }.json`, csn, true);
   }
 
-  // Write the result 'content' to a file 'filename' in directory 'dir', except if 'dir' is '-'.
-  // In that case, display 'content' to stdout.
-  // If 'content' is not a string, JSON-stringify it
-  // If displaying to stdout, prepend a headline containing 'filename', unless 'omitHeadline' is set.
-  // For filenames, illegal characters (slash, backslash, colon) are replaced by '_'.
+  /**
+   * Write the result 'content' to a file 'filename' in directory 'dir', except if 'dir' is '-'.
+   * In that case, display 'content' to stdout.
+   * If 'content' is not a string, JSON-stringify it
+   * If displaying to stdout, prepend a headline containing 'filename',
+   * unless 'omitHeadline' is set.
+   * For filenames, illegal characters (slash, backslash, colon) are replaced by '_'.
+   *
+   * @param {string} dir
+   * @param {string} fileName
+   * @param {string} content
+   * @param {boolean} [omitHeadline]
+   */
   function writeToFileOrDisplay( dir, fileName, content, omitHeadline = false ) {
     if (options.internalMsg)
       return;
     fileName = fileName.replace(/[:/\\]/g, '_');
 
-    // replace all dots with underscore to get deployable .hdbcds sources (except the one before the file extension)
+    // replace all dots with underscore to get deployable .hdbcds sources
+    // (except the one before the file extension)
     if (options.transformation === 'hdbcds')
       fileName = fileName.replace(/\.(?=.*?\.)/g, '_');
 
-    if (!(content instanceof String || typeof content === 'string'))
+    if (typeof content !== 'string')
       content = JSON.stringify(content, null, 2);
 
     if (dir === '-') {
@@ -672,10 +692,10 @@ async function executeCommandLine( command, options, args ) {
           sql: true, hdbconstraint: true, hdbtable: true, hdbview: true,
         };
         const commentStarter = fileName.split('.').pop() in sqlTypes ? '--$' : '//';
-        process.stdout.write(`${commentStarter} ------------------- ${fileName} -------------------\n`);
+        process.stdout.write(`${ commentStarter } ------------------- ${ fileName } -------------------\n`);
       }
 
-      process.stdout.write(`${content}\n`);
+      process.stdout.write(`${ content }\n`);
       if (!omitHeadline)
         process.stdout.write('\n');
     }
@@ -730,8 +750,9 @@ function parseSeverityOptions({ options }) {
     debug: 'Debug',
   };
 
-  // Note: We use a for loop to ensure that the order of the options on the command line is respected, i.e.
-  //      `--warn id --error id` would lead to `id` being reclassified as an error and not a warning.
+  // Note: We use a for loop to ensure that the order of the options on
+  //       the command line is respected, i.e. `--warn id --error id` would
+  //       lead to `id` being reclassified as an error and not a warning.
   for (const key in options) {
     switch (key) {
       case 'error':
@@ -754,4 +775,3 @@ function parseSeverityOptions({ options }) {
     }
   }
 }
-

package/bin/cdsse.js

@@ -10,7 +10,8 @@
 // capabilities supported at the moments is: complete, find, lint.
 // Syntax highlighting is supported by ./cdshi.js.
 
-/* eslint no-console:off */
+/* eslint @stylistic/js/max-len: 0, no-console: 0 */
+
 // @ts-nocheck
 
 'use strict';
@@ -28,8 +29,8 @@ const { availableBetaFlags: beta } = require('../lib/base/model');
 
 const { argv } = process;
 const cmd = commands[argv[2]];
-const line = Number.parseInt( argv[3] );
-const column = Number.parseInt( argv[4] );
+const line = Number.parseInt( argv[3], 10 );
+const column = Number.parseInt( argv[4], 10 );
 const file = argv[5];
 const frel = path.relative( '', file || '' );
 // TODO: proper realname
@@ -72,10 +73,11 @@ function complete( err, buf ) {
     hasId = tokensAt( buf, off.prefix, off.col, true );
   }
   if (hasId) {
-    const src = `${buf.substring( 0, off.prefix )}__NO_SUCH_ID__${buf.substring( off.cursor )}`;
+    const src = `${ buf.substring( 0, off.prefix ) }__NO_SUCH_ID__${ buf.substring( off.cursor ) }`;
     const fname = path.resolve( '', file );
     compiler.compileX( [ file ], '', {
-      newParser: true, attachValidNames: true, lintMode: true, beta, messages }, { [fname]: src } )
+      newParser: true, attachValidNames: true, lintMode: true, beta, messages,
+    }, { [fname]: src } )
       .then( ident, ident );
   }
   return true;
@@ -97,7 +99,7 @@ const autoNavigateKinds = {
   $navElement: art => art._origin,
   $tableAlias: art => art._origin,
   using: () => true,
-}
+};
 
 // For finding the definition for reference under cursor, do the following
 //  * replace identifier under cursor by an undefined name
@@ -112,7 +114,7 @@ function find( err, buf ) {
   if (off.prefix === off.cursor) // not at name
     return true;
   const messages = [];
-  const src = `${buf.substring( 0, off.prefix )}__NO_SUCH_ID__${buf.substring( off.cursor )}`;
+  const src = `${ buf.substring( 0, off.prefix ) }__NO_SUCH_ID__${ buf.substring( off.cursor ) }`;
   const fname = path.resolve( '', file );
   compiler.compileX( [ file ], '', {
     newParser: true, attachValidNames: true, lintMode: true, beta, messages,
@@ -130,7 +132,7 @@ function find( err, buf ) {
     // TODO: why no _effectiveType for $navElement ?
     // TODO: display both the (first) inferred _and_ the "final" one
     if (art)
-      console.log( `${locationString( art.name.location || art.location )}: Definition` );
+      console.log( `${ locationString( art.name.location || art.location ) }: Definition` );
     return true;
   }
 }
@@ -140,7 +142,9 @@ function lint( err, buf ) {
     return usage( err );
   const messages = [];
   const fname = path.resolve( '', file );
-  compiler.compileX( [ file ], '', { newParser: true, lintMode: true, beta, messages }, { [fname]: buf } )
+  compiler.compileX( [ file ], '', {
+    newParser: true, lintMode: true, beta, messages,
+  }, { [fname]: buf } )
     .then( display, display );
   return true;
 
@@ -155,7 +159,7 @@ function lint( err, buf ) {
 
 function tokensAt( buf, _offset, col, symbol ) {
   const messages = [];
-  const src = `${buf.substring( 0, _offset )}≠${buf.substring( _offset )}`;
+  const src = `${ buf.substring( 0, _offset ) }≠${ buf.substring( _offset ) }`;
   compiler.parseX( src, frel, { newParser: true, messages } );
   const et = messageAt( messages, 'expectedTokens', col ) || [];
   for (const n of et) {

package/bin/cdsv2m.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+/* eslint @stylistic/js/max-len: 0, no-console: 0 */
+
 'use strict';
 
 // Very simple command-line interface to support model migration
@@ -45,6 +47,6 @@ function ria() {
   }
   for (const name in annotates) {
     const escaped = name.split('.').map(part => smartId(part)).join('.');
-    console.log(`annotate ${escaped} with @cds.redirection.target: false;`);
+    console.log(`annotate ${ escaped } with @cds.redirection.target: false;`);
   }
 }