fix eslint issues in adaptive expressions (#4833)

microsoft · Jan 6, 2025 · 7cafc93 · 7cafc93
1 parent 5464ddd
commit 7cafc93
Show file tree

Hide file tree

Showing 90 changed files with 299 additions and 376 deletions.
diff --git a/libraries/adaptive-expressions/eslint.config.cjs b/libraries/adaptive-expressions/eslint.config.cjs
@@ -1,13 +1,8 @@
-const onlyWarn = require("eslint-plugin-only-warn");
-const sharedConfig = require("../../eslint.config.cjs")
+const sharedConfig = require('../../eslint.config.cjs');
 
 module.exports = [
     ...sharedConfig,
     {
-        ignores: ["**/generated/*", "**/expressionProperty.test.js"],
+        ignores: ['**/generated/*', '**/expressionProperty.test.js'],
     },
-    {
-        plugins: {
-            "only-warn": onlyWarn,
-        },
-    }];
+];
diff --git a/libraries/adaptive-expressions/package.json b/libraries/adaptive-expressions/package.json
@@ -38,7 +38,6 @@
     "btoa-lite": "^1.0.0",
     "d3-format": "^2.0.0",
     "dayjs": "^1.11.13",
-    "eslint-plugin-only-warn": "^1.1.0",
     "jspath": "^0.4.0",
     "lodash": "^4.17.21",
     "lru-cache": "^5.1.1",

diff --git a/libraries/adaptive-expressions/src/builtinFunctions/add.ts b/libraries/adaptive-expressions/src/builtinFunctions/add.ts
@@ -62,7 +62,7 @@ export class Add extends ExpressionEvaluator {
             expression,
             2,
             Number.MAX_SAFE_INTEGER,
-            ReturnType.String | ReturnType.Number
+            ReturnType.String | ReturnType.Number,
         );
     }
 }
diff --git a/libraries/adaptive-expressions/src/builtinFunctions/addDays.ts b/libraries/adaptive-expressions/src/builtinFunctions/addDays.ts
@@ -17,13 +17,10 @@ export class AddDays extends TimeTransformEvaluator {
      * Initializes a new instance of the [AddDays](xref:adaptive-expressions.AddDays) class.
      */
     constructor() {
-        super(
-            ExpressionType.AddDays,
-            (ts: Date, num: number): Date => {
-                const newDate = new Date(ts);
-                newDate.setDate(ts.getDate() + num);
-                return newDate;
-            }
-        );
+        super(ExpressionType.AddDays, (ts: Date, num: number): Date => {
+            const newDate = new Date(ts);
+            newDate.setDate(ts.getDate() + num);
+            return newDate;
+        });
     }
 }
diff --git a/libraries/adaptive-expressions/src/builtinFunctions/addHours.ts b/libraries/adaptive-expressions/src/builtinFunctions/addHours.ts
@@ -17,13 +17,10 @@ export class AddHours extends TimeTransformEvaluator {
      * Initializes a new instance of the [AddHours](xref:adaptive-expressions.AddHours) class.
      */
     constructor() {
-        super(
-            ExpressionType.AddHours,
-            (ts: Date, num: number): Date => {
-                const newDate = new Date(ts);
-                newDate.setHours(ts.getHours() + num);
-                return newDate;
-            }
-        );
+        super(ExpressionType.AddHours, (ts: Date, num: number): Date => {
+            const newDate = new Date(ts);
+            newDate.setHours(ts.getHours() + num);
+            return newDate;
+        });
     }
 }
diff --git a/libraries/adaptive-expressions/src/builtinFunctions/addMinutes.ts b/libraries/adaptive-expressions/src/builtinFunctions/addMinutes.ts
@@ -17,13 +17,10 @@ export class AddMinutes extends TimeTransformEvaluator {
      * Initializes a new instance of the [AddMinutes](xref:adaptive-expressions.AddMinutes) class.
      */
     constructor() {
-        super(
-            ExpressionType.AddMinutes,
-            (ts: Date, num: number): Date => {
-                const newDate = new Date(ts);
-                newDate.setMinutes(ts.getMinutes() + num);
-                return newDate;
-            }
-        );
+        super(ExpressionType.AddMinutes, (ts: Date, num: number): Date => {
+            const newDate = new Date(ts);
+            newDate.setMinutes(ts.getMinutes() + num);
+            return newDate;
+        });
     }
 }
