@sap/cds-dk 8.3.0 → 8.4.0

package/CHANGELOG.md

@@ -7,6 +7,32 @@ 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
@@ -27,8 +53,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 +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.
@@ -145,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.
@@ -275,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`.
@@ -377,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.
@@ -659,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.
@@ -709,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
 
@@ -732,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
@@ -1215,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.
@@ -1412,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.
@@ -1549,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))
           }
         }
@@ -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_

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/deploy/to-hana/hana.js

@@ -38,7 +38,7 @@ module.exports = new class HanaDeployer {
   async deploy(options = {}) {
     let { model, serviceName: pServiceName, tunnelAddress, vcapFile, undeployWhitelist, hdiOptions = {}, dry, storeCredentials } = options;
 
-    options.for = options.for || 'hybrid';
+    options.for ??= 'hybrid';
 
     if (model) {
       throw `Specifying a CDS model for HANA deployment is not supported.
@@ -168,7 +168,7 @@ Therefore, specifying the CDS model is not required when calling 'cds deploy'.`;
     console.log(`Using container ${bold(cfServiceInstanceName)}`);
 
     const cfConfig = cfServiceInstanceMta?.parameters?.config;
-    const serviceInstance = await this.createHanaService(cfServiceInstanceName, cfConfig);
+    const serviceInstance = await cfUtil.getOrCreateService('hana', 'hdi-shared', cfServiceInstanceName, cfConfig);
 
     const cfServiceInstanceKeyName = serviceKeyName ?? `${cfServiceInstanceName}-key`;
     let credentials = await cfUtil.getOrCreateServiceKey(serviceInstance, cfServiceInstanceKeyName, { permissions: 'development' });
@@ -182,25 +182,6 @@ Therefore, specifying the CDS model is not required when calling 'cds deploy'.`;
     return { cfServiceInstanceName, cfServiceInstanceKeyName, serviceKey: credentials, serviceInstance }
   }
 
-
-  async createHanaService(instanceName, cfConfig) {
-    // hana or hanatrial, error if neither found
-    try {
-      return await cfUtil.getOrCreateService('hana', 'hdi-shared', instanceName, cfConfig);
-    } catch (error) {
-      if (error.command && /offering .* not found/i.test(error.command.stderr)) {
-        console.log(`Falling back to 'hanatrial'`);
-        return await cfUtil.getOrCreateService('hanatrial', 'hdi-shared', instanceName, cfConfig);
-      }
-      else if (error.command && /no database/i.test(error.command.stderr)) {
-        console.log(`No database connected to 'hana' service. Falling back to 'hanatrial'`);
-        return await cfUtil.getOrCreateService('hanatrial', 'hdi-shared', instanceName, cfConfig);
-      }
-      throw error;
-    }
-  }
-
-
   _validateCredentials(credentials, cfServiceInstanceKey) {
     if (!credentials) {
       throw `Could not create service key ${bold(cfServiceInstanceKey)}.`;

package/lib/env/schemas/cds-rc.js

@@ -131,6 +131,141 @@ module.exports = {
                     }
                 },
 
+                import: {
+                    type: "object",
+                    description: "Set CDS import configurations.",
+                    additionalProperties: false,
+                    properties: {
+                        as: {
+                            type: "string",
+                            description: "Converts the input file into one of these supported formats: cds, csn or json.",
+                            $ref: "#/$defs/import-options/as"
+                        },
+                        from: {
+                            type: "string",
+                            description: "Imports the model from the one of the given options: edmx, openapi or asyncapi.",
+                            $ref: "#/$defs/import-options/from"
+                        },
+                        force: {
+                            type: "boolean",
+                            description: "Forcefully overwrites the contents in the CDS file and updates the checksum",
+                        },
+                        no_save: {
+                            type: "boolean",
+                            description: "Skips updating ./package.json.",
+                        },
+                        out: {
+                            type: "string",
+                            description: "Output file written to the specified location."
+                        },
+                        dry: {
+                            type: "boolean",
+                            description: "Writes the converted csn to stdout only.",
+                        },
+                        keepNamespace: {
+                            type: "boolean",
+                            description: "Keeps the original namespace from the edmx content instead of using the filename by default.",
+                            default: false
+                        },
+                        includeNamespaces: {
+                            type: "string",
+                            description: "Imports only entities matching to the given list of namespaces."
+                        }
+                    }
+                },
+                
+                export: {
+                    type: "object",
+                    description: "Customize cds compile settings",
+                    additionalProperties: false,
+                    properties: {
+                        asyncapi: {
+                            type: "object",
+                            description: "AsyncAPI settings for cds compile",
+                            additionalProperties: false,
+                            properties: {
+                                application_namespace: {
+                                    type: "string",
+                                    description: "The registered namespace of the application"
+                                },
+                                merged: {
+                                    type: "object",
+                                    description: "properties that needs to be there when merged option is used",
+                                    additionalProperties: false, 
+                                    properties: {
+                                        title: {
+                                            type: "string",
+                                            description: "Title to be used for merged doc"
+                                        },
+                                        version: {
+                                            type: "string",
+                                            description: "Version to be used for merged doc"
+                                        },
+                                        short_text: {
+                                            type: "string",
+                                            description: "Short decription of the AsyncAPIs"
+                                        },
+                                        description: {
+                                            type: "string",
+                                            description: "Description to be used for the merged doc"
+                                        }
+                                    }
+                                },
+                                event_spec_version: {
+                                    type: "string",
+                                    description: "Mentions the version of AsyncAPI spec"
+                                },
+                                event_source: {
+                                    type: "string",
+                                    description: "Event source information",
+                                    default: "{region}/{applicationNamespace}/{instanceId}",
+                                },
+                                event_source_params: {
+                                    type: "object",
+                                    description: "Parameters related to the source of event",
+                                    default: {
+                                        region: {
+                                        "description": "The regional context of the application.",
+                                        "schema": {
+                                            "type": "string"
+                                        }
+                                        },
+                                        applicationNamespace: {
+                                        "description": "The registered namespace of the application.",
+                                        "schema": {
+                                            "type": "string"
+                                        }
+                                        },
+                                        instanceId: {
+                                        "description": "The instance id (tenant, installation, ...) of the application.",
+                                        "schema": {
+                                            "type": "string"
+                                        }
+                                        }
+                                    },
+                                    additionalProperties: false,
+                                    region: {
+                                        type: "string",
+                                        description: "The regional context of the application"
+                                    },
+                                    applicationNamespace: {
+                                        type: "string",
+                                        description: "The registered namespace of the application"
+                                    },
+                                    instanceId: {
+                                        type: "string",
+                                        description: "The instance id (tenant, installation, ...) of the application."
+                                    }
+                                },
+                                event_characteristics: {
+                                    type: "object",
+                                    description: "The characteristics defined for events",
+                                    additionalProperties: true
+                                }
+                            }
+                        }
+                    }
+                },
                 // deploy specific schema
                 deploy: {
                     type: "object",
@@ -164,7 +299,8 @@ module.exports = {
                 "mtx-extension",
                 "mtx",
                 "node-cf",
-                "java-cf"
+                "java-cf",
+                "helm"
             ],
             enumDescriptions: [
                 "Node.js build plugin",
@@ -174,7 +310,8 @@ module.exports = {
                 "MTX extension build plugin",
                 "MTX build plugin",
                 "Node.js Cloud Foundry build plugin",
-                "Java Cloud Foundry build plugin"
+                "Java Cloud Foundry build plugin",
+                "Helm chart build plugin"
             ]
         },
 
@@ -193,6 +330,41 @@ module.exports = {
                     }
                 }
             ]
