@sap/cds-dk 6.2.3 → 6.3.1

package/lib/init/util/projectReader.js

@@ -1,8 +1,7 @@
 const path = require('path')
-const { nullLogger } = require('../util/logger')
 const cds = require('../../cds')
 const { BuildTaskFactory } = cds.build
-const { fs } = cds.utils
+const { read, exists } = cds.utils
 const P_LANGUAGE_JAVA = 'java'
 const P_LANGUAGE_NODEJS = 'nodejs'
 const DEFAULT_P_LANGUAGE = P_LANGUAGE_NODEJS
@@ -14,11 +13,13 @@ const BUILD_TASK_HANA = "hana"
 const BUILD_TASK_FIORI = "fiori"
 const BUILD_TASK_MTX = "mtx"
 const BUILD_TASK_MTX_SIDECAR = "mtx-sidecar"
+const DEBUG = /\b(cli)\b/.test(process.env.DEBUG) && console.debug
+const LOG = console
 
 module.exports = class ProjectReader {
 
-    constructor(template) {
-        this.template = template
+    constructor(projectPath) {
+        this.projectPath = projectPath
     }
 
     /**
@@ -28,104 +29,59 @@ module.exports = class ProjectReader {
         const cdsEnvVar = process.env.CDS_ENV
         process.env.CDS_ENV = profile
         try {
-            return await this.template.getEnv();
+            return cds.env.for('cds', exists(this.projectPath) ? this.projectPath : this.cwd);
         } finally {
             cdsEnvVar ? process.env.CDS_ENV = cdsEnvVar : delete process.env.CDS_ENV
         }
     }
 
-    get fsUtil() {
-        return this.template.fsUtil
-    }
-
-    get logger() {
-        return this.template.logger
-    }
-
-    get projectPath() {
-        return this.template.projectPath
-    }
-
     async read(options) {
         const env = await this.getEnv();
-        this.logger.isDebug && this.logger.debug(JSON.stringify(env, null, 1))
-
-        const capDescriptor = await this._getCapDescriptor(env, options)
-        const uiDescriptor = await this._getUiDescriptor(env)
-        const projectDescriptor = {
-            cap: capDescriptor,
-            ui: uiDescriptor
-        }
+        DEBUG && DEBUG({ env })
 
-        await this._validate(projectDescriptor)
+        const cap = await this._getCapDescriptor(env, options)
+        const ui = await this._getUiDescriptor(env)
+        const projectDescriptor = { cap, ui }
+        this._validateDbFolders(cap)
 
-        this.logger.isDebug && this.logger.debug(JSON.stringify(projectDescriptor, null, 1))
+        DEBUG && DEBUG({ projectDescriptor })
         return projectDescriptor
     }
 
+    _validateDbFolders(cap) {
+        const { root, db: dbs, isJava } = cap
+        if (isJava) {
+            for (const db of dbs) if (!exists(path.join(root, db.path, 'package.json'))) {
+                LOG.error(`Missing 'package.json' in folder ${db.path} - 'cds add hana' adds configuration for SAP HANA`)
+            }
+        }
+    }
+
     async _getCapDescriptor(env, options) {
         const projectPath = this.projectPath
-        let capDescriptor = {
-            for: options && options.for,
+        const _hasFacet = template => require(`../template/${template}`).hasFacet(env, projectPath, options)
+        const cap = {
+            for: options?.for,
             pLanguage: DEFAULT_P_LANGUAGE,
             srv: {},
             db: [],
             requires: [],
-            get isMultitenant() {
-                return options?.add?.has('mtx') || options?.add?.has('multitenancy') ||
-                    env.requires.multitenancy || env.requires.db?.multiTenant ||
-                    this.isJava && fs.existsSync(path.join('mtx', 'sidecar')) ||
-                    false
-            },
-            get isExtensible() {
-                return options?.add?.has('mtx') || options?.add?.has('extensibility') || env.requires.extensibility ||
-                    this.isJava && fs.existsSync('.cdsrc.json') && JSON.parse(fs.readFileSync('.cdsrc.json', 'utf8'))?.requires?.extensibility === true
-            },
-            get isNodejs() {
-                return this.pLanguage === P_LANGUAGE_NODEJS
-            },
-            get isJava() {
-                return this.pLanguage === P_LANGUAGE_JAVA
-            },
-            get hasRequires() {
-                return this.requires.length > 0
-            },
-            get hasRequiresDb() {
-                return this.db.length > 0
-            },
-            get hasHana() {
-                return this.requires.some(({ resource }) => resource.isHana)
-            },
-            get hasXsuaa() {
-                return this.requires.some(({ resource }) => resource.isXsuaa)
-            },
-            get hasAuditlog() {
-                return false // TODO: Need a `cds.requires.auditlog` or some other way to detect if enabled.
-            },
-            get needsSidecar() {
-                return (options?.add.has('hana') || this.db.length > 0) && (this.isJava || !this.isMultitenant)
-            },
-            get hasApprouter() {
-                return !!env.requires.approuter
-            },
-            get hasMessaging() {
-                return !!env.requires.messaging
-            },
-            get hasDestination() {
-                const kinds = { odata: 1, 'odata-v2': 1, 'odata-v4': 1, rest: 1 }
-                return Object.entries(env.requires).some(([service, require]) => !kinds[service] && kinds[require.kind])
-            },
-            get hasHtml5Repo() {
-                return fs.existsSync(path.join(projectPath, 'chart', 'templates', 'html5-apps-repo-host.yaml'))
-            },
-            get hasMtaDeployment() {
-                if (!options?.add.has('mta') && options?.add.has('helm')) return false
-                return fs.existsSync(path.join(projectPath, 'mta.yaml'))
-            },
-            get hasHelmDeployment() {
-                if (options?.add.has('mta') && !options?.add.has('helm')) return false
-                return fs.existsSync(path.join(projectPath, 'chart', 'values.yaml'))
-            }
+            get root()           { return projectPath },
+            get hasRequires()    { return this.requires.length > 0 },
+            get needsSidecar()   { return (options?.add.has('hana') || this.db.length > 0) && (this.isJava || !this.isMultitenant) },
+            get isNodejs()       { return this.pLanguage === P_LANGUAGE_NODEJS },
+            get isJava()         { return this.pLanguage === P_LANGUAGE_JAVA },
+            get isMultitenant()  { return _hasFacet('multitenancy') },
+            get isExtensible()   { return _hasFacet('extensibility') },
+            get hasHana()        { return _hasFacet('hana') },
+            get hasXsuaa()       { return _hasFacet('xsuaa') },
+            get hasAuditlog()    { return _hasFacet('auditlog') },
+            get hasApprouter()   { return _hasFacet('approuter') },
+            get hasMessaging()   { return _hasFacet('enterprise-messaging') },
+            get hasDestination() { return _hasFacet('destinations') },
+            get hasHtml5Repo()   { return _hasFacet('html5-repo') },
+            get hasMta()         { return _hasFacet('mta') },
+            get hasHelm()        { return _hasFacet('helm') },
         }
 
         // setting the effective env as it might have changed by already executed 'add' commands, e.g. cds init foo --add hana,mta
@@ -133,23 +89,25 @@ module.exports = class ProjectReader {
         cds.env // make sure env is initialized, otherwise we cannot set it (exotic case)
         cds.env = env
 
-        const buildTasks = await new BuildTaskFactory(this.logger.isDebug ? this.logger : nullLogger, cds).getTasks({ root: this.projectPath, resolve: true, mta: false })
+        const root = this.projectPath
+        const nullLogger = { debug: () => {}, log: () => {}, warn: () => {}, error: () => {}, write: () => {}}
+        const buildTasks = await new BuildTaskFactory(nullLogger, cds).getTasks({ root, resolve: true, mta: false })
 
         await Promise.all(buildTasks.map(async (task) => {
-            const relDestPath = ProjectReader._slash(path.relative(this.projectPath, task.dest))
+            const relDestPath = path.relative(root, task.dest)?.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)) {
-                        capDescriptor.db.push({ path: relDestPath, name: path.basename(task.src) })
+                        cap.db.push({ path: relDestPath, name: path.basename(task.src) })
                     }
                     break
 
                 case BUILD_TASK_JAVA:
                 case BUILD_TASK_JAVA_CF:
-                    capDescriptor.pLanguage = P_LANGUAGE_JAVA
-                    capDescriptor.srv = {
+                    cap.pLanguage = P_LANGUAGE_JAVA
+                    cap.srv = {
                         path: relDestPath,
                         name: path.basename(task.src),
                         ext: await this._getJavaExtDescriptor(task)
@@ -158,7 +116,7 @@ module.exports = class ProjectReader {
 
                 case BUILD_TASK_NODEJS:
                 case BUILD_TASK_NODE_CF:
-                    capDescriptor.srv = {
+                    cap.srv = {
                         path: relDestPath,
                         name: path.basename(task.src)
                     }
@@ -170,17 +128,17 @@ module.exports = class ProjectReader {
                     break
 
                 default:
-                    this.logger.warn(`Unknown build task type ${task.for}`)
+                    LOG.warn(`Unknown build task type ${task.for}`)
             }
         }))
 
         // setting app name, app description...
-        await this._setAppDetails(capDescriptor)
+        await this._setAppDetails(cap)
 
         // setting required resource information
-        this._setResourceDependencies(env, capDescriptor)
+        this._setResourceDependencies(env, cap)
 
-        return capDescriptor
+        return cap
     }
 
     /**
@@ -188,206 +146,127 @@ module.exports = class ProjectReader {
      * @param {object} task
      */
     async _getJavaExtDescriptor(task) {
-        let descriptor = null
         // by default spring-boot:repackage is used creating an executable jar archive
         const pomJson = await this._parseXml(path.join(task.src, 'pom.xml'))
         if (pomJson) {
-            // cannot use 'instanceof ManifestTemplate' since ManifestTemplate requires projectReader -> cycle created
-            if (this.template.constructor.name === 'ManifestTemplate' && this._isOldJavaRuntime(pomJson)) {
+            const dependencies = pomJson?.project?.dependencies?.[0]?.dependency
+            const isOldJavaRuntime = [...dependencies].some(d => /com\.sap\.cloud\.servicesdk/.test(d?.groupId?.[0]))
+            if (isOldJavaRuntime) {
                 throw new Error("Projects using the classic CAP Java SDK are not supported")
             }
 
-            descriptor = {
-                archiveName: path.basename(this.projectPath) + "-exec.jar"
-            }
-            const archiveName = ProjectReader._getProperty(pomJson, 'project.artifactId.0')
-            if (archiveName) {
-                if (ProjectReader._getProperty(pomJson, 'project.packaging.0') === 'war') {
-                    descriptor.archiveName = archiveName + '-exec.war'
-                } else {
-                    descriptor.archiveName = archiveName + '-exec.jar'
-                }
-            }
+            const descriptor = { archiveName: path.basename(this.projectPath) + "-exec.jar" }
+            const archiveName = pomJson?.project?.artifactId?.[0]
+            const suffix = pomJson?.project?.packaging?.[0]
+            if (archiveName) descriptor.archiveName = archiveName + '-exec.' + suffix
+            return descriptor
         }
-        return descriptor
     }
 
     async _getUiDescriptor(env) {
-        const uiDescriptor = {
-            appPath: null
-        }
-
         const absoluteAppPath = path.join(this.projectPath, env.folders.app)
-        if (await this.fsUtil.pathExists(absoluteAppPath)) {
-            uiDescriptor.appPath = env.folders.app
+        return {
+            appPath: exists(absoluteAppPath) ? env.folders.app : null
         }
-
-        return uiDescriptor
     }
 
-    async _setAppDetails(capDescriptor) {
-        if (capDescriptor.pLanguage !== P_LANGUAGE_JAVA && capDescriptor.pLanguage !== P_LANGUAGE_NODEJS) {
-            throw Error(`${capDescriptor.pLanguage} not supported`)
+    async _setAppDetails(cap) {
+        if (cap.pLanguage !== P_LANGUAGE_JAVA && cap.pLanguage !== P_LANGUAGE_NODEJS) {
+            throw Error(`${cap.pLanguage} not supported`)
         }
 
         // 1.1. java - use parent pom.xml
-        if (capDescriptor.pLanguage === P_LANGUAGE_JAVA) {
+        if (cap.pLanguage === P_LANGUAGE_JAVA) {
             const pomXmlPath = path.join(this.projectPath, 'pom.xml')
             try {
-                if (await this.fsUtil.pathExists(pomXmlPath)) {
+                if (exists(pomXmlPath)) {
                     const pomJson = await this._parseXml(pomXmlPath)
-                    const artifactId = ProjectReader._getProperty(pomJson, 'project.artifactId.0')
-                    const description = ProjectReader._getProperty(pomJson, 'project.description.0')
-                    let version = ProjectReader._getProperty(pomJson, 'project.version.0')
+                    const [artifactId] = pomJson?.project?.artifactId ?? []
+                    const [description] = pomJson?.project?.description ?? []
+                    let [version] = pomJson?.project?.version ?? []
                     // might need to resolve <version>${revision}</version> property
-                    const versionMatch = version.match(/\${1}\{{1}([\w-\\.]+)\}{1}/)
-                    if (versionMatch && versionMatch.length === 2) {
-                        const resolved = ProjectReader._getProperty(pomJson, 'project.properties.0.' + versionMatch[1] + '.0')
-                        if (resolved) {
-                            version = resolved
-                        }
+                    if (version.match(/\${1}\{{1}([\w-\\.]+)\}{1}/)?.length === 2) {
+                        version = pomJson?.project?.properties?.[0].revision[0]
                     }
                     if (version) {
                         // check compliance with mta version format - copied from mbt build error message
                         // if not compliant we use a static default value, see below...
                         if (/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$/.test(version)) {
-                            capDescriptor.appVersion = version
+                            cap.appVersion = version
                         }
                     }
                     if (artifactId) {
-                        const nameMatch = artifactId.match(/([\w-\\.]+)(-parent)+/)
-                        if (Array.isArray(nameMatch)) {
-                            capDescriptor.appName = nameMatch.length === 3 ? nameMatch[1] : artifactId
-                        }
+                        cap.appName = artifactId.split(/-parent/)[0]
                     }
                     if (description) {
-                        capDescriptor.appDescription = description
+                        cap.appDescription = description
                     }
                 }
             } catch (e) {
-                this.logger.error(`Failed to read file ${pomXmlPath} - skip pom.xml data`)
-                this.logger.error(e)
+                LOG.error(`Failed to read file ${pomXmlPath} - skip pom.xml data`)
+                LOG.error(e)
             }
         }
 
         // 1.2. use package.json
-        if (!capDescriptor.appName) {
+        if (!cap.appName) {
             const packageJsonPath = path.join(this.projectPath, 'package.json')
-            if (await this.fsUtil.pathExists(packageJsonPath)) {
+            if (exists(packageJsonPath)) {
                 try {
-                    const packageJson = await this.fsUtil.readJSON(packageJsonPath, 'utf-8')
-                    if (!capDescriptor.appDescription && packageJson.description) {
-                        capDescriptor.appDescription = packageJson.description
-                    }
-                    if (!capDescriptor.appVersion && packageJson.version) {
-                        capDescriptor.appVersion = packageJson.version
-                    }
-                    if (packageJson.name) {
-                        let segments = packageJson.name.trim().split('/')
-                        // scope as namespace
-                        if (segments[0].startsWith('@')) {
-                            segments[0] = segments[0].replace('@', '')
-                        }
-                        segments = segments.map(segment => segment.startsWith('@') ? encodeURIComponent(segment.replace('@', '')) : encodeURIComponent(segment))
-                        if (!capDescriptor.appName) {
-                            capDescriptor.appName = segments[segments.length - 1]
-                        }
-                        if (!capDescriptor.appId) {
-                            capDescriptor.appId = segments.join('.')
-                        }
-                        if (!capDescriptor.appDescription) {
-                            capDescriptor.appDescription = segments[segments.length - 1]
-                        }
+                    const { name, version, description } = await read(packageJsonPath)
+                    cap.appDescription = cap.appDescription ?? description
+                    cap.appVersion = cap.appVersion ?? version
+                    if (name) {
+                        const segments = name.trim().replace(/@/g, '').split('/').map(encodeURIComponent)
+                        cap.appName = cap.appName ?? segments[segments.length - 1]
+                        cap.appId = cap.appId ?? segments.join('.')
+                        cap.appDescription = cap.appDescription ?? cap.appName
                     }
                 } catch (e) {
-                    this.logger.error(`Failed to read file ${packageJsonPath} - skip application data`)
-                    this.logger.error(e)
+                    LOG.error(`Failed to read file ${packageJsonPath} - skip application data`)
+                    LOG.error(e)
                 }
             }
         }
 
         // 2. use project name and static default values
-        if (!capDescriptor.appName) {
-            const projectName = path.basename(this.projectPath)
-            capDescriptor.appName = projectName
-        }
-        if (!capDescriptor.appDescription) {
-            capDescriptor.appDescription = capDescriptor.appName + " application"
-        }
-        if (!capDescriptor.appId) {
-            capDescriptor.appId = capDescriptor.appName
-        }
-        if (!capDescriptor.appVersion) {
-            capDescriptor.appVersion = '1.0.0'
-        }
+        cap.appName = cap.appName ?? path.basename(this.projectPath)
+        cap.appDescription = cap.appDescription ?? cap.appName + " application"
+        cap.appId = cap.appId ?? cap.appName
+        cap.appVersion = cap.appVersion ?? '1.0.0'
     }
 
-    _setResourceDependencies(env, capDescriptor) {
-        const hanaResources = new Map()
-        const otherResources = new Map()
-
-        for (const key of Object.keys(env.requires)) {
-            // ignore abstract helper definitions like sql
-            if (key === 'sql' || key === 'sqlite' || key === 'hana') continue
-            const { kind } = env.requires[key]
-            if (kind === 'hana' || kind === 'hana-mt' || kind === 'hana-cloud') {
-                hanaResources.set(key, env.requires[key])
-            } else {
-                otherResources.set(key, env.requires[key])
-            }
-        }
-
-        for (const [key, value] of hanaResources) {
-            const resource = this._getReqResource(key, value, capDescriptor)
-            if (resource) {
-                // using production profile
-                capDescriptor.requires.push({ resource })
-            }
-        }
-        // add after hana resource dependencies have been handled as multitenant information is required
-        for (const [key, value] of otherResources) {
-            const resource = this._getReqResource(key, value, capDescriptor)
-            if (resource) {
-                // using production profile
-                capDescriptor.requires.push({ resource })
-            }
+    _setResourceDependencies(env, cap) {
+        for (const [key, require] of Object.entries(env.requires)) {
+            if (key === 'sql' || key === 'sqlite' || key === 'hana') continue // ignore abstract helper definitions like sql
+            const resource = this._getReqResource(key, require, cap)
+            if (resource) cap.requires.push({ resource }) // using production profile
         }
     }
 
     _hasHanaServiceBinding(env) {
-        const kind = ProjectReader._getProperty(env, 'requires.db.kind')
-        return kind === 'hana' || kind === 'sql' && (
-            ProjectReader._getProperty(env, 'requires.db.dialect') === 'hana' ||
-            ProjectReader._getProperty(env, 'requires.db.use') === 'hana'
-        )
+        const db = env?.requires?.db
+        return db?.kind === 'hana' || db?.kind === 'sql' && (db?.dialect === 'hana' || db?.use === 'hana')
     }
 
-    _getReqResource(key, reqEntry, capDescriptor) {
+    _getReqResource(key, reqEntry, cap) {
+        const { kind, dialect, use, vcap = {}, multiTenant } = reqEntry
+        const { appName, isMultitenant } = cap
         const resource = {
-            name: ProjectReader._getResourceName(key, capDescriptor),
+            name: !key.includes(appName) ? `${appName}-${key}` : key,
             service: '',
-            get isMultitenant() {
-                return capDescriptor.isMultitenant || reqEntry.multiTenant || false
-            },
-            vcap: reqEntry.vcap || {},
-            get isManagedHana() {
-                return this.service === 'service-manager' || this.vcap.label === 'service-manager'
-            },
-            get isPlainHana() {
-                return this.service === 'hana' && !this.isManagedHana
-            },
-            get isHana() {
-                return this.isPlainHana || this.isManagedHana
-            },
-            get isXsuaa() {
-                return this.service === 'xsuaa'
-            },
+            vcap,
+            get isMultitenant() { return isMultitenant || multiTenant || false },
+            get isManagedHana() { return this.vcap.label === 'service-manager' || this.service === 'service-manager' },
+            get isPlainHana()   { return this.service === 'hana' && !this.isManagedHana },
+            get isHana()        { return this.isPlainHana || this.isManagedHana },
+            get isXsuaa()       { return this.service === 'xsuaa' },
         }
 
-        switch (reqEntry.kind) {
+        switch (kind) {
             case 'sql':
             case 'hana':
-                if (reqEntry.kind === 'sql' && reqEntry.dialect !== 'hana' && reqEntry.use !== 'hana') {
+                if (kind === 'sql' && dialect !== 'hana' && use !== 'hana') {
                     break
                 }
                 // use different service name to avoid conflicts when switching from single tenant to multitenant
@@ -402,16 +281,11 @@ module.exports = class ProjectReader {
                 break
 
             case 'xsuaa':
-                resource.service = reqEntry.kind
+                resource.service = kind
                 resource.vcap.plan = 'application'
                 break
-
             default: {
-                if (ProjectReader._getProperty(reqEntry, 'vcap.plan')) {
-                    resource.service = reqEntry.kind
-                } else {
-                    this.logger.debug(`Skip resource ${key}`)
-                }
+                vcap.plan ? resource.service = kind : DEBUG && DEBUG(`Skip resource ${key}`)
             }
         }
         return resource.service ? resource : null
@@ -429,7 +303,7 @@ module.exports = class ProjectReader {
         const xmljs = require('xml-js');
         let xmljsParse = {};
         try {
-            const xml = await this.fsUtil.readFile(pomXmlPath, 'utf-8')
+            const xml = await read(pomXmlPath, 'utf-8')
             xmljsParse.project = JSON.parse(await xmljs.xml2json(xml, {
                 ignoreComment: true,
                 compact: true,
@@ -441,12 +315,12 @@ module.exports = class ProjectReader {
                 ignoreInstruction: true,
                 ignoreCdata: true,
                 ignoreDoctype: true,
-                textFn: this.removeTextAttributes
+                textFn: this._removeTextAttributes
             })).project[0];
             return xmljsParse;
         } catch (e) {
-            this.logger.error(`Failed to read file ${pomXmlPath} - skip pom.xml data`)
-            this.logger.error(e)
+            LOG.error(`Failed to read file ${pomXmlPath} - skip pom.xml data`)
+            LOG.error(e)
         }
     }
 
@@ -455,63 +329,14 @@ module.exports = class ProjectReader {
         input : "groupId":[{"_text":["customer"]}]
         output: "groupId":["customer"]
     */
-    removeTextAttributes(value, parentElement) {
-        const parentElementsObj = Object.keys(parentElement._parent);
-        const key = parentElementsObj.length;
-        const keyName = parentElementsObj[key - 1];
-        const arrKey = parentElement._parent[keyName];
-        const arrKeyLen = arrKey.length;
-        if (arrKeyLen > 0) {
-            const arr = arrKey;
-            const arrIndex = arrKey.length - 1;
-            arr[arrIndex] = value;
-        } else {
-            parentElement._parent[keyName] = value;
-        }
-    }
-    async _validate(projectDescriptor) {
-        const capDescriptor = projectDescriptor.cap
-        if (capDescriptor.db.length > 0) {
-            if (capDescriptor.isJava) {
-                //ensure package.json exists in db module
-                await Promise.all(capDescriptor.db.map(async db => {
-                    const dbPath = path.join(this.projectPath, db.path, "package.json")
-                    if (!await this.fsUtil.pathExists(dbPath)) {
-                        this.logger.error(`Missing package.json file in folder ${db.path} - 'cds add hana' will add the configuration for SAP HANA deployment`) //NOSONAR
-                    }
-                }))
-            }
+    _removeTextAttributes(value, parentElement) {
+        const parentKeys = Object.keys(parentElement._parent);
+        const key = parentKeys[parentKeys.length - 1];
+        const _text = parentElement._parent[key];
+        if (_text.length > 0) {
+            _text[_text.length - 1] = value;
         } else {
-            //this.logger.warn(`No SAP HANA service binding defined in the requires section of the project's package.json. Database module omitted`) //NOSONAR
-        }
-    }
-
-    _isOldJavaRuntime(pomJson) {
-        const dependencies = ProjectReader._getProperty(pomJson, "project.dependencies.0.dependency")
-        if (Array.isArray(dependencies)) {
-            return dependencies.some((dependency) => {
-                const groupId = ProjectReader._getProperty(dependency, 'groupId.0')
-                return /com\.sap\.cloud\.servicesdk/.test(groupId)
-            })
+            parentElement._parent[key] = value;
         }
-        return false
-    }
-
-    static _slash(filename) {
-        return filename ? filename.replace(/\\/g, '/') : filename
-    }
-
-    static _getResourceName(key, capDescriptor) {
-        let name = key
-        // only if not already present
-        if (!name.includes(capDescriptor.appName)) {
-            name = capDescriptor.appName + '-' + name
-        }
-        return name
-    }
-
-    static _getProperty(src, segments) {
-        segments = Array.isArray(segments) ? segments : segments.split('.')
-        return segments.reduce((p, n) => p && p[n], src)
     }
 }

package/lib/init/util/spinner.js

@@ -16,9 +16,11 @@ const ERASE_LINE = ESC_SEQ + 'K';
 // const SAVE_CURSOR = ESC_SEQ + 's';
 // const RESTORE_CURSOR = ESC_SEQ + 'u';
 
+const LOG = console
+const DEBUG = /\bcli\b/.test(process.env.DEBUG) && LOG.debug
+
 class Spinner {
-    constructor(logger, theme = Spinner.THEME_SPIN, initialDelay = 1000) {
-        this.logger = logger;
+    constructor(theme = Spinner.THEME_SPIN, initialDelay = 1000) {
         this.theme = theme;
         this.initialDelay = initialDelay;
     }
@@ -40,22 +42,22 @@ class Spinner {
     }
 
     _start(msg) {
-        if (!this.logger.isDebug && this.logger.isTTY) {
-            this.logger.log(msg + HIDE_CURSOR + ERASE_LINE + MOVE_CURSOR_UP);
+        if (!DEBUG && process.stdout.isTTY) {
+            LOG.info(msg + HIDE_CURSOR + ERASE_LINE + MOVE_CURSOR_UP);
             this.timeoutId = setTimeout(() => {
                 let idx = 0;
                 this.intervalId = setInterval(() => {
-                    this.logger.log(msg + ' ' + SPINNER_THEMES[this.theme][idx] + ERASE_LINE + MOVE_CURSOR_UP);
+                    LOG.info(msg + ' ' + SPINNER_THEMES[this.theme][idx] + ERASE_LINE + MOVE_CURSOR_UP);
                     idx = (idx + 1) % SPINNER_THEMES[this.theme].length;
                 }, RENDER_DELAY);
             }, this.initialDelay);
         } else {
-            this.logger.log(msg);
+            LOG.info(msg);
         }
     }
 
     _stop(msg, postfix) {
-        if (!this.logger.isDebug && this.logger.isTTY) {
+        if (!DEBUG && process.stdout.isTTY) {
             if (this.timeoutId) {
                 clearTimeout(this.timeoutId);
                 this.timeoutId = null;
@@ -66,7 +68,7 @@ class Spinner {
                 this.intervalId = null;
             }
 
-            this.logger.log(SHOW_CURSOR + msg + ' ' + postfix + ERASE_LINE);
+            LOG.info(SHOW_CURSOR + msg + ' ' + postfix + ERASE_LINE);
         }
     }
 }