From 3cd07d7e633aedd4943a6076f3d85b3ebfbef54d Mon Sep 17 00:00:00 2001
From: adroslice <adriel.m.slice@gmail.com>
Date: Fri, 2 Aug 2024 14:03:11 +0200
Subject: [PATCH] Fixed more typescript warnings

- Mainly moved type exports to .ts file
---
 client/src/components/input/DropdownInput.vue | 24 +++----------
 client/src/components/input/EnumInput.vue     | 17 ++-------
 client/src/components/input/NicerForm.vue     | 15 ++------
 client/src/components/input/input.ts          | 35 +++++++++++++++++++
 client/src/definitions.ts                     |  2 +-
 5 files changed, 45 insertions(+), 48 deletions(-)
 create mode 100644 client/src/components/input/input.ts

diff --git a/client/src/components/input/DropdownInput.vue b/client/src/components/input/DropdownInput.vue
index 86bf7c4..4d249e4 100644
--- a/client/src/components/input/DropdownInput.vue
+++ b/client/src/components/input/DropdownInput.vue
@@ -1,21 +1,7 @@
 <!-- Base component that implements selecting single and multiple values from a list in a type-unsafe manner -->
-<script lang="ts">
-// Types
-export type Options = Record<Index, Option>;
-export type Option = {
-  [key: Index]: any, // Allow additional properties for customization
-  display?: string,
-};
-export type SearchProvider = (opts: SearchOptions) => Promise<Options>;
-export type MaybeSearchProvider = SearchProvider | null;
-export type SearchOptions = {
-  search: string,
-  unknownKeys?: Index[],
-  // parentData?: any,
-};
-</script>
 <script setup lang="ts">
 import { equals, isNullish, Index } from '../../util';
+import type { Options, MaybeSearchProvider } from './input';
 // --- Prop setup ---
 const props = withDefaults(defineProps<{
   // Two-Way Bindings (v-model)
@@ -89,9 +75,9 @@ watch($$(multiple), () => modelValue = multiple ? [] : null );
 // --- Everything Else  ---
 let expanded = $ref(false);
 let navigated = $ref(0);
-let inputDiv: HTMLElement | null = $ref(null);
-let input: HTMLElement | null = $ref(null);
-let valueButton: HTMLElement | null = $ref(null);
+let inputDiv = $ref(null as HTMLElement | null);
+let input = $ref(null as HTMLElement | null);
+let valueButton = $ref(null as HTMLElement | null);
 
 const selCount = $computed(() => modelValue?.length || 0);
 
@@ -266,4 +252,4 @@ input { padding: 0.25rem; outline: none; }
 
 div:empty { display: none; }
 button { padding: 0.25rem; }
-</style>
\ No newline at end of file
+</style>
diff --git a/client/src/components/input/EnumInput.vue b/client/src/components/input/EnumInput.vue
index c079ecd..1c44382 100644
--- a/client/src/components/input/EnumInput.vue
+++ b/client/src/components/input/EnumInput.vue
@@ -1,19 +1,6 @@
-<script lang="ts">
-import { Index, MaybeIndex, equals, variantOf } from '../../util';
-import { Fields } from './NicerForm.vue';
-
-export type Variant = {
-  fields?: Fields,
-  display?: string,
-  icon?: Component
-};
-export type Variants = Record<Index, Variant>;
-export type EnumValueWithFields = { [index: Index]: Record<Index, any> }
-export type EnumValue = Index | EnumValueWithFields;
-export type MaybeEnumValue = EnumValue | null;
-</script>
-
 <script setup lang="ts">
+import type { MaybeEnumValue, Variants, EnumValueWithFields } from './input';
+import { equals, variantOf, MaybeIndex, Index } from '~/util';
 
 const props = withDefaults(defineProps<{
   // Two-Way Bindings
diff --git a/client/src/components/input/NicerForm.vue b/client/src/components/input/NicerForm.vue
index 8ee03c9..3f3d7ad 100644
--- a/client/src/components/input/NicerForm.vue
+++ b/client/src/components/input/NicerForm.vue
@@ -1,17 +1,6 @@
-<script lang="ts">
-import { equals, Index } from '../../util';
-
-export type Field = {
-  is: Component | string,
-  label?: string,
-  props?: any,
-  // actions?: Action[],
-  // forceCastNumber`?: bool,
-};
-export type Fields = Record<Index, Field>;
-</script>
-
 <script setup lang="ts">
+import { equals, Index } from '../../util';
+import type { Fields } from './input';
 const props = withDefaults(defineProps<{
   // Two-Way Bindings
   modelValue?: Record<Index, any>,
diff --git a/client/src/components/input/input.ts b/client/src/components/input/input.ts
new file mode 100644
index 0000000..7b69d8d
--- /dev/null
+++ b/client/src/components/input/input.ts
@@ -0,0 +1,35 @@
+import { Index } from '~/util';
+// --- DROPDOWN_INPUT ---
+export type Options = Record<Index, Option>;
+export type Option = {
+  [key: Index]: any, // Allow additional properties for customization
+  display?: string,
+};
+export type SearchProvider = (opts: SearchOptions) => Promise<Options>;
+export type MaybeSearchProvider = SearchProvider | null;
+export type SearchOptions = {
+  search: string,
+  unknownKeys?: Index[],
+  // parentData?: any,
+};
+
+// --- FORM INPUT ---
+export type Field = {
+  is: Component | string,
+  label?: string,
+  props?: any,
+  // actions?: Action[],
+  // forceCastNumber`?: bool,
+};
+export type Fields = Record<Index, Field>;
+
+// --- ENUM INPUT ---
+export type Variant = {
+  fields?: Fields,
+  display?: string,
+  icon?: Component
+};
+export type Variants = Record<Index, Variant>;
+export type EnumValueWithFields = { [index: Index]: Record<Index, any> }
+export type EnumValue = Index | EnumValueWithFields;
+export type MaybeEnumValue = EnumValue | null;
diff --git a/client/src/definitions.ts b/client/src/definitions.ts
index 86919ca..9ee2e58 100644
--- a/client/src/definitions.ts
+++ b/client/src/definitions.ts
@@ -1,4 +1,4 @@
-import { SearchProvider, Options } from '~/components/input/DropdownInput.vue';
+import { SearchProvider, Options } from '~/components/input/input';
 import { apiCall } from './api';
 
 const GetHardwareInterfaces: SearchProvider = async (o) => {