@sap/cds-compiler 2.15.2 → 3.0.2

package/lib/edm/csn2edm.js

@@ -14,7 +14,7 @@ const { cloneCsnNonDict, isEdmPropertyRendered, isBuiltinType } = require('../mo
 const { checkCSNVersion } = require('../json/csnVersion');
 const { makeMessageFunction } = require('../base/messages');
 const { EdmTypeFacetMap, EdmTypeFacetNames, EdmPrimitiveTypeMap, getEdm } = require('./edm.js');
-  
+
 /*
 OData V2 spec 06/01/2017 PDF version is available from here:
 https://msdn.microsoft.com/en-us/library/dd541474.aspx
@@ -330,11 +330,12 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
             Entity starts with 'localserviceNameized.' or ends with '_localized'
       */
       edmUtils.foreach(schemaCsn.definitions,
-        a => edmUtils.isEntity(a) && !a.abstract && a.name.startsWith(schemaNamePrefix),
+        a => a.kind === 'entity' && !a.abstract && a.name.startsWith(schemaNamePrefix),
         createEntityTypeAndSet
       );
       // create unbound actions/functions
-      edmUtils.foreach(schemaCsn.definitions, a => edmUtils.isActionOrFunction(a) && a.name.startsWith(schemaNamePrefix),
+      edmUtils.foreach(schemaCsn.definitions, 
+        a => (a.kind === 'action' || a.kind === 'function') && a.name.startsWith(schemaNamePrefix),
         (options.isV4()) ? createActionV4 : createActionV2);
 
     // create the complex types
@@ -346,7 +347,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
       {
         edmUtils.foreach(schemaCsn.definitions,
         artifact => edmUtils.isDerivedType(artifact) &&
-        !edmUtils.isAssociationOrComposition(artifact) &&
+        !artifact.target &&
         artifact.name.startsWith(schemaNamePrefix),
           createTypeDefinition);
       }
@@ -395,14 +396,14 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
       {
         const EntityTypeName = entityCsn.name.replace(schemaNamePrefix, '');
         const EntitySetName = edmUtils.getBaseName(entityCsn.$entitySetName || entityCsn.name);
-
+        const isSingleton = edmUtils.isSingleton(entityCsn) && options.isV4();
         const [ properties, hasStream ] = createProperties(entityCsn);
 
         const loc = ['definitions', entityCsn.name];
         const type = `${schema.name}.${EntityTypeName}`;
         if(properties.length === 0)
           warning(null, loc, { type }, 'EDM EntityType $(TYPE) has no properties');
-        else if(entityCsn.$edmKeyPaths.length === 0)
+        else if(entityCsn.$edmKeyPaths.length === 0 && !isSingleton)
           message('odata-spec-violation-no-key', loc);
 
         if(!edmUtils.isODataSimpleIdentifier(EntityTypeName))
@@ -414,14 +415,14 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
           if(p._edmAttributes.Name === EntityTypeName)
             warning('odata-spec-violation-property-name', pLoc, { kind: entityCsn.kind });
 
-          if(options.isV2() && p._isCollection && !edmUtils.isAssociationOrComposition(p._csn))
+          if(options.isV2() && p._isCollection && !p._csn.target)
             warning('odata-spec-violation-array', pLoc, { version: '2.0' });
 
           if(!edmUtils.isODataSimpleIdentifier(p._edmAttributes.Name))
             message('odata-spec-violation-id', pLoc, { id: p._edmAttributes.Name });
           else if (options.isV2() && /^(_|[0-9])/.test(p._edmAttributes.Name)) {
             // FIXME: Rewrite signalIllegalIdentifier function to be more flexible
-            error('odata-spec-violation-id', pLoc, 
+            message('odata-spec-violation-id', pLoc,
             { prop: p._edmAttributes.Name[0], id: p._edmAttributes.Name, version: '2.0', '#': 'v2firstchar' });
           }
         });
@@ -461,7 +462,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
         }
 
         // put actions behind entity types in Schema/EntityContainer
-        edmUtils.forAll(entityCsn.actions, (a, n) => {
+        entityCsn.actions && Object.entries(entityCsn.actions).forEach(([ n, a ]) => {
           (options.isV4()) ? createActionV4(a, n, entityCsn)
                           : createActionV2(a, n, entityCsn)
         });
@@ -522,7 +523,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
         }
 
         // Parameter Nodes
-        edmUtils.forAll(actionCsn.params, (parameterCsn, parameterName) => {
+        actionCsn.params && Object.entries(actionCsn.params).forEach(([parameterName, parameterCsn]) => {
           const p = new Edm.Parameter(v, { Name: parameterName }, parameterCsn );
           const pLoc = [ ...loc, 'params', p._edmAttributes.Name ];
           if(!edmUtils.isODataSimpleIdentifier(parameterName))
@@ -573,7 +574,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
         if(rt) // add EntitySet attribute only if return type is an entity
         {
           const defintion = schemaCsn.definitions[rt];
-          if(defintion && edmUtils.isEntity(defintion))
+          if(defintion && defintion.kind === 'entity')
           {
             functionImport.setEdmAttribute('EntitySet', rt.replace(schemaNamePrefix, ''));
           }
@@ -597,7 +598,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
           // Binding Parameter: Primary Keys at first position in sequence, this is decisive!
           // V2 XML: Nullable=false is set because we reuse the primary key property for the parameter
           edmUtils.foreach(entityCsn.elements,
-            elementCsn => elementCsn.key && !edmUtils.isAssociationOrComposition(elementCsn),
+            elementCsn => elementCsn.key && !elementCsn.target,
             (elementCsn, elementName) => {
               functionImport.append(new Edm.Parameter(v, { Name: elementName }, elementCsn, 'In' ));
             }
@@ -605,7 +606,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
         }
 
         // is this still required?
-        edmUtils.forAll(actionCsn, (v, p) => {
+        Object.entries(actionCsn).forEach(([p, v]) => {
           if (p.match(/^@sap\./))
             functionImport.setXml( { ['sap:' + p.slice(5).replace(/\./g, '-')] : v });
         });
@@ -613,7 +614,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
         // V2 XML: Parameters that are not explicitly marked as Nullable or NotNullable in the CSN must become Nullable=true
         // V2 XML spec does only mention default Nullable=true for Properties not for Parameters so omitting Nullable=true let
         // the client assume that Nullable is false.... Correct Nullable Handling is done inside Parameter constructor
-        edmUtils.forAll(actionCsn.params, (parameterCsn, parameterName) => {
+        actionCsn.params && Object.entries(actionCsn.params).forEach(([parameterName, parameterCsn]) => {
           const pLoc = [...loc, 'params', parameterName];
           const param = new Edm.Parameter(v, { Name: parameterName }, parameterCsn, 'In' );
           edmTypeCompatibilityCheck(param, pLoc);
@@ -621,9 +622,9 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
             message('odata-spec-violation-id', pLoc, { id: parameterName });
 
           // only scalar or structured type in V2 (not entity)
-          if(param._type && 
-            !param._type.startsWith('Edm.') && 
-            csn.definitions[param._type] && 
+          if(param._type &&
+            !param._type.startsWith('Edm.') &&
+            csn.definitions[param._type] &&
             !edmUtils.isStructuredType(csn.definitions[param._type]))
             warning('odata-spec-violation-param', pLoc, { version: '2.0' });
 
@@ -683,14 +684,12 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
         let hasStream = false;
         const streamProps = [];
 
-        edmUtils.forAll(elementsCsn.elements, (elementCsn, elementName) =>
+        elementsCsn.elements && Object.entries(elementsCsn.elements).forEach(([elementName, elementCsn]) =>
         {
           if(elementCsn._edmParentCsn == undefined)
             setProp(elementCsn, '_edmParentCsn', edmParentCsn);
 
-          if(!elementCsn._ignore) {
-            if(edmUtils.isAssociationOrComposition(elementCsn))
-            {
+          if(elementCsn.target) {
               // Foreign keys are part of the generic elementCsn.elements property creation
 
               // This is the V4 edmx:NavigationProperty
@@ -698,36 +697,35 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
 
               // 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)
+            if (!elementCsn._target.abstract && elementCsn['@odata.navigable'] !== false)
               {
-                const navProp = new Edm.NavigationProperty(v, {
-                  Name: elementName,
-                  Type: elementCsn._target.name
-                }, elementCsn);
-                props.push(navProp);
+              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);
-              }
+              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))
+          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'];
+            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);
+              streamProps.push(elementName);
 
-              } else {
-                props.push(new Edm.Property(v, { Name: elementName }, elementCsn));
-              }
+            } else {
+              props.push(new Edm.Property(v, { Name: elementName }, elementCsn));
             }
           }
 
@@ -772,10 +770,10 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
             message('odata-spec-violation-id', pLoc, { id: p._edmAttributes.Name });
 
           if(options.isV2()) {
-            if(p._isCollection && !edmUtils.isAssociationOrComposition(p._csn))
+            if(p._isCollection && !p._csn.target)
               warning('odata-spec-violation-array', pLoc, { version: '2.0' });
 
-            if(edmUtils.isAssociationOrComposition(p._csn))
+            if(p._csn.target)
               warning('odata-spec-violation-assoc', pLoc, { version: '2.0' });
           }
         });
@@ -933,7 +931,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
 
     // generate the Edm.Annotations tree and append it to the corresponding schema
     function addAnnotations() {
-      let { annos, usedVocabularies } = translate.csn2annotationEdm(csn, serviceCsn.name, Edm, options, messageFunctions);
+      let { annos, usedVocabularies } = translate.csn2annotationEdm(reqDefs, serviceCsn.name, Edm, options, messageFunctions);
       // distribute edm:Annotations into the schemas
       // Distribute each anno into Schema
       annos.forEach(anno => {
@@ -990,7 +988,7 @@ function csn2edmAll(_csn, _options, serviceNames=undefined) {
           });
         }
         else {
-          message('odata-spec-violation-type-unknown', pLoc, 
+          message('odata-spec-violation-type-unknown', pLoc,
           { type:edmType });
         }
       }

package/lib/edm/edm.js

@@ -54,7 +54,7 @@ const EdmPrimitiveTypeMap = {
   'Edm.GeometryMultiLineString': { v4: true, SRID: true, desc: 'Collection of line strings in a flat-earth coordinate system' },
   'Edm.GeometryMultiPolygon': { v4: true, SRID: true, desc: 'Collection of polygons in a flat-earth coordinate system' },
   'Edm.GeometryCollection': { v4: true, SRID: true, desc: 'Collection of arbitrary Geometry values' },
-  //'Edm.PrimitiveType': { v4: true, desc: 'Abstract meta type' },
+  'Edm.PrimitiveType': { v4: true, desc: 'Abstract meta type' },
   //'Edm.Untyped': { v4: true, desc: 'Abstract void type' },
 };
 
@@ -239,7 +239,7 @@ function getEdm(options, messageFunctions) {
       if(csn)
       {
         const attr = (useSetAttributes ? csn._SetAttributes : csn);
-        edmUtils.forAll(attr, (v, p) => {
+        attr && Object.entries(attr).forEach(([p, v]) => {
           if (p.match(/^@sap./))
             this.setXml( { ['sap:' + p.slice(5).replace(/\./g, '-')] : v } );
         });
@@ -332,7 +332,7 @@ function getEdm(options, messageFunctions) {
       if(what==='metadata' || what==='all')
       {
         xml += super.innerXML(indent);
-        edmUtils.forAll(this._actions, actionArray => {
+        this._actions && Object.values(this._actions).forEach(actionArray => {
           actionArray.forEach(action => {
             xml += action.toXML(indent, what) + '\n'; });
         });
@@ -350,7 +350,7 @@ function getEdm(options, messageFunctions) {
     // no $Namespace
     toJSONattributes(json)
     {
-      edmUtils.forAll(this._edmAttributes, (v,p) => {
+      this._edmAttributes && Object.entries(this._edmAttributes).forEach(([p, v]) => {
         if (p !== 'Name' && p !== 'Namespace')
           json[p[0] === '@' ? p : '$' + p] = v;
       });
@@ -371,7 +371,7 @@ function getEdm(options, messageFunctions) {
         if(Object.keys(json_Annotations).length)
           json['$Annotations'] = json_Annotations;
       }
-      edmUtils.forAll(this._actions, (actionArray, actionName) => {
+      this._actions && Object.entries(this._actions).forEach(([actionName, actionArray]) => {
         json[actionName] = [];
         actionArray.forEach(action => {
           json[actionName].push(action.toJSON());
@@ -737,7 +737,7 @@ function getEdm(options, messageFunctions) {
       if(this._type !== 'Edm.String' && this._type)   // Edm.String is default)
         json['$'+this._typeName] = this._type;
 
-      edmUtils.forAll(this._edmAttributes, (v,p) => {
+      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 == false))
@@ -840,8 +840,8 @@ function getEdm(options, messageFunctions) {
       super(v, attributes, csn);
 
       // array of enum not yet allowed
-      let enumValues = /*(csn.items && csn.items.enum) ||*/ csn.enum;
-      edmUtils.forAll(enumValues, (e, en) =>  {
+      const enumValues = /*(csn.items && csn.items.enum) ||*/ csn.enum;
+      enumValues && Object.entries(enumValues).forEach(([en, e]) =>  {
         this.append(new Member(v, { Name: en, Value: e.val } ));
       });
     }
@@ -1177,9 +1177,10 @@ function getEdm(options, messageFunctions) {
         _constraints = this._csn._constraints._partnerCsn._constraints;
         [i,j] = [1,0];
       }
-      edmUtils.forAll(_constraints.constraints,
-        c => this.append(new ReferentialConstraint(this._v,
-        { Property: c[i].join(options.pathDelimiter), ReferencedProperty: c[j].join(options.pathDelimiter) } ) ) );
+      _constraints.constraints && Object.values(_constraints.constraints).forEach(c =>
+        this.append(new ReferentialConstraint(this._v,
+          { Property: c[i].join(options.pathDelimiter), ReferencedProperty: c[j].join(options.pathDelimiter) } ) )
+      );
     }
   }
 
@@ -1223,9 +1224,15 @@ function getEdm(options, messageFunctions) {
       // short form: key: value
       const inlineConstExpr =
         [ 'Edm.Binary', 'Edm.Boolean', 'Edm.Byte', 'Edm.Date', 'Edm.DateTimeOffset', 'Edm.Decimal', 'Edm.Double', 'Edm.Duration', 'Edm.Guid',
-          'Edm.Int16', 'Edm.Int32', 'Edm.Int64', 'Edm.SByte','Edm.Single', /*'Edm.Stream',*/ 'Edm.String', 'Edm.TimeOfDay',
+          'Edm.Int16', 'Edm.Int32', 'Edm.Int64', 'Edm.SByte','Edm.Single', 'Edm.Stream', 'Edm.String', 'Edm.TimeOfDay',
+          // Edm.Geo* according to https://issues.oasis-open.org/browse/ODATA-1323
+/*          'Edm.Geography', 'Edm.GeographyPoint', 'Edm.GeographyLineString', 'Edm.GeographyPolygon', 'Edm.GeographyMultiPoint',
+          'Edm.GeographyMultiLineString', 'Edm.GeographyMultiPolygon', 'Edm.GeographyCollection', 'Edm.Geometry', 'Edm.GeometryPoint',
+          'Edm.GeometryLineString', 'Edm.GeometryPolygon', 'Edm.GeometryMultiPoint', 'Edm.GeometryMultiLineString', 'Edm.GeometryMultiPolygon',
+          'Edm.GeometryCollection',
+*/
           /* UI.xml: defines Annotations with generic type 'Edm.PrimitiveType' */
-          'Edm.PrimitiveType', 'Bool',
+          'Edm.PrimitiveType', 'Edm.Untyped', 'Bool',
           // Official JSON V4.01 Spec defines these paths as constant inline expression:
           'AnnotationPath', 'ModelElementPath', 'NavigationPropertyPath', 'PropertyPath',
         ];
@@ -1496,7 +1503,7 @@ function getEdm(options, messageFunctions) {
     }
     toJSONattributes(json) {
       super.toJSONattributes(json);
-      edmUtils.forAll(this._jsonOnlyAttributes, (v,p) => {
+      this._jsonOnlyAttributes && Object.entries(this._jsonOnlyAttributes).forEach(([p, v]) => {
         json[p[0] === '@' ? p : '$' + p] = v;
       });
       return json;
@@ -1600,7 +1607,7 @@ function getEdm(options, messageFunctions) {
       node._d = new Dependent(v, { Role: from } );
       node._p = new Principal(v, { Role: to } );
 
-      edmUtils.forAll(c, cv => {
+      c && Object.values(c).forEach(cv => {
         node._d.append(new PropertyRef(v, cv[0].join(options.pathDelimiter)));
         node._p.append(new PropertyRef(v, cv[1].join(options.pathDelimiter)));
       });