@sap/cds-dk 9.7.1 → 9.8.0

package/lib/build/{provider/featureToggleBuildPlugin.js → plugins/featureToggles.js}

@@ -1,20 +1,9 @@
 const path = require('path')
 const cds = require('../../cds')
-const { DEFAULT_CSN_FILE_NAME, OUTPUT_MODE, OUTPUT_MODE_RESULT } = require('../constants')
-const InternalBuildPlugin = require('./internalBuildPlugin')
+const { DEFAULT_CSN_FILE_NAME } = require('../constants')
 const { getI18nDefaultFolder, filterFeaturePaths } = require('../util')
 
-class FeatureToggleBuildPlugin extends InternalBuildPlugin {
-    init() {
-        if (this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
-            this._result = {
-                dest: this.task.dest,
-                edmx: new Map(),
-                languages: new Set(),
-                services: new Set()
-            }
-        }
-    }
+module.exports = class FeatureTogglesBuildPlugin extends require('./internal') {
 
     async compileAll(csn, destBase, destFts) {
         const sources = filterFeaturePaths(csn, this.task.options.model || this.task.src)
@@ -31,10 +20,6 @@ class FeatureToggleBuildPlugin extends InternalBuildPlugin {
         const csnStr = await this.compileToJson(dictionary.base, path.join(destBase, DEFAULT_CSN_FILE_NAME))
         const csnModel = JSON.parse(csnStr)
         csnModel.meta = csn.meta
-        if (this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
-            this._result.csn = csnModel
-        }
-
         if (sources.features) {
             dictionary.features = await this._compileFeatures(sources.features, destBase, destFts, dictionary.base)
         }
@@ -45,10 +30,7 @@ class FeatureToggleBuildPlugin extends InternalBuildPlugin {
         const i18nFolder = getI18nDefaultFolder()
         const ftsName = path.dirname(cds.env.features.folders || 'fts/*')
         // create language bundle for base model
-        const i18n = await this.collectLanguageBundles(dictionary.base, path.join(destBase, i18nFolder))
-        if (i18n && this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
-            this._result.languageBundles = i18n.bundles
-        }
+        await this.collectLanguageBundles(dictionary.base, path.join(destBase, i18nFolder))
 
         if (dictionary.features) {
             // create language bundles for all features
@@ -90,5 +72,3 @@ class FeatureToggleBuildPlugin extends InternalBuildPlugin {
         cds.compiler.compileSources({ [ftCsn.requires[0]]: baseCsn, 'feature.csn': ftCsn }, { ...super.options(), ...cds.env.cdsc ?? {} })
     }
 }
-
-module.exports = FeatureToggleBuildPlugin

package/lib/build/{provider → plugins}/fiori/index.js

@@ -1,8 +1,7 @@
-const path = require('path')
+const path = require('node:path')
 const cds = require('../../../cds')
-const EdmxBuildPlugin = require('../edmxBuildPlugin')
-const { relativePaths } = require('../../util')
-const { OUTPUT_MODE, OUTPUT_MODE_RESULT, BUILD_TASK_FIORI, CDS_CONFIG_PATH_SEP, OUTPUT_MODE_FILESYSTEM } = require('../../constants')
+const { relativePaths, normalizePath } = require('../../util')
+const { BUILD_TASK_FIORI, CDS_CONFIG_PATH_SEP } = require('../../constants')
 const DEBUG = cds.debug('cli|build')
 
 /**
@@ -10,25 +9,25 @@ const DEBUG = cds.debug('cli|build')
  * For SAP Web IDE Full-Stack compatibility a corresponding metadata.xml is still generated.
  * Though, 'fiori' build tasks can still be configured for UI5 mock server usage - see cap/issues#8673
  */
-class FioriBuildPlugin extends EdmxBuildPlugin {
-    init() {
-        // enforce
-        this._result = {
-            dest: this.task.dest,
-            edmx: new Map(),
-            languages: new Set(),
-            services: new Set()
-        }
-    }
+module.exports = class FioriBuildPlugin extends require('../edmx') {
+
+    _cachedEdmx = new Map()
+
+    static get taskDefaults() { return { src: normalizePath(cds.env.folders.app) } }
 
-    async prepare() {
-        this.context.for = this.context.for || {}
-        this.context.for[BUILD_TASK_FIORI] = this.context.for[BUILD_TASK_FIORI] || {}
+    static hasTask() { return false } // never auto-pulled, only if configured in build tasks
+
+    async _ensureCachesInitialized() {
+        this.context.for ??= {}
+        this.context.for[BUILD_TASK_FIORI] ??= {}
 
         // cache for later use across multiple FioriBuildPlugin instances
         const fioriBuildOptions = this.context.for[BUILD_TASK_FIORI]
-        fioriBuildOptions.appModel = new Map()
-        fioriBuildOptions.appEdmx = new Map()
+        if (fioriBuildOptions._initialized) {
+            return
+        }
+        fioriBuildOptions.appModel ??= new Map()
+        fioriBuildOptions.appEdmx ??= new Map()
 
         // group tasks that have a common application root folder
         const appTaskGroups = new Map()
@@ -51,10 +50,6 @@ class FioriBuildPlugin extends EdmxBuildPlugin {
             appModelGroups.set(appFolder, appModels)
         }
 
-        // ensure edmx is cached as build result
-        const buildOption = this.context.options[OUTPUT_MODE]
-        this.context.options[OUTPUT_MODE] |= OUTPUT_MODE_RESULT
-
         try {
             for (let [appFolder, appModelGroup] of appModelGroups.entries()) {
                 DEBUG?.(`building module [${appFolder}] using [${this.constructor.name}]`)
@@ -64,7 +59,7 @@ class FioriBuildPlugin extends EdmxBuildPlugin {
                 }
                 DEBUG?.(`model: ${relativePaths(cds.root, modelPaths).join(", ")}`)
 
-                //cache model per fiori app root folder
+                // cache model per fiori app root folder
                 const options = this.options()
                 const model = await cds.load(modelPaths, options)
                 fioriBuildOptions.appModel.set(appFolder, model)
@@ -72,12 +67,13 @@ class FioriBuildPlugin extends EdmxBuildPlugin {
                 await this.compileToEdmx(model)
 
                 // cache edmx per fiori app root folder
-                fioriBuildOptions.appEdmx.set(appFolder, this._result.edmx)
+                this._cachedEdmx = new Map()
+                await this.compileToEdmx(model)
+                fioriBuildOptions.appEdmx.set(appFolder, this._cachedEdmx)
             }
         } finally {
-            this.context.options[OUTPUT_MODE] = buildOption
+            fioriBuildOptions._initialized = true
         }
-        return false
     }
 
     /**
@@ -87,10 +83,7 @@ class FioriBuildPlugin extends EdmxBuildPlugin {
      * cannot be resolved based on the defined service URI
      */
     async build() {
-        const model = await this.model()
-        if (!model) {
-            return
-        }
+        await this._ensureCachesInitialized()
         await this._writeEdmxToWebapp(this.task.src, this.task.dest)
     }
 
@@ -100,7 +93,7 @@ class FioriBuildPlugin extends EdmxBuildPlugin {
 
         try {
             manifest = require(manifestPath)
-        } catch (error) {
+        } catch {
             console.log(`UI module does not contain a manifest.json [${relativePaths(cds.root, manifestPath)}], skipping build`)
             return
         }
@@ -133,10 +126,8 @@ class FioriBuildPlugin extends EdmxBuildPlugin {
             return
         }
 
-        if (this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM)) {
-            const edmxPath = path.resolve(path.join(dest, 'webapp'), this._strippedUrlPath(localUri))
-            return this.write(edmx).to(edmxPath)
-        }
+        const edmxPath = path.resolve(path.join(dest, 'webapp'), this._strippedUrlPath(localUri))
+        return this.write(edmx).to(edmxPath)
     }
 
     _getEdmxForUri(model, appFolder, uri) {
@@ -161,5 +152,3 @@ class FioriBuildPlugin extends EdmxBuildPlugin {
         return urlString.replace(/^(\/|\\)/, '').replace(/(\/|\\)$/, '') // strip leading and trailing slash or backslash
     }
 }
-
-module.exports = FioriBuildPlugin

package/lib/build/{provider → plugins}/hana/index.js

@@ -1,14 +1,10 @@
 const fs = require('fs')
-const path = require('path')
 const cds = require('../../../cds')
+const { exists, isdir, path } = cds.utils
 const { compileToHdbMigration, getJournalEntities, getMigrationTableName } = require('./2migration')
-const InternalBuildPlugin = require('../internalBuildPlugin')
 const { find } = require('../../../util/fs')
-const { BuildError, relativePaths, BuildMessage, hasOptionValue, getWorkspacePaths } = 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, OPTION_WS } = require('../../constants')
-const { WARNING } = InternalBuildPlugin
+const { BuildError, relativePaths, BuildMessage, hasOptionValue, getWorkspacePaths, normalizePath } = require('../../util')
+const { CONTENT_PACKAGE_JSON, CONTENT_HDBTABLEDATA, CSV_FILE_DETECTION, CONTENT_ENV, CONTENT_DEFAULT_ENV_JSON, CONTENT_NODE_MODULES, CONTINUE_UNRESOLVED_SCHEMA_CHANGES, CSV_FILE_TARGET, OPTION_WS, SEVERITY_WARNING } = require('../../constants')
 const DEFAULT_COMPILE_DEST_FOLDER = path.normalize("src/gen")
 const FILE_EXT_CSV = ".csv"
 const FILE_EXT_HDBTABLEDATA = ".hdbtabledata"
@@ -26,14 +22,19 @@ const DEBUG = cds.debug('cli|build')
 // This list contains exceptions which will be ignored during the consistency check.
 const PLUGINLESS_HDB_FILES = new Set([".hdbgrants", ".hdbrevokes"])
 
-class HanaBuildPlugin extends InternalBuildPlugin {
+module.exports = class HanaBuildPlugin extends require('../internal') {
+
+    static get taskDefaults() { return { src: normalizePath(cds.env.folders.db) } }
+
+    static hasTask() {
+        if (cds.env.extends) return false
+        const src = path.join(cds.root, this.taskDefaults?.src ?? 'db')
+        if (!exists(src)) return false
+        const db = cds.env.requires.db
+        return db?.kind === 'hana' || db?.dialect === 'hana'
+    }
+
     init() {
-        if (this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
-            this._result = {
-                dest: this.task.dest,
-                hana: new Set()
-            }
-        }
         this.task.options.compileDest = path.resolve(this.task.dest, this.task.options.compileDest || DEFAULT_COMPILE_DEST_FOLDER)
     }
 
@@ -57,7 +58,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
         // 1. compile
         const hdiPlugins = await this._compileToHana(model, wsPaths)
 
-        if (!this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_NONE)) {
+        if (!cds.cli.options.dry) {
             // 2. copy resources
             if (this.hasBuildOption(CSV_FILE_DETECTION, false)) {
                 await this._copyResources(src, dest)
@@ -83,13 +84,12 @@ class HanaBuildPlugin extends InternalBuildPlugin {
             // common model artifacts that are not part of the current project
             if (wsPaths.length || cds.cli.options?.[OPTION_WS] || hasOptionValue(this.task.options[OPTION_WS], true)) {
                 // first is winning, e.g. a .hdiconfig file might exist in multiple workspaces
-                const wsFiles = (await this._getWorkspaceFiles(wsPaths)).reduce((acc, src) => {
-                    const { filePath } = src;
-                    if (!acc.some(file => file.filePath === filePath)) {
-                        acc.push(src);
-                    }
-                    return acc;
-                }, []);
+                const seen = new Set()
+                const wsFiles = (await this._getWorkspaceFiles(wsPaths)).filter(src => {
+                    if (seen.has(src.filePath)) return false
+                    seen.add(src.filePath)
+                    return true
+                });
 
                 // copy artifacts to the src/gen folder in inplace mode
                 const dest = path.join(this.task.dest, this.isStagingBuild() ? 'src' : 'src/gen')
@@ -101,13 +101,12 @@ class HanaBuildPlugin extends InternalBuildPlugin {
                 )
             }
         }
-        return this._result
     }
 
     /**
      * Deletes any content that has been created in folder '#this.task.dest/src/gen' by inplace mode.
      * <br>
-     * Note: Content created in staging build will be deleted by the #BuildTaskEngine itself.
+     * Note: Content created in staging build will be deleted by default.
      */
     async clean() {
         if (this.isStagingBuild()) {
@@ -162,7 +161,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
                 if (entry.startsWith(dbSrc)) {
                     return true
                 }
-                if (cds.utils.isdir(entry)) {
+                if (isdir(entry)) {
                     return !/(\/|\\)node_modules(\/|\\)?$/.test(entry) ||
                         (/(\/|\\)node_modules(\/|\\)?$/.test(entry) && this.hasBuildOption(CONTENT_NODE_MODULES, true))
                 }
@@ -188,7 +187,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
             const regex = RegExp('\\.cds$|\\.csv$|\\.hdbtabledata$')
 
             await this.copyNativeContent(src, dest, (entry) => {
-                if (cds.utils.isdir(entry)) {
+                if (isdir(entry)) {
                     return !/(\/|\\)node_modules(\/|\\)?$/.test(entry)
                 }
                 return (!regex.test(entry) && entry !== cds.env.build.outputfile) ||
@@ -200,7 +199,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
         // subfolders are not supported
         const allFiles = []
         for (const csvDir of csvDirs) {
-            allFiles.push(...await find(csvDir, { filter: entry => regexData.test(entry) && !cds.utils.isdir(entry) }))
+            allFiles.push(...await find(csvDir, { filter: entry => regexData.test(entry) && !isdir(entry) }))
         }
 
         return Promise.all(allFiles.map((file) => {
@@ -224,7 +223,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
         const destSrcDir = path.join(this.task.dest, "src")
 
         const allCsvFiles = await find(destSrcDir, { filter: (entry) => {
-            if (cds.utils.isdir(entry)) {
+            if (isdir(entry)) {
                 return true
             }
             if (/\.hdbtabledata$/.test(entry)) {
@@ -257,9 +256,6 @@ class HanaBuildPlugin extends InternalBuildPlugin {
                 // otherwise create in 'src/gen'
                 let tableDataPath = csvFolder.startsWith(this.task.options.compileDest) ? csvFolder : this.task.options.compileDest
                 tableDataPath = path.join(tableDataPath, file)
-                if (this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
-                    this._result.hana.add(path.relative(this.task.dest, tableDataPath))
-                }
                 promises.push(this.write(tableData).to(tableDataPath))
             }
             await Promise.all(promises)
@@ -269,13 +265,11 @@ class HanaBuildPlugin extends InternalBuildPlugin {
     async _stripCsvComments(csvFiles) {
         // Note: modification of csv files is only allowed for files located in the compile destination folder,
         // meaning having their origin location at db/data/* or db/csv/*
-        const stripComments = cds.utils.csv?.stripComments ?? require(path.join(cds.home, 'bin/build/csv-reader')).stripComments  // cds@6 compatibility
-
-        for (const file of csvFiles) {
+        await Promise.all(csvFiles.map(file => {
             if (this.isStagingBuild() || file.startsWith(this.task.options.compileDest)) {
-                await stripComments(file, null, this.task.options.trimCsvWhitespaces)
+                return cds.utils.csv?.stripComments(file, null, this.task.options.trimCsvWhitespaces)
             }
-        }
+        }))
     }
 
     /**
@@ -300,7 +294,6 @@ class HanaBuildPlugin extends InternalBuildPlugin {
 
     async _compileToHdb(model, format) {
         const hdiPlugins = new Set()
-        const relDest = path.relative(this.task.dest, this.task.options.compileDest)
         // enforces sqlNames option for compiler in tests
         const options = { ...this.options(), sql_mapping: cds.env.sql.names }
         const result = cds.compile.to[format](model, options)
@@ -311,9 +304,6 @@ class HanaBuildPlugin extends InternalBuildPlugin {
             const file = key.file ? key.file : key.name + key.suffix
 
             hdiPlugins.add(suffix)
-            if (this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
-                this._result.hana.add(path.join(relDest, file))
-            }
             promises.push(this.write(content).to(path.join(this.task.options.compileDest, file)))
             if (suffix === FILE_EXT_HDBTABLE) {
                 const name = key.name || path.parse(key.file).name
@@ -332,7 +322,6 @@ class HanaBuildPlugin extends InternalBuildPlugin {
 
     async _compileToHdbmigration(model, format, wsPaths) {
         const hdiPlugins = new Set()
-        const relDestDir = path.relative(this.task.dest, this.task.options.compileDest)
         const relDbDestDir = path.relative(cds.root, this.task.options.compileDest)
         const dbSrcDir = path.join(this.task.src, "src")
         const relDbSrcDir = path.relative(cds.root, dbSrcDir)
@@ -371,9 +360,6 @@ class HanaBuildPlugin extends InternalBuildPlugin {
                 if (!wsMigrationTables.has(name)) {
                     migrationTableFiles.push(path.join(relDbSrcDir, fileName))
                     if (changed) {
-                        if (this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
-                            this._result.hana.add(path.join("src", fileName))
-                        }
                         promises.push(this.write(content).to(path.join(dbSrcDir, fileName)))
                     } else {
                         DEBUG?.(`no change, keep existing ${fileName}`)
@@ -382,9 +368,6 @@ class HanaBuildPlugin extends InternalBuildPlugin {
                     DEBUG?.(`skip generation of migration table [${fileName}] as it originates from a different workspace`)
                 }
             } else {
-                if (this.hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_RESULT)) {
-                    this._result.hana.add(path.join(relDestDir, fileName))
-                }
                 promises.push(this.write(content).to(path.join(this.task.options.compileDest, fileName)))
                 if (suffix === FILE_EXT_HDBTABLE) {
                     // issue an error in case a .hdbmigrationtable file already exists
@@ -407,12 +390,12 @@ class HanaBuildPlugin extends InternalBuildPlugin {
         } finally {
             // update last-dev CSN version
             if (afterImage) {
-                if (!HanaBuildPlugin._toEqualIgnoreMeta(lastDev, afterImage)) {
+                if (!_toEqualIgnoreMeta(lastDev, afterImage)) {
                     await this.write(afterImage).to(lastDevCsnDir)
                 }
                 // add src/.hdiconfig if not existing
                 if (migrationTableFiles.length > 0 && !fs.existsSync(path.join(dbSrcDir, FILE_NAME_HDICONFIG))) {
-                    const template = await HanaBuildPlugin._readTemplateAsJson('.hdiconfig-cloud')
+                    const template = await _readTemplateAsJson('.hdiconfig-cloud')
                     await this.write(template).to(path.join(dbSrcDir, FILE_NAME_HDICONFIG))
                 }
             }
@@ -428,7 +411,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
             DEBUG?.(`skip create [${relativePaths(cds.root, pkgJson)}], already existing`)
         }
         if (this.isStagingBuild() && !exists) {
-            const content = await HanaBuildPlugin._readTemplateAsJson(FILE_NAME_PACKAGE_JSON)
+            const content = await _readTemplateAsJson(FILE_NAME_PACKAGE_JSON)
             await this.write(content).to(path.join(this.task.dest, FILE_NAME_PACKAGE_JSON))
         }
     }
@@ -451,7 +434,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
         //     // without the need of creating a static .hdiconfig file in the 'db' folder
 
         //     // add all known plugins
-        //     const defaultHdiConfig = await HanaBuildPlugin._readTemplateAsJson('.hdiconfig-cloud')
+        //     const defaultHdiConfig = await this._readTemplateAsJson('.hdiconfig-cloud')
         //     for (const plugin in defaultHdiConfig['file_suffixes']) {
         //         hdiPlugins.add('.' + plugin)
         //     }
@@ -463,7 +446,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
         hdiConfigPath = path.join(this.task.options.compileDest, FILE_NAME_HDICONFIG)
         // }
 
-        const template = await HanaBuildPlugin._readTemplateAsJson('.hdiconfig-all')
+        const template = await _readTemplateAsJson('.hdiconfig-all')
         let content = {
             'file_suffixes': {}
         }
@@ -490,7 +473,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
     async _writeHdiNamespace() {
         // see issue #64 - add .hdinamespace file to prevent HDI from adding gen/ folder to the namespace.
         const hdiNamespace = path.join(this.task.options.compileDest, FILE_NAME_HDINAMESPACE)
-        const content = await HanaBuildPlugin._readTemplateAsJson(FILE_NAME_HDINAMESPACE)
+        const content = await _readTemplateAsJson(FILE_NAME_HDINAMESPACE)
         return await this.write(content).to(hdiNamespace)
     }
 
@@ -502,7 +485,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
             // see issue #64 - add .hdinamespace file to prevent HDI from adding gen/ folder to the namespace.
             const undeployJsonDest = path.join(this.task.dest, FILE_NAME_UNDEPLOY_JSON)
             const undeployJsonSrc = path.join(this.task.src, FILE_NAME_UNDEPLOY_JSON)
-            const templateEntries = await HanaBuildPlugin._readTemplateAsJson(FILE_NAME_UNDEPLOY_JSON)
+            const templateEntries = await _readTemplateAsJson(FILE_NAME_UNDEPLOY_JSON)
             let newEntries = []
             if (fs.existsSync(undeployJsonSrc)) {
                 newEntries = await JSON.parse((await fs.promises.readFile(undeployJsonSrc, 'utf-8')).toString())
@@ -532,7 +515,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
         if (fs.existsSync(file)) {
             const undeployList = JSON.parse((await fs.promises.readFile(file)).toString(), 'utf-8')
             if (Array.isArray(undeployList)) {
-                const hdiconfig = await HanaBuildPlugin._readTemplateAsJson('.hdiconfig-all')
+                const hdiconfig = await _readTemplateAsJson('.hdiconfig-all')
                 const keys = new Set(Object.keys(hdiconfig['file_suffixes']).map(key => '.' + key))
                 undeployList.forEach(entry => {
                     const extName = path.extname(entry)
@@ -540,7 +523,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
                         if (keys.has(extName)) {
                             hdiPlugins.add(extName)
                         } else {
-                            this.pushMessage(`Ignoring invalid entry '${entry}' in undeploy.json file`, WARNING)
+                            this.pushMessage(`Ignoring invalid entry '${entry}' in undeploy.json file`, SEVERITY_WARNING)
                         }
                     }
                 })
@@ -566,7 +549,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
                         resolutionMessages.push(new BuildMessage(`Manual resolution required for file ${path.relative(cds.root, file)}. Check migration version content for further details.`))
                     }
                 } catch (e) {
-                    throw new Error(`${path.relative(cds.root, file)}: ${e.toString()}`)
+                    throw new Error(`${path.relative(cds.root, file)}: ${e.message}`, { cause: e })
                 }
             }))
             if (resolutionMessages.length) {
@@ -618,35 +601,30 @@ class HanaBuildPlugin extends InternalBuildPlugin {
 
         return workspaceFiles
     }
+}
 
-    _hasJournalDefinitions(model) {
-        return Object.values(model.definitions).some(def => def['@cds.persistence.journal'])
-    }
+async function _readTemplateAsJson(template) {
+    const content = await fs.promises.readFile(path.join(__dirname, 'template', template), 'utf-8')
+    return JSON.parse(content.toString())
+}
 
-    static async _readTemplateAsJson(template) {
-        const content = await fs.promises.readFile(path.join(__dirname, 'template', template), 'utf-8')
-        return JSON.parse(content.toString())
+function _toEqualIgnoreMeta(csn1, csn2) {
+    function toString(csn) {
+        return JSON.stringify(csn, (k, v) => {
+            if (v?.creator) {
+                // make sure it's the compiler meta tag
+                if (k === 'meta' && v.creator?.startsWith('CDS Compiler'))
+                    return
+            }
+            return v
+        })
     }
 
-    static _toEqualIgnoreMeta(csn1, csn2) {
-        function toString(csn) {
-            return JSON.stringify(csn, (k, v) => {
-                if (v?.creator) {
-                    // make sure it's the compiler meta tag
-                    if (k === 'meta' && v.creator?.startsWith('CDS Compiler'))
-                        return
-                }
-                return v
-            })
-        }
-
-        if (csn1 === csn2) {
-            return true
-        }
-        if (!csn1 || !csn2) {
-            return false
-        }
-        return toString(csn1) === toString(csn2)
+    if (csn1 === csn2) {
+        return true
+    }
+    if (!csn1 || !csn2) {
+        return false
     }
+    return toString(csn1) === toString(csn2)
 }
-module.exports = HanaBuildPlugin

package/lib/build/{provider → plugins}/hana/migrationtable.js

@@ -1,3 +1,4 @@
+const cds = require('../../../cds')
 const fs = require('fs').promises
 const {existsSync} = require('fs')
 class MigrationTableParser {
@@ -306,7 +307,7 @@ class MigrationTableModel {
    * Delete comments and return only those lines representing DDL statements.
    */
   _compactLine(line) {
-    return line.replace(/ /g, '')
+    return line.replaceAll(' ', '')
   }
 }
 
@@ -354,7 +355,7 @@ class MigrationTable {
   }
 
   clone() {
-    return new MigrationTable(JSON.parse(JSON.stringify(this.lines)))
+    return new MigrationTable(cds.clone(this.lines))
   }
 }
 
@@ -465,7 +466,7 @@ class Migration {
   }
 
   clone() {
-    return new Migration(JSON.parse(JSON.stringify(this.lines)))
+    return new Migration(cds.clone(this.lines))
   }
 }
 

package/lib/build/plugins/helm/index.js

@@ -1,11 +1,11 @@
 const cds = require('../../../cds')
-const { exists, path, readFileSync, yaml } = cds.utils
-const { Plugin, BuildError } = require('../..')
-const { join } = path
+const { exists, path: { join }, readFileSync, yaml } = cds.utils
+const { BuildError } = require('../../util')
 const { readProject } = require('../../../init/projectReader')
+const { SEVERITY_WARNING } = require('../../constants')
 
-module.exports = class HelmBuildPlugin extends Plugin {
-  static taskDefaults = { src: "." }
+module.exports = class HelmBuildPlugin extends require('../plugin') {
+  static get taskDefaults() { return { src: "." } }
 
   static hasTask() {
     if (exists('chart/Chart.yaml')) {
@@ -27,7 +27,7 @@ module.exports = class HelmBuildPlugin extends Plugin {
 
   async build() {
     if (!HelmBuildPlugin.hasTask()) {
-      this.pushMessage("Helm Chart not found. Execute `cds add kyma` to add the helm chart.", Plugin.WARNING)
+      this.pushMessage("Helm Chart not found. Execute `cds add kyma` to add the helm chart.", SEVERITY_WARNING)
       return
     }
 

package/lib/build/{provider/internalBuildPlugin.js → plugins/internal.js}

@@ -1,20 +1,12 @@
-const fs = require('fs')
 const path = require('path')
 const cds = require('../../cds')
-const Plugin = require('../plugin')
+const { rimraf, isdir } = cds.utils
 const { find } = require('../../util/fs')
 const { hasOptionValue } = require('../util')
-const { FOLDER_GEN, DEFAULT_BUILTIN_PRIORITY_MAX } = require('../constants')
+const { FOLDER_GEN } = require('../constants')
 const TRACE = cds.debug('trace')
 
-class InternalBuildPlugin extends Plugin {
-    /**
-     * 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 DEFAULT_BUILTIN_PRIORITY_MAX / 2
-    }
+module.exports = class InternalBuildPlugin extends require('./plugin') {
 
     init() {
         // REVISIT: no default gen folder for now
@@ -24,26 +16,13 @@ class InternalBuildPlugin extends Plugin {
         function _isSubDirectory(parent, child) {
             return !path.relative(parent, child).startsWith('..')
         }
-        // build results are deleted by the BuildTaskEngine if the build.target !== '.'
+        // build results are deleted by default 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 && !_isSubDirectory(this.task.dest, this.task.src)) {
-            await fs.promises.rm(this.task.dest, { force: true, recursive: true })
+            await rimraf(this.task.dest)
         }
     }
 
-    /**
-     * Called by the framework after {@link #init()}, used to perform more elaborate preparation.
-     * E.g. caching some pre-calculated data that can be used across multiple build tasks. This kind of data
-     * has to be stored in the plugin type specific options section.
-     * @returns {Promise<boolean>} A value 'false' indicates that {@link #prepare()} will not be called for other instances
-     * of this plugin type.
-     * True indicates that {@link #prepare()} will be called for other instances of this of this plugin type.
-     * @deprecated
-     */
-    async prepare() {
-        // cancel subsequent prepare calls for other plugins of the same type by default
-        return false
-    }
 
     /**
      * Determines whether the given build option value has been set for this build task.
@@ -72,17 +51,17 @@ class InternalBuildPlugin extends Plugin {
     }
 
     async copyNativeContent(srcDir, destDir, customFilter) {
+        const regex = new RegExp(FOLDER_GEN + "\\b")
         function commonStagingBuildFilter(src, destDir) {
             if (typeof src !== "string" || typeof destDir !== "string") {
                 return false
             }
-            if (!cds.utils.isdir(src)) {
+            if (!isdir(src)) {
                 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
             }
@@ -192,6 +171,3 @@ function cds_compile_to_json (csn,o) {
   }
   finally { TRACE?.timeEnd('cds.compile 2json'.padEnd(22)) }
 }
-
-
-module.exports = InternalBuildPlugin