+        },
+
+        import_options: {
+            from: {
+                oneOf: [
+                    {
+                        const: "asyncapi",
+                        description: "AsyncAPI specification"
+                    },
+                    {
+                        const: "edmx",
+                        description: "OData specification"
+                    },
+                    {
+                        const: "openapi",
+                        description: "OpenAPI specification"
+                    }
+                ]
+            },
+            as: {
+                oneOf: [
+                    {
+                        const: "cds",
+                        description: "Converts the input file into cds format"
+                    },
+                    {
+                        const: "csn",
+                        description: "Converts the input file into csn format"
+                    },
+                    {
+                        const: "json",
+                        description: "Converts the input file into json format"
+                    }
+                ]
+            }
         }
     }
 }

package/lib/import/asyncapi/parserContext.js

@@ -6,12 +6,11 @@ module.exports = class ParserContext {
      * @constructor
      */
     constructor(content) {
-        this.topics = this.getTopics(content);
         this.services = this.getServicesFromContent(content);
     }
 
-    getTopicName(channelName) {
-        return channelName.startsWith('ce/') ? channelName.substring(3) : channelName;
+    getTopicName(eventName) {
+        return eventName.startsWith('ce/') ? eventName.substring(3) : eventName;
     }
 
     getEventName(messageRefString) {
@@ -19,28 +18,6 @@ module.exports = class ParserContext {
         return lastSlashIndex == -1 ? '' : messageRefString.substring(lastSlashIndex + 1);
     }
 
-    /**
-     * Return an obect with topic annotations for messages
-     */
-    getTopics(content) {
-        const topics = {};
-
-        Object.entries(content.channels).forEach(([key, value]) => {
-            const topic = this.getTopicName(key);
-            if (value.subscribe && value.subscribe.message && value.subscribe.message.$ref) {
-                const event = this.getEventName(value.subscribe.message.$ref);
-                topics[event] = topic;
-            }
-
-            if (value.publish && value.publish.message && value.publish.message.$ref) {
-                const event = this.getEventName(value.publish.message.$ref);
-                topics[event] = topic;
-            }
-        });
-
-        return topics;
-    }
-
     /**
      * Returns services from the asyncapi json object along with the events and annotations.
      * @returns an object with all the services.
@@ -49,7 +26,7 @@ module.exports = class ParserContext {
         const services = {};
         const serviceAnnotations = this.getServiceAnnotations(content);
 
-        Object.entries(content.components.messages).forEach(([key, value]) => {
+        Object.entries(content.components.messages).forEach(([, value]) => {
             let eventName;
             // Message name should be used to capture the event name
             if (value.name) {
@@ -71,10 +48,7 @@ module.exports = class ParserContext {
             const eventAnnotations = this.getEventAnnotations(value);
 
             // add topic annotation
-            if (this.topics[key]) {
-                eventAnnotations['@topic'] = this.topics[key];
-            }
-
+            eventAnnotations['@topic'] = this.getTopicName(eventName);
             let properties = {};
             let types = {};