@sap/cds-dk 6.3.1 → 6.4.0

package/lib/init/util/merge.js

@@ -55,7 +55,7 @@ async function mergeJSON(into, from, projectDescriptor, semantics) {
     return result
 }
 
-async function mergeYAML(into, from, projectDescriptor, semantics) {
+async function mergeYAML(into, from, projectDescriptor, semantics = {}) {
     const target =
         typeof into === 'string' ? await readYAML(into) :
         into instanceof YAML.Document ? into :
@@ -312,8 +312,25 @@ async function mergeYAML(into, from, projectDescriptor, semantics) {
     return target
 }
 
+async function removeFromYAML(name, keyPaths) {
+    const yaml = await readYAML(name)
+    for (const keyPath of keyPaths) {
+        let node = yaml
+        const keys = keyPath.split('.')
+        for (const [index, key] of keys.entries()) {
+            if (index === keys.length - 1) {
+                node.delete(key)
+            } else {
+                node = node.get(key)
+            }
+        }
+    }
+    await writeYAML(name, yaml)
+}
+
 module.exports = {
   sortDependencies,
   mergeJSON,
-  mergeYAML
+  mergeYAML,
+  removeFromYAML
 }

package/lib/init/util/projectReader.js

@@ -89,18 +89,21 @@ module.exports = class ProjectReader {
         cds.env // make sure env is initialized, otherwise we cannot set it (exotic case)
         cds.env = env
 
-        const root = this.projectPath
-        const nullLogger = { debug: () => {}, log: () => {}, warn: () => {}, error: () => {}, write: () => {}}
-        const buildTasks = await new BuildTaskFactory(nullLogger, cds).getTasks({ root, resolve: true, mta: false })
+        const nullLogger = { debug: () => { }, log: () => { }, warn: () => { }, error: () => { }, write: () => { } }
+        
+        // no file path resolving as the directories might not exist - e.g. cds add will create the mtx/sidecar folder
+        const buildTasks = await new BuildTaskFactory(nullLogger, cds).getTasks({ root: this.projectPath, resolve: false, mta: false })
 
         await Promise.all(buildTasks.map(async (task) => {
-            const relDestPath = path.relative(root, task.dest)?.replace(/\\/g, '/')
+            const srcPath = path.resolve(this.projectPath, task.src)
+            const srcFolder = path.basename(srcPath)
+            const relDestPath = path.join(env?.build?.target ?? "gen", task.dest || task.src)?.replace(/\\/g, '/')
 
             switch (task.for) {
                 case BUILD_TASK_HANA:
                     // check whether we have a hana service binding defined as a hana build task is returned by default for compatibility reasons if neither hana, nor sqlite has been defined
                     if (this._hasHanaServiceBinding(env)) {
-                        cap.db.push({ path: relDestPath, name: path.basename(task.src) })
+                        cap.db.push({ path: relDestPath, name: srcFolder })
                     }
                     break
 
@@ -109,8 +112,8 @@ module.exports = class ProjectReader {
                     cap.pLanguage = P_LANGUAGE_JAVA
                     cap.srv = {
                         path: relDestPath,
-                        name: path.basename(task.src),
-                        ext: await this._getJavaExtDescriptor(task)
+                        name: srcFolder,
+                        ext: await this._getJavaExtDescriptor(srcPath)
                     }
                     break
 
@@ -118,7 +121,7 @@ module.exports = class ProjectReader {
                 case BUILD_TASK_NODE_CF:
                     cap.srv = {
                         path: relDestPath,
-                        name: path.basename(task.src)
+                        name: srcFolder
                     }
                     break
 
@@ -142,12 +145,12 @@ module.exports = class ProjectReader {
     }
 
     /**
-     * Determines java specific properties for the given build task.
-     * @param {object} task
+     * Determines java specific properties for the given module source path.
+     * @param {object} srcPath
      */
-    async _getJavaExtDescriptor(task) {
+    async _getJavaExtDescriptor(srcPath) {
         // by default spring-boot:repackage is used creating an executable jar archive
-        const pomJson = await this._parseXml(path.join(task.src, 'pom.xml'))
+        const pomJson = await this._parseXml(path.join(srcPath, 'pom.xml'))
         if (pomJson) {
             const dependencies = pomJson?.project?.dependencies?.[0]?.dependency
             const isOldJavaRuntime = [...dependencies].some(d => /com\.sap\.cloud\.servicesdk/.test(d?.groupId?.[0]))