@sap/cds-compiler 4.9.6 → 4.9.8

package/CHANGELOG.md

@@ -7,6 +7,13 @@
 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 4.9.8 - 2024-07-29
+
+### Fixed
+
+- compiler: Fix extensions with bound actions using an explicit binding parameter in `parseCdl` CSN.
+- to.edm(x): No `Nullable` attribute for `$ReturnType` of `Collection(<entity type>)` [OData V4 CSDL, section 12.8 Return Type](https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html#sec_ReturnType)
+
 ## Version 4.9.6 - 2024-07-15
 
 ### Fixed

package/lib/compiler/define.js

@@ -1203,7 +1203,9 @@ function define( model ) {
     const type = first?.type || first?.items?.type; // this sequence = no derived type
     const path = type?.path;
     if (path?.length === 1 && path[0]?.id === '$self') { // TODO: no where: ?
-      const { $self } = main.$tableAliases;
+      const $self = main.$tableAliases?.$self ||
+                    main.kind === 'extend' && { name: { id: '$self' } };
+      // remark: an extend has no "table alias" `$self` (relevant for parse-cdl)
       setLink( type, '_artifact', $self );
       setLink( path[0], '_artifact', $self );
     }

package/lib/edm/edm.js

@@ -882,12 +882,20 @@ function getEdm( options, messageFunctions ) {
   class ReturnType extends PropertyBase {
     constructor(version, csn) {
       super(version, {}, csn);
+      // CSDL 12.8: If the return type is a collection of entity types,
+      // the Nullable attribute has no meaning and MUST NOT be specified.
+      if (csn.$NoNullableProperty)
+        delete this._edmAttributes.Nullable;
     }
 
     // we need Name but NO $kind, can't use standard to JSON()
     toJSON() {
       const json = Object.create(null);
       this.toJSONattributes(json);
+      // CSDL 12.8: If the return type is a collection of entity types,
+      // the Nullable attribute has no meaning and MUST NOT be specified.
+      if (this._csn.$NoNullableProperty)
+        delete json.$Nullable;
       return json;
     }
   }

package/lib/edm/edmPreprocessor.js

@@ -1892,7 +1892,7 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
     mapCdsToEdmProp(def);
     annotateAllowedValues(def, defLocation);
     if (def.returns) {
-      markCollection(def.returns);
+      markCollection(def.returns, true);
       mapCdsToEdmProp(def.returns);
       annotateAllowedValues(def.returns, [ ...defLocation, 'returns' ]);
     }
@@ -1905,16 +1905,20 @@ function initializeModel( csn, _options, messageFunctions, requestedServiceNames
       rewriteAnnotationExpressions(member);
       if (member.returns) {
         edmUtils.assignAnnotation(member.returns, '@Core.Description', member.returns.doc);
-        markCollection(member.returns);
+        markCollection(member.returns, true);
         mapCdsToEdmProp(member.returns);
         annotateAllowedValues(member.returns, [ ...location, 'returns' ]);
         rewriteAnnotationExpressions(member.returns);
       }
     }, defLocation);
     // mark members that need to be rendered as collections
-    function markCollection( obj ) {
+    function markCollection( obj, isReturns ) {
       const items = obj.items || csn.definitions[obj.type] && csn.definitions[obj.type].items;
       if (items) {
+        edmUtils.assignProp(obj, '$NoNullableProperty',
+                            isReturns && items.type &&
+                            !isBuiltinType(items.type) &&
+                            csn.definitions[items.type]?.kind === 'entity');
         edmUtils.assignProp(obj, '_NotNullCollection', items.notNull !== undefined ? items.notNull : true);
         edmUtils.assignProp(obj, '$isCollection', true);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "4.9.6",
+  "version": "4.9.8",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",
@@ -28,7 +28,7 @@
     "gentest3": "cross-env MAKEREFS=${MAKEREFS:-'true'} mocha --reporter-option maxDiffSize=0 test3/testRefFiles.js",
     "coverage": "cross-env nyc mocha --reporter-option maxDiffSize=0 test/ test3/testRefFiles.js && nyc report --reporter=lcov",
     "coverage:piper": "cross-env nyc mocha --reporter test/TestMochaReporter.js --reporter-options mochaFile=./coverage/TEST-results.xml --reporter-option maxDiffSize=0 --timeout 10000 test/ test3/ && nyc report --reporter=cobertura && nyc report --reporter=lcov",
-    "lint": "eslint bin/ benchmark/ lib/ test/ test3/ scripts/ types/ && node scripts/linter/lintGrammar.js && node scripts/linter/lintTests.js test3/ && node scripts/linter/lintMessages.js && node scripts/linter/lintMessageIdCoverage.js lib/ && markdownlint README.md CHANGELOG.md doc/ internalDoc/ && cd share/messages && markdownlint . && cd ../../ && node scripts/check-changelog.js",
+    "lint": "eslint bin/ benchmark/ lib/ test/ test3/ scripts/ && node scripts/linter/lintGrammar.js && node scripts/linter/lintTests.js test3/ && node scripts/linter/lintMessages.js && node scripts/linter/lintMessageIdCoverage.js lib/ && markdownlint README.md CHANGELOG.md doc/ internalDoc/ && cd share/messages && markdownlint . && cd ../../ && node scripts/check-changelog.js",
     "tslint": "tsc --pretty -p .",
     "updateVocs": "node scripts/odataAnnotations/generateDictMain.js && npm run generateAllRefs",
     "updateTocs": "node scripts/update-toc.js",