@sap/cds-dk 7.0.3 → 7.1.0

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

@@ -2,7 +2,6 @@
 const cds = require('../../../cds')
 const { exists, fs } = cds.utils
 const { resolve, join, relative }  = require('path');
-const LOG = console
 const DEBUG = cds.debug('cli')
 
 module.exports = class DataTemplate extends require('../templateBase') {
@@ -111,7 +110,7 @@ function createDataFile (isFileExists, dataFilePath, dest, force, entity) {
     relFilePath = relative(cds.root, dataFilePath);
   }
   if (isFileExists && !force) {
-    LOG.info(`Skipping ${relFilePath}`);
+    console.log(`Skipping ${relFilePath}`);
   }
   else {
     // continue only if file not already exists, or '--force' option provided
@@ -119,7 +118,7 @@ function createDataFile (isFileExists, dataFilePath, dest, force, entity) {
     if (dataFileContent && dataFileContent.length) {
       if (!exists(dest))  fs.mkdirSync(dest, {recursive: true})
       fs.writeFileSync(dataFilePath, dataFileContent);
-      isFileExists ? LOG.info(`Overwriting `+relFilePath) : LOG.info(`Creating `+relFilePath)
+      isFileExists ? console.log(`Overwriting `+relFilePath) : console.log(`Creating `+relFilePath)
     }
   }
 }

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

@@ -10,7 +10,6 @@ const { LINT_DEV, LINT_GLOBAL } = require("../../constants").OPTIONS;
 const { getConfigPath, getFileExtensions } = require("@sap/eslint-plugin-cds/lib/api");
 const cds = require("../../../cds");
 const { mkdirp, exists } = cds.utils;
-const LOG = console;
 
 const IS_WIN = os.platform() === "win32";
 const ALLOWED_FILE_EXTENSIONS = getFileExtensions();
@@ -100,20 +99,20 @@ module.exports = class LintTemplate extends require('../templateBase') {
         ].join(" ")}`;
 
         if (cds.cli.options.force) {
-          LOG.info(
+          console.log(
             `\n\nAlmost done - installing ${this.missingNpmDependencies["names"].length} npm dependencies:\n${task}`
           );
           this._runTask(task);
         } else {
-          LOG.info(
+          console.log(
             `\n\nAlmost done - ${term.warn(
               `you are missing ${this.missingNpmDependencies["names"].length} npm dependencies`
             )}:\n`
           );
           this.missingNpmDependencies["msgs"].forEach((msg, i) => {
-            LOG.info(`(${i + 1}) ${msg}`);
+            console.log(`(${i + 1}) ${msg}`);
             if (i === this.missingNpmDependencies["msgs"].length - 1) {
-              LOG.info("\n");
+              console.log("\n");
             }
           });
           await this._promptInstallDependencies(task);
@@ -192,7 +191,7 @@ module.exports = class LintTemplate extends require('../templateBase') {
           resolve(this._runTask(task));
           // If use declines or question timeout is reached, print todos
         } else if (["n", "no"].includes(received.toLowerCase())) {
-          LOG.info(todos);
+          console.log(todos);
           resolve();
         } else {
           // Close and restart question (with new timeout)

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

@@ -4,7 +4,6 @@ const { exists, mkdirp, path } = cds.utils
 const { URLS, OPTIONS: { NODEJS, JAVA }, COMMAND_ADD } = require('../../constants')
 const term = require('../../../util/term')
 const { copyFiles } = require('../../util/template')
-const LOG = console
 
 module.exports = class NodejsTemplate extends require('../templateBase') {
 
@@ -29,7 +28,7 @@ module.exports = class NodejsTemplate extends require('../templateBase') {
     }
 
     async finalize() {
-        LOG.info(`Find samples on ${term.link(URLS.SAMPLES)}`)
-        LOG.info(`Learn about next steps at ${term.link(URLS.CAPIRE)}`)
+        console.log(`Find samples on ${term.link(URLS.SAMPLES)}`)
+        console.log(`Learn about next steps at ${term.link(URLS.CAPIRE)}`)
     }
 }

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

@@ -3,7 +3,6 @@ const cds = require('../../../cds')
 const { exists } = cds.utils
 const { copyFiles } = require('../../util/template')
 const { URLS } = require('../../constants')
-const LOG = console
 
 module.exports = class PipelineTemplate extends require('../templateBase') {
 
@@ -25,6 +24,6 @@ module.exports = class PipelineTemplate extends require('../templateBase') {
     }
 
     async finalize() {
-        LOG.info(`For information on project "Piper" and its pipelines see ${URLS.PIPELINE_HELP}`);
+        console.log(`For information on project "Piper" and its pipelines see ${URLS.PIPELINE_HELP}`);
     }
 }

package/lib/init/util/indent.js

@@ -48,7 +48,7 @@ function detectIndent (file) {
         }, { tabs: { indents: {}, total: 0, character: '\t' }, spaces: { indents: {}, total: 0, character: ' ' } })
 
     const preferred = indents.tabs.total > indents.spaces.total ? indents.tabs : indents.spaces
-    const width = gcd(Object.keys(preferred.indents))
+    const width = gcd(Object.keys(preferred.indents)) ?? 2
     return preferred.character.repeat(width)
 }
 

package/lib/init/util/merge.js

@@ -110,14 +110,14 @@ async function mergeJSON(into, from, project, semantics) {
         const resultYAML = await mergeYAML(targetYAML, sourceYAML, project, semantics)
         result = YAML.parse(YAML.stringify(resultYAML))
     } else {
-        const target = typeof into === 'string' ? await read(into) : into
+        const target = typeof into === 'string' ? await read(into, 'json') : into
         result = _deepMerge(target, source)
     }
     // we need to stringify result on site to be able to apply the appropriate indentation.
     // cds-utils.write is currently hardcoded to use spaces for indentation.
     if (typeof into === 'string') {
-        const indent = exists(into) && detectIndent((await read(into, 'utf-8')).split(EOL))
-        await write(into, JSON.stringify(result, null, indent ?? 2))
+        const indent = exists(into) && detectIndent((await read(into, 'utf-8')).split(EOL)) || '  '
+        await write(into, JSON.stringify(result, null, indent) + EOL)
     }
     return result
 }

package/lib/init/util/mvn.js

@@ -1,9 +1,6 @@
 
 const { URLS, MAVEN_ARCHETYPE_VERSION, OPTIONS: { JAVA_MVN, JAVA_PACKAGE, SAMPLES, HANA }, REGEX_JAVA_PACKAGE } = require('../constants');
 
-const { CliError } = require('../../client/helper/errors');
-
-
 const cp = require('child_process');
 const util = require('util');
 const execAsync = util.promisify(cp.exec);
@@ -132,29 +129,27 @@ class MvnArchetypeUtil {
 
         // -DjdkVersion=[11|17]
         if (!params.get('-DjdkVersion')) {
+            let javaVersion
             try {
-                const javaVersion = await execAsync('java -version');
-                const match = javaVersion?.stderr?.match(/version\s*"?(\d+\.\d+\.\d+)"?/);
-                if (match?.[1]) {
-                    const segments = match[1]?.split('.');
-                    const version = new Number(segments?.[0]);
-                    switch (true) {
-                        case (version < 17):
-                            if (process.env.WS_BASE_URL) {
-                                throw new CliError(`Java version ${match[1]} is not supported. Use Java 17 or higher. You can use command 'Java: Set Default JDK' to switch to Java 17.`)
-                            }
-                            throw new CliError(`Java version ${match[1]} is not supported. Use Java 17 or higher.`)
-                        case (version < 20): params.set(`-DjdkVersion`, 17); break;
-                        case (version >= 20): params.set(`-DjdkVersion`, 20); break;
-                        default:
-                    }
-                }
+                javaVersion = await execAsync('java -version');
             } catch (err) {
-                if (err instanceof CliError) {
-                    throw err;
-                }
                 DEBUG?.(err);
             }
+            const match = javaVersion?.stderr?.match(/version\s*"?(\d+\.\d+\.\d+)"?/);
+            if (match?.[1]) {
+                const segments = match[1]?.split('.');
+                const version = new Number(segments?.[0]);
+                switch (true) {
+                    case (version < 17):
+                        if (process.env.WS_BASE_URL) {
+                            throw `Java version ${match[1]} is not supported. Use Java 17 or higher. You can use command 'Java: Set Default JDK' to switch to Java 17.`
+                        }
+                        throw `Java version ${match[1]} is not supported. Use Java 17 or higher.`
+                    case (version < 20): params.set(`-DjdkVersion`, 17); break;
+                    case (version >= 20): params.set(`-DjdkVersion`, 20); break;
+                    default:
+                }
+            }
         }
 
         if (options[JAVA_PACKAGE]) {

package/lib/util/cfUtil.js

@@ -15,7 +15,6 @@ const LOG = cds.log ? cds.log('deploy') : console;
 const DEBUG = cds.debug('deploy');
 
 const { bold, warn } = require('./term');
-const { CliError } = require('../client/helper/errors');
 
 const CF_COMMAND = 'cf';
 
@@ -143,7 +142,7 @@ class CfUtil {
         try {
             return (await this._cfRun('oauth-token')).stdout;
         } catch (err) {
-            throw new CliError(err.message);
+            throw err.message;
         }
     }