@sap/cds-dk 9.9.2 → 10.0.3

package/lib/watch/vite-watch.js

@@ -1,4 +1,4 @@
-const cds = require('../../lib/cds')
+const cds = require('../cds')
 const { pathToFileURL } = require('node:url')
 const { path, stat, readdir, isdir, colors: { BOLD, RESET } } = cds.utils
 
@@ -7,7 +7,7 @@ let hmrPort = 24100
 async function hasViteConfig(appPath) {
   for (const name of ['vite.config.js', 'vite.config.mjs', 'vite.config.ts']) {
     const file = await stat(path.join(appPath, name)).catch(e => e.code === 'ENOENT' ? null : Promise.reject(e))
-    return !!file
+    if (file) return true
   }
   return false
 }
@@ -16,13 +16,20 @@ async function findViteApps() {
   const app = cds.env.folders.app
   const apps = []
   if (!isdir(app)) return apps
+  const appRoot = path.join(cds.root, app)
+  // Single-UI scenario: a vite project sits directly in app/
+  if (await hasViteConfig(appRoot)) {
+    apps.push({ name: '', path: appRoot, root: true })
+    return apps
+  }
+  // Multi-UI scenario: each sub-folder of app/ may be a vite project
   const entries = await readdir(app)
   for (const entry of entries) {
     const appName = typeof entry === 'string' ? entry : entry.name
     if (!appName) continue
-    const appPath = path.join(cds.root, app, appName)
+    const appPath = path.join(appRoot, appName)
     if (!isdir(appPath)) continue
-    if (await hasViteConfig(appPath)) apps.push({ name: appName, path: appPath })
+    if (await hasViteConfig(appPath)) apps.push({ name: appName, path: appPath, root: false })
   }
   return apps
 }
@@ -39,6 +46,16 @@ async function loadCreateServer(fromPath) {
   throw `[cds] - Found Vite app in ${relative}, but package "vite" is not installed. Run ${BOLD}npm install vite --prefix ${relative}${RESET} to install it.`
 }
 
