@sap/cds-compiler 2.15.6 → 2.15.10

package/CHANGELOG.md

@@ -7,6 +7,24 @@
 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.10 - 2023-01-26
+
+### Fixed
+
+- If an entity with parameters is auto-exposed, the generated projection now has
+  the same formal parameters and its query forwards these parameters to the origin entity.
+- to.edm(x): Respect record type hint `$Type` in EDM JSON as full qualified `@type` URI property.
+
+## 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/compiler/populate.js

@@ -1187,6 +1187,21 @@ function populate( model ) {
         $inferred: '$generated',
       },
     };
+    // forward target parameters to projection
+    if (target.params) {
+      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[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) {
       Object.assign( autoexposed, art );

package/lib/edm/annotations/genericTranslation.js

@@ -1144,28 +1144,30 @@ function csn2annotationEdm(csn, serviceName, Edm = undefined, options=undefined,
         // this type doesn't exist
         message(warning, context, `explicitly specified type '${ actualTypeName }' not found in vocabulary`);
         // explicitly mentioned type, render in XML and JSON
-        newRecord.setEdmAttribute('Type', actualTypeName);
-      }
-      else if (dTypeName && !isDerivedFrom(actualTypeName, dTypeName)) {
-        // this type doesn't fit the expected one
-        message(warning, context, `explicitly specified type '${ actualTypeName
-        }' is not derived from expected type '${ dTypeName }'`);
-        actualTypeName = dTypeName;
-        // explicitly mentioned type, render in XML and JSON
-        newRecord.setEdmAttribute('Type', actualTypeName);
-      }
-      else if (isAbstractType(actualTypeName)) {
-        // this type is abstract
-        message(warning, context, `explicitly specified type '${ actualTypeName }' is abstract, specify a concrete type`);
-        if(dTypeName)
-          actualTypeName = dTypeName;
-        // set to definition name and render in XML and JSON
-        newRecord.setEdmAttribute('Type', actualTypeName);
+        newRecord.setXml({ 'Type': actualTypeName});
+        // unknown dictionary type: can't fully qualify it
+        newRecord.setJSON({ 'Type': actualTypeName});
       }
       else {
-        // ok
+        if (isAbstractType(actualTypeName)) {
+          // this type is abstract
+          message(warning, context, `explicitly specified type '${ actualTypeName }' is abstract, specify a concrete type`);
+          if(dTypeName)
+            actualTypeName = dTypeName;
+        }
+        else if (dTypeName && !isDerivedFrom(actualTypeName, dTypeName)) {
+          // this type doesn't fit the expected one
+          message(warning, context, `explicitly specified type '${ actualTypeName
+          }' is not derived from expected type '${ dTypeName }'`);
+          actualTypeName = dTypeName;
+        }
         // Dictionary Type, render in XML only for backward compatibility
         newRecord.setXml( { Type: actualTypeName });
+        const vocName = actualTypeName.slice(0, actualTypeName.indexOf('.'));
+        const vocDef = vocabularyDefinitions[vocName];
+        // Set full qualified type in JSON
+        if(vocDef)
+          newRecord.setJSON( { 'Type': `${vocDef.ref.Uri}#${actualTypeName}` });
       }
     }
     else if (dTypeName) { // there is an expected type name according to dictionary
@@ -1323,7 +1325,11 @@ function csn2annotationEdm(csn, serviceName, Edm = undefined, options=undefined,
           const props = Object.create(null);
           Object.entries(obj).forEach(([k, val]) => {
             if(k === '@type') {
-              edmNode.setEdmAttribute('Type', val);
+              edmNode.setJSON({ 'Type': val});
+              // try to shorten full qualified type URI to short type name
+              const parts = val.split('#');
+              const shortTypeName = parts[parts.length-1];
+              edmNode.setXml({ Type: shortTypeName });
             }
             else {
               let child = undefined;

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/edm/edm.js

@@ -1351,8 +1351,8 @@ function getEdm(options, messageFunctions) {
   {
     toJSONattributes(json)
     {
-      if(this._edmAttributes.Type)
-        json['@type'] = this._edmAttributes.Type;
+      if(this._jsonOnlyAttributes.Type)
+        json['@type'] = this._jsonOnlyAttributes.Type;
       let keys = Object.keys(this._edmAttributes).filter(k => k !== 'Type');
       for(const key of keys)
         json['$'+key] = this._edmAttributes[key];

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.10",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",