@sap/cds-compiler 2.15.2 → 3.0.2

package/lib/edm/edmPreprocessor.js

@@ -11,14 +11,11 @@ const {
   intersect,
   validateOptions,
   foreach,
-  forAll,
-  isAssociationOrComposition,
   isComposition,
   isStructuredArtifact,
   isParameterizedEntity,
   resolveOnConditionAndPrepareConstraints,
   finalizeReferentialConstraints,
-  isEntity,
   getSchemaPrefix,
 } = require('./edmUtils.js');
 
@@ -54,6 +51,10 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     fallBackSchemaName,
     whatsMyServiceRootName ] = getAnOverviewOnTheServices(csn);
 
+  if(serviceRootNames.length === 0) {
+    return [serviceRoots, Object.create(null), reqDefs, whatsMyServiceRootName, fallBackSchemaName, options];
+  }
+
   if(requestedServiceNames === undefined)
     requestedServiceNames = options.serviceNames;
   if(requestedServiceNames === undefined) {
@@ -64,10 +65,6 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     return requestedServiceNames.includes(whatsMyServiceRootName(n));
   }
 
-  if(serviceRootNames.length === 0) {
-    return [serviceRoots, Object.create(null), reqDefs, whatsMyServiceRootName, fallBackSchemaName, options];
-  }
-
   // Structural CSN inbound QA checks
   inboundQualificationChecks();
   // not needed at the moment
