@sap/cds-dk 8.2.3 → 8.4.0

package/CHANGELOG.md

@@ -7,6 +7,55 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 8.4.0 - 2024-10-29
+
+### Added
+
+- 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
+
+- `cds add mta`, `cds add helm` and `cds add cf-manifest` execute the `mvn cds:add -Dfeature CF/K8S` under the hood for Java projects.
+- `cds compile --to mermaid` now supports `mta.yaml` to generate a visualization of your deployment descriptor.
+- `cds add data` now also generates data for models imported with `cds import`.
+- `cds add data` now also supports structured types.
+- `cds deploy` now can also write its DDL statements to a separate log file with the `--out <file>` parameter.
+- `cds add dynatrace` is now supported for Kyma.
+- `cds import --name ...` to be used in RFC importer (`@sap/cds-rfc`).
+- `cds add cloud-logging --with-telemetry` and `cds add dynatrace` are added to the `production` profile by default and respect the `for` option.
+
+### Changed
+
+- `cds add sample` now uses `@ui5/cli` version 4.
+- `cds import` now throws a warning for OpenAPI files containing recursive data types.
+
+### Fixed
+
+- `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
 
 ### Fixed
@@ -41,7 +90,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.
@@ -122,7 +171,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.
@@ -252,7 +301,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`.
@@ -265,6 +314,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 - `cds add notebook` is removed.  CAP Jupyter Notebooks have been replaced by custom CAP Notebooks for VS Code which are now part of the CDS Editor.  See https://cap.cloud.sap/docs/tools/#add-cds-editor for more.
 
+## Version 7.9.8 - 2024-09-17
+
+### Fixed
+
+- BDSA-2024-6188: vulnerability with express.js 4.19.2
 
 ## Version 7.9.7 - 2024-08-22
 
@@ -349,7 +403,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.
@@ -631,11 +685,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.
@@ -681,7 +735,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
 
@@ -704,7 +758,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
@@ -1187,7 +1241,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.
@@ -1384,7 +1438,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.
@@ -1521,9 +1575,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))
           }
         }
