Merge pull request #206 from JHWelch/more-linting

More linting

client/src/__tests__/test-extensions.d.ts

@@ -3,7 +3,7 @@ import 'vitest'
 
 declare module '@vue/test-utils' {
   interface VueWrapper {
-    byTestId(id: string): DOMWrapper<Element>;
+    byTestId(id: string): DOMWrapper<Element>
   }
 }
 

client/src/components/DynamicHeroIcon.vue

@@ -3,8 +3,8 @@ import { onMounted, ref } from 'vue'
 import * as heroIcons from '@heroicons/vue/24/solid'
 
 const props = defineProps<{
-  name: keyof typeof heroIcons,
-  class?: string,
+  name: keyof typeof heroIcons
+  class?: string
 }>()
 
 const isLoaded = ref(false)

client/src/components/RsvpModal.vue

@@ -9,9 +9,9 @@ import { CalendarDaysIcon } from '@heroicons/vue/24/solid'
 import { jsonHeaders } from '@client/data/headers'
 
 type RsvpForm = {
-  name: string,
-  email?: string,
-  reminders: boolean,
+  name: string
+  email?: string
+  reminders: boolean
 }
 
 const errors = ref<Errors>({})

client/src/components/form/FormCheckbox.vue

@@ -2,9 +2,9 @@
 import { computed } from 'vue'
 
 const props = defineProps<{
-  name: string,
-  description: string,
-  label?: string,
+  name: string
+  description: string
+  label?: string
 }>()
 
 defineEmits([

client/src/components/form/FormInput.vue

@@ -1,12 +1,12 @@
 <script lang="ts" setup>
 withDefaults(defineProps<{
-  name: string,
-  hideLabel?: boolean,
-  label?: string,
-  type?: string,
-  error?: string,
-  placeholder?: string,
-  required?: boolean,
+  name: string
+  hideLabel?: boolean
+  label?: string
+  type?: string
+  error?: string
+  placeholder?: string
+  required?: boolean
 }>(), {
   hideLabel: false,
   type: 'text',

client/src/pages/SuggestionsCreatePage.vue

@@ -6,10 +6,10 @@ import { ErrorBag } from '@client/types'
 import { jsonHeaders } from '@client/data/headers'
 
 type SuggestionFormData = {
-  theme?: string,
-  submitted_by?: string,
-  movie1?: string,
-  movie2?: string,
+  theme?: string
+  submitted_by?: string
+  movie1?: string
+  movie2?: string
 }
 
 const errors = ref<SuggestionFormData>({})

client/src/types.ts

@@ -1,8 +1,8 @@
 export type Errors = {
-  [key: string]: string;
+  [key: string]: string
 }
 
 export type ErrorBag = {
-  errors?: Errors;
-  message?: string;
+  errors?: Errors
+  message?: string
 }

eslint.config.mjs

@@ -11,5 +11,22 @@ export default [
       'no-restricted-imports': ['error', {
         patterns: ['.*'], // Disable all relative imports
       }],
+      '@stylistic/padding-line-between-statements': [
+        'error',
+        { blankLine: 'always', prev: '*', next: 'return' },
+      ],
+      '@stylistic/member-delimiter-style': [
+        'error',
+        {
+          multiline: {
+            delimiter: 'none',
+          },
+          singleline: {
+            delimiter: 'comma',
+            requireLast: false,
+          },
+          multilineDetection: 'brackets',
+        },
+      ],
     },
   }]

server/__tests__/controllers/cacheEmailTemplatesController.spec.ts

@@ -23,6 +23,7 @@ let req: Request
 const newCacheController = () => {
   const config = mockConfig()
   const firestore = new FirestoreAdapter(config)
+
   return new CacheEmailTemplatesController(firestore)
 }
 

server/__tests__/controllers/rsvpController.spec.ts

@@ -27,9 +27,9 @@ const mockBody = ({
   email = 'test@example.com',
   reminders = false,
 }: {
-  name?: any; // eslint-disable-line @typescript-eslint/no-explicit-any
-  email?: any; // eslint-disable-line @typescript-eslint/no-explicit-any
-  reminders?: any; // eslint-disable-line @typescript-eslint/no-explicit-any
+  name?: any // eslint-disable-line @typescript-eslint/no-explicit-any
+  email?: any // eslint-disable-line @typescript-eslint/no-explicit-any
+  reminders?: any // eslint-disable-line @typescript-eslint/no-explicit-any
 } = {}) => ({ name, email, reminders })
 
 describe('store', () => {

server/__tests__/controllers/subscriptionController.spec.ts

@@ -33,7 +33,7 @@ beforeEach(() => {
 })
 
 interface MockBodyArgs {
-  email?: any; // eslint-disable-line @typescript-eslint/no-explicit-any
+  email?: any // eslint-disable-line @typescript-eslint/no-explicit-any
 }
 
 const mockBody = ({

server/__tests__/controllers/suggestionController.spec.ts

@@ -33,9 +33,9 @@ const newSuggestionController = () => {
 }
 
 interface MockBodyArgs {
-  theme?: any; // eslint-disable-line @typescript-eslint/no-explicit-any
-  submitted_by?: any; // eslint-disable-line @typescript-eslint/no-explicit-any
-  movies?: any; // eslint-disable-line @typescript-eslint/no-explicit-any
+  theme?: any // eslint-disable-line @typescript-eslint/no-explicit-any
+  submitted_by?: any // eslint-disable-line @typescript-eslint/no-explicit-any
+  movies?: any // eslint-disable-line @typescript-eslint/no-explicit-any
 }
 
 const mockBody = ({

server/__tests__/support/firebaseMock.ts

@@ -115,52 +115,52 @@ export class FirebaseMock {
     }).toFirebaseDTO()
 
   static mockCollection = (collectionPath: string): {
-    firestore: { firestore: 'firestore' },
-    collectionPath: string,
+    firestore: { firestore: 'firestore' }
+    collectionPath: string
   } => ({
     firestore: { firestore: 'firestore' },
     collectionPath,
   })
 }
 
 export type FirebaseWeek = {
-  id: string,
-  theme: string,
-  date: DateTime,
-  slug?: string | null,
-  isSkipped: boolean,
-  movies?: FirebaseMovie[],
-  styledTheme?: RichText[],
-  lastEditedTime?: string,
+  id: string
+  theme: string
+  date: DateTime
+  slug?: string | null
+  isSkipped: boolean
+  movies?: FirebaseMovie[]
+  styledTheme?: RichText[]
+  lastEditedTime?: string
 }
 
 export type FirebaseMovie = {
-  director: string,
-  length: number,
-  notionId: string,
-  posterPath: string,
-  showingUrl: string | null,
-  theaterName: string | null,
-  time: string | null,
-  title: string,
-  tmdbId: number | null,
-  url: string | null,
-  year: number | null,
+  director: string
+  length: number
+  notionId: string
+  posterPath: string
+  showingUrl: string | null
+  theaterName: string | null
+  time: string | null
+  title: string
+  tmdbId: number | null
+  url: string | null
+  year: number | null
 }
 
 export type FirebaseUser = {
-  id: string,
-  email: string,
-  reminders: boolean,
+  id: string
+  email: string
+  reminders: boolean
 }
 
 export type FirebaseWeekConstructor = {
-  id: string,
-  theme: string,
-  date: Date|string,
-  styledTheme?: RichText[],
-  isSkipped?: boolean,
-  slug?: string | null,
-  movies?: Movie[],
-  lastEditedTime?: DateTime|string,
+  id: string
+  theme: string
+  date: Date|string
+  styledTheme?: RichText[]
+  isSkipped?: boolean
+  slug?: string | null
+  movies?: Movie[]
+  lastEditedTime?: DateTime|string
 }