@sap/cds-compiler 4.1.2 → 4.2.2

package/lib/compiler/utils.js

@@ -14,7 +14,7 @@ const { dictAdd, pushToDict, dictFirst } = require('../base/dictionaries');
 const { kindProperties } = require('./base');
 const { XsnName, XsnArtifact, CsnLocation } = require('./classes');
 
-const $inferred = Symbol.for('cds.$inferred');
+const $inferred = Symbol.for( 'cds.$inferred' );
 
 // for links, i.e., properties starting with an underscore '_':
 
@@ -109,7 +109,7 @@ function linkToOrigin( origin, name, parent, prop, location, silentDep ) {
   return elem;
 }
 
-function proxyCopyMembers( art, dictProp, originDict, location, kind ) {
+function proxyCopyMembers( art, dictProp, originDict, location, kind, tmpDeprecated ) {
   art[dictProp] = Object.create( null );
   // TODO: set $inferred ? for dict?
   for (const name in originDict) {
@@ -118,8 +118,11 @@ function proxyCopyMembers( art, dictProp, originDict, location, kind ) {
       const member = linkToOrigin( origin, name, art, dictProp,
                                    location || origin.location, true );
       member.$inferred = 'expanded';
+      // TODO throughout the compiler: do not set art.‹prop›.$inferred if art.$inferred
       if (kind)
         member.kind = kind;
+      else if (origin.key && !tmpDeprecated) // TODO(v5/v6): remove tmpDeprecated
+        member.key = Object.assign( { $inferred: 'expanded' }, origin.key );
       if (kind && origin.masked)  // TODO: remove!
         member.masked = Object.assign( { $inferred: 'nav' }, origin.masked );
     }
@@ -139,7 +142,7 @@ function setMemberParent( elem, name, parent, prop ) {
     // TODO: consider nested ARRAY OF and RETURNS, COMPOSITION OF type
     const p = parent.items || parent.targetAspect || parent;
     if (p[prop] === undefined)
-      p[prop] = Object.create(null);
+      p[prop] = Object.create( null );
     dictAdd( p[prop], name, elem );
   }
   if (parent._outer && parent._outer.items) // TODO: remove for items, too
@@ -161,7 +164,7 @@ function setMemberParent( elem, name, parent, prop ) {
 
     else
       delete elem.name[kind];
-  });
+  } );
   // try { throw new CompilerAssertion('Foo') } catch (e) { elem.name.stack = e; };
 }
 
@@ -207,7 +210,7 @@ function storeExtension( elem, name, prop, parent, block ) {
   //   return;
   // }
   if (!parent[kind][prop])
-    parent[kind][prop] = Object.create(null);
+    parent[kind][prop] = Object.create( null );
   pushToDict( parent[kind][prop], name, elem );
 }
 
@@ -233,7 +236,7 @@ function withAssociation( ref, test = testFunctionPlaceholder, alsoTestLast = fa
  * @param {XSN.Path} path
  */
 function pathName( path ) {
-  return (path && !path.broken) ? path.map( id => id.id ).join('.') : '';
+  return (path && !path.broken) ? path.map( id => id.id ).join( '.' ) : '';
 }
 
 /**
@@ -245,7 +248,7 @@ function pathName( path ) {
  * @returns {XSN.Path}
  */
 function splitIntoPath( location, name ) {
-  return name.split('.').map( id => ({ id, location }) );
+  return name.split( '.' ).map( id => ({ id, location }) );
 }
 
 /**
@@ -259,7 +262,7 @@ function augmentPath( location, ...args ) {
 function copyExpr( expr, location, skipUnderscored, rewritePath ) {
   if (!expr || typeof expr !== 'object')
     return expr;
-  else if (Array.isArray(expr))
+  else if (Array.isArray( expr ))
     return expr.map( e => copyExpr( e, location, skipUnderscored, rewritePath ) );
 
   const proto = Object.getPrototypeOf( expr );
@@ -296,7 +299,7 @@ function testExpr( expr, pathTest, queryTest, user ) {
   if (!expr || typeof expr === 'string') { // parse error or keywords in {xpr:...}
     return false;
   }
-  else if (Array.isArray(expr)) {
+  else if (Array.isArray( expr )) {
     return expr.some( e => testExpr( e, pathTest, queryTest, user ) );
   }
   else if (expr.path) {
@@ -307,10 +310,10 @@ function testExpr( expr, pathTest, queryTest, user ) {
   }
   else if (expr.op && expr.args) {
     // unnamed args => array
-    if (Array.isArray(expr.args))
+    if (Array.isArray( expr.args ))
       return expr.args.some( e => testExpr( e, pathTest, queryTest, user ) );
     // named args => dictionary
-    for (const namedArg of Object.keys(expr.args)) {
+    for (const namedArg of Object.keys( expr.args )) {
       if (testExpr( expr.args[namedArg], pathTest, queryTest, user ))
         return true;
     }
@@ -403,7 +406,7 @@ function forEachUserDict( art, prop, callback ) {
     if (obj.$inferred)
       continue;
     callback( obj, name, prop );
-    if (Array.isArray(obj.$duplicates)) // redefinitions
+    if (Array.isArray( obj.$duplicates )) // redefinitions
       obj.$duplicates.forEach( o => callback( o, name, prop ) );
   }
 }

package/lib/edm/.eslintrc.json

@@ -1,5 +1,44 @@
 {
+  "root": true,
+  //"plugins": ["sonarjs", "jsdoc"],
+  //"extends": ["plugin:jsdoc/recommended", "../../../.eslintrc-ydkjsi.json", "plugin:sonarjs/recommended"],
+  "plugins": ["sonarjs"],
+  "extends": ["../../.eslintrc-ydkjsi.json", "plugin:sonarjs/recommended"],
   "rules": {
-    "no-shadow": "off"
+    "prefer-const": "error",
+    "quotes": ["error", "single", "avoid-escape"],
+    "prefer-template": "error",
+    "no-trailing-spaces": "error",
+    "template-curly-spacing":["error", "never"],
+    "complexity": ["warn", 50],
+    "max-len": "off",
+    // there seem to be false positives
+    "jsdoc/require-returns-check": "off",
+    // Don't enforce stupid descriptions
+    "jsdoc/require-param-description": "off",
+    "jsdoc/require-returns-description": "off",
+    // Sometimes if-else's are more specific
+    "sonarjs/prefer-single-boolean-return": "off",
+    // Very whiny and nitpicky
+    "sonarjs/cognitive-complexity": "off",
+    "sonarjs/no-duplicate-string": "off",
+    // Does not recognize TS types
+    "jsdoc/no-undefined-types": "off",
+    "jsdoc/tag-lines": "off",
+    "no-nested-ternary": "off",
+    "sonarjs/no-nested-template-literals": "off"
+  },
+  "parserOptions": {
+    "ecmaVersion": 2022,
+    "sourceType": "script"
+  },
+  "env": {
+    "es2022": true,
+    "node": true
+  },
+  "settings": {
+    "jsdoc": {
+      "mode": "typescript"
+    }
   }
 }