@sap/cds-compiler 3.4.0 → 3.4.2

package/CHANGELOG.md

@@ -7,11 +7,23 @@
 Note: `beta` fixes, changes and features are usually not listed in this ChangeLog but [here](doc/CHANGELOG_BETA.md).
 The compiler behavior concerning `beta` features can change at any time without notice.
 
+## Version 3.4.2 - 2022-11-11
+
+### Fixed
+
+- Don't propagate `@cds.external` (The CDS Importer adds `@cds.external` for all
+  imported definitions beginning with cds-dk@6.3.0, see CAP release log).
+- for.odata: Ignore all `@cds.external` definitions.
+- to.sql: For sql dialect `h2`, don't turn a Decimal with length 0 into a Decfloat.
+- Extending a projection with an aspect could result in incorrect auto-redirection.
+- Annotations of aspects were not properly propagated to projections under some order-specific circumstances.
+
 ## Version 3.4.0 - 2022-10-26
 
 ### Added
 
-- to.sql: Add support for sql dialect `h2`, which renders SQL for H2 2.x
+- to.sql: Add support for sql dialect `h2`, which renders SQL for H2 2.x.
+- Projections can now be extended by annotation-only aspects, e.g. `extend P with MyAspect;`.
 
 ### Fixed
 

package/lib/base/message-registry.js