diff --git a/libraries/adaptive-expressions/src/builtinFunctions/addOrdinal.ts b/libraries/adaptive-expressions/src/builtinFunctions/addOrdinal.ts
@@ -29,7 +29,7 @@ export class AddOrdinal extends ExpressionEvaluator {
     private static evaluator(): EvaluateExpressionDelegate {
         return FunctionUtils.apply(
             (args: any[]): string => AddOrdinal.evalAddOrdinal(args[0]),
-            FunctionUtils.verifyInteger
+            FunctionUtils.verifyInteger,
         );
     }
 

diff --git a/libraries/adaptive-expressions/src/builtinFunctions/addSeconds.ts b/libraries/adaptive-expressions/src/builtinFunctions/addSeconds.ts
@@ -17,13 +17,10 @@ export class AddSeconds extends TimeTransformEvaluator {
      * Initializes a new instance of the [AddSeconds](xref:adaptive-expressions.AddSeconds) class.
      */
     constructor() {
-        super(
-            ExpressionType.AddSeconds,
-            (ts: Date, num: number): Date => {
-                const newDate = new Date(ts);
-                newDate.setSeconds(ts.getSeconds() + num);
-                return newDate;
-            }
-        );
+        super(ExpressionType.AddSeconds, (ts: Date, num: number): Date => {
+            const newDate = new Date(ts);
+            newDate.setSeconds(ts.getSeconds() + num);
+            return newDate;
+        });
     }
 }
diff --git a/libraries/adaptive-expressions/src/builtinFunctions/addToTime.ts b/libraries/adaptive-expressions/src/builtinFunctions/addToTime.ts
@@ -60,7 +60,7 @@ export class AddToTime extends ExpressionEvaluator {
         interval: number,
         timeUnit: string,
         format?: string,
-        locale?: string
+        locale?: string,
     ): ValueWithError {
         let result: string;
         const error = InternalFunctionUtils.verifyISOTimestamp(timeStamp);
@@ -81,7 +81,7 @@ export class AddToTime extends ExpressionEvaluator {
             [ReturnType.String, ReturnType.String],
             ReturnType.String,
             ReturnType.Number,
-            ReturnType.String
+            ReturnType.String,
         );
     }
 }
diff --git a/libraries/adaptive-expressions/src/builtinFunctions/average.ts b/libraries/adaptive-expressions/src/builtinFunctions/average.ts
@@ -28,7 +28,7 @@ export class Average extends ExpressionEvaluator {
     private static evaluator(): EvaluateExpressionDelegate {
         return FunctionUtils.apply(
             (args: any[]): number => args[0].reduce((x: number, y: number): number => x + y) / args[0].length,
-            FunctionUtils.verifyNumericList
+            FunctionUtils.verifyNumericList,
         );
     }
 }
diff --git a/libraries/adaptive-expressions/src/builtinFunctions/base64ToBinary.ts b/libraries/adaptive-expressions/src/builtinFunctions/base64ToBinary.ts
@@ -26,7 +26,7 @@ export class Base64ToBinary extends ExpressionEvaluator {
             ExpressionType.Base64ToBinary,
             Base64ToBinary.evaluator(),
             ReturnType.Object,
-            FunctionUtils.validateUnary
+            FunctionUtils.validateUnary,
         );
     }
 

diff --git a/libraries/adaptive-expressions/src/builtinFunctions/base64ToString.ts b/libraries/adaptive-expressions/src/builtinFunctions/base64ToString.ts
@@ -24,7 +24,7 @@ export class Base64ToString extends ExpressionEvaluator {
             ExpressionType.Base64ToString,
             Base64ToString.evaluator(),
             ReturnType.String,
-            FunctionUtils.validateUnary
+            FunctionUtils.validateUnary,
         );
     }
 

