@sap/cds 6.7.2 → 6.8.2

package/apis/core.d.ts

@@ -2,33 +2,9 @@
 import { ReflectedModel, LinkedModel, LinkedDefinition } from './reflect'
 import { CSN as csn, Definition } from './csn'
 
-type UserInput = string | { id: string; attr: Record<string, string>; roles: Record<string, string> } | User
-
-export class User {
-  constructor(obj?: UserInput)
-  id: string
-  /**
-   * @deprecated Use https://cap.cloud.sap/docs/node.js/events#locale instead
-   */
-  locale: string
-  /**
-   * @deprecated Use https://cap.cloud.sap/docs/node.js/events#tenant instead
-   */
-  tenant: string | undefined
-  attr: Record<string, string>
-  roles: Record<string, string>
-  static Privileged: typeof Privileged
-  is(role: string): boolean
-}
-/**
- * Subclass for executing code with superuser privileges.
- */
-declare class Privileged extends User {
-  constructor()
-  is(): boolean
-}
 
 export = cds
+
 declare class cds {
   /**
    * Turns the given plain CSN model into a linked model
@@ -46,7 +22,7 @@ declare class cds {
    * Represents the user in a given context.
    * @see [capire docs](https://cap.cloud.sap/docs/node.js/authentication#cds-user)
    */
-  User: typeof User
+  User: typeof cds.User
 
   // infer (query : cqn, model : csn) : LinkedDefinition
 
@@ -87,11 +63,6 @@ declare class cds {
    */
   entity: Definition
 
-  struct: Definition
-  array: Definition
-  context: Definition
-  service: Definition
-
   /**
    * Add aspects to a given object, for example:
    *
@@ -134,3 +105,31 @@ declare class cds {
   lazified: <T>(target: T) => T
 }
 // & typeof import ('../lib/index')
+
+declare namespace cds {
+  type UserInput = string | { id: string; attr: Record<string, string>; roles: Record<string, string> } | User
+
+  export class User {
+    constructor(obj?: UserInput)
+    id: string
+    /**
+     * @deprecated Use https://cap.cloud.sap/docs/node.js/events#locale instead
+     */
+    locale: string
+    /**
+     * @deprecated Use https://cap.cloud.sap/docs/node.js/events#tenant instead
+     */
+    tenant: string | undefined
+    attr: Record<string, string>
+    roles: Record<string, string>
+    static Privileged: typeof Privileged
+    is(role: string): boolean
+  }
+  /**
+   * Subclass for executing code with superuser privileges.
+   */
+  class Privileged extends User {
+    constructor()
+    is(): boolean
+  }
+}

package/apis/csn.d.ts

@@ -24,7 +24,7 @@ export interface DefinitionRegistry {
     type: type,
     struct: struct,
     entity: entity,
-    Association: Association,
+    Association: Association
 }
 export type Definition = DefinitionRegistry[keyof DefinitionRegistry];
 

package/apis/ql.d.ts

@@ -1,4 +1,4 @@
-import {Definition} from "./csn"
+import { Definition } from "./csn"
 import * as CQN from "./cqn"
 import { Constructable, ArrayConstructable, SingularType } from "./internal/inference"
 
