@sap/cds-dk 6.7.1 → 6.8.0

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

@@ -25,13 +25,9 @@ class MetadataConverter {
      * @param {Object} options the options object
      * @memberof MetadataConverter
      */
-    constructor(options = { omit$TypeOnEdmString: true }) {
+    // constructor(options = { omit$TypeOnEdmString: true }) {
+    constructor(options = {}) {
         this._options = options;
-        if (options.omit$TypeOnEdmString === undefined) {
-            // eslint-disable-next-line no-param-reassign
-            options.omit$TypeOnEdmString = true;
-        }
-
         this._conversion = {};
     }
 
@@ -114,14 +110,6 @@ class MetadataConverter {
         const strategy = this._conversion.strategy[index];
         if (strategy == null) {
             let result = input;
-            if (this._options.omit$TypeOnEdmString === true) {
-                result = this._filterProperties(
-                    input,
-                    (key, inputNode) => {
-                        return !(key === '$Type' && inputNode[key] === 'Edm.String' && inputNode.$Cast === undefined);
-                    }
-                );
-            }
             return callback(null, result, []);
         }
 
@@ -287,8 +275,12 @@ class Expression {
             if (attr.NavigationPropertyPath) {
                 return { $NavigationPropertyPath: attr.NavigationPropertyPath };
             }
+            /**
+             * For entries like:
+             * <PropertyValue Property="Rollup" EnumMember="SAP__aggregation.RollupType/None"/>
+             */
             if (attr.EnumMember) {
-                return this.convertEnumMemberExpression(attr.EnumMember);
+                return { "#" : this.convertEnumMemberExpression(attr.EnumMember) };
             }
         } else {
             if (attr.AnnotationPath) {
@@ -298,7 +290,7 @@ class Expression {
             if (attr.ModelElementPath) return attr.ModelElementPath;
             if (attr.NavigationPropertyPath) return attr.NavigationPropertyPath;
             if (attr.EnumMember) {
-                return this.convertEnumMemberExpression(attr.EnumMember);
+                return { "#" : this.convertEnumMemberExpression(attr.EnumMember) };
             }
         }
 
@@ -579,7 +571,6 @@ class Expression {
         const nonStdAttributes = this.getNonStdAttributes(element.attributes);
         for (let i = 0; i < nonStdAttributes.length; i++) {
             let attr = nonStdAttributes[i];
-            let check = 0;
             let [prefix, attrName] = attr.split(':');
             if (attrName)
                 attrName = attrName.replace(/-/g, '.');
@@ -588,24 +579,17 @@ class Expression {
                 attribute = "@" + prefix + "." + attrName;
             else if (attrName === undefined)
                 attribute = "$" + prefix;
-            if (attribute !== undefined && attribute.startsWith('$') === false) {
-                Object.entries(target).forEach(a => {
-                    if (Object.keys(a[1]).length === 0 && typeof (a[1]) != 'boolean') {
-                        a[1][attribute] = element.attributes[attr];
-                        check = 1;
-                    }
-                });
-                if (check == 0)
-                    target[attribute] = element.attributes[attr];
+            if (attribute !== undefined && !attribute.startsWith('$')) {
+                target[attribute] = element.attributes[attr];
             }
         }
     }
 
     getNonStdAttributes(attributes) {
         const attributeList = [];
-        const standardArrtibutes = ['MaxLength', 'Precision', 'Scale', 'Nullable', 'DefaultValue',
-            'Name', 'Type', 'HasStream', 'IsFlags', 'Alias', 'Namespace', 'BaseType', 'Partner',
-            'IsComposable', 'ContainsTarget', 'IsBound', 'EntitySet', 'EntitySetPath', 'EntityType'];
+        const standardArrtibutes = ['MaxLength', 'Precision', 'Scale', 'Nullable', 'DefaultValue', 'Name',
+            'Type', 'HasStream', 'IsFlags', 'Alias', 'Namespace', 'BaseType', 'Partner', 'IsComposable',
+            'ContainsTarget', 'IsBound', 'EntitySet', 'EntitySetPath', 'EntityType', 'UnderlyingType'];
         attributeList.push(...Object.keys(attributes).filter(attribute => standardArrtibutes.indexOf(attribute) === -1));
         return attributeList;
     }
@@ -960,9 +944,8 @@ class Context extends Emitter {
             if (typeof metadata === 'string') {
                 metadataAst = this._strategy.getASTFactory()(metadata);
             }
-            return new MetadataConverter({
-                omit$TypeOnEdmString: false
-            }).addConversion([
+
+            return new MetadataConverter({}).addConversion([
                 MetadataConverter.createOdataV4MetadataXmlToOdataV4CsdlStrategy()
                     .setASTFactory(this._strategy.getASTFactory())
                     .setXmlNodeFactory(this._strategy.getXmlNodeFactory())
@@ -1378,7 +1361,11 @@ class FloatExpression extends Expression {
 class EnumMemberExpression extends Expression {
     constructor(element, expression, context) { super(element, expression, context); }
     interpret() {
-        const target = this.convertEnumMemberExpression(this.getElement().elements[0].text);
+        /**
+         * For entries like:
+         * <EnumMember>Org.OData.Core.V1.RevisionKind/Deprecated</EnumMember>
+         */
+        const target = { "#" : this.convertEnumMemberExpression(this.getElement().elements[0].text) };
         this.setTarget(target);
         super.interpret();
         return target;
@@ -1540,7 +1527,8 @@ class CollectionExpression extends Expression {
             .forEach((result) => {
                 target.push(result);
             });
-
+        // we might have to revisit this scenario when records/collection are empty
+        // return (target.length === 0) ? null : target;
         return target;
     }
 }
@@ -1661,7 +1649,8 @@ class RecordExpression extends Expression {
                 Object.assign(target, interpretation);
             }
         });
-
+        // we might have to revisit this scenario when records/collection are empty
+        // return (Object.keys(target).length === 0) ? null : target;
         return target;
     }
 }
@@ -1688,9 +1677,20 @@ class PropertyValueExpression extends Expression {
          */
         if (element.attributes.Int) target[name] = Number(element.attributes.Int);
         if (element.attributes.Bool) target[name] = element.attributes.Bool === 'true';
+        /**
+         * If the property valus is of type `Date`, import it as a string itself
+         * <PropertyValue Property="Date" Date="2021-08-24" />
+         * We might have to have a strict check in the futore.. 'YYYY-MM_DD`
+         */
+        if (element.attributes.Date) target[name] = element.attributes.Date;
 
         this.getStack().forEach((expr) => {
             const result = expr.interpret();
+            // we might have to revisit this scenario when records/collection are empty
+            // if (result === null) {
+            //     delete target[name];
+            //     return;
+            // }
             if (expr.getType() === 'CollectionExpression') {
                 target[name] = result;
             } else if (typeof result === 'object') {

package/lib/import/odata/util/MultiMap.js

@@ -1,8 +1,8 @@
 "use strict";
 
-/*
-    Library for handling multiple values for same key
-*/
+/**
+ * Library for handling multiple values for same key
+ */
 var Multimap = (function () {
     var mapCtor;
     if (typeof Map !== 'undefined') {
@@ -69,8 +69,8 @@ var Multimap = (function () {
     };
 
     /**
-   * @return {Array} all the keys in the map
-   */
+     * @return {Array} all the keys in the map
+     */
     Multimap.prototype.keys = function () {
         if (this._map)
             return makeIterator(this._.keys());

package/lib/import/odata/v2parser.js

@@ -1843,6 +1843,7 @@ function getEdmxv2CSN(edmx2jsonModel, ignorePersistenceSkip, mockServerUc, conte
 	isValid = _validateEDMX(edmx2jsonModel);
 	if (isValid) {
 		parserContext.serviceNamespace = _getServiceNameSpace(edmx2jsonModel);
+		context.schemaNamespace = parserContext.serviceNamespace; // required for `--keep-namespace` scenario
 		let namespaceAlias = edmx2jsonModel["edmx:Edmx"]["edmx:DataServices"].Schema._attributes.Alias;
 		// replace the namespace alias value with original namespace value
 		if (namespaceAlias) {