@sap/cds-dk 7.7.2 → 7.8.1

package/lib/build/util.js

@@ -117,9 +117,10 @@ function resolveRequiredSapModels(modelPaths) {
     })
 }
 
-async function getDefaultModelOptions(ws = false) {
+async function getDefaultModelOptions(ws = false, filter) {
+    // Note: requires.toggles holds the actual kind representation and not the value 'true'
     const wildcards = cds.env.requires.toggles && cds.env.features.folders ? ['*', cds.env.features.folders] : '*'
-    let paths = _filterModelPaths(cds.resolve(wildcards, false))
+    let paths = _filterModelPaths(cds.resolve(wildcards, false), filter)
 
     if (ws) {
         const workspaces = await getWorkspaces()
@@ -129,7 +130,7 @@ async function getDefaultModelOptions(ws = false) {
             workspaces.forEach(workspace => {
                 cds.root = path.join(root, workspace)
                 cds.env = cds.env.for('cds', cds.root)
-                paths = paths.concat(_filterModelPaths(cds.resolve(cds.env.requires.toggles ? wildcards : '*', false)).map(p => path.join(workspace, p)))
+                paths = paths.concat(_filterModelPaths(cds.resolve(cds.env.requires.toggles ? wildcards : '*', false), filter).map(p => path.join(workspace, p)))
             })
         } finally {
             cds.root = root
@@ -165,17 +166,6 @@ function getI18nDefaultFolder() {
     return cds.env.i18n.folders[0] ?? 'i18n'
 }
 
-function isClassicMtx() {
-    function _hasMtxDependency() {
-        try {
-            return !!require(path.join(cds.root, 'package.json'))?.dependencies?.['@sap/cds-mtx']
-        } catch (e) {
-            return false
-        }
-    }
-    return /true/i.test(process.env.OLD_MTX) || _hasMtxDependency()
-}
-
 async function pathExists(path) {
     return fs.promises.access(path).then(() => true).catch(() => false);
 }
@@ -264,10 +254,10 @@ function _validateWsDependencies(wsRoot, dependencies, devDependencies) {
 
 /**
  * Returns a flat array of existing files and folders, trailing '/' or '\\' characters have been removed.
- * @param  {...any} modelPaths array of files and folders - optionally nested
+ * @param  {Array} modelPaths array of files and folders - optionally nested
  * @returns 
  */
-function _filterModelPaths(...modelPaths) {
+function _filterModelPaths(modelPaths, filter) {
     const model = new Set()
     // may contain nested arrays
     modelPaths = flatten(modelPaths)
@@ -287,7 +277,7 @@ function _filterModelPaths(...modelPaths) {
             }
         }
     })
-    return [...model].map(m => normalizePath(m))
+    return [...model].filter(m => filter ? filter(m) : true).map(m => normalizePath(m))
 }
 
 /**
@@ -378,7 +368,6 @@ module.exports = {
     getDefaultModelOptions,
     flatten,
     getI18nDefaultFolder,
-    isClassicMtx,
     normalizePath,
     pathExists,
     getWorkspaces,

package/lib/compile/openapi/index.js

@@ -3,7 +3,8 @@ const cds = require('../../cds')
 
 module.exports = function processor(csn, options = {}) {
     const edmOptions = Object.assign({
-        odataOpenapiHints: true, // hint to compiler
+        odataOpenapiHints: true, // hint to cds-compiler
+        edm4OpenAPI: true, // downgrades certain OData errors to warnings in cds-compiler
         to: 'openapi' // hint to cds.compile.to.edm (usually set by CLI, but also do this in programmatic usages)
     }, options)
 

package/lib/index.js

@@ -46,9 +46,9 @@ class CdsDkAdd {
 class CdsDkBuild {
   get build() { return super.build = require('./build') }
 }
-if (process.argv[2] in { 'add':1, 'init':1 }) {
+if (process.argv[2] in { add:1, init:1, help:1 }) {
   cds.extend (cds.constructor) .with (CdsDkAdd)
-} else if (process.argv[2] in { 'build':1, 'deploy':1, 'push':1 }) {
+} else if (process.argv[2] in { build:1, deploy:1, push:1 }) {
   cds.extend (cds.constructor) .with (CdsDkBuild)
 }
 

package/lib/init/constants.js

@@ -4,7 +4,7 @@ module.exports = {
     COMMAND_INIT: 'init',
     COMMAND_ADD: 'add',
 
-    MAVEN_ARCHETYPE_VERSION: '2.7.0',
+    MAVEN_ARCHETYPE_VERSION: '2.8.1',
 
     OPTIONS: Object.freeze({
         JAVA: 'java',
@@ -35,6 +35,7 @@ module.exports = {
         ENTERPRISE_MESSAGING: 'enterprise-messaging',
         ENTERPRISE_MESSAGING_SHARED: 'enterprise-messaging-shared',
         REDIS_MESSAGING: 'redis-messaging',
+        KAFKA: 'kafka',
         APPROUTER: 'approuter',
         DESTINATION: 'destination',
         DATA: 'data',
@@ -56,7 +57,7 @@ module.exports = {
         PIPELINE_HELP: 'https://sap.github.io/jenkins-library/',
         SAMPLES: 'https://github.com/SAP-samples/cloud-cap-samples',
         CAPIRE: 'https://cap.cloud.sap',
-        MAVEN_ARCHETYPE_HELP: `https://cap.cloud.sap/docs/java/development/#the-maven-archetype`,
+        MAVEN_ARCHETYPE_HELP: `https://cap.cloud.sap/docs/java/developing-applications/building#the-maven-archetype`,
         MAVEN_INSTALL_HELP: `https://maven.apache.org/install.html`
     }),
 

package/lib/init/index.js

@@ -100,11 +100,11 @@ module.exports = class CDSGenerator {
     }
 
     /**
-     * @param {string} facets, comma separated list of templates, no blanks
+     * @param {string} facets, comma separated list of facets
      * @param {any} options, additional options
      */
-    async addCmd(facets) {
-        if (!facets) throw 'You must specify a facet to add to the project.'
+    async add(facets) {
+        if (!facets?.length) throw 'You must specify a facet to add to the project.'
 
         this._initialize(null);
         this._greetings();
@@ -113,7 +113,7 @@ module.exports = class CDSGenerator {
             throw `The current folder doesn't seem to contain a project. None of the following files found: ${PROJECT_FILES.join(', ')}.`
         }
 
-        await this._process();
+        await this._process(facets);
         await this.stepEnd();
     }
 
@@ -170,11 +170,11 @@ module.exports = class CDSGenerator {
         }
     }
 
-    async _process() {
+    async _process(facets) {
         DEBUG?.(`Project path: ${cds.root}`);
 
         await this._validateOptions();
-        await this._fillTemplateList();
+        await this._fillTemplateList(facets);
 
         for (const template of this.templateList) {
             console.log(`Adding feature '${template.name}'...`);
@@ -216,11 +216,11 @@ module.exports = class CDSGenerator {
         }
     }
 
-    async _fillTemplateList() {
+    async _fillTemplateList(facets) {
         const templates = new Map
-        const { command, options, argv } = cds.cli
+        const { command, options } = cds.cli
 
-        const plugins = command === COMMAND_INIT ? options.add : new Set(argv[0].split(','))
+        const plugins = command === COMMAND_INIT ? options.add : new Set(facets)
 
         for (let plugin of plugins) {
             // Compat
@@ -299,20 +299,6 @@ module.exports = class CDSGenerator {
         if (cds.cli.command === COMMAND_INIT && !options.add.has(JAVA)) {
             options.add.add(NODEJS);
         }
-
-        this._checkAdditionalOptions();
-    }
-
-    _checkAdditionalOptions() {
-        const { options } = cds.cli
-        for (const [key] of Object.entries(options)) {
-            const keySplit = key.split(/:/)
-            if (keySplit.length === 2) {
-                if (!options.add.has(keySplit[0])) {
-                    console.log(`ignoring option ${key} since ${keySplit[0]} is not part of specified feature list: ${Array.from(options.add).join(', ')}`)
-                }
-            }
-        }
     }
 
     async _validateOptions() {

package/lib/init/plugin.js

@@ -10,6 +10,14 @@ module.exports = class Plugin {
         this.name = this.constructor.name.replace(/template/i, '').replace(/([a-z0-9])([A-Z])/g, '$1-$2').toLowerCase()
     }
 
+    /**
+     * Provides command-line options for the plugin.
+     * @returns {Array.<{option: string, flag: string, shortcut?: string, help: string}>}
+     */
+    options() {
+        return []
+    }
+
     /**
      * Gets the required templates.
      * @returns {string[]} An array of strings representing required plugins.

package/lib/init/registries/mta.js

@@ -32,6 +32,11 @@ const enterpriseMessaging = {
     where: { type: 'org.cloudfoundry.managed-service', 'parameters.service': 'enterprise-messaging' }
 }
 
+const kafkaMessaging = {
+    in: 'resources',
+    where: { type: 'org.cloudfoundry.managed-service', 'parameters.service': 'kafka' }
+}
+
 const applicationLogging = {
     in: 'resources',
     where: { type: 'org.cloudfoundry.managed-service', 'parameters.service': 'application-logs' }
@@ -144,6 +149,7 @@ module.exports = {
     destination,
     connectivity,
     enterpriseMessaging,
+    kafkaMessaging,
     hdbDeployer,
     hdiContainer,
     notificationTypesDeployer,

package/lib/init/template/data/as-csv.js

@@ -0,0 +1,60 @@
+// const cds = require('../../../cds')
+
+module.exports = async (data={}, csn, { headerOnly=false, queries=false, separator=',' }={}) => {
+  if (!queries) { // remove all projection-like entities
+    Object.keys(data)
+      .map(name => csn.definitions[name])
+      .filter (entity => entity.query)
+      .forEach(entity => { delete data[entity.name] })
+  }
+
+  // We might need multiple passes if data for associations/compositions is created on the fly.
+  // So loop as long as there is some non-string data left.
+  while (Object.values(data).some(d => typeof d === 'object')) {
+    Object.entries(data)
+    .filter(([_, value]) => typeof value === 'object')
+    .map(([name]) => csn.definitions[name])
+    .forEach(entity => {
+      const entityData = data[entity.name]
+      const header = []
+      const records = []
+      for (let i = 0; i < entityData.length; i++) {
+        let record = []
+        for (const element of Object.values(entity.elements).sort(keyFirstSorter)) {
+          const name = element.name
+          let value = entityData[i][name]
+          if (value === undefined)
+            continue
+          if (element._type === 'cds.Composition') {
+            data[element.target] = value // Add object for a new entity. Next pass will process it.
+          }
+          else if (element._type === 'cds.Association') {
+            if (i === 0) {
+              header.push(...Object.keys(value).map(foreignKey => name + '_' + foreignKey))
+            }
+            record.push(...Object.values(value))
+          }
+          else {
+            if (i === 0)  header.push(name)
+            if (typeof value === 'string' && (value.includes('"') || value.includes(separator)))
+              value = `"${value.replace(/"/g, '""')}"` // escape double quotes, then quote the value
+            record.push(value)
+          }
+        }
+        records.push(record.join(separator))
+      }
+      let res = header.join(separator)
+      if (!headerOnly)
+        res += '\n' + records.join('\n')
+
+      data[entity.name] = res
+    })
+  }
+  return data
+}
+
+function keyFirstSorter(e1, e2) {
+  if (e1.key && !e2.key) return -1
+  if (!e1.key && e2.key) return 1
+  return 0 // preserve original order otherwise
+}