@@ -85,7 +82,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
 
   /*
     Final base type expansion is required here when:
-    1) The input CSN was already transformed for V4 but shall be rendered in V2 and the 
+    1) The input CSN was already transformed for V4 but shall be rendered in V2 and the
        edmx generator is called directly (bypassing OData transformation)
     2) The input CSN was already transformed for V4 and persisted (all non-enumerables are
        stripped of)
@@ -119,17 +116,12 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
   }
 
   if(schemaNames.length) {
-    // First attach names to all definitions (and actions/params) in the model
-    // elements are done in initializeStruct
-    // Set myServiceName for later reference and indication of a service member
-    // First attach names to all definitions in the model and fill reqDefs
-    // Link association targets and spray @odata.contained over untagged compositions
     forEachDefinition(csn, [
       attachNameProperty,
       (def, defName) => {
         const mySchemaName = whatsMySchemaName(defName);
         mySchemaName && setProp(def, '$mySchemaName', mySchemaName);
-        if(isMyServiceRequested(defName))
+        if(isMyServiceRequested(defName) && def.kind !== 'aspect')
           reqDefs.definitions[defName] = def;
       },
       linkAssociationTarget ]);
@@ -307,7 +299,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
         const myServiceRoot = whatsMyServiceRootName(defName);
         const mySchemaPrefix = getSchemaPrefix(defName);
         if(myServiceRoot && options.isV4() &&
-        /*(options.toOdata.odataProxies || options.toOdata.odataXServiceRefs) && options.isStructFormat && */
+        /*(options.odataProxies || options.odataXServiceRefs) && options.isStructFormat && */
         defName !== myServiceRoot && myServiceRoot !== mySchemaPrefix) {
           const service = { kind: 'service', name: mySchemaPrefix };
           serviceRoots[mySchemaPrefix] = service;
@@ -341,23 +333,21 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
   // link association target to association and add @odata.contained to compositions in V4
   function linkAssociationTarget(struct) {
     forEachMemberRecursively(struct, (element, name, prop, subpath) => {
-      if(isAssociationOrComposition(element) && !element._ignore) {
-        if(!element._target) {
-          let target = csn.definitions[element.target];
-          if(target) {
-            setProp(element, '_target', target);
+      if(element.target && !element._target) {
+        let target = csn.definitions[element.target];
+        if(target) {
+          setProp(element, '_target', target);
           // If target has parameters, xref assoc at target for redirection
-            if(isParameterizedEntity(target)) {
-              if(!target.$sources) {
-                setProp(target, '$sources', Object.create(null));
-              }
-              target.$sources[struct.name + '.' + name] = element;
+          if(isParameterizedEntity(target)) {
+            if(!target.$sources) {
+              setProp(target, '$sources', Object.create(null));
             }
-          }
-          else {
-            error(null, subpath, { target: element.target }, "Target $(TARGET) can't be found in the model");
+            target.$sources[struct.name + '.' + name] = element;
           }
         }
+        else {
+          error(null, subpath, { target: element.target }, "Target $(TARGET) can't be found in the model");
+        }
       }
       // in V4 tag all compositions to be containments
       if(options.odataContainment &&
@@ -389,7 +379,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     }
 
     function initContainments(elt, eltName) {
-      if(isAssociationOrComposition(elt) && elt['@odata.contained'] && !elt._ignore) {
+      if(elt.target && elt['@odata.contained'] && !elt._ignore) {
         // Let the containee know its container
         // (array because the contanee may contained more then once)
         let containee = elt._target;
@@ -660,17 +650,19 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
       }
       //forward annotations from managed association element to its foreign keys
       const elements = construct.items && construct.items.elements || construct.elements;
-      forAll(elements[element['@odata.foreignKey4']], (attr, attrName) => {
+      const fk = elements[element['@odata.foreignKey4']];
+      for(const attrName in fk) {
+        const attr = fk[attrName];
         if(attrName[0] === '@') {
           element[attrName] = attr;
         }
-      });
+      }
       // and eventually remove some afterwards:)
       if(options.isV2())
         setSAPSpecificV2AnnotationsToAssociation(element);
 
       // initialize an association
-      if(isAssociationOrComposition(element)) {
+      if(element.target) {
         // in case this is a forward assoc, store the backlink partners here, _selfReferences.length > 1 => error
         assignProp(element, '_selfReferences', []);
         assignProp(element._target, '$proxies', []);
@@ -685,7 +677,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
       applyAppSpecificLateCsnTransformationOnElement(options, element, def, error);
     }, [], true, { elementsOnly: true });
 
-    if(!isDeprecatedEnabled(options, 'v1KeysForTemporal')) {
+    if(!isDeprecatedEnabled(options, '_v1KeysForTemporal')) {
       // if artifact has a cds.valid.key mention it as @Core.AlternateKey
       if(validKey.length) {
         let altKeys = [{ Key: [] }];
@@ -699,7 +691,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
       // @Core.AlternateKeys: [{ Key: [ { Name: 'slID', Alias: 'slID' }, { Name: 'validFrom', Alias: 'validFrom'} ] }]
       if(validKey.length) {
         let altKeys = [{ Key: [] }];
-        forAll(keys, (k, kn) => {
+        Object.entries(([kn, k]) => {
           altKeys[0].Key.push( { Name: kn, Alias: kn } );
           delete k.key;
         });
@@ -722,7 +714,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     }
 
     // prepare the structure itself
-    if(isEntity(def)) {
+    if(def.kind === 'entity') {
       assignProp(def, '_SetAttributes', Object.create(null));
       assignProp(def, '$keys', keys);
       applyAppSpecificLateCsnTransformationOnStructure(options, def, error);
@@ -738,7 +730,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     forEachMemberRecursively(def.items || def, initConstraintsOnAssoc, [], true, { elementsOnly: true });
   }
   function initConstraintsOnAssoc(element) {
-    if (isAssociationOrComposition(element) && !element._ignore && !element._constraints) {
+    if (element.target && !element._constraints) {
         // setup the constraints object
       setProp(element, '_constraints', { constraints: Object.create(null), selfs: [], _origins: [], termCount: 0 });
         // and crack the ON condition
@@ -790,7 +782,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
             delete struct.$keys[element.name];
           }
         }
-        // deprecated unmanagedUpInComponent:
+        // deprecated._unmanagedUpInComponent:
         // Only in containment:
         // Ignore this (foreign key) elment if renderForeignKeys is false
         if(options.odataContainment && element['@odata.containment.ignore']) {
@@ -822,7 +814,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     forEachMemberRecursively(def.items || def, finalizeConstraintsOnAssoc, [], true, { elementsOnly: true });
   }
   function finalizeConstraintsOnAssoc(element) {
-    if (isAssociationOrComposition(element) && !element._ignore && element._constraints) {
+    if (element.target && !element._ignore && element._constraints) {
       finalizeReferentialConstraints(csn, element, options, info);
 
       if(element._constraints._partnerCsn && element.cardinality && element.cardinality.max) {
@@ -855,7 +847,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     sub artifacts exposed by the initial type exposure
   */
   function convertExposedTypesOfOtherServicesIntoCrossReferences() {
-    if(options.toOdata.odataXServiceRefs && options.isV4()) {
+    if(options.odataXServiceRefs && options.isV4()) {
       serviceRootNames.forEach(srn => {
         schemaNames.forEach(fqSchemaName => {
           if(fqSchemaName.startsWith(srn + '.')) {
@@ -912,7 +904,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     // if this artifact is a service member check its associations
     if(globalSchemaPrefix) {
       forEachGeneric(struct.items || struct, 'elements', element => {
-        if(!isAssociationOrComposition(element) || element._ignore || element['@odata.navigable'] === false)
+        if(!element.target || element['@odata.navigable'] === false)
           return;
         /*
          * Consider everything @cds.autoexpose: falsy to be a proxy candidate for now
@@ -949,18 +941,18 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
         const targetSchemaName = element._target.$mySchemaName;
         if(isProxyRequired(element)) {
           if(options.isV4() &&
-             (options.toOdata.odataProxies || options.toOdata.odataXServiceRefs) &&
+             (options.odataProxies || options.odataXServiceRefs) &&
              // must be a managed association with keys OR an unambiguous backlink
-             element.keys || 
+             element.keys ||
              (element.on && element._constraints.selfs.length === 1 && element._constraints.termCount === 1)
             ) {
             // reuse proxy if available
             let proxy = getProxyForTargetOf(element);
             if(!proxy) {
-              if(targetSchemaName && options.toOdata.odataXServiceRefs) {
+              if(targetSchemaName && options.odataXServiceRefs) {
                 proxy = createSchemaRefFor(targetSchemaName);
               }
-              else if(options.toOdata.odataProxies) {
+              else if(options.odataProxies) {
                 proxy = createProxyFor(element, targetSchemaName);
               }
               proxy = registerProxy(proxy, element);
@@ -1024,7 +1016,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
       // proxyDefinitionName: strip the serviceName and replace '.' with '_'
       let defName =
         `${assoc._target.name.replace(proxySchemaName + '.', '').replace(/\./g, '_')}`;
-      
+
       // fullName: Prepend serviceName and if in same service add '_proxy'
       const proxy = isParamProxy
         ? createParameterEntity(assoc._target,  proxySchemaName + '.' + defName, true)
@@ -1068,13 +1060,13 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     // copy over the primary keys of the target and trigger the type exposure
     // if the element already exists we assume it was fully exposed
     function populateProxyElements(assoc, proxy, elements) {
-      forAll(elements, e => {
+      Object.values(elements).forEach(e => {
         if (isEdmPropertyRendered(e, options)) {
           let newElt = proxy.elements[e.name];
           if(!newElt) {
             if(csnUtils.isAssocOrComposition(e.type)) {
               if(!e.on && e.keys) {
-                if(options.toOdata.odataNoTransitiveProxies)
+                if(options.odataNoTransitiveProxies)
                   newElt = convertManagedAssocIntoStruct(e);
                 else
                   newElt = createProxyOrSchemaRefForManagedAssoc(e);
@@ -1275,10 +1267,10 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
           proxy = getProxyForTargetOf(e);
           if(!proxy) {
             // option odataXServiceRefs has precedence over odataProxies
-            if(e._target.$mySchemaName && options.toOdata.odataXServiceRefs) {
+            if(e._target.$mySchemaName && options.odataXServiceRefs) {
               proxy = createSchemaRefFor(e._target.$mySchemaName);
             }
-            else if(options.toOdata.odataProxies) {
+            else if(options.odataProxies) {
               proxy = createProxyFor(e, e._target.$mySchemaName);
               if(!e._target.$isParamEntity)
                 populateProxyElements(e, proxy, getForeignKeyDefinitions(e));
@@ -1451,16 +1443,13 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     if(def.$keys) {
       setProp(def, '$edmKeyPaths', []);
       // for all key elements that shouldn't be ignored produce the paths
-      foreach(def.$keys, k => !k._ignore && !(k._isToContainer && k._selfReferences.length), (k, kn) => {
+      foreach(def.$keys, k => !(k._isToContainer && k._selfReferences.length), (k, kn) => {
         if(isEdmPropertyRendered(k, options) &&
          !(options.isV2() && k['@Core.MediaType'])) {
           if(options.isV4() && options.isStructFormat) {
-          // This is structured OData ONLY
-          // if the foreign keys are explicitly requested, ignore associations and use the flat foreign keys instead
-            if(options.renderForeignKeys && !k.target)
-              def.$edmKeyPaths.push([kn]);
-          // else produce paths (isEdmPropertyRendered() has filtered @odata.foreignKey4 already)
-            else if(!options.renderForeignKeys)
+            // This is structured OData ONLY
+            // if the foreign keys are explicitly requested, ignore associations and use the flat foreign keys instead
+            if(!options.renderForeignKeys || (options.renderForeignKeys && !k.target))
               def.$edmKeyPaths.push(...produceKeyRefPaths(k, kn));
           }
         // In v2/v4 flat, associations are never rendered
@@ -1543,13 +1532,13 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
       // Nullability
       if((!elt.key && (elt.notNull === undefined || elt.notNull === false)) ||
            elt.key && (elt.notNull !== undefined && elt.notNull === false)) {
-        error('odata-spec-violation-key-null', location,
+        message('odata-spec-violation-key-null', location,
           {name: pathSegment, '#': pathSegment ? 'std' : 'scalar'});
       }
       // many
       let type = elt.items || elt.type && !isBuiltinType(elt.type) && csnUtils.getFinalTypeDef(elt.type).items;
       if(type) {
-        error('odata-spec-violation-key-array', location,
+        message('odata-spec-violation-key-array', location,
           {name: pathSegment, '#': pathSegment ? 'std' : 'scalar'});
       }
       // type
@@ -1559,7 +1548,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
 
         // check for legal scalar types, proxy exposed structured types are not resolvable in CSN
         // V2 allows any Edm.PrimitiveType (even Double and Binary), V4 is more specific:
-        if(options.isV4() && type && !isAssociationOrComposition(type) && isBuiltinType(type.type)) {
+        if(options.isV4() && type && !type.target && isBuiltinType(type.type)) {
           const edmType = edmUtils.mapCdsToEdmType(type);
           const legalEdmTypes = {
             'Edm.Boolean':1, 'Edm.Byte':1, 'Edm.Date':1, 'Edm.DateTimeOffset':1, 'Edm.Decimal':1, 'Edm.Duration':1,
@@ -1612,10 +1601,17 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
       if(isEdmPropertyRendered(elt, options)) {
         // Assoc can never be a derived TypeDefinition, no need to
         // unroll derived type chains for assocs
-        if(isAssociationOrComposition(elt) && !elt.$touched) {
+        if(elt.target && !elt.$touched) {
           if(!elt._target.$edmTgtPaths)
             setProp(elt._target, '$edmTgtPaths', []);
-          if(!elt._target.$hasEntitySet && !elt._isToContainer && curDef !== elt._target) {
+          // drill into target only if
+          // 1) target has no entity set and this assoc is not going to the container
+          // 2) current definition and target are the same (cycle)
+          // 3) it's no external reference
+          if(!elt.$externalRef &&
+             !elt._target.$hasEntitySet &&
+             !elt._isToContainer &&
+             curDef !== elt._target) {
             // follow elements in the target but avoid cycles
             setProp(elt, '$touched', true);
             elt._target.$edmTgtPaths.push(newPrefix);
@@ -1650,10 +1646,11 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
       if(isEdmPropertyRendered(elt, options)) {
         // Assoc can never be a derived TypeDefinition, no need to
         // unroll derived type chains for assocs
-        if(isAssociationOrComposition(elt) && !elt.$touched) {
+        if(elt.target && !elt.$touched) {
           // drill into target only if
           // 1) target has no entity set and this assoc is not going to the container
           // 2) current definition and target are the same (cycle)
+          // 3) it's no external reference
           if(!elt.$externalRef &&
              !elt._target.$hasEntitySet &&
              !elt._isToContainer &&
@@ -1713,7 +1710,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     // 1) must not be a proxy and not a containee in V4
     // No annos are rendered for non-existing EntitySet targets.
     if(def.$hasEntitySet === undefined) {
-      const hasEntitySet = isEntity(def) && !(options.isV4() && edmUtils.isContainee(def)) && !def.$proxy;
+      const hasEntitySet = def.kind === 'entity' && !(options.isV4() && edmUtils.isContainee(def)) && !def.$proxy;
       setProp(def, '$hasEntitySet', hasEntitySet);
     }
   }
@@ -1917,7 +1914,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
           if(Object.keys(o).length) {
             // ReadRestrictions may have sub type ReadByKeyRestrictions { Description, LongDescription }
             // chop annotations into dictionaries
-            if(prefix === '@Capabilities.ReadRestrictions' && 
+            if(prefix === '@Capabilities.ReadRestrictions' &&
                Object.keys(o).some(k => k.startsWith('ReadByKeyRestrictions.'))) {
               const no = {};
               Object.entries(o).forEach(([k,v]) => {
@@ -1958,16 +1955,16 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
   }
 
   function mapCdsToEdmProp(obj) {
-    if (obj.type && isBuiltinType(obj.type) && !isAssociationOrComposition(obj) && !obj.targetAspect) {
-      let edmType = edmUtils.mapCdsToEdmType(obj, messageFunctions, _options.toOdata.version === 'v2', obj['@Core.MediaType']);
+    if (obj.type && isBuiltinType(obj.type) && !obj.target && !obj.targetAspect) {
+      let edmType = edmUtils.mapCdsToEdmType(obj, messageFunctions, _options.odataVersion === 'v2', obj['@Core.MediaType']);
       assignProp(obj, '_edmType', edmType);
     } else if (obj._isCollection && (obj.items && isBuiltinType(csnUtils.getFinalTypeDef(obj.items.type)))) {
-      let edmType = edmUtils.mapCdsToEdmType(obj.items, messageFunctions, _options.toOdata.version === 'v2', obj['@Core.MediaType'], obj.$path);
+      let edmType = edmUtils.mapCdsToEdmType(obj.items, messageFunctions, _options.odataVersion === 'v2', obj['@Core.MediaType'], obj.$path);
       assignProp(obj, '_edmType', edmType);
     }
     // This is the special case when we have array of array, but will not be supported in the future
     else if (obj._isCollection && obj.items && obj.items.type && obj.items.items && isBuiltinType(csnUtils.getFinalTypeDef(obj.items.items.type))) {
-      let edmType = edmUtils.mapCdsToEdmType(obj.items.items, messageFunctions, _options.toOdata.version === 'v2', obj['@Core.MediaType']);
+      let edmType = edmUtils.mapCdsToEdmType(obj.items.items, messageFunctions, _options.odataVersion === 'v2', obj['@Core.MediaType']);
       assignProp(obj, '_edmType', edmType);
     }
   }
@@ -2321,7 +2318,7 @@ function setSAPSpecificV2AnnotationsToAssociation(carrier) {
   });
 
   function addToAssociationSet(carrier, propName, propValue, removeFromType=true) {
-    if(isAssociationOrComposition(carrier)) {
+    if(carrier.target) {
       assignProp(carrier, '_SetAttributes', Object.create(null));
       assignAnnotation(carrier._SetAttributes, propName, propValue);
       if(removeFromType) {

package/lib/edm/edmUtils.js

@@ -8,31 +8,17 @@ function validateOptions(_options)
 {
   if(!_options.isV2 && !_options.isV4)
   {
-    // csn2edm expects "version" to be a top-level property of options
+    // csn2edm expects "odataVersion" to be a top-level property of options
     // set to 'v4' as default, override with value from incoming options
-    // (here version comes inside "toOdata")
-    const options = Object.assign({ version: 'v4'}, _options);
-    if (options.toOdata) {
-      if(options.toOdata.version)
-        options.version = options.toOdata.version;
-      if(options.toOdata.odataFormat)
-        options.odataFormat = options.toOdata.odataFormat;
-      if(options.toOdata.odataContainment)
-        options.odataContainment = options.toOdata.odataContainment;
-      if(options.toOdata.odataForeignKeys)
-        options.odataForeignKeys = options.toOdata.odataForeignKeys;
-      if(options.toOdata.odataV2PartialConstr)
-        options.odataV2PartialConstr = options.toOdata.odataV2PartialConstr;
-      // global flag that indicates whether or not FKs shall be rendered in general
-      // V2/V4 flat: yes
-      // V4/struct: depending on odataForeignKeys
-      options.renderForeignKeys =
-        options.version === 'v4' ? options.odataFormat === 'structured' &&  !!options.odataForeignKeys : true;
+    const options = Object.assign({ odataVersion: 'v4'}, _options);
+    // global flag that indicates whether or not FKs shall be rendered in general
+    // V2/V4 flat: yes
+    // V4/struct: depending on odataForeignKeys
+    options.renderForeignKeys =
+      options.odataVersion === 'v4' ? options.odataFormat === 'structured' &&  !!options.odataForeignKeys : true;
 
-    }
-
-    const v2 = options.version.match(/v2/i) !== null;
-    const v4 = options.version.match(/v4/i) !== null;
+    const v2 = options.odataVersion.match(/v2/i) !== null;
+    const v4 = options.odataVersion.match(/v4/i) !== null;
 
     options.v = [v2, v4];
     options.isStructFormat = options.odataFormat && options.odataFormat === 'structured';
@@ -70,11 +56,6 @@ function foreach(dictionary, filter, func) {
   });
 }
 
-// Call func(art, name) for each artifact 'art' with name 'name' in 'dictionary'
-function forAll(dictionary, func) {
-  foreach(dictionary, ()=>true, func);
-}
-
 // true if _containerEntity is unequal to artifact name (non-recursive containment association)
 //      or if artifact belongs to an artificial parameter entity
 function isContainee(artifact) {
@@ -82,27 +63,11 @@ function isContainee(artifact) {
   return (artifact._containerEntity && (artifact._containerEntity.length > 1 || artifact._containerEntity[0] != artifact.name));
 }
 
-// Return true if 'artifact' has an association type
-function isAssociation(artifact) {
-  return (artifact.type === 'cds.Association' || artifact.type === 'Association') &&  artifact.target != undefined;
-  //return artifact.target != undefined;
-}
-
 function isComposition(artifact) {
   return (artifact.type === 'cds.Composition' || artifact.type === 'Composition') &&
     artifact.target != undefined;
 }
 
-function isAssociationOrComposition(artifact)
-{
-  return isAssociation(artifact) || isComposition(artifact);
-}
-
-function isManagedAssociation(artifact)
-{
-  return isAssociation(artifact) && artifact.on == undefined;
-}
-
 // Return true if the association 'assoc' has cardinality 'to-many'
 function isToMany(assoc) {
   if (!assoc.cardinality) {
@@ -122,13 +87,8 @@ function isSingleton(entityCsn) {
   return singleton || ((singleton === undefined || singleton === null) && hasNullable);
 }
 
-function isEntity(artifact)
-{
-  return artifact.kind === 'entity';
-}
-
 function isParameterizedEntity(artifact) {
-  return isEntity(artifact) && artifact.params;
+  return artifact.kind === 'entity' && artifact.params;
 }
 
 // Return true if 'artifact' is structured (i.e. has elements, like a structured type or an entity)
@@ -146,10 +106,6 @@ function isDerivedType(artifact) {
   return artifact.kind === 'type' && !isStructuredArtifact(artifact);
 }
 
-function isActionOrFunction(artifact) {
-  return artifact.kind === 'action' || artifact.kind === 'function';
-}
-
 function resolveOnConditionAndPrepareConstraints(csn, assocCsn, messageFunctions) {
   if(!assocCsn._constraints)
     throw Error('Please debug me: need _constraints');
@@ -189,7 +145,7 @@ function resolveOnConditionAndPrepareConstraints(csn, assocCsn, messageFunctions
           info(null, ['definitions', parentName, 'elements', assocCsn.name],
             `"${originParentName}:${partnerPath.join('.')}" with target "${originAssocCsn._target.name}" is compared with $self which represents "${parentName}"`);
         }
-        if(isAssociationOrComposition(originAssocCsn)) {
+        if(originAssocCsn.target) {
           // Mark this association as backlink if $self appears exactly once
           // to surpress edm:Association generation in V2 mode
           if(isBacklink) {
@@ -359,7 +315,7 @@ function finalizeReferentialConstraints(csn, assocCsn, options, info)
           // in structured mode only resolve top level element (path rewriting is done elsewhere)
           const depEltName = ( options.isFlatFormat ? c[0].join('_') : c[0][0] );
           const principalEltName = ( options.isFlatFormat ? c[1].join('_') : c[1][0] );
-          const fk = (isEntity(dependentEntity) && dependentEntity.elements[ depEltName ]) ||
+          const fk = (dependentEntity.kind === 'entity' && dependentEntity.elements[ depEltName ]) ||
             (localDepEntity && localDepEntity.elements && localDepEntity.elements[ depEltName ]);
           const pk = principalEntity.$keys && principalEntity.$keys[ principalEltName ];
           if(isConstraintCandidate(fk) && isConstraintCandidate(pk)) {
@@ -801,20 +757,14 @@ module.exports = {
   validateOptions,
   intersect,
   foreach,
-  forAll,
   isContainee,
-  isAssociation,
-  isManagedAssociation,
   isComposition,
-  isAssociationOrComposition,
   isToMany,
   isSingleton,
-  isEntity,
   isStructuredType,
   isStructuredArtifact,
   isParameterizedEntity,
   isDerivedType,
-  isActionOrFunction,
   resolveOnConditionAndPrepareConstraints,
   finalizeReferentialConstraints,
   determineMultiplicity,

package/lib/gen/Dictionary.json

@@ -658,6 +658,7 @@
       "Type": "Common.FieldControlType",
       "AppliesTo": [
         "Property",
+        "Parameter",
         "Record",
         "EntityType"
       ]
@@ -3246,6 +3247,7 @@
         "TypeNamePlural": "Edm.String",
         "Title": "UI.DataFieldAbstract",
         "Description": "UI.DataFieldAbstract",
+        "Image": "Edm.Stream",
         "ImageUrl": "Edm.String",
         "TypeImageUrl": "Edm.String",
         "Initials": "Edm.String"
@@ -3693,7 +3695,7 @@
       "$kind": "ComplexType",
       "BaseType": "UI.DataFieldAbstract",
       "Properties": {
-        "Value": "Edm.PrimitiveType",
+        "Value": "Edm.Untyped",
         "Label": "Edm.String",
         "Criticality": "UI.CriticalityType",
         "CriticalityRepresentation": "UI.CriticalityRepresentationType",
@@ -3704,8 +3706,8 @@
       "$kind": "ComplexType",
       "BaseType": "UI.DataField",
       "Properties": {
-        "Action": "Common.QualifiedName",
         "Value": "Edm.PrimitiveType",
+        "Action": "Common.QualifiedName",
         "Label": "Edm.String",
         "Criticality": "UI.CriticalityType",
         "CriticalityRepresentation": "UI.CriticalityRepresentationType",
@@ -3716,10 +3718,10 @@
       "$kind": "ComplexType",
       "BaseType": "UI.DataField",
       "Properties": {
+        "Value": "Edm.PrimitiveType",
         "SemanticObject": "Edm.String",
         "Action": "Edm.String",
         "Mapping": "Collection(Common.SemanticObjectMappingType)",
-        "Value": "Edm.PrimitiveType",
         "Label": "Edm.String",
         "Criticality": "UI.CriticalityType",
         "CriticalityRepresentation": "UI.CriticalityRepresentationType",
@@ -3730,8 +3732,8 @@
       "$kind": "ComplexType",
       "BaseType": "UI.DataField",
       "Properties": {
-        "Target": "Edm.NavigationPropertyPath",
         "Value": "Edm.PrimitiveType",
+        "Target": "Edm.NavigationPropertyPath",
         "Label": "Edm.String",
         "Criticality": "UI.CriticalityType",
         "CriticalityRepresentation": "UI.CriticalityRepresentationType",
@@ -3742,9 +3744,9 @@
       "$kind": "ComplexType",
       "BaseType": "UI.DataField",
       "Properties": {
+        "Value": "Edm.PrimitiveType",
         "Url": "Edm.String",
         "UrlContentType": "Edm.String",
-        "Value": "Edm.PrimitiveType",
         "Label": "Edm.String",
         "Criticality": "UI.CriticalityType",
         "CriticalityRepresentation": "UI.CriticalityRepresentationType",
@@ -3755,8 +3757,8 @@
       "$kind": "ComplexType",
       "BaseType": "UI.DataField",
       "Properties": {
-        "Actions": "Collection(UI.DataField)",
         "Value": "Edm.PrimitiveType",
+        "Actions": "Collection(UI.DataField)",
         "Label": "Edm.String",
         "Criticality": "UI.CriticalityType",
         "CriticalityRepresentation": "UI.CriticalityRepresentationType",

package/lib/gen/language.checksum

@@ -1 +1 @@
-351a6ed427f91f2eef4d8e9a2e11dd17
+ca4caa65192cebc39f35cd598958dbb0