@sap/cds 6.4.1 → 6.6.0

package/bin/build/provider/fiori/index.js

@@ -62,10 +62,9 @@ class FioriAppModuleBuilder extends BuildTaskHandlerEdmx {
             }
 
             for (let [appFolder, appModelGroup] of appModelGroups.entries()) {
-                this.logger.log(`building module [${appFolder}] using [${this.constructor.name}]`)
+                this.logger.debug(`building module [${appFolder}] using [${this.constructor.name}]`)
                 const modelPaths = cds.resolve(Array.from(appModelGroup.values()), this.buildOptions)
                 if (!modelPaths || modelPaths.length === 0) {
-                    this.logger.log(`no model found`)
                     continue
                 }
                 this.logger._debug && this.logger.debug(`model: ${relativePaths(this.buildOptions.root, modelPaths).join(", ")}`)
@@ -89,19 +88,15 @@ class FioriAppModuleBuilder extends BuildTaskHandlerEdmx {
     /**
      * This version only creates a odata representation for the 'mainService' data source
      * as defined by the fiori wizard - everything else is currently not supported.
-     * Therefore errors are only logged, the build does not fail in case a the service
+     * Therefore errors are only logged, the build does not fail in case a service
      * cannot be resolved based on the defined service URI
      */
     async build() {
-        const { src, dest } = this.task
-        const modelPaths = this.resolveModel()
-        if (!modelPaths || modelPaths.length === 0) {
-            this.logger.log(`no model found`)
+        const model = await this.model()
+        if (!model) {
             return
         }
-        this.logger._debug && this.logger.debug(`model: ${relativePaths(this.buildOptions.root, modelPaths).join(", ")}`)
-
-        await this._writeEdmxToWebapp(src, dest)
+        await this._writeEdmxToWebapp(this.task.src, this.task.dest)
     }
 
     async _writeEdmxToWebapp(src, dest) {

package/bin/build/provider/hana/2migration.js

@@ -1,6 +1,6 @@
 const path = require('path')
 const parser = require('./migrationtable')
-const { BuildError } = require('../../util')
+const { BuildError, hasOptionValue } = require('../../util')
 const { LOG_MODULE_NAMES } = require('../../constants')
 const cds = require('../../cds'), { compiler: cdsc } = cds
 const cdscVersion = `-- generated by cds-compiler version ${cdsc.version()}`
@@ -160,7 +160,7 @@ function _filterJournalArtifacts(csn) {
   }
   const dict = csn.definitions
   for (const name in dict) {
-    if (dict[name][ANNO_PERSISTENCE_JOURNAL] !== true) {
+    if (!_isPersistedAsJournalTable(dict[name])) {
       delete dict[name]
     }
   }
@@ -168,3 +168,12 @@ function _filterJournalArtifacts(csn) {
   csn.meta.build = `CDS Build v${cds.version}`
   return csn;
 }
+
+// see cds-compiler/lib/model/csnUtils.js#isPersistedAsTable
+function _isPersistedAsJournalTable(artifact) {
+  return artifact.kind === 'entity' && hasOptionValue(artifact['@cds.persistence.journal'], true) &&
+    !artifact.abstract &&
+    !hasOptionValue(artifact['@cds.persistence.skip'], true) &&
+    !hasOptionValue(artifact['@cds.persistence.exists'], true) &&
+    (!artifact.query && !artifact.projection || hasOptionValue(artifact['@cds.persistence.table'], true))
+}

package/bin/build/provider/hana/index.js

@@ -338,6 +338,12 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
                 if (!HanaModuleBuilder._toEqualIgnoreMeta(lastDev, afterImage)) {
                     await this.write(afterImage).to(lastDevCsnDir)
                 }
+
+                // add src/.hdiconfig if not existing
+                if (!fs.existsSync(path.join(dbSrcDir, '.hdiconfig'))) {
+                    const template = await HanaModuleBuilder._readTemplateAsJson('.hdiconfig-hanacloud')
+                    await this.write(template).to(path.join(dbSrcDir, '.hdiconfig'))
+                }
             }
         } else {
             throw new BuildError(`Inconsistent CDS compilation results - file ${lastDevCsnFolder} missing`)
@@ -352,7 +358,7 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
             this.logger._debug && this.logger.debug(`skip create [${relativePaths(this.buildOptions.root, packageJson)}], already existing`)
         }
         if (this.isStagingBuild() && !exists) {
-            const content = await this._readTemplateAsJson(FILE_NAME_PACKAGE_JSON)
+            const content = await HanaModuleBuilder._readTemplateAsJson(FILE_NAME_PACKAGE_JSON)
             await this.write(content).to(path.join(this.task.dest, FILE_NAME_PACKAGE_JSON))
         }
     }
@@ -362,7 +368,7 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
      */
     async _writeHdiConfig(plugins) {
         const hdiConfig = path.join(this.task.options.compileDest, FILE_NAME_HDICONFIG)
-        const template = await this._readTemplateAsJson(FILE_NAME_HDICONFIG)
+        const template = await HanaModuleBuilder._readTemplateAsJson('.hdiconfig-haas')
         let content = {
             'file_suffixes': {}
         }
@@ -372,7 +378,7 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
             }
         }
         if (Object.keys(content['file_suffixes']).length !== plugins.size) {
-            this.logger.error(`'HANA plugin not found for file suffix [${Array.from(plugins).join(',')}]`)
+            this.pushMessage(`'HANA plugin not found for file suffix [${Array.from(plugins).join(',')}]`)
         }
         // TODO - Be on the save side for now - go for the content use case later on if this works as expected.
         if (cds.env.hana['deploy-format'] === 'hdbtable') {
@@ -388,7 +394,7 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
     async _writeHdiNamespace() {
         // see issue #64 - add .hdinamespace file to prevent HDI from adding gen/ folder to the namespace.
         const hdiNamespace = path.join(this.task.options.compileDest, FILE_NAME_HDINAMESPACE)
-        const content = await this._readTemplateAsJson(FILE_NAME_HDINAMESPACE)
+        const content = await HanaModuleBuilder._readTemplateAsJson(FILE_NAME_HDINAMESPACE)
         return await this.write(content).to(hdiNamespace)
     }
 
@@ -400,7 +406,7 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
             // see issue #64 - add .hdinamespace file to prevent HDI from adding gen/ folder to the namespace.
             const undeployJsonDest = path.join(this.task.dest, FILE_NAME_UNDEPLOY_JSON)
             const undeployJsonSrc = path.join(this.task.src, FILE_NAME_UNDEPLOY_JSON)
-            const templateEntries = await this._readTemplateAsJson(FILE_NAME_UNDEPLOY_JSON)
+            const templateEntries = await HanaModuleBuilder._readTemplateAsJson(FILE_NAME_UNDEPLOY_JSON)
             let newEntries = []
             if (fs.existsSync(undeployJsonSrc)) {
                 newEntries = await JSON.parse((await fs.promises.readFile(undeployJsonSrc, 'utf-8')).toString())
@@ -423,20 +429,12 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
         }
     }
 
-    async _readTemplateAsJson(template) {
-        const templatePath = path.join(__dirname, 'template', template)
-        return fs.promises.readFile(templatePath, 'utf-8').then(f => JSON.parse(f.toString()))
-            .catch((error) => {
-                this.logger.error(`Failed to read template [${templatePath}]`)
-                return Promise.reject(error)
-            })
-    }
 
     async _readTypesFromUndeployJson() {
         const result = new Set()
         const file = path.join(this.task.src, "undeploy.json")
         if (fs.existsSync(file)) {
-            const undeployList = JSON.parse((await fs.promises.readFile(file)).toString())
+            const undeployList = JSON.parse((await fs.promises.readFile(file)).toString(), 'utf-8')
             if (Array.isArray(undeployList)) {
                 undeployList.forEach(entry => result.add(path.extname(entry)))
             }
@@ -466,6 +464,11 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
         }
     }
 
+    static async _readTemplateAsJson(template) {
+        const content = await fs.promises.readFile(path.join(__dirname, 'template', template), 'utf-8')
+        return JSON.parse(content.toString())
+    }
+
     static _toEqualIgnoreMeta(csn1, csn2) {
         function toString(csn) {
             return JSON.stringify(csn, (k, v) => {

package/bin/build/provider/hana/template/.hdiconfig-hanacloud

@@ -0,0 +1,137 @@
+
+{
+    "file_suffixes": {
+        "csv": {
+            "plugin_name": "com.sap.hana.di.tabledata.source"
+        },
+        "hdbafllangprocedure": {
+            "plugin_name": "com.sap.hana.di.afllangprocedure"
+        },
+        "hdbanalyticprivilege": {
+            "plugin_name": "com.sap.hana.di.analyticprivilege"
+        },
+        "hdbcalculationview": {
+            "plugin_name": "com.sap.hana.di.calculationview"
+        },
+        "hdbcollection": {
+            "plugin_name": "com.sap.hana.di.collection"
+        },
+        "hdbconstraint": {
+            "plugin_name": "com.sap.hana.di.constraint"
+        },
+        "hdbdropcreatetable": {
+            "plugin_name": "com.sap.hana.di.dropcreatetable"
+        },
+        "hdbflowgraph": {
+            "plugin_name": "com.sap.hana.di.flowgraph"
+        },
+        "hdbfunction": {
+            "plugin_name": "com.sap.hana.di.function"
+        },
+        "hdbgraphworkspace": {
+            "plugin_name": "com.sap.hana.di.graphworkspace"
+        },
+        "hdbhadoopmrjob": {
+            "plugin_name": "com.sap.hana.di.virtualfunctionpackage.hadoop"
+        },
+        "hdbindex": {
+            "plugin_name": "com.sap.hana.di.index"
+        },
+        "hdblibrary": {
+            "plugin_name": "com.sap.hana.di.library"
+        },
+        "hdbmigrationtable": {
+            "plugin_name": "com.sap.hana.di.table.migration"
+        },
+        "hdbprocedure": {
+            "plugin_name": "com.sap.hana.di.procedure"
+        },
+        "hdbprojectionview": {
+            "plugin_name": "com.sap.hana.di.projectionview"
+        },
+        "hdbprojectionviewconfig": {
+            "plugin_name": "com.sap.hana.di.projectionview.config"
+        },
+        "hdbreptask": {
+            "plugin_name": "com.sap.hana.di.reptask"
+        },
+        "hdbresultcache": {
+            "plugin_name": "com.sap.hana.di.resultcache"
+        },
+        "hdbrole": {
+            "plugin_name": "com.sap.hana.di.role"
+        },
+        "hdbroleconfig": {
+            "plugin_name": "com.sap.hana.di.role.config"
+        },
+        "hdbsearchruleset": {
+            "plugin_name": "com.sap.hana.di.searchruleset"
+        },
+        "hdbsequence": {
+            "plugin_name": "com.sap.hana.di.sequence"
+        },
+        "hdbstatistics": {
+            "plugin_name": "com.sap.hana.di.statistics"
+        },
+        "hdbstructuredprivilege": {
+            "plugin_name": "com.sap.hana.di.structuredprivilege"
+        },
+        "hdbsynonym": {
+            "plugin_name": "com.sap.hana.di.synonym"
+        },
+        "hdbsynonymconfig": {
+            "plugin_name": "com.sap.hana.di.synonym.config"
+        },
+        "hdbsystemversioning": {
+            "plugin_name": "com.sap.hana.di.systemversioning"
+        },
+        "hdbtable": {
+            "plugin_name": "com.sap.hana.di.table"
+        },
+        "hdbtabledata": {
+            "plugin_name": "com.sap.hana.di.tabledata"
+        },
+        "hdbtabletype": {
+            "plugin_name": "com.sap.hana.di.tabletype"
+        },
+        "hdbtrigger": {
+            "plugin_name": "com.sap.hana.di.trigger"
+        },
+        "hdbview": {
+            "plugin_name": "com.sap.hana.di.view"
+        },
+        "hdbvirtualfunction": {
+            "plugin_name": "com.sap.hana.di.virtualfunction"
+        },
+        "hdbvirtualfunctionconfig": {
+            "plugin_name": "com.sap.hana.di.virtualfunction.config"
+        },
+        "hdbvirtualpackagehadoop": {
+            "plugin_name": "com.sap.hana.di.virtualpackage.hadoop"
+        },
+        "hdbvirtualpackagesparksql": {
+            "plugin_name": "com.sap.hana.di.virtualpackage.sparksql"
+        },
+        "hdbvirtualprocedure": {
+            "plugin_name": "com.sap.hana.di.virtualprocedure"
+        },
+        "hdbvirtualprocedureconfig": {
+            "plugin_name": "com.sap.hana.di.virtualprocedure.config"
+        },
+        "hdbvirtualtable": {
+            "plugin_name": "com.sap.hana.di.virtualtable"
+        },
+        "hdbvirtualtableconfig": {
+            "plugin_name": "com.sap.hana.di.virtualtable.config"
+        },
+        "properties": {
+            "plugin_name": "com.sap.hana.di.tabledata.properties"
+        },
+        "tags": {
+            "plugin_name": "com.sap.hana.di.tabledata.properties"
+        },
+        "txt": {
+            "plugin_name": "com.sap.hana.di.copyonly"
+        }
+    }
+}

package/bin/build/provider/hana/template/package.json

@@ -3,6 +3,9 @@
   "dependencies": {
     "@sap/hdi-deploy": "^4"
   },
+  "engines": {
+    "node": "^14 || ^16 || ^18"
+  },
   "scripts": {
     "start": "node node_modules/@sap/hdi-deploy/deploy.js"
   }

package/bin/build/provider/mtx/resourcesTarBuilder.js

@@ -21,12 +21,21 @@ class ResourcesTarBuilder {
             this.handler.pushMessage("No deployment resources found - skip resources.tgz", WARNING)
             return
         }
-        await this.writeTarFile(resources, root, path.join(dest, DEFAULT_TAR_NAME))
+        await this.writeTarFile(path.join(dest, DEFAULT_TAR_NAME), root, resources)
     }
 
-    async writeTarFile(resources, root, tarFile) {
+    /**
+     * Creates a TAR file at the given absolute tarPath. An optional resources list holds the files and folders 
+     * that will be added to the TAR. Paths are relative to the passed root directory. If omitted, the entire 
+     * root directory contents will be added. 
+     * @param {*} tarFile Absolute TAR file name.
+     * @param {*} root The root directory the passed resources are relative to.
+     * @param {*} resources Optional list of absolute or relative resource paths - relative to the given root directory. 
+     * If omitted all resources contained in the root directory are added to the TAR file.
+     */
+    async writeTarFile(tarFile, root, resources) {
         const { tar } = require('../../../../lib').utils
-        await tar.czfd(tarFile, root, resources) // REVISIT: tar.czfd was created for this case only -> it ensures the target's dir exists
+        await tar.czfd(tarFile, root, resources)
         this.handler.pushFile(tarFile)
     }
 

package/bin/build/provider/mtx-extension/index.js

@@ -1,8 +1,11 @@
 const path = require('path')
+const fs = require('fs')
 const cds = require('../../cds')
+
 const BuildTaskHandlerInternal = require('../buildTaskHandlerInternal')
 const { FOLDER_GEN } = require('../../constants')
 const ResourcesTarBuilder = require('../mtx/resourcesTarBuilder')
+const { BuildError } = require('../../util')
 
 class MtxExtensionModuleBuilder extends BuildTaskHandlerInternal {
     init() {
@@ -13,47 +16,64 @@ class MtxExtensionModuleBuilder extends BuildTaskHandlerInternal {
     }
 
     async build() {
-        const model = await this.model()
-        if (!model) {
-            return
-        }
-        const allFiles = []
-        const destExt = path.join(this.task.dest, 'ext')
-
-        const packageJson = path.join(destExt, 'package.json')
-        await this.copy(path.join(this.task.src, 'package.json')).to(packageJson)
-        allFiles.push(packageJson)
-
-        // extension CSN using parsed format
-        const options = { ...this.options(), flavor: 'parsed' }
-        const extCsn = await cds.load(this.resolveModel(), options)
-        if (extCsn.requires) {
-            extCsn.requires.length = 0
+        const { src, dest } = this.task
+        const destExt = path.join(dest, 'ext')
+
+        const packageJson = path.join(src, 'package.json')
+        if (!fs.existsSync(packageJson)) {
+            throw new BuildError(`The package.json file is missing`)
         }
-        const csnFile = path.join(destExt, 'extension.csn')
-        await this.compileToJson(extCsn, csnFile)
-        allFiles.push(csnFile)
-
-        // static i18n folder name as runtime does not use the CDS config of the extension project
-        const i18n = await this.collectLanguageBundles(extCsn, path.join(destExt, 'i18n'))
-        if (i18n) {
-            allFiles.push(i18n.file)
+        await this.copy(packageJson).to(path.join(destExt, 'package.json'))
+
+        // validate existence of base model by simply checking existence of appPackage folder 
+        // cds.resolve might fail for the extension migration use case as no index.csn file exists.
+        // A compilation error is thrown anyhow if any base model using statement cannot be resolved.
+        const appPackage = MtxExtensionModuleBuilder._getAppPackageName()
+        if (!fs.existsSync(path.join(src, 'node_modules', appPackage))) {
+            throw new BuildError(`The SaaS application base model '${appPackage}' is missing. Have you run the 'cds pull' command?`)
         }
 
-        const files = Object.keys(await cds.deploy.resources(model))
-        if (files.length > 0) {
-            const dataDest = path.join(destExt, 'data')
-            await Promise.all(
-                files
-                    .filter(file => /\.csv$/.test(file))
-                    .map(csv => {
-                        const csvFile = path.join(dataDest, path.basename(csv))
-                        allFiles.push(csvFile)
-                        return this.copy(csv).to(csvFile)
-                    })
-            )
+        // copy handlers
+        const folders = [path.join(src, cds.env.folders.srv, 'handlers')]
+        await this.copyNativeContent(src, destExt, res => {
+            if (fs.statSync(res).isDirectory()) {
+                return folders.some(folder => folder.startsWith(res))
+            }
+            if (folders.includes(path.dirname(res)) && /\.js$/.test(res)) {
+                return true
+            }
+        })
+
+        const model = await this.model()
+        if (model) {
+            // extension CSN using parsed format
+            const options = { ...this.options(), flavor: 'parsed' }
+            const extCsn = await cds.load(this.resolveModel(), options)
+            if (extCsn.requires) {
+                extCsn.requires.length = 0
+            }
+            await this.compileToJson(extCsn, path.join(destExt, 'extension.csn'))
+
+            await this.collectLanguageBundles(extCsn, path.join(destExt, 'i18n'))
+
+            const files = Object.keys(await cds.deploy.resources(model))
+            if (files.length > 0) {
+                const dataDest = path.join(destExt, 'data')
+                await Promise.all(
+                    files
+                        .filter(file => /\.csv$/.test(file))
+                        .map(csv => {
+                            return this.copy(csv).to(path.join(dataDest, path.basename(csv)))
+                        })
+                )
+            }
         }
-        await new ResourcesTarBuilder(this).writeTarFile(allFiles, destExt, path.join(this.task.dest, 'extension.tgz'))
+        // add all resources contained in the 'ext' folder
+        await new ResourcesTarBuilder(this).writeTarFile(path.join(this.task.dest, 'extension.tgz'), destExt)
+    }
+
+    static _getAppPackageName() {
+        return cds.env.extends || '_base';
     }
 }
 module.exports = MtxExtensionModuleBuilder

package/bin/build/provider/mtx-sidecar/index.js

@@ -59,7 +59,7 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
      */
     async _buildMainApp(sidecarEnv) {
         if (sidecarEnv.requires['cds.xt.ModelProviderService']?.kind !== 'in-sidecar') {
-            throw new BuildError("CDS build failed", "Invalid MTX sidecar configuration - \"cds.xt.ModelProviderService\": \"in-sidecar\" missing.")
+            throw new BuildError('Invalid MTX sidecar configuration - "cds.xt.ModelProviderService": "in-sidecar" missing.')
         }
         let main = sidecarEnv.requires['cds.xt.ModelProviderService']?.root
         const profiles = cds.env.profiles || []

package/bin/build/util.js

@@ -187,6 +187,22 @@ function flatten(modelPaths) {
     }, [])
 }
 
+/**
+ * Copy a file or directory. The directory can have contents.
+ * REVISIT: 'fs.promises.cp' replacement for nodejs 14
+ * @param src <String> Note that if src is a directory it will copy everything inside of this directory, not the entire directory itself.
+ * @param dest <String> Note that if src is a file, dest cannot be a directory.
+ */
+async function copy(src, dest) {
+    if ((await fs.promises.stat(src)).isDirectory()) {
+        const entries = await fs.promises.readdir(src)
+        return Promise.all(entries.map(async each => copy(path.join(src, each), path.join(dest, each))))
+    } else {
+        await fs.promises.mkdir(path.dirname(dest), { recursive: true })
+        return fs.promises.copyFile(src, dest)
+    }
+}
+
 class BuildMessage extends Error {
     constructor(message, severity = SEVERITY_ERROR) {
         super(message)
@@ -212,7 +228,7 @@ class BuildError extends BuildMessage {
     }
 
     toString() {
-        return this.message + '\n' + this.messages.map(m => m.toString()).join('\n')
+        return this.message + (this.messages.length > 0 ? '\n' + this.messages.map(m => m.toString()).join('\n') : '')
     }
 }
 
@@ -228,6 +244,7 @@ module.exports = {
     resolveRequiredSapModels,
     getDefaultModelOptions,
     flatten,
+    copy,
     BuildMessage,
     BuildError
 }

package/bin/cds.js

@@ -9,7 +9,6 @@ const cli = { //NOSONAR
 
   exec (cmd = process.argv[2], ...argv) {
     if (!argv.length) argv = process.argv.slice(3)
-    if (process.env.NODE_ENV !== 'test')  this.errorHandlers()
     if (cmd in this.Shortcuts) cmd = process.argv[2] = this.Shortcuts[cmd]
     let task = this.load ('./'+cmd)
     if (task && cmd !== 'build')  return task.apply (this, this.args(task,argv))
@@ -59,10 +58,7 @@ const cli = { //NOSONAR
   },
 
   errorHandlers () {
-    const _error = (e) => { cli.log(e.errors || e, { 'log-level': cds.env.log.levels.cli }); _exit(1) }
-    const _exit = (c) => { console.log(); process.exit(c) }
-    cds.repl || process.on ('unhandledRejection', _error)
-    cds.repl || process.on ('uncaughtException', _error)
+    // for compatibility with lkg -> remove after next release of cds-dk
   },
 
   get log() { return this.log = require('./utils/log') }

package/bin/deploy/to-hana/hana.js

@@ -71,8 +71,8 @@ class HanaDeployer {
         await fs.write(path.join(currentModelFolder, 'undeploy.json'), JSON.stringify(undeployWhitelist, null, 2));
       }
 
-      const isEmpty = !Object.keys(vcapEnv).length;
-      if (!isEmpty) {
+      const hasVCAPEnv = Object.keys(vcapEnv).length > 0;
+      if (hasVCAPEnv) {
         await fs.mkdir(currentModelFolder, { recursive: true });
       } else {
         const { cfServiceInstanceName, cfServiceInstanceKeyName, serviceKey } =
@@ -106,7 +106,14 @@ class HanaDeployer {
 
       await hdiDeployUtil.deploy(currentModelFolder, vcapEnv, hdiOptions);
 
-      if (bindCallback) {
+      // let isLoggedInToCF;
+      // try {
+      //   isLoggedInToCF = !!(await cfUtil.getCfTarget());
+      // } catch (err) {
+      //   // valid state: not logged in
+      // }
+      // if (bindCallback && isLoggedInToCF) {
+      if (!hasVCAPEnv && bindCallback) {
         const args = [path.relative(projectPath, buildResult.task.src)];
         const options = { to: `${serviceName}:${serviceKeyName}`, kind: buildResult.task.for }
         await bindCallback(args, options);

package/bin/serve.js

@@ -6,7 +6,7 @@ module.exports = Object.assign ( serve, {
     flags: [
         '--project', '--projects',
         '--in-memory', '--in-memory?',
-        '--mocked', '--with-mocks', '--with-bindings',
+        '--mocked', '--with-mocks', '--with-bindings', '--resolve-bindings',
         '--watch',
     ],
     shortcuts: [ '-s', undefined, '-2', '-a', '-w', undefined, '-p' ],
@@ -98,6 +98,10 @@ module.exports = Object.assign ( serve, {
         All required services are bound automatically upon bootstrapping.
         Option *--with-mocks* subsumes this option.
 
+    *--resolve-bindings* (beta)
+
+        Resolve remote service bindings configured via *cds bind*.
+
     *--in-memory[?]*
 
         Automatically adds a transient in-memory database bootstrapped on
@@ -127,14 +131,14 @@ const cds = require('../lib'), { exists, isfile, local, path } = cds.utils
 
 // provisional loggers, see _prepare_logging
 let log = console.log
-let debug = false
 
 
 /**
  * The main function which dispatches into the respective usage variants.
  * @param {string[]} all - project folder, model filenames, or service name
  */
-async function serve (all=[], o={}) { // NOSONAR
+async function serve (all=[], o={}) {
+
   // canonicalize options to ease subsequent tasks...
   cds.options = o
   const [pms] = all // project folder, model filenames, or service name
@@ -196,17 +200,8 @@ async function serve (all=[], o={}) { // NOSONAR
 
     server.listening ? _started(server) : server.once('listening',_started)
     server.on ('error',_reject) // startup errors like EADDRINUSE
-    server.on ('close', ()=> shutdown())  // in case of server.close() was called, like in cds.test
-
-    process.once('SIGTERM', shutdown)
-    process.once('SIGINT', shutdown)
-    process.once('SIGHUP', shutdown)
-    process.once('SIGUSR2', shutdown) // by nodemon
-    process.on('beforeExit', shutdown) //> when event loop empties
-    process.on('message', (msg) => { if (msg.close||msg.exit) shutdown() })  // by `cds watch` on Windows
-
-    return server
-
+    // server.on ('close', _shutdown)  // IMPORTANT: Don't do that as that would be a very strange loop
+    // process.on ('exit', _shutdown)  // IMPORTANT: Don't do that as that would be a very strange loop
     async function _started() {
       _warn_if_cds_was_loaded_from_different_locations()
       const url = cds.server.url = `http://localhost:${server.address().port}`
@@ -214,13 +209,34 @@ async function serve (all=[], o={}) { // NOSONAR
       _resolve (server)
     }
 
-    async function shutdown (sig) {
-      if (shutdown.called) return; else shutdown.called = true // only do that once
-      global.it || cds.watched || console.log()  // blank line makes the ^C look pretty in terminals
-      debug && debug(`${sig}, shutting down, calling ${cds.listeners('shutdown').length} listeners`)
-      await Promise.all(cds.listeners('shutdown').map((fn) => fn()))
-      if (process.env.NODE_ENV !== 'test' && !global.it)  process.exit()
+    cds.shutdown = _shutdown //> for programmatic invocation
+    process.on('unhandledRejection', (_,p) => _shutdown (console.error('❗️Uncaught',p)))
+    process.on('uncaughtException', (e) => _shutdown (console.error('❗️Uncaught',e)))
+    process.on('SIGINT', cds.watched ? _shutdown : (s,n)=>_shutdown(s,n,console.log())) //> newline after ^C
+    process.on('SIGHUP', _shutdown)
+    process.on('SIGHUP2', _shutdown)
+    process.on('SIGTERM', _shutdown)
+
+    async function _shutdown (signal,n) {
+      if (signal) DEBUG?.('⚡️',signal,n, 'received by cds serve')
+      await Promise.all(cds.listeners('shutdown').map(fn => fn()))
+      server.close(()=>{/* it's ok if closed already */})   // first, we try stopping server and process the nice way
+      if (!global.it) setTimeout(process.exit,1111).unref() // after ~1 sec, we force-exit it, unless in test mode
     }
+
+    const DEBUG = cds.debug('cli')
+    if (DEBUG) {
+      cds.on('shutdown', () => DEBUG ('⚡️','cds serve - cds.shutdown'))
+      server.on('close', () => DEBUG ('⚡️','cds serve - server.close(d)'))
+      process.on('exit', () => DEBUG ('⚡️','cds serve - process.exit'))
+      process.on('beforeExit', ()=> DEBUG ('⚡️','cds serve - process.beforeExit'))
+    }
+
+    if (process.platform === 'win32') {
+      process.on('message', msg => msg.close && _shutdown())  // by `cds watch` on Windows
+    }
+
+    return server
   })
 }
 

package/common.cds

@@ -72,6 +72,13 @@ context sap.common {
     name  : localized String(255)  @title : '{i18n>Name}';
     descr : localized String(1000) @title : '{i18n>Description}';
   }
+
+  /*
+   * Aspect that is included by generated `.texts` entities for localized entities.
+   */
+  aspect TextsAspect {
+    key locale: Locale;
+  }
 }