@sap/cds-dk 4.9.0 → 4.9.3

package/CHANGELOG.md

@@ -6,6 +6,36 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## Version 4.9.3 - 2022-04-27
+
+### Changed
+
+- `cds init` uses latest Maven Java archetype version 1.23.1 for creating Java projects.
+- Include `@sap/cds` 5.9.3
+
+### Fixed
+
+- `cds add cf-manifest` now uses the correct `application` plan for the `xsuaa` service
+- `cds login`, `cds activate`: correctly include response in auth errors
+- The SAP HANA and MTA options in the project wizard in BAS now work again
+
+## Version 4.9.2 - 2022-04-11
+
+### Changed
+
+- Include `moment` 2.29.2, fixing CVE-2022-24785
+- Include `@sap/cds` 5.9.2
+- Include `@sap/eslint-plugin` 2.3.5
+
+## Version 4.9.1 - 2022-04-01
+
+### Changed
+
+- `cds init` uses latest Maven Java archetype version 1.23.0 for creating Java projects.
+- Include `@sap/cds` 5.9.1
+- Include `@sap/cds-compiler` 2.13.8
+- Include `@sap/eslint-plugin` 2.3.4
+
 ## Version 4.9.0 - 2022-03-28
 
 ### Added

package/lib/client/auth_manager.js

