@sap/cds-dk 8.3.0 → 8.4.1

package/CHANGELOG.md

@@ -7,6 +7,51 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 8.4.1 - 2024-11-08
+
+### Added
+
+- `cds deploy --no-build` lets you skip the implicit `cds build`.
+- `cds add data/http` supports new type `cds.Map`.
+
+### Changed
+
+### Fixed
+
+- `cds compile --to <unknown>` shows a cleaner error message.
+- `cds add data` handles composition of one correctly.
+- `cds add http` creates payloads for unbound actions in services.
+- `cds compile --to xsuaa` can now handle annotation expressions in `where` clauses.
+- `cds add http` produces requests for all expected data and no longer relies on existing data on the side.
+- `cds add typer` creates `tsconfig.json` that works with `cds-tsx`.
+
+## Version 8.4.0 - 2024-10-29
+
+### Added
+
+- `cds add application-logging` for Java also executes the `cds:add` goal with feature `APPLICATION_LOGGING`.
+- Added support for `import` and `export` for auto-completion in `package.json` and `.cdsrc.json`.
+- `cds add side-by-side-extensibility` adds configuration for logic extensibility via extension points (Java).
+- `cds init --java` can be used as an alias to `cds init --add java`.
+- Add cds schema for `helm` build plugin.
+
+### Changed
+
+- `cds init` does not put comments in JSON files within `.vscode/`.
+- `cds import --from asyncapi` now uses CloudEvents type in `@topic` annotation.
+- `cds deploy` does not fall back to the deprecated `hanatrial` service plan any more.
+
+### Fixed
+
+- `cds env` now colors is output honoring settings like `FORCE_COLOR`.
+- `cds add` commands correctly detect Java/Node in Microsoft PowerShell.
+- `cds add hana` doesn't add `dependencies` to `.cdsrc.json` any more.
+- `cds add cf-manifest` uses the new `sap_java_buildpack_jakarta` buildpack.
+- `cds build --production` now correctly formats console log output.
+- `cds add` correctly handles entries like `cds.requires.auth` if the following configuration is scoped in a profile.
+- `cds add` plugins can use a shortcut for their options.
+- `cds import` fix for no entity schema in OData V2.
+
 ## Version 8.3.0 - 2024-09-30
 
 ### Added
@@ -27,8 +72,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ### Fixed
 
-- With `cds add workzone`, apps can now directly be added via Content Manager in SAP Build Work Zone.
-- Less obstrusive warning about `cds` instead of `cds-ts` in Typescript projects.
+- `cds add workzone`-created apps can now directly be added via Content Manager in SAP Build Work Zone.
+- Less obtrusive warning about `cds` instead of `cds-ts` in Typescript projects.
 
 ## Version 8.2.3 - 2024-09-25
 
@@ -64,7 +109,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - `cds add dynatrace` adds configuration for Dynatrace.
 - `cds add cloud-logging` adds configuration for SAP Cloud Logging. Option `--with-telemetry` allows for configuration with telemetry.
 - `cds version` shows version information for `@cap-js/db-service`.
-- `cds add portal` now adds portal configuration for Kyma.
+- `cds add portal` now adds SAP Cloud Portal configuration for Kyma.
 - `cds add handler` allows to create handler stubs (for Java only, beta)
 - `cds init --add java --no-db` lets you create a Java project without persistent database.
 - `cds import` supports plugins.
@@ -145,7 +190,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - `cds compile --to mermaid` no longer fails for complex queries like joins.
 - `cds build --for mtx-sidecar` now correctly supports different `srv` folder name.
 - `cds add audit-log` in combination with `cds add multitenancy` correctly adds the audit-log dependency to the MTX sidecar.
-- `cds build` adds the correct hdbtabledata file paths to the hana result set.
+- `cds build` adds the correct hdbtabledata file paths to the HANA result set.
 - `cds add` plugins can now correctly interpret `cds.cli` properties.
 - `cds deploy --to hana --dry` now shows correct files with their content.
 - `cds version` now reports the correct version of `@sap/cds` if this one is installed locally along with a local `@sap/cds-dk` installation.
