Fix new SonarQube issues (#1641)

* fix new sonarqube issues

Author: ethanzhouyc

src-electron/generator/helper-endpointconfig.js

@@ -1392,10 +1392,10 @@ function endpoint_config(options) {
   let sessionId = this.global.sessionId
   let collectAttributesOptions = {
     allowUnknownStorageOption:
-      options.hash.allowUnknownStorageOption === 'false' ? false : true,
+      options.hash.allowUnknownStorageOption !== 'false',
     spaceForDefaultValue: options.hash.spaceForDefaultValue,
     isReadableMaskGenerationEnabled:
-      options.hash.isReadableMaskGenerationEnabled === 'true' ? true : false
+      options.hash.isReadableMaskGenerationEnabled === 'true'
   }
   let promise = templateUtil
     .ensureZclPackageIds(newContext)

src-electron/generator/matter/app/zap-templates/common/ClusterTestGeneration.js

@@ -987,7 +987,7 @@ function attachGlobal(global, value, errorContext) {
         value = new String(value);
         break;
       case 'boolean':
-        value = new Boolean(value);
+        value = Boolean(value);
         break;
       default:
         throw new Error('Unsupported value: ' + JSON.stringify(value));

src-electron/util/util.js

@@ -726,7 +726,7 @@ function executeExternalProgram(
 
     if (options.rejectOnFail) {
       // We return a rejected promise to allow the caller to handle it.
-      return Promise.reject(error)
+      return Promise.reject(toErrorObject(error))
     } else {
       // If we're not rejecting on fail, we just log the error and continue.
       console.error(error.message)

src-electron/validation/conformance-expression-evaluator.js

@@ -23,7 +23,7 @@
 
 const dbEnum = require('../../src-shared/db-enum')
 
-const OPERAND_REGEX = /[A-Za-z][A-Za-z0-9_]*/g
+const OPERAND_REGEX = /[A-Za-z]\w*/g
 
 /**
  * Evaluate the value of a boolean conformance expression that includes operands and operators.
@@ -75,7 +75,7 @@ function evaluateConformanceExpression(expression, elementMap) {
   // if any operand is desc, the conformance is too complex to parse
   for (let part of parts) {
     let operands = getOperandsFromExpression(part)
-    if (operands && operands.includes(dbEnum.conformanceTag.described)) {
+    if (operands.includes(dbEnum.conformanceTag.described)) {
       return dbEnum.conformanceTag.described
     }
   }
@@ -141,7 +141,7 @@ function checkMissingOperands(expression, elementMap) {
  */
 function checkIfExpressionHasOperand(expression, operand) {
   let operands = getOperandsFromExpression(expression)
-  return operands && operands.includes(operand)
+  return operands.includes(operand)
 }
 
 /**
@@ -152,8 +152,8 @@ function checkIfExpressionHasOperand(expression, operand) {
  */
 function getOperandsFromExpression(expression) {
   if (!expression) return []
-  let operands = expression.match(OPERAND_REGEX)
-  return operands ? operands : []
+  let operands = expression.match(OPERAND_REGEX) || []
+  return operands
 }
 
 /**
@@ -262,12 +262,11 @@ function translateConformanceTag(expression) {
  */
 function translateBooleanExpr(expr) {
   // match operands and operators
-  let tokens = expr.match(/[A-Za-z0-9_]+|[!&|()]/g) || []
+  let tokens = expr.match(/\w+|[!&|()]/g) || []
   let output = []
-
-  for (let i = 0; i < tokens.length; i++) {
+  let i = 0
+  while (i < tokens.length) {
     let token = tokens[i]
-
     if (token === '&') {
       output.push(dbEnum.logicalOperators.and)
     } else if (token === '|') {
@@ -288,8 +287,8 @@ function translateBooleanExpr(expr) {
       // if none of the above is matched, it is an element operand
       output.push(`${token} is enabled`)
     }
+    i++
   }
-
   return output.join(' ')
 }
 
@@ -321,7 +320,7 @@ function translateConformanceExpression(expression) {
     if (conformanceTag) return conformanceTag
 
     // handle optional expressions surrounded by '[]'
-    let optionalMatch = part.match(/^\[(.*)\]$/)
+    let optionalMatch = /^\[(.*)\]$/.exec(part)
     if (optionalMatch) {
       // optionalMatch[1] is the expression inside '[]'
       let optionalText = translateBooleanExpr(optionalMatch[1])