@@ -14,59 +14,89 @@ export class cds_ql {
 
 export type PK = number | string | object
 
-interface QLExtensions {
-	as: (alias: string) => void
-}
 
-// to support path expressions: https://pages.github.tools.sap/cap/docs/java/query-api#path-expressions
-// `Book.title` == `Proxy<Book>.title()`
-
-/**
- * This is a marker interface to determine if a property supports subselecting. That is:
- * 
- * [1] SELECT.from(Books, b => b.author)
- * means: "select all books and project each book's author"
- * [2] SELECT.from(Books, b => b.author(a => a.ID))
- * means: "select all books, subselect each book's author's ID
- * 
- */ 
-type Subqueryable <T> = ((fn:((a:T)=>any)|"*") => T)
+type Primitive = string | number | boolean | Date
 
+// don't wrap QLExtensions in more QLExtensions (indirection to work around recursive definition)
+type QLExtensions<T> = T extends QLExtensions_<any> ? T : QLExtensions_<T>
 
 /**
- * Wrap every attribute into a proxy that supports operations
- * in addition to its regular capabilities.
- */
-type ProxiedAttributes<T> =  {
-	[Key in keyof T]: Proxy<T[Key]> //& QLExtensions
+ * QLExtensions are properties that are attached to entities in CQL contexts.
+ * They are passed down to all properties recursively.
+*/
+type QLExtensions_<T> = {
+	[Key in keyof T]: QLExtensions<T[Key]>
 } & {
 	/**
-	 * Accesses any nested attribute based on a path:
+	 * Alias for this attribute.
+	 */
+	as: (alias: string) => void
+
+	/**
+	 * Accesses any nested attribute based on a [path](https://cap.cloud.sap/cap/docs/java/query-api#path-expressions):
 	 * `X.get('a.b.c.d')`. Note that you will not receive
 	 * proper typing after this call.
 	 * To still have access to typed results, use
 	 * `X.a().b().c().d()` instead.
 	 */
-	get: (path: string) => any // Proxy<unknown>
-} & QLExtensions
+	get: (path: string) => any
+
+	// have to exclude undefined from the type, or we'd end up with a distribution of Subqueryable
+	// over T and undefined, which gives us zero code completion within the callable. 
+} & Subqueryable<Exclude<T, undefined>>
 
 /**
- * Entrance type for Proxies. The conditional makes sure that we don't
- * wrap properties into multiple layers of proxy.
- * Proxy_ was required as we can't circularily reference a type during its definition.
- * So `Proxy<T> = T extends Proxy<any> ...` was not possible.
+ * Adds the ability for subqueries to structured properties.
+ * The final result of each subquery will be the property itself:
+ * `Book.title` == `Subqueryable<Book>.title()`
  */
-export type Proxy<T> = T extends Proxy_<any> ? T : Proxy_<T>
+type Subqueryable<T> = 
+T extends Primitive	? {}
+// composition of many/ association to many
+: T extends readonly unknown[] ? { 
+	/**
+	 * @example
+	 * ```js
+	 * SELECT.from(Books, b => b.author)
+	 * ```
+	 * means: "select all books and project each book's author"
+	 * 
+	 * whereas
+	 * ```js
+	 * SELECT.from(Books, b => b.author(a => a.ID))
+	 * ```
+	 * means: "select all books, subselect each book's author's ID
+	 * 
+	 * Note that you do not need to return anything from these subqueries.
+	 */
+	(fn: ((a:QLExtensions<T[number]>) => any) | '*'): T[number] 
+}
+// composition of one/ association to one
+: { 
+	/**
+	 * @example
+	 * ```js
+	 * SELECT.from(Books, b => b.author)
+	 * ```
+	 * means: "select all books and project each book's author"
+	 * 
+	 * whereas
+	 * ```js
+	 * SELECT.from(Books, b => b.author(a => a.ID))
+	 * ```
+	 * means: "select all books, subselect each book's author's ID
+	 * 
+	 * Note that you do not need to return anything from these subqueries.
+	 */
+	(fn: ((a:QLExtensions<T>) => any) | '*'): T 
+}
+;
 
-export type Proxy_<T> = (T extends Subqueryable<infer U>
-		? (Omit<T, ""> & Subqueryable<Proxy_<U>>) // drop ((x: T) => T) in favour of (x: Proxy<T>) => Proxy<T>)
-		: (ProxiedAttributes<T>))
-	& QLExtensions
 
 // Alias for projections
 // https://cap.cloud.sap/docs/node.js/cds-ql?q=projection#projection-functions
 //export type Projection<T> = (e:T)=>void
-export type Projection<T> = (e:Proxy<T extends ArrayConstructable ?  SingularType<T> : T>)=>void
+export type Projection<T> = (e:QLExtensions<T extends ArrayConstructable ?  SingularType<T> : T>)=>void
 // Type for query pieces that can either be chained to build more complex queries or
 // awaited to materialise the result:
 // `Awaitable<SELECT<Book>, Book> = SELECT<Book> & Promise<Book>`
@@ -161,11 +191,11 @@ TaggedTemplateQueryPart<Awaitable<SELECT<unknown>, InstanceType<any>>>
 &
 // calling with class
 	(<T extends ArrayConstructable<any>>
-	(entityType: T, projection?: Projection<Proxy<SingularType<T>>>)
+	(entityType: T, projection?: Projection<QLExtensions<SingularType<T>>>)
 	=> Awaitable<SELECT<SingularType<T>>, SingularType<T>>)
 &
 	(<T extends ArrayConstructable<any>>
-	(entityType: T, primaryKey : PK, projection?: Projection<Proxy<SingularType<T>>>)
+	(entityType: T, primaryKey : PK, projection?: Projection<QLExtensions<SingularType<T>>>)
 	=> Awaitable<SELECT<SingularType<T>>, SingularType<T>>)
 
 & ((entity: Definition | string, primaryKey? : PK, projection? : Projection<unknown>) => SELECT<any>)
@@ -180,12 +210,12 @@ type SELECT_from =
 &
 // calling with class
 	(<T extends ArrayConstructable<any>>
-	(entityType: T, projection?: Projection<Proxy<SingularType<T>>>)
+	(entityType: T, projection?: Projection<QLExtensions<SingularType<T>>>)
 	=> Awaitable<SELECT<T>, InstanceType<T>>)
 &
 	(<T extends ArrayConstructable<any>>
 	(entityType: T, primaryKey : PK, projection?: Projection<SingularType<T>>)
-	=> Awaitable<SELECT<T>, InstanceType<T>>)
+	=> Awaitable<SELECT<SingularType<T>>, InstanceType<SingularType<T>>>)  // when specifying a key, we expect a single element as result
 // calling with definition
 & ((entity: Definition | string, primaryKey? : PK, projection? : Projection<unknown>) => SELECT<any>)
 // calling with concrete list