diff --git a/libraries/adaptive-expressions/src/builtinFunctions/binary.ts b/libraries/adaptive-expressions/src/builtinFunctions/binary.ts
@@ -29,7 +29,7 @@ export class Binary extends ExpressionEvaluator {
     private static evaluator(): EvaluateExpressionDelegate {
         return FunctionUtils.apply(
             (args: any[]): Uint8Array => InternalFunctionUtils.getTextEncoder().encode(args[0]),
-            FunctionUtils.verifyString
+            FunctionUtils.verifyString,
         );
     }
 }
diff --git a/libraries/adaptive-expressions/src/builtinFunctions/comparisonEvaluator.ts b/libraries/adaptive-expressions/src/builtinFunctions/comparisonEvaluator.ts
@@ -34,7 +34,7 @@ export class ComparisonEvaluator extends ExpressionEvaluator {
         type: string,
         func: (arg0: any[]) => boolean,
         validator: ValidateExpressionDelegate,
-        verify?: VerifyExpression
+        verify?: VerifyExpression,
     ) {
         super(type, ComparisonEvaluator.evaluator(func, verify), ReturnType.Boolean, validator);
     }
@@ -52,7 +52,7 @@ export class ComparisonEvaluator extends ExpressionEvaluator {
                 expression,
                 state,
                 newOptions,
-                verify
+                verify,
             );
             let error = childrenError;
             if (!error) {

diff --git a/libraries/adaptive-expressions/src/builtinFunctions/concat.ts b/libraries/adaptive-expressions/src/builtinFunctions/concat.ts
@@ -24,7 +24,7 @@ export class Concat extends ExpressionEvaluator {
             ExpressionType.Concat,
             Concat.evaluator(),
             ReturnType.String | ReturnType.Array,
-            FunctionUtils.validateAtLeastOne
+            FunctionUtils.validateAtLeastOne,
         );
     }
 

diff --git a/libraries/adaptive-expressions/src/builtinFunctions/convertFromUTC.ts b/libraries/adaptive-expressions/src/builtinFunctions/convertFromUTC.ts
@@ -60,7 +60,7 @@ export class ConvertFromUTC extends ExpressionEvaluator {
         timeStamp: string,
         destinationTimeZone: string,
         format?: string,
-        locale?: string
+        locale?: string,
     ): ValueWithError {
         let result: string;
         let error: string;
@@ -89,7 +89,7 @@ export class ConvertFromUTC extends ExpressionEvaluator {
             expression,
             [ReturnType.String, ReturnType.String],
             ReturnType.String,
-            ReturnType.String
+            ReturnType.String,
         );
     }
 }
diff --git a/libraries/adaptive-expressions/src/builtinFunctions/convertToUTC.ts b/libraries/adaptive-expressions/src/builtinFunctions/convertToUTC.ts
@@ -69,7 +69,7 @@ export class ConvertToUTC extends ExpressionEvaluator {
         timeStamp: string,
         sourceTimezone: string,
         format?: string,
-        locale?: string
+        locale?: string,
     ): ValueWithError {
         let result: string;
         let error: string;

diff --git a/libraries/adaptive-expressions/src/builtinFunctions/countWord.ts b/libraries/adaptive-expressions/src/builtinFunctions/countWord.ts
@@ -29,7 +29,7 @@ export class CountWord extends ExpressionEvaluator {
     private static evaluator(): EvaluateExpressionDelegate {
         return FunctionUtils.apply(
             (args: any[]): number => InternalFunctionUtils.parseStringOrUndefined(args[0]).trim().split(/\s+/).length,
-            FunctionUtils.verifyStringOrNull
+            FunctionUtils.verifyStringOrNull,
         );
     }
 }
diff --git a/libraries/adaptive-expressions/src/builtinFunctions/dataUri.ts b/libraries/adaptive-expressions/src/builtinFunctions/dataUri.ts
@@ -29,7 +29,7 @@ export class DataUri extends ExpressionEvaluator {
     private static evaluator(): EvaluateExpressionDelegate {
         return FunctionUtils.apply(
             (args: any[]): string => 'data:text/plain;charset=utf-8;base64,'.concat(btoa(args[0])),
-            FunctionUtils.verifyString
+            FunctionUtils.verifyString,
         );
     }
 }
diff --git a/libraries/adaptive-expressions/src/builtinFunctions/dataUriToBinary.ts b/libraries/adaptive-expressions/src/builtinFunctions/dataUriToBinary.ts
@@ -24,7 +24,7 @@ export class DataUriToBinary extends ExpressionEvaluator {
             ExpressionType.DataUriToBinary,
             DataUriToBinary.evaluator(),
             ReturnType.Object,
-            FunctionUtils.validateUnary
+            FunctionUtils.validateUnary,
         );
     }
 
