@sap/cds-compiler 4.0.2 → 4.1.2

package/lib/transform/{transformUtilsNew.js → transformUtils.js}

@@ -420,17 +420,10 @@ function getTransformers(model, options, pathDelimiter = '_') {
     if (typeof type === 'string' && isBuiltinType(type))
       return;
 
-    let typeRef = null;
-    if (resolved.has(type)) {
-      typeRef = resolved.get(type)?.art
-      // The cached entry may not be resolved, yet.
-      if (typeRef.type && !isBuiltinType(typeRef.type))
-        typeRef = getFinalTypeInfo(typeRef.type);
-    } else {
-      typeRef = getFinalTypeInfo(type);
-    }
+    const typeRef = getFinalTypeInfo(type, (t) => resolved.get(t)?.art || csnUtils.artifactRef(t));
     if(!typeRef)
       return;
+
     if (typeRef.elements || typeRef.items) {
       // Copy elements/items and we're finished. No need to look up actual base type,
       // since it must also be structured and must contain at least as many elements,
@@ -909,7 +902,7 @@ function getTransformers(model, options, pathDelimiter = '_') {
     if (annotation === undefined) {
       throw new CompilerAssertion('Annotation ' + fromName + ' not found in ' + JSON.stringify(node));
     }
-    if(node[toName] === undefined || node[toName] === null) {
+    if(node[toName] == null) {
       delete node[fromName];
       node[toName] = annotation;
     }
@@ -931,9 +924,7 @@ function getTransformers(model, options, pathDelimiter = '_') {
     if (value === undefined) {
       throw new CompilerAssertion('Annotation value must not be undefined');
     }
-
-    if(node[name] === undefined || node[name] === null)
-      node[name] = value;
+    node[name] ??= value;
   }
 
   /**
@@ -1352,93 +1343,6 @@ function getTransformers(model, options, pathDelimiter = '_') {
 
 }
 
-/**
- * Modify the given CSN/artifact in-place, applying the given customTransformations.
- * Dictionaries are correctly handled - a "type" transformer will not be called on an entity called "type".
- *
- * A custom transformation function has the following signature:
- * (any, object, string, CSN.Path) => undefined
- *
- * Given that we have a custom transformation for "type" and stumble upon a thing like below:
- *
- * {
- *    type: "cds.String",
- *    anotherProp: 1
- * }
- *
- * The input for the function would be:
- *
- * ("cds.String", { type: <>, anotherProp: <>}, "type", [xy, "type"])
- *
- * @param {CSN.Model} csn
- * @param {object} customTransformations Dictionary of functions to apply - if the property matches a key in this dict, it will be called
- * @param {boolean} [transformNonEnumerableElements=false] Transform non-enumerable elements to work with cds linked...
- * @returns {CSN.Model|CSN.Artifact} Return the CSN/artifact
- */
-function transformModel(csn, customTransformations, transformNonEnumerableElements=false){
-  const transformers = {
-    elements: dictionary,
-    definitions: dictionary,
-    actions: dictionary,
-    params: dictionary,
-    enum: dictionary,
-    mixin: dictionary,
-    args: dictionary
-  };
-
-  const csnPath = [];
-  if (csn.definitions)
-    dictionary( csn, 'definitions', csn.definitions );
-  else {
-    // fake it till you make it
-    const obj = { definitions: Object.create(null)};
-    obj.definitions.thing = csn;
-    dictionary(obj, 'definitions', obj.definitions);
-  }
-
-  return csn;
-
-  function standard( parent, prop, node ) {
-    // checking for .kind and .type is safe because annotations with such properties, are already flattened out
-    const isAnnotation = () => (typeof prop === 'string' && prop.startsWith('@') && !node.kind && !node.type);
-    if (!node || node._ignore || typeof node !== 'object' || !{}.propertyIsEnumerable.call( parent, prop ) || isAnnotation())
-      return;
-
-    csnPath.push( prop );
-
-    if (Array.isArray(node)) {
-      node.forEach( (n, i) => standard( node, i, n ) );
-    }
-    else {
-      const iterateOver = Object.getOwnPropertyNames( node );
-      // cds-linked resolves types and add's them to elements as non-enum - need to be processed
-      if(transformNonEnumerableElements && node.elements && !Object.prototype.propertyIsEnumerable.call(node, 'elements')){
-        iterateOver.push('elements');
-      }
-      for (const name of iterateOver) {
-        if(customTransformations[name])
-          customTransformations[name](node[name], node, name, csnPath.concat(name))
-
-        const trans = transformers[name] || standard;
-        trans( node, name, node[name] );
-      }
-    }
-    csnPath.pop();
-  }
-  function dictionary( node, prop, dict ) {
-    csnPath.push( prop );
-
-    if (Array.isArray(dict)) {
-      dict.forEach( (n, i) => standard(dict, i, n))
-    } else {
-      for (const name of Object.getOwnPropertyNames( dict ))
-        standard( dict, name, dict[name] );
-    }
-
-    csnPath.pop();
-  }
-}
-
 /**
  * Mandatory input transformation for all backends:
  * Replace
@@ -1465,7 +1369,6 @@ function rewriteBuiltinTypeRef(csn) {
 module.exports = {
   // This function retrieves the actual exports
   getTransformers,
-  transformModel,
   RelationalOperators,
   rewriteBuiltinTypeRef,
 };

package/lib/transform/translateAssocsToJoins.js

@@ -1124,9 +1124,14 @@ function translateAssocsToJoins(model, inputOptions = {})
     // get paths of managed assocs (unmanaged assocs are not allowed in FK paths)
     if(element.foreignKeys)
     {
-      for(let fkn in element.foreignKeys)
+      for(const fkn in element.foreignKeys)
       {
-        let fk = element.foreignKeys[fkn];
+        const fk = element.foreignKeys[fkn];
+        // ignore an unmanaged association
+        if(fk.targetElement._artifact.target &&
+           fk.targetElement._artifact.on &&
+           !fk.targetElement._artifact.foreignKeys)
+          continue;
         // once a fk is to be followed, treat all sub-paths as srcSide, this will add fk.name.id only
         if(srcSide)
           paths = paths.concat(flattenElement(fk.targetElement._artifact, true,  fk.name.id, fk.targetElement.path.map(ps => ps.id).join(pathDelimiter)));
@@ -1146,9 +1151,9 @@ function translateAssocsToJoins(model, inputOptions = {})
     // get paths of plain structured elements
     else if(element.elements)
     {
-      for(let n in element.elements)
+      for(const n in element.elements)
       {
-        let elt = element.elements[n];
+        const elt = element.elements[n];
         paths = paths.concat(flattenElement(elt, true, elt.name.id, elt.name.id));
       }
     }
@@ -1384,7 +1389,7 @@ function translateAssocsToJoins(model, inputOptions = {})
 
     All prefix trees are put underneath the $tableAlias structure with attribute $qat or $fqat.
     Each path step appears exactly once for a given filter condition in the prefix tree and
-    has a link to it's definition (origin). The default filter is an empty string ''.
+    has a link to its definition (origin). The default filter is an empty string ''.
 
     A special note on paths in filter conditions. Filter paths are treated like postfix
     paths to an association path step, meaning, they are inserted into the assoc's $qat or $fqat
@@ -1409,32 +1414,13 @@ function translateAssocsToJoins(model, inputOptions = {})
 
     let [head, ...tail] = path;
 
-    if(['$projection', '$self'].includes(head.id) && tail.length && head._navigation.kind === '$self') {
-      // make sure not to truncate tail
-      if(tail.length > 1)
-        [head, ...tail] = tail;
-      else
-        head = tail[0];
-      /*
-        if the head is a path (it better be;) then use it as
-        anchor for _navigation and just merge the tail into that QAT
-        example:
-        entity E { key id: Integer; toE: association to E; toF: association to F;}
-        entity F { key id: Integer; toE: association to E; }
-        view V as select from E { toE, $projection.toE.toF.id };
-      */
-      let value = env.lead.elements[head.id].value;
-      if(value.path) {
-        head = value.path[0];
-      }
-      else // value is another expression, don't consider it
-        return;
-    }
-
-
     // qatParent is the node where the starting qat is attached to
     let qatParent = undefined;
 
+    // Note: If head is $self, we would need to resolve it if the path follows associations.
+    //       However, that is already rejected by SQL backend checks. For example $self paths
+    //       can't be "$self.assoc.foo.bar".
+
     // FROM and filter paths do not have a _navigation, but for filter paths
     // the corresponding path step (to where the filter was attached to) is in env.pathStep
     if(!head._navigation)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "4.0.2",
+  "version": "4.1.2",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",

package/share/messages/check-proper-type-of.md

@@ -43,4 +43,4 @@ view ViewFoo as select from Foo {
 
 ## Related Messages
 
-- `check-proper-type`
+- `def-missing-type`

package/share/messages/{check-proper-type.md → def-missing-type.md}

@@ -1,14 +1,12 @@
-# check-proper-type
+# def-missing-type
 
 A type artifact doesn’t have proper type information.
 
 The message's severity is `Info` but may be raised to `Error` in the SQL,
 SAP HANA, and OData backends.  These backends require types to have type
-information.  Otherwise they aren’t able to render elements that use this
+information.  Otherwise, they aren’t able to render elements that use this
 type (for example, to SQL columns).
 
-This message affects CSN input and shouldn’t appear if CDL input is used.
-
 ## Example
 
 Erroneous code example:
@@ -23,7 +21,7 @@ Erroneous code example:
 }
 ```
 
-`MainType` is of kind "type" but has not further type information.
+`MainType` is of kind "type" but has not further type-information.
 
 ## How to Fix
 

package/share/messages/message-explanations.json

@@ -2,9 +2,9 @@
   "$comment": "This is an auto-generated file! Do not edit this file directly!",
   "messages": [
     "anno-duplicate-unrelated-layer",
-    "check-proper-type",
     "check-proper-type-of",
     "def-duplicate-autoexposed",
+    "def-missing-type",
     "extend-repeated-intralayer",
     "extend-unrelated-layer",
     "redirected-to-ambiguous",