@sap/cds-dk 7.4.0 → 7.5.0

package/lib/build/buildTaskProviderFactory.js

@@ -1,18 +1,14 @@
 const fs = require('fs')
 const path = require('path')
 const cds = require('../cds')
-const { LOG_MODULE_NAMES, OUTPUT_MODE_FILESYSTEM, DEFAULT_SRC_FOLDER } = require('./constants')
+const { OUTPUT_MODE_FILESYSTEM, DEFAULT_SRC_FOLDER } = require('./constants')
 const InternalBuildTaskProvider = require('./provider/internalBuildTaskProvider')
 const BuildTaskProvider = require('./buildTaskProvider')
 const { BuildError } = require('./util')
-const BuildPlugin = require('./buildPlugin')
+const DEBUG = cds.debug('cli|build')
 
 class BuildTaskProviderFactory {
     constructor(options = {}) {
-        // REVISIT: Logger is never passed to BuildTaskProviderFactory except for tests
-        // -> tests shouldn't pollute library coding
-        // see cds-dk/test/bin/eval.test.js for a non-invasive solution (intercepting console.log)
-        options.logger = options.logger || cds.log(LOG_MODULE_NAMES)
         options.outputMode = options.outputMode || OUTPUT_MODE_FILESYSTEM
         if (options.clean === undefined) {
             options.clean = true
@@ -20,9 +16,6 @@ class BuildTaskProviderFactory {
         this._buildOptions = options
         this._context = { options, tasks: [] } // resolved tasks
     }
-    get logger() {
-        return this.options.logger
-    }
     get options() {
         return this._context.options
     }
@@ -47,7 +40,7 @@ class BuildTaskProviderFactory {
             }
             const provider = this._getProvider(task)
             if (provider instanceof DefaultBuildTaskProvider) {
-                this.logger._debug && this.logger.debug(`No provider found for build task '${task.use}', using default provider`)
+                DEBUG?.(`No provider found for build task '${task.use}', using default provider`)
             }
             return this._applyTaskDefaults(provider, [task])
         }))
@@ -62,7 +55,7 @@ class BuildTaskProviderFactory {
                 // apply defaults
                 const newTasks = tasks.filter(task => !existingTasks.includes(task))
                 await this._applyTaskDefaults(provider, newTasks)
-                this.logger._debug && this.logger.debug(`Build task provider ${provider.constructor.name} returned build tasks ${JSON.stringify(newTasks)}`)
+                DEBUG?.(`Build task provider ${provider.constructor.name} returned build tasks ${JSON.stringify(newTasks)}`)
             }
         }
         return tasks
