@sap/cds-dk 7.5.1 → 7.6.0

package/bin/add.js

@@ -10,53 +10,57 @@ module.exports = Object.assign(add, {
 
     *cds add* <feature | comma-separated list of features>
 
-    Adds one or more features to an existing project - grow as you go.
+    Add one or more features to an existing project - grow as you go.
 
-    The following features are supported so far:
+    The following features can be added:
 
-    *hana*                  - add support for SAP HANA
+      *hana*                  - add support for SAP HANA
 
-    *sqlite*                - add support for SQLite databases
+      *sqlite*                - add support for SQLite
 
-    *xsuaa*                 - add support for authentication via XSUAA
+      *postgres*              - add support for PostgreSQL
 
-    *multitenancy*          - add support for multitenancy
+      *liquibase*             - add support for Liquibase
 
-    *toggles*               - add support for feature toggles
+      *xsuaa*                 - add support for authentication via XSUAA
 
-    *extensibility*         - add support for extensibility
+      *multitenancy*          - add support for multitenancy
 
-    *approuter*             - add support for application routing
+      *toggles*               - add support for feature toggles
 
-    *local-messaging*       - add support for local messaging
+      *extensibility*         - add support for extensibility
 
-    *file-based-messaging*  - add support for file-based messaging
+      *approuter*             - add support for application routing
 
-    *enterprise-messaging*  - add support for SAP Event Mesh
+      *local-messaging*       - add support for local messaging
 
-    *redis-messaging*       - add support for Redis messaging
+      *file-based-messaging*  - add support for file-based messaging
 
-    *kibana*                - add support for Kibana formatting
+      *enterprise-messaging*  - add support for SAP Event Mesh
 
-    *mta*                   - add support for MTA-based deployment
+      *redis-messaging*       - add support for Redis messaging
 
-    *cf-manifest*           - add support for CF-native deployment
+      *kibana*                - add support for Kibana formatting
 
-    *helm*                  - add support for Helm-based Kyma deployment
+      *mta*                   - add support for MTA-based deployment
 
-    *html5-repo*            - add support for the HTML5 repository
+      *cf-manifest*           - add support for CF-native deployment
 
-    *pipeline*              - add files for CI/CD pipeline integration
+      *helm*                  - add support for Helm-based Kyma deployment
 
-    *tiny-sample*           - add minimal sample files
+      *html5-repo*            - add support for the HTML5 repository
 
-    *sample*                - add sample files including Fiori UI
+      *pipeline*              - add files for CI/CD pipeline integration
 
-    *data*                  - add CSV headers for modeled entities
+      *tiny-sample*           - add minimal sample files
 
-    *typer*                 - add type generation for CDS models
+      *sample*                - add sample files including Fiori UI
 
-    *lint*                  - add support for CDS Lint
+      *data*                  - add CSV headers for modeled entities
+
+      *typer*                 - add type generation for CDS models
+
+      *lint*                  - add support for CDS Lint
 
 
 # OPTIONS

package/bin/bind.js

@@ -1,7 +1,7 @@
 module.exports = Object.assign(cds_bind, {
-    options: ['--to', '--for', '--on', '--kind', '--output-file'],
+    options: ['--to', '--for', '--on', '--kind', '--output-file', '--to-app-services', '--no-create-service-key'],
     flags: ['--exec'],
-    shortcuts: ['-2', '-4', '-n', '-k', '-o'],
+    shortcuts: ['-2', '-4', '-n', '-k', '-o', '-a'],
     help: `
 # SYNOPSIS
 
@@ -21,33 +21,48 @@ module.exports = Object.assign(cds_bind, {
 # OPTIONS
 
     *-2 | --to* <instance>[:<key>] | <service-binding> | <secret>
-        bind to a given Cloud Foundry instance, Kubernetes service binding or Kubernetes secret.
+
+        Bind to a given Cloud Foundry instance, Kubernetes service binding or Kubernetes secret.
 
     *-4 | --for* <profile>
-        store binding information under <profile> in *.cdsrc-private.json*. Default *hybrid* is used
-        if '--for' is not specified
+
+        Profile to store binding information. Defaults to *hybrid*.
 
     *-n | --on* cf | k8s
-        bind to service on Cloud Foundry or Kubernetes, defaults to Cloud Foundry
+
+        Target platform (Cloud Foundry or Kubernetes) to bind to. Defaults to *cf*.
 
     *-k | --kind* <kind>
-        the kind of service
+
+        Kind of the service.
 
     *-o | --output-file* <path>
-        save bindings to the given *.cdsrc.json* or *package.json* file. Default is *.cdsrc-private.json*.
-        If *path* is a directory, then it will save it to the *.cdsrc.json* file in that directory.
+
+        Output file for added binding information. Use this option if binding configuration should
+        be added to *package.json* or *.cdsrc.json*. Defaults to *.cdsrc-private.json*.
+        If *path* is a directory, the *.cdsrc.json* file in that directory is used.
+
+    *-a | --to-app-services <app>* (Beta)
+
+        Bind to a given application (Cloud Foundry only).
+
+    *--no-create-service-key*
+
+        Skip automatic creation of service keys.
 
 # EXAMPLE
 
-    cds bind --to my-hdi-container
-    cds bind --to my-hdi-container,my-xsuaa
-    cds bind uaa --to my-xsuaa:my-xsuaa-key --kind xsuaa --for myprofile
+    cds bind --to bookshop-db
+    cds bind --to bookshop-db,bookshop-auth
+    cds bind auth --to bookshop-auth:bookshop-auth-key --kind xsuaa --for my-profile
 
-    cds bind --to my-hdi-container --output-file .
-    cds bind --to my-hdi-container --output-file package.json
+    cds bind --to bookshop-db --output-file .
+    cds bind --to bookshop-db --output-file package.json
 
-    cds bind --to my-hdi-container --on k8s
-    cds bind --to my-hdi-container --for my-profile
+    cds bind --to bookshop-db --on k8s
+    cds bind --to bookshop-db --for my-profile
+
+    cds bind --to-app-services bookshop-srv
 `
 });
 
@@ -72,29 +87,41 @@ async function cds_bind(args, options) {
         throw 'Option --profile is no longer supported. Use --for instead to specify the profile to use when storing connection settings.';
     }
 
-    if (!options.to) {
-        throw `Use option --to or -2 to specify the target instance, e.g. cds bind --to myInstance:myService`;
+    const { on, 'to-app-services': app, to } = options
+
+    if (on === 'k8s' && app) {
+        throw 'Option --to-app-services is only supported for Cloud Foundry.';
     }
 
-    if (args.length > 1) {
-        throw `Too many arguments: Please specify only one or no service.`;
+    if (!to && !app) {
+        throw `Use option --to or -2 to specify the target instance, e.g. cds bind --to myInstance:myService`;
     }
 
-    options.serviceArg = args[0]
-    options.targets = options.to.split(/,/g);
+    const outputFile = options['output-file']
+    if (app) {
+        const services = await require('../lib/util/cf').getServices(app)
+        // Later: optimize logging for parallelization, services.forEach(service => bind({ ...options, to: service.name, outputFile }))
+        for (const service of services.filter(s => Object.keys(s.credentials).length > 0)) {
+            await bind({ ...options, to: service.name, outputFile })
+        }
+    } else {
+        if (args.length > 1) {
+            throw `Too many arguments: Please specify only one or no service.`;
+        }
 
-    if (options.targets.length >= 2 && options.serviceArg) {
-        throw `Service argument cannot be specified together with multiple targets ('--to') services. Use one service per call or omit the service argument.`;
-    }
+        options.serviceArg = args[0]
+        options.targets = options.to.split(/,/g);
 
-    if (options.targets.length >= 2 && options.kind) {
-        throw `The option '--kind' cannot be specified together with multiple targets ('--to') services. Use one service per call or omit the '--kind' option.`;
-    }
+        if (options.targets.length >= 2 && options.serviceArg) {
+            throw `Service argument cannot be specified together with multiple targets ('--to') services. Use one service per call or omit the service argument.`;
+        }
 
-    await bind({
-        ...options,
-        outputFile: options['output-file']
-    });
+        if (options.targets.length >= 2 && options.kind) {
+            throw `The option '--kind' cannot be specified together with multiple targets ('--to') services. Use one service per call or omit the '--kind' option.`;
+        }
+
+        await bind({ ...options, outputFile });
+    }
 }
 
 async function cds_bind_exec(command) { // eslint-disable-lint

package/bin/build.js

@@ -80,7 +80,7 @@ module.exports = Object.assign(build, {
         a tarball will be created in folder 'gen/srv'. Dependencies in package.json
         will be adapted to point to the correct tarball file URL.
         Contents is packaged based on the rules of the 'npm pack' command.
-
+        
 # EXAMPLES
 
    *cds* build

package/bin/cds.js

@@ -45,12 +45,12 @@ const cli = {
         }
         const args = this.args(task, argv)
         args[0].push(...appendArgs)
-        if (args[1]?.['resolve-bindings']) await _resolveBindings({ silent: cmd === 'env' })
         cds.cli = {
           command: cmd,
           argv: args[0],
           options: args[1],
         }
+        if (args[1]?.['resolve-bindings']) await _resolveBindings({ silent: cmd === 'env' })
         return await task.apply(this, args)
       }
     } catch (e) {

package/bin/env.js

@@ -63,12 +63,7 @@ async function env ([cmd, key, value], options={}) {
   )
 
   let env = cds.env
-  if (options["resolve-bindings"]) {
-    const BindingManager = require('../lib/bind/bindingManager')
-    const bindingManager = new BindingManager({ env, silent: true })
-    const bindingEnv = await bindingManager.bindingEnv()
-    Object.assign(process.env, bindingEnv)
-  }
+  // REVISIT: Currently only read in env.test.js
   env['_home_cds-dk'] = path.resolve(__dirname, '..')  // to help tools find the DK
 
   if (!options.for && options.mocked) await cds.service.bindings

package/bin/init.js

@@ -28,7 +28,11 @@ module.exports = Object.assign(init, {
 
         *hana*                  - add support for SAP HANA
 
-        *sqlite*                - add support for SQLite databases
+        *sqlite*                - add support for SQLite
+
+        *postgres*              - add support for PostgreSQL
+
+        *liquibase*             - add support for Liquibase
 
         *xsuaa*                 - add support for authentication via XSUAA
 
@@ -44,9 +48,9 @@ module.exports = Object.assign(init, {
 
         *enterprise-messaging*  - add support for SAP Event Mesh
 
-        *redis-messaging*       - add support for Redis messaging
+        *file-based-messaging*  - add support for file-based messaging
 
-        *kibana*                - add support for Kibana formatting
+        *redis-messaging*       - add support for Redis messaging
 
         *mta*                   - add support for MTA-based deployment
 

package/bin/logout.js

@@ -44,8 +44,8 @@ module.exports = Object.assign(logout, {
     *--clear-invalid*
     
         Enter special mode to clear all tokens and settings for any project
-        folders which no longer exist in the file system. Ignores any other
-        command-line arguments.
+        folders which no longer exist in the file system. Additionally, removes
+        expired tokens. Ignores any other command-line arguments.
         
 `;
     }})

package/bin/migrate.js

@@ -38,7 +38,7 @@ module.exports = Object.assign(migrate, {
 
         Do a dry-run only. Only run a verification of the extension migration.
 
-    *--skip-verification
+    *--skip-verification*
 
         Skip verification step. Does not check for potential deployment
         differences.

package/bin/version.js

@@ -106,6 +106,7 @@ function _markdown (versions) {
   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)

package/bin/watch.js

@@ -64,7 +64,14 @@ const t = module.exports.codes = {
   orange: colors ? '\x1b[38;2;255;140;0m' : '' // darker orange, works with bright and dark background
 }
 const extDefaults = 'cds,csn,csv,ts,mjs,cjs,js,json,properties,edmx,xml,env'
-const ignore = RegExp(`(_out\\${sep}|node_modules\\${sep}|@cds-models\\${sep}|@types\\${sep}|app(\\${sep}.+)?\\${sep}((webapp|dist|target)\\${sep}|\\.cds-services\\.json$|tsconfig\\.json$|.*\\.tsbuildinfo$))`)
+const ignore = RegExp(
+  `(node_modules|_out|@types|@cds-models)\\${sep}` +
+  `|app(\\${sep}.+)?\\${sep}(` +
+    `(webapp|dist|target)\\${sep}|` +
+    `tsconfig\\.json$|` +
+    `.*\\.tsbuildinfo$` +
+  ')'
+)
 
 async function watch ([cwd], {
   args = ['serve', 'all'],

package/lib/bind/bindingUtil.js

@@ -14,14 +14,13 @@ const KindToRequiresNameMap = {
     'enterprise-messaging': 'messaging',
     'enterprise-messaging-amqp': 'messaging',
     'enterprise-messaging-http': 'messaging',
-    'enterprise-messaging-shared': 'messaging'
+    'enterprise-messaging-shared': 'messaging',
+    'multitenancy': 'multitenancy'
 }
 
-const PreferredKinds = [
-    'hana-cloud',
-    'xsuaa', // REVISIT: remove with ^8
-    'xsuaa-auth'
-];
+const PreferredKinds = {
+    multitenancy:1, 'hana-cloud':1, xsuaa:1, 'xsuaa-auth':1, 'ias-auth':1, 'saas-registry':1
+};
 
 const PLATFORM_TYPES = {
     'cf': 'Cloud Foundry',
@@ -64,29 +63,24 @@ class BindingUtil {
             throw new Error(`Please provide a service kind or update @sap/cds version to use the kind detection.`);
         }
 
-        function findKindFor(kind, service) {
-            const vcapService = env._find_credentials_for_required_service(kind, service, vcapServices);
-            if (!vcapService) return;
-            if (!Object.values(requires).find(require => require !== service && require.kind == kind))
-                vcapService.service.kindCandidates.push(kind);
-        }
-
         const requires = env.requires.kinds || {};
-        for (const kind of Object.keys(requires)) {
-            const requireService = requires[kind];
-            findKindFor(kind, requireService);
-            findKindFor(kind, { kind });
+        for (const [kind, service] of Object.entries(requires)) {
+            const vcapService = env._find_credentials_for_required_service(kind, service, vcapServices);
+            if (!vcapService) continue;
+            const isUniqueKind = !Object.values(requires).some(otherService =>
+                otherService !== service && otherService.kind === kind
+            )
+            if (isUniqueKind) vcapService.service.kindCandidates.push(kind);
         }
 
         // Check if one "kind" per service was found
         for (const service of services) {
-            const preferredKind = service.kindCandidates.find(kind => PreferredKinds.indexOf(kind) >= 0);
+            const preferredKind = service.kindCandidates.find(kind => kind in PreferredKinds);
             if (preferredKind) {
                 service.kind = preferredKind;
-            } if (service.kindCandidates.length === 1) {
+            } else if (service.kindCandidates.length === 1) {
                 service.kind = service.kindCandidates[0];
             }
-
             delete service.kindCandidates;
         }
     }

package/lib/bind/cfKeyProvider.js

@@ -8,7 +8,7 @@ require('../util/axios').pruneErrors();
 const { URL } = require('url');
 const { bold, highlight } = require('../util/term');
 
-class CFKeyProvider {
+module.exports = new class CFKeyProvider {
     async getCfSpaceInfo() {
         DEBUG?.('getting space info');
 
@@ -93,17 +93,18 @@ class CFKeyProvider {
     }
 
     async _resolveManagedService(instanceObj, instance, key, org, space) {
-        let keyObj
-        try {
-            keyObj = await this.getKey({ names: key, service_instance_guids: instanceObj.guid });
-        } catch (error) {
+        const create = (cds.cli.command === 'bind' || cds.cli.command === 'deploy') && !cds.cli.options['no-create-service-key']
+        const silent = (cds.cli.options.json || cds.cli.command === 'env') && !DEBUG
+        const credentials = await cfUtil.getOrCreateServiceKey(instanceObj, key, {}, { create, silent });
+
+        if (!credentials) {
             let message = `No service key ${highlight(key)} found for service instance ${highlight(instance)}.\n\n`;
             message += `Use ${bold(`cf create-service-key ${instanceObj.name} ${key} [-c ...]`)} to create the required service key.`;
             throw message;
         }
+
         const planObj = await this.getPlans({ guids: instanceObj.relationships.service_plan.data.guid });
         const offeringObj = await this.getOfferings({ guids: planObj.relationships.service_offering.data.guid });
-        const keyCredentialsObj = await BatchRequest.req(this.target, `/v3/service_credential_bindings/${encodeURIComponent(keyObj.guid)}/details`);
         const resolvedBinding = {
             binding: {
                 type: "cf",
@@ -119,7 +120,7 @@ class CFKeyProvider {
                 },
                 resolved: true,
             },
-            credentials: keyCredentialsObj.credentials
+            credentials
         };
 
         return resolvedBinding;
@@ -237,7 +238,6 @@ class BatchRequest {
     static async req(target, urlPath) {
         const url = new URL(urlPath, target.apiEndpoint);
         DEBUG?.(`_req: ${url.toString()}`);
-
         const result = await axios.get(url.toString(), {
             headers: {
                 authorization: target.authorization
@@ -246,5 +246,3 @@ class BatchRequest {
         return result.data;
     }
 }
-
-module.exports = new CFKeyProvider()

package/lib/bind/index.js

@@ -33,7 +33,7 @@ async function bind(options) {
     }
 
     const onText = { 'cf': 'Cloud Foundry', 'k8s': 'Kubernetes' }[on];
-    logger.log(`Retrieving data from ${onText}...`);
+    if (!options['to-app-services']) logger.log(`Retrieving data from ${onText}...`);
     let resolvedServices
 
     const targets = options.to.split(/,/g);
@@ -94,7 +94,9 @@ async function bind(options) {
     });
 
     const isJavaProject = await checkIsJavaProject(cds.root);
-    logger.log(`${info('TIP:')} Run with cloud bindings: ${bold(runCmd(options.for, isJavaProject))}`);
+    if (!cds.cli.options['to-app-services']) {
+        logger.log(`${info('TIP:')} Run with cloud bindings: ${bold(runCmd(options.for, isJavaProject))}`);
+    }
 }
 
 function runCmd(profile, isJavaProject) {

package/lib/build/buildTaskFactory.js

@@ -2,8 +2,8 @@ const fs = require('fs')
 const path = require('path')
 const cds = require('../cds')
 const BuildTaskProviderFactory = require('./buildTaskProviderFactory')
-const { hasJavaNature, getProperty, flatten, getDefaultModelOptions } = require('./util')
-const { FILE_EXT_CDS, BUILD_TASK_JAVA_CF, BUILD_TASK_JAVA } = require("./constants")
+const { hasJavaNature, getProperty, flatten, getDefaultModelOptions, hasOptionValue } = require('./util')
+const { FILE_EXT_CDS, BUILD_TASK_JAVA_CF, BUILD_TASK_JAVA, CONTENT_WS } = require("./constants")
 const term = require('../util/term')
 const DEBUG = cds.debug('cli|build')
 
@@ -55,27 +55,24 @@ class BuildTaskFactory {
         let tasks = BuildTaskFactory._getExistingTasks()
         if (tasks.length === 0) {
             tasks = await this.providerFactory.lookupTasks()
+            this._applyCliOptions(tasks)
         } else {
+            this._applyCliOptions(tasks)
             // 1. apply default values including task.for and task.use and ensure that for all tasks a provider exists - throwing error otherwise
             await this.providerFactory.applyTaskDefaults(tasks)
             // ensure that dependencies get wired up before filtering
             await this.providerFactory.lookupTasks(tasks, true)
         }
 
-        // 3. filters the list of build tasks and adapts according to given CLI options
+        // 2. filters the list of build tasks
         // Note: A new task might get created, e.g. 'cds build --for hana' will enforce a hana build even if sqlite has been configured
         let existingTasks = tasks
-        tasks = this._applyCliOptionsFilter(tasks)
+        tasks = await this._filterTasksForCli(tasks)
         if (tasks.length === 0) {
             return tasks
         }
-        // a new array is returned to indicate new build tasks have been created
-        if (tasks !== existingTasks) {
-            // a different task shall be executed
-            await this.providerFactory.applyTaskDefaults(tasks)
-        }
 
-        // 2. add dependencies
+        // 3. add dependencies
         existingTasks = [...tasks]
         await this.providerFactory.lookupTasks(tasks, true)
         if (tasks.length > existingTasks.length) {
@@ -85,7 +82,7 @@ class BuildTaskFactory {
         }
 
         // obligatory task defaults shared by all tasks
-        BuildTaskFactory._applyCommonTaskDefaults(tasks)
+        await BuildTaskFactory._applyCommonTaskDefaults(tasks)
 
         this._setDefaultBuildTargetFolder(tasks)
         return tasks
@@ -95,11 +92,26 @@ class BuildTaskFactory {
         return Array.isArray(getProperty(cds.env, 'build.tasks')) ? JSON.parse(JSON.stringify(cds.env.build.tasks)) : []
     }
 
-    static _applyCommonTaskDefaults(tasks) {
-        const modelPaths = getDefaultModelOptions()
-
+    static async _applyCommonTaskDefaults(tasks) {
+        // normalize model options
+        tasks.forEach(task => {
+            if (task.options?.model && !Array.isArray(task.options.model)) {
+                task.options.model = [task.options.model]
+            }
+        })
+        // there must be at least one task without model options
+        if (!tasks.some(task => !task.options?.model?.length > 0)) {
+            return
+        }
+        const modelPaths = await getDefaultModelOptions()
+        let wsModelPaths
+        // calculate only once
+        if (tasks.some(task => hasOptionValue(task.options?.[CONTENT_WS], true))) {
+            wsModelPaths = await getDefaultModelOptions(true)
+        }
+        // set default model options
         tasks.forEach(task => {
-            this._setTaskModelOptions(task, modelPaths)
+            this._setTaskModelOptions(task, hasOptionValue(task.options?.[CONTENT_WS], true) ? wsModelPaths : modelPaths)
             if (!task.src) {
                 throw new Error(`Invalid build task definition - value of property 'src' is missing in [${task.for || task.use}].`)
             }
@@ -134,7 +146,7 @@ class BuildTaskFactory {
         return false
     }
 
-    _applyCliOptionsFilter(tasks) {
+    async _filterTasksForCli(tasks) {
         const options = this.options
         // filter tasks using either option for, use, src
         let resultTasks = tasks.filter(task => {
@@ -149,6 +161,8 @@ class BuildTaskFactory {
                     task.src = options.src
                 }
                 resultTasks.push(task)
+                this._applyCliOptions(resultTasks)
+                await this.providerFactory.applyTaskDefaults(resultTasks)
             }
         } else if (resultTasks.length <= tasks.length) {
             // return the same array as long as it contains a subset of the given tasks
@@ -156,7 +170,6 @@ class BuildTaskFactory {
             resultTasks.forEach(task => tasks.push(task))
             resultTasks = tasks
         }
-        this._applyCliOptions(resultTasks)
         return resultTasks
     }
 
@@ -176,14 +189,12 @@ class BuildTaskFactory {
 
     static _setTaskModelOptions(task, defaultModelPaths) {
         task.options = task.options || {}
-        if (!task.options.model || Array.isArray(task.options.model) && task.options.model.length === 0) {
+        if (!task.options.model?.length > 0) {
             defaultModelPaths = new Set(defaultModelPaths)
             if (task.src) {
                 defaultModelPaths.add(task.src)
             }
             task.options.model = [...defaultModelPaths]
-        } else if (!Array.isArray(task.options.model)) {
-            task.options.model = [task.options.model]
         }
     }
 

package/lib/build/constants.js

@@ -26,13 +26,14 @@ exports.FLAVOR_LOCALIZED_EDMX = "flavorLocalizedEdmx"           // create locali
 exports.CONTENT_EDMX = "contentEdmx"                            // create EDMX for required languages - ENABLED by default
 exports.CONTENT_LOCALIZED_EDMX = "contentLocalizedEdmx"         // create EDMX for required languages - ENABLED for Java by default
 exports.CONTENT_PACKAGE_JSON = "contentPackageJson"             // create package.json file if not existing, or modify existing package.json - ENABLED by default
-exports.CONTENT_PACKAGELOCK_JSON = "contentPackageLockJson"     // copy package-lock.json file if existing into deployment folder - ENABLED by default
-exports.CONTENT_HDBTABLEDATA = "contentHdbtabledata"            // create .hdbtabledata files for .csv files if not existing - ENABLED by default
-exports.CONTENT_NPMRC = "contentNpmrc"                          // copy .npmrc file if existing into deployment folder - ENABLED by default
-exports.CONTENT_CDSRC_JSON = "contentCdsrcJson"                 // copy .cdsrc.json file if existing into deployment folder - ENABLED by default
-exports.CONTENT_NODE_MODULES = "contentNodeModules"             // copy node_modules folder if existing into deployment folder - DISABLED by default
-exports.CONTENT_ENV = "contentEnv"                              // copy .env file if existing into deployment folder - DISABLED by default
-exports.CONTENT_DEFAULT_ENV_JSON = "contentDefaultEnvJson"      // copy default-env.json file if existing into deployment folder - DISABLED by default
+exports.CONTENT_PACKAGELOCK_JSON = "contentPackageLockJson"     // copy package-lock.json file into deployment folder - ENABLED by default
+exports.CONTENT_HDBTABLEDATA = "contentHdbtabledata"            // create .hdbtabledata files for .csv files if not already existing - ENABLED by default
+exports.CONTENT_NPMRC = "contentNpmrc"                          // copy .npmrc file into deployment folder - ENABLED by default
+exports.CONTENT_CDSRC_JSON = "contentCdsrcJson"                 // copy .cdsrc.json file into deployment folder - ENABLED by default
+exports.CONTENT_NODE_MODULES = "contentNodeModules"             // copy node_modules folder into deployment folder - DISABLED by default
+exports.CONTENT_ENV = "contentEnv"                              // copy .env file into deployment folder - DISABLED by default
+exports.CONTENT_DEFAULT_ENV_JSON = "contentDefaultEnvJson"      // copy default-env.json file into deployment folder - DISABLED by default
+exports.CONTENT_WS = "ws"                                       // determine model paths including submodules + CONTENT_SUBMODULES_HANA - DISABLED by default
 
 exports.CSV_FILE_TARGET = "csvFileTarget"                       // target folder when copying CSV files to the deployment target folder ./db/src/gen/*, default is 'data'
 exports.CSV_FILE_DETECTION = "csvFileDetection"                 // detect CSV files based on CDS model location - ENABLED by default
@@ -43,7 +44,7 @@ exports.IGNORE_DEFAULT_MODELS = "ignoreDefaultModels"           // do not add de
 
 exports.FOLDER_GEN = "gen"
 exports.FILE_EXT_CDS = ".cds"
-exports.MTX_SIDECAR_FOLDER = "mtx/sidecar"                  // default name of the mtx sidecar folder
+exports.MTX_SIDECAR_FOLDER = "mtx/sidecar"                      // default name of the mtx sidecar folder
 exports.DEFAULT_CSN_FILE_NAME = "csn.json"
 // REVISIT: the models are not required if a custom server.js file is used for MTX bootstrap
 exports.NODEJS_MODEL_EXCLUDE_LIST = ['@sap/cds/srv/mtx', '@sap/cds-mtxs/srv/bootstrap']

package/lib/build/provider/featureToggleBuildPlugin.js

@@ -1,4 +1,3 @@
-const fs = require('fs')
 const path = require('path')
 const cds = require('../../cds')
 const { DEFAULT_CSN_FILE_NAME, OUTPUT_MODE, OUTPUT_MODE_RESULT } = require('../constants')
@@ -65,7 +64,7 @@ class FeatureToggleBuildPlugin extends InternalBuildPlugin {
     }
 
     async _resolveSourcePaths(csn) {
-        const regex = new RegExp(path.resolve(cds.root, this.ftsName).replace(/\\/g, '\\\\') + '[/|\\\\](?<ftName>[^/|\\\\]*)')
+        const regex = new RegExp(this.ftsName + '[/|\\\\](?<ftName>[^/|\\\\]*)')
         let paths = { base: [] }
 
         // add ROOT source file paths for the base model
@@ -77,11 +76,6 @@ class FeatureToggleBuildPlugin extends InternalBuildPlugin {
             return acc
         }, [])
 
-        // keep existing behavior and return paths returned by cds.resolve if features are not supported by this project
-        if (!fs.existsSync(path.join(cds.root, this.ftsName))) {
-            return paths
-        }
-
         // add source file paths for the features
         paths.features = csn['$sources'].reduce((acc, file) => {
             const match = file.match(regex)