@sap/cds-compiler 6.0.12 → 6.1.0

package/CHANGELOG.md

@@ -8,6 +8,31 @@ Note: `beta` fixes, changes and features are usually not listed in this ChangeLo
 but in [doc/CHANGELOG_BETA.md](doc/CHANGELOG_BETA.md).
 The compiler behavior concerning `beta` features can change at any time without notice.
 
+## Version 6.1.0 - 2025-06-27
+
+### Added
+
+- for.odata:
+  + Introduce a new option `addAnnotationAddressViaNavigationPath` to annotate services
+    containing draft-enabled entities with `@Common.AddressViaNavigationPath`.
+  + Introduce a new option `draftMessages` that enhances the draft generation logic.
+
+### Changed
+
+- Update OData vocabularies: Capabilities, Common
+
+### Fixed
+
+- compiler: The ternary condition operator `…?…:…` is now right-associative as usual
+  (in v5, chaining it like in `…?…:…?…:…` was not possible without parentheses).
+
+## Version 6.0.14 - 2025-06-18
+
+### Fixed
+
+- to.sql: Fix error when calculated element refers to a localized element.
+- to.edm(x): Correctly handle `PropertyPath` in a collection when using expressions as annotation values
+
 ## Version 6.0.12 - 2025-06-06
 
 ### Changed

package/bin/cdsc.js

