@@ -403,6 +403,7 @@ export default defineNuxtModule<ModuleOptions>({
403403 // Inject aliases
404404 const nuxtOptions = nuxt . options
405405 nuxtOptions . alias = nuxtOptions . alias ?? { }
406+
406407 if ( hasQueries )
407408 nuxtOptions . alias [ '#edgedb/queries' ] = queriesPath
408409 if ( hasInterfaces )
@@ -431,16 +432,26 @@ export default defineNuxtModule<ModuleOptions>({
431432 from : resolveLocal ( './runtime/server/composables/useEdgeDbPKCE' ) ,
432433 name : 'useEdgeDbPKCE' ,
433434 } ,
434- {
435- from : resolveLocal ( './runtime/server/composables/useEdgeDbQueries' ) ,
436- name : 'useEdgeDbQueries' ,
437- } ,
438- {
439- from : resolveLocal ( './runtime/server/composables/useEdgeDbQueryBuilder' ) ,
440- name : 'useEdgeDbQueryBuilder' ,
441- } ,
442435 ] )
443436
437+ if ( hasQueryBuilder ) {
438+ addServerImports ( [
439+ {
440+ from : resolveLocal ( './runtime/server/composables/useEdgeDbQueryBuilder' ) ,
441+ name : 'useEdgeDbQueryBuilder' ,
442+ } ,
443+ ] )
444+ }
445+
446+ if ( hasQueries ) {
447+ addServerImports ( [
448+ {
449+ from : resolveLocal ( './runtime/server/composables/useEdgeDbQueries' ) ,
450+ name : 'useEdgeDbQueries' ,
451+ } ,
452+ ] )
453+ }
454+
444455 // Add server-side auto-imports
445456 nuxt . hook (
446457 'nitro:config' ,
@@ -460,6 +471,7 @@ export default defineNuxtModule<ModuleOptions>({
460471 // Push server aliases
461472 config . alias ??= { }
462473 config . alias [ '#edgedb/server' ] = resolveLocal ( './runtime/server/index' )
474+
463475 if ( hasQueries )
464476 config . alias [ '#edgedb/queries' ] = join ( dbschemaDir , '/queries.ts' )
465477 if ( hasInterfaces )
@@ -472,6 +484,7 @@ export default defineNuxtModule<ModuleOptions>({
472484 config . typescript . tsConfig ??= { }
473485 config . typescript . tsConfig . compilerOptions ??= { }
474486 config . typescript . tsConfig . compilerOptions . paths ??= { }
487+
475488 if ( hasQueries )
476489 config . typescript . tsConfig . compilerOptions . paths [ '#edgedb/queries' ] = [ `${ join ( dbschemaDir , '/queries.ts' ) } ` ]
477490 if ( hasInterfaces )
0 commit comments