@sap/cds-compiler 4.6.2 → 4.7.4

package/lib/transform/transformUtils.js

@@ -7,10 +7,11 @@
 const { setProp } = require('../base/model');
 
 const { copyAnnotations, applyTransformations, isDollarSelfOrProjectionOperand } = require('../model/csnUtils');
-const { cloneCsnNonDict, cloneCsnDictionary, getUtils } = require('../model/csnUtils');
+const { getUtils } = require('../model/csnUtils');
 const { typeParameters, isBuiltinType } = require('../compiler/builtins');
 const { ModelError, CompilerAssertion} = require('../base/error');
 const { forEach } = require('../utils/objectUtils');
+const { cloneCsnNonDict, cloneCsnDict } = require('../model/cloneCsn');
 
 const RestrictedOperators = ['<', '>', '>=', '<='];
 const RelationalOperators = ['=', '!=', '<>', 'is' /*, 'like'*/,...RestrictedOperators];
@@ -341,13 +342,13 @@ function getTransformers(model, options, msgFunctions, pathDelimiter = '_') {
 
     // Don't process a leading $self - it will a .art with .elements!
     let i = scope === '$self' ? 1 : 0;
-  
+
     // read property from resolved path link
     const art = (propName) =>
     (links[i].art?.[propName] ||
      effectiveType(links[i].art)[propName] ||
      (resolvedLinkTypes.get(links[i])||{})[propName]);
-  
+
     let flattenStep = false;
     let nextIsItems = !!art('items') || (refParentIsItems && i === 0);
     for(; i < links.length; i++) {
@@ -370,7 +371,7 @@ function getTransformers(model, options, msgFunctions, pathDelimiter = '_') {
       if(nextIsItems && art('target'))
         nextIsItems = false;
 
-      flattenStep = !links[i].art?.kind && 
+      flattenStep = !links[i].art?.kind &&
         !links[i].art?.SELECT &&
         !links[i].art?.from &&
         art('elements');
@@ -441,7 +442,7 @@ function getTransformers(model, options, msgFunctions, pathDelimiter = '_') {
       // since it must also be structured and must contain at least as many elements,
       // if not more (in client style CSN).
       if (typeRef.elements && !(options.transformation === 'hdbcds' && options.sqlMapping === 'hdbcds'))
-        nodeWithType.elements = cloneCsnDictionary(typeRef.elements, options);
+        nodeWithType.elements = cloneCsnDict(typeRef.elements, options);
       else if (typeRef.items)
         nodeWithType.items = cloneCsnNonDict(typeRef.items, options);
 
@@ -449,7 +450,7 @@ function getTransformers(model, options, msgFunctions, pathDelimiter = '_') {
     }
 
     if (typeRef.enum && nodeWithType.enum === undefined)
-      nodeWithType.enum = cloneCsnDictionary(typeRef.enum, options);
+      nodeWithType.enum = cloneCsnDict(typeRef.enum, options);
 
     // Copy type and type arguments (+ localized)
 

package/lib/transform/translateAssocsToJoins.js

@@ -55,7 +55,7 @@ function translateAssocsToJoinsCSN(csn, options){
 
 function translateAssocsToJoins(model, inputOptions = {})
 {
-  const { error, warning, throwWithError } = makeMessageFunction(model, inputOptions);
+  const { error, warning, throwWithError } = makeMessageFunction(model, inputOptions, 'a2j');
 
   const options = model.options || inputOptions;
 
@@ -495,7 +495,7 @@ function translateAssocsToJoins(model, inputOptions = {})
     let srcTableAlias = constructTableAliasPathStep(assocSourceQA);
     let tgtTableAlias = constructTableAliasPathStep(assocQAT.$QA);
 
-    node.on = createOnCondition(assoc, srcTableAlias, tgtTableAlias, options.tenantAsColumn);
+    node.on = createOnCondition(assoc, srcTableAlias, tgtTableAlias, options.tenantDiscriminator);
 
     if(assocQAT._filter)
     {
@@ -600,7 +600,7 @@ function translateAssocsToJoins(model, inputOptions = {})
           Put all src/tgt path siblings into the EQ term and create the proper path objects
           with the src/tgt table alias path steps in front.
         */
-        let args = [];          // TODO: tenant comparison?
+        let args = compareTenants ? [ addTenantComparison(assoc) ] : [];
         for(let i = 0; i < assoc.$flatSrcFKs.length; i++)
         {
           args.push({op: {val: '=' },

package/lib/utils/objectUtils.js

@@ -70,10 +70,24 @@ function forEachKey( o, callback ) {
   }
 }
 
+/**
+ * Sets a property as "hidden" (a.k.a. non-enumerable).
+ *
+ * @param {object} obj
+ * @param {string} prop
+ * @param {any} val
+ */
+function setHidden( obj, prop, val ) {
+  Object.defineProperty( obj, prop, {
+    value: val, configurable: true, writable: true, enumerable: false,
+  } );
+}
+
 module.exports = {
   copyPropIfExist,
   createDict,
   forEach,
   forEachValue,
   forEachKey,
+  setHidden,
 };

package/package.json

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