@sap/cds-compiler 3.4.0 → 3.4.4

package/lib/edm/csn2edm.js

@@ -30,7 +30,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
 
   // use original options for messages; cloned CSN for semantic location
   const messageFunctions = makeMessageFunction(csn, _options, 'to.edmx');
-  const { info, warning, error, message, throwWithAnyError } = messageFunctions;
+  const { info, warning, error, message, throwWithError } = messageFunctions;
   checkCSNVersion(csn, _options);
 
   let rc = Object.create(null);
@@ -54,7 +54,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
 
   const v = options.v;
   if(Object.keys(allServices).length === 0) {
-    info(null, null, `No Services in model`);
+    info(null, null, 'No Services in model');
     return rc;
   }
 
@@ -76,7 +76,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
       services[serviceCsn.name] = createEdm(serviceCsn);
       return services; }, rc);
   }
-  throwWithAnyError();
+  throwWithError();
   return rc;
 
   //--------------------------------------------------------------------------------
@@ -91,6 +91,8 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
     // let alias = serviceCsn.alias || baseName(baseName(serviceCsn.name, '::'), '.');
     // FIXME: UI5 cannot deal with spec conforming simpleid alias names
 
+    function markRendered(def) { setProp(def, '$isRendered', true); }
+
     const service = new Edm.DataServices(v);
     /** @type {object} */
     const edm = new Edm.Edm(v, service);
@@ -131,8 +133,19 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
       -----------------------------------------------*/
     let LeadSchema;
     const fqSchemaXRef = [serviceCsn.name];