@@ -98,7 +98,7 @@ const centralMessages = {
   'ref-sloppy-target': { severity: 'Warning' },
 
   'extend-repeated-intralayer': { severity: 'Warning' },
-  'extend-unrelated-layer':     { severity: 'Warning' },
+  'extend-unrelated-layer':     { severity: 'Info' },
 
   'ext-duplicate-extend-type': { severity: 'Error' },
   'ext-duplicate-extend-type-unrelated-layer': { severity: 'Error', configurableFor: true },

package/lib/compiler/extend.js

@@ -620,15 +620,17 @@ function extend( model ) {
       return;
     }
 
-    if (!art._ancestors)
-      setLink( art, '_ancestors', [] ); // recursive array of includes
-    for (const ref of ext.includes) {
-      const template = ref._artifact;
-      // !template -> non-includable, e.g. scalar type, or cyclic
-      if (template) {
-        if (template._ancestors)
-          art._ancestors.push( ...template._ancestors );
-        art._ancestors.push( template );
+    if (!art.query) {
+      if (!art._ancestors)
+        setLink( art, '_ancestors', [] ); // recursive array of includes
+      for (const ref of ext.includes) {
+        const template = ref._artifact;
+        // !template -> non-includable, e.g. scalar type, or cyclic
+        if (template) {
+          if (template._ancestors)
+            art._ancestors.push( ...template._ancestors );
+          art._ancestors.push( template );
+        }
       }
     }
     includeMembers( ext, art, 'elements' );
@@ -1275,7 +1277,7 @@ function copyPersistenceAnnotations(target, source, options) {
     copy( '@cds.persistence.exists' );
   copy( '@cds.persistence.skip' );
 
-  function copy(anno) {
+  function copy( anno ) {
     if ( source[anno] && !target[anno] )
       target[anno] = { ...source[anno], $inferred: 'parent-origin' };
   }

package/lib/compiler/propagator.js

@@ -33,6 +33,7 @@ function propagate( model ) {
     '@Analytics.visible': never,
     '@cds.autoexpose': onlyViaArtifact,
     '@cds.autoexposed': never,  // in case people set it themselves
+    '@cds.external': never,
     '@cds.redirection.target': never,
     '@fiori.draft.enabled': onlyViaArtifact,
     '@': annotation,            // always except in 'returns' and 'items'
@@ -84,42 +85,34 @@ function propagate( model ) {
       return;
     }
     // console.log('RUN:', art.name, art.elements ? Object.keys(art.elements) : 0)
+
     const chain = [];
-    let target = art;
-    let source = getOrigin( target );
-    while (source && checkAndSetStatus( source )) {
-      chain.push({ target, source });
-      target = source;
-      source = getOrigin( target );
-    }
-    if (source) {               // the source has fully propagated properties
-      chain.push({ target, source });
-    }
-    else if (target._main) {    // source is element, which has not inherited props yet
-      run( target._main );       // run on main artifact first
-    }
+    let targets = [ art ];
+    while (targets.length) {
+      const news = [];
+      for (const target of targets) {
+        const origin = getOrigin( target );
+        if (origin) {
+          chain.push( { target, source: origin } );
+          if (checkAndSetStatus( origin ))
+            news.push( origin );
+        }
 
-    // Even with a query source, go through `includes`. `source` is propagated first, i.e. wins.
-    if (target.includes) {
-      let targets = [ target ];
-      while (targets.length) {
-        const news = [];
-        for (const t of targets) {
-          for (const ref of t.includes || []) {
-            const s = ref._artifact;
-            if (!s)          // ref error
-              continue;
-            chain.push( { target: t, source: s } );
-            if (checkAndSetStatus( s ))
-              news.push( s );
-          }
+        for (const ref of target.includes || []) {
+          const include = ref._artifact;
+          if (!include)
+            continue;
+          chain.push( { target, source: include } );
+          if (checkAndSetStatus( include ))
+            news.push( include );
         }
-        targets = news;
       }
+      targets = news;
     }
+
     chain.reverse().forEach( step );
     runMembers( art );
-    // console.log('DONE:', art.name, art.elements ? Object.keys(art.elements) : 0)
+    // console.log('DONE:', art.name, art.elements ? Object.keys(art.elements) : 0);
   }
 
   function runMembers( art ) {

package/lib/transform/forOdataNew.js

@@ -109,7 +109,9 @@ function transform4odataWithCsn(inputModel, options) {
   // @ts-ignore
   const externalServices = services.filter(serviceName => csn.definitions[serviceName]['@cds.external']);
   // @ts-ignore
-  const isExternalServiceMember = (_art, name) => externalServices.includes(getServiceName(name));
+  const isExternalServiceMember = (art, name) => {
+    return !!(externalServices.includes(getServiceName(name)) ||  (art && art['@cds.external']))
+  }
 
   if (options.csnFlavor === 'universal' && isBetaEnabled(options, 'enableUniversalCsn'))
     enrichUniversalCsn(csn, options);
@@ -163,10 +165,12 @@ function transform4odataWithCsn(inputModel, options) {
     // Needs to happen exactly between flattenAllStructStepsInRefs and flattenElements to keep model resolvable.
     // OData doesn't resolve type chains after the first 'items'
     flattening.resolveTypeReferences(csn, options, resolved, '_',
-      { skip: [ 'action', 'aspect', 'event', 'function', 'type'], skipArtifact: isExternalServiceMember, skipStandard: { items: true } });
+      { skip: [ 'action', 'aspect', 'event', 'function', 'type'], 
+        skipArtifact: isExternalServiceMember, skipStandard: { items: true } });
     // No structured elements exists anymore
     flattening.flattenElements(csn, options, '_', error,
-      { skip: ['action', 'aspect', 'event', 'function', 'type'], skipArtifact: isExternalServiceMember,
+      { skip: ['action', 'aspect', 'event', 'function', 'type'], 
+        skipArtifact: isExternalServiceMember,
         skipStandard: { items: true },  // don't drill further into .items
         skipDict: { actions: true } }); // don't drill further into .actions -> bound actions, action-artifacts are handled by skip
   }

package/lib/transform/forRelationalDB.js

@@ -705,7 +705,7 @@ function transformForRelationalDBWithCsn(inputModel, options, moduleName) {
       setProp(node, '$renamed', 'cds.UUID');
     }
 
-    if(options.sqlDialect === 'h2' && val === 'cds.Decimal' && !node.scale) {
+    if(options.sqlDialect === 'h2' && val === 'cds.Decimal' && node.scale === undefined) {
       node[key] = 'cds.DecimalFloat'; // cds.Decimal and cds.Decimal(p) should map do DECFLOAT for h2
     }
 

package/lib/transform/universalCsn/universalCsnEnricher.js

@@ -28,6 +28,7 @@ module.exports = (csn, options) => {
     // Properties on definition level that we treat specially.
   const definitionPropagationRules = {
     '@cds.autoexpose': onlyViaArtifact,
+    '@cds.external': skip,
     '@fiori.draft.enabled': onlyViaArtifact,
     '@': nullStopsPropagation,
     // Example: `type E : F;` does not have `elements`, but they are required for e.g. OData.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "3.4.0",
+  "version": "3.4.2",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",