@sap/cds-dk 8.9.3 → 9.0.4

package/lib/build/provider/internalBuildTaskProvider.js

@@ -102,20 +102,12 @@ class InternalBuildTaskProvider extends BuildTaskProvider {
     }
 
     _createDbTask(src, taskOptions) {
-        DEBUG?.("determining database kind")
         if (!src || InternalBuildTaskProvider._isMtxExtension()) {
             return null
         }
         let task = null
         if (this._useHana()) {
             DEBUG?.("found HANA database")
-            // legacy build supports dest property
-            const compileDest = cds.env.data?.dest
-            if (compileDest) {
-                //../db/src/gen
-                // compileDest is relative to src folder in modular build - resolve correctly
-                taskOptions.compileDest = path.relative(path.resolve(cds.root, src), path.resolve(cds.root, compileDest))
-            }
             task = {
                 src: src,
                 for: BUILD_TASK_HANA,
@@ -135,15 +127,9 @@ class InternalBuildTaskProvider extends BuildTaskProvider {
         if (cds.env.requires.db?.kind) {
             return false
         }
-        // check whether cds config represents a legacy build system config for which requires.db was not configured
-        // Note: compat layer sets requires.db: {}
-        const userEnv = cds.env.for("cds", cds.root, false)
-        return userEnv && (userEnv.data?.model || userEnv.service?.model)
     }
 
     _createMtxTask(src) {
-        DEBUG?.("determining MTX architecture")
-
         // preserve order of creation
         if (InternalBuildTaskProvider._isMtxExtension()) {
             DEBUG?.("MTX extension app")
@@ -194,7 +180,6 @@ class InternalBuildTaskProvider extends BuildTaskProvider {
     }
 
     _createSrvTask(src, taskOptions) {
-        DEBUG?.("determining implementation technology")
         if (!src || InternalBuildTaskProvider._isMtxExtension()) {
             return null
         }
@@ -208,13 +193,7 @@ class InternalBuildTaskProvider extends BuildTaskProvider {
     }
 
     _createJavaTask(src, taskOptions) {
-        DEBUG?.("found implementation technology Java")
-        // legacy build supports dest property
-        const compileDest = cds.env.service?.dest
-        if (compileDest) {
-            // compileDest is relative to src folder in modular build - resolve correctly
-            taskOptions.compileDest = path.relative(path.resolve(cds.root, src), path.resolve(cds.root, compileDest))
-        }
+        DEBUG?.("found Java runtime")
         return {
             src: src,
             for: BUILD_TASK_JAVA,
@@ -223,7 +202,7 @@ class InternalBuildTaskProvider extends BuildTaskProvider {
     }
 
     _createNodeTask(src, taskOptions) {
-        DEBUG?.("found implementation technology Nodejs")
+        DEBUG?.("found Nodejs runtime")
         if (!fs.existsSync(path.join(cds.root, 'package.json'))) {
             throw new BuildError(`No 'package.json' found in project root folder '${cds.root}'`)
         }
@@ -295,7 +274,7 @@ class InternalBuildTaskProvider extends BuildTaskProvider {
             if (!acc) {
                 let resourcePath = path.resolve(cds.root, resource)
                 if (fs.existsSync(resourcePath)) {
-                    if (fs.lstatSync(resourcePath).isDirectory()) {
+                    if (cds.utils.isdir(resourcePath)) {
                         acc = resource
                     } else {
                         // represents file

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

@@ -55,7 +55,7 @@ class JavaBuildPlugin extends EdmxBuildPlugin {
 
     async _copyNativeContent(src, dest) {
         return super.copyNativeContent(src, dest, (entry) => {
-            if (fs.statSync(entry).isDirectory()) {
+            if (cds.utils.isdir(entry)) {
                 return true // using common filter for folders
             } else {
                 const extname = path.extname(entry)

package/lib/build/provider/mtx-extension/index.js

@@ -93,7 +93,7 @@ class MtxExtensionBuildPlugin extends InternalBuildPlugin {
         // copy handlers from srv folder
         const folder = path.join(cds.root, cds.env.folders.srv).replace(/[/\\]$/, '')
         await this.copyNativeContent(cds.root, destExt, res => {
-            if (fs.statSync(res).isDirectory()) {
+            if (cds.utils.isdir(res)) {
                 return res.startsWith(folder)
             }
             if (path.dirname(res).startsWith(folder) && /\.js$/.test(res)) {
@@ -122,19 +122,14 @@ class MtxExtensionBuildPlugin extends InternalBuildPlugin {
     }
 
     _linter() {
-        let linter
         try {
             // Make sure cds-mtxs APIs are loaded, from local mtxs preferrably
-            linter = require(require.resolve('@sap/cds-mtxs', { paths: [cds.root, __dirname] })).xt?.linter
-            if (!linter) {
-                this.pushMessage('MTXS linter cannot be loaded. Update of @sap/cds-dk and @sap/cds-mtxs modules required? Skipping extension model lint step.')
-                return null // too old mtxs
-            }
+            const mtxs = require(require.resolve('@sap/cds-mtxs', { paths: [cds.root, __dirname] }))
+            return mtxs.xt.linter
         } catch (e) {
             if (e.code !== 'MODULE_NOT_FOUND') throw e
             this.pushMessage('MTXS linter cannot be loaded, @sap/cds-mtxs not installed. Skipping extension model lint step.')
         }
-        return linter
     }
 
     static _getSaasPkgPath() {

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

@@ -10,6 +10,12 @@ const { OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM, ODATA_VERSION_V2, FOLDER_GEN, CONTE
 const { WARNING } = EdmxBuildPlugin
 const LOG = cds.log('cli|build'), DEBUG = cds.debug('cli|build')
 
+/**
+ * @param {T | T[]} x
+ * @returns {T[]}
+ */
+const arrayify = x => Array.isArray(x) ? x : [x]
+
 class NodejsBuildPlugin extends EdmxBuildPlugin {
     init() {
         super.init()
@@ -99,7 +105,7 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         // 1. copy all files to 'destSrv' except those contained in the blocklist (including node_modules)
         // project/srv -> 'gen/srv/srv'
         await super.copyNativeContent(src, destSrv, (entry) => {
-            if (fs.statSync(entry).isDirectory()) {
+            if (cds.utils.isdir(entry)) {
                 // TODO shall not copy language bundles - return !/(\/|\\)(node_modules|_i18n)(\/|\\)?$/.test(entry)
                 return !/(\/|\\)node_modules(\/|\\)?$/.test(entry)
             }
@@ -149,7 +155,7 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         srvAllowList = new RegExp(srvAllowList)
 
         await super.copyNativeContent(src, dest, (entry) => {
-            if (fs.statSync(entry).isDirectory()) {
+            if (cds.utils.isdir(entry)) {
                 return folders.some(folder => entry.startsWith(folder))
             }
             if (/\.js$|\.properties$/.test(entry)) {
@@ -162,17 +168,20 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
     async _packWorkspaceDependencies(dest) {
         const wsRoot = findWorkspaceRoot(cds.root)
         const appPkg = require(path.join(dest, 'package.json'))
+        const allWorkspaces = await getWorkspaces(wsRoot, true, false);
         let workspaces
         if (this.task.options.workspaces) {
-            workspaces = Array.isArray(this.task.options.workspaces) ? this.task.options.workspaces : [this.task.options.workspaces]
+            const relevantWorkspaces = new Set(arrayify(this.task.options.workspaces))
+            workspaces = allWorkspaces
+                .filter(ws => relevantWorkspaces.has(ws.workspace))
         } else {
             // devDependencies are not considered
-            workspaces = await getWorkspaces(wsRoot, true, false);
+            workspaces = allWorkspaces
         }
         if (workspaces.length) {
             let pkgDescriptors
             try {
-                pkgDescriptors = await NodejsBuildPlugin._execNpmPack(dest, wsRoot, workspaces)
+                pkgDescriptors = await NodejsBuildPlugin._execNpmPack(dest, wsRoot, workspaces.map(ws => ws.workspace))
             } catch (e) {
                 DEBUG?.(e)
                 throw new BuildError(`Failed to package npm workspace dependencies\n${e.message}`)
@@ -182,7 +191,13 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
                 for (const pkgDescriptor of pkgDescriptors) {
                     const { name, filename: fileName } = pkgDescriptor
                     const filePath = path.join(dest, fileName)
-                    if (appPkg.dependencies?.[name]) {
+                    // we pack workspaces that are not directly part of appPkg.dependencies
+                    // to include transitive dependencies, i.e. we are packing A, which has a dep
+                    // on workspace B, which has a dep on C. A will not have a direct dependency
+                    // on C, but it will be included in the build transitively, and therefore
+                    // has to be added to the package.json as well, so they are available for the
+                    // packaged B.
+                    if (appPkg.dependencies?.[name] || workspaces.some(ws => ws.packageName === name)) {
                         appPkg.dependencies[name] = `file:${fileName}`
                         this.pushFile(filePath)
                         changed |= true
@@ -197,6 +212,13 @@ class NodejsBuildPlugin extends EdmxBuildPlugin {
         }
     }
 
+    /**
+     * @param {import('fs').PathLike} dest - destination folder
+     * @param {import('fs').PathLike} wsRoot - workspace root folder
+     * @param {string[]} workspaces - list of workspace names
+     * @returns {Promise<JSON>} - returns a promise that resolves to the result of the command
+     * @private
+     */
     static async _execNpmPack(dest, wsRoot, workspaces) {
         const args = ['pack', '-ws', '--json', `--pack-destination=${dest}`]
         workspaces.forEach(w => args.push(`-w=${w}`))