-    const whatsMySchemaName = function(n) {
-      return fqSchemaXRef.reduce((rc, sn) => !rc && n && n.startsWith(sn + '.') ? sn : rc, undefined);
+    const whatsMySchemaName = function(n, arr=fqSchemaXRef) {
+      return arr.reduce((rc, sn) => !rc && n && n.startsWith(sn + '.') ? sn : rc, undefined);
+    }
+
+    let xServiceRefs = [];
+    const UsedTypes = {};
+    function collectUsedType(csn, typeName = (csn.items?.type || csn.type)) {
+      if(typeName) {
+        if(UsedTypes[typeName])
+          UsedTypes[typeName].push(csn)
+        else
+          UsedTypes[typeName] = [ csn ];
+      }
     }
 
     // create schema containers
@@ -175,20 +188,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
 
       // Fill the schemas and references, fqSchemaXRef must be complete
       populateSchemas(subSchemaDictionary);
-      const xServiceRefs = populateXserviceRefs();
-      /* TODO:
-      const references = Object.entries(allSchemas).reduce((references, [fqName, art]) => {
-        // add references
-        if(fqName.startsWith(serviceCsn.name + '.') && art.kind === 'reference') {
-          fqSchemaXRef.push(fqName);
-          references.push(art);
-        }
-        return references;
-      }, []);
-      */
-      // Add xrefs to full schema cross ref list for further usage
-      fqSchemaXRef.push(...xServiceRefs);
-      fqSchemaXRef.sort((a,b) => b.length-a.length);
+      xServiceRefs = populateXserviceRefs();
 
       // Bring the schemas in alphabetical order, service first, root last
       const sortedSchemaNames = Object.keys(subSchemaDictionary).filter(n => n !== fallBackSchemaName && n !== serviceCsn.name).sort();
@@ -223,13 +223,52 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
     service._children.forEach(c => {
       c._ec && Object.entries(c._ec._registry).forEach((([setName, arr]) => {
         if(arr.length > 1) {
-          error(null, null, { name: c._edmAttributes.Namespace, id: setName },
-          `Namespace $(NAME): Duplicate entries in EntityContainer with Name=$(ID) for ${arr.map(a =>a.getDuplicateMessage()).join(', ')} `);
+          error(null, null, {
+            name: c._edmAttributes.Namespace,
+            id: setName,
+            names: arr.map(a => a.getDuplicateMessage())
+          }, 'Namespace $(NAME): Duplicate entries in EntityContainer with Name=$(ID) for $(NAMES)');
         }
       }));
     });
     // Create annotations and distribute into Schemas
     addAnnotations();
+
+     // type cross check
+    const xServiceRefNames = xServiceRefs.map(r => r.name).sort((a,b)=>b.length-a.length);
+    for(let typeName in UsedTypes) {
+      if(!isBuiltinType(typeName)) {
+        let iTypeName = typeName;
+        /*
+          Report type ref, if the type is
+            - not a builtin,
+            - not included in required definitions (for this service)
+            - not a type clash (reported in type exposure),
+            - a @cds.external service member but can't be rendered
+            - and not a cross referenced type
+        */
+        if(!typeName.startsWith(serviceCsn.name + '.'))
+          iTypeName = serviceCsn.name + '.' + typeName;
+        const def = reqDefs.definitions[iTypeName];
+
+        const usages = UsedTypes[typeName].filter(u => !u.$NameClashReported);
+        if(usages.length > 0) {
+          if(def && !def.$isRendered && def['@cds.external'])
+            message('odata-spec-violation-type', usages[0].$location, 
+              { 
+                type: typeName,
+                anno: '@cds.external',
+                name: serviceCsn.name,
+                code: def.elements ? 'Edm.ComplexType' : 'Edm.TypeDefinition',
+                version: options.isV4() ? '4.0' : '2.0',
+                '#': 'external' } );
+          else if(!def && !whatsMySchemaName(typeName, xServiceRefNames))
+            message('odata-spec-violation-type', usages[0].$location, 
+          { type: typeName, name: serviceCsn.name, '#': 'missing' } );
+        }
+      }
+    }
+
     return edm
 
     // Sort definitions into their schema container
@@ -290,7 +329,6 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
       return Object.entries(allSchemas).reduce((references, [fqName, art]) => {
         // add references
         if(art.kind === 'reference' && whatsMySchemaName(fqName) && serviceCsn.name === whatsMyServiceRootName(fqName, false)) {
-          fqSchemaXRef.push(fqName);
           references.push(art);
         }
         return references;
@@ -331,17 +369,17 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
       */
       edmUtils.foreach(schemaCsn.definitions,
         a => a.kind === 'entity' && !a.abstract && a.name.startsWith(schemaNamePrefix),
-        createEntityTypeAndSet
+        [createEntityTypeAndSet, markRendered]
       );
       // create unbound actions/functions
-      edmUtils.foreach(schemaCsn.definitions, 
+      edmUtils.foreach(schemaCsn.definitions,
         a => (a.kind === 'action' || a.kind === 'function') && a.name.startsWith(schemaNamePrefix),
-        (options.isV4()) ? createActionV4 : createActionV2);
+        [(options.isV4()) ? createActionV4 : createActionV2, markRendered]);
 
     // create the complex types
       edmUtils.foreach(schemaCsn.definitions,
       a => edmUtils.isStructuredType(a) && a.name.startsWith(schemaNamePrefix),
-      createComplexType);
+      [createComplexType, markRendered]);
 
       if(options.isV4())
       {
@@ -349,10 +387,10 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
         artifact => edmUtils.isDerivedType(artifact) &&
         !artifact.target &&
         artifact.name.startsWith(schemaNamePrefix),
-          createTypeDefinition);
+          [createTypeDefinitionV4, markRendered]);
       }
 
-      // fetch all exising children names in a map
+      // fetch all existing child names in a map
       const NamesInSchemaXRef = Schema._children.reduce((acc, cur) => {
         const name = cur._edmAttributes.Name;
         if(acc[name] === undefined) {
@@ -370,15 +408,12 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
             np.addReferentialConstraintNodes();
         }
         else {
-          addAssociation(np);
+          addAssociationV2(np);
         }
       });
 
