@sap/cds-compiler 5.8.2 → 5.9.0

package/lib/edm/edm.js

@@ -21,7 +21,7 @@ function getEdm( options, messageFunctions ) {
       if (!attributes || typeof attributes !== 'object')
         error(null, 'Debug me: attributes must be a dictionary');
       if (!Array.isArray(version))
-        error(null, `Debug me: v is either undefined or not an array: ${version}`);
+        error(null, `Debug me: v is either undefined or not an array: ${ version }`);
       if (version.filter(v => v).length !== 1)
         error(null, 'Debug me: exactly one version must be set');
 
@@ -131,7 +131,7 @@ function getEdm( options, messageFunctions ) {
     toJSONattributes(json, withHints = true) {
       forEach(this._edmAttributes, (p, v) => {
         if (p !== 'Name')
-          json[p[0] === '@' ? p : `$${p}`] = v;
+          json[p[0] === '@' ? p : `$${ p }`] = v;
       });
       return (withHints ? this.toOpenApiHints(json) : json);
     }
@@ -139,7 +139,7 @@ function getEdm( options, messageFunctions ) {
     toOpenApiHints(json) {
       if (options.odataOpenapiHints && this._openApiHints) {
         Object.entries(this._openApiHints).forEach(([ p, v ]) => {
-          json[p[0] === '@' ? p : `$${p}`] = v;
+          json[p[0] === '@' ? p : `$${ p }`] = v;
         });
       }
       return json;
@@ -158,24 +158,24 @@ function getEdm( options, messageFunctions ) {
     // virtual
     toXML(indent = '', what = 'all') {
       const { kind } = this;
-      let head = `${indent}<${kind}`;
+      let head = `${ indent }<${ kind }`;
 
       if (kind === 'Parameter' && this._edmAttributes.Collection) {
         delete this._edmAttributes.Collection;
-        this._edmAttributes.Type = `Collection(${this._edmAttributes.Type})`;
+        this._edmAttributes.Type = `Collection(${ this._edmAttributes.Type })`;
       }
 
       head += this.toXMLattributes();
 
-      const inner = this.innerXML(`${indent}  `, what);
+      const inner = this.innerXML(`${ indent }  `, what);
       if (inner.length < 1)
         head += '/>';
 
       else if (inner.length < 77 && inner.indexOf('<') < 0)
-        head += `>${inner.slice(indent.length + 1, -1)}</${kind}>`;
+        head += `>${ inner.slice(indent.length + 1, -1) }</${ kind }>`;
 
       else
-        head += `>\n${inner}${indent}</${kind}>`;
+        head += `>\n${ inner }${ indent }</${ kind }>`;
 
       return head;
     }
@@ -185,11 +185,11 @@ function getEdm( options, messageFunctions ) {
       let tmpStr = '';
       forEach(this._edmAttributes, (p, v) => {
         if (v !== undefined && typeof v !== 'object')
-          tmpStr += ` ${p}="${edmUtils.escapeStringForAttributeValue(v)}"`;
+          tmpStr += ` ${ p }="${ edmUtils.escapeStringForAttributeValue(v) }"`;
       });
       forEach(this._xmlOnlyAttributes, (p, v) => {
         if (v !== undefined && typeof v !== 'object')
-          tmpStr += ` ${p}="${edmUtils.escapeStringForAttributeValue(v)}"`;
+          tmpStr += ` ${ p }="${ edmUtils.escapeStringForAttributeValue(v) }"`;
       });
       return tmpStr;
     }
@@ -199,7 +199,7 @@ function getEdm( options, messageFunctions ) {
       let xml = '';
 
       this._children.forEach((e) => {
-        xml += `${e.toXML(indent, what)}\n`;
+        xml += `${ e.toXML(indent, what) }\n`;
       });
       return xml;
     }
@@ -211,7 +211,7 @@ function getEdm( options, messageFunctions ) {
         if (attr) {
           Object.entries(attr).forEach(([ p, v ]) => {
             if (p.match(/^@sap./))
-              this.setXml( { [`sap:${p.slice(5).replace(/\./g, '-')}`]: v } );
+              this.setXml( { [`sap:${ p.slice(5).replace(/\./g, '-') }`]: v } );
           });
         }
       }
@@ -324,17 +324,17 @@ function getEdm( options, messageFunctions ) {
         if (this._actions) {
           Object.values(this._actions).forEach((actionArray) => {
             actionArray.forEach((action) => {
-              xml += `${action.toXML(indent, what)}\n`;
+              xml += `${ action.toXML(indent, what) }\n`;
             });
           });
         }
       }
       if ((what === 'annotations' || what === 'all') && this._annotations.length > 0) {
         this._annotations.filter(a => a._edmAttributes.Term).forEach((a) => {
-          xml += `${a.toXML(indent)}\n`;
+          xml += `${ a.toXML(indent) }\n`;
         });
         this._annotations.filter(a => a._edmAttributes.Target).forEach((a) => {
-          xml += `${a.toXML(indent)}\n`;
+          xml += `${ a.toXML(indent) }\n`;
         });
       }
       return xml;
@@ -345,7 +345,7 @@ function getEdm( options, messageFunctions ) {
       if (this._edmAttributes) {
         Object.entries(this._edmAttributes).forEach(([ p, v ]) => {
           if (p !== 'Name' && p !== 'Namespace')
-            json[p[0] === '@' ? p : `$${p}`] = v;
+            json[p[0] === '@' ? p : `$${ p }`] = v;
         });
       }
       return this.toOpenApiHints(json);
@@ -464,7 +464,7 @@ function getEdm( options, messageFunctions ) {
 
       const json = Object.create(null);
       json.$Version = this._edmAttributes.Version;
-      json.$EntityContainer = `${schema._edmAttributes.Namespace}.${schema._ec._edmAttributes.Name}`;
+      json.$EntityContainer = `${ schema._edmAttributes.Namespace }.${ schema._ec._edmAttributes.Name }`;
 
       const referenceJson = Object.create(null);
       this._defaultRefs.forEach((r) => {
@@ -483,7 +483,7 @@ function getEdm( options, messageFunctions ) {
 
     // all(default), metadata, annotations
     toXML(what = 'all') {
-      return `<?xml version="1.0" encoding="utf-8"?>\n${super.toXML('', what)}`;
+      return `<?xml version="1.0" encoding="utf-8"?>\n${ super.toXML('', what) }`;
     }
 
     innerXML(indent, what) {
@@ -491,13 +491,13 @@ function getEdm( options, messageFunctions ) {
 
       if (this.v4 || (this.v2 && (what === 'all' || what === 'annotations'))) {
         this._defaultRefs.forEach((r) => {
-          xml += `${r.toXML(indent)}\n`;
+          xml += `${ r.toXML(indent) }\n`;
         });
       }
       this._children.forEach((e) => {
-        xml += `${e.toXML(indent)}\n`;
+        xml += `${ e.toXML(indent) }\n`;
       });
-      xml += `${this._service.toXML(indent, what)}\n`;
+      xml += `${ this._service.toXML(indent, what) }\n`;
       return xml;
     }
   }
@@ -509,7 +509,7 @@ function getEdm( options, messageFunctions ) {
           if (p === 'EntityType') // it's $Type in json
             json.$Type = v;
           else
-            json[p[0] === '@' ? p : `$${p}`] = v;
+            json[p[0] === '@' ? p : `$${ p }`] = v;
         }
       });
       return json;
@@ -527,7 +527,7 @@ function getEdm( options, messageFunctions ) {
     }
 
     getDuplicateMessage() {
-      return `EntityType "${this._edmAttributes.EntityType}"`;
+      return `EntityType "${ this._edmAttributes.EntityType }"`;
     }
   }
 
@@ -586,7 +586,7 @@ function getEdm( options, messageFunctions ) {
     innerXML(indent) {
       let xml = super.innerXML(indent);
       if (this._returnType !== undefined)
-        xml += `${this._returnType.toXML(indent)}\n`;
+        xml += `${ this._returnType.toXML(indent) }\n`;
       return xml;
     }
 
@@ -617,12 +617,12 @@ function getEdm( options, messageFunctions ) {
   */
   class FunctionImport extends Node {
     getDuplicateMessage() {
-      return `Function "${this._edmAttributes.Name}"`;
+      return `Function "${ this._edmAttributes.Name }"`;
     }
   } // ActionFunctionBase {}
   class ActionImport extends Node {
     getDuplicateMessage() {
-      return `Action "${this._edmAttributes.Name}"`;
+      return `Action "${ this._edmAttributes.Name }"`;
     }
   }
 
@@ -685,10 +685,10 @@ function getEdm( options, messageFunctions ) {
                 if (td[facetName] !== undefined &&
                       (facet.v2 === this.v2 ||
                       facet.v4 === this.v4)) {
-                  if (this.v2 && facetName === 'Scale' && csn[`@odata.${facetName}`] === 'variable')
+                  if (this.v2 && facetName === 'Scale' && csn[`@odata.${ facetName }`] === 'variable')
                     this.setXml({ [facet.extra]: true });
                   else
-                    this.setEdmAttribute(facetName, csn[`@odata.${facetName}`]);
+                    this.setEdmAttribute(facetName, csn[`@odata.${ facetName }`]);
                 }
               });
             }
@@ -702,28 +702,28 @@ function getEdm( options, messageFunctions ) {
       if (options.whatsMySchemaName && this._edmAttributes[typeName]) {
         const schemaName = options.whatsMySchemaName(this._edmAttributes[typeName]);
         if (schemaName && schemaName !== options.serviceName)
-          this._edmAttributes[typeName] = this._edmAttributes[typeName].replace(`${options.serviceName}.`, '');
+          this._edmAttributes[typeName] = this._edmAttributes[typeName].replace(`${ options.serviceName }.`, '');
       }
 
       // store undecorated type for JSON
       this._type = this._edmAttributes[typeName];
       // decorate for XML (not for Complex/EntityType)
       if (this.$isCollection && this._edmAttributes[typeName])
-        this._edmAttributes[typeName] = `Collection(${this._edmAttributes[typeName]})`;
+        this._edmAttributes[typeName] = `Collection(${ this._edmAttributes[typeName] })`;
     }
 
     toJSONattributes(json) {
       // $Type Edm.String, $Nullable=false MAY be omitted
       // @ property and parameter for performance reasons
       if (this._type !== 'Edm.String' && this._type)   // Edm.String is default)
-        json[`$${this._typeName}`] = this._type;
+        json[`$${ this._typeName }`] = this._type;
 
       if (this._edmAttributes) {
         Object.entries(this._edmAttributes).forEach(([ p, v ]) => {
           if (p !== 'Name' && p !== this._typeName &&
           // remove this line if Nullable=true becomes default
           !(p === 'Nullable' && !v))
-            json[p[0] === '@' ? p : `$${p}`] = v;
+            json[p[0] === '@' ? p : `$${ p }`] = v;
         });
       }
 
@@ -765,12 +765,12 @@ function getEdm( options, messageFunctions ) {
           // Limit Key length to 32 characters
           if (c > 0) {
             if (alias.length > 28)
-              alias = `${alias.substr(0, 13)}__${alias.substr(alias.length - 13, alias.length)}`;
+              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)}`;
+            alias = `${ alias.substr(0, 15) }__${ alias.substr(alias.length - 15, alias.length) }`;
           }
           p[1] = alias;
         }
@@ -792,7 +792,7 @@ function getEdm( options, messageFunctions ) {
     innerXML(indent) {
       let xml = '';
       if (this._keys)
-        xml += `${this._keys.toXML(indent)}\n`;
+        xml += `${ this._keys.toXML(indent) }\n`;
       return xml + super.innerXML(indent);
     }
 
@@ -800,7 +800,7 @@ function getEdm( options, messageFunctions ) {
       super.toJSONattributes(json);
       if (this._jsonOnlyAttributes) {
         Object.entries(this._jsonOnlyAttributes).forEach(([ p, v ]) => {
-          json[p[0] === '@' ? p : `$${p}`] = v;
+          json[p[0] === '@' ? p : `$${ p }`] = v;
         });
       }
       if (this._keys)
@@ -939,7 +939,7 @@ function getEdm( options, messageFunctions ) {
         // translate the following @sap annos as xml attributes to the Property
         forEach(csn, (p, v) => {
           if (p in Property.SAP_Annotation_Attributes)
-            this.setXml( { [`sap:${p.slice(5).replace(/\./g, '-')}`]: v });
+            this.setXml( { [`sap:${ p.slice(5).replace(/\./g, '-') }`]: v });
         });
       }
 
@@ -967,7 +967,7 @@ function getEdm( options, messageFunctions ) {
             Reason: Fiori UI5 expects 'Default' under extension namespace 'sap:'
             Additionally: The attribute is named 'Default' in V2 and 'DefaultValue' in V4
           */
-          this._edmAttributes[`Default${this.v4 ? 'Value' : ''}`] = defVal;
+          this._edmAttributes[`Default${ this.v4 ? 'Value' : '' }`] = defVal;
         }
       }
     }
@@ -1022,7 +1022,7 @@ function getEdm( options, messageFunctions ) {
 
     innerXML(indent) {
       if (this._d && this._p)
-        return `${this._p.toXML(indent)}\n${this._d.toXML(indent)}\n`;
+        return `${ this._p.toXML(indent) }\n${ this._d.toXML(indent) }\n`;
 
       return super.innerXML(indent);
     }
@@ -1044,7 +1044,7 @@ function getEdm( options, messageFunctions ) {
 
         // either csn has multiplicity or we have to use the multiplicity of the backlink
         if (this.$isCollection) {
-          this._edmAttributes.Type = `Collection(${attributes.Type})`;
+          this._edmAttributes.Type = `Collection(${ attributes.Type })`;
           // attribute Nullable is not allowed in combination with Collection (see Spec)
           // Even if min cardinality is > 0, remove Nullable, because the implicit OData contract
           // is that a navigation property must either return an empty collection or all collection
@@ -1142,7 +1142,7 @@ function getEdm( options, messageFunctions ) {
             json.$OnDelete = c._edmAttributes.Action;
             break;
           default:
-            error(null, `Debug me: Unhandled NavProp child: ${c.kind}`);
+            error(null, `Debug me: Unhandled NavProp child: ${ c.kind }`);
         }
       });
       // TODO Annotations
@@ -1220,7 +1220,7 @@ function getEdm( options, messageFunctions ) {
       // without filtering non-spec-compliant constExpr
       const json = Object.create(null);
       Object.entries(dict).forEach(([ k, v ]) => {
-        json[`$${k}`] = v;
+        json[`$${ k }`] = v;
       });
       return json;
     }
@@ -1246,7 +1246,7 @@ function getEdm( options, messageFunctions ) {
     toJSONattributes(json) {
       forEach(this._edmAttributes, (p, v) => {
         if (p !== 'Target')
-          json[p[0] === '@' ? p : `$${p}`] = v;
+          json[p[0] === '@' ? p : `$${ p }`] = v;
       });
       return json;
     }
@@ -1291,7 +1291,7 @@ function getEdm( options, messageFunctions ) {
     }
 
     getJsonFQTermName() {
-      return `@${this._edmAttributes.Term}${this._edmAttributes.Qualifier ? `#${this._edmAttributes.Qualifier}` : ''}`;
+      return `@${ this._edmAttributes.Term }${ this._edmAttributes.Qualifier ? `#${ this._edmAttributes.Qualifier }` : '' }`;
     }
   }
 
@@ -1317,7 +1317,7 @@ function getEdm( options, messageFunctions ) {
         json['@type'] = this._jsonOnlyAttributes.Type;
       const keys = Object.keys(this._edmAttributes).filter(k => k !== 'Type');
       for (const key of keys)
-        json[`$${key}`] = this._edmAttributes[key];
+        json[`$${ key }`] = this._edmAttributes[key];
       return json;
     }
 
@@ -1340,7 +1340,7 @@ function getEdm( options, messageFunctions ) {
             break;
           }
           default:
-            error(null, `Pease debug me: Unhandled Record child: ${c.kind}`);
+            error(null, `Pease debug me: Unhandled Record child: ${ c.kind }`);
         }
       });
       return json;
@@ -1384,8 +1384,8 @@ function getEdm( options, messageFunctions ) {
 
     toXML(indent = '') {
       const { kind } = this;
-      let xml = `${indent}<${kind}${this.toXMLattributes()}`;
-      xml += (this._value !== undefined ? `>${edmUtils.escapeStringForText(this._value)}</${kind}>` : '/>');
+      let xml = `${ indent }<${ kind }${ this.toXMLattributes() }`;
+      xml += (this._value !== undefined ? `>${ edmUtils.escapeStringForText(this._value) }</${ kind }>` : '/>');
       return xml;
     }
 
@@ -1403,10 +1403,10 @@ function getEdm( options, messageFunctions ) {
       const json = this.mergeJSONAnnotations();
       const e = this._children.filter(c => c.kind !== 'Annotation');
       if (e.length === 1)
-        json[`$${this.kind}`] = e[0].toJSON();
+        json[`$${ this.kind }`] = e[0].toJSON();
 
       else
-        json[`$${this.kind}`] = e.map(c => c.toJSON());
+        json[`$${ this.kind }`] = e.map(c => c.toJSON());
 
       return json;
     }
@@ -1418,14 +1418,14 @@ function getEdm( options, messageFunctions ) {
     }
     toJSON() {
       const json = this.mergeJSONAnnotations();
-      json[`$${this.kind}`] = null;
+      json[`$${ this.kind }`] = null;
       return json;
     }
   }
   class Apply extends AnnotationBase {
     toJSON() {
       const json = this.mergeJSONAnnotations();
-      json[`$${this.kind}`] = this._children.filter(c => c.kind !== 'Annotation').map(c => c.toJSON());
+      json[`$${ this.kind }`] = this._children.filter(c => c.kind !== 'Annotation').map(c => c.toJSON());
       return this.toJSONattributes(json);
     }
   }
@@ -1433,7 +1433,7 @@ function getEdm( options, messageFunctions ) {
     toXMLattributes() {
       if (this._jsonOnlyAttributes.Collection) {
         const ot = this._edmAttributes.Type;
-        this._edmAttributes.Type = `Collection(${ot})`;
+        this._edmAttributes.Type = `Collection(${ ot })`;
         const str = super.toXMLattributes();
         this._edmAttributes.Type = ot;
         return str;
@@ -1444,14 +1444,14 @@ function getEdm( options, messageFunctions ) {
       const json = this.mergeJSONAnnotations();
       // first expression only, if any
       const children = this._children.filter(child => child.kind !== 'Annotation');
-      json[`$${this.kind}`] = children.length ? children[0].toJSON() : {};
+      json[`$${ this.kind }`] = children.length ? children[0].toJSON() : {};
       return this.toJSONattributes(json);
     }
     toJSONattributes(json) {
       super.toJSONattributes(json);
       if (this._jsonOnlyAttributes) {
         Object.entries(this._jsonOnlyAttributes).forEach(([ p, v ]) => {
-          json[p[0] === '@' ? p : `$${p}`] = v;
+          json[p[0] === '@' ? p : `$${ p }`] = v;
         });
       }
       return json;
@@ -1462,7 +1462,7 @@ function getEdm( options, messageFunctions ) {
   class If extends AnnotationBase {
     toJSON() {
       const json = this.mergeJSONAnnotations();
-      json[`$${this.kind}`] = this._children.filter(c => c.kind !== 'Annotation').map(c => c.toJSON());
+      json[`$${ this.kind }`] = this._children.filter(c => c.kind !== 'Annotation').map(c => c.toJSON());
       return json;
     }
   }
@@ -1471,13 +1471,13 @@ function getEdm( options, messageFunctions ) {
       const json = this.mergeJSONAnnotations();
       // first expression only, if any
       const children = this._children.filter(child => child.kind !== 'Annotation');
-      json[`$${this.kind}`] = children.length ? children[0].toJSON() : '';
+      json[`$${ this.kind }`] = children.length ? children[0].toJSON() : '';
       return this.toJSONattributes(json);
     }
 
     toJSONattributes(json) { // including Name
       forEach(this._edmAttributes, (p, v) => {
-        json[p[0] === '@' ? p : `$${p}`] = v;
+        json[p[0] === '@' ? p : `$${ p }`] = v;
       });
       return json;
     }
@@ -1493,7 +1493,7 @@ function getEdm( options, messageFunctions ) {
       const json = this.mergeJSONAnnotations();
       // first expression only, if any
       const children = this._children.filter(child => child.kind !== 'Annotation');
-      json[`$${this.kind}`] = children.length ? children[0].toJSON() : {};
+      json[`$${ this.kind }`] = children.length ? children[0].toJSON() : {};
       return json;
     }
   }
@@ -1520,7 +1520,7 @@ function getEdm( options, messageFunctions ) {
     innerXML(indent) {
       let xml = '';
       this._end.forEach((e) => {
-        xml += `${e.toXML(indent)}\n`;
+        xml += `${ e.toXML(indent) }\n`;
       });
       xml += super.innerXML(indent);
       return xml;
@@ -1536,7 +1536,7 @@ function getEdm( options, messageFunctions ) {
       );
     }
     getDuplicateMessage() {
-      return `Association "${this._edmAttributes.Association}"`;
+      return `Association "${ this._edmAttributes.Association }"`;
     }
   }
 

package/lib/edm/edmAnnoPreprocessor.js

@@ -111,7 +111,7 @@ function applyAppSpecificLateCsnTransformationOnElement( options, element, struc
 
     // respect flattened annotation $value
     Object.entries(dict).forEach(([ k, v ]) => {
-      dict[`${k}.$value`] = v;
+      dict[`${ k }.$value`] = v;
     });
     return dict;
   }
@@ -202,7 +202,7 @@ function applyAppSpecificLateCsnTransformationOnStructure( options, struct, erro
 
     // respect flattened annotation $value
     Object.keys(dict).forEach((k) => {
-      dict[`${k}.$value`] = dict[k];
+      dict[`${ k }.$value`] = dict[k];
     });
 
     return dict;

package/lib/edm/edmInboundChecks.js

@@ -87,7 +87,7 @@ function inboundQualificationChecks( csn, options, messageFunctions,
         if (path[1] === defName)
           assignAnnotation(elt, anno, true);
         else if (elt[anno] == null)
-          warning('odata-key-uuid-default-anno', path, { type: type.type, anno, id: `${defName}:${eltPath.join('.')}` });
+          warning('odata-key-uuid-default-anno', path, { type: type.type, anno, id: `${ defName }:${ eltPath.join('.') }` });
       }
       else {
         const elements = type.items?.elements || type.elements;