@@ -275,7 +320,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - `cds login` eagerly fetches the passcode URL (if supported by `@sap/cds-mtxs`) and prints it on prompt.
 - `cds extend` and `cds activate` have been deprecated and are now removed. (You can still migrate and download projects, see `cds migrate --help` and `cds extend --help`.)
 - Remove obsolete classic MTX checks and enforce `@sap/cds` >= 7.
-- `cds build` uses cds.compile.to.hana API with `@sap/cds` 8.
+- `cds build` uses `cds.compile.to.hana` API with `@sap/cds` 8.
 - `cds bind` and `cds deploy` use direct http requests instead of `cf curl`.
 - `cds build --for java` no longer generates localized EDMX files by default. It can be enabled using `contentLocalizedEdmx` build task option.
 - `@cap-js/sqlite`/`better-sqlite3` is used in dependencies instead of `sqlite3`.
@@ -377,7 +422,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - `cds add` doesn't fail for projects with a minimal `package.json` w/o `name` and `version` fields
 - `cds add data` can be executed in projects w/o `package.json` and `.cdsrc.json` files.
 - `cds add sample` does not fail if the `srv` folder doesn't exist.
-- `cds add helm` fixed xsuaa tenant-mode not updating on adding `multitenancy`
+- `cds add helm` fixed XSUAA tenant-mode not updating on adding `multitenancy`
 - `cds watched` cannot be called from command line anymore.
 - `cds login` now correctly handles the case of an expired refresh token and gives more information about token-request errors.
 - `cds login` now refreshes the token URL if it had previously reverted to a legacy URL.
@@ -659,11 +704,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - `cds add connectivity` does not add `connectivity: true` to your `package.json` any more.
 - `cds watch` now ignores more files/folders: `app/(webapp|dist|target)`, `app/*/(webapp|dist|target)`, `tsconfig.json`, `*.tsbuildinfo`
 - `cds build` now uses `compile.to.hdbtable` if no migration tables exist.
-- Refactoring `cds build plugin` API
+- `cds build` plugin API is refactored.
 
 ### Fixed
 
-- `cds login` now prints shorter errors. (Set `DEBUG=req` in env to see all details again.)
+- `cds login` now prints shorter errors (set `DEBUG=req` in env to see all details again).
 - Fixed issue when creating a CAP project in SAP Business Application Studio's template wizard.
 - `cds import` now handles name collision within a Schema for OData V4 EDMX.
 - `cds build` for mtx extension projects no longer creates CSN containing unresolved model associations.
@@ -709,7 +754,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ### Removed
 
-- Undocumented facet `cds add auditlog`
+- `cds add auditlog` facet.
 
 ## Version 7.1.1 - 2023-08-10
 
@@ -732,7 +777,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 - Calls from Business Application Studio `New Project from Template` wizard are now handled correctly.
 - `cds add cf-manifest` correctly generates the XSUAA instance name.
-- `cds build` always uses the configured hana build task when building the MTX sidecar.
+- `cds build` always uses the configured HANA build task when building the MTX sidecar.
 - `cds import` OData V4 EDMX fix for Annotation Alias and Namespace value replacement.
 
 ### Changed
@@ -1215,7 +1260,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - `cds import` switch from `@openapi.schema` to `@JSON.Schema`.
 - `cds add mtx` will now add configuration for streamlined MTX. It effectively acts as a shortcut for `cds add multitenancy,toggles,extensibility`
 - `cds add mtx` no longer includes `hana` and `xsuaa`.  To achieve the same effect as before, run `cds add mtx && cds add hana,xsuaa --for production`.
-- `cds bind -2 <xsuaa service instance>` binds the CDS `auth` service to the xsuaa instance. Previously `uaa` was used.  This requires `@sap/cds` 6 or higher.
+- `cds bind -2 <xsuaa service instance>` binds the CDS `auth` service to the XSUAA instance. Previously `uaa` was used.  This requires `@sap/cds` 6 or higher.
 - `cds add lint:dev` updated to adjust to new api structure of `@sap/eslint-plugin-cds` v2.5.0
 - `cds init` uses latest Maven Java archetype version 1.27.0 for creating Java projects.
 - `cds login localhost:<port> -u <username>` now saves username (and empty password, if applicable) with project settings for convenience.
