@sap/cds-compiler 4.1.2 → 4.2.4

package/lib/compiler/populate.js

@@ -48,8 +48,8 @@ const {
 } = require('./utils');
 const { typeParameters } = require('./builtins');
 
-const $inferred = Symbol.for('cds.$inferred');
-const $location = Symbol.for('cds.$location');
+const $inferred = Symbol.for( 'cds.$inferred' );
+const $location = Symbol.for( 'cds.$location' );
 
 /**
  * These properties are copied from specified elements.
@@ -166,7 +166,7 @@ function populate( model ) {
    *
    * Calculating an effective association/composition implies calculating its
    * target entity (including redirections), but not induce calculating the
-   * target's elements.  Calculating an effective structure (entities, …)  does
+   * target's elements.  Calculating an effective structure (entities, …) does
    * not imply calculating the effective types of its elements.  Calculating an
    * effective array does not imply calculating its effective line type.
    */
@@ -215,7 +215,7 @@ function populate( model ) {
       // console.log( 'ET-DO:', effectiveSeqNo, a?.kind, a?.name, a._extensions?.elements?.length )
       extendArtifactAfter( a ); // after setting _effectiveType (for messages)
       if (a.typeProps$)
-        setSpecifiedElementTypeProperties(a);
+        setSpecifiedElementTypeProperties( a );
     }
     // console.log( 'ET-END:', art?.kind, art?.name )
     return art;
@@ -393,7 +393,7 @@ function populate( model ) {
       proxyCopyMembers( art, 'elements', struct.elements, art.path?.location, '$navElement' );
       return true;
     }
