@sap/cds-compiler 4.0.2 → 4.2.2

package/lib/compiler/kick-start.js

@@ -33,7 +33,7 @@ function kickStart( model ) {
     const art = model.definitions[name];
     if (art._parent === undefined)
       return;                   // nothing to do for builtins and redefinitions
-    if (art.query && art._ancestors === undefined)
+    if (art.query && art._ancestors === undefined && art.kind === 'entity')
       setProjectionAncestors( art );
 
     let parent = art._parent;
@@ -44,7 +44,7 @@ function kickStart( model ) {
     if (!parent || !service)
       return;
     // To be removed when nested services are allowed
-    if (!isBetaEnabled(options, 'nestedServices') && art.kind === 'service') {
+    if (!isBetaEnabled( options, 'nestedServices' ) && art.kind === 'service') {
       while (parent.kind !== 'service')
         parent = parent._parent;
       message( 'service-nested-service', [ art.name.location, art ], { art: parent },
@@ -66,15 +66,16 @@ function kickStart( model ) {
     // TODO: do not do implicit redirection across services, i.e. Service2.E is
     // no redirection target for E if Service2.E = projection on Service1.E and
     // Service1.E = projection on E
+
+    // Remark: _ancestors are also set with includes, and there also for aspects,
+    // types and events.
     const chain = [];
     const autoexposed = annotationVal( art['@cds.autoexposed'] );
-    const preferredRedirectionTarget = annotationVal( art['@cds.redirection.target'] );
     // no need to set preferredRedirectionTarget in the while loop as we would
     // use the projection having @cds.redirection.target anyhow instead of
     // `art` anyway (if we do the no-x-service-implicit-redirection TODO above)
     while (art?.query?.from?.path && // direct select with one source
-           art._ancestors !== 0 &&        // prevent inf-loop
-           (preferredRedirectionTarget || !annotationIsFalse( art['@cds.redirection.target'] ) )) {
+           art._ancestors !== 0) {   // prevent inf-loop
       chain.push( art );
       setLink( art, '_ancestors', 0 ); // avoid infloop with cyclic from
       const name = resolveUncheckedPath( art.query.from, 'from', art );
@@ -109,10 +110,10 @@ function kickStart( model ) {
     return;
 
     function expose( ancestor ) {
-      if (ancestor._service === service)
+      if (ancestor._service === service || annotationIsFalse( art['@cds.redirection.target'] ))
         return;
       const desc = ancestor._descendants ||
-            setLink( ancestor, '_descendants', Object.create(null) );
+            setLink( ancestor, '_descendants', Object.create( null ) );
       if (!desc[sname])
         desc[sname] = [ art ];
       else
@@ -125,6 +126,7 @@ function kickStart( model ) {
     if (elem.target && type && type[0] && type[0].id === 'cds.Composition') {
       // A target aspect would have already moved to property `targetAspect` in
       // define.js (hm... more something for kick-start.js...)
+      // TODO: for safety, just use resolveUncheckedPath()
       const target = resolvePath( elem.target, 'target', elem );
       if (target)
         model.$compositionTargets[target.name.absolute] = true;
@@ -134,6 +136,7 @@ function kickStart( model ) {
 
   // Resolve the using declarations in `using`.  Issue
   // error message if the referenced artifact does not exist.
+  // TODO: think of moving this to resolve.js
   function resolveUsings( src, topLevel ) {
     if (!src.usings)
       return;

package/lib/compiler/moduleLayers.js

@@ -23,7 +23,7 @@ function setLayers( sources ) {
 
   // It is ensured that the representative is called last in SCC and that
   // dependent SCCs are called first
-  function setExtends( node, representative, sccDeps = Object.create(null) ) {
+  function setExtends( node, representative, sccDeps = Object.create( null ) ) {
     setLink( node, '_layerRepresentative', representative );
     if (layerRepresentative !== representative) {
       layerRepresentative = representative;