@@ -24,7 +24,6 @@ function addUrlInfo(params, authData) {
 function getTokenUrl(params) {
     const tokenUrl = new URL(params.get('tokenUrl'));
     tokenUrl.search = `subdomain=${params.get('subdomain')}`;
-    console.log(tokenUrl);
 
     if (params.has('refreshToken')) {
         tokenUrl.search += `&refresh_token=${encodeURIComponent(params.get('refreshToken'))}`;
@@ -61,7 +60,7 @@ async function retrieveTokenOrPasscodeUrl(params) {
         try {
             response = await axios.get(tokenUrl);
         } catch (error) {
-            throw new Error(`Failed to get authentication token: ${error}.\nResponse body: ${util.inspect(response && response.data)}`);
+            throw new Error(`Failed to get authentication token: ${error}.\nResponse body: ${util.inspect(error.response && error.response.data)}`);
         }
         authData = response.data;
 

package/lib/client/extend.js

@@ -35,7 +35,6 @@ module.exports = class Extend extends BaseCommand {
                 filesToWrite.set(filepath, filecontent);
             }
         }
-        console.log('filepath', filesToWrite.keys());
         for (const [filepath, content] of [...filesToWrite.entries()]) {
             const normalizedFilepath = normalizePath(filepath);
             fse.mkdirpSync(path.dirname(normalizedFilepath));

package/lib/client/params.js

@@ -209,9 +209,9 @@ class AllParams extends BasicParams {
 
         // `logout` PARAMS
         this.deleteSettings         = new Param('deleteSettings',         false);
-        this["delete-settings"]      = this.deleteSettings.newAlias('delete-settings');
+        this["delete-settings"]     = this.deleteSettings.newAlias('delete-settings');
         this.clearInvalid           = new Param('clearInvalid',           false);
-        this["clear-invalid"]        = this.clearInvalid.newAlias('clear-invalid');
+        this["clear-invalid"]       = this.clearInvalid.newAlias('clear-invalid');
     }
 }
 

package/lib/init/constants.js

@@ -1,6 +1,6 @@
 const os = require('os');
 
-const MAVEN_ARCHETYPE_VERSION = '1.22.2';
+const MAVEN_ARCHETYPE_VERSION = '1.23.1';
 
 const constants = {
     IS_WIN: (os.platform() === 'win32'),

package/lib/init/template/cf-manifest/files/services-manifest.yml.hbs

@@ -13,7 +13,7 @@ create-services:
 {{/resource.isHana}}
 {{#resource.isXsuaa}}
     broker: {{resource.service}}
-    plan: "broker"
+    plan: application
 {{/resource.isXsuaa}}
 {{#resource.vcap.name}}
     broker: {{resource.service}}

package/lib/init/template/hana/index.js

@@ -106,7 +106,7 @@ module.exports = class HanaTemplate extends TemplateBase {
         const projectType = await this.getProjectType();
         switch (projectType) {
             case PROJECT_TYPE.java: {
-                await this.templateUtil.copyFiles('java', path.join(this.projectPath, env.folders.db), {}, this.options.force);
+                await this.templateUtil.copyFiles(path.join('java', 'db'), path.join(this.projectPath, env.folders.db), {}, this.options.force);
                 await this._updatePomXml();
                 const cdsrcJsonPath = path.join(this.projectPath, '.cdsrc.json');
                 await this._updateCdsrcJson(cdsrcJsonPath, env.folders.db, env);

package/lib/init/template/lint/index.js

@@ -118,7 +118,7 @@ module.exports = class LintTemplate extends TemplateBase {
               this.logger.log("\n");
             }
           });
-          this._promptInstallDependencies(task);
+          await this._promptInstallDependencies(task);
         }
       }
     }
@@ -168,7 +168,10 @@ module.exports = class LintTemplate extends TemplateBase {
     return;
   }
 
-  _promptInstallDependencies(task) {
+  async _promptInstallDependencies(task) {
+    if (!process.stdin.isTTY) {
+      return; // non-interactive shell, like in tests
+    }
     const rl = readline.createInterface({
       input: process.stdin,
       output: process.stdout,
@@ -183,23 +186,26 @@ module.exports = class LintTemplate extends TemplateBase {
     let todos = `${term.error(
       "Aborted!\nPlease install the following components manually:"
     )}\n\n${term.warn(task)}`;
-    rl.question(question, (answer) => {
-      rl.close();
-      clearTimeout(timerID);
-      received = answer.trim().toLowerCase();
-      // If user confirms or force flag is set, install dependencies
-      if (["y", "yes"].includes(received) || this.options.force) {
-        this._runTask(task);
-        // If use declines or question timeout is reached, print todos
-      } else if (["n", "no"].includes(received.toLowerCase())) {
-        this.logger.log(todos);
-      } else {
-        // Close and restart question (with new timeout)
+    return new Promise((resolve, reject) => {
+      rl.question(question, (answer) => {
         rl.close();
         clearTimeout(timerID);
-        this._promptInstallDependencies(task);
-      }
-    });
+        received = answer.trim().toLowerCase();
+        // If user confirms or force flag is set, install dependencies
+        if (["y", "yes"].includes(received) || this.options.force) {
+          resolve(this._runTask(task));
+          // If use declines or question timeout is reached, print todos
+        } else if (["n", "no"].includes(received.toLowerCase())) {
+          this.logger.log(todos);
+          resolve();
+        } else {
+          // Close and restart question (with new timeout)
+          rl.close();
+          clearTimeout(timerID);
+          this._promptInstallDependencies(task).then(resolve).catch(reject);
+        }
+      });
+    })
   }
 
   _runTask(task) {

package/lib/init/util/templateUtil.js

@@ -237,9 +237,6 @@ module.exports = class TemplateUtil {
                     if (actions.mergeCollection) actions.mergeCollection(targetNode, templateNode)
                     if (targetNode) {
                         _traverseYAMLNode(targetNode, templateIndex, actions, templateNode);
-                    } else if (!actions.mergeCollection) {
-                        collection.add(YAML.createNode(templateNode))
-                        //this.fsUtil.writeYAML(targetPath, target)
                     }
                 }
             })
@@ -294,7 +291,7 @@ module.exports = class TemplateUtil {
             mergePair: (collection, templateNode) => {
                 const childIsArray = false//templateNode.value.type !== 'MAP' && !!templateNode.value.items
                 if (collection.type === 'MAP' && !childIsArray) {
-                    collection.add(YAML.createNode(templateNode))
+                    collection.add(templateNode)
                     //this.fsUtil.writeYAML(targetPath, target)
                 }
             },
@@ -314,9 +311,8 @@ module.exports = class TemplateUtil {
                         .filter(({ref}) => !existenceMap.get(ref))
                     missingExistences.forEach(existence => {
                         const templateNode = templateExistenceMap.get(existence.ref).node
-                        const templateExistence = YAML.createNode(templateNode)
-                        templateExistence.spaceBefore = existence.spaceBefore
-                        targetNode.add(templateExistence)
+                        templateNode.spaceBefore = existence.spaceBefore
+                        targetNode.add(templateNode)
                         //this.fsUtil.writeYAML(targetPath, target)
                     })
                 }