@sap/cds-compiler 5.8.2 → 5.9.2

package/lib/compiler/shared.js

@@ -477,10 +477,10 @@ function fns( model ) {
    * Traverse arguments `args` if they match a specific pattern:
    *
    * - a (sub) expression is a comparison, i.e. uses one of the binary operators
-   *   `=`, `<>`, `!=`, `in` or `not in`,
+   *   `=`, `<>`, '==', `!=`, `in` or `not in`,
    * - one side of the comparison is a reference or a `cast` function call when
    *   typed with an enum type,
-   * - the other side is a enum reference, an enum reference in parentheses, or a
+   * - the other side is an enum reference, an enum reference in parentheses, or a
    *   list of enum references.
    *
    * Return an array of the arguments which are to be traversed normally, or
@@ -489,7 +489,7 @@ function fns( model ) {
   function traverseSpecialArgs( args, exprCtx, user, type, callback ) {
     if (args.length <= 3) {
       if (args.length === 3 && args[1].literal === 'token' &&
-          [ '=', '<>', '!=', 'in' ].includes( args[1].val ))
+          [ '=', '<>', '==', '!=', 'in' ].includes( args[1].val ))
         return traverseComparison( args[0], args[2], exprCtx, user, callback );
     }
     else if (args[0].val === 'case' && args[0].literal === 'token') {

package/lib/compiler/tweak-assocs.js

@@ -860,7 +860,7 @@ function tweakAssocs( model ) {
   }
 
   /**
-   * @param {XSN.Path} ref
+   * @param {object} ref
    * @param {number} index
    * @param {XSN.Artifact} user
    * @param {boolean} isTargetSide

package/lib/compiler/utils.js

@@ -603,6 +603,15 @@ function userQuery( user ) {
   return null;
 }
 
+function userParam( user ) {
+  while (user._main) {
+    if (user.kind === 'param')
+      return user;
+    user = user._parent;
+  }
+  return null;
+}
+
 function pathStartsWithSelf( ref ) {
   const head = ref && !ref.scope && ref.path?.[0];
   if (head?._navigation?.kind === '$self')
@@ -720,6 +729,7 @@ module.exports = {
   isDirectComposition,
   targetCantBeAspect,
   userQuery,
+  userParam,
   pathStartsWithSelf,
   columnRefStartsWithSelf,
   isAssocToPrimaryKeys,

package/lib/compiler/xpr-rewrite.js

@@ -276,7 +276,7 @@ function xprRewriteFns( model ) {
    * @param {XSN.Expression} expr
    * @param {AnnoRewriteConfig} config
    * @param {string} refCtx
-   * @returns {null} Returns true if the expression couldn't be rewritten.
+   * @returns {null|true} Returns true if the expression couldn't be rewritten.
    */
   function rewriteAnnoExpr( expr, config, refCtx ) {
     const root = expr.path && (expr.path[0]?._navigation || expr.path[0]?._artifact);

package/lib/edm/annotations/edmJson.js

@@ -194,23 +194,23 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
       args = args.filter(a => a);
       if (argDef.min != null && (!args || argDef.min > args.length)) {
         error('odata-anno-xpr-args', location, {
-          anno, op: `${propName}(…)`, count: argDef.min, '#': 'atleast',
+          anno, op: `${ propName }(…)`, count: argDef.min, '#': 'atleast',
         });
       }
       if (argDef.max != null && (!args || argDef.max < args.length)) {
         error('odata-anno-xpr-args', location, {
-          anno, op: `${propName}(…)`, count: argDef.max, '#': 'atmost',
+          anno, op: `${ propName }(…)`, count: argDef.max, '#': 'atmost',
         });
       }
       if (argDef.exact != null && (!args || argDef.exact !== args.length)) {
         if (argDef.exact === 0) {
           error('odata-anno-xpr-args', location, {
-            anno, op: `${propName}(…)`,
+            anno, op: `${ propName }(…)`,
           });
         }
         else {
           error('odata-anno-xpr-args', location, {
-            anno, op: `${propName}(…)`, count: argDef.exact, '#': 'exactly',
+            anno, op: `${ propName }(…)`, count: argDef.exact, '#': 'exactly',
           });
         }
       }
@@ -235,6 +235,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
   //----------------------------------
   // RELATIONAL
   transform['='] = op('$Eq');
+  transform['=='] = op('$Eq');
   transform.$Eq = noOp;
   transform['<>'] = op('$Ne');
   transform['!='] = op('$Ne');
@@ -337,7 +338,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
         parent.args = newArgs;
         if (foundProps.length !== 1) {
           error('odata-anno-xpr-args', location, {
-            anno, op: `${xpr}(…)`, prop: `${argName}(…)`, '#': 'wrongcount',
+            anno, op: `${ xpr }(…)`, prop: `${ argName }(…)`, '#': 'wrongcount',
           });
         }
         else {
@@ -348,7 +349,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
             parent[argName] = /* func.args[0].ref?.join('.') || */ func.args[0].val;
             if (evalVal && !parent[argName]) {
               error('odata-anno-xpr-args', location, {
-                anno, op: `${argName}(…)`, meta: argDef.meta || 'literal', '#': 'wrongval_meta',
+                anno, op: `${ argName }(…)`, meta: argDef.meta || 'literal', '#': 'wrongval_meta',
               });
             }
           }
@@ -374,7 +375,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
         evalArgs({ exact: 1 }, type.args, type.func);
         if (type.args?.length === 1) {
           const typeName = type.args[0].func;
-          if (EdmPrimitiveTypeMap[`Edm.${type.args[0].func}`])
+          if (EdmPrimitiveTypeMap[`Edm.${ type.args[0].func }`])
             newArgs.push({ func: typeName, args: type.args[0].args || [] });
           else
             newArgs.push(type);
@@ -389,13 +390,13 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
       [ foundTypeProps, newArgs ]
       = parent.args
           ? parent.args.reduce((acc, arg) => {
-            (EdmPrimitiveTypeMap[`Edm.${arg.func}`] ? acc[0] : acc[1]).push(arg);
+            (EdmPrimitiveTypeMap[`Edm.${ arg.func }`] ? acc[0] : acc[1]).push(arg);
             return acc;
           }, [ [], [] ] )
           : [ [], [] ];
       if (foundTypeProps.length) {
         foundTypeProps.forEach((type) => {
-          const edmType = `Edm.${type.func}`;
+          const edmType = `Edm.${ type.func }`;
           const td = EdmPrimitiveTypeMap[edmType];
           const typeFuncDef = {
             func: typePropName,
@@ -408,7 +409,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
               const facetDef = td[facetName];
               if (facetDef && i < type.args.length) {
                 const facetFuncDef = {
-                  func: `${facetName}`,
+                  func: `${ facetName }`,
                   args: [ type.args[i++] ],
                 };
                 typeFuncDef.args.push(facetFuncDef);
@@ -431,7 +432,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
       parent.args = newArgs;
       if (foundTypeProps.length !== 1) {
         typePropName = isDollarFunc ? '$Type' : 'Type';
-        error('odata-anno-xpr-type', location, { anno, op: `${xpr}(…)` });
+        error('odata-anno-xpr-type', location, { anno, op: `${ xpr }(…)` });
         rc = false;
       }
       else {
@@ -455,17 +456,17 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
         }, [ [], [] ] );
 
         let typeOpStr = collTypes.length
-          ? `${typePropName}(${isDollarFunc ? '$Collection' : 'Collection'}(…))`
-          : `${typePropName}(…)`;
+          ? `${ typePropName }(${ isDollarFunc ? '$Collection' : 'Collection' }(…))`
+          : `${ typePropName }(…)`;
 
         if (collTypes.length) {
           if (collTypes.length > 1 || scalarTypes.length) {
-            error('odata-anno-xpr-type', location, { anno, op: `${xpr}(…)` });
+            error('odata-anno-xpr-type', location, { anno, op: `${ xpr }(…)` });
           }
           else {
-            typeOpStr = `${typePropName}(${collTypes[0].func}(…))`;
+            typeOpStr = `${ typePropName }(${ collTypes[0].func }(…))`;
             if (collTypes[0].args.length !== 1) {
-              error('odata-anno-xpr-type', location, { anno, op: `${xpr}(…)` });
+              error('odata-anno-xpr-type', location, { anno, op: `${ xpr }(…)` });
             }
             else {
               typeArg = collTypes[0].args[0];
@@ -474,7 +475,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
           }
         }
         else if (scalarTypes.length !== 1) {
-          error('odata-anno-xpr-type', location, { anno, op: `${xpr}(…)` });
+          error('odata-anno-xpr-type', location, { anno, op: `${ xpr }(…)` });
           rc = false;
         }
         else {
@@ -484,7 +485,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
           // do final type checks and assignment
           const typeDef = typeArg?.ref?.join('.') || typeArg?.val;
           if (typeof typeDef !== 'string')
-            error('odata-anno-xpr-type', location, { anno, op: `${xpr}(…)` });
+            error('odata-anno-xpr-type', location, { anno, op: `${ xpr }(…)` });
           else
             parent.$Type = typeDef;
 
@@ -511,8 +512,8 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
 
               if (td[facetName]) {
                 // ignore facets that are not type relevant
-                const facetFuncName = isDollarFunc ? `$${facetName}` : facetName;
-                const facetArgs = typeFacets.filter(arg => arg.func === facetName || arg.func === `$${facetName}`);
+                const facetFuncName = isDollarFunc ? `$${ facetName }` : facetName;
+                const facetArgs = typeFacets.filter(arg => arg.func === facetName || arg.func === `$${ facetName }`);
 
                 if (facetArgs.length === 0 && !optional && (options.isV2() === facetDef.v2 || options.isV4() === facetDef.v4)) {
                   message('odata-spec-violation-type', location,
@@ -526,14 +527,14 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
                 }
                 else if (facetArgs.length > 1) {
                   error('odata-anno-xpr-args', location, {
-                    anno, op: typeOpStr, prop: `${facetFuncName}(…)`, '#': 'wrongcount',
+                    anno, op: typeOpStr, prop: `${ facetFuncName }(…)`, '#': 'wrongcount',
                   });
                 }
                 else if (facetArgs.length === 1) {
                   const facetArg = facetArgs[0];
                   if (facetArg.args.length !== 1) {
                     error('odata-anno-xpr-args', location, {
-                      anno, op: `${facetFuncName}(…)`, count: 1, '#': 'exactly',
+                      anno, op: `${ facetFuncName }(…)`, count: 1, '#': 'exactly',
                     });
                   }
                   else {
@@ -542,7 +543,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
                     if (isNan && options.isV4() && facetName === 'Scale' && facetVal !== 'variable') {
                       error('odata-anno-xpr-args', location, {
                         anno,
-                        op: `${facetFuncName}(…)`,
+                        op: `${ facetFuncName }(…)`,
                         meta: 'number',
                         rawvalues: [ 'variable' ],
                         '#': 'wrongval_meta_list',
@@ -550,11 +551,11 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
                     }
                     else if (isNan && facetName !== 'Scale') {
                       error('odata-anno-xpr-args', location, {
-                        anno, op: `${facetFuncName}(…)`, meta: 'number', '#': 'wrongval_meta',
+                        anno, op: `${ facetFuncName }(…)`, meta: 'number', '#': 'wrongval_meta',
                       });
                     }
                     else {
-                      parent[`$${facetName}`] = facetVal;
+                      parent[`$${ facetName }`] = facetVal;
                     }
                   }
                 }
@@ -587,7 +588,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
             // reqDef entry etc...
             if (typeDef) { // eslint-disable-line no-lonely-if
               error('odata-anno-xpr-type', location, {
-                anno, op: `${xpr}(…)`, type: `${typeDef}`, '#': 'edm',
+                anno, op: `${ xpr }(…)`, type: `${ typeDef }`, '#': 'edm',
               });
             }
             /*
@@ -627,7 +628,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
     };
 
     const dollar = () => {
-      parent[`$${xpr}`] = parent[xpr];
+      parent[`$${ xpr }`] = parent[xpr];
       delete parent[xpr];
     };
 
@@ -637,7 +638,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
       let funcName = parent[propName];
       if (funcName) {
         if (!funcName.startsWith('odata.'))
-          funcName = `odata.${funcName}`;
+          funcName = `odata.${ funcName }`;
 
         const argDef = canonicFunctionDefinitions[funcName];
         if (argDef) {
@@ -654,7 +655,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
           funcName = parent[propName];
           if (funcName.split('.').length !== 2) {
             error('odata-anno-xpr', location, {
-              anno, op: `${propName}(…)`, code: funcName, meta: 'namespace', othermeta: 'function', '#': 'canonfuncalias',
+              anno, op: `${ propName }(…)`, code: funcName, meta: 'namespace', othermeta: 'function', '#': 'canonfuncalias',
             });
           }
         }
@@ -701,6 +702,8 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
       },
       LabeledElement: () => {
         rewriteArgs({ Name: { exact: 1, meta: 'qualified name' } });
+        parent.$Name = parent.Name; // Make it an attribute or rendering fails.
+        delete parent.Name;
         oneArg();
         dollar();
       },
@@ -708,7 +711,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
         oneArg();
         if (parent[xpr].length === 1 && typeof parent[xpr][0].val !== 'string') {
           error('odata-anno-xpr-args', location, {
-            anno, op: `${xpr}(…)`, meta: 'literal', '#': 'wrongval_meta',
+            anno, op: `${ xpr }(…)`, meta: 'literal', '#': 'wrongval_meta',
           });
         }
       },
@@ -724,7 +727,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
         const args = parent[xpr];
         if (args?.length && typeof args[0].val !== 'string') {
           error('odata-anno-xpr-args', location, {
-            anno, op: `${xpr}(…)`, meta: 'string', '#': 'wrongval_meta',
+            anno, op: `${ xpr }(…)`, meta: 'string', '#': 'wrongval_meta',
           });
         }
         transformExpression(parentparent, parentprop, transform);
@@ -733,7 +736,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
         parent[xpr] = true;
         delete parent.func;
         if (parent.args?.length)
-          error('odata-anno-xpr-args', location, { anno, op: `${xpr}(…)` });
+          error('odata-anno-xpr-args', location, { anno, op: `${ xpr }(…)` });
         delete parent.args;
       },
     };
@@ -750,12 +753,12 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
       transformExpression(parent, undefined, transform);
     }
     else {
-      const funcName = xpr.startsWith('odata.') ? xpr : `odata.${xpr}`;
+      const funcName = xpr.startsWith('odata.') ? xpr : `odata.${ xpr }`;
       const argDef = canonicFunctionDefinitions[funcName];
       if (argDef) {
         if (argDef.use) {
           error('odata-anno-xpr', location, {
-            anno, op: `${xpr}(…)`, code: argDef.use, '#': 'use',
+            anno, op: `${ xpr }(…)`, code: argDef.use, '#': 'use',
           });
         }
         else {
@@ -769,7 +772,7 @@ function xpr2edmJson( carrier, anno, location, options, messageFunctions ) {
       }
       else {
         error('odata-anno-xpr', location, {
-          anno, op: `${xpr}(…)`, '#': 'notadynexpr',
+          anno, op: `${ xpr }(…)`, '#': 'notadynexpr',
         });
       }
     }
@@ -824,13 +827,13 @@ function getEdmJsonHandler( Edm, options, messageFunctions, handleTerm ) {
     },
     $Cast: {
       create: () => new Edm.Cast(v),
-      attr: [ '$Type', ...EdmTypeFacetNames.map(n => `$${n}`), '@sap.variable.scale' ],
+      attr: [ '$Type', ...EdmTypeFacetNames.map(n => `$${ n }`), '@sap.variable.scale' ],
       jsonAttr: [ '$Collection' ],
       anno: true,
     },
     $IsOf: {
       create: () => new Edm.IsOf(v),
-      attr: [ '$Type', ...EdmTypeFacetNames.map(n => `$${n}`), '@sap.variable.scale' ],
+      attr: [ '$Type', ...EdmTypeFacetNames.map(n => `$${ n }`), '@sap.variable.scale' ],
       jsonAttr: [ '$Collection' ],
       anno: true,
     },
@@ -944,7 +947,7 @@ function getEdmJsonHandler( Edm, options, messageFunctions, handleTerm ) {
           }
           else if (exprDef.attr && exprDef.attr.includes(name)) {
             if (options.isV2() && name.startsWith('@sap.'))
-              edmNode.setXml( { [`sap:${name.slice(5).replace(/\./g, '-')}`]: val } );
+              edmNode.setXml( { [`sap:${ name.slice(5).replace(/\./g, '-') }`]: val } );
             if (name[0] === '$')
               edmNode.setEdmAttribute(name.slice(1), val);
           }
@@ -982,7 +985,7 @@ function getEdmJsonHandler( Edm, options, messageFunctions, handleTerm ) {
       const typeName = getXmlTypeName(val);
       if (typeName === 'Int')
         return 'Edm.Int32';
-      return `Edm.${typeName}`;
+      return `Edm.${ typeName }`;
     }
   }
 }