Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix type generation being faulty #756

Merged
merged 3 commits into from
May 23, 2024
Merged

fix: fix type generation being faulty #756

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d1fcf9
fix: fix type generation being faulty
phoenix-ru May 23, 2024
791d0cb
Merge branch 'main' into fix/typescript-type-generation
zoey-kaiser May 23, 2024
813d710
chore: use module augmentation
phoenix-ru May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 18 additions & 19 deletions src/module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
defineNuxtModule,
useLogger,
createResolver,
addTemplate,
addTypeTemplate,
addPlugin,
addServerPlugin,
addImports,
Expand Down Expand Up @@ -197,16 +197,13 @@ export default defineNuxtModule<ModuleOptions>({
nitroConfig.alias['#auth'] = resolve('./runtime/server/services')
})

addTemplate({
addTypeTemplate({
filename: 'types/auth.d.ts',
getContents: () =>
[
'// AUTO-GENERATED BY @sidebase/nuxt-auth',
"declare module '#auth' {",
` import RuntimeServerServices from '${resolve('./runtime/server/services')}'`,
' const getServerSession: RuntimeServerServices.getServerSession',
' const getToken: RuntimeServerServices.getToken',
' const NuxtAuthHandler: RuntimeServerServices.NuxtAuthHandler',
` const { getServerSession, getToken, NuxtAuthHandler }: typeof import('${resolve('./runtime/server/services')}')`,
...(options.provider.type === 'local'
? [genInterface(
'SessionData',
Expand All @@ -215,23 +212,25 @@ export default defineNuxtModule<ModuleOptions>({
: []
),
'}',
"declare module 'nitropack' {",
` import { RouteOptions } from '${resolve('./runtime/types.ts')}'`,
' interface NitroRouteRules {',
' auth?: RouteOptions',
' }',
' interface NitroRouteConfig {',
' auth?: RouteOptions',
' }',
'}',
''
].join('\n')
})

nuxt.hook('prepare:types', (options) => {
options.references.push({
path: resolve(nuxt.options.buildDir, 'types/auth.d.ts')
})
addTypeTemplate({
filename: 'types/auth-misc.d.ts',
getContents: () => [
'// AUTO-GENERATED BY @sidebase/nuxt-auth',
`import { RouteOptions } from '${resolve('./runtime/types.ts')}'`,
"declare module 'nitropack' {",
' interface NitroRouteRules {',
' auth?: RouteOptions',
' }',
' interface NitroRouteConfig {',
' auth?: RouteOptions',
' }',
'}',
''
].join('\n')
})

// 6. Register middleware for autocomplete in definePageMeta
Expand Down