-    if (art.elements || art.kind === '$tableAlias' || art.kind === '$inline' ||
+    if (art.elements || art.kind === '$inline' ||
         // no element expansions for "non-proper" types like
         // entities (as parameter types) etc:
         struct.kind !== 'type' && struct.kind !== 'element' && struct.kind !== 'param' &&
@@ -407,7 +407,8 @@ function populate( model ) {
     const location = ref && ref.location || art.location;
     // console.log( message( null, location, art, {target:struct,art}, 'Info','EXPAND-ELEM')
     //              .toString(), Object.keys(struct.elements))
-    proxyCopyMembers( art, 'elements', struct.elements, weakLocation( location ) );
+    proxyCopyMembers( art, 'elements', struct.elements, weakLocation( location ),
+                      null, isDeprecatedEnabled( options, 'noKeyPropagationWithExpansions' ) );
     // Set elements expansion status (the if condition is always true, as no
     // elements expansion will take place on artifact with existing other
     // member property):
@@ -541,7 +542,7 @@ function populate( model ) {
           }
           else if (typePropertiesFromSpecifiedElements[prop]) {
             if (!ielem.typeProps$)
-              setLink(ielem, 'typeProps$', Object.create(null));
+              setLink( ielem, 'typeProps$', Object.create( null ) );
             // Note: At this point in time, effectiveType() was likely not called on the
             // element, yet. Setting it here, we can't compare it to its value from _origin.
             ielem.typeProps$[prop] = selem[prop];
@@ -550,14 +551,14 @@ function populate( model ) {
 
         selem.$replacement = true;
         if (selem.elements)
-          setLink(ielem, 'elements$', selem.elements);
+          setLink( ielem, 'elements$', selem.elements );
         if (selem.enum)
-          setLink(ielem, 'enum$', selem.enum);
+          setLink( ielem, 'enum$', selem.enum );
       }
     }
 
     if (wasAnnotated)
-      setExpandStatusAnnotate(art, 'annotate');
+      setExpandStatusAnnotate( art, 'annotate' );
 
     // TODO: We don't check enum$, yet! We first need to fix expansion for
     //       `cast(elem as EnumType)` (see #9421)
@@ -577,8 +578,8 @@ function populate( model ) {
     for (const prop in art.typeProps$) {
       let o = art;
       if (o._effectiveType !== 0) { // cyclic
-        while (!o[prop] && getOrigin(o))
-          o = getOrigin(o);
+        while (!o[prop] && getOrigin( o ))
+          o = getOrigin( o );
       }
 
       if (typePropertiesFromSpecifiedElements[prop] === 'if-undefined') {
@@ -595,7 +596,7 @@ function populate( model ) {
     if (query._combined || !query.from || !query.$tableAliases)
       // already done (TODO: re-check!) or $join query or parse error
       return query;
-    setLink( query, '_combined', Object.create(null) );
+    setLink( query, '_combined', Object.create( null ) );
     query.$inlines = [];
     forEachGeneric( query, '$tableAliases', resolveTabRef );
     initFromColumns( query, query.columns );
@@ -621,7 +622,7 @@ function populate( model ) {
       forEachGeneric( { elements: alias.elements }, 'elements', ( elem, name ) => {
         if (elem.$duplicates !== true)
           dictAddArray( query._combined, name, elem, null ); // not dictAdd()
-      });
+      } );
     }
   }
 
@@ -666,7 +667,7 @@ function populate( model ) {
   function initFromColumns( query, columns, inlineHead = undefined ) {
     const elemsParent = query.items || query;
     if (!inlineHead) {
-      elemsParent.elements = Object.create(null);
+      elemsParent.elements = Object.create( null );
       if (query._main._leadingQuery === query) // never the case for 'expand'
         query._main.elements = elemsParent.elements;
     }
@@ -700,7 +701,7 @@ function populate( model ) {
         col.kind = 'element';
         dictAdd( elemsParent.elements, id, col, ( name, location ) => {
           error( 'duplicate-definition', [ location, query ], { name, '#': 'element' } );
-        });
+        } );
         setMemberParent( col, id, query );
       }
     }
@@ -773,7 +774,7 @@ function populate( model ) {
   // col ($replacement set before *)
   // false if two cols have same name
   function wildcardSiblings( columns, query ) {
-    const siblings = Object.create(null);
+    const siblings = Object.create( null );
     if (!columns)
       return siblings;
 
@@ -798,7 +799,7 @@ function populate( model ) {
     const { elements } = query.items || query;
     let location = wildcard.location || query.from && query.from.location || query.location;
     const inferred = query._main.$inferred;
-    const excludingDict = (colParent || query).excludingDict || Object.create(null);
+    const excludingDict = (colParent || query).excludingDict || Object.create( null );
 
     const envParent = wildcard._pathHead; // TODO: rename _pathHead to _columnParent
     // console.log('S1:',location.line,location.col,
@@ -825,15 +826,15 @@ function populate( model ) {
           dictAdd( elements, name, sibling, ( _name, loc ) => {
             // there can be a definition from a previous inline with the same name:
             error( 'duplicate-definition', [ loc, query ], { name, '#': 'element' } );
-          });
+          } );
           setMemberParent( sibling, name, query );
         }
         // else {
         //   sibling.$inferred = 'query';
         // }
       }
-      else if (Array.isArray(navElem)) {
-        const names = navElem.filter( e => !e.$duplicates)
+      else if (Array.isArray( navElem )) {
+        const names = navElem.filter( e => !e.$duplicates )
           .map( e => `${ e.name.alias }.${ e.name.element }` );
         if (names.length) {
           error( 'wildcard-ambiguous', [ location, query ], { id: name, names },
@@ -848,7 +849,7 @@ function populate( model ) {
         dictAdd( elements, name, elem, ( _name, loc ) => {
           // there can be a definition from a previous inline with the same name:
           error( 'duplicate-definition', [ loc, query ], { name, '#': 'element' } );
-        });
+        } );
         elem.$inferred = '*';
         elem.name.$inferred = '*';
         if (envParent)
@@ -895,7 +896,7 @@ function populate( model ) {
     if (!sibling.target || sibling.target.$inferred || // not explicit REDIRECTED TO
         path && path[path.length - 1].id !== sibling.name.id) { // or renamed
       const { id } = sibling.name;
-      if (Array.isArray(navElem)) {
+      if (Array.isArray( navElem )) {
         // ID published! Used in stakeholder project; if renamed, add to oldMessageIds
         info( 'wildcard-excluding-many', [ sibling.name.location, query ],
               { id, keyword: 'excluding' },
@@ -1000,6 +1001,12 @@ function populate( model ) {
 
   function redirectImplicitlyDo( elem, assoc, target, service ) {
     // console.log('ES:',elem.name.absolute,elem.name.element);
+    if (assoc._main === target && elem._main?.kind === 'entity' &&
+        elem._main?._ancestors?.includes( target )) {
+      // source and target of the model association are the same entity, and
+      // the current main artifact is a suitable auto-redirection target → return it
+      return elem._main;
+    }
     const elemScope = scopedRedirections && // null if no scoped redirections
           preferredElemScope( target, service, elem, assoc._main || assoc );
     const exposed = minimalExposure( target, service, elemScope );
@@ -1009,7 +1016,7 @@ function populate( model ) {
       if (isAutoExposed( target ))
         target = createAutoExposed( origTarget, service, elemScope );
       const desc = origTarget._descendants ||
-            setLink( origTarget, '_descendants', Object.create(null) );
+            setLink( origTarget, '_descendants', Object.create( null ) );
       if (!desc[service.name.absolute]) // could be the target itself (no repeated msgs)!
         desc[service.name.absolute] = [ target ];
       else
@@ -1031,16 +1038,16 @@ function populate( model ) {
                  std: 'Replace target $(TARGET) by one of $(SORTED_ARTS); can\'t auto-redirect this association if multiple projections exist in this service',
                  // eslint-disable-next-line max-len
                  two: 'Replace target $(TARGET) by $(SORTED_ARTS) or $(SECOND); can\'t auto-redirect this association if multiple projections exist in this service',
-               });
+               } );
       // continuation semantics: no auto-redirection
     }
     else {
       // referred (and probably inferred) assoc (without a user-provided target at that place)
       // HINT: consider bin/cdsv2m.js when changing the following message text
-      // No grouped and sub messages yet (TODO v3): mention at all target places with all assocs
+      // No grouped and sub messages yet (TODO v5): mention at all target places with all assocs
       const withAnno = annotationVal( exposed[0]['@cds.redirection.target'] );
       for (const proj of exposed) {
-        // TODO: def-ambiguous-target (just v3, as the current is infamous and used in options),
+        // TODO: def-ambiguous-target (just v5, as the current is infamous and used in options),
         message( 'redirected-implicitly-ambiguous',
                  [ weakLocation( proj.name.location ), proj ],
                  {
@@ -1064,7 +1071,7 @@ function populate( model ) {
     return target;
   }
 
-  // Return projections of `target` in `service`.  Shorted by
+  // Return projections of `target` in `service`.  Sorted by
   // - first, only consider projections with @cds.redirection.target=true
   // - exclude all indirect projections, i.e. those which are projection on others in list
   //
@@ -1081,7 +1088,7 @@ function populate( model ) {
       return exposed || [];
     let min = [];
     for (const e of exposed) {
-      if (min.every( m => m._ancestors?.includes( e ))) {
+      if (min.every( m => m._ancestors?.includes( e ) )) {
         min = [ e ];
       }
       else if (min.length !== 1 || !e._ancestors?.includes( min[0] )) {
@@ -1228,7 +1235,7 @@ function populate( model ) {
       return `${ service.name.absolute }.${ absolute }`;
     const base = definitionScope( target );
     if (base === target)
-      return `${ service.name.absolute }.${ absolute.substring( absolute.lastIndexOf('.') + 1 ) }`;
+      return `${ service.name.absolute }.${ absolute.substring( absolute.lastIndexOf( '.' ) + 1 ) }`;
     // for scoped (e.g. calculated) entities, use exposed name of base:
     const exposed = minimalExposure( base, service, elemScope );
     // console.log(exposed.map( a => a.name.absolute ));
@@ -1300,18 +1307,18 @@ function populate( model ) {
     };
     // forward target parameters to projection
     if (target.params) {
-      art.params = Object.create(null);
+      art.params = Object.create( null );
       // is art.query.from.path[0].$syntax: ':' required?
-      art.query.from.path[0].args = Object.create(null);
-      forEachGeneric(target, 'params', (p, pn) => {
-        art.params[pn] = linkToOrigin(p, pn, art, 'params', p.location);
+      art.query.from.path[0].args = Object.create( null );
+      forEachGeneric( target, 'params', (p, pn) => {
+        art.params[pn] = linkToOrigin( p, pn, art, 'params', p.location );
         art.query.from.path[0].args[pn] = {
           name: { id: p.name.id, location: p.location },
           location: p.location,
           scope: 'param',
           path: [ { id: pn, location: p.location } ],
         };
-      });
+      } );
     }
     // TODO: do we need to tag the generated entity with elemScope = 'auto'?
     if (autoexposed) {

package/lib/compiler/propagator.js

@@ -20,7 +20,7 @@ const {
   withAssociation,
   viewFromPrimary,
 } = require('./utils');
-const $inferred = Symbol.for('cds.$inferred');
+const $inferred = Symbol.for( 'cds.$inferred' );
 // const { refString } = require( '../base/messages')
 
 // Note that propagation here is also used for deep-copying (function `onlyViaParent`)
@@ -104,7 +104,7 @@ function propagate( model ) {
           if (target._calcOrigin?._origin && target.value?._artifact) {
             chain.push({ target, source: target.value._artifact });
             if (checkAndSetStatus( target.value._artifact ))
-              news.push(target.value._artifact);
+              news.push( target.value._artifact );
 
             if (target.value?._artifact.$inferred !== 'include') {
               // If the referred to element is not inferred, it is a new one and not the original.
@@ -242,11 +242,11 @@ function propagate( model ) {
                 target.location ||
                 target._outer && target._outer.location;
     const dict = source[prop];
-    target[prop] = Object.create(null); // also propagate empty elements
+    target[prop] = Object.create( null ); // also propagate empty elements
     for (const name in dict) {
       const member = linkToOrigin( dict[name], name, target, prop, location );
       member.$inferred = 'proxy';
-      setEffectiveType(member, dict[name]);
+      setEffectiveType( member, dict[name] );
     }
     target[prop][$inferred] = 'prop';
   }
@@ -286,7 +286,7 @@ function propagate( model ) {
     if (target.kind === 'param' && source.kind === 'entity')
       return; // Don't propagate from entity types to parameters (+ return type).
     if (target.kind)
-      always(prop, target, source); // not in 'items'
+      always( prop, target, source ); // not in 'items'
   }
 
   function notNull( prop, target, source, viaType ) {
@@ -379,7 +379,7 @@ function checkAndSetStatus( art ) {
 
 function setEffectiveType( target, source ) {
   if (source._effectiveType !== undefined)
-    setLink( target, '_effectiveType', source._effectiveType);
+    setLink( target, '_effectiveType', source._effectiveType );
 }
 
 module.exports = {