@sap/cds-compiler 4.0.2 → 4.2.2

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.
@@ -159,7 +159,8 @@ function propagate( model ) {
           (!target.type.$inferred || target.type.$inferred === 'cast');
     const keys = Object.keys( source );
     for (const prop of keys) {
-      if (prop in target)       // TODO: warning with competing props from multi-includes
+      // TODO: warning with competing props from multi-includes
+      if (target[prop] !== undefined || source[prop] === undefined)
         continue;
       const transformer = props[prop] || props[prop.charAt(0)];
       if (transformer)
@@ -174,9 +175,9 @@ function propagate( model ) {
       while (elem._parent.kind === 'element')
         elem = elem._parent;
       if (elem !== source) {
-        if (!('notNull' in target) && ('notNull' in elem))
+        if (target.notNull === undefined && elem.notNull !== undefined)
           props.notNull( 'notNull', target, elem );
-        if (!('virtual' in target) && ('virtual' in elem))
+        if (target.virtual === undefined && elem.virtual !== undefined)
           props.virtual( 'virtual', target, elem );
       }
     }
@@ -241,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';
   }
@@ -285,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 ) {
@@ -378,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 = {