@@ -77,11 +81,12 @@ const cli = {
 
         if (args[1]?.['resolve-bindings']) await _resolveBindings({ silent: cmd === 'env' })
 
-        // cds.root may for some subcommands not point to the correct directory (e.g. cds w where users can pass a project directory)
-        // showing the full detected path should give the user an idea whether this info is relevant for them
+        // warn users if they are using cds instead of cds-ts in a TypeScript project
         const tsconfig = path.join(cds.root ?? '.', 'tsconfig.json')
-        if (!process.env.CDS_TYPESCRIPT && fs.existsSync(tsconfig)) {
-          console.info(`Detected ${tsconfig}. If this is a TypeScript project, consider running commands using cds-ts instead of cds.`)
+        if (!process.env.CDS_TYPESCRIPT && cds.cli?.command === 'serve' && fs.existsSync(tsconfig)) {
+          // cds.root may for some subcommands not point to the correct directory (e.g. cds w where users can pass a project directory)
+          // showing the full detected path should give the user an idea whether this info is relevant for them
+          console.error(`Detected ${tsconfig}. If this is a TypeScript project, consider running commands using 'cds-ts' instead of 'cds'.\n`)
         }
         return await task.apply(this, args)
       }
@@ -137,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_
@@ -230,8 +235,12 @@ async function compile (models, options={}) {
   const messages = options.messages = []
 
   if (Array.isArray(models) && models.length > 0) {  // any arguments?
-    model = cds.load (models, options)
-    src = models[0] .replace (/\.[^.]+$/,'')       //> excluding source file extension, e.g. .cds
+    if (/mta.*\.ya?ml/.test(models[0])) {
+      model = Promise.resolve(models[0])
+    } else {
+      model = cds.load (models, options)
+      src = models[0] .replace (/\.[^.]+$/,'')       //> excluding source file extension, e.g. .cds
+    }
   } else if (!process.stdin.isTTY && process.argv[1].endsWith('cds')) {  // else check for stdin
     model = readModelFromStdin()
     src = 'stdin'

package/bin/deploy/index.js

@@ -1,7 +1,7 @@
 module.exports = Object.assign(deploy, {
-  options: ['--to', '--for', '--tunnel-address', '--vcap-file', '--delta-from' ],
+  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' ],
-  shortcuts: ['-2', '-4'],
+  shortcuts: ['-2', '-4', '-o'],
   help: `
 # SYNOPSIS
 
@@ -37,6 +37,11 @@ module.exports = Object.assign(deploy, {
 
       Just print the SQL statements without executing them.
 
+    *--out* | *-o* <file>
+
+      Write the DDL statements to the given file.
+      Not available in combination with '--to hana'.
+
     *--with-mocks*
 
       Also create tables for all entities from imported models.
@@ -134,10 +139,19 @@ async function deploy(_model, options) { // NOSONAR
   }
   try {
     options.messages = []
-    if(options.script) options.dry = true // to ensure that we don't accidentally execute any SQLs
+    if (options.script) options.dry = true // to ensure that we don't accidentally execute any SQLs
+    if (options.out) {
+      ensureVersion(cds.version, 8, 3, `Option --out is available with @sap/cds >= 8.3.0, current version is ${cds.version}`)
+      options.schema_log = []
+    }
+
     await deployer.deploy(_model, _db, options)
     const log = this.log || _log
     if (options.messages.length) log (options.messages, options)
+
+    if (options.out) {
+      await cds.utils.write (options.out, options.schema_log.join('\n'))
+    }
   } catch (e) {
     if (e.code === 'MODEL_NOT_FOUND') {
       if (!_model) throw new Error('No .cds models found, please specify one as an argument')
@@ -153,3 +167,8 @@ function _log (messages, options) {
   messages = sortMessagesSeverityAware (messages)
   cds._log (messages, options)
 }
+
+function ensureVersion(version, reqMajor, reqMinor, message) {
+  const [major, minor] = version.split('.').map(Number)
+  if (major < reqMajor || (major === reqMajor && minor < reqMinor)) throw message
+}

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/import.js

@@ -1,8 +1,8 @@
 module.exports = Object.assign(_import, {
     _name: 'import',
-    options: ['--out', '--as', '--include-namespaces', '--from', '--config', '--destination'],
+    options: ['--out', '--as', '--name', '--include-namespaces', '--from', '--config', '--destination'],
     flags: ['--dry', '--force', '--no-copy', '--no-save', '--keep-namespace', '--beta'],
-    shortcuts: ['-o', '-as', '-ns', undefined, '-c', undefined, '-', '-f'],
+    shortcuts: ['-o', '-as', '-n', '-ns', undefined, '-c', undefined, '-', '-f'],
     help: `
 # SYNOPSIS
 
@@ -43,7 +43,7 @@ module.exports = Object.assign(_import, {
     *--from*
         Imports the model from the one of the given options "edmx", "openapi" or
         "asyncapi".
-    
+
     *-c | --config* <JSON Object>
         Adds the provided JSON Object as custom configuration data to the package.json.
 
@@ -51,6 +51,10 @@ module.exports = Object.assign(_import, {
         Enables beta mode in cds import.
         - Populates default value for optional action and function parameters in the CSN or CDS.
 
+    *--destination*
+        Destination name under which the remote service can be reached.
+        Not supported by import types "edmx", "openapi" or "asyncapi".
+
     *Below options are valid for OData only*
 
     *--keep-namespace*
@@ -62,10 +66,11 @@ module.exports = Object.assign(_import, {
         For OData V2 attributes with the namespace "sap" & "m" are captured by
         default.
 
-    *--destination*
-        Destination name under which the remote service can be reached.
-        Not supported by import types "edmx", "openapi" or "asyncapi".
+    *Below options are valid for RFC only*
 
+    *-n | --name*
+        The name of the module to be imported
+        Requires valid system credentials as the import connects to the system to fetch the metadata.
 
 # EXAMPLES
 
@@ -85,20 +90,25 @@ const messages = require('../lib/import/message').getMessages();
 const common = require('../lib/import/common');
 const cdsImport = require('../lib/index');
 
-async function _import(file, options = {}) {
-    let csn = "";
+async function _import(args, options = {}) {
+    let csn = '';
     let apiOptions = {};
     // preprocess
     let cwd = process.cwd();
-    if (Array.isArray(file)) file = file[0];
-    if (!file) return this.help('import');
     // process options
     await common.processOptions(options, apiOptions);
-    const srcFilePath = await common.preProcess(file, options, cwd);
 
     const cds = require('../lib/cds')
     await cds.plugins
 
+    let file
+    let input
+    if (!options.name) {
+        file = Array.isArray(args) ? args[0] : args
+        if (!file) return this.help('import')
+        input = await common.preProcess(file, options, cwd);
+    }
+
     // process - csn generation
     // if --from option is given, call api directly accordingly
     if (options.from) {
@@ -106,14 +116,14 @@ async function _import(file, options = {}) {
             // the required plugin might not be installed, e.g. rfc importer
             throw messages.UNSUPPORTED_FROM_OPTION;
         }
-        csn = await cdsImport.import.from[options.from](srcFilePath, apiOptions);
+        csn = await cdsImport.import.from[options.from](input, apiOptions);
     } else {
-        csn = await cdsImport.import(srcFilePath, apiOptions);
+        csn = await cdsImport.import(input, apiOptions);
     }
 
     // reads the file version
     options.inputFileKind = apiOptions.odataVersion ? apiOptions.odataVersion : apiOptions.inputFileKind;
 
     // postprocess
-    return await common.postProcess(file, options, csn, cwd);
+    return await common.postProcess(apiOptions.file ?? file, options, csn, cwd);
 }

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

@@ -1,4 +1,4 @@
- 
+
 module.exports = Object.assign (repl, { options: [], help: `
 # SYNOPSIS
 
@@ -24,7 +24,9 @@ async function repl (_, options={}) {
 
 
   const repl = require('repl').start ({
-    ...options, ignoreUndefined: true,
+    ...options,
+    ignoreUndefined: true,
+    useGlobal: true,
     writer: o => {
       if (!o || typeof o !== 'object') return o
       return inspect(o).replace(/\[Object: null prototype\] /g, '')
@@ -32,12 +34,23 @@ async function repl (_, options={}) {
   })
 
   Object.defineProperty (cds,'repl',{value:repl})
-  cds.lazify (Object.assign (repl.context,{ cds,
-     
-    Foo: lazy => new cds.entity ({name:'Foo'}),
-    Bar: lazy => new cds.entity ({name:'Bar'}),
-    expect: lazy => cds.test.expect,
-  }))
+  cds.extend (repl.context) .with ( class {
+    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={}
+
+  repl.defineCommand ('run', {
+    help: 'Runs a cds server in the given CAP project folder, which can be a module name like @capire/bookshop.',
+    async action (project) {
+      // await cds.exec ('--project', project, '--port', '0')
+      await cds.test (project)
+      console.log ('Following are made avaliable as global variables:')
+      console.log ('- cds.services:', Object.keys(cds.services)); Object.assign (repl.context, cds.services)
+      console.log ('- cds.entities:', Object.keys(cds.entities)); Object.assign (repl.context, cds.entities)
+    }
+  })
 
   repl.history = new Array(222)
   const home = process.env.HOME || process.env.USERPROFILE

package/bin/util/fuzzySearch.js

@@ -8,7 +8,7 @@
  */
 
 
-const cache = {};
+const cache = new Map();
 
 
 module.exports = (input, list, log) => {
@@ -52,8 +52,9 @@ module.exports = (input, list, log) => {
 
 const levDistance = (a, b) => {
 
-  if (cache[a] && cache[a][b]) {
-    return cache[a][b];
+  const cachedObj = cache.get(a)?.get(b);
+  if (cachedObj) {
+    return cachedObj;
   }
 
   if (a.length === 0) {
@@ -81,7 +82,9 @@ const levDistance = (a, b) => {
 
 
 const addToCache = (a, b, value) => {
-  cache[a] = cache[a] || {};
-  cache[a][b] = value;
+  if (!cache.has(a)) {
+    cache.set(a, new Map());
+  }
+  cache.get(a).set(b, value);
   return value;
 }

package/lib/build/plugins/helm/files/subcharts/content-deployment/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 description: A Helm Chart for creating a Content Deployment job
 name: content-deployment
 type: application
-version: 1.6.2
+version: 1.6.3

package/lib/build/plugins/helm/files/subcharts/content-deployment/values.schema.json

@@ -528,7 +528,7 @@
             "title": "Image tag",
             "type": "string",
             "$comment": "Copied from https://github.com/containers/image/blob/18d58d29fdc4fc32fb8a8a6d186b829b217f1bf5/docker/reference/regexp.go#L68-L70",
-            "pattern": "^((?:(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])(?:(?:\\.(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]))+)?(?::[0-9]+)?/)?[a-z0-9]+(?:(?:(?:[._]|__|[-]*)[a-z0-9]+)+)?(?:(?:/[a-z0-9]+(?:(?:(?:[._]|__|[-]*)[a-z0-9]+)+)?)+)?)(?::([\\w][\\w.-]{0,127}))?(?:@([A-Za-z][A-Za-z0-9]*(?:[-_+.][A-Za-z][A-Za-z0-9]*)*[:][[:xdigit:]]{32,}))?$"
+            "pattern": "^((?:(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])(?:(?:\\.(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]))+)?(?::[0-9]+)?/)?[a-z0-9]+(?:(?:(?:[._]|__|[-]*)[a-zA-Z0-9]+)+)?(?:(?:/[a-z0-9]+(?:(?:(?:[._]|__|[-]*)[a-z0-9]+)+)?)+)?)(?::([\\w][\\w.-]{0,127}))?(?:@([A-Za-z][A-Za-z0-9]*(?:[-_+.][A-Za-z][A-Za-z0-9]*)*[:][[:xdigit:]]{32,}))?$"
         },
         "ImagePullPolicy": {
             "title": "ImagePullPolicy",

package/lib/build/plugins/helm/files/subcharts/content-deployment/values.yaml

@@ -15,7 +15,7 @@ global:
     _internal:
       content-deployment:
         versions:
-          1.6.2: true
+          1.6.3: true
 # Will be used instead of the `.Chart.Name`, e.g. when generating the Deployment name.
 # nameOverride: name
 

package/lib/build/plugins/helm/files/subcharts/web-application/Chart.yaml

@@ -3,4 +3,4 @@ description: A Helm chart for web app
 kubeVersion: '>= 1.21'
 name: web-application
 type: application
-version: 1.17.0
+version: 1.17.2

package/lib/build/plugins/helm/files/subcharts/web-application/templates/virtual-service.yaml

@@ -1,4 +1,4 @@
-{{- if include "web-application.internal.TENANT_HOST_PATTERN" . -}}
+{{- if and .Values.expose.enabled (include "web-application.internal.TENANT_HOST_PATTERN" .) -}}
 apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
 metadata:
@@ -10,7 +10,26 @@ spec:
   hosts:
     - "*"
   http:
-    - corsPolicy:
+  {{- range $httpRule := .Values.expose.rules }}
+    - match:
+        - uri:
+            regex: {{ $httpRule.path }}
+          {{- if $httpRule.methods }}
+          method:
+            regex: ^({{ join "|" $httpRule.methods }})$
+          {{- end }}
+          headers:
+            Host:
+              regex: {{ tpl (include "web-application.internal.TENANT_HOST_PATTERN" $) $ }}
+      route:
+        - weight: 100
+          destination:
+            host: "{{ include "web-application.fullname" $ }}.{{ $.Release.Namespace }}.svc.cluster.local"
+      {{- if $httpRule.corsPolicy }}
+      corsPolicy:
+      {{ $httpRule.corsPolicy | toYaml | nindent 8 }}
+      {{- else }}
+      corsPolicy:
         allowHeaders:
           - Authorization
           - Content-Type
@@ -23,14 +42,6 @@ spec:
           - PATCH
         allowOrigins:
           - regex: .*
-      match:
-        - uri:
-            regex: /.*
-          headers:
-            Host:
-              regex: {{ tpl (include "web-application.internal.TENANT_HOST_PATTERN" .) . }}
-      route:
-        - weight: 100
-          destination:
-            host: "{{ include "web-application.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local"
+    {{- end }}
+  {{- end }}
 {{- end }}

package/lib/build/plugins/helm/files/subcharts/web-application/values.schema.json

@@ -1326,7 +1326,7 @@
             "title": "Image tag",
             "type": "string",
             "$comment": "Copied from https://github.com/containers/image/blob/18d58d29fdc4fc32fb8a8a6d186b829b217f1bf5/docker/reference/regexp.go#L68-L70",
-            "pattern": "^((?:(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])(?:(?:\\.(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]))+)?(?::[0-9]+)?/)?[a-z0-9]+(?:(?:(?:[._]|__|[-]*)[a-z0-9]+)+)?(?:(?:/[a-z0-9]+(?:(?:(?:[._]|__|[-]*)[a-z0-9]+)+)?)+)?)(?::([\\w][\\w.-]{0,127}))?(?:@([A-Za-z][A-Za-z0-9]*(?:[-_+.][A-Za-z][A-Za-z0-9]*)*[:][[:xdigit:]]{32,}))?$"
+            "pattern": "^((?:(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])(?:(?:\\.(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]))+)?(?::[0-9]+)?/)?[a-z0-9]+(?:(?:(?:[._]|__|[-]*)[a-zA-Z0-9]+)+)?(?:(?:/[a-z0-9]+(?:(?:(?:[._]|__|[-]*)[a-z0-9]+)+)?)+)?)(?::([\\w][\\w.-]{0,127}))?(?:@([A-Za-z][A-Za-z0-9]*(?:[-_+.][A-Za-z][A-Za-z0-9]*)*[:][[:xdigit:]]{32,}))?$"
         },
         "ImagePullPolicy": {
             "title": "ImagePullPolicy",

package/lib/build/plugins/helm/files/subcharts/web-application/values.yaml

@@ -15,7 +15,7 @@ global:
     _internal:
       web-application:
         versions:
-          1.17.0: true
+          1.17.2: true
 ## Will be used instead of the `.Chart.Name`, e.g. when generating the Deployment name.
 # nameOverride: name
 
@@ -159,7 +159,7 @@ expose:
   # Rules represents collection of Rule to apply.
   rules:
     - accessStrategies:
-        - handler: allow
+        - handler: no_auth
       methods:
         - GET
         - POST