@@ -34,7 +34,7 @@ export class DataUriToBinary extends ExpressionEvaluator {
     private static evaluator(): EvaluateExpressionDelegate {
         return FunctionUtils.apply(
             (args: any[]): Uint8Array => InternalFunctionUtils.getTextEncoder().encode(args[0]),
-            FunctionUtils.verifyString
+            FunctionUtils.verifyString,
         );
     }
 }
diff --git a/libraries/adaptive-expressions/src/builtinFunctions/dataUriToString.ts b/libraries/adaptive-expressions/src/builtinFunctions/dataUriToString.ts
@@ -24,7 +24,7 @@ export class DataUriToString extends ExpressionEvaluator {
             ExpressionType.DataUriToString,
             DataUriToString.evaluator(),
             ReturnType.String,
-            FunctionUtils.validateUnary
+            FunctionUtils.validateUnary,
         );
     }
 
@@ -34,7 +34,7 @@ export class DataUriToString extends ExpressionEvaluator {
     private static evaluator(): EvaluateExpressionDelegate {
         return FunctionUtils.apply(
             (args: any[]): string => atob(args[0].slice(args[0].indexOf(',') + 1)),
-            FunctionUtils.verifyString
+            FunctionUtils.verifyString,
         );
     }
 }
diff --git a/libraries/adaptive-expressions/src/builtinFunctions/endsWith.ts b/libraries/adaptive-expressions/src/builtinFunctions/endsWith.ts
@@ -32,9 +32,9 @@ export class EndsWith extends ExpressionEvaluator {
         return FunctionUtils.apply(
             (args: any[]): boolean =>
                 InternalFunctionUtils.parseStringOrUndefined(args[0]).endsWith(
-                    InternalFunctionUtils.parseStringOrUndefined(args[1])
+                    InternalFunctionUtils.parseStringOrUndefined(args[1]),
                 ),
-            FunctionUtils.verifyStringOrNull
+            FunctionUtils.verifyStringOrNull,
         );
     }
 

diff --git a/libraries/adaptive-expressions/src/builtinFunctions/eol.ts b/libraries/adaptive-expressions/src/builtinFunctions/eol.ts
@@ -11,6 +11,7 @@ import { EvaluateExpressionDelegate, ExpressionEvaluator } from '../expressionEv
 import { ExpressionType } from '../expressionType';
 import { FunctionUtils } from '../functionUtils';
 import { ReturnType } from '../returnType';
