Fix new eslint errors and warnings

Author: Caligatio

src/common.ts

@@ -128,7 +128,7 @@ export function parseInputOption(
   key: string,
   value: GenericInputType | undefined,
   bigEndianMod: -1 | 1,
-  fallback?: packedValue
+  fallback?: packedValue,
 ): packedValue {
   const errStr = key + " must include a value and format";
   if (!value) {
@@ -144,10 +144,9 @@ export function parseInputOption(
 
   return getStrConverter(
     value["format"],
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore - the value of encoding gets value checked by getStrConverter
     value["encoding"] || "UTF8",
-    bigEndianMod
+    bigEndianMod,
   )(value["value"]);
 }
 
@@ -189,7 +188,7 @@ export abstract class jsSHABase<StateT, VariantT> {
     remainderBinLen: number,
     processedBinLen: number,
     H: StateT,
-    outputLen: number
+    outputLen: number,
   ) => number[];
   protected abstract readonly stateCloneFunc: (state: StateT) => StateT;
   protected abstract readonly newStateFunc: (variant: VariantT) => StateT;
@@ -205,7 +204,6 @@ export abstract class jsSHABase<StateT, VariantT> {
     this.utfType = inputOptions["encoding"] || "UTF8";
     this.numRounds = inputOptions["numRounds"] || 1;
 
-    /* eslint-disable-next-line @typescript-eslint/ban-ts-comment */
     // @ts-ignore - The spec actually says ToString is called on the first parseInt argument so it's OK to use it here
     // to check if an arugment is an integer. This cheat would break if it's used to get the value of the argument.
     if (isNaN(this.numRounds) || this.numRounds !== parseInt(this.numRounds, 10) || 1 > this.numRounds) {
@@ -289,7 +287,7 @@ export abstract class jsSHABase<StateT, VariantT> {
       this.remainderLen,
       this.processedLen,
       this.stateCloneFunc(this.intermediateState),
-      outputBinLen
+      outputBinLen,
     );
     for (i = 1; i < this.numRounds; i += 1) {
       /* Need to mask out bits that should be zero due to output not being a multiple of 32 */
@@ -301,7 +299,7 @@ export abstract class jsSHABase<StateT, VariantT> {
         outputBinLen,
         0,
         this.newStateFunc(this.shaVariant),
-        outputBinLen
+        outputBinLen,
       );
     }
 
@@ -360,7 +358,7 @@ export abstract class jsSHABase<StateT, VariantT> {
         key["binLen"],
         0,
         this.newStateFunc(this.shaVariant),
-        this.outputBinLen
+        this.outputBinLen,
       );
     }
     while (key["value"].length <= lastArrayIndex) {
@@ -413,15 +411,15 @@ export abstract class jsSHABase<StateT, VariantT> {
       this.remainderLen,
       this.processedLen,
       this.stateCloneFunc(this.intermediateState),
-      this.outputBinLen
+      this.outputBinLen,
     );
     finalizedState = this.roundFunc(this.keyWithOPad, this.newStateFunc(this.shaVariant));
     finalizedState = this.finalizeFunc(
       firstHash,
       this.outputBinLen,
       this.variantBlockSize,
       finalizedState,
-      this.outputBinLen
+      this.outputBinLen,
     );
 
     return finalizedState;

src/converters.ts

@@ -26,7 +26,7 @@ function str2packed(
   utfType: EncodingType,
   existingPacked: number[] | undefined,
   existingPackedLen: number | undefined,
-  bigEndianMod: -1 | 1
+  bigEndianMod: -1 | 1,
 ): packedValue {
   let codePnt,
     codePntArr,
@@ -62,7 +62,7 @@ function str2packed(
           0xf0 | (codePnt >>> 18),
           0x80 | ((codePnt >>> 12) & 0x3f),
           0x80 | ((codePnt >>> 6) & 0x3f),
-          0x80 | (codePnt & 0x3f)
+          0x80 | (codePnt & 0x3f),
         );
       }
 
@@ -116,7 +116,7 @@ function hex2packed(
   str: string,
   existingPacked: number[] | undefined,
   existingPackedLen: number | undefined,
-  bigEndianMod: -1 | 1
+  bigEndianMod: -1 | 1,
 ): packedValue {
   let i, num, intOffset, byteOffset;
 
@@ -159,7 +159,7 @@ function bytes2packed(
   str: string,
   existingPacked: number[] | undefined,
   existingPackedLen: number | undefined,
-  bigEndianMod: -1 | 1
+  bigEndianMod: -1 | 1,
 ): packedValue {
   let codePnt, i, intOffset, byteOffset;
 
@@ -195,7 +195,7 @@ function b642packed(
   str: string,
   existingPacked: number[] | undefined,
   existingPackedLen: number | undefined,
-  bigEndianMod: -1 | 1
+  bigEndianMod: -1 | 1,
 ): packedValue {
   let byteCnt = 0,
     index,
@@ -258,7 +258,7 @@ function uint8array2packed(
   arr: Uint8Array,
   existingPacked: number[] | undefined,
   existingPackedLen: number | undefined,
-  bigEndianMod: -1 | 1
+  bigEndianMod: -1 | 1,
 ): packedValue {
   let i, intOffset, byteOffset;
 
@@ -292,7 +292,7 @@ function arraybuffer2packed(
   arr: ArrayBuffer,
   existingPacked: number[] | undefined,
   existingPackedLen: number | undefined,
-  bigEndianMod: -1 | 1
+  bigEndianMod: -1 | 1,
 ): packedValue {
   return uint8array2packed(new Uint8Array(arr), existingPacked, existingPackedLen, bigEndianMod);
 }
@@ -308,7 +308,7 @@ function arraybuffer2packed(
 export function getStrConverter(
   format: FormatType,
   utfType: EncodingType,
-  bigEndianMod: -1 | 1
+  bigEndianMod: -1 | 1,
   /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
 ): (input: any, existingBin?: number[], existingBinLen?: number) => packedValue {
   /* Validate encoding */
@@ -369,7 +369,7 @@ export function getStrConverter(
     case "ARRAYBUFFER":
       try {
         new ArrayBuffer(0);
-      } catch (ignore) {
+      } catch {
         throw new Error(arraybuffer_error);
       }
       /**
@@ -384,7 +384,7 @@ export function getStrConverter(
     case "UINT8ARRAY":
       try {
         new Uint8Array(0);
-      } catch (ignore) {
+      } catch {
         throw new Error(uint8array_error);
       }
       /**
@@ -417,7 +417,7 @@ export function packed2hex(
   packed: number[],
   outputLength: number,
   bigEndianMod: -1 | 1,
-  formatOpts: { outputUpper: boolean; b64Pad: string }
+  formatOpts: { outputUpper: boolean; b64Pad: string },
 ): string {
   const hex_tab = "0123456789abcdef";
   let str = "",
@@ -449,7 +449,7 @@ export function packed2b64(
   packed: number[],
   outputLength: number,
   bigEndianMod: -1 | 1,
-  formatOpts: { outputUpper: boolean; b64Pad: string }
+  formatOpts: { outputUpper: boolean; b64Pad: string },
 ): string {
   let str = "",
     i,
@@ -560,19 +560,19 @@ export function getOutputConverter(
   format: "HEX" | "B64" | "BYTES",
   outputBinLen: number,
   bigEndianMod: -1 | 1,
-  outputOptions: { outputUpper: boolean; b64Pad: string }
+  outputOptions: { outputUpper: boolean; b64Pad: string },
 ): (binarray: number[]) => string;
 export function getOutputConverter(
   format: "ARRAYBUFFER",
   outputBinLen: number,
   bigEndianMod: -1 | 1,
-  outputOptions: { outputUpper: boolean; b64Pad: string }
+  outputOptions: { outputUpper: boolean; b64Pad: string },
 ): (binarray: number[]) => ArrayBuffer;
 export function getOutputConverter(
   format: "UINT8ARRAY",
   outputBinLen: number,
   bigEndianMod: -1 | 1,
-  outputOptions: { outputUpper: boolean; b64Pad: string }
+  outputOptions: { outputUpper: boolean; b64Pad: string },
 ): (binarray: number[]) => Uint8Array;
 /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
 export function getOutputConverter(format: any, outputBinLen: any, bigEndianMod: any, outputOptions: any): any {
@@ -593,7 +593,7 @@ export function getOutputConverter(format: any, outputBinLen: any, bigEndianMod:
       try {
         /* Need to test ArrayBuffer support */
         new ArrayBuffer(0);
-      } catch (ignore) {
+      } catch {
         throw new Error(arraybuffer_error);
       }
       return function (binarray: number[]): ArrayBuffer {
@@ -603,7 +603,7 @@ export function getOutputConverter(format: any, outputBinLen: any, bigEndianMod:
       try {
         /* Need to test Uint8Array support */
         new Uint8Array(0);
-      } catch (ignore) {
+      } catch {
         throw new Error(uint8array_error);
       }
       return function (binarray: number[]): Uint8Array {

src/sha3.ts

@@ -104,7 +104,7 @@ function roundSHA3(block: number[] | null, state: Int_64[][]): Int_64[][] {
     for (x = 0; x < block.length; x += 2) {
       state[(x >>> 1) % 5][((x >>> 1) / 5) | 0] = xor_64_2(
         state[(x >>> 1) % 5][((x >>> 1) / 5) | 0],
-        new Int_64(block[x + 1], block[x])
+        new Int_64(block[x + 1], block[x]),
       );
     }
   }
@@ -140,8 +140,8 @@ function roundSHA3(block: number[] | null, state: Int_64[][]): Int_64[][] {
           B[x][y],
           new Int_64(
             ~B[(x + 1) % 5][y].highOrder & B[(x + 2) % 5][y].highOrder,
-            ~B[(x + 1) % 5][y].lowOrder & B[(x + 2) % 5][y].lowOrder
-          )
+            ~B[(x + 1) % 5][y].lowOrder & B[(x + 2) % 5][y].lowOrder,
+          ),
         );
       }
     }
@@ -172,7 +172,7 @@ function finalizeSHA3(
   state: Int_64[][],
   blockSize: number,
   delimiter: number,
-  outputLen: number
+  outputLen: number,
 ): number[] {
   let i,
     state_offset = 0,
@@ -362,7 +362,7 @@ export default class jsSHA extends jsSHABase<Int_64[][], VariantType> {
     remainderBinLen: number,
     processedBinLen: number,
     H: Int_64[][],
-    outputLen: number
+    outputLen: number,
   ) => number[];
   stateCloneFunc: (state: Int_64[][]) => Int_64[][];
   newStateFunc: (variant: VariantType) => Int_64[][];
@@ -372,7 +372,7 @@ export default class jsSHA extends jsSHABase<Int_64[][], VariantType> {
   constructor(
     variant: FixedLengthVariantType,
     inputFormat: FormatNoTextType,
-    options?: FixedLengthOptionsNoEncodingType
+    options?: FixedLengthOptionsNoEncodingType,
   );
   constructor(variant: "SHAKE128" | "SHAKE256", inputFormat: "TEXT", options?: SHAKEOptionsEncodingType);
   constructor(variant: "SHAKE128" | "SHAKE256", inputFormat: FormatNoTextType, options?: SHAKEOptionsNoEncodingType);
@@ -505,7 +505,7 @@ export default class jsSHA extends jsSHABase<Int_64[][], VariantType> {
         state,
         variantBlockSize,
         delimiter,
-        outputBinLen
+        outputBinLen,
       );
     };
 
@@ -528,7 +528,7 @@ export default class jsSHA extends jsSHABase<Int_64[][], VariantType> {
     }
     const packedParams = packedLEConcat(
       encode_string(resolvedOptions["funcName"]),
-      encode_string(resolvedOptions["customization"])
+      encode_string(resolvedOptions["customization"]),
     );
 
     /* CSHAKE is defined to be a call to SHAKE iff both the customization and function-name string are both empty.  This
@@ -538,7 +538,7 @@ export default class jsSHA extends jsSHABase<Int_64[][], VariantType> {
       for (let i = 0; i < byte_pad_out.length; i += this.variantBlockSize >>> 5) {
         this.intermediateState = this.roundFunc(
           byte_pad_out.slice(i, i + (this.variantBlockSize >>> 5)),
-          this.intermediateState
+          this.intermediateState,
         );
         this.processedLen += this.variantBlockSize;
       }
@@ -561,7 +561,7 @@ export default class jsSHA extends jsSHABase<Int_64[][], VariantType> {
     for (let i = 0; i < byte_pad_out.length; i += this.variantBlockSize >>> 5) {
       this.intermediateState = this.roundFunc(
         byte_pad_out.slice(i, i + (this.variantBlockSize >>> 5)),
-        this.intermediateState
+        this.intermediateState,
       );
       this.processedLen += this.variantBlockSize;
     }
@@ -574,19 +574,18 @@ export default class jsSHA extends jsSHABase<Int_64[][], VariantType> {
    * @param options Hashmap of extra outputs options. `outputLen` must be specified.
    * @returns The KMAC in the format specified.
    */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   protected _getKMAC(options: { outputLen: number }): number[] {
     const concatedRemainder = packedLEConcat(
       { value: this.remainder.slice(), binLen: this.remainderLen },
-      right_encode(options["outputLen"])
+      right_encode(options["outputLen"]),
     );
 
     return this.finalizeFunc(
       concatedRemainder["value"],
       concatedRemainder["binLen"],
       this.processedLen,
       this.stateCloneFunc(this.intermediateState),
-      options["outputLen"]
+      options["outputLen"],
     );
   }
 }

src/sha512.ts

@@ -204,7 +204,7 @@ function finalizeSHA512(
   remainderBinLen: number,
   processedBinLen: number,
   H: Int_64[],
-  variant: VariantType
+  variant: VariantType,
 ): number[] {
   let i, retVal;
 
@@ -236,7 +236,6 @@ function finalizeSHA512(
   }
 
   if ("SHA-384" === variant) {
-    H = (H as unknown) as Int_64[];
     retVal = [
       H[0].highOrder,
       H[0].lowOrder,

test/hash_data.js

@@ -1,10 +1,11 @@
 /* globals module, define, self */
 (function (global, factory) {
+  /* eslint-disable-next-line @typescript-eslint/no-unused-expressions */
   typeof exports === "object" && typeof module !== "undefined"
     ? (module.exports = factory())
     : typeof define === "function" && define.amd
-    ? define(factory)
-    : ((global = global || self), (global.hashData = factory()));
+      ? define(factory)
+      : ((global = global || self), (global.hashData = factory()));
 })(this, function () {
   "use strict";
 

test/src/common.ts

@@ -20,15 +20,14 @@ export function runHashTests(
     | "KMAC128"
     | "KMAC256",
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  jsSHA: any
+  jsSHA: any,
 ): void {
   describe(`Test jsSHA(${variant}) Using NIST Tests`, () => {
     hashData[variant].forEach((test) => {
       test.outputs.forEach((output) => {
         if (test.hmacKey) {
           it(test.name + " - Old Style", () => {
             const hashObj = new jsSHA(variant, test.input.format);
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
             hashObj.setHMACKey(test.hmacKey.value, test.hmacKey.format);
             hashObj.update(test.input.value);