From 17218e27196971dc3611024ba994f32779b367cd Mon Sep 17 00:00:00 2001
From: Michael <michaelmrowetz@gmail.com>
Date: Sat, 12 Nov 2022 17:20:00 -0500
Subject: [PATCH] chore: update TS to 4.8.4

---
 package-lock.json          | 14 +++++++-------
 package.json               |  2 +-
 src/ts/file-reader.ts      |  2 +-
 src/ts/transformers/har.ts | 15 ++++++++-------
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7e473486..d45b6bab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30,7 +30,7 @@
         "tsify": "^5.0.4",
         "tslint": "~6.1.3",
         "tslint-eslint-rules": "^5.4.0",
-        "typescript": "^4.3.2",
+        "typescript": "^4.8.4",
         "whatwg-fetch": "^3.6.2"
       }
     },
@@ -8703,9 +8703,9 @@
       "dev": true
     },
     "node_modules/typescript": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.2.tgz",
-      "integrity": "sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==",
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
+      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -16381,9 +16381,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.2.tgz",
-      "integrity": "sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==",
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
+      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
       "dev": true
     },
     "uglify-js": {
diff --git a/package.json b/package.json
index 4cf271ff..fad38118 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "tsify": "^5.0.4",
     "tslint": "~6.1.3",
     "tslint-eslint-rules": "^5.4.0",
-    "typescript": "^4.3.2",
+    "typescript": "^4.8.4",
     "whatwg-fetch": "^3.6.2"
   },
   "dependencies": {
diff --git a/src/ts/file-reader.ts b/src/ts/file-reader.ts
index e81b5fcb..2a6eea6e 100644
--- a/src/ts/file-reader.ts
+++ b/src/ts/file-reader.ts
@@ -21,7 +21,7 @@ export function readFile(file: File,
       const harData = JSON.parse(rawData);
       callback(null, harData.log);
     } catch (e) {
-      callback(e);
+      callback(e as Error);
     }
   }
 
diff --git a/src/ts/transformers/har.ts b/src/ts/transformers/har.ts
index 7182c34c..91fc49e6 100644
--- a/src/ts/transformers/har.ts
+++ b/src/ts/transformers/har.ts
@@ -214,7 +214,7 @@ const getUserTimings = (currPage: Page, options: ChartOptions) => {
     name = escapeHtml(name);
 
     if (fullName !== name && currPage[`_userTime.endTimer-${name}`]) {
-      duration = currPage[`_userTime.endTimer-${name}`] - currPage[k];
+      duration = currPage[`_userTime.endTimer-${name}`] as number - currPage[k];
       return {
         duration,
         name: `${options.showUserTimingEndMarker ? fullName : name} (${currPage[k]} - ${currPage[k] + duration} ms)`,
@@ -279,18 +279,19 @@ const buildDetailTimingBlocks = (startRelative: number, harEntry: Entry): Waterf
  * @param  {number} startRelative - Number of milliseconds since page load started (`page.startedDateTime`)
  * @returns {Object}
  */
-const getTimePair = (key: string, harEntry: Entry, collect: WaterfallEntryTiming[], startRelative: number) => {
-  let wptKey;
+const getTimePair = (key: TimingType, harEntry: Entry, collect: WaterfallEntryTiming[], startRelative: number) => {
+  let wptKey: Exclude<TimingType, 'wait' | 'receive'>  | 'ttfb' | 'download';
+
   switch (key) {
     case "wait": wptKey = "ttfb"; break;
     case "receive": wptKey = "download"; break;
     default: wptKey = key;
   }
-  const preciseStart = parseInt(harEntry[`_${wptKey}_start`], 10);
-  const preciseEnd = parseInt(harEntry[`_${wptKey}_end`], 10);
+  const preciseStart = parseInt(`${harEntry[`_${wptKey}_start`]}`, 10);
+  const preciseEnd = parseInt(`${harEntry[`_${wptKey}_end`]}`, 10);
   const start = isNaN(preciseStart) ?
-    ((collect.length > 0) ? collect[collect.length - 1].end : startRelative) : preciseStart;
-  const end = isNaN(preciseEnd) ? (start + harEntry.timings[key]) : preciseEnd;
+  ((collect.length > 0) ? collect[collect.length - 1].end : startRelative) : preciseStart;
+  const end = isNaN(preciseEnd) ? (start + (harEntry.timings[key] ?? 0)) : preciseEnd;
 
   return {
     end: Math.round(end),