@sap/cds-dk 7.3.2 → 7.4.0

package/lib/compile/openapi/csdl2openapi.js

@@ -479,7 +479,7 @@ module.exports.csdl2openapi = function (
             if (description) tag.description = description;
             tags.push(tag);
         })
-        return tags.sort(function(pre, next){return pre.name.localeCompare(next.name)});
+        return tags.sort(function (pre, next) { return pre.name.localeCompare(next.name) });
     }
 
     /**
@@ -655,7 +655,7 @@ module.exports.csdl2openapi = function (
                             schema: ref(element.$Type, SUFFIX.create),
                         }
                     }
-                },              
+                },
                 responses: response(201, 'Created ' + lname, { $Type: element.$Type }, insertRestrictions.ErrorResponses, !countRestrictions),
             };
             if (insertRestrictions.LongDescription) pathItem.post.description = insertRestrictions.LongDescription;
@@ -1620,7 +1620,7 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
         r[code] = {
             description: description
         };
-        let CountPropertyObj = {[csdl.$Version > '4.0' ? '@count' : '@odata.count'] : ref('count')} ;
+        let CountPropertyObj = { [csdl.$Version > '4.0' ? '@count' : '@odata.count']: ref('count') };
         if (code != 204) {
             const s = getSchema(type);
             r[code].content = {

package/lib/index.js

@@ -19,13 +19,15 @@ if (cds.compile.to.constructor.name === 'Object') { // not a class as in cds 7
   cds.compile.to.xsuaa = require('./compile/to-xsuaa')
 }
 
-cds.schema = cds.schema || {} // backward compatibility
-cds.extend (cds.schema) .with ( {
+// add overlay4 method to cds.schema to retrieve schema with cds-dk features
+// schema is cds version specific; add cds-dk parts not present in cds, e.g. build
+// failsafe for legacy cds without schema.constructor
+cds.extend(cds.schema?.constructor || {}).with(class {
   get overlay4() { return super.overlay4 = require('./env/schema') }
 })
 
 // set build API, potentially removing the old API facade from sap/cds 7
-delete cds.__proto__?.build
+// delete cds.__proto__?.build //> not required, as its overriden below anyways
 cds.extend (cds.constructor) .with (class {
   get build() { return super.build = require('./build') }
 })

package/lib/init/constants.js

@@ -4,7 +4,7 @@ module.exports = {
     COMMAND_INIT: 'init',
     COMMAND_ADD: 'add',
 
-    MAVEN_ARCHETYPE_VERSION: '2.3.0',
+    MAVEN_ARCHETYPE_VERSION: '2.4.0',
 
     OPTIONS: Object.freeze({
         JAVA: 'java',
@@ -45,8 +45,6 @@ module.exports = {
         NOTIFICATIONS: 'notifications'
     }),
 
-    PROJECT_TYPE: Object.freeze({ nodejs: 1, java: 2, unknown: 3 }),
-
     REGEX_JAVA_PACKAGE: /^[a-z_][a-z0-9_]*(\.[a-z_][a-z0-9_]*)*$/g,
     // copied from mbt error message
     REGEX_JAVA_VERSION: /^(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-]+)*)?$/,

package/lib/init/index.js

@@ -6,7 +6,7 @@ const { OPTIONS, COMMAND_INIT, PROJECT_FILES, REGEX_PROJECT_NAME } = require('./
 const {
     NODEJS, JAVA,
     HANA, APPROUTER, XSUAA, KIBANA, ENTERPRISE_MESSAGING,
-    MTA, HELM, MULTITENANCY, PIPELINE,
+    MTA, MULTITENANCY, PIPELINE,
     TINY_SAMPLE, SAMPLE
  } = OPTIONS
 
@@ -23,7 +23,7 @@ module.exports = class CDSGenerator {
             default: '',
             target: 'projectName',
             validate: async (value) => {
-                try {    
+                try {
                     cds.root = path.resolve(this.cwd, value || '.');
 
                     await this._validateProjectName(value);
@@ -74,7 +74,7 @@ module.exports = class CDSGenerator {
             default: '',
             choices: [
                 { name: 'Cloud Foundry: MTA Deployment', value: MTA },
-                { name: 'Kyma: Helm Deployment', value: HELM },
+                // { name: 'Kyma: Helm Deployment', value: HELM },
                 { name: 'Multitenancy', value: MULTITENANCY },
                 { name: 'CI/CD Pipeline Integration', value: PIPELINE },
             ],
@@ -182,7 +182,11 @@ module.exports = class CDSGenerator {
 
         if (cds.cli.command === COMMAND_INIT) {
             const relativeProjectPath = path.relative(this.cwd, cds.root)
-            console.log(`\nSuccessfully created project. Continue with '${term.bold('cd '+relativeProjectPath)}'.\n`)
+            let message = 'Successfully created project.'
+            if (relativeProjectPath) {
+                message = message + ` Continue with '${term.bold('cd ' + relativeProjectPath)}'.`
+            }
+            console.log('\n' + message)
         } else {
             console.log(`\nSuccessfully added features to your project.`)
         }
@@ -219,6 +223,7 @@ module.exports = class CDSGenerator {
             // Compat
             if (facet === 'sample-tiny') facet = 'tiny-sample'
             if (facet === 'kibana-logging') facet = 'kibana'
+            if (facet === 'postgresql') facet = 'postgres'
 
             if (!templates.has(facet)) {
                 const template = await this._createTemplate(facet)

package/lib/init/template/approuter/files/package.json

@@ -4,7 +4,7 @@
     "@sap/approuter": "^14.0.0"
   },
   "engines": {
-    "node": "^18.0.0"
+    "node": "^20.0.0"
   },
   "scripts": {
     "start": "node node_modules/@sap/approuter/approuter.js"

package/lib/init/template/hana/files/db/package.json

@@ -4,7 +4,7 @@
     "@sap/hdi-deploy": "^4"
   },
   "engines": {
-    "node": "^16 || ^18"
+    "node": "^20.0.0"
   },
   "scripts": {
     "start": "node node_modules/@sap/hdi-deploy/deploy.js",

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

@@ -1,6 +1,6 @@
 const { join } = require('path')
 const cds = require('../../../cds')
-const { exists, read, write } = cds.utils
+const { read, write } = cds.utils
 const { APPROUTER, HANA, KIBANA } = require('../../constants').OPTIONS
 const mvn = require('../../util/mvn')
 const { readProject } = require('../../util/projectReader')
@@ -17,11 +17,9 @@ const {
 module.exports = class MultitenancyTemplate extends require('../templateBase') {
 
   static hasFacet(env) {
-    // REVISIT: Check if this can be simplified
     const { options } = cds.cli.options
-    return options?.add?.has('mtx') || options?.add?.has('multitenancy') ||
-           !!env.requires?.multitenancy || !!env.requires?.db?.multiTenant ||
-           exists(join('mtx', 'sidecar')) || false
+    // REVISIT: Check if this can be simplified
+    return options?.add?.has('mtx') || options?.add?.has('multitenancy') || !!env.requires?.multitenancy || false
   }
 
   getRelatedFacets() {

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

@@ -3,13 +3,13 @@ const cds = require('../../../cds')
 const { read } = cds.utils
 const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML } = require('../../util/merge')
+const mvn = require('../../util/mvn')
 const { srvNode4, srvJava4, postgres, postgresDeployer } = require('../_merging/registry-mta')
 
 module.exports = class PostgresTemplate extends require('../templateBase') {
 
   async canRun() {
-    const { hasMta, hasHelm, isJava } = await readProject(this.options)
-    if (isJava)             throw `'cds add postgres' is not available for Java yet`
+    const { hasMta, hasHelm } = await readProject(this.options)
     if (hasHelm && !hasMta) throw `'cds add postgres' is not available for Kyma yet`
     return true
   }
@@ -20,9 +20,10 @@ module.exports = class PostgresTemplate extends require('../templateBase') {
 
   async run() {
     const project = await readProject(this.options)
-    const { configFile } = project
+    const { configFile, isJava } = project
     project.shortcut = !(await read(configFile)).cds?.requires?.db?.kind
     await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), project)
+    if (isJava) await mvn.add('postgresql')
     await this.runDependentMerging()
   }
 

package/lib/init/template/templateBase.js

@@ -1,6 +1,4 @@
 const cds = require('../../cds')
-const { exists } = require('../../cds').utils
-const { PROJECT_TYPE } = require('../constants')
 
 module.exports = class TemplateBase {
 
@@ -99,15 +97,4 @@ module.exports = class TemplateBase {
      */
     async finalize() {
     }
-
-    /**
-     * Returns the project type
-     * @see PROJECT_TYPE
-     * @returns PROJECT_TYPE for current project
-     */
-    getProjectType() {
-        if (exists('pom.xml')) return PROJECT_TYPE.java;
-        if (exists('package.json')) return PROJECT_TYPE.nodejs;
-        return PROJECT_TYPE.unknown;
-    }
 }