@sap/cds-dk 8.2.3 → 8.3.0

package/CHANGELOG.md

@@ -7,6 +7,29 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## 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
+
+- 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.
+
 ## Version 8.2.3 - 2024-09-25
 
 ### Fixed
@@ -265,6 +288,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
 

package/bin/cds.js

@@ -77,11 +77,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)
       }

package/bin/compile/index.js

@@ -230,8 +230,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/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/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' }) }
+    get Bar() { return ctx.Bar ??= new cds.entity({ name: 'Bar' }) }
+    get expect() { return cds.test.expect }
+  } .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

package/lib/compile/to-mermaid.js

@@ -1,6 +1,8 @@
 const cds = require('../cds')
 
 module.exports = function to_mermaid (model, options={}) {
+  if (typeof model === 'string' && /mta.*\.ya?ml/.test(model)) return to_mta_mermaid(model)
+
   options = Object.assign({
     assocnames: false,     // include association names
     elements  : false,     // include all elements { falsy | 'all'|true | 'keys' }
@@ -119,3 +121,88 @@ function resolveTargets (query) {
 
   return targets
 }
+
+function to_mta_mermaid (file) {
+  const content = cds.utils.fs.readFileSync(file, 'utf8')
+  const mta = cds.utils.yaml.parse(content)
+  const { modules = [], resources = [] } = mta
+
+  const all = new Set([...modules.map(m => m.name), ...resources.map(r => r.name)])
+  const provided = new Set()
+  const required = new Set()
+
+  let diag = 'graph LR\n'
+
+  const appModules = modules.filter(module => module.provides && module.provides.length > 0)
+  const utilityModules = modules.filter(module => !module.provides || module.provides.length === 0)
+
+  diag += '  subgraph Modules\n'
+  appModules.forEach(module => {
+    diag += `    subgraph ${module.name}\n`
+    module.provides.forEach(provide => {
+      provided.add(provide.name)
+      diag += `      ${provide.name}["${provide.name}"]\n`
+    })
+    diag += `    end\n`
+  })
+  utilityModules.forEach(module => {
+    diag += `    ${module.name}["${module.name}"]:::module\n`
+  })
+  diag += '  end\n'
+
+  diag += '  subgraph Resources\n'
+  resources.forEach(resource => {
+    diag += `    ${resource.name}["${resource.name}"]:::resource\n`
+  })
+  diag += '  end\n'
+
+  modules.forEach(module => {
+    if (module.requires) {
+      module.requires.forEach(require => {
+        required.add(require.name)
+        if (!all.has(require.name) && !provided.has(require.name)) {
+          diag += `  ${module.name} -->|requires| ${require.name}:::missing\n`
+        } else {
+          diag += `  ${module.name} -->|requires| ${require.name}\n`
+        }
+      })
+    }
+  })
+  resources.forEach(resource => {
+    if (resource.requires) {
+      resource.requires.forEach(require => {
+        required.add(require.name)
+        if (!all.has(require.name) && !provided.has(require.name)) {
+          diag += `  ${resource.name} -->|requires| ${require.name}:::missing\n`
+        } else {
+          diag += `  ${resource.name} -->|requires| ${require.name}\n`
+        }
+      })
+    }
+  })
+
+  provided.forEach(api => {
+    if (!required.has(api)) {
+      diag += `  class ${api} unused\n`
+    } else {
+      diag += `  class ${api} api\n`
+    }
+  })
+  modules.forEach(module => {
+    diag += `  class ${module.name} module\n`
+  })
+  resources.forEach(resource => {
+    diag += `  class ${resource.name} resource\n`
+  })
+
+  diag += `
+    classDef module fill:#36aeff,stroke:#333,stroke-width:2px;
+    classDef resource fill:#2bab43,stroke:#333,stroke-width:2px;
+    classDef api fill:#e03da4,stroke:#333,stroke-width:2px;
+    classDef missing fill:#ffcccc,stroke:#ff0000,stroke-width:2px,color:#ff0000;
+    classDef unused fill:#ffcccc,stroke:#ff0000,stroke-width:2px,color:#ff0000;
+  `
+
+  return diag
+}
+

package/lib/import/common.js

@@ -17,7 +17,7 @@ let optionsMapping = {
 };
 
 let apiOptions = ['includeNamespaces', 'keepNamespace', 'beta'];
-let commonOptions = ['no_copy', 'no_save', 'out', 'dry', 'as', 'from', 'force', 'config', 'destination'];
+let commonOptions = ['no_copy', 'no_save', 'out', 'dry', 'as', 'from', 'force', 'config', 'destination', 'name'];
 
 async function generateEDMX2JSON(edmx) {
     let cjson = convert.xml2json(edmx, {
@@ -344,7 +344,7 @@ async function _updatePackageJson(dest, services, kind, cwd, config, destination
     if (!config && destination) {
         config = { "[production]": { credentials: { destination } } };
     }
-
+    
     let package_json_updated = false;
     for (let service of services) {
         // existing service configuration data can be updated, e.g. in case of delta imports

package/lib/import/importapi.js

@@ -7,11 +7,11 @@ let asyncapi = require('./asyncapi');
 let messages = require('./message').getMessages();
 
 module.exports = Object.assign(cds_import, {
-    from: cds.lazified({
+    from: {
         edmx: cds_import_from_edmx,
         openapi: cds_import_from_openapi,
         asyncapi: cds_import_from_asyncapi
-    })
+    }
 });
 
 /**
@@ -95,7 +95,7 @@ async function cds_import_from_openapi(filepath, options = {}) {
     return csn;
 }
 
-/** 
+/**
  * This is the import API function to generate CSN from asyncapi files.
  * @param {string} filepath
  * - a single valid filepath

package/lib/import/openapi/importOpenAPI.js

@@ -552,14 +552,13 @@ function indirectlyReferencedType(context, subSchema) {
 }
 
 function referencedType(context, ref) {
-    const expectedPrefix = context.v3
-        ? "#/components/schemas/"
-        : "#/definitions/";
+    const expectedPrefix = context.v3 ? "#/components/schemas/" : "#/definitions/";
     if (!ref.startsWith(expectedPrefix)) {
         throw new Error(`TODO: unexpected reference ${ref} in schema.`);
     }
     const schemaName = ref.substring(expectedPrefix.length);
     const schema = context.schemas[schemaName];
+
     return {
         name: `${context.serviceName}_types.${cdsName(schemaName)}`,
         schema,
@@ -633,11 +632,50 @@ function betterType(currentType, schema) {
 // }
 
 function structElements(context, type, schema) {
+    checkCircularReference(schema);
+    const schemaName = Object.keys(context.schemas).find(key => context.schemas[key] === schema);
+    const refPath = `#/components/schemas/${schemaName}`;
     //TODO: interpret "required"
     for (const [prop, propSchema] of Object.entries(schema.properties || {})) {
         const name = cdsName(prop);
+        //to detect recursive data types
+        if ((propSchema?.$ref === refPath) || (propSchema?.items?.$ref === refPath)) {
+            console.warn(`Recursive data type detected: ${schemaName} for the property ${name}`);
+        }
         //TODO: check if property "name" already exists and has identical cdsType, warn otherwise
         type.elements[name] = cdsType(context, propSchema);
         if (name !== prop) type.elements[name]["@openapi.name"] = prop;
     }
-}
+}
+
+// function to check circular references and throw error if found
+function checkCircularReference(schema, visited = new Set()) {
+    if (schema.$ref) {
+        const ref = schema.$ref;
+        if (visited.has(ref)) {
+            console.warn(`Circular reference detected: ${ref}`);
+        }
+        visited.add(ref);
+    }
+    
+    if (schema.allOf) {
+        schema.allOf.forEach(subSchema => checkCircularReference(subSchema, visited));
+    }
+    
+    if (schema.anyOf) {
+        schema.anyOf.forEach(subSchema => checkCircularReference(subSchema, visited));
+    }
+    
+    if (schema.oneOf) {
+        schema.oneOf.forEach(subSchema => checkCircularReference(subSchema, visited));
+    }
+    
+    if (schema.properties) {
+        Object.values(schema.properties).forEach(subSchema => checkCircularReference(subSchema, visited));
+    }
+    
+    if (schema.items) {
+        checkCircularReference(schema.items, visited);
+    }
+}
+

package/lib/init/merge.js

@@ -162,8 +162,8 @@ async function _mergeYAML(into, from, project, semantics = {}) {
 
     let collectionStack = [target.contents]
 
-    const _getProperty = (object, keyPath) => keyPath.split('.').reduce((p, k) => p && p[k], object)
-    const _getYAMLProperty = (object, keyPath) => keyPath.split('.').reduce((p, k) => p && p.get(k), object)
+    const _getProperty = (object, keyPath) => keyPath.split('.').filter(k => k).reduce((p, k) => p && p[k], object)
+    const _getYAMLProperty = (object, keyPath) => keyPath.split('.').filter(k => k).reduce((p, k) => p && p.get(k), object)
 
     const _validateWhere = (node, dict, index) => {
         const _addToMap = entries => entries?.filter(entry => {

package/lib/init/mvn.js

@@ -17,8 +17,8 @@ module.exports.add = async function (feature) {
     if (javaMvn) _scan(javaMvn).forEach(([k,v]) => params.set(k,v))
     const archetypeVersion = params.get('-DarchetypeVersion') ?? MAVEN_ARCHETYPE_VERSION
     if (feature === HANA) { // REVISIT: compat for HANA until -Dfeature HANA is provided by Java
-        params.set(`com.sap.cds:cds-maven-plugin:${archetypeVersion}:addTargetPlatform`)
-        params.set(`-DtargetPlatform`, `cloudfoundry`) // REVISIT: Should get rid of CF dependency for Kyma scenarios
+        params.set(`com.sap.cds:cds-maven-plugin:${archetypeVersion}:add`)
+        params.set(`-Dfeature`, `CF`) // REVISIT: Should get rid of CF dependency for Kyma scenarios
     } else {
         params.set(`com.sap.cds:cds-maven-plugin:${archetypeVersion}:add`)
         params.set(`-Dfeature`, feature)