refactor: Enable auto-import for composables

components/account/AccountFollowButton.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
-import { toggleFollowAccount, useRelationship } from '~~/composables/masto/relationship'
 
 const { account, command, context, ...props } = defineProps<{
   account: mastodon.v1.Account

components/account/AccountHoverWrapper.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
-import { fetchAccountByHandle } from '~/composables/cache'
 
 type WatcherType = [acc?: mastodon.v1.Account | null, h?: string, v?: boolean]
 

components/account/AccountMoreButton.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
-import { toggleBlockAccount, toggleBlockDomain, toggleMuteAccount } from '~~/composables/masto/relationship'
 
 const { account } = defineProps<{
   account: mastodon.v1.Account

components/aria/AriaAnnouncer.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { LocaleObject } from '@nuxtjs/i18n'
-import type { AriaAnnounceType, AriaLive } from '~/composables/aria'
 
 const router = useRouter()
 const { t, locale, locales } = useI18n()

components/aria/AriaLog.vue

@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import type { AriaLive } from '~/composables/aria'
-
 // tsc complaining when using $defineProps
 withDefaults(defineProps<{
   title: string

components/aria/AriaStatus.vue

@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import type { AriaLive } from '~/composables/aria'
-
 // tsc complaining when using $defineProps
 withDefaults(defineProps<{
   ariaLive?: AriaLive

components/command/CommandItem.vue

@@ -1,6 +1,4 @@
 <script lang="ts" setup>
-import type { ResolvedCommand } from '~/composables/command'
-
 const {
   cmd,
   index,

components/command/CommandPanel.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
-import type { SearchResult as SearchResultType } from '~/composables/masto/search'
-import type { CommandScope, QueryResult, QueryResultItem } from '~/composables/command'
+type SearchResultType = SearchResult
 
 const emit = defineEmits<{
   (event: 'close'): void

components/modal/ModalContainer.vue

@@ -1,19 +1,6 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
 import type { ConfirmDialogChoice } from '~/types'
-import {
-  isCommandPanelOpen,
-  isConfirmDialogOpen,
-  isEditHistoryDialogOpen,
-  isErrorDialogOpen,
-  isFavouritedBoostedByDialogOpen,
-  isKeyboardShortcutsDialogOpen,
-  isMediaPreviewOpen,
-  isPreviewHelpOpen,
-  isPublishDialogOpen,
-  isReportDialogOpen,
-  isSigninDialogOpen,
-} from '~/composables/dialog'
 
 const isMac = useIsMac()
 

components/nav/NavBottom.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { Component } from 'vue'
-import type { NavButtonName } from '../../composables/settings'
 
 import { STORAGE_KEY_BOTTOM_NAV_BUTTONS } from '~/constants'
 

components/report/ReportModal.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
-import { toggleBlockAccount, toggleFollowAccount, toggleMuteAccount, useRelationship } from '~~/composables/masto/relationship'
 
 const { account, status } = defineProps<{
   account: mastodon.v1.Account

components/search/SearchResult.vue

@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import type { SearchResult } from '~/composables/masto/search'
-
 defineProps<{
   result: SearchResult
   active: boolean

components/settings/SettingsBottomNav.vue

@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import type { NavButtonName } from '~/composables/settings'
 import { STORAGE_KEY_BOTTOM_NAV_BUTTONS } from '~/constants'
 
 interface NavButton {

components/settings/SettingsColorMode.vue

@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import type { ColorMode } from '~/composables/settings'
-
 const colorMode = useColorMode()
 
 function setColorMode(mode: ColorMode) {

components/settings/SettingsFontSize.vue

@@ -1,6 +1,5 @@
 <script lang="ts" setup>
 import { DEFAULT_FONT_SIZE } from '~/constants'
-import type { FontSize } from '~/composables/settings'
 
 const userSettings = useUserSettings()
 

components/settings/SettingsThemeColors.vue

@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import type { ThemeColors } from '~/composables/settings'
-
 const themes = await import('~/constants/themes.json').then(r => r.default) as [string, ThemeColors][]
 const settings = useUserSettings()
 

components/status/StatusActionsMore.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
-import { toggleBlockAccount, toggleMuteAccount, useRelationship } from '~~/composables/masto/relationship'
 
 const props = defineProps<{
   status: mastodon.v1.Status

components/status/StatusFavouritedBoostedBy.vue

@@ -1,6 +1,4 @@
 <script setup lang="ts">
-import { favouritedBoostedByStatusId } from '~/composables/dialog'
-
 const type = ref<'favourited-by' | 'boosted-by'>('favourited-by')
 
 const { client } = useMasto()

components/status/StatusReplyingTo.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
-import { fetchAccountById } from '~/composables/cache'
 
 type WatcherType = [status?: mastodon.v1.Status, v?: boolean]
 

components/tiptap/TiptapEmojiList.vue

@@ -1,9 +1,6 @@
 <script setup lang="ts">
 import { getEmojiMatchesInText } from '@iconify/utils/lib/emoji/replace/find'
-import type { CustomEmoji, Emoji } from '~/composables/tiptap/suggestion'
-import { isCustomEmoji } from '~/composables/tiptap/suggestion'
 import { emojiFilename, emojiPrefix, emojiRegEx } from '~~/config/emojis'
-import type { CommandHandler } from '~/composables/command'
 
 const { items, command } = defineProps<{
   items: (CustomEmoji | Emoji)[]

components/tiptap/TiptapHashtagList.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
-import type { CommandHandler } from '~/composables/command'
 
 const { items, command } = defineProps<{
   items: mastodon.v1.Tag[]

components/tiptap/TiptapMentionList.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { mastodon } from 'masto'
-import type { CommandHandler } from '~/composables/command'
 
 const { items, command } = defineProps<{
   items: mastodon.v1.Account[]

composables/command.ts

@@ -2,7 +2,6 @@ import type { ComputedRef } from 'vue'
 import { defineStore } from 'pinia'
 import Fuse from 'fuse.js'
 import type { LocaleObject } from '@nuxtjs/i18n'
-import type { SearchResult } from '~/composables/masto/search'
 
 // @unocss-include
 

composables/push-notifications/createPushSubscription.ts

@@ -1,10 +1,4 @@
 import type { mastodon } from 'masto'
-import type {
-  CreatePushNotification,
-  PushManagerSubscriptionInfo,
-  RequiredUserLogin,
-} from '~/composables/push-notifications/types'
-import { PushSubscriptionError } from '~/composables/push-notifications/types'
 
 export async function createPushSubscription(
   user: RequiredUserLogin,
@@ -42,7 +36,7 @@ export async function createPushSubscription(
       )
     })
     .catch((error) => {
-      let useError: PushSubscriptionError | Error = error
+      let useError: typeof PushSubscriptionError | Error = error
       if (error.code === 11 && error.name === 'InvalidStateError')
         useError = new PushSubscriptionError('too_many_registrations', 'Too many registrations')
       else if (error.code === 20 && error.name === 'AbortError')

composables/push-notifications/usePushManager.ts

@@ -1,11 +1,5 @@
 import type { mastodon } from 'masto'
 
-import type {
-  CreatePushNotification,
-  PushNotificationPolicy,
-  PushNotificationRequest,
-  SubscriptionResult,
-} from '~/composables/push-notifications/types'
 import { STORAGE_KEY_NOTIFICATION, STORAGE_KEY_NOTIFICATION_POLICY } from '~/constants'
 
 const supportsPushNotifications = typeof window !== 'undefined'

composables/tiptap/suggestion.ts

@@ -6,7 +6,6 @@ import { PluginKey } from 'prosemirror-state'
 import type { Component } from 'vue'
 import type { Emoji, EmojiMartData } from '@emoji-mart/data'
 import type { mastodon } from 'masto'
-import { currentCustomEmojis, updateCustomEmojis } from '~/composables/emojis'
 import TiptapMentionList from '~/components/tiptap/TiptapMentionList.vue'
 import TiptapHashtagList from '~/components/tiptap/TiptapHashtagList.vue'
 import TiptapEmojiList from '~/components/tiptap/TiptapEmojiList.vue'

composables/users.ts

@@ -14,8 +14,6 @@ import {
   STORAGE_KEY_SERVERS,
   STORAGE_KEY_USERS,
 } from '~/constants'
-import type { PushNotificationPolicy, PushNotificationRequest } from '~/composables/push-notifications/types'
-import { useAsyncIDBKeyval } from '~/composables/idb'
 
 const mock = process.mock
 

layouts/default.vue

@@ -1,6 +1,4 @@
 <script lang="ts" setup>
-import { usePreferences } from '~/composables/settings'
-
 const route = useRoute()
 const info = useBuildInfo()
 

nuxt.config.ts

@@ -71,10 +71,11 @@ export default defineNuxtConfig({
   },
   imports: {
     dirs: [
-      './composables/masto',
-      './composables/push-notifications',
+      './composables/masto/*',
+      './composables/push-notifications/*',
       './composables/settings',
-      './composables/tiptap/index.ts',
+      './composables/tiptap/*',
+      './composables/idb',
     ],
     imports: [{
       name: 'useI18n',

plugins/magic-keys.client.ts

@@ -1,6 +1,4 @@
 import type { RouteLocationRaw } from 'vue-router'
-import { useMagicSequence } from '~/composables/magickeys'
-import { currentUser, getInstanceDomain } from '~/composables/users'
 
 export default defineNuxtPlugin(({ $scrollToTop }) => {
   const keys = useMagicKeys()

plugins/setup-global-effects.client.ts

@@ -1,4 +1,3 @@
-import type { OldFontSize } from '~/composables/settings'
 import { oldFontSizeMap } from '~/constants/options'
 import { DEFAULT_FONT_SIZE } from '~/constants'
 

scripts/avatars.ts

@@ -2,7 +2,6 @@ import { Buffer } from 'node:buffer'
 import { join, resolve } from 'pathe'
 import fs from 'fs-extra'
 import { ofetch } from 'ofetch'
-import { elkTeamMembers } from '../composables/about'
 
 const avatarsDir = resolve('./public/avatars/')
 

scripts/generate-themes.ts

@@ -1,5 +1,4 @@
 import chroma from 'chroma-js'
-import type { ThemeColors } from '~/composables/settings'
 
 // #cc7d24 -> hcl(67.14,62.19,59.56)
 export const themesColor = Array.from(

tests/nuxt/content-rich.test.ts

@@ -3,8 +3,6 @@ import { renderToString } from 'vue/server-renderer'
 import { format } from 'prettier'
 import type { mastodon } from 'masto'
 import { mockComponent } from '@nuxt/test-utils/runtime'
-import { contentToVNode } from '~/composables/content-render'
-import type { ContentParseOptions } from '~/composables/content-parse'
 
 beforeEach(() => {
   publicServer.value = useRuntimeConfig().public.defaultServer

tests/nuxt/html-parse.test.ts

@@ -1,7 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import { format } from 'prettier'
 import { render as renderTree } from 'ultrahtml'
-import type { ContentParseOptions } from '~/composables/content-parse'
 
 describe('html-parse', () => {
   it('empty', async () => {