+function collectServicePrefixes() {
+  const prefixes = new Set(['/-/', '/$batch', '/$metadata', '/health', '/favicon.ico'])
+  for (const srv of cds.service.providers || []) {
+    for (const ep of srv.endpoints || []) {
+      if (ep.path) prefixes.add(ep.path.endsWith('/') ? ep.path : ep.path + '/')
+    }
+  }
+  return [...prefixes]
+}
+
 cds.on('bootstrap', app => {
 
   let viteMiddleware = null
@@ -61,15 +78,23 @@ cds.on('bootstrap', app => {
     }
 
     for (const viteApp of viteApps) {
-      const base = normalizeBase(viteApp.name)
+      const base = viteApp.root ? '/' : normalizeBase(viteApp.name)
       const server = await createServer({ base, root: viteApp.path, server: { middlewareMode: true, hmr: { port: hmrPort++ } }})
-      viteServers.push({ base, middlewares: server.middlewares })
+      viteServers.push({ base, root: viteApp.root, middlewares: server.middlewares })
     }
 
+    const servicePrefixes = collectServicePrefixes()
+    const isServiceRoute = url => servicePrefixes.some(p => url === p.replace(/\/$/, '') || url.startsWith(p))
+
     viteMiddleware = (req, res, next) => {
       const url = req.url || ''
-      const match = viteServers.find(v => url.startsWith(v.base) || url.startsWith('/@'))
-      if (match) return match.middlewares(req, res, next)
+      if (isServiceRoute(url)) return next()
+      // Sub-folder vite apps: match by base prefix
+      const sub = viteServers.find(v => !v.root && (url.startsWith(v.base) || url.startsWith('/@')))
+      if (sub) return sub.middlewares(req, res, next)
+      // Root vite app handles everything else; vite calls next() for unknown files
+      const root = viteServers.find(v => v.root)
+      if (root) return root.middlewares(req, res, next)
       next()
     }
   })

package/lib/watch/watcher.js

@@ -46,6 +46,32 @@ module.exports = function watch(paths, { filter, ignore, hotReload } = {}) {
 
   const useNativeRecursive = process.platform === 'darwin' || process.platform === 'win32'
   if (useNativeRecursive) {
+    // On Windows, ReadDirectoryChangesW fires FILE_NOTIFY_CHANGE events for mere
+    // file opens (antivirus, search indexer, TypeScript loaders) without a write
+    // having occurred, causing spurious server restarts.  Guard by confirming
+    // mtime actually changed before emitting 'change'.  The cache is seeded on
+    // the first event for each path so buffered pre-startup events are suppressed.
+    // Mac uses kqueue/FSEvents which only fires on real writes — no guard needed.
+    const _mtimes = process.platform === 'win32' ? new Map() : null
+    const _watcherStart = _mtimes && Date.now()
+    const _changedOnDisk = _mtimes
+      ? async fullPath => {
+        try {
+          const { mtimeMs } = await fs.promises.stat(fullPath)
+          const prev = _mtimes.get(fullPath)
+          _mtimes.set(fullPath, mtimeMs)
+          if (prev === undefined) return false          // first event: seed cache, suppress
+          if (prev === mtimeMs) return false            // mtime unchanged: read-only open
+          if (mtimeMs < _watcherStart) return false    // older than watcher: buffered OS event
+          return true
+        } catch (err) {
+          _mtimes.delete(fullPath)
+          if (err.code !== 'ENOENT' && err.code !== 'ENOTDIR') throw err
+          return true  // stat failed (deleted file): let it through
+        }
+      }
+      : () => true  // non-Windows: always emit
+
     const _watch = async root => {
       try {
         if (!fs.existsSync(root)) return
@@ -56,7 +82,7 @@ module.exports = function watch(paths, { filter, ignore, hotReload } = {}) {
           const fullPath = resolve(root, name)
           if (_hotReload(fullPath)) {
             ee.emit('refreshModel', fs.existsSync(fullPath) ? 'update' : 'remove', fullPath)
-          } else if (_allow(fullPath) && _narrowJSONreloads(fullPath)) {
+          } else if (_allow(fullPath) && _narrowJSONreloads(fullPath) && await _changedOnDisk(fullPath)) {
             ee.emit('change', fs.existsSync(fullPath) ? 'update' : 'remove', fullPath)
           }
         }

package/node_modules/@cap-js/asyncapi/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/node_modules/@cap-js/asyncapi/README.md

@@ -0,0 +1,46 @@
+[![REUSE status](https://api.reuse.software/badge/github.com/cap-js/asyncapi)](https://api.reuse.software/info/github.com/cap-js/asyncapi)
+
+# AsyncAPI 
+
+## About this project
+
+The `@cap-js/asyncapi` is a package that provides support for AsyncAPI document compilation.
+
+### Table of Contents
+
+- [Requirements and Setup](#requirements-and-setup)
+- [Contributing](#contributing)
+- [Code of Conduct](#code-of-conduct)
+- [Licensing](#licensing)
+
+## Requirements and Setup
+
+### Installation
+
+```sh
+$ npm install @cap-js/asyncapi
+```
+
+### Usage
+
+```js
+const cds = require('@sap/cds')
+const { compile } = require('@cap-js/asyncapi')
+```
+
+```js
+const csn = await cds.load(cds.env.folders.srv)
+const asyncapiDocument = compile(csn)
+```
+
+## Contributing
+
+This project is open to feature requests/suggestions, bug reports etc. via [GitHub issues](https://github.com/cap-js/asyncapi/issues). Contribution and feedback are encouraged and always welcome. For more information about how to contribute, the project structure, as well as additional contribution information, see our [Contribution Guidelines](CONTRIBUTING.md).
+
+## Code of Conduct
+
+We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone. By participating in this project, you agree to abide by its [Code of Conduct](https://github.com/cap-js/.github/blob/main/CODE_OF_CONDUCT.md) at all times.
+
+## Licensing
+
+Copyright 2024 SAP SE or an SAP affiliate company and contributors. Please see our [LICENSE](LICENSE) for copyright and license information. Detailed information including third-party components and their licensing/copyright information is available [via the REUSE tool](https://api.reuse.software/info/github.com/cap-js/asyncapi).

package/node_modules/@cap-js/asyncapi/index.js

@@ -0,0 +1,4 @@
+
+module.exports = {
+    compile: require('./lib/compile')
+}

package/node_modules/@cap-js/asyncapi/lib/compile/channels.js

@@ -0,0 +1,18 @@
+const { getEventName, getChannelName } = require('./utils')
+
+const getChannel = eventName => ({
+    subscribe: {
+        message: {
+            $ref: '#/components/messages/' + eventName
+        }
+    }
+})
+
+const getChannels = (definitions, events) => events.reduce((channels, event) => {
+    const eventName = getEventName(event, definitions[event])
+    const channelName = getChannelName(definitions[event]) ?? eventName
+    channels[channelName] = getChannel(eventName)
+    return channels
+}, {})
+
+module.exports = getChannels

package/node_modules/@cap-js/asyncapi/lib/compile/components/messageTraits/index.js

@@ -0,0 +1,89 @@
+/**
+ * Get a map of message traits.
+ */
+module.exports = function getMessageTraits() {
+
+    return {
+        'CloudEventsContext.v1': {
+            'headers': {
+                'type': 'object',
+                'properties': {
+                    'id': {
+                        'description': 'Identifies the event.',
+                        'type': 'string',
+                        'examples': [
+                            '6925d08e-bc19-4ad7-902e-bd29721cc69b'
+                        ]
+                    },
+                    'specversion': {
+                        'description': 'The version of the CloudEvents specification which the event uses.',
+                        'type': 'string',
+                        'const': '1.0'
+                    },
+                    'source': {
+                        'description': 'Identifies the instance the event originated in.',
+                        'type': 'string',
+                        'format': 'uri-reference',
+                        'examples': [
+                            '/default/sap.s4.beh/ER9CLNT001',
+                            '/eu/sap.billing.sb/91dec60d-9757-4e2c-b9e5-21da10016fe9'
+                        ]
+                    },
+                    'type': {
+                        'description': 'Describes the type of the event related to the source the event originated in.',
+                        'type': 'string',
+                        'examples': [
+                            'sap.dsc.FreightOrder.Arrived.v1',
+                            'sap.billing.sb.Subscription.Canceled.v1'
+                        ]
+                    },
+                    'subject': {
+                        'description': 'Describes the subject of the event in the context of the source the event originated in (e.g., the id of the business object the event is about).',
+                        'type': 'string',
+                        'examples': [
+                            'ce307052-75a0-4a8f-a961-ebf21669bb80',
+                            'urn:epc:tag:sgtin-96:1.7332402.026591.1234567890'
+                        ]
+                    },
+                    'datacontenttype': {
+                        'description': 'Content type of the event data.',
+                        'type': 'string',
+                        'const': 'application/json'
+                    },
+                    'dataschema': {
+                        'description': 'Identifies the schema that the event data adheres to.',
+                        'type': 'string',
+                        'format': 'uri',
+                        'examples': [
+                            'http://example.com/event/sap.billing.sb.Subscription.Canceled/v1.2.0'
+                        ]
+                    },
+                    'time': {
+                        'description': 'Timestamp of when the occurrence happened.',
+                        'format': 'date-time',
+                        'type': 'string',
+                        'examples': [
+                            '2018-04-05T17:31:00Z'
+                        ]
+                    }
+                },
+                'required': [
+                    'id',
+                    'source',
+                    'specversion',
+                    'type'
+                ],
+                'patternProperties': {
+                    '^xsap[a-z0-9]+$': {
+                        'description': 'Application defined custom extension context attributes.',
+                        'type': [
+                            'boolean',
+                            'integer',
+                            'string'
+                        ]
+                    }
+                }
+            }
+        }
+    }
+}

package/node_modules/@cap-js/asyncapi/lib/compile/components/messages/index.js

@@ -0,0 +1,179 @@
+const { getEventName, getDescription } = require('../../utils')
+
+const annotationMapping = {
+    'EventSpecVersion': 'x-sap-event-spec-version',
+    'EventSource': 'x-sap-event-source',
+    'EventSourceParams': 'x-sap-event-source-parameters',
+    'EventCharacteristics': 'x-sap-event-characteristics',
+    'EventStateInfo': 'x-sap-stateInfo',
+    'EventSchemaVersion': 'x-sap-event-version'
+}
+
+/**
+ * Get header properties from definition.
+ */
+function getHeaderProperties(name) {
+    return { type: { const: name } }
+}
+
+function nestedAnnotation(resObj, asyncapiProperty, keys, value) {
+    if (resObj[asyncapiProperty] === undefined) {
+        resObj[asyncapiProperty] = {}
+    }
+
+    let node = resObj[asyncapiProperty]
+
+    // traverse the annotation property and define the objects if they're not defined
+    for (let nestedIndex = 1; nestedIndex < keys.length - 1; nestedIndex++) {
+        const nestedElement = keys[nestedIndex]
+        if (node[nestedElement] === undefined) {
+            node[nestedElement] = {}
+        }
+        node = node[nestedElement]
+    }
+
+    // set value annotation property
+    node[keys[keys.length - 1]] = value
+}
+
+function readAnnotations(definition, presets) {
+    let resObj = {}
+
+    for (const [key, value] of Object.entries(definition)) {
+        if (key.startsWith('@AsyncAPI') && !key.startsWith('@AsyncAPI.Extensions')) {
+            // get annotation value after @AsyncAPI
+            const annotationProperties = key.split('@AsyncAPI.')[1]
+            const keys = annotationProperties.split('.')
+
+            // convert annotation property (ex: EventSource) to asyncapi property (ex: x-sap-event-source)
+            // if annotation property isn't present in map then ignore the property
+            if (annotationMapping[keys[0]] === undefined) continue
+
+            const asyncapiProperty = annotationMapping[keys[0]]
+
+            // if there's no nesting then just set the value
+            if (keys.length === 1) {
+                resObj[asyncapiProperty] = value
+            } else {
+                nestedAnnotation(resObj, asyncapiProperty, keys, value)
+            }
+        }
+
+        else if (key.startsWith('@AsyncAPI.Extensions')) {
+            const annotationProperties = key.split('@AsyncAPI.Extensions.')[1]
+            const keys = annotationProperties.split('.')
+            keys[0] = 'x-' + keys[0]
+
+            if (keys.length === 1) {
+                // if the key is already present, that means, Annotations have already been considered
+                if (resObj[keys[0]]) continue
+                // else we populate
+                resObj[keys[0]] = value
+            } else {
+                nestedAnnotation(resObj, keys[0], keys, value)
+            }
+        }
+    }
+
+    for (const [key, value] of Object.entries(presets)) {
+        if (resObj[key] === undefined) {
+            resObj[key] = value
+        }
+    }
+
+    addDefaults(resObj)
+    return resObj
+}
+
+function addDefaults(obj) {
+    const defaults = {
+        'x-sap-event-source': '/{region}/{applicationNamespace}/{instanceId}',
+        'x-sap-event-source-parameters': {
+            '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'
+                }
+            }
+        }
+    }
+
+    for (const [key, value] of Object.entries(defaults)) {
+        if (!obj[key]) {
+            obj[key] = value
+        }
+    }
+}
+
+/**
+ * Get message for the event definition.
+ */
+function eventToMessage(definition, name, presets, i18nBundle) {
+    let obj = readAnnotations(definition, presets)
+
+    let messageObj = {
+        name,
+        headers: {
+            type: 'object',
+            properties: getHeaderProperties(name)
+        },
+        payload: {
+            $ref: `#/components/schemas/${name}`
+        },
+        traits: [
+            {
+                $ref: '#/components/messageTraits/CloudEventsContext.v1'
+            }
+        ]
+    }
+
+    // Add description if available
+    const description = getDescription(definition, i18nBundle)
+    if (description) {
+        messageObj.description = description
+    }
+
+    const message = { ...obj, ...messageObj}
+
+    return message
+}
+
+/**
+ * Event definitions of one CSN to messages.
+ */
+function entriesToMessages(definitions, events, presets, i18nBundle) {
+    const messages = {}
+
+    events.forEach(event => {
+        let name = getEventName(event, definitions[event])
+        messages[name] = eventToMessage(definitions[event], name, presets, i18nBundle)
+    })
+
+    return messages
+}
+
+/**
+ * Combining the definition objects from CSN into one schema
+ */
+function definitionsToMessages(definitions, events, presets, i18nBundle) {
+    const messages = {}
+    Object.assign(messages, entriesToMessages(definitions, events, presets, i18nBundle))
+    return messages
+}
+
+module.exports = {
+    definitionsToMessages,
+    nestedAnnotation
+}