Do some refactoring in Helpers.getNumber

surveyjs · Jul 31, 2024 · a639976 · a639976
1 parent 525d17e
commit a639976
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 37 deletions.
diff --git a/src/expressions/expressions.ts b/src/expressions/expressions.ts
@@ -263,14 +263,14 @@ export class Const extends Operand {
   public setVariables(variables: Array<string>) {}
   protected getCorrectValue(value: any): any {
     if (!value || typeof value != "string") return value;
-    if (this.isBooleanValue(value)) return value.toLowerCase() === "true";
+    if (OperandMaker.isBooleanValue(value)) return value.toLowerCase() === "true";
     if (
       value.length > 1 &&
       this.isQuote(value[0]) &&
       this.isQuote(value[value.length - 1])
     )
       return value.substring(1, value.length - 1);
-    if (OperandMaker.isNumeric(value)) {
+    if (Helpers.isNumber(value)) {
       if (value.indexOf("0x") == 0) return parseInt(value);
       if (value.length > 1 && value[0] == "0" && (value.length < 2 || (value[1] !== "." && value[1] !== ","))) return value;
       return parseFloat(value);
@@ -284,12 +284,6 @@ export class Const extends Operand {
   private isQuote(ch: string): boolean {
     return ch == "'" || ch == '"';
   }
-  private isBooleanValue(value: any): boolean {
-    return (
-      value &&
-      (value.toLowerCase() === "true" || value.toLowerCase() === "false")
-    );
-  }
 }
 
 export class Variable extends Const {
@@ -416,7 +410,7 @@ export class FunctionOperand extends Operand {
 }
 
 export class OperandMaker {
-  static throwInvalidOperatorError(op: string) {
+  static throwInvalidOperatorError(op: string): void {
     throw new Error("Invalid operator: '" + op + "'");
   }
 
@@ -427,32 +421,12 @@ export class OperandMaker {
   static toOperandString(value: string): string {
     if (
       !!value &&
-      !OperandMaker.isNumeric(value) &&
+      !Helpers.isNumber(value) &&
       !OperandMaker.isBooleanValue(value)
     )
       value = "'" + value + "'";
     return value;
   }
-
-  static isSpaceString(str: string): boolean {
-    return !!str && !str.replace(" ", "");
-  }
-
-  static isNumeric(value: string): boolean {
-    if (
-      !!value &&
-      (value.indexOf("-") > -1 ||
-        value.indexOf("+") > 1 ||
-        value.indexOf("*") > -1 ||
-        value.indexOf("^") > -1 ||
-        value.indexOf("/") > -1 ||
-        value.indexOf("%") > -1)
-    )
-      return false;
-    if (OperandMaker.isSpaceString(value)) return false;
-    return Helpers.isNumber(value);
-  }
-
   static isBooleanValue(value: string): boolean {
     return (
       !!value &&

diff --git a/src/helpers.ts b/src/helpers.ts
@@ -195,18 +195,25 @@ export class Helpers {
     return !isNaN(this.getNumber(value));
   }
   public static getNumber(value: any): number {
-    if (
-      typeof value == "string" &&
-      !!value &&
-      value.indexOf("0x") == 0 &&
-      value.length > 32
-    )
-      return NaN;
+    if (typeof value == "string") {
+      if(!value.replace(" ", "")) return NaN;
+      if(value.indexOf("0x") == 0 && value.length > 32) return NaN;
+      if(Helpers.isStringHasOperator(value)) return NaN;
+    }
     value = this.prepareStringToNumber(value);
     const res = parseFloat(value);
     if(isNaN(res) || !isFinite(value)) return NaN;
     return res;
   }
+  private static isStringHasOperator(str: string): boolean {
+    if(str.lastIndexOf("-") > 0) return false;
+    if(str.lastIndexOf("+") > 0) return false;
+    const operators = "*^/%";
+    for(let i = 0; i < operators.length; i ++) {
+      if(str.indexOf(operators[i]) > -1) return true;
+    }
+    return false;
+  }
   private static prepareStringToNumber(val: any): any {
     if(typeof val !== "string" || !val) return val;
     let i = val.indexOf(",");