package/apis/serve.d.ts

@@ -2,6 +2,7 @@ import { Service, ServiceImpl } from "./services"
 import { LinkedDefinition } from "./reflect"
 import { csn } from "./csn"
 import * as http from "http"
+import { Application } from "express"
 
 // export const Service : _Service
 
@@ -9,7 +10,7 @@ interface _fluent {
 	from (model : string | csn) : this
 	to (protocol: string) : this
 	at (path: string) : this
-	in <T = any> (app: T) : this
+	in (app: Application) : this
 	with (impl: ServiceImpl | string) : this
 	// (req,res) : void
 }
@@ -40,8 +41,8 @@ declare class cds_serve {
 	 * express application has been constructed but no middlewares or routes
 	 * added yet.
 	 */
-	on <T = any> (event : 'bootstrap', listener : (app : T) => void) : this
-	once <T = any>(event : 'bootstrap', listener : (app : T) => void) : this
+	on (event : 'bootstrap', listener : (app : Application) => void) : this
+	once (event : 'bootstrap', listener : (app : Application) => void) : this
 
 	/**
 	 * Emitted for each service served by cds.serve().

package/apis/services.d.ts

@@ -1,9 +1,10 @@
 import { SELECT, INSERT, UPDATE, DELETE, Query, ConstructedQuery, UPSERT } from './ql'
-import { Projection, Proxy, Awaitable } from './ql'
-import { ArrayConstructable, Unwrap, SingularType, Constructable } from './internal/inference'
+import { Awaitable } from './ql'
+import { ArrayConstructable, Constructable } from './internal/inference'
 import { LinkedModel, Definition, Definitions } from './reflect'
-import { csn, type } from './csn'
+import { csn } from './csn'
 import { User } from './core'
+import * as express from "express"
 import { ref } from './cqn'
 // import { Service } from './cds'
 
@@ -90,6 +91,18 @@ export class QueryAPI {
    * @see [docs](https://pages.github.tools.sap/cap/docs/node.js/cds-context-tx?q=spawn#cds-spawn)
    */
   spawn(options: Options, fn: (tx: Transaction) => {}): SpawnEventEmitter
+
+  /**
+   * @see [docs](https://pages.github.tools.sap/cap/docs/node.js/cds-context-tx?q=cds.context#cds-context
+   */
+  context:  ContextProperties
+}
+
+type ContextProperties = {
+  id?: string
+  http?: {req: express.Request, res: express.Response}
+  tenant? : string,
+  user? : User | string
 }
 
 /**
@@ -98,11 +111,11 @@ export class QueryAPI {
  */
 export class Service extends QueryAPI {
   constructor(
-    name: String,
+    name: string,
     model: csn,
     options: {
-      kind: String
-      impl: String | ServiceImpl
+      kind: string
+      impl: string | ServiceImpl
     }
   )
 
@@ -345,7 +358,7 @@ interface SpawnEvents {
   'done': () => void
 }
 
-class SpawnEventEmitter {
+declare class SpawnEventEmitter {
   on<U extends keyof SpawnEvents>(
     event: U, listener: SpawnEvents[U]
   ): this;

package/bin/build/buildTaskEngine.js

@@ -44,7 +44,7 @@ class BuildTaskEngine {
         // validate required @sap namespace models - log only
         const unresolved = BuildTaskEngine._resolveRequiredSapServices(tasks)
         if (unresolved.length > 0) {
-            messages.push(new BuildMessage(`Required CDS service models [${unresolved.join(', ')}] cannot be resolved. Make sure to install the missing npm modules.`))
+            messages.push(new BuildMessage(`Required CDS models [${unresolved.join(', ')}] cannot be resolved. Make sure up-to-date versions of the missing modules are installed.`))
         }
 
         // create build task handlers

package/bin/build/index.js

@@ -29,7 +29,7 @@ async function build(options = {}) {
         cds.root = projectPath // REVISIT: not good / fragile
     }
     const logger = options.logger || cds.log(LOG_MODULE_NAMES)
-    const buildOptions = _mergeCliOptions({ root: projectPath }, options)
+    const buildOptions = _mergeCliOptions({ root: cds.root }, options)
     const buildTaskFactory = new BuildTaskFactory(logger)
     const buildTaskEngine = new BuildTaskEngine(logger)
     let buildResult

package/bin/build/provider/buildTaskProviderInternal.js

@@ -178,7 +178,7 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
                 sidecarEnv = cds.env.for("cds", sidecarPath)
             }
             if (
-                cds.env.profiles.includes('with-mtx-sidecar') || // new presets
+                cds.env.profiles?.includes('with-mtx-sidecar') || // new presets
                 cds.env.requires["cds.xt.ModelProviderService"]?.external // for compatibility with former mtxs presets
             ) {
                 this.logger.debug("MTX app with sidecar")
@@ -186,17 +186,21 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
                     throw new BuildError(`MTX sidecar directory '${sidecarPath}' not existing. Custom build task configuration required if the folder is named differently.`)
                 }
                 if (!sidecarEnv.requires["cds.xt.ModelProviderService"]?._in_sidecar) {
+                    // correct profile might have been set, but couldn't be resolved
+                    if (sidecarEnv.profiles?.includes('mtx-sidecar')) {
+                        throw new BuildError('MTX configuration cannot be resolved. Make sure an up-to-date version of @sap/cds-mtxs is installed.')
+                    }
                     throw new BuildError(`Invalid MTX sidecar configuration - profile 'mtx-sidecar' not set.`)
                 }
                 return { for: BUILD_TASK_MTX_SIDECAR }
             }
-            if (sidecarEnv?.requires["cds.xt.ModelProviderService"]?._in_sidecar) {
-                throw new BuildError(`MTX sidecar configuration requires profile 'with-mtx-sidecar' or custom build task configuration.`)
+            if (sidecarEnv?.requires["cds.xt.ModelProviderService"]?._in_sidecar || sidecarEnv?.profiles?.includes('mtx-sidecar')) {
+                throw new BuildError(`MTX sidecar requires profile 'with-mtx-sidecar' in project root configuration.`)
             }
 
-            if (cds.env.requires["cds.xt.ModelProviderService"]?._in_sidecar) {
+            if (cds.env.requires["cds.xt.ModelProviderService"]?._in_sidecar || cds.env.profiles?.includes('mtx-sidecar')) {
                 // cds build is executed in sidecar folder
-                throw new BuildError(`Invalid working directory ${projectPath}. Make sure to execute 'cds build' in the CAP project root directory.`)
+                throw new BuildError(`Seems that you are executing 'cds build' in the 'mtx/sidecar' folder. Execute 'cds build' in the project root folder instead.`)
             }
 
             // without sidecar
@@ -208,7 +212,6 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
                 }
             }
         }
-
         if (!tasks.some(task => task.for === BUILD_TASK_JAVA || task.for === BUILD_TASK_JAVA_CF)) {
             if (cds.env.requires.multitenancy) {
                 this.logger.debug("Nodejs Classic MTX app without sidecar")

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

@@ -8,7 +8,7 @@ const { BuildError, relativePaths } = require('../../util')
 const CSV = require('../../csv-reader')
 const to_hdbmigration = require('./2migration')
 const to_hdbtabledata = require('./2tabledata')
-const { ERROR } = require('../../buildTaskHandler')
+const { ERROR, WARNING } = require('../../buildTaskHandler')
 
 const DEFAULT_COMPILE_DEST_FOLDER = path.normalize("src/gen")
 
@@ -378,7 +378,7 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
             }
         }
         if (Object.keys(content['file_suffixes']).length !== plugins.size) {
-            this.pushMessage(`'HANA plugin not found for file suffix [${Array.from(plugins).join(',')}]`)
+            this.pushMessage(`'HANA database 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') {
@@ -433,13 +433,20 @@ class HanaModuleBuilder extends BuildTaskHandlerInternal {
     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(), 'utf-8')
             if (Array.isArray(undeployList)) {
+                const hdiconfig = await HanaModuleBuilder._readTemplateAsJson('.hdiconfig-haas')
+                const keys = new Set(Object.keys(hdiconfig['file_suffixes']).map(key => '.' + key))
                 undeployList.forEach(entry => {
                     const extName = path.extname(entry)
-                    if (extName) {
-                        result.add(extName)
+                    if (extName && !result.has(extName)) {
+                        if (keys.has(extName)) {
+                            result.add(extName)
+                        } else {
+                            this.pushMessage(`Ignoring invalid entry '${entry}' in undeploy.json file`, WARNING)
+                        }
                     }
                 })
             }

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

@@ -32,7 +32,7 @@ class MtxExtensionModuleBuilder extends BuildTaskHandlerInternal {
         if (model) {
             // extension CSN using parsed format
             const options = { ...this.options(), flavor: 'parsed' }
-            const extModel = await cds.load(this.resolveModel(), options)
+            const extModel = await cds.load(this._resolveExtensionFiles(model), options)
             if (extModel.requires) {
                 extModel.requires.length = 0
             }
@@ -79,6 +79,18 @@ class MtxExtensionModuleBuilder extends BuildTaskHandlerInternal {
         await new ResourcesTarBuilder(this).writeTarFile(path.join(this.task.dest, 'extension.tgz'), destExt)
     }
 
+    _resolveExtensionFiles(model) {
+        const node_modules = path.join(this.task.src, 'node_modules')
+        const paths = model['$sources'].reduce((acc, file) => {
+            if (file.startsWith(this.task.src) && !file.startsWith(node_modules)) {
+                acc.push(file)
+            }
+            return acc
+        }, [])
+
+        return paths
+    }
+
     _lintExtModel(extModel, model) {
         const linter = this._linter()
         if (!linter) {

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

@@ -60,7 +60,7 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
     async _buildMainApp(sidecarEnv) {
         let main = sidecarEnv.requires['cds.xt.ModelProviderService']?.root
         if (!main) {
-            throw new BuildError('Invalid MTX sidecar configuration - "cds/requires/cds.xt.ModelProviderService/root" missing.')
+            throw new BuildError(`Invalid MTX sidecar configuration. Make sure that the profile 'mtx-sidecar' is configured and an up-to-date version of @sap/cds-mtxs is installed.`)
         }
         const profiles = cds.env.profiles || []
 
@@ -101,7 +101,7 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
             const modelFilePaths = cds.resolve(modelPaths)
 
             if (!modelFilePaths || modelFilePaths.length === 0) {
-                throw new BuildError("No CDS service models found in MTX sidecar. Make sure required npm modules are installed.")
+                throw new BuildError("No CDS models found in MTX sidecar. Make sure up-to-date versions of the required npm modules are installed.")
             }
             this._logger._debug && this._logger.debug(`sidecar model: ${relativePaths(this.buildOptions.root, modelFilePaths).join(", ")}`)
 
@@ -109,7 +109,7 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
             const unresolved = resolveRequiredSapModels(modelPaths)
             if (unresolved.length > 0) {
                 // log error, but don't fail
-                this.pushMessage(`CDS service models [${unresolved.join(', ')}] required by MTX sidecar cannot be resolved. Make sure to install the missing npm modules.`, ERROR)
+                throw new BuildError(`CDS models [${unresolved.join(', ')}] required by MTX sidecar cannot be resolved. Make sure up-to-date versions of the corresponding npm modules are installed.`, ERROR)
             }
 
             // synchronous compilation

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

@@ -65,10 +65,33 @@ class NodejsModuleBuilder extends BuildTaskHandlerEdmx {
         if (this.isStagingBuild() && !this.hasBuildOption(BUILD_OPTION_OUTPUT_MODE, OUTPUT_MODE_RESULT_ONLY)) {
             const srcSrv = this.task.src === this.buildOptions.root ? path.resolve(this.task.src, cds.env.folders.srv) : this.task.src
             await this._copyNativeContent(this.buildOptions.root, srcSrv, destRoot, destSrv)
+            await this._fixCapireSamplesDeps(destRoot)
         }
         return this._result
     }
 
+    // REVISIT: fix for capire samples - needs to be reworked
+    // Instead of adding relative paths we may better delete the entire entry as relative paths
+    // cannot be resolved in cloud deployments anyway.
+    // Support for HANA native artifacts defined in sub-modules required
+    async _fixCapireSamplesDeps(dest) {
+        const packageJson = path.join(dest, 'package.json')
+        try {
+            const content = require(packageJson)
+            const { dependencies } = content
+            let changed
+            for (let dependency in dependencies) {
+                if (dependency.startsWith('@capire/')) {
+                    dependencies[dependency] = path.relative(dest, path.dirname(require.resolve(dependency + '/package.json')))
+                    changed = true
+                }
+            }
+            if (changed) {
+                return this.write(JSON.stringify(content, null, '  ')).to(packageJson)
+            }
+        } catch (e) {/*ignore*/ }
+    }
+
     async clean() {
         // staging build content is deleted by BuildTaskEngine
         if (this.buildOptions.target === this.buildOptions.root) {

package/bin/plugins.js

@@ -14,7 +14,8 @@ module.exports = async function load_plugins (log = console.log) {
     }
   } else
     try {
-      const { dependencies } = require(cds.root + '/package.json')
+      const pkg = require(cds.root + '/package.json')
+      const dependencies = { ...pkg.dependencies, ...(process.env.NODE_ENV !== 'production' && pkg.devDependencies) }
       for (let each in dependencies) {
         plugins.push(_load_plugin(each + '/cds-plugin'))
       }

package/bin/version.js

@@ -103,7 +103,7 @@ function _markdown (versions) {
     Object.assign (pkg, require (resolve('package.json')))
   } catch (e) {/* ignored */}
   console.log ('|', pkg.name, '|', pkg.repository.url || pkg.repository, '|')
-  console.log ('|:------------------ | ----------- |')
+  console.log ('|:---------------------- | ----------- |')
   if (require('../lib').env['project-nature'] === 'nodejs') {
     console.log ('|', v('Node.js'), '|')
     console.log ('|', v('@sap/cds'), '|')
@@ -113,10 +113,11 @@ function _markdown (versions) {
   }
   console.log ('|', v('@sap/cds-compiler'), '|')
   console.log ('|', v('@sap/cds-dk'), '|')
+  console.log ('|', v('@sap/cds-dk (global)'), '|')
   console.log ('|', v('@sap/eslint-plugin-cds'), '|')
   function v (component) {
     const version = versions [component] || '_version_'
-    return (component + '           ').slice(0,18)
+    return (component + '               ').slice(0,22)
     +' | '+ (version  + '           ').slice(0,11)
   }
   console.log()

package/common.cds

@@ -56,8 +56,9 @@ context sap.common {
    * See https://cap.cloud.sap/docs/cds/common#entity-sapcommoncurrencies
    */
   entity Currencies : CodeList {
-    key code   : String(3) @(title : '{i18n>CurrencyCode}');
-        symbol : String(5) @(title : '{i18n>CurrencySymbol}');
+    key code      : String(3) @(title : '{i18n>CurrencyCode}');
+        symbol    : String(5) @(title : '{i18n>CurrencySymbol}');
+        minorUnit : Int16     @(title : '{i18n>CurrencyMinorUnit}');
   }
 
   /**

package/lib/auth/index.js

@@ -30,5 +30,8 @@ function auth_factory (options) {
     cds.log().info ('using auth strategy:', { kind, impl: local(impl) }, '\n')
     middleware = require(impl)
   }
+  if ((typeof middleware === 'function' && middleware.length === 3) || Array.isArray(middleware)) {
+    return middleware
+  }
   return middleware(o)
 }

package/lib/auth/mocked-users.js

@@ -10,6 +10,19 @@ class MockedUsers {
       if (typeof v === 'boolean') continue
       if (typeof v === 'string') v = { password:v }
       let id = _configured(v).id || k
+
+      // Only for mock users the pseudo roles are kept in the role list.
+      // In all other cases pseudo roles are filtered out.
+      if (v.roles) {
+        if (Array.isArray(v.roles)) {
+          if (v.roles.includes('system-user')) v._is_system = true
+          if (v.roles.includes('internal-user')) v._is_internal = true
+        } else {
+          if ('system-user' in v.roles) v._is_system = true
+          if ('internal-user' in v.roles) v._is_internal = true
+        }
+      } else v.roles = []
+
       let u = users[id] = new User ({ id, ...v })
       let fts = tenants[u.tenant]?.features
       if (fts && !u.features) u.features = fts

package/lib/compile/etc/_localized.js

@@ -18,6 +18,8 @@ const _been_here = Symbol('is _localized')
 function unfold_ddl (ddl, csn, o={}) { // NOSONAR
 	const _locales = _locales_4sql[o.dialect]; if (!_locales)  return ddl
 	const localized_views = ddl.filter (each => each.startsWith('CREATE VIEW localized_') || each.startsWith('DROP VIEW localized_'))
+	// REVISIT: analyze ddl statements. Problem is with schevo calling this function containing only drops
+	if (o.sqlDialect === 'sqlite' && o.betterSqliteSessionVariables) return ddl
 	for (const localized_view of localized_views) {
 		for (const locale of _locales) ddl.push (localized_view
 			.replace (/localized_/g, `localized_${locale}_`)
@@ -59,6 +61,7 @@ function unfold_csn (m) { // NOSONAR
 		if (_localized_entries !== false && _is_localized(d)) {
 			_add_proxy4 (d,`localized.${each}`, x => pass2.push([x]))
 			// if running on sqlite add additional localized.<locale>. views
+			if (_conf?.impl === '@cap-js/sqlite') continue
 			if (_locales) for (const locale of _locales) {
 				_add_proxy4 (d,`localized.${locale}.${each}`, x => pass2.push([x,locale]))
 			}

package/lib/compile/for/lean_drafts.js

@@ -128,7 +128,6 @@ module.exports = function cds_compile_for_lean_drafts(csn) {
       }
       draft.elements[each] = newEl
     }
-    // TODO: Redirect associations to localized
     return draft
   }
   for (const name in csn.definitions) {