-      // remove EntityContainer if empty
-      if(Schema._ec && Schema._ec._children.length === 0) {
-        Schema._children.splice(Schema._children.indexOf(Schema._ec), 1);
-      }
-      if(Schema._children.length === 0) {
+      if(Schema._children.length === 0 || 
+        (Schema._children.length === 1 && Schema._children[0].kind === 'EntityContainer')) {
         // FIXME: Location for sub schemas?
         warning(null, ['definitions', Schema._edmAttributes.Namespace], { name: Schema._edmAttributes.Namespace }, 'Schema $(NAME) is empty');
       }
@@ -468,6 +503,134 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
         });
       }
 
+      function createComplexType(structuredTypeCsn)
+      {
+        // V4 attributes: Name, BaseType, Abstract, OpenType
+        const attributes = { Name: structuredTypeCsn.name.replace(schemaNamePrefix, '') };
+
+        const complexType = new Edm.ComplexType(v, attributes, structuredTypeCsn);
+        const elementsCsn = structuredTypeCsn.items || structuredTypeCsn;
+        const properties = createProperties(elementsCsn, structuredTypeCsn)[0];
+        const loc = ['definitions', structuredTypeCsn.name];
+
+        if(properties.length === 0) {
+          warning(null, loc, { name: structuredTypeCsn.name },
+          'EDM ComplexType $(NAME) has no properties');
+        }
+        if(!edmUtils.isODataSimpleIdentifier(attributes.Name))
+          message('odata-spec-violation-id', loc, { id: attributes.Name });
+
+        properties.forEach(p => {
+          const pLoc = [ ...loc, ...(structuredTypeCsn.items ? ['items', 'elements'] : [ 'elements' ]), p._edmAttributes.Name ];
+          edmTypeCompatibilityCheck(p, pLoc);
+          if(p._edmAttributes.Name === complexType._edmAttributes.Name)
+            message('odata-spec-violation-property-name', pLoc, { kind: structuredTypeCsn.kind });
+
+          if(!edmUtils.isODataSimpleIdentifier(p._edmAttributes.Name))
+            message('odata-spec-violation-id', pLoc, { id: p._edmAttributes.Name });
+
+          if(options.isV2()) {
+            if(p._isCollection && !p._csn.target)
+              message('odata-spec-violation-array', pLoc, { version: '2.0' });
+
+            if(p._csn.target)
+              message('odata-spec-violation-assoc', pLoc, { version: '2.0' });
+          }
+        });
+
+
+        complexType.append(...(properties));
+
+        Schema.append(complexType);
+      }
+
+      /**
+       * @param {object} elementsCsn
+       * @param {object} edmParentCsn
+       * @returns {[object[], any]} Returns a [ [ Edm Properties ], boolean hasStream ]:
+       *                              array of Edm Properties
+       *                              hasStream : value of @Core.MediaType assignment
+       */
+      function createProperties(elementsCsn, edmParentCsn=elementsCsn)
+      {
+        const props = [];
+        let hasStream = false;
+        const streamProps = [];
+
+        elementsCsn.elements && Object.entries(elementsCsn.elements).forEach(([elementName, elementCsn]) =>
+        {
+          if(elementCsn._edmParentCsn == undefined)
+            setProp(elementCsn, '_edmParentCsn', edmParentCsn);
+
+          if(elementCsn.target) {
+              // Foreign keys are part of the generic elementCsn.elements property creation
+
+              // This is the V4 edmx:NavigationProperty
+              // gets rewritten for V2 in addAssociations()
+
+              // suppress navprop creation only if @odata.navigable:false is not annotated.
+              // (undefined !== false) still evaluates to true
+            if (!elementCsn._target.abstract && elementCsn['@odata.navigable'] !== false)
+              {
+              const navProp = new Edm.NavigationProperty(v, {
+                Name: elementName,
+                Type: elementCsn._target.name
+              }, elementCsn);
+              collectUsedType(elementCsn, elementCsn._target.name);
+              props.push(navProp);
+                // save the navProp in the global array for late constraint building
+              navigationProperties.push(navProp);
+            }
+          }
+            // render ordinary property if element is NOT ...
+            // 1) ... annotated @cds.api.ignore
+            // 2) ... annotated @odata.foreignKey4 and odataFormat: structured
+
+          else if(isEdmPropertyRendered(elementCsn, options))
+            {
+              // CDXCORE-CDXCORE-173
+              // V2: filter  @Core.MediaType
+            if ( options.isV2() && elementCsn['@Core.MediaType']) {
+              hasStream = elementCsn['@Core.MediaType'];
+              delete elementCsn['@Core.MediaType'];
+                // CDXCORE-CDXCORE-177:
+                // V2: don't render element but add attribute 'm:HasStream="true' to EntityType
+                // V4: render property type 'Edm.Stream'
+              streamProps.push(elementName);
+
+            } else {
+              collectUsedType(elementCsn);
+              props.push(new Edm.Property(v, { Name: elementName }, elementCsn));
+            }
+          }
+
+        });
+        if(options.isV2()) {
+          if(streamProps.length > 1) { // TODO: why not mention 2.0 in text?
+            error(null, ['definitions', elementsCsn.name], { names: streamProps, version: '2.0', anno: '@Core.MediaType' },
+                 'Expected only one element to be annotated with $(ANNO) for OData $(VERSION) but found $(NAMES)');
+          }
+          else if(streamProps.length === 1) {
+            info(null, ['definitions', elementsCsn.name], { id: streamProps[0], version: '2.0', anno: '@Core.MediaType' },
+                  'Property $(ID) annotated with $(ANNO) is removed from EDM for OData $(VERSION)');
+          }
+        }
+        return [ props, hasStream ];
+      }
+
+      // V4 <TypeDefintion>
+      function createTypeDefinitionV4(typeCsn)
+      {
+        // derived types are already resolved to base types
+        const attributes = { Name: typeCsn.name.replace(schemaNamePrefix, '') };
+        if(!edmUtils.isODataSimpleIdentifier(attributes.Name))
+          message('odata-spec-violation-id', ['definitions', typeCsn.name], { id: attributes.Name });
+
+        const typeDef = new Edm.TypeDefinition(v, attributes, typeCsn );
+        edmTypeCompatibilityCheck(typeDef, [ 'definitions', typeCsn.name ]);
+        Schema.append(typeDef);
+      }
+
       // add bound/unbound actions/functions for V4
       function createActionV4(actionCsn, _name, entityCsn=undefined)
       {
@@ -528,7 +691,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
           const pLoc = [ ...loc, 'params', p._edmAttributes.Name ];
           if(!edmUtils.isODataSimpleIdentifier(parameterName))
             message('odata-spec-violation-id', pLoc, { id: parameterName });
-
+          collectUsedType(parameterCsn);
           edmTypeCompatibilityCheck(p, pLoc);
           actionNode.append(p);
         });
