@sap/cds-compiler 5.1.2 → 5.2.0

package/lib/transform/odata/flattening.js

@@ -2,7 +2,7 @@
 
 const { forEachDefinition,
   copyAnnotations, forEachMemberRecursively,
-  transformExpression, findAnnotationExpression } = require('../../model/csnUtils');
+  transformExpression, transformAnnotationExpression } = require('../../model/csnUtils');
 const { isBuiltinType, isMagicVariable } = require('../../base/builtins');
 const transformUtils = require('../transformUtils');
 const { setProp } = require('../../base/model');
@@ -54,7 +54,7 @@ function allInOneFlattening(csn, refFlattener, adaptRefs, inspectRef, isExternal
             if (flatElt.items) {
               // rewrite annotation paths inside items.elements
               forEachMemberRecursively(flatElt.items, (elt, _eltName, _prop, path) => {
-                const exprAnnos = Object.keys(elt).filter(pn => findAnnotationExpression(elt, pn));
+                const exprAnnos = Object.keys(elt).filter(pn => pn[0] === '@');
                 flattenAndPrefixExprPaths(elt, exprAnnos, elt.$path, path, 0, true);
               }, [ flatEltName ], true, { pathWithoutProp: true } );
             }
@@ -67,7 +67,7 @@ function allInOneFlattening(csn, refFlattener, adaptRefs, inspectRef, isExternal
       });
       // entity annotations
       const flatAnnos = Object.create(null);
-      const annoNames = copyAnnotations(def, flatAnnos).filter(an => findAnnotationExpression(def, an));
+      const annoNames = copyAnnotations(def, flatAnnos).filter(pn => pn[0] === '@');
       flattenAndPrefixExprPaths(flatAnnos, annoNames, [ 'definitions', defName ], [ defName ], 0);
       setProp(def, '$flatAnnotations', flatAnnos);
       // explicit binding parameter of bound action
@@ -100,10 +100,10 @@ function allInOneFlattening(csn, refFlattener, adaptRefs, inspectRef, isExternal
               };
 
               const flatAnnos = Object.create(null);
