improve types

nuxt-modules · Mar 1, 2024 · 8e5eed7 · 8e5eed7
1 parent 56de988
commit 8e5eed7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/module.ts b/src/module.ts
@@ -1,6 +1,5 @@
 import { existsSync } from 'fs'
 import jiti from 'jiti'
-import type { Ref } from 'vue'
 import { defu } from 'defu'
 import { useLogger, addPlugin, addImports, addTemplate, createResolver, defineNuxtModule } from '@nuxt/kit'
 import GraphQLPlugin from '@rollup/plugin-graphql'
@@ -198,11 +197,6 @@ export default defineNuxtModule<ModuleOptions>({
 
 export const defineApolloClient = (config: ClientConfig) => config
 
-export interface ModuleRuntimeHooks {
-  'apollo:auth': (params: { client: string, token: Ref<string | null> }) => void
-  'apollo:error': (error: ErrorResponse) => void
-}
-
 export interface ModuleRuntimeConfig {
   apollo: NuxtApolloConfig<any>
 }
@@ -211,10 +205,6 @@ export interface ModulePublicRuntimeConfig {
   apollo: NuxtApolloConfig<any>
 }
 
-declare module '#app' {
-  interface RuntimeNuxtHooks extends ModuleRuntimeHooks {}
-}
-
 declare module '@nuxt/schema' {
   interface NuxtConfig { ['apollo']?: Partial<ModuleOptions> }
   interface NuxtOptions { ['apollo']?: ModuleOptions }

diff --git a/src/runtime/plugin.ts b/src/runtime/plugin.ts
@@ -6,9 +6,11 @@ import { ApolloClients, provideApolloClients } from '@vue/apollo-composable'
 import { ApolloClient, ApolloLink, createHttpLink, InMemoryCache, split } from '@apollo/client/core'
 import { GraphQLWsLink } from '@apollo/client/link/subscriptions'
 import { setContext } from '@apollo/client/link/context'
+import type { ClientConfig, ErrorResponse } from '../types'
 import createRestartableClient from './ws'
 import { useApollo } from './composables'
 import { ref, useCookie, defineNuxtPlugin, useRequestHeaders } from '#imports'
+import type { Ref } from '#imports'
 
 import { NuxtApollo } from '#apollo'
 import type { ApolloClientKeys } from '#apollo'
@@ -18,7 +20,7 @@ export default defineNuxtPlugin((nuxtApp) => {
 
   const clients = {} as Record<ApolloClientKeys, ApolloClient<any>>
 
-  for (const [key, clientConfig] of Object.entries(NuxtApollo.clients)) {
+  for (const [key, clientConfig] of Object.entries(NuxtApollo.clients) as [ApolloClientKeys, ClientConfig][]) {
     const getAuth = async () => {
       const token = ref<string | null>(null)
 
@@ -155,13 +157,19 @@ export default defineNuxtPlugin((nuxtApp) => {
   }
 })
 
+export interface ModuleRuntimeHooks {
+  'apollo:auth': (params: { client: ApolloClientKeys, token: Ref<string | null> }) => void
+  'apollo:error': (error: ErrorResponse) => void
+}
+
 interface DollarApolloHelpers extends ReturnType<typeof useApollo> {}
 interface DollarApollo {
   clients: Record<ApolloClientKeys, ApolloClient<any>>
   defaultClient: ApolloClient<any>
 }
 
 declare module '#app' {
+  interface RuntimeNuxtHooks extends ModuleRuntimeHooks {}
   interface NuxtApp {
     $apolloHelpers: DollarApolloHelpers
     $apollo: DollarApollo