@sap/cds-dk 8.8.2 → 8.9.1

package/lib/init/index.js

@@ -60,7 +60,7 @@ module.exports = class CDSGenerator {
      * @param {any} options, additional options
      */
     async add(facets) {
-        if (!facets?.length) throw 'You must specify a facet to add to the project.'
+        if (!facets?.length) throw 'you must specify a facet to add to the project'
 
         this._initialize(null);
         this._greetings();
@@ -110,7 +110,7 @@ module.exports = class CDSGenerator {
     _initialize(projectName) {
         // avoid config files to be created in the home dir
         if (cds.cli.command === COMMAND_INIT && !projectName && process.cwd() === require('os').homedir()) {
-            throw `In your home directory, use 'cds init <project>'`
+            throw `in your home directory, use 'cds init <project>'`
         }
         const { options } = cds.cli
         this.cwd = options.cwd || process.cwd();
@@ -123,19 +123,19 @@ module.exports = class CDSGenerator {
     _greetings() {
         if (cds.cli.command === COMMAND_INIT) {
             const relativeProjectPath = path.relative(this.cwd, cds.root)
-            const folderName = relativeProjectPath ? `.${path.sep}${relativeProjectPath}` : 'current folder'
-            console.log(`Creating new CAP project in ${term.bold(folderName)}\n`)
+            const folderName = relativeProjectPath ? `.${path.sep}${relativeProjectPath}` : 'the current folder'
+            console.log(`creating new CAP project in ${term.bold(folderName)}\n`)
         }
         if (cds.cli.options.for && typeof cds.cli.options.for !== 'string') {
-            throw 'The --for argument must not be empty.'
+            throw 'the --for argument must not be empty'
         }
         if (cds.cli.options.force && !cds.cli.options.dry) {
-            console.log(`Using '--force' ... existing files will be overwritten`)
+            console.log(`using '--force' ... existing files will be overwritten`)
         }
     }
 
     async _process(facets) {
-        DEBUG?.(`Project path: ${cds.root}`);
+        DEBUG?.(`project path: ${cds.root}`);
 
         const { options, command } = cds.cli
         if (command === COMMAND_INIT) {
@@ -149,7 +149,7 @@ module.exports = class CDSGenerator {
         const byPriority = (a, b) => cmds.indexOf(a) - cmds.indexOf(b)
         const sorted = Array.from(plugins).sort(byPriority)
         for (const [i, facet] of Object.entries(sorted)) {
-            if (!cds.cli.options.dry) console.log(`Adding feature '${facet}'...`);
+            if (!cds.cli.options.dry) console.log(`adding ${term.bold(facet)}`)
             const template = this.templateList[i]
             await template.run();
             await template.combine();
@@ -157,19 +157,19 @@ module.exports = class CDSGenerator {
         }
 
         if (cds.env['project-nature'] === 'java') {
-            console.log('Updating frozen dependencies in package-lock.json...')
+            console.log('updating frozen dependencies in package-lock.json…')
             await cmd.spawnCommand('npm' , ['i', '--package-lock-only'], { cwd:cds.root })
         }
 
         if (cds.cli.command === COMMAND_INIT) {
             const relativeProjectPath = path.relative(this.cwd, cds.root)
-            let message = 'Successfully created project.'
+            let message = 'successfully created project'
             if (relativeProjectPath) {
-                message = message + ` Continue with '${term.bold('cd ' + relativeProjectPath)}'.`
+                message += ` – continue with ${term.bold('cd ' + relativeProjectPath)}`
             }
             console.log('\n' + message)
         } else if (!cds.cli.options.dry) {
-            console.log(`\nSuccessfully added features to your project.`)
+            console.log(`\nsuccessfully added features to your project`)
         }
     }
 
@@ -188,7 +188,7 @@ module.exports = class CDSGenerator {
                     return `${term.bold(name) + ' '.repeat(max - name.length)}  ${term.dim(help)}`
                 }).join('\n')
                 DEBUG?.(err)
-                throw `Unknown facet '${term.bold(plugin)}'. Did you mean ${term.bold(`cds add ${bestMatch}`)}?\n\nHaven't found the proper facet yet? Here are all supported facets:\n\n${allFacetsText}\n`
+                throw `unknown facet ${term.bold(plugin)} – did you mean ${term.bold(`cds add ${bestMatch}`)}?\n\nall supported facets:\n\n${allFacetsText}\n`
             }
             throw err
         }
@@ -210,7 +210,6 @@ module.exports = class CDSGenerator {
             if (!templates.has(plugin)) {
                 const template = await this._createTemplate(plugin)
                 if (await template.canRun()) {
-                    DEBUG?.(`Adding feature '${plugin}'`)
                     templates.set(plugin, template)
                     const dependencies = await template.requires()
                     dependencies?.forEach(d => plugins.add(d))
@@ -229,8 +228,6 @@ module.exports = class CDSGenerator {
                 return a - b
             })
             .map(key => templates.get(key))
-
-        DEBUG?.(`Features: ${this.templateList.map(({ name }) => name).join(', ')}`);
     }
 
     async stepEnd() { // Also used by CAP Generator

package/lib/init/mvn.js

@@ -111,7 +111,7 @@ module.exports.generate = async function (feature, options = cds.cli.options) {
     const cwd = options.cwd ?? cds.root
 
     try {
-        console.log(`Executing command: `, term.highlight('mvn ' + command.join(' ')))
+        console.log(`executing: `, term.highlight('mvn ' + command.join(' ')))
         await cmd.spawnCommand('mvn', command, { cwd: cwd })
         return command
     } catch (err) {

package/lib/init/plugin.js

@@ -69,7 +69,7 @@ module.exports = class Plugin {
     async combineSupported() {
         const DEBUG = cds.log('cli|add')._debug
         DEBUG && console.log()
-        DEBUG && console.log('Plugins active for production:')
+        DEBUG && console.log('plugins active for production:')
         const fromDk = await readdir(join(__dirname, './template'))
         const { registered } = require('./add')
         const { env4 } = require('./projectReader')

package/lib/init/projectReader.js

@@ -102,6 +102,7 @@ module.exports = new class ProjectReader {
      * @property {boolean} hasMalwareScanner Indicates if the project uses the SAP Malware Scanning service.
      * @property {boolean} hasDynatrace Indicates if the project uses Dynatrace.
      * @property {boolean} hasCloudLogging Indicates if the project uses Cloud Logging.
+     * @property {String} extendsApp Indicates which project is extended if any.
      */
 
     /**
@@ -125,8 +126,9 @@ module.exports = new class ProjectReader {
         const _uiEmbedded = () => exists(join(env.folders.app, 'xs-app.json'))
         const _uiModule = () => !_uiEmbedded() && isdir(env.folders.app) && fs.readdirSync(resolve(cds.root, env.folders.app)).length > 0
         const _isJava = () => this.isJava
+        const _extends = () => pkgJson().extends
         const isApp = name => {
-            return name !== 'appconfig' && !name.startsWith('_') && name !== 'router' && name !== 'portal' && name !== 'workzone'
+            return name !== 'appconfig' && !name.match(/^[._]/) && name !== 'router' && name !== 'portal' && name !== 'workzone'
         }
         const reserved = {
             dependencies: () => pkgJson().dependencies,
@@ -192,6 +194,8 @@ module.exports = new class ProjectReader {
             hasUI5: _ui5,
             hasMTXRoute: () => _inProd('extensibility') || (_inProd('multitenancy') && !_isJava()),
             hasMTXRouteJava: () => (_inProd('helm-unified-runtime') || _inProd('helm')) && _isJava() && _inProd('multitenancy'),
+            imageRegistry: () => exists('chart/values.yaml') ? cds.load.yaml(join(cds.root, 'chart/values.yaml')).global?.image?.registry ?? '<your-container-registry>' : '<your-container-registry>',
+            extendsApp: _extends,
         }
 
         // Automatically creates availability checks for `cds add` commands.

package/lib/init/template/approuter/files/package.json

@@ -1,10 +1,7 @@
 {
   "name": "approuter",
   "dependencies": {
-    "@sap/approuter": "^19.0.0"
-  },
-  "engines": {
-    "node": "^20"
+    "@sap/approuter": "^20.0.0"
   },
   "scripts": {
     "start": "node node_modules/@sap/approuter/approuter.js"

package/lib/init/template/attachments/files/package.json.hbs

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "@cap-js/attachments": "^1"
+    "@cap-js/attachments": "^2"
   }
 }

package/lib/init/template/cloud-logging/files/java-cdsrc.json

@@ -0,0 +1,5 @@
+{
+  "requires": {
+    "telemetry": "to-cloud-logging"
+  }
+}

package/lib/init/template/cloud-logging/index.js

@@ -24,11 +24,15 @@ module.exports = class extends require('../../plugin') {
   }
 
   async run() {
-    const project = readProject(), { hasTelemetry, isNodejs } = project
-    if (isNodejs && (cds.cli.options['with-telemetry'] || hasTelemetry)) {
-      project.profile ??= 'production'
-      await merge(__dirname, 'files/package.json.hbs').into('package.json', { with: project })
-      await sort('package.json', 'dependencies')
+    const project = readProject(), { hasTelemetry, isNodejs, isJava } = project
+    if (cds.cli.options['with-telemetry'] || hasTelemetry) {
+      if (isNodejs) {
+        project.profile ??= 'production'
+        await merge(__dirname, 'files/package.json.hbs').into('package.json', { with: project })
+        await sort('package.json', 'dependencies')
+      } else if (isJava) {
+        await merge(__dirname, 'files/java-cdsrc.json').into('.cdsrc.json')
+      }
     }
   }
 

package/lib/init/template/containerize/files/containerize.yaml.hbs

@@ -1,6 +1,6 @@
 ---
 _schema-version: '1.0'
-repository: <your-container-registry>
+repository: {{& imageRegistry}}
 tag: latest
 before-all:
   - npx cds build --production

package/lib/init/template/data/index.js

@@ -140,7 +140,7 @@ function writeFileFor (entity, data, csn, dest, force) {
 
   // continue only if file not already exists, or '--force' option provided
   if (fileExists && !force) {
-    console.log(`  ${dim('Skipping ' + relFilePath)}`)
+    console.log(`  ${dim('skipping ' + relFilePath)}`)
     return
   }
 
@@ -149,8 +149,8 @@ function writeFileFor (entity, data, csn, dest, force) {
   if (data.length) {
     if (!exists(dest))  fs.mkdirSync(dest, {recursive: true})
     fs.writeFileSync(dataFilePath, data)
-    if (fileExists) console.log(`  ${dim('Overwriting ' + relFilePath)}`)
-    else console.log(`  ${dim('Creating ' + relFilePath)}`)
+    if (fileExists) console.log(`  ${dim('overwriting ' + relFilePath)}`)
+    else console.log(`  ${dim('creating ' + relFilePath)}`)
   }
 }
 

package/lib/init/template/extension/files/.base/index.cds

@@ -0,0 +1,15 @@
+entity my.bookshop.Books {
+  key ID : Integer;
+  title  : String  @title : 'Title';
+  stock  : Integer @title : 'Stock';
+}
+
+service CatalogService {
+  entity Books as projection on my.bookshop.Books;
+}
+
+annotate CatalogService.Books with @UI.LineItem: [
+  { Value: ID },
+  { Value: title },
+  { Value: stock },
+];

package/lib/init/template/extension/files/app/extension.cds.hbs

@@ -0,0 +1,47 @@
+using { my.bookshop, CatalogService } from '{{{basePackage}}}';
+
+namespace {{{extensionNamespace}}};
+
+// new entity
+entity x_Authors {
+  key ID : Integer;
+  name   : String @title : 'Name';
+  books  : Association to many bookshop.Books on books.x_author = $self;
+}
+
+// field extension incl. association
+extend bookshop.Books with {
+  x_isbn   : String @title : 'ISBN';
+  x_author : Association to x_Authors @title : 'Author';
+}
+
+// service extension
+extend service CatalogService with {
+  @readonly entity Authors as projection on x_Authors;
+}
+
+// -------------------------------------------
+// Fiori Annotations
+
+annotate CatalogService.Books with @(
+  Common.SemanticKey: [x_isbn],
+  UI: {
+    LineItem: [
+      { Value:  x_isbn },
+      ... up to { Value: title },
+      { Value:  x_author_ID },
+      ...
+    ]
+  }
+) {
+  x_author @Common: { Text: x_author.name, TextArrangement: #TextOnly };
+};
+
+annotate CatalogService.Authors with @(
+  UI: {
+    LineItem: [
+      { Value: ID },
+      { Value: name },
+    ]
+  }
+);

package/lib/init/template/extension/files/test/data/Authors.csv

@@ -0,0 +1,4 @@
+ID,name
+201,J.K. Rowling
+202,William Shakespeare
+203,Agatha Christie

package/lib/init/template/extension/files/test/data/my.bookshop-Books.csv

@@ -0,0 +1,8 @@
+ID,title,stock,x_isbn,x_author_ID
+101,Harry Potter and the Philosopher's Stone,7,9780747532743,201
+102,Harry Potter and the Chamber of Secrets,5,9780747538493,201
+103,Harry Potter and the Prisoner of Azkaban,12,9780747546290,201
+104,Harry Potter and the Goblet of Fire,3,9780747550990,201
+105,Harry Potter and the Order of the Phoenix,2,9780747551002,201
+106,Harry Potter and the Half-Blood Prince,1,9780747581085,201
+107,Harry Potter and the Deathly Hallows,0,9780747591053,201

package/lib/init/template/extension/index.js

@@ -0,0 +1,99 @@
+const cds = require('../../../cds')
+const { read, write, exists, copy, path:{join, relative}, readdir, rimraf } = cds.utils
+const { mkdir, symlink } = require('fs/promises')
+const { renderAndCopy } = require('../../template')
+const projectReader = require('../../projectReader')
+const npmPackageRegex = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/i
+
+module.exports = class ExtensionProjectTemplate extends require('../../plugin') {
+
+  static help() {
+    return 'Extension project'
+  }
+
+  options() {
+    return {
+      'base': {
+        type: 'string',
+        short: 'p',
+        help: `The project to extend.`
+      }
+    }
+  }
+
+
+  async run() {
+    let { base, force } = cds.cli.options
+    if (typeof base === 'string' && !base.match(npmPackageRegex)) throw `Illegal package name: ${base}`
+    if (typeof base !== 'string' || !base?.length)  base = '@capire/bookshop'
+
+    const pkgJson = exists('package.json') ? await read('package.json') : { name: 'my-extension-project' }
+    if (!pkgJson.extends || force) {
+      pkgJson.extends = base
+    }
+
+    if (!pkgJson.workspaces?.includes('.base')) {
+      pkgJson.workspaces ??= []
+      pkgJson.workspaces.push('.base')
+    }
+    await write('package.json', pkgJson, { spaces: 2 })
+
+    if (!exists('.base/package.json') || force) {
+      await write('.base/package.json', {name: base})
+    }
+
+    await nodeModulesLink(base)
+    // remove empty and irrelevant folders
+    await Promise.all([ rmIfEmpty('db') ])
+  }
+
+  async addSample() {
+    const proj = projectReader.readProject()
+    const base = proj.extendsApp
+    if (!base) throw 'No project to extend found in package.json. Create a new extension project with "cds init extension"'
+
+    const projectSimple = base.replace(/^.*?\//, '')
+    const extensionNamespace = `${namespacify(proj.appName)}.${namespacify(projectSimple)}`
+    const { force } = cds.cli.options
+
+    if (!exists('.base/index.cds') || force) {
+      await copy(join(__dirname, 'files/.base/index.cds'), '.base/index.cds')
+    }
+
+    if (!exists('app/extension.cds') || force) {
+      await renderAndCopy(join(__dirname, 'files/app'), 'app', {
+        basePackage: base,
+        extensionNamespace
+      })
+    }
+    if (!exists('test/data') || force) {
+      await copy(join(__dirname, 'files/test/data/my.bookshop-Books.csv'), 'test/data/my.bookshop-Books.csv')
+      await copy(join(__dirname, 'files/test/data/Authors.csv'), `test/data/${extensionNamespace}-x_Authors.csv`)
+    }
+
+  }
+
+  // async finalize() {
+  //     console.log(`For information on project "Piper" and its pipelines see ${URLS.PIPELINE_HELP}`);
+  // }
+}
+
+function namespacify(s) {
+  return s.replace(/[/.-]/g, '_').replace(/[@]/g, '').toLowerCase()
+}
+async function rmIfEmpty(s) {
+  exists(s) && !(await readdir(s)).length && await rimraf(s)
+}
+
+// Allow subsequent templates like `cds add handler` to resolve the model w/o `npm i`.
+// So create a symlink from node_modules to .base, anticipating what `npm i` would do.
+async function nodeModulesLink(base) {
+  const link = join(cds.root, 'node_modules', base)
+  if (exists(link))  return
+  const scope = base.indexOf('/') > 0 && base.split('/')[0] // @scope/pkg
+  const target = join(cds.root, 'node_modules', scope||'')
+  await mkdir(target, { recursive: true })
+  const relTarget = relative(target, join(cds.root, '.base'))
+  // console.log(`> linking ${relTarget} to ${link}`)
+  await symlink(relTarget, link, 'junction')
+}

package/lib/init/template/handler/files/extension/handler.xs.hbs

@@ -0,0 +1,10 @@
+{{#hasTyper}}
+const { {{entityNames}} } = require('#cds-models/{{{servicePath}}}')
+{{/hasTyper}}
+{{^hasTyper}}
+const { {{entityNames}} } = this.entities
+{{/hasTyper}}
+
+module.exports = async function(req) {
+  {{#entityName}}console.log('{{when}} {{event}} {{entityName}}'){{/entityName}}{{^entityName}}console.log('{{when}} {{event}}'){{/entityName}}
+}

package/lib/init/template/handler/files/extension/package.json

@@ -0,0 +1,10 @@
+{
+  "devDependencies": {
+    "@sap/cds-oyster": "git+https://github.tools.sap/cap/cds-oyster"
+  },
+  "cds": {
+    "requires": {
+      "code-extensibility": true
+    }
+  }
+}

package/lib/init/template/handler/index.js

@@ -1,5 +1,5 @@
 const cds = require('../../../cds')
-const { fs: { promises: { rename } }, path: { basename, dirname, join }, exists } = cds.utils
+const { fs: { promises: { rename } }, read, write, path: { basename, dirname, join }, exists } = cds.utils
 const { readProject } = require('../../projectReader')
 const { renderAndCopy } = require('../../template')
 const mvn = require('../../mvn')
@@ -36,34 +36,28 @@ module.exports = class Handler extends require('../../plugin') {
   }
 
   async run() {
-    const { isJava } = readProject()
-    if (isJava) {
+    const proj = readProject()
+    if (proj.isJava) {
       await mvn.generate('handler')
     } else {
-      await createNodeHandler()
+      await createNodeHandler(proj)
     }
   }
 }
 
-async function createNodeHandler() {
+/**
+ * @param {ReturnType<readProject} proj
+ */
+async function createNodeHandler(proj) {
   const { filter, force, out=cds.env.folders.srv } = cds.cli.options
-  const proj = readProject()
   const csn = await loadModel()
-  if (!csn)  return console.log(dim(`> Skipping, no model found`))
+  if (!csn)  return console.log(dim(`> skipping, no model found`))
 
   const nameFilter = filterStringAsRegex(filter)
 
   for (const service of csn.services) {
     if (!service.$location.file)  continue
 
-    const destFileType = proj.isTypescript ? '.ts' : '.js'
-    const outPath = join(out, basename(service.$location.file.replace('.cds', destFileType)))
-    const destFile = join(cds.root, outPath)
-    if (!force && exists(destFile)) {
-      console.log(dim(`> Skipping ${outPath}`))
-      continue
-    }
-
     proj.serviceName = service.name
     proj.serviceClass = service.name.split('.').pop()
     proj.servicePath = proj.serviceName ? (proj.serviceName.replace(/\./g, '/')) : ''
@@ -92,11 +86,67 @@ async function createNodeHandler() {
     else if (all.length)
       proj.allNames = all.map(e => e.name).join(', ')
 
-    console.log(dim(`> Writing ${outPath}`))
-    const destPath = dirname(destFile)
-    await renderAndCopy(join(__dirname, 'files'), destPath, proj)
-    await rename(join(destPath, 'handler.xs'), destFile)
+    if (proj.extendsApp) {
+      await createExtCodeHandler(service, proj, out, force)
+    } else {
+      const destFileType = proj.isTypescript ? '.ts' : '.js'
+      const outPath = join(out, basename(service.$location.file.replace('.cds', destFileType)))
+      const destFile = join(cds.root, outPath)
+      if (!force && exists(destFile)) {
+        console.log(dim(`> skipping ${outPath}`))
+        continue
+      }
+      console.log(dim(`> writing ${outPath}`))
+      const destPath = dirname(destFile)
+      await renderAndCopy(join(__dirname, 'files/standard'), destPath, proj)
+      await rename(join(destPath, 'handler.xs'), destFile)
+    }
+  }
+}
+
+async function createExtCodeHandler(service, proj, out, force) {
+  const destFileType = '.js' // only JS for now, a TS toolchain in an ext. project would be too complex
+  const srvOutPath = join(cds.root, out, service.name)
+
+  // entities
+  const events = [['after', 'READ'], ['before', 'CREATE'], ['before', 'UPDATE']]
+  for (const ent of proj.entities) {
+    proj.entityName = ent.name
+    const entityOutPath = join(srvOutPath, ent.name)
+    for (const [when, event] of events) {
+      proj.when = when
+      proj.event = event
+      const outPath = join(entityOutPath, `${when}-${event}${destFileType}`)
+      if (!force && exists(outPath)) {
+        console.log(dim(`> skipping ${outPath}`))
+        continue
+      }
+      console.log(dim(`> writing ${outPath}`))
+      await renderAndCopy(join(__dirname, 'files/extension'), entityOutPath, proj)
+      await rename(join(entityOutPath, 'handler.xs'), outPath)
+    }
+  }
+
+  // unbound actions
+  proj.when = 'on'
+  proj.entityName = ''
+  for (const op of proj.operations) {
+    proj.event = op.name
+    const outPath = join(srvOutPath, `on-${op.name}${destFileType}`)
+    if (!force && exists(outPath)) {
+      console.log(dim(`> skipping ${outPath}`))
+      continue
+    }
+    console.log(dim(`> writing ${outPath}`))
+    await renderAndCopy(join(__dirname, 'files/extension'), dirname(outPath), proj)
+    await rename(join(dirname(outPath), 'handler.xs'), outPath)
   }
+
+  // package.json
+  const pkgJson = await read('package.json')
+  const pkgJsonDelta = require('./files/extension/package.json')
+  deepMerge(pkgJson, pkgJsonDelta)
+  await write('package.json', pkgJson, { spaces: 2 })
 }
 
 /**
@@ -107,6 +157,19 @@ async function loadModel() {
     return cds.linked(cds.minify(await cds.load([cds.env.roots])))
   } catch (err) {
     if (err.code === 'MODEL_NOT_FOUND')  return null
-    throw err
+    throw new Error(`Error compiling CDS files. Run 'npm install' and try again.`, {cause:err})
+  }
+}
+
+function deepMerge(obj1, obj2) {
+  for (const key in obj2) {
+    if (Object.prototype.hasOwnProperty.call(obj2, key)) {
+      if (obj2[key] instanceof Object && obj1[key] instanceof Object) {
+        obj1[key] = deepMerge(obj1[key], obj2[key])
+      } else {
+        obj1[key] = obj2[key]
+      }
+    }
   }
+  return obj1
 }

package/lib/init/template/http/index.js

@@ -133,14 +133,15 @@ module.exports = class HttpTemplate extends require('../../plugin') {
   async #generateRequests(services, payload, csn) {
     let varsDefined = false  // when writing requests for multiple services to stdout, define vars only once
     for (const [serviceName, service] of services) {
-      let [hostname, auth] = await this.#getHostnameAndAuth(service, csn)
+      let [hostname, username, password] = await this.#getHostnameAndAuth(service, csn)
       let requests = []
       if (!cds.cli.options.dry || !varsDefined) {
-        requests.push(auth ? `@server = ${hostname}\n@auth = ${auth}\n` : `@server = ${hostname}\n`)
+        const auth = username ? `@username=${username}\n@password=${password}\n` : ''
+        requests.push(`@server=${hostname}\n${auth}`)
       }
       varsDefined = true
-      const headers = auth ? `Content-Type: application/json\n{{auth}}` : `Content-Type: application/json`
-      const headerAuth = auth ? '{{auth}}' : ''
+      const headerAuth = username ? `Authorization: Basic {{username}}:{{password}}` : ''
+      const headers = headerAuth ? `Content-Type: application/json\n${headerAuth}` : `Content-Type: application/json`
 
       service.urlPaths.forEach((urlPath) => {
         if (service.urlPaths.length > 1) {
@@ -201,7 +202,7 @@ module.exports = class HttpTemplate extends require('../../plugin') {
       const nameDraftsCreate = slug(title+'_Draft_POST')
       requests.push(`${title} Drafts GET\n# @name ${slug(title+'_Drafts_GET')}\nGET ${url}?$filter=(IsActiveEntity eq false)\n${headerAuth}\n`) // unencoded URL for better readability (client can handle this)
       requests.push(`${title} Draft POST\n# @name ${nameDraftsCreate}\nPOST ${url}\n${headers}\n\n${postBody}\n`)
-      requests.push(`\n### Result from POST request above\n@draftID = {{${nameDraftsCreate}.response.body.$.${key}}}\n`)
+      requests.push(`\n### Result from POST request above\n@draftID={{${nameDraftsCreate}.response.body.$.${key}}}\n`)
       requests.push(`${title} Draft PATCH\n# @name ${slug(title+'_Draft_Patch')}\nPATCH ${url}(${key}={{draftID}},IsActiveEntity=false)\n${headers}\n\n${postBody}\n`)
       requests.push(`${title} Draft Prepare\n# @name ${slug(title+'_Draft_Prepare')}\nPOST ${url}(${key}={{draftID}},IsActiveEntity=false)/AdminService.draftPrepare\n${headers}\n\n{}\n`)
       requests.push(`${title} Draft Activate\n# @name ${slug(title+'_Draft_Activate')}\nPOST ${url}(${key}={{draftID}},IsActiveEntity=false)/AdminService.draftActivate\n${headers}\n\n{}\n`)
@@ -216,8 +217,10 @@ module.exports = class HttpTemplate extends require('../../plugin') {
     if (!cds.cli.options['for-app']) {
       const host = service.isJava ? this.#javaHost : this.#nodeHost
       const users = Object.values(await this.#mockUsersForService(service, csn))
-      const authStr = users.length ? `Authorization: Basic ${users[0].name}:${users[0].password||''}` : null
-      return [host, authStr]
+      if (users.length) {
+        return [host, users[0].name, users[0].password || '']
+      }
+      return [host]
     }
 
     if (!this.approuterAuth) {
@@ -304,13 +307,13 @@ module.exports = class HttpTemplate extends require('../../plugin') {
       const outputPath = this.#determineOutputPath(serviceName)
       if (exists(outputPath)) {
         if (cds.cli.options.force) {
-          console.log(term.dim(`  Overwriting ${outputPath}`))
+          console.log(term.dim(`  overwriting ${outputPath}`))
         } else {
-          console.log(term.dim(`  Skipping ${outputPath}`))
+          console.log(term.dim(`  skipping ${outputPath}`))
           return
         }
       } else {
-        console.log(term.dim(`  Creating ${outputPath}`))
+        console.log(term.dim(`  creating ${outputPath}`))
       }
       write(http).to(outputPath)
     }

package/lib/init/template/java/index.js

@@ -22,7 +22,7 @@ module.exports = class JavaTemplate extends require('../../plugin') {
             throw `You can't change the runtime of an existing project.`
         }
         if (options.add?.has(NODEJS)) {
-            throw `Only one runtime per project is supported. Specify either ${bold(JAVA)} or ${bold(NODEJS)}.`
+            throw `only one runtime per project is supported – specify either ${bold(JAVA)} or ${bold(NODEJS)}`
         }
         return true
     }
@@ -30,7 +30,7 @@ module.exports = class JavaTemplate extends require('../../plugin') {
     async run() {
         const projectName = path.basename(cds.root)
         const { params, artifactId, archetypeVersion } = await mvn.init(projectName)
-        console.log(`Using Maven archetype version ${archetypeVersion}`)
+        console.log(`using Maven archetype version ${archetypeVersion}`)
 
         const temp = await mkdtemp(join(os.tmpdir(), `${path.basename(cds.root)}_`))
         try {
@@ -47,6 +47,6 @@ module.exports = class JavaTemplate extends require('../../plugin') {
     }
 
     async finalize() {
-        console.log(`Learn about next steps at ${link(URLS.CAPIRE)}`)
+        console.log(`learn about next steps at ${link(URLS.CAPIRE)}`)
     }
 }