+import os from 'os';
 
 /**
  * Return the newline string according to the environment.
@@ -39,8 +40,6 @@ export class EOL extends ExpressionEvaluator {
         } else if (typeof self !== 'undefined') {
             return self.navigator.platform.includes('Win') ? '\r\n' : '\n';
         } else {
-            // eslint-disable-next-line @typescript-eslint/no-var-requires
-            const os = require('os');
             return os.EOL;
         }
     }

diff --git a/libraries/adaptive-expressions/src/builtinFunctions/equal.ts b/libraries/adaptive-expressions/src/builtinFunctions/equal.ts
@@ -22,7 +22,7 @@ export class Equal extends ComparisonEvaluator {
         super(
             ExpressionType.Equal,
             (args) => FunctionUtils.commonEquals(args[0], args[1]),
-            FunctionUtils.validateBinary
+            FunctionUtils.validateBinary,
         );
     }
 }
diff --git a/libraries/adaptive-expressions/src/builtinFunctions/foreach.ts b/libraries/adaptive-expressions/src/builtinFunctions/foreach.ts
@@ -23,7 +23,7 @@ export class Foreach extends ExpressionEvaluator {
             ExpressionType.Foreach,
             InternalFunctionUtils.foreach,
             ReturnType.Array,
-            InternalFunctionUtils.ValidateLambdaExpression
+            InternalFunctionUtils.ValidateLambdaExpression,
         );
     }
 }
diff --git a/libraries/adaptive-expressions/src/builtinFunctions/formatNumber.ts b/libraries/adaptive-expressions/src/builtinFunctions/formatNumber.ts
@@ -1,4 +1,3 @@
-/* eslint-disable security/detect-object-injection */
 /**
  * @module adaptive-expressions
  */
@@ -31,35 +30,40 @@ export class FormatNumber extends ExpressionEvaluator {
      * @private
      */
     private static evaluator(): EvaluateExpressionDelegate {
-        return FunctionUtils.applyWithOptionsAndError((args: unknown[], options: Options): {
-            value: unknown;
-            error: string;
-        } => {
-            let value: unknown = null;
-            let error: string;
-            const number = args[0];
-            const precision = args[1];
-            let locale = options.locale ? options.locale : Intl.DateTimeFormat().resolvedOptions().locale;
-            locale = FunctionUtils.determineLocale(args, 3, locale);
-            if (!FunctionUtils.isNumber(number)) {
-                error = `formatNumber first argument ${number} must be a number`;
-            } else if (!FunctionUtils.isNumber(precision)) {
-                error = `formatNumber second argument ${precision} must be a number`;
-            } else if (locale && typeof locale !== 'string') {
-                error = `formatNubmer third argument ${locale} is not a valid locale`;
-            } else {
-                const fixedNotation = `,.${precision}f`;
-                const roundedNumber = this.roundToPrecision(number, precision);
-                const formatLocale = localeInfo[locale];
-                if (formatLocale !== undefined) {
-                    value = d3formatLocale(formatLocale).format(fixedNotation)(roundedNumber);
+        return FunctionUtils.applyWithOptionsAndError(
+            (
+                args: unknown[],
+                options: Options,
+            ): {
+                value: unknown;
+                error: string;
+            } => {
+                let value: unknown = null;
+                let error: string;
+                const number = args[0];
+                const precision = args[1];
+                let locale = options.locale ? options.locale : Intl.DateTimeFormat().resolvedOptions().locale;
+                locale = FunctionUtils.determineLocale(args, 3, locale);
+                if (!FunctionUtils.isNumber(number)) {
+                    error = `formatNumber first argument ${number} must be a number`;
+                } else if (!FunctionUtils.isNumber(precision)) {
+                    error = `formatNumber second argument ${precision} must be a number`;
+                } else if (locale && typeof locale !== 'string') {
+                    error = `formatNubmer third argument ${locale} is not a valid locale`;
                 } else {
-                    value = d3format(fixedNotation)(roundedNumber);
+                    const fixedNotation = `,.${precision}f`;
+                    const roundedNumber = this.roundToPrecision(number, precision);
+                    const formatLocale = localeInfo[locale];
+                    if (formatLocale !== undefined) {
+                        value = d3formatLocale(formatLocale).format(fixedNotation)(roundedNumber);
+                    } else {
+                        value = d3format(fixedNotation)(roundedNumber);
+                    }
                 }
-            }
 
-            return { value, error };
-        });
+                return { value, error };
+            },
+        );
     }
 
     private static roundToPrecision = (num: number, digits: number): number =>