@sap/cds-compiler 4.9.4 → 4.9.8

package/CHANGELOG.md

@@ -7,6 +7,22 @@
 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
+
+- for.seal: Don't generate DRAFT artifacts.
+- for.odata: Propagate all `@odata { Type, MaxLength, Precision, Scale, SRID }` to generated foreign keys.
+- to.edm(x): Respect `AppliesTo` specification in term definitions for actions and functions.
+- to.sql: Conditions inside filters in combination with foreign key aliases were not properly translated in rare cases.
+
 ## Version 4.9.4 - 2024-05-21
 
 ### 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/annotations/genericTranslation.js

@@ -261,6 +261,7 @@ function csn2annotationEdm( reqDefs, reqDefsUtils, csnVocabularies, serviceName,
     const entityName = nameParts.pop();
 
     Object.entries(cObject.actions).forEach(([ n, action ]) => {
+      setProp(action, '$isBound', true);
       const actionName = `${serviceName}.${isV2() ? `${entityName}_` : ''}${n}`;
       handleAction(actionName, action, cObjectname, [ ...location, 'actions', n ]);
     });
@@ -516,13 +517,14 @@ function csn2annotationEdm( reqDefs, reqDefsUtils, csnVocabularies, serviceName,
       if (carrier.kind === 'entity') {
       // If AppliesTo=[EntitySet/Singleton/Collection, EntityType], EntitySet/Singleton/Collection has precedence
         testToAlternativeEdmTargetP = ((x) => {
-          if (options.isV2())
-            return [ 'Singleton', 'EntitySet', 'Collection' ].some(y => x.includes(y));
-
-
-          return edmUtils.isSingleton(carrier)
-            ? x.includes('Singleton')
-            : [ 'EntitySet', 'Collection' ].some(y => x.includes(y));
+          if (x) {
+            if (options.isV2())
+              return [ 'Singleton', 'EntitySet', 'Collection' ].some(y => x.includes(y));
+            return edmUtils.isSingleton(carrier)
+              ? x.includes('Singleton')
+              : [ 'EntitySet', 'Collection' ].some(y => x.includes(y));
+          }
+          return true;
         });
         testToStandardEdmTargetP = (x => (x ? x.includes('EntityType') : true));
         // if carrier has an alternate 'entitySetName' use this instead of EdmTargetName
@@ -540,6 +542,23 @@ function csn2annotationEdm( reqDefs, reqDefsUtils, csnVocabularies, serviceName,
       else if (carrier.kind === 'type') {
         testToStandardEdmTargetP = (x => (x ? x.includes(carrier.elements ? 'ComplexType' : 'TypeDefinition') : true));
       }
+      else if (carrier.kind === 'action' || carrier.kind === 'function') {
+        const type = carrier.kind === 'action' ? 'Action' : 'Function';
+        const container = carrier.kind === 'action' ? 'ActionImport' : 'FunctionImport';
+        if (options.isV4()) {
+          testToStandardEdmTargetP = (x => (x ? x.includes(type) : true));
+          // Unbound actions/functions are Action/FunctionImports and are bound to container target
+          testToAlternativeEdmTargetP = (x => (x ? x.includes(container) && !carrier.$isBound : true));
+          const lastDotIndex = carrier.name.lastIndexOf('.');
+          alternativeEdmTargetNameP = lastDotIndex > -1
+            ? `${serviceName}.EntityContainer/${carrier.name.substring(lastDotIndex + 1)}`
+            : `${serviceName}.EntityContainer/${carrier.name}`;
+          hasAlternativeCarrierP = true;
+        }
+        if (options.isV2())
+          // same as in V4 but everything goes to standard target
+          testToStandardEdmTargetP = (x => (x ? x.includes(type) || (x.includes(container) && !carrier.$isBound) : true));
+      }
       else if (carrier.kind === 'service') {
       // if annotated object is a service, annotation goes to EntityContainer,
       //   except if AppliesTo contains Schema but not EntityContainer, then annotation goes to Schema

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/lib/transform/db/flattening.js

@@ -16,6 +16,7 @@ const { setProp, isBetaEnabled } = require('../../base/model');
 const { forEach } = require('../../utils/objectUtils');
 const { transformExpression } = require('./applyTransformations');
 const { cloneCsnNonDict } = require('../../model/cloneCsn');
+const { EdmTypeFacetNames } = require('../../edm/EdmPrimitiveTypeDefinitions');
 
 /**
  * Strip off leading $self from refs where applicable.
@@ -828,11 +829,11 @@ function createForeignKeys( csnUtils, path, element, prefix, csn, options, pathD
   else if (finalElement.type == null || isBuiltinType(finalElement.type)) {
     const newFk = Object.create(null);
     setProp(newFk, '$extensionPath', extensionPath);
-    for (const prop of [ 'type', 'length', 'scale', 'precision', 'srid', 'default', '@odata.Type' ]) {
+    [ 'type', 'length', 'scale', 'precision', 'srid', 'default', '@odata.Type', ...EdmTypeFacetNames.map(f => `@odata.${f}`) ].forEach((prop) => {
       // copy props from original element to preserve derived types!
       if (element[prop] !== undefined)
         newFk[prop] = element[prop];
-    }
+    });
     return [ [ prefix, newFk ] ];
   }
 

package/lib/transform/effective/main.js

@@ -11,7 +11,6 @@ const validate = require('../../checks/validator');
 const expansion = require('../db/expansion');
 const queries = require('./queries');
 const associations = require('./associations');
-const generateDrafts = require('../draft/db');
 const handleExists = require('../db/transformExists');
 const misc = require('./misc');
 const annotations = require('./annotations');
@@ -77,7 +76,6 @@ function effectiveCsn( model, options, messageFunctions ) {
   processCalculatedElementsInEntities(csn);
   associations.managedToUnmanaged(csn, options, csnUtils, messageFunctions);
   associations.transformBacklinks(csn, options, csnUtils, messageFunctions);
-  generateDrafts(csn, options, '_', messageFunctions);
   const transformers = mergeTransformers([ misc.attachPersistenceName(csn, options, csnUtils), options.remapOdataAnnotations ? annotations.remapODataAnnotations(csn) : {}, misc.removeDefinitionsAndProperties(csn, options) ], null);
   applyTransformations(csn, transformers, [], { skipIgnore: false });
 

package/lib/transform/translateAssocsToJoins.js

@@ -1110,8 +1110,27 @@ function translateAssocsToJoins(model, inputOptions = {})
             }
             else {
               const [ tableAlias, path ] = getTableAliasAndPathSteps(pathNode);
-              const pathStr = path.map(ps => ps.id).join(pathDelimiter);
-              replaceNodeContent(pathNode, constructPathNode([ tableAlias, { id: pathStr, _artifact: pathNode._artifact } ]));
+              const rewrittenPath = [];
+              const leafArtifact = path.at(-1)._artifact;
+              // Walk from left to right and search for first assoc. If assocs in filters become join relevant in the future,
+              // i.e. not only fk-access, we need to revisit this
+              for(let i = 0; i < path.length; i++) {
+                const pathStep = path[i];
+                if(pathStep._artifact?.foreignKeys) {
+                  const possibleNonAliasedFkName = path.slice(i).map(ps => ps.id).join(pathDelimiter);
+                  if(!pathStep._artifact.$flatSrcFKs)
+                      setProp(pathStep._artifact, '$flatSrcFKs', flattenElement(pathStep._artifact, true, pathStep._artifact.name.id, pathStep._artifact.name.id));
+                  const fk = pathStep._artifact.$flatSrcFKs.find(f => f._artifact === leafArtifact && f.acc.startsWith(possibleNonAliasedFkName));
+                  if(fk) {
+                    rewrittenPath.push(fk);
+                    i = path.length;
+                    continue;
+                  }
+                }
+
+                rewrittenPath.push(pathStep);
+              }
+              replaceNodeContent(pathNode, constructPathNode([ tableAlias, { id: rewrittenPath.map(ps => ps.id).join(pathDelimiter), _artifact: pathNode._artifact } ]));
             }
           }
         } ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "4.9.4",
+  "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",