feat(generate): fix paths injection when automatic generation disabled

Tahul · Nov 22, 2023 · 0dbbe31 · 0dbbe31
1 parent cee28e5
commit 0dbbe31
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -85,11 +85,11 @@ export default defineNuxtConfig({
     queriesDir: 'queries',
     // dbschema/ dir (you should not touch this)
     queryBuilderDir: 'dbschema/query-builder',
-    // Toggles typings generation (@db/interfaces)
+    // Toggles typings generation (#db/interfaces)
     generateInterfaces: true,
-    // Toggles typings generation (@db/queries)
+    // Toggles typings generation (#db/queries)
     generateQueries: true,
-    // Toggles typings generation (@db/builder)
+    // Toggles typings generation (#db/builder)
     generateQueryBuilder: true,
     // Toggles logging messages on code generation
     generateQuiet: true,
@@ -170,11 +170,11 @@ export default defineEventHandler(async (req) => {
 })
 ```
 
-You can still import [queries](https://www.edgedb.com/docs/clients/js/queries) directly from `@db/queries` and pass them the client from `useEdgeDb()`.
+You can still import [queries](https://www.edgedb.com/docs/clients/js/queries) directly from `#db/queries` and pass them the client from `useEdgeDb()`.
 
 ```typescript
 // server/api/blogpost/[id].ts
-import { getBlogPost } from '@db/queries'
+import { getBlogPost } from '#db/queries'
 import { defineEventHandler, getRouterParams } from 'h3'
 
 export default defineEventHandler(async (req) => {

diff --git a/src/module.ts b/src/module.ts
@@ -390,20 +390,15 @@ export default defineNuxtModule<ModuleOptions>({
       })
     }
 
-    if (options.generateInterfaces || options.generateQueries || options.generateQueryBuilder) {
-      const nuxtOptions = nuxt.options
-
-      if (options.generateQueries)
-        nuxtOptions.alias['@db/queries'] = join(dbschemaDir, '/queries.ts')
-      if (options.generateInterfaces)
-        nuxtOptions.alias['@db/interfaces'] = join(dbschemaDir, '/interfaces.ts')
-      if (options.generateQueryBuilder)
-        nuxtOptions.alias['@db/builder'] = join(dbschemaDir, '/query-builder/index.ts')
-
-      await generateInterfaces()
-      await generateQueries()
-      await generateQueryBuilder()
-    }
+    // Inject aliases
+    const nuxtOptions = nuxt.options
+    nuxtOptions.alias['#db/queries'] = join(dbschemaDir, '/queries.ts')
+    nuxtOptions.alias['#db/interfaces'] = join(dbschemaDir, '/interfaces.ts')
+    nuxtOptions.alias['#db/builder'] = join(dbschemaDir, '/query-builder/index.ts')
+
+    await generateInterfaces()
+    await generateQueries()
+    await generateQueryBuilder()
 
     if (options.composables) {
       // Add server-side auto-imports

diff --git a/src/runtime/server/useEdgeDbQueries.ts b/src/runtime/server/useEdgeDbQueries.ts
@@ -1,6 +1,6 @@
-import * as queries from '@db/queries'
 import type { EventHandlerRequest, H3Event } from 'h3'
 import { useEdgeDb } from './useEdgeDb'
+import * as queries from '#db/queries'
 
 export function useEdgeDbQueries(
   req: H3Event<EventHandlerRequest> | undefined = undefined,