@sap/cds-dk 8.9.5 → 9.0.5

package/lib/build/index.js

@@ -12,7 +12,7 @@ module.exports = { build, register, Plugin, BuildError }
  * @param {object} options - command options as defined by build command.
  */
 async function build(options = {}) {
-    if (!fs.existsSync(cds.root) || !fs.lstatSync(cds.root).isDirectory()) {
+    if (!fs.existsSync(cds.root) || !cds.utils.isdir(cds.root)) {
         throw `Project folder '${cds.root}' does not exist`
     }
     try {

package/lib/build/plugin.js

@@ -1,76 +1,104 @@
-const path = require('path')
-const fs = require('fs')
+const path = require('node:path')
+const fs = require('node:fs')
+const os = require('node:os');
 const cds = require('../cds')
+const IS_WIN = os.platform() === 'win32';
+
 const { OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM, SEVERITY_INFO, SEVERITY_WARNING, SEVERITY_ERROR } = require('./constants')
 const { hasOptionValue, getProperty, relativePaths, BuildMessage, pathExists, filterFeaturePaths, getFiles } = require('./util')
 const DEBUG = cds.debug('cli|build')
 
+/**
+ * @typedef {{ src?: string, dest?: string, options?: object } & Record<string, any>} TaskDefaults
+ * @typedef {{ src: string, dest: string, for: string, options: object } & Record<string, any>} Task
+ * @typedef {{ options: Record<string, any>, tasks: Task[] }} Context
+ * @callback FileWriterTo
+ * @param {string} dest - absolute or relative file path. Relative paths will be resolved to this task's destination path.
+ * @returns {Promise<void>} - resolves when the file has been written
+ * @typedef {Object} FileWriter
+ * @property {FileWriterTo} to
+ */
+
 /**
  * The build plugin creates the build output for a dedicated build task. It is uniquely identified
- * by the build task's <code>for</code> or <code>use</code>property. The <code>use</code> property represents 
+ * by the build task's `for<` or `use` property. The `use` property represents 
  * the fully qualified node module path of the build plugin implementation.
- * <p>
  * The build task engine defines the following protocol. The methods are invoked in descending order:
- * <ul>
- *  <li>init() - optional</li>
- *  <li>get priority() - optional</li>
- *  <li>async clean()</li>
- *  <li>async build()</li>
- * </ul>
- * The reflected CSN can be accessed using the async method <code>model()</code>.
+ *  - `init()` - optional
+ *  - `get priority()` - optional
+ *  - `async clean()`
+ *  - `async build()`
+ * The reflected CSN can be accessed using the async method `model()`.
  */
 class Plugin {
-    /**
-     * @constructor
-     */
-    constructor() {
-        this._files = new Set()
-        this._messages = []
-    }
-
     static INFO = SEVERITY_INFO
     static WARNING = SEVERITY_WARNING
     static ERROR = SEVERITY_ERROR
 
+    /** @type {TaskDefaults} */
+    static taskDefaults  // injected externally
+
     /**
-     * Determines whether a task of this type will be created when cds build is executed,
-     * returns true by default.
+     * @type {Task | undefined}
+     * @private
      */
-    static hasTask() {
-        return true
-    }
+    _task
 
     /**
-     * Returns the build task executed by this build plugin.
-     * @return {object}
+     * @type {Context | undefined}
+     * @private
      */
-    get task() {
-        //injected by framework
-        return this._task
+    _context
+
+    /**
+     * @type {Set<string>}
+     * @private
+     */
+    _files = new Set()
+
+    /**
+     * Returns the list of files and folders written by this build plugin.
+     */
+    get files() {
+        return [...this._files]
     }
 
+    /**
+     * @type {(string | BuildMessage)[]}
+     * @private
+     */
+    _messages = []
     /**
      * Returns a list of build and compiler messages created by this build plugin. 
      * Supported message severities are 'Info', 'Warning', and 'Error'.
-     * @return {Array}
      */
     get messages() {
         return this._messages
     }
 
     /**
-     * Returns the list of files and folders written by this build plugin.
-     * @return {Array}
+     * Determines whether a task of this type will be created when cds build is executed,
+     * returns true by default.
      */
-    get files() {
-        return [...this._files]
+    static hasTask() {
+        return true
+    }
+
+    /**
+     * Returns the build task executed by this build plugin.
+     * @returns {Task}
+     */
+    get task() {
+        // @ts-expect-error - possibly undefined, but expected to be injected by framework
+        return this._task
     }
 
     /**
      * Returns the build context
-     * @returns {object}
+     * @returns {Context}
      */
     get context() {
+        // @ts-expect-error - possibly undefined, but expected to be injected by framework
         return this._context
     }
 
@@ -80,7 +108,7 @@ class Plugin {
      * The higher the priority value, the sooner the build plugin will be run.
      * The range of valid priority values is from -1024 to +1024.
      * Built-in plugins have a priority value range from 0 - 524.
-     * @return {number} the priority for this plugin as integer.
+     * @returns the priority for this plugin as integer.
      */
     get priority() {
         return 1024
@@ -100,15 +128,18 @@ class Plugin {
      * @abstract
      * Called by the framework to create the artifacts of this build plugin.
      */
-    async build() { }
+    async build() { /* abstract */}
 
     /**
      * Called by the framework immediately before 'build' to delete any output created by this build plugin.
-     * <p>
-     * Note: The <code>BuildTaskEngine</code> is cleaning the common generation target folder if the build is
+     * Note: The [`BuildTaskEngine`]({@link ./buildTaskEngine.js)}) is cleaning the common generation target folder if the build is
      * executed in staging mode, e.g. build.target: "gen".
      */
     async clean() {
+        /**
+         * @param {string} parent - absolute path of the parent directory
+         * @param {string} child - absolute path of the child directory
+         */
         function isSubDirectory(parent, child) {
             return !path.relative(parent, child).startsWith('..')
         }
@@ -124,12 +155,12 @@ class Plugin {
      * Asynchronously write the given content to a given file path.
      * If the file exists the content is replaced. If the file does not exist, a new file will be created.
      * The file name is stored in the list of files written by this build plugin.
-     * @param {string} dest - absolute or relative file path. Relative paths will be resolved to this task's destination path.
-     * @param {any} data - If data is of type object the JSON-stringified version is written.
+     * @param {object | Buffer} data - If data is of type object the JSON-stringified version is written.
+     * @returns {FileWriter}
      */
     write(data) {
         return {
-            to: async (dest) => {
+            to: async (/** @type {string} */ dest) => {
                 if (this._hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM)) {
                     if (!path.isAbsolute(dest)) {
                         // relative to build task's destination path
@@ -145,17 +176,17 @@ class Plugin {
 
     /**
      * Asynchronously copies a single file or the entire directory structure from 'src' to 'dest', including subdirectories and files.
-     * <p>
+     * 
      * Note: The file names are stored in the list of files written by this build plugin.
-     * </p>
-     * @param {string} src The absolute or relative source path of the file or directory to copy.
+     * 
+     * @param {string} src - The absolute or relative source path of the file or directory to copy.
      * Relative paths will be resolved to this task's source path.
-     * @param {string} dest The absolute or relative target path. Relative paths will be resolved to this task's destination path.
+     * @returns {FileWriter}
      *
      */
     copy(src) {
         return {
-            to: async (dest) => {
+            to: async (/** @type {string} */ dest) => {
                 if (this._hasBuildOption(OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM)) {
                     if (!path.isAbsolute(src)) {
                         // relative to build task's source path
@@ -166,12 +197,16 @@ class Plugin {
                         dest = path.resolve(this.task.dest, dest)
                     }
                     // list all copied files recursively
-                    if (fs.lstatSync(src).isDirectory()) {
+                    if (cds.utils.isdir(src)) {
                         await fs.promises.cp(src, dest, { recursive: true })
                         const files = getFiles(dest)
                         files.forEach(file => this.pushFile(file))
                     } else {
                         this.pushFile(dest)
+                        if (IS_WIN && fs.lstatSync(src).isSymbolicLink()) {
+                            const linkTarget = await fs.promises.readlink(src);
+                            src = path.resolve(path.dirname(src), linkTarget);
+                        }
                         return fs.promises.cp(src, dest, { recursive: true })
                     }
                 }
@@ -181,11 +216,11 @@ class Plugin {
 
     /**
      * Adds the given user message and severity to the list of messages issued by this build task.
-     * <p>
+     * 
      * User messages will be logged after CDS build has been finished based on the log-level that has been set.
      * By default messages with severity <em>warning</em> and <em>error</em> will be logged.
-     * @param {string} message the message text
-     * @param {string} severity the severity of the message
+     * @param {string} message - the message text
+     * @param {import('./constants').Severity} severity - the severity of the message
      */
     pushMessage(message, severity) {
         this.messages.push(new BuildMessage(message, severity))
@@ -194,7 +229,7 @@ class Plugin {
     /**
      * Returns a compiled CSN model according to the model paths defined by this build task.
      * The model includes model enhancements defined by feature toggles, if any.
-     * @return {object} the compiled CSN model
+     * @returns {Promise<import('@sap/cds').csn.CSN | null>} the compiled CSN model
      */
     async model() {
         const files = cds.resolve(this.task.options.model || this.task.src)
@@ -217,7 +252,7 @@ class Plugin {
     /**
      * Returns a compiled base model CSN according to the model paths defined by this build task.
      * The base model does not include any model enhancements defined by feature toggles.
-     * @return {object} the compiled base model CSN
+     * @returns {ReturnType<Plugin['model']>} the compiled base model CSN
      */
     async baseModel() {
         const model = await this.model()
@@ -234,7 +269,7 @@ class Plugin {
 
     /**
      * Adds the given fully qualified file path to the list of files that are written by this build task.
-     * @param {string} filePath
+     * @param {string} filePath - fully qualified file path
      */
     pushFile(filePath) {
         this._files.add(filePath)

package/lib/build/plugins/helm/files/subcharts/web-application/Chart.yaml

@@ -2,5 +2,7 @@ apiVersion: v2
 description: A Helm chart for web app
 kubeVersion: '>= 1.21'
 name: web-application
+sources:
+- https://github.tools.sap/unified-runtime/web-application
 type: application
-version: 1.24.0
+version: 1.27.0

package/lib/build/plugins/helm/files/subcharts/web-application/templates/_helpers.tpl

@@ -215,8 +215,10 @@ If release name contains chart name it will be used as service instance name.
     port: {{ .values.port | default .context.Values.port}}
 {{- end }}
 {{- if eq .checkName "startupProbe" }}
-  periodSeconds: 2
-  failureThreshold: {{ div (add1  .context.Values.startupTimeoutSeconds) 2 }}
+  {{- $period := default .checkValues.periodSeconds 2 }}
+  periodSeconds: {{ $period }}
+  failureThreshold: {{ div (add1  .context.Values.startupTimeoutSeconds) $period }}
+  timeoutSeconds: {{ .checkValues.timeoutSeconds }}
 {{- else }}
 {{- if .checkValues.periodSeconds }}
   periodSeconds: {{ .checkValues.periodSeconds }}

package/lib/build/plugins/helm/files/subcharts/web-application/templates/api-rule.yaml

@@ -1,8 +1,10 @@
 {{- if .Values.expose.enabled -}}
 {{- if .Values.expose.APIRule.experimental -}}
 apiVersion: gateway.kyma-project.io/v2alpha1
-{{ else }}
+{{ else if .Values.expose.APIRule.legacy -}}
 apiVersion: gateway.kyma-project.io/v1beta1
+{{ else }}
+apiVersion: gateway.kyma-project.io/v2
 {{- end }}
 kind: APIRule
 metadata:
@@ -10,7 +12,7 @@ metadata:
   labels: {{- include "web-application.labels" . | nindent 4 }}
 spec:
   gateway: {{ tpl .Values.expose.gateway $ }}
-  {{- if .Values.expose.APIRule.experimental }}
+  {{- if or .Values.expose.APIRule.experimental (not .Values.expose.APIRule.legacy)}}
   hosts:
     {{- include "web-application.internal.exposeHosts" . | indent 4 }}
   {{- else }}

package/lib/build/plugins/helm/files/subcharts/web-application/templates/deployment.yaml

@@ -36,6 +36,14 @@ spec:
         imagePullPolicy: {{ .Values.imagePullPolicy |  default .Values.global.imagePullPolicy }}
       {{- end }}
         name: {{ include "web-application.name" . }}
+      {{- if .Values.command }}
+        command:
+        {{- .Values.command | toYaml | nindent 8 }}
+      {{- end }}
+      {{- if .Values.args }}
+        args:
+        {{- .Values.args | toYaml | nindent 8 }}
+      {{- end }}
         ports:
         - name: http
           containerPort: {{ .Values.port }}
@@ -108,6 +116,14 @@ spec:
         imagePullPolicy: {{ $sidecar.imagePullPolicy |  default $.Values.global.imagePullPolicy }}
       {{- end }}
         name: {{ $key }}
+        {{- if $sidecar.command }}
+        command:
+        {{- $sidecar.command | toYaml | nindent 8 }}
+        {{- end }}
+        {{- if $sidecar.args }}
+        args:
+        {{- $sidecar.args | toYaml | nindent 8 }}
+        {{- end }}
         envFrom:
         {{- $envFromVars := (include "web-application.internal.processEnvFrom" (dict "envFrom" $sidecar.envFrom "context" $) | fromJson) }}
         {{- if not (eq (len $envFromVars.vars) 0) }}
@@ -173,7 +189,8 @@ spec:
       {{- end }}
       {{- if .Values.nodeAffinity }}
       affinity:
-        {{- .Values.nodeAffinity | toYaml | nindent 8 }}
+        nodeAffinity:
+        {{- .Values.nodeAffinity | toYaml | nindent 10 }}
       {{- end }}
       topologySpreadConstraints:
       {{- range $constraint := .Values.availability.topologySpreadConstraints }}

package/lib/build/plugins/helm/files/subcharts/web-application/templates/service-binding.yaml

@@ -28,7 +28,6 @@ spec:
   {{- end }}
   {{- if $mergedParams.parametersFrom }}
   parametersFrom: {{ tpl ($mergedParams.parametersFrom | toYaml) $ | nindent 4 }}
-  watchParametersFromChanges: true
   {{- end }}
   {{- if $mergedParams.credentialsRotationPolicy }}
   credentialsRotationPolicy: {{ $mergedParams.credentialsRotationPolicy | toYaml | nindent 4 }}

package/lib/build/plugins/helm/files/subcharts/web-application/values.schema.json

@@ -136,6 +136,20 @@
                 }
             }
         },
+        "command": {
+            "$id": "#/properties/command",
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "args": {
+            "$id": "#/properties/args",
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
         "additionalVolumes": {
             "$id": "#/properties/additionalVolumes",
             "type": "array",
@@ -221,7 +235,7 @@
                 },
                 "limits": {
                     "type": "object",
-                    "additionalProperties": false,
+                    "additionalProperties": true,
                     "required": [
                         "memory"
                     ],
@@ -588,6 +602,9 @@
                     "properties": {
                         "experimental": {
                             "type": "boolean"
+                        },
+                        "legacy": {
+                            "type": "boolean"
                         }
                     }
                 },
@@ -651,7 +668,8 @@
                                 "PUT",
                                 "PATCH",
                                 "DELETE",
-                                "HEAD"
+                                "HEAD",
+                                "OPTIONS"
                             ],
                             "path": "/.*"
                         }
@@ -917,6 +935,20 @@
                         "imagePullPolicy": {
                             "$ref": "#/definitions/ImagePullPolicy"
                         },
+                        "command": {
+                            "$id": "#/properties/command",
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        },
+                        "args": {
+                            "$id": "#/properties/args",
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        },
                         "envFrom": {
                             "$id": "#/properties/envFrom",
                             "type": "array",

package/lib/build/plugins/helm/files/subcharts/web-application/values.yaml

@@ -14,7 +14,7 @@ global:
     _internal:
       web-application:
         versions:
-          1.24.0: true
+          1.27.0: true
 ## Will be used instead of the `.Chart.Name`, e.g. when generating the Deployment name.
 # nameOverride: name
 
@@ -46,6 +46,10 @@ imagePullSecret: {}
 ## The content for the dynamically generated Kubernetes Secret, which will be used as an image pull secret. Can't be used with the `name` option.
 # dockerconfigjson: ""
 
+## Command and arguments used to run the container, see https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#define-a-command-and-arguments-when-you-create-a-pod
+# command: []
+# args: []
+
 ## Setting the imagePullPolicy, see https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy
 # imagePullPolicy: Always
 
@@ -64,6 +68,7 @@ additionalVolumes: []
 #     cpu: 100m
 #     ephemeral-storage: 1G
 #     memory: 1G
+#     gpu-vendor.example/example-gpu: 1
 #   requests:
 #     cpu: 100m
 #     ephemeral-storage: 1G
@@ -154,7 +159,8 @@ envFrom: []
 #     name: my-secret-ref1
 
 expose:
-  APIRule: {}
+  APIRule:
+    legacy: true
   #   experimental: true
   ## Specifies the service's dns name for inbound external traffic. If it doesn't contain a dot, the default cluster domain will be appended.
   # host: ""
@@ -180,6 +186,7 @@ expose:
         - PATCH
         - DELETE
         - HEAD
+        - OPTIONS
       path: /.*
       ## APIRule CORS policy configuration
       ## https://kyma-project.io/#/api-gateway/user/custom-resources/apirule/04-10-apirule-custom-resource

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

@@ -1,5 +1,6 @@
 const cds = require('../../../cds')
-const { exists, path, readFileSync, yaml } = cds.utils
+const yaml = require('yaml')
+const { exists, path, readFileSync } = cds.utils
 const { Plugin, BuildError } = require('../../../build')
 const { join } = path
 const { readProject } = require('../../../init/projectReader')

package/lib/build/plugins.js

@@ -1,32 +1,46 @@
+// @ts-check
 const cds = require('../cds')
 const Plugin = require('./plugin')
 const DEBUG = cds.debug('cli|build')
 
 module.exports = new (class Plugins {
-    constructor() {
-        this._plugins = new Map()
-        this._registerDefaults()
-    }
+    /** @type {Map<string, typeof Plugin>} */
+    #plugins = new Map()
     get plugins() {
-        return this._plugins
+        return this.#plugins
     }
+
+    constructor() {
+        this.#registerDefaults()
+    }
+
+    /**
+     * @param {string} id - unique name of the plugin
+     * @param {typeof Plugin | { prototype?: unknown, impl: string, taskDefaults: { src: string } }} plugin - class extending Plugin
+     */
     register(id, plugin) {
+        /**
+         * @param {{prototype?: unknown}} plugin
+         * @returns {plugin is typeof Plugin}
+         */
+        const isNewStylePlugin = plugin => plugin.prototype instanceof Plugin
+
         if (!id || !plugin) {
             throw new Error(`Invalid parameter passed, build plugin id: ${id}`)
         }
-        if (this._plugins.has(id)) {
+        if (this.#plugins.has(id)) {
             throw new Error(`CDS build plugin ${id} already registered`)
         }
-        if(!(plugin.prototype instanceof Plugin)) {
+        if(!isNewStylePlugin(plugin)) {
             // with cds-dk version 7 the following registration format was supported:
             // cds.build.register("cov2ap", { impl: "@cap-js-community/odata-v2-adapter/src/build.js", taskDefaults: { src: "srv" } })
             throw `The cds build plugin '${id}' is not compatible with this @sap/cds-dk version. Update the npm package '${plugin.impl || id}' to the latest version.`
         }
-        DEBUG?.(`Registering build plugin ${id}`)
-        this._plugins.set(id, plugin)
+        DEBUG?.(`registering build plugin ${id}`)
+        this.#plugins.set(id, plugin)
     }
 
-    _registerDefaults() {
+    #registerDefaults() {
         this.register('helm', require('./plugins/helm'))
     }
 })

package/lib/build/provider/edmxBuildPlugin.js

@@ -10,7 +10,7 @@ class EdmxBuildPlugin extends FeatureToggleBuildPlugin {
 
         // generate edmx for services only that have the odata protocol
         const serviceNames = cds.reflect(model).services
-            .filter(service => this._isOdataProtocol(service))
+            .filter(service => 'odata' in service.protocols)
             .map(service => service.name)
 
         // new compile impl is throwing error in case no services exist!
@@ -51,16 +51,6 @@ class EdmxBuildPlugin extends FeatureToggleBuildPlugin {
         return Promise.all(promises)
     }
 
-    _isOdataProtocol(srv) {
-        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)
-            if (typeof protocols === "string") return protocols.startsWith('odata')
-        }
-        return protocols.some(p => p && p.startsWith('odata'))
-    }
-
     _options4odata() {
         const o = this.options()
         o.version = cds.env.odata.version

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

@@ -1,7 +1,7 @@
 const path = require('path')
 const cds = require('../../../cds')
 const EdmxBuildPlugin = require('../edmxBuildPlugin')
-const URL = require('url')
+const { URL } = require('node: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')
@@ -52,7 +52,7 @@ class FioriBuildPlugin extends EdmxBuildPlugin {
             appModelGroups.set(appFolder, appModels)
         }
 
-        // ensure edmx is cached as build result 
+        // ensure edmx is cached as build result
         const buildOption = this.context.options[OUTPUT_MODE]
         this.context.options[OUTPUT_MODE] |= OUTPUT_MODE_RESULT
 
@@ -159,8 +159,8 @@ class FioriBuildPlugin extends EdmxBuildPlugin {
     }
 
     _strippedUrlPath(urlString) {
-        const url = URL.parse(urlString)
-        return url.pathname.replace(/^(\/|\\)/, '').replace(/(\/|\\)$/, '') // strip leading and trailing slash or backslash)
+        const url = new URL(urlString, 'http://dummy.base') // need dummy base to parse relative URLs correctly
+        return url.pathname.replace(/^(\/|\\)/, '').replace(/(\/|\\)$/, '') // strip leading and trailing slash or backslash
     }
 }
 

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

@@ -44,6 +44,12 @@ class HanaBuildPlugin extends InternalBuildPlugin {
             wsPaths = await getWorkspacePaths()
         }
 
+        if (cds.cli.options.mocked) {
+            cds.deploy?.include_external_entities_in?.(model)
+        } else {
+            cds.deploy?.exclude_external_entities_in?.(model)
+        }
+
         // the order of 1 and 2 is important
         // 1. compile
         const hdiPlugins = await this._compileToHana(model, wsPaths)
@@ -153,7 +159,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
                 if (entry.startsWith(dbSrc)) {
                     return true
                 }
-                if (fs.statSync(entry).isDirectory()) {
+                if (cds.utils.isdir(entry)) {
                     return !/(\/|\\)node_modules(\/|\\)?$/.test(entry) ||
                         (/(\/|\\)node_modules(\/|\\)?$/.test(entry) && this.hasBuildOption(CONTENT_NODE_MODULES, true))
                 }
@@ -179,7 +185,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
             const regex = RegExp('\\.cds$|\\.csv$|\\.hdbtabledata$')
 
             await this.copyNativeContent(src, dest, (entry) => {
-                if (fs.statSync(entry).isDirectory()) {
+                if (cds.utils.isdir(entry)) {
                     return !/(\/|\\)node_modules(\/|\\)?$/.test(entry)
                 }
                 return (!regex.test(entry) && entry !== cds.env.build.outputfile) ||
@@ -191,7 +197,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
         // subfolders are not supported
         const allFiles = csvDirs.reduce((acc, csvDir) => {
             return acc.concat(getFiles(csvDir, (entry) => {
-                if (fs.statSync(entry).isDirectory()) {
+                if (cds.utils.isdir(entry)) {
                     return false
                 }
                 return regexData.test(entry)
@@ -219,7 +225,7 @@ class HanaBuildPlugin extends InternalBuildPlugin {
         const destSrcDir = path.join(this.task.dest, "src")
 
         const allCsvFiles = getFiles(destSrcDir, (entry) => {
-            if (fs.statSync(entry).isDirectory()) {
+            if (cds.utils.isdir(entry)) {
                 return true
             }
             if (/\.hdbtabledata$/.test(entry)) {
@@ -243,7 +249,8 @@ class HanaBuildPlugin extends InternalBuildPlugin {
             const promises = []
             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 toHdbtabledata = cds.compile.to.hdbtabledata
+            if (!toHdbtabledata)  throw `hdbtabledata plugin not found – make sure to install package '@cap-js/hana'`
             const tableDataResult = await toHdbtabledata(model, options)
 
             for (let [tableData, { file, csvFolder }] of tableDataResult) {