@sap/cds-compiler 2.15.6 → 2.15.8

package/CHANGELOG.md

@@ -7,6 +7,16 @@
 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 2.15.8 - 2022-08-02
+
+### Fixed
+
+- to.edm(x): Nested `@UI.TextArrangement` has precedence over `@TextArrangement` shortcut annotation for `@Common.Text`.
+- to.hdi.migration:
+  + Respect option `disableHanaComments` when rendering the `ALTER` statements
+  + Doc comments rendered the _full doc comment_ instead of only the first paragraph, as `to.hdi` does.
+- compiler: An association's cardinality was lost for associations published in projections.
+
 ## Version 2.15.6 - 2022-07-26
 
 ### Fixed

package/lib/edm/annotations/preprocessAnnotations.js

@@ -297,8 +297,12 @@ function preprocessAnnotations(csn, serviceName, options) {
 
           //change the scalar anno into a "pseudo-structured" one
           // 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['@Common.Text.@UI.TextArrangement'] && textAnno) {
+            carrier['@Common.Text'] = { '$value': textAnno, '@UI.TextArrangement': value };
+          }
           delete carrier[aName];
         }
       }

package/lib/json/from-csn.js

@@ -102,6 +102,7 @@ const ourpropsRegex = /^[_$]?[a-zA-Z]+[0-9]*$/;
 const typeProperties = [
   // do not include CSN v0.1.0 properties here:
   'target', 'elements', 'enum', 'items',
+  'cardinality', // for association publishing in views
   'type', 'length', 'precision', 'scale', 'srid', 'localized', 'notNull',
   'keys', 'on',                 // only with 'target'
 ];

package/lib/json/to-csn.js

@@ -184,9 +184,11 @@ const propertyOrder = (function orderPositions() {
 }());
 
 // 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
 ];
 

package/lib/render/toSql.js

@@ -200,7 +200,7 @@ function toSqlDdl(csn, options) {
       Render comment string.
      */
     comment(comment) {
-      return comment && renderStringForSql(comment, options.sqlDialect) || 'NULL';
+      return comment && renderStringForSql(getHanaComment({ doc: comment }), options.sqlDialect) || 'NULL';
     },
     /*
       Alter SQL snippet for entity.
@@ -461,7 +461,7 @@ function toSqlDdl(csn, options) {
     // Change entity properties
     if (migration.properties) {
       for (const [ prop, def ] of Object.entries(migration.properties)) {
-        if (prop === 'doc') {
+        if (prop === 'doc' && !options.disableHanaComments) { // def.new may be `null`
           const alterComment = render.alterEntityComment(tableName, def.new);
           addMigration(resultObj, artifactName, false, alterComment);
         }
@@ -527,7 +527,7 @@ function toSqlDdl(csn, options) {
           }
         }
 
-        if (def.old.doc !== def.new.doc) {
+        if (!options.disableHanaComments && def.old.doc !== def.new.doc) {
           const eltStrOldNoDoc = getEltStrNoProps(def.old, eltName, 'doc');
           const eltStrNewNoDoc = getEltStrNoProps(def.new, eltName, 'doc');
           if (eltStrOldNoDoc === eltStrNewNoDoc) { // only `doc` changed

package/package.json

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