@sap/cds-compiler 2.11.4 → 2.13.8

package/lib/edm/edm.js

@@ -137,11 +137,11 @@ module.exports = function (options, error) {
       let tmpStr = '';
       edmUtils.forAll(this, (v, p) => {
         if (typeof this[p] !== 'object')
-          tmpStr += ' ' + p + '="' + edmUtils.escapeString(v) + '"'
+          tmpStr += ' ' + p + '="' + edmUtils.escapeStringForAttributeValue(v) + '"'
       });
       edmUtils.forAll(this._xmlOnlyAttributes, (v,p) => {
         if (typeof v !== 'object')
-          tmpStr += ' ' + p + '="' + edmUtils.escapeString(v) + '"'
+          tmpStr += ' ' + p + '="' + edmUtils.escapeStringForAttributeValue(v) + '"'
       });
       return tmpStr;
     }
@@ -599,7 +599,7 @@ module.exports = function (options, error) {
         // Complex/EntityType are derived from TypeBase
         // but have no type attribute in their CSN
         if(typecsn.type) { // this thing has a type
-          // check wether this is a scalar type (or array of scalar type) or a named type
+          // check whether this is a scalar type (or array of scalar type) or a named type
           let scalarType = undefined;
           if(typecsn.items && typecsn.items.type &&
             isBuiltinType(typecsn.items.type)) {
@@ -665,7 +665,7 @@ module.exports = function (options, error) {
         json['$'+this._typeName] = this._type;
 
       edmUtils.forAll(this, (v,p) => {
-        if (p !== 'Name' && p != this._typeName
+        if (p !== 'Name' && p !== this._typeName
           // remove this line if Nullable=true becomes default
           && !(p === 'Nullable' && v == false))
         {
@@ -711,7 +711,7 @@ module.exports = function (options, error) {
             if(alias.length > 28) {
               alias = alias.substr(0, 13)+ '__' +alias.substr(alias.length-13, alias.length);
             }
-            alias = alias+'_'+c.toString().padStart(3,0);
+            alias = alias+'_'+c.toString().padStart(3, '0');
           }
           else if(alias.length > 32) {
             alias = alias.substr(0, 15)+ '__' +alias.substr(alias.length-15, alias.length);
@@ -835,7 +835,7 @@ module.exports = function (options, error) {
       // Nullable=false is default for EDM JSON representation 4.01
       // When a key explicitly (!) has 'notNull = false', it stays nullable
       return (nodeCsn._NotNullCollection !== undefined ? nodeCsn._NotNullCollection :
-        (nodeCsn.key && !(nodeCsn.notNull === false)) || nodeCsn.notNull === true);
+        (nodeCsn.key && nodeCsn.notNull !== false) || nodeCsn.notNull === true);
     }
 
     toJSONattributes(json)
@@ -879,11 +879,12 @@ module.exports = function (options, error) {
       // the V2 metadata.xml
       // @ts-ignore
       Property.SAP_Annotation_Attribute_WhiteList = [
-        '@sap.hierarchy.node.for',                  //-> 	sap:hierarchy-node-for
-        '@sap.hierarchy.parent.node.for',           // -> 	sap:hierarchy-parent-node-for
-        '@sap.hierarchy.level.for',               	// -> 	sap:hierarchy-level-for
-        '@sap.hierarchy.drill.state.for',           // -> 	sap:hierarchy-drill-state-for
-        '@sap.hierarchy.node.descendant.count.for'	// -> 	sap:hierarchy-node-descendant-count-for
+        '@sap.hierarchy.node.for',                  // ->   sap:hierarchy-node-for
+        '@sap.hierarchy.parent.node.for',           // ->   sap:hierarchy-parent-node-for
+        '@sap.hierarchy.level.for',                 // ->   sap:hierarchy-level-for
+        '@sap.hierarchy.drill.state.for',           // ->   sap:hierarchy-drill-state-for
+        '@sap.hierarchy.node.descendant.count.for', // ->   sap:hierarchy-node-descendant-count-for
+        '@sap.parameter'
       ];
 
       super(v, attributes, csn);
@@ -927,9 +928,7 @@ module.exports = function (options, error) {
             Additionally: The attribute is named 'Default' in V2 and 'DefaultValue' in V4
           */
           if(this.v4)
-            this[`Default${this.v4 ? 'Value' : ''}`] = ['cds.Boolean', 'cds.Binary', 'cds.LargeBinary', 'cds.Integer64', 'cds.Integer'].includes(csn.type)
-          ? defVal
-          : edmUtils.escapeString(defVal);
+            this[`Default${this.v4 ? 'Value' : ''}`] = defVal;
         }
       }
     }
@@ -1159,7 +1158,7 @@ module.exports = function (options, error) {
           /* short notation for Edm.Boolean, Edm.String and Edm.Float, see internal project:
               edmx2csn-npm/edm-converters/blob/835d92a1aa6b0be25c56cef85e260c9188187429/lib/edmxV40ToJsonV40/README.md
             */
-          case 'Edm.Boolean': 
+          case 'Edm.Boolean':
             v = (v=='true'?true:(v=='false'?false:v));
             // eslint-no-fallthrough
           case 'Edm.String':
@@ -1275,8 +1274,8 @@ module.exports = function (options, error) {
       if(this.Type)
         json['@type'] = this.Type;
       let keys = Object.keys(this).filter(k => k !== 'Type');
-      for(let i = 0; i < keys.length; i++)
-        json['$'+keys[i]] = this[keys[i]];
+      for(const key of keys)
+        json['$'+key] = this[key];
     }
 
     toJSONchildren(json)
@@ -1356,7 +1355,7 @@ module.exports = function (options, error) {
     {
       let kind = this.kind;
       let xml = indent + '<' + kind + this.toXMLattributes();
-      xml +=  (this._value !== undefined ? '>' + edmUtils.escapeString(this._value) + '</' + kind + '>' : '/>');
+      xml +=  (this._value !== undefined ? '>' + edmUtils.escapeStringForText(this._value) + '</' + kind + '>' : '/>');
       return xml;
     }
 
@@ -1377,7 +1376,7 @@ module.exports = function (options, error) {
     }
 
     toJSON()
-    { 
+    {
       // toJSON: depending on number of children unary or n-ary expr
       const json = this.mergeJSONAnnotations();
       const e = this._children.filter(c=>c.kind !== 'Annotation');
@@ -1459,7 +1458,7 @@ module.exports = function (options, error) {
       return json;
     }
   }
-  // LabeledElementReference is a 
+  // LabeledElementReference is a
   class LabeledElementReference extends ValueThing {
     constructor(v, val) {
       super(v, 'LabeledElementReference', val);