@@ -74,19 +67,18 @@ class BuildTaskProviderFactory {
      * @param {*} task
      */
     createPlugin(task) {
-        const BuildPluginClass = this.getPluginClass(task)
+        const BuildPlugin = this.getPlugin(task)
         const resolvedTask = this._resolveTask(task)
-        this.logger._debug && this.logger.debug(`loaded build plugin [${resolvedTask.use}]`)
+        DEBUG?.(`loaded build plugin [${resolvedTask.use}]`)
 
-        const plugin = new BuildPluginClass()
+        const plugin = new BuildPlugin()
         if (!(plugin instanceof BuildPlugin)) {
             throw new Error(`Invalid Build plugin type ${task.for}`)
         }
         plugin._task = resolvedTask
-        plugin._logger = this.logger
         plugin._context = this.context
         this.context.tasks.push(resolvedTask)
-        this.logger._debug && this.logger.debug(`created build plugin [${resolvedTask.use}]`)
+        DEBUG?.(`created build plugin [${resolvedTask.use}]`)
         return plugin
     }
 
@@ -96,12 +88,12 @@ class BuildTaskProviderFactory {
      * 'use' defines the fully qualified module name of custom build plugins implementations.
      * @param {object} task
      */
-    getPluginClass(task) {
+    getPlugin(task) {
         const provider = this._getProvider(task)
         try {
-            return provider.getPluginClass(task)
+            return provider.getPlugin(task)
         } catch (e) {
-            this.logger.error(`Provider failed to load build plugin class - provider: ${provider.constructor.name}, task: ${task.for || task.use} :\n` + e)
+            console.error(`Provider failed to load build plugin class - provider: ${provider.constructor.name}, task: ${task.for || task.use} :\n` + e)
             throw e
         }
     }
@@ -139,7 +131,7 @@ class BuildTaskProviderFactory {
             try {
                 return provider.providesTask(key)
             } catch (e) {
-                this.logger.error(`Build task provider ${provider.constructor.name} returned an error:\n` + e)
+                console.error(`Build task provider ${provider.constructor.name} returned an error:\n` + e)
                 throw e
             }
         })
@@ -160,9 +152,9 @@ class BuildTaskProviderFactory {
     _loadProviders() {
         // DefaultBuildTaskProvider must be last entry
         return [
-            new InternalBuildTaskProvider(this.logger),
-            new PluginBuildTaskProvider(this.logger),
-            new DefaultBuildTaskProvider(this.logger)
+            new InternalBuildTaskProvider(),
+            new PluginBuildTaskProvider(),
+            new DefaultBuildTaskProvider()
         ]
     }
 }
@@ -172,16 +164,15 @@ class BuildTaskProviderFactory {
  * Has to be the last entry in the providers list.
  */
 class DefaultBuildTaskProvider extends BuildTaskProvider {
-    constructor(logger) {
+    constructor() {
         super()
-        this._logger = logger
     }
 
     providesTask(key) {
         return !!key.use
     }
 
-    getPluginClass(task) {
+    getPlugin(task) {
         try {
             return require(require.resolve(task.use, { paths: [cds.root] }))
         } catch (e) {
@@ -194,10 +185,9 @@ class DefaultBuildTaskProvider extends BuildTaskProvider {
  * Default provider implementation handling fully qualified custom build task declarations.
  */
 class PluginBuildTaskProvider extends BuildTaskProvider {
-    constructor(logger) {
+    constructor() {
         super()
-        this._logger = logger
-        this._plugins = require('./plugins').getPlugins()
+        this._plugins = require('./plugins').plugins
     }
 
     get plugins() {
@@ -208,22 +198,17 @@ class PluginBuildTaskProvider extends BuildTaskProvider {
         return this.plugins.has(key.for)
     }
 
-    getPluginClass(task) {
-        return this.plugins.get(task.for).class
+    getPlugin(task) {
+        return this.plugins.get(task.for)
     }
 
     async lookupTasks(tasks, dependencies) {
         if (!dependencies) {
-            this.plugins.forEach(plugin => {
-                if (plugin.class?.hasTask()) {
-                    const task = this.getTask({ for: plugin.id })
-                    if (!task) {
-                        throw new Error(`Build task '${plugin.id}' required for custom plugin '${plugin.impl}'`)
-                    }
-                    task.for = plugin.id
-                    tasks.push(task)
+            for (const [id, plugin] of this.plugins) {
+                if (plugin.hasTask()) {
+                    tasks.push(this.getTask({ for: id }))
                 }
-            })
+            }
         }
     }
 
@@ -236,7 +221,7 @@ class PluginBuildTaskProvider extends BuildTaskProvider {
     }
 
     getTask(key) {
-        const task = this.plugins.get(key.for).taskDefaults
+        const task = this.plugins.get(key.for).taskDefaults ?? {}
         task.for = key.for
         task.src ??= DEFAULT_SRC_FOLDER
         task.src = task.src.replace(/\/$/, '')

package/lib/build/constants.js

@@ -59,4 +59,3 @@ exports.LOG_LEVEL_WARN = "warn"
 exports.LOG_LEVEL_INFO = "info"
 exports.LOG_LEVEL_DEBUG = "debug"
 exports.LOG_LEVELS = [exports.LOG_LEVEL_ERROR, exports.LOG_LEVEL_WARN, exports.LOG_LEVEL_INFO, exports.LOG_LEVEL_DEBUG]
-exports.LOG_MODULE_NAMES = "cds|build"

package/lib/build/index.js

@@ -4,7 +4,7 @@ const BuildTaskEngine = require('./buildTaskEngine')
 const BuildPlugin = require('./buildPlugin')
 const { BuildError } = require('./util')
 
-module.exports = { build, register, BuildPlugin }
+module.exports = { build, register, Plugin: BuildPlugin, BuildError, BuildPlugin }
 
 /**
  * Executes cds build in the directory defined by cds.root.
@@ -29,6 +29,6 @@ async function build(options = {}) {
     }
 }
 
-function register(id, options) {
-    return require('./plugins').register(id, options)
+function register(id, plugin) {
+    return require('./plugins').register(id, plugin)
 }

package/lib/build/plugins.js

@@ -1,33 +1,33 @@
 const cds = require('../cds')
+const DEBUG = cds.debug('cli|build')
 
-module.exports = new (class BuildPlugins {
+module.exports = new (class Plugins {
     constructor() {
         this._plugins = new Map()
     }
-    getPlugins() {
+    get plugins() {
         return this._plugins
     }
-    getPlugin(id) {
-        return this._plugins.get(id)
-    }
-    register(id, options) {
-        if (!id || !options?.impl) {
-            throw Error("Invalid build plugin parameter")
+    register(id, plugin) {
+        if (!id || !plugin) {
+            throw Error("Invalid parameter")
+        }
+        if (plugin.impl) {
+            // REVISIT: remove compat mode - latest cds-dk@8
+            const taskDefaults = plugin.taskDefaults
+            plugin = this._loadPlugin(id, plugin.impl)
+            plugin.taskDefaults = taskDefaults
         }
         if (this._plugins.has(id)) {
             throw Error(`Build plugin ${id} already registered`)
         }
-        this._plugins.set(id, {
-            id,
-            class: this._loadPlugin(id, options.impl),
-            description: options.description,
-            taskDefaults: options.taskDefaults ?? {}
-        })
+        DEBUG?.(`Registering build plugin ${id}`)
+        this._plugins.set(id, plugin)
     }
     _loadPlugin(id, impl) {
         try {
             // project-local module is preferred - otherwise from our own dependencies
-            return require(require.resolve(impl, { paths: [cds.root, __dirname] })) 
+            return require(require.resolve(impl, { paths: [cds.root, __dirname] }))
         } catch (e) {
             throw new Error(`Custom build plugin implementation '${impl}' for '${id}' cannot be loaded:\n` + e)
         }

package/lib/build/provider/edmxBuildPlugin.js

@@ -2,6 +2,7 @@ const path = require('path')
 const cds = require('../../cds')
 const FeatureToggleBuildPlugin = require('./featureToggleBuildPlugin')
 const { OUTPUT_MODE, OUTPUT_MODE_RESULT, FLAVOR_LOCALIZED_EDMX } = require('../constants')
+const DEBUG = cds.debug('cli|build')
 
 class EdmxBuildPlugin extends FeatureToggleBuildPlugin {
     async compileToEdmx(model, edmxDest, compileOptions = {}) { // NOSONAR
@@ -19,7 +20,7 @@ class EdmxBuildPlugin extends FeatureToggleBuildPlugin {
                 ...compileOptions,
                 serviceNames
             }
-            this.logger._debug && this.logger.debug(`compiling edmx files using OData version ${options.version}`)
+            DEBUG?.(`compiling edmx files using OData version ${options.version}`)
 
             const result = cds.compile.to.edmx(model, options)
 
@@ -51,13 +52,11 @@ class EdmxBuildPlugin extends FeatureToggleBuildPlugin {
     }
 
     _isOdataProtocol(srv) {
-        let protocols = cds.service.protocols4?.(srv)
-        if (!protocols) {
-            // compatibility with @sap/cds < 7.3.0
+        if ('_serves_odata' in srv) return srv._serves_odata // >= 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)
-            if (typeof protocols === "string") {
-                protocols = [protocols]
-            }
+            if (typeof protocols === "string") return protocols.startsWith('odata')
         }
         return protocols.some(p => p && p.startsWith('odata'))
     }

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

@@ -3,8 +3,8 @@ const cds = require('../../../cds')
 const EdmxBuildPlugin = require('../edmxBuildPlugin')
 const URL = require('url')
 const { getProperty, relativePaths } = require('../../util')
-
 const { OUTPUT_MODE, OUTPUT_MODE_RESULT, BUILD_TASK_FIORI, CDS_CONFIG_PATH_SEP, OUTPUT_MODE_FILESYSTEM } = require('../../constants')
+const DEBUG = cds.debug('cli|build')
 
 /**
  * With cds 4 service metadata for the UI service binding is no longer created by default.
@@ -58,12 +58,12 @@ class FioriBuildPlugin extends EdmxBuildPlugin {
 
         try {
             for (let [appFolder, appModelGroup] of appModelGroups.entries()) {
-                this.logger.debug(`building module [${appFolder}] using [${this.constructor.name}]`)
+                DEBUG?.(`building module [${appFolder}] using [${this.constructor.name}]`)
                 const modelPaths = cds.resolve(Array.from(appModelGroup.values()))
                 if (!modelPaths || modelPaths.length === 0) {
                     continue
                 }
-                this.logger._debug && this.logger.debug(`model: ${relativePaths(cds.root, modelPaths).join(", ")}`)
+                DEBUG?.(`model: ${relativePaths(cds.root, modelPaths).join(", ")}`)
 
                 //cache model per fiori app root folder
                 const options = this.options()
@@ -102,14 +102,14 @@ class FioriBuildPlugin extends EdmxBuildPlugin {
         try {
             manifest = require(manifestPath)
         } catch (error) {
-            this.logger.log(`UI module does not contain a manifest.json [${relativePaths(cds.root, manifestPath)}], skipping build`)
+            console.log(`UI module does not contain a manifest.json [${relativePaths(cds.root, manifestPath)}], skipping build`)
             return
         }
 
         const mainService = getProperty(manifest, ['sap.app', 'dataSources', 'mainService'])
         if (!mainService) {
             // no mainService defined - not supported
-            this.logger._debug && this.logger.debug(`UI module does not have a datasource [mainService], [${relativePaths(cds.root, manifestPath)}], skipping build`)
+            DEBUG?.(`UI module does not have a datasource [mainService], [${relativePaths(cds.root, manifestPath)}], skipping build`)
             return
         }
 
@@ -117,20 +117,20 @@ class FioriBuildPlugin extends EdmxBuildPlugin {
         const uri = mainService.uri
 
         if (!localUri || !uri) {
-            this.logger._debug && this.logger.warn(`local uri setting missing for data source [mainService], [${relativePaths(cds.root, manifestPath)}]`)
+            DEBUG?.(`local uri setting missing for data source [mainService], [${relativePaths(cds.root, manifestPath)}]`)
             return
         }
 
         const appFolder = path.relative(cds.root, src).split(CDS_CONFIG_PATH_SEP)[0]
         const model = this.context.for[BUILD_TASK_FIORI].appModel.get(appFolder)
         if (!model) {
-            this.logger.error(`failed to load model for service uri ${uri}, data source [mainService]`)
+            console.error(`failed to load model for service uri ${uri}, data source [mainService]`)
             return
         }
 
         const edmx = this._getEdmxForUri(model, appFolder, uri)
         if (!edmx) {
-            this.logger.error(`failed to resolve service definition for service uri ${uri}, data source [mainService]`)
+            console.error(`failed to resolve service definition for service uri ${uri}, data source [mainService]`)
             return
         }
 

package/lib/build/provider/hana/2migration.js

@@ -1,18 +1,14 @@
 const path = require('path')
 const parser = require('./migrationtable')
-const { BuildError, hasOptionValue } = require('../../util')
-const { LOG_MODULE_NAMES } = require('../../constants')
+const { BuildError, hasOptionValue, BuildMessage } = require('../../util')
+const { SEVERITY_WARNING } = require('../../constants')
 const cds = require('../../../cds'), { compiler: cdsc } = cds
 const cdscVersion = `-- generated by cds-compiler version ${cdsc.version()}`
 const { getArtifactCdsPersistenceName } = cdsc
-let logger = cds.log(LOG_MODULE_NAMES)
 const ANNO_PERSISTENCE_JOURNAL = '@cds.persistence.journal'
+const DEBUG = cds.debug('cli|build')
 
 module.exports = async (model, lastDevVersion, srcPath, options = {}) => {
-  if (options.logger) {
-    logger = options.logger
-  }
-
   const { definitions, deletions, migrations, afterImage, journalFileNames } = _toHdiMigration(model, lastDevVersion, options)
   const definitionResult = []
 
@@ -34,14 +30,14 @@ module.exports = async (model, lastDevVersion, srcPath, options = {}) => {
 
 function _toHdiMigration(model, lastDevVersion, options) {
   const result = cdsc.to.hdi.migration(cds.minify(model), options, lastDevVersion);
-  const journalFileNames = _getJournalFileNames(result.afterImage);
-  if (logger._debug) {
-    logger.debug('cdsc.to.hdi.migration returned')
+  const journalFileNames = _getJournalFileNames(result.afterImage, options);
+  if (DEBUG) {  
+    DEBUG('cdsc.to.hdi.migration returned')
     for (const { name, suffix, sql } of result.definitions) {
       if (suffix === '.hdbtable' || suffix === '.hdbmigrationtable') {
         if (journalFileNames.has(name)) {
           const migration = result.migrations.find(migration => migration.name === name)
-          logger.debug(`
+          DEBUG(`
 File ${name + '.hdbmigrationtable'} - ${migration ? migration.changeset.length : 0} new changes
 ${sql}
 ${migration ? migration.changeset.map(change => change.sql).join('\n') : 'Empty changeset'}
@@ -50,7 +46,7 @@ ${migration ? migration.changeset.map(change => change.sql).join('\n') : 'Empty
       }
     }
   }
-  return { ...result, journalFileNames };
+  return { ...result, journalFileNames }
 }
 
 /**
@@ -136,19 +132,19 @@ function _emptyMigration(name) {
   return { name, suffix: ".hdbmigrationtable", changeset: [] }
 }
 
-function _getJournalFileNames(model) {
+function _getJournalFileNames(model, options) {
   const journalNames = new Set(cds.reflect(model).all(item => {
     if (item.kind === 'entity' && item[ANNO_PERSISTENCE_JOURNAL] === true) {
       if (item['@cds.persistence.skip'] === true || item['@cds.persistence.exists'] === true) {
-        logger.warn(`[hdbmigrationtable] annotation @cds.persistence.journal skipped for entity '${item.name}' as persistence exists`)
+        options.messages?.push(new BuildMessage(`[hdbmigrationtable] annotation @cds.persistence.journal skipped for entity '${item.name}' as persistence exists`, SEVERITY_WARNING))
       }
       return true
     }
     return false
   }).map(entity => getArtifactCdsPersistenceName(entity.name, 'quoted', model, 'hana')))
 
-  logger._debug && logger.debug(`\n[hdbmigrationtable] found ${journalNames.size} model entities annotated with '@cds.persistence.journal`)
-  logger._debug && logger.debug(`[hdbmigrationtable] ${[...journalNames].join(', ')}\n`)
+  DEBUG?.(`\n[hdbmigrationtable] found ${journalNames.size} model entities annotated with '@cds.persistence.journal`)
+  DEBUG?.(`[hdbmigrationtable] ${[...journalNames].join(', ')}\n`)
 
   return journalNames
 }

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

@@ -4,13 +4,10 @@ const cds = require('../../../cds')
 const to_hdbmigration = require('./2migration')
 const InternalBuildPlugin = require('../internalBuildPlugin')
 const { BuildError, relativePaths, BuildMessage } = require('../../util')
-
 const { OUTPUT_MODE_NONE, OUTPUT_MODE, CONTENT_PACKAGE_JSON, CONTENT_HDBTABLEDATA, CSV_FILE_DETECTION,
     CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON, CONTENT_NODE_MODULES, OUTPUT_MODE_RESULT, CONTINUE_UNRESOLVED_SCHEMA_CHANGES, CSV_FILE_TARGET } = require('../../constants')
 const { WARNING } = InternalBuildPlugin
-
 const DEFAULT_COMPILE_DEST_FOLDER = path.normalize("src/gen")
-
 const FILE_EXT_CSV = ".csv"
 const FILE_EXT_HDBTABLEDATA = ".hdbtabledata"
 const FILE_EXT_HDBTABLE = ".hdbtable"
@@ -21,6 +18,7 @@ const FILE_NAME_PACKAGE_JSON = "package.json"
 const PATH_LAST_DEV_CSN = "last-dev/csn.json"
 const FILE_NAME_UNDEPLOY_JSON = "undeploy.json"
 const DEPLOY_FORMAT = "deploy-format"
+const DEBUG = cds.debug('cli|build')
 
 class HanaBuildPlugin extends InternalBuildPlugin {
     init() {
@@ -215,7 +213,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
 
             const promises = []
             const relDest = path.relative(this.task.dest, this.task.options.compileDest)
-            const options = { ...this.options(), logger: this.logger, dirs: csvDirs, baseDir: this.task.options.compileDest }
+            const options = { ...this.options(), messages: this.messages, dirs: csvDirs, baseDir: this.task.options.compileDest }
 
             const toHdbtabledata = cds.compile.to.hdbtabledata ?? require(path.join(cds.home, 'bin/build/provider/hana/2tabledata')) // cds@6 compatibility
             const tableDataResult = await toHdbtabledata(model, options)
@@ -314,7 +312,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
             lastDev = JSON.parse((await fs.promises.readFile(lastDevCsnDir, 'utf-8')).toString())
         }
         // enforces sqlNames option for compiler in tests, pass options from cds env, ensures that the correct format is taken
-        const options = { ...this.options(), logger: this.logger, sql_mapping: cds.env.sql.names, "deploy-format": format }
+        const options = { ...this.options(), messages: this.messages, sql_mapping: cds.env.sql.names, "deploy-format": format }
 
         const compilationResult = await to_hdbmigration(model, lastDev, dbSrcDir, options)
         const definitions = compilationResult.definitions
@@ -332,7 +330,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
                     }
                     promises.push(this.write(content).to(path.join(dbSrcDir, file)))
                 } else {
-                    this.logger._debug && this.logger.debug(`no change, keep existing ${file}`)
+                    DEBUG?.(`no change, keep existing ${file}`)
                 }
             } else {
                 if (this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
@@ -384,7 +382,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
         const exists = fs.existsSync(packageJson)
 
         if (exists) {
-            this.logger._debug && this.logger.debug(`skip create [${relativePaths(cds.root, packageJson)}], already existing`)
+            DEBUG?.(`skip create [${relativePaths(cds.root, packageJson)}], already existing`)
         }
         if (this.isStagingBuild() && !exists) {
             const content = await HanaBuildPlugin._readTemplateAsJson(FILE_NAME_PACKAGE_JSON)

package/lib/build/provider/hana/template/package.json

@@ -4,7 +4,7 @@
     "@sap/hdi-deploy": "^4"
   },
   "engines": {
-    "node": "^14 || ^16 || ^18"
+    "node": "^16 || ^18 || ^20"
   },
   "scripts": {
     "start": "node node_modules/@sap/hdi-deploy/deploy.js"

package/lib/build/provider/internalBuildPlugin.js

@@ -6,14 +6,6 @@ const { hasOptionValue } = require('../util')
 const { FOLDER_GEN } = require('../constants')
 
 class InternalBuildPlugin extends BuildPlugin {
-    /**
-     * Returns the logger that has been passed the build task engine.
-     * @returns {object}
-     */
-    get logger() {
-        //injected by framework
-        return this._logger;
-    }
     /**
      * Custom build plugins are executed before internal build plugins in order
      * ensure and content cannot be overwritten by mistake.

package/lib/build/provider/internalBuildTaskProvider.js

@@ -3,24 +3,20 @@ const path = require('path')
 const cds = require('../../cds')
 const { hasJavaNature, getDefaultModelOptions, BuildError, hasOptionValue, isClassicMtx, 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 } = require("../constants")
+const DEBUG = cds.debug('cli|build')
 
 class InternalBuildTaskProvider extends BuildTaskProvider {
-    constructor(logger) {
+    constructor() {
         super()
-        this._logger = logger
         // ensure that classic mtx is not used in combination with cds-dk@7
         if (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.`)
         }
     }
-    get logger() {
-        return this._logger
-    }
 
     providesTask(key) {
         return BUILD_TASKS.includes(key.for) || key.use && key.use.startsWith(BUILD_TASK_PREFIX)
@@ -43,7 +39,7 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
         InternalBuildTaskProvider._setDefaultModel(task)
     }
 
-    getPluginClass(task) {
+    getPlugin(task) {
         return require(`./${InternalBuildTaskProvider._getForValueFromTask(task)}`)
     }
 
@@ -60,13 +56,13 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
         if (Array.isArray(db) && db.length > 0) {
             db = InternalBuildTaskProvider._getModuleFolder(db) || null
             if (!db && !dependencies) { // log once
-                this.logger.debug("No database module found")
+                DEBUG?.("No database module found")
             }
         }
         if (Array.isArray(srv) && srv.length > 0) {
             srv = InternalBuildTaskProvider._getModuleFolder(srv) || null
             if (!srv && !dependencies) { // log once
-                this.logger.debug("No service module found")
+                DEBUG?.("No service module found")
             }
         }
 
@@ -99,8 +95,8 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
                 }
             }
         } else {
-            !db && this.logger._debug && this.logger.debug(`project doesn't have a database module '${cds.env.folders.db}'`)
-            !srv && this.logger._debug && this.logger.debug(`project doesn't have a service module '${cds.env.folders.srv}'`)
+            !db && DEBUG?.(`project doesn't have a database module '${cds.env.folders.db}'`)
+            !srv && DEBUG?.(`project doesn't have a service module '${cds.env.folders.srv}'`)
 
             // create hana build task
             const dbTask = this._createDbTask(db, dbOptions)
@@ -122,13 +118,13 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
     }
 
     _createDbTask(src, taskOptions) {
-        this.logger.debug("determining database kind")
+        DEBUG?.("determining database kind")
         if (!src || InternalBuildTaskProvider._isMtxExtension()) {
             return null
         }
         let task = null
         if (this._useHana()) {
-            this.logger.debug("found HANA database")
+            DEBUG?.("found HANA database")
             // legacy build supports dest property
             const compileDest = cds.env.data?.dest
             if (compileDest) {
@@ -142,7 +138,7 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
                 options: taskOptions
             }
         } else {
-            this.logger.debug("found sqlite database - skipping HANA build task")
+            DEBUG?.("found sqlite database - skipping HANA build task")
         }
         return task
     }
@@ -162,11 +158,11 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
     }
 
     _createMtxTask(src) {
-        this.logger.debug("determining MTX architecture")
+        DEBUG?.("determining MTX architecture")
 
         // preserve order of creation
         if (InternalBuildTaskProvider._isMtxExtension()) {
-            this.logger.debug("MTX extension app")
+            DEBUG?.("MTX extension app")
             return { for: BUILD_TASK_MTX_EXTENSION }
         }
 
@@ -180,7 +176,7 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
                 cds.env.profiles?.includes('with-mtx-sidecar') || // new presets
                 cds.env.requires["cds.xt.ModelProviderService"]?.external // for compatibility with former mtxs presets
             ) {
-                this.logger.debug("MTX app with sidecar")
+                DEBUG?.("MTX app with sidecar")
                 if (!sidecarEnv) {
                     throw new BuildError(`MTX sidecar directory '${sidecarPath}' not existing. Custom build task configuration required if the folder is named differently.`)
                 }
@@ -204,7 +200,7 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
 
             // mtxs nodejs app without sidecar
             if (!InternalBuildTaskProvider._hasJavaNature(src)) {
-                this.logger.debug("MTX Nodejs app without sidecar")
+                DEBUG?.("MTX Nodejs app without sidecar")
                 return {
                     for: BUILD_TASK_MTX,
                     src
@@ -214,7 +210,7 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
     }
 
     _createSrvTask(src, taskOptions) {
-        this.logger.debug("determining implementation technology")
+        DEBUG?.("determining implementation technology")
         if (!src || InternalBuildTaskProvider._isMtxExtension()) {
             return null
         }
@@ -228,7 +224,7 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
     }
 
     _createJavaTask(src, taskOptions) {
-        this.logger.debug("found implementation technology Java")
+        DEBUG?.("found implementation technology Java")
         // legacy build supports dest property
         const compileDest = cds.env.service?.dest
         if (compileDest) {
@@ -243,7 +239,7 @@ Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/doc
     }
 
     _createNodeTask(src, taskOptions) {
-        this.logger.debug("found implementation technology Nodejs")
+        DEBUG?.("found implementation technology Nodejs")
         return {
             src: src,
             for: BUILD_TASK_NODEJS,