@sap/cds-compiler 3.8.2 → 3.9.2

package/lib/transform/forRelationalDB.js

@@ -244,7 +244,7 @@ function transformForRelationalDBWithCsn(inputModel, options, moduleName) {
     }
   });
 
-  processCalculatedElementsInEntities(csn, options);
+  processCalculatedElementsInEntities(csn);
 
   timetrace.start('Transform CSN')
 
@@ -272,7 +272,7 @@ function transformForRelationalDBWithCsn(inputModel, options, moduleName) {
   ]);
 
   // eliminate the doA2J in the functions 'handleManagedAssociationFKs' and 'createForeignKeyElements'
-  doA2J && flattening.handleManagedAssociationsAndCreateForeignKeys(csn, options, error, pathDelimiter, true, csnUtils, { skipDict: { actions: true }, allowArtifact: artifact => (artifact.kind === 'entity') });
+  doA2J && flattening.handleManagedAssociationsAndCreateForeignKeys(csn, options, error, warning, pathDelimiter, true, csnUtils, { skipDict: { actions: true }, allowArtifact: artifact => (artifact.kind === 'entity') });
 
   doA2J && forEachDefinition(csn, flattenIndexes);
   // Managed associations get an on-condition - in views and entities
@@ -613,7 +613,7 @@ function transformForRelationalDBWithCsn(inputModel, options, moduleName) {
     function doit(dict, subPath) {
       for (const elemName in dict) {
         const elem = dict[elemName];
-        if (isAssocOrComposition(elem.type) && elem.on)
+        if (elem.on && isAssocOrComposition(elem))
           processBacklinkAssoc(elem, elemName, artifact, artifactName, subPath.concat([ elemName, 'on' ]));
       }
     }
@@ -636,16 +636,16 @@ function transformForRelationalDBWithCsn(inputModel, options, moduleName) {
       // For HANA: Report an error on
       // - view with parameters that has an element of type association/composition
       // - association that points to entity with parameters
-      if (options.sqlDialect === 'hana' && member.target && isAssocOrComposition(member.type) && !isBetaEnabled(options, 'assocsWithParams')) {
+      if (options.sqlDialect === 'hana' && member.target && isAssocOrComposition(member) && !isBetaEnabled(options, 'assocsWithParams')) {
         if (artifact.params) {
           // HANA does not allow 'WITH ASSOCIATIONS' on something with parameters:
           // SAP DBTech JDBC: [7]: feature not supported: parameterized sql view cannot support association: line 1 col 1 (at pos 0)
-          message('def-unexpected-paramview-assoc', path, { '#': 'view' });
+          message('def-unexpected-paramview-assoc', path, { '#': 'source' });
         }
         else if(artifact['@cds.persistence.udf'] || artifact['@cds.persistence.calcview']) {
           // UDF/CVs w/o params don't support 'WITH ASSOCIATIONS'
           const anno = artifact['@cds.persistence.udf'] ? '@cds.persistence.udf' : '@cds.persistence.calcview';
-          message('def-unexpected-calcview-assoc', path, { '#': 'entity-persistence', anno });
+          message('def-unexpected-calcview-assoc', path, { '#': 'source', anno });
         }
         if (csn.definitions[member.target].params) {
           // HANA does not allow association targets with parameters or to UDFs/CVs w/o parameters:
@@ -660,7 +660,7 @@ function transformForRelationalDBWithCsn(inputModel, options, moduleName) {
           // CREATE TABLE Y (  id INTEGER NOT NULL,  toUDF_id INTEGER) WITH ASSOCIATIONS (MANY TO ONE JOIN UDF AS toUDF ON (toUDF.id = toUDF_id));
           // CREATE VIEW U AS SELECT  id, toUDF.a FROM Y;
           const anno = csn.definitions[member.target]['@cds.persistence.udf'] ? '@cds.persistence.udf' : '@cds.persistence.calcview';
-          message('def-unexpected-calcview-assoc', path, { '#': 'target-persistence', anno });
+          message('def-unexpected-calcview-assoc', path, { '#': 'target', anno });
         }
       }
     }, [ 'definitions', artifactName ]);

package/lib/transform/odata/toFinalBaseType.js

@@ -27,7 +27,7 @@ function expandToFinalBaseType(csn, transformers, csnUtils, services, options, i
     /*
       If the definition('def' variable) is a type definition and the assigned type of this very same definition('def' variable)
       is structured type, e.g.:
-      
+
       type Struct1 {
         a : Integer;
         b : Integer;
@@ -48,7 +48,7 @@ function expandToFinalBaseType(csn, transformers, csnUtils, services, options, i
           "a": { "type": "cds.Integer" },
           "b": { "type": "cds.Integer" }
         } } ...
-      
+
       "S.Struct2" should looks just like "S.Struct1" => the "type": "S.Struct1" property has to be removed
     */
     if (def.kind === 'type' && def.type && !isBuiltinType(def.type) && !def.type.ref) {
@@ -83,7 +83,7 @@ function expandToFinalBaseType(csn, transformers, csnUtils, services, options, i
   // type Foo: array of { qux: Integer };
   function expandFirstLevelOfArrayed(def) {
     if (def.items.type && !isBuiltinType(def.items.type)) {
-      let finalBaseType = csnUtils.getFinalBaseTypeWithProps(def.items.type);
+      let finalBaseType = csnUtils.getFinalTypeInfo(def.items.type);
       if (finalBaseType?.elements) {
         def.items.elements = cloneCsnDictionary(finalBaseType.elements, options);
         delete def.items.type;
@@ -102,7 +102,7 @@ function expandToFinalBaseType(csn, transformers, csnUtils, services, options, i
     if (node.kind === 'event') return;
 
     if(node.type && !isBuiltinType(node.type)) {
-      const finalBaseType = csnUtils.getFinalBaseTypeWithProps(node.type);
+      const finalBaseType = csnUtils.getFinalTypeInfo(node.type);
       if(!finalBaseType) {
         /*
           type could not be resolved, set it to null
@@ -179,8 +179,8 @@ function expandToFinalBaseType(csn, transformers, csnUtils, services, options, i
           // handle array of defined via a named type
           // example in actions: 'action act() return Primitive; type Primitive: array of String;'
           const currService = csnUtils.getServiceName(defName);
-          const isArrayOfBuiltin = finalBaseType.items && 
-            isBuiltinType(csnUtils.getFinalBaseTypeWithProps(finalBaseType.items.type)?.type)
+          const isArrayOfBuiltin = finalBaseType.items &&
+            isBuiltinType(csnUtils.getFinalTypeInfo(finalBaseType.items.type)?.type)
           if (isArrayOfBuiltin && (!isArtifactInService(node.type, currService) || !isV4)) {
             node.items = finalBaseType.items;
             delete node.type;

package/lib/transform/odata/typesExposure.js

@@ -162,7 +162,7 @@ function typesExposure(csn, whatsMyServiceName, requestedServiceNames, fallBackS
           isKey = false;
         // in case this was a named type and if the openess does not match the type definition
         // expose the type as a new one not changing the original definition.
-        if(elements && (!!node['@open'] !== !!typeDef['@open']) && isBetaEnabled(options, 'odataOpenType'))
+        if(elements && !!node['@open'] !== !!typeDef['@open'])
           fullQualifiedNewTypeName += node['@open'] ? '_open' : '_closed';
       }
       // check if that type is already defined
@@ -381,8 +381,17 @@ function typesExposure(csn, whatsMyServiceName, requestedServiceNames, fallBackS
       Object.entries(elements).forEach(([elemName, element]) => {
         let cloned = cloneCsnNonDict(element, options);
         // if this was an anonymous sub element of a key, mark it as not nullable
-        if(isAnonymous && isKey && !cloned.key && cloned.notNull === undefined)
-          cloned.notNull = true;
+        if(isAnonymous && isKey && !cloned.key) {
+          if(cloned.target) {
+            if(cloned.cardinality === undefined)
+              cloned.cardinality = {};
+            cloned.cardinality.min = 1;
+          }
+          // if odata-spec-violation-key-null is checking on min>1, this can
+          // be an else if
+          if(cloned.notNull === undefined)
+            cloned.notNull = true;
+        }
         type.elements[elemName] = cloned;
       });
       return type;

package/lib/transform/odata/utils.js

@@ -13,6 +13,9 @@ function defNameWithoutServiceOrContextName(name, srvOrCtx) {
  * By the given name of an artifact 'artName 'and an array 'services'
  * containing all the service names part of the model, return the service
  * name where the given artifact resides
+ *
+ * @todo: This function does not take nested services into account => longest match
+ *
  * @param {string} artName
  * @param {string[]} services
  */

package/lib/transform/transformUtilsNew.js

@@ -4,7 +4,7 @@
 // different backends.
 // The sibling of model/transform/TransformUtil.js which works with compacted new CSN.
 
-const { hasErrors, makeMessageFunction } = require('../base/messages');
+const { makeMessageFunction } = require('../base/messages');
 const { setProp } = require('../base/model');
 
 const { copyAnnotations, applyTransformations } = require('../model/csnUtils');
@@ -25,7 +25,7 @@ function getTransformers(model, options, pathDelimiter = '_') {
   const csnUtils = getUtils(model);
   const {
     getCsnDef,
-    getFinalBaseTypeWithProps,
+    getFinalTypeInfo,
     hasAnnotationValue,
     inspectRef,
     isStructured,
@@ -142,12 +142,6 @@ function getTransformers(model, options, pathDelimiter = '_') {
     // FIXME: Duplicate code
     // Assemble foreign key element name from assoc name, '_' and foreign key name/alias
     const foreignKeyElementName = `${assocName.replace(/\./g, pathDelimiter)}${pathDelimiter}${foreignKey.as || foreignKey.ref.join(pathDelimiter)}`;
-
-
-    // In case of compiler errors the foreign key might be missing
-    if (!fkArtifact && hasErrors(options.messages)) {
-      return null;
-    }
     return [ foreignKeyElementName, createRealFK(fkArtifact, assoc, assocName, foreignKey, path, foreignKeyElementName) ];
   }
 
@@ -168,21 +162,11 @@ function getTransformers(model, options, pathDelimiter = '_') {
 
 
     let fkArtifact = inspectRef(path).art;
-
-    // In case of compiler errors the foreign key might be missing
-    if (!fkArtifact && hasErrors(options.messages)) {
-      return null;
-    }
-
-    newForeignKey(fkArtifact,foreignKeyElementName);
+    newForeignKey(fkArtifact, foreignKeyElementName);
 
     function processAssociationOrComposition(fkArtifact,foreignKeyElementName) {
       fkArtifact.keys.forEach(iKey => {
-        let iKeyArtifact = inspectRef(iKey.$path).art;
-
-        if (!iKeyArtifact && hasErrors(options.messages)) {
-          return;
-        }
+        const iKeyArtifact = inspectRef(iKey.$path).art;
         if(iKey.ref.length>1)
           throw new CompilerAssertion(`createForeignKeyElement(${artifactName},${assocName},${iKey.$path.join('/')}) unexpected reference: `+ iKey.ref)
         newForeignKey(iKeyArtifact,foreignKeyElementName+'_'+iKey.ref[0])
@@ -242,7 +226,7 @@ function getTransformers(model, options, pathDelimiter = '_') {
     // for type of 'x' -> elem.type is an object, not a string -> use directly
     let elemType;
     if (!elem.elements) // structures do not have final base type
-      elemType = getFinalBaseTypeWithProps(elem.type);
+      elemType = getFinalTypeInfo(elem.type);
 
     const struct = elemType ? elemType.elements : elem.elements;
 
@@ -419,11 +403,12 @@ function getTransformers(model, options, pathDelimiter = '_') {
       typeRef = resolved.get(type)?.art
       // The cached entry may not be resolved, yet.
       if (typeRef.type && !isBuiltinType(typeRef.type))
-        typeRef = getFinalBaseTypeWithProps(typeRef.type);
+        typeRef = getFinalTypeInfo(typeRef.type);
     } else {
-      typeRef = getFinalBaseTypeWithProps(type);
+      typeRef = getFinalTypeInfo(type);
     }
-
+    if(!typeRef)
+      return;
     if (typeRef.elements || typeRef.items) {
       // Copy elements/items and we're finished. No need to look up actual base type,
       // since it must also be structured and must contain at least as many elements,
@@ -1188,9 +1173,9 @@ function getTransformers(model, options, pathDelimiter = '_') {
                     '$(PREFIX): Sub path $(NAME) not found in $(ALIAS)');
                 }
                 else {
-                  error(null, location, 
+                  error(null, location,
                     {
-                      prefix: prefix(lhs, op, rhs), 
+                      prefix: prefix(lhs, op, rhs),
                       name: (x.lhs ? lhs : rhs).ref.join('.'),
                       alias: (x.lhs ? rhs : lhs).ref.join('.')
                     },

package/lib/transform/translateAssocsToJoins.js

@@ -1303,8 +1303,8 @@ function translateAssocsToJoins(model, inputOptions = {})
       path = tail;
     }
     // assocStack eventually undefined => head is not Assoc
-    // assoc prefix can be something strucutred or just the id, the core
-    // compiler decides if it want's to add 'element' or only 'id' to the XSN
+    // assoc prefix can be something structured or just the id, the core
+    // compiler decides if it wants to add 'element' or only 'id' to the XSN
     // we need to unambiguously identify the target side with the full assoc prefix.
     // If the path is on the target side, strip the prefix of and treat src/tgt
     // paths uniformly.
@@ -1313,19 +1313,19 @@ function translateAssocsToJoins(model, inputOptions = {})
     path.forEach((ps) => {
       /* checks for all path steps */
       if(ps.args) {
-        error(null, pathDict.location,
+        error(null, [pathDict.location, lead],
           { name: lead.name.absolute, id: ps.id },
           '$(NAME): $(ID) must not have parameters');
         pathDict.$check = false;
       }
       if(ps.where) {
-        error(null, pathDict.location,
+        error(null, [pathDict.location, lead],
           { name: lead.name.absolute, id: ps.id },
           '$(NAME): $(ID) must not have a filter');
         pathDict.$check = false;
       }
       if(ps._artifact.virtual) {
-        error(null, pathDict.location,
+        error(null, [pathDict.location, lead],
           { name: lead.name.absolute, id: ps.id },
           '$(NAME): $(ID) must not be virtual');
         pathDict.$check = false;
@@ -1338,7 +1338,7 @@ function translateAssocsToJoins(model, inputOptions = {})
         if(la1) {
           if(ps._artifact.on)
           {
-            error(null, pathDict.location,
+            error(null, [pathDict.location, lead],
               { name: lead.name.absolute, id: ps.id, alias: pathAsStr(pathDict.path) },
               '$(NAME): $(ID) in path $(ALIAS)" must not be an unmanaged association');
             pathDict.$check = false;
@@ -1346,7 +1346,7 @@ function translateAssocsToJoins(model, inputOptions = {})
           else if(ps._artifact.$fkPathPrefixTree)// must be managed
           {
             if(!ps._artifact.$fkPathPrefixTree.children[la1.id]) {
-              error(null, pathDict.location,
+              error(null, [pathDict.location, lead],
                 { art: lead.name.absolute, id: la1.id, name: ps.id, alias: pathAsStr(pathDict.path) },
                 '$(ART): $(ID) is not foreign key of managed association $(NAME) in path $(ALIAS)' );
               pathDict.$check = false;
@@ -1355,7 +1355,7 @@ function translateAssocsToJoins(model, inputOptions = {})
         }
         else {
           // it is the last path step => no association
-          error(null, pathDict.location,
+          error(null, [pathDict.location, lead],
             { art: lead.name.absolute, id: ps.id, alias: pathAsStr(pathDict.path) },
             '$(ART): $(ID) in path $(ALIAS) must not be an association');
           pathDict.$check = false;
@@ -1366,7 +1366,7 @@ function translateAssocsToJoins(model, inputOptions = {})
     const lastSegment = path[path.length - 1];
     const artifact = lastSegment && lastSegment._artifact && lastSegment._artifact.type && lastSegment._artifact.type._artifact && lastSegment._artifact.type._artifact;
     if (artifact && artifact.elements) {
-      error(null, pathDict.location,
+      error(null, [pathDict.location, lead],
         { art: lead.name.absolute, id: lastSegment.id },
         '$(ART): $(ID) must have scalar type');
       pathDict.$check = false;

package/lib/transform/universalCsn/.eslintrc.json

@@ -17,15 +17,16 @@
     "sonarjs/cognitive-complexity": "off",
     // Does not recognize TS types
     "jsdoc/no-undefined-types": "off",
+    "jsdoc/tag-lines": "off",
     // Just annoying as hell
     "sonarjs/no-duplicate-string": "off"
   },
   "parserOptions": {
-    "ecmaVersion": 2020,
+    "ecmaVersion": 2022,
     "sourceType": "script"
   },
   "env": {
-    "es2020": true,
+    "es2022": true,
     "node": true
   },
   "settings": {

package/lib/transform/universalCsn/coreComputed.js

@@ -155,7 +155,7 @@ function setCoreComputedOnViewsAndCalculatedElements( csn, csnUtils ) {
         (
           column.xpr || column.list || column.func || column.val !== undefined || column.param ||
           column.SELECT || column.SET ||
-          column.ref && [ '$at', '$now', '$user', '$session' ].includes(column.ref[0])
+          column.ref && [ '$at', '$valid', '$now', '$user', '$session' ].includes(column.ref[0])
         );
     }
 

package/lib/transform/universalCsn/universalCsnEnricher.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { setProp } = require('../../base/model');
+const { setProp, isBetaEnabled } = require('../../base/model');
 const shuffleGen = require('../../base/shuffle');
 const { setAnnotationIfNotDefined, makeClientCompatible } = require('./utils');
 const {
@@ -23,6 +23,7 @@ const { setCoreComputedOnViewsAndCalculatedElements } = require('./coreComputed'
  * @param {CSN.Options} options
  */
 module.exports = (csn, options) => {
+  const propagateToReturns = isBetaEnabled( options, 'v4preview' );
   const csnUtils = getUtils(csn, 'init-all');
   const {
     initDefinition, getOrigin, getQueryPrimarySource, artifactRef, getColumn,
@@ -174,7 +175,8 @@ module.exports = (csn, options) => {
         setTargetAspectIfRequired(parent);
       },
       type: ( parent, prop, type, path, grandParent, parentProp ) => {
-        if (parentProp === 'returns') // annos are not propagated to `returns` and `items`
+        // annos are not propagated to `returns` (<=v3) and `items`
+        if (parentProp === 'returns' && !propagateToReturns)
           return;
         const annotationsForBuiltinType = extensions[type];
         Object.assign( parent, annotationsForBuiltinType );
@@ -292,7 +294,7 @@ module.exports = (csn, options) => {
         });
       },
       returns: (parent, prop, returns) => {
-        propagateMemberPropsFromOrigin(returns, { items: true, '@': true, elements: true });
+        propagateMemberPropsFromOrigin(returns, { items: true, '@': !propagateToReturns, elements: true });
         if (returns.target)
           calculateForeignKeys(returns);
       },
@@ -618,7 +620,7 @@ function copyProperties( from, to, getCustomRule, except = null, force = null )
   const keys = Object.keys(from);
   // Copy over properties from the origin element to the target.
   for (const key of keys) {
-    if (except && !(force && force[key]) && (key.charAt(0) in except || key in except))
+    if (except && !(force && force[key]) && (except[key] || except[key.charAt(0)]))
       continue;
     if (!(key in to)) {
       const func = force && force[key] ? force[key] : getCustomRule(key);

package/package.json

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