fix linting

beyond-all-reason · Nov 20, 2024 · bd8a4aa · bd8a4aa
1 parent f03e8db
commit bd8a4aa
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 19 deletions.
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -29,7 +29,13 @@ export default [
         rules: {
             "vue/multi-word-component-names": "off",
             "@typescript-eslint/no-unused-vars": "warn",
-            "@typescript-eslint/no-unused-expressions": "warn",
+            "@typescript-eslint/no-unused-expressions": [
+                "warn",
+                {
+                    allowShortCircuit: true,
+                    allowTernary: true,
+                },
+            ],
             "@typescript-eslint/no-explicit-any": "warn",
             "@typescript-eslint/no-non-null-asserted-optional-chain": "warn",
             "@typescript-eslint/no-unsafe-function-type": "warn",

diff --git a/src/renderer/components/controls/Range.vue b/src/renderer/components/controls/Range.vue
@@ -39,7 +39,7 @@ import Slider, { type SliderProps } from "primevue/slider";
 
 import Control from "@renderer/components/controls/Control.vue";
 
-export interface Props extends SliderProps {}
+export type Props = SliderProps;
 
 const props = defineProps<Props>();
 const emits = defineEmits<{

diff --git a/src/renderer/components/maps/MapListComponent.vue b/src/renderer/components/maps/MapListComponent.vue
@@ -29,13 +29,13 @@
  * - Easy one click install button
  * - Demo map button that launches a simple offline game on the map
  */
-
 import { Ref, ref } from "vue";
 
 import SearchBox from "@renderer/components/controls/SearchBox.vue";
 import Select from "@renderer/components/controls/Select.vue";
 import MapOverviewCard from "@renderer/components/maps/MapOverviewCard.vue";
 import { type MapData } from "@main/content/maps/map-data";
+import type { GameType, Terrain } from "@main/content/maps/map-metadata";
 import { db } from "@renderer/store/db";
 import { useDexieLiveQueryWithDeps } from "@renderer/composables/useDexieLiveQuery";
 import { mapsStore } from "@renderer/store/maps.store";
@@ -68,16 +68,8 @@ useInfiniteScroll(
 
 const maps = useDexieLiveQueryWithDeps([searchVal, sortMethod, limit, filters], () => {
     const { terrain, gameType } = filters;
-    const terrainFilters = new Set([
-        ...Object.entries(terrain)
-            .filter(([_, v]) => v)
-            .map(([k]) => k),
-    ]);
-    const gameTypeFilters = new Set([
-        ...Object.entries(gameType)
-            .filter(([_, v]) => v)
-            .map(([k]) => k),
-    ]);
+    const terrainFilters = new Set([...(<Terrain[]>Object.keys(terrain)).filter((key) => !!terrain[key]).map((k) => k)]);
+    const gameTypeFilters = new Set([...(<GameType[]>Object.keys(gameType)).filter((key) => gameType[key]).map((k) => k)]);
     return db.maps
         .filter(
             (map) =>

diff --git a/src/renderer/components/maps/MapOverviewCard.vue b/src/renderer/components/maps/MapOverviewCard.vue
@@ -11,7 +11,7 @@
             </div>
         </div>
         <div class="attributes br flex-row gap-sm">
-            <TerrainIcon v-for="terrain in map?.terrain" :terrain="terrain" />
+            <TerrainIcon v-for="terrain in map?.terrain" :terrain="terrain" v-bind:key="terrain" />
         </div>
     </div>
 </template>

diff --git a/src/renderer/components/maps/filters/GameTypeFilter.vue b/src/renderer/components/maps/filters/GameTypeFilter.vue
@@ -1,6 +1,11 @@
 <template>
     <div class="game-type-container gap-md">
-        <IconFilterCheckbox v-for="gameType in gameTypeOptions" v-model:checked="gameTypeFilters[gameType]" class="game-type-option">
+        <IconFilterCheckbox
+            v-for="gameType in gameTypeOptions"
+            v-model:checked="gameTypeFilters[gameType]"
+            v-bind:key="gameType"
+            class="game-type-option"
+        >
             <div>{{ /^\D.*/.test(gameType) ? gameType.toUpperCase() : gameType }}</div>
         </IconFilterCheckbox>
     </div>

diff --git a/src/renderer/components/maps/filters/TerrainFilter.vue b/src/renderer/components/maps/filters/TerrainFilter.vue
@@ -1,18 +1,18 @@
 <template>
     <div class="flex-col gap-md">
         <div class="terrain-container gap-md">
-            <IconFilterCheckbox v-for="terrain in terrainOptions" v-model:checked="terrainFilters[terrain]">
+            <IconFilterCheckbox v-for="terrain in terrainOptions" v-model:checked="terrainFilters[terrain]" v-bind:key="terrain">
                 <TerrainIcon :terrain="terrain" class="lg" />
             </IconFilterCheckbox>
         </div>
         <div class="flex-row gap-md">
             <div class="terrain-container water gap-md">
-                <IconFilterCheckbox v-for="terrain in waterOptions" v-model:checked="terrainFilters[terrain]">
+                <IconFilterCheckbox v-for="terrain in waterOptions" v-model:checked="terrainFilters[terrain]" v-bind:key="terrain">
                     <TerrainIcon :terrain="terrain" class="lg" />
                 </IconFilterCheckbox>
             </div>
             <div class="terrain-container layout gap-md">
-                <IconFilterCheckbox v-for="terrain in layoutOptions" v-model:checked="terrainFilters[terrain]">
+                <IconFilterCheckbox v-for="terrain in layoutOptions" v-model:checked="terrainFilters[terrain]" v-bind:key="terrain">
                     <TerrainIcon :terrain="terrain" class="lg" />
                 </IconFilterCheckbox>
             </div>

diff --git a/src/renderer/views/library/maps/index.vue b/src/renderer/views/library/maps/index.vue
@@ -60,7 +60,6 @@ import type { MapData } from "@main/content/maps/map-data";
 import Panel from "@renderer/components/common/Panel.vue";
 import MapFiltersComponent from "@renderer/components/maps/MapFiltersComponent.vue";
 import MapListComponent from "@renderer/components/maps/MapListComponent.vue";
-import { ref } from "vue";
 import { useRouter } from "vue-router";
 const router = useRouter();
 async function onMapSelected(map: MapData) {