@@ -299,7 +299,7 @@ function displayUsage( error, helpText, code ) {
  */
 async function createTemporaryFileFromStdin() {
   const contents = await readStream(process.stdin);
-  const file = tmpFilePath('cds-compiler-stdin', 'cds');
+  const file = tmpFilePath('cds-compiler-stdin.cds');
   await fs.promises.writeFile(file, contents);
   return file;
 }

package/lib/api/options.js

@@ -36,6 +36,7 @@ const publicOptionsNewAPI = [
   'booleanEquality',
   'dollarNowAsTimestamp',
   // ODATA
+  'addAnnotationAddressViaNavigationPath',
   'odataOpenapiHints',
   'edm4OpenAPI',
   'odataVersion',
@@ -48,6 +49,7 @@ const publicOptionsNewAPI = [
   'odataV2PartialConstr',
   'odataVocabularies',
   'odataNoCreator',
+  'draftMessages',
   'service',
   'serviceNames',
   // to.cdl

package/lib/base/messages.js

@@ -193,7 +193,7 @@ class CompileMessage {
     this.validNames = null;
     this.home = home;  // semantic location, e.g. 'entity:"E"/element:"x"'
     this.severity = severity;
-    Object.defineProperty( this, 'messageId', { value: id } );
+    this.messageId = id;
     Object.defineProperty( this, '$module', { value: moduleName, configurable: true } );
     // Uncomment when running TypeScript linter
     // this.messageId = id;

package/lib/base/node-helpers.js

@@ -19,9 +19,17 @@ class PromiseAllError extends Error {
  *
  * This function only works as intended if no promise in `promises` fulfill
  * with a value which is an instance of Error.
+ *
+ * @param {Promise[]} promises
+ * @param {(e: Error) => boolean} shouldImmediatelyReject
+ *          Determine on a per-promise basis whether we should immediately abort all promises.
  */
-function promiseAllDoNotRejectImmediately( promises ) {
-  return Promise.all( promises.map( p => p.catch(e => e) ) )
+function promiseAllDoNotRejectImmediately( promises, shouldImmediatelyReject = _error => false ) {
+  return Promise.all( promises.map( p => p.catch((e) => {
+    if (shouldImmediatelyReject(e))
+      throw e;
+    return e;
+  }) ) )
     .then( values => (values.some(e => e instanceof Error)
       ? Promise.reject( new PromiseAllError(
         values, 'At least one promise has been rejected'

package/lib/checks/assocOutsideService.js

@@ -21,7 +21,9 @@ function assertNoAssocUsageOutsideOfService( parent, prop, ref, path, grandparen
     return;
 
   const { _links } = parent;
-  if (_links?.length <= 1)
+  // session variables can't have assoc steps, _links of 1 can't have assoc steps
+  // TODO: (typeof parentProp === 'number' && path[path.length - 2] === 'on') - ignore on-conditions, as they are cut off anyway
+  if (parent.$scope === '$magic' || _links?.length <= 1 )
     return;
 
   for (let i = 0; i < _links.length - 1; i++) {

package/lib/compiler/index.js

@@ -148,6 +148,8 @@ function parserForFile( source, ext, options ) {
 //  - { realname: fs.realpath(filename) }: if filename is not canonicalized
 //
 function compileX( filenames, dir = '', options = {}, fileCache = Object.create( null ) ) {
+  options.abortSignal?.throwIfAborted();
+
   // A non-proper dictionary (i.e. with prototype) is safe if the keys are
   // absolute file names - they start with `/` or `\` or similar
   // if (Object.getPrototypeOf( fileCache ))
@@ -163,7 +165,10 @@ function compileX( filenames, dir = '', options = {}, fileCache = Object.create(
       input = processedInput;
       model.sources = input.sources;
     } )
-    .then( () => promiseAllDoNotRejectImmediately( input.files.map( readAndParse ) ) )
+    .then( () => promiseAllDoNotRejectImmediately(
+      input.files.map( readAndParse ),
+      e => e?.name === 'AbortError' // reject immediately if user wants to abort
+    ))
     .then( testInvocation, (reason) => {
       // do not reject with PromiseAllError, use InvocationError:
       const errs = reason.valuesOrErrors?.filter( e => e instanceof Error ) || [ reason ];
@@ -176,6 +181,7 @@ function compileX( filenames, dir = '', options = {}, fileCache = Object.create(
     all = all.then( readDependencies );
 
   return all.then( () => {
+    options.abortSignal?.throwIfAborted();
     moduleLayers.setLayers( input.sources );
     return compileDoX( model );
   } );
@@ -193,6 +199,9 @@ function compileX( filenames, dir = '', options = {}, fileCache = Object.create(
     sources[filename] = { location: new Location( rel ) };
 
     const source = await cdsFs( fileCache, options.traceFs ).readFileAsync( filename, 'utf8' );
+    // before running our compute-heavy parsing, check if user aborted
+    options.abortSignal?.throwIfAborted();
+
     const ast = parseX( source, rel, options, model.$messageFunctions );
     sources[filename] = ast;
     ast.location = new Location( rel );

package/lib/compiler/shared.js

@@ -527,7 +527,6 @@ function fns( model ) {
     if (traverseTypedExpr( args[0], exprCtx, user, null, callback ) === traverseExpr.STOP)
       return null;
     return args.slice( 1 );
-    // TODO: adopt if we extend this to ?:?:…
   }
 
   function traverseCaseWhen( args, exprCtx, user, type, callback ) {

package/lib/edm/annotations/genericTranslation.js

@@ -1442,6 +1442,15 @@ function csn2annotationEdm( reqDefs, reqDefsUtils, csnVocabularies, serviceName,
                   { anno: msg.anno(), '#': 'enuminCollection' });
         }
         else if (value.$edmJson) {
+          if (dTypeName === 'Edm.PropertyPath') {
+            const dPropType = dTypeName.replace(/^Edm\./, '');
+            if (!value.$edmJson[`$${ dPropType }`]) {
+              // Needs to adapt the property type as per the dictionary, because expression refs are always
+              // generated as kind $Path earlier on (edmJson::transform.ref)
+              value.$edmJson[`$${ dPropType }`] = value.$edmJson.$Path;
+              delete value.$edmJson.$Path;
+            }
+          }
           newCollection.append(handleEdmJson(value.$edmJson, msg));
         }
         else {

package/lib/gen/BaseParser.js

@@ -1,4 +1,4 @@
-// Base class for generated parser, for redepage v0.2.4
+// Base class for generated parser, for redepage v0.2.5
 
 'use strict';
 
@@ -53,7 +53,7 @@ class BaseParser {
       s: this.s,
       stack: this.stack,
       dynamic_: this.dynamic_,
-      prec_: this.prec_
+      prec_: this.prec_         // TODO: necessary?
     };
   }
 
@@ -433,13 +433,13 @@ class BaseParser {
       this.s = cmd[1];
     if (cmd[0] !== (lk1 ? 'ck' : 'ci')) { // make the std case fast
       // TODO: also not with lean condition
-      let match1 = this._pred_next( 'Id', lk1, 'P' ); // TODO: really P for I?
+      let match1 = this._pred_next( 'Id', lk1, 'P' ); // first step of `K`/`I` prediction
       if (!match1) {
         if (lk1 || match1 === false) // assert for correct code generation
           throw Error( `Cannot match first prediction token in rule at state ${ saved.s }` );
-        if (match1 == null) {
+        if (match1 == null) {      // TODO: just return true, rule exit prediction will do it
           this._traceSubPush( 0 );  // TODO: make _pred_next push this
-          match1 = this._matchesInFollow( 'Id', lk1, 'I' ); // TODO: 'I'?
+          match1 = this._matchesInFollow( 'Id', lk1, 'I' );
         }
         else {
           this._traceSubPush( false );
@@ -452,10 +452,12 @@ class BaseParser {
 
     this._traceSubPush( '' );   // between the two tokens
     ++this.tokenIdx;            // for user lookahead fns and conditions
-    let match2 = this._pred_next( lt2, lk2, (lk1 ? 'K' : 'I') );
+    const mode = lk1 ? 'K' : 'I';
+    let match2 = this._pred_next( lt2, lk2, mode );
     if (match2 == null) {
       this._traceSubPush( 0 );  // TODO: make _pred_next push this
-      match2 = !!this._matchesInFollow( lt2, lk2, (lk1 ? 'K' : 'I') );
+      match2 = !!this._matchesInFollow( lt2, lk2, mode );
+      // TODO: we might use mode 'E' in _matchesInFollow (depends on caching)
     }
     else {
       this._traceSubPush( match2 );
@@ -485,8 +487,6 @@ class BaseParser {
    * condition is listed in `this.leanConditions`.
    */
   _pred_next( type, keyword, mode ) { // mode = P | K | I | E | R | M
-    // TODO mode: really distinguish between K | I | E | R ?
-    // Probably not: would not work with caching?  → P, P -> F
     const properCall = (mode === 'P');
     const lean = (mode !== 'M'); // TODO: extra method with conditions ?
     // TODO: if false, use condition in this.leanConditions
@@ -609,6 +609,7 @@ class BaseParser {
       this._traceSubPush( match == null ? 0 : match === (mode !== 'R') );
       // successfully matching a keyword in giR() means unsuccessful match as
       // reserved identifer
+      // TODO: this.stack ?
     }
     this.dynamic_ = dynamic_;
     this.s = savedState;
@@ -773,7 +774,6 @@ class BaseParser {
     token.keyword = keyword;
     Object.assign( this, saved );
     this.trace = trace;
-    // TODO: also trace M(…) collection, extra line for each token, with condition
     return expecting;
   }
 

package/lib/gen/CdlGrammar.checksum

@@ -1 +1 @@
-eb778bab22f4006cfcf64e418dcae71c
+7cfe4871a952fbc999cd1e8b06300f7f

package/lib/gen/CdlParser.js

@@ -1,4 +1,4 @@
-// Parser generated by redepage v0.2.4
+// Parser generated by redepage v0.2.5
 'use strict;'
 const { XsnSource, XsnArtifact, XsnName } = require( '../compiler/xsn-model' )
 const AstBuildingParser = require('../parsers/AstBuildingParser')
@@ -1164,7 +1164,7 @@ Id:[656,673],
 '||':['c',660,,'precLeft_',20],
 and:['ck',660,,'precLeft_',4],
 or:['ck',660,,'precLeft_',2],
-'?':['c',657,,'precLeft_',0],
+'?':['c',657,,'precRight_',0],
 '<':['c',659,,'precNone_',10],'=':'<','>':'<','!=':'<','<=':'<','<>':'<','>=':'<',
 '==':['c',660,,'precNone_',10],
 is:['ck',661,,'precNone_',10],
@@ -1786,7 +1786,7 @@ case 85:switch(this.lk()){
 case'limit':case'order':this.orderByLimitOffset({query},86);continue
 default:this.s=86;continue
 }
-case 86:this.s=87;{this.afterBrace('normal'); ; }continue
+case 86:this.s=87;{this.afterBrace('normal')}continue;
 case 87:switch(this.lk()){
 case'actions':this.actionsBlock({art:$.art},0);continue
 default:this.gr([';']);continue
@@ -3087,7 +3087,7 @@ return this.exit_()
 }
 targetCardinality($,$next,$startState){
 this.rule_($startState??436,$next)
-{ if (!$.atAlt) $.card.sourceMax = $.card.targetMax; }
+if (!$.atAlt) $.card.sourceMax = $.card.targetMax
 for(;;)switch(this.s){
 case 436:switch(this.l()){
 case'*':if(this.c(0)){ $.card.targetMax = this.valueWithLocation(); }continue
@@ -3232,7 +3232,7 @@ case 473:switch(this.lk()){
 case'excluding':this.excludingClause({query:$.query},480);continue
 default:this.s=480;continue
 }
-case 474:this.s=475;{this.inSelectItem('sqlStyle'); ; }continue
+case 474:this.s=475;{this.inSelectItem('sqlStyle')}continue;
 case 475:switch(this.l()){
 case'*':if(this.c(476)){ $.query.columns = [ this.valueWithLocation() ]; }continue
 case'Id':case'#':case'(':case'+':case'-':case':':case'?':case'@':case'{':case'Number':case'String':case'QuotedLiteral':this.selectItemDef({columns:($.query.columns = [])},476);continue
@@ -3578,7 +3578,7 @@ case 570:switch(this.lk()){
 case'virtual':if(this.lP(['Id','#','(','+','-',':','?','{','key','not','case','cast','null','true','false','Number','String','exists','QuotedLiteral'])&&this.gc(571,'modifierRestriction')&&this.ck(571)){ art.virtual = this.valueWithLocation( true ); }continue
 default:this.s=571;continue
 }
-case 571:this.s=572;{this.columnExpr('key'); ; }continue
+case 571:this.s=572;{this.columnExpr('key')}continue;
 case 572:switch(this.lk()){
 case'key':if(this.gc(573,'modifierRestriction')&&this.ck(573)){ art.key = this.valueWithLocation( true ); }continue
 default:this.s=573;continue
@@ -3860,7 +3860,7 @@ case'+':case'-':if(this.gc(0,'precLeft_',22)&&this.c(660)){ $.expr = this.applyO
 case'||':if(this.gc(0,'precLeft_',20)&&this.c(660)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
 case'and':if(this.gc(0,'precLeft_',4)&&this.ck(660)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
 case'or':if(this.gc(0,'precLeft_',2)&&this.ck(660)){ $.expr = this.applyOpToken( $.expr, 'nary' ); }continue
-case'?':if(this.gc(0,'precLeft_',0)&&this.c(657)){ $.expr = this.applyOpToken( $.expr, '?:' ); }continue
+case'?':if(this.gc(0,'precRight_',0)&&this.c(657)){ $.expr = this.applyOpToken( $.expr, '?:' ); }continue
 case'<':case'=':case'>':case'!=':case'<=':case'<>':case'>=':if(this.gc(0,'precNone_',10)&&this.c(659)){ $.expr = this.applyOpToken( $.expr ); }continue
 case'==':if(this.gc(0,'precNone_',10)&&this.c(660)){ $.expr = this.applyOpToken( $.expr ); }continue
 case'is':if(this.gc(0,'precNone_',10)&&this.ck(661)){ $.expr = this.applyOpToken( $.expr ); }continue

package/lib/gen/Dictionary.json

@@ -3231,13 +3231,6 @@
         "ValidationFunction": "Common.QualifiedName"
       }
     },
-    "Common.DraftUserAccessType": {
-      "$kind": "ComplexType",
-      "Properties": {
-        "UserAccessRole": "Edm.String",
-        "UserID": "Edm.String"
-      }
-    },
     "Common.EffectType": {
       "$deprecated": true,
       "$deprecationText": "All side effects are essentially value changes, differentiation not needed.",

package/lib/json/to-csn.js

@@ -1319,11 +1319,15 @@ function flattenInternalXpr( array, xprOp ) {
 function ternaryOperator( node ) {
   const rargs = [
     'case',
-    'when', exprInternal(node.args[0]),
-    'then', exprInternal(node.args[2]),
-    'else', exprInternal(node.args[4]),
-    'end',
+    'when', exprInternal( node.args[0] ),
+    'then', exprInternal( node.args[2] ),
   ];
+  let right = node.args[4];
+  for (; right.op?.val === '?:' && !right.$parens?.length; right = right.args[4]) {
+    rargs.push( 'when', exprInternal( right.args[0] ),
+                'then', exprInternal( right.args[2] ) );
+  }
+  rargs.push( 'else', exprInternal( right ), 'end' );
 
   if (node.$parens?.length)
     return { xpr: flattenInternalXpr( rargs, 'xpr' ) };

package/lib/main.d.ts

@@ -158,6 +158,16 @@ declare namespace compiler {
      * @since v4.2.0
      */
     moduleLookupDirectories?: string[]
+    /**
+     * An [`AbortSignal`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal)
+     * that can be used to abort the compilation.
+     * Used for any `async` task, i.e. at the moment for reading/parsing files.
+     *
+     * Note that this flag has no effect on _synchronous_ compilation functions.
+     *
+     * @since v6.1
+     */
+    abortSignal?: AbortSignal
     /**
      * Option for {@link compileSources}.  If set, all objects inside the
      * provided sources dictionary are interpreted as XSN structures instead
@@ -1558,8 +1568,6 @@ declare namespace compiler {
     constructor(location: Location, msg: string, severity?: MessageSeverity, id?: string | null, home?: string | null, moduleName?: string | null);
     /**
      * Optional ID of the message.  Can be used to reclassify messages.
-     *
-     * @note This property is non-enumerable as message IDs are not finalized, yet.
      */
     messageId?: string
 

package/lib/optionProcessor.js

@@ -263,6 +263,8 @@ optionProcessor.command('O, toOdata')
   .option('    --odata-v2-partial-constr')
   .option('    --odata-vocabularies <list>')
   .option('    --odata-no-creator')
+  .option('    --draft-messages')
+  .option('    --add-annotation-AddressViaNavigationPath')
   .option('-c, --csn')
   .option('-f, --odata-format <format>', { valid: [ 'flat', 'structured' ] })
   .option('-n, --sql-mapping <style>', { valid: [ 'plain', 'quoted', 'hdbcds' ], aliases: [ '--names' ] })
@@ -297,7 +299,10 @@ optionProcessor.command('O, toOdata')
        --odata-vocabularies <list> JSON array of adhoc vocabulary definitions
                                    { 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
+       --draft-messages            Add draft messages as part of the draft creation
+       --add-annotation-AddressViaNavigationPath Add annotation "@Common.AddressViaNavigationPath" to the services
+                                                 containing draft enabled entitties 
+       -n, --sql-mapping <style> Annotate artifacts and elements with "@cds.persistence.name", which is
                              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,

package/lib/transform/db/rewriteCalculatedElements.js

@@ -697,8 +697,10 @@ function removeDummyValueInEntity( artifact, path, options ) {
 function dummifyInEntity( artifact, path ) {
   applyTransformationsOnDictionary(artifact.elements, {
     value: (parent, _prop, value) => {
-      if (!value.stored)
+      if (!value.stored) {
         parent.value = { val: 'DUMMY' };
+        delete parent.localized;
+      }
     },
   }, {}, path);
 }

package/lib/transform/draft/db.js

@@ -232,7 +232,7 @@ function generateDrafts( csn, options, pathDelimiter, messageFunctions ) {
     draftAdministrativeData.DraftAdministrativeData.notNull = true;
     addElement(draftAdministrativeData, draftsArtifact, artifactName);
 
-    if (isBetaEnabled(options, 'draftMessages')) {
+    if (isBetaEnabled(options, 'draftMessages') || options.draftMessages) {
       const draftMessages = { DraftMessages: { '@Core.Computed': true, virtual: true, items: { type: 'DRAFT.DraftAdministrativeData_DraftMessage' } } };
       addElement(draftMessages, draftsArtifact, artifactName);
     }

package/lib/transform/draft/odata.js

@@ -59,7 +59,7 @@ function generateDrafts( csn, options, services, messageFunctions ) {
   const filterDict = Object.create(null);
 
   // validate the 'DRAFT.DraftAdministrativeData_DraftMessage' type if already present in the model
-  if (isBetaEnabled(options, 'draftMessages')) {
+  if (isBetaEnabled(options, 'draftMessages') || options.draftMessages) {
     const draftAdminDataMessagesType = csn.definitions['DRAFT.DraftAdministrativeData_DraftMessage'];
     if (draftAdminDataMessagesType && !isValidDraftAdminDataMessagesType(draftAdminDataMessagesType)) {
       error(null, [ 'definitions', 'DRAFT.DraftAdministrativeData_DraftMessage' ], { name: 'DRAFT.DraftAdministrativeData_DraftMessage' },
@@ -180,7 +180,7 @@ function generateDrafts( csn, options, services, messageFunctions ) {
     // ... on SiblingEntity.IsActiveEntity != IsActiveEntity ...
     siblingEntity.SiblingEntity.on = createAssociationPathComparison('SiblingEntity', 'IsActiveEntity', '!=', 'IsActiveEntity');
 
-    if (isBetaEnabled(options, 'draftMessages')) {
+    if (isBetaEnabled(options, 'draftMessages') || options.draftMessages) {
       const draftMessages = { DraftMessages: { '@Core.Computed': true, virtual: true, items: { type: 'DRAFT.DraftAdministrativeData_DraftMessage' } } };
       addElement(draftMessages, artifact, artifactName);
 
@@ -189,8 +189,11 @@ function generateDrafts( csn, options, services, messageFunctions ) {
         setAnnotation(artifact, '@Common.SideEffects#alwaysFetchMessages.TargetProperties', ['DraftMessages'] );
       }
       setAnnotation(artifact, '@Common.Messages', { '=': 'DraftMessages', ref: ['DraftMessages'] });
-      const service = csn.definitions[getServiceOfArtifact(artifactName, services)];
-      setAnnotation(service, '@Common.AddressViaNavigationPath', true);
+      setAnnotationAddressViaNavigationPath(artifactName, services);
+    }
+
+    if (options.addAnnotationAddressViaNavigationPath) {
+      setAnnotationAddressViaNavigationPath(artifactName, services);
     }
 
     // Iterate elements
@@ -291,6 +294,13 @@ function generateDrafts( csn, options, services, messageFunctions ) {
       }
     })
   }
+
+  // Set the @Common.AddressViaNavigationPath annotation to the service of
+  // the current artifact, if not set already
+  function setAnnotationAddressViaNavigationPath(artifactName, services) {
+    const service = csn.definitions[getServiceOfArtifact(artifactName, services)];
+    setAnnotation(service, '@Common.AddressViaNavigationPath', true);
+  }
 }
 
 module.exports = generateDrafts;

package/lib/transform/transformUtils.js

@@ -402,7 +402,7 @@ function getTransformers(model, options, msgFunctions, pathDelimiter = '_') {
     if (!draftAdminDataEntity) {
       draftAdminDataEntity = createAndAddDraftAdminDataEntity();
       model.definitions['DRAFT.DraftAdministrativeData'] = draftAdminDataEntity;
-      if (isBetaEnabled(options, 'draftMessages')
+      if ((isBetaEnabled(options, 'draftMessages') || options.draftMessages)
           && options.transformation === 'odata'
           && !model.definitions['DRAFT.DraftAdministrativeData_DraftMessage']) {
         model.definitions['DRAFT.DraftAdministrativeData_DraftMessage'] = createDraftAdminDataMessagesType();
@@ -475,7 +475,7 @@ function getTransformers(model, options, msgFunctions, pathDelimiter = '_') {
       draftIsProcessedByMe.DraftIsProcessedByMe['@Common.Label'] = '{i18n>Draft_DraftIsProcessedByMe}';
       addElement(draftIsProcessedByMe, artifact, artifactName);
 
-      if (isBetaEnabled(options, 'draftMessages')) {
+      if (isBetaEnabled(options, 'draftMessages') || options.draftMessages) {
         const messages = { DraftMessages: { } };
         if (options.transformation === 'odata') {
           messages.DraftMessages = { items: { type: 'DRAFT.DraftAdministrativeData_DraftMessage' } };

package/lib/utils/file.js

@@ -32,18 +32,14 @@ function fileExtension( filename ) {
 }
 
 /**
- * Create a temporary file path using the system's temporary folder and a filename
- * consisting of the given name/extension and a random string.
+ * Create a temporary file path using the system's temporary folder.
  *
- * @param {string} name
- * @param {string} extension
+ * @param {string} filename
  * @returns {string}
  */
-function tmpFilePath( name, extension ) {
-  const crypto = require('crypto');
-  const id = crypto.randomBytes(32).toString('hex');
-  const filename = `${ name }-${ id }.${ extension }`;
-  return path.join(os.tmpdir(), filename);
+function tmpFilePath( filename ) {
+  const dir = fs.mkdtempSync(fs.realpathSync(os.tmpdir()) + path.sep);
+  return path.join(dir, filename);
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "6.0.12",
+  "version": "6.1.0",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",