@@ -1412,7 +1457,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - `cds import` bug fixed for `--force` flag. Now overwrites the correct file content.
 - `cds import` fix will no longer capture unwanted annotations in the CSN for OData V4.
 - `cds import` now support annotations for properties of type `Type Definition`
-- `cds import` fix for supporting valid datatypes in unbounded function imports for OData V4.
+- `cds import` fix for supporting valid data types in unbounded function imports for OData V4.
 - `cds import` bug fixed for missing data imports for parameters with entity type not mapped to an entity set.
 - `cds import` now supports properties with complex type for OData V4.
 - `cds import` fix will now throw error if the key property of an entity is of type `Collection` for both OData V2 and V4 edmx.
@@ -1549,9 +1594,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - `cds lint` now limits all file extensions to those allowed by the @sap/eslint-plugin-cds ESLint configuration
 
 ## Version 4.6.0 - 2021-11-02
+
 ### Added
 
-- `cds bind` binds the given service to a hana instance by storing the credentials in `.cdsrc.json` in your user home directory [beta].
+- `cds bind` binds the given service to a HANA instance by storing the credentials in `.cdsrc.json` in your user home directory [beta].
 - `cds import` introduced option `--include-namespaces` which imports the custom defined namespaces.
 - `cds import` preserve documentation in CSN file for actions and functions from OData V4 EDMX file.
 - `cds import` now supports reading values of the `as` option from cds.env

package/bin/build.js

