@sap/cds-dk 7.6.1 → 7.7.1

package/bin/cds.js

@@ -77,7 +77,7 @@ const cli = {
   args (task, argv) {
 
     const { options:o=[], flags:f=[], shortcuts:s=[] } = task
-    const _global = /^--(profile|production|sql|odata|build-.*|cdsc-.*|odata-.*|folders-.*)$/
+    const _global = /^--(profile|production|sql|odata|add-.*|build-.*|cdsc-.*|odata-.*|folders-.*)$/
     const _flags = { '--production':true }
     const options = {}, args = []
     let k,a, env = null

package/bin/version.js

@@ -89,30 +89,31 @@ function _versions_from(pkg_path, pkg_label) {
 }
 
 function _markdown (versions) {
-  console.log()
   const pkg = { name:'', repository:'', version:'' }; try {
     Object.assign (pkg, require (resolve('package.json')))
   } catch (e) {/* ignored */}
-  console.log ('|', pkg.name, '|', pkg.repository.url || pkg.repository || 'https://github.com/<your/repo>', '|')
-  console.log ('|:---------------------- | ----------- |')
-  if (require('../lib').env['project-nature'] === 'nodejs') {
-    console.log ('|', v('Node.js'), '|')
-    console.log ('|', v('@sap/cds'), '|')
-  } else {
-    console.log ('|', v('CAP Java Runtime'), '|')
-  }
-  console.log ('|', v('@sap/cds-compiler'), '|')
-  console.log ('|', v('@sap/cds-dk'), '|')
-  console.log ('|', v('@sap/cds-dk (global)'), '|')
-  console.log ('|', v('@sap/eslint-plugin-cds'), '|')
-  console.log ('|', v('@sap/cds-mtxs'), '|')
-  console.log ('|', v('@cap-js/cds-types'), '|')
-  function v (component) {
-    const version = versions [component] || MISSING
-    return (component + '               ').slice(0,22)
-    +' | '+ (version  + '           ').slice(0,11)
-  }
+  const repo = pkg.repository.url || pkg.repository || 'https://github.com/<your/repo>'
+  const valLength = Math.max(repo.length, versions.home.length)
+
+  console.log ()
+  console.log ('|', $(pkg.name, repo), '|')
+  console.log ('|', $('----------------------', '-'.repeat(valLength)), '|')
+
+  Object.keys(versions)
+    .filter(mod => mod != pkg.name)
+    .sort()
+    .forEach(id => console.log ('|', $(id, versions[id]), '|'))
+
+  // TODO get CAP Java version from mvn
+  // if (require('../lib').env['project-nature'] === 'java') {
+  //   console.log ('|', $('CAP Java Runtime'), '|')
+  // }
   console.log()
+
+  function $ (key, val=MISSING) {
+    return ( key  + ' '.repeat(22)).slice(0,22)
+    +' | '+ (val  + ' '.repeat(valLength)).slice(0,valLength)
+  }
 }
 
 function _pkg_path(id, ...paths) {

package/bin/watch.js

@@ -78,6 +78,12 @@ async function watch ([cwd], {
   ext = extDefaults,
   ...options
 }={}) {
+  if (cwd && !cds.utils.exists(cwd)) try { // try module name like `@capire/bookshop`
+    cwd = require.resolve(cwd+'/package.json').slice(0,-13)
+  } catch (err) {
+    throw `Error: No such folder or package: '${cwd}'`
+  }
+
   if (!Object.keys(options).includes('with-mocks'))               args.push ('--with-mocks')
   if (!Object.keys(options).find(a => /^in-memory\??$/.test(a)))  args.push ('--in-memory?')
   args

package/lib/build/buildTaskEngine.js

@@ -9,6 +9,7 @@ const InternalBuildPlugin = require('./provider/internalBuildPlugin')
 const COMPILATION_ERROR = 'CompilationError'
 const COMPILE_MESSAGE = 'CompileMessage'
 const DEBUG = cds.debug('cli|build')
+const LOG_LIMIT = 30
 
 class BuildTaskEngine {
     constructor(options) {
@@ -38,7 +39,7 @@ class BuildTaskEngine {
         // validate required @sap namespace models - log only
         const unresolved = BuildTaskEngine._resolveRequiredSapServices(tasks)
         if (unresolved.length > 0) {
-            throw new BuildError(`Required CDS models [${unresolved.join(', ')}] cannot be resolved. Make sure up-to-date versions of the missing modules are installed.`)
+            throw new BuildError(`Required CDS models [${unresolved.join(', ')}] cannot be resolved. Use the 'npm install' command to install up-to-date versions of the missing packages.`)
         }
 
         // create build plugins
@@ -221,9 +222,10 @@ class BuildTaskEngine {
         const files = BuildTaskEngine._getOutput(plugins)
         if (files.length > 0) {
             const term = require('../util/term')
-            if (!process.env.DEBUG && files.length > 20) {
-                files.length = 20
-                files.push('...')
+            if (!process.env.DEBUG && files.length > LOG_LIMIT) {
+                const length = files.length
+                files.length = LOG_LIMIT
+                files.push(`... ${length - files.length} more. Run with DEBUG=build to show all files.`)
             }
             console.log(`done > wrote output to:\n   ${term.secondary(files.join("\n   "))}\n`)
         }

package/lib/build/buildTaskProviderFactory.js

@@ -13,6 +13,11 @@ class BuildTaskProviderFactory {
         if (options.clean === undefined) {
             options.clean = true
         }
+        ['for', 'src', 'dest'].forEach(key => {
+            if (options[key] && typeof options[key] !== 'string') {
+                throw new BuildError(`Invalid build options - property '${key}' must be a string`)
+            }
+        })
         this._buildOptions = options
         this._context = { options, tasks: [] } // resolved tasks
     }

package/lib/build/provider/edmxBuildPlugin.js

@@ -52,7 +52,7 @@ class EdmxBuildPlugin extends FeatureToggleBuildPlugin {
     }
 
     _isOdataProtocol(srv) {
-        if ('_serves_odata' in srv) return srv._serves_odata // >= cds 7.4.0
+        let yes = srv._serves_odata; if (yes) return typeof yes === 'function' ? yes.call(srv) : yes // >= cds 7.4.0
         let protocols = cds.service.protocols4?.(srv) // >= cds 7.4.0
         if (!protocols) { // @sap/cds < 7.3.0
             protocols = cds.service.protocols.protocol4(srv)

package/lib/build/provider/internalBuildTaskProvider.js

@@ -183,7 +183,7 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
                 if (!sidecarEnv.requires["cds.xt.ModelProviderService"]?._in_sidecar) {
                     if (sidecarEnv.profiles?.includes('mtx-sidecar')) {
                         // profile has been set, but cannot be resolved
-                        throw new BuildError('MTX configuration cannot be resolved. Make sure up-to-date versions of @sap/cds-mtxs and @sap/cds are installed.')
+                        throw new BuildError("MTX configuration cannot be resolved. Use the 'npm install' command to install up-to-date versions of @sap/cds-mtxs and @sap/cds.")
                     }
                     throw new BuildError(`Invalid MTX sidecar configuration - profile 'mtx-sidecar' not set.`)
                 }
@@ -264,26 +264,29 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
     static _setDefaultSrcFolder(task) {
         switch (task.for) {
             case BUILD_TASK_HANA:
-                task.src = task.src || normalizePath(cds.env.folders.db)
+                task.src ||= normalizePath(cds.env.folders.db)
                 break
             case BUILD_TASK_JAVA:
             case BUILD_TASK_JAVA_CF:
             case BUILD_TASK_NODEJS:
             case BUILD_TASK_NODE_CF:
-                task.src = task.src || normalizePath(cds.env.folders.srv)
+                task.src ||= normalizePath(cds.env.folders.srv)
                 break
             case BUILD_TASK_FIORI:
-                task.src = task.src || normalizePath(cds.env.folders.app)
+                task.src ||= normalizePath(cds.env.folders.app)
                 break
             case BUILD_TASK_MTX_SIDECAR:
-                task.src = task.src || MTX_SIDECAR_FOLDER
+                task.src ||= MTX_SIDECAR_FOLDER
                 break
             case BUILD_TASK_MTX_EXTENSION:
-                task.src = task.src || "."
+                if (task.src && task.src !== cds.root) {
+                    throw new BuildError("Invalid 'src' property value for build task 'mtx-extension', the only allowed value is '.'")
+                }
+                task.src ||= "."
                 break
             case BUILD_TASK_MTX:
                 // mtxs with nodejs, but without sidecar
-                task.src = task.src || normalizePath(cds.env.folders.srv)
+                task.src ||= normalizePath(cds.env.folders.srv)
                 break
             default:
                 throw new Error(`Unknown build task '${task.use || task.for}'`)
@@ -296,8 +299,7 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
         if (taskModelPaths && !Array.isArray(taskModelPaths)) {
             taskModelPaths = [taskModelPaths]
         }
-        const toggles = cds.env.features.folders
-        const allowList = new RegExp(`^@sap/cds${toggles ? '|^' + toggles.replace('*', '') : ''}`)
+        const allowList = new RegExp(`^@sap/cds${cds.env.requires.toggles ? '|^' + cds.env.features.folders.replace('*', '') : ''}`)
         task.options = task.options || {}
         let defaultModelPaths = []
         if (taskModelPaths?.length) {
@@ -336,7 +338,7 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
     }
 
     /**
-     * Determines the module folder from the past list that may represent files or folders w or w/o .cds file extension.
+     * Determines the module folder from the given list that may represent files or folders w or w/o .cds file extension.
      * @param {Array} filesOrFolders
      */
     static _getModuleFolder(filesOrFolders) {

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

@@ -3,7 +3,7 @@ const fs = require('fs')
 const path = require('path')
 const cds = require('../../../cds')
 const EdmxBuildPlugin = require('../edmxBuildPlugin')
-const ResourcesTarProvider = require('./resourcesTarBuilder')
+const ResourcesTarBuilder = require('./resourcesTarBuilder')
 const { FOLDER_GEN } = require('../../constants')
 const { BuildError } = require('../../util')
 
@@ -29,7 +29,7 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
         if (!model) {
             return
         }
-        return new ResourcesTarProvider(this).createTar(dest, model)
+        return new ResourcesTarBuilder(this).createTar(dest, model)
     }
 
     async clean() {

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

@@ -34,7 +34,7 @@ class ResourcesTarBuilder {
      * If omitted all resources contained in the root directory are added to the TAR file.
      */
     async writeTarFile(tarFile, root, resources) {
-        const { tar } = require('../../../../lib').utils
+        const { tar } = require('../../..').utils
         await tar.czfd(tarFile, root, resources)
         this.plugin.pushFile(tarFile)
     }

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

@@ -0,0 +1,50 @@
+const path = require('path')
+const cds = require('../../../cds')
+const { WARNING } = require('../internalBuildPlugin')
+
+class ExtensionCompilation {
+    constructor(plugin) {
+        this._plugin = plugin
+    }
+
+    get plugin() { return this._plugin }
+
+    isDuplicateDefinitionError(e) {
+        return e.code === 'ERR_CDS_COMPILATION_FAILURE' && e.messages?.some(m => m.messageId === 'duplicate-definition')
+    }
+
+    async recompileWithoutDuplicates(messages, saasPkgPath) {
+        // determine directories containing duplicate CDS definitions
+        const duplicates = messages?.reduce((acc, m) => {
+            if (m.messageId === 'duplicate-definition' && m.$location?.file) {
+                const dirname = path.resolve(cds.root, m.$location.file)
+                if (!dirname.startsWith(saasPkgPath)) {
+                    acc.add(path.dirname(dirname))
+                }
+            }
+            return acc
+        }, new Set())
+
+        function getPkgName(dirname) {
+            try {
+                if (dirname && dirname !== cds.root && path.dirname(dirname) !== dirname) {
+                    const pkg = require(path.join(dirname, 'package.json'))
+                    return pkg.name
+                }
+            } catch (e) {
+                return getPkgName(path.dirname(dirname))
+            }
+        }
+        const pkgNames = [...[...duplicates].reduce((acc, dir) => acc.add(getPkgName(dir)), new Set())]
+        const modelPaths = this.plugin.task.options.model.filter(m => !pkgNames.some(pkg => m === pkg || m.startsWith(pkg + '/')))
+        this.plugin.task.options.model = modelPaths
+        this.plugin.pushMessage(`Duplicate CDS model definitions found. Using CDS artifacts from base model instead and recompiling with model options ${JSON.stringify(modelPaths)}.\nMake sure to use compatible versions for the dependencies '${pkgNames.join(', ')}'.`, WARNING)
+        // recompile without duplicates
+        return this.plugin.model()
+    }
+
+    resolveExtensionFiles(model, saasPkgFolder) {
+        return model['$sources'].filter(file => file.startsWith(cds.root) && !file.startsWith(saasPkgFolder))
+    }
+}
+module.exports = ExtensionCompilation

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

@@ -2,8 +2,9 @@ const path = require('path')
 const fs = require('fs')
 const cds = require('../../../cds')
 const InternalBuildPlugin = require('../internalBuildPlugin')
-const { FOLDER_GEN, EXTENSION_POINT_VALIDATION } = require('../../constants')
 const ResourcesTarBuilder = require('../mtx/resourcesTarBuilder')
+const ExtensionCompilation = require('./extensionCompilation')
+const { FOLDER_GEN, EXTENSION_POINT_VALIDATION } = require('../../constants')
 const { BuildError, BuildMessage } = require('../../util')
 const DEBUG = cds.debug('cli|build')
 
@@ -16,69 +17,73 @@ class MtxExtensionBuildPlugin extends InternalBuildPlugin {
     }
 
     async build() {
-        const { src, dest } = this.task
+        const { dest } = this.task
         const destExt = path.join(dest, 'ext')
-        // check existence of appPackage folder only
-        // REVISIT: cds.resolve will fail as no index.csn file exists in this folder for the extension migration use case
+        let model
+        let extensionModel
+
+        // REVISIT: check existence of SaaS app package folder only
+        // cds.resolve will fail as no index.csn file exists in this folder for the extension migration use case
         // a compilation error is thrown anyhow if any base model refs cannot be resolved
-        const appPackageFolder = this._getAppPackageFolder()
-        if (!fs.existsSync(path.join(src, appPackageFolder))) {
-            throw new BuildError(`The SaaS application base model '${appPackageFolder}' is missing. Have you run the 'cds pull' command?`)
-        }
+        const saasPkgPath = MtxExtensionBuildPlugin._getSaasPkgPath()
+        const extensionCompilation = new ExtensionCompilation(this)
 
         // full compile of the extension using base model - ensuring consistency
-        const model = await this.model()
+        try {
+            model = await this.model()
+        } catch (e) {
+            if (extensionCompilation.isDuplicateDefinitionError(e)) {
+                // clear compilation errors and recompile with removed duplicate resources
+                this.messages.length = 0
+                model = await extensionCompilation.recompileWithoutDuplicates(e.messages, saasPkgPath)
+            }
+        }
 
         if (model) {
             // extension CSN using parsed format
             const options = { ...this.options(), flavor: 'parsed' }
-            const extModel = await cds.load(this._resolveExtensionFiles(model), options)
-            if (extModel.requires) {
-                extModel.requires.length = 0
+            const extensionFiles = extensionCompilation.resolveExtensionFiles(model, saasPkgPath)
+            if (extensionFiles.length > 0) {
+                extensionModel = await cds.load(extensionFiles, options)
+                if (extensionModel.requires) {
+                    extensionModel.requires.length = 0
+                }
             }
-
+        }
+        if (extensionModel) {
             // IMPORTANT NOTE: perform all model operations before the linter is called as the linter
             // will modify the model causing the creation of 'unresolved' associations
-            await this.compileToJson(extModel, path.join(destExt, 'extension.csn'))
-            await this.collectLanguageBundles(extModel, path.join(destExt, 'i18n'))
-
-            // perform SQL backend validation to prevent extension deployment problems later on
-            // REVISIT: disabled - causing stack overflow errors in LinkedCSN for some scenarios
-            // cds.compile.to.sql(model)
+            await this.compileToJson(extensionModel, path.join(destExt, 'extension.csn'))
+            await this.collectLanguageBundles(extensionModel, path.join(destExt, 'i18n'))
 
             const files = Object.keys(await cds.deploy.resources(model))
             if (files.length > 0) {
                 const dataDest = path.join(destExt, 'data')
                 await Promise.all(
-                    files
-                        .filter(file => /\.csv$/.test(file))
-                        .map(csv => {
-                            return this.copy(csv).to(path.join(dataDest, path.basename(csv)))
-                        })
+                    files.filter(file => /\.csv$/.test(file)).map(csv => {
+                        return this.copy(csv).to(path.join(dataDest, path.basename(csv)))
+                    })
                 )
             }
 
             if (!this.hasBuildOption(EXTENSION_POINT_VALIDATION, false)) {
                 try {
                     // throws error in case of linting errors
-                    this._lintExtModel(extModel, model)
+                    this._lintExtModel(extensionModel, model, saasPkgPath)
                 } catch (error) {
                     // cleanup existing files in case of an error
-                    await fs.promises.rm(this.task.dest, { recursive: true })
+                    await fs.promises.rm(dest, { recursive: true })
                     throw error
                 }
             }
         }
 
-        const packageJson = path.join(src, 'package.json')
-        if (!fs.existsSync(packageJson)) {
-            throw new BuildError(`package.json file not found in ${src}`)
-        }
-        await this.copy(packageJson).to(path.join(destExt, 'package.json'))
+        // existence already checked
+        await this.copy(path.join(cds.root, 'package.json')).to(path.join(destExt, 'package.json'))
 
         // copy handlers
-        const folders = [path.join(src, cds.env.folders.srv, 'handlers')]
-        await this.copyNativeContent(src, destExt, res => {
+        const folders = [path.join(cds.root, cds.env.folders.srv, 'handlers')]
+        await this.copyNativeContent(cds.root, destExt, res => {
             if (fs.statSync(res).isDirectory()) {
                 return folders.some(folder => folder.startsWith(res))
             }
@@ -88,27 +93,15 @@ class MtxExtensionBuildPlugin extends InternalBuildPlugin {
         })
 
         // add all resources contained in 'gen/ext' folder
-        await new ResourcesTarBuilder(this).writeTarFile(path.join(this.task.dest, 'extension.tgz'), destExt)
+        return new ResourcesTarBuilder(this).writeTarFile(path.join(dest, 'extension.tgz'), destExt)
     }
 
-    _resolveExtensionFiles(model) {
-        const node_modules = path.join(this.task.src, 'node_modules')
-        const paths = model['$sources'].reduce((acc, file) => {
-            if (file.startsWith(this.task.src) && !file.startsWith(node_modules)) {
-                acc.push(file)
-            }
-            return acc
-        }, [])
-
-        return paths
-    }
-
-    _lintExtModel(extModel, model) {
+    _lintExtModel(extModel, model, saasPkgPath) {
         const linter = this._linter()
         if (!linter) {
             return
         }
-        const env = cds.env.for('cds', path.join(this.task.src, this._getAppPackageFolder()))
+        const env = cds.env.for('cds', saasPkgPath)
         DEBUG?.(`Saas extension point restrictions:\n${env.requires?.['cds.xt.ExtensibilityService']}`)
 
         const messages = linter.lint(extModel, model, env)
@@ -135,8 +128,35 @@ class MtxExtensionBuildPlugin extends InternalBuildPlugin {
         return linter
     }
 
-    _getAppPackageFolder() {
-        return path.join('node_modules', cds.env.extends || '_base');
+    static _getSaasPkgPath() {
+        // 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')
+        if (!saasPkgPath) {
+            // older projects might not have a workspace definition
+            saasPkgPath = this._getNodeModulesPath(saasPkgPath)
+        }
+        return saasPkgPath
+    }
+
+    static _getWorkspacePath(pkg) {
+        const pkgJson = require(path.join(cds.root, 'package.json'))
+        if (pkgJson.workspaces) {
+            try {
+                // loading package.json of SaaS app - might not exist for older projects
+                return path.dirname(require.resolve(path.join(pkg, 'package.json'), { paths: [cds.root] }))
+            } catch (e) {
+                if (e.code !== 'MODULE_NOT_FOUND') throw e
+                throw new BuildError(`The SaaS application base model is missing. Did you execute 'cds pull' and 'npm install'?`)
+            }
+        }
+    }
+
+    static _getNodeModulesPath() {
+        const saasPkgPath = path.join(cds.root, 'node_modules', cds.env.extends || '_base')
+        if (!fs.existsSync(saasPkgPath)) {
+            throw new BuildError(`The SaaS application base model is missing. Did you execute 'cds pull' and 'npm install'?`)
+        }
+        return saasPkgPath
     }
 }
 

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

@@ -3,7 +3,7 @@ const cds = require('../../../cds')
 const fs = require('fs')
 const { FOLDER_GEN, DEFAULT_CSN_FILE_NAME, MTX_SIDECAR_DB_VALIDATION, CONTENT_EDMX, FLAVOR_LOCALIZED_EDMX } = require('../../constants')
 const NodejsBuildPlugin = require('../nodejs')
-const ResourcesTarProvider = require('../mtx/resourcesTarBuilder')
+const ResourcesTarBuilder = require('../mtx/resourcesTarBuilder')
 const { ERROR } = NodejsBuildPlugin
 const { relativePaths, BuildError, resolveRequiredSapModels, getI18nDefaultFolder } = require('../../util')
 const DEBUG = cds.debug('cli|build')
@@ -64,7 +64,7 @@ class MtxSidecarBuildPlugin extends NodejsBuildPlugin {
     async _buildMainApp(sidecarEnv) {
         let main = sidecarEnv.requires['cds.xt.ModelProviderService']?.root
         if (!main) {
-            throw new BuildError(`Invalid MTX sidecar configuration. Make sure that the profile 'mtx-sidecar' is configured and an up-to-date version of @sap/cds-mtxs is installed.`)
+            throw new BuildError("Invalid MTX sidecar configuration. Make sure that the profile 'mtx-sidecar' is configured. Use 'npm install @sap/cds-mtxs' to install an up-to-date version.")
         }
         if (!this.hasBuildOption(MTX_SIDECAR_DB_VALIDATION, false)
             && !cds.env.build.tasks?.length                     // disable if custom build tasks exist
@@ -97,7 +97,7 @@ class MtxSidecarBuildPlugin extends NodejsBuildPlugin {
 
         // create resources TAR
         // resources are determined based on available database build task, SQLite as fallback
-        await new ResourcesTarProvider(this).createTar(destMain, model)
+        await new ResourcesTarBuilder(this).createTar(destMain, model)
 
         // copy package.json and .cdsrc.json from project root
         await this._copyMainConfigFiles(cds.root, destMain)

package/lib/build/util.js

@@ -119,7 +119,7 @@ function resolveRequiredSapModels(modelPaths) {
 
 async function getDefaultModelOptions(ws = false) {
     const wildcards = cds.env.requires.toggles && cds.env.features.folders ? ['*', cds.env.features.folders] : '*'
-    let paths = _pushModelPaths(cds.resolve(wildcards, false))
+    let paths = _filterModelPaths(cds.resolve(wildcards, false))
 
     if (ws) {
         const workspaces = await getWorkspaces()
@@ -129,7 +129,7 @@ async function getDefaultModelOptions(ws = false) {
             workspaces.forEach(workspace => {
                 cds.root = path.join(root, workspace)
                 cds.env = cds.env.for('cds', cds.root)
-                paths = paths.concat(_pushModelPaths(cds.resolve(cds.env.requires.toggles ? wildcards : '*', false)).map(p => path.join(workspace, p)))
+                paths = paths.concat(_filterModelPaths(cds.resolve(cds.env.requires.toggles ? wildcards : '*', false)).map(p => path.join(workspace, p)))
             })
         } finally {
             cds.root = root
@@ -247,7 +247,7 @@ function _getWorkspace(wsRoot, pkg) {
 }
 
 function _validateWsDependencies(wsRoot, dependencies, devDependencies) {
-    const allDependencies = {...dependencies, ...devDependencies}
+    const allDependencies = { ...dependencies, ...devDependencies }
     for (const name in allDependencies) {
         if (allDependencies[name] === '*') {
             try {
@@ -262,7 +262,12 @@ function _validateWsDependencies(wsRoot, dependencies, devDependencies) {
     }
 }
 
-function _pushModelPaths(...modelPaths) {
+/**
+ * Returns a flat array of existing files and folders, trailing '/' or '\\' characters have been removed.
+ * @param  {...any} modelPaths array of files and folders - optionally nested
+ * @returns 
+ */
+function _filterModelPaths(...modelPaths) {
     const model = new Set()
     // may contain nested arrays
     modelPaths = flatten(modelPaths)

package/lib/env/schema.js

@@ -65,6 +65,7 @@ _robustRequire.resolve = function (id, options = {}) {
 }
 
 function mergePluginSchema(pluginSchema) {
+    // contribution points also appear in schema file ./schemas/cds-rc.js
     return {
         into: async (targetSchema) => {
             if (pluginSchema.buildTaskType) {

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

@@ -5,6 +5,59 @@ module.exports = {
     $defs: {
         cdsRoot: {
             properties: {
+                // declaration for schema node for cds plugins contributing cds configuration
+                schema: {
+                    type: "object",
+                    description: "Schema declaration for cds plugins contributing cds configuration",
+                    additionalProperties: false,
+                    properties: {
+                        cds: {
+                            type: "object",
+                            description: "Containing json schema declarations for root level entries under cds node.",
+                            patternProperties: {
+                                // new keyword must start with word character or opening brackets
+                                "^[\\[\\(\\w].*": {
+                                    $ref: "https://json-schema.org/draft/2020-12/schema"
+                                }
+                            }
+                        },
+
+                        buildTaskType: {
+                            type: "object",
+                            additionalProperties: false,
+                            required: ["name"],
+                            properties: {
+                                name: {
+                                    type: "string",
+                                    minLength: 1,
+                                    description: "The name of the build task type."
+                                },
+                                description: {
+                                    type: "string",
+                                    description: "The description of the build task type."
+                                }
+                            }
+                        },
+
+                        databaseType: {
+                            type: "object",
+                            additionalProperties: false,
+                            required: ["name"],
+                            properties: {
+                                name: {
+                                    type: "string",
+                                    minLength: 1,
+                                    description: "The name of the database type."
+                                },
+                                description: {
+                                    type: "string",
+                                    description: "The description of the database type."
+                                }
+                            }
+                        }
+                    }
+                },
+
                 // build specific schema
                 build: {
                     type: "object",
@@ -115,4 +168,4 @@ module.exports = {
             ]
         }
     }
-}
+}

package/lib/import/asyncapi/parserContext.js

@@ -319,6 +319,12 @@ module.exports = class ParserContext {
      */
     getPropertyObject(propertyContent) {
         const property = {};
+        if ('$ref' in propertyContent) {
+            const refPathParts = propertyContent['$ref'].split('/');
+            const propertyName = refPathParts[refPathParts.length - 1];
+            property['type'] = { 'ref': [refPathParts[3], propertyName] };
+            return property;
+        }
         const inputType = this.getTypeFromArray(propertyContent.type);
         const cdsType = this.getDataType(inputType, propertyContent.format);
 

package/lib/init/add.js

@@ -3,6 +3,8 @@ const registered = new Map
 module.exports = {
   Plugin: require('./plugin'),
   merge: require('./merge').merge, // fluent API
+  removeFromYAML: require('./merge').removeFromYAML,
+  removeFromYAMLArray: require('./merge').removeFromYAMLArray,
   readProject: require('./projectReader').readProject,
   mvn: {
     add: require('./mvn').add

package/lib/init/constants.js

@@ -4,7 +4,7 @@ module.exports = {
     COMMAND_INIT: 'init',
     COMMAND_ADD: 'add',
 
-    MAVEN_ARCHETYPE_VERSION: '2.5.0',
+    MAVEN_ARCHETYPE_VERSION: '2.7.0',
 
     OPTIONS: Object.freeze({
         JAVA: 'java',
@@ -50,7 +50,7 @@ module.exports = {
     REGEX_JAVA_PACKAGE: /^[a-z_][a-z0-9_]*(\.[a-z_][a-z0-9_]*)*$/g,
     // copied from mbt error message
     REGEX_JAVA_VERSION: /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$/,
-    REGEX_PROJECT_NAME: /[^0-9a-zA-Z_-]/g,
+    REGEX_PROJECT_NAME: /[^0-9a-zA-Z_-]+/g,
 
     URLS: Object.freeze({
         PIPELINE_HELP: 'https://sap.github.io/jenkins-library/',