@sap/cds-compiler - npm Package Compare versions

Comparing version 2.15.6 to 2.15.8

lib/edm/annotations/preprocessAnnotations.js

@@ -300,4 +300,8 @@ 'use strict';
           // TODO should be flattened, but then alphabetical order is destroyed
-          let newTextAnno = { '$value': textAnno, '@UI.TextArrangement': value };
-          carrier['@Common.Text'] = newTextAnno;
+
+          // Do not overwrite existing nested annotation values, instead give existing
+          // nested annotation precedence and remove outer annotation (always)
+          if(!carrier['@[e-mail]'] && textAnno) {
+            carrier['@Common.Text'] = { '$value': textAnno, '@UI.TextArrangement': value };
+          }
           delete carrier[aName];
@@ -304,0 +308,0 @@ }

lib/json/from-csn.js

@@ -105,2 +105,3 @@ // CSN frontend - transform CSN into XSN
   'target', 'elements', 'enum', 'items',
+  'cardinality', // for association publishing in views
   'type', 'length', 'precision', 'scale', 'srid', 'localized', 'notNull',
@@ -107,0 +108,0 @@ 'keys', 'on',                 // only with 'target'

lib/json/to-csn.js

@@ -187,5 +187,7 @@ // Transform XSN (augmented CSN) into CSN
 // sync with definition in from-csn.js:
+// Note: Order here is also the property order in CSN.
 const typeProperties = [
-  'target', 'elements', 'enum', 'items', // TODO: notNull?
-  'type', 'length', 'precision', 'scale', 'srid', 'localized',
+  'target', 'elements', 'enum', 'items',
+  'cardinality', // for association publishing in views
+  'type', 'length', 'precision', 'scale', 'srid', 'localized', // TODO: notNull?
   'foreignKeys', 'on',      // for explicit ON/keys with REDIRECTED
@@ -192,0 +194,0 @@ ];

package.json

 {
   "name": "@sap/cds-compiler",
-  "version": "2.15.6",
+  "version": "2.15.8",
   "description": "CDS (Core Data Services) compiler and backends",
@@ -5,0 +5,0 @@ "homepage": "https://cap.cloud.sap/",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

4051995

increased by0.02%

Lines of code

80088

increased by0.01%

No dependency changes