@sap/cds-dk 7.9.6 → 8.0.3

package/lib/build/provider/internalBuildPlugin.js

@@ -1,42 +1,33 @@
 const fs = require('fs')
 const path = require('path')
 const cds = require('../../cds')
-const BuildPlugin = require('../buildPlugin')
-const { hasOptionValue } = require('../util')
-const { FOLDER_GEN } = require('../constants')
+const Plugin = require('../plugin')
+const { hasOptionValue, getFiles } = require('../util')
+const { FOLDER_GEN, DEFAULT_BUILTIN_PRIORITY_MAX } = require('../constants')
 
-class InternalBuildPlugin extends BuildPlugin {
+class InternalBuildPlugin extends Plugin {
     /**
-     * Custom build plugins are executed before internal build plugins in order
-     * ensure and content cannot be overwritten by mistake.
+     * By default custom build plugins are executed before internal build plugins
+     * to ensure built-in plugin content isn't overwritten by mistake.
      */
     get priority() {
-        return InternalBuildPlugin.PRIORITY_MAX_VALUE
+        return DEFAULT_BUILTIN_PRIORITY_MAX / 2
     }
 
-    init() { 
+    init() {
         // REVISIT: no default gen folder for now
     }
 
     async clean() {
+        function _isSubDirectory(parent, child) {
+            return !path.relative(parent, child).startsWith('..')
+        }
         // build results are deleted by the BuildTaskEngine if the build.target !== '.'
         // make sure that src is not a subfolder of dest
-        if (cds.env.build.target === '.' && this.task.src !== this.task.dest && !this._isSubDirectory(this.task.dest, this.task.src)) {
+        if (cds.env.build.target === '.' && this.task.src !== this.task.dest && !_isSubDirectory(this.task.dest, this.task.src)) {
             await fs.promises.rm(this.task.dest, { force: true, recursive: true })
         }
     }
-    /**
-     * Maximum allowed priority for internal build tasks.
-     */
-    static get PRIORITY_MAX_VALUE() {
-        return 0;
-    }
-    /**
-     * Minimum allowed priority for custom build tasks.
-     */
-    static get PRIORITY_MIN_VALUE() {
-        return Number.MIN_SAFE_INTEGER;
-    }
 
     /**
      * Called by the framework after {@link #init()}, used to perform more elaborate preparation.
@@ -52,16 +43,6 @@ class InternalBuildPlugin extends BuildPlugin {
         return false
     }
 
-    /**
-     * Returns whether cds env has a property with the specified value.
-     * If the value is omitted the existence of the given property name is checked.
-     * @param {string} qualifiedName
-     * @param {any=} value
-     */
-    hasCdsEnvOption(qualifiedName, value) {
-        return hasOptionValue(cds.env.get(qualifiedName), value)
-    }
-
     /**
      * Determines whether the given build option value has been set for this build task.
      * If the value is omitted, the existence of the given property name is checked.
@@ -80,14 +61,6 @@ class InternalBuildPlugin extends BuildPlugin {
         return super._getBuildOption(qualifiedName)
     }
 
-    /**
-    * Returns a list of CDS model files defining the transitive closure of the CDS model based on the model options
-    * defined for this build task.
-    */
-    resolveModel() {
-        return this._resolveModel()
-    }
-
     /**
      * Returns whether the build results of this build plugin are created inplace
      * or in a separate staging folder which is not part of the build tasks src folder.
@@ -97,13 +70,30 @@ class InternalBuildPlugin extends BuildPlugin {
     }
 
     async copyNativeContent(srcDir, destDir, customFilter) {
-        const files = InternalBuildPlugin._find(srcDir, (src) => {
+        function commonStagingBuildFilter(src, destDir) {
+            if (typeof src !== "string" || typeof destDir !== "string") {
+                return false
+            }
+            if (!fs.statSync(src).isDirectory()) {
+                return true //file
+            }
+            if (src === destDir) {
+                return false
+            }
+            const regex = new RegExp(FOLDER_GEN + "\\b")
+            if (src === path.resolve(cds.root, cds.env.build.target)) {
+                return false
+            }
+            return !regex.exec(path.basename(src))
+        }
+
+        const files = getFiles(srcDir, (src) => {
             // do not copy files that:
             // - from 'cds.env.build.target'
             // - from 'dest'
             // - from some generation folder
-            // - do not match filter function
-            return this._commonStagingBuildFilter(src, destDir) && (!customFilter || customFilter.call(this, src))
+            // - do not match filter function ,
+            return commonStagingBuildFilter(src, destDir) && (!customFilter || customFilter.call(this, src))
         })
         return Promise.all(
             files.map((srcFile) => {
@@ -165,60 +155,5 @@ class InternalBuildPlugin extends BuildPlugin {
         }
         return null
     }
-
-    _isSubDirectory(parent, child) {
-        return !path.relative(parent, child).startsWith('..')
-    }
-
-    _commonStagingBuildFilter(src, destDir) {
-        if (typeof src !== "string" || typeof destDir !== "string") {
-            return false
-        }
-        if (!fs.statSync(src).isDirectory()) {
-            return true //file
-        }
-        if (src === destDir) {
-            return false
-        }
-        const regex = new RegExp(FOLDER_GEN + "\\b")
-        if (src === path.resolve(cds.root, cds.env.build.target)) {
-            return false
-        }
-        return !regex.exec(path.basename(src))
-    }
-
-    static _find(srcDir, filter) {
-        const files = []
-        this._traverseFileSystem(srcDir, files, filter)
-        return files;
-    }
-
-    static _traverseFileSystem(srcDir, files, filter) {
-        let entries = []
-        try {
-            entries = fs.readdirSync(srcDir)
-        } catch (e) {
-            // ignore if not existing
-        }
-        entries.map(subDirEntry => path.join(srcDir, subDirEntry)).forEach((entry) => {
-            this._handleResource(entry, files, filter)
-        })
-    }
-
-    static _handleResource(entry, files, filter) {
-        if (!filter || filter.call(this, entry)) {
-            var stats = this._getResourceStatus(entry)
-            if (stats.isDirectory()) {
-                this._traverseFileSystem(entry, files, filter)
-            } else if (stats.isFile() || stats.isSymbolicLink()) {
-                files.push(entry)
-            }
-        }
-    }
-
-    // for testing purposes
-    static _getResourceStatus(entry) {
-        return fs.lstatSync(entry)
-    }
 }
 module.exports = InternalBuildPlugin

package/lib/build/provider/internalBuildTaskProvider.js

@@ -4,25 +4,14 @@ const cds = require('../../cds')
 const { hasJavaNature, getDefaultModelOptions, BuildError, hasOptionValue, normalizePath } = require('../util')
 const BuildTaskProvider = require('../buildTaskProvider')
 const { FILE_EXT_CDS, BUILD_TASK_HANA, BUILD_TASK_FIORI, BUILD_TASK_JAVA, BUILD_TASK_JAVA_CF, BUILD_TASK_NODEJS, BUILD_TASK_NODE_CF, BUILD_TASK_MTX,
-    BUILD_TASK_PREFIX, BUILD_TASKS, BUILD_TASK_MTX_SIDECAR, MTX_SIDECAR_FOLDER, BUILD_TASK_MTX_EXTENSION, NODEJS_MODEL_EXCLUDE_LIST,
-    IGNORE_DEFAULT_MODELS, CONTENT_WS } = require("../constants")
+    BUILD_TASKS, BUILD_TASK_MTX_SIDECAR, MTX_SIDECAR_FOLDER, BUILD_TASK_MTX_EXTENSION, NODEJS_MODEL_EXCLUDE_LIST,
+    IGNORE_DEFAULT_MODELS, OPTION_WS } = require("../constants")
 const ResourcesTarBuilder = require('./mtx/resourcesTarBuilder')
 const DEBUG = cds.debug('cli|build')
 
 class InternalBuildTaskProvider extends BuildTaskProvider {
-    constructor() {
-        super()
-        // ensure that classic mtx is not used in combination with cds-dk@7
-        if (InternalBuildTaskProvider._isClassicMtx()) {
-            throw new BuildError(`@sap/cds-mtx is deprecated and not supported by @sap/cds-dk >= 7.
-Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/docs/guides/multitenancy/old-mtx-migration or install @sap/cds-dk version 6 instead.`)
-        }
-    }
-
     providesTask(key) {
-        return BUILD_TASKS.includes(key.for) || key.use && key.use.startsWith(BUILD_TASK_PREFIX)
-        // REVISIT: do not support different build task implementations of the same build task ID defined by 'for'
-        // return (BUILD_TASKS.includes(key.for) && !key.use) || (key.use && key.use.startsWith(BUILD_TASK_PREFIX))
+        return BUILD_TASKS.includes(key.for)
     }
 
     async lookupTasks(tasks, dependencies) {
@@ -30,10 +19,6 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
     }
 
     async applyTaskDefaults(task) {
-        const taskFor = InternalBuildTaskProvider._getForValueFromTask(task)
-        task.for = task.for || taskFor
-        task.use = task.use || `${BUILD_TASK_PREFIX}/${taskFor}`
-
         // src folder needs to be initialized first
         InternalBuildTaskProvider._setDefaultSrcFolder(task)
 
@@ -41,7 +26,7 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
     }
 
     getPlugin(task) {
-        return require(`./${InternalBuildTaskProvider._getForValueFromTask(task)}`)
+        return require(`./${task.for}`)
     }
 
     async _createTasks(tasks, dependencies) {
@@ -202,7 +187,7 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
             }
 
             // mtxs nodejs app without sidecar
-            if (!InternalBuildTaskProvider._hasJavaNature(src)) {
+            if (!hasJavaNature()) {
                 DEBUG?.("MTX Nodejs app without sidecar")
                 return {
                     for: BUILD_TASK_MTX,
@@ -218,7 +203,7 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
             return null
         }
         let task = null
-        if (InternalBuildTaskProvider._hasJavaNature(src)) {
+        if (hasJavaNature()) {
             task = this._createJavaTask(src, taskOptions)
         } else {
             task = this._createNodeTask(src, taskOptions)
@@ -243,6 +228,9 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
 
     _createNodeTask(src, taskOptions) {
         DEBUG?.("found implementation technology Nodejs")
+        if (!fs.existsSync(path.join(cds.root, 'package.json'))) {
+            throw new BuildError(`No 'package.json' found in project root folder '${cds.root}'`)
+        }
         return {
             src: src,
             for: BUILD_TASK_NODEJS,
@@ -254,17 +242,6 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
         return !!cds.env.extends
     }
 
-    static _isClassicMtx() {
-        function _hasMtxDependency() {
-            try {
-                return !!require(path.join(cds.root, 'package.json'))?.dependencies?.['@sap/cds-mtx']
-            } catch (e) {
-                return false
-            }
-        }
-        return /true/i.test(process.env.OLD_MTX) || _hasMtxDependency()
-    }
-
     /**
      * Distinguishes whether the Nodejs project is a Streamlined MTX (cds >=6) or an old MTX project.
      */
@@ -303,14 +280,14 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
                 task.src ||= normalizePath(cds.env.folders.srv)
                 break
             default:
-                throw new Error(`Unknown build task '${task.use || task.for}'`)
+                throw new Error(`Unknown build task '${task.for}'`)
         }
     }
 
     static async _setDefaultModel(task) {
-        const ws = hasOptionValue(task.options?.[CONTENT_WS], true) || cds.cli.options?.ws
+        const ws = hasOptionValue(task.options?.[OPTION_WS], true) || cds.cli.options?.[OPTION_WS]
         // REVISIT: filter nodejs bootstrap service models for Java - issues/12770#issuecomment-1805719
-        const filter = this._hasJavaNature() ? (m) => !NODEJS_MODEL_EXCLUDE_LIST.includes(m) : null
+        const filter = hasJavaNature() ? (m) => !NODEJS_MODEL_EXCLUDE_LIST.includes(m) : null
         let taskModelPaths = task.options?.model
         if (taskModelPaths && !Array.isArray(taskModelPaths)) {
             taskModelPaths = [taskModelPaths]
@@ -336,19 +313,6 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
         }
     }
 
-    /**
-     * Returns whether this project is a java project or not.
-     * @param {string} srv - the folder name of the service module
-     */
-    static _hasJavaNature(srv = cds.env.folders.srv) {
-        srv = this._getModuleFolder(Array.isArray(srv) ? srv : [srv])
-        return hasJavaNature([cds.root, srv && path.join(cds.root, srv)])
-    }
-
-    static _getForValueFromTask(task) {
-        return task.for ? task.for : task.use && task.use.substring(BUILD_TASK_PREFIX.length + 1)
-    }
-
     /**
      * Determines the module folder from the given list that may represent files or folders w or w/o .cds file extension.
      * @param {Array} filesOrFolders

package/lib/build/provider/java/index.js

@@ -24,9 +24,8 @@ class JavaBuildPlugin extends EdmxBuildPlugin {
         await this._compileForJava(model, compileDest)
 
         if (!this.hasBuildOption(CONTENT_EDMX, false)) {
-            // generate edmx files containing all features
-            // REVISIT: localized edmx for backward compatibility
-            if (!this.hasBuildOption(CONTENT_LOCALIZED_EDMX, false)) {
+            // generate edmx files containing all features - localized edmx for backward compatibility
+            if (this.hasBuildOption(CONTENT_LOCALIZED_EDMX, true)) {
                 await this.compileToEdmx(model, compileDest, { [FLAVOR_LOCALIZED_EDMX]: true })
             }
             // non-localized edmx

package/lib/build/provider/mtx/index.js

@@ -1,4 +1,4 @@
-/* eslint-disable no-empty */
+ 
 const fs = require('fs')
 const path = require('path')
 const cds = require('../../../cds')
@@ -9,16 +9,17 @@ const { BuildError } = require('../../util')
 
 class MtxBuildPlugin extends EdmxBuildPlugin {
     get priority() {
-        // should be scheduled after 'hana' build tasks are finished
-        return EdmxBuildPlugin.PRIORITY_MIN_VALUE
+        // must run after 'hana' build task
+        return super.priority - 10
     }
+
     init() {
         super.init()
 
         // this build task only supports nodejs mtxs apps without sidecar
         if (cds.env['project-nature'] === 'java') {
             throw new BuildError(`@sap/cds-mtx is deprecated and not supported by @sap/cds-dk >= 7. This also applies to the 'mtx' build task in Java projects.
-Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/docs/guides/multitenancy/old-mtx-migration or install @sap/cds-dk version 6 instead.`)
+Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/docs/guides/multitenancy/old-mtx-migration.`)
         }
     }
 

package/lib/build/provider/mtx-extension/index.js

@@ -133,8 +133,11 @@ class MtxExtensionBuildPlugin extends InternalBuildPlugin {
     }
 
     static _getSaasPkgPath() {
+        if (!cds.env.extends) {
+            throw new BuildError(`Missing configuration 'cds.extends' in package.json`)
+        }
         // cds.env.extends holds the SaaS app package name, also if the extends field is defined on root level
-        let saasPkgPath = this._getWorkspacePath(cds.env.extends || '_base')
+        let saasPkgPath = this._getWorkspacePath(cds.env.extends)
         if (!saasPkgPath) {
             // older projects might not have a workspace definition
             saasPkgPath = this._getNodeModulesPath(saasPkgPath)
@@ -156,7 +159,7 @@ class MtxExtensionBuildPlugin extends InternalBuildPlugin {
     }
 
     static _getNodeModulesPath() {
-        const saasPkgPath = path.join(cds.root, 'node_modules', cds.env.extends || '_base')
+        const saasPkgPath = path.join(cds.root, 'node_modules', cds.env.extends)
         if (!fs.existsSync(saasPkgPath)) {
             throw new BuildError(`The SaaS application base model is missing. Did you execute 'cds pull' and 'npm install'?`)
         }

package/lib/build/provider/mtx-sidecar/index.js

@@ -12,8 +12,8 @@ const DEFAULT_MAIN_FOLDER = "_main"
 
 class MtxSidecarBuildPlugin extends NodejsBuildPlugin {
     get priority() {
-        // should be scheduled after 'hana' build tasks are finished
-        return NodejsBuildPlugin.PRIORITY_MIN_VALUE
+        // must run after 'hana' build task
+        return super.priority - 10
     }
     init() {
         super.init()

package/lib/build/provider/nodejs/index.js

@@ -5,7 +5,8 @@ const cmd = require('../../../util/command');
 const EdmxBuildPlugin = require('../edmxBuildPlugin')
 const { BuildError, getWorkspaces } = require('../../util')
 const { OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM, ODATA_VERSION_V2, FOLDER_GEN, CONTENT_EDMX, CONTENT_PACKAGELOCK_JSON,
-    CONTENT_NPMRC, CONTENT_CDSRC_JSON, CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON, FLAVOR_LOCALIZED_EDMX } = require('../../constants')
+    CONTENT_NPMRC, CONTENT_CDSRC_JSON, CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON, FLAVOR_LOCALIZED_EDMX, 
+    OPTION_WS_PACK} = require('../../constants')
 const { WARNING } = EdmxBuildPlugin
 const DEBUG = cds.debug('cli|build')
 
@@ -36,7 +37,7 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         }
         // by default model contains all features
         const model = await this.model()
-        if (!model && !this.context.options['ws-pack']) {
+        if (!model && !this.context.options[OPTION_WS_PACK]) {
             return
         }
         if (model) {
@@ -55,7 +56,7 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         if (this.isStagingBuild() && this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM)) {
             const srcSrv = this.task.src === cds.root ? path.resolve(this.task.src, cds.env.folders.srv) : this.task.src
             await this._copyNativeContent(cds.root, srcSrv, destRoot, destSrv)
-            if (this.context.options['ws-pack']) {
+            if (this.context.options[OPTION_WS_PACK]) {
                 await this._packWorkspaceDependencies(destRoot)
             }
         }

package/lib/build/util.js

@@ -28,18 +28,9 @@ function setProperty(src, segments, value) {
 
 /**
  * Returns whether this project is a java project or not.
- * @param {Array} dirs - the absolute path names to check.
 */
-function hasJavaNature(dirs) {
-    return dirs.flat().reduce((acc, dir) => {
-        if (dir) {
-            const file = path.join(dir, 'pom.xml')
-            if (fs.existsSync(file)) {
-                acc.push(file)
-            }
-        }
-        return acc
-    }, []).length > 0
+function hasJavaNature() {
+    return [cds.env.folders.srv, '.'].some(f => f && fs.existsSync(path.join(cds.root, f, 'pom.xml')))
 }
 
 /**
@@ -176,8 +167,18 @@ async function pathExists(path) {
  * @returns the paths are relative to 'cds.root'.
  */
 async function getWorkspaces(resolve = false, devDependencies = true, wsRoot = cds.root) {
+    let pgkJsonWsRoot
+    try {
+        pgkJsonWsRoot = require(path.join(wsRoot, 'package.json'))
+    } catch (e) {
+        if (e.code === 'MODULE_NOT_FOUND') {
+            DEBUG?.(`No package.json found in project '${wsRoot}', skipping workspace resolution.`)
+            return []
+        }
+        throw e
+    }
+
     const workspaces = []
-    const pgkJsonWsRoot = require(path.join(wsRoot, 'package.json'))
     let pgkJson = pgkJsonWsRoot
     if (wsRoot !== cds.root) {
         pgkJson = require(path.join(cds.root, 'package.json'))
@@ -201,6 +202,44 @@ async function getWorkspaces(resolve = false, devDependencies = true, wsRoot = c
     return workspaces
 }
 
+/**
+ * This JavaScript function filterFeaturePaths is used to filter and categorize file paths 
+ * from a given model into two categories: base and features.
+ * @param {*} model - represents a data model. It's expected to have a $sources property which is an array of file paths.
+ * @param {*} modelPaths - an array of file paths.
+ * @returns 
+ */
+function filterFeaturePaths(model, modelPaths) {
+    const ftsName = path.dirname(cds.env.features.folders || 'fts/*')
+    const regex = new RegExp(`[/|\\\\]+${ftsName}[/|\\\\]+(?<ftName>[^/|\\\\]*)`)
+    const sources = { base: [] }
+
+    // add ROOT source file paths for the base model
+    sources.base = cds.resolve(modelPaths).reduce((acc, file) => {
+        const match = file.match(regex)
+        if (!match) {
+            acc.push(file)
+        }
+        return acc
+    }, [])
+
+    // add source file paths for the features
+    sources.features = model['$sources'].reduce((acc, file) => {
+        const match = file.match(regex)
+        if (match) {
+            const { ftName } = match.groups
+            //feature
+            if (!acc[ftName]) {
+                acc[ftName] = []
+            }
+            acc[ftName].push(file)
+        }
+        return acc
+    }, {})
+
+    return sources
+}
+
 /**
  * Read installed npm workspaces using 'npm ls -ws --json'. 
  * @returns {Array} list of package paths, or an empty array if either 
@@ -280,6 +319,36 @@ function _filterModelPaths(modelPaths, filter) {
     return [...model].filter(m => filter ? filter(m) : true).map(m => normalizePath(m))
 }
 
+/**
+ * Returns a set of files found in the given directory and its subdirectories.
+ * @param {string} srcDir - the directory to search for files
+ * @param {Function} filter - the filter function to apply to the found files
+ * @param {Array} files - the set of files to add the found files to
+ * @returns {Array} files found in the given directory and its subdirectories
+ */
+function getFiles(srcDir, filter, files = []) {
+    function handleResource(entry, filter, files) {
+        if (!filter || filter.call(this, entry)) {
+            const stats = fs.lstatSync(entry)
+            if (stats.isDirectory()) {
+                getFiles(entry, filter, files)
+            } else if (stats.isFile() || stats.isSymbolicLink()) {
+                files.push(entry)
+            }
+        }
+    }
+    let entries = []
+    try {
+        entries = fs.readdirSync(srcDir)
+    } catch (e) {
+        // ignore if not existing
+    }
+    entries.map(subDirEntry => path.join(srcDir, subDirEntry)).forEach((entry) => {
+        handleResource(entry, filter, files)
+    })
+    return files
+}
+
 /**
  * Return gnu-style error string for location `loc`:
  *  - 'File:Line:Col' without `loc.end`
@@ -371,6 +440,8 @@ module.exports = {
     normalizePath,
     pathExists,
     getWorkspaces,
+    filterFeaturePaths,
+    getFiles,
     BuildMessage,
     BuildError
 }

package/lib/compile/to-mermaid.js

@@ -0,0 +1,108 @@
+const cds = require('../cds')
+
+module.exports = function to_mermaid (model, options={}) {
+  options = Object.assign({
+    assocnames: false,    // include association names
+    elements  : false,    // include all elements { falsy | 'all'|true | 'keys' }
+    min       : false,    // minify the model, i.e. remove unused definitions, available in CLI
+    namespaces: true,     // group entities by namespace/service
+    queries   : false,    // include relations for queries
+    service   : undefined // filter service by name, available in CLI
+  }, cds.env.mermaid ?? {}, options)
+
+  const elemOpts = options.elements === 'none' ? false : options.elements
+  if (options.min)  model = cds.minify(model)
+
+  model = cds.linked(model)
+  const allServices = model.all('service')
+
+  // filter by one service if its name is given or only one service is present
+  const srvFilter = options.service ?? (Object.keys(allServices).length === 1 ? allServices[0].name : undefined)
+  if (srvFilter && !model.definitions[srvFilter]) {
+    throw new Error(`Service "${srvFilter}" not found among ${model.all('service').map(s => s.name).sort()}`)
+  }
+
+  const seenEntities = new Set()
+  const namespaces = {}
+  const entityFilter = e => !e.name.startsWith('cds.') && !e.name.endsWith('.texts')
+
+  let diag = ''
+
+  // if requested, filter by one service
+  model.all('service')
+  .filter (srv => !srvFilter || srv.name === srvFilter)
+  .forEach(srv => {
+    namespaces[srv.name] = []
+    model.entities(srv)
+    .filter (entityFilter)
+    .forEach (e => {
+      namespaces[srv.name].push(e)
+      seenEntities.add(e.name)
+    })
+  })
+
+  // group other namespaces/services
+  if (options.namespaces) {
+    model.all('entity')
+    .filter (e => !seenEntities.has(e.name))
+    .filter (entityFilter)
+    .forEach (e => {
+      const ns = e.name.slice(0,e.name.lastIndexOf('.'))
+      if (!srvFilter || ns === srvFilter) {
+        namespaces[ns] = namespaces[ns] || []
+        namespaces[ns].push(e)
+        seenEntities.add(e.name)
+      }
+    })
+
+    // create namespace groups and classes
+    Object.keys(namespaces).forEach(ns => {
+      if (!diag.length)  diag = `classDiagram\n`
+      diag += `  namespace ${ns.replaceAll('.','_')} {\n`
+      namespaces[ns].forEach (e => {
+        const simpleName = e.name.slice(e.name.lastIndexOf('.')+1)
+        diag += `    class \`${e.name}\``
+        diag += `["${simpleName}"]` // simple name as label
+        if (elemOpts) {
+          diag += ` {\n`
+          e.elements.forEach (el => {
+            if ((elemOpts === 'all' || elemOpts === true) || (el.key && elemOpts == 'keys')) {
+              diag += `      +${el._type?.replace('cds.','')} ${el.name}`
+              diag += `\n`
+            }
+          })
+          diag += `    }`
+        }
+        diag += `\n`
+      })
+      diag += `  }\n`
+    })
+    diag += `\n`
+  }
+
+  // add associations, either from collected entities or all entities
+  const entities = seenEntities.size
+    ? Array.from(seenEntities).map(name => model.definitions[name])
+    : model.all('entity').filter (entityFilter) // if no grouping and no service filter is on
+  entities.forEach(e => {
+    if (!diag.length)  diag = `classDiagram\n`
+    e.elements.forEach (el => {
+      if (el instanceof cds.Association) {
+        if (el.target.endsWith('.texts'))  return
+        const type = el.type === 'cds.Composition' ? '*-->' : '-->'
+        const card = el.cardinality?.max === '*' ? '"*"' : ''
+        diag += `  \`${e.name}\` ${type} ${card} \`${el.target}\``
+        if (options.assocnames) {
+          diag += `: ${el.name}`
+        }
+        diag += `\n`
+      }
+    })
+    // add relations for queries
+    if (e.query && options.queries)  {
+      diag += `  \`${e.name}\` ..> \`${e.query.target.name}\`\n`
+    }
+  })
+
+  return diag.trim()
+}

package/lib/compile/to_asyncapi.js

@@ -0,0 +1,7 @@
+const { compile } = require('@cap-js/asyncapi')
+
+function cds_compile_to_asyncapi (csn, options) {
+  return compile(csn, options)
+}
+
+module.exports = cds_compile_to_asyncapi

package/lib/compile/to_openapi.js

@@ -0,0 +1,7 @@
+const { compile } = require('@cap-js/openapi')
+
+function cds_compile_to_openapi (csn, options) {
+  return compile(csn, options)
+}
+
+module.exports = cds_compile_to_openapi