refactor(force-return-types): address review comments

jellyfin · Jan 2, 2021 · c409ac9 · c409ac9
1 parent b2cc69c
commit c409ac9
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 22 deletions.
diff --git a/components/Buttons/UserButton.vue b/components/Buttons/UserButton.vue
@@ -29,14 +29,19 @@
 import Vue from 'vue';
 import { mapActions } from 'vuex';
 
+interface MenuItem {
+  title: string;
+  action: () => void;
+}
+
 export default Vue.extend({
   data() {
     return {
       avatarSize: 48
     };
   },
   computed: {
-    menuItems(): Array<Record<never, never>> {
+    menuItems(): MenuItem[] {
       return [
         {
           title: this.$t('logout'),

diff --git a/components/Item/ItemGrid.vue b/components/Item/ItemGrid.vue
@@ -49,7 +49,7 @@ export default Vue.extend({
     items: {
       type: Array,
       required: true,
-      default: (): Array<never> => {
+      default: (): BaseItemDto[] => {
         return [];
       }
     },

diff --git a/components/Item/Metadata/ImageEditor.vue b/components/Item/Metadata/ImageEditor.vue
@@ -76,15 +76,15 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import { ImageInfo, ImageType } from '@jellyfin/client-axios';
+import { BaseItemDto, ImageInfo, ImageType } from '@jellyfin/client-axios';
 import imageHelper from '~/mixins/imageHelper';
 
 export default Vue.extend({
   mixins: [imageHelper],
   props: {
     metadata: {
       type: Object,
-      default: (): Record<never, never> => ({})
+      default: (): BaseItemDto => ({})
     }
   },
   data() {
@@ -104,7 +104,7 @@ export default Vue.extend({
         );
       });
     },
-    backdropImages(): Array<never> {
+    backdropImages(): ImageInfo[] {
       return this.$data.images.filter((image: ImageInfo) => {
         const { ImageType } = image;
         return ImageType === 'Backdrop';

diff --git a/components/Item/Metadata/ImageSearch.vue b/components/Item/Metadata/ImageSearch.vue
@@ -95,7 +95,8 @@ import Vue from 'vue';
 import {
   ImageProviderInfo,
   RemoteImageInfo,
-  ImageType
+  ImageType,
+  BaseItemDto
 } from '@jellyfin/client-axios';
 
 export default Vue.extend({
@@ -108,7 +109,7 @@ export default Vue.extend({
   props: {
     metadata: {
       type: Object,
-      default: (): Record<never, never> => ({})
+      default: (): BaseItemDto => ({})
     },
     dialog: {
       type: Boolean,

diff --git a/components/Item/Metadata/PersonEditor.vue b/components/Item/Metadata/PersonEditor.vue
@@ -65,7 +65,7 @@ export default Vue.extend({
   props: {
     person: {
       type: Object,
-      default: (): Record<string, string> => ({
+      default: (): BaseItemPerson => ({
         Name: '',
         Type: '',
         Role: ''

diff --git a/components/Item/PersonList.vue b/components/Item/PersonList.vue
@@ -37,15 +37,15 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import { ImageType } from '@jellyfin/client-axios';
+import { BaseItemPerson, ImageType } from '@jellyfin/client-axios';
 import imageHelper from '~/mixins/imageHelper';
 
 export default Vue.extend({
   mixins: [imageHelper],
   props: {
     items: {
       type: Array,
-      default: (): Array<never> => {
+      default: (): BaseItemPerson[] => {
         return [];
       }
     },

diff --git a/layouts/default.vue b/layouts/default.vue
@@ -123,6 +123,12 @@ interface WebSocketMessage {
   Data?: Record<string, never>;
 }
 
+interface LayoutButton {
+  icon: string;
+  title: string;
+  to: string;
+}
+
 export default Vue.extend({
   data() {
     return {
@@ -143,7 +149,7 @@ export default Vue.extend({
           };
         })
     }),
-    items(): Array<Record<string, string>> {
+    items(): LayoutButton[] {
       return [
         {
           icon: 'mdi-home',
@@ -152,7 +158,7 @@ export default Vue.extend({
         }
       ];
     },
-    configItems(): Array<Record<string, string>> {
+    configItems(): LayoutButton[] {
       return [
         {
           icon: 'mdi-pencil-outline',

diff --git a/pages/person/_itemId/index.vue b/pages/person/_itemId/index.vue
@@ -172,7 +172,7 @@ export default Vue.extend({
       }
     },
     birthPlace: {
-      get(): null {
+      get(): string | null {
         if (this.$data.item.ProductionLocations) {
           return this.$data.item.ProductionLocations[0];
         } else {
@@ -181,7 +181,7 @@ export default Vue.extend({
       }
     },
     movies: {
-      get(): Array<Record<string, string>> {
+      get(): BaseItemDto[] {
         return this.$data.appearances
           .filter((appearance: BaseItemDto) => {
             return appearance.Type === 'Movie';
@@ -190,7 +190,7 @@ export default Vue.extend({
       }
     },
     shows: {
-      get(): Array<Record<string, string>> {
+      get(): BaseItemDto[] {
         return this.$data.appearances
           .filter((appearance: BaseItemDto) => {
             return appearance.Type === 'Series';

diff --git a/plugins/browserDetection.ts b/plugins/browserDetection.ts
@@ -101,9 +101,7 @@ class BrowserDetector {
    * @memberof BrowserDetector
    */
   isApple(): boolean {
-    return (navigator.vendor &&
-      navigator.vendor.includes('Apple') &&
-      !this.isTizen()) as boolean;
+    return navigator?.vendor.includes('Apple') && !this.isTizen();
   }
 
   /**

diff --git a/store/homeSection.ts b/store/homeSection.ts
@@ -45,9 +45,7 @@ type MutationPayload = {
 };
 
 export const getters: GetterTree<HomeSectionState, AppState> = {
-  getHomeSectionContent: (state) => (
-    section: HomeSection
-  ): Array<never> | BaseItemDto | BaseItemDto[] => {
+  getHomeSectionContent: (state) => (section: HomeSection): BaseItemDto[] => {
     switch (section.type) {
       case 'libraries':
         return state.libraries;

diff --git a/store/tvShows.ts b/store/tvShows.ts
@@ -38,7 +38,7 @@ export const getters: GetterTree<TvShowsState, AppState> = {
     itemId
   }: {
     itemId: string;
-  }): Array<BaseItemDto[]> => {
+  }): BaseItemDto[][] => {
     return state[itemId]?.seasonEpisodes;
   }
 };