@sap/cds-dk 10.0.7 → 10.1.0

package/node_modules/@sap/cds-compiler/lib/compiler/tweak-assocs.js

@@ -93,6 +93,10 @@ function tweakAssocs( model ) {
 
     if (art.query) {
       traverseQueryPost(art.query, null, (query) => {
+        forEachGeneric( query, '$tableAliases', ( mixin ) => {
+          if (mixin.$backlink?._redirected)
+            pushLink( model, '_associations', mixin );
+        } );
         forEachGeneric( query, 'elements', handleQueryElements );
       });
     }
@@ -338,16 +342,6 @@ function tweakAssocs( model ) {
   }
 
   function propagateBacklink( assoc, _originAssoc ) {
-    // const origin = originAssoc.$backlink;
-    // if (assoc.target._artifact === originAssoc.target._artifact) {
-    //   // no redirection → backlink is the same → no need to traverse ON-condition
-    //   const backlink = { location: weakLocation( origin.location ), target: {} };
-    //   setLink( backlink, '_origin', origin._origin );
-    //   setLink( backlink, '_outer', assoc );
-    //   assoc.$backlink = backlink;
-    //   // TODO: _redirected
-    // }
-    // else {
     checkBacklinkPartner( assoc );
     // console.log('PB:',assoc._main.name.id,assoc.name.id,originAssoc.name.id,
     //             !!originAssoc.on,!!assoc.on,!!assoc.$backlink)
@@ -370,17 +364,21 @@ function tweakAssocs( model ) {
       setLink( backlink, '_redirected', null ); // no further processing
       return;
     }
-    if (backlink._redirected?.length === 0)
+    if (!backlink._redirected?.length)
       return;
     // all of the following necessary?
     setLink( backlink, '_main', elem._main );
     setLink( backlink, '_parent', elem._parent );
     setLink( backlink, '_effectiveType', backlink );
     backlink.name = origin.name;
-    if (origin.on)
+    if (origin.on) {
       rewriteCondition( backlink, origin );
-    else if (origin.foreignKeys)
-      rewriteKeys( backlink, origin );
+      if (backlink.$errorReported)
+        setLink( backlink, '_redirected', null ); // no further processing
+    }
+    else if (rewriteKeys( backlink, origin )) {
+      setLink( backlink, '_redirected', null ); // no further processing
+    }
   }
 
   /**
@@ -419,10 +417,11 @@ function tweakAssocs( model ) {
   function rewriteKeys( elem, assoc ) {
     addConditionFromAssocPublishing( elem, assoc, null );
     if (elem.on)
-      return; // foreign keys were transformed into ON-condition
+      return false;             // foreign keys were transformed into ON-condition
 
     // TODO: split this function: create foreign keys without `targetElement`
     // already in Phase 2: redirectImplicitly()
+    let withIssue = false;
     elem.foreignKeys = Object.create(null); // set already here (also for zero foreign keys)
     forEachInOrder( assoc, 'foreignKeys', ( orig, name ) => {
       const location = weakRefLocation( elem.target );
@@ -431,10 +430,11 @@ function tweakAssocs( model ) {
       setLink( fk, '_effectiveType', fk );
       fk.targetElement = copyExpr( orig.targetElement, location );
       if (elem._redirected)
-        rewriteKey( elem, fk );
+        withIssue = rewriteKey( elem, fk ) || withIssue;
     } );
     if (elem.foreignKeys) // Possibly no fk was set
       elem.foreignKeys[$inferred] = 'rewrite';
+    return withIssue;
   }
 
   function rewriteKey( elem, fk ) {
@@ -458,8 +458,9 @@ function tweakAssocs( model ) {
           message( 'ref-missing-backlink-element',
                    [ (outer.value || outer.name).location, outer ],
                    { '#': (outer.value ? 'std' : 'def'), id: undef.id } );
-        // TODO: more info if element was already missing in "intermediate" projection
-        // TODO: collect all missing elements?
+          // TODO: more info if element was already missing in "intermediate" projection
+          // TODO: collect all missing elements?
+          return true;
         }
         else {
           setArtifactLink( targetElement.path[0], null );
@@ -476,7 +477,7 @@ function tweakAssocs( model ) {
             target: alias._main,
             name: elem.name?.id,
           } );
-          return null;
+          return true;
         }
       }
       else {
@@ -489,9 +490,10 @@ function tweakAssocs( model ) {
       const item = targetElement.path[0];
       setArtifactLink( item, projectedKey.elem );
       setArtifactLink( targetElement, projectedKey.elem );
-      return projectedKey.elem;
+      return false;             // ok
     }
-    return null;
+    // TODO: check message if this is reached
+    return true;
   }
 
   /**
@@ -534,7 +536,7 @@ function tweakAssocs( model ) {
       // TODO: Only report once for multi-include chains, see
       //       Associations/SubElements/UnmanagedInSubElement.err.cds
       error( 'type-unsupported-rewrite', [ elem.location, elem ], { '#': 'sub-element' } );
-      removeArtifactLinks();
+      removeArtifactLinks( elem );
       return;
     }
     const nav = (elem._main?.query && elem.value)
@@ -551,7 +553,7 @@ function tweakAssocs( model ) {
     if (!navigation) { // TODO: what about $projection.assoc as myAssoc ?
       if (elem._columnParent) {
         error( 'rewrite-not-supported', [ elem.target.location, elem ], { '#': 'inline-expand' } );
-        removeArtifactLinks();
+        removeArtifactLinks( elem );
       }
       return;                 // should not happen: $projection, $magic, or ref to const
     }
@@ -566,31 +568,31 @@ function tweakAssocs( model ) {
     }
     else if (elem._columnParent) {
       error( 'rewrite-not-supported', [ elem.target.location, elem ], { '#': 'inline-expand' } );
-      removeArtifactLinks();
+      removeArtifactLinks( elem );
       return;
     }
     else {
       // TODO: support that, now that the ON condition is rewritten in the right order
       error( null, [ elem.value.location, elem ], {},
              'Selecting unmanaged associations from a sub query is not supported' );
-      removeArtifactLinks();
+      removeArtifactLinks( elem );
       return;
     }
 
     addConditionFromAssocPublishing( elem, assoc, nav );
     elem.on.$inferred = 'rewrite';
+  }
 
-    /**
-     * Clear all `_artifact` links in the ON-condition to avoid follow-up
-     * issues during ON-condition rewriting of associations that inherit
-     * the ON-condition.
-     */
-    function removeArtifactLinks() {
-      traverseExpr( elem.on, 'rewrite-on', elem, (expr) => {
-        setArtifactLink( expr, null );
-        return traverseExpr.SKIP; // TODO: necessary?
-      } );
-    }
+  /**
+   * Clear all `_artifact` links in the ON-condition to avoid follow-up
+   * issues during ON-condition rewriting of associations that inherit
+   * the ON-condition.
+   */
+  function removeArtifactLinks( elem ) {
+    traverseExpr( elem.on, 'rewrite-on', elem, (expr) => {
+      setArtifactLink( expr, null );
+      return traverseExpr.SKIP; // TODO: necessary?
+    } );
   }
 
   /**
@@ -639,16 +641,22 @@ function tweakAssocs( model ) {
       }
     }
 
-    elem.on = {
-      op: { val: 'ixpr', location },
-      args: [
-        { ...elem.on, $parens: [ assoc.location ] },
-        { val: 'and', literal: 'token', location },
-        filterToCondition( lastStep, elem, nav ),
-      ],
-      location,
-      $inferred: 'copy',
-    };
+    // Empty filters don't add anything to the ON-condition.
+    if (lastStep.where.args?.length) {
+      elem.on = {
+        op: { val: 'ixpr', location },
+        args: [
+          { ...elem.on, $parens: [ assoc.location ] },
+          { val: 'and', literal: 'token', location },
+          filterToCondition( lastStep, elem, nav ),
+        ],
+        location,
+        $inferred: 'copy',
+      };
+    }
+    else if (elem.on && !elem.on.$inferred) {
+      elem.on.$inferred = 'copy';
+    }
 
     // Published paths with filters are always associations, never
     // compositions, hence we need to change the type to avoid type propagation.
@@ -843,6 +851,8 @@ function tweakAssocs( model ) {
         message( 'ref-missing-backlink-element',
                  [ (outer.value || outer.name).location, outer ],
                  { '#': (outer.value ? 'std' : 'def'), id: undef.id } );
+        assoc.$errorReported = true; // for `_redirected: null` later
+        // (do not set now, then we would see just the first missing element)
         // TODO: more info if element was already missing in "intermediate" projection
         // TODO: collect all missing elements?
       }
@@ -1220,14 +1230,16 @@ function findRewriteTarget( expr, index, env, user ) {
       return [ env.elements[item.id], index ];
     return [ null, expr.path.length ];
   }
-  const items = (env._leadingQuery || env)._combined?.[item.id];
+  const items = (env.$queries?.[0] || env)._combined?.[item.id];
   const allNavs = !items || Array.isArray(items) ? items : [ items ];
 
   // If the annotation target itself has a table alias, require projections of that
   // table alias. Of course, that only works if we're talking about the same query.
-  const tableAlias = (user._main?._origin === item._artifact?._main &&
-    user.value?.path[0]?._navigation?.kind === '$tableAlias')
-    ? user.value.path[0]._navigation : null;
+  const valueNav = user.value?.path[0]?._navigation;
+  const tableAlias = (valueNav?.kind === '$tableAlias' &&
+                      user._main?._origin?._origin === item._artifact?._main)
+    ? valueNav
+    : null;
 
   // Look at all table aliase that could project `item` and only select
   // those that have actual projections.

package/node_modules/@sap/cds-compiler/lib/compiler/utils.js

@@ -8,7 +8,7 @@
 
 'use strict';
 
-const { dictAdd, dictFirst } = require('./dictionaries');
+const { dictAdd } = require('./dictionaries');
 const { Location, weakLocation } = require('../base/location');
 const { XsnName, XsnArtifact } = require('./xsn-model');
 
@@ -158,7 +158,7 @@ function initItemsLinks( obj, block ) {
  * is most often the property `elem.name.id`.
  *
  * If argument `prop` is provided, add `elem` to the dictionary of that name,
- * e.g. `elements`.  TODO: remove `prop`.
+ * e.g. `elements`.  TODO: remove `prop` and `name`, rename to `setParentAndMain`.
 */
 function setMemberParent( elem, name, parent, prop ) {
   if (prop) {              // extension or structure include
@@ -342,6 +342,26 @@ function withAssociation( ref, test = testFunctionPlaceholder, alsoTestLast = fa
   return false;
 }
 
+
+function hasSecurityAnno( ext ) {
+  return ext['@restrict'] || ext['@requires'] ||
+    Object.keys( ext ).some( prop => prop.startsWith( '@ams.' ) );
+}
+
+function extensionRefContext( ext ) {
+  if (ext.kind === 'annotate') {
+    if (hasSecurityAnno( ext ))
+      return 'annotate-sec';
+  }
+  else if (ext.artifacts || ext.$syntax === 'empty') {
+    // extend … with definitions (or friends) or bare { extend: "ref" } in CSN
+    // TODO v8: not for `extend context` and `extend service` → !ext.expectedKind ?
+    if (!ext.doc && !Object.keys( ext ).some( a => a.charAt(0) === '@') )
+      return 'annotate';
+  }
+  return ext.kind;
+}
+
 /**
  * Return string 'A.B.C' for parsed source `A.B.C` (is vector of ids with
  * locations).
@@ -639,17 +659,6 @@ function traverseQueryExtra( main, callback ) {
   }
 }
 
-/**
- * Returns what was available at view._from[0] before:
- * (think first whether to really use this function)
- */
-function viewFromPrimary( view ) {
-  let query = view.$queries?.[0];
-  while (query?._origin?.kind === 'select') // sub query in from
-    query = query._origin;
-  return dictFirst( query?.$tableAliases );
-}
-
 /**
  * About Helper property $expand for faster the XSN-to-CSN transformation
  * - null/undefined: artifact, member, items does not contain expanded members
@@ -730,6 +739,10 @@ function targetCantBeAspect( elem, calledForTargetAspectProp, definitions ) { //
   return null;
 }
 
+function isLeadingQuery( query ) {
+  return query === query._main?.$queries?.[0];
+}
+
 function userQuery( user ) {
   // TODO: we need _query links set by the definer
   while (user._main) {
@@ -898,6 +911,8 @@ module.exports = {
   initDollarParameters,
   initBoundSelfParam,
   withAssociation,
+  hasSecurityAnno,
+  extensionRefContext,
   pathName,
   hasSpecialPathItemProp,
   augmentPath,
@@ -909,10 +924,10 @@ module.exports = {
   forEachQueryExpr,
   traverseQueryPost,
   traverseQueryExtra,
-  viewFromPrimary,
   setExpandStatus,
   isDirectComposition,
   targetCantBeAspect,
+  isLeadingQuery,
   userQuery,
   userParam,
   pathStartsWithSelf,

package/node_modules/@sap/cds-compiler/lib/edm/edmAnnoPreprocessor.js

@@ -10,12 +10,12 @@ const { forEachGeneric } = require('../model/csnUtils');
  *  These transformations are available today:
  *
  *  Analytical Scenario:
- *    If a structure is annotated with @Aggregation.ApplySupported.PropertyRestrictions
+ *    V2 analytical clients don't understand OData V4 vocabulary annotations, therefore
+ *    if a structure is annotated with '@Aggregation.ApplySupported.PropertyRestrictions'
  *    then a number of annotation rewrites are done to this structure and to the
- *    elements of this structure
- *    Also the key properties of all structure elements are removed and a new
- *    artificial key element 'key _ID : String' is inserted at first position of
- *    the elements dictionary
+ *    elements of this structure. Also, the key properties of all structure elements are
+ *    removed and a new artificial key element 'key _ID : String' is inserted at first position of
+ *    the elements dictionary.
  *
  * PDM (Personal Data Management)
  *    Planned but not yet implemented annotation rewriting (pending to finalization)
@@ -48,6 +48,7 @@ function addToSetAttr( carrier, propName, propValue, removeFromType = true ) {
 }
 
 function applyAppSpecificLateCsnTransformationOnElement( options, element, struct, error ) {
+  // see "Analytical Scenario" in the module-level comment for why this transformation is needed
   if (options.isV2() && struct['@Aggregation.ApplySupported.PropertyRestrictions'])
     mapAnnotationAssignment(element, struct, GenerateAnalyticalAnnotations());
 

package/node_modules/@sap/cds-compiler/lib/gen/CdlGrammar.checksum

@@ -1 +1 @@
-230b7681d344570b9cdb67a5c9bb0f86
+bfa8a04d3ff1bc96f00a7f8d532f11d0