@sap/cds-dk 7.0.2 → 7.1.0

package/lib/compile/asyncapi/components/messages/index.js

@@ -16,11 +16,31 @@ function getHeaderProperties(name) {
     return { type: { const: name } };
 }
 
+function nestedAnnotation(resObj, asyncapiProperty, keys, value) {
+    if (resObj[asyncapiProperty] === undefined) {
+        resObj[asyncapiProperty] = {};
+    }
+
+    let node = resObj[asyncapiProperty];
+
+    // traverse the annotation property and define the objects if they're not defined
+    for (let nestedIndex = 1; nestedIndex < keys.length - 1; nestedIndex++) {
+        const nestedElement = keys[nestedIndex];
+        if (node[nestedElement] === undefined) {
+            node[nestedElement] = {};
+        }
+        node = node[nestedElement];
+    }
+
+    // set value annotation property
+    node[keys[keys.length - 1]] = value;
+}
+
 function readAnnotations(definition, presets) {
     let resObj = {};
 
     for (const [key, value] of Object.entries(definition)) {
-        if (key.startsWith('@AsyncAPI')) {
+        if (key.startsWith('@AsyncAPI') && !key.startsWith('@AsyncAPI.Extensions')) {
             // get annotation value after @AsyncAPI
             const annotationProperties = key.split('@AsyncAPI.')[1];
             const keys = annotationProperties.split('.');
@@ -35,23 +55,22 @@ function readAnnotations(definition, presets) {
             if (keys.length === 1) {
                 resObj[asyncapiProperty] = value;
             } else {
-                if (resObj[asyncapiProperty] === undefined) {
-                    resObj[asyncapiProperty] = {};
-                }
-
-                let node = resObj[asyncapiProperty];
+                nestedAnnotation(resObj, asyncapiProperty, keys, value)
+            }
+        }
 
-                // traverse the annotation property and define the objects if they're not defined
-                for (let nestedIndex = 1; nestedIndex < keys.length-1; nestedIndex++) {
-                    const nestedElement = keys[nestedIndex];
-                    if (node[nestedElement] === undefined) {
-                        node[nestedElement] = {};
-                    }
-                    node = node[nestedElement];
-                }
+        else if (key.startsWith('@AsyncAPI.Extensions')) {
+            const annotationProperties = key.split('@AsyncAPI.Extensions.')[1];
+            const keys = annotationProperties.split('.');
+            keys[0] = "x-" + keys[0];
 
-                // set value annotation property
-                node[keys[keys.length-1]] = value;
+            if (keys.length === 1) {
+                // if the key is already present, that means, Annotations have already been considered
+                if (resObj[keys[0]]) continue;
+                // else we populate
+                resObj[keys[0]] = value;
+            } else {
+                nestedAnnotation(resObj, keys[0], keys, value);
             }
         }
     }
@@ -142,9 +161,13 @@ function entriesToMessages(definitions, events, presets) {
 /**
  * Combining the definition objects from CSN into one schema
  */
-module.exports = function definitionsToMessages(definitions, events, presets) {
+function definitionsToMessages(definitions, events, presets) {
     const messages = {};
-
     Object.assign(messages, entriesToMessages(definitions, events, presets));
     return messages;
 }
+
+module.exports = {
+    definitionsToMessages,
+    nestedAnnotation
+}

package/lib/compile/asyncapi/index.js

@@ -1,6 +1,6 @@
 const csnToJSONSchema = require('./components/schemas');
 const getMessageTraits = require('./components/messageTraits');
-const definitionsToMessages = require('./components/messages');
+const { definitionsToMessages, nestedAnnotation } = require('./components/messages');
 const getChannels = require('./channels');
 const cds = require('../../cds');
 const messages = require("./message");
@@ -75,13 +75,14 @@ function _getAsyncApi(csn, events, serviceName, applicationNamespace, presets) {
     const infoObject = getInfoObject(csn.definitions[serviceName]);
     const stateObj = getStateInfo(csn.definitions[serviceName]);
     const shortTextObj = getShortText(csn.definitions[serviceName]);
-
+    const extensionAnnotationObj = getExtensions(csn.definitions[serviceName], shortTextObj, stateObj);
     return {
         asyncapi: '2.0.0',
         'x-sap-catalog-spec-version': '1.2',
         'x-sap-application-namespace': applicationNamespace,
         ...Object.keys(stateObj).length && { 'x-sap-stateInfo': stateObj },
         ...Object.keys(shortTextObj).length && { 'x-sap-shortText': shortTextObj },
+        ...Object.keys(extensionAnnotationObj).length && extensionAnnotationObj,
         info: infoObject,
         defaultContentType: 'application/json',
         channels: getChannels(csn.definitions, events),
@@ -89,6 +90,26 @@ function _getAsyncApi(csn, events, serviceName, applicationNamespace, presets) {
     };
 }
 
+function getExtensions(serviceCsn, shortTextObj, stateObj) {
+    let extensionObj = {};
+    for (const [key, value] of Object.entries(serviceCsn)) {
+        if (key.startsWith('@AsyncAPI.Extensions')) {
+            const annotationProperties = key.split('@AsyncAPI.Extensions.')[1];
+            const keys = annotationProperties.split('.');
+            keys[0] = "x-" + keys[0];
+            if ((keys[0] === 'x-sap-shortText' && Object.keys(shortTextObj).length > 0) ||
+                (keys[0] === 'x-sap-stateInfo' && Object.keys(stateObj).length > 0)
+            ) continue;
+            if (keys.length === 1) {
+                extensionObj[keys[0]] = value;
+            } else {
+                nestedAnnotation(extensionObj, keys[0], keys, value);
+            }
+        }
+    }
+    return extensionObj;
+}
+
 function getShortText(serviceCsn, presetValue = undefined) {
     let shortTextValue = presetValue || serviceCsn["@AsyncAPI.ShortText"];
     if (shortTextValue) {

package/lib/deploy/to-hana/hana.js

@@ -15,7 +15,6 @@ const gitUtil = require('../../util/gitUtil');
 const mtaUtil = require('./mtaUtil');
 
 const { bold, info } = require('../../util/term');
-const { CliError } = require('../../client/helper/errors');
 
 const { bind } = require('../../bind');
 
@@ -49,7 +48,7 @@ class HanaDeployer {
     let { model, serviceName, tunnelAddress, vcapFile, undeployWhitelist, hdiOptions } = options;
 
     if (model) {
-      throw new CliError('Specifying a model for hana deployment is not supported.');
+      throw 'Specifying a model for hana deployment is not supported.';
     }
 
     console.log(`${bold('Starting deploy to SAP HANA ...')}`);

package/lib/import/common.js

@@ -66,6 +66,9 @@ async function getVersion(fileInputStream){
     } else if (version === '4.0' || version === "4.01") {
         oDataVersion = 'V4';
     }
+    else {
+        throw new Error(messages.INVALID_EDMX_METADATA_VERSION);
+    }
 
     return oDataVersion;
 }

package/lib/import/message.js

@@ -2,6 +2,7 @@
 
 const messages = {
 	INVALID_EDMX_METADATA: 'The OData model is not valid. Specify the correct OData model.',
+	INVALID_EDMX_METADATA_VERSION: 'The OData version is not valid. Specify the correct OData version.',
 	INVALID_OUTPUT_FILE: 'Please provide an output file with one of these [cds, csn, json] file extension.',
 	SPECIFY_INPUT_FILE: 'Specify an input file that exists.',
 	SPECIFY_OUTPUT_FILE: 'Specify an output file or correct the output file path provided.',
@@ -26,7 +27,7 @@ const messages = {
 	BOUNDED_ACTION_COLLISION: 'For Bounded Action, combination of action name and binding parameter type should be unique.',
 	STREAM_NO_COLLECTION: `'Edm.Stream' cannot be of Collection type.`,
 	UNSUPPORTED_PROPERTY_TYPE: 'Property cannot be of EntityType. Check the type: ',
-	UNRESOLVED_SCHEMA_NAMESPACE: `Could not resolve the schema `,
+    UNRESOLVED_SCHEMA_NAMESPACE: `Could not resolve the schema `,
 	INVALID_DATATYPE: `Invalid Data Type `,
 	ELEMENT_NAME_COLLISION: 'Collision between EntityContainer Element Name and Schema Element Name is currenlty not supported. Please check the element name: '
 };

package/lib/import/odata/metadataconverter/MetadataConverter.js

@@ -371,6 +371,7 @@ class Expression {
     annotate(prefix = '', target, annotationExpressionResult) {
         let _target = target;
         for (const key of Object.keys(annotationExpressionResult)) {
+            if (prefix !== '') prefix = prefix + ".";
             _target[prefix + key] = annotationExpressionResult[key];
         }
         return target;