@sap/cds-compiler 3.0.0 → 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');
 
@@ -124,7 +121,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
       (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 ]);
@@ -336,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)) {
-        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 &&
@@ -384,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;
@@ -655,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', []);
@@ -694,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;
         });
@@ -717,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);
@@ -733,7 +730,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
     forEachMemberRecursively(def.items || def, initConstraintsOnAssoc, [], true, { elementsOnly: true });
   }
   function initConstraintsOnAssoc(element) {
-    if (isAssociationOrComposition(element) && !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
@@ -817,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) {
@@ -907,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['@odata.navigable'] === false)
+        if(!element.target || element['@odata.navigable'] === false)
           return;
         /*
          * Consider everything @cds.autoexpose: falsy to be a proxy candidate for now
@@ -1063,7 +1060,7 @@ 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) {
@@ -1551,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,
@@ -1604,7 +1601,7 @@ 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', []);
           // drill into target only if
@@ -1649,7 +1646,7 @@ 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)
@@ -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);
     }
   }
@@ -1958,7 +1955,7 @@ function initializeModel(csn, _options, messageFunctions, requestedServiceNames=
   }
 
   function mapCdsToEdmProp(obj) {
-    if (obj.type && isBuiltinType(obj.type) && !isAssociationOrComposition(obj) && !obj.targetAspect) {
+    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)))) {
@@ -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

@@ -56,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) {
@@ -68,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) {
@@ -108,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)
@@ -132,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');
@@ -175,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) {
@@ -345,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)) {
@@ -787,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/language.checksum

@@ -1 +1 @@
-dd18d05cabbe93eabf1bd17b83add5ee
+ca4caa65192cebc39f35cd598958dbb0