@@ -536,6 +699,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
         // return type if any
         if(actionCsn.returns) {
           actionNode._returnType = new Edm.ReturnType(v, actionCsn.returns);
+          collectUsedType(actionCsn.returns);
           edmTypeCompatibilityCheck(actionNode._returnType, [ ...loc, 'returns' ]);
           // if binding type matches return type add attribute EntitySetPath
           if(entityCsn != undefined && fullQualified(entityCsn.name) === actionNode._returnType._type) {
@@ -617,6 +781,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
         actionCsn.params && Object.entries(actionCsn.params).forEach(([parameterName, parameterCsn]) => {
           const pLoc = [...loc, 'params', parameterName];
           const param = new Edm.Parameter(v, { Name: parameterName }, parameterCsn, 'In' );
+          collectUsedType(parameterCsn);
           edmTypeCompatibilityCheck(param, pLoc);
           if(!edmUtils.isODataSimpleIdentifier(parameterName))
             message('odata-spec-violation-id', pLoc, { id: parameterName });
@@ -644,6 +809,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
           const returns = action.returns.items || action.returns;
           let type = returns.type;
           if (type) {
+            collectUsedType(action.returns);
             if (!isBuiltinType(type) && csn.definitions[type].kind !== 'entity' && csn.definitions[type].kind !== 'type') {
               message('odata-spec-violation-returns', returnsLoc, { kind: action.kind, version: '2.0' });
             }
@@ -671,147 +837,21 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
         }
       }
 
-      /**
-       * @param {object} elementsCsn
-       * @param {object} edmParentCsn
-       * @returns {[object[], any]} Returns a [ [ Edm Properties ], boolean hasStream ]:
-       *                              array of Edm Properties
-       *                              hasStream : value of @Core.MediaType assignment
-       */
-      function createProperties(elementsCsn, edmParentCsn=elementsCsn)
-      {
-        const props = [];
-        let hasStream = false;
-        const streamProps = [];
-
-        elementsCsn.elements && Object.entries(elementsCsn.elements).forEach(([elementName, elementCsn]) =>
-        {
-          if(elementCsn._edmParentCsn == undefined)
-            setProp(elementCsn, '_edmParentCsn', edmParentCsn);
-
-          if(elementCsn.target) {
-              // Foreign keys are part of the generic elementCsn.elements property creation
-
-              // This is the V4 edmx:NavigationProperty
-              // gets rewritten for V2 in addAssociations()
-
-              // suppress navprop creation only if @odata.navigable:false is not annotated.
-              // (undefined !== false) still evaluates to true
-            if (!elementCsn._target.abstract && elementCsn['@odata.navigable'] !== false)
-              {
-              const navProp = new Edm.NavigationProperty(v, {
-                Name: elementName,
-                Type: elementCsn._target.name
-              }, elementCsn);
-              props.push(navProp);
-                // save the navProp in the global array for late constraint building
-              navigationProperties.push(navProp);
-            }
-          }
-            // render ordinary property if element is NOT ...
-            // 1) ... annotated @cds.api.ignore
-            // 2) ... annotated @odata.foreignKey4 and odataFormat: structured
-
-          else if(isEdmPropertyRendered(elementCsn, options))
-            {
-              // CDXCORE-CDXCORE-173
-              // V2: filter  @Core.MediaType
-            if ( options.isV2() && elementCsn['@Core.MediaType']) {
-              hasStream = elementCsn['@Core.MediaType'];
-              delete elementCsn['@Core.MediaType'];
-                // CDXCORE-CDXCORE-177:
-                // V2: don't render element but add attribute 'm:HasStream="true' to EntityType
-                // V4: render property type 'Edm.Stream'
-              streamProps.push(elementName);
-
-            } else {
-              props.push(new Edm.Property(v, { Name: elementName }, elementCsn));
-            }
-          }
-
-        });
-        if(options.isV2()) {
-          if(streamProps.length > 1) { // TODO: why not mention 2.0 in text?
-            error(null, ['definitions', elementsCsn.name], { names: streamProps, version: '2.0', anno: '@Core.MediaType' },
-                 `Expected only one element to be annotated with $(ANNO) for OData $(VERSION) but found $(NAMES)`);
-          }
-          else if(streamProps.length === 1) {
-            info(null, ['definitions', elementsCsn.name], { id: streamProps[0], version: '2.0', anno: '@Core.MediaType' },
-                  'Property $(ID) annotated with $(ANNO) is removed from EDM for OData $(VERSION)');
-          }
-        }
-        return [ props, hasStream ];
-      }
-
-      function createComplexType(structuredTypeCsn)
-      {
-        // V4 attributes: Name, BaseType, Abstract, OpenType
-        const attributes = { Name: structuredTypeCsn.name.replace(schemaNamePrefix, '') };
-
-        const complexType = new Edm.ComplexType(v, attributes, structuredTypeCsn);
-        const elementsCsn = structuredTypeCsn.items || structuredTypeCsn;
-        const properties = createProperties(elementsCsn, structuredTypeCsn)[0];
-        const loc = ['definitions', structuredTypeCsn.name];
-
-        if(properties.length === 0) {
-          warning(null, loc, { name: structuredTypeCsn.name },
-          'EDM ComplexType $(NAME) has no properties');
-        }
-        if(!edmUtils.isODataSimpleIdentifier(attributes.Name))
-          message('odata-spec-violation-id', loc, { id: attributes.Name });
-
-        properties.forEach(p => {
-          const pLoc = [ ...loc, ...(structuredTypeCsn.items ? ['items', 'elements'] : [ 'elements' ]), p._edmAttributes.Name ];
-          edmTypeCompatibilityCheck(p, pLoc);
-          if(p._edmAttributes.Name === complexType._edmAttributes.Name)
-            message('odata-spec-violation-property-name', pLoc, { kind: structuredTypeCsn.kind });
-
-          if(!edmUtils.isODataSimpleIdentifier(p._edmAttributes.Name))
-            message('odata-spec-violation-id', pLoc, { id: p._edmAttributes.Name });
-
-          if(options.isV2()) {
-            if(p._isCollection && !p._csn.target)
-              message('odata-spec-violation-array', pLoc, { version: '2.0' });
-
-            if(p._csn.target)
-              message('odata-spec-violation-assoc', pLoc, { version: '2.0' });
-          }
-        });
-
-
-        complexType.append(...(properties));
-
-        Schema.append(complexType);
-      }
-
-      // V4 <TypeDefintion>
-      function createTypeDefinition(typeCsn)
-      {
-        // derived types are already resolved to base types
-        const attributes = { Name: typeCsn.name.replace(schemaNamePrefix, '') };
-        if(!edmUtils.isODataSimpleIdentifier(attributes.Name))
-          message('odata-spec-violation-id', ['definitions', typeCsn.name], { id: attributes.Name });
-
-        const typeDef = new Edm.TypeDefinition(v, attributes, typeCsn );
-        edmTypeCompatibilityCheck(typeDef, [ 'definitions', typeCsn.name ]);
-        Schema.append(typeDef);
-      }
-
       /*
-      * addAssociation() constructs a V2 association.
-      * In V4 all this has been simplified very much, the only thing actually left over is
-      * <ReferentialConstriant> that is then a sub element to <NavigationProperty>.
-      * However, referential constraints are substantially different to its V2 counterpart,
-      * so it is better to reimplement proper V4 construction of<NavigationProperty> in a separate
-      * function.
-      *
-      * This method does:
-      * rewrite <NavigationProperty> attributes to be V2 compliant
-      * add <Association> elements to the schema
-      * add <End>, <ReferentialConstraint>, <Dependent> and <Principal> sub elements to <Association>
-      * add <AssociationSet> to the EntityContainer for each <Association>
+        addAssociation() constructs a V2 association.
+        In V4 all this has been simplified very much, the only thing actually left over is
+        <ReferentialConstriant> that is then a sub element to <NavigationProperty>.
+        However, referential constraints are substantially different to its V2 counterpart,
+        so it is better to reimplement proper V4 construction of<NavigationProperty> in a separate
+        function.
+
+        This method does:
+        rewrite <NavigationProperty> attributes to be V2 compliant
+        add <Association> elements to the schema
+        add <End>, <ReferentialConstraint>, <Dependent> and <Principal> sub elements to <Association>
+        add <AssociationSet> to the EntityContainer for each <Association>
       */
-      function addAssociation(navigationProperty)
+      function addAssociationV2(navigationProperty)
       {
         let constraints = navigationProperty._csn._constraints;
         let parentName = navigationProperty._csn._edmParentCsn.name.replace(schemaNamePrefix, '');

package/lib/edm/edmAnnoPreprocessor.js

@@ -109,7 +109,7 @@ function applyAppSpecificLateCsnTransformationOnElement(options, element, struct
       if(!Array.isArray(CommonAttributes)) {
         error(null, ['definitions', struct.name, 'elements', element.name],
           { anno: '@Common.attribute', code: JSON.stringify(CommonAttributes) },
-          `Expect array value for $(ANNOTATION): $(CODE)`);
+          'Expect array value for $(ANNOTATION): $(CODE)');
         return;
       }
 
@@ -125,7 +125,7 @@ function applyAppSpecificLateCsnTransformationOnElement(options, element, struct
       if(!Array.isArray(ContextDefiningProperties)) {
         error(null, ['definitions', struct.name, 'elements', element.name],
           { anno: '@Aggregation.ContextDefiningProperties', code: JSON.stringify(ContextDefiningProperties) },
-          `Expect array value for $(ANNOTATION): $(CODE)`);
+          'Expect array value for $(ANNOTATION): $(CODE)');
         return;
       }
       if(ContextDefiningProperties.length > 0)
@@ -198,7 +198,7 @@ function applyAppSpecificLateCsnTransformationOnStructure(options, struct, error
         error(null, ['definitions', struct.name ],
           { anno: '@Capabilities.FilterRestrictions.FilterExpressionRestrictions',
             code: JSON.stringify(filterRestrictions) },
-          `Expect array value for $(ANNOTATION): $(CODE)`);
+          'Expect array value for $(ANNOTATION): $(CODE)');
         return;
       }
       filterRestrictions.forEach(v => {
@@ -215,7 +215,7 @@ function applyAppSpecificLateCsnTransformationOnStructure(options, struct, error
         error(null, ['definitions', struct.name],
           { anno: '@Capabilities.FilterRestrictions.RequiredProperties',
             code: JSON.stringify(requiredProperties) },
-          `Expect array value for $(ANNOTATION): $(CODE)`);
+          'Expect array value for $(ANNOTATION): $(CODE)');
         return;
       }
 
@@ -346,4 +346,4 @@ module.exports = {
   setSAPSpecificV2AnnotationsToEntityContainer,
   setSAPSpecificV2AnnotationsToEntitySet,
   setSAPSpecificV2AnnotationsToAssociation
-};
+};

package/lib/edm/edmInboundChecks.js

@@ -24,11 +24,11 @@ function resolveForeignKeyRefs(csn) {
 function inboundQualificationChecks(csn, options, messageFunctions, 
   serviceRootNames, requestedServiceNames, isMyServiceRequested, whatsMyServiceRootName) {
   const csnUtils = getUtils(csn);
-  const { message, throwWithAnyError } = messageFunctions;
+  const { message, throwWithError } = messageFunctions;
 
   forEachDefinition(csn, [ attach$path, checkChainedArray ]);
   checkNestedContextsAndServices();
-  throwWithAnyError();
+  throwWithError();
 
     // attach $path to all
   function attach$path(def, defName) {

package/lib/edm/edmPreprocessor.js

@@ -264,7 +264,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
           const art = csn.definitions[newDefName];
           if(art !== undefined) {
             error(null, [ 'definitions', defName ], { name: newDefName },
-            `Artifact name containing dots can't be mapped to an OData compliant name because it conflicts with existing definition $(NAME)`);
+            'Artifact name containing dots can\'t be mapped to an OData compliant name because it conflicts with existing definition $(NAME)');
           }
           else {
             csn.definitions[newDefName] = def;

package/lib/edm/edmUtils.js

@@ -205,7 +205,7 @@ function resolveOnConditionAndPrepareConstraints(csn, assocCsn, messageFunctions
     function fillConstraints(arg, pos)
     {
       if(arg.xpr)
-        arg.xpr.map(fillConstraints);
+        getExpressionArguments(arg.xpr);
       else if(pos > 0 && pos < expr.length)
       {
         let lhs = expr[pos-1];
@@ -485,7 +485,7 @@ function mapCdsToEdmType(csn, messageFunctions, isV2=false, isMediaType=false, l
   const { error } = messageFunctions || { error: ()=>true };
   let cdsType = csn.type;
   if(cdsType === undefined) {
-    error(null, location, `no type found`);
+    error(null, location, 'no type found');
     return '<NOTYPE>';
   }
   if(!isBuiltinType(cdsType))
@@ -544,7 +544,7 @@ function mapCdsToEdmType(csn, messageFunctions, isV2=false, isMediaType=false, l
     */
   }[cdsType];
   if (edmType == undefined) {
-    error(null, location, { type: cdsType }, `No EDM type available for $(TYPE)`);
+    error(null, location, { type: cdsType }, 'No EDM type available for $(TYPE)');
   }
   if(isV2)
   {