-              const annoNames = copyAnnotations(action, flatAnnos).filter(an => findAnnotationExpression(action, an));
+              const annoNames = copyAnnotations(action, flatAnnos).filter(pn => pn[0] === '@');
               annoNames.forEach((an) => {
                 refCheck.anno = an;
-                transformExpression(flatAnnos, an,
+                transformAnnotationExpression(flatAnnos, an,
                   [ markBindingParam, refCheck, refFlattener ],
                   [ 'definitions', defName, 'actions',  actionName ]);
                 adaptRefs.forEach(fn => fn(true, 1, (parent) => parent.$bparam));
@@ -112,10 +112,10 @@ function allInOneFlattening(csn, refFlattener, adaptRefs, inspectRef, isExternal
               setProp(action, '$flatAnnotations', flatAnnos);
 
               forEachMemberRecursively(action, (member, memberName, prop, path, _parent) => {
-                const exprAnnos = Object.keys(member).filter(pn => findAnnotationExpression(member, pn));
+                const exprAnnos = Object.keys(member).filter(pn => pn[0] === '@');
                 exprAnnos.forEach((pn) => {
                   refCheck.anno = pn;
-                  transformExpression(member, pn, [ markBindingParam, refCheck, refFlattener ], path);
+                  transformAnnotationExpression(member, pn, [ markBindingParam, refCheck, refFlattener ], path);
                   adaptRefs.forEach(fn => fn(true, 1, (parent) => parent.$bparam));
                   adaptRefs.length = 0;
                 });
@@ -193,7 +193,7 @@ function allInOneFlattening(csn, refFlattener, adaptRefs, inspectRef, isExternal
     };
     // TODO: copy only those expression annotations that have no path into unreachable subtree, starting
     // of typePathRoot (which could be some completely different path)
-    const exprAnnoNames = copyAnnotations(elt, flatElt, false, excludes).filter(pn => findAnnotationExpression(flatElt, pn));
+    const exprAnnoNames = copyAnnotations(elt, flatElt, false, excludes).filter(pn => pn[0] === '@');
     flattenAndPrefixExprPaths(flatElt, exprAnnoNames, elt.$path, rootPrefix, typeIdx);
     // Copy selected type properties
     ['key', 'virtual', 'masked', 'viaAll', 'localized'].forEach(p => {
@@ -217,7 +217,7 @@ function allInOneFlattening(csn, refFlattener, adaptRefs, inspectRef, isExternal
     const [ nonAnnoProps, exprAnnoProps ] = Object.keys(flatElt).reduce((acc, pn) => {
       if (pn[0] !== '@' && pn !== 'value')
         acc[0].push(pn);
-      if (findAnnotationExpression(flatElt, pn) || pn === 'value')
+      else
         acc[1].push(pn);
       return acc;
     }, [[],[]]);
@@ -326,9 +326,8 @@ function allInOneFlattening(csn, refFlattener, adaptRefs, inspectRef, isExternal
         return `${head}`;
     })();
 
-    let refChanged = false;
     const absolutifier = {
-      ref : (parent, prop, xpr) => {
+      ref : (parent, prop, xpr, _path, _p, _ppn, ctx) => {
         const head = xpr[0].id || xpr[0];
         let isPrefixed = false;
         if(!isMagicVariable(head)) {
@@ -365,20 +364,27 @@ function allInOneFlattening(csn, refFlattener, adaptRefs, inspectRef, isExternal
               parent[prop].unshift('$self');
           }
         }
-        if(isPrefixed)
-          refChanged = isPrefixed;
+        if(isPrefixed && ctx?.annoExpr?.['=']) {
+          ctx.annoExpr['='] = true;
+        }
       }
     }
+
+    refFlattener.$fnArgs = [ refParentIsItems ];
     propNames.forEach(pn => {
-      refChanged = false;
       refCheck.anno = pn;
-      transformExpression(carrier, pn, [ refCheck, refFlattener ], csnPath);
-      adaptRefs.forEach(fn =>
-        { if( fn(refParentIsItems)) refChanged = true });
-      adaptRefs.length = 0;
-      transformExpression(carrier, pn, absolutifier, csnPath)
-      if(refChanged && carrier[pn]['='])
-      carrier[pn]['='] = true;
+      if(pn[0] === '@') {
+        transformAnnotationExpression(carrier, pn, [ refCheck, refFlattener ], csnPath);
+        adaptRefs.forEach(fn => fn(refParentIsItems));
+        adaptRefs.length = 0;
+        transformAnnotationExpression(carrier, pn, absolutifier, csnPath);
+      }
+      if(pn === 'value') {
+        transformExpression(carrier, pn, [ refCheck, refFlattener ], csnPath);
+        adaptRefs.forEach(fn => fn(refParentIsItems));
+        adaptRefs.length = 0;
+        transformExpression(carrier, pn, absolutifier, csnPath);
+      }
     });
   }
 
@@ -454,14 +460,10 @@ function flattenAllStructStepsInRefs( csn, refFlattener, adaptRefs, inspectRef,
   typeNames.forEach(tn => {
     forEachMemberRecursively(csn.definitions[tn], (member, memberName, prop, csnPath) => {
       Object.keys(member).filter(pn => pn[0] === '@').forEach(pn => {
-        let refChanged = false;
         refCheck.anno = pn;
-        transformExpression(member, pn, [ refCheck, refFlattener ], csnPath);
-        adaptRefs.forEach(fn => {
-          if (fn(true, 1)) refChanged = true });
+        transformAnnotationExpression(member, pn, [ refCheck, refFlattener ], csnPath);
+        adaptRefs.forEach(fn => fn(true, 1));
         adaptRefs.length = 0;
-        if(refChanged && member[pn]['='])
-          member[pn]['='] = true;
       });
     }, [ 'definitions', tn ]);
   })
@@ -488,8 +490,7 @@ function getStructRefFlatteningTransformer(csn, inspectRef, effectiveType, optio
   }
   const adaptRefs = [];
   const transformer = {
-    ref: (parent, prop, ref, path) => {
-      let refChanged = false;
+    ref: (parent, _prop, ref, path, _p, _ppn, ctx) => {
       const { links, art, scope } = inspectRef(path);
       const resolvedLinkTypes = resolveLinkTypes(links);
       setProp(parent, '$path', [ ...path ]);
@@ -502,9 +503,10 @@ function getStructRefFlatteningTransformer(csn, inspectRef, effectiveType, optio
           //       full path into target, uncomment this line and
           //       comment/remove setProp in expansion.js
           // setProp(parent, '$structRef', parent.ref);
-          [ parent.ref, refChanged ] = flattenStructStepsInRef(ref,
+          const [ newRef, refChanged ] = flattenStructStepsInRef(ref,
               scopedPath, links, scope, resolvedLinkTypes,
               suspend, suspendPos, parent.$bparam);
+          parent.ref = newRef;
           resolved.set(parent, { links, art, scope });
           // Explicitly set implicit alias for things that are now flattened - but only in columns
           // TODO: Can this be done elegantly during expand phase already?
@@ -546,8 +548,17 @@ function getStructRefFlatteningTransformer(csn, inspectRef, effectiveType, optio
             && typeof path[path.length - 1] === 'number';
         }
       };
+
       // adapt queries later
-      adaptRefs.push(fn);
+      if(ctx?.annoExpr?.['=']) {
+        const annoExpr = ctx.annoExpr;
+        adaptRefs.push((...args) => {
+          if(fn(...args))
+            annoExpr['='] = true;
+        });
+      }
+      else 
+        adaptRefs.push(fn);
     },
   }
 

package/lib/transform/odata/toFinalBaseType.js

@@ -2,11 +2,10 @@
 
 const { setProp, isBetaEnabled } = require('../../base/model');
 const {
-  transformExpression,
+  transformAnnotationExpression,
   forEachDefinition,
   forEachGeneric,
   forEachMemberRecursively,
-  findAnnotationExpression,
 } = require('../../model/csnUtils');
 const { isBuiltinType } = require('../../base/builtins');
 const { isArtifactInSomeService, isArtifactInService } = require('./utils');
@@ -224,9 +223,9 @@ function expandToFinalBaseType(csn, transformers, csnUtils, services, options, e
         const usingPositionStr = f($path2path(location));
         const eltRootPath = $path2path(elt.$path);
 
-        Object.keys(elt).filter(pn => pn[0] === '@' && findAnnotationExpression(elt, pn)).forEach(xprAName => {
-          transformExpression(elt, xprAName, {
-            ref: (parent, prop, xpr, csnPath) => {
+        Object.keys(elt).filter(pn => pn[0] === '@').forEach(anno => {
+          transformAnnotationExpression(elt, anno, {
+            ref: (parent, prop, xpr, csnPath, _p, _ppn, ctx) => {
               let prefixMatch = true;
               const head = xpr[0].id || xpr[0];
               if (head === '$self') {
@@ -238,10 +237,12 @@ function expandToFinalBaseType(csn, transformers, csnUtils, services, options, e
                     parent[prop] = [ ...xpr.slice(eltRootPath.length-1)];
                   else
                     parent[prop] = [ '$self', ...xpr.slice(typeRefRootPath.length)];
+                  if(ctx?.annoExpr?.['='])
+                    ctx.annoExpr['='] = true;
                 }
                 else {
                   error('odata-anno-xpr-ref', csnPath,
-                  { anno: xprAName, elemref: xpr.join('.'), name: usingPositionStr, code: typeRefStr });
+                  { anno, elemref: xpr.join('.'), name: usingPositionStr, code: typeRefStr });
                 }              
               }
             },

package/lib/transform/universalCsn/universalCsnEnricher.js

@@ -54,6 +54,7 @@ module.exports = (csn, options) => {
   const ruleToFunction = {
     __proto__: null,
     never: skip,
+    onlyViaParent: skip,        // TODO: not correct
     onlyViaArtifact,
     notWithPersistenceTable,
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "5.1.2",
+  "version": "5.2.0",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",
@@ -15,7 +15,7 @@
   "types": "lib/main.d.ts",
   "scripts": {
     "download": "node scripts/downloadANTLR.js",
-    "gen": "node ./scripts/build.js && node scripts/genGrammarChecksum.js",
+    "gen": "node ./scripts/build.js && node scripts/genGrammarChecksum.js && node ./redepage/bin/redepage --pretty --compile lib/gen/CdlParser.js --copy-base-parser lib/parsers/CdlGrammar.g4",
     "xmakeAfterInstall": "npm run gen",
     "xmakePrepareRelease": "echo \"$(node scripts/stripReadme.js README.md)\" > README.md && node scripts/assertSnapshotVersioning.js && node scripts/assertChangelog.js && node scripts/cleanup.js --remove-dev",
     "test": "npm run test:piper",

package/share/messages/redirected-to-ambiguous.md

@@ -31,14 +31,15 @@ view View as select from
 };
 ```
 
-Entity `Target` exists more than once in `View`.  In the previous example, this
-happens through the *direct* sources in the select clause.
+Entity `Target` exists more than once in `View` under different table aliases.
+In the previous example, this happens through the *direct* sources in the
+select clause.
 Because the original target exists twice in the redirected target, the compiler
 isn’t able to correctly resolve the redirection due to ambiguities.
 
 This can also happen through *indirect* sources.  For example if entity `Main`
-were to include `Target` then selecting from `Target` just once would be enough
-to trigger this error.
+were to include `Target`, then selecting from `Target` just once would be
+enough to trigger this error.
 
 ## How to Fix