@@ -148,7 +148,7 @@ async function build([project], options = {}) {
     // IMPORTANT: call plugins before subsequent access to cds.env
     await cds.plugins
 
-    cds.env = cds.env.for('cds', cds.root);
+    cds.env = cds.env.for('cds', cds.root)
     delete options.project // avoid that relative project paths are resolved twice
 
     if (typeof options["options-model"] === "string") {

package/bin/cds.js

@@ -68,6 +68,10 @@ const cli = {
             const flags   = all.filter(([,f]) => f.type === 'boolean')
             const options = all.filter(([,o]) => o.type !== 'boolean')
             task.options.push(...options.map(([key]) => '--'+key))
+            task.shortcuts.push(...options.map(([_, { short }]) => short ? '-'+short : undefined).filter(Boolean))
+            const byShortcut = (a, b) => (b.short ? 1 : 0) - (a.short ? 1 : 0)
+            task.options.sort(byShortcut)
+            task.shortcuts.sort(byShortcut)
             task.flags.push(...flags.map(([key]) => '--'+key))
           }
         }
@@ -138,6 +142,14 @@ const cli = {
       add (k, e[path[0]] = v)
     }
 
+    // always use 'plain' log format for cds-dk logging
+    // by default 'plain' log format is used for development while 'json' format is used for production, see cap/cds/blob/main/lib/env/defaults.js#L97
+    // the json formatter logs stringified JSON which causing any line breaks to get replaced by '\n'
+    // using the env variable ensures that cds.env isn't loaded too early
+    env ??= {}
+    env.log ??= {}
+    env.log.format = 'plain'
+
     // if (env) require('../lib/cds').env.add (env) //> avoid loading env
     // unless it has already explicitly been set by the user
     if (env) process.env.CDS_CONFIG ??= JSON.stringify(env)

package/bin/compile/index.js

@@ -4,7 +4,7 @@ const {colors} = require('../../lib/util/term')
 module.exports = Object.assign ( compile, {
   handleCompletion,
   options: [
-  '--from', '--service', '--lang', '--for', '--to', '--dest', '--log-level', '--flavor', '--dialect', '--sql-dialect', '--openapi:url', '--openapi:servers', '--odata-version'
+    '--from', '--service', '--lang', '--for', '--to', '--dest', '--log-level', '--flavor', '--dialect', '--sql-dialect', '--openapi:url', '--openapi:servers', '--openapi:config-file', '--odata-version'
   ],
   shortcuts: [
   undefined, '-s', '-l', '-4', '-2', '-o', undefined, '-f'
@@ -135,6 +135,11 @@ module.exports = Object.assign ( compile, {
 
     Include YUML diagram in the generated OpenAPI document, default: *false*.
 
+  *--openapi:config-file* filename
+
+    The passed configuration file will be read to generate the OpenAPI document, incorporating all specified options.
+    Precedence of Options: Inline options specified in the command line will take precedence over those defined in the configuration file.
+
   *--asyncapi:merged*
 
     A single AsyncAPI document is generated using the details of all input services. Information of _title_
@@ -233,6 +238,12 @@ async function compile (models, options={}) {
     if (/mta.*\.ya?ml/.test(models[0])) {
       model = Promise.resolve(models[0])
     } else {
+      for (const kind of ['to', 'for']) {
+        const tail = options[kind]
+        if (typeof tail === 'string' && !cds.compile[kind][tail]) {
+          throw `Unknown model processor: cds.compile.${kind}.${tail}`
+        }
+      }
       model = cds.load (models, options)
       src = models[0] .replace (/\.[^.]+$/,'')       //> excluding source file extension, e.g. .cds
     }
@@ -300,7 +311,6 @@ async function compile (models, options={}) {
     let p = cds.compile[kind]
     for (let each of tail.split('.')) {
       p = p[each]
-      if (!p) throw `Unknown model processor: cds.compile.${kind}.${tail}`
     }
     return p
   }

package/bin/deploy/index.js

@@ -1,6 +1,6 @@
 module.exports = Object.assign(deploy, {
   options: ['--to', '--for', '--out', '--tunnel-address', '--vcap-file', '--delta-from' ],
-  flags: ['--no-save', '--auto-undeploy', '--dry', '--xdry', '--with-mocks', '--store-credentials', '--model-only', '--script', '--with-auto-schema-evolution' ],
+  flags: ['--no-save', '--auto-undeploy', '--dry', '--xdry', '--with-mocks', '--store-credentials', '--no-build', '--model-only', '--script', '--with-auto-schema-evolution' ],
   shortcuts: ['-2', '-4', '-o'],
   help: `
 # SYNOPSIS
@@ -37,6 +37,10 @@ module.exports = Object.assign(deploy, {
 
       Just print the SQL statements without executing them.
 
+    *--no-build*  (only in combination with *--to hana*)
+
+      Skip running *cds build*.
+
     *--out* | *-o* <file>
 
       Write the DDL statements to the given file.
@@ -97,6 +101,7 @@ module.exports = Object.assign(deploy, {
     cds deploy --to sqlite:db
     cds deploy --to hana
     cds deploy --to hana:myService --auto-undeploy
+    cds deploy --to hana --no-build
 
 `})
 

package/bin/env.js

@@ -72,6 +72,7 @@ async function env ([cmd, key, value], options={}) {
 
 
 const { inspect, format } = require('node:util')
+const {colors} = require('../lib/util/term')
 const commands = {
 
   json: (env,k,v,o) => commands.get (env,k,v,{...o,json:true}),
@@ -87,7 +88,7 @@ const commands = {
   },
 
   get (conf, key, val, options) {
-    let fmt = x => inspect (x, {depth:22,colors:true})
+    let fmt = x => inspect (x, {depth:22, colors})
 
     let obj = (
       !key ? conf
@@ -96,7 +97,7 @@ const commands = {
       : conf.get(key.replace(/^cds\./,''))
     )
 
-    if (!process.stdout.isTTY) {
+    if (!colors) {
       fmt = x => typeof x !== 'object' ? x : JSON.stringify(x,0,2)
     }
     if (options.json) {

package/bin/init.js

@@ -9,7 +9,7 @@ module.exports = Object.assign(init, {
     handleCompletion,
     options: ['--add', '--java:mvn', '--java:package', '--lint:custom', '--lint:custom:example', '--no-db'],
     shortcuts: ['-a'],
-    flags: ['--force', '--verbose'],
+    flags: ['--java', '--force', '--verbose'],
     help: `
 # SYNOPSIS
 
@@ -20,6 +20,10 @@ module.exports = Object.assign(init, {
 
 # OPTIONS
 
+    *--java*
+
+        Create a CAP Java project.
+
     *--add* <feature | comma-separated list of features>
 
         Add one or more features while creating the project.
@@ -40,10 +44,10 @@ ${require('../lib/init').help()}
 # EXAMPLES
 
     *cds init* bookshop
-    *cds init* bookshop --add java
-    *cds init* bookshop --add java,hana
+    *cds init* bookshop --java
+    *cds init* bookshop --add hana
     *cds init* bookshop --add multitenancy,mta
-    *cds init* --add java --java:mvn groupId=myGroup,artifactId=newId,package=my.company
+    *cds init* --java --java:mvn groupId=myGroup,artifactId=newId,package=my.company
 
 # SEE ALSO
 

package/bin/repl.js

@@ -35,9 +35,9 @@ async function repl (_, options={}) {
 
   Object.defineProperty (cds,'repl',{value:repl})
   cds.extend (repl.context) .with ( class {
-    get Foo() { return ctx.Foo ??= new cds.entity({ name: 'Foo' }) }
-    get Bar() { return ctx.Bar ??= new cds.entity({ name: 'Bar' }) }
-    get expect() { return cds.test.expect }
+    get Foo() { return ctx.Foo ??= new cds.entity({ name: 'Foo' }) }; set Foo(v) { ctx.Foo = v }
+    get Bar() { return ctx.Bar ??= new cds.entity({ name: 'Bar' }) }; set Bar(v) { ctx.Bar = v }
+    get expect() { return ctx.expect ??= cds.test.expect }; set expect(v) { ctx.expect = v }
   } .prototype )
   const ctx={}
 

package/lib/build/util.js

@@ -6,6 +6,7 @@ const execAsync = require('util').promisify(cp.exec)
 const IS_WIN = require('os').platform() === 'win32'
 const { SEVERITY_ERROR, FILE_EXT_CDS } = require('./constants');
 const DEBUG = cds.debug('cli|build')
+const SECRETS = /(passw)|(cert)|(ca)|(secret)|(key)/i
 
 function getProperty(src, segments) {
     segments = Array.isArray(segments) ? segments : segments.split('.')
@@ -68,31 +69,42 @@ function relativePaths(root, qualifiedPaths) {
     return qualifiedPaths
 }
 
-function redactCredentials(config, o) {
-    return JSON.stringify(config, (k, v) => {
-        if (!v) {
-            return v
-        }
-        if (k === 'credentials') {
-            try {
-                return _redacted(v)
-            } catch (e) {/* ignored */ }
+function redactCredentials(config) {
+    if (typeof config !== 'object' || config === null) {
+        return config;
+    }
+
+    if (Array.isArray(config)) {
+        return config.map(item => redactCredentials(item));
+    } else {
+        const newConfig = Object.assign({}, config);
+        for (let key in newConfig) {
+            if (key === 'credentials') {
+                newConfig[key] = _redacted(newConfig[key]);
+            } else {
+                newConfig[key] = redactCredentials(newConfig[key]);
+            }
         }
-        return v
-    }, o && o.indents || 2)
+        return newConfig;
+    }
 }
 
-/** redacts password-like strings, also reducing clutter in output */
+/**
+ * Masks password-like strings, also reducing clutter in output
+ * @param {any} cred - object or array with credentials
+ * @returns {any}
+ */
 function _redacted(cred) {
-    const secrets = /(password)|(certificate)|(ca)/i // 'certificate' and 'ca' on HANA
-    const newCred = Object.assign({}, cred)
-    Object.keys(newCred)
-        .filter(k => typeof newCred[k] === 'string' && secrets.test(k))
-        .forEach(k => newCred[k] = '...')
-    return newCred
+    if (!cred) return cred
+    if (Array.isArray(cred)) return cred.map(c => typeof c === 'string' ? '...' : _redacted(c))
+    if (typeof cred === 'object') {
+      const newCred = Object.assign({}, cred)
+      Object.keys(newCred).forEach(k => (typeof newCred[k] === 'string' && SECRETS.test(k)) ? (newCred[k] = '...') : (newCred[k] = _redacted(newCred[k])))
+      return newCred
+    }
+    return cred
 }
-
-
+  
 /**
  * Returns a list of fully qualified model names belonging to the '@sap' namespace that cannot be resolved.
  * E.g. the module might NOT have been installed.

package/lib/compile/to-xsuaa.js

@@ -7,44 +7,57 @@ const hardcoded = {
   Attributes: ['id', 'tenant', 'ext_attr']
 }
 
-
 module.exports = function compile_to_xsuaa (model, options) {
 
   const base = getBaseModel(options)
   const scopes = {}
   const attributes = {}
 
+  const findUserAttrInExpression = (expr, attributes = []) => {
+    // find `$user` ref, but not e.g. `$self.$user`
+    if (typeof expr === 'object' && expr.ref?.length && expr.ref[0] === '$user') {
+      if (expr.ref.length === 2) {
+        const attr = expr.ref[1]
+        if (!/^[a-zA-Z0-9_]*$/.test(attr)) {
+          // see https://help.sap.com/docs/CP_AUTHORIZ_TRUST_MNG/ae8e8427ecdf407790d96dad93b5f723/517895a9612241259d6941dbf9ad81cb.html#attributes
+          throw new Error(`Illegal attribute name '${attr}' in '${expr}'. Only characters a-z, A-Z, 0-9, _ are allowed.`)
+        }
+        if (!hardcoded.Attributes.includes(attr)) attributes.push(attr)
+      }
+      // Reject expressions like `$user.foo.bar`, as xsuaa attributes are primitive, not structured
+      else if (expr.ref.length > 2) {
+        throw new Error (`Structured attributes like '${expr.ref.join('.')}' are not supported`)
+      }
+    }
+    else if (typeof expr === 'object') { // descend sub expressions etc.
+      Object.values(expr).forEach(e => findUserAttrInExpression(e, attributes))
+    }
+    else if (Array.isArray(expr)) { // descend arrays
+      expr.forEach(e => findUserAttrInExpression(e, attributes))
+    }
+    return attributes
+  }
+
+  /**
+   * @param {string|object} condition - the condition object or string
+   * @returns string[] - the attributes found in the condition
+   */
   const parseAttributes = (condition) => { // e.g. 'foo = $user.bar or baz = $user.boo'
     if (!condition) return []
 
-    // first validate basic syntax of expression by parsing it
     let expr
-    try {
-      expr = cds.parse.expr(condition).xpr
-    } catch (err) {
-      throw new Error(`Invalid expression': ${err.message}`)
-    }
-
-    // Reject expressions like `$user.foo.bar`, as xsuaa attributes are primitive, not structured
-    expr.forEach(expr => {
-      const userIdx = expr.ref?.indexOf('$user')
-      if (userIdx >= 0 && expr.ref.length > userIdx+2) {
-        throw new Error (`Structured attributes like '${expr.ref.join('.')}' are not supported`)
+    if (typeof condition === 'object') {
+      if (!condition.xpr && !condition['=']) throw new Error(`Invalid expression: ${JSON.stringify(condition)}`)
+      expr = condition.xpr
+    } else  {
+      try {
+        expr = cds.parse.expr(condition).xpr
+      } catch (err) {
+        throw new Error(`Invalid expression': ${err.message}`, { cause: err })
       }
-    })
+    }
 
-    // Reject expressions like `$user.foo-bar`
-    // Impl. note: use the expression string rather than the parsed expression as the above example would be
-    // `[ { ref: [ '$user', 'foo' ] }, '-', { ref: [ 'bar' ] } ]`
-    // making it ambiguous to tell if it was `$user.foo-bar` or `$user.foo - bar`
-    return Array.from(condition.matchAll(/\$user\s*\.\s*(\S*)/g))
-      .map(m => m[1])
-      .filter(m => !hardcoded.Attributes.includes(m))
-      .map(m => {
-        // see https://help.sap.com/docs/CP_AUTHORIZ_TRUST_MNG/ae8e8427ecdf407790d96dad93b5f723/517895a9612241259d6941dbf9ad81cb.html#attributes
-        if (!/^[a-zA-Z0-9_]*$/.test(m))  throw new Error(`Illegal attribute name '${m}' in '${condition}'. Only characters a-z, A-Z, 0-9, _ are allowed.`)
-        return m
-      })
+    return findUserAttrInExpression(expr)
   }
 
   cds.reflect(model).foreach(def => {