From 6eecf1cde023c40f56d0bbe42c004a77fc4d4f05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Ml=C3=A1dek?= <t@mldk.cz>
Date: Mon, 1 Aug 2022 22:40:45 +0200
Subject: [PATCH] chore: missing types, fix (some) Svelte check warnings

---
 webui/package.json                            |  6 ++
 .../display/blobs/AudioViewer.svelte          | 20 +++--
 .../display/blobs/ModelViewer.svelte          |  2 +-
 webui/src/components/layout/Jobs.svelte       |  2 +-
 webui/yarn.lock                               | 84 +++++++++++++++++++
 5 files changed, 103 insertions(+), 11 deletions(-)

diff --git a/webui/package.json b/webui/package.json
index e669d3a..64f17c0 100644
--- a/webui/package.json
+++ b/webui/package.json
@@ -14,6 +14,12 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "^1.0.1",
     "@tsconfig/svelte": "^3.0.0",
+    "@types/dompurify": "^2.3.3",
+    "@types/lodash": "^4.14.182",
+    "@types/lru-cache": "^7.10.10",
+    "@types/marked": "^4.0.3",
+    "@types/three": "^0.143.0",
+    "@types/wavesurfer.js": "^6.0.3",
     "@typescript-eslint/eslint-plugin": "^5.32.0",
     "@typescript-eslint/parser": "^5.32.0",
     "eslint": "^8.21.0",
diff --git a/webui/src/components/display/blobs/AudioViewer.svelte b/webui/src/components/display/blobs/AudioViewer.svelte
index 2ee1396..4d61125 100644
--- a/webui/src/components/display/blobs/AudioViewer.svelte
+++ b/webui/src/components/display/blobs/AudioViewer.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { debounce, throttle } from "lodash";
   import { onMount } from "svelte";
+  import type { IValue } from "upend/types";
   import type WaveSurfer from "wavesurfer.js";
   import type { Region, RegionParams } from "wavesurfer.js/src/plugin/regions";
   import {
@@ -36,7 +37,8 @@
   // Annotations
   const DEFAULT_ANNOTATION_COLOR = "#cb4b16";
 
-  let currentAnnotation: Region | undefined;
+  type UpRegion = Region & { data: IValue };
+  let currentAnnotation: UpRegion | undefined;
   $: currentAnnotationIndex =
     Array.from(regions)
       .sort((a, b) => a.start - b.start)
@@ -113,7 +115,7 @@
       c: new TimeFragment(region.start, region.end).toString(),
     });
 
-    await putEntityAttribute(entity, "LBL", region.data);
+    await putEntityAttribute(entity, "LBL", region.data as IValue);
 
     await putEntityAttribute(entity, "COLOR", {
       t: "String",
@@ -162,7 +164,7 @@
       loadAnnotations();
     });
 
-    wavesurfer.on("region-created", (region: Region) => {
+    wavesurfer.on("region-created", (region: UpRegion) => {
       regions.add(region);
       if (!region.attributes["upend-id"]) {
         createAnnotation(region);
@@ -170,31 +172,31 @@
       }
     });
 
-    wavesurfer.on("region-updated", (region: Region) => {
+    wavesurfer.on("region-updated", (region: UpRegion) => {
       currentAnnotation = region;
     });
 
-    wavesurfer.on("region-update-end", (region: Region) => {
+    wavesurfer.on("region-update-end", (region: UpRegion) => {
       updateAnnotation(region);
       currentAnnotation = region;
     });
 
-    wavesurfer.on("region-removed", (region: Region) => {
+    wavesurfer.on("region-removed", (region: UpRegion) => {
       deleteAnnotation(region);
       regions.delete(region);
     });
 
-    wavesurfer.on("region-in", (region: Region) => {
+    wavesurfer.on("region-in", (region: UpRegion) => {
       currentAnnotation = region;
     });
 
-    wavesurfer.on("region-out", (region: Region) => {
+    wavesurfer.on("region-out", (region: UpRegion) => {
       if (currentAnnotation.id === region.id) {
         currentAnnotation = undefined;
       }
     });
 
-    wavesurfer.on("region-dblclick", (region: Region, _ev: MouseEvent) => {
+    wavesurfer.on("region-dblclick", (region: UpRegion, _ev: MouseEvent) => {
       currentAnnotation = region;
       setTimeout(() => wavesurfer.setCurrentTime(region.start));
     });
diff --git a/webui/src/components/display/blobs/ModelViewer.svelte b/webui/src/components/display/blobs/ModelViewer.svelte
index 9f6a487..a864847 100644
--- a/webui/src/components/display/blobs/ModelViewer.svelte
+++ b/webui/src/components/display/blobs/ModelViewer.svelte
@@ -8,7 +8,7 @@
   onMount(async () => {
     root.style.height = `${root.clientWidth}px`;
 
-    const THREE = await import("three/src/Three");
+    const THREE = await import("three");
     const THREE_OC = await import("three/examples/jsm/controls/OrbitControls");
     const THREE_STL = await import("three/examples/jsm/loaders/STLLoader");
 
diff --git a/webui/src/components/layout/Jobs.svelte b/webui/src/components/layout/Jobs.svelte
index 4e0a796..6250e6d 100644
--- a/webui/src/components/layout/Jobs.svelte
+++ b/webui/src/components/layout/Jobs.svelte
@@ -19,7 +19,7 @@
 
   let jobs: IJob[] = [];
   let activeJobs: JobWithId[] = [];
-  let timeout: number;
+  let timeout: NodeJS.Timeout;
   async function updateJobs() {
     clearTimeout(timeout);
     jobs = await fetchJobs();
diff --git a/webui/yarn.lock b/webui/yarn.lock
index 5a89146..b90115b 100644
--- a/webui/yarn.lock
+++ b/webui/yarn.lock
@@ -324,6 +324,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/debounce@npm:*":
+  version: 3.0.0
+  resolution: "@types/debounce@npm:3.0.0"
+  checksum: af99f44f8ce90388aa5a909066c64b4ddc5efdff72bccf7dcef1fe8a04f03d03a7a42cc1f42ff14620c66923f92600ccfeb768bd77ad250f12a6ebca116ca719
+  languageName: node
+  linkType: hard
+
+"@types/dompurify@npm:^2.3.3":
+  version: 2.3.3
+  resolution: "@types/dompurify@npm:2.3.3"
+  dependencies:
+    "@types/trusted-types": "*"
+  checksum: 427e2dc60d94d13d7860a293b926b376727cb2f545a3334a3f2e7de695a2bb23058dd15108e49e0651378229b443ee8ae0028034b6f2df9a9008c04fb7ad6f8f
+  languageName: node
+  linkType: hard
+
 "@types/json-schema@npm:^7.0.9":
   version: 7.0.11
   resolution: "@types/json-schema@npm:7.0.11"
@@ -331,6 +347,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/lodash@npm:^4.14.182":
+  version: 4.14.182
+  resolution: "@types/lodash@npm:4.14.182"
+  checksum: 7dd137aa9dbabd632408bd37009d984655164fa1ecc3f2b6eb94afe35bf0a5852cbab6183148d883e9c73a958b7fec9a9bcf7c8e45d41195add6a18c34958209
+  languageName: node
+  linkType: hard
+
+"@types/lru-cache@npm:^7.10.10":
+  version: 7.10.10
+  resolution: "@types/lru-cache@npm:7.10.10"
+  dependencies:
+    lru-cache: "*"
+  checksum: bf0c9a99b3b954adfd1a63621aeea2c7f9412340ac43fad82f2b1ec257df09efa454e6cc7943518659e112b9d650de0e64c5252de9e449576eeb28449e068a1e
+  languageName: node
+  linkType: hard
+
+"@types/marked@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "@types/marked@npm:4.0.3"
+  checksum: 2fc409a6291cb770688731a444f54e7eab6257c9b565dea4e9d2f3b6654b606e9dd8ea4a924e306b2d2f581dedcb7a27f10f2ca7aed828b11642ab85955341f1
+  languageName: node
+  linkType: hard
+
 "@types/node@npm:*":
   version: 17.0.13
   resolution: "@types/node@npm:17.0.13"
@@ -354,6 +393,38 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/three@npm:^0.143.0":
+  version: 0.143.0
+  resolution: "@types/three@npm:0.143.0"
+  dependencies:
+    "@types/webxr": "*"
+  checksum: 1e4557a844fac4efe6d8af90960322f50f1d26f6394c033bea8868519ce89f36e3b03ce85d2b7320868f11a46b3fe5bd6178e89e750ccd50e68fb5806af58588
+  languageName: node
+  linkType: hard
+
+"@types/trusted-types@npm:*":
+  version: 2.0.2
+  resolution: "@types/trusted-types@npm:2.0.2"
+  checksum: 3371eef5f1c50e1c3c07a127c1207b262ba65b83dd167a1c460fc1b135a3fb0c97b9f508efebd383f239cc5dd5b7169093686a692a501fde9c3f7208657d9b0d
+  languageName: node
+  linkType: hard
+
+"@types/wavesurfer.js@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "@types/wavesurfer.js@npm:6.0.3"
+  dependencies:
+    "@types/debounce": "*"
+  checksum: 41b45e1863474da106ea95573134171142d26b11775922f153775ed0b070b2a430146f9f293353df12de4991f2d224b1413f1b9dc6a60e1383aeacfa83fc4177
+  languageName: node
+  linkType: hard
+
+"@types/webxr@npm:*":
+  version: 0.5.0
+  resolution: "@types/webxr@npm:0.5.0"
+  checksum: 891af0e96a229f45584d89daa3101232862da2ded14076aa631b2e12deb4e4b91fa35ff8d8d5ab4613aa8adce0870bd32cd61f070c1bc70d37303c515e1ae6ac
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/eslint-plugin@npm:^5.32.0":
   version: 5.32.0
   resolution: "@typescript-eslint/eslint-plugin@npm:5.32.0"
@@ -2262,6 +2333,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lru-cache@npm:*":
+  version: 7.13.1
+  resolution: "lru-cache@npm:7.13.1"
+  checksum: f53c7dd098a7afd6342b23f7182629edff206c7665de79445a7f5455440e768a4d1c6ec52e1a16175580c71535c9437dfb6f6bc22ca1a0e4a7454a97cde87329
+  languageName: node
+  linkType: hard
+
 "lru-cache@npm:^6.0.0":
   version: 6.0.0
   resolution: "lru-cache@npm:6.0.0"
@@ -3871,6 +3949,12 @@ __metadata:
     "@recogito/annotorious": ^2.7.1
     "@sveltejs/vite-plugin-svelte": ^1.0.1
     "@tsconfig/svelte": ^3.0.0
+    "@types/dompurify": ^2.3.3
+    "@types/lodash": ^4.14.182
+    "@types/lru-cache": ^7.10.10
+    "@types/marked": ^4.0.3
+    "@types/three": ^0.143.0
+    "@types/wavesurfer.js": ^6.0.3
     "@typescript-eslint/eslint-plugin": ^5.32.0
     "@typescript-eslint/parser": ^5.32.0
     boxicons: ^2.1.1