@sap/cds-compiler 6.4.6 → 6.5.2

package/lib/transform/db/temporal.js

@@ -11,8 +11,8 @@ const validToString = '@cds.valid.to';
 const validFromString = '@cds.valid.from';
 /**
  * Get the forEachDefinition callback function that adds a where condition to views that
- * - are annotated with @cds.valid.from and @cds.valid.to,
- * - have only one @cds.valid.from and @cds.valid.to,
+ * - are annotated with `@cds.valid.from` and `@cds.valid.to`,
+ * - have only one `@cds.valid.from` and `@cds.valid.to`,
  * - and both annotations come from the same entity
  *
  * If the view has one of the annotations but the other conditions are not met, an error will be raised.
@@ -30,8 +30,8 @@ function getViewDecorator( csn, messageFunctions, csnUtils, options ) {
   return addTemporalWhereConditionToView;
   /**
    * Add a where condition to views that
-   * - are annotated with @cds.valid.from and @cds.valid.to,
-   * - have only one @cds.valid.from and @cds.valid.to,
+   * - are annotated with `@cds.valid.from` and `@cds.valid.to`,
+   * - have only one `@cds.valid.from` and `@cds.valid.to`,
    * - and both annotations come from the same entity
    *
    * If the view has one of the annotations but the other conditions are not met, an error will be raised.
@@ -97,10 +97,10 @@ function getViewDecorator( csn, messageFunctions, csnUtils, options ) {
   }
 
   /**
-   * Get all elements tagged with @cds.valid.from/to from the union of all entities of the from-clause.
+   * Get all elements tagged with `@cds.valid.from/to` from the union of all entities of the from-clause.
    *
-   * @param {any} combined union of all entities of the from-clause
-   * @returns {Array[]} Array where first field is array of elements with @cds.valid.from, second field is array of elements with @cds.valid.to.
+   * @param {CSN.QueryFrom} combined union of all entities of the from-clause
+   * @returns {Array[]} Array where first field is array of elements with `@cds.valid.from`, second field is array of elements with `@cds.valid.to`.
    */
   function getFromToElements( combined ) {
     const from = [];
@@ -121,7 +121,7 @@ function getViewDecorator( csn, messageFunctions, csnUtils, options ) {
   }
 
   /**
-   * Check if the given SELECT has a falsy @cds.valid.from and a falsy @cds.valid.to
+   * Check if the given SELECT has a falsy `@cds.valid.from` and a falsy `@cds.valid.to`
    *
    * @param {CSN.QuerySelect} SELECT
    * @param {CSN.Elements} elements
@@ -150,13 +150,13 @@ function getViewDecorator( csn, messageFunctions, csnUtils, options ) {
 }
 
 /**
- * Get the forEachDefinition callback function that collects all usages of @cds.valid.from/to/key and checks that
+ * Get the forEachDefinition callback function that collects all usages of `@cds.valid.from/to/key` and checks that
  * - the assignment is on a valid element
  * - the annotation is only assigned once
  * - key is only used in conjunction with from and to
  *
- * Furthermore, @cds.valid.from and @cds.valid.key is processed - @cds.valid.from is marked as key or marked as unique if @cds.valid.key is used.
- * If @cds.valid.key is used, the real key-elements have their key-property removed (set non-enumerable as $key) and instead the @cds.valid.key-marked elements have it added.
+ * Furthermore, `@cds.valid.from` and `@cds.valid.key` is processed - `@cds.valid.from` is marked as key or marked as unique if `@cds.valid.key` is used.
+ * If `@cds.valid.key` is used, the real key-elements have their key-property removed (set non-enumerable as $key) and instead the `@cds.valid.key`-marked elements have it added.
  *
  * @param {CSN.Model} csn
  * @param {CSN.Options} options

package/lib/transform/draft/db.js

@@ -188,6 +188,8 @@ function generateDrafts( csn, options, pathDelimiter, messageFunctions ) {
     // Copy all elements
     for (const elemName in artifact.elements) {
       const origElem = artifact.elements[elemName];
+      // elements with $calc are rendered as usual
+
       if (origElem.value?.stored) {
         calcOnWriteElements.push(elemName);
       }

package/lib/transform/draft/odata.js

@@ -27,11 +27,12 @@ const { makeMessageFunction } = require('../../base/messages');
  * @param {CSN.Options} options
  * @param {string[]|undefined} services Will be calculated JIT if not provided
  * @param {object} [messageFunctions]
+ * @param {function} [isExternalServiceMember]
  * @returns {CSN.Model} Returns the transformed input model
  * @todo should be done by the compiler - Check associations for valid foreign keys
  * @todo check if needed at all: Remove '$projection' from paths in the element's ON-condition
  */
-function generateDrafts( csn, options, services, messageFunctions ) {
+function generateDrafts( csn, options, services, messageFunctions, isExternalServiceMember ) {
   // TEMP(2024-02-26): Temporary! Umbrella uses this file directly in cds/lib/compile/for/drafts.js#L1
   messageFunctions ??= makeMessageFunction(csn, options, 'odata-drafts');
 
@@ -53,14 +54,11 @@ function generateDrafts( csn, options, services, messageFunctions ) {
     services = getServiceNames(csn);
 
   const visitedArtifacts = Object.create(null);
-  // @ts-ignore
-  const externalServices = services.filter(serviceName => csn.definitions[serviceName]['@cds.external']);
-  // @ts-ignore
-  const isExternalServiceMember = (_art, name) => externalServices.includes(getServiceName(name));
+
   const filterDict = Object.create(null);
 
   // validate the 'DRAFT.DraftAdministrativeData_DraftMessage' type if already present in the model
-  if (options.draftMessages) {
+  if (options.draftMessages && options.odataVersion === 'v4') {
     const draftAdminDataMessagesType = csn.definitions['DRAFT.DraftAdministrativeData_DraftMessage'];
     if (draftAdminDataMessagesType && !isValidDraftAdminDataMessagesType(draftAdminDataMessagesType)) {
       error(null, [ 'definitions', 'DRAFT.DraftAdministrativeData_DraftMessage' ], { name: 'DRAFT.DraftAdministrativeData_DraftMessage' },
@@ -181,7 +179,7 @@ function generateDrafts( csn, options, services, messageFunctions ) {
     // ... on SiblingEntity.IsActiveEntity != IsActiveEntity ...
     siblingEntity.SiblingEntity.on = createAssociationPathComparison('SiblingEntity', 'IsActiveEntity', '!=', 'IsActiveEntity');
 
-    if (options.draftMessages) {
+    if (options.draftMessages && options.odataVersion === 'v4') {
       const draftMessages = { DraftMessages: { '@Core.Computed': true, virtual: true, items: { type: 'DRAFT.DraftAdministrativeData_DraftMessage' } } };
       addElement(draftMessages, artifact, artifactName);
 

package/lib/transform/effective/flattening.js

@@ -62,13 +62,12 @@ function flattenRefs(csn, options, csnUtils, messageFunctions) {
 
     // explicit binding parameter of bound action
     if (def.actions) {
-      const special$self = !csn?.definitions?.$self && '$self';
       Object.entries(def.actions).forEach(([ an, a ]) => {
         if (a.params) {
           const params = Object.entries(a.params);
           const firstParam = params[0][1];
           const type = firstParam?.items?.type || firstParam?.type;
-          if (type === special$self) {
+          if (type === '$self') {
             const bindingParamName = params[0][0];
             const markBindingParam = {
               ref: (parent, prop, xpr) => {

package/lib/transform/forOdata.js

@@ -117,9 +117,9 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
   // use the array when there is a need to identify if an artifact is in a service or not
   const services = getServiceNames(csn);
   // @ts-ignore
-  const externalServices = services.filter(serviceName => csn.definitions[serviceName]['@cds.external']);
+  const externalServices = services.filter(serviceName => csn.definitions[serviceName]['@cds.external'] && csn.definitions[serviceName]['@cds.external'] !== 2);
   // @ts-ignore
-  const isExternalServiceMember = (art, name) => !!(externalServices.includes(getServiceName(name)) || (art && art['@cds.external']));
+  const isExternalServiceMember = (art, name) => !!(externalServices.includes(getServiceName(name)) || (art && art['@cds.external'] && art['@cds.external'] !== 2));
 
   if (options.csnFlavor === 'universal' && isBetaEnabled(options, 'enableUniversalCsn'))
     enrichUniversalCsn(csn, options);
@@ -127,7 +127,7 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
   // - Generate artificial draft fields on a structured CSN if requested, flattening and struct
   //   expansion do their magic including foreign key generation and annotation propagation.
   //   Tenantenizer has to decorate the DraftAdministrativeData, so draft decoration must be done before.
-  generateDrafts(csn, options, services, messageFunctions);
+  generateDrafts(csn, options, services, messageFunctions, isExternalServiceMember);
 
   if (options.tenantDiscriminator)
     addTenantFields(csn, options);

package/lib/transform/forRelationalDB.js

@@ -49,7 +49,7 @@ function forEachDefinition(csn, cb) {
  * such as flattening, wildcard expansion, etc.
  *
  * @param {CSN.Model}      csn
- * @param {CSN.SqlOptions} options
+ * @param {SqlOptions} options
  * @param {object}         messageFunctions Message functions such as `error()`, `info()`, …
  */
 function transformForRelationalDBWithCsn(csn, options, messageFunctions) {

package/lib/transform/odata/createForeignKeys.js

@@ -76,7 +76,6 @@ function createForeignKeyElements(csn, options, messageFunctions, csnUtils, iter
   }
 
   function createForeignKeysForElement(path, element, prefix, csn, options, pathDelimiter, lvl = 0, originalKey = {} ) {
-    const special$self = !csn?.definitions?.$self && '$self';
     const isInspectRefResult = !Array.isArray(path);
 
     let fks = [];
@@ -87,7 +86,7 @@ function createForeignKeyElements(csn, options, messageFunctions, csnUtils, iter
     let finalTypeName;
 
     // resolve derived type
-    if (element.type && !isBuiltinType(element.type) && element.type !== special$self) {
+    if (element.type && !isBuiltinType(element.type)) {
       const tmpElt = csnUtils.effectiveType(element);
       // effective type resolves to structs and enums only but not scalars
       if (Object.keys(tmpElt).length) {

package/lib/transform/odata/flattening.js

@@ -102,13 +102,12 @@ function allInOneFlattening(csn, refFlattener, adaptRefs, inspectRef, getFinalTy
       setProp(def, '$flatAnnotations', flatAnnos);
       // explicit binding parameter of bound action
       if (def.actions) {
-        const special$self = !csn?.definitions?.$self && '$self';
         Object.entries(def.actions).forEach(([ actionName, action ]) => {
           if (action.params) {
             const params = Object.entries(action.params);
             const firstParam = params[0][1];
             const type = firstParam?.items?.type || firstParam?.type;
-            if (type === special$self) {
+            if (type === '$self') {
               const bindingParamName = params[0][0];
               const markBindingParam = {
                 ref: (parent, prop, xpr) => {

package/lib/transform/odata/toFinalBaseType.js

@@ -13,7 +13,6 @@ const { cloneCsnDict, cloneCsnNonDict } = require('../../model/cloneCsn');
 
 function expandToFinalBaseType(csn, transformers, csnUtils, services, options, error) {
   const isV4 = options.odataVersion === 'v4';
-  const special$self = !csn?.definitions?.$self && '$self';
   forEachDefinition(csn, (def, defName) => {
     // Unravel derived type chains to final one for elements, actions, action parameters (propagating annotations)
     forEachMemberRecursively(def, (member, _memberName) => {
@@ -112,65 +111,63 @@ function expandToFinalBaseType(csn, transformers, csnUtils, services, options, e
       else {
         if (isExpandable(finalBaseType) || node.kind === 'type') {
           // 1. Get the final type of the node (resolve derived type chain)
-          if (finalBaseType.type !== special$self) {
-            // The type replacement depends on whether 'node' is a definition or a member[element].
-            if (node.kind) {
-              /*
-                It is a definition and we expand to builtin type and to elements
-                type T: S; --> Integer;
-                type S: X; --> Integer;
-                type X: Integer;
+          // The type replacement depends on whether 'node' is a definition or a member[element].
+          if (node.kind) {
+            /*
+              It is a definition and we expand to builtin type and to elements
+              type T: S; --> Integer;
+              type S: X; --> Integer;
+              type X: Integer;
 
-                type A: B; -> {...}
-                type B: C; -> { ... }
-                type C { .... };
+              type A: B; -> {...}
+              type B: C; -> { ... }
+              type C { .... };
+            */
+            if (isBuiltinType(finalBaseType.type)) {
+              /*
+                use transformUtils::toFinalBaseType for the moment,
+                as it is collects along the chain of types
+                attributes that need to be propagated
+                enum, length, scale, etc.
               */
-              if (isBuiltinType(finalBaseType.type)) {
-                /*
-                  use transformUtils::toFinalBaseType for the moment,
-                  as it is collects along the chain of types
-                  attributes that need to be propagated
-                  enum, length, scale, etc.
-                */
-                transformers.toFinalBaseType(node);
-              }
-              else if (csnUtils.isStructured(finalBaseType)) {
-                cloneElements(node, finalBaseType);
-              }
-              else if (node.type && node.items) {
-                delete node.type;
-              }
+              transformers.toFinalBaseType(node);
             }
-            else {
-              /*
-                this is a member and we expand to final base only if builtin
-                  type T: S; --> Integer;
-                  type S: X; --> Integer;
-                  type X: Integer;
+            else if (csnUtils.isStructured(finalBaseType)) {
+              cloneElements(node, finalBaseType);
+            }
+            else if (node.type && node.items) {
+              delete node.type;
+            }
+          }
+          else {
+            /*
+              this is a member and we expand to final base only if builtin
+              type T: S; --> Integer;
+              type S: X; --> Integer;
+              type X: Integer;
 
-                  type {
-                    struct_elt: many A; ---> stays the same
-                    scalar_elt: T; ---> Integer;
-                    type_ref_elt: type of struct_elt;
-                  };
-                  type A: B; -> {...}
-                  type B: C; -> { ... }
-                  type C { .... };
+              type {
+              struct_elt: many A; ---> stays the same
+              scalar_elt: T; ---> Integer;
+              type_ref_elt: type of struct_elt;
+              };
+              type A: B; -> {...}
+              type B: C; -> { ... }
+              type C { .... };
+            */
+            // eslint-disable-next-line no-lonely-if
+            if (isBuiltinType(finalBaseType.type)) {
+              /*
+                use transformUtils::toFinalBaseType for the moment,
+                as it is collects along the chain of types
+                attributes that need to be propagated
+                enum, length, scale, etc.
               */
-              // eslint-disable-next-line no-lonely-if
-              if (isBuiltinType(finalBaseType.type)) {
-                /*
-                  use transformUtils::toFinalBaseType for the moment,
-                  as it is collects along the chain of types
-                  attributes that need to be propagated
-                  enum, length, scale, etc.
-                */
-                transformers.toFinalBaseType(node);
-                // node.type = finalType;
-              }
-              else if (node.type.ref) {
-                cloneElements(node, finalBaseType);
-              }
+              transformers.toFinalBaseType(node);
+              // node.type = finalType;
+            }
+            else if (node.type.ref) {
+              cloneElements(node, finalBaseType);
             }
           }
         }

package/lib/transform/transformUtils.js

@@ -397,7 +397,7 @@ function getTransformers(model, options, msgFunctions, pathDelimiter = '_') {
     if (!draftAdminDataEntity) {
       draftAdminDataEntity = createAndAddDraftAdminDataEntity();
       model.definitions['DRAFT.DraftAdministrativeData'] = draftAdminDataEntity;
-      if (options.draftMessages && options.transformation === 'odata' &&
+      if (options.draftMessages && options.transformation === 'odata' && options.odataVersion === 'v4' &&
           !model.definitions['DRAFT.DraftAdministrativeData_DraftMessage'])
         model.definitions['DRAFT.DraftAdministrativeData_DraftMessage'] = createDraftAdminDataMessagesType();
 
@@ -493,7 +493,7 @@ function getTransformers(model, options, msgFunctions, pathDelimiter = '_') {
       draftIsProcessedByMe.DraftIsProcessedByMe['@Common.Label'] = '{i18n>Draft_DraftIsProcessedByMe}';
       addElement(draftIsProcessedByMe, artifact, artifactName);
 
-      if (options.transformation !== 'odata' || options.draftMessages) {
+      if (options.transformation !== 'odata' || (options.draftMessages && options.odataVersion === 'v4')) {
         const messages = { DraftMessages: { } };
         if (options.transformation === 'odata')
           messages.DraftMessages = { items: { type: 'DRAFT.DraftAdministrativeData_DraftMessage' } };
@@ -888,12 +888,11 @@ function getTransformers(model, options, msgFunctions, pathDelimiter = '_') {
  * @param {CSN.Model} csn
  */
 function rewriteBuiltinTypeRef(csn) {
-  const special$self = !csn?.definitions?.$self && '$self';
   applyTransformations(csn, {
     type: (parent, _prop, type) => {
       if (type?.ref && (
         isBuiltinType(type.ref[0]) ||
-        type.ref[0] === special$self)
+        type.ref[0] === '$self')
       )
         parent.type = type.ref[0];
     },

package/package.json

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