Replace ArrayElementType<T> with T[number]

yu256 · Dec 3, 2023 · b4c3d3b · b4c3d3b
1 parent f835f91
commit b4c3d3b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/packages/frontend/src/components/VrcUser.vue b/packages/frontend/src/components/VrcUser.vue
@@ -11,10 +11,9 @@
 <script lang="ts" setup>
 import VrcAvatar from '@/components/VrcAvatar.vue';
 import { HitUsers } from '@/scripts/vrchat-api';
-import { ArrayElementType } from '@/types/custom-utilities';
 
 defineProps<{
- user: ArrayElementType<HitUsers>;
+ user: HitUsers[number];
 }>();
 </script>
 

diff --git a/packages/frontend/src/pages/vrchat-world.vue b/packages/frontend/src/pages/vrchat-world.vue
@@ -47,7 +47,6 @@ import { User, World, fetchVrcWithAuth, addToFavorites } from '@/scripts/vrchat-
 import { definePageMetadata } from '@/scripts/page-metadata';
 import MkSelect from '@/components/MkSelect.vue';
 import MkButton from '@/components/MkButton.vue';
-import { ArrayElementType } from '@/types/custom-utilities';
 import { toast } from '@/os';
 
 const props = defineProps<{
@@ -63,7 +62,7 @@ fetchVrcWithAuth('world', props.id).then(async wrld => {
  if (wrld) author.value = await fetchVrcWithAuth('user', wrld.authorId);
 });
 
-const selectedOption = ref<ArrayElementType<typeof options>['value']>('created_at');
+const selectedOption = ref<typeof options[number]['value']>('created_at');
 let timeKey = 0;
 
 const options = [

diff --git a/packages/frontend/src/scripts/vrchat-api.ts b/packages/frontend/src/scripts/vrchat-api.ts
@@ -1,6 +1,6 @@
 import { defaultStore } from '@/store';
 import { alert as miAlert, select, toast } from '@/os';
-import { ArrayElementType, SomeRequired } from '@/types/custom-utilities';
+import { SomeRequired } from '@/types/custom-utilities';
 
 type ApiResponse<T> = { Success: T } | { Error: string };
 
@@ -187,7 +187,7 @@ export type User = {
  isFriend: boolean;
  location: string;
  travelingToLocation?: string;
- status: ArrayElementType<typeof status>;
+ status: typeof status[number];
  statusDescription?: string;
  rank: string;
 };

diff --git a/packages/frontend/src/types/custom-utilities.ts b/packages/frontend/src/types/custom-utilities.ts
@@ -1,7 +1,5 @@
 export type CustomPartial<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
 
-export type ArrayElementType<T> = T extends readonly (infer U)[] ? U : never;
-
 export type SomeRequired<T, K extends keyof T> = Omit<T, K> & Required<RequiredNotNull<Pick<T, K>>>;
 export type RequiredNotNull<T> = {
  [P